# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2020-10-27 22:33:15
# Node ID f90a5c211251410ba5c7425c56a7902b4559d61d
# Parent  96fcc37a9c80784f6cea635c4b4dc44f6c10ee46

rebase: change and standarize template for rebase's one-line summary

This removes the default template in rebase and switches to a
centrally defined template. I've simplified it a bit to avoid the
conditional parenthesis. I've also added labels so the different parts
can be easily colored. The template is somewhat similar to what we've
used internally at Google for a few years.

I'm happy to change the template if others have opinions. Should we
reuse the `color.log.` names as I have?

Differential Revision: https://phab.mercurial-scm.org/D9252

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -146,13 +146,8 @@ def _revsetdestautoorphanrebase(repo, su
 
 def _ctxdesc(ctx):
     """short description for a context"""
-    labels_spec = b'join(filter(namespaces % "{ifeq(namespace, "branches", "", join(names, " "))}"), " ")'
-    spec = b'{rev}:{node|short} "{desc|firstline}"{if(%s, " ({%s})")}' % (
-        labels_spec,
-        labels_spec,
-    )
     return cmdutil.format_changeset_summary(
-        ctx.repo().ui, ctx, command=b'rebase', default_spec=spec
+        ctx.repo().ui, ctx, command=b'rebase'
     )
 
 
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -1222,8 +1222,16 @@ def format_changeset_summary(ui, ctx, co
     if not spec:
         spec = default_spec
     if not spec:
-        # TODO: Pick a default we can agree on. This isn't used yet.
-        raise error.ProgrammingError(b"no default one-line summary defined yet")
+        spec = (
+            b'{separate(" ", '
+            b'label("log.changeset", "{rev}:{node|short}")'
+            b', '
+            b'label("log.tag", tags)'
+            b', '
+            b'label("log.bookmark", bookmarks)'
+            b')} '
+            b'"{label("log.desc", desc|firstline)}"'
+        )
     text = rendertemplate(ctx, spec)
     return text.split(b'\n')[0]
 
diff --git a/tests/test-absorb-unfinished.t b/tests/test-absorb-unfinished.t
--- a/tests/test-absorb-unfinished.t
+++ b/tests/test-absorb-unfinished.t
@@ -17,7 +17,7 @@ Abort absorb if there is an unfinished o
   $ hg commit -Aqm "foo 2"
 
   $ hg --config extensions.rebase= rebase -r 1 -d 0
-  rebasing 1:c3b6dc0e177a "foo 2" (tip)
+  rebasing 1:c3b6dc0e177a tip "foo 2"
   merging foo.whole
   warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
diff --git a/tests/test-audit-path.t b/tests/test-audit-path.t
--- a/tests/test-audit-path.t
+++ b/tests/test-audit-path.t
@@ -177,7 +177,7 @@ and the rebase should fail (issue5628)
 
   $ hg up -qC 2
   $ hg rebase -s 2 -d 1 --config extensions.rebase=
-  rebasing 2:e73c21d6b244 "file a/poisoned" (tip)
+  rebasing 2:e73c21d6b244 tip "file a/poisoned"
   abort: path 'a/poisoned' traverses symbolic link 'a'
   [255]
   $ ls ../merge-symlink-out
diff --git a/tests/test-bookmarks-rebase.t b/tests/test-bookmarks-rebase.t
--- a/tests/test-bookmarks-rebase.t
+++ b/tests/test-bookmarks-rebase.t
@@ -37,7 +37,7 @@ bookmark list
 rebase
 
   $ hg rebase -s two -d one
-  rebasing 3:2ae46b1d99a7 "3" (two tip)
+  rebasing 3:2ae46b1d99a7 tip two "3"
   saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg
 
   $ hg log
@@ -77,7 +77,7 @@ aborted rebase should restore active boo
   created new head
   $ hg bookmark three
   $ hg rebase -s three -d two
-  rebasing 4:dd7c838e8362 "4" (three tip)
+  rebasing 4:dd7c838e8362 tip three "4"
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -92,7 +92,7 @@ aborted rebase should restore active boo
 after aborted rebase, restoring a bookmark that has been removed should not fail
 
   $ hg rebase -s three -d two
-  rebasing 4:dd7c838e8362 "4" (three tip)
+  rebasing 4:dd7c838e8362 tip three "4"
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
diff --git a/tests/test-copies-in-changeset.t b/tests/test-copies-in-changeset.t
--- a/tests/test-copies-in-changeset.t
+++ b/tests/test-copies-in-changeset.t
@@ -344,7 +344,7 @@ Test rebasing a commit with copy informa
   $ hg mv a b
   $ hg ci -qm 'rename a to b'
   $ hg rebase -d 1 --config rebase.experimental.inmemory=yes
-  rebasing 2:* "rename a to b" (tip) (glob)
+  rebasing 2:* tip "rename a to b" (glob)
   merging a and b to b
   saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/*-*-rebase.hg (glob)
   $ hg st --change . --copies
diff --git a/tests/test-copies.t b/tests/test-copies.t
--- a/tests/test-copies.t
+++ b/tests/test-copies.t
@@ -625,8 +625,8 @@ merging csets is a descendant of the bas
      a
 
   $ hg rebase -r . -d 2 -t :other
-  rebasing 5:5018b1509e94 "added willconflict and d" (tip) (no-changeset !)
-  rebasing 5:af8d273bf580 "added willconflict and d" (tip) (changeset !)
+  rebasing 5:5018b1509e94 tip "added willconflict and d" (no-changeset !)
+  rebasing 5:af8d273bf580 tip "added willconflict and d" (changeset !)
 
   $ hg up 3 -q
   $ hg l --hidden
diff --git a/tests/test-copy-move-merge.t b/tests/test-copy-move-merge.t
--- a/tests/test-copy-move-merge.t
+++ b/tests/test-copy-move-merge.t
@@ -137,7 +137,7 @@ first verify copy metadata was kept
 
   $ hg up -qC 2
   $ hg rebase --keep -d 1 -b 2 --config extensions.rebase=
-  rebasing 2:add3f11052fa "other" (tip)
+  rebasing 2:add3f11052fa tip "other"
   merging b and a to b
   merging c and a to c
 
@@ -156,7 +156,7 @@ first verify copy metadata was kept
   $ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.copytrace=off --config ui.interactive=True << EOF
   > c
   > EOF
-  rebasing 2:add3f11052fa "other" (tip)
+  rebasing 2:add3f11052fa tip "other"
   file 'a' was deleted in local [dest] but was modified in other [source].
   You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
   What do you want to do? c
@@ -238,7 +238,7 @@ A file is copied on one side and has bee
 file is copied from `0:a`, so the file history of the `3:b` should trace directly to `0:a`.
 
   $ hg rebase -d 2 -s 3 --config extensions.rebase= --config experimental.copytrace=off
-  rebasing 3:47e1a9e6273b "copy a->b (2)" (tip)
+  rebasing 3:47e1a9e6273b tip "copy a->b (2)"
   saved backup bundle to $TESTTMP/copydisable3/.hg/strip-backup/47e1a9e6273b-2d099c59-rebase.hg
 
   $ hg log -G -f b
diff --git a/tests/test-copytrace-heuristics.t b/tests/test-copytrace-heuristics.t
--- a/tests/test-copytrace-heuristics.t
+++ b/tests/test-copytrace-heuristics.t
@@ -54,7 +54,7 @@ Check filename heuristics (same dirname 
      desc: initial
 
   $ hg rebase -s . -d 1
-  rebasing 2:557f403c0afd "mod a, mod dir/file.txt" (tip)
+  rebasing 2:557f403c0afd tip "mod a, mod dir/file.txt"
   merging b and a to b
   merging dir2/file.txt and dir/file.txt to dir2/file.txt
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/557f403c0afd-9926eeff-rebase.hg
@@ -87,7 +87,7 @@ Make sure filename heuristics do not whe
      desc: initial
 
   $ hg rebase -s . -d 1
-  rebasing 2:d526312210b9 "mode a" (tip)
+  rebasing 2:d526312210b9 tip "mode a"
   file 'a' was deleted in local [dest] but was modified in other [source].
   You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
   What do you want to do? u
@@ -126,7 +126,7 @@ Test when lca didn't modified the file t
      desc: initial
 
   $ hg rebase -s . -d 2
-  rebasing 3:9d5cf99c3d9f "mod a" (tip)
+  rebasing 3:9d5cf99c3d9f tip "mod a"
   merging b and a to b
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9d5cf99c3d9f-f02358cc-rebase.hg
   $ cd ..
@@ -161,7 +161,7 @@ Rebase "backwards"
      desc: initial
 
   $ hg rebase -s . -d 0
-  rebasing 3:fbe97126b396 "mod b" (tip)
+  rebasing 3:fbe97126b396 tip "mod b"
   merging a and b to a
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fbe97126b396-cf5452a1-rebase.hg
   $ cd ..
@@ -198,7 +198,7 @@ Check a few potential move candidates
      desc: initial
 
   $ hg rebase -s . -d 2
-  rebasing 3:6b2f4cece40f "mod dir/a" (tip)
+  rebasing 3:6b2f4cece40f tip "mod dir/a"
   merging dir/b and dir/a to dir/b
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/6b2f4cece40f-503efe60-rebase.hg
   $ cd ..
@@ -243,7 +243,7 @@ Test the copytrace.movecandidateslimit w
 With small limit
 
   $ hg rebase -s 2 -d 1 --config experimental.copytrace.movecandidateslimit=0
-  rebasing 2:ef716627c70b "mod a" (tip)
+  rebasing 2:ef716627c70b tip "mod a"
   skipping copytracing for 'a', more candidates than the limit: 7
   file 'a' was deleted in local [dest] but was modified in other [source].
   You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
@@ -257,7 +257,7 @@ With small limit
 With default limit which is 100
 
   $ hg rebase -s 2 -d 1
-  rebasing 2:ef716627c70b "mod a" (tip)
+  rebasing 2:ef716627c70b tip "mod a"
   merging foo and a to foo
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg
 
@@ -323,7 +323,7 @@ Move a directory in draft branch
      desc: initial
 
   $ hg rebase -s . -d 1
-  rebasing 2:a33d80b6e352 "mv dir/ dir2/" (tip)
+  rebasing 2:a33d80b6e352 tip "mv dir/ dir2/"
   merging dir/a and dir2/a to dir2/a
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a33d80b6e352-fecb9ada-rebase.hg
   $ cd ..
@@ -358,7 +358,7 @@ Move file twice and rebase mod on top of
   o  rev: 0
      desc: initial
   $ hg rebase -s . -d 2
-  rebasing 3:d41316942216 "mod a" (tip)
+  rebasing 3:d41316942216 tip "mod a"
   merging c and a to c
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d41316942216-2b5949bc-rebase.hg
 
@@ -431,7 +431,7 @@ Move one file and add another file in th
      desc: initial
 
   $ hg rebase -s . -d 2
-  rebasing 3:ef716627c70b "mod a" (tip)
+  rebasing 3:ef716627c70b tip "mod a"
   merging b and a to b
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg
   $ ls -A
@@ -504,7 +504,7 @@ Copy and move file
      desc: initial
 
   $ hg rebase -s . -d 1
-  rebasing 2:ef716627c70b "mod a" (tip)
+  rebasing 2:ef716627c70b tip "mod a"
   merging b and a to b
   merging c and a to c
   saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg
@@ -631,7 +631,7 @@ File directory and base name changed in 
      desc: initial
 
   $ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100
-  rebasing 2:6207d2d318e7 "mod a" (tip)
+  rebasing 2:6207d2d318e7 tip "mod a"
   merging dir2/b and dir1/a to dir2/b
   saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/6207d2d318e7-1c9779ad-rebase.hg
   $ cat dir2/b
@@ -669,7 +669,7 @@ in other merge parent. File moved on reb
      desc: initial
 
   $ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100
-  rebasing 2:e8919e7df8d0 "mv dir1 dir2" (tip)
+  rebasing 2:e8919e7df8d0 tip "mv dir1 dir2"
   saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/e8919e7df8d0-f62fab62-rebase.hg
   $ ls dir2
   a
diff --git a/tests/test-dirstate-race.t b/tests/test-dirstate-race.t
--- a/tests/test-dirstate-race.t
+++ b/tests/test-dirstate-race.t
@@ -225,7 +225,7 @@ the merge tool goes to /dev/null because
   > EOF
 
   $ hg rebase -s . -d 3 --tool test
-  rebasing 4:b08445fd6b2a "c4" (tip)
+  rebasing 4:b08445fd6b2a tip "c4"
   merging a
   custom merge tool
   custom merge tool end
diff --git a/tests/test-fix.t b/tests/test-fix.t
--- a/tests/test-fix.t
+++ b/tests/test-fix.t
@@ -865,7 +865,7 @@ fixing the working directory if there ar
   $ hg commit -Aqm "foo 2"
 
   $ hg --config extensions.rebase= rebase -r 1 -d 0
-  rebasing 1:c3b6dc0e177a "foo 2" (tip)
+  rebasing 1:c3b6dc0e177a tip "foo 2"
   merging foo.whole
   warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
diff --git a/tests/test-infinitepush-ci.t b/tests/test-infinitepush-ci.t
--- a/tests/test-infinitepush-ci.t
+++ b/tests/test-infinitepush-ci.t
@@ -356,7 +356,7 @@ enabling obsmarkers and rebase extension
 
   $ hg phase -r . --draft --force
   $ hg rebase -r 6 -d 3
-  rebasing 6:9b42578d4447 "added f" (tip)
+  rebasing 6:9b42578d4447 tip "added f"
 
   $ hg glog
   @  7:99949238d9ac added f
diff --git a/tests/test-largefiles-update.t b/tests/test-largefiles-update.t
--- a/tests/test-largefiles-update.t
+++ b/tests/test-largefiles-update.t
@@ -307,7 +307,7 @@ automated commit like rebase/transplant
 
   $ hg rebase -s 1 -d 2 --keep
   rebasing 1:72518492caa6 "#1"
-  rebasing 4:07d6153b5c04 "#4" (tip)
+  rebasing 4:07d6153b5c04 tip "#4"
 
   $ hg status -A large1
   large1: $ENOENT$
diff --git a/tests/test-narrow-copies.t b/tests/test-narrow-copies.t
--- a/tests/test-narrow-copies.t
+++ b/tests/test-narrow-copies.t
@@ -70,5 +70,5 @@ create full repo
   $ echo new > inside/f5
   $ hg ci -Aqm 'add inside/f5'
   $ hg --config extensions.rebase= rebase -d 'public()' -r .
-  rebasing 6:610b60178c28 "add inside/f5" (tip)
+  rebasing 6:610b60178c28 tip "add inside/f5"
   saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/610b60178c28-65716a78-rebase.hg
diff --git a/tests/test-narrow-rebase.t b/tests/test-narrow-rebase.t
--- a/tests/test-narrow-rebase.t
+++ b/tests/test-narrow-rebase.t
@@ -61,7 +61,7 @@ Can rebase onto commit where no files ou
   $ echo modified > inside/f2
   $ hg ci -qm 'modify inside/f2'
   $ hg rebase -d 'desc("modify inside/f1")'
-  rebasing 5:c2f36d04e05d "modify inside/f2" (tip)
+  rebasing 5:c2f36d04e05d tip "modify inside/f2"
   saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob)
 
 Can rebase onto conflicting changes inside narrow spec
@@ -70,14 +70,14 @@ Can rebase onto conflicting changes insi
   $ echo conflicting > inside/f1
   $ hg ci -qm 'conflicting inside/f1'
   $ hg rebase -d 'desc("modify inside/f1")' 2>&1 | egrep -v '(warning:|incomplete!)'
-  rebasing 6:cdce97fbf653 "conflicting inside/f1" (tip)
+  rebasing 6:cdce97fbf653 tip "conflicting inside/f1"
   merging inside/f1
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
   $ echo modified3 > inside/f1
   $ hg resolve -m 2>&1 | grep -v continue:
   (no more unresolved files)
   $ hg continue
-  rebasing 6:cdce97fbf653 "conflicting inside/f1" (tip)
+  rebasing 6:cdce97fbf653 tip "conflicting inside/f1"
   saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob)
 
 Can rebase onto non-conflicting changes outside narrow spec
@@ -86,7 +86,7 @@ Can rebase onto non-conflicting changes 
   $ echo modified > inside/f2
   $ hg ci -qm 'modify inside/f2'
   $ hg rebase -d 'desc("modify outside/f1")'
-  rebasing 7:c2f36d04e05d "modify inside/f2" (tip)
+  rebasing 7:c2f36d04e05d tip "modify inside/f2"
   saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob)
 
 Rebase interrupts on conflicting changes outside narrow spec
diff --git a/tests/test-obsmarkers-effectflag.t b/tests/test-obsmarkers-effectflag.t
--- a/tests/test-obsmarkers-effectflag.t
+++ b/tests/test-obsmarkers-effectflag.t
@@ -76,7 +76,7 @@ rebase (parents change)
   $ mkcommit C0
   $ mkcommit D0
   $ hg rebase -r . -d 'desc(B0)'
-  rebasing 10:c85eff83a034 "D0" (tip)
+  rebasing 10:c85eff83a034 tip "D0"
 
 check result
 
diff --git a/tests/test-rebase-abort.t b/tests/test-rebase-abort.t
--- a/tests/test-rebase-abort.t
+++ b/tests/test-rebase-abort.t
@@ -78,7 +78,7 @@ Conflicting rebase:
 
   $ hg rebase -s 3 -d 2
   rebasing 3:3163e20567cc "L1"
-  rebasing 4:46f0b057b5c0 "L2" (tip)
+  rebasing 4:46f0b057b5c0 tip "L2"
   merging common
   warning: conflicts while merging common! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -145,7 +145,7 @@ earlier than 2.7 by renaming ".hg/rebase
 
   $ hg rebase -s 3 -d 2
   rebasing 3:3163e20567cc "L1"
-  rebasing 4:46f0b057b5c0 "L2" (tip)
+  rebasing 4:46f0b057b5c0 tip "L2"
   merging common
   warning: conflicts while merging common! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -215,7 +215,7 @@ Rebase and abort without generating new 
   $ hg rebase -b 4 -d 2
   rebasing 3:a6484957d6b9 "B bis"
   note: not rebasing 3:a6484957d6b9 "B bis", its destination already has all its changes
-  rebasing 4:145842775fec "C1" (tip)
+  rebasing 4:145842775fec tip "C1"
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -274,7 +274,7 @@ rebase abort should not leave working co
   
 
   $ hg rebase -d master -r foo
-  rebasing 3:6c0f977a22d8 "C" (foo tip)
+  rebasing 3:6c0f977a22d8 tip foo "C"
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -314,7 +314,7 @@ user has somehow managed to update to a 
   created new head
 
   $ hg rebase -d @ -b foo --tool=internal:fail
-  rebasing 2:070cf4580bb5 "b2" (foo tip)
+  rebasing 2:070cf4580bb5 tip foo "b2"
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
   [1]
 
diff --git a/tests/test-rebase-base-flag.t b/tests/test-rebase-base-flag.t
--- a/tests/test-rebase-base-flag.t
+++ b/tests/test-rebase-base-flag.t
@@ -36,9 +36,9 @@ Single branching point, without merge:
   >   |
   >   R
   > EOS
-  rebasing 3:d6003a550c2c "C" (C)
-  rebasing 5:4526cf523425 "D" (D)
-  rebasing 6:b296604d9846 "E" (E tip)
+  rebasing 3:d6003a550c2c C "C"
+  rebasing 5:4526cf523425 D "D"
+  rebasing 6:b296604d9846 E tip "E"
   o  6: 4870f5e7df37 E
   |
   | o  5: dc999528138a D
@@ -66,9 +66,9 @@ Multiple branching points caused by sele
   >   |
   >   R
   > EOS
-  rebasing 2:c1e6b162678d "B" (B)
-  rebasing 3:d6003a550c2c "C" (C)
-  rebasing 6:54c8f00cb91c "E" (E tip)
+  rebasing 2:c1e6b162678d B "B"
+  rebasing 3:d6003a550c2c C "C"
+  rebasing 6:54c8f00cb91c E tip "E"
   o    6: 00598421b616 E
   |\
   | o  5: 6b3e11729672 C
@@ -94,8 +94,8 @@ Rebase should not extend the "--base" re
   >   |
   >   R
   > EOS
-  rebasing 2:c1e6b162678d "B" (B)
-  rebasing 5:54c8f00cb91c "E" (E tip)
+  rebasing 2:c1e6b162678d B "B"
+  rebasing 5:54c8f00cb91c E tip "E"
   o    5: e583bf3ff54c E
   |\
   | o  4: 85260910e847 B
@@ -119,9 +119,9 @@ Rebase should not simplify the "--base" 
   >   |
   >   R
   > EOS
-  rebasing 2:c1e6b162678d "B" (B)
-  rebasing 3:d6003a550c2c "C" (C)
-  rebasing 5:54c8f00cb91c "E" (E tip)
+  rebasing 2:c1e6b162678d B "B"
+  rebasing 3:d6003a550c2c C "C"
+  rebasing 5:54c8f00cb91c E tip "E"
   o    5: 00598421b616 E
   |\
   | o  4: 6b3e11729672 C
@@ -167,12 +167,12 @@ Multiple branching points caused by mult
   >   |
   >   R
   > EOS
-  rebasing 3:a113dbaa660a "B1" (B1)
-  rebasing 5:06ce7b1cc8c2 "B2" (B2)
-  rebasing 6:0ac98cce32d3 "C1" (C1)
-  rebasing 8:781512f5e33d "C2" (C2)
-  rebasing 9:428d8c18f641 "E1" (E1)
-  rebasing 11:e1bf82f6b6df "E2" (E2)
+  rebasing 3:a113dbaa660a B1 "B1"
+  rebasing 5:06ce7b1cc8c2 B2 "B2"
+  rebasing 6:0ac98cce32d3 C1 "C1"
+  rebasing 8:781512f5e33d C2 "C2"
+  rebasing 9:428d8c18f641 E1 "E1"
+  rebasing 11:e1bf82f6b6df E2 "E2"
   o  12: e4a37b6fdbd2 E2
   |
   o  11: 9675bea983df E1
@@ -210,19 +210,19 @@ Multiple branching points with multiple 
   >  \|/  |/  |/
   >   A   A   A
   > EOS
-  rebasing 2:dc0947a82db8 "C" (C)
-  rebasing 8:4e4f9194f9f1 "D" (D)
-  rebasing 9:03ca77807e91 "E" (E)
-  rebasing 10:afc707c82df0 "F" (F)
-  rebasing 13:690dfff91e9e "G" (G)
-  rebasing 14:2893b886bb10 "H" (H)
-  rebasing 3:08ebfeb61bac "I" (I)
-  rebasing 4:a0a5005cec67 "J" (J)
-  rebasing 5:83780307a7e8 "K" (K)
-  rebasing 6:e131637a1cb6 "L" (L)
-  rebasing 11:d1f6d0c3c7e4 "M" (M)
-  rebasing 12:7aaec6f81888 "N" (N)
-  rebasing 15:325bc8f1760d "P" (P tip)
+  rebasing 2:dc0947a82db8 C "C"
+  rebasing 8:4e4f9194f9f1 D "D"
+  rebasing 9:03ca77807e91 E "E"
+  rebasing 10:afc707c82df0 F "F"
+  rebasing 13:690dfff91e9e G "G"
+  rebasing 14:2893b886bb10 H "H"
+  rebasing 3:08ebfeb61bac I "I"
+  rebasing 4:a0a5005cec67 J "J"
+  rebasing 5:83780307a7e8 K "K"
+  rebasing 6:e131637a1cb6 L "L"
+  rebasing 11:d1f6d0c3c7e4 M "M"
+  rebasing 12:7aaec6f81888 N "N"
+  rebasing 15:325bc8f1760d P tip "P"
   o    15: 6ef6a0ea3b18 P
   |\
   | o    14: 20ba3610a7e5 N
@@ -268,13 +268,13 @@ Slightly more complex merge case (mentio
   > |
   > M0
   > EOF
-  rebasing 4:8817fae53c94 "C0" (C0)
-  rebasing 6:06ca5dfe3b5b "B2" (B2)
-  rebasing 7:73508237b032 "C1" (C1)
-  rebasing 9:fdb955e2faed "A2" (A2)
-  rebasing 11:4e449bd1a643 "A3" (A3)
-  rebasing 10:0a33b0519128 "B1" (B1)
-  rebasing 12:209327807c3a "B3" (B3 tip)
+  rebasing 4:8817fae53c94 C0 "C0"
+  rebasing 6:06ca5dfe3b5b B2 "B2"
+  rebasing 7:73508237b032 C1 "C1"
+  rebasing 9:fdb955e2faed A2 "A2"
+  rebasing 11:4e449bd1a643 A3 "A3"
+  rebasing 10:0a33b0519128 B1 "B1"
+  rebasing 12:209327807c3a B3 tip "B3"
   o    12: ceb984566332 B3
   |\
   | o  11: 19d93caac497 B1
@@ -318,8 +318,8 @@ Multiple roots. Roots are ancestors of d
   >  \|\|
   >   C A
   > EOF
-  rebasing 2:112478962961 "B" (B)
-  rebasing 3:b70f76719894 "D" (D)
+  rebasing 2:112478962961 B "B"
+  rebasing 3:b70f76719894 D "D"
   o  4: 511efad7bf13 D
   |
   | o  3: 25c4e279af62 B
@@ -349,8 +349,8 @@ Multiple roots. One root is not an ances
   >  \|\|
   >   A C
   > EOF
-  rebasing 2:f675d5a1c6a4 "B" (B)
-  rebasing 5:f68696fe6af8 "E" (E tip)
+  rebasing 2:f675d5a1c6a4 B "B"
+  rebasing 5:f68696fe6af8 E tip "E"
   o    5: f6e6f5081554 E
   |\
   | o    4: 30cabcba27be B
@@ -370,8 +370,8 @@ Multiple roots. Two children share two p
   >  \|\|\
   >   A C A
   > EOF
-  rebasing 2:f675d5a1c6a4 "B" (B)
-  rebasing 3:c2a779e13b56 "D" (D)
+  rebasing 2:f675d5a1c6a4 B "B"
+  rebasing 3:c2a779e13b56 D "D"
   o    4: 5eecd056b5f8 D
   |\
   +---o  3: 30cabcba27be B
diff --git a/tests/test-rebase-bookmarks.t b/tests/test-rebase-bookmarks.t
--- a/tests/test-rebase-bookmarks.t
+++ b/tests/test-rebase-bookmarks.t
@@ -75,7 +75,7 @@ Test deleting divergent bookmarks from d
   o  0: 1994f17a630e 'A' bookmarks: Y@diverge
   
   $ hg rebase -s Y -d 3
-  rebasing 2:49cb3485fa0c "C" (Y Z)
+  rebasing 2:49cb3485fa0c Y Z "C"
   saved backup bundle to $TESTTMP/a1/.hg/strip-backup/49cb3485fa0c-126f3e97-rebase.hg
 
   $ hg tglog
@@ -97,7 +97,7 @@ Do not try to keep active but deleted di
   $ hg book W@diverge
 
   $ hg rebase -s W -d .
-  rebasing 3:41acb9dca9eb "D" (W tip)
+  rebasing 3:41acb9dca9eb tip W "D"
   saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-b35a6a63-rebase.hg
 
   $ hg bookmarks
@@ -115,8 +115,8 @@ Keep bookmarks to the correct rebased ch
   $ hg up -q Z
 
   $ hg rebase -s 1 -d 3
-  rebasing 1:6c81ed0049f8 "B" (X)
-  rebasing 2:49cb3485fa0c "C" (Y Z)
+  rebasing 1:6c81ed0049f8 X "B"
+  rebasing 2:49cb3485fa0c Y Z "C"
   saved backup bundle to $TESTTMP/a2/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg
 
   $ hg tglog
@@ -138,8 +138,8 @@ Keep active bookmark on the correct chan
   $ hg up -q X
 
   $ hg rebase -d W
-  rebasing 1:6c81ed0049f8 "B" (X)
-  rebasing 2:49cb3485fa0c "C" (Y Z)
+  rebasing 1:6c81ed0049f8 X "B"
+  rebasing 2:49cb3485fa0c Y Z "C"
   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg
 
   $ hg tglog
@@ -169,7 +169,7 @@ rebase --continue with bookmarks present
   $ hg up 3
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg rebase --dest 4
-  rebasing 3:3d5fa227f4b5 "C" (Y Z)
+  rebasing 3:3d5fa227f4b5 Y Z "C"
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -179,7 +179,7 @@ rebase --continue with bookmarks present
   (no more unresolved files)
   continue: hg rebase --continue
   $ hg rebase --continue
-  rebasing 3:3d5fa227f4b5 "C" (Y Z)
+  rebasing 3:3d5fa227f4b5 Y Z "C"
   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-c6ea2371-rebase.hg
   $ hg tglog
   @  4: 45c0f0ec1203 'C' bookmarks: Y Z
@@ -209,7 +209,7 @@ as --rev arguments (issue3950)
   $ hg rebase -r '"bisect"^^::"bisect"^' -r bisect -d Z
   rebasing 5:345c90f326a4 "bisect"
   rebasing 6:f677a2907404 "bisect2"
-  rebasing 7:325c16001345 "bisect3" (bisect tip)
+  rebasing 7:325c16001345 tip bisect "bisect3"
   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-b4840586-rebase.hg
 
 Bookmark and working parent get moved even if --keep is set (issue5682)
@@ -232,7 +232,7 @@ Bookmark and working parent get moved ev
   o  0: 426bada5c675 'A' bookmarks: A
   
   $ hg rebase -r B -d C --keep
-  rebasing 1:112478962961 "B" (B)
+  rebasing 1:112478962961 B "B"
   $ hg tglog
   @  3: 9769fc65c4c5 'B' bookmarks: B
   |
diff --git a/tests/test-rebase-cache.t b/tests/test-rebase-cache.t
--- a/tests/test-rebase-cache.t
+++ b/tests/test-rebase-cache.t
@@ -165,7 +165,7 @@ Rebase head of branch3 (8) onto branch2 
   o  0: 'A'
   
   $ hg rebase -s 8 -d 6
-  rebasing 8:4666b71e8e32 "F" (tip)
+  rebasing 8:4666b71e8e32 tip "F"
   saved backup bundle to $TESTTMP/a2/.hg/strip-backup/4666b71e8e32-fc1c4e96-rebase.hg
 
   $ hg branches
@@ -232,7 +232,7 @@ Rebase entire branch3 (7-8) onto branch2
   $ hg rebase -s 7 -d 6
   rebasing 7:653b9feb4616 "branch3"
   note: not rebasing 7:653b9feb4616 "branch3", its destination already has all its changes
-  rebasing 8:4666b71e8e32 "F" (tip)
+  rebasing 8:4666b71e8e32 tip "F"
   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-3c88de16-rebase.hg
 
   $ hg branches
@@ -478,6 +478,6 @@ Turn most changeset public
   $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --dest 7 --source 5 -e
   rebasing 5:361a99976cc9 "F"
   HGEDITFORM=rebase.merge
-  rebasing 8:326cfedc031c "I" (tip)
+  rebasing 8:326cfedc031c tip "I"
   HGEDITFORM=rebase.normal
   saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/361a99976cc9-35e980d0-rebase.hg
diff --git a/tests/test-rebase-check-restore.t b/tests/test-rebase-check-restore.t
--- a/tests/test-rebase-check-restore.t
+++ b/tests/test-rebase-check-restore.t
@@ -123,7 +123,7 @@ Rebase F onto E - check keepbranches:
   o  0:draft 'A'
   
   $ hg rebase -s 5 -d 4 --keepbranches
-  rebasing 5:01e6ebbd8272 "F" (tip)
+  rebasing 5:01e6ebbd8272 tip "F"
   merging A
   warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -137,7 +137,7 @@ Solve the conflict and go on:
   (no more unresolved files)
   continue: hg rebase --continue
   $ hg rebase --continue
-  rebasing 5:01e6ebbd8272 "F" (tip)
+  rebasing 5:01e6ebbd8272 tip "F"
   saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-6fd3a015-rebase.hg
 
   $ hg tglog
diff --git a/tests/test-rebase-collapse.t b/tests/test-rebase-collapse.t
--- a/tests/test-rebase-collapse.t
+++ b/tests/test-rebase-collapse.t
@@ -35,9 +35,9 @@ Highest phase of source commits is used:
   > echo "edited manually" >> \$1
   > EOF
   $ HGEDITOR="sh $TESTTMP/editor.sh" hg rebase --collapse --keepbranches -e --source B --dest F
-  rebasing 1:112478962961 "B" (B)
-  rebasing 3:26805aba1e60 "C" (C)
-  rebasing 5:f585351a92f8 "D" (D tip)
+  rebasing 1:112478962961 B "B"
+  rebasing 3:26805aba1e60 C "C"
+  rebasing 5:f585351a92f8 D tip "D"
   ==== before editing
   Collapsed revision
   * B
@@ -96,8 +96,8 @@ Merge gets linearized:
 
   $ hg phase --force --secret D
   $ hg rebase --source B --collapse --dest F
-  rebasing 1:112478962961 "B" (B)
-  rebasing 3:4e4f9194f9f1 "D" (D)
+  rebasing 1:112478962961 B "B"
+  rebasing 3:4e4f9194f9f1 D "D"
   saved backup bundle to $TESTTMP/linearized-merge/.hg/strip-backup/112478962961-e389075b-rebase.hg
 
   $ hg tglog
@@ -141,8 +141,8 @@ Custom message:
   > true
   > EOF
   $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source B --collapse -m 'custom message' -e --dest D
-  rebasing 1:112478962961 "B" (B)
-  rebasing 3:26805aba1e60 "C" (C tip)
+  rebasing 1:112478962961 B "B"
+  rebasing 3:26805aba1e60 C tip "C"
   HGEDITFORM=rebase.collapse
   saved backup bundle to $TESTTMP/message/.hg/strip-backup/112478962961-f4131707-rebase.hg
 
@@ -185,9 +185,9 @@ Rebase and collapse - more than one exte
 Rebase and collapse - E onto H:
 
   $ hg rebase -s E --dest H --collapse # root (E) is not a merge
-  rebasing 5:49cb92066bfd "E" (E)
-  rebasing 6:11abe3fb10b8 "F" (F)
-  rebasing 7:64e264db77f0 "G" (G tip)
+  rebasing 5:49cb92066bfd E "E"
+  rebasing 6:11abe3fb10b8 F "F"
+  rebasing 7:64e264db77f0 G tip "G"
   saved backup bundle to $TESTTMP/multiple-external-parents/.hg/strip-backup/49cb92066bfd-ee8a8a79-rebase.hg
 
   $ hg tglog
@@ -287,7 +287,7 @@ Preserves external parent
   > EOF
 
   $ hg rebase -s F --dest I --collapse # root (F) is not a merge
-  rebasing 6:c82b08f646f1 "F" (F)
+  rebasing 6:c82b08f646f1 F "F"
   file 'E' was deleted in local [dest] but was modified in other [source].
   You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
   What do you want to do? u
@@ -299,9 +299,9 @@ Preserves external parent
   (no more unresolved files)
   continue: hg rebase --continue
   $ hg rebase -c
-  rebasing 6:c82b08f646f1 "F" (F)
-  rebasing 7:a6db7fa104e1 "G" (G)
-  rebasing 8:e1d201b72d91 "H" (H tip)
+  rebasing 6:c82b08f646f1 F "F"
+  rebasing 7:a6db7fa104e1 G "G"
+  rebasing 8:e1d201b72d91 H tip "H"
   saved backup bundle to $TESTTMP/external-parent/.hg/strip-backup/c82b08f646f1-f2721fbf-rebase.hg
 
   $ hg tglog
@@ -347,8 +347,8 @@ Rebasing from multiple bases:
   > A
   > EOF
   $ hg rebase --collapse -r 'B+C' -d D
-  rebasing 1:fc2b737bb2e5 "B" (B)
-  rebasing 2:dc0947a82db8 "C" (C)
+  rebasing 1:fc2b737bb2e5 B "B"
+  rebasing 2:dc0947a82db8 C "C"
   saved backup bundle to $TESTTMP/multiple-bases/.hg/strip-backup/dc0947a82db8-b0c1a7ea-rebase.hg
   $ hg tglog
   o  2: 2127ae44d291 'Collapsed revision
@@ -424,10 +424,10 @@ With internal merge:
 
 
   $ hg rebase -s B --collapse --dest F
-  rebasing 1:112478962961 "B" (B)
-  rebasing 3:26805aba1e60 "C" (C)
-  rebasing 4:be0ef73c17ad "D" (D)
-  rebasing 5:02c4367d6973 "E" (E tip)
+  rebasing 1:112478962961 B "B"
+  rebasing 3:26805aba1e60 C "C"
+  rebasing 4:be0ef73c17ad D "D"
+  rebasing 5:02c4367d6973 E tip "E"
   saved backup bundle to $TESTTMP/internal-merge/.hg/strip-backup/112478962961-1dfb057b-rebase.hg
 
   $ hg tglog
@@ -514,7 +514,7 @@ Rebase, collapse and copies
   merging a and d to d
   merging b and e to e
   merging c and f to f
-  rebasing 3:338e84e2e558 "move2" (tip)
+  rebasing 3:338e84e2e558 tip "move2"
   merging f and c to c
   merging e and g to g
   saved backup bundle to $TESTTMP/copies/.hg/strip-backup/6e7340ee38c0-ef8ef003-rebase.hg
@@ -557,7 +557,7 @@ Test collapsing in place
 
   $ hg rebase --collapse -b . -d 0
   rebasing 1:1352765a01d4 "change"
-  rebasing 2:64b456429f67 "Collapsed revision" (tip)
+  rebasing 2:64b456429f67 tip "Collapsed revision"
   saved backup bundle to $TESTTMP/copies/.hg/strip-backup/1352765a01d4-45a352ea-rebase.hg
   $ hg st --change tip --copies
   M a
@@ -631,7 +631,7 @@ Test collapsing changes that add then re
   $ hg book foo
   $ hg rebase -d 0 -r "1::2" --collapse -m collapsed
   rebasing 1:6d8d9f24eec3 "a"
-  rebasing 2:1cc73eca5ecc "b" (foo tip)
+  rebasing 2:1cc73eca5ecc tip foo "b"
   saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/6d8d9f24eec3-77d3b6e2-rebase.hg
   $ hg log -G --template "{rev}: '{desc}' {bookmarks}"
   @  1: 'collapsed' foo
@@ -655,7 +655,7 @@ running into merge conflict and invoking
   > A
   > EOF
   $ hg rebase --collapse -m "new message" -b B -d C
-  rebasing 1:81e5401e4d37 "B" (B)
+  rebasing 1:81e5401e4d37 B "B"
   merging A
   warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -665,7 +665,7 @@ running into merge conflict and invoking
   (no more unresolved files)
   continue: hg rebase --continue
   $ hg rebase --continue
-  rebasing 1:81e5401e4d37 "B" (B)
+  rebasing 1:81e5401e4d37 B "B"
   saved backup bundle to $TESTTMP/collapse_remember_message/.hg/strip-backup/81e5401e4d37-96c3dd30-rebase.hg
   $ hg log
   changeset:   2:17186933e123
@@ -702,7 +702,7 @@ Test aborted editor on final message
   > A
   > EOF
   $ hg rebase --collapse -t internal:merge3 -s B -d D
-  rebasing 1:f899f3910ce7 "B" (B)
+  rebasing 1:f899f3910ce7 B "B"
   merging A
   warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -729,8 +729,8 @@ Test aborted editor on final message
   (no more unresolved files)
   continue: hg rebase --continue
   $ hg rebase --continue
-  rebasing 1:f899f3910ce7 "B" (B)
-  rebasing 3:63668d570d21 "C" (C tip)
+  rebasing 1:f899f3910ce7 B "B"
+  rebasing 3:63668d570d21 C tip "C"
   merging A
   warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -757,8 +757,8 @@ Test aborted editor on final message
   (no more unresolved files)
   continue: hg rebase --continue
   $ HGEDITOR=false hg rebase --continue --config ui.interactive=1
-  already rebased 1:f899f3910ce7 "B" (B) as 82b8abf9c185
-  rebasing 3:63668d570d21 "C" (C tip)
+  already rebased 1:f899f3910ce7 B "B" as 82b8abf9c185
+  rebasing 3:63668d570d21 C tip "C"
   abort: edit failed: false exited with status 1
   [255]
   $ hg tglog
@@ -771,6 +771,6 @@ Test aborted editor on final message
   o  0: 4a2df7238c3b 'A'
   
   $ hg rebase --continue
-  already rebased 1:f899f3910ce7 "B" (B) as 82b8abf9c185
-  already rebased 3:63668d570d21 "C" (C tip) as 82b8abf9c185
+  already rebased 1:f899f3910ce7 B "B" as 82b8abf9c185
+  already rebased 3:63668d570d21 C tip "C" as 82b8abf9c185
   saved backup bundle to $TESTTMP/aborted-editor/.hg/strip-backup/f899f3910ce7-7cab5e15-rebase.hg
diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t
+++ b/tests/test-rebase-conflicts.t
@@ -100,7 +100,7 @@ Conclude rebase:
   $ hg rebase --continue
   already rebased 3:3163e20567cc "L1" as 3e046f2ecedb
   rebasing 4:46f0b057b5c0 "L2"
-  rebasing 5:8029388f38dc "L3" (mybook)
+  rebasing 5:8029388f38dc mybook "L3"
   saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-5ca4656e-rebase.hg
 
   $ hg tglog
@@ -261,7 +261,7 @@ Check that the right ancestors is used w
   updating the branch cache
   rebased as 19c888675e13
   rebase status stored
-  rebasing 10:2f2496ddf49d "merge" (tip)
+  rebasing 10:2f2496ddf49d tip "merge"
    future parents are 11 and 7
    already in destination
    merge against 10:2f2496ddf49d
@@ -341,7 +341,7 @@ Test minimization of merge conflicts
   $ echo c >> a
   $ hg commit -q -m 'abc'
   $ hg rebase -s 7bc217434fc1 -d ab --keep
-  rebasing 13:7bc217434fc1 "abc" (tip)
+  rebasing 13:7bc217434fc1 tip "abc"
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -361,7 +361,7 @@ Test minimization of merge conflicts
   rebase aborted
   $ hg up -q -C 7bc217434fc1
   $ hg rebase -s . -d ab --keep -t internal:merge3
-  rebasing 13:7bc217434fc1 "abc" (tip)
+  rebasing 13:7bc217434fc1 tip "abc"
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -399,7 +399,7 @@ Test rebase with obsstore turned on and 
   $ echo 3 > B
   $ hg commit --amend -m E -A B -q
   $ hg rebase -r B+D -d . --config experimental.evolution=true
-  rebasing 1:112478962961 "B" (B)
+  rebasing 1:112478962961 B "B"
   merging B
   warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -410,8 +410,8 @@ Test rebase with obsstore turned on and 
   (no more unresolved files)
   continue: hg rebase --continue
   $ hg rebase --continue --config experimental.evolution=none
-  rebasing 1:112478962961 "B" (B)
-  rebasing 3:f585351a92f8 "D" (D)
+  rebasing 1:112478962961 B "B"
+  rebasing 3:f585351a92f8 D "D"
   warning: orphaned descendants detected, not stripping 112478962961
   saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg
 
@@ -448,10 +448,10 @@ Test where the conflict happens when reb
   $ hg co F
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg rebase -d B
-  rebasing 2:dc0947a82db8 "C" (C)
-  rebasing 3:e7b3f00ed42e "D" (D)
-  rebasing 4:03ca77807e91 "E" (E)
-  rebasing 5:9a6b91dc2044 "F" (F tip)
+  rebasing 2:dc0947a82db8 C "C"
+  rebasing 3:e7b3f00ed42e D "D"
+  rebasing 4:03ca77807e91 E "E"
+  rebasing 5:9a6b91dc2044 F tip "F"
   merging conflict
   warning: conflicts while merging conflict! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -480,10 +480,10 @@ Test where the conflict happens when reb
   (no more unresolved files)
   continue: hg rebase --continue
   $ hg rebase -c
-  already rebased 2:dc0947a82db8 "C" (C) as 0199610c343e
-  already rebased 3:e7b3f00ed42e "D" (D) as f0dd538aaa63
-  already rebased 4:03ca77807e91 "E" (E) as cbf25af8347d
-  rebasing 5:9a6b91dc2044 "F" (F)
+  already rebased 2:dc0947a82db8 C "C" as 0199610c343e
+  already rebased 3:e7b3f00ed42e D "D" as f0dd538aaa63
+  already rebased 4:03ca77807e91 E "E" as cbf25af8347d
+  rebasing 5:9a6b91dc2044 F "F"
   saved backup bundle to $TESTTMP/conflict-in-merge/.hg/strip-backup/dc0947a82db8-ca7e7d5b-rebase.hg
   $ hg tglog
   @    5:draft 'F'
diff --git a/tests/test-rebase-dest.t b/tests/test-rebase-dest.t
--- a/tests/test-rebase-dest.t
+++ b/tests/test-rebase-dest.t
@@ -20,15 +20,15 @@ Require a destination
   (use: hg rebase -d REV)
   [255]
   $ hg rebase -d 1
-  rebasing 2:5db65b93a12b "cc" (tip)
+  rebasing 2:5db65b93a12b tip "cc"
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5db65b93a12b-4fb789ec-rebase.hg
   $ hg rebase -d 0 -r . -q
   $ HGPLAIN=1 hg rebase
-  rebasing 2:889b0bc6a730 "cc" (tip)
+  rebasing 2:889b0bc6a730 tip "cc"
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/889b0bc6a730-41ec4f81-rebase.hg
   $ hg rebase -d 0 -r . -q
   $ hg --config commands.rebase.requiredest=False rebase
-  rebasing 2:279de9495438 "cc" (tip)
+  rebasing 2:279de9495438 tip "cc"
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/279de9495438-ab0a5128-rebase.hg
 
 Requiring dest should not break continue or other rebase options
@@ -45,7 +45,7 @@ Requiring dest should not break continue
   o  0 aa
   
   $ hg rebase -d 2
-  rebasing 3:0537f6b50def "dc" (tip)
+  rebasing 3:0537f6b50def tip "dc"
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -55,7 +55,7 @@ Requiring dest should not break continue
   (no more unresolved files)
   continue: hg rebase --continue
   $ hg rebase --continue
-  rebasing 3:0537f6b50def "dc" (tip)
+  rebasing 3:0537f6b50def tip "dc"
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0537f6b50def-be4c7386-rebase.hg
 
   $ cd ..
@@ -171,9 +171,9 @@ Rebase to null should work:
   > | |
   > A B
   > EOS
-  already rebased 0:426bada5c675 "A" (A)
-  already rebased 2:dc0947a82db8 "C" (C)
-  rebasing 3:004dc1679908 "D" (D tip)
+  already rebased 0:426bada5c675 A "A"
+  already rebased 2:dc0947a82db8 C "C"
+  rebasing 3:004dc1679908 D tip "D"
   o  4: d8d8601abd5e D
   
   o  2: dc0947a82db8 C
@@ -227,10 +227,10 @@ Switch roots:
   > |  |
   > A  D
   > EOS
-  rebasing 2:112478962961 "B" (B)
-  rebasing 4:26805aba1e60 "C" (C)
-  rebasing 3:cd488e83d208 "E" (E)
-  rebasing 5:0069ba24938a "F" (F tip)
+  rebasing 2:112478962961 B "B"
+  rebasing 4:26805aba1e60 C "C"
+  rebasing 3:cd488e83d208 E "E"
+  rebasing 5:0069ba24938a F tip "F"
   o  9: d150ff263fc8 F
   |
   o  8: 66f30a1a2eab E
@@ -254,8 +254,8 @@ Different destinations for merge changes
   > |\|
   > A D
   > EOS
-  rebasing 3:a4256619d830 "B" (B)
-  rebasing 6:8e139e245220 "C" (C tip)
+  rebasing 3:a4256619d830 B "B"
+  rebasing 6:8e139e245220 C tip "C"
   o    8: d7d1169e9b1c C
   |\
   | o    7: 2ed0c8546285 B
@@ -283,9 +283,9 @@ Move to a previous parent:
   >   |/
   >   A
   > EOS
-  rebasing 4:33441538d4aa "F" (F)
-  rebasing 6:cf43ad9da869 "G" (G)
-  rebasing 7:eef94f3b5f03 "H" (H tip)
+  rebasing 4:33441538d4aa F "F"
+  rebasing 6:cf43ad9da869 G "G"
+  rebasing 7:eef94f3b5f03 H tip "H"
   o  10: b3d84c6666cf H
   |
   | o  5: f585351a92f8 D
@@ -309,8 +309,8 @@ Source overlaps with destination:
   >  \|/
   >   A
   > EOS
-  rebasing 2:dc0947a82db8 "C" (C)
-  rebasing 1:112478962961 "B" (B)
+  rebasing 2:dc0947a82db8 C "C"
+  rebasing 1:112478962961 B "B"
   o  5: 5fe9935d5222 B
   |
   o  4: 12d20731b9e0 C
@@ -352,11 +352,11 @@ Detect source is ancestor of dest in run
   >  \|/
   >   A
   > EOS
-  already rebased 1:112478962961 "B" (B)
-  already rebased 2:dc0947a82db8 "C" (C)
-  already rebased 3:b18e25de2cf5 "D" (D)
-  already rebased 4:312782b8f06e "E" (E)
-  already rebased 5:ad6717a6a58e "F" (F tip)
+  already rebased 1:112478962961 B "B"
+  already rebased 2:dc0947a82db8 C "C"
+  already rebased 3:b18e25de2cf5 D "D"
+  already rebased 4:312782b8f06e E "E"
+  already rebased 5:ad6717a6a58e F tip "F"
   o  5: ad6717a6a58e F
   |
   o  3: b18e25de2cf5 D
@@ -380,17 +380,17 @@ Massively rewrite the DAG:
   >  \| |
   >   A H
   > EOS
-  rebasing 4:701514e1408d "I" (I)
-  rebasing 0:426bada5c675 "A" (A)
-  rebasing 1:e7050b6e5048 "H" (H)
-  rebasing 5:26805aba1e60 "C" (C)
-  rebasing 7:cf89f86b485b "J" (J)
-  rebasing 2:112478962961 "B" (B)
-  rebasing 3:7fb047a69f22 "E" (E)
-  rebasing 8:f585351a92f8 "D" (D)
-  rebasing 10:ae41898d7875 "K" (K tip)
-  rebasing 9:711f53bbef0b "G" (G)
-  rebasing 6:64a8289d2492 "F" (F)
+  rebasing 4:701514e1408d I "I"
+  rebasing 0:426bada5c675 A "A"
+  rebasing 1:e7050b6e5048 H "H"
+  rebasing 5:26805aba1e60 C "C"
+  rebasing 7:cf89f86b485b J "J"
+  rebasing 2:112478962961 B "B"
+  rebasing 3:7fb047a69f22 E "E"
+  rebasing 8:f585351a92f8 D "D"
+  rebasing 10:ae41898d7875 K tip "K"
+  rebasing 9:711f53bbef0b G "G"
+  rebasing 6:64a8289d2492 F "F"
   o  21: 3735afb3713a F
   |
   o  20: 07698142d7a7 G
@@ -433,12 +433,12 @@ Resolve instability:
   >      A
   > EOF
   6 new orphan changesets
-  rebasing 16:5c432343bf59 "J" (J tip)
-  rebasing 3:26805aba1e60 "C" (C)
-  rebasing 6:f585351a92f8 "D" (D)
-  rebasing 10:ffebc37c5d0b "E3" (E3)
-  rebasing 13:fb184bcfeee8 "F2" (F2)
-  rebasing 11:dc838ab4c0da "G" (G)
+  rebasing 16:5c432343bf59 J tip "J"
+  rebasing 3:26805aba1e60 C "C"
+  rebasing 6:f585351a92f8 D "D"
+  rebasing 10:ffebc37c5d0b E3 "E3"
+  rebasing 13:fb184bcfeee8 F2 "F2"
+  rebasing 11:dc838ab4c0da G "G"
   o  22: 174f63d574a8 G
   |
   o  21: c9d9fbe76705 F2
diff --git a/tests/test-rebase-detach.t b/tests/test-rebase-detach.t
--- a/tests/test-rebase-detach.t
+++ b/tests/test-rebase-detach.t
@@ -24,7 +24,7 @@ Rebasing D onto B detaching from C (one 
   $ hg phase --force --secret D
 
   $ hg rebase -s D -d B
-  rebasing 3:e7b3f00ed42e "D" (D tip)
+  rebasing 3:e7b3f00ed42e D tip "D"
   saved backup bundle to $TESTTMP/a1/.hg/strip-backup/e7b3f00ed42e-6f368371-rebase.hg
 
   $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
@@ -60,8 +60,8 @@ Rebasing D onto B detaching from C (two 
   > EOF
 
   $ hg rebase -s D -d B
-  rebasing 3:e7b3f00ed42e "D" (D)
-  rebasing 4:69a34c08022a "E" (E tip)
+  rebasing 3:e7b3f00ed42e D "D"
+  rebasing 4:69a34c08022a E tip "E"
   saved backup bundle to $TESTTMP/a2/.hg/strip-backup/e7b3f00ed42e-a2ec7cea-rebase.hg
 
   $ hg tglog
@@ -97,8 +97,8 @@ Rebasing C onto B using detach (same as 
   > EOF
 
   $ hg rebase -s C -d B
-  rebasing 2:dc0947a82db8 "C" (C)
-  rebasing 3:e7b3f00ed42e "D" (D tip)
+  rebasing 2:dc0947a82db8 C "C"
+  rebasing 3:e7b3f00ed42e D tip "D"
   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/dc0947a82db8-b8481714-rebase.hg
 
   $ hg tglog
@@ -136,8 +136,8 @@ Rebasing D onto B detaching from C and c
   $ hg phase --force --secret E
 
   $ hg rebase --collapse -s D -d B
-  rebasing 3:e7b3f00ed42e "D" (D)
-  rebasing 4:69a34c08022a "E" (E tip)
+  rebasing 3:e7b3f00ed42e D "D"
+  rebasing 4:69a34c08022a E tip "E"
   saved backup bundle to $TESTTMP/a4/.hg/strip-backup/e7b3f00ed42e-a2ec7cea-rebase.hg
 
   $ hg  log -G --template "{rev}:{phase} '{desc}' {branches}\n"
@@ -173,9 +173,9 @@ Rebasing across null as ancestor
   > EOF
 
   $ hg rebase -s C -d B
-  rebasing 2:dc0947a82db8 "C" (C)
-  rebasing 3:e7b3f00ed42e "D" (D)
-  rebasing 4:69a34c08022a "E" (E tip)
+  rebasing 2:dc0947a82db8 C "C"
+  rebasing 3:e7b3f00ed42e D "D"
+  rebasing 4:69a34c08022a E tip "E"
   saved backup bundle to $TESTTMP/a5/.hg/strip-backup/dc0947a82db8-3eefec98-rebase.hg
 
   $ hg tglog
@@ -191,7 +191,7 @@ Rebasing across null as ancestor
   
   $ hg rebase -d 1 -s 3
   rebasing 3:e9153d36a1af "D"
-  rebasing 4:e3d0c70d606d "E" (tip)
+  rebasing 4:e3d0c70d606d tip "E"
   saved backup bundle to $TESTTMP/a5/.hg/strip-backup/e9153d36a1af-db7388ed-rebase.hg
   $ hg tglog
   o  4: 2c24e540eccd 'E'
@@ -248,9 +248,9 @@ Verify that target is not selected as ex
   o  0: 426bada5c675 'A'
   
   $ hg rebase -s I -d H --collapse --config ui.merge=internal:other
-  rebasing 5:b92d164ad3cb "I" (I)
+  rebasing 5:b92d164ad3cb I "I"
   rebasing 6:0cfbc7e8faaf "Merge"
-  rebasing 7:c6aaf0d259c0 "J" (tip)
+  rebasing 7:c6aaf0d259c0 tip "J"
   saved backup bundle to $TESTTMP/a6/.hg/strip-backup/b92d164ad3cb-88fd7ab7-rebase.hg
 
   $ hg tglog
@@ -294,7 +294,7 @@ Ensure --continue restores a correct sta
   adding B
   $ hg phase --force --secret .
   $ hg rebase -s . -d B --config ui.merge=internal:merge
-  rebasing 3:17b4880d2402 "B2" (tip)
+  rebasing 3:17b4880d2402 tip "B2"
   merging B
   warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -303,8 +303,8 @@ Ensure --continue restores a correct sta
   (no more unresolved files)
   continue: hg rebase --continue
   $ hg rebase -c
-  rebasing 3:17b4880d2402 "B2" (tip)
-  note: not rebasing 3:17b4880d2402 "B2" (tip), its destination already has all its changes
+  rebasing 3:17b4880d2402 tip "B2"
+  note: not rebasing 3:17b4880d2402 tip "B2", its destination already has all its changes
   saved backup bundle to $TESTTMP/a7/.hg/strip-backup/17b4880d2402-1ae1f6cc-rebase.hg
   $ hg  log -G --template "{rev}:{phase} '{desc}' {branches}\n"
   o  2:draft 'C'
diff --git a/tests/test-rebase-empty-successor.t b/tests/test-rebase-empty-successor.t
--- a/tests/test-rebase-empty-successor.t
+++ b/tests/test-rebase-empty-successor.t
@@ -24,15 +24,15 @@ With rewrite.empty-successor=skip, b2 is
 
   $ hg rebase -s 2 -d 1 --config rewrite.empty-successor=skip --dry-run
   starting dry-run rebase; repository will not be changed
-  rebasing 2:6e2aad5e0f3c "b2" (tip)
-  note: not rebasing 2:6e2aad5e0f3c "b2" (tip), its destination already has all its changes
+  rebasing 2:6e2aad5e0f3c tip "b2"
+  note: not rebasing 2:6e2aad5e0f3c tip "b2", its destination already has all its changes
   dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase
 
 With rewrite.empty-successor=keep, b2 will be recreated although it became empty.
 
   $ hg rebase -s 2 -d 1 --config rewrite.empty-successor=keep
-  rebasing 2:6e2aad5e0f3c "b2" (tip)
-  note: created empty successor for 2:6e2aad5e0f3c "b2" (tip), its destination already has all its changes
+  rebasing 2:6e2aad5e0f3c tip "b2"
+  note: created empty successor for 2:6e2aad5e0f3c tip "b2", its destination already has all its changes
   saved backup bundle to $TESTTMP/.hg/strip-backup/6e2aad5e0f3c-7d7c8801-rebase.hg
 
   $ hg tglog
diff --git a/tests/test-rebase-emptycommit.t b/tests/test-rebase-emptycommit.t
--- a/tests/test-rebase-emptycommit.t
+++ b/tests/test-rebase-emptycommit.t
@@ -50,10 +50,10 @@
 With --keep, bookmark should move
 
   $ hg rebase -r 3+4 -d E --keep
-  rebasing 3:e7b3f00ed42e "D" (BOOK-D)
-  note: not rebasing 3:e7b3f00ed42e "D" (BOOK-D), its destination already has all its changes
-  rebasing 4:69a34c08022a "E" (BOOK-E)
-  note: not rebasing 4:69a34c08022a "E" (BOOK-E), its destination already has all its changes
+  rebasing 3:e7b3f00ed42e BOOK-D "D"
+  note: not rebasing 3:e7b3f00ed42e BOOK-D "D", its destination already has all its changes
+  rebasing 4:69a34c08022a BOOK-E "E"
+  note: not rebasing 4:69a34c08022a BOOK-E "E", its destination already has all its changes
   $ hg log -G -T '{rev} {desc} {bookmarks}'
   o  7 E BOOK-D BOOK-E
   |
@@ -82,12 +82,12 @@ still introduced by an ancestor of chang
 "BOOK-D", and "BOOK-E" include changes introduced by "C".
 
   $ hg rebase -s 2 -d E
-  rebasing 2:dc0947a82db8 "C" (BOOK-C C)
-  rebasing 3:e7b3f00ed42e "D" (BOOK-D)
-  note: not rebasing 3:e7b3f00ed42e "D" (BOOK-D), its destination already has all its changes
-  rebasing 4:69a34c08022a "E" (BOOK-E)
-  note: not rebasing 4:69a34c08022a "E" (BOOK-E), its destination already has all its changes
-  rebasing 5:6b2aeab91270 "F" (BOOK-F F)
+  rebasing 2:dc0947a82db8 C BOOK-C "C"
+  rebasing 3:e7b3f00ed42e BOOK-D "D"
+  note: not rebasing 3:e7b3f00ed42e BOOK-D "D", its destination already has all its changes
+  rebasing 4:69a34c08022a BOOK-E "E"
+  note: not rebasing 4:69a34c08022a BOOK-E "E", its destination already has all its changes
+  rebasing 5:6b2aeab91270 F BOOK-F "F"
   saved backup bundle to $TESTTMP/non-merge/.hg/strip-backup/dc0947a82db8-52bb4973-rebase.hg
   $ hg log -G -T '{rev} {desc} {bookmarks}'
   o  5 F BOOK-F
@@ -139,12 +139,12 @@ assumed branch name change.
   $ hg branch foo -q
 
   $ hg rebase -r '(A::)-(B::)-A' -d H --keepbranches
-  rebasing 2:dc0947a82db8 "C" (BOOK-C)
-  note: not rebasing 2:dc0947a82db8 "C" (BOOK-C), its destination already has all its changes
-  rebasing 3:b18e25de2cf5 "D" (BOOK-D)
-  note: not rebasing 3:b18e25de2cf5 "D" (BOOK-D), its destination already has all its changes
-  rebasing 4:86a1f6686812 "E" (BOOK-E E)
-  note: not rebasing 4:86a1f6686812 "E" (BOOK-E E), its destination already has all its changes
+  rebasing 2:dc0947a82db8 BOOK-C "C"
+  note: not rebasing 2:dc0947a82db8 BOOK-C "C", its destination already has all its changes
+  rebasing 3:b18e25de2cf5 BOOK-D "D"
+  note: not rebasing 3:b18e25de2cf5 BOOK-D "D", its destination already has all its changes
+  rebasing 4:86a1f6686812 E BOOK-E "E"
+  note: not rebasing 4:86a1f6686812 E BOOK-E "E", its destination already has all its changes
   saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg
   $ hg update null -q
 
@@ -189,13 +189,13 @@ Part of ancestors of a merge become empt
   > EOS
 
   $ hg rebase -r '(A::)-(B::)-A' -d H
-  rebasing 2:dc0947a82db8 "C" (BOOK-C)
-  note: not rebasing 2:dc0947a82db8 "C" (BOOK-C), its destination already has all its changes
-  rebasing 3:b18e25de2cf5 "D" (BOOK-D D)
-  rebasing 4:03ca77807e91 "E" (BOOK-E E)
-  rebasing 5:ad6717a6a58e "F" (BOOK-F)
-  note: not rebasing 5:ad6717a6a58e "F" (BOOK-F), its destination already has all its changes
-  rebasing 6:c58e8bdac1f4 "G" (BOOK-G G)
+  rebasing 2:dc0947a82db8 BOOK-C "C"
+  note: not rebasing 2:dc0947a82db8 BOOK-C "C", its destination already has all its changes
+  rebasing 3:b18e25de2cf5 D BOOK-D "D"
+  rebasing 4:03ca77807e91 E BOOK-E "E"
+  rebasing 5:ad6717a6a58e BOOK-F "F"
+  note: not rebasing 5:ad6717a6a58e BOOK-F "F", its destination already has all its changes
+  rebasing 6:c58e8bdac1f4 G BOOK-G "G"
   saved backup bundle to $TESTTMP/merge2/.hg/strip-backup/b18e25de2cf5-2d487005-rebase.hg
 
   $ hg log -G -T '{rev} {desc} {bookmarks}'
diff --git a/tests/test-rebase-inmemory.t b/tests/test-rebase-inmemory.t
--- a/tests/test-rebase-inmemory.t
+++ b/tests/test-rebase-inmemory.t
@@ -42,7 +42,7 @@ Rebase a simple DAG:
   b (no-eol)
   $ hg rebase --debug -r b -d c | grep rebasing
   rebasing in memory
-  rebasing 2:db0e82a16a62 "b" (b)
+  rebasing 2:db0e82a16a62 b "b"
   $ hg tglog
   o  3: ca58782ad1e4 'b'
   |
@@ -102,7 +102,7 @@ Write files to the working copy, and ens
   somefile (no-eol)
   $ hg rebase --debug -s b -d a | grep rebasing
   rebasing in memory
-  rebasing 2:db0e82a16a62 "b" (b)
+  rebasing 2:db0e82a16a62 b "b"
   $ hg tglog
   o  3: fc055c3b4d33 'b'
   |
@@ -118,7 +118,7 @@ Write files to the working copy, and ens
   b (no-eol)
   $ hg rebase --debug -s 1 -d 3 | grep rebasing
   rebasing in memory
-  rebasing 1:02952614a83d "d" (d)
+  rebasing 1:02952614a83d d "d"
   rebasing 2:f56b71190a8f "c"
   $ hg tglog
   o  3: 753feb6fd12a 'c'
@@ -149,7 +149,7 @@ Rebase the working copy parent
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg rebase -r 3 -d 0 --debug | grep rebasing
   rebasing in memory
-  rebasing 3:753feb6fd12a "c" (tip)
+  rebasing 3:753feb6fd12a tip "c"
   $ hg tglog
   @  3: 844a7de3e617 'c'
   |
@@ -179,7 +179,7 @@ Test reporting of path conflicts
   o  0: b173517d0057 'a'
   
   $ hg rebase -r . -d 2
-  rebasing 4:daf7dfc139cb "a/a" (tip)
+  rebasing 4:daf7dfc139cb tip "a/a"
   saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/daf7dfc139cb-fdbfcf4f-rebase.hg
 
   $ hg tglog
@@ -220,7 +220,7 @@ Test reporting of path conflicts
   o  0: b173517d0057 'a'
   
   $ hg rebase -r . -d 5
-  rebasing 7:855e9797387e "added a back!" (tip)
+  rebasing 7:855e9797387e tip "added a back!"
   saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/855e9797387e-81ee4c5d-rebase.hg
 
   $ hg tglog
@@ -246,7 +246,7 @@ Test reporting of path conflicts
   $ hg ci -m 'c/subdir/file.txt'
   $ hg rebase -r . -d 3 -n
   starting dry-run rebase; repository will not be changed
-  rebasing 8:e147e6e3c490 "c/subdir/file.txt" (tip)
+  rebasing 8:e147e6e3c490 tip "c/subdir/file.txt"
   abort: error: 'c/subdir/file.txt' conflicts with file 'c' in 3.
   [255]
 FIXME: shouldn't need this, but when we hit path conflicts in dryrun mode, we
@@ -709,7 +709,7 @@ Test a metadata-only in-memory merge
   $ hg ci -qAm 'add +x to foo.txt'
 issue5960: this was raising an AttributeError exception
   $ hg rebase -r . -d 1
-  rebasing 2:539b93e77479 "add +x to foo.txt" (tip)
+  rebasing 2:539b93e77479 tip "add +x to foo.txt"
   saved backup bundle to $TESTTMP/no_exception/.hg/strip-backup/*.hg (glob)
   $ hg diff -c tip
   diff --git a/foo.txt b/foo.txt
@@ -772,7 +772,7 @@ Test rebasing a commit with copy informa
   $ hg mv a b
   $ hg ci -qm 'rename a to b'
   $ hg rebase -d 1
-  rebasing 2:b977edf6f839 "rename a to b" (tip)
+  rebasing 2:b977edf6f839 tip "rename a to b"
   merging a and b to b
   saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/b977edf6f839-0864f570-rebase.hg
   $ hg st --copies --change .
@@ -793,7 +793,7 @@ Test rebasing a commit with copy informa
   $ hg mv a b
   $ hg ci -qm 'rename a to b'
   $ hg rebase -d 1
-  rebasing 2:b977edf6f839 "rename a to b" (tip)
+  rebasing 2:b977edf6f839 tip "rename a to b"
   merging a and b to b
   saved backup bundle to $TESTTMP/rebase-rename-empty/.hg/strip-backup/b977edf6f839-0864f570-rebase.hg
   $ hg st --copies --change .
@@ -813,7 +813,7 @@ Rebase across a copy with --collapse
   $ echo a2 > a
   $ hg ci -qm 'modify a'
   $ hg rebase -r . -d 1 --collapse
-  rebasing 2:41c4ea50d4cf "modify a" (tip)
+  rebasing 2:41c4ea50d4cf tip "modify a"
   merging b and a to b
   saved backup bundle to $TESTTMP/rebase-rename-collapse/.hg/strip-backup/41c4ea50d4cf-b90b7994-rebase.hg
   $ cd ..
@@ -850,7 +850,7 @@ Test rebasing when the file we are mergi
   created new head
 
   $ hg rebase -r . -d 1 --config ui.merge=internal:merge3
-  rebasing 2:fb62b706688e "add b to foo" (tip)
+  rebasing 2:fb62b706688e tip "add b to foo"
   merging foo
   hit merge conflicts; rebasing that commit again in the working copy
   merging foo
@@ -943,7 +943,7 @@ definition.
   $ hg rebase -s 2 -d 3
   rebasing 2:0194f1db184a "b"
   note: not rebasing 2:0194f1db184a "b", its destination already has all its changes
-  rebasing 4:59c8292117b1 "merge" (tip)
+  rebasing 4:59c8292117b1 tip "merge"
   saved backup bundle to $TESTTMP/keep_merge/.hg/strip-backup/0194f1db184a-aee31d03-rebase.hg
   $ hg tglog
   o    3: 506e2454484b 'merge'
@@ -969,6 +969,6 @@ changed although the file contents were 
   $ echo bar > test; hg add test; hg ci -m c
   created new head
   $ hg rebase -d 2 -d 1 --tool :local
-  rebasing 2:ca2749322ee5 "c" (tip)
-  note: not rebasing 2:ca2749322ee5 "c" (tip), its destination already has all its changes
+  rebasing 2:ca2749322ee5 tip "c"
+  note: not rebasing 2:ca2749322ee5 tip "c", its destination already has all its changes
   saved backup bundle to $TESTTMP/nofilechanges/.hg/strip-backup/ca2749322ee5-6dc7e94b-rebase.hg
diff --git a/tests/test-rebase-interruptions.t b/tests/test-rebase-interruptions.t
--- a/tests/test-rebase-interruptions.t
+++ b/tests/test-rebase-interruptions.t
@@ -348,7 +348,7 @@ two dirstate parents. We should not get 
   $ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.precommit=hg status | grep "M A"'
   rebasing 2:965c486023db "C"
   M A
-  rebasing 6:a0b2430ebfb8 "F" (tip)
+  rebasing 6:a0b2430ebfb8 tip "F"
   abort: precommit hook exited with status 1
   [255]
   $ hg tglogp
@@ -397,7 +397,7 @@ two dirstate parents. We should not get 
   >     --config 'hooks.tonative.pretxncommit=True' --config 'hooks.pretxncommit=hg log -r $HG_NODE | grep "summary:     C"'
   rebasing 2:965c486023db "C"
   summary:     C
-  rebasing 6:a0b2430ebfb8 "F" (tip)
+  rebasing 6:a0b2430ebfb8 tip "F"
   transaction abort!
   rollback completed
   abort: pretxncommit hook exited with status 1
@@ -447,7 +447,7 @@ two dirstate parents. We should not get 
   $ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.pretxnclose=hg log -r tip | grep "summary:     C"'
   rebasing 2:965c486023db "C"
   summary:     C
-  rebasing 6:a0b2430ebfb8 "F" (tip)
+  rebasing 6:a0b2430ebfb8 tip "F"
   transaction abort!
   rollback completed
   abort: pretxnclose hook exited with status 1
@@ -522,7 +522,7 @@ Make sure merge state is cleaned up afte
 Now try again with --collapse
   $ hg unbundle -q .hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
   $ hg rebase -s 2 -d 1 --noninteractive --collapse
-  rebasing 2:fdaca8533b86 "b" (tip)
+  rebasing 2:fdaca8533b86 tip "b"
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -533,7 +533,7 @@ Now try again with --collapse
   (no more unresolved files)
   continue: hg rebase --continue
   $ hg rebase --continue
-  rebasing 2:fdaca8533b86 "b" (tip)
+  rebasing 2:fdaca8533b86 tip "b"
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
   $ hg resolve --list
   $ test -d .hg/merge
diff --git a/tests/test-rebase-legacy.t b/tests/test-rebase-legacy.t
--- a/tests/test-rebase-legacy.t
+++ b/tests/test-rebase-legacy.t
@@ -58,11 +58,11 @@ rebasestate generated by a legacy client
 #endif
 
   $ hg continue
-  rebasing 4:c1e6b162678d "B" (B)
-  rebasing 8:6f7a236de685 "D" (D)
-  rebasing 2:de008c61a447 "E" (E)
-  rebasing 7:d2fa1c02b240 "G" (G)
-  rebasing 9:6582e6951a9c "H" (H tip)
+  rebasing 4:c1e6b162678d B "B"
+  rebasing 8:6f7a236de685 D "D"
+  rebasing 2:de008c61a447 E "E"
+  rebasing 7:d2fa1c02b240 G "G"
+  rebasing 9:6582e6951a9c H tip "H"
   warning: orphaned descendants detected, not stripping c1e6b162678d, de008c61a447
   saved backup bundle to $TESTTMP/.hg/strip-backup/6f7a236de685-9880a3dc-rebase.hg
 
diff --git a/tests/test-rebase-mq-skip.t b/tests/test-rebase-mq-skip.t
--- a/tests/test-rebase-mq-skip.t
+++ b/tests/test-rebase-mq-skip.t
@@ -57,7 +57,7 @@ already has one local mq patch
   $ hg up -q -C qtip
 
   $ hg rebase -v
-  rebasing 2:13a46ce44f60 "P0" (p0.patch qbase)
+  rebasing 2:13a46ce44f60 p0.patch qbase "P0"
   resolving manifests
   removing p0
   getting r1
@@ -67,9 +67,9 @@ already has one local mq patch
   p0
   committing manifest
   committing changelog
-  rebasing 3:148775c71080 "P1" (p1.patch qtip)
+  rebasing 3:148775c71080 p1.patch qtip "P1"
   resolving manifests
-  note: not rebasing 3:148775c71080 "P1" (p1.patch qtip), its destination already has all its changes
+  note: not rebasing 3:148775c71080 p1.patch qtip "P1", its destination already has all its changes
   rebase merging completed
   updating mq patch p0.patch to 5:9ecc820b1737
   $TESTTMP/a/.hg/patches/p0.patch
@@ -149,12 +149,12 @@ already has one local mq patch
   $ hg up -q qtip
 
   $ HGMERGE=internal:fail hg rebase
-  rebasing 1:b4bffa6e4776 "r1" (qbase r1)
-  note: not rebasing 1:b4bffa6e4776 "r1" (qbase r1), its destination already has all its changes
-  rebasing 2:c0fd129beb01 "r2" (r2)
-  rebasing 3:6ff5b8feed8e "r3" (r3)
-  note: not rebasing 3:6ff5b8feed8e "r3" (r3), its destination already has all its changes
-  rebasing 4:094320fec554 "r4" (r4)
+  rebasing 1:b4bffa6e4776 qbase r1 "r1"
+  note: not rebasing 1:b4bffa6e4776 qbase r1 "r1", its destination already has all its changes
+  rebasing 2:c0fd129beb01 r2 "r2"
+  rebasing 3:6ff5b8feed8e r3 "r3"
+  note: not rebasing 3:6ff5b8feed8e r3 "r3", its destination already has all its changes
+  rebasing 4:094320fec554 r4 "r4"
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
   [1]
 
@@ -163,14 +163,14 @@ already has one local mq patch
   continue: hg rebase --continue
 
   $ hg continue
-  already rebased 1:b4bffa6e4776 "r1" (qbase r1) as 057f55ff8f44
-  already rebased 2:c0fd129beb01 "r2" (r2) as 1660ab13ce9a
-  already rebased 3:6ff5b8feed8e "r3" (r3) as 1660ab13ce9a
-  rebasing 4:094320fec554 "r4" (r4)
-  note: not rebasing 4:094320fec554 "r4" (r4), its destination already has all its changes
-  rebasing 5:681a378595ba "r5" (r5)
-  rebasing 6:512a1f24768b "r6" (qtip r6)
-  note: not rebasing 6:512a1f24768b "r6" (qtip r6), its destination already has all its changes
+  already rebased 1:b4bffa6e4776 qbase r1 "r1" as 057f55ff8f44
+  already rebased 2:c0fd129beb01 r2 "r2" as 1660ab13ce9a
+  already rebased 3:6ff5b8feed8e r3 "r3" as 1660ab13ce9a
+  rebasing 4:094320fec554 r4 "r4"
+  note: not rebasing 4:094320fec554 r4 "r4", its destination already has all its changes
+  rebasing 5:681a378595ba r5 "r5"
+  rebasing 6:512a1f24768b qtip r6 "r6"
+  note: not rebasing 6:512a1f24768b qtip r6 "r6", its destination already has all its changes
   saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-b9bfb84d-rebase.hg
 
   $ hg tglog
diff --git a/tests/test-rebase-mq.t b/tests/test-rebase-mq.t
--- a/tests/test-rebase-mq.t
+++ b/tests/test-rebase-mq.t
@@ -59,7 +59,7 @@ Rebase - same thing, but mq patch is def
 Rebase - generate a conflict:
 
   $ hg rebase -s 2 -d 1
-  rebasing 2:3504f44bffc0 "P0" (f.patch qbase)
+  rebasing 2:3504f44bffc0 f.patch qbase "P0"
   merging f
   warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -72,8 +72,8 @@ Fix the 1st conflict:
   (no more unresolved files)
   continue: hg rebase --continue
   $ hg rebase -c
-  rebasing 2:3504f44bffc0 "P0" (f.patch qbase)
-  rebasing 3:929394423cd3 "P1" (f2.patch qtip tip)
+  rebasing 2:3504f44bffc0 f.patch qbase "P0"
+  rebasing 3:929394423cd3 f2.patch qtip tip "P1"
   merging f
   warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -86,8 +86,8 @@ Fix the 2nd conflict:
   (no more unresolved files)
   continue: hg rebase --continue
   $ hg rebase -c
-  already rebased 2:3504f44bffc0 "P0" (f.patch qbase) as ebe9914c0d1c
-  rebasing 3:929394423cd3 "P1" (f2.patch qtip)
+  already rebased 2:3504f44bffc0 f.patch qbase "P0" as ebe9914c0d1c
+  rebasing 3:929394423cd3 f2.patch qtip "P1"
   saved backup bundle to $TESTTMP/a/.hg/strip-backup/3504f44bffc0-30595b40-rebase.hg
 
   $ hg tglog
@@ -203,8 +203,8 @@ Adding one git-style patch and one norma
 Rebase the applied mq patches:
 
   $ hg rebase -s 2 -d 1
-  rebasing 2:0c587ffcb480 "P0 (git)" (f_git.patch qbase)
-  rebasing 3:c7f18665e4bc "P1" (f.patch qtip tip)
+  rebasing 2:0c587ffcb480 f_git.patch qbase "P0 (git)"
+  rebasing 3:c7f18665e4bc f.patch qtip tip "P1"
   saved backup bundle to $TESTTMP/a/.hg/strip-backup/0c587ffcb480-0ea5695f-rebase.hg
 
   $ hg qci -m 'save patch state'
@@ -337,7 +337,7 @@ removed from the series):
   foo
   $ [ -f .hg/patches/empty-important ]
   $ hg -q rebase -d 2
-  note: not rebasing 1:0aaf4c3af7eb "important commit message" (empty-important qbase), its destination already has all its changes
+  note: not rebasing 1:0aaf4c3af7eb empty-important qbase "important commit message", its destination already has all its changes
   $ hg qseries
   guarded
   bar
diff --git a/tests/test-rebase-named-branches.t b/tests/test-rebase-named-branches.t
--- a/tests/test-rebase-named-branches.t
+++ b/tests/test-rebase-named-branches.t
@@ -72,7 +72,7 @@ Branch name containing a dash (issue3181
   rebasing 5:24b6387c8c8c "F"
   rebasing 6:eea13746799a "G"
   rebasing 7:02de42196ebe "H"
-  rebasing 9:cb039b7cae8e "dev-two named branch" (tip)
+  rebasing 9:cb039b7cae8e tip "dev-two named branch"
   saved backup bundle to $TESTTMP/a1/.hg/strip-backup/24b6387c8c8c-24cb8001-rebase.hg
 
   $ hg tglog
@@ -101,7 +101,7 @@ Branch name containing a dash (issue3181
   rebasing 6:24de4aff8e28 "F"
   rebasing 7:4b988a958030 "G"
   rebasing 8:31d0e4ba75e6 "H"
-  rebasing 9:9e70cd31750f "dev-two named branch" (tip)
+  rebasing 9:9e70cd31750f tip "dev-two named branch"
   saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-c4ee9ef5-rebase.hg
 
   $ hg tglog
@@ -190,7 +190,7 @@ Branch name containing a dash (issue3181
   rebasing 6:679f28760620 "F"
   rebasing 7:549f007a9f5f "G"
   rebasing 8:12b2bc666e20 "H"
-  rebasing 9:71325f8bc082 "dev-two named branch" (tip)
+  rebasing 9:71325f8bc082 tip "dev-two named branch"
   saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-6cdd1a52-rebase.hg
 
   $ hg tglog
@@ -253,7 +253,7 @@ Rebasing descendant onto ancestor across
   rebasing 6:3944801ae4ea "dev-two named branch"
   rebasing 7:3bdb949809d9 "B"
   rebasing 8:a0d543090fa4 "C"
-  rebasing 9:e9f862ce8bad "D" (tip)
+  rebasing 9:e9f862ce8bad tip "D"
   saved backup bundle to $TESTTMP/a1/.hg/strip-backup/3944801ae4ea-fb46ed74-rebase.hg
 
   $ hg tglog
@@ -344,7 +344,7 @@ source or destination.
 
   $ hg rebase -s tip -d 4 --dry-run
   starting dry-run rebase; repository will not be changed
-  rebasing 11:be1dea60f2a6 "D" (tip)
+  rebasing 11:be1dea60f2a6 tip "D"
   dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase
   $ hg diff
   diff -r 2b586e70108d A
@@ -360,7 +360,7 @@ unrelated to the source or destination.
   $ echo A-mod > A
   $ echo n | hg rebase -s tip -d 4 --confirm --config ui.interactive=True
   starting in-memory rebase
-  rebasing 11:be1dea60f2a6 "D" (tip)
+  rebasing 11:be1dea60f2a6 tip "D"
   rebase completed successfully
   apply changes (yn)? n
   $ hg diff
@@ -374,7 +374,7 @@ unrelated to the source or destination.
   $ echo A-mod > A
   $ hg rebase -s tip -d 4 --confirm
   starting in-memory rebase
-  rebasing 11:be1dea60f2a6 "D" (tip)
+  rebasing 11:be1dea60f2a6 tip "D"
   rebase completed successfully
   apply changes (yn)? y
   saved backup bundle to $TESTTMP/a1/.hg/strip-backup/be1dea60f2a6-ca6d2dac-rebase.hg
@@ -527,8 +527,8 @@ rebase 'c1' to the branch head 'c2' that
   marked working directory as branch x
   $ hg rebase -r 3:: -d .
   rebasing 3:76abc1c6f8c7 "b1"
-  rebasing 4:8427af5d86f2 "c2 closed" (tip)
-  note: not rebasing 4:8427af5d86f2 "c2 closed" (tip), its destination already has all its changes
+  rebasing 4:8427af5d86f2 tip "c2 closed"
+  note: not rebasing 4:8427af5d86f2 tip "c2 closed", its destination already has all its changes
   saved backup bundle to $TESTTMP/case2/.hg/strip-backup/76abc1c6f8c7-cd698d13-rebase.hg
   $ hg tglog
   o  3: 117b0ed08075 'b1' x
diff --git a/tests/test-rebase-newancestor.t b/tests/test-rebase-newancestor.t
--- a/tests/test-rebase-newancestor.t
+++ b/tests/test-rebase-newancestor.t
@@ -251,7 +251,7 @@ rebase of merge of ancestors
   $ echo 'other change while merging future "rebase ancestors"' > other
   $ hg ci -Aqm 'merge rebase ancestors'
   $ hg rebase -d 5 -v
-  rebasing 6:4c5f12f25ebe "merge rebase ancestors" (tip)
+  rebasing 6:4c5f12f25ebe tip "merge rebase ancestors"
   resolving manifests
   removing other
   resolving manifests
@@ -310,9 +310,9 @@ may include unwanted content:
   > R
   > EOS
   $ hg rebase -r D+E+F -d Z
-  rebasing 5:5f2c926dfecf "D" (D)
-  rebasing 6:b296604d9846 "E" (E)
-  rebasing 7:caa9781e507d "F" (F tip)
+  rebasing 5:5f2c926dfecf D "D"
+  rebasing 6:b296604d9846 E "E"
+  rebasing 7:caa9781e507d F tip "F"
   abort: rebasing 7:caa9781e507d will include unwanted changes from 4:d6003a550c2c or 3:c1e6b162678d
   [255]
 
@@ -330,9 +330,9 @@ The warning does not get printed if ther
   > R
   > EOS
   $ hg rebase -r B+C+D -d Z
-  rebasing 3:c1e6b162678d "B" (B)
-  rebasing 4:d6003a550c2c "C" (C)
-  rebasing 5:c8f78076273e "D" (D tip)
+  rebasing 3:c1e6b162678d B "B"
+  rebasing 4:d6003a550c2c C "C"
+  rebasing 5:c8f78076273e D tip "D"
   saved backup bundle to $TESTTMP/dual-merge-base2/.hg/strip-backup/d6003a550c2c-6f1424b6-rebase.hg
   $ hg manifest -r 'desc(D)'
   B
@@ -352,8 +352,8 @@ The merge base could be different from o
   > B C Z
   > EOS
   $ hg rebase -r D+F -d Z
-  rebasing 3:004dc1679908 "D" (D)
-  rebasing 5:4be4cbf6f206 "F" (F tip)
+  rebasing 3:004dc1679908 D "D"
+  rebasing 5:4be4cbf6f206 F tip "F"
   saved backup bundle to $TESTTMP/chosen-merge-base1/.hg/strip-backup/004dc1679908-06a66a3c-rebase.hg
   $ hg manifest -r 'desc(F)'
   C
@@ -373,8 +373,8 @@ The merge base could be different from o
   > B C Z
   > EOS
   $ hg rebase -r E+F -d Z
-  rebasing 4:974e4943c210 "E" (E)
-  rebasing 5:4be4cbf6f206 "F" (F tip)
+  rebasing 4:974e4943c210 E "E"
+  rebasing 5:4be4cbf6f206 F tip "F"
   saved backup bundle to $TESTTMP/chosen-merge-base2/.hg/strip-backup/974e4943c210-b2874da5-rebase.hg
   $ hg manifest -r 'desc(F)'
   B
diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t
--- a/tests/test-rebase-obsolete.t
+++ b/tests/test-rebase-obsolete.t
@@ -210,7 +210,7 @@ More complex case where part of the reba
   
   $ hg rebase --source 'desc(B)' --dest 'tip' --config experimental.rebaseskipobsolete=True
   rebasing 8:8877864f1edb "B"
-  note: not rebasing 9:08483444fef9 "D", already in destination as 11:4596109a6a43 "D" (tip)
+  note: not rebasing 9:08483444fef9 "D", already in destination as 11:4596109a6a43 tip "D"
   rebasing 10:5ae4c968c6ac "C"
   $ hg debugobsolete
   42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'rebase', 'user': 'test'}
@@ -258,7 +258,7 @@ More complex case where part of the reba
   grafting 11:4596109a6a43 "D"
   $ hg up -qr 'desc(E)'
   $ hg rebase -s tip -d .
-  rebasing 14:9e36056a46e3 "D" (tip)
+  rebasing 14:9e36056a46e3 tip "D"
   $ hg log --style default --debug -r tip
   changeset:   15:627d4614809036ba22b9e7cb31638ddc06ab99ab
   tag:         tip
@@ -518,7 +518,7 @@ Test multiple root handling
   $ hg rebase --dest 4 --rev '7+11+9'
   rebasing 9:cf44d2f5a9f4 "D"
   rebasing 7:02de42196ebe "H"
-  rebasing 11:0d8f238b634c "C" (tip)
+  rebasing 11:0d8f238b634c tip "C"
   $ hg log -G
   o  14:1e8370e38cca C
   |
@@ -556,9 +556,9 @@ Detach both parents
   > EOF
 
   $ hg rebase -d G -r 'B + D + F'
-  rebasing 1:112478962961 "B" (B)
-  rebasing 2:b18e25de2cf5 "D" (D)
-  rebasing 6:f15c3adaf214 "F" (F tip)
+  rebasing 1:112478962961 B "B"
+  rebasing 2:b18e25de2cf5 D "D"
+  rebasing 6:f15c3adaf214 F tip "F"
   abort: cannot rebase 6:f15c3adaf214 without moving at least one of its parents
   [255]
 
@@ -612,7 +612,7 @@ test on rebase dropping a merge
   $ hg rebase --dest 6 --rev '((desc(H) + desc(D))::) - desc(M)'
   rebasing 3:32af7686d403 "D"
   rebasing 7:02de42196ebe "H"
-  rebasing 9:4bde274eefcf "I" (tip)
+  rebasing 9:4bde274eefcf tip "I"
   1 new orphan changesets
   $ hg log -G
   @  12:acd174b7ab39 I
@@ -656,7 +656,7 @@ Test hidden changesets in the rebase set
 
   $ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off
   rebasing 9:4bde274eefcf "I"
-  rebasing 13:06edfc82198f "J" (tip)
+  rebasing 13:06edfc82198f tip "J"
   2 new content-divergent changesets
   $ hg log -G
   @  15:5ae8a643467b J
@@ -787,7 +787,7 @@ Rebase finds its way in a chain of marke
 
   $ hg rebase -d 'desc(B2)'
   note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 3:261e70097290 "B2"
-  rebasing 4:212cb178bcbb "C" (tip)
+  rebasing 4:212cb178bcbb tip "C"
 
 Even when the chain include missing node
 
@@ -816,7 +816,7 @@ Even when the chain include missing node
 
   $ hg rebase -d 'desc(B2)'
   note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 2:261e70097290 "B2"
-  rebasing 5:1a79b7535141 "D" (tip)
+  rebasing 5:1a79b7535141 tip "D"
   $ hg up 4
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo "O" > O
@@ -845,7 +845,7 @@ Even when the chain include missing node
   $ hg rebase -d 6 -r "4::"
   rebasing 4:ff2c4d47b71d "C"
   note: not rebasing 7:360bbaa7d3ce "O", it has no successor
-  rebasing 8:8d47583e023f "P" (tip)
+  rebasing 8:8d47583e023f tip "P"
 
 If all the changeset to be rebased are obsolete and present in the destination, we
 should display a friendly error message
@@ -885,7 +885,7 @@ should display a friendly error message
   o  0:4a2df7238c3b A
   
   $ hg rebase -r . -d 10
-  note: not rebasing 11:f44da1f4954c "nonrelevant" (tip), it has no successor
+  note: not rebasing 11:f44da1f4954c tip "nonrelevant", it has no successor
 
 If a rebase is going to create divergence, it should abort
 
@@ -970,7 +970,7 @@ With experimental.evolution.allowdiverge
 
   $ hg rebase -s 10 -d 12 --config experimental.evolution.allowdivergence=True
   rebasing 10:121d9e3bc4c6 "P"
-  rebasing 14:73568ab6879d "bar foo" (tip)
+  rebasing 14:73568ab6879d tip "bar foo"
   2 new content-divergent changesets
   $ hg summary
   parent: 16:61bd55f69bc4 tip
@@ -1041,7 +1041,7 @@ Create the changes that we will rebase
   $ hg rebase --continue
   rebasing 19:b82fb57ea638 "willconflict second version"
   note: not rebasing 20:8b31da3c4919 "dummy change", already in destination as 18:601db7a18f51 "dummy change successor"
-  rebasing 21:7bdc8a87673d "dummy change" (tip)
+  rebasing 21:7bdc8a87673d tip "dummy change"
   $ cd ..
 
 Divergence cases due to obsolete changesets
@@ -1096,11 +1096,11 @@ would occur because the successor of d (
 consequence f (descendant of d) is left behind.
 
   $ hg rebase -b 'e' -d 'x'
-  rebasing 1:488e1b7e7341 "b" (b)
-  rebasing 3:a82ac2b38757 "c" (c)
-  rebasing 5:027ad6c5830d "d'" (d')
-  rebasing 6:d60ebfa0f1cb "e" (e)
-  note: not rebasing 4:76be324c128b "d" (d) and its descendants as this would cause divergence
+  rebasing 1:488e1b7e7341 b "b"
+  rebasing 3:a82ac2b38757 c "c"
+  rebasing 5:027ad6c5830d d' "d'"
+  rebasing 6:d60ebfa0f1cb e "e"
+  note: not rebasing 4:76be324c128b d "d" and its descendants as this would cause divergence
   $ hg log -G -r 'a'::
   o  11:eb6d63fc4ed5 e
   |
@@ -1154,9 +1154,9 @@ By allowing divergence, we can perform t
   (to force the rebase please set experimental.evolution.allowdivergence=True)
   [255]
   $ hg rebase --config experimental.evolution.allowdivergence=true -r 'c'::'f' -d 'x'
-  rebasing 3:a82ac2b38757 "c" (c)
-  rebasing 4:76be324c128b "d" (d)
-  rebasing 7:1143e9adc121 "f" (f tip)
+  rebasing 3:a82ac2b38757 c "c"
+  rebasing 4:76be324c128b d "d"
+  rebasing 7:1143e9adc121 f tip "f"
   1 new orphan changesets
   2 new content-divergent changesets
   $ hg log -G -r 'a':: -T instabilities
@@ -1187,9 +1187,9 @@ By allowing divergence, we can perform t
 (Not skipping obsoletes means that divergence is allowed.)
 
   $ hg rebase --config experimental.rebaseskipobsolete=false -r 'c'::'f' -d 'x'
-  rebasing 3:a82ac2b38757 "c" (c)
-  rebasing 4:76be324c128b "d" (d)
-  rebasing 7:1143e9adc121 "f" (f tip)
+  rebasing 3:a82ac2b38757 c "c"
+  rebasing 4:76be324c128b d "d"
+  rebasing 7:1143e9adc121 f tip "f"
   1 new orphan changesets
   2 new content-divergent changesets
 
@@ -1231,12 +1231,12 @@ Similar test on a more complex graph
   o  0:b173517d0057 a
   
   $ hg rebase -b 'f' -d 'x'
-  rebasing 1:488e1b7e7341 "b" (b)
-  rebasing 3:a82ac2b38757 "c" (c)
-  rebasing 5:63324dc512ea "e'" (e')
-  rebasing 7:3ffec603ab53 "f" (f)
-  rebasing 4:76be324c128b "d" (d)
-  note: not rebasing 6:e36fae928aec "e" (e) and its descendants as this would cause divergence
+  rebasing 1:488e1b7e7341 b "b"
+  rebasing 3:a82ac2b38757 c "c"
+  rebasing 5:63324dc512ea e' "e'"
+  rebasing 7:3ffec603ab53 f "f"
+  rebasing 4:76be324c128b d "d"
+  note: not rebasing 6:e36fae928aec e "e" and its descendants as this would cause divergence
   $ hg log -G -r 'a':
   o  13:a1707a5b7c2c d
   |
@@ -1294,7 +1294,7 @@ issue5782
   o  0:b173517d0057 a
   
   $ hg rebase -d 0 -r 2
-  rebasing 2:a82ac2b38757 "c" (c)
+  rebasing 2:a82ac2b38757 c "c"
   $ hg log -G -r 'a': --hidden
   o  5:69ad416a4a26 c
   |
@@ -1325,8 +1325,8 @@ Rebase merge where successor of one pare
   1 new orphan changesets
 
   $ hg rebase -d B -s D
-  note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
-  rebasing 4:66f1a38021c9 "F" (F tip)
+  note: not rebasing 2:b18e25de2cf5 D "D", already in destination as 1:112478962961 B "B"
+  rebasing 4:66f1a38021c9 F tip "F"
   $ hg log -G
   o    5:50e9d60b99c6 F
   |\
@@ -1357,8 +1357,8 @@ Rebase merge where successor of other pa
   1 new orphan changesets
 
   $ hg rebase -d B -s E
-  note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
-  rebasing 4:66f1a38021c9 "F" (F tip)
+  note: not rebasing 3:7fb047a69f22 E "E", already in destination as 1:112478962961 B "B"
+  rebasing 4:66f1a38021c9 F tip "F"
   $ hg log -G
   o    5:aae1787dacee F
   |\
@@ -1389,8 +1389,8 @@ Rebase merge where successor of one pare
   1 new orphan changesets
 
   $ hg rebase -d C -s D
-  note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
-  rebasing 5:66f1a38021c9 "F" (F tip)
+  note: not rebasing 2:b18e25de2cf5 D "D", already in destination as 1:112478962961 B "B"
+  rebasing 5:66f1a38021c9 F tip "F"
 
   $ hg log -G
   o    6:0913febf6439 F
@@ -1424,8 +1424,8 @@ Rebase merge where successor of other pa
   1 new orphan changesets
 
   $ hg rebase -d C -s E
-  note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
-  rebasing 5:66f1a38021c9 "F" (F tip)
+  note: not rebasing 3:7fb047a69f22 E "E", already in destination as 1:112478962961 B "B"
+  rebasing 5:66f1a38021c9 F tip "F"
   $ hg log -G
   o    6:c6ab0cc6d220 F
   |\
@@ -1458,10 +1458,10 @@ Rebase merge where successor of one pare
   1 new orphan changesets
 
   $ hg rebase -d C -b F
-  rebasing 2:b18e25de2cf5 "D" (D)
-  note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
-  rebasing 5:66f1a38021c9 "F" (F tip)
-  note: not rebasing 5:66f1a38021c9 "F" (F tip), its destination already has all its changes
+  rebasing 2:b18e25de2cf5 D "D"
+  note: not rebasing 3:7fb047a69f22 E "E", already in destination as 1:112478962961 B "B"
+  rebasing 5:66f1a38021c9 F tip "F"
+  note: not rebasing 5:66f1a38021c9 F tip "F", its destination already has all its changes
   $ hg log -G
   o  6:8f47515dda15 D
   |
@@ -1494,10 +1494,10 @@ Rebase merge where successor of other pa
   1 new orphan changesets
 
   $ hg rebase -d C -b F
-  note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
-  rebasing 3:7fb047a69f22 "E" (E)
-  rebasing 5:66f1a38021c9 "F" (F tip)
-  note: not rebasing 5:66f1a38021c9 "F" (F tip), its destination already has all its changes
+  note: not rebasing 2:b18e25de2cf5 D "D", already in destination as 1:112478962961 B "B"
+  rebasing 3:7fb047a69f22 E "E"
+  rebasing 5:66f1a38021c9 F tip "F"
+  note: not rebasing 5:66f1a38021c9 F tip "F", its destination already has all its changes
 
   $ hg log -G
   o  6:533690786a86 E
@@ -1531,8 +1531,8 @@ destination
   > EOF
 
   $ hg rebase -d D -s B
-  rebasing 1:112478962961 "B" (B)
-  note: not rebasing 3:26805aba1e60 "C" (C) and its descendants as this would cause divergence
+  rebasing 1:112478962961 B "B"
+  note: not rebasing 3:26805aba1e60 C "C" and its descendants as this would cause divergence
 
   $ cd ..
 
@@ -1581,9 +1581,9 @@ Rebase merge where both parents have suc
   > EOS
   1 new orphan changesets
   $ hg rebase -r A+B+E -d F
-  note: not rebasing 4:a3d17304151f "A" (A), already in destination as 0:96cc3511f894 "C" (C)
-  note: not rebasing 5:b23a2cc00842 "B" (B), already in destination as 1:058c1e1fb10a "D" (D)
-  rebasing 7:dac5d11c5a7d "E" (E tip)
+  note: not rebasing 4:a3d17304151f A "A", already in destination as 0:96cc3511f894 C "C"
+  note: not rebasing 5:b23a2cc00842 B "B", already in destination as 1:058c1e1fb10a D "D"
+  rebasing 7:dac5d11c5a7d E tip "E"
   abort: rebasing 7:dac5d11c5a7d will include unwanted changes from 3:59c792af609c, 5:b23a2cc00842 or 2:ba2b7fa7166d, 4:a3d17304151f
   [255]
   $ cd ..
@@ -1600,9 +1600,9 @@ parent moves as requested.
   > EOS
   1 new orphan changesets
   $ hg rebase -r A+B+D -d Z
-  note: not rebasing 0:426bada5c675 "A" (A), already in destination as 2:96cc3511f894 "C" (C)
-  rebasing 1:fc2b737bb2e5 "B" (B)
-  rebasing 3:b8ed089c80ad "D" (D)
+  note: not rebasing 0:426bada5c675 A "A", already in destination as 2:96cc3511f894 C "C"
+  rebasing 1:fc2b737bb2e5 B "B"
+  rebasing 3:b8ed089c80ad D "D"
 
   $ rm .hg/localtags
   $ hg log -G
@@ -1631,9 +1631,9 @@ parent moves as requested.
   > EOS
   1 new orphan changesets
   $ hg rebase -r B+A+D -d Z
-  rebasing 0:426bada5c675 "A" (A)
-  note: not rebasing 1:fc2b737bb2e5 "B" (B), already in destination as 2:96cc3511f894 "C" (C)
-  rebasing 3:b8ed089c80ad "D" (D)
+  rebasing 0:426bada5c675 A "A"
+  note: not rebasing 1:fc2b737bb2e5 B "B", already in destination as 2:96cc3511f894 C "C"
+  rebasing 3:b8ed089c80ad D "D"
 
   $ rm .hg/localtags
   $ hg log -G
@@ -1669,7 +1669,7 @@ equivalents in destination
   adding b
   created new head
   $ hg rebase -r 2 -d 1
-  rebasing 2:1e9a3c00cbe9 "b" (tip)
+  rebasing 2:1e9a3c00cbe9 tip "b"
   $ hg log -r .  # working dir is at rev 3 (successor of 2)
   3:be1832deae9a b (no-eol)
   $ hg book -r 2 mybook --hidden  # rev 2 has a bookmark on it now
@@ -1679,7 +1679,7 @@ equivalents in destination
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   2:1e9a3c00cbe9 b (rewritten using rebase as 3:be1832deae9a) (no-eol)
   $ hg rebase -r 2 -d 3 --config experimental.evolution.track-operation=1
-  note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b" (tip)
+  note: not rebasing 2:1e9a3c00cbe9 mybook "b", already in destination as 3:be1832deae9a tip "b"
 Check that working directory and bookmark was updated to rev 3 although rev 2
 was skipped
   $ hg log -r .
@@ -1706,8 +1706,8 @@ parent gets moved:
   $ hg update D1 -q
   $ hg bookmark book -i
   $ hg rebase -r B+D1 -d E
-  rebasing 1:112478962961 "B" (B)
-  note: not rebasing 5:15ecf15e0114 "D1" (book D1 tip), already in destination as 2:0807738e0be9 "D2" (D2)
+  rebasing 1:112478962961 B "B"
+  note: not rebasing 5:15ecf15e0114 D1 tip book "D1", already in destination as 2:0807738e0be9 D2 "D2"
   1 new orphan changesets
   $ hg log -G -T '{desc} {bookmarks}'
   @  B book
@@ -1819,7 +1819,7 @@ Also test --continue for the above case
   continue: hg rebase --continue
   $ hg rebase --continue
   rebasing 1:2ec65233581b "B"
-  rebasing 3:7829726be4dc "C" (tip)
+  rebasing 3:7829726be4dc tip "C"
   $ hg log -G
   @  5:1964d5d5b547 C
   |
@@ -2112,9 +2112,9 @@ Test --stop moves bookmarks of original 
   o  0: 1994f17a630e 'A' bookmarks:
   
   $ hg rebase -s 1 -d 5
-  rebasing 1:6c81ed0049f8 "B" (X)
-  rebasing 2:49cb3485fa0c "C" (Y)
-  rebasing 3:67a385d4e6f2 "D" (Z)
+  rebasing 1:6c81ed0049f8 X "B"
+  rebasing 2:49cb3485fa0c Y "C"
+  rebasing 3:67a385d4e6f2 Z "D"
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
diff --git a/tests/test-rebase-parameters.t b/tests/test-rebase-parameters.t
--- a/tests/test-rebase-parameters.t
+++ b/tests/test-rebase-parameters.t
@@ -451,8 +451,8 @@ Test --tool parameter:
   $ cd b1
 
   $ hg rebase -s 2 -d 1 --tool internal:local
-  rebasing 2:e4e3f3546619 "c2b" (tip)
-  note: not rebasing 2:e4e3f3546619 "c2b" (tip), its destination already has all its changes
+  rebasing 2:e4e3f3546619 tip "c2b"
+  note: not rebasing 2:e4e3f3546619 tip "c2b", its destination already has all its changes
   saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg
 
   $ hg cat c2
@@ -465,7 +465,7 @@ Test --tool parameter:
   $ cd b2
 
   $ hg rebase -s 2 -d 1 --tool internal:other
-  rebasing 2:e4e3f3546619 "c2b" (tip)
+  rebasing 2:e4e3f3546619 tip "c2b"
   saved backup bundle to $TESTTMP/b2/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg
 
   $ hg cat c2
@@ -478,7 +478,7 @@ Test --tool parameter:
   $ cd b3
 
   $ hg rebase -s 2 -d 1 --tool internal:fail
-  rebasing 2:e4e3f3546619 "c2b" (tip)
+  rebasing 2:e4e3f3546619 tip "c2b"
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
   [1]
 
@@ -502,8 +502,8 @@ Test --tool parameter:
   (continue: hg rebase --continue)
   [255]
   $ hg rebase -c --tool internal:fail
-  rebasing 2:e4e3f3546619 "c2b" (tip)
-  note: not rebasing 2:e4e3f3546619 "c2b" (tip), its destination already has all its changes
+  rebasing 2:e4e3f3546619 tip "c2b"
+  note: not rebasing 2:e4e3f3546619 tip "c2b", its destination already has all its changes
   saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg
 
   $ hg rebase -i
diff --git a/tests/test-rebase-partial.t b/tests/test-rebase-partial.t
--- a/tests/test-rebase-partial.t
+++ b/tests/test-rebase-partial.t
@@ -35,8 +35,8 @@ Rebase two commits, of which one is alre
   > |/
   > A
   > EOF
-  rebasing 2:b18e25de2cf5 "D" (D)
-  already rebased 3:26805aba1e60 "C" (C tip)
+  rebasing 2:b18e25de2cf5 D "D"
+  already rebased 3:26805aba1e60 C tip "C"
   o  4: fe3b4c6498fa D
   |
   | o  3: 26805aba1e60 C
@@ -56,8 +56,8 @@ Can collapse commits even if one is alre
   > |/
   > A
   > EOF
-  rebasing 2:b18e25de2cf5 "D" (D)
-  rebasing 3:26805aba1e60 "C" (C tip)
+  rebasing 2:b18e25de2cf5 D "D"
+  rebasing 3:26805aba1e60 C tip "C"
   o  4: a2493f4ace65 Collapsed revision
   |  * D
   |  * C
@@ -81,7 +81,7 @@ Abort doesn't lose the commits that were
   > A
   > EOF
   $ hg rebase -r C+D -d B
-  rebasing 2:ef8c0fe0897b "D" (D)
+  rebasing 2:ef8c0fe0897b D "D"
   merging file
   warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -111,8 +111,8 @@ the hole (B below), not on top of the de
   > |
   > A
   > EOF
-  already rebased 1:112478962961 "B" (B)
-  rebasing 3:f585351a92f8 "D" (D tip)
+  already rebased 1:112478962961 B "B"
+  rebasing 3:f585351a92f8 D tip "D"
   o  4: 1e6da8103bc7 D
   |
   | x  3: f585351a92f8 D
diff --git a/tests/test-rebase-rename.t b/tests/test-rebase-rename.t
--- a/tests/test-rebase-rename.t
+++ b/tests/test-rebase-rename.t
@@ -60,7 +60,7 @@ Rename is tracked:
 Rebase the revision containing the rename:
 
   $ hg rebase -s 3 -d 2
-  rebasing 3:73a3ee40125d "rename A" (tip)
+  rebasing 3:73a3ee40125d tip "rename A"
   saved backup bundle to $TESTTMP/a/.hg/strip-backup/73a3ee40125d-1d78ebcf-rebase.hg
 
   $ hg tglog
@@ -134,8 +134,8 @@ Rebased revision does not contain inform
   o  0: 1994f17a630e 'A'
   
   $ hg rebase -s 5 -d 4
-  rebasing 5:af8ad1f97097 "E" (tip)
-  note: not rebasing 5:af8ad1f97097 "E" (tip), its destination already has all its changes
+  rebasing 5:af8ad1f97097 tip "E"
+  note: not rebasing 5:af8ad1f97097 tip "E", its destination already has all its changes
   saved backup bundle to $TESTTMP/a/.hg/strip-backup/af8ad1f97097-c3e90708-rebase.hg
   $ hg tglog
   @  4: 60f545c27784 'E'
@@ -207,7 +207,7 @@ Copy is tracked:
 Rebase the revision containing the copy:
 
   $ hg rebase -s 3 -d 2
-  rebasing 3:0a8162ff18a8 "copy A" (tip)
+  rebasing 3:0a8162ff18a8 tip "copy A"
   saved backup bundle to $TESTTMP/b/.hg/strip-backup/0a8162ff18a8-dd06302a-rebase.hg
 
   $ hg tglog
@@ -291,7 +291,7 @@ Test rebase across repeating renames:
   
 
   $ hg rebase -s 4 -d 3
-  rebasing 4:b918d683b091 "Another unrelated change" (tip)
+  rebasing 4:b918d683b091 tip "Another unrelated change"
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/b918d683b091-3024bc57-rebase.hg
 
   $ hg diff --stat -c .
diff --git a/tests/test-rebase-scenario-global.t b/tests/test-rebase-scenario-global.t
--- a/tests/test-rebase-scenario-global.t
+++ b/tests/test-rebase-scenario-global.t
@@ -170,7 +170,7 @@ F onto E - rebase of a branching point (
   rebasing 5:24b6387c8c8c "F"
   rebasing 6:eea13746799a "G"
   note: not rebasing 6:eea13746799a "G", its destination already has all its changes
-  rebasing 7:02de42196ebe "H" (tip)
+  rebasing 7:02de42196ebe tip "H"
   saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg
 
   $ hg tglog
@@ -228,7 +228,7 @@ F onto B - G maintains E as parent:
   $ hg rebase -s 5 -d 1
   rebasing 5:24b6387c8c8c "F"
   rebasing 6:eea13746799a "G"
-  rebasing 7:02de42196ebe "H" (tip)
+  rebasing 7:02de42196ebe tip "H"
   saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg
 
   $ hg tglog
@@ -339,32 +339,32 @@ Check rebasing public changeset
 
   $ hg rebase -d 5 -b 6 --keep
   rebasing 6:e1c4361dd923 "C"
-  rebasing 7:c9659aac0000 "D" (tip)
+  rebasing 7:c9659aac0000 tip "D"
 
 Check rebasing mutable changeset
 Source phase greater or equal to destination phase: new changeset get the phase of source:
   $ hg id -n
   5
   $ hg rebase -s9 -d0
-  rebasing 9:2b23e52411f4 "D" (tip)
+  rebasing 9:2b23e52411f4 tip "D"
   saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-f942decf-rebase.hg
   $ hg id -n # check we updated back to parent
   5
   $ hg log --template "{phase}\n" -r 9
   draft
   $ hg rebase -s9 -d1
-  rebasing 9:2cb10d0cfc6c "D" (tip)
+  rebasing 9:2cb10d0cfc6c tip "D"
   saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-ddb0f256-rebase.hg
   $ hg log --template "{phase}\n" -r 9
   draft
   $ hg phase --force --secret 9
   $ hg rebase -s9 -d0
-  rebasing 9:c5b12b67163a "D" (tip)
+  rebasing 9:c5b12b67163a tip "D"
   saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-4e372053-rebase.hg
   $ hg log --template "{phase}\n" -r 9
   secret
   $ hg rebase -s9 -d1
-  rebasing 9:2a0524f868ac "D" (tip)
+  rebasing 9:2a0524f868ac tip "D"
   saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-cefd8574-rebase.hg
   $ hg log --template "{phase}\n" -r 9
   secret
@@ -461,7 +461,7 @@ Source on have two descendant heads but 
   rebasing 3:ffd453c31098 "D"
   rebasing 6:3d8a618087a7 "G"
   rebasing 7:72434a4e60b0 "H"
-  rebasing 8:479ddb54a924 "I" (tip)
+  rebasing 8:479ddb54a924 tip "I"
   $ hg tglog
   o  13: 9bf1d9358a90 'I'
   |
@@ -506,7 +506,7 @@ Base on have one descendant heads we ask
   rebasing 3:ffd453c31098 "D"
   rebasing 6:3d8a618087a7 "G"
   rebasing 7:72434a4e60b0 "H"
-  rebasing 8:479ddb54a924 "I" (tip)
+  rebasing 8:479ddb54a924 tip "I"
   $ hg tglog
   o  12: 9d7da0053b1c 'I'
   |
@@ -632,7 +632,7 @@ rebase on ancestor with revset
   $ hg rebase -r '6::' -d 2
   rebasing 6:3d8a618087a7 "G"
   rebasing 7:72434a4e60b0 "H"
-  rebasing 8:479ddb54a924 "I" (tip)
+  rebasing 8:479ddb54a924 tip "I"
   saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-b4f73f31-rebase.hg
   $ hg tglog
   o  8: fcb52e68a694 'I'
@@ -667,7 +667,7 @@ We would expect heads are I, F if it was
   rebasing 5:41bfcc75ed73 "F"
   rebasing 6:3d8a618087a7 "G"
   rebasing 7:72434a4e60b0 "H"
-  rebasing 8:479ddb54a924 "I" (tip)
+  rebasing 8:479ddb54a924 tip "I"
   saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-aae93a24-rebase.hg
   $ hg tglog
   o  8: 9136df9a87cf 'I'
@@ -736,7 +736,7 @@ each root have a different common ancest
 
   $ hg rebase --dest 'desc(G)' --rev 'desc(K) + desc(I)'
   rebasing 8:e7ec4e813ba6 "I"
-  rebasing 10:23a4ace37988 "K" (tip)
+  rebasing 10:23a4ace37988 tip "K"
   saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-b06984b3-rebase.hg
   $ hg log --rev 'children(desc(G))'
   changeset:   9:adb617877056
@@ -803,7 +803,7 @@ Test that rebase is not confused by $CWD
   rebasing 2:779a07b1b7a0 "first source commit"
   current directory was removed (rmcwd !)
   (consider changing to repo root: $TESTTMP/cwd-vanish) (rmcwd !)
-  rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip)
+  rebasing 3:a7d6f3a00bf3 tip "second source with subdir"
   saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-rebase.hg
 
 Get back to the root of cwd-vanish. Note that even though `cd ..`
@@ -979,7 +979,7 @@ Testing rebase being called inside anoth
   > EOS
 
   $ hg rebase -s C -d B
-  rebasing 2:dc0947a82db8 "C" (C tip)
+  rebasing 2:dc0947a82db8 C tip "C"
 
   $ [ -f .hg/rebasestate ] && echo 'WRONG: rebasestate should not exist'
   [1]
diff --git a/tests/test-rebase-transaction.t b/tests/test-rebase-transaction.t
--- a/tests/test-rebase-transaction.t
+++ b/tests/test-rebase-transaction.t
@@ -103,8 +103,8 @@ continued
   >   A
   > EOF
   $ hg rebase --collapse -b D -d Z
-  rebasing 1:112478962961 "B" (B)
-  rebasing 3:c26739dbe603 "C" (C)
+  rebasing 1:112478962961 B "B"
+  rebasing 3:c26739dbe603 C "C"
   merging conflict
   warning: conflicts while merging conflict! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -132,9 +132,9 @@ continued
   (no more unresolved files)
   continue: hg rebase --continue
   $ hg continue
-  already rebased 1:112478962961 "B" (B) as 79bc8f4973ce
-  rebasing 3:c26739dbe603 "C" (C)
-  rebasing 5:d24bb333861c "D" (D tip)
+  already rebased 1:112478962961 B "B" as 79bc8f4973ce
+  rebasing 3:c26739dbe603 C "C"
+  rebasing 5:d24bb333861c D tip "D"
   saved backup bundle to $TESTTMP/collapse-conflict/.hg/strip-backup/112478962961-b5b34645-rebase.hg
   $ hg tglog
   o  3: Collapsed revision
@@ -165,9 +165,9 @@ rebase can then be continued
   >   A
   > EOF
   $ HGEDITOR=false hg --config ui.interactive=1 rebase --collapse -b D -d Z
-  rebasing 1:112478962961 "B" (B)
-  rebasing 3:26805aba1e60 "C" (C)
-  rebasing 5:f585351a92f8 "D" (D tip)
+  rebasing 1:112478962961 B "B"
+  rebasing 3:26805aba1e60 C "C"
+  rebasing 5:f585351a92f8 D tip "D"
   transaction abort!
   rollback completed
   abort: edit failed: false exited with status 1
@@ -186,9 +186,9 @@ rebase can then be continued
   o  0: A
   
   $ hg continue
-  rebasing 1:112478962961 "B" (B)
-  rebasing 3:26805aba1e60 "C" (C)
-  rebasing 5:f585351a92f8 "D" (D tip)
+  rebasing 1:112478962961 B "B"
+  rebasing 3:26805aba1e60 C "C"
+  rebasing 5:f585351a92f8 D tip "D"
   saved backup bundle to $TESTTMP/collapse-cancel-editor/.hg/strip-backup/112478962961-cb2a9b47-rebase.hg
   $ hg tglog
   o  3: Collapsed revision
diff --git a/tests/test-remotefilelog-bgprefetch.t b/tests/test-remotefilelog-bgprefetch.t
--- a/tests/test-remotefilelog-bgprefetch.t
+++ b/tests/test-remotefilelog-bgprefetch.t
@@ -229,7 +229,7 @@
 .. flaky, the core the test is checked when checking the cache dir, so
 .. hopefully this flakyness is not hiding any actual bug.
   $ hg rebase -s temporary -d foo
-  rebasing 3:d9cf06e3b5b6 "b" (temporary tip)
+  rebasing 3:d9cf06e3b5b6 tip temporary "b"
   saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/d9cf06e3b5b6-e5c3dc63-rebase.hg
   ? files fetched over ? fetches - (? misses, 0.00% hit ratio) over *s (glob)
   $ find $CACHEDIR -type f | sort
diff --git a/tests/test-remotefilelog-linknodes.t b/tests/test-remotefilelog-linknodes.t
--- a/tests/test-remotefilelog-linknodes.t
+++ b/tests/test-remotefilelog-linknodes.t
@@ -32,7 +32,7 @@
   b292c1e3311f
 
   $ hg rebase -d 1
-  rebasing 2:0632994590a8 "xx" (tip)
+  rebasing 2:0632994590a8 tip "xx"
   saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/0632994590a8-0bc786d8-rebase.hg (glob)
   $ hg log -f x --template "{node|short}\n"
   81deab2073bc
@@ -41,14 +41,14 @@
 # Rebase back, log -f still works
 
   $ hg rebase -d 0 -r 2
-  rebasing 2:81deab2073bc "xx" (tip)
+  rebasing 2:81deab2073bc tip "xx"
   saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/81deab2073bc-80cb4fda-rebase.hg (glob)
   $ hg log -f x --template "{node|short}\n"
   b3fca10fb42d
   b292c1e3311f
 
   $ hg rebase -d 1 -r 2
-  rebasing 2:b3fca10fb42d "xx" (tip)
+  rebasing 2:b3fca10fb42d tip "xx"
   saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/b3fca10fb42d-da73a0c7-rebase.hg (glob)
 
   $ cd ..
diff --git a/tests/test-remotefilelog-sparse.t b/tests/test-remotefilelog-sparse.t
--- a/tests/test-remotefilelog-sparse.t
+++ b/tests/test-remotefilelog-sparse.t
@@ -99,4 +99,4 @@ pulled
   $ hg prefetch -r '. + .^' -I x -I z
   4 files fetched over 1 fetches - (4 misses, 0.00% hit ratio) over * (glob)
   $ hg rebase -d 2 --keep
-  rebasing 1:876b1317060d "x2" (foo)
+  rebasing 1:876b1317060d foo "x2"
diff --git a/tests/test-shelve2.t b/tests/test-shelve2.t
--- a/tests/test-shelve2.t
+++ b/tests/test-shelve2.t
@@ -54,7 +54,7 @@ shelve should leave dirstate clean (issu
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg rebase -d 6c103be8f4e4 --config extensions.rebase=
-  rebasing 2:323bfa07f744 "xyz"( \(tip\))? (re)
+  rebasing 2:323bfa07f744( tip)? "xyz" (re)
   merging x
   saved backup bundle to \$TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-(78114325|7ae538ef)-rebase.hg (re)
   $ hg unshelve
diff --git a/tests/test-sparse.t b/tests/test-sparse.t
--- a/tests/test-sparse.t
+++ b/tests/test-sparse.t
@@ -196,7 +196,7 @@ For now, manually remove the files
 Verify rebase temporarily includes excluded files
 
   $ hg rebase -d 1 -r 2 --config extensions.rebase=
-  rebasing 2:b91df4f39e75 "edit hide" (tip)
+  rebasing 2:b91df4f39e75 tip "edit hide"
   temporarily included 2 file(s) in the sparse checkout for merging
   merging hide
   warning: conflicts while merging hide! (edit, then use 'hg resolve --mark')
@@ -279,7 +279,7 @@ Verify rebase succeeds if all changed fi
 
   $ hg commit -Aqm "add show2"
   $ hg rebase -d 1 --config extensions.rebase=
-  rebasing 2:bdde55290160 "add show2" (tip)
+  rebasing 2:bdde55290160 tip "add show2"
   saved backup bundle to $TESTTMP/myrepo/.hg/strip-backup/bdde55290160-216ed9c6-rebase.hg
 
 Verify log --sparse only shows commits that affect the sparse checkout
diff --git a/tests/test-split.t b/tests/test-split.t
--- a/tests/test-split.t
+++ b/tests/test-split.t
@@ -368,9 +368,9 @@ Split a non-head
   $ cp -R . ../d
 
   $ runsplit -r 1 | grep rebasing
-  rebasing 2:b5c5ea414030 "d1" (d1)
-  rebasing 3:f4a0a8d004cc "d2" (d2)
-  rebasing 4:777940761eba "d3" (d3)
+  rebasing 2:b5c5ea414030 d1 "d1"
+  rebasing 3:f4a0a8d004cc d2 "d2"
+  rebasing 4:777940761eba d3 "d3"
 #if obsstore-off
   $ hg bookmark
      d1                        4:c4b449ef030e