Mercurial > hg
comparison tests/test-rebase-legacy.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 | 503d0dd2af18 |
| children |
comparison
equal
deleted
inserted
replaced
| 45770:96fcc37a9c80 | 45771:f90a5c211251 |
|---|---|
| 56 $ hg continue --dry-run | 56 $ hg continue --dry-run |
| 57 rebase in progress, will be resumed | 57 rebase in progress, will be resumed |
| 58 #endif | 58 #endif |
| 59 | 59 |
| 60 $ hg continue | 60 $ hg continue |
| 61 rebasing 4:c1e6b162678d "B" (B) | 61 rebasing 4:c1e6b162678d B "B" |
| 62 rebasing 8:6f7a236de685 "D" (D) | 62 rebasing 8:6f7a236de685 D "D" |
| 63 rebasing 2:de008c61a447 "E" (E) | 63 rebasing 2:de008c61a447 E "E" |
| 64 rebasing 7:d2fa1c02b240 "G" (G) | 64 rebasing 7:d2fa1c02b240 G "G" |
| 65 rebasing 9:6582e6951a9c "H" (H tip) | 65 rebasing 9:6582e6951a9c H tip "H" |
| 66 warning: orphaned descendants detected, not stripping c1e6b162678d, de008c61a447 | 66 warning: orphaned descendants detected, not stripping c1e6b162678d, de008c61a447 |
| 67 saved backup bundle to $TESTTMP/.hg/strip-backup/6f7a236de685-9880a3dc-rebase.hg | 67 saved backup bundle to $TESTTMP/.hg/strip-backup/6f7a236de685-9880a3dc-rebase.hg |
| 68 | 68 |
| 69 $ hg log -G -T '{rev}:{node|short} {desc}\n' | 69 $ hg log -G -T '{rev}:{node|short} {desc}\n' |
| 70 o 11:721b8da0a708 H | 70 o 11:721b8da0a708 H |