Snapshot idea/138.1503 from git://git.jetbrains.org/idea/community.git

Change-Id: Ie01af1d8710ec0ff51d90301bda1a18b0b5c0faf

5 files changed, 42 insertions, 182 deletions

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgLogSingleCommitAction.java b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgLogSingleCommitAction.java
index 7410b0e7703e..43ef70ed2446 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgLogSingleCommitAction.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgLogSingleCommitAction.java
@@ -16,76 +16,21 @@
 
 package org.zmlx.hg4idea.action;
 
-import com.intellij.dvcs.DvcsUtil;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.CommonDataKeys;
+import com.intellij.dvcs.ui.VcsLogSingleCommitAction;
 import com.intellij.openapi.components.ServiceManager;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
-import com.intellij.vcs.log.VcsFullCommitDetails;
-import com.intellij.vcs.log.VcsLog;
-import com.intellij.vcs.log.VcsLogDataKeys;
+import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
-import org.zmlx.hg4idea.HgVcs;
+import org.jetbrains.annotations.Nullable;
 import org.zmlx.hg4idea.repo.HgRepository;
 import org.zmlx.hg4idea.repo.HgRepositoryManager;
 
-import java.util.List;
-
-/**
- * @author Nadya Zabrodina
- */
-public abstract class HgLogSingleCommitAction extends DumbAwareAction {
-
-  private static final Logger LOG = Logger.getInstance(HgLogSingleCommitAction.class);
-
-  protected abstract void actionPerformed(@NotNull HgRepository repository, @NotNull VcsFullCommitDetails commit);
+public abstract class HgLogSingleCommitAction extends VcsLogSingleCommitAction<HgRepository> {
 
+  @Nullable
   @Override
-  public void actionPerformed(AnActionEvent e) {
-    Data data = Data.collect(e);
-    if (!data.isValid()) {
-      return;
-    }
-
-    List<VcsFullCommitDetails> details = data.log.getSelectedDetails();
-    if (details.size() != 1) {
-      return;
-    }
-    VcsFullCommitDetails commit = details.get(0);
-
-    HgRepositoryManager repositoryManager = ServiceManager.getService(data.project, HgRepositoryManager.class);
-    final HgRepository repository = repositoryManager.getRepositoryForRoot(commit.getRoot());
-    if (repository == null) {
-      DvcsUtil.noVcsRepositoryForRoot(LOG, commit.getRoot(), data.project, repositoryManager, HgVcs.getInstance(data.project));
-      return;
-    }
-
-    actionPerformed(repository, commit);
+  protected HgRepository getRepositoryForRoot(@NotNull Project project, @NotNull VirtualFile root) {
+    return ServiceManager.getService(project, HgRepositoryManager.class).getRepositoryForRoot(root);
   }
 
-  @Override
-  public void update(AnActionEvent e) {
-    Data data = Data.collect(e);
-    boolean enabled = data.isValid() && data.log.getSelectedCommits().size() == 1;
-    e.getPresentation().setVisible(data.isValid());
-    e.getPresentation().setEnabled(enabled);
-  }
-
-  private static class Data {
-    Project project;
-    VcsLog log;
-
-    static Data collect(AnActionEvent e) {
-      Data data = new Data();
-      data.project = e.getData(CommonDataKeys.PROJECT);
-      data.log = e.getData(VcsLogDataKeys.VSC_LOG);
-      return data;
-    }
-
-    boolean isValid() {
-      return project != null && log != null && DvcsUtil.logHasRootForVcs(log, HgVcs.getKey());
-    }
-  }
 }
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandAuthenticator.java b/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandAuthenticator.java
index 1d41cdc688f9..14f6c981777b 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandAuthenticator.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandAuthenticator.java
@@ -35,7 +35,7 @@ import org.zmlx.hg4idea.HgVcsMessages;
 class HgCommandAuthenticator {
 
   private static final Logger LOG = Logger.getInstance(HgCommandAuthenticator.class.getName());
-
+  
   private GetPasswordRunnable myGetPassword;
   private final Project myProject;
   private boolean myForceAuthorization;
@@ -71,7 +71,7 @@ class HgCommandAuthenticator {
   }
 
   public boolean promptForAuthentication(Project project, String proposedLogin, String uri, String path, @Nullable ModalityState state) {
-    GetPasswordRunnable runnable = new GetPasswordRunnable(project, proposedLogin, uri, path, myForceAuthorization, state);
+    GetPasswordRunnable runnable = new GetPasswordRunnable(project, proposedLogin, uri, path, myForceAuthorization);
     ApplicationManager.getApplication().invokeAndWait(runnable, state == null ? ModalityState.defaultModalityState() : state);
     myGetPassword = runnable;
     return runnable.isOk();
@@ -96,21 +96,14 @@ class HgCommandAuthenticator {
     @Nullable private String myURL;
     private boolean myRememberPassword;
     private boolean myForceAuthorization;
-    @Nullable private ModalityState myState;
-
-    public GetPasswordRunnable(Project project,
-                               String proposedLogin,
-                               String uri,
-                               String path,
-                               boolean forceAuthorization,
-                               @Nullable ModalityState state) {
+
+    public GetPasswordRunnable(Project project, String proposedLogin, String uri, String path, boolean forceAuthorization) {
       this.myProject = project;
       this.myProposedLogin = proposedLogin;
       this.myURL = uri + path;
       this.myForceAuthorization = forceAuthorization;
-      myState = state;
     }
-
+    
     public void run() {
 
       // find if we've already been here
@@ -135,9 +128,11 @@ class HgCommandAuthenticator {
         final String key = keyForUrlAndLogin(myURL, login);
         try {
           final PasswordSafeImpl passwordSafe = (PasswordSafeImpl)PasswordSafe.getInstance();
-          password = passwordSafe.getPassword(myProject, HgCommandAuthenticator.class, key, myState);
-        }
-        catch (PasswordSafeException e) {
+          password = passwordSafe.getMemoryProvider().getPassword(myProject, HgCommandAuthenticator.class, key);
+          if (password == null) {
+            password = passwordSafe.getPassword(myProject, HgCommandAuthenticator.class, key);
+          }
+        } catch (PasswordSafeException e) {
           LOG.info("Couldn't get password for key [" + key + "]", e);
         }
       }
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgLogProvider.java b/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgLogProvider.java
index 03c98621a8c2..4adec9dff515 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgLogProvider.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgLogProvider.java
@@ -64,10 +64,13 @@ public class HgLogProvider implements VcsLogProvider {
     return HgHistoryUtil.loadMetadata(myProject, root, requirements.getCommitCount(), Collections.<String>emptyList());
   }
 
-  @NotNull
   @Override
-  public List<TimedVcsCommit> readAllHashes(@NotNull VirtualFile root, @NotNull Consumer<VcsUser> userRegistry) throws VcsException {
-    return HgHistoryUtil.readAllHashes(myProject, root, userRegistry, Collections.<String>emptyList());
+  public void readAllHashes(@NotNull VirtualFile root, @NotNull Consumer<VcsUser> userRegistry,
+                            @NotNull Consumer<TimedVcsCommit> commitConsumer) throws VcsException {
+    List<TimedVcsCommit> commits = HgHistoryUtil.readAllHashes(myProject, root, userRegistry, Collections.<String>emptyList());
+    for (TimedVcsCommit commit : commits) {
+      commitConsumer.consume(commit);
+    }
   }
 
   @NotNull
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgDiffFromHistoryHandler.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgDiffFromHistoryHandler.java
index 61d08bc94e8c..1d556a8b19cb 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgDiffFromHistoryHandler.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgDiffFromHistoryHandler.java
@@ -15,22 +15,13 @@
  */
 package org.zmlx.hg4idea.provider;
 
-import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.progress.ProgressIndicator;
-import com.intellij.openapi.progress.Task;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.ui.DialogBuilder;
-import com.intellij.openapi.util.Couple;
 import com.intellij.openapi.vcs.FilePath;
+import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.changes.Change;
-import com.intellij.openapi.vcs.changes.ui.ChangesBrowser;
-import com.intellij.openapi.vcs.history.CurrentRevision;
-import com.intellij.openapi.vcs.history.DiffFromHistoryHandler;
-import com.intellij.openapi.vcs.history.VcsFileRevision;
-import com.intellij.openapi.vcs.history.VcsHistoryUtil;
+import com.intellij.openapi.vcs.history.BaseDiffFromHistoryHandler;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.Consumer;
 import com.intellij.vcsUtil.VcsUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -44,111 +35,37 @@ import java.util.List;
  *
  * @author Nadya Zabrodina
  */
-public class HgDiffFromHistoryHandler implements DiffFromHistoryHandler {
+public class HgDiffFromHistoryHandler extends BaseDiffFromHistoryHandler<HgFileRevision> {
 
   private static final Logger LOG = Logger.getInstance(HgDiffFromHistoryHandler.class);
 
-  @NotNull private final Project myProject;
-
   public HgDiffFromHistoryHandler(@NotNull Project project) {
-    myProject = project;
+    super(project);
   }
 
+  @NotNull
   @Override
-  public void showDiffForOne(@NotNull AnActionEvent e, @NotNull FilePath filePath,
-                             @NotNull VcsFileRevision previousRevision, @NotNull VcsFileRevision revision) {
-    doShowDiff(filePath, previousRevision, revision, false);
+  protected List<Change> getChangesBetweenRevisions(@NotNull FilePath path, @NotNull HgFileRevision rev1, @Nullable HgFileRevision rev2) {
+    return executeDiff(path, rev1, rev2);
   }
 
-
+  @NotNull
   @Override
-  public void showDiffForTwo(@NotNull FilePath filePath, @NotNull VcsFileRevision revision1, @NotNull VcsFileRevision revision2) {
-    doShowDiff(filePath, revision1, revision2, true);
+  protected List<Change> getAffectedChanges(@NotNull FilePath path, @NotNull HgFileRevision rev) throws VcsException {
+    return executeDiff(path, null, rev);
   }
 
-  private void doShowDiff(@NotNull FilePath filePath, @NotNull VcsFileRevision revision1, @NotNull VcsFileRevision revision2,
-                          boolean autoSort) {
-    if (!filePath.isDirectory()) {
-      VcsHistoryUtil.showDifferencesInBackground(myProject, filePath, revision1, revision2, autoSort);
-    }
-    else if (revision2 instanceof CurrentRevision) {
-      HgFileRevision left = (HgFileRevision)revision1;
-      showDiffForDirectory(filePath, left, null);
-    }
-    else if (revision1.equals(VcsFileRevision.NULL)) {
-      HgFileRevision right = (HgFileRevision)revision2;
-      showDiffForDirectory(filePath, null, right);
-    }
-    else {
-      HgFileRevision left = (HgFileRevision)revision1;
-      HgFileRevision right = (HgFileRevision)revision2;
-      if (autoSort) {
-        Couple<VcsFileRevision> pair = VcsHistoryUtil.sortRevisions(revision1, revision2);
-        left = (HgFileRevision)pair.first;
-        right = (HgFileRevision)pair.second;
-      }
-      showDiffForDirectory(filePath, left, right);
-    }
+  @NotNull
+  @Override
+  protected String getPresentableName(@NotNull HgFileRevision revision) {
+    return revision.getRevisionNumber().getChangeset();
   }
 
-  private void showDiffForDirectory(@NotNull final FilePath path,
-                                    @Nullable final HgFileRevision rev1,
-                                    @Nullable final HgFileRevision rev2) {
+  @NotNull
+  private List<Change> executeDiff(@NotNull FilePath path, @Nullable HgFileRevision rev1, @Nullable HgFileRevision rev2) {
     VirtualFile root = VcsUtil.getVcsRootFor(myProject, path);
     LOG.assertTrue(root != null, "Repository is null for " + path);
-    calculateDiffInBackground(root, path, rev1, rev2, new Consumer<List<Change>>() {
-      @Override
-      public void consume(List<Change> changes) {
-        showDirDiffDialog(path, rev1 != null ? rev1.getRevisionNumber().getChangeset() : null,
-                          rev2 != null ? rev2.getRevisionNumber().getChangeset() : null, changes);
-      }
-    });
-  }
-
-  // rev1 == null => rev2 is the initial commit
-  // rev2 == null => comparing rev1 with local
-  private void calculateDiffInBackground(@NotNull final VirtualFile root, @NotNull final FilePath path,
-                                         @Nullable final HgFileRevision rev1, @Nullable final HgFileRevision rev2,
-                                         final Consumer<List<Change>> successHandler) {
-    new Task.Backgroundable(myProject, "Comparing revisions...") {
-      private List<Change> myChanges;
 
-      @Override
-      public void run(@NotNull ProgressIndicator indicator) {
-        if (myProject != null) {
-          myChanges = HgUtil.getDiff(HgDiffFromHistoryHandler.this.myProject, root, path, rev1, rev2);
-        }
-      }
-
-      @Override
-      public void onSuccess() {
-        successHandler.consume(myChanges);
-      }
-    }.queue();
-  }
-
-  private void showDirDiffDialog(@NotNull FilePath path, @Nullable String hash1, @Nullable String hash2, @NotNull List<Change> diff) {
-    DialogBuilder dialogBuilder = new DialogBuilder(myProject);
-    String title;
-    if (hash2 != null) {
-      if (hash1 != null) {
-        title = String.format("Difference between %s and %s in %s", hash1, hash2, path.getName());
-      }
-      else {
-        title = String.format("Initial commit %s in %s", hash2, path.getName());
-      }
-    }
-    else {
-      LOG.assertTrue(hash1 != null, "hash1 and hash2 can't both be null. Path: " + path);
-      title = String.format("Difference between %s and local version in %s", hash1, path.getName());
-    }
-    dialogBuilder.setTitle(title);
-    dialogBuilder.setActionDescriptors(new DialogBuilder.ActionDescriptor[]{new DialogBuilder.CloseDialogAction()});
-    final ChangesBrowser changesBrowser = new ChangesBrowser(myProject, null, diff, null, false, true,
-                                                             null, ChangesBrowser.MyUseCase.COMMITTED_CHANGES, null);
-    changesBrowser.setChangesToDisplay(diff);
-    dialogBuilder.setCenterPanel(changesBrowser);
-    dialogBuilder.showNotModal();
+    return HgUtil.getDiff(myProject, root, path, rev1, rev2);
   }
-}
-
+}
\ No newline at end of file
diff --git a/plugins/hg4idea/testSrc/hg4idea/test/HgExecutor.java b/plugins/hg4idea/testSrc/hg4idea/test/HgExecutor.java
index 2a654c4e534d..359c850362c9 100644
--- a/plugins/hg4idea/testSrc/hg4idea/test/HgExecutor.java
+++ b/plugins/hg4idea/testSrc/hg4idea/test/HgExecutor.java
@@ -65,7 +65,7 @@ public class HgExecutor extends Executor {
     List<String> split = splitCommandInParameters(command);
     split.add(0, HG_EXECUTABLE);
     debug("hg " + command);
-    return run(split, ignoreNonZeroExitCode);
+    return run(ourCurrentDir(), split, ignoreNonZeroExitCode);
   }
 
   public static void updateProject() {