diff tests/test-rebase-empty-successor.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
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 27 Oct 2020 15:33:15 -0700
parents 1efbfa9b36a7
children
line wrap: on
line diff
--- a/tests/test-rebase-empty-successor.t	Thu Oct 22 23:10:06 2020 -0700
+++ b/tests/test-rebase-empty-successor.t	Tue Oct 27 15:33:15 2020 -0700
@@ -24,15 +24,15 @@
 
   $ hg rebase -s 2 -d 1 --config rewrite.empty-successor=skip --dry-run
   starting dry-run rebase; repository will not be changed
-  rebasing 2:6e2aad5e0f3c "b2" (tip)
-  note: not rebasing 2:6e2aad5e0f3c "b2" (tip), its destination already has all its changes
+  rebasing 2:6e2aad5e0f3c tip "b2"
+  note: not rebasing 2:6e2aad5e0f3c tip "b2", its destination already has all its changes
   dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase
 
 With rewrite.empty-successor=keep, b2 will be recreated although it became empty.
 
   $ hg rebase -s 2 -d 1 --config rewrite.empty-successor=keep
-  rebasing 2:6e2aad5e0f3c "b2" (tip)
-  note: created empty successor for 2:6e2aad5e0f3c "b2" (tip), its destination already has all its changes
+  rebasing 2:6e2aad5e0f3c tip "b2"
+  note: created empty successor for 2:6e2aad5e0f3c tip "b2", its destination already has all its changes
   saved backup bundle to $TESTTMP/.hg/strip-backup/6e2aad5e0f3c-7d7c8801-rebase.hg
 
   $ hg tglog