diff tests/test-rebase-interruptions.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-interruptions.t	Thu Oct 22 23:10:06 2020 -0700
+++ b/tests/test-rebase-interruptions.t	Tue Oct 27 15:33:15 2020 -0700
@@ -348,7 +348,7 @@
   $ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.precommit=hg status | grep "M A"'
   rebasing 2:965c486023db "C"
   M A
-  rebasing 6:a0b2430ebfb8 "F" (tip)
+  rebasing 6:a0b2430ebfb8 tip "F"
   abort: precommit hook exited with status 1
   [255]
   $ hg tglogp
@@ -397,7 +397,7 @@
   >     --config 'hooks.tonative.pretxncommit=True' --config 'hooks.pretxncommit=hg log -r $HG_NODE | grep "summary:     C"'
   rebasing 2:965c486023db "C"
   summary:     C
-  rebasing 6:a0b2430ebfb8 "F" (tip)
+  rebasing 6:a0b2430ebfb8 tip "F"
   transaction abort!
   rollback completed
   abort: pretxncommit hook exited with status 1
@@ -447,7 +447,7 @@
   $ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.pretxnclose=hg log -r tip | grep "summary:     C"'
   rebasing 2:965c486023db "C"
   summary:     C
-  rebasing 6:a0b2430ebfb8 "F" (tip)
+  rebasing 6:a0b2430ebfb8 tip "F"
   transaction abort!
   rollback completed
   abort: pretxnclose hook exited with status 1
@@ -522,7 +522,7 @@
 Now try again with --collapse
   $ hg unbundle -q .hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
   $ hg rebase -s 2 -d 1 --noninteractive --collapse
-  rebasing 2:fdaca8533b86 "b" (tip)
+  rebasing 2:fdaca8533b86 tip "b"
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -533,7 +533,7 @@
   (no more unresolved files)
   continue: hg rebase --continue
   $ hg rebase --continue
-  rebasing 2:fdaca8533b86 "b" (tip)
+  rebasing 2:fdaca8533b86 tip "b"
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
   $ hg resolve --list
   $ test -d .hg/merge