Mercurial > hg

changeset 33789:19f495fef0a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: change "result would have 3 parent" error message (BC) The old error message "cannot use revision REV as base, result would have 3 parents" is confusing - why use REV as base? why add a new parent?. This patch changes it to "cannot move parent", which seems better. Differential Revision: https://phab.mercurial-scm.org/D342
author Jun Wu <quark@fb.com>
date Sat, 12 Aug 2017 21:01:06 -0700
parents 0531ffd59a98
children f2befc1f4cf4
files hgext/rebase.py tests/test-rebase-brute-force.t tests/test-rebase-obsolete.t tests/test-rebase-scenario-global.t
diffstat 4 files changed, 8 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/rebase.py	Mon Aug 14 07:02:38 2017 -0700
+++ b/hgext/rebase.py	Sat Aug 12 21:01:06 2017 -0700
@@ -1091,10 +1091,9 @@
         #    /|    # None of A and B will be changed to D and rebase fails.
         #   A B D
         if set(newps) == set(oldps) and dest not in newps:
-            # The error message is for compatibility. It's a bit misleading
-            # since rebase is not supposed to add new parents.
-            raise error.Abort(_('cannot use revision %d as base, '
-                                'result would have 3 parents') % rev)
+            raise error.Abort(_('cannot rebase %d:%s without '
+                                'moving at least one of its parents')
+                              % (rev, repo[rev]))
 
     repo.ui.debug(" future parents are %d and %d\n" % tuple(newps))
 
--- a/tests/test-rebase-brute-force.t	Mon Aug 14 07:02:38 2017 -0700
+++ b/tests/test-rebase-brute-force.t	Sat Aug 12 21:01:06 2017 -0700
@@ -23,7 +23,7 @@
      A: A':Z
      B: B':Z
     AB: A':Z B':Z
-     C: ABORT: cannot use revision 3 as base, result would have 3 parents
+     C: ABORT: cannot rebase 3:a35c07e8a2a4 without moving at least one of its parents
     AC: A':Z C':A'B
     BC: B':Z C':B'A
    ABC: A':Z B':Z C':A'B'
@@ -31,7 +31,7 @@
     AD: A':Z D':Z
     BD: B':Z D':B'
    ABD: A':Z B':Z D':B'
-    CD: ABORT: cannot use revision 3 as base, result would have 3 parents
+    CD: ABORT: cannot rebase 3:a35c07e8a2a4 without moving at least one of its parents
    ACD: A':Z C':A'B D':Z
    BCD: B':Z C':B'A D':B'
   ABCD: A':Z B':Z C':A'B' D':B'
@@ -49,7 +49,7 @@
     B: B':Z
     A: 
    BA: B':Z
-    C: ABORT: cannot use revision 3 as base, result would have 3 parents
+    C: ABORT: cannot rebase 3:b8d7149b562b without moving at least one of its parents
    BC: B':Z C':B'A
    AC: 
   BAC: B':Z C':B'A
--- a/tests/test-rebase-obsolete.t	Mon Aug 14 07:02:38 2017 -0700
+++ b/tests/test-rebase-obsolete.t	Sat Aug 12 21:01:06 2017 -0700
@@ -494,7 +494,7 @@
   not rebasing ignored 4:26805aba1e60 "C" (C)
   not rebasing ignored 5:4b61ff5c62e2 "E" (E)
   rebasing 6:f15c3adaf214 "F" (F tip)
-  abort: cannot use revision 6 as base, result would have 3 parents
+  abort: cannot rebase 6:f15c3adaf214 without moving at least one of its parents
   [255]
 
   $ cd ..
--- a/tests/test-rebase-scenario-global.t	Mon Aug 14 07:02:38 2017 -0700
+++ b/tests/test-rebase-scenario-global.t	Sat Aug 12 21:01:06 2017 -0700
@@ -271,7 +271,7 @@
 
   $ hg rebase -s 6 -d 1
   rebasing 6:eea13746799a "G"
-  abort: cannot use revision 6 as base, result would have 3 parents
+  abort: cannot rebase 6:eea13746799a without moving at least one of its parents
   [255]
   $ hg rebase --abort
   rebase aborted