diff tests/test-metaedit.t @ 5970:65d4e47d7f26

rewriteutil: use precheck from core if recent enough This commit makes the evolve extension's `rewriteutil.precheck()` simply delegate to the same function from Mercurial core, if that function is deemed recent enough. The way I made that check is by looking for `rewriteutil.find_new_divergence_from()`. That means that there's a range of commits (ba6881c6::8125bcd2^) where the user would see less detailed error messages if they are running with an hg version from that range (there are no released versions in that range). As you can see in the tests, switching to core's version of the function mostly affects error messages and exit codes.
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 04 May 2021 09:40:18 -0700
parents 628215631e8e
children 1a13ac9ef30a
line wrap: on
line diff
--- a/tests/test-metaedit.t	Sat Jun 19 22:33:38 2021 +0300
+++ b/tests/test-metaedit.t	Tue May 04 09:40:18 2021 -0700
@@ -74,7 +74,7 @@
   $ hg metaedit -r 0 --fold
   abort: cannot fold public changesets: ea207398892e
   (see 'hg help phases' for details)
-  [255]
+  [10]
   $ hg metaedit 'desc(C) + desc(F)' --fold
   abort: cannot fold non-linear revisions (multiple roots given)
   [255]
@@ -87,9 +87,9 @@
   (587528abfffe will become unstable and new unstable changes are not allowed)
   [255]
   $ hg metaedit 'desc(A)::desc(B)' --fold --config 'experimental.evolution=createmarkers, allnewcommands'
-  abort: fold will orphan 4 descendants
+  abort: cannot fold changeset, as that will orphan 4 descendants
   (see 'hg help evolution.instability')
-  [255]
+  [10]
   $ hg metaedit --user foobar
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg log --template '{rev}: {author}\n' -r 'desc(F):' --hidden