rebase: remove rev number from rebase output

Summary: Revision numbers are deprecated, let's not print them in the rebase output. The tests were automatically fixed with run-tests.py -i Reviewed By: quark-zju Differential Revision: D17936451 fbshipit-source-id: a8f0403b6af4573421ca874e9311f26931eba697
2024-10-05 22:37:37 +03:00 · 2019-10-15 16:28:01 -07:00 · 2019-10-15 16:28:01 -07:00 · 8ed08b321f
commit 8ed08b321f
parent d1f94e520c
97 changed files with 822 additions and 822 deletions
--- a/edenscm/hgext/rebase.py
+++ b/edenscm/hgext/rebase.py
@ -138,7 +138,7 @@ def _revsetdestrebase(repo, subset, x):

 def _ctxdesc(ctx):
    """short description for a context"""
-    desc = '%d:%s "%s"' % (ctx.rev(), ctx, ctx.description().split("\n", 1)[0])
+    desc = '%s "%s"' % (ctx, ctx.description().split("\n", 1)[0])
    repo = ctx.repo()
    names = []
    for nsname, ns in repo.names.iteritems():
--- a/tests/test-amend-fold.t
+++ b/tests/test-amend-fold.t
@ -65,7 +65,7 @@ Test rebasing of stack after fold.
  $ hg fold --from '.^'
  2 changesets folded
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  rebasing 4:b762560d23fd "r4"
+  rebasing b762560d23fd "r4"
  merging mf
  $ showgraph
  o  10 c480ccdc36c0 r4
@ -86,13 +86,13 @@ Test rebasing of multiple children
  $ hg fold --from '.^'
  2 changesets folded
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  rebasing 5:* "r5" (glob)
+  rebasing 77d787dfa5b6 "r5"
  merging mf
-  rebasing 8:* "r6" (glob)
+  rebasing dd0541003d21 "r6"
  merging mf
-  rebasing 9:* "r2" (glob)
+  rebasing fac8d040c80b "r2"
  merging mf
-  rebasing 10:* "r4" (glob)
+  rebasing c480ccdc36c0 "r4"
  merging mf
  $ showgraph
  o  15 6b8dd87db039 r4
@ -132,15 +132,15 @@ rebase is not on the topmost folded commit.
  $ hg fold --from 2
  3 changesets folded
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  rebasing 3:a422badec216 "r3"
+  rebasing a422badec216 "r3"
  merging mf
-  rebasing 4:b762560d23fd "r4"
+  rebasing b762560d23fd "r4"
  merging mf
-  rebasing 5:77d787dfa5b6 "r5"
+  rebasing 77d787dfa5b6 "r5"
  merging mf
-  rebasing 6:ec6d8e65acbe "r6"
+  rebasing ec6d8e65acbe "r6"
  merging mf
-  rebasing 7:9c9414e0356c "r7"
+  rebasing 9c9414e0356c "r7"
  merging mf
  $ showgraph
  o  13 69b8281910bd r7
@ -174,9 +174,9 @@ Also test that using node hashes instead of rev numbers works.

  $ hg fold --exact 09bb8c f07e66 cb14eb
  3 changesets folded
-  rebasing 4:aa70f0fe546a "r4"
+  rebasing aa70f0fe546a "r4"
  merging mf
-  rebasing 5:f2987ebe5838 "r5"
+  rebasing f2987ebe5838 "r5"
  merging mf
  $ showgraph
  o  8 064f4cd2992f r5
--- a/tests/test-amend-hide-t.py
+++ b/tests/test-amend-hide-t.py
@ -124,7 +124,7 @@ sh % "hg hide -c" == r"""
 sh % "hg hide -c -r ." == r"""
    abort: --rev and --cleanup are incompatible
    [255]"""
-sh % "hg --config 'extensions.rebase=' rebase -s 5 -d 6" == 'rebasing 5:1f7934a9b4de "F"'
+sh % "hg --config 'extensions.rebase=' rebase -s 5 -d 6" == 'rebasing 1f7934a9b4de "F"'
 sh % "hg book -r 5 alive --hidden"
 sh % "hg log -G -T '{rev} {desc} {bookmarks}\\n'" == r"""
    o  7 F
--- a/tests/test-amend-nextrebase.t
+++ b/tests/test-amend-nextrebase.t
@ -70,7 +70,7 @@ Rebasing single changeset.
  abort: current changeset has no children
  [255]
  $ hg next --rebase
-  rebasing 2:776c07fa2b12 "r2"
+  rebasing 776c07fa2b12 "r2"
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  [8fb200] r2
  $ showgraph
@ -97,7 +97,7 @@ Test --clean flag.
  [255]
  $ hg next --rebase --clean
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  rebasing 3:137d867d71d5 "r3"
+  rebasing 137d867d71d5 "r3"
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  [f12433] r3
  $ hg status
@ -121,9 +121,9 @@ Rebasing multiple changesets at once.
  hint[amend-restack]: descendants of e8ec16b776b6 are left behind - use 'hg restack' to rebase them
  hint[hint-ack]: use 'hg hint --ack amend-restack' to silence these hints
  $ hg next --rebase --top
-  rebasing 2:776c07fa2b12 "r2"
-  rebasing 3:137d867d71d5 "r3"
-  rebasing 4:daa37004f338 "r4"
+  rebasing 776c07fa2b12 "r2"
+  rebasing 137d867d71d5 "r3"
+  rebasing daa37004f338 "r4"
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
  [d25685] r4
  $ showgraph
@ -147,11 +147,11 @@ Rebasing a stack one changeset at a time.
  hint[amend-restack]: descendants of e8ec16b776b6 are left behind - use 'hg restack' to rebase them
  hint[hint-ack]: use 'hg hint --ack amend-restack' to silence these hints
  $ hg next --rebase
-  rebasing 2:776c07fa2b12 "r2"
+  rebasing 776c07fa2b12 "r2"
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  [8fb200] r2
  $ hg next --rebase
-  rebasing 3:137d867d71d5 "r3"
+  rebasing 137d867d71d5 "r3"
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  [f12433] r3
  $ showgraph
@ -173,7 +173,7 @@ Rebasing a stack one changeset at a time.
  

  $ hg next --rebase
-  rebasing 4:daa37004f338 "r4"
+  rebasing daa37004f338 "r4"
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  [d25685] r4
  $ showgraph
@ -197,8 +197,8 @@ Rebasing a stack two changesets at a time.
  hint[amend-restack]: descendants of e8ec16b776b6 are left behind - use 'hg restack' to rebase them
  hint[hint-ack]: use 'hg hint --ack amend-restack' to silence these hints
  $ hg next --rebase 2
-  rebasing 2:776c07fa2b12 "r2"
-  rebasing 3:137d867d71d5 "r3"
+  rebasing 776c07fa2b12 "r2"
+  rebasing 137d867d71d5 "r3"
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  [f12433] r3
  $ showgraph
@ -221,8 +221,8 @@ Rebasing a stack two changesets at a time.
  o  0 r0
  
  $ hg next --rebase 2
-  rebasing 4:daa37004f338 "r4"
-  rebasing 5:5f333e6f7274 "r5"
+  rebasing daa37004f338 "r4"
+  rebasing 5f333e6f7274 "r5"
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  [dd153e] r5
  $ showgraph
@ -263,9 +263,9 @@ Rebasing after multiple amends.
  o  0 r0
  
  $ hg next --rebase --top
-  rebasing 2:776c07fa2b12 "r2"
-  rebasing 3:137d867d71d5 "r3"
-  rebasing 4:daa37004f338 "r4"
+  rebasing 776c07fa2b12 "r2"
+  rebasing 137d867d71d5 "r3"
+  rebasing daa37004f338 "r4"
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
  [5d31c6] r4
  $ showgraph
@ -306,9 +306,9 @@ Rebasing from below the amended changeset with the --newest flag.
  @  0 r0
  
  $ hg next --rebase --top --newest
-  rebasing 3:137d867d71d5 "r3"
-  rebasing 4:daa37004f338 "r4"
-  rebasing 5:5f333e6f7274 "r5"
+  rebasing 137d867d71d5 "r3"
+  rebasing daa37004f338 "r4"
+  rebasing 5f333e6f7274 "r5"
  5 files updated, 0 files merged, 0 files removed, 0 files unresolved
  [2d8122] r5
  $ showgraph
@ -356,7 +356,7 @@ rolled back and the final state should be as it was before `hg next --rebase`.
  o  0 r0
  
  $ hg next --rebase
-  rebasing 2:776c07fa2b12 "r2"
+  rebasing 776c07fa2b12 "r2"
  changeset f03405deb52b has multiple children, namely:
  [c9239a] add a
  [8fb200] r2
@ -408,7 +408,7 @@ Test a situation where there is a conflict.
  o  0 add a
  
  $ hg next --rebase --top
-  rebasing 2:4538525df7e2 "add c"
+  rebasing 4538525df7e2 "add c"
  merging c
  warning: 1 conflicts while merging c! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -436,7 +436,7 @@ Now resolve the conflict and resume the rebase.
  (no more unresolved files)
  continue: hg rebase --continue
  $ hg rebase --continue
-  rebasing 2:4538525df7e2 "add c"
+  rebasing 4538525df7e2 "add c"
  $ showgraph
  o  5 add c
  |
@ -459,7 +459,7 @@ Rebase when other predecessors are still visible
  hint[amend-restack]: descendants of e8ec16b776b6 are left behind - use 'hg restack' to rebase them
  hint[hint-ack]: use 'hg hint --ack amend-restack' to silence these hints
  $ hg next --rebase
-  rebasing 2:776c07fa2b12 "r2"
+  rebasing 776c07fa2b12 "r2"
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  [bd2075] r2
  $ hg prev
@ -484,7 +484,7 @@ Rebase when other predecessors are still visible
  o  0 r0
  
  $ hg next --rebase
-  rebasing 5:bd2075358087 "r2"
+  rebasing bd2075358087 "r2"
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  [88a893] r2
  $ showgraph
--- a/tests/test-amend-noinhibit-t.py
+++ b/tests/test-amend-noinhibit-t.py
@ -25,4 +25,4 @@ sh % "hg update 1" == "1 files updated, 0 files merged, 0 files removed, 0 files
 sh % "hg amend -m Amended --no-rebase" == r"""
    hint[amend-restack]: descendants of c05912b45f80 are left behind - use 'hg restack' to rebase them
    hint[hint-ack]: use 'hg hint --ack amend-restack' to silence these hints"""
-sh % "hg rebase --restack" == 'rebasing 2:* "r2" (glob)'
+sh % "hg rebase --restack" == 'rebasing 27d2178f63cc "r2"'
--- a/tests/test-amend-rebase-t.py
+++ b/tests/test-amend-rebase-t.py
@ -30,7 +30,7 @@ sh % "showgraph" == r"""
    |/
    o  0 1ad88bca4140 r0"""
 sh % "hg rebase -r 1 -d 3" == r"""
-    rebasing 1:* "r1" (glob)
+    rebasing 22094967a90d "r1"
    merging mf"""
 sh % "showgraph" == r"""
    o  4 309a29d7f33b r1
--- a/tests/test-amend-restack-auto.t
+++ b/tests/test-amend-restack-auto.t
@ -23,7 +23,7 @@ Test invalid value for amend.autorestack
  $ hg update B -q
  $ hg amend -m "new message"
  invalid amend.autorestack config of "test"; falling back to only-trivial
-  rebasing 2:ca039b450ae0 "C" (C)
+  rebasing ca039b450ae0 "C" (C)
  hint[amend-autorebase]: descendants have been auto-rebased because no merge conflict could have happened - use --no-rebase or set commands.amend.autorebase=False to disable auto rebase
  hint[hint-ack]: use 'hg hint --ack amend-autorebase' to silence these hints

@ -55,15 +55,15 @@ amend.autorestack=only-trivial, and simple changes (expect restack)
  > EOS
  $ hg update B -q
  $ hg amend -m 'Unchanged manifest for B'
-  rebasing 2:26805aba1e60 "C" (C)
+  rebasing 26805aba1e60 "C" (C)
  hint[amend-autorebase]: descendants have been auto-rebased because no merge conflict could have happened - use --no-rebase or set commands.amend.autorebase=False to disable auto rebase
  hint[hint-ack]: use 'hg hint --ack amend-autorebase' to silence these hints
  $ hg prev
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  [426bad] A
  $ hg amend -m 'Unchanged manifest for A'
-  rebasing 3:5357953e3ea3 "Unchanged manifest for B"
-  rebasing 4:b635bd2cf20b "C"
+  rebasing 5357953e3ea3 "Unchanged manifest for B"
+  rebasing b635bd2cf20b "C"
  hint[amend-autorebase]: descendants have been auto-rebased because no merge conflict could have happened - use --no-rebase or set commands.amend.autorebase=False to disable auto rebase
  hint[hint-ack]: use 'hg hint --ack amend-autorebase' to silence these hints

@ -147,7 +147,7 @@ amend.autorestack=no-conflict, and mergeable changes (expect restack)
  $ $TESTDIR/seq.py 0 2 > file
  $ hg amend
  custom autorestack message
-  rebasing 2:ca039b450ae0 "C" (C)
+  rebasing ca039b450ae0 "C" (C)
  merging file
  $ showgraph
  o  4 7ed7d67ad7bf C
@ -219,8 +219,8 @@ amend.autorestack=no-conflict, and conflicting changes (expect cancelled restack
  $ echo 'unmergeable!' > file
  $ hg amend
  restacking children automatically (unless they conflict)
-  rebasing 2:b6c0d35dc9e9 "C" (C)
-  rebasing 3:02cc3cc1d010 "D" (D)
+  rebasing b6c0d35dc9e9 "C" (C)
+  rebasing 02cc3cc1d010 "D" (D)
  merging file
  transaction abort!
  rollback completed
@ -254,11 +254,11 @@ amend.autorestack=always, and conflicting changes (expect restack)
  $ hg update B -q
  $ echo 'unmergeable!' > file
  $ hg amend
-  rebasing 2:b6c0d35dc9e9 "C" (C)
-  rebasing 3:02cc3cc1d010 "D" (D)
+  rebasing b6c0d35dc9e9 "C" (C)
+  rebasing 02cc3cc1d010 "D" (D)
  merging file
  hit merge conflicts (in file); switching to on-disk merge
-  rebasing 3:02cc3cc1d010 "D" (D)
+  rebasing 02cc3cc1d010 "D" (D)
  merging file
  warning: 1 conflicts while merging file! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -296,9 +296,9 @@ Test rebasing children with obsolete children themselves needing a restack.
  $ echo "new value" > A
  $ hg amend
  restacking children automatically (unless they conflict)
-  rebasing 2:917a077edb8d "B" (B)
-  rebasing 4:ff9eba5e2480 "C2" (C2)
-  rebasing 5:01f26f1a10b2 "D" (D)
+  rebasing 917a077edb8d "B" (B)
+  rebasing ff9eba5e2480 "C2" (C2)
+  rebasing 01f26f1a10b2 "D" (D)
  $ showgraph
  o  9 0a75af8fc6e3 D
  |
@ -338,7 +338,7 @@ Rebasing commits outside X:: can be surprising and more easily cause conflicts.
  $ hg up -q B2
  $ hg amend -m B3
  restacking children automatically (unless they conflict)
-  rebasing 5:afb1812f5f28 "D" (D)
+  rebasing afb1812f5f28 "D" (D)
  $ showgraph
  o  7 c9dfcf01df0b D
  |
--- a/tests/test-amend-restack-divergence.t
+++ b/tests/test-amend-restack-divergence.t
@ -39,7 +39,7 @@ onto the newest successor of their parent.
  |/
  o  0 1f0dee641bb7 add a
  $ hg rebase --restack
-  rebasing 2:4538525df7e2 "add c"
+  rebasing 4538525df7e2 "add c"
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ showgraph
  o  5 b0a0bc953ac3 add c
--- a/tests/test-amend-restack-multidest.t
+++ b/tests/test-amend-restack-multidest.t
@ -42,8 +42,8 @@ Restack does topological sort and only rebases "D" once:
  |/
  o  0 426bada5c675 A
  $ hg rebase --restack
-  rebasing 5:ca53c8ceb284 "C"
-  rebasing 3:f585351a92f8 "D" (D)
+  rebasing ca53c8ceb284 "C"
+  rebasing f585351a92f8 "D" (D)
  $ showgraph
  o  8 981f3734c126 D
  |
@ -81,15 +81,15 @@ Restack will only restack the "current" stack and leave other stacks untouched.

  $ hg update -q D
  $ hg rebase --restack
-  rebasing 10:be0ef73c17ad "D" (D)
+  rebasing be0ef73c17ad "D" (D)

  $ hg update -q G
  $ hg rebase --restack
-  rebasing 11:cc209258a732 "H" (H)
+  rebasing cc209258a732 "H" (H)

  $ hg update -q I
  $ hg rebase --restack
-  rebasing 12:59760668f0e1 "K" (K)
+  rebasing 59760668f0e1 "K" (K)

  $ rm .hg/localtags
  $ showgraph
@ -128,14 +128,14 @@ The "prune" cases.

  $ hg update -q B
  $ hg rebase --restack
-  rebasing 3:112478962961 "B" (B)
-  rebasing 7:f585351a92f8 "D" (D)
-  rebasing 8:78d2dca436b2 "E" (E tip)
+  rebasing 112478962961 "B" (B)
+  rebasing f585351a92f8 "D" (D)
+  rebasing 78d2dca436b2 "E" (E tip)

  $ hg update -q H
  $ hg rebase --restack
-  rebasing 4:8fdb2c1feb20 "G" (G)
-  rebasing 5:02ac06fe83b9 "H" (H)
+  rebasing 8fdb2c1feb20 "G" (G)
+  rebasing 02ac06fe83b9 "H" (H)

  $ rm .hg/localtags
  $ showgraph
@ -168,7 +168,7 @@ Restack could resume after resolving merge conflicts.

  $ hg update -q F
  $ hg rebase --restack
-  rebasing 5:ed8545a5c22a "F" (F)
+  rebasing ed8545a5c22a "F" (F)
  merging C
  warning: 1 conflicts while merging C! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -180,8 +180,8 @@ Restack could resume after resolving merge conflicts.
  $ hg resolve --mark -q
  continue: hg rebase --continue
  $ hg rebase --continue
-  rebasing 5:ed8545a5c22a "F"
-  rebasing 6:4d1ef7d890c5 "G" (tip)
+  rebasing ed8545a5c22a "F"
+  rebasing 4d1ef7d890c5 "G" (tip)
  merging E
  warning: 1 conflicts while merging E! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -191,8 +191,8 @@ Restack could resume after resolving merge conflicts.
  $ hg resolve --mark -q
  continue: hg rebase --continue
  $ hg rebase --continue
-  already rebased 5:ed8545a5c22a "F" as 2282fe522d5c
-  rebasing 6:4d1ef7d890c5 "G"
+  already rebased ed8545a5c22a "F" as 2282fe522d5c
+  rebasing 4d1ef7d890c5 "G"

  $ showgraph
  o  8 3b00517bf275 G
--- a/tests/test-amend-restack-obsolete.t
+++ b/tests/test-amend-restack-obsolete.t
@ -39,7 +39,7 @@ Test invalid value for amend.autorestack
  o  0 426bada5c675 A
  $ hg amend -m "B'"
  restacking children automatically (unless they conflict)
-  rebasing 3:26805aba1e60 "C" (C)
+  rebasing 26805aba1e60 "C" (C)
  $ showgraph
  o  7 5676eb48a524 C
  |
@ -57,7 +57,7 @@ Test invalid value for amend.autorestack
  |/
  o  0 426bada5c675 A
  $ hg rebase --restack
-  rebasing 5:3c36beb5705f "D" (D)
+  rebasing 3c36beb5705f "D" (D)
  $ showgraph
  o  8 d1e904d06977 D
  |
--- a/tests/test-amend-restack-t.py
+++ b/tests/test-amend-restack-t.py
@ -74,8 +74,8 @@ sh % "showgraph" == r"""
    |/
    o  0 1f0dee641bb7 add a"""
 sh % "hg rebase --restack" == r'''
-    rebasing 2:4538525df7e2 "add c"
-    rebasing 3:47d2a3944de8 "add d"'''
+    rebasing 4538525df7e2 "add c"
+    rebasing 47d2a3944de8 "add d"'''
 sh % "showgraph" == r"""
    o  6 228a9d754739 add d
    |
@ -112,7 +112,7 @@ sh % "showgraph" == r"""
    | x  1 7c3bad9141dc add b
    |/
    o  0 1f0dee641bb7 add a"""
-sh % "hg rebase --restack" == 'rebasing 2:4538525df7e2 "add c"'
+sh % "hg rebase --restack" == 'rebasing 4538525df7e2 "add c"'
 sh % "showgraph" == r"""
    o  5 e5f1b912c5fa add c
    |
@ -146,8 +146,8 @@ sh % "showgraph" == r"""
    |/
    o  0 1f0dee641bb7 add a"""
 sh % "hg rebase --restack" == r"""
-    rebasing 2:4538525df7e2 "add c"
-    rebasing 3:47d2a3944de8 "add d"
+    rebasing 4538525df7e2 "add c"
+    rebasing 47d2a3944de8 "add d"
    merging d
    warning: 1 conflicts while merging d! (edit, then use 'hg resolve --mark')
    unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -161,9 +161,9 @@ sh % "hg resolve --mark d" == r"""
    (no more unresolved files)
    continue: hg rebase --continue"""
 sh % "hg rebase --continue" == r'''
-    already rebased 2:4538525df7e2 "add c" as 217450801891
-    rebasing 3:47d2a3944de8 "add d"
-    rebasing 4:9d206ffc875e "add e"'''
+    already rebased 4538525df7e2 "add c" as 217450801891
+    rebasing 47d2a3944de8 "add d"
+    rebasing 9d206ffc875e "add e"'''
 sh % "showgraph" == r"""
    o  8 b706583c96e3 add e
    |
@ -198,8 +198,8 @@ sh % "showgraph" == r"""
    |/
    o  0 1f0dee641bb7 add a"""
 sh % "hg rebase --restack" == r'''
-    rebasing 2:4538525df7e2 "add c"
-    rebasing 3:47d2a3944de8 "add d"'''
+    rebasing 4538525df7e2 "add c"
+    rebasing 47d2a3944de8 "add d"'''
 sh % "showgraph" == r"""
    @  6 228a9d754739 add d
    |
@ -234,8 +234,8 @@ sh % "showgraph" == r"""
    |/
    o  0 1f0dee641bb7 add a"""
 sh % "hg rebase --restack" == r'''
-    rebasing 2:4538525df7e2 "add c"
-    rebasing 3:47d2a3944de8 "add d"'''
+    rebasing 4538525df7e2 "add c"
+    rebasing 47d2a3944de8 "add d"'''
 sh % "showgraph" == r"""
    o  7 228a9d754739 add d
    |
@ -283,9 +283,9 @@ sh % "showgraph" == r"""
    |/
    o  0 1f0dee641bb7 add a"""
 sh % "hg rebase --restack" == r'''
-    rebasing 2:4538525df7e2 "add c"
-    rebasing 3:47d2a3944de8 "add d"
-    rebasing 5:58e16e5d23eb "add e"'''
+    rebasing 4538525df7e2 "add c"
+    rebasing 47d2a3944de8 "add d"
+    rebasing 58e16e5d23eb "add e"'''
 sh % "showgraph" == r"""
    @  9 2220f78c83d8 add e
    |
@ -329,8 +329,8 @@ sh % "showgraph" == r"""
    |/
    o  0 1f0dee641bb7 add a"""
 sh % "hg rebase --restack" == r'''
-    rebasing 5:dd2a887139a3 "add c" (tip)
-    rebasing 3:47d2a3944de8 "add d"'''
+    rebasing dd2a887139a3 "add c" (tip)
+    rebasing 47d2a3944de8 "add d"'''
 sh % "showgraph" == r"""
    @  7 4e2bc7d6cfea add d
    |
@ -371,7 +371,7 @@ sh % "showgraph" == r"""
    | @  1 7c3bad9141dc add b
    |/
    o  0 1f0dee641bb7 add a"""
-sh % "hg rebase --restack" == 'rebasing 4:9d206ffc875e "add e"'
+sh % "hg rebase --restack" == 'rebasing 9d206ffc875e "add e"'
 sh % "showgraph" == r"""
    o  7 a660256c6d2a add e
    |
@ -410,7 +410,7 @@ sh % "showgraph" == r"""
    |/
    o  0 1f0dee641bb7 add a"""
 sh % "hg rebase --restack" == r"""
-    rebasing 2:4538525df7e2 "add c"
+    rebasing 4538525df7e2 "add c"
    1 files updated, 0 files merged, 0 files removed, 0 files unresolved"""
 sh % "showgraph" == r"""
    o  5 b7aa69de00bb add c
@ -455,8 +455,8 @@ sh % "showgraph" == r"""
    |/
    o  0 1f0dee641bb7 add a"""
 sh % "hg rebase --restack" == r"""
-    rebasing 5:dd2a887139a3 "add c" (tip)
-    rebasing 3:47d2a3944de8 "add d"
+    rebasing dd2a887139a3 "add c" (tip)
+    rebasing 47d2a3944de8 "add d"
    1 files updated, 0 files merged, 0 files removed, 0 files unresolved"""
 sh % "showgraph" == r"""
    o  7 4e2bc7d6cfea add d
@ -530,11 +530,11 @@ sh % "showgraph" == r"""
    |/
    o  0 1f0dee641bb7 add a"""
 sh % "hg rebase --restack" == r"""
-    rebasing 6:849d5cce0019 "add f"
-    rebasing 8:dd2a887139a3 "add c"
-    rebasing 11:8282a17a7483 "add g" (tip)
-    rebasing 3:47d2a3944de8 "add d"
-    rebasing 10:e86422ad5d0e "add h"
+    rebasing 849d5cce0019 "add f"
+    rebasing dd2a887139a3 "add c"
+    rebasing 8282a17a7483 "add g" (tip)
+    rebasing 47d2a3944de8 "add d"
+    rebasing e86422ad5d0e "add h"
    1 files updated, 0 files merged, 0 files removed, 0 files unresolved"""
 sh % "showgraph" == r"""
    o  16 5bc29b84815f add h
--- a/tests/test-amend-split.t
+++ b/tests/test-amend-split.t
@ -106,8 +106,8 @@ Split in the middle of a stack.
  examine changes to 'c2'? [Ynesfdaq?] n
  
  Done splitting? [yN] y
-  rebasing 4:* "add d1 and d2" (glob)
-  rebasing 5:* "add d1 and d2"* (glob)
+  rebasing 3c66f08f0fd3 "add d1 and d2"
+  rebasing 43b9beefca2e "add d1 and d2"

  $ showgraph
  o  9 bdb846f063c6 add d1 and d2
@ -148,12 +148,12 @@ Split with multiple children and using hash.
  examine changes to 'a2'? [Ynesfdaq?] n
  
  Done splitting? [yN] y
-  rebasing 1:* "add b1 and b2" (glob)
-  rebasing 6:* "add c1 and c2" (glob)
-  rebasing 7:* "add c1 and c2" (glob)
-  rebasing 8:* "add d1 and d2" (glob)
-  rebasing 9:* "add d1 and d2" (glob)
-  rebasing 10:* "add d1 and d2"* (glob)
+  rebasing b7fb8fde59b2 "add b1 and b2"
+  rebasing 6227053e403e "add c1 and c2"
+  rebasing bff303a2c228 "add c1 and c2"
+  rebasing acbc5d06143b "add d1 and d2"
+  rebasing bdb846f063c6 "add d1 and d2"
+  rebasing bd98a3c83a29 "add d1 and d2"

  $ showgraph
  o  18 5ad76779e999 add d1 and d2
@ -197,10 +197,10 @@ Split using revset.
  examine changes to 'b2'? [Ynesfdaq?] n
  
  Done splitting? [yN] y
-  rebasing 14:* "add c1 and c2" (glob)
-  rebasing 15:* "add c1 and c2" (glob)
-  rebasing 16:* "add d1 and d2" (glob)
-  rebasing 17:* "add d1 and d2"* (glob)
+  rebasing 7c57722f849b "add c1 and c2"
+  rebasing 7300aee81508 "add c1 and c2"
+  rebasing 7c766f705803 "add d1 and d2"
+  rebasing c2fa6cc56f60 "add d1 and d2"

  $ showgraph
  o  23 065a5bb834a6 add d1 and d2
@ -232,10 +232,10 @@ Test that command aborts when given multiple commits.
 Test --no-rebase flag.
  $ mkcommit e
  $ hg rebase -s 20 -d .
-  rebasing 20:* "add c1 and c2" (glob)
-  rebasing 21:* "add c1 and c2" (glob)
-  rebasing 22:* "add d1 and d2" (glob)
-  rebasing 23:* "add d1 and d2" (glob)
+  rebasing 216c1cfd66ba "add c1 and c2"
+  rebasing 6b6c4cdbcb5c "add c1 and c2"
+  rebasing e3e63b66173e "add d1 and d2"
+  rebasing 065a5bb834a6 "add d1 and d2"
  $ showgraph
  o  28 5f8ed24aed8c add d1 and d2
  |
--- a/tests/test-amend-userestack.t
+++ b/tests/test-amend-userestack.t
@ -51,8 +51,8 @@ Test hg amend --fixup.

  $ hg amend --fixup
  warning: --fixup is deprecated and WILL BE REMOVED. use 'hg restack' instead.
-  rebasing 2:* "add c" (glob)
-  rebasing 3:* "add d" (glob)
+  rebasing 4538525df7e2 "add c"
+  rebasing 47d2a3944de8 "add d"
  $ showgraph
  o  6 add d
  |
@ -70,8 +70,8 @@ Test that the operation field on the metadata is correctly set.

 Test hg amend --rebase
  $ hg amend -m "amended again" --rebase
-  rebasing 5:* "add c" (glob)
-  rebasing 6:* "add d" (glob)
+  rebasing * "add c" (glob)
+  rebasing * "add d" (glob)
  $ showgraph
  o  9 add d
  |
--- a/tests/test-audit-path.t
+++ b/tests/test-audit-path.t
@ -173,7 +173,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 e73c21d6b244 "file a/poisoned" (tip)
  abort: path 'a/poisoned' traverses symbolic link 'a'
  [255]
  $ ls ../merge-symlink-out
--- a/tests/test-bookmarks-rebase.t
+++ b/tests/test-bookmarks-rebase.t
@ -38,7 +38,7 @@ bookmark list
 rebase

  $ hg rebase -s two -d one
-  rebasing 3:2ae46b1d99a7 "3" (two tip)
+  rebasing 2ae46b1d99a7 "3" (two tip)
  saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg

  $ hg log
@ -77,7 +77,7 @@ aborted rebase should restore active bookmark.
  adding d
  $ hg bookmark three
  $ hg rebase -s three -d two
-  rebasing 4:dd7c838e8362 "4" (three tip)
+  rebasing dd7c838e8362 "4" (three tip)
  merging d
  warning: 1 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 bookmark.
 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 dd7c838e8362 "4" (three tip)
  merging d
  warning: 1 conflicts while merging d! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
--- a/tests/test-checkoutidentifier-commitinfo.t
+++ b/tests/test-checkoutidentifier-commitinfo.t
@ -74,7 +74,7 @@ Rebase with conflict resolution
  $ hg debugcheckoutidentifier
  0000000000000007
  $ hg rebase -s 6 -d 5
-  rebasing 6:78930e916793 "2z"
+  rebasing 78930e916793 "2z"
  merging 2
  warning: 1 conflicts while merging 2! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -88,9 +88,9 @@ Rebase with conflict resolution
  $ hg debugcheckoutidentifier
  0000000000000008
  $ hg rebase --continue
-  rebasing 6:78930e916793 "2z"
+  rebasing 78930e916793 "2z"
  commit_info (author=test checkoutidentifier=0000000000000008 mutation=rebase node=2a9f3f40eebf9d189f51eeba40f6d45935255c3e predecessors=78930e916793ff11b38f4f89f92221c180f922a3)
-  rebasing 7:27fd2733660c "3" (tip)
+  rebasing 27fd2733660c "3" (tip)
  commit_info (author=test checkoutidentifier=0000000000000009 mutation=rebase node=b42c49c8c650d6040d4a4003a30c82e1cde21c50 predecessors=27fd2733660ce0233ef4603cebe6328681aa598d)
  $ hg debugcheckoutidentifier
  0000000000000010
--- a/tests/test-commitcloud-backup.t
+++ b/tests/test-commitcloud-backup.t
@ -214,7 +214,7 @@ Rebase + backup. Make sure that two heads were deleted and head was saved
  o  7e6a6fd9c7c8c8c307ee14678f03d63af3a7b455 commit
  
  $ hg rebase -s f79c5017de -d 773a3ba2e7c2
-  rebasing 5:f79c5017def3 "newhead1"
+  rebasing f79c5017def3 "newhead1"
  $ hg cloud backup
  backing up stack rooted at 667453c0787e
  remote: pushing 3 commits:
@ -500,8 +500,8 @@ Create logs directory and set correct permissions
  b18e25de2cf5fc4699a029ed635882849e53ef73 backed up
  26805aba1e600a82e93661149f2313866a221a7b backed up
  $ hg rebase -s B -d D --config infinitepushbackup.autobackup=True --config infinitepushbackup.logdir=$TESTTMP/logs
-  rebasing 2:112478962961 "B" (B)
-  rebasing 4:26805aba1e60 "C" (C tip)
+  rebasing 112478962961 "B" (B)
+  rebasing 26805aba1e60 "C" (C tip)
  $ waitbgbackup
  $ hg log -r ':' -G -T '{desc} {node}'
  o  C ffeec75ec60331057b875fc5356c57c3ff204500
--- a/tests/test-commitcloud-sync-bookmarks.t
+++ b/tests/test-commitcloud-sync-bookmarks.t
@ -104,7 +104,7 @@ Rebasing the bookmark will make the draft commit disappear.

  $ cd ../client1
  $ hg rebase -b foo -d 4
-  note: not rebasing 1:00422fad0026 "draft-commit" (foo), already in destination as 3:441f69264760 "landed-commit"
+  note: not rebasing 00422fad0026 "draft-commit" (foo), already in destination as 441f69264760 "landed-commit"
  $ tglogp
  o  4: 67d363c9001e public 'public-commit-2' foo
  |
--- a/tests/test-commitcloud-sync.t
+++ b/tests/test-commitcloud-sync.t
@ -282,7 +282,7 @@ Try to push selectively
  $ cd client1
  $ echo more >> commit1
  $ hg amend --rebase -m "`hg descr | head -n1` amended"
-  rebasing 2:02f6fc2b7154 "commit2" (bookmark1)
+  rebasing 02f6fc2b7154 "commit2" (bookmark1)

  $ hg cloud sync
  commitcloud: synchronizing 'server' with 'user/test/default'
@ -600,12 +600,12 @@ Expected result: client2 should be moved to 68e035cc1996
  o  0: d20a80d4def3 'base'
  
  $ hg rebase -s cebbb614447e -d d20a80d4def3 -m "`hg descr | head -n1` rebased" --collapse
-  rebasing 8:cebbb614447e "commit2 amended amended"
+  rebasing cebbb614447e "commit2 amended amended"
  $ echo 5 >> filea.txt && hg amend -m "`hg descr | head -n1` amended"
  $ hg id -i
  99e818be5af0
  $ hg rebase -s 99e818be5af0 -d a7bb357e7299 -m "`hg descr | head -n1` rebased" --collapse
-  rebasing 13:99e818be5af0 "commit2 amended amended rebased amended" (tip)
+  rebasing 99e818be5af0 "commit2 amended amended rebased amended" (tip)
  $ echo 6 >> filea.txt && hg amend -m "`hg descr | head -n1` amended"
  $ tglog -r '.'
  @  15: 68e035cc1996 'commit2 amended amended rebased amended rebased amended'
@ -697,7 +697,7 @@ Wait for them to complete and then do another cloud sync
  $ hg debugwaitbackup
  $ hg cloud sync -q
  $ grep rebasing $TESTTMP/racerebase.out
-  rebasing 17:f2ccc2716735 "stack commit 2" (testbookmark)
+  rebasing f2ccc2716735 "stack commit 2" (testbookmark)
  $ tglog
  o  19: 715c1454ae33 'stack commit 2' testbookmark
  |
@ -1055,8 +1055,8 @@ Pull it into one of the clients and rebase one of the stacks onto it
  o  d20a80d4def3 'base'
  
  $ hg rebase -s e58a6603d256 -d publicbookmark1
-  rebasing 23:e58a6603d256 "stack 1 first"
-  rebasing 24:9a3e7907fd5c "stack 1 second"
+  rebasing e58a6603d256 "stack 1 first"
+  rebasing 9a3e7907fd5c "stack 1 second"
  $ hg cloud sync -q

 Create another public commit on the server, moving one of the bookmarks
@ -1127,8 +1127,8 @@ Do a pull on this client.  The remote bookmarks now get updated.
  
 Rebase the commits again, and resync to the first client.
  $ hg rebase -s 5df7c1d8d8ab -d publicbookmark2
-  rebasing 23:5df7c1d8d8ab "stack 1 first"
-  rebasing 24:2da6c73964b8 "stack 1 second"
+  rebasing 5df7c1d8d8ab "stack 1 first"
+  rebasing 2da6c73964b8 "stack 1 second"
  $ hg cloud sync -q
  $ cd ../client1
  $ hg cloud sync
--- a/tests/test-copy-move-merge.t
+++ b/tests/test-copy-move-merge.t
@ -71,7 +71,7 @@ Test disabling copy tracing

  $ hg up -qC 2
  $ hg rebase --keep -d 1 -b 2 --config extensions.rebase=
-  rebasing 2:add3f11052fa "other" (tip)
+  rebasing add3f11052fa "other" (tip)
  merging b and a to b
  merging c and a to c

@ -89,7 +89,7 @@ Test disabling copy tracing
  $ 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 add3f11052fa "other" (tip)
  other [source] changed a which local [dest] deleted
  use (c)hanged version, leave (d)eleted, leave (u)nresolved, or input (r)enamed path? c

@ -123,7 +123,7 @@ Verify disabling copy tracing still keeps copies from rebase source
  o  0 add a
  
  $ hg rebase -d . -b 2 --config extensions.rebase= --config experimental.copytrace=off
-  rebasing 2:6adcf8c12e7d "copy b->x"
+  rebasing 6adcf8c12e7d "copy b->x"
  saved backup bundle to $TESTTMP/copydisable/.hg/strip-backup/6adcf8c12e7d-ce4b3e75-rebase.hg
  $ hg up -q 3
  $ hg log -f x -T '{rev} {desc}\n'
@ -156,7 +156,7 @@ Verify we duplicate existing copies, instead of detecting them
  o  0 add a
  
  $ hg rebase -d 2 -s 3 --config extensions.rebase= --config experimental.copytrace=off
-  rebasing 3:47e1a9e6273b "copy a->b (2)" (tip)
+  rebasing 47e1a9e6273b "copy a->b (2)" (tip)
  saved backup bundle to $TESTTMP/copydisable3/.hg/strip-backup/47e1a9e6273b-2d099c59-rebase.hg

  $ hg log -G -f b
--- a/tests/test-copytrace-heuristics.t
+++ b/tests/test-copytrace-heuristics.t
@ -55,7 +55,7 @@ Check filename heuristics (same dirname and same basename)
      desc: initial

  $ hg rebase -s . -d 1
-  rebasing 2:557f403c0afd "mod a, mod dir/file.txt" (tip)
+  rebasing 557f403c0afd "mod a, mod dir/file.txt" (tip)
  merging b and a to b
  merging dir2/file.txt and dir/file.txt to dir2/file.txt
  $ cd ..
@ -87,7 +87,7 @@ Make sure filename heuristics do not when they are not related
      desc: initial

  $ hg rebase -s . -d 1
-  rebasing 2:d526312210b9 "mode a" (tip)
+  rebasing d526312210b9 "mode a" (tip)
  other [source] changed a which local [dest] deleted
  use (c)hanged version, leave (d)eleted, leave (u)nresolved, or input (r)enamed path? u
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -125,7 +125,7 @@ Test when lca didn't modified the file that was moved
      desc: initial, phase: draft

  $ hg rebase -s . -d 2
-  rebasing 3:9d5cf99c3d9f "mod a" (tip)
+  rebasing 9d5cf99c3d9f "mod a" (tip)
  merging b and a to b
  $ cd ..
  $ rm -rf repo
@ -159,7 +159,7 @@ Rebase "backwards"
      desc: initial

  $ hg rebase -s . -d 0
-  rebasing 3:fbe97126b396 "mod b" (tip)
+  rebasing fbe97126b396 "mod b" (tip)
  merging a and b to a
  $ cd ..
  $ rm -rf repo
@ -195,7 +195,7 @@ Check a few potential move candidates
      desc: initial

  $ hg rebase -s . -d 2
-  rebasing 3:6b2f4cece40f "mod dir/a" (tip)
+  rebasing 6b2f4cece40f "mod dir/a" (tip)
  merging dir/b and dir/a to dir/b
  $ cd ..
  $ rm -rf repo
@ -238,7 +238,7 @@ Test the copytrace.movecandidateslimit with many move candidates
 With small limit

  $ hg rebase -s 2 -d 1 --config experimental.copytrace.movecandidateslimit=0
-  rebasing 2:ef716627c70b "mod a" (tip)
+  rebasing ef716627c70b "mod a" (tip)
  skipping copytracing for 'a', more candidates than the limit: 7
  other [source] changed a which local [dest] deleted
  use (c)hanged version, leave (d)eleted, leave (u)nresolved, or input (r)enamed path? u
@ -251,7 +251,7 @@ With small limit
 With default limit which is 100

  $ hg rebase -s 2 -d 1
-  rebasing 2:ef716627c70b "mod a" (tip)
+  rebasing ef716627c70b "mod a" (tip)
  merging foo and a to foo

  $ cd ..
@ -281,7 +281,7 @@ Move file in one branch and delete it in another
      desc: initial, phase: draft

  $ hg rebase -s 1 -d 2
-  rebasing 1:472e38d57782 "mv a b"
+  rebasing 472e38d57782 "mv a b"
  $ hg up -q c492ed3c7e35dcd1dc938053b8adf56e2cfbd062
  $ ls
  b
@ -313,7 +313,7 @@ Move a directory in draft branch
      desc: initial

  $ hg rebase -s . -d 1
-  rebasing 2:a33d80b6e352 "mv dir/ dir2/" (tip)
+  rebasing a33d80b6e352 "mv dir/ dir2/" (tip)
  merging dir/a and dir2/a to dir2/a
  $ cd ..
  $ rm -rf server
@ -346,7 +346,7 @@ Move file twice and rebase mod on top of moves
  o  changeset: 1451231c87572a7d3f92fc210b4b35711c949a98
      desc: initial
  $ hg rebase -s . -d 2
-  rebasing 3:d41316942216 "mod a" (tip)
+  rebasing d41316942216 "mod a" (tip)
  merging c and a to c

  $ cd ..
@ -378,9 +378,9 @@ Move file twice and rebase moves on top of mods
  o  changeset: 1451231c87572a7d3f92fc210b4b35711c949a98
      desc: initial
  $ hg rebase -s 1 -d .
-  rebasing 1:472e38d57782 "mv a b"
+  rebasing 472e38d57782 "mv a b"
  merging a and b to b
-  rebasing 2:d3efd280421d "mv b c"
+  rebasing d3efd280421d "mv b c"
  merging b and c to c

  $ cd ..
@ -415,7 +415,7 @@ Move one file and add another file in the same folder in one branch, modify file
      desc: initial

  $ hg rebase -s . -d 2
-  rebasing 3:ef716627c70b "mod a" (tip)
+  rebasing ef716627c70b "mod a" (tip)
  merging b and a to b
  $ ls
  b
@ -483,7 +483,7 @@ Copy and move file
      desc: initial

  $ hg rebase -s . -d 1
-  rebasing 2:ef716627c70b "mod a" (tip)
+  rebasing ef716627c70b "mod a" (tip)
  merging b and a to b
  merging c and a to c
  $ ls
@ -568,7 +568,7 @@ Test shelve/unshelve
  $ hg unshelve
  unshelving change 'default'
  rebasing shelved changes
-  rebasing 1:f0569b377759 "shelve changes to: initial"
+  rebasing f0569b377759 "shelve changes to: initial"
  merging b and a to b
  $ ls
  b
@ -607,7 +607,7 @@ File directory and base name changed in same move
      desc initial, phase: draft

  $ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100
-  rebasing 2:6207d2d318e7 "mod a" (tip)
+  rebasing 6207d2d318e7 "mod a" (tip)
  merging dir2/b and dir1/a to dir2/b
  $ cat dir2/b
  a
@ -644,7 +644,7 @@ in other merge parent. File moved on rebase.
      desc initial, phase: draft

  $ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100
-  rebasing 2:e8919e7df8d0 "mv dir1 dir2" (tip)
+  rebasing e8919e7df8d0 "mv dir1 dir2" (tip)
  $ ls dir2
  a
  dummy
@ -680,7 +680,7 @@ Testing the sourcecommitlimit config
 When the sourcecommitlimit is small and we have more drafts, we use heuristics only

  $ hg rebase -s 8b6e13696 -d .
-  rebasing 1:8b6e13696c38 "added more things to a"
+  rebasing 8b6e13696c38 "added more things to a"
  other [source] changed a which local [dest] deleted
  use (c)hanged version, leave (d)eleted, leave (u)nresolved, or input (r)enamed path? u
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -692,7 +692,7 @@ fullcopytracing
  $ hg rebase --abort
  rebase aborted
  $ hg rebase -s 8b6e13696 -d . --config experimental.copytrace.sourcecommitlimit=100
-  rebasing 1:8b6e13696c38 "added more things to a"
+  rebasing 8b6e13696c38 "added more things to a"
  merging foo/bar and a to foo/bar
  $ cd ..
  $ rm -rf repo
--- a/tests/test-copytrace-manual-t.py
+++ b/tests/test-copytrace-manual-t.py
@ -23,7 +23,7 @@ sh % "hg rebase -r $C -d $D '--config=ui.interactive=1' '--config=experimental.c
 r
 Renamed
 """ == r"""
-    rebasing 2:85b47c0eb942 "C"
+    rebasing 85b47c0eb942 "C"
    other [source] changed A which local [dest] deleted
    use (c)hanged version, leave (d)eleted, leave (u)nresolved, or input (r)enamed path? r
    path 'A' in commit 85b47c0eb942 was renamed to [what path] in commit ed4ad4ec6472 ? Renamed
--- a/tests/test-dirstate-race.t
+++ b/tests/test-dirstate-race.t
@ -210,7 +210,7 @@ the merge tool goes to /dev/null because we're more interested in the results of
  > EOF

  $ hg rebase -s . -d 3 --tool test
-  rebasing 4:b08445fd6b2a "c4" (tip)
+  rebasing b08445fd6b2a "c4" (tip)
  merging a
  custom merge tool
  custom merge tool end
--- a/tests/test-fb-hgext-copytrace-amend.t
+++ b/tests/test-fb-hgext-copytrace-amend.t
@ -28,7 +28,7 @@ Test amend copytrace
  hint[amend-restack]: descendants of 9f815da0cfb3 are left behind - use 'hg restack' to rebase them
  hint[hint-ack]: use 'hg hint --ack amend-restack' to silence these hints
  $ hg rebase --restack
-  rebasing 2:ad25e018afa9 "mod a"
+  rebasing ad25e018afa9 "mod a"
  merging b and a to b
  $ ls
  b
@ -70,11 +70,11 @@ Test amend copytrace with multiple stacked commits
  $ hg mv c c3
  $ hg amend
  $ hg rebase --restack
-  rebasing 2:797127d4e250 "mod a"
+  rebasing 797127d4e250 "mod a"
  merging a1 and a to a1
-  rebasing 3:e2aabbfe749a "mod b"
+  rebasing e2aabbfe749a "mod b"
  merging b2 and b to b2
-  rebasing 4:4f8d18558559 "mod c" (test-top)
+  rebasing 4f8d18558559 "mod c" (test-top)
  merging c3 and c to c3
  $ hg up test-top
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -106,7 +106,7 @@ Test amend copytrace with multiple renames of the same file
  $ hg mv b c
  $ hg amend
  $ hg rebase --restack
-  rebasing 2:ad25e018afa9 "mod a"
+  rebasing ad25e018afa9 "mod a"
  merging c and a to c
  $ hg update 5
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -141,8 +141,8 @@ Test amend copytrace with copies
  $ hg cp b c
  $ hg amend
  $ hg rebase --restack
-  rebasing 2:6938f0d82b23 "mod a"
-  rebasing 3:df8dfcb1d237 "mod i" (test-top)
+  rebasing 6938f0d82b23 "mod a"
+  rebasing df8dfcb1d237 "mod i" (test-top)
  $ hg up test-top
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  (activating bookmark test-top)
@ -175,7 +175,7 @@ Test rebase after amend deletion of copy
  $ hg rm b
  $ hg amend
  $ hg rebase --restack
-  rebasing 2:ad25e018afa9 "mod a"
+  rebasing ad25e018afa9 "mod a"
  $ cd ..
  $ rm -rf repo

@ -199,9 +199,9 @@ Test failure to rebase deletion after rename
  hint[amend-restack]: descendants of 9f815da0cfb3 are left behind - use 'hg restack' to rebase them
  hint[hint-ack]: use 'hg hint --ack amend-restack' to silence these hints
  $ hg rebase --restack
-  rebasing 2:ad25e018afa9 "mod a"
+  rebasing ad25e018afa9 "mod a"
  merging b and a to b
-  rebasing 3:ba0395f0e180 "delete a"
+  rebasing ba0395f0e180 "delete a"
  abort: a@ba0395f0e180: not found in manifest!
  [255]
  $ hg rebase --abort
@ -231,7 +231,7 @@ Test amend copytrace can be disabled
  hint[amend-restack]: descendants of 9f815da0cfb3 are left behind - use 'hg restack' to rebase them
  hint[hint-ack]: use 'hg hint --ack amend-restack' to silence these hints
  $ hg rebase --restack
-  rebasing 2:ad25e018afa9 "mod a"
+  rebasing ad25e018afa9 "mod a"
  other [source] changed a which local [dest] deleted
  hint: if this is due to a renamed file, you can manually input the renamed path, or re-run the command using --config=experimental.copytrace=on to make hg figure out renamed path automatically (which is very slow, and you will need to be patient)
  use (c)hanged version, leave (d)eleted, or leave (u)nresolved, or input (r)enamed path? u
--- a/tests/test-fb-hgext-copytrace-errormsg-t.py
+++ b/tests/test-fb-hgext-copytrace-errormsg-t.py
@ -30,7 +30,7 @@ sh % "hg up 0" == "1 files updated, 0 files merged, 0 files removed, 0 files unr
 sh % "hg mv 1 2"
 sh % "hg ci -m dest"
 sh % "hg rebase -s 1 -d ." == r"""
-    rebasing 1:812796267395 "2"
+    rebasing 812796267395 "2"
    other [source] changed 1 which local [dest] deleted
    hint: if this is due to a renamed file, you can manually input the renamed path, or re-run the command using --config=experimental.copytrace=on to make hg figure out renamed path automatically (which is very slow, and you will need to be patient)
    use (c)hanged version, leave (d)eleted, or leave (u)nresolved, or input (r)enamed path? u
@ -38,6 +38,6 @@ sh % "hg rebase -s 1 -d ." == r"""
    [1]"""
 sh % "hg rebase --abort" == "rebase aborted"
 sh % "hg rebase -s 1 -d . --config=experimental.copytrace=on" == r"""
-    rebasing 1:812796267395 "2"
+    rebasing 812796267395 "2"
    merging 2 and 1 to 2
-    saved backup bundle to $TESTTMP/repo/.hg/strip-backup/812796267395-81e11405-rebase.hg (glob)"""
+    saved backup bundle to $TESTTMP/repo/.hg/strip-backup/812796267395-81e11405-rebase.hg"""
--- a/tests/test-fb-hgext-copytrace.t
+++ b/tests/test-fb-hgext-copytrace.t
@ -43,7 +43,7 @@ Check filename heuristics (same dirname and same basename)
      desc: initial, phase: public

  $ hg rebase -s . -d 1
-  rebasing 2:557f403c0afd "mod a, mod dir/file.txt" (tip)
+  rebasing 557f403c0afd "mod a, mod dir/file.txt" (tip)
  merging b and a to b
  merging dir2/file.txt and dir/file.txt to dir2/file.txt
  $ cd ..
@ -77,7 +77,7 @@ Make sure filename heuristics do not when they are not related
      desc: initial, phase: public

  $ hg rebase -s . -d 1
-  rebasing 2:d526312210b9 "mode a" (tip)
+  rebasing d526312210b9 "mode a" (tip)
  other [source] changed a which local [dest] deleted
  hint: if this is due to a renamed file, you can manually input the renamed path, or re-run the command using --config=experimental.copytrace=on to make hg figure out renamed path automatically (which is very slow, and you will need to be patient)
  use (c)hanged version, leave (d)eleted, or leave (u)nresolved, or input (r)enamed path? u
@ -117,7 +117,7 @@ Test when lca didn't modified the file that was moved
      desc: initial, phase: public

  $ hg rebase -s . -d 2
-  rebasing 3:9d5cf99c3d9f "mod a" (tip)
+  rebasing 9d5cf99c3d9f "mod a" (tip)
  merging b and a to b
  $ cd ..
  $ rm -rf server
@ -153,7 +153,7 @@ Rebase "backwards"
      desc: initial, phase: public

  $ hg rebase -s . -d 0
-  rebasing 3:fbe97126b396 "mod b" (tip)
+  rebasing fbe97126b396 "mod b" (tip)
  merging a and b to a
  $ cd ..
  $ rm -rf server
@ -181,7 +181,7 @@ Rebase draft commit on top of draft commit
      desc: initial, phase: draft

  $ hg rebase -s . -d 1
-  rebasing 2:5268f05aa168 "mod a" (tip)
+  rebasing 5268f05aa168 "mod a" (tip)
  merging b and a to b
  $ cd ..
  $ rm -rf server
@ -220,7 +220,7 @@ Check a few potential move candidates
      desc: initial, phase: public

  $ hg rebase -s . -d 2
-  rebasing 3:6b2f4cece40f "mod dir/a" (tip)
+  rebasing 6b2f4cece40f "mod dir/a" (tip)
  merging dir/b and dir/a to dir/b
  $ cd ..
  $ rm -rf server
@ -252,7 +252,7 @@ Move file in one branch and delete it in another
      desc: initial, phase: public

  $ hg rebase -s 1 -d 2
-  rebasing 1:472e38d57782 "mv a b"
+  rebasing 472e38d57782 "mv a b"
  $ hg up -q c492ed3c7e35dcd1dc938053b8adf56e2cfbd062
  $ ls
  b
@ -298,7 +298,7 @@ Too many move candidates
      desc: initial, phase: public

  $ hg rebase -s 2 -d 1
-  rebasing 2:ef716627c70b "mod a" (tip)
+  rebasing ef716627c70b "mod a" (tip)
  other [source] changed a which local [dest] deleted
  hint: if this is due to a renamed file, you can manually input the renamed path, or re-run the command using --config=experimental.copytrace=on to make hg figure out renamed path automatically (which is very slow, and you will need to be patient)
  use (c)hanged version, leave (d)eleted, or leave (u)nresolved, or input (r)enamed path? u
@ -335,7 +335,7 @@ Move a directory in draft branch
      desc: initial, phase: public

  $ hg rebase -s . -d 1
-  rebasing 2:a33d80b6e352 "mv dir/ dir2/" (tip)
+  rebasing a33d80b6e352 "mv dir/ dir2/" (tip)
  merging dir/a and dir2/a to dir2/a
  $ cd ..
  $ rm -rf server
@ -369,7 +369,7 @@ Move file twice and rebase mod on top of moves
  o  changeset: 1451231c87572a7d3f92fc210b4b35711c949a98
      desc: initial, phase: public
  $ hg rebase -s . -d 2
-  rebasing 3:d41316942216 "mod a" (tip)
+  rebasing d41316942216 "mod a" (tip)
  merging c and a to c

  $ cd ..
@ -404,9 +404,9 @@ Move file twice and rebase moves on top of mods
  o  changeset: 1451231c87572a7d3f92fc210b4b35711c949a98
      desc: initial, phase: public
  $ hg rebase -s 1 -d .
-  rebasing 1:472e38d57782 "mv a b"
+  rebasing 472e38d57782 "mv a b"
  merging a and b to b
-  rebasing 2:d3efd280421d "mv b c"
+  rebasing d3efd280421d "mv b c"
  merging b and c to c

  $ cd ..
@ -444,7 +444,7 @@ Move one file and add another file in the same folder in one branch, modify file
      desc: initial, phase: public

  $ hg rebase -s . -d 2
-  rebasing 3:ef716627c70b "mod a" (tip)
+  rebasing ef716627c70b "mod a" (tip)
  merging b and a to b
  $ ls
  b
@ -515,7 +515,7 @@ Copy and move file
      desc: initial, phase: public

  $ hg rebase -s . -d 1
-  rebasing 2:ef716627c70b "mod a" (tip)
+  rebasing ef716627c70b "mod a" (tip)
  merging b and a to b
  merging c and a to c
  $ ls
@ -606,7 +606,7 @@ Test shelve/unshelve
  $ hg unshelve
  unshelving change 'default'
  rebasing shelved changes
-  rebasing 1:f0569b377759 "shelve changes to: initial"
+  rebasing f0569b377759 "shelve changes to: initial"
  merging b and a to b
  $ ls
  b
@ -644,7 +644,7 @@ changed in same move
      desc initial, phase: draft

  $ hg rebase -s . -d 1 --config=experimental.copytrace=on
-  rebasing 2:6207d2d318e7 "mod a" (tip)
+  rebasing 6207d2d318e7 "mod a" (tip)
  merging dir2/b and dir1/a to dir2/b
  $ cat dir2/b
  a
@ -681,7 +681,7 @@ while adding file to original directory in other merge parent. File moved on reb
      desc initial, phase: draft

  $ hg rebase -s . -d 1 --config=experimental.copytrace=on
-  rebasing 2:e8919e7df8d0 "mv dir1 dir2" (tip)
+  rebasing e8919e7df8d0 "mv dir1 dir2" (tip)
  $ ls dir2
  a
  dummy
--- a/tests/test-fb-hgext-dirsync.t
+++ b/tests/test-fb-hgext-dirsync.t
@ -305,7 +305,7 @@ Test that rebasing applies the same change to both
  $ echo b > dir1/a
  $ hg commit --config extensions.dirsync=! -m "edit dir1/a with sync on"
  $ hg rebase --config extensions.rebase= -d 1
-  rebasing 2:70b4edc7f658 "edit dir1/a with sync on" (tip)
+  rebasing 70b4edc7f658 "edit dir1/a with sync on" (tip)
  mirrored changes in 'dir1/a' to 'dir2/a'
  $ hg diff --git -r ".^" -r .
  diff --git a/dir1/a b/dir1/a
--- a/tests/test-fb-hgext-drop.t
+++ b/tests/test-fb-hgext-drop.t
@ -68,7 +68,7 @@ TEST: dropping changeset in the middle of the stack
  
  $ hg drop -r 2
  Dropping changeset c175ba: r2
-  rebasing 3:c034855f2b01 "r3" (tip)
+  rebasing c034855f2b01 "r3" (tip)
  merging mf
  $ hg log -G -T '{rev} {desc|firstline}'
  o  4 r3
@ -113,15 +113,15 @@ TEST: dropping a changest with child changesets
  
  $ hg drop 2
  Dropping changeset 37d4c1: r2
-  rebasing 3:a422badec216 "r3"
+  rebasing a422badec216 "r3"
  merging mf
-  rebasing 4:b762560d23fd "r4"
+  rebasing b762560d23fd "r4"
  merging mf
-  rebasing 5:e76b6544a13a "r5"
+  rebasing e76b6544a13a "r5"
  merging mf
-  rebasing 6:4905937520ff "r6"
+  rebasing 4905937520ff "r6"
  merging mf
-  rebasing 7:2c7cfba83429 "r7" (tip)
+  rebasing 2c7cfba83429 "r7" (tip)
  merging mf
  $ hg log -G -T '{rev} {desc|firstline}'
  o  12 r7
@ -197,7 +197,7 @@ TEST: dropping a changeset with merge conflict
  
  $ hg drop 1
  Dropping changeset 2a8ed6: r1
-  rebasing 2:3d69e4d36b46 "r2"
+  rebasing 3d69e4d36b46 "r2"
  merging of
  warning: 1 conflicts while merging of! (edit, then use 'hg resolve --mark')
  conflict occurred during drop: please fix it by running 'hg rebase --continue', and then re-run 'hg drop'
--- a/tests/test-fb-hgext-fastmanifest-access.t
+++ b/tests/test-fb-hgext-fastmanifest-access.t
@ -155,8 +155,8 @@ Check diagnosis, debugging information
  CACHE HIT ['-1', '2', '3', '4', '5']
  =================================================
  $ hg rebase -r 5:: -d 4 --config extensions.rebase=
-  rebasing 5:5234b99c4f1d "add e"
-  rebasing 6:dd82c74514cb "add f" (tip)
+  rebasing 5234b99c4f1d "add e"
+  rebasing dd82c74514cb "add f" (tip)
  saved backup bundle to $TESTTMP/accesspattern/.hg/strip-backup/5234b99c4f1d-c2e049ad-rebase.hg (glob)
  $ printaccessedrevs
  =================================================
--- a/tests/test-fb-hgext-merge-conflictinfo.t
+++ b/tests/test-fb-hgext-merge-conflictinfo.t
@ -228,7 +228,7 @@ Test case 1: Source deleted, dest changed
  

  $ hg rebase -d 1 -s 2
-  rebasing 2:25c2ef28f4c7 "source" (tip)
+  rebasing 25c2ef28f4c7 "source" (tip)
  local [dest] changed file which other [source] deleted
  use (c)hanged version, (d)elete, or leave (u)nresolved? u
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -304,7 +304,7 @@ Test case 2: Source changed, dest deleted
  

  $ hg rebase -d 2 -s 1
-  rebasing 1:ec87889f5f90 "source"
+  rebasing ec87889f5f90 "source"
  other [source] changed file which local [dest] deleted
  use (c)hanged version, leave (d)eleted, leave (u)nresolved, or input (r)enamed path? u
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -342,7 +342,7 @@ Test case 3: Source changed, dest moved
  

  $ hg rebase -d 2 -s 1
-  rebasing 1:ec87889f5f90 "source"
+  rebasing ec87889f5f90 "source"
  merging file_newloc and file to file_newloc
  saved backup bundle to $TESTTMP/cornercases/foo/foo/foo/foo/.hg/strip-backup/ec87889f5f90-e39a76b8-rebase.hg (glob)
  $ hg up -q 2 # source
@ -380,7 +380,7 @@ Test case 4: Source changed, dest moved (w/o copytracing)
  

  $ hg rebase -d 2 -s 1 --config experimental.copytrace=off
-  rebasing 1:ec87889f5f90 "source"
+  rebasing ec87889f5f90 "source"
  other [source] changed file which local [dest] deleted
  use (c)hanged version, leave (d)eleted, leave (u)nresolved, or input (r)enamed path? u
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -418,7 +418,7 @@ Test case 5: Source moved, dest changed
  

  $ hg rebase -d 2 -s 1
-  rebasing 1:e6e7483a8950 "source"
+  rebasing e6e7483a8950 "source"
  merging file and file_newloc to file_newloc
  saved backup bundle to $TESTTMP/cornercases/foo/foo/foo/foo/.hg/strip-backup/e6e7483a8950-8e128ac2-rebase.hg (glob)
  $ hg up 2
@ -457,7 +457,7 @@ Test case 6: Source moved, dest changed (w/o copytracing)
  

  $ hg rebase -d 2 -s 1 --config experimental.copytrace=off
-  rebasing 1:e6e7483a8950 "source"
+  rebasing e6e7483a8950 "source"
  local [dest] changed file which other [source] deleted
  use (c)hanged version, (d)elete, or leave (u)nresolved? u
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -497,7 +497,7 @@ Test case 7: Source is a directory, dest is a file (base is still a file)
  

  $ hg rebase -d 2 -s 1
-  rebasing 1:ed93aeac6b3c "source"
+  rebasing ed93aeac6b3c "source"
  abort:*: '$TESTTMP/cornercases/foo/foo/foo/foo/file' (glob)
  [255]
  $ hg resolve --tool=internal:dumpjson --all
@ -529,7 +529,7 @@ Test case 8: Source is a file, dest is a directory (base is still a file)
  

  $ hg rebase -d 2 -s 1
-  rebasing 1:ec87889f5f90 "source"
+  rebasing ec87889f5f90 "source"
  abort:*: '$TESTTMP/cornercases/foo/foo/foo/foo/file' (glob)
  [255]
  $ hg resolve --tool=internal:dumpjson --all
@ -565,7 +565,7 @@ Test case 9: Source is a binary file, dest is a file (base is still a file)
  

  $ hg rebase -d 2 -s 1
-  rebasing 1:b6e55a03a5dc "source"
+  rebasing b6e55a03a5dc "source"
  merging file
  warning: ([^\s]+) looks like a binary file. (re)
  warning: 1 conflicts while merging file! (edit, then use 'hg resolve --mark')
@ -606,7 +606,7 @@ Test case 10: Source is a file, dest is a binary file (base is still a file)
  

  $ hg rebase -d 2 -s 1
-  rebasing 1:ec87889f5f90 "source"
+  rebasing ec87889f5f90 "source"
  merging file
  warning: ([^\s]+) looks like a binary file. (re)
  warning: 1 conflicts while merging file! (edit, then use 'hg resolve --mark')
@ -648,7 +648,7 @@ Test case 11: Source is a symlink, dest is a file (base is still a file)
  

  $ hg rebase -d 2 -s 1
-  rebasing 1:06aece48b59f "source"
+  rebasing 06aece48b59f "source"
  merging file
  warning: internal :merge cannot merge symlinks for file
  warning: 1 conflicts while merging file! (edit, then use 'hg resolve --mark')
@ -690,7 +690,7 @@ Test case 12: Source is a file, dest is a symlink (base is still a file)
  

  $ hg rebase -d 2 -s 1
-  rebasing 1:ec87889f5f90 "source"
+  rebasing ec87889f5f90 "source"
  merging file
  warning: internal :merge cannot merge symlinks for file
  warning: 1 conflicts while merging file! (edit, then use 'hg resolve --mark')
@ -736,7 +736,7 @@ mergestate (like shelve):
  $ hg unshelve
  unshelving change 'default'
  rebasing shelved changes
-  rebasing 3:b0582bede31d "shelve changes to: c" (tip)
+  rebasing b0582bede31d "shelve changes to: c" (tip)
  merging b
  warning: 1 conflicts while merging b! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
--- a/tests/test-fb-hgext-pull-createmarkers.t
+++ b/tests/test-fb-hgext-pull-createmarkers.t
@ -154,10 +154,10 @@ changesets
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ mkcommit k 202
  $ hg rebase -d default/master
-  note: not rebasing 2:1a07332e9fa1 "add c", already in destination as 6:d446b1b2be43 "add c"
-  note: not rebasing 3:ee96b78ae17d "add d", already in destination as 7:1f539cc6f364 "add d"
-  note: not rebasing 4:d5895ab36037 "add e", already in destination as 8:461a5b25b3dc "add e" (default/master master)
-  rebasing 9:7dcd118e395a "add k" (tip)
+  note: not rebasing 1a07332e9fa1 "add c", already in destination as d446b1b2be43 "add c"
+  note: not rebasing ee96b78ae17d "add d", already in destination as 1f539cc6f364 "add d"
+  note: not rebasing d5895ab36037 "add e", already in destination as 461a5b25b3dc "add e" (default/master master)
+  rebasing 7dcd118e395a "add k" (tip)

  $ echo more >> k
  $ hg amend
--- a/tests/test-fb-hgext-remotefilelog-bgprefetch.t
+++ b/tests/test-fb-hgext-remotefilelog-bgprefetch.t
@ -264,7 +264,7 @@ TODO: Make this test compatibile with obsstore enabled.
  $ clearcache
  $ find $CACHEDIR -type f | sort
  $ hg rebase -s temporary -d foo
-  rebasing 3:58147a5b5242 "b" (temporary tip)
+  rebasing 58147a5b5242 "b" (temporary tip)
  saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/58147a5b5242-c3678817-rebase.hg (glob)
  * files fetched over 1 fetches - (* misses, 0.00% hit ratio) over *s (glob)
  $ sleep 1
--- a/tests/test-fb-hgext-remotefilelog-linknodes.t
+++ b/tests/test-fb-hgext-remotefilelog-linknodes.t
@ -35,7 +35,7 @@ TODO: Make this test compatibile with obsstore enabled.
  b292c1e3311f

  $ hg rebase -d 1
-  rebasing 2:0632994590a8 "xx" (tip)
+  rebasing 0632994590a8 "xx" (tip)
  saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/0632994590a8-0bc786d8-rebase.hg (glob)
  $ hg log -f x --template "{node|short}\n"
  81deab2073bc
@ -45,14 +45,14 @@ TODO: Make this test compatibile with obsstore enabled.
 # Rebase back, log -f still works

  $ hg rebase -d 0 -r 2
-  rebasing 2:81deab2073bc "xx" (tip)
+  rebasing 81deab2073bc "xx" (tip)
  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 b3fca10fb42d "xx" (tip)
  saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/b3fca10fb42d-da73a0c7-rebase.hg (glob)

  $ cd ..
@ -90,9 +90,9 @@ TODO: Make this test compatibile with obsstore enabled.

  $ hg pull -q
  $ hg rebase -d tip
-  rebasing 1:4549721d828f "xx2"
+  rebasing 4549721d828f "xx2"
  note: rebase of 1:4549721d828f created no changes to commit
-  rebasing 2:5ef6d97e851c "xxy"
+  rebasing 5ef6d97e851c "xxy"
  saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/4549721d828f-b084e33c-rebase.hg (glob)
  $ hg log -f x --template '{node|short}\n'
  4ae8e31c85ef
--- a/tests/test-fb-hgext-remotefilelog-local.t
+++ b/tests/test-fb-hgext-remotefilelog-local.t
@ -105,7 +105,7 @@ TODO: Make this test compatibile with obsstore enabled.
  new changesets fed61014d323

  $ hg rebase -d tip
-  rebasing 1:9abfe7bca547 "a"
+  rebasing 9abfe7bca547 "a"
  saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/9abfe7bca547-8b11e5ff-rebase.hg (glob)
  3 files fetched over 2 fetches - (3 misses, 0.00% hit ratio) over *s (glob)

--- a/tests/test-fb-hgext-remotefilelog-pack-files.t
+++ b/tests/test-fb-hgext-remotefilelog-pack-files.t
@ -186,9 +186,9 @@
 - commit will be required to read the new content of the first commit, which
 - hasn't been flushed to disk yet.
  $ hg rebase -s $C -d $B
-  rebasing 4:e6011cdb8530 "C"
+  rebasing e6011cdb8530 "C"
  merging foo
-  rebasing 5:f579bc04d2ae "D" (tip)
+  rebasing f579bc04d2ae "D" (tip)
  merging foo

 # Test compatibility with LFS
--- a/tests/test-fb-hgext-remotefilelog-sparse.t
+++ b/tests/test-fb-hgext-remotefilelog-sparse.t
@ -98,4 +98,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 876b1317060d "x2" (foo)
--- a/tests/test-fb-hgext-scm-prompt-hg.t
+++ b/tests/test-fb-hgext-scm-prompt-hg.t
@ -56,7 +56,7 @@ Test basic repo behaviors

 Test rebase
  $ cmd hg rebase -d 775bfdd --config "extensions.rebase="
-  rebasing 2:4b6cc7d5194b "c3" (active tip)
+  rebasing 4b6cc7d5194b "c3" (active tip)
  merging b
  warning: 1 conflicts while merging b! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -122,7 +122,7 @@ Test unshelve
  $ cmd hg unshelve --config "extensions.shelve="
  unshelving change 'default'
  rebasing shelved changes
-  rebasing 4:19f7fec7f80b "shelve changes to: c3" (tip)
+  rebasing 19f7fec7f80b "shelve changes to: c3" (tip)
  other [source] changed b which local [dest] deleted
  use (c)hanged version, leave (d)eleted, leave (u)nresolved, or input (r)enamed path? u
  unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
--- a/tests/test-fb-hgext-smartlog-obsolete.t
+++ b/tests/test-fb-hgext-smartlog-obsolete.t
@ -61,7 +61,7 @@ Check rebase template keyword.
  |/
  o  1 Amended
  $ hg rebase -r 2 -d .
-  rebasing 2:* "add b" (glob)
+  rebasing * "add b" (glob)
  $ showgraph
  o  4 add b
  |
--- a/tests/test-fb-hgext-smartlog-tweakdefaults.t
+++ b/tests/test-fb-hgext-smartlog-tweakdefaults.t
@ -33,9 +33,9 @@ Prepare a repo for rebase checks
  $ echo b > b && hg ci -Am b          # rev 5
  adding b
  $ hg rebase --hidden -r 5 -d 1       # rev 6
-  rebasing 5:1e9a3c00cbe9 "b" (tip)
+  rebasing 1e9a3c00cbe9 "b" (tip)
  $ hg rebase --hidden -r 5 -d 2       # rev 7
-  rebasing 5:1e9a3c00cbe9 "b"
+  rebasing 1e9a3c00cbe9 "b"

 Check the rebase template keywords
  $ hg log --hidden -r 5 -T "{node} rebased as {rebasesuccessors % '{short(rebasesuccessor)} '}\n"
--- a/tests/test-fb-hgext-smartlog.t
+++ b/tests/test-fb-hgext-smartlog.t
@ -332,7 +332,7 @@ Test singlepublicsuccessor  template keyword
  $ echo c > c && hg ci -Am c
  adding c
  $ hg rebase -s 2 -d 1
-  rebasing 2:d36c0562f908 "c" (tip)
+  rebasing d36c0562f908 "c" (tip)
  $ hg phase -r 3 --public
  $ hg smartlog -r 2 -T "SPS: {singlepublicsuccessor}" --hidden
  x  SPS: 2b5806c2ca1e228838315bbffeb7d1504c38c9d6
--- a/tests/test-fb-hgext-snapshot-show.t
+++ b/tests/test-fb-hgext-snapshot-show.t
@ -62,7 +62,7 @@

 # Try creating the rebasestate snapshot
  $ hg rebase -s "$MERGEREV" -d .
-  rebasing 7:9d3ebf4630d3 "merge #1"
+  rebasing 9d3ebf4630d3 "merge #1"
  merging mergefile
  warning: 1 conflicts while merging mergefile! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
--- a/tests/test-fb-hgext-treemanifest-convertflat.t
+++ b/tests/test-fb-hgext-treemanifest-convertflat.t
@ -286,7 +286,7 @@ manifest for commit 'f7febcf0f689'.
 - Test rebasing of the flat ony commits works as expected.

  $ hg rebase -d '9055b56f3916' -s '3795bd66ca70'
-  rebasing 4:3795bd66ca70 "flat only commit 1 over flat only commit 2 at level 2" (tip)
+  rebasing 3795bd66ca70 "flat only commit 1 over flat only commit 2 at level 2" (tip)
  fetching tree '' 40f43426c87ba597f0d9553077c72fe06d4e2acb, based on 85b359fdb09e9b8d7ac4a74551612b277345e8fd, found via 9055b56f3916
  fetching tree '' a6875e5fbf695d5fe67e03b8a5df2bab0e6dd045, based on 85b359fdb09e9b8d7ac4a74551612b277345e8fd, found via f7febcf0f689
  fetching tree '' b7db2b1fa98f78057c528e8dad908e05ef80aeb4, based on 85b359fdb09e9b8d7ac4a74551612b277345e8fd, found via 3795bd66ca70
--- a/tests/test-fb-hgext-treemanifest-noflat.t
+++ b/tests/test-fb-hgext-treemanifest-noflat.t
@ -80,5 +80,5 @@ This file tests that normal mercurial operations almost never read the flat mani
    File "*/fastmanifest/implementation.py", line *, in add (glob)
      p1text = origself.revision(p1)
  
-  rebasing 2:667a26a14261 "modify b" (tip)
+  rebasing 667a26a14261 "modify b" (tip)
  saved backup bundle to $TESTTMP/client/.hg/strip-backup/667a26a14261-d769c687-rebase.hg (glob)
--- a/tests/test-fb-hgext-treemanifest-treeonly.t
+++ b/tests/test-fb-hgext-treemanifest-treeonly.t
@ -240,7 +240,7 @@ Test pulling new commits from a hybrid server

 Test rebasing treeonly commits
  $ hg rebase -d 5 -b 2
-  rebasing 2:4b702090309e "hybrid flat+tree commit"
+  rebasing 4b702090309e "hybrid flat+tree commit"
  merging subdir/x
  warning: 1 conflicts while merging subdir/x! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -250,7 +250,7 @@ Test rebasing treeonly commits
  (no more unresolved files)
  continue: hg rebase --continue
  $ hg rebase --continue
-  rebasing 2:4b702090309e "hybrid flat+tree commit"
+  rebasing 4b702090309e "hybrid flat+tree commit"
  saved backup bundle to $TESTTMP/client/.hg/strip-backup/4b702090309e-7a0f0c5f-rebase.hg (glob)

 Test histedit treeonly commits
--- a/tests/test-fb-hgext-treemanifest.t
+++ b/tests/test-fb-hgext-treemanifest.t
@ -119,8 +119,8 @@ Test rebasing a stack of commits results in a pack with all the trees
  $ echo >> subdir/y
  $ hg commit -Am 'modify subdir/y again'
  $ hg rebase -d 0 -s '.^'
-  rebasing 3:6a2476258ba5 "modify subdir/y"
-  rebasing 4:f096b21e165f "modify subdir/y again" (tip)
+  rebasing 6a2476258ba5 "modify subdir/y"
+  rebasing f096b21e165f "modify subdir/y again" (tip)
  saved backup bundle to $TESTTMP/client/.hg/strip-backup/6a2476258ba5-a90056a1-rebase.hg (glob)
  $ hg log -r '.^::.' -T '{manifest}\n'
  0d05c20bb7eb53dbfe91f834ed3f0c26ca6ca655
@ -199,8 +199,8 @@ Test rebase two commits with same changes
  $ hg add noop
  $ hg commit -Am 'rebase destination'
  $ hg rebase -d 6 -s '4 + 5' --config rebase.singletransaction=True
-  rebasing 4:6052526a0d67 "modify subdir/y #1"
-  rebasing 5:79a69a1547d7 "modify subdir/y #2"
+  rebasing 6052526a0d67 "modify subdir/y #1"
+  rebasing 79a69a1547d7 "modify subdir/y #2"
  saved backup bundle to $TESTTMP/client/.hg/strip-backup/79a69a1547d7-fc6bc129-rebase.hg (glob)
  $ hg debughistorypack .hg/store/packs/manifests/387394c1cfba657cf7ac620d361317dd969a5c70.histidx .hg/store/packs/manifests/3b9ccdeefd4d12bf729e949ffdd58c25525a53e2.histidx
  
--- a/tests/test-fb-hgext-tweakdefaults-opawarecommands.t
+++ b/tests/test-fb-hgext-tweakdefaults-opawarecommands.t
@ -27,7 +27,7 @@ Check rebase metadata
  $ echo b > b && hg ci -Am b
  adding b
  $ hg rebase -r . -d destination
-  rebasing 3:1e9a3c00cbe9 "b" (tip)
+  rebasing 1e9a3c00cbe9 "b" (tip)
  $ hg debugobsolete
  09d39afb522a08bdb03dc231608f7a3488ab4edc * 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} (glob)
  * * 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'} (glob)
--- a/tests/test-fb-hgext-tweakdefaults-ordering-t.py
+++ b/tests/test-fb-hgext-tweakdefaults-ordering-t.py
@ -34,5 +34,5 @@ sh % "touch c"
 sh % "hg commit -Aqm c"
 sh % "hg bookmark C -t AB"
 sh % "hg rebase" == r"""
-    rebasing 2:d5e255ef74f8 "c" (C tip)
-    saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d5e255ef74f8-7d2cc323-rebase.hg (glob)"""
+    rebasing d5e255ef74f8 "c" (C tip)
+    saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d5e255ef74f8-7d2cc323-rebase.hg"""
--- a/tests/test-fb-hgext-tweakdefaults-pullrebaseffwd-t.py
+++ b/tests/test-fb-hgext-tweakdefaults-pullrebaseffwd-t.py
@ -47,15 +47,15 @@ sh % "hg commit -qAm x"
 sh % "echo c" > "../repo/c"
 sh % "hg -R ../repo commit -qAm c"
 sh % "hg pull --rebase -d default" == r"""
-    pulling from $TESTTMP/repo (glob)
+    pulling from $TESTTMP/repo
    searching for changes
    adding changesets
    adding manifests
    adding file changes
    added 1 changesets with 1 changes to 1 files (+1 heads)
    new changesets 177f92b77385
-    rebasing 2:* "x" (glob)
-    saved backup bundle * (glob)"""
+    rebasing 86d71924e1d0 "x"
+    saved backup bundle to $TESTTMP/* (glob)"""
 sh % "hg log -G -T '{rev} {desc}'" == r"""
    @  3 x
    |
--- a/tests/test-fb-hgext-tweakdefaults-pullrebaseremotenames-t.py
+++ b/tests/test-fb-hgext-tweakdefaults-pullrebaseremotenames-t.py
@ -51,14 +51,14 @@ sh % "hg commit -qAm x"
 sh % "echo c" > "../repo/c"
 sh % "hg -R ../repo commit -qAm c"
 sh % "hg pull --rebase" == r"""
-    pulling from $TESTTMP/repo (glob)
+    pulling from $TESTTMP/repo
    searching for changes
    adding changesets
    adding manifests
    adding file changes
    added 1 changesets with 1 changes to 1 files (+1 heads)
    new changesets 177f92b77385
-    rebasing 2:86d71924e1d0 "x" (localbookmark)
+    rebasing 86d71924e1d0 "x" (localbookmark)
    saved backup bundle to $TESTTMP/clone/.hg/strip-backup/86d71924e1d0-48875604-rebase.hg"""
 sh % "hg log -G -T '{rev} {desc}: {bookmarks}'" == r"""
    @  3 x: localbookmark
--- a/tests/test-fb-hgext-tweakdefaults-remotenames.t
+++ b/tests/test-fb-hgext-tweakdefaults-remotenames.t
@ -49,13 +49,13 @@ Test that hg pull --rebase aborts without --dest
  pulling from $TESTTMP/repo (glob)
  searching for changes
  no changes found
-  rebasing 3:3de6bbccf693 "foo" (bm tip)
+  rebasing 3de6bbccf693 "foo" (bm tip)
  saved backup bundle to $TESTTMP/clone/.hg/strip-backup/3de6bbccf693-0dce0663-rebase.hg (glob)
  $ hg pull --rebase --dest three
  pulling from $TESTTMP/repo (glob)
  searching for changes
  no changes found
-  rebasing 3:54ac787ff1c5 "foo" (bm tip)
+  rebasing 54ac787ff1c5 "foo" (bm tip)
  saved backup bundle to $TESTTMP/clone/.hg/strip-backup/54ac787ff1c5-4c2ca3a1-rebase.hg (glob)

 Test that hg pull --update aborts without --dest
@ -91,7 +91,7 @@ Test that setting a defaultdest allows --update and --rebase to work
  pulling from $TESTTMP/repo (glob)
  searching for changes
  no changes found
-  rebasing 4:50f3f60b4841 "d" (tip)
+  rebasing 50f3f60b4841 "d" (tip)
  saved backup bundle to * (glob)
  $ hg log -G --all -T '{node|short} {bookmarks} {remotenames}'
  @  ba0f83735c95
@ -116,7 +116,7 @@ Test that hg pull --rebase also works with a --tool argument
  adding file changes
  added 1 changesets with 1 changes to 1 files (+1 heads)
  new changesets e8aa3bc9f3f0
-  rebasing 4:ba0f83735c95 "d"
+  rebasing ba0f83735c95 "d"
  merging d
  saved backup bundle to $TESTTMP/clone/.hg/strip-backup/ba0f83735c95-ba455273-rebase.hg (glob)
  $ hg log -G --all -T '{node|short} {bookmarks} {remotenames}'
--- a/tests/test-fb-hgext-tweakdefaults.t
+++ b/tests/test-fb-hgext-tweakdefaults.t
@ -88,7 +88,7 @@ Empty rebase fails
  abort: you must specify a destination (-d) for the rebase
  [255]
  $ hg rebase -d 2
-  rebasing 1:7b4cb4e1674c "b"
+  rebasing 7b4cb4e1674c "b"
  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/7b4cb4e1674c-f22b5b1e-rebase.hg (glob)

 Empty rebase returns exit code 0:
@ -436,11 +436,11 @@ and allowance of prune rebases
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  adding d
  $ hg rebase -r 1 -d 2
-  rebasing 1:09d39afb522a "a"
+  rebasing 09d39afb522a "a"

 Test that we do not show divergence warning
  $ hg rebase -r 1 -d 3 --hidden
-  rebasing 1:09d39afb522a "a"
+  rebasing 09d39afb522a "a"

 Test that we allow pure prune rebases
  $ hg prune 4
@ -450,7 +450,7 @@ Test that we allow pure prune rebases
  hint[strip-hide]: 'hg strip' may be deprecated in the future - use 'hg hide' instead
  hint[hint-ack]: use 'hg hint --ack strip-hide' to silence these hints
  $ hg rebase -r 4 -d 3 --hidden
-  rebasing 4:31aefaa21905 "d"
+  rebasing 31aefaa21905 "d"

 Test diff --per-file-stat
  $ echo a >> a
@ -492,7 +492,7 @@ Test rebase with showupdated=True
  o  3903775176ed42b1458a6281db4a0ccf4d9f287a 0
  
  $ hg rebase -r 1 -d 2
-  rebasing 1:0e067c57feba "b"
+  rebasing 0e067c57feba "b"
  0e067c57feba -> a602e0d56f83 "b"
  saved backup bundle to $TESTTMP/showupdated/.hg/strip-backup/0e067c57feba-ca6d05e3-rebase.hg (glob)

@ -529,18 +529,18 @@ Test rebase with showupdate=True and a lot of source revisions
  @  3903775176ed42b1458a6281db4a0ccf4d9f287a 0
  
  $ hg rebase -r 'all() - 0 - 12' -d 12
-  rebasing 1:d5e255ef74f8 "c"
-  rebasing 2:a602e0d56f83 "b"
-  rebasing 3:46a418a0abd2 "1"
-  rebasing 4:ee71024c6e8c "2"
-  rebasing 5:7ab24e484daf "3"
-  rebasing 6:4e6ba707bdb8 "4"
-  rebasing 7:657f1516f142 "5"
-  rebasing 8:73800d52e8dd "6"
-  rebasing 9:e5ec40f70991 "7"
-  rebasing 10:6a01a2bb0a9f "8"
-  rebasing 11:14218977adef "9"
-  rebasing 13:6e3ddf6f49ef "11" (tip)
+  rebasing d5e255ef74f8 "c"
+  rebasing a602e0d56f83 "b"
+  rebasing 46a418a0abd2 "1"
+  rebasing ee71024c6e8c "2"
+  rebasing 7ab24e484daf "3"
+  rebasing 4e6ba707bdb8 "4"
+  rebasing 657f1516f142 "5"
+  rebasing 73800d52e8dd "6"
+  rebasing e5ec40f70991 "7"
+  rebasing 6a01a2bb0a9f "8"
+  rebasing 14218977adef "9"
+  rebasing 6e3ddf6f49ef "11" (tip)
  14218977adef -> 2d12dd93bf8b "9"
  46a418a0abd2 -> 645dc4557ba8 "1"
  4e6ba707bdb8 -> b9598afdff23 "4"
@ -559,6 +559,6 @@ Test rebase with showupdate=True and a long commit message
  $ touch longfile && hg add -q
  $ hg commit -qm "This is a long commit message which will be truncated."
  $ hg rebase -d 1
-  rebasing 14:e915a57d67db "This is a long commit message which will be truncated." (tip)
+  rebasing e915a57d67db "This is a long commit message which will be truncated." (tip)
  e915a57d67db -> 5444f740ff6c "This is a long commit message which will be tru..."
  saved backup bundle to $TESTTMP/showupdated/.hg/strip-backup/e915a57d67db-ad3372b5-rebase.hg (glob)
--- a/tests/test-fb-hgext-undo.t
+++ b/tests/test-fb-hgext-undo.t
@ -613,7 +613,7 @@ and commits are not duplicated
  > rebase =
  > EOF
  $ hg rebase -s 8057 -d 75f6
-  rebasing 17:805791ba4bcd "newbranch" (newbook tip)
+  rebasing 805791ba4bcd "newbranch" (newbook tip)
  $ hg log -l 2
  changeset:   18:35324a911c0d
  bookmark:    newbook
@ -1117,7 +1117,7 @@ permanently delete a commit, we do not want to undo to this state.
  > rebase =
  > EOF
  $ hg rebase -r 00617 -d 28dfc
-  rebasing 28:00617a57f780 "bfile" (tip)
+  rebasing 00617a57f780 "bfile" (tip)
  merging afile
  warning: 1 conflicts while merging afile! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -1145,7 +1145,7 @@ permanently delete a commit, we do not want to undo to this state.
  (no more unresolved files)
  continue: hg rebase --continue
  $ hg rebase --continue
-  rebasing 28:00617a57f780 "bfile" (tip)
+  rebasing 00617a57f780 "bfile" (tip)
  $ hg log -G -T compact -l6
  @  29[tip]:27   e642892c5cb0   1970-01-01 00:00 +0000   test
  |    bfile
@ -1210,7 +1210,7 @@ permanently delete a commit, we do not want to undo to this state.
  $ hg undo
  undone to *, before rebase -r 00617 -d 28dfc (glob)
  $ hg rebase -r 00617 -d 28dfc
-  rebasing 28:00617a57f780 "bfile"
+  rebasing 00617a57f780 "bfile"
  merging afile
  warning: 1 conflicts while merging afile! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
--- a/tests/test-fsmonitor-filemerge.t
+++ b/tests/test-fsmonitor-filemerge.t
@ -16,7 +16,7 @@
  $ setconfig blackbox.track=merge_resolve,watchman blackbox.logsource=true

  $ hg rebase -s B -d C --tool=false
-  rebasing 1:65f3e88a53bc "B" (B)
+  rebasing 65f3e88a53bc "B" (B)
  merging 2
  merging A
  merging 2 failed!
--- a/tests/test-hgext-perfsuite.t
+++ b/tests/test-hgext-perfsuite.t
@ -81,14 +81,14 @@ TODO: Make this test compatibile with obsstore enabled.
  stdout: reverting repo3/u/r/l/aaa
  
  ran 'revert' in * sec (glob)
-  stdout: rebasing 4:b17a0147d61c "test commit" (tip)
+  stdout: rebasing b17a0147d61c "test commit" (tip)
  saved backup bundle to $TESTTMP/repo3/.hg/strip-backup/b17a0147d61c-bd5f50f4-rebase.hg
  
  ran 'rebase' in * sec (glob)
  stdout: 1 files updated, 0 files merged, 10 files removed, 0 files unresolved
  (activating bookmark master)
  
-  stdout: rebasing 4:f8d4b0697695 "test commit" (tip)
+  stdout: rebasing f8d4b0697695 "test commit" (tip)
  saved backup bundle to $TESTTMP/repo3/.hg/strip-backup/f8d4b0697695-7388783a-rebase.hg
  
  ran 'immrebase' in * sec (glob)
--- a/tests/test-histedit-obsolete.t
+++ b/tests/test-histedit-obsolete.t
@ -230,7 +230,7 @@ Test that rewriting leaving instability behind is allowed
 stabilise

  $ hg rebase  -r 'orphan()' -d .
-  rebasing 11:c13eb81022ca "f"
+  rebasing c13eb81022ca "f"
  $ hg up tip -q

 Test dropping of changeset on the top of the stack
--- a/tests/test-merge-ancestor-mergestate-t.py
+++ b/tests/test-merge-ancestor-mergestate-t.py
@ -41,12 +41,12 @@ B
 A   # A/file = 1\n2\n3\n4
 """
 sh % "hg rebase -s A -d 0" == r"""
-    rebasing 1:19c6d3b0d8fb "A" (A)
-    rebasing 3:5a83467e1fc3 "B" (B)
-    rebasing 5:09810f6b52c0 "F" (F)
-    rebasing 4:3ff755c5931b "C" (C)
-    rebasing 6:dc7f2675f9ab "D" (D)
-    rebasing 7:5eb863826611 "E" (E tip)
+    rebasing 19c6d3b0d8fb "A" (A)
+    rebasing 5a83467e1fc3 "B" (B)
+    rebasing 09810f6b52c0 "F" (F)
+    rebasing 3ff755c5931b "C" (C)
+    rebasing dc7f2675f9ab "D" (D)
+    rebasing 5eb863826611 "E" (E tip)
    saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/19c6d3b0d8fb-a2cf1ad8-rebase.hg"""
 sh % "showgraph" == r"""
    o  7 e71547946f82 E
@ -65,7 +65,7 @@ sh % "showgraph" == r"""
    |
    @  0 9309aa3b805a driver"""
 sh % "hg rebase -r aa431a9572c1 -d e71547946f82" == r"""
-    rebasing 4:aa431a9572c1 "F"
+    rebasing aa431a9572c1 "F"
    ancestor nodes = ['01ba3ad89eb70070d81f052c0c40a3877c2ba5d8']
    ancestor revs = [3]
    merging file
--- a/tests/test-merge-conflict-count.t
+++ b/tests/test-merge-conflict-count.t
@ -15,7 +15,7 @@ Encountering a merge conflict prints the number of textual conflicts in each fil
  > a            # d/a = two
  > EOS
  $ hg rebase -r d -d e
-  rebasing 3:211accd27e10 "d" (d)
+  rebasing 211accd27e10 "d" (d)
  merging a
  merging b
  warning: 1 conflicts while merging a! (edit, then use 'hg resolve --mark')
@ -70,7 +70,7 @@ A merge conflict prints the possible conflicting commits:
  > a            # d/a = two
  > EOS
  $ hg rebase -r d -d j
-  rebasing 3:211accd27e10 "d" (d)
+  rebasing 211accd27e10 "d" (d)
  merging a
  merging b
  warning: 1 conflicts while merging a! (edit, then use 'hg resolve --mark')
--- a/tests/test-merge-halt.t
+++ b/tests/test-merge-halt.t
@ -24,7 +24,7 @@
 Testing on-failure=continue
  $ echo on-failure=continue >> $HGRCPATH
  $ hg rebase -s 1 -d 2 --tool false
-  rebasing 1:1f28a51c3c9b "c"
+  rebasing 1f28a51c3c9b "c"
  merging a
  merging b
  merging a failed!
@ -42,7 +42,7 @@ Testing on-failure=continue
 Testing on-failure=halt
  $ echo on-failure=halt >> $HGRCPATH
  $ hg rebase -s 1 -d 2 --tool false
-  rebasing 1:1f28a51c3c9b "c"
+  rebasing 1f28a51c3c9b "c"
  merging a
  merging b
  merging a failed!
@ -67,7 +67,7 @@ Testing on-failure=prompt
  > y
  > n
  > EOS
-  rebasing 1:1f28a51c3c9b "c"
+  rebasing 1f28a51c3c9b "c"
  merging a
  merging b
  merging a failed!
@ -87,7 +87,7 @@ Testing on-failure=prompt
  $ cat <<EOS | hg rebase -s 1 -d 2 --tool false
  > a
  > EOS
-  rebasing 1:1f28a51c3c9b "c"
+  rebasing 1f28a51c3c9b "c"
  merging a
  merging b
  merging a failed!
@ -113,7 +113,7 @@ Check that successful tool with failed post-check halts the merge
  > n
  > n
  > EOS
-  rebasing 1:1f28a51c3c9b "c"
+  rebasing 1f28a51c3c9b "c"
  merging a
  merging b
   output file a appears unchanged
@ -141,7 +141,7 @@ Check that conflicts with conflict check also halts the merge
  > on-failure=halt
  > EOS
  $ hg rebase -s 1 -d 2 --tool true
-  rebasing 1:1f28a51c3c9b "c"
+  rebasing 1f28a51c3c9b "c"
  merging a
  merging b
  merging a failed!
@ -160,7 +160,7 @@ Check that always-prompt also can halt the merge
  > y
  > n
  > EOS
-  rebasing 1:1f28a51c3c9b "c"
+  rebasing 1f28a51c3c9b "c"
  merging a
  merging b
  was merge of 'a' successful (yn)? y
@ -178,7 +178,7 @@ Check that always-prompt also can halt the merge

 Check that successful tool otherwise allows the merge to continue
  $ hg rebase -s 1 -d 2 --tool echo --keep --config merge-tools.echo.premerge=keep
-  rebasing 1:1f28a51c3c9b "c"
+  rebasing 1f28a51c3c9b "c"
  merging a
  merging b
  $TESTTMP/repo/a *a~base* *a~other* (glob)
--- a/tests/test-mutation.t
+++ b/tests/test-mutation.t
@ -156,7 +156,7 @@ Split parent, selecting all changes at the end
  record this change to 'file3'? [Ynesfdaq?] y
  
  no more change to split
-  rebasing 23:0529c1ec7df6 "c6"
+  rebasing 0529c1ec7df6 "c6"

 Split leaves the checkout at the top of the split commits

@ -170,7 +170,7 @@ Split leaves the checkout at the top of the split commits
 Amend with rebase afterwards (split info should not be propagated)

  $ hg amend --rebase -m "c5 (split)"
-  rebasing 26:0623f07d148d "c6"
+  rebasing 0623f07d148d "c6"
  $ hg debugmutation ".::tip"
   *  48b076c1640c53afc98cc99922d034e17830a65d amend by test at 1970-01-01T00:00:00 from:
      aa10382521dc0799a9ebc1235aa0783149ffcc4e split by test at 1970-01-01T00:00:00 (split into this and: 36e4e93ec194346c3e5a0afefd426dbc14dcaf4a) from:
--- a/tests/test-rebase-abort.t
+++ b/tests/test-rebase-abort.t
@ -56,8 +56,8 @@ TODO: Make this test compatibile with obsstore enabled.
 Conflicting rebase:

  $ hg rebase -s 3 -d 2
-  rebasing 3:3163e20567cc "L1"
-  rebasing 4:46f0b057b5c0 "L2" (tip)
+  rebasing 3163e20567cc "L1"
+  rebasing 46f0b057b5c0 "L2" (tip)
  merging common
  warning: 1 conflicts while merging common! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -131,8 +131,8 @@ forgotten) by Mercurial earlier than 2.7. This emulates Mercurial
 earlier than 2.7 by renaming ".hg/rebasestate" temporarily.

  $ hg rebase -s 3 -d 2
-  rebasing 3:3163e20567cc "L1"
-  rebasing 4:46f0b057b5c0 "L2" (tip)
+  rebasing 3163e20567cc "L1"
+  rebasing 46f0b057b5c0 "L2" (tip)
  merging common
  warning: 1 conflicts while merging common! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -199,9 +199,9 @@ Rebase and abort without generating new changesets:
  o  0: 1994f17a630e public 'A'
  
  $ hg rebase -b 4 -d 2
-  rebasing 3:a6484957d6b9 "B bis"
+  rebasing a6484957d6b9 "B bis"
  note: rebase of 3:a6484957d6b9 created no changes to commit
-  rebasing 4:145842775fec "C1" (tip)
+  rebasing 145842775fec "C1" (tip)
  merging c
  warning: 1 conflicts while merging c! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -260,7 +260,7 @@ rebase abort should not leave working copy in a merge state if tip-1 is public
  

  $ hg rebase -d master -r foo
-  rebasing 3:6c0f977a22d8 "C" (foo tip)
+  rebasing 6c0f977a22d8 "C" (foo tip)
  merging c
  warning: 1 conflicts while merging c! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -299,7 +299,7 @@ user has somehow managed to update to a different revision (issue4009)
  $ hg commit -m b2

  $ hg rebase -d @ -b foo --tool=internal:fail
-  rebasing 2:070cf4580bb5 "b2" (foo tip)
+  rebasing 070cf4580bb5 "b2" (foo tip)
  unresolved conflicts (see hg resolve, then hg rebase --continue)
  [1]

@ -364,8 +364,8 @@ test aborting an interrupted series (issue5084)
  @  0 base
  
  $ hg --config extensions.n=$TESTDIR/failfilemerge.py rebase -s 3 -d tip
-  rebasing 3:3a71550954f1 "b"
-  rebasing 4:e80b69427d80 "c"
+  rebasing 3a71550954f1 "b"
+  rebasing e80b69427d80 "c"
  abort: ^C
  [255]
  $ hg rebase --abort
@ -413,7 +413,7 @@ during a rebase (issue4661)
  $ hg ci -m "conflicting 2"

  $ hg rebase -d 1 --tool 'internal:fail'
-  rebasing 2:e4ea5cdc9789 "conflicting 1"
+  rebasing e4ea5cdc9789 "conflicting 1"
  unresolved conflicts (see hg resolve, then hg rebase --continue)
  [1]
  $ hg rebase --abort
--- a/tests/test-rebase-base-flag.t
+++ b/tests/test-rebase-base-flag.t
@ -34,9 +34,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 d6003a550c2c "C" (C)
+  rebasing 4526cf523425 "D" (D)
+  rebasing b296604d9846 "E" (E tip)
  o  6: 4870f5e7df37 'E'
  |
  | o  5: dc999528138a 'D'
@ -64,9 +64,9 @@ Multiple branching points caused by selecting a single merge changeset:
  >   |
  >   R
  > EOS
-  rebasing 2:c1e6b162678d "B" (B)
-  rebasing 3:d6003a550c2c "C" (C)
-  rebasing 6:54c8f00cb91c "E" (E tip)
+  rebasing c1e6b162678d "B" (B)
+  rebasing d6003a550c2c "C" (C)
+  rebasing 54c8f00cb91c "E" (E tip)
  o    6: 00598421b616 'E'
  |\
  | o  5: 6b3e11729672 'C'
@ -92,8 +92,8 @@ Rebase should not extend the "--base" revset using "descendants":
  >   |
  >   R
  > EOS
-  rebasing 2:c1e6b162678d "B" (B)
-  rebasing 5:54c8f00cb91c "E" (E tip)
+  rebasing c1e6b162678d "B" (B)
+  rebasing 54c8f00cb91c "E" (E tip)
  o    5: e583bf3ff54c 'E'
  |\
  | o  4: 85260910e847 'B'
@ -117,9 +117,9 @@ Rebase should not simplify the "--base" revset using "roots":
  >   |
  >   R
  > EOS
-  rebasing 2:c1e6b162678d "B" (B)
-  rebasing 3:d6003a550c2c "C" (C)
-  rebasing 5:54c8f00cb91c "E" (E tip)
+  rebasing c1e6b162678d "B" (B)
+  rebasing d6003a550c2c "C" (C)
+  rebasing 54c8f00cb91c "E" (E tip)
  o    5: 00598421b616 'E'
  |\
  | o  4: 6b3e11729672 'C'
@ -178,12 +178,12 @@ Multiple branching points caused by multiple bases (issue5420):
  >   |
  >   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 a113dbaa660a "B1" (B1)
+  rebasing 06ce7b1cc8c2 "B2" (B2)
+  rebasing 0ac98cce32d3 "C1" (C1)
+  rebasing 781512f5e33d "C2" (C2)
+  rebasing 428d8c18f641 "E1" (E1)
+  rebasing e1bf82f6b6df "E2" (E2)
  o  12: e4a37b6fdbd2 'E2'
  |
  o  11: 9675bea983df 'E1'
@ -221,19 +221,19 @@ Multiple branching points with multiple merges:
  >  \|/  |/  |/
  >   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 dc0947a82db8 "C" (C)
+  rebasing 4e4f9194f9f1 "D" (D)
+  rebasing 03ca77807e91 "E" (E)
+  rebasing afc707c82df0 "F" (F)
+  rebasing 690dfff91e9e "G" (G)
+  rebasing 2893b886bb10 "H" (H)
+  rebasing 08ebfeb61bac "I" (I)
+  rebasing a0a5005cec67 "J" (J)
+  rebasing 83780307a7e8 "K" (K)
+  rebasing e131637a1cb6 "L" (L)
+  rebasing d1f6d0c3c7e4 "M" (M)
+  rebasing 7aaec6f81888 "N" (N)
+  rebasing 325bc8f1760d "P" (P tip)
  o    15: 6ef6a0ea3b18 'P'
  |\
  | o    14: 20ba3610a7e5 'N'
@ -279,13 +279,13 @@ Slightly more complex merge case (mentioned in https://www.mercurial-scm.org/pip
  > |
  > 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 8817fae53c94 "C0" (C0)
+  rebasing 06ca5dfe3b5b "B2" (B2)
+  rebasing 73508237b032 "C1" (C1)
+  rebasing fdb955e2faed "A2" (A2)
+  rebasing 4e449bd1a643 "A3" (A3)
+  rebasing 0a33b0519128 "B1" (B1)
+  rebasing 209327807c3a "B3" (B3 tip)
  o    12: ceb984566332 'B3'
  |\
  | o  11: 19d93caac497 'B1'
@ -334,8 +334,8 @@ Multiple roots. Roots are ancestors of dest:
  >  \|\|
  >   C A
  > EOF
-  rebasing 2:112478962961 "B" (B)
-  rebasing 3:b70f76719894 "D" (D)
+  rebasing 112478962961 "B" (B)
+  rebasing b70f76719894 "D" (D)
  o  4: 511efad7bf13 'D'
  |
  | o  3: 25c4e279af62 'B'
@ -374,8 +374,8 @@ Multiple roots. One root is not an ancestor of dest. Select using a merge:
  >  \|\|
  >   A C
  > EOF
-  rebasing 2:f675d5a1c6a4 "B" (B)
-  rebasing 5:f68696fe6af8 "E" (E tip)
+  rebasing f675d5a1c6a4 "B" (B)
+  rebasing f68696fe6af8 "E" (E tip)
  o    5: f6e6f5081554 'E'
  |\
  | o    4: 30cabcba27be 'B'
@ -395,8 +395,8 @@ Multiple roots. Two children share two parents while dest has only one parent:
  >  \|\|\
  >   A C A
  > EOF
-  rebasing 2:f675d5a1c6a4 "B" (B)
-  rebasing 3:c2a779e13b56 "D" (D)
+  rebasing f675d5a1c6a4 "B" (B)
+  rebasing c2a779e13b56 "D" (D)
  o    4: 5eecd056b5f8 'D'
  |\
  +---o  3: 30cabcba27be 'B'
--- a/tests/test-rebase-bookmarks.t
+++ b/tests/test-rebase-bookmarks.t
@ -73,7 +73,7 @@ Test deleting divergent bookmarks from dest (issue3685)
  o  0: 1994f17a630e 'A' Y@diverge
  
  $ hg rebase -s Y -d 3
-  rebasing 2:49cb3485fa0c "C" (Y Z)
+  rebasing 49cb3485fa0c "C" (Y Z)
  saved backup bundle to $TESTTMP/a1/.hg/strip-backup/49cb3485fa0c-126f3e97-rebase.hg

  $ tglog
@ -95,7 +95,7 @@ Do not try to keep active but deleted divergent bookmark
  $ hg book W@diverge

  $ hg rebase -s W -d .
-  rebasing 3:41acb9dca9eb "D" (W tip)
+  rebasing 41acb9dca9eb "D" (W tip)
  saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-b35a6a63-rebase.hg

  $ hg bookmarks
@ -113,8 +113,8 @@ Keep bookmarks to the correct rebased changeset
  $ hg up -q Z

  $ hg rebase -s 1 -d 3
-  rebasing 1:6c81ed0049f8 "B" (X)
-  rebasing 2:49cb3485fa0c "C" (Y Z)
+  rebasing 6c81ed0049f8 "B" (X)
+  rebasing 49cb3485fa0c "C" (Y Z)
  saved backup bundle to $TESTTMP/a2/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg

  $ tglog
@ -136,8 +136,8 @@ Keep active bookmark on the correct changeset
  $ hg up -q X

  $ hg rebase -d W
-  rebasing 1:6c81ed0049f8 "B" (X)
-  rebasing 2:49cb3485fa0c "C" (Y Z)
+  rebasing 6c81ed0049f8 "B" (X)
+  rebasing 49cb3485fa0c "C" (Y Z)
  saved backup bundle to $TESTTMP/a3/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg

  $ tglog
@ -166,7 +166,7 @@ rebase --continue with bookmarks present (issue3802)
  $ 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 3d5fa227f4b5 "C" (Y Z)
  merging c
  warning: 1 conflicts while merging c! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -176,7 +176,7 @@ rebase --continue with bookmarks present (issue3802)
  (no more unresolved files)
  continue: hg rebase --continue
  $ hg rebase --continue
-  rebasing 3:3d5fa227f4b5 "C" (Y Z)
+  rebasing 3d5fa227f4b5 "C" (Y Z)
  saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-c6ea2371-rebase.hg
  $ tglog
  @  4: 45c0f0ec1203 'C' Y Z
@ -204,9 +204,9 @@ as --rev arguments (issue3950)
  $ hg book bisect
  $ hg update -q Y
  $ hg rebase -r '"bisect"^^::"bisect"^' -r bisect -d Z
-  rebasing 5:345c90f326a4 "bisect"
-  rebasing 6:f677a2907404 "bisect2"
-  rebasing 7:325c16001345 "bisect3" (bisect tip)
+  rebasing 345c90f326a4 "bisect"
+  rebasing f677a2907404 "bisect2"
+  rebasing 325c16001345 "bisect3" (bisect tip)
  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)
@ -229,7 +229,7 @@ Bookmark and working parent get moved even if --keep is set (issue5682)
  o  0: 426bada5c675 'A' A
  
  $ hg rebase -r B -d C --keep
-  rebasing 1:112478962961 "B" (B)
+  rebasing 112478962961 "B" (B)
  $ tglog
  @  3: 9769fc65c4c5 'B' B
  |
--- a/tests/test-rebase-check-restore-t.py
+++ b/tests/test-rebase-check-restore-t.py
@ -71,8 +71,8 @@ sh % "tglogp" == r"""
    |/
    o  0: 4a2df7238c3b draft 'A'"""
 sh % "hg rebase -s 1 -d 4 --keep" == r"""
-    rebasing 1:27547f69f254 "B"
-    rebasing 2:965c486023db "C"
+    rebasing 27547f69f254 "B"
+    rebasing 965c486023db "C"
    merging A
    warning: 1 conflicts while merging A! (edit, then use 'hg resolve --mark')
    unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -86,8 +86,8 @@ sh % "hg resolve -m A" == r"""
    (no more unresolved files)
    continue: hg rebase --continue"""
 sh % "hg rebase --continue" == r'''
-    already rebased 1:27547f69f254 "B" as 45396c49d53b
-    rebasing 2:965c486023db "C"'''
+    already rebased 27547f69f254 "B" as 45396c49d53b
+    rebasing 965c486023db "C"'''

 sh % "tglogp" == r"""
    o  7: d2d25e26288e secret 'C'
@ -127,7 +127,7 @@ sh % "tglogp" == r"""
    |/
    o  0: 4a2df7238c3b draft 'A'"""
 sh % "hg rebase -s 5 -d 4" == r"""
-    rebasing 5:3225f3ea730a "F" (tip)
+    rebasing 3225f3ea730a "F" (tip)
    merging A
    warning: 1 conflicts while merging A! (edit, then use 'hg resolve --mark')
    unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -141,7 +141,7 @@ sh % "hg resolve -m A" == r"""
    (no more unresolved files)
    continue: hg rebase --continue"""
 sh % "hg rebase --continue" == r"""
-    rebasing 5:3225f3ea730a "F" (tip)
+    rebasing 3225f3ea730a "F" (tip)
    saved backup bundle to $TESTTMP/a2/.hg/strip-backup/3225f3ea730a-289ce185-rebase.hg"""

 sh % "tglogp" == r"""
--- a/tests/test-rebase-collapse.t
+++ b/tests/test-rebase-collapse.t
@ -38,9 +38,9 @@ Rebasing B onto H and collapsing changesets:
  > echo "edited manually" >> \$1
  > EOF
  $ HGEDITOR="sh $TESTTMP/editor.sh" hg rebase --collapse -e --dest $H
-  rebasing 1:112478962961 "B"
-  rebasing 4:26805aba1e60 "C"
-  rebasing 7:f585351a92f8 "D" (tip)
+  rebasing 112478962961 "B"
+  rebasing 26805aba1e60 "C"
+  rebasing f585351a92f8 "D" (tip)
  ==== before editing
  Collapsed revision
  * B
@ -92,8 +92,8 @@ Rebasing E onto H:
  $ cd a2

  $ hg rebase --source $E --collapse --dest $H
-  rebasing 2:7fb047a69f22 "E"
-  rebasing 5:c6001eacfde5 "G"
+  rebasing 7fb047a69f22 "E"
+  rebasing c6001eacfde5 "G"

  $ hg log -Gr 'all()' -T '{desc}'
  o  Collapsed revision
@ -133,8 +133,8 @@ Rebasing G onto H with custom message:
  > true
  > EOF
  $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source $E --collapse -m 'custom message' -e --dest $H
-  rebasing 2:7fb047a69f22 "E"
-  rebasing 5:c6001eacfde5 "G"
+  rebasing 7fb047a69f22 "E"
+  rebasing c6001eacfde5 "G"
  HGEDITFORM=rebase.collapse

  $ hg log -Gr 'all()' -T '{desc}'
@ -195,9 +195,9 @@ Rebase and collapse - more than one external (fail):
 Rebase and collapse - E onto H:

  $ hg rebase -s $E --dest $H --collapse # root (E) is not a merge
-  rebasing 5:49cb92066bfd "E"
-  rebasing 6:11abe3fb10b8 "F"
-  rebasing 7:202d1982ae8b "G" (tip)
+  rebasing 49cb92066bfd "E"
+  rebasing 11abe3fb10b8 "F"
+  rebasing 202d1982ae8b "G" (tip)

  $ hg log -Gr 'all()' -T '{desc}'
  o    Collapsed revision
@ -252,11 +252,11 @@ Rebase and collapse - E onto I:
  $ cd c1

  $ hg rebase -s $E --dest $I --collapse # root (E) is not a merge
-  rebasing 5:49cb92066bfd "E"
-  rebasing 6:3cf8a9483881 "F"
+  rebasing 49cb92066bfd "E"
+  rebasing 3cf8a9483881 "F"
  merging E
-  rebasing 7:066fd31e12b9 "G"
-  rebasing 8:c8947cb2e149 "H" (tip)
+  rebasing 066fd31e12b9 "G"
+  rebasing c8947cb2e149 "H" (tip)

  $ hg log -Gr 'all()' -T '{desc}'
  o    Collapsed revision
@ -311,10 +311,10 @@ Rebase and collapse - B onto F:
  $ cd d1

  $ hg rebase -s $B --collapse --dest $F
-  rebasing 1:112478962961 "B"
-  rebasing 3:26805aba1e60 "C"
-  rebasing 4:be0ef73c17ad "D"
-  rebasing 5:02c4367d6973 "E" (tip)
+  rebasing 112478962961 "B"
+  rebasing 26805aba1e60 "C"
+  rebasing be0ef73c17ad "D"
+  rebasing 02c4367d6973 "E" (tip)

  $ hg log -Gr 'all()' -T '{desc}'
  o  Collapsed revision
@ -356,11 +356,11 @@ Rebase, collapse and copies

  $ hg up -q $Q
  $ hg rebase --collapse -d $Y
-  rebasing 1:24b95cf2173d "P"
+  rebasing 24b95cf2173d "P"
  merging a and d to d
  merging b and e to e
  merging c and f to f
-  rebasing 3:2ccc3426bf6d "Q" (tip)
+  rebasing 2ccc3426bf6d "Q" (tip)
  merging f and c to c
  merging e and g to g
  $ hg st
@ -394,8 +394,8 @@ Rebase, collapse and copies
 Test collapsing in place

  $ hg rebase --collapse -b . -d $X
-  rebasing 2:71cf332de4cf "Y"
-  rebasing 4:c2a9a5beba1a "Collapsed revision" (tip)
+  rebasing 71cf332de4cf "Y"
+  rebasing c2a9a5beba1a "Collapsed revision" (tip)
  $ hg st --change tip --copies
  M a
  M c
@ -437,8 +437,8 @@ Test collapsing changes that add then remove a file
  adding b
  $ hg book foo
  $ hg rebase -d 0 -r "1::2" --collapse -m collapsed
-  rebasing 1:6d8d9f24eec3 "a"
-  rebasing 2:1cc73eca5ecc "b" (foo tip)
+  rebasing 6d8d9f24eec3 "a"
+  rebasing 1cc73eca5ecc "b" (foo tip)
  $ hg log -G --template "{rev}: '{desc}' {bookmarks}"
  @  3: 'collapsed' foo
  |
@ -465,7 +465,7 @@ running into merge conflict and invoking rebase --continue.
  $ echo "a-dev" > a
  $ hg commit -m "a-dev"
  $ hg rebase --collapse -m "a-default-dev" -d 1
-  rebasing 2:1fb04abbc715 "a-dev" (tip)
+  rebasing 1fb04abbc715 "a-dev" (tip)
  merging a
  warning: 1 conflicts while merging a! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -475,7 +475,7 @@ running into merge conflict and invoking rebase --continue.
  (no more unresolved files)
  continue: hg rebase --continue
  $ hg rebase --continue
-  rebasing 2:1fb04abbc715 "a-dev" (tip)
+  rebasing 1fb04abbc715 "a-dev" (tip)
  $ hg log
  changeset:   3:3f6f2136305e
  tag:         tip
--- a/tests/test-rebase-conflicts.t
+++ b/tests/test-rebase-conflicts.t
@ -62,8 +62,8 @@ Try to call --continue:
 Conflicting rebase:

  $ hg rebase -s 3 -d 2
-  rebasing 3:3163e20567cc "L1"
-  rebasing 4:46f0b057b5c0 "L2"
+  rebasing 3163e20567cc "L1"
+  rebasing 46f0b057b5c0 "L2"
  merging common
  warning: 1 conflicts while merging common! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -97,9 +97,9 @@ Conclude rebase:
  (no more unresolved files)
  continue: hg rebase --continue
  $ hg continue
-  already rebased 3:3163e20567cc "L1" as 3e046f2ecedb
-  rebasing 4:46f0b057b5c0 "L2"
-  rebasing 5:8029388f38dc "L3" (mybook)
+  already rebased 3163e20567cc "L1" as 3e046f2ecedb
+  rebasing 46f0b057b5c0 "L2"
+  rebasing 8029388f38dc "L3" (mybook)
  saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-5ca4656e-rebase.hg

  $ tglogp
@ -236,7 +236,7 @@ Check that the right ancestors is used while rebasing a merge (issue4041)
  rebase onto 4bc80088dc6b starting from e31216eec445
  rebasing on disk
  rebase status stored
-  rebasing 9:e31216eec445 "more changes to f1"
+  rebasing e31216eec445 "more changes to f1"
   future parents are 2 and -1
  rebase status stored
   update to 2:4bc80088dc6b
@ -262,7 +262,7 @@ Check that the right ancestors is used while rebasing a merge (issue4041)
  committing manifest
  committing changelog
  rebased as 19c888675e13
-  rebasing 10:2f2496ddf49d "merge" (tip)
+  rebasing 2f2496ddf49d "merge" (tip)
   future parents are 11 and 7
  rebase status stored
   already in destination
@ -336,7 +336,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 7bc217434fc1 "abc" (tip)
  merging a
  warning: 1 conflicts while merging a! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -356,7 +356,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 7bc217434fc1 "abc" (tip)
  merging a
  warning: 1 conflicts while merging a! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -394,7 +394,7 @@ Test rebase with obsstore turned on and off (issue5606)
  $ 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 112478962961 "B" (B)
  merging B
  warning: 1 conflicts while merging B! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -405,8 +405,8 @@ Test rebase with obsstore turned on and off (issue5606)
  (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 112478962961 "B" (B)
+  rebasing f585351a92f8 "D" (D)
  warning: orphaned descendants detected, not stripping 112478962961
  saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg

--- a/tests/test-rebase-copy-relations.t
+++ b/tests/test-rebase-copy-relations.t
@ -13,10 +13,10 @@
  > EOS

  $ hg rebase -s $B -d $Z
-  rebasing 1:112478962961 "B"
-  rebasing 5:039c3379aaa9 "C2"
-  rebasing 3:26805aba1e60 "C"
-  rebasing 6:f585351a92f8 "D" (tip)
+  rebasing 112478962961 "B"
+  rebasing 039c3379aaa9 "C2"
+  rebasing 26805aba1e60 "C"
+  rebasing f585351a92f8 "D" (tip)
  $ hg log -G -T '{node|short} {desc} {obsfate}'
  o  f7f4f5b9173a D
  |
--- a/tests/test-rebase-dest.t
+++ b/tests/test-rebase-dest.t
@ -23,15 +23,15 @@ Require a destination
  (use: hg rebase -d REV)
  [255]
  $ hg rebase -d 1
-  rebasing 2:5db65b93a12b "cc" (tip)
+  rebasing 5db65b93a12b "cc" (tip)
  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 889b0bc6a730 "cc" (tip)
  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 279de9495438 "cc" (tip)
  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/279de9495438-ab0a5128-rebase.hg

 Requiring dest should not break continue or other rebase options
@ -48,7 +48,7 @@ Requiring dest should not break continue or other rebase options
  o  0 aa
  
  $ hg rebase -d 2
-  rebasing 3:0537f6b50def "dc" (tip)
+  rebasing 0537f6b50def "dc" (tip)
  merging c
  warning: 1 conflicts while merging c! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -58,7 +58,7 @@ Requiring dest should not break continue or other rebase options
  (no more unresolved files)
  continue: hg rebase --continue
  $ hg rebase --continue
-  rebasing 3:0537f6b50def "dc" (tip)
+  rebasing 0537f6b50def "dc" (tip)
  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0537f6b50def-be4c7386-rebase.hg

  $ cd ..
@ -179,9 +179,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 426bada5c675 "A" (A)
+  already rebased dc0947a82db8 "C" (C)
+  rebasing 004dc1679908 "D" (D tip)
  o  4: d8d8601abd5e 'D'
  
  o  2: dc0947a82db8 'C'
@ -223,10 +223,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 112478962961 "B" (B)
+  rebasing 26805aba1e60 "C" (C)
+  rebasing cd488e83d208 "E" (E)
+  rebasing 0069ba24938a "F" (F tip)
  o  9: d150ff263fc8 'F'
  |
  o  8: 66f30a1a2eab 'E'
@ -250,8 +250,8 @@ Different destinations for merge changesets with a same root:
  > |\|
  > A D
  > EOS
-  rebasing 3:a4256619d830 "B" (B)
-  rebasing 6:8e139e245220 "C" (C tip)
+  rebasing a4256619d830 "B" (B)
+  rebasing 8e139e245220 "C" (C tip)
  o    8: 51e2ce92e06a 'C'
  |\
  | o    7: 2ed0c8546285 'B'
@ -279,9 +279,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 33441538d4aa "F" (F)
+  rebasing cf43ad9da869 "G" (G)
+  rebasing eef94f3b5f03 "H" (H tip)
  o  10: b3d84c6666cf 'H'
  |
  | o  9: f7c28a1a15e2 'G'
@ -305,8 +305,8 @@ Source overlaps with destination:
  >  \|/
  >   A
  > EOS
-  rebasing 2:dc0947a82db8 "C" (C)
-  rebasing 1:112478962961 "B" (B)
+  rebasing dc0947a82db8 "C" (C)
+  rebasing 112478962961 "B" (B)
  o  5: 5fe9935d5222 'B'
  |
  o  4: 12d20731b9e0 'C'
@ -348,11 +348,11 @@ Detect source is ancestor of dest in runtime:
  >  \|/
  >   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 112478962961 "B" (B)
+  already rebased dc0947a82db8 "C" (C)
+  already rebased b18e25de2cf5 "D" (D)
+  already rebased 312782b8f06e "E" (E)
+  already rebased ad6717a6a58e "F" (F tip)
  o  5: ad6717a6a58e 'F'
  |
  | o    4: 312782b8f06e 'E'
@ -376,17 +376,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 701514e1408d "I" (I)
+  rebasing 426bada5c675 "A" (A)
+  rebasing e7050b6e5048 "H" (H)
+  rebasing 26805aba1e60 "C" (C)
+  rebasing cf89f86b485b "J" (J)
+  rebasing 112478962961 "B" (B)
+  rebasing 7fb047a69f22 "E" (E)
+  rebasing f585351a92f8 "D" (D)
+  rebasing ae41898d7875 "K" (K tip)
+  rebasing 711f53bbef0b "G" (G)
+  rebasing 64a8289d2492 "F" (F)
  o  21: 3735afb3713a 'F'
  |
  o  20: 07698142d7a7 'G'
@ -428,12 +428,12 @@ Resolve instability:
  >     \|          # amend: I -> I2
  >      A
  > EOF
-  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 5c432343bf59 "J" (J tip)
+  rebasing 26805aba1e60 "C" (C)
+  rebasing f585351a92f8 "D" (D)
+  rebasing ffebc37c5d0b "E3" (E3)
+  rebasing fb184bcfeee8 "F2" (F2)
+  rebasing dc838ab4c0da "G" (G)
  o  22: 174f63d574a8 'G'
  |
  o  21: c9d9fbe76705 'F2'
--- a/tests/test-rebase-detach.t
+++ b/tests/test-rebase-detach.t
@ -22,7 +22,7 @@ Rebasing D onto B detaching from C (one commit):
  $ hg phase --force --secret D

  $ hg rebase -s D -d B
-  rebasing 3:e7b3f00ed42e "D" (D tip)
+  rebasing e7b3f00ed42e "D" (D tip)
  saved backup bundle to $TESTTMP/a1/.hg/strip-backup/e7b3f00ed42e-6f368371-rebase.hg

  $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
@ -58,8 +58,8 @@ Rebasing D onto B detaching from C (two commits):
  > EOF

  $ hg rebase -s D -d B
-  rebasing 3:e7b3f00ed42e "D" (D)
-  rebasing 4:69a34c08022a "E" (E tip)
+  rebasing e7b3f00ed42e "D" (D)
+  rebasing 69a34c08022a "E" (E tip)
  saved backup bundle to $TESTTMP/a2/.hg/strip-backup/e7b3f00ed42e-a2ec7cea-rebase.hg

  $ tglog
@ -95,8 +95,8 @@ Rebasing C onto B using detach (same as not using it):
  > EOF

  $ hg rebase -s C -d B
-  rebasing 2:dc0947a82db8 "C" (C)
-  rebasing 3:e7b3f00ed42e "D" (D tip)
+  rebasing dc0947a82db8 "C" (C)
+  rebasing e7b3f00ed42e "D" (D tip)
  saved backup bundle to $TESTTMP/a3/.hg/strip-backup/dc0947a82db8-b8481714-rebase.hg

  $ tglog
@ -134,8 +134,8 @@ Rebasing D onto B detaching from C and collapsing:
  $ hg phase --force --secret E

  $ hg rebase --collapse -s D -d B
-  rebasing 3:e7b3f00ed42e "D" (D)
-  rebasing 4:69a34c08022a "E" (E tip)
+  rebasing e7b3f00ed42e "D" (D)
+  rebasing 69a34c08022a "E" (E tip)
  saved backup bundle to $TESTTMP/a4/.hg/strip-backup/e7b3f00ed42e-a2ec7cea-rebase.hg

  $ hg  log -G --template "{rev}:{phase} '{desc}' {branches}\n"
@ -171,9 +171,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 dc0947a82db8 "C" (C)
+  rebasing e7b3f00ed42e "D" (D)
+  rebasing 69a34c08022a "E" (E tip)
  saved backup bundle to $TESTTMP/a5/.hg/strip-backup/dc0947a82db8-3eefec98-rebase.hg

  $ tglog
@ -188,8 +188,8 @@ Rebasing across null as ancestor
  o  0: 426bada5c675 'A'
  
  $ hg rebase -d 1 -s 3
-  rebasing 3:e9153d36a1af "D"
-  rebasing 4:e3d0c70d606d "E" (tip)
+  rebasing e9153d36a1af "D"
+  rebasing e3d0c70d606d "E" (tip)
  saved backup bundle to $TESTTMP/a5/.hg/strip-backup/e9153d36a1af-db7388ed-rebase.hg
  $ tglog
  o  4: 2c24e540eccd 'E'
@ -246,9 +246,9 @@ Verify that target is not selected as external rev (issue3085)
  o  0: 426bada5c675 'A'
  
  $ hg rebase -s I -d H --collapse --config ui.merge=internal:other
-  rebasing 5:b92d164ad3cb "I" (I)
-  rebasing 6:0cfbc7e8faaf "Merge"
-  rebasing 7:c6aaf0d259c0 "J" (tip)
+  rebasing b92d164ad3cb "I" (I)
+  rebasing 0cfbc7e8faaf "Merge"
+  rebasing c6aaf0d259c0 "J" (tip)
  saved backup bundle to $TESTTMP/a6/.hg/strip-backup/b92d164ad3cb-88fd7ab7-rebase.hg

  $ tglog
@ -292,7 +292,7 @@ Ensure --continue restores a correct state (issue3046) and phase:
  adding B
  $ hg phase --force --secret .
  $ hg rebase -s . -d B --config ui.merge=internal:fail
-  rebasing 3:17b4880d2402 "B2" (tip)
+  rebasing 17b4880d2402 "B2" (tip)
  merging B
  warning: 1 conflicts while merging B! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -301,7 +301,7 @@ Ensure --continue restores a correct state (issue3046) and phase:
  (no more unresolved files)
  continue: hg rebase --continue
  $ hg rebase -c
-  rebasing 3:17b4880d2402 "B2" (tip)
+  rebasing 17b4880d2402 "B2" (tip)
  note: rebase of 3:17b4880d2402 created no changes to commit
  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/17b4880d2402-1ae1f6cc-rebase.hg
  $ hg  log -G --template "{rev}:{phase} '{desc}' {branches}\n"
--- a/tests/test-rebase-emptycommit.t
+++ b/tests/test-rebase-emptycommit.t
@ -49,9 +49,9 @@
 With --keep, bookmark should move

  $ hg rebase -r 3+4 -d E --keep
-  rebasing 3:e7b3f00ed42e "D" (BOOK-D)
+  rebasing e7b3f00ed42e "D" (BOOK-D)
  note: rebase of 3:e7b3f00ed42e created no changes to commit
-  rebasing 4:69a34c08022a "E" (BOOK-E)
+  rebasing 69a34c08022a "E" (BOOK-E)
  note: rebase of 4:69a34c08022a created no changes to commit
  $ hg log -G -T '{rev} {desc} {bookmarks}'
  o  7 E BOOK-D BOOK-E
@ -81,12 +81,12 @@ still introduced by an ancestor of changeset on B-NEW. In the below case,
 "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)
+  rebasing dc0947a82db8 "C" (BOOK-C C)
+  rebasing e7b3f00ed42e "D" (BOOK-D)
  note: rebase of 3:e7b3f00ed42e created no changes to commit
-  rebasing 4:69a34c08022a "E" (BOOK-E)
+  rebasing 69a34c08022a "E" (BOOK-E)
  note: rebase of 4:69a34c08022a created no changes to commit
-  rebasing 5:6b2aeab91270 "F" (BOOK-F F)
+  rebasing 6b2aeab91270 "F" (BOOK-F F)
  $ hg log -G -T '{rev} {desc} {bookmarks}'
  o  9 F BOOK-F
  |
@ -136,11 +136,11 @@ Merge and its ancestors all become empty
  > EOS

  $ hg rebase -r '(A::)-(B::)-A' -d H
-  rebasing 2:dc0947a82db8 "C" (BOOK-C)
+  rebasing dc0947a82db8 "C" (BOOK-C)
  note: rebase of 2:dc0947a82db8 created no changes to commit
-  rebasing 3:b18e25de2cf5 "D" (BOOK-D)
+  rebasing b18e25de2cf5 "D" (BOOK-D)
  note: rebase of 3:b18e25de2cf5 created no changes to commit
-  rebasing 4:86a1f6686812 "E" (BOOK-E E)
+  rebasing 86a1f6686812 "E" (BOOK-E E)
  note: rebase of 4:86a1f6686812 created no changes to commit

  $ hg log -G -T '{rev} {desc} {bookmarks}'
@ -190,13 +190,13 @@ Part of ancestors of a merge become empty
  > EOS

  $ hg rebase -r '(A::)-(B::)-A' -d H
-  rebasing 2:dc0947a82db8 "C" (BOOK-C)
+  rebasing dc0947a82db8 "C" (BOOK-C)
  note: rebase of 2:dc0947a82db8 created no changes to commit
-  rebasing 3:b18e25de2cf5 "D" (BOOK-D D)
-  rebasing 4:03ca77807e91 "E" (BOOK-E E)
-  rebasing 5:ad6717a6a58e "F" (BOOK-F)
+  rebasing b18e25de2cf5 "D" (BOOK-D D)
+  rebasing 03ca77807e91 "E" (BOOK-E E)
+  rebasing ad6717a6a58e "F" (BOOK-F)
  note: rebase of 5:ad6717a6a58e created no changes to commit
-  rebasing 6:c58e8bdac1f4 "G" (BOOK-G G)
+  rebasing c58e8bdac1f4 "G" (BOOK-G G)

  $ hg log -G -T '{rev} {desc} {bookmarks}'
  o    12 G BOOK-G
--- a/tests/test-rebase-flags.t
+++ b/tests/test-rebase-flags.t
@ -53,7 +53,7 @@ Test rebasing a single commit that changes flags:
  

  $ hg rebase -r 1 -d .
-  rebasing 1:5f41048406b0 "move"
+  rebasing 5f41048406b0 "move"
  merging foo and foo_newloc to foo_newloc
  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5f41048406b0-6cf73300-rebase.hg
  $ hg up tip
--- a/tests/test-rebase-inmemory-conflicts.t
+++ b/tests/test-rebase-inmemory-conflicts.t
@ -49,13 +49,13 @@ Make conflicts halfway up the stack:
  $ cp -R . ../control
  $ hg rebase -d c
  rebasing in-memory!
-  rebasing 4:f4016ed9f5d0 "d" (d)
-  rebasing 5:881eb15e0fdf "e" (e)
-  note: not rebasing 6:22d86c9ba040 "f" (f) and its descendants as this would cause divergence
-  rebasing 7:e692c3b32196 "f"
+  rebasing f4016ed9f5d0 "d" (d)
+  rebasing 881eb15e0fdf "e" (e)
+  note: not rebasing 22d86c9ba040 "f" (f) and its descendants as this would cause divergence
+  rebasing e692c3b32196 "f"
  merging c
  hit merge conflicts (in c); switching to on-disk merge
-  rebasing 7:e692c3b32196 "f"
+  rebasing e692c3b32196 "f"
  merging c
  warning: 1 conflicts while merging c! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -64,11 +64,11 @@ Make conflicts halfway up the stack:
  (no more unresolved files)
  continue: hg rebase --continue
  $ hg rebase --continue
-  already rebased 4:f4016ed9f5d0 "d" (d) as 32bb4413a7df
-  already rebased 5:881eb15e0fdf "e" (e) as d82c41319fdd
-  note: not rebasing 6:22d86c9ba040 "f" (f) and its descendants as this would cause divergence
-  rebasing 7:e692c3b32196 "f"
-  rebasing 8:2a19607ff85c "g"
+  already rebased f4016ed9f5d0 "d" (d) as 32bb4413a7df
+  already rebased 881eb15e0fdf "e" (e) as d82c41319fdd
+  note: not rebasing 22d86c9ba040 "f" (f) and its descendants as this would cause divergence
+  rebasing e692c3b32196 "f"
+  rebasing 2a19607ff85c "g"
  $ hg log -G -r 0:: -T '{desc} {rev} {node|short}'
  o  g 12 24c12a3229e2
  |
@ -100,8 +100,8 @@ Try it with uncommitted changes, ensure it aborts nicely:
  $ echo "test" > a
  $ hg rebase -s d82c41319fdd -d a
  rebasing in-memory!
-  rebasing 10:d82c41319fdd "e"
-  rebasing 11:c33e7f678afd "f"
+  rebasing d82c41319fdd "e"
+  rebasing c33e7f678afd "f"
  transaction abort!
  rollback completed
  abort: must use on-disk merge for this rebase (hit merge conflicts in c), but you have working copy changes
--- a/tests/test-rebase-inmemory-mergedriver-exception.t
+++ b/tests/test-rebase-inmemory-mergedriver-exception.t
@ -38,7 +38,7 @@ Now make two conflicting commits:

 Without IMM:
  $ hg rebase -r B -d A --config rebase.experimental.inmemory=0
-  rebasing 2:c1d523ef4657 "B" (B tip)
+  rebasing c1d523ef4657 "B" (B tip)
  in preprocess()
  error: preprocess hook raised an exception: some exception in preprocess()
  (run with --traceback for stack trace)
@ -52,14 +52,14 @@ Without IMM:
 With IMM:
  $ hg rebase -r B -d A --config rebase.experimental.inmemory=1
  rebasing in-memory!
-  rebasing 2:c1d523ef4657 "B" (B tip)
+  rebasing c1d523ef4657 "B" (B tip)
  in preprocess()
  error: preprocess hook raised an exception: some exception in preprocess()
  (run with --traceback for stack trace)
  warning: merge driver failed to preprocess files
  (hg resolve --all to retry, or hg resolve --all --skip to skip merge driver)
  hit merge conflicts (in FILE); switching to on-disk merge
-  rebasing 2:c1d523ef4657 "B" (B tip)
+  rebasing c1d523ef4657 "B" (B tip)
  in preprocess()
  error: preprocess hook raised an exception: some exception in preprocess()
  (run with --traceback for stack trace)
@ -95,14 +95,14 @@ have to try it both ways. (It might be nice to change that.)
  > EOF
  $ hg commit -m "new base"
  $ hg rebase -r A+B -d .
-  rebasing 1:6cc5ed361a96 "A" (A)
-  rebasing 2:c1d523ef4657 "B" (B)
+  rebasing 6cc5ed361a96 "A" (A)
+  rebasing c1d523ef4657 "B" (B)
  saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/c1d523ef4657-4b35995e-rebase.hg

 Without IMM, you can see we try to merge FILE twice (once in preprocess() and once later),
 and it fails:
  $ hg rebase -r B -d A --config rebase.experimental.inmemory=0
-  rebasing 3:ffa05d84855d "B" (B tip)
+  rebasing ffa05d84855d "B" (B tip)
  in preprocess()
  warning: 1 conflicts while merging FILE! (edit, then use 'hg resolve --mark')
  done with preprocess()
@ -122,14 +122,14 @@ and it fails:
 With IMM, it's *very* noisy, but we do eventually get to the same place:
  $ hg rebase -r B -d A --config rebase.experimental.inmemory=1
  rebasing in-memory!
-  rebasing 3:ffa05d84855d "B" (B tip)
+  rebasing ffa05d84855d "B" (B tip)
  in preprocess()
  error: preprocess hook raised an exception: in-memory merge does not support merge conflicts
  (run with --traceback for stack trace)
  warning: merge driver failed to preprocess files
  (hg resolve --all to retry, or hg resolve --all --skip to skip merge driver)
  hit merge conflicts (in FILE); switching to on-disk merge
-  rebasing 3:ffa05d84855d "B" (B tip)
+  rebasing ffa05d84855d "B" (B tip)
  in preprocess()
  warning: 1 conflicts while merging FILE! (edit, then use 'hg resolve --mark')
  done with preprocess()
--- a/tests/test-rebase-inmemory-mergedriver.t
+++ b/tests/test-rebase-inmemory-mergedriver.t
@ -89,11 +89,11 @@ we expect to see "generators version = NEW".

  $ hg rebase -d new_driver
  rebasing in-memory!
-  rebasing 2:* "prefix FILE with 0" (base_1 tip) (glob)
+  rebasing 83615e50cada "prefix FILE with 0" (base_1 tip)
  generators version = BASE
  base's someFunction() called
  artifact rebuild required (in FILE); switching to on-disk merge
-  rebasing 2:* "prefix FILE with 0" (base_1 tip) (glob)
+  rebasing 83615e50cada "prefix FILE with 0" (base_1 tip)
  generators version = NEW
  new_required_arg = new_required
  note: rebase of 2:* created no changes to commit (glob)
--- a/tests/test-rebase-inmemory-nochanges-t.py
+++ b/tests/test-rebase-inmemory-nochanges-t.py
@ -45,7 +45,7 @@ for userustmanifest in [True, False]:
    # Rebase one version onto the other, confirm it gets rebased out:
    sh % "hg rebase -r b -d a" == r"""
        rebasing in-memory!
-        rebasing 2:811ec875201f "b" (b tip)
+        rebasing 811ec875201f "b" (b tip)
        note: rebase of 2:811ec875201f created no changes to commit"""

    # Without IMM, this behavior is semi-broken: the commit is not rebased out and the
@ -53,7 +53,7 @@ for userustmanifest in [True, False]:
    sh.cd(reponame)
    sh % "setconfig 'rebase.experimental.inmemory=0'"
    sh % "hg rebase -r b -d a" == r"""
-        rebasing 2:811ec875201f "b" (b tip)
+        rebasing 811ec875201f "b" (b tip)
        warning: can't find ancestor for 'file_new' copied from 'file'!"""

    if userustmanifest:
--- a/tests/test-rebase-inmemory-noconflict.t
+++ b/tests/test-rebase-inmemory-noconflict.t
@ -28,7 +28,7 @@ Tests the --noconflict rebase flag
 Confirm it fails when rebasing a change that conflicts:
  $ hg rebase -r tip -d . --noconflict
  rebasing in-memory!
-  rebasing 3:955ac081fc7c "g" (tip)
+  rebasing 955ac081fc7c "g" (tip)
  merging c
  hit merge conflicts (in c) and --noconflict passed; exiting
  $ hg st
@ -39,7 +39,7 @@ Confirm it fails when rebasing a change that conflicts:
 Confirm rebase without a merge behaves the same:
  $ hg rebase -r tip -d .~1 --noconflict
  rebasing in-memory!
-  rebasing 3:955ac081fc7c "g" (tip)
+  rebasing 955ac081fc7c "g" (tip)
  saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/955ac081fc7c-77e57574-rebase.hg

 Confirm the flag fails without IMM:
@ -71,7 +71,7 @@ Confirm that it rebases a three-way merge, but no conflict:
  $ hg up -qC 0
  $ hg rebase -r 1 -d 2 --noconflict
  rebasing in-memory!
-  rebasing 1:12cba56c6d27 "extend to 10"
+  rebasing 12cba56c6d27 "extend to 10"
  merging a
  saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/12cba56c6d27-14ff6d99-rebase.hg
  $ hg cat -r tip a | wc -l | xargs
--- a/tests/test-rebase-inmemory.t
+++ b/tests/test-rebase-inmemory.t
@ -36,7 +36,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 db0e82a16a62 "b" (b)
  $ tglog
  o  3: ca58782ad1e4 'b'
  |
@ -95,7 +95,7 @@ Write files to the working copy, and ensure they're still there after the rebase
  somefile (no-eol)
  $ hg rebase --debug -s b -d a | grep rebasing
  rebasing in-memory
-  rebasing 2:db0e82a16a62 "b" (b)
+  rebasing db0e82a16a62 "b" (b)
  $ tglog
  o  3: fc055c3b4d33 'b'
  |
@ -111,8 +111,8 @@ Write files to the working copy, and ensure they're still there after the rebase
  b (no-eol)
  $ hg rebase --debug -s 1 -d 3 | grep rebasing
  rebasing in-memory
-  rebasing 1:02952614a83d "d" (d)
-  rebasing 2:f56b71190a8f "c"
+  rebasing 02952614a83d "d" (d)
+  rebasing f56b71190a8f "c"
  $ tglog
  o  3: 753feb6fd12a 'c'
  |
@ -158,7 +158,7 @@ cleanly.
  $ hg up 0
  1 files updated, 0 files merged, 5 files removed, 0 files unresolved
  $ hg rebase -r 4 -d .
-  rebasing 4:0666f6a71f74 "change a's flags" (tip)
+  rebasing 0666f6a71f74 "change a's flags" (tip)
  saved backup bundle to $TESTTMP/repo1/repo3/.hg/strip-backup/0666f6a71f74-a2618702-rebase.hg
  $ hg up -q tip
  $ ls -l a | cut -c -10
@ -171,7 +171,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 | egrep 'rebasing|disabling'
  rebasing in-memory
-  rebasing 3:753feb6fd12a "c" (tip)
+  rebasing 753feb6fd12a "c" (tip)
  $ tglog
  @  3: 844a7de3e617 'c'
  |
@ -202,10 +202,10 @@ Rerun with merge conflicts, demonstrating switching to on-disk merge:
  o  0: b173517d0057 'a'
  
  $ hg rebase -r 3 -d 4
-  rebasing 3:844a7de3e617 "c"
+  rebasing 844a7de3e617 "c"
  merging c
  hit merge conflicts (in c); switching to on-disk merge
-  rebasing 3:844a7de3e617 "c"
+  rebasing 844a7de3e617 "c"
  merging c
  warning: 1 conflicts while merging c! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -218,7 +218,7 @@ Allow the working copy parent to be rebased with IMM:
  $ hg up -qC 3
  $ hg rebase -r . -d 2
  rebasing in-memory!
-  rebasing 3:844a7de3e617 "c"
+  rebasing 844a7de3e617 "c"
  saved backup bundle to $TESTTMP/repo1/repo2/.hg/strip-backup/844a7de3e617-108d0332-rebase.hg
  $ tglog
  @  4: 6f55b7035492 'c'
--- a/tests/test-rebase-interruptions.t
+++ b/tests/test-rebase-interruptions.t
@ -54,8 +54,8 @@ Changes during an interruption - continue:
 Rebasing B onto E:

  $ hg rebase -s 1 -d 4
-  rebasing 1:27547f69f254 "B"
-  rebasing 2:965c486023db "C"
+  rebasing 27547f69f254 "B"
+  rebasing 965c486023db "C"
  merging A
  warning: 1 conflicts while merging A! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -91,8 +91,8 @@ Force this commit onto secret phase
 Resume the rebasing:

  $ hg rebase --continue
-  already rebased 1:27547f69f254 "B" as 45396c49d53b
-  rebasing 2:965c486023db "C"
+  already rebased 27547f69f254 "B" as 45396c49d53b
+  rebasing 965c486023db "C"
  merging A
  warning: 1 conflicts while merging A! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -107,8 +107,8 @@ Solve the conflict and go on:
  continue: hg rebase --continue

  $ hg rebase --continue
-  already rebased 1:27547f69f254 "B" as 45396c49d53b
-  rebasing 2:965c486023db "C"
+  already rebased 27547f69f254 "B" as 45396c49d53b
+  rebasing 965c486023db "C"
  warning: orphaned descendants detected, not stripping 27547f69f254, 965c486023db

  $ tglogp
@ -150,8 +150,8 @@ Changes during an interruption - abort:
 Rebasing B onto E:

  $ hg rebase -s 1 -d 4
-  rebasing 1:27547f69f254 "B"
-  rebasing 2:965c486023db "C"
+  rebasing 27547f69f254 "B"
+  rebasing 965c486023db "C"
  merging A
  warning: 1 conflicts while merging A! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -222,8 +222,8 @@ Changes during an interruption - abort (again):
 Rebasing B onto E:

  $ hg rebase -s 1 -d 4
-  rebasing 1:27547f69f254 "B"
-  rebasing 2:965c486023db "C"
+  rebasing 27547f69f254 "B"
+  rebasing 965c486023db "C"
  merging A
  warning: 1 conflicts while merging A! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -283,9 +283,9 @@ Test rebase interrupted by hooks
  $ cp -R a3 hook-precommit
  $ cd hook-precommit
  $ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.precommit=hg status | grep "M A"'
-  rebasing 2:965c486023db "C"
+  rebasing 965c486023db "C"
  M A
-  rebasing 6:a0b2430ebfb8 "F" (tip)
+  rebasing a0b2430ebfb8 "F" (tip)
  abort: precommit hook exited with status 1
  [255]
  $ tglogp
@ -306,8 +306,8 @@ Test rebase interrupted by hooks
  o  0: 4a2df7238c3b public 'A'
  
  $ hg rebase --continue
-  already rebased 2:965c486023db "C" as 401ccec5e39f
-  rebasing 6:a0b2430ebfb8 "F"
+  already rebased 965c486023db "C" as 401ccec5e39f
+  rebasing a0b2430ebfb8 "F"
  saved backup bundle to $TESTTMP/hook-precommit/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg
  $ tglogp
  @  6: 6e92a149ac6b secret 'F'
@ -336,9 +336,9 @@ Test rebase interrupted by hooks
  $ NODE="\$HG_NODE"
 #endif
  $ hg rebase --source 2 --dest 5 --tool internal:other --config "hooks.pretxncommit=hg log -r $NODE | grep \"summary:     C\""
-  rebasing 2:965c486023db "C"
+  rebasing 965c486023db "C"
  summary:     C
-  rebasing 6:a0b2430ebfb8 "F" (tip)
+  rebasing a0b2430ebfb8 "F" (tip)
  transaction abort!
  rollback completed
  abort: pretxncommit hook exited with status 1
@ -361,8 +361,8 @@ Test rebase interrupted by hooks
  o  0: 4a2df7238c3b public 'A'
  
  $ hg rebase --continue
-  already rebased 2:965c486023db "C" as 401ccec5e39f
-  rebasing 6:a0b2430ebfb8 "F"
+  already rebased 965c486023db "C" as 401ccec5e39f
+  rebasing a0b2430ebfb8 "F"
  saved backup bundle to $TESTTMP/hook-pretxncommit/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg
  $ tglogp
  @  6: 6e92a149ac6b secret 'F'
@ -386,9 +386,9 @@ Test rebase interrupted by hooks
  $ cp -R a3 hook-pretxnclose
  $ cd hook-pretxnclose
  $ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.pretxnclose=hg log -r tip | grep "summary:     C"'
-  rebasing 2:965c486023db "C"
+  rebasing 965c486023db "C"
  summary:     C
-  rebasing 6:a0b2430ebfb8 "F" (tip)
+  rebasing a0b2430ebfb8 "F" (tip)
  transaction abort!
  rollback completed
  abort: pretxnclose hook exited with status 1
@ -411,8 +411,8 @@ Test rebase interrupted by hooks
  o  0: 4a2df7238c3b public 'A'
  
  $ hg rebase --continue
-  already rebased 2:965c486023db "C" as 401ccec5e39f
-  rebasing 6:a0b2430ebfb8 "F"
+  already rebased 965c486023db "C" as 401ccec5e39f
+  rebasing a0b2430ebfb8 "F"
  saved backup bundle to $TESTTMP/hook-pretxnclose/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg
  $ tglogp
  @  6: 6e92a149ac6b secret 'F'
@ -443,7 +443,7 @@ Make sure merge state is cleaned up after a no-op rebase merge (issue5494)
  $ echo c >> a
  $ hg commit -qm c
  $ hg rebase -s 1 -d 2 --noninteractive
-  rebasing 1:fdaca8533b86 "b"
+  rebasing fdaca8533b86 "b"
  merging a
  warning: 1 conflicts while merging a! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -454,7 +454,7 @@ Make sure merge state is cleaned up after a no-op rebase merge (issue5494)
  (no more unresolved files)
  continue: hg rebase --continue
  $ hg rebase --continue
-  rebasing 1:fdaca8533b86 "b"
+  rebasing fdaca8533b86 "b"
  note: rebase of 1:fdaca8533b86 created no changes to commit
  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
  $ hg resolve --list
--- a/tests/test-rebase-issue-noparam-single-rev-t.py
+++ b/tests/test-rebase-issue-noparam-single-rev-t.py
@ -55,7 +55,7 @@ sh % "tglog" == r"""
 sh % "hg up -q -C 2"

 sh % "hg rebase" == r"""
-    rebasing 2:87c180a611f2 "l1"
+    rebasing 87c180a611f2 "l1"
    saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-a5be192d-rebase.hg"""

 sh % "tglog" == r"""
@ -106,8 +106,8 @@ sh % "tglog" == r"""
 sh % "hg up -q -C 3"

 sh % "hg rebase" == r"""
-    rebasing 2:87c180a611f2 "l1"
-    rebasing 3:1ac923b736ef "l2"
+    rebasing 87c180a611f2 "l1"
+    rebasing 1ac923b736ef "l2"
    saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-b980535c-rebase.hg"""

 sh % "tglog" == r"""
--- a/tests/test-rebase-legacy-t.py
+++ b/tests/test-rebase-legacy-t.py
@ -53,11 +53,11 @@ d2fa1c02b2401b0e32867f26cce50818a4bd796a:000000000000000000000000000000000000000
 """ > ".hg/rebasestate"

 sh % "hg rebase --continue" == r"""
-    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 c1e6b162678d "B" (B)
+    rebasing 6f7a236de685 "D" (D)
+    rebasing de008c61a447 "E" (E)
+    rebasing d2fa1c02b240 "G" (G)
+    rebasing 6582e6951a9c "H" (H tip)
    warning: orphaned descendants detected, not stripping c1e6b162678d, de008c61a447
    saved backup bundle to $TESTTMP/.hg/strip-backup/6f7a236de685-9880a3dc-rebase.hg"""

--- a/tests/test-rebase-missing-cwd.t
+++ b/tests/test-rebase-missing-cwd.t
@ -20,7 +20,7 @@ Ensure that dirsync does not cause an abort when cwd goes missing
  $ cd dir

  $ hg rebase -s . -d $delete
-  rebasing 1:6f52fdb3a577 "change"
+  rebasing 6f52fdb3a577 "change"
  current directory was removed
  (consider changing to repo root: $TESTTMP/repo1)
  saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/6f52fdb3a577-1340ca06-rebase.hg
--- a/tests/test-rebase-newancestor.t
+++ b/tests/test-rebase-newancestor.t
@ -42,9 +42,9 @@ TODO: Make this test compatibile with obsstore enabled.
  o  0: 1e635d440a73 'A'
  
  $ hg rebase -s 1 -d 3
-  rebasing 1:0f4f7cb4f549 "B"
+  rebasing 0f4f7cb4f549 "B"
  merging a
-  rebasing 2:30ae917c0e4f "C"
+  rebasing 30ae917c0e4f "C"
  merging a
  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0f4f7cb4f549-82b3b163-rebase.hg

@ -106,11 +106,11 @@ Full rebase all the way back from branching point:
  $ hg rebase -r 'only(dev,def)' -d $default4 --config ui.interactive=True << EOF
  > c
  > EOF
-  rebasing 2:1e48f4172d62 "dev1"
-  rebasing 4:aeae94a564c6 "dev2"
-  rebasing 6:da5b1609fcb1 "devmerge1"
+  rebasing 1e48f4172d62 "dev1"
+  rebasing aeae94a564c6 "dev2"
+  rebasing da5b1609fcb1 "devmerge1"
  note: rebase of 6:da5b1609fcb1 created no changes to commit
-  rebasing 7:bea5bcfda5f9 "devmerge2" (tip)
+  rebasing bea5bcfda5f9 "devmerge2" (tip)
  note: rebase of 7:bea5bcfda5f9 created no changes to commit
  saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1e48f4172d62-cc446d63-rebase.hg
  $ tglog
@ -134,10 +134,10 @@ Grafty cherry picking rebasing:
  $ hg rebase -r 'children(only(dev,def))' -d $default4 --config ui.interactive=True << EOF
  > c
  > EOF
-  rebasing 4:aeae94a564c6 "dev2"
-  rebasing 6:da5b1609fcb1 "devmerge1"
+  rebasing aeae94a564c6 "dev2"
+  rebasing da5b1609fcb1 "devmerge1"
  note: rebase of 6:da5b1609fcb1 created no changes to commit
-  rebasing 7:bea5bcfda5f9 "devmerge2" (tip)
+  rebasing bea5bcfda5f9 "devmerge2" (tip)
  note: rebase of 7:bea5bcfda5f9 created no changes to commit
  saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/aeae94a564c6-2b0faa8a-rebase.hg
  $ tglog
@ -206,7 +206,7 @@ Test order of parents of rebased merged with un-rebased changes as p1.
  o  0: 02f0f58d5300 'common'
  
  $ hg rebase -r 4 -d 2
-  rebasing 4:6990226659be "merge p1 3=outside p2 1=ancestor"
+  rebasing 6990226659be "merge p1 3=outside p2 1=ancestor"
  saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/6990226659be-4d67a0d3-rebase.hg
  $ hg tip
  changeset:   5:cca50676b1c5
@ -218,7 +218,7 @@ Test order of parents of rebased merged with un-rebased changes as p1.
  summary:     merge p1 3=outside p2 1=ancestor
  
  $ hg rebase -r 4 -d 2
-  rebasing 4:a57575f79074 "merge p1 1=ancestor p2 3=outside"
+  rebasing a57575f79074 "merge p1 1=ancestor p2 3=outside"
  saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/a57575f79074-385426e5-rebase.hg
  $ hg tip
  changeset:   5:f9daf77ffe76
@ -249,7 +249,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 4c5f12f25ebe "merge rebase ancestors" (tip)
  resolving manifests
  removing other
  note: merging f9daf77ffe76+ and 4c5f12f25ebe using bids from ancestors a60552eb93fb and f59da8fc0fcf
@ -319,9 +319,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 5f2c926dfecf "D" (D)
+  rebasing b296604d9846 "E" (E)
+  rebasing caa9781e507d "F" (F tip)
  abort: rebasing 7:caa9781e507d will include unwanted changes from 4:d6003a550c2c or 3:c1e6b162678d
  [255]

@ -339,9 +339,9 @@ The warning does not get printed if there is no unwanted change detected:
  > 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 c1e6b162678d "B" (B)
+  rebasing d6003a550c2c "C" (C)
+  rebasing c8f78076273e "D" (D tip)
  saved backup bundle to $TESTTMP/dual-merge-base2/.hg/strip-backup/d6003a550c2c-6f1424b6-rebase.hg
  $ hg manifest -r 'desc(D)'
  B
@ -361,8 +361,8 @@ The merge base could be different from old p1 (changed parent becomes new p1):
  > B C Z
  > EOS
  $ hg rebase -r D+F -d Z
-  rebasing 3:004dc1679908 "D" (D)
-  rebasing 5:4be4cbf6f206 "F" (F tip)
+  rebasing 004dc1679908 "D" (D)
+  rebasing 4be4cbf6f206 "F" (F tip)
  saved backup bundle to $TESTTMP/chosen-merge-base1/.hg/strip-backup/004dc1679908-06a66a3c-rebase.hg
  $ hg manifest -r 'desc(F)'
  C
@ -382,8 +382,8 @@ The merge base could be different from old p1 (changed parent becomes new p1):
  > B C Z
  > EOS
  $ hg rebase -r E+F -d Z
-  rebasing 4:974e4943c210 "E" (E)
-  rebasing 5:4be4cbf6f206 "F" (F tip)
+  rebasing 974e4943c210 "E" (E)
+  rebasing 4be4cbf6f206 "F" (F tip)
  saved backup bundle to $TESTTMP/chosen-merge-base2/.hg/strip-backup/974e4943c210-b2874da5-rebase.hg
  $ hg manifest -r 'desc(F)'
  B
--- a/tests/test-rebase-obsolete.t
+++ b/tests/test-rebase-obsolete.t
@ -60,9 +60,9 @@ simple rebase
  $ hg up 32af7686d403
  3 files updated, 0 files merged, 2 files removed, 0 files unresolved
  $ hg rebase -d eea13746799a
-  rebasing 1:42ccdea3bb16 "B"
-  rebasing 2:5fddd98957c8 "C"
-  rebasing 3:32af7686d403 "D"
+  rebasing 42ccdea3bb16 "B"
+  rebasing 5fddd98957c8 "C"
+  rebasing 32af7686d403 "D"
  $ hg log -G
  @  10:8eeb3c33ad33 D
  |
@ -128,10 +128,10 @@ set.
  grafting 1:42ccdea3bb16 "B"
  grafting 3:32af7686d403 "D"
  $ hg rebase  -s 42ccdea3bb16 -d .
-  rebasing 1:42ccdea3bb16 "B"
+  rebasing 42ccdea3bb16 "B"
  note: rebase of 1:42ccdea3bb16 created no changes to commit
-  rebasing 2:5fddd98957c8 "C"
-  rebasing 3:32af7686d403 "D"
+  rebasing 5fddd98957c8 "C"
+  rebasing 32af7686d403 "D"
  note: rebase of 3:32af7686d403 created no changes to commit
  $ hg log -G
  o  10:5ae4c968c6ac C
@ -182,7 +182,7 @@ set.
 More complex case where part of the rebase set were already rebased

  $ hg rebase --rev 'desc(D)' --dest 'desc(H)'
-  rebasing 9:08483444fef9 "D"
+  rebasing 08483444fef9 "D"
  $ hg debugobsolete
  42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'}
  5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'}
@ -208,9 +208,9 @@ More complex case where part of the rebase set were already rebased
  o  0:cd010b8cd998 A
  
  $ 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)
-  rebasing 10:5ae4c968c6ac "C"
+  rebasing 8877864f1edb "B"
+  note: not rebasing 08483444fef9 "D", already in destination as 4596109a6a43 "D" (tip)
+  rebasing 5ae4c968c6ac "C"
  $ hg debugobsolete
  42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'}
  5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'}
@ -257,7 +257,7 @@ More complex case where part of the rebase set were already rebased
  grafting 11:4596109a6a43 "D"
  $ hg up -qr 'desc(E)'
  $ hg rebase -s tip -d .
-  rebasing 14:9e36056a46e3 "D" (tip)
+  rebasing 9e36056a46e3 "D" (tip)
  $ hg log --style default --debug -r tip
  changeset:   15:627d4614809036ba22b9e7cb31638ddc06ab99ab
  tag:         tip
@ -282,7 +282,7 @@ even though it is hidden (until we're moved there).

  $ hg --hidden up -qr 'first(hidden())'
  $ hg rebase --rev 13 --dest 15
-  rebasing 13:98f6af4ee953 "C"
+  rebasing 98f6af4ee953 "C"
  $ hg log -G
  o  16:294a2b93eb4d C
  |
@ -315,9 +315,9 @@ collapse rebase
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ cd collapse
  $ hg rebase  -s 42ccdea3bb16 -d eea13746799a --collapse
-  rebasing 1:42ccdea3bb16 "B"
-  rebasing 2:5fddd98957c8 "C"
-  rebasing 3:32af7686d403 "D"
+  rebasing 42ccdea3bb16 "B"
+  rebasing 5fddd98957c8 "C"
+  rebasing 32af7686d403 "D"
  $ hg log -G
  o  8:4dc2197e807b Collapsed revision
  |
@ -387,8 +387,8 @@ be rebased.
  o  0:cd010b8cd998 A
  
  $ hg rebase -s 5fddd98957c8 -d eea13746799a
-  rebasing 2:5fddd98957c8 "C"
-  rebasing 3:32af7686d403 "D"
+  rebasing 5fddd98957c8 "C"
+  rebasing 32af7686d403 "D"
  $ hg log -G
  o  9:cf44d2f5a9f4 D
  |
@ -407,7 +407,7 @@ be rebased.
  o  0:cd010b8cd998 A
  
  $ hg rebase -s 42ccdea3bb16 -d 02de42196ebe
-  rebasing 1:42ccdea3bb16 "B"
+  rebasing 42ccdea3bb16 "B"
  $ hg log -G
  o  10:7c6027df6a99 B
  |
@ -459,7 +459,7 @@ Test that rewriting leaving instability behind is allowed
  $ hg log -r 'children(8)'
  9:cf44d2f5a9f4 D (no-eol)
  $ hg rebase -r 8
-  rebasing 8:e273c5e7d2d2 "C"
+  rebasing e273c5e7d2d2 "C"
  $ hg log -G
  o  11:0d8f238b634c C
  |
@ -485,9 +485,9 @@ 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 cf44d2f5a9f4 "D"
+  rebasing 02de42196ebe "H"
+  rebasing 0d8f238b634c "C" (tip)
  $ hg log -G
  o  14:1e8370e38cca C
  |
@ -525,9 +525,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 112478962961 "B" (B)
+  rebasing b18e25de2cf5 "D" (D)
+  rebasing f15c3adaf214 "F" (F tip)
  abort: cannot rebase 6:f15c3adaf214 without moving at least one of its parents
  [255]

@ -578,9 +578,9 @@ test on rebase dropping a merge
 (actual test)

  $ 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 32af7686d403 "D"
+  rebasing 02de42196ebe "H"
+  rebasing 4bde274eefcf "I" (tip)
  $ hg log -G
  @  12:acd174b7ab39 I
  |
@ -618,8 +618,8 @@ Test hidden changesets in the rebase set (issue4504)
  obsoleted 1 changesets

  $ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off
-  rebasing 9:4bde274eefcf "I"
-  rebasing 13:06edfc82198f "J" (tip)
+  rebasing 4bde274eefcf "I"
+  rebasing 06edfc82198f "J" (tip)
  $ hg log -G
  @  15:5ae8a643467b J
  |
@ -698,8 +698,8 @@ Test hidden changesets in the rebase set (issue4504)
  o  0:cd010b8cd998 A
  
  $ hg rebase -s 14 -d 17 --config experimental.rebaseskipobsolete=True
-  note: not rebasing 14:9ad579b4a5de "I", already in destination as 16:fc37a630c901 "K"
-  rebasing 15:5ae8a643467b "J"
+  note: not rebasing 9ad579b4a5de "I", already in destination as fc37a630c901 "K"
+  rebasing 5ae8a643467b "J"

  $ cd ..

@ -742,8 +742,8 @@ setup
 Rebase finds its way in a chain of marker

  $ hg rebase -d 'desc(B2)'
-  note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 3:261e70097290 "B2"
-  rebasing 4:212cb178bcbb "C" (tip)
+  note: not rebasing a8b11f55fb19 "B0", already in destination as 261e70097290 "B2"
+  rebasing 212cb178bcbb "C" (tip)

 Even when the chain include missing node

@ -767,8 +767,8 @@ 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)
+  note: not rebasing a8b11f55fb19 "B0", already in destination as 261e70097290 "B2"
+  rebasing 1a79b7535141 "D" (tip)
  $ hg up 4
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
  $ echo "O" > O
@ -793,9 +793,9 @@ Even when the chain include missing node
  $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=true
  obsoleted 1 changesets
  $ 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 ff2c4d47b71d "C"
+  note: not rebasing 360bbaa7d3ce "O", it has no successor
+  rebasing 8d47583e023f "P" (tip)

 If all the changeset to be rebased are obsolete and present in the destination, we
 should display a friendly error message
@ -833,7 +833,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 f44da1f4954c "nonrelevant" (tip), it has no successor

 If a rebase is going to create divergence, it should abort

@ -911,8 +911,8 @@ If a rebase is going to create divergence, it should abort
 With experimental.evolution.allowdivergence=True, rebase can create divergence

  $ hg rebase -s 10 -d 12 --config experimental.evolution.allowdivergence=True
-  rebasing 10:121d9e3bc4c6 "P"
-  rebasing 14:73568ab6879d "bar foo" (tip)
+  rebasing 121d9e3bc4c6 "P"
+  rebasing 73568ab6879d "bar foo" (tip)
  $ hg summary
  parent: 16:61bd55f69bc4 tip
   bar foo
@ -965,7 +965,7 @@ Create the changes that we will rebase
  |
  ~
  $ hg rebase -r ".^^ + .^ + ." -d 18
-  rebasing 19:b82fb57ea638 "willconflict second version"
+  rebasing b82fb57ea638 "willconflict second version"
  merging willconflict
  warning: 1 conflicts while merging willconflict! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -975,9 +975,9 @@ Create the changes that we will rebase
  (no more unresolved files)
  continue: hg rebase --continue
  $ 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 b82fb57ea638 "willconflict second version"
+  note: not rebasing 8b31da3c4919 "dummy change", already in destination as 601db7a18f51 "dummy change successor"
+  rebasing 7bdc8a87673d "dummy change" (tip)
  $ cd ..

 Divergence cases due to obsolete changesets
@ -1027,11 +1027,11 @@ would occur because the successor of d (d') is also in rebaseset. As a
 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 488e1b7e7341 "b" (b)
+  rebasing a82ac2b38757 "c" (c)
+  rebasing 027ad6c5830d "d'" (d')
+  rebasing d60ebfa0f1cb "e" (e)
+  note: not rebasing 76be324c128b "d" (d) and its descendants as this would cause divergence
  $ hg log -G -r 'a'::
  o  11:eb6d63fc4ed5 e
  |
@ -1068,9 +1068,9 @@ By allowing divergence, we can perform the rebase.
  (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 a82ac2b38757 "c" (c)
+  rebasing 76be324c128b "d" (d)
+  rebasing 1143e9adc121 "f" (f tip)
  $ hg log -G -r 'a':: -T instabilities
  o  10:e1744ea07510 f
  |
@ -1099,9 +1099,9 @@ By allowing divergence, we can perform the rebase.
 (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 a82ac2b38757 "c" (c)
+  rebasing 76be324c128b "d" (d)
+  rebasing 1143e9adc121 "f" (f tip)

  $ hg debugstrip --no-backup -q -r 0:

@ -1140,12 +1140,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 488e1b7e7341 "b" (b)
+  rebasing a82ac2b38757 "c" (c)
+  rebasing 63324dc512ea "e'" (e')
+  rebasing 3ffec603ab53 "f" (f)
+  rebasing 76be324c128b "d" (d)
+  note: not rebasing e36fae928aec "e" (e) and its descendants as this would cause divergence
  $ hg log -G -r 'a':
  o  13:a1707a5b7c2c d
  |
@ -1192,8 +1192,8 @@ Rebase merge where successor of one parent is equal to destination (issue5198)
  > EOF

  $ 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 b18e25de2cf5 "D" (D), already in destination as 112478962961 "B" (B)
+  rebasing 66f1a38021c9 "F" (F tip)
  $ hg log -G
  o    5:50e9d60b99c6 F
  |\
@ -1223,8 +1223,8 @@ Rebase merge where successor of other parent is equal to destination
  > EOF

  $ 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 7fb047a69f22 "E" (E), already in destination as 112478962961 "B" (B)
+  rebasing 66f1a38021c9 "F" (F tip)
  $ hg log -G
  o    5:aae1787dacee F
  |\
@ -1254,8 +1254,8 @@ Rebase merge where successor of one parent is ancestor of destination
  > EOF

  $ 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 b18e25de2cf5 "D" (D), already in destination as 112478962961 "B" (B)
+  rebasing 66f1a38021c9 "F" (F tip)

  $ hg log -G
  o    6:0913febf6439 F
@ -1288,8 +1288,8 @@ Rebase merge where successor of other parent is ancestor of destination
  > EOF

  $ 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 7fb047a69f22 "E" (E), already in destination as 112478962961 "B" (B)
+  rebasing 66f1a38021c9 "F" (F tip)
  $ hg log -G
  o    6:c6ab0cc6d220 F
  |\
@ -1321,9 +1321,9 @@ Rebase merge where successor of one parent is ancestor of destination
  > EOF

  $ 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)
+  rebasing b18e25de2cf5 "D" (D)
+  note: not rebasing 7fb047a69f22 "E" (E), already in destination as 112478962961 "B" (B)
+  rebasing 66f1a38021c9 "F" (F tip)
  note: rebase of 5:66f1a38021c9 created no changes to commit
  $ hg log -G
  o  6:8f47515dda15 D
@ -1356,9 +1356,9 @@ Rebase merge where successor of other parent is ancestor of destination
  > EOF

  $ 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 b18e25de2cf5 "D" (D), already in destination as 112478962961 "B" (B)
+  rebasing 7fb047a69f22 "E" (E)
+  rebasing 66f1a38021c9 "F" (F tip)
  note: rebase of 5:66f1a38021c9 created no changes to commit

  $ hg log -G
@ -1390,9 +1390,9 @@ Rebase merge where both parents have successors in destination
  > X Y
  > EOS
  $ 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 a3d17304151f "A" (A), already in destination as 96cc3511f894 "C" (C)
+  note: not rebasing b23a2cc00842 "B" (B), already in destination as 058c1e1fb10a "D" (D)
+  rebasing dac5d11c5a7d "E" (E tip)
  abort: rebasing 7:dac5d11c5a7d will include unwanted changes from 3:59c792af609c, 5:b23a2cc00842 or 2:ba2b7fa7166d, 4:a3d17304151f
  [255]
  $ cd ..
@ -1408,9 +1408,9 @@ parent moves as requested.
  > A B C # D/D = D
  > EOS
  $ 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 426bada5c675 "A" (A), already in destination as 96cc3511f894 "C" (C)
+  rebasing fc2b737bb2e5 "B" (B)
+  rebasing b8ed089c80ad "D" (D)

  $ rm .hg/localtags
  $ hg log -G
@ -1438,9 +1438,9 @@ parent moves as requested.
  > A B C  # D/D = D
  > EOS
  $ 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 426bada5c675 "A" (A)
+  note: not rebasing fc2b737bb2e5 "B" (B), already in destination as 96cc3511f894 "C" (C)
+  rebasing b8ed089c80ad "D" (D)

  $ rm .hg/localtags
  $ hg log -G
@ -1475,7 +1475,7 @@ equivalents in destination
  $ echo b > b && hg ci -Am b
  adding b
  $ hg rebase -r 2 -d 1
-  rebasing 2:1e9a3c00cbe9 "b" (tip)
+  rebasing 1e9a3c00cbe9 "b" (tip)
  $ 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
@ -1483,7 +1483,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 1e9a3c00cbe9 "b" (mybook), already in destination as be1832deae9a "b" (tip)
 Check that working directory and bookmark was updated to rev 3 although rev 2
 was skipped
  $ hg log -r .
@ -1510,8 +1510,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 112478962961 "B" (B)
+  note: not rebasing 15ecf15e0114 "D1" (book D1 tip), already in destination as 0807738e0be9 "D2" (D2)
  $ hg log -G -T '{desc} {bookmarks}'
  @  B book
  |
@ -1545,7 +1545,7 @@ Rebasing a merge with one of its parent having a hidden successor
  > EOS

  $ hg rebase -r $D -d $E
-  rebasing 5:9e62094e4d94 "D"
+  rebasing 9e62094e4d94 "D"

  $ hg log -G
  o    7:a699d059adcf D
@ -1575,7 +1575,7 @@ rebasestate may contain hidden hashes. "rebase --abort" should work regardless.

  $ hg update -q $C --hidden
  $ hg rebase -s $B -d $D
-  rebasing 1:2ec65233581b "B"
+  rebasing 2ec65233581b "B"
  merging D
  warning: 1 conflicts while merging D! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -1609,8 +1609,8 @@ Also test --continue for the above case
  (no more unresolved files)
  continue: hg rebase --continue
  $ hg rebase --continue
-  rebasing 1:2ec65233581b "B"
-  rebasing 3:7829726be4dc "C" (tip)
+  rebasing 2ec65233581b "B"
+  rebasing 7829726be4dc "C" (tip)
  $ hg log -G
  @  5:1964d5d5b547 C
  |
--- a/tests/test-rebase-parameters.t
+++ b/tests/test-rebase-parameters.t
@ -124,9 +124,9 @@ Rebase with no arguments (from 3 onto 8):
  $ hg up -q -C 3

  $ hg rebase
-  rebasing 1:42ccdea3bb16 "B"
-  rebasing 2:5fddd98957c8 "C"
-  rebasing 3:32af7686d403 "D"
+  rebasing 42ccdea3bb16 "B"
+  rebasing 5fddd98957c8 "C"
+  rebasing 32af7686d403 "D"

  $ tglog
  @  9: ed65089c18f8 'D'
@ -157,9 +157,9 @@ Rebase with base == '.' => same as no arguments (from 3 onto 8):
  $ cd a2

  $ hg rebase --base .
-  rebasing 1:42ccdea3bb16 "B"
-  rebasing 2:5fddd98957c8 "C"
-  rebasing 3:32af7686d403 "D"
+  rebasing 42ccdea3bb16 "B"
+  rebasing 5fddd98957c8 "C"
+  rebasing 32af7686d403 "D"

  $ tglog
  @  9: ed65089c18f8 'D'
@ -185,9 +185,9 @@ Rebase with dest == branch(.) => same as no arguments (from 3 onto 8):
  $ cd a3

  $ hg rebase --dest 'branch(.)'
-  rebasing 1:42ccdea3bb16 "B"
-  rebasing 2:5fddd98957c8 "C"
-  rebasing 3:32af7686d403 "D"
+  rebasing 42ccdea3bb16 "B"
+  rebasing 5fddd98957c8 "C"
+  rebasing 32af7686d403 "D"

  $ tglog
  @  11: ed65089c18f8 'D'
@ -217,8 +217,8 @@ Specify only source (from 2 onto 8):
  $ cd a4

  $ hg rebase --source 'desc("C")'
-  rebasing 2:5fddd98957c8 "C"
-  rebasing 3:32af7686d403 "D"
+  rebasing 5fddd98957c8 "C"
+  rebasing 32af7686d403 "D"

  $ tglog
  o  8: 7726e9fd58f7 'D'
@ -244,9 +244,9 @@ Specify only dest (from 3 onto 6):
  $ cd a5

  $ hg rebase --dest 6
-  rebasing 1:42ccdea3bb16 "B"
-  rebasing 2:5fddd98957c8 "C"
-  rebasing 3:32af7686d403 "D"
+  rebasing 42ccdea3bb16 "B"
+  rebasing 5fddd98957c8 "C"
+  rebasing 32af7686d403 "D"

  $ tglog
  @  11: 8eeb3c33ad33 'D'
@ -276,9 +276,9 @@ Specify only base (from 1 onto 8):
  $ cd a6

  $ hg rebase --base 'desc("D")'
-  rebasing 1:42ccdea3bb16 "B"
-  rebasing 2:5fddd98957c8 "C"
-  rebasing 3:32af7686d403 "D"
+  rebasing 42ccdea3bb16 "B"
+  rebasing 5fddd98957c8 "C"
+  rebasing 32af7686d403 "D"

  $ tglog
  o  9: ed65089c18f8 'D'
@ -304,8 +304,8 @@ Specify source and dest (from 2 onto 7):
  $ cd a7

  $ hg rebase --source 2 --dest 7
-  rebasing 2:5fddd98957c8 "C"
-  rebasing 3:32af7686d403 "D"
+  rebasing 5fddd98957c8 "C"
+  rebasing 32af7686d403 "D"

  $ tglog
  o  10: 668acadedd30 'D'
@ -335,9 +335,9 @@ Specify base and dest (from 1 onto 7):
  $ cd a8

  $ hg rebase --base 3 --dest 7
-  rebasing 1:42ccdea3bb16 "B"
-  rebasing 2:5fddd98957c8 "C"
-  rebasing 3:32af7686d403 "D"
+  rebasing 42ccdea3bb16 "B"
+  rebasing 5fddd98957c8 "C"
+  rebasing 32af7686d403 "D"

  $ tglog
  o  11: 287cc92ba5a4 'D'
@ -367,8 +367,8 @@ Specify only revs (from 2 onto 8)
  $ cd a9

  $ hg rebase --rev 'desc("C")::'
-  rebasing 2:5fddd98957c8 "C"
-  rebasing 3:32af7686d403 "D"
+  rebasing 5fddd98957c8 "C"
+  rebasing 32af7686d403 "D"

  $ tglog
  o  8: 7726e9fd58f7 'D'
@ -392,8 +392,8 @@ Rebasing both a single revision and a merge in one command
  $ hg clone -q -u . a aX
  $ cd aX
  $ hg rebase -r 3 -r 6 --dest 8
-  rebasing 3:32af7686d403 "D"
-  rebasing 6:eea13746799a "G"
+  rebasing 32af7686d403 "D"
+  rebasing eea13746799a "G"
  $ cd ..

 Test --tool parameter:
@ -420,7 +420,7 @@ Test --tool parameter:
  $ cd b1

  $ hg rebase -s 2 -d 1 --tool internal:local
-  rebasing 2:e4e3f3546619 "c2b" (tip)
+  rebasing e4e3f3546619 "c2b" (tip)
  note: rebase of 2:e4e3f3546619 created no changes to commit

  $ hg cat c2
@ -433,7 +433,7 @@ Test --tool parameter:
  $ cd b2

  $ hg rebase -s 2 -d 1 --tool internal:other
-  rebasing 2:e4e3f3546619 "c2b" (tip)
+  rebasing e4e3f3546619 "c2b" (tip)

  $ hg cat c2
  c2b
@ -445,7 +445,7 @@ Test --tool parameter:
  $ cd b3

  $ hg rebase -s 2 -d 1 --tool internal:fail
-  rebasing 2:e4e3f3546619 "c2b" (tip)
+  rebasing e4e3f3546619 "c2b" (tip)
  unresolved conflicts (see hg resolve, then hg rebase --continue)
  [1]

@ -469,7 +469,7 @@ Test --tool parameter:
  (continue: hg rebase --continue)
  [255]
  $ hg rebase -c --tool internal:fail
-  rebasing 2:e4e3f3546619 "c2b" (tip)
+  rebasing e4e3f3546619 "c2b" (tip)
  note: rebase of 2:e4e3f3546619 created no changes to commit

  $ hg rebase -i
--- a/tests/test-rebase-partial.t
+++ b/tests/test-rebase-partial.t
@ -31,8 +31,8 @@ Rebase two commits, of which one is already in the right place
  > |/
  > A
  > EOF
-  rebasing 2:b18e25de2cf5 "D" (D)
-  already rebased 3:26805aba1e60 "C" (C tip)
+  rebasing b18e25de2cf5 "D" (D)
+  already rebased 26805aba1e60 "C" (C tip)
  o  4: fe3b4c6498fa 'D'
  |
  | o  3: 26805aba1e60 'C'
@ -52,8 +52,8 @@ Can collapse commits even if one is already in the right place
  > |/
  > A
  > EOF
-  rebasing 2:b18e25de2cf5 "D" (D)
-  rebasing 3:26805aba1e60 "C" (C tip)
+  rebasing b18e25de2cf5 "D" (D)
+  rebasing 26805aba1e60 "C" (C tip)
  o  4: a2493f4ace65 'Collapsed revision
  |  * D
  |  * C'
@ -77,8 +77,8 @@ the hole (B below), not on top of the destination (A).
  > |
  > A
  > EOF
-  already rebased 1:112478962961 "B" (B)
-  rebasing 3:f585351a92f8 "D" (D tip)
+  already rebased 112478962961 "B" (B)
+  rebasing f585351a92f8 "D" (D tip)
  o  4: 1e6da8103bc7 'D'
  |
  | x  3: f585351a92f8 'D'
@ -100,7 +100,7 @@ Abort doesn't lose the commits that were already in the right place
  > A
  > EOF
  $ hg rebase -r C+D -d B
-  rebasing 2:ef8c0fe0897b "D" (D)
+  rebasing ef8c0fe0897b "D" (D)
  merging file
  warning: 1 conflicts while merging file! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
--- a/tests/test-rebase-pull-t.py
+++ b/tests/test-rebase-pull-t.py
@ -63,7 +63,7 @@ sh % "hg pull --rebase" == r'''
    adding file changes
    added 1 changesets with 1 changes to 1 files (+1 heads)
    new changesets 77ae9631bcca
-    rebasing 2:ff8d69a621f9 "L1"'''
+    rebasing ff8d69a621f9 "L1"'''

 sh % "tglog" == r"""
    @  4: d80cc2da061e 'L1'
@ -200,7 +200,7 @@ sh % "hg pull --rev tip --rebase" == r'''
    adding file changes
    added 2 changesets with 2 changes to 2 files
    new changesets 31cd3a05214e:770a61882ace
-    rebasing 3:ff8d69a621f9 "L1"'''
+    rebasing ff8d69a621f9 "L1"'''
 sh % "tglog" == r"""
    @  6: 518d153c0ba3 'L1'
    |
@ -239,7 +239,7 @@ sh % "hg pull --rebase" == r'''
    adding file changes
    added 1 changesets with 1 changes to 1 files (+1 heads)
    new changesets 00e3b7781125
-    rebasing 6:518d153c0ba3 "L1"'''
+    rebasing 518d153c0ba3 "L1"'''
 sh % "tglog" == r"""
    @  8: 0d0727eb7ce0 'L1'
    |
@ -286,8 +286,8 @@ sh % "hg pull --rebase" == r'''
    adding file changes
    added 1 changesets with 1 changes to 1 files (+1 heads)
    new changesets 88dd24261747
-    rebasing 8:0d0727eb7ce0 "L1"
-    rebasing 9:c1f58876e3bf "L2"'''
+    rebasing 0d0727eb7ce0 "L1"
+    rebasing c1f58876e3bf "L2"'''
 sh % "tglog" == r"""
    o  12: 6dc0ea5dcf55 'L2'
    |
--- a/tests/test-rebase-removed.t
+++ b/tests/test-rebase-removed.t
@ -17,8 +17,8 @@
  > EOS

  $ hg rebase -s $B -d $C
-  rebasing 2:c84328973e26 "B"
-  rebasing 3:2f1af6263db7 "A1" (tip)
+  rebasing c84328973e26 "B"
+  rebasing 2f1af6263db7 "A1" (tip)
  other [source] changed A which local [dest] deleted
  use (c)hanged version, leave (d)eleted, leave (u)nresolved, or input (r)enamed path? u
  unresolved conflicts (see hg resolve, then hg rebase --continue)
@ -60,8 +60,8 @@
  continue: hg rebase --continue

  $ hg rebase --continue
-  already rebased 2:c84328973e26 "B" as 27652fba03b2
-  rebasing 3:2f1af6263db7 "A1"
+  already rebased c84328973e26 "B" as 27652fba03b2
+  rebasing 2f1af6263db7 "A1"

  $ hg log -Gr 'all()'
  o  changeset:   5:8bbb642d1454
--- a/tests/test-rebase-rename.t
+++ b/tests/test-rebase-rename.t
@ -61,7 +61,7 @@ Rename is tracked:
 Rebase the revision containing the rename:

  $ hg rebase -s 3 -d 2
-  rebasing 3:73a3ee40125d "rename A" (tip)
+  rebasing 73a3ee40125d "rename A" (tip)
  saved backup bundle to $TESTTMP/a/.hg/strip-backup/73a3ee40125d-1d78ebcf-rebase.hg

  $ tglog
@ -151,7 +151,7 @@ Copy is tracked:
 Rebase the revision containing the copy:

  $ hg rebase -s 3 -d 2
-  rebasing 3:0a8162ff18a8 "copy A" (tip)
+  rebasing 0a8162ff18a8 "copy A" (tip)
  saved backup bundle to $TESTTMP/b/.hg/strip-backup/0a8162ff18a8-dd06302a-rebase.hg

  $ tglog
@ -234,7 +234,7 @@ Test rebase across repeating renames:
  

  $ hg rebase -s 4 -d 3
-  rebasing 4:b918d683b091 "Another unrelated change" (tip)
+  rebasing b918d683b091 "Another unrelated change" (tip)
  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/b918d683b091-3024bc57-rebase.hg

  $ hg diff --stat -c .
@ -282,9 +282,9 @@ Update back to before we performed copies, and inject an unrelated change.

 Rebase the copies on top of the unrelated change.
  $ hg rebase --source 1 --dest 4
-  rebasing 1:79d255d24ad2 "File b created as copy of a and modified"
-  rebasing 2:327f772bc074 "File c created as copy of b and modified"
-  rebasing 3:421b7e82bb85 "File d created as copy of c and modified"
+  rebasing 79d255d24ad2 "File b created as copy of a and modified"
+  rebasing 327f772bc074 "File c created as copy of b and modified"
+  rebasing 421b7e82bb85 "File d created as copy of c and modified"
  saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/79d255d24ad2-a2265555-rebase.hg
  $ hg update 4
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -306,10 +306,10 @@ copy records collapse correctly.
  $ echo more >> unrelated
  $ hg ci -m 'unrelated commit is unrelated'
  $ hg rebase -s 2 --dest 5 --collapse
-  rebasing 2:68bf06433839 "File b created as copy of a and modified"
-  rebasing 3:af74b229bc02 "File c created as copy of b and modified"
+  rebasing 68bf06433839 "File b created as copy of a and modified"
+  rebasing af74b229bc02 "File c created as copy of b and modified"
  merging b and c to c
-  rebasing 4:dbb9ba033561 "File d created as copy of c and modified"
+  rebasing dbb9ba033561 "File d created as copy of c and modified"
  merging c and d to d
  saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/68bf06433839-dde37595-rebase.hg
  $ hg co tip
--- a/tests/test-rebase-scenario-global.t
+++ b/tests/test-rebase-scenario-global.t
@ -53,7 +53,7 @@ can abort or warn for colliding untracked files)
  A D
  $ echo collide > D
  $ HGEDITOR=cat hg rebase -s 3 -d 7 --edit --config merge.checkunknown=warn
-  rebasing 3:32af7686d403 "D"
+  rebasing 32af7686d403 "D"
  D: replacing untracked file
  D
  
@ -98,7 +98,7 @@ that we can ignore for colliding untracked files)
  $ echo collide > D

  $ HGEDITOR=cat hg rebase -s 3 -d 5 --config merge.checkunknown=ignore
-  rebasing 3:32af7686d403 "D"
+  rebasing 32af7686d403 "D"
  saved backup bundle to $TESTTMP/a2/.hg/strip-backup/32af7686d403-6f7dface-rebase.hg
  $ cat D.orig
  collide
@ -134,8 +134,8 @@ if they have the same contents)
  E

  $ hg rebase -s 4 -d 7
-  rebasing 4:9520eea781bc "E"
-  rebasing 6:eea13746799a "G"
+  rebasing 9520eea781bc "E"
+  rebasing eea13746799a "G"
  note: rebase of 6:eea13746799a created no changes to commit
  saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg
  $ f E.orig
@ -165,10 +165,10 @@ F onto E - rebase of a branching point (skip G):
  $ cd a4

  $ hg rebase -s 5 -d 4
-  rebasing 5:24b6387c8c8c "F"
-  rebasing 6:eea13746799a "G"
+  rebasing 24b6387c8c8c "F"
+  rebasing eea13746799a "G"
  note: rebase of 6:eea13746799a created no changes to commit
-  rebasing 7:02de42196ebe "H" (tip)
+  rebasing 02de42196ebe "H" (tip)
  saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg

  $ tglog
@ -195,7 +195,7 @@ G onto H - merged revision having a parent in ancestors of target:
  $ cd a5

  $ hg rebase -s 6 -d 7
-  rebasing 6:eea13746799a "G"
+  rebasing eea13746799a "G"
  saved backup bundle to $TESTTMP/a5/.hg/strip-backup/eea13746799a-883828ed-rebase.hg

  $ tglog
@ -224,9 +224,9 @@ F onto B - G maintains E as parent:
  $ cd a6

  $ hg rebase -s 5 -d 1
-  rebasing 5:24b6387c8c8c "F"
-  rebasing 6:eea13746799a "G"
-  rebasing 7:02de42196ebe "H" (tip)
+  rebasing 24b6387c8c8c "F"
+  rebasing eea13746799a "G"
+  rebasing 02de42196ebe "H" (tip)
  saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg

  $ tglog
@ -268,7 +268,7 @@ F onto G - rebase onto a descendant:
 G onto B - merge revision with both parents not in ancestors of target:

  $ hg rebase -s 6 -d 1
-  rebasing 6:eea13746799a "G"
+  rebasing eea13746799a "G"
  abort: cannot rebase 6:eea13746799a without moving at least one of its parents
  [255]
  $ hg rebase --abort
@ -294,8 +294,8 @@ F onto G - rebase onto a descendant:
 C onto A - rebase onto an ancestor:

  $ hg rebase -d 0 -s 2
-  rebasing 2:5fddd98957c8 "C"
-  rebasing 3:32af7686d403 "D"
+  rebasing 5fddd98957c8 "C"
+  rebasing 32af7686d403 "D"
  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg
  $ tglog
  o  7: c9659aac0000 'D'
@ -330,39 +330,39 @@ Check rebasing public changeset
  [255]

  $ hg rebase -d 5 -b 6 --keep
-  rebasing 6:e1c4361dd923 "C"
-  rebasing 7:c9659aac0000 "D" (tip)
+  rebasing e1c4361dd923 "C"
+  rebasing c9659aac0000 "D" (tip)

 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 2b23e52411f4 "D" (tip)
  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 2cb10d0cfc6c "D" (tip)
  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 c5b12b67163a "D" (tip)
  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 2a0524f868ac "D" (tip)
  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-cefd8574-rebase.hg
  $ hg log --template "{phase}\n" -r 9
  secret
 Source phase lower than destination phase: new changeset get the phase of destination:
  $ hg rebase -s8 -d9
-  rebasing 8:6d4f22462821 "C"
+  rebasing 6d4f22462821 "C"
  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-3441f70b-rebase.hg
  $ hg log --template "{phase}\n" -r 'rev(9)'
  secret
@ -391,7 +391,7 @@ Check that temporary bundle doesn't lose phase when not using generaldelta
  o  0:cb9a public a
  
  $ hg rebase -s 1 -d 2
-  rebasing 1:d2ae7f538514 "b"
+  rebasing d2ae7f538514 "b"
  saved backup bundle to $TESTTMP/issue5678/.hg/strip-backup/d2ae7f538514-2953539b-rebase.hg
  $ hg log -G -T '{rev}:{node|shortest} {phase} {desc}\n'
  o  2:c882 draft b
@ -448,11 +448,11 @@ Source on have two descendant heads but ask for one
  (use --keep to keep original changesets)
  [255]
  $ hg rebase -r '2::8' -d 1 -k
-  rebasing 2:c9e50f6cdc55 "C"
-  rebasing 3:ffd453c31098 "D"
-  rebasing 6:3d8a618087a7 "G"
-  rebasing 7:72434a4e60b0 "H"
-  rebasing 8:479ddb54a924 "I" (tip)
+  rebasing c9e50f6cdc55 "C"
+  rebasing ffd453c31098 "D"
+  rebasing 3d8a618087a7 "G"
+  rebasing 72434a4e60b0 "H"
+  rebasing 479ddb54a924 "I" (tip)
  $ tglog
  o  13: 9bf1d9358a90 'I'
  |
@ -494,10 +494,10 @@ Base on have one descendant heads we ask for but common ancestor have two
  (use --keep to keep original changesets)
  [255]
  $ hg rebase -r '3::8' -d 1 --keep
-  rebasing 3:ffd453c31098 "D"
-  rebasing 6:3d8a618087a7 "G"
-  rebasing 7:72434a4e60b0 "H"
-  rebasing 8:479ddb54a924 "I" (tip)
+  rebasing ffd453c31098 "D"
+  rebasing 3d8a618087a7 "G"
+  rebasing 72434a4e60b0 "H"
+  rebasing 479ddb54a924 "I" (tip)
  $ tglog
  o  12: 9d7da0053b1c 'I'
  |
@ -537,9 +537,9 @@ rebase subset
  (use --keep to keep original changesets)
  [255]
  $ hg rebase -r '3::7' -d 1 --keep
-  rebasing 3:ffd453c31098 "D"
-  rebasing 6:3d8a618087a7 "G"
-  rebasing 7:72434a4e60b0 "H"
+  rebasing ffd453c31098 "D"
+  rebasing 3d8a618087a7 "G"
+  rebasing 72434a4e60b0 "H"
  $ tglog
  o  11: 8fbd00952cbc 'H'
  |
@ -577,11 +577,11 @@ rebase subset with multiple head
  (use --keep to keep original changesets)
  [255]
  $ hg rebase -r '3::(7+5)' -d 1 --keep
-  rebasing 3:ffd453c31098 "D"
-  rebasing 4:c01897464e7f "E"
-  rebasing 5:41bfcc75ed73 "F"
-  rebasing 6:3d8a618087a7 "G"
-  rebasing 7:72434a4e60b0 "H"
+  rebasing ffd453c31098 "D"
+  rebasing c01897464e7f "E"
+  rebasing 41bfcc75ed73 "F"
+  rebasing 3d8a618087a7 "G"
+  rebasing 72434a4e60b0 "H"
  $ tglog
  o  13: 8fbd00952cbc 'H'
  |
@ -621,9 +621,9 @@ rebase on ancestor with revset
  $ hg clone -q -u . ah ah5
  $ cd ah5
  $ hg rebase -r '6::' -d 2
-  rebasing 6:3d8a618087a7 "G"
-  rebasing 7:72434a4e60b0 "H"
-  rebasing 8:479ddb54a924 "I" (tip)
+  rebasing 3d8a618087a7 "G"
+  rebasing 72434a4e60b0 "H"
+  rebasing 479ddb54a924 "I" (tip)
  saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-b4f73f31-rebase.hg
  $ tglog
  o  8: fcb52e68a694 'I'
@ -654,11 +654,11 @@ We would expect heads are I, F if it was supported
  $ hg clone -q -u . ah ah6
  $ cd ah6
  $ hg rebase -r '(4+6)::' -d 1
-  rebasing 4:c01897464e7f "E"
-  rebasing 5:41bfcc75ed73 "F"
-  rebasing 6:3d8a618087a7 "G"
-  rebasing 7:72434a4e60b0 "H"
-  rebasing 8:479ddb54a924 "I" (tip)
+  rebasing c01897464e7f "E"
+  rebasing 41bfcc75ed73 "F"
+  rebasing 3d8a618087a7 "G"
+  rebasing 72434a4e60b0 "H"
+  rebasing 479ddb54a924 "I" (tip)
  saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-aae93a24-rebase.hg
  $ tglog
  o  8: 9136df9a87cf 'I'
@ -725,8 +725,8 @@ each root have a different common ancestor with the destination and this is a de
 (actual test)

  $ hg rebase --dest 'desc(G)' --rev 'desc(K) + desc(I)'
-  rebasing 8:e7ec4e813ba6 "I"
-  rebasing 10:23a4ace37988 "K" (tip)
+  rebasing e7ec4e813ba6 "I"
+  rebasing 23a4ace37988 "K" (tip)
  saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-b06984b3-rebase.hg
  $ hg log --rev 'children(desc(G))'
  changeset:   9:adb617877056
@ -789,10 +789,10 @@ Test that rebase is not confused by $CWD disappearing during rebase (issue4121)
  $ hg commit -m 'second source with subdir'

  $ hg rebase -b . -d 1 --traceback
-  rebasing 2:779a07b1b7a0 "first source commit"
+  rebasing 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 a7d6f3a00bf3 "second source with subdir" (tip)
  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 ..`
@ -837,11 +837,11 @@ Test that rebase is done in topo order (issue5370)
  

  $ hg rebase -s 1 -d 6
-  rebasing 1:76035bbd54bd "B"
-  rebasing 2:d84f5cfaaf14 "C"
-  rebasing 4:82ae8dc7a9b7 "E"
-  rebasing 3:ab709c9f7171 "D"
-  rebasing 5:412b391de760 "F"
+  rebasing 76035bbd54bd "B"
+  rebasing d84f5cfaaf14 "C"
+  rebasing 82ae8dc7a9b7 "E"
+  rebasing ab709c9f7171 "D"
+  rebasing 412b391de760 "F"
  saved backup bundle to $TESTTMP/order/.hg/strip-backup/76035bbd54bd-e341bc99-rebase.hg

  $ tglog
@ -965,7 +965,7 @@ Testing rebase being called inside another transaction
  > EOS

  $ hg rebase -s C -d B
-  rebasing 2:dc0947a82db8 "C" (C tip)
+  rebasing dc0947a82db8 "C" (C tip)

  $ [ -f .hg/rebasestate ] && echo 'WRONG: rebasestate should not exist'
  [1]
--- a/tests/test-remotenames-pull-rebase.t
+++ b/tests/test-remotenames-pull-rebase.t
@ -91,7 +91,7 @@ Tests 'hg pull --rebase' defaults to original (rebase->pullrebase) behaviour whe
  updating to active bookmark bmnottracking
  nothing to rebase
  $ hg rebase -d 3
-  rebasing 1:6a7c7fb59c1e "localcommit" (bmnottracking)
+  rebasing 6a7c7fb59c1e "localcommit" (bmnottracking)
  saved backup bundle to $TESTTMP/localrepo/.hg/strip-backup/6a7c7fb59c1e-55f908e9-*.hg (glob)
  $ printdag
  @  localcommit | bmnottracking |
@ -191,7 +191,7 @@ Test pull with --rebase and --tool
  adding file changes
  added 1 changesets with 2 changes to 2 files (+1 heads)
  new changesets b1a3b9086dc9
-  rebasing 6:1d01e32a0efb "somelocalchanges" (tracking2)
+  rebasing 1d01e32a0efb "somelocalchanges" (tracking2)
  merging editedbyboth
  saved backup bundle to $TESTTMP/localrepo/.hg/strip-backup/*.hg (glob)
  $ printdag
--- a/tests/test-remotenames-pushto.t
+++ b/tests/test-remotenames-pushto.t
@ -232,7 +232,7 @@ Test that rebasing and pushing works as expected
  @  0 a
  
  $ hg --config extensions.rebase= rebase -d default/@ -s headc 2>&1 | grep -v "^warning:" | grep -v incomplete
-  rebasing 1:cc61aa6be3dc "c" (headc)
+  rebasing cc61aa6be3dc "c" (headc)
  merging a
  unresolved conflicts (see hg resolve, then hg rebase --continue)
  $ echo "a" > a
@ -241,7 +241,7 @@ Test that rebasing and pushing works as expected
  $ hg resolve --mark a
  (no more unresolved files)
  $ hg --config extensions.rebase= rebase --continue
-  rebasing 1:cc61aa6be3dc "c" (headc)
+  rebasing cc61aa6be3dc "c" (headc)
  saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/cc61aa6be3dc-73e4f2eb-*.hg (glob)
  $ hg log -G -T '{rev} {desc} {bookmarks} {remotebookmarks}\n'
  o  2 c headc
--- a/tests/test-remotenames-tracking.t
+++ b/tests/test-remotenames-tracking.t
@ -45,14 +45,14 @@ Create a tracking bookmark
     a                         1:fdceb0e57656
   * b                         2:dea4e1d2ca0e            [a: 1 ahead, 1 behind]
  $ hg rebase --tool :fail
-  rebasing 2:dea4e1d2ca0e "b" (b tip)
+  rebasing dea4e1d2ca0e "b" (b tip)
  unresolved conflicts (see hg resolve, then hg rebase --continue)
  [1]
  $ echo aa > a
  $ hg resolve --mark a 2>&1 | grep -v "^continue:"
  (no more unresolved files)
  $ hg rebase --continue
-  rebasing 2:dea4e1d2ca0e "b" (b tip)
+  rebasing dea4e1d2ca0e "b" (b tip)
  saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/dea4e1d2ca0e-a7f1cee1-*.hg (glob)
  $ hg log -G -T '{rev} {desc} {bookmarks} {remotebookmarks}'
  @  2 b b
@ -235,7 +235,7 @@ Test implicit rebase destination
  $ hg bookmarks -v
   * c                         5:ff58066d17c3            [remote/a: 1 ahead, 2 behind]
  $ hg rebase
-  rebasing 5:ff58066d17c3 "d" (c tip)
+  rebasing ff58066d17c3 "d" (c tip)
  saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/ff58066d17c3-470dd0be-*.hg (glob)
  $ hg log -G -T '{rev} {node|short} {bookmarks} {remotebookmarks}\n'
  @  5 8d13dc14fef1 c
--- a/tests/test-shelve-t.py
+++ b/tests/test-shelve-t.py
@ -150,7 +150,7 @@ sh % "hg unshelve --keep" == r"""
    unshelving change 'default-01'
    temporarily committing pending changes (restore with 'hg unshelve --abort')
    rebasing shelved changes
-    rebasing 4:4893561a85b4 "shelve changes to: second"
+    rebasing 4893561a85b4 "shelve changes to: second"
    merging a/a"""

 sh % "hg revert --all -q"
@ -258,7 +258,7 @@ sh % "hg unshelve" == r"""
    unshelving change 'default'
    temporarily committing pending changes (restore with 'hg unshelve --abort')
    rebasing shelved changes
-    rebasing 4:4893561a85b4 "shelve changes to: second"
+    rebasing 4893561a85b4 "shelve changes to: second"
    merging a/a
    warning: 1 conflicts while merging a/a! (edit, then use 'hg resolve --mark')
    unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
@ -350,7 +350,7 @@ sh % "hg graft --continue" == r"""
    (continue: hg unshelve --continue)
    [255]"""
 sh % "hg unshelve -c --trace" == r"""
-    rebasing 4:4893561a85b4 "shelve changes to: second"
+    rebasing 4893561a85b4 "shelve changes to: second"
    unshelve of 'default' complete"""

 # Ensure the repo is as we hope
@ -478,12 +478,12 @@ sh % "hg shelve" == r"""
    shelved as default
    1 files updated, 0 files merged, 0 files removed, 0 files unresolved"""
 sh % "hg rebase -d 1 --config 'extensions.rebase='" == r"""
-    rebasing 2:323bfa07f744 "xyz"
+    rebasing 323bfa07f744 "xyz"
    merging x"""
 sh % "hg unshelve" == r'''
    unshelving change 'default'
    rebasing shelved changes
-    rebasing 3:a2281b51947d "shelve changes to: xyz"'''
+    rebasing a2281b51947d "shelve changes to: xyz"'''
 sh % "hg status" == "M z"
 sh % "cd .."

@ -506,7 +506,7 @@ sh % "hg up -q 1"
 sh % "hg unshelve" == r"""
    unshelving change 'default'
    rebasing shelved changes
-    rebasing 3:7eac9d98447f "shelve changes to: c" (tip)"""
+    rebasing 7eac9d98447f "shelve changes to: c" (tip)"""
 sh % "hg status" == "A d"

 # Unshelve should work on an ancestor of the original commit
@ -517,7 +517,7 @@ sh % "hg up 0" == "0 files updated, 0 files merged, 1 files removed, 0 files unr
 sh % "hg unshelve" == r"""
    unshelving change 'default'
    rebasing shelved changes
-    rebasing 5:325b64d70042 "shelve changes to: b" (tip)"""
+    rebasing 325b64d70042 "shelve changes to: b" (tip)"""
 sh % "hg status" == "A d"

 # Test bug 4073 we need to enable obsolete markers for it
@ -594,7 +594,7 @@ sh % "hg unshelve --date '1073741824 0'" == r"""
    unshelving change 'default'
    temporarily committing pending changes (restore with 'hg unshelve --abort')
    rebasing shelved changes
-    rebasing 10:a0cc43106cdd "shelve changes to: commit stuff"
+    rebasing a0cc43106cdd "shelve changes to: commit stuff"
    merging f
    warning: 1 conflicts while merging f! (edit, then use 'hg resolve --mark')
    unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
@ -625,7 +625,7 @@ sh % "hg unshelve" == r'''
    unshelving change 'default'
    temporarily committing pending changes (restore with 'hg unshelve --abort')
    rebasing shelved changes
-    rebasing 10:a0cc43106cdd "shelve changes to: commit stuff"'''
+    rebasing a0cc43106cdd "shelve changes to: commit stuff"'''
 sh % "hg st" == r"""
    M a
    A f
@ -641,7 +641,7 @@ sh % "mv f.orig f"
 sh % "hg unshelve" == r"""
    unshelving change 'default'
    rebasing shelved changes
-    rebasing 10:a0cc43106cdd "shelve changes to: commit stuff"
+    rebasing a0cc43106cdd "shelve changes to: commit stuff"
    merging f
    warning: 1 conflicts while merging f! (edit, then use 'hg resolve --mark')
    unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
@ -1090,7 +1090,7 @@ sh % "hg unshelve" == r"""
    unshelving change 'default'
    temporarily committing pending changes (restore with 'hg unshelve --abort')
    rebasing shelved changes
-    rebasing 0:c850bce25d9f "(changes in empty repository)"
+    rebasing c850bce25d9f "(changes in empty repository)"
    merging unknown"""
 sh % "hg status" == "A unknown"
 sh % "hg forget unknown"
@ -1109,7 +1109,7 @@ sh % "hg status"
 sh % "hg unshelve" == r"""
    unshelving change 'default'
    rebasing shelved changes
-    rebasing 0:c850bce25d9f "(changes in empty repository)"
+    rebasing c850bce25d9f "(changes in empty repository)"
    merging unknown"""
 sh % "hg status" == "M unknown"
 sh % "hg remove --force unknown"
@ -1129,7 +1129,7 @@ sh % "hg ci -Am text1" == "adding file"
 sh % "hg unshelve" == r"""
    unshelving change 'default'
    rebasing shelved changes
-    rebasing 0:a6a994ce5ac2 "(changes in empty repository)"
+    rebasing a6a994ce5ac2 "(changes in empty repository)"
    merging file
    warning: 1 conflicts while merging file! (edit, then use 'hg resolve --mark')
    unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
@ -1169,7 +1169,7 @@ sh % "hg shelve --list" == "default * shelve changes to: 1 (glob)"
 sh % "hg unshelve --keep" == r"""
    unshelving change 'default'
    rebasing shelved changes
-    rebasing 1:49351a7ca591 "shelve changes to: 1"
+    rebasing 49351a7ca591 "shelve changes to: 1"
    merging file
    warning: 1 conflicts while merging file! (edit, then use 'hg resolve --mark')
    unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
@ -1178,7 +1178,7 @@ sh % "hg resolve --mark file" == r"""
    (no more unresolved files)
    continue: hg unshelve --continue"""
 sh % "hg unshelve --continue" == r"""
-    rebasing 1:49351a7ca591 "shelve changes to: 1"
+    rebasing 49351a7ca591 "shelve changes to: 1"
    unshelve of 'default' complete"""
 sh % "hg shelve --list" == "default * shelve changes to: 1 (glob)"
 sh % "cd .."
--- a/tests/test-sparse-profiles.t
+++ b/tests/test-sparse-profiles.t
@ -192,7 +192,7 @@ Verify rebase conflicts pulls in the conflicting changes
  webpage.sparse

  $ hg rebase -d 2
-  rebasing 1:e7901640ca22 "edit profile"
+  rebasing e7901640ca22 "edit profile"
  temporarily included 1 file(s) in the sparse checkout for merging
  merging backend.sparse
  merging data.py
--- a/tests/test-sparse-rebase.t
+++ b/tests/test-sparse-rebase.t
@ -19,9 +19,9 @@
  $ printf D > D
  $ echo 2 > E
  $ hg rebase -s C -d B
-  rebasing 2:dc0947a82db8 "C" (C)
+  rebasing dc0947a82db8 "C" (C)
  temporarily included 1 file(s) in the sparse checkout for merging
  cleaned up 1 temporarily added file(s) from the sparse checkout
-  rebasing 3:e7b3f00ed42e "D" (D tip)
+  rebasing e7b3f00ed42e "D" (D tip)
  temporarily included 1 file(s) in the sparse checkout for merging
  cleaned up 1 temporarily added file(s) from the sparse checkout
--- a/tests/test-sparse.t
+++ b/tests/test-sparse.t
@ -186,7 +186,7 @@ Verify adding sparseness hides files
 Verify rebase temporarily includes excluded files

  $ hg rebase -d 1 -r 2 --config extensions.rebase=
-  rebasing 2:b91df4f39e75 "edit hide" (tip)
+  rebasing b91df4f39e75 "edit hide" (tip)
  temporarily included 1 file(s) in the sparse checkout for merging
  merging hide
  warning: 1 conflicts while merging hide! (edit, then use 'hg resolve --mark')
@ -276,7 +276,7 @@ Verify rebase succeeds if all changed files are in sparse checkout

  $ hg commit -Aqm "add show2"
  $ hg rebase -d 1 --config extensions.rebase=
-  rebasing 2:bdde55290160 "add show2" (tip)
+  rebasing bdde55290160 "add show2" (tip)

 Verify log --sparse only shows commits that affect the sparse checkout

--- a/tests/test-visibility-cloudsync.t
+++ b/tests/test-visibility-cloudsync.t
@ -102,7 +102,7 @@ Create another client and use it to modify the commits and create some new ones.
  

  $ hg rebase -r $D -d $E
-  rebasing 3:6ba5de8abe43 "D"
+  rebasing 6ba5de8abe43 "D"
  $ hg up -q $Z
  $ echo X > X
  $ hg commit -Aqm X
@ -138,7 +138,7 @@ Before syncing, create a new commit in the original client
 Also introduce some divergence by rebasing the same commit

  $ hg rebase -r $D -d $Z
-  rebasing 5:6ba5de8abe43 "D"
+  rebasing 6ba5de8abe43 "D"

 Now cloud sync.  The sets of commits should be merged.

--- a/tests/test-visibility.t
+++ b/tests/test-visibility.t
@ -67,8 +67,8 @@ Simple creation and amending of draft commits

  $ mkcommit draft2a
  $ hg rebase -s ".^" -d 1
-  rebasing 4:bc066ca12b45 "draft1 amend1"
-  rebasing 5:2ccd7cddaa94 "draft2a" (tip)
+  rebasing bc066ca12b45 "draft1 amend1"
+  rebasing 2ccd7cddaa94 "draft2a" (tip)
  $ tglogp
  @  7: ecfc0c412bb8 draft 'draft2a'
  |
@ -84,7 +84,7 @@ Simple creation and amending of draft commits
  ecfc0c412bb878c3e7b1b3468cae773b473fd3ec
  v1
  $ hg rebase -s . -d 2
-  rebasing 7:ecfc0c412bb8 "draft2a" (tip)
+  rebasing ecfc0c412bb8 "draft2a" (tip)
  $ tglogp
  @  8: af54c09bb37d draft 'draft2a'
  |
@ -323,7 +323,7 @@ Stack navigation and rebases
  o  0: 426bada5c675 'A'
  
  $ hg next --rebase
-  rebasing 2:26805aba1e60 "C"
+  rebasing 26805aba1e60 "C"
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  [23910a] C
  $ tglogm
@ -342,7 +342,7 @@ Stack navigation and rebases
  o  0: 426bada5c675 'A'
  
  $ hg next --rebase
-  rebasing 3:f585351a92f8 "D"
+  rebasing f585351a92f8 "D"
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  [1d30cc] D
  $ tglogm
@ -363,7 +363,7 @@ Stack navigation and rebases
  o  0: 426bada5c675 'A'
  
  $ hg next --rebase
-  rebasing 4:9bc730a19041 "E"
+  rebasing 9bc730a19041 "E"
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  [ec992f] E
  $ tglogm
@ -543,7 +543,7 @@ Test that shelve and unshelve work
  $ hg unshelve --keep
  unshelving change 'default'
  rebasing shelved changes
-  rebasing 7:f321a4a9343c "shelve changes to: F" (tip)
+  rebasing f321a4a9343c "shelve changes to: F" (tip)
  $ hg st
  A file
  $ tglogm
@ -565,7 +565,7 @@ Test that shelve and unshelve work
  unshelving change 'default'
  temporarily committing pending changes (restore with 'hg unshelve --abort')
  rebasing shelved changes
-  rebasing 7:f321a4a9343c "shelve changes to: F"
+  rebasing f321a4a9343c "shelve changes to: F"
  $ hg st
  A file
  A other