Add compare with parent action (closes #1283) - 1st round of fixes

VirtusLab · Feb 13, 2023 · d1a5142 · d1a5142
1 parent 5112285
commit d1a5142
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/...main/java/com/virtuslab/gitmachete/frontend/actions/base/BaseCompareWithParentAction.java b/...main/java/com/virtuslab/gitmachete/frontend/actions/base/BaseCompareWithParentAction.java
@@ -62,7 +62,8 @@ public void actionPerformed(AnActionEvent anActionEvent) {
     }
 
     val parent = managedBranch.asNonRoot().getParent();
-    GitBrancher.getInstance(project).compare(parent.getName(), Collections.singletonList(gitRepository));
+    val repositories = Collections.singletonList(gitRepository);
+    GitBrancher.getInstance(project).compareAny(parent.getName(), managedBranch.getName(), repositories);
   }
 
 }
diff --git a/src/test/java/com/virtuslab/archunit/BackgroundTaskEnqueuingTestSuite.java b/src/test/java/com/virtuslab/archunit/BackgroundTaskEnqueuingTestSuite.java
@@ -63,7 +63,7 @@ public void only_continues_in_background_methods_should_enqueue_background_tasks
           JavaClass calledMethodOwner = calledMethod.getOwner();
           return calledMethodOwner.isAssignableTo(Task.Backgroundable.class) && calledMethodName.equals("queue") ||
               calledMethodOwner.isAssignableTo(GitBrancher.class)
-                  && !(calledMethodName.equals("getInstance") || calledMethodName.equals("compare"))
+                  && !(calledMethodName.equals("getInstance") || calledMethodName.equals("compareAny"))
               ||
               calledMethodOwner.isAssignableTo(VcsPushDialog.class) && calledMethodName.equals("show") ||
               calledMethod.getRawReturnType().isEquivalentTo(java.util.concurrent.Future.class);

diff --git a/src/test/java/com/virtuslab/archunit/UIThreadUnsafeMethodInvocationsTestSuite.java b/src/test/java/com/virtuslab/archunit/UIThreadUnsafeMethodInvocationsTestSuite.java
@@ -123,7 +123,7 @@ public boolean test(JavaMethod method) {
       "git4idea.GitUtil.getRepositoryManager(com.intellij.openapi.project.Project)",
       "git4idea.branch.GitBranchUtil.sortBranchNames(java.util.Collection)",
       "git4idea.branch.GitBrancher.checkout(java.lang.String, boolean, java.util.List, java.lang.Runnable)",
-      "git4idea.branch.GitBrancher.compare(java.lang.String, java.util.List)",
+      "git4idea.branch.GitBrancher.compareAny(java.lang.String, java.lang.String, java.util.List)",
       "git4idea.branch.GitBrancher.createBranch(java.lang.String, java.util.Map)",
       "git4idea.branch.GitBrancher.deleteBranch(java.lang.String, java.util.List)",
       "git4idea.branch.GitBrancher.deleteBranches(java.util.Map, java.lang.Runnable)",