diff tests/test-rebase-emptycommit.t @ 45771:f90a5c211251

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

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

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

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

--- a/tests/test-rebase-emptycommit.t	Thu Oct 22 23:10:06 2020 -0700
+++ b/tests/test-rebase-emptycommit.t	Tue Oct 27 15:33:15 2020 -0700
@@ -50,10 +50,10 @@
 With --keep, bookmark should move
 
   $ hg rebase -r 3+4 -d E --keep
-  rebasing 3:e7b3f00ed42e "D" (BOOK-D)
-  note: not rebasing 3:e7b3f00ed42e "D" (BOOK-D), its destination already has all its changes
-  rebasing 4:69a34c08022a "E" (BOOK-E)
-  note: not rebasing 4:69a34c08022a "E" (BOOK-E), its destination already has all its changes
+  rebasing 3:e7b3f00ed42e BOOK-D "D"
+  note: not rebasing 3:e7b3f00ed42e BOOK-D "D", its destination already has all its changes
+  rebasing 4:69a34c08022a BOOK-E "E"
+  note: not rebasing 4:69a34c08022a BOOK-E "E", its destination already has all its changes
   $ hg log -G -T '{rev} {desc} {bookmarks}'
   o  7 E BOOK-D BOOK-E
   |
@@ -82,12 +82,12 @@
 "BOOK-D", and "BOOK-E" include changes introduced by "C".
 
   $ hg rebase -s 2 -d E
-  rebasing 2:dc0947a82db8 "C" (BOOK-C C)
-  rebasing 3:e7b3f00ed42e "D" (BOOK-D)
-  note: not rebasing 3:e7b3f00ed42e "D" (BOOK-D), its destination already has all its changes
-  rebasing 4:69a34c08022a "E" (BOOK-E)
-  note: not rebasing 4:69a34c08022a "E" (BOOK-E), its destination already has all its changes
-  rebasing 5:6b2aeab91270 "F" (BOOK-F F)
+  rebasing 2:dc0947a82db8 C BOOK-C "C"
+  rebasing 3:e7b3f00ed42e BOOK-D "D"
+  note: not rebasing 3:e7b3f00ed42e BOOK-D "D", its destination already has all its changes
+  rebasing 4:69a34c08022a BOOK-E "E"
+  note: not rebasing 4:69a34c08022a BOOK-E "E", its destination already has all its changes
+  rebasing 5:6b2aeab91270 F BOOK-F "F"
   saved backup bundle to $TESTTMP/non-merge/.hg/strip-backup/dc0947a82db8-52bb4973-rebase.hg
   $ hg log -G -T '{rev} {desc} {bookmarks}'
   o  5 F BOOK-F
@@ -139,12 +139,12 @@
   $ hg branch foo -q
 
   $ hg rebase -r '(A::)-(B::)-A' -d H --keepbranches
-  rebasing 2:dc0947a82db8 "C" (BOOK-C)
-  note: not rebasing 2:dc0947a82db8 "C" (BOOK-C), its destination already has all its changes
-  rebasing 3:b18e25de2cf5 "D" (BOOK-D)
-  note: not rebasing 3:b18e25de2cf5 "D" (BOOK-D), its destination already has all its changes
-  rebasing 4:86a1f6686812 "E" (BOOK-E E)
-  note: not rebasing 4:86a1f6686812 "E" (BOOK-E E), its destination already has all its changes
+  rebasing 2:dc0947a82db8 BOOK-C "C"
+  note: not rebasing 2:dc0947a82db8 BOOK-C "C", its destination already has all its changes
+  rebasing 3:b18e25de2cf5 BOOK-D "D"
+  note: not rebasing 3:b18e25de2cf5 BOOK-D "D", its destination already has all its changes
+  rebasing 4:86a1f6686812 E BOOK-E "E"
+  note: not rebasing 4:86a1f6686812 E BOOK-E "E", its destination already has all its changes
   saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg
   $ hg update null -q
 
@@ -189,13 +189,13 @@
   > EOS
 
   $ hg rebase -r '(A::)-(B::)-A' -d H
-  rebasing 2:dc0947a82db8 "C" (BOOK-C)
-  note: not rebasing 2:dc0947a82db8 "C" (BOOK-C), its destination already has all its changes
-  rebasing 3:b18e25de2cf5 "D" (BOOK-D D)
-  rebasing 4:03ca77807e91 "E" (BOOK-E E)
-  rebasing 5:ad6717a6a58e "F" (BOOK-F)
-  note: not rebasing 5:ad6717a6a58e "F" (BOOK-F), its destination already has all its changes
-  rebasing 6:c58e8bdac1f4 "G" (BOOK-G G)
+  rebasing 2:dc0947a82db8 BOOK-C "C"
+  note: not rebasing 2:dc0947a82db8 BOOK-C "C", its destination already has all its changes
+  rebasing 3:b18e25de2cf5 D BOOK-D "D"
+  rebasing 4:03ca77807e91 E BOOK-E "E"
+  rebasing 5:ad6717a6a58e BOOK-F "F"
+  note: not rebasing 5:ad6717a6a58e BOOK-F "F", its destination already has all its changes
+  rebasing 6:c58e8bdac1f4 G BOOK-G "G"
   saved backup bundle to $TESTTMP/merge2/.hg/strip-backup/b18e25de2cf5-2d487005-rebase.hg
 
   $ hg log -G -T '{rev} {desc} {bookmarks}'