vcs annotate: allow to build annotation by VcsRevisionNumber

diff --git a/platform/vcs-impl/src/com/intellij/vcs/AnnotationProviderEx.java b/platform/vcs-impl/src/com/intellij/vcs/AnnotationProviderEx.java
new file mode 100644 (file)
index 0000000..2d94e33
--- /dev/null
+++ b/platform/vcs-impl/src/com/intellij/vcs/AnnotationProviderEx.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2000-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.vcs;
+
+import com.intellij.openapi.vcs.FilePath;
+import com.intellij.openapi.vcs.VcsException;
+import com.intellij.openapi.vcs.annotate.AnnotationProvider;
+import com.intellij.openapi.vcs.annotate.FileAnnotation;
+import com.intellij.openapi.vcs.history.VcsRevisionNumber;
+import org.jetbrains.annotations.NotNull;
+
+public interface AnnotationProviderEx extends AnnotationProvider {
+  @NotNull
+  FileAnnotation annotate(@NotNull FilePath path, @NotNull VcsRevisionNumber revision) throws VcsException;
+}

diff --git a/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java b/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java
index 477da3a1874b2f9e53939b3ca5c910bfa5d3c82e..889bc10ae0560a79adf66473c3fcdcde8edd212e 100644 (file)
--- a/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java
+++ b/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java
@@ -27,25 +27,29 @@ import com.intellij.openapi.vcs.annotate.*;
 import com.intellij.openapi.vcs.history.VcsAbstractHistorySession;
 import com.intellij.openapi.vcs.history.VcsFileRevision;
 import com.intellij.openapi.vcs.history.VcsRevisionNumber;
+import com.intellij.openapi.vcs.vfs.VcsFileSystem;
+import com.intellij.openapi.vcs.vfs.VcsVirtualFile;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.vcs.AnnotationProviderEx;
 import com.intellij.vcsUtil.VcsUtil;
 import git4idea.GitFileRevision;
 import git4idea.GitRevisionNumber;
 import git4idea.GitUtil;
 import git4idea.commands.GitCommand;
 import git4idea.commands.GitSimpleHandler;
-import git4idea.util.StringScanner;
 import git4idea.history.GitHistoryUtils;
 import git4idea.i18n.GitBundle;
+import git4idea.util.StringScanner;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class GitAnnotationProvider implements AnnotationProvider, VcsCacheableAnnotationProvider {
+public class GitAnnotationProvider implements AnnotationProviderEx, VcsCacheableAnnotationProvider {
   private final Project myProject;
   @NonNls private static final String AUTHOR_KEY = "author";
   @NonNls private static final String COMMITTER_TIME_KEY = "committer-time";
@@ -67,13 +71,10 @@ public class GitAnnotationProvider implements AnnotationProvider, VcsCacheableAn
     final Exception[] exception = new Exception[1];
     Runnable command = new Runnable() {
       public void run() {
-        final ProgressIndicator progress = ProgressManager.getInstance().getProgressIndicator();
         try {
           final FilePath currentFilePath = VcsUtil.getFilePath(file.getPath());
           final FilePath realFilePath;
-          if (progress != null) {
-            progress.setText(GitBundle.message("getting.history", file.getName()));
-          }
+          setProgressIndicatorText(GitBundle.message("getting.history", file.getName()));
           final List<VcsFileRevision> revisions = GitHistoryUtils.history(myProject, currentFilePath);
           if (revision == null) {
             realFilePath = GitHistoryUtils.getLastCommitName(myProject, currentFilePath);
@@ -81,10 +82,9 @@ public class GitAnnotationProvider implements AnnotationProvider, VcsCacheableAn
           else {
             realFilePath = ((GitFileRevision)revision).getPath();
           }
-          if (progress != null) {
-            progress.setText(GitBundle.message("computing.annotation", file.getName()));
-          }
-          final GitFileAnnotation result = annotate(realFilePath, revision, revisions, file);
+          setProgressIndicatorText(GitBundle.message("computing.annotation", file.getName()));
+          VcsRevisionNumber revisionNumber = revision != null ? revision.getRevisionNumber() : null;
+          final GitFileAnnotation result = annotate(realFilePath, revisionNumber, revisions, file);
           annotation[0] = result;
         }
         catch (Exception e) {
@@ -105,10 +105,28 @@ public class GitAnnotationProvider implements AnnotationProvider, VcsCacheableAn
     return annotation[0];
   }
 
-  private GitFileAnnotation annotate(final FilePath repositoryFilePath,
-                                     final VcsFileRevision revision,
-                                     final List<VcsFileRevision> revisions,
-                                     final VirtualFile file) throws VcsException {
+  @NotNull
+  @Override
+  public FileAnnotation annotate(@NotNull final FilePath path, @NotNull final VcsRevisionNumber revision) throws VcsException {
+    setProgressIndicatorText(GitBundle.message("getting.history", path.getName()));
+    List<VcsFileRevision> revisions = GitHistoryUtils.history(myProject, path, null, revision);
+
+    GitFileRevision fileRevision = new GitFileRevision(myProject, path, (GitRevisionNumber)revision);
+    VcsVirtualFile file = new VcsVirtualFile(path.getPath(), fileRevision, VcsFileSystem.getInstance());
+
+    setProgressIndicatorText(GitBundle.message("computing.annotation", path.getName()));
+    return annotate(path, revision, revisions, file);
+  }
+
+  private static void setProgressIndicatorText(@Nullable String text) {
+    final ProgressIndicator progress = ProgressManager.getInstance().getProgressIndicator();
+    if (progress != null) progress.setText(text);
+  }
+
+  private GitFileAnnotation annotate(@NotNull final FilePath repositoryFilePath,
+                                     @Nullable final VcsRevisionNumber revision,
+                                     @NotNull final List<VcsFileRevision> revisions,
+                                     @NotNull final VirtualFile file) throws VcsException {
     GitSimpleHandler h = new GitSimpleHandler(myProject, GitUtil.getGitRoot(repositoryFilePath), GitCommand.BLAME);
     h.setStdoutSuppressed(true);
     h.setCharset(file.getCharset());
@@ -117,12 +135,12 @@ public class GitAnnotationProvider implements AnnotationProvider, VcsCacheableAn
       h.addParameters("HEAD");
     }
     else {
-      h.addParameters(revision.getRevisionNumber().asString());
+      h.addParameters(revision.asString());
     }
     h.endOptions();
     h.addRelativePaths(repositoryFilePath);
     String output = h.run();
-    GitFileAnnotation annotation = new GitFileAnnotation(myProject, file, revision == null ? null : revision.getRevisionNumber());
+    GitFileAnnotation annotation = new GitFileAnnotation(myProject, file, revision == null ? null : revision);
     class CommitInfo {
       Date date;
       String author;