diff tests/test-rebase-scenario-global.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-scenario-global.t	Thu Oct 22 23:10:06 2020 -0700
+++ b/tests/test-rebase-scenario-global.t	Tue Oct 27 15:33:15 2020 -0700
@@ -170,7 +170,7 @@
   rebasing 5:24b6387c8c8c "F"
   rebasing 6:eea13746799a "G"
   note: not rebasing 6:eea13746799a "G", its destination already has all its changes
-  rebasing 7:02de42196ebe "H" (tip)
+  rebasing 7:02de42196ebe tip "H"
   saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg
 
   $ hg tglog
@@ -228,7 +228,7 @@
   $ hg rebase -s 5 -d 1
   rebasing 5:24b6387c8c8c "F"
   rebasing 6:eea13746799a "G"
-  rebasing 7:02de42196ebe "H" (tip)
+  rebasing 7:02de42196ebe tip "H"
   saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg
 
   $ hg tglog
@@ -339,32 +339,32 @@
 
   $ hg rebase -d 5 -b 6 --keep
   rebasing 6:e1c4361dd923 "C"
-  rebasing 7:c9659aac0000 "D" (tip)
+  rebasing 7:c9659aac0000 tip "D"
 
 Check rebasing mutable changeset
 Source phase greater or equal to destination phase: new changeset get the phase of source:
   $ hg id -n
   5
   $ hg rebase -s9 -d0
-  rebasing 9:2b23e52411f4 "D" (tip)
+  rebasing 9:2b23e52411f4 tip "D"
   saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-f942decf-rebase.hg
   $ hg id -n # check we updated back to parent
   5
   $ hg log --template "{phase}\n" -r 9
   draft
   $ hg rebase -s9 -d1
-  rebasing 9:2cb10d0cfc6c "D" (tip)
+  rebasing 9:2cb10d0cfc6c tip "D"
   saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-ddb0f256-rebase.hg
   $ hg log --template "{phase}\n" -r 9
   draft
   $ hg phase --force --secret 9
   $ hg rebase -s9 -d0
-  rebasing 9:c5b12b67163a "D" (tip)
+  rebasing 9:c5b12b67163a tip "D"
   saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-4e372053-rebase.hg
   $ hg log --template "{phase}\n" -r 9
   secret
   $ hg rebase -s9 -d1
-  rebasing 9:2a0524f868ac "D" (tip)
+  rebasing 9:2a0524f868ac tip "D"
   saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-cefd8574-rebase.hg
   $ hg log --template "{phase}\n" -r 9
   secret
@@ -461,7 +461,7 @@
   rebasing 3:ffd453c31098 "D"
   rebasing 6:3d8a618087a7 "G"
   rebasing 7:72434a4e60b0 "H"
-  rebasing 8:479ddb54a924 "I" (tip)
+  rebasing 8:479ddb54a924 tip "I"
   $ hg tglog
   o  13: 9bf1d9358a90 'I'
   |
@@ -506,7 +506,7 @@
   rebasing 3:ffd453c31098 "D"
   rebasing 6:3d8a618087a7 "G"
   rebasing 7:72434a4e60b0 "H"
-  rebasing 8:479ddb54a924 "I" (tip)
+  rebasing 8:479ddb54a924 tip "I"
   $ hg tglog
   o  12: 9d7da0053b1c 'I'
   |
@@ -632,7 +632,7 @@
   $ hg rebase -r '6::' -d 2
   rebasing 6:3d8a618087a7 "G"
   rebasing 7:72434a4e60b0 "H"
-  rebasing 8:479ddb54a924 "I" (tip)
+  rebasing 8:479ddb54a924 tip "I"
   saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-b4f73f31-rebase.hg
   $ hg tglog
   o  8: fcb52e68a694 'I'
@@ -667,7 +667,7 @@
   rebasing 5:41bfcc75ed73 "F"
   rebasing 6:3d8a618087a7 "G"
   rebasing 7:72434a4e60b0 "H"
-  rebasing 8:479ddb54a924 "I" (tip)
+  rebasing 8:479ddb54a924 tip "I"
   saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-aae93a24-rebase.hg
   $ hg tglog
   o  8: 9136df9a87cf 'I'
@@ -736,7 +736,7 @@
 
   $ hg rebase --dest 'desc(G)' --rev 'desc(K) + desc(I)'
   rebasing 8:e7ec4e813ba6 "I"
-  rebasing 10:23a4ace37988 "K" (tip)
+  rebasing 10:23a4ace37988 tip "K"
   saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-b06984b3-rebase.hg
   $ hg log --rev 'children(desc(G))'
   changeset:   9:adb617877056
@@ -803,7 +803,7 @@
   rebasing 2:779a07b1b7a0 "first source commit"
   current directory was removed (rmcwd !)
   (consider changing to repo root: $TESTTMP/cwd-vanish) (rmcwd !)
-  rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip)
+  rebasing 3:a7d6f3a00bf3 tip "second source with subdir"
   saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-rebase.hg
 
 Get back to the root of cwd-vanish. Note that even though `cd ..`
@@ -979,7 +979,7 @@
   > EOS
 
   $ hg rebase -s C -d B
-  rebasing 2:dc0947a82db8 "C" (C tip)
+  rebasing 2:dc0947a82db8 C tip "C"
 
   $ [ -f .hg/rebasestate ] && echo 'WRONG: rebasestate should not exist'
   [1]