Mercurial > hg
diff tests/test-rebase-rename.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 | 45ec64d93b3a |
children | 1703a7f9d5b8 |
line wrap: on
line diff
--- a/tests/test-rebase-rename.t Thu Oct 22 23:10:06 2020 -0700 +++ b/tests/test-rebase-rename.t Tue Oct 27 15:33:15 2020 -0700 @@ -60,7 +60,7 @@ Rebase the revision containing the rename: $ hg rebase -s 3 -d 2 - rebasing 3:73a3ee40125d "rename A" (tip) + rebasing 3:73a3ee40125d tip "rename A" saved backup bundle to $TESTTMP/a/.hg/strip-backup/73a3ee40125d-1d78ebcf-rebase.hg $ hg tglog @@ -134,8 +134,8 @@ o 0: 1994f17a630e 'A' $ hg rebase -s 5 -d 4 - rebasing 5:af8ad1f97097 "E" (tip) - note: not rebasing 5:af8ad1f97097 "E" (tip), its destination already has all its changes + rebasing 5:af8ad1f97097 tip "E" + note: not rebasing 5:af8ad1f97097 tip "E", its destination already has all its changes saved backup bundle to $TESTTMP/a/.hg/strip-backup/af8ad1f97097-c3e90708-rebase.hg $ hg tglog @ 4: 60f545c27784 'E' @@ -207,7 +207,7 @@ Rebase the revision containing the copy: $ hg rebase -s 3 -d 2 - rebasing 3:0a8162ff18a8 "copy A" (tip) + rebasing 3:0a8162ff18a8 tip "copy A" saved backup bundle to $TESTTMP/b/.hg/strip-backup/0a8162ff18a8-dd06302a-rebase.hg $ hg tglog @@ -291,7 +291,7 @@ $ hg rebase -s 4 -d 3 - rebasing 4:b918d683b091 "Another unrelated change" (tip) + rebasing 4:b918d683b091 tip "Another unrelated change" saved backup bundle to $TESTTMP/repo/.hg/strip-backup/b918d683b091-3024bc57-rebase.hg $ hg diff --stat -c .