svn: Refactored "MergeCalculatorTask" - do not check if merge info is supported
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Sat, 8 Oct 2016 19:33:20 +0000 (22:33 +0300)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 11 Oct 2016 01:28:23 +0000 (04:28 +0300)
It is already checked in "CheckRepositorySupportsMergeInfoTask".

plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/MergeCalculatorTask.java

index ecedded6d55419601750afa448b63e87319e042d..5c2adca9be65d30c38efccfe19b76f1f82e45c59 100644 (file)
@@ -53,19 +53,16 @@ public class MergeCalculatorTask extends BaseMergeTask {
 
   @Override
   public void run() throws VcsException {
-    if (myMergeContext.getWcInfo().getFormat().supportsMergeInfo()) {
-      myMergeChecker.prepare();
+    myMergeChecker.prepare();
 
-      List<Pair<SvnChangeList, LogHierarchyNode>> afterCopyPointChangeLists =
-        getChangeListsAfter(myCopyPoint.getTrue().getTargetRevision());
-      List<CommittedChangeList> notMergedChangeLists = getNotMergedChangeLists(afterCopyPointChangeLists);
+    List<Pair<SvnChangeList, LogHierarchyNode>> afterCopyPointChangeLists = getChangeListsAfter(myCopyPoint.getTrue().getTargetRevision());
+    List<CommittedChangeList> notMergedChangeLists = getNotMergedChangeLists(afterCopyPointChangeLists);
 
-      if (!notMergedChangeLists.isEmpty()) {
-        next(new ShowRevisionSelector(myMergeProcess, notMergedChangeLists, myMergeChecker));
-      }
-      else {
-        end("Everything is up-to-date", false);
-      }
+    if (!notMergedChangeLists.isEmpty()) {
+      next(new ShowRevisionSelector(myMergeProcess, notMergedChangeLists, myMergeChecker));
+    }
+    else {
+      end("Everything is up-to-date", false);
     }
   }