RevWalk: fix bad topo flags error message

The error message for an Exception thrown by StartGenerator when given
both the TOPO flag and the TOPO_KEEP_BRANCH_TOGETHER flag mentions a
non-existent flag, TOPO_NON_INTERMIX. The error message was introduced
in commit e498d43.

Replace TOPO_NON_INTERMIX with TOPO_KEEP_BRANCH_TOGETHER in the error
message of an Exception thrown by the StartGenerator when the TOPO flag
is provided together with the TOPO_KEEP_BRANCH_TOGETHER flag.

Signed-off-by: Alex Spradlin <alexaspradlin@google.com>
Change-Id: Id24640dc08e96a196508fe38ce144aa7e035082f

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkSortTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkSortTest.java
index 18ea2c83cec9f92d8f0bf3d66e044f5e2b73a6df..8af6747739c0f44cd6cb359084caaf4658cc9ba6 100644 (file)
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkSortTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkSortTest.java
@@ -310,7 +310,7 @@ public class RevWalkSortTest extends RevWalkTestCase {
                        fail("did not throw IllegalStateException");
                } catch (IllegalStateException e) {
                        assertEquals(
-                                       JGitText.get().cannotCombineTopoSortWithTopoNonIntermixSort,
+                                       JGitText.get().cannotCombineTopoSortWithTopoKeepBranchTogetherSort,
                                        e.getMessage());
                }
        }

diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
index c46cd4a36f27add74241a6b4ff7c67f705e2a44a..cb570e836c778bd200c28dbb5cb1fb66cfeaee1a 100644 (file)
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
@@ -54,7 +54,7 @@ cannotChangeActionOnComment=Cannot change action on comment line in git-rebase-t
 cannotCheckoutFromUnbornBranch=Cannot check out from unborn branch
 cannotCheckoutOursSwitchBranch=Checking out ours/theirs is only possible when checking out index, not when switching branches.
 cannotCombineSquashWithNoff=Cannot combine --squash with --no-ff.
-cannotCombineTopoSortWithTopoNonIntermixSort=Cannot combine sorts TOPO and TOPO_NON_INTERMIX.
+cannotCombineTopoSortWithTopoKeepBranchTogetherSort=Cannot combine sorts TOPO and TOPO_KEEP_BRANCH_TOGETHER
 cannotCombineTreeFilterWithRevFilter=Cannot combine TreeFilter {0} with RevFilter {1}.
 cannotCommitOnARepoWithState=Cannot commit on a repo with state: {0}
 cannotCommitWriteTo=Cannot commit write to {0}

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
index 9d8acad7a8c526eae846e051875f3a1137e1d169..ec2414d41ba7a8d0e5984186b85eed0fe6c67173 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
@@ -82,7 +82,7 @@ public class JGitText extends TranslationBundle {
        /***/ public String cannotCheckoutFromUnbornBranch;
        /***/ public String cannotCheckoutOursSwitchBranch;
        /***/ public String cannotCombineSquashWithNoff;
-       /***/ public String cannotCombineTopoSortWithTopoNonIntermixSort;
+       /***/ public String cannotCombineTopoSortWithTopoKeepBranchTogetherSort;
        /***/ public String cannotCombineTreeFilterWithRevFilter;
        /***/ public String cannotCommitOnARepoWithState;
        /***/ public String cannotCommitWriteTo;

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/StartGenerator.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/StartGenerator.java
index 18af012afd97064eea97e42d795dec6a8e806134..bfcea6ea8f5932d2536779b79502418aed04e306 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/StartGenerator.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/StartGenerator.java
@@ -137,7 +137,7 @@ class StartGenerator extends Generator {
                if (walker.hasRevSort(RevSort.TOPO)
                                && walker.hasRevSort(RevSort.TOPO_KEEP_BRANCH_TOGETHER)) {
                        throw new IllegalStateException(JGitText
-                                       .get().cannotCombineTopoSortWithTopoNonIntermixSort);
+                                       .get().cannotCombineTopoSortWithTopoKeepBranchTogetherSort);
                }
 
                if (walker.hasRevSort(RevSort.TOPO)