Merge lp:~frankoid/bzr4j/idea-update-trunk into lp:bzr4j

[Francis Devereux]

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/command/BzrLogCommand.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/command/BzrLogCommand.java	2010-03-02 20:44:47 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/command/BzrLogCommand.java	2010-03-03 00:22:12 +0000
@@ -15,13 +15,13 @@
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vcs.history.VcsFileRevision;
+import com.intellij.util.Consumer;
 import org.emergent.bzr4j.core.cli.BzrXmlResult;
 import org.emergent.bzr4j.core.xmloutput.XmlOutputHandler;
 import org.emergent.bzr4j.intellij.BzrFile;
 import org.emergent.bzr4j.intellij.BzrFileRevision;
 import org.emergent.bzr4j.intellij.BzrRevisionNumber;
 
-import java.util.Collections;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
@@ -30,37 +30,45 @@
 
   private static final Logger LOG = Logger.getInstance(BzrLogCommand.class.getName());
 
-  private static final int REVISION_INDEX = 0;
-
   public BzrLogCommand(Project project) {
     super(project);
   }
 
-  public final List<VcsFileRevision> execute(final BzrFile hgFile, int limit) {
-    if (limit <= REVISION_INDEX || hgFile == null || hgFile.getRepo() == null) {
-      return Collections.emptyList();
+  public final List<VcsFileRevision> execute(final BzrFile bzrFile) {
+    final List<VcsFileRevision> revisions = new LinkedList<VcsFileRevision>();
+
+    execute(bzrFile, new Consumer<VcsFileRevision>() {
+      public void consume(VcsFileRevision revision) {
+        revisions.add(revision);
+      }
+    });
+
+    return revisions;
+  }
+
+  public final void execute(final BzrFile bzrFile, final Consumer<VcsFileRevision> consumer) {
+    if (bzrFile == null || bzrFile.getRepo() == null) {
+      return;
     }
 
-    BzrIdeaExec handler = BzrIdeaExec.createBzrIdeaExec(hgFile.getRepo(), "xmllog");
+    BzrIdeaExec handler = BzrIdeaExec.createBzrIdeaExec(bzrFile.getRepo(), "xmllog");
 
-    ShellCommandService hgCommandService = ShellCommandService.getInstance(project);
+    ShellCommandService bzrCommandService = ShellCommandService.getInstance(project);
 
     List<String> arguments = new LinkedList<String>();
-    arguments.add(hgFile.getRelativePath());
+    arguments.add(bzrFile.getRelativePath());
 
     handler.addArguments(arguments);
 
-    final List<VcsFileRevision> revisions = new LinkedList<VcsFileRevision>();
     XmlOutputHandler resultHandler = new XmlOutputHandler() {
       @Override
       public void handleLog(String revno, String committer, String branchNick, Date timestamp, String message) {
         BzrRevisionNumber bzrRev = BzrRevisionNumber.getLocalInstance(revno);
-        revisions.add(new BzrFileRevision(project, hgFile, bzrRev, branchNick, timestamp, committer, message));
+        consumer.consume(new BzrFileRevision(project, bzrFile, bzrRev, branchNick, timestamp, committer, message));
       }
     };
 
-    hgCommandService.execute(handler, BzrXmlResult.createBzrXmlResult(resultHandler));
-    return revisions;
+    bzrCommandService.execute(handler, BzrXmlResult.createBzrXmlResult(resultHandler));
   }
 
 }

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/BzrHistoryProvider.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/BzrHistoryProvider.java	2010-03-02 20:44:47 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/BzrHistoryProvider.java	2010-03-03 00:22:12 +0000
@@ -17,32 +17,31 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vcs.FilePath;
 import com.intellij.openapi.vcs.VcsException;
-import com.intellij.openapi.vcs.history.FileHistoryPanel;
 import com.intellij.openapi.vcs.history.HistoryAsTreeProvider;
+import com.intellij.openapi.vcs.history.VcsAbstractHistorySession;
+import com.intellij.openapi.vcs.history.VcsAppendableHistorySessionPartner;
 import com.intellij.openapi.vcs.history.VcsDependentHistoryComponents;
 import com.intellij.openapi.vcs.history.VcsFileRevision;
 import com.intellij.openapi.vcs.history.VcsHistoryProvider;
 import com.intellij.openapi.vcs.history.VcsHistorySession;
 import com.intellij.openapi.vcs.history.VcsRevisionNumber;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.util.Consumer;
 import com.intellij.util.ui.ColumnInfo;
 import com.intellij.vcsUtil.VcsUtil;
 import org.emergent.bzr4j.intellij.BzrFile;
-import org.emergent.bzr4j.intellij.BzrFileRevision;
 import org.emergent.bzr4j.intellij.command.BzrLogCommand;
 import org.emergent.bzr4j.intellij.command.BzrMiscCommand;
-import org.emergent.bzr4j.intellij.command.BzrWorkingCopyRevisionsCommand;
 
 import javax.swing.*;
-import java.util.LinkedList;
+import java.util.Collections;
 import java.util.List;
 
 public class BzrHistoryProvider implements VcsHistoryProvider {
 
+  @SuppressWarnings({ "UnusedDeclaration" })
   private static final Logger LOG = Logger.getInstance(BzrHistoryProvider.class.getName());
 
-  private static final int DEFAULT_LIMIT = 500;
-
   private final Project project;
 
   public BzrHistoryProvider(Project project) {
@@ -54,7 +53,7 @@
     return VcsDependentHistoryComponents.createOnlyColumns(new ColumnInfo[0]);
   }
 
-  public AnAction[] getAdditionalActions(FileHistoryPanel panel) {
+  public AnAction[] getAdditionalActions(Runnable runnable) {
     return new AnAction[0];
   }
 
@@ -66,26 +65,51 @@
     return null;
   }
 
+  public void reportAppendableHistory(
+      FilePath filePath, final VcsAppendableHistorySessionPartner partner) throws VcsException {
+    final VirtualFile vcsRoot = VcsUtil.getVcsRootFor(project, filePath);
+    if (vcsRoot == null) {
+      return;
+    }
+
+    BzrFile bzrFile = new BzrFile(vcsRoot, filePath);
+
+    partner.reportCreatedEmptySession(createBzrHistorySession(Collections.<VcsFileRevision>emptyList(), vcsRoot));
+
+    BzrLogCommand logCommand = new BzrLogCommand(project);
+    logCommand.execute(bzrFile, new Consumer<VcsFileRevision>() {
+      public void consume(VcsFileRevision revision) {
+        partner.acceptRevision(revision);
+      }
+    });
+  }
+
   public VcsHistorySession createSessionFor(FilePath filePath) throws VcsException {
     final VirtualFile vcsRoot = VcsUtil.getVcsRootFor(project, filePath);
     if (vcsRoot == null) {
       return null;
     }
-    BzrFile hgFile = new BzrFile(vcsRoot, filePath);
+
+    BzrFile bzrFile = new BzrFile(vcsRoot, filePath);
     BzrLogCommand logCommand = new BzrLogCommand(project);
-    List<VcsFileRevision> result = logCommand.execute(hgFile, DEFAULT_LIMIT);
-    return new VcsHistorySession(result) {
+    List<VcsFileRevision> revisions = logCommand.execute(bzrFile);
+    return createBzrHistorySession(revisions, vcsRoot);
+  }
+
+  private VcsAbstractHistorySession createBzrHistorySession(
+      final List<VcsFileRevision> revisions, final VirtualFile vcsRoot) {
+    return new VcsAbstractHistorySession(revisions) {
       @Override
       protected VcsRevisionNumber calcCurrentRevisionNumber() {
         return BzrMiscCommand.revno(project,vcsRoot);
       }
+
+      public HistoryAsTreeProvider getHistoryAsTreeProvider() {
+        return null;
+      }
     };
   }
 
-  public HistoryAsTreeProvider getTreeHistoryProvider() {
-    return null;
-  }
-
   public boolean supportsHistoryForDirectories() {
     return true;
   }

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/annotate/BzrAnnotationProvider.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/annotate/BzrAnnotationProvider.java	2010-01-05 02:18:38 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/annotate/BzrAnnotationProvider.java	2010-03-03 00:22:12 +0000
@@ -26,8 +26,6 @@
 
 public class BzrAnnotationProvider implements AnnotationProvider {
 
-  private static final int DEFAULT_LIMIT = 500;
-
   private final Project project;
 
   public BzrAnnotationProvider(Project project) {
@@ -45,7 +43,7 @@
     return new BzrAnnotation(
         hgFile,
         hgAnnotateCommand.execute(hgFile),
-        hgLogCommand.execute(hgFile, DEFAULT_LIMIT)
+        hgLogCommand.execute(hgFile)
     );
   }