Mercurial > evolve

changeset 5670:777ca21a6f71

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge with stable into default
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 26 Nov 2020 07:40:10 +0100
parents b0a103e08d89 (diff) 1d80cda7fe93 (current diff)
children 8c5f2c37b911
files
diffstat 51 files changed, 186 insertions(+), 164 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/__init__.py	Mon Nov 23 13:43:29 2020 +0800
+++ b/hgext3rd/evolve/__init__.py	Thu Nov 26 07:40:10 2020 +0100
@@ -1179,7 +1179,17 @@
     finally:
         lockmod.release(tr, lock, wlock)
 
-@eh.wrapcommand(b'strip', extension=b'strip', opts=[
+try:
+    from mercurial import strip
+    strip
+    stripcmd = b'debugstrip'
+    stripext = None
+except ImportError:
+    # hg <= 5.6 (d7a508a75d72)
+    stripcmd = b'strip'
+    stripext = b'strip'
+
+@eh.wrapcommand(stripcmd, extension=stripext, opts=[
     (b'', b'bundle', None, _(b"delete the commit entirely and move it to a "
                              b"backup bundle")),
     ])
--- a/hgext3rd/evolve/metadata.py	Mon Nov 23 13:43:29 2020 +0800
+++ b/hgext3rd/evolve/metadata.py	Thu Nov 26 07:40:10 2020 +0100
@@ -5,7 +5,7 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
-__version__ = b'10.1.1.dev'
+__version__ = b'10.2.0.dev'
 testedwith = b'4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6'
 minimumhgversion = b'4.6'
 buglink = b'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py	Mon Nov 23 13:43:29 2020 +0800
+++ b/hgext3rd/topic/__init__.py	Thu Nov 26 07:40:10 2020 +0100
@@ -232,7 +232,7 @@
               b'topic.active': b'green',
               }
 
-__version__ = b'0.20.1.dev'
+__version__ = b'0.21.0.dev'
 
 testedwith = b'4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6'
 minimumhgversion = b'4.6'
--- a/hgext3rd/topic/compat.py	Mon Nov 23 13:43:29 2020 +0800
+++ b/hgext3rd/topic/compat.py	Thu Nov 26 07:40:10 2020 +0100
@@ -8,6 +8,8 @@
 from __future__ import absolute_import
 
 from mercurial import (
+    cmdutil,
+    extensions,
     pycompat,
     registrar,
     util,
@@ -46,3 +48,14 @@
     return set().union(
         *[roots for roots in repo._phasecache.phaseroots[1:] if roots]
     )
+
+def overridecommitstatus(overridefn):
+    if r'tip' in cmdutil.commitstatus.__code__.co_varnames:
+        extensions.wrapfunction(cmdutil, 'commitstatus', overridefn)
+    else:
+        # hg <= 5.6 (976b26bdd0d8)
+        def _override(orig, repo, node, branch, bheads=None, opts=None):
+            def _orig(repo, node, branch, bheads=None, tip=None, opts=None):
+                return orig(repo, node, branch, bheads=bheads, opts=opts)
+            return overridefn(_orig, repo, node, branch, bheads=bheads, tip=None, opts=opts)
+        extensions.wrapfunction(cmdutil, 'commitstatus', _override)
--- a/hgext3rd/topic/topicmap.py	Mon Nov 23 13:43:29 2020 +0800
+++ b/hgext3rd/topic/topicmap.py	Thu Nov 26 07:40:10 2020 +0100
@@ -6,7 +6,6 @@
 from mercurial import (
     branchmap,
     changegroup,
-    cmdutil,
     extensions,
     repoview,
     util,
@@ -89,20 +88,20 @@
     _setuptopicfilter(ui)
     _wrapbmcache(ui)
     extensions.wrapfunction(changegroup.cg1unpacker, 'apply', cgapply)
-    extensions.wrapfunction(cmdutil, 'commitstatus', commitstatus)
+    compat.overridecommitstatus(commitstatus)
 
 def cgapply(orig, self, repo, *args, **kwargs):
     """make sure a topicmap is used when applying a changegroup"""
     other = repo.filtered(topicfilter(repo.filtername))
     return orig(self, other, *args, **kwargs)
 
-def commitstatus(orig, repo, node, branch, bheads=None, opts=None):
+def commitstatus(orig, repo, node, branch, bheads=None, tip=None, opts=None):
     # wrap commit status use the topic branch heads
     ctx = repo[node]
     if ctx.topic() and ctx.branch() == branch:
         bheads = repo.branchheads(b"%s:%s" % (branch, ctx.topic()))
 
-    ret = orig(repo, node, branch, bheads=bheads, opts=opts)
+    ret = orig(repo, node, branch, bheads=bheads, tip=tip, opts=opts)
 
     # logic copy-pasted from cmdutil.commitstatus()
     if opts is None:
--- a/tests/test-amend-patch.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-amend-patch.t	Thu Nov 26 07:40:10 2020 +0100
@@ -666,7 +666,7 @@
   $ hg add bar
   $ HGEDITOR=cat hg amend --patch
   abort: uncommitted changes
-  [255]
+  [20]
 
   $ hg revert --all
   forgetting bar
--- a/tests/test-evolve-abort-orphan.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-evolve-abort-orphan.t	Thu Nov 26 07:40:10 2020 +0100
@@ -56,7 +56,7 @@
 #else
   $ hg abort
   abort: no operation in progress
-  [255]
+  [20]
 #endif
 
 Testing with wrong combination of flags
@@ -101,7 +101,7 @@
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg parents
   changeset:   5:e93a9161a274
@@ -148,7 +148,7 @@
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
   $ echo foo > d
   $ hg resolve -m
   (no more unresolved files)
@@ -176,7 +176,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
 testing that interrupted evolve shows up in morestatus
   $ hg status -v
@@ -288,7 +288,7 @@
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg glog
   o  9:7f8e8bd9f0b6 added c
@@ -353,7 +353,7 @@
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
   $ hg glog
   o  9:7f8e8bd9f0b6 added c
   |   () draft
@@ -431,7 +431,7 @@
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg glog
   o  12:1c476940790a added d
@@ -507,7 +507,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg glog
   @  5:c1f4718020e3 added b
@@ -554,7 +554,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg abort
   evolve aborted
--- a/tests/test-evolve-abort-phasediv.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-evolve-abort-phasediv.t	Thu Nov 26 07:40:10 2020 +0100
@@ -97,7 +97,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
 testing that interrupted evolve shows up in morestatus
   $ hg status -v
@@ -216,7 +216,7 @@
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg abort
   1 new phase-divergent changesets
@@ -286,7 +286,7 @@
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo watwat > c
   $ hg resolve -m
@@ -302,7 +302,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg abort
   1 new phase-divergent changesets
--- a/tests/test-evolve-content-divergent-basic.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-evolve-content-divergent-basic.t	Thu Nov 26 07:40:10 2020 +0100
@@ -344,7 +344,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo foobar > d
   $ hg resolve -m
@@ -404,7 +404,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo watbar > d
   $ hg resolve -m
@@ -615,7 +615,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ cat > a <<EOF
   > jungle
--- a/tests/test-evolve-content-divergent-case-A3.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-evolve-content-divergent-case-A3.t	Thu Nov 26 07:40:10 2020 +0100
@@ -79,7 +79,7 @@
   $ cd ../local
   $ hg pull -qu
   $ hg rebase -r 'desc(C)' -d 'desc(B)'
-  rebasing 3:928c8849ec01 "C" (tip)
+  rebasing 3:928c8849ec01 tip "C"
 
   $ cd ../other
   $ hg pull -qu
--- a/tests/test-evolve-content-divergent-case-A4.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-evolve-content-divergent-case-A4.t	Thu Nov 26 07:40:10 2020 +0100
@@ -84,12 +84,12 @@
   $ cd ../local
   $ hg pull -qu
   $ hg rebase -r 'desc(D)' -d 'desc(C)'
-  rebasing 4:6a418860e87b "D" (tip)
+  rebasing 4:6a418860e87b tip "D"
 
   $ cd ../other
   $ hg pull -qu
   $ hg rebase -r 'desc(D)' -d 'desc(B)'
-  rebasing 4:6a418860e87b "D" (tip)
+  rebasing 4:6a418860e87b tip "D"
   $ hg push -q
 
   $ cd ../local
--- a/tests/test-evolve-content-divergent-interrupted.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-evolve-content-divergent-interrupted.t	Thu Nov 26 07:40:10 2020 +0100
@@ -90,7 +90,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg status -v
   M d
@@ -204,7 +204,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg evolve --abort
   2 new orphan changesets
@@ -274,7 +274,7 @@
       () draft
 
   $ hg rebase -r . -d .^^^ --config extensions.rebase=
-  rebasing 4:c41c793e0ef1 "added d" (tip)
+  rebasing 4:c41c793e0ef1 tip "added d"
   $ echo bar > c
   $ hg add c
   $ hg amend
@@ -312,7 +312,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg evolve --abort
   evolve aborted
@@ -366,7 +366,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg evolve --abort
   evolve aborted
@@ -458,7 +458,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg evolve --stop
   stopped the interrupted evolve
@@ -485,7 +485,7 @@
 ---------------------------------------------------------------------------
 
   $ hg rebase -r . -d .^^^ --config extensions.rebase=
-  rebasing 6:9c1631e352d9 "added d" (tip)
+  rebasing 6:9c1631e352d9 tip "added d"
 
   $ hg glog
   @  7:517d4375cb72 added d
@@ -511,7 +511,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg evolve --stop
   stopped the interrupted evolve
@@ -561,7 +561,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg diff
   diff -r ca1b80f7960a c
--- a/tests/test-evolve-content-divergent-relocation.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-evolve-content-divergent-relocation.t	Thu Nov 26 07:40:10 2020 +0100
@@ -310,7 +310,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo watbar > y
   $ hg resolve -m
@@ -464,7 +464,7 @@
   warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg diff
   diff -r 7411ed2cf7cf y
@@ -494,7 +494,7 @@
   1 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg diff
   diff -r 635c0edd2e45 y
@@ -627,7 +627,7 @@
 
 The first side of the divergence get rebased on top of upstream.
   $ hg rebase -r . -d 'desc("upstream")'
-  rebasing 2:898ddd4443b3 "divergent" (tip)
+  rebasing 2:898ddd4443b3 tip "divergent"
   $ hg --hidden co 2 -q
   updated to hidden changeset 898ddd4443b3
   (hidden revision '898ddd4443b3' was rewritten as: befae6138569)
--- a/tests/test-evolve-content-divergent-stack.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-evolve-content-divergent-stack.t	Thu Nov 26 07:40:10 2020 +0100
@@ -272,7 +272,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
   $ echo c > c
   $ hg res -m
   (no more unresolved files)
@@ -285,7 +285,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
   $ hg diff
   diff -r 5907cbc074a0 c
   --- a/c	Thu Jan 01 00:00:00 1970 +0000
@@ -542,7 +542,7 @@
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo b > b
   $ hg res -m
@@ -555,7 +555,7 @@
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo b > b
   $ hg res -m
@@ -644,7 +644,7 @@
   4 new orphan changesets
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
 As now we have interrupted evolution of stack of content-divergent cset (when
 relocation of "divergent" also included) let's test --abort and --stop 
@@ -745,7 +745,7 @@
   4 new orphan changesets
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg evolve --stop
   2 new orphan changesets
@@ -865,7 +865,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo foo > b
   $ hg res -m
--- a/tests/test-evolve-continue.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-evolve-continue.t	Thu Nov 26 07:40:10 2020 +0100
@@ -60,7 +60,7 @@
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo foo > d
   $ hg resolve -m
@@ -121,7 +121,7 @@
   warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo bar > e
   $ hg resolve -m
@@ -162,7 +162,7 @@
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo foo > b
   $ hg resolve -m
@@ -247,7 +247,7 @@
   warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo foo > f
   $ hg resolve -m
@@ -262,7 +262,7 @@
   warning: conflicts while merging h! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo foo > h
   $ hg resolve -m
@@ -309,7 +309,7 @@
   warning: conflicts while merging g! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo foo > g
   $ hg resolve -m
@@ -358,7 +358,7 @@
   warning: conflicts while merging g! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
   $ echo foo > g
   $ hg resolve -m
   (no more unresolved files)
@@ -425,7 +425,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
 Status mentions file 'b' (copied from 'a') here, even though it wasn't
 affected by the evolved changeset (nor was 'a')
@@ -455,7 +455,7 @@
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
   $ hg st -C
   M a
   A d
--- a/tests/test-evolve-effectflags.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-evolve-effectflags.t	Thu Nov 26 07:40:10 2020 +0100
@@ -128,7 +128,7 @@
   $ mkcommit C0
   $ mkcommit D0
   $ hg rebase -r . -d 'desc(B0)'
-  rebasing 10:c85eff83a034 "D0" (tip)
+  rebasing 10:c85eff83a034 tip "D0"
 
 check result
 
--- a/tests/test-evolve-issue5966.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-evolve-issue5966.t	Thu Nov 26 07:40:10 2020 +0100
@@ -59,7 +59,7 @@
   atop:[4] apricot
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
   $ hg evolve --list
   34a690fcf6ab: banana
     orphan: 7f59f18ca4a9 (obsolete parent)
--- a/tests/test-evolve-issue5967.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-evolve-issue5967.t	Thu Nov 26 07:40:10 2020 +0100
@@ -43,7 +43,7 @@
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo apricot > a
   $ hg resolve --mark a
--- a/tests/test-evolve-issue6097.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-evolve-issue6097.t	Thu Nov 26 07:40:10 2020 +0100
@@ -29,7 +29,7 @@
 Now rebase the successor of 0 on top of 1
 
   $ hg rebase -r . -d 1
-  rebasing 2:32acf8fb1b23 "apricot and coconut" (tip)
+  rebasing 2:32acf8fb1b23 tip "apricot and coconut"
   1 new orphan changesets
 
 Pruning 1 just to get it out of the way
--- a/tests/test-evolve-orphan-merge.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-evolve-orphan-merge.t	Thu Nov 26 07:40:10 2020 +0100
@@ -210,7 +210,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo FOObar > c
   $ hg resolve -m
@@ -266,7 +266,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo foobar > c
   $ hg resolve -m
--- a/tests/test-evolve-orphan-split.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-evolve-orphan-split.t	Thu Nov 26 07:40:10 2020 +0100
@@ -177,7 +177,7 @@
       () draft
 
   $ hg rebase -r . -d 8fa14d15e168
-  rebasing 9:c0fbf8aaf6c4 "added a b c" (tip)
+  rebasing 9:c0fbf8aaf6c4 tip "added a b c"
   $ hg glog
   @  10:7f87764e5b64 added a b c
   |   () draft
--- a/tests/test-evolve-phase-divergence.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-evolve-phase-divergence.t	Thu Nov 26 07:40:10 2020 +0100
@@ -578,7 +578,7 @@
 
   $ cd ../alice
   $ hg rebase -r . -d .^^^
-  rebasing 9:2352021b3785 "added x to x" (bm tip)
+  rebasing 9:2352021b3785 bm tip "added x to x"
 
   $ hg pull ../public
   pulling from ../public
@@ -707,7 +707,7 @@
   $ hg add y
   $ hg ci -m "y to y and foobar to foo"
   $ hg rebase -r . -d .^^^
-  rebasing 12:dc88f5aa9bc9 "y to y and foobar to foo" (tip)
+  rebasing 12:dc88f5aa9bc9 tip "y to y and foobar to foo"
 
   $ echo foo > y
   $ hg amend
@@ -814,7 +814,7 @@
   $ echo l > l
   $ hg ci -Aqm "added l to l"
   $ hg rebase -r . -d .^^^^
-  rebasing 17:f3794e5a91dc "added l to l" (tip)
+  rebasing 17:f3794e5a91dc tip "added l to l"
   $ echo kl > l
   $ echo foo > x
   $ hg add x
@@ -860,7 +860,7 @@
   warning: conflicts while merging x! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg diff
   diff -r 8c2bb6fb44e9 l
--- a/tests/test-evolve-phase.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-evolve-phase.t	Thu Nov 26 07:40:10 2020 +0100
@@ -87,7 +87,7 @@
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg diff
   diff -r 87495ea7c9ec a
--- a/tests/test-evolve-progress.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-evolve-progress.t	Thu Nov 26 07:40:10 2020 +0100
@@ -136,7 +136,7 @@
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
   $ echo resolved > a
   $ hg resolve -m a
   (no more unresolved files)
--- a/tests/test-evolve-public-content-divergent-corner-cases.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Thu Nov 26 07:40:10 2020 +0100
@@ -396,7 +396,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg diff
   diff -r 155349b645be c
@@ -427,7 +427,7 @@
   1 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg sum
   parent: 5:93cd84bbdaca 
@@ -507,7 +507,7 @@
   $ node=`hg log --rev 'desc("c_E")' -T '{node}'`
   $ hg rebase -s $node -d 'desc("c_B")'
   rebasing 5:4ab2719bbab9 "c_E"
-  rebasing 6:77ccbf8d837e "c_F" (tip)
+  rebasing 6:77ccbf8d837e tip "c_F"
   $ hg phase --public tip
   $ hg rebase --hidden -s $node -d 'desc("c_C")' --config experimental.evolution.allowdivergence=yes
   rebasing 5:4ab2719bbab9 "c_E"
--- a/tests/test-evolve-public-content-divergent-discard.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-evolve-public-content-divergent-discard.t	Thu Nov 26 07:40:10 2020 +0100
@@ -273,7 +273,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg diff
   diff -r f7c1071f1e7c ch
@@ -388,7 +388,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo c > c
   $ hg res -m
@@ -494,7 +494,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo dh > dh
   $ hg res -m
@@ -598,7 +598,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo c > c
   $ hg res -m
@@ -612,7 +612,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo dh > dh
   $ hg res -m
--- a/tests/test-evolve-public-content-divergent-main.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-evolve-public-content-divergent-main.t	Thu Nov 26 07:40:10 2020 +0100
@@ -174,7 +174,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo "I am foobar" > b
   $ hg resolve -m --tool union
@@ -361,7 +361,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg diff
   diff -r 155349b645be c
@@ -492,7 +492,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo d > d
   $ hg res -m
@@ -585,7 +585,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg diff
   diff -r 155349b645be c
@@ -620,7 +620,7 @@
   2 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo d > d
   $ hg res -m
--- a/tests/test-evolve-serveronly-legacy.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-evolve-serveronly-legacy.t	Thu Nov 26 07:40:10 2020 +0100
@@ -59,5 +59,5 @@
   abort: remote error:
   incompatible Mercurial client; bundle2 required
   (see https://www.mercurial-scm.org/wiki/IncompatibleClient)
-  [255]
+  [100]
   $ cat ../errors.log
--- a/tests/test-evolve-stop-orphan.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-evolve-stop-orphan.t	Thu Nov 26 07:40:10 2020 +0100
@@ -92,7 +92,7 @@
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg evolve --stop
   stopped the interrupted evolve
@@ -138,7 +138,7 @@
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg diff
   diff -r cb6a2ab625bb d
@@ -200,7 +200,7 @@
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
   $ echo foo > d
   $ hg resolve -m
   (no more unresolved files)
@@ -250,7 +250,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg status
   M c
@@ -288,7 +288,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo foobar > c
   $ hg resolve -m
@@ -364,7 +364,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg evolve --stop
   stopped the interrupted evolve
--- a/tests/test-evolve-stop-phasediv.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-evolve-stop-phasediv.t	Thu Nov 26 07:40:10 2020 +0100
@@ -86,7 +86,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg evolve --stop
   stopped the interrupted evolve
--- a/tests/test-evolve-topic.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-evolve-topic.t	Thu Nov 26 07:40:10 2020 +0100
@@ -338,9 +338,9 @@
 different topic
 
   $ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase=
-  rebasing 16:d2dc89c57700 "add iii" (bar)
+  rebasing 16:d2dc89c57700 bar "add iii"
   1 new orphan changesets
-  rebasing 17:9bf430c106b7 "add jjj" (bar)
+  rebasing 17:9bf430c106b7 bar "add jjj"
   1 new orphan changesets
   $ hg log -Gr 42b49017ff90::
   *  21 - {bar} 7542e76aba2c add jjj (draft)
@@ -428,7 +428,7 @@
   warning: conflicts while merging hhh! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
   $ echo "resolved hhh" > hhh
   $ hg resolve --mark hhh
   (no more unresolved files)
--- a/tests/test-evolve.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-evolve.t	Thu Nov 26 07:40:10 2020 +0100
@@ -628,7 +628,7 @@
   merging 1
   warning: conflicts while merging 1! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts (see hg help resolve)
-  [1]
+  [240]
   $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n'
   7:a5bfd90a2f29 
   $ echo 3 > 1
@@ -1394,7 +1394,7 @@
   warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ glog -r "desc('add unstableifparentisfolded')::" --hidden
   @  33:b9acdb1af6d5@default(draft) will be evolved safely
--- a/tests/test-issue-5720.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-issue-5720.t	Thu Nov 26 07:40:10 2020 +0100
@@ -63,7 +63,7 @@
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
 Fix the conflict
   $ echo c2 > a
--- a/tests/test-obsolete.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-obsolete.t	Thu Nov 26 07:40:10 2020 +0100
@@ -175,7 +175,7 @@
   $ hg init ../other-new
   $ hg phase --draft 'secret() - extinct()' # until we fix exclusion
   abort: empty revision set
-  [255]
+  [10]
   $ hg push ../other-new
   pushing to ../other-new
   searching for changes
--- a/tests/test-pick.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-pick.t	Thu Nov 26 07:40:10 2020 +0100
@@ -90,7 +90,7 @@
 #if abortcommand
   $ hg abort
   abort: no operation in progress
-  [255]
+  [20]
 #endif
 
 Specifying both continue and revs
@@ -197,7 +197,7 @@
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts (see hg help resolve)
-  [1]
+  [240]
 
   $ echo foobar > c
   $ hg resolve --all --mark
@@ -235,7 +235,7 @@
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts (see hg help resolve)
-  [1]
+  [240]
   $ echo foobar > c
   $ hg resolve -m
   (no more unresolved files)
@@ -260,7 +260,7 @@
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts (see hg help resolve)
-  [1]
+  [240]
 
 #if abortcommand
   $ hg abort --dry-run
@@ -320,7 +320,7 @@
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts (see hg help resolve)
-  [1]
+  [240]
 
   $ echo bar > b
   $ hg resolve -m
@@ -459,7 +459,7 @@
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts (see hg help resolve)
-  [1]
+  [240]
   $ hg resolve -t :other a
   (no more unresolved files)
   continue: hg pick --continue
--- a/tests/test-prev-next.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-prev-next.t	Thu Nov 26 07:40:10 2020 +0100
@@ -125,14 +125,14 @@
   $ hg prev
   abort: uncommitted changes
   (do you want --merge?)
-  [255]
+  [20]
   $ hg prev --merge
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   [0] added a
   $ hg next
   abort: uncommitted changes
   (do you want --merge?)
-  [255]
+  [20]
   $ hg next --merge
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   [1] added b
@@ -376,7 +376,7 @@
   $ hg next --evolve
   abort: uncommitted changes
   (use `hg amend`, `hg revert` or `hg shelve`)
-  [255]
+  [20]
 
   $ cd ..
 
@@ -467,7 +467,7 @@
   $ hg prev --config commands.update.check=abort
   abort: uncommitted changes
   (do you want --merge?)
-  [255]
+  [20]
   $ hg prev --merge --config commands.update.check=abort
   file 'bar' was deleted in other [destination] but was modified in local [working copy].
   You can use (c)hanged version, (d)elete, or leave (u)nresolved.
@@ -488,7 +488,7 @@
   $ hg next --config commands.update.check=abort
   abort: uncommitted changes
   (do you want --merge?)
-  [255]
+  [20]
   $ hg next --merge --config commands.update.check=abort
   merging bar
   warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')
--- a/tests/test-prune.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-prune.t	Thu Nov 26 07:40:10 2020 +0100
@@ -265,11 +265,11 @@
   $ mkcommit n1
   created new head
   $ mkcommit n2
-  $ hg --config extensions.strip= --config experimental.prunestrip=True strip -r .
+  $ hg --config experimental.prunestrip=True debugstrip -r .
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory is now at c7e58696a948
   1 changesets pruned
-  $ hg --config extensions.strip= --config experimental.prunestrip=True strip -r . --bundle
+  $ hg --config experimental.prunestrip=True debugstrip -r . --bundle
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/c7e58696a948-69ca36d3-backup.hg (glob)
 
--- a/tests/test-rewind.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-rewind.t	Thu Nov 26 07:40:10 2020 +0100
@@ -1191,10 +1191,10 @@
 
   $ hg rewind --to 'desc("amended")' --hidden
   abort: uncommitted changes
-  [255]
+  [20]
 
 XXX: Unfortunately, even with --keep it's not allowed
 
   $ hg rewind --keep --to 'desc("amended")' --hidden
   abort: uncommitted changes
-  [255]
+  [20]
--- a/tests/test-sharing.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-sharing.t	Thu Nov 26 07:40:10 2020 +0100
@@ -379,7 +379,7 @@
 Alice rebases her draft changeset on top of Bob's public changeset and
 publishes the result.
   $ hg rebase -d 4
-  rebasing 3:3363442626b3 "fix bug 15 (v2)" (bug15)
+  rebasing 3:3363442626b3 bug15 "fix bug 15 (v2)"
   $ hg push ../public
   pushing to ../public
   searching for changes
--- a/tests/test-split.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-split.t	Thu Nov 26 07:40:10 2020 +0100
@@ -138,7 +138,7 @@
   $ echo "_cd" > _c
   $ hg split
   abort: uncommitted changes
-  [255]
+  [20]
   $ hg up "desc(_c)" -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
@@ -382,7 +382,7 @@
   (enter ? for help) [Ynesfdaq?] q
   
   abort: user quit
-  [255]
+  [250]
 
 Running split with tip revision, specified as unnamed argument
   $ hg split --rev . << EOF
@@ -396,7 +396,7 @@
   (enter ? for help) [Ynesfdaq?] q
   
   abort: user quit
-  [255]
+  [250]
 
 Running split with both unnamed and named revision arguments shows an error msg
   $ hg split  --rev . --rev .^ << EOF
@@ -648,7 +648,7 @@
   (enter ? for help) [Ynesfdaq?] q
   
   abort: user quit
-  [255]
+  [250]
 
   $ hg branch
   another-branch
--- a/tests/test-stabilize-conflict.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-stabilize-conflict.t	Thu Nov 26 07:40:10 2020 +0100
@@ -130,7 +130,7 @@
   warning: conflicts while merging babar! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
   $ hg resolve -l
   U babar
   $ hg log -G
@@ -223,7 +223,7 @@
   merging babar failed!
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
   $ hg resolve -l
   U babar
   $ hg log -G
--- a/tests/test-topic-change.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-topic-change.t	Thu Nov 26 07:40:10 2020 +0100
@@ -182,13 +182,13 @@
      Added a  ()
   
   $ hg rebase -s 11 -d 22
-  rebasing 11:1315a3808ed0 "Added d" (foo)
+  rebasing 11:1315a3808ed0 foo "Added d"
   switching to topic foo
-  rebasing 16:edc4a6b9ea60 "Added e" (bar)
+  rebasing 16:edc4a6b9ea60 bar "Added e"
   switching to topic bar
-  rebasing 17:82e0b14f4d9e "Added f" (bar)
-  rebasing 18:e7b418d79a05 "Added g" (bar)
-  rebasing 20:c2d6b7df5dcf "Added h" (foobar)
+  rebasing 17:82e0b14f4d9e bar "Added f"
+  rebasing 18:e7b418d79a05 bar "Added g"
+  rebasing 20:c2d6b7df5dcf foobar "Added h"
   switching to topic foobar
 
   $ hg glog
--- a/tests/test-topic-dest.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-topic-dest.t	Thu Nov 26 07:40:10 2020 +0100
@@ -113,7 +113,7 @@
   switching to topic elephant
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg rebase
-  rebasing 4:cb7ae72f4a80 "babar" (elephant)
+  rebasing 4:cb7ae72f4a80 elephant "babar"
   switching to topic elephant
   $ hg log -G
   @  7 (elephant) babar
@@ -134,7 +134,7 @@
   switching to topic monkey
   1 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ hg rebase
-  rebasing 5:d832ddc604ec "zephir" (monkey)
+  rebasing 5:d832ddc604ec monkey "zephir"
   switching to topic monkey
   $ hg log -G
   @  8 (monkey) zephir
@@ -177,7 +177,7 @@
   o  0 () c_alpha
   
   $ hg rebase
-  rebasing 9:d79a104e2902 "Huc" (tip monkey)
+  rebasing 9:d79a104e2902 tip monkey "Huc"
   $ hg log -G
   @  10 (monkey) Huc
   |
@@ -229,7 +229,7 @@
   switching to topic elephant
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg rebase -d 'desc(c_zeta)' # make sure tip is elsewhere
-  rebasing 7:8d0b77140b05 "babar" (elephant)
+  rebasing 7:8d0b77140b05 elephant "babar"
   switching to topic elephant
   $ hg up monkey
   switching to topic monkey
--- a/tests/test-topic-rebase.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-topic-rebase.t	Thu Nov 26 07:40:10 2020 +0100
@@ -72,7 +72,7 @@
   switching to topic myfeature
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg rebase
-  rebasing 1:39e7a938055e "add feature1" (myfeature)
+  rebasing 1:39e7a938055e myfeature "add feature1"
   switching to topic myfeature
   $ hg stack
   ### topic: myfeature
@@ -123,12 +123,12 @@
   switching to topic myotherfeature
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg rebase
-  rebasing 5:81f854012ec5 "myotherfeature1" (myotherfeature)
+  rebasing 5:81f854012ec5 myotherfeature "myotherfeature1"
   merging file
   warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
   switching to topic myotherfeature
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
-  [1]
+  [240]
 
 Resolve the conflict
   $ echo A2 > file
@@ -137,7 +137,7 @@
   (no more unresolved files)
   continue: hg rebase --continue
   $ hg rebase --continue
-  rebasing 5:81f854012ec5 "myotherfeature1" (myotherfeature)
+  rebasing 5:81f854012ec5 myotherfeature "myotherfeature1"
 
 Check the the commit has the right topic
 
--- a/tests/test-topic-stack-complex.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-topic-stack-complex.t	Thu Nov 26 07:40:10 2020 +0100
@@ -160,7 +160,7 @@
   1 new orphan changesets
   2 new content-divergent changesets
   $ hg rebase -r . -d ec94a1ed1330~1
-  rebasing 9:eb3b16fef8ea "Added e and f" (tip foo)
+  rebasing 9:eb3b16fef8ea tip foo "Added e and f"
   $ hg stack
   ### topic: foo (2 heads)
   ### target: default (branch)
--- a/tests/test-topic-stack.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-topic-stack.t	Thu Nov 26 07:40:10 2020 +0100
@@ -410,8 +410,8 @@
 Make things linear again
 
   $ hg rebase -s 'desc(c_e)' -d 'desc(c_d) - obsolete()'
-  rebasing 4:0f9ac936c87d "c_e" (foo)
-  rebasing 5:6559e6d93aea "c_f" (foo)
+  rebasing 4:0f9ac936c87d foo "c_e"
+  rebasing 5:6559e6d93aea foo "c_f"
   $ hg log -G
   o  8 default {foo} draft c_f
   |
@@ -480,8 +480,8 @@
   $ hg commit --amend -m 'c_D' 
   4 new orphan changesets
   $ hg rebase -d . -s 'desc(c_g)'
-  rebasing 9:81264ae8a36a "c_g" (foo)
-  rebasing 10:fde5f5941642 "c_h" (foo)
+  rebasing 9:81264ae8a36a foo "c_g"
+  rebasing 10:fde5f5941642 foo "c_h"
   $ hg log -G
   o  13 default {foo} draft c_h
   |
@@ -546,8 +546,8 @@
   
 Converting into a linear chain
   $ hg rebase -s 'desc("c_e") - obsolete()' -d 'desc("c_h") - obsolete()'
-  rebasing 7:215bc359096a "c_e" (foo)
-  rebasing 8:ec9267b3f33f "c_f" (foo)
+  rebasing 7:215bc359096a foo "c_e"
+  rebasing 8:ec9267b3f33f foo "c_f"
 
   $ hg log -G
   o  15 default {foo} draft c_f
@@ -593,17 +593,17 @@
   o  0 default {} public c_a
   
   $ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()'
-  rebasing 15:77082e55de88 "c_f" (foo)
+  rebasing 15:77082e55de88 foo "c_f"
   switching to topic foo
   1 new orphan changesets
   switching to topic foobar
   $ hg rebase -s 'desc("c_g") - obsolete()' -d 'desc("c_D") - obsolete()'
-  rebasing 12:0c3e8aed985d "c_g" (foo)
+  rebasing 12:0c3e8aed985d foo "c_g"
   switching to topic foo
-  rebasing 13:b9e4f3709bc5 "c_h" (foo)
-  rebasing 16:4bc813530301 "c_e" (foobar)
+  rebasing 13:b9e4f3709bc5 foo "c_h"
+  rebasing 16:4bc813530301 foobar "c_e"
   switching to topic foobar
-  rebasing 18:4406ea4be852 "c_f" (tip foo)
+  rebasing 18:4406ea4be852 tip foo "c_f"
   switching to topic foo
   switching to topic foobar
   $ hg up
@@ -902,12 +902,12 @@
 get things linear again
 
   $ hg rebase -r s1 -d default
-  rebasing 16:1d84ec948370 "c_D" (tip blue)
+  rebasing 16:1d84ec948370 tip blue "c_D"
   switching to topic blue
   $ hg rebase -r s2 -d s1
-  rebasing 13:3ab2eedae500 "c_G" (blue)
+  rebasing 13:3ab2eedae500 blue "c_G"
   $ hg rebase -r s3 -d s2
-  rebasing 8:3bfe800e0486 "c_I" (blue)
+  rebasing 8:3bfe800e0486 blue "c_I"
   $ hg stack
   ### topic: blue
   ### target: default (branch)
--- a/tests/test-topic-tutorial.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-topic-tutorial.t	Thu Nov 26 07:40:10 2020 +0100
@@ -488,10 +488,10 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg rebase
-  rebasing 1:13900241408b "adding condiments" (food)
+  rebasing 1:13900241408b food "adding condiments"
   merging shopping
   switching to topic food
-  rebasing 2:287de11b401f "adding fruits" (food)
+  rebasing 2:287de11b401f food "adding fruits"
   merging shopping
 
   $ hg log --graph
@@ -1055,12 +1055,12 @@
 #endif
 
   $ hg rebase
-  rebasing 6:183984ef46d1 "Adding hammer" (tools)
+  rebasing 6:183984ef46d1 tools "Adding hammer"
   merging shopping
   switching to topic tools
-  rebasing 7:cffff85af537 "Adding saw" (tools)
+  rebasing 7:cffff85af537 tools "Adding saw"
   merging shopping
-  rebasing 8:34255b455dac "Adding drill" (tools)
+  rebasing 8:34255b455dac tools "Adding drill"
   merging shopping
 
 But what about the other topic? You can use 'hg topics --verbose' to see
@@ -1087,10 +1087,10 @@
 multiple *public* heads it would create on that branch:
 
   $ hg rebase -b drinks
-  rebasing 9:8dfa45bd5e0c "Adding apple juice" (drinks)
+  rebasing 9:8dfa45bd5e0c drinks "Adding apple juice"
   merging shopping
   switching to topic drinks
-  rebasing 10:70dfa201ed73 "Adding orange juice" (drinks)
+  rebasing 10:70dfa201ed73 drinks "Adding orange juice"
   merging shopping
   switching to topic tools
 
@@ -1777,9 +1777,9 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg rebase
-  rebasing 19:d5c51ee5762a "Adding saw" (tools)
+  rebasing 19:d5c51ee5762a tools "Adding saw"
   merging shopping
-  rebasing 20:bae3758e46bf "Adding drill" (tools)
+  rebasing 20:bae3758e46bf tools "Adding drill"
   merging shopping
 
   $ hg stack
--- a/tests/test-topic.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-topic.t	Thu Nov 26 07:40:10 2020 +0100
@@ -271,16 +271,16 @@
 
   $ hg topic '.'
   abort: the name '.' is reserved
-  [255]
+  [10]
   $ hg topic null
   abort: the name 'null' is reserved
-  [255]
+  [10]
   $ hg topic tip
   abort: the name 'tip' is reserved
-  [255]
+  [10]
   $ hg topic 12345
   abort: cannot use an integer as a name
-  [255]
+  [10]
   $ hg topic '   '
   abort: topic name cannot consist entirely of whitespaces
   [255]
@@ -317,7 +317,7 @@
   HG: branch 'default'
   HG: changed alpha
   abort: empty commit message
-  [255]
+  [10]
   $ hg revert alpha
   $ hg topic
    * topicflag (0 changesets)
--- a/tests/test-uncommit-interactive.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-uncommit-interactive.t	Thu Nov 26 07:40:10 2020 +0100
@@ -45,7 +45,7 @@
   (enter ? for help) [Ynesfdaq?] q
   
   abort: user quit
-  [255]
+  [250]
   $ hg status
 
 Make a commit with multiple hunks
--- a/tests/test-unstability-resolution-result.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-unstability-resolution-result.t	Thu Nov 26 07:40:10 2020 +0100
@@ -92,7 +92,7 @@
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
   $ hg revert -r "orphan()" a
   $ hg diff
   diff -r 66719795a494 a
--- a/tests/test-wireproto.t	Mon Nov 23 13:43:29 2020 +0800
+++ b/tests/test-wireproto.t	Thu Nov 26 07:40:10 2020 +0100
@@ -202,7 +202,7 @@
 
   $ hg debugpushkey http://localhost:$HGPORT/ obsolete
   abort: HTTP Error 410: won't exchange obsmarkers through pushkey
-  [255]
+  [100]
   $ cat errors.log
   $ hg debugpushkey ssh://user@dummy/server obsolete
   remote: abort: won't exchange obsmarkers through pushkey