Mercurial > hg
diff tests/test-rebase-detach.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 | dc5e5577af39 |
children | 21733e8c924f |
line wrap: on
line diff
--- a/tests/test-rebase-detach.t Thu Oct 22 23:10:06 2020 -0700 +++ b/tests/test-rebase-detach.t Tue Oct 27 15:33:15 2020 -0700 @@ -24,7 +24,7 @@ $ hg phase --force --secret D $ hg rebase -s D -d B - rebasing 3:e7b3f00ed42e "D" (D tip) + rebasing 3:e7b3f00ed42e D tip "D" saved backup bundle to $TESTTMP/a1/.hg/strip-backup/e7b3f00ed42e-6f368371-rebase.hg $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" @@ -60,8 +60,8 @@ > EOF $ hg rebase -s D -d B - rebasing 3:e7b3f00ed42e "D" (D) - rebasing 4:69a34c08022a "E" (E tip) + rebasing 3:e7b3f00ed42e D "D" + rebasing 4:69a34c08022a E tip "E" saved backup bundle to $TESTTMP/a2/.hg/strip-backup/e7b3f00ed42e-a2ec7cea-rebase.hg $ hg tglog @@ -97,8 +97,8 @@ > EOF $ hg rebase -s C -d B - rebasing 2:dc0947a82db8 "C" (C) - rebasing 3:e7b3f00ed42e "D" (D tip) + rebasing 2:dc0947a82db8 C "C" + rebasing 3:e7b3f00ed42e D tip "D" saved backup bundle to $TESTTMP/a3/.hg/strip-backup/dc0947a82db8-b8481714-rebase.hg $ hg tglog @@ -136,8 +136,8 @@ $ hg phase --force --secret E $ hg rebase --collapse -s D -d B - rebasing 3:e7b3f00ed42e "D" (D) - rebasing 4:69a34c08022a "E" (E tip) + rebasing 3:e7b3f00ed42e D "D" + rebasing 4:69a34c08022a E tip "E" saved backup bundle to $TESTTMP/a4/.hg/strip-backup/e7b3f00ed42e-a2ec7cea-rebase.hg $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" @@ -173,9 +173,9 @@ > EOF $ hg rebase -s C -d B - rebasing 2:dc0947a82db8 "C" (C) - rebasing 3:e7b3f00ed42e "D" (D) - rebasing 4:69a34c08022a "E" (E tip) + rebasing 2:dc0947a82db8 C "C" + rebasing 3:e7b3f00ed42e D "D" + rebasing 4:69a34c08022a E tip "E" saved backup bundle to $TESTTMP/a5/.hg/strip-backup/dc0947a82db8-3eefec98-rebase.hg $ hg tglog @@ -191,7 +191,7 @@ $ hg rebase -d 1 -s 3 rebasing 3:e9153d36a1af "D" - rebasing 4:e3d0c70d606d "E" (tip) + rebasing 4:e3d0c70d606d tip "E" saved backup bundle to $TESTTMP/a5/.hg/strip-backup/e9153d36a1af-db7388ed-rebase.hg $ hg tglog o 4: 2c24e540eccd 'E' @@ -248,9 +248,9 @@ o 0: 426bada5c675 'A' $ hg rebase -s I -d H --collapse --config ui.merge=internal:other - rebasing 5:b92d164ad3cb "I" (I) + rebasing 5:b92d164ad3cb I "I" rebasing 6:0cfbc7e8faaf "Merge" - rebasing 7:c6aaf0d259c0 "J" (tip) + rebasing 7:c6aaf0d259c0 tip "J" saved backup bundle to $TESTTMP/a6/.hg/strip-backup/b92d164ad3cb-88fd7ab7-rebase.hg $ hg tglog @@ -294,7 +294,7 @@ adding B $ hg phase --force --secret . $ hg rebase -s . -d B --config ui.merge=internal:merge - rebasing 3:17b4880d2402 "B2" (tip) + rebasing 3:17b4880d2402 tip "B2" merging B warning: conflicts while merging B! (edit, then use 'hg resolve --mark') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') @@ -303,8 +303,8 @@ (no more unresolved files) continue: hg rebase --continue $ hg rebase -c - rebasing 3:17b4880d2402 "B2" (tip) - note: not rebasing 3:17b4880d2402 "B2" (tip), its destination already has all its changes + rebasing 3:17b4880d2402 tip "B2" + note: not rebasing 3:17b4880d2402 tip "B2", its destination already has all its changes saved backup bundle to $TESTTMP/a7/.hg/strip-backup/17b4880d2402-1ae1f6cc-rebase.hg $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" o 2:draft 'C'