diff tests/test-rebase-abort.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-abort.t	Thu Oct 22 23:10:06 2020 -0700
+++ b/tests/test-rebase-abort.t	Tue Oct 27 15:33:15 2020 -0700
@@ -78,7 +78,7 @@
 
   $ hg rebase -s 3 -d 2
   rebasing 3:3163e20567cc "L1"
-  rebasing 4:46f0b057b5c0 "L2" (tip)
+  rebasing 4:46f0b057b5c0 tip "L2"
   merging common
   warning: conflicts while merging common! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -145,7 +145,7 @@
 
   $ hg rebase -s 3 -d 2
   rebasing 3:3163e20567cc "L1"
-  rebasing 4:46f0b057b5c0 "L2" (tip)
+  rebasing 4:46f0b057b5c0 tip "L2"
   merging common
   warning: conflicts while merging common! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -215,7 +215,7 @@
   $ hg rebase -b 4 -d 2
   rebasing 3:a6484957d6b9 "B bis"
   note: not rebasing 3:a6484957d6b9 "B bis", its destination already has all its changes
-  rebasing 4:145842775fec "C1" (tip)
+  rebasing 4:145842775fec tip "C1"
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -274,7 +274,7 @@
   
 
   $ hg rebase -d master -r foo
-  rebasing 3:6c0f977a22d8 "C" (foo tip)
+  rebasing 3:6c0f977a22d8 tip foo "C"
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -314,7 +314,7 @@
   created new head
 
   $ hg rebase -d @ -b foo --tool=internal:fail
-  rebasing 2:070cf4580bb5 "b2" (foo tip)
+  rebasing 2:070cf4580bb5 tip foo "b2"
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
   [1]