Mercurial > public > mercurial-scm > hg
diff tests/test-rebase-partial.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-partial.t Thu Oct 22 23:10:06 2020 -0700 +++ b/tests/test-rebase-partial.t Tue Oct 27 15:33:15 2020 -0700 @@ -35,8 +35,8 @@ > |/ > A > EOF - rebasing 2:b18e25de2cf5 "D" (D) - already rebased 3:26805aba1e60 "C" (C tip) + rebasing 2:b18e25de2cf5 D "D" + already rebased 3:26805aba1e60 C tip "C" o 4: fe3b4c6498fa D | | o 3: 26805aba1e60 C @@ -56,8 +56,8 @@ > |/ > A > EOF - rebasing 2:b18e25de2cf5 "D" (D) - rebasing 3:26805aba1e60 "C" (C tip) + rebasing 2:b18e25de2cf5 D "D" + rebasing 3:26805aba1e60 C tip "C" o 4: a2493f4ace65 Collapsed revision | * D | * C @@ -81,7 +81,7 @@ > A > EOF $ hg rebase -r C+D -d B - rebasing 2:ef8c0fe0897b "D" (D) + rebasing 2:ef8c0fe0897b D "D" merging file warning: conflicts while merging file! (edit, then use 'hg resolve --mark') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') @@ -111,8 +111,8 @@ > | > A > EOF - already rebased 1:112478962961 "B" (B) - rebasing 3:f585351a92f8 "D" (D tip) + already rebased 1:112478962961 B "B" + rebasing 3:f585351a92f8 D tip "D" o 4: 1e6da8103bc7 D | | x 3: f585351a92f8 D