##// END OF EJS Templates
rebase: change and standarize template for rebase's one-line summary...
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

File last commit:

r46356:f90a5c21 default
r46356:f90a5c21 default
Show More
test-rebase-empty-successor.t
44 lines | 1.2 KiB | text/troff | Tads3Lexer
/ tests / test-rebase-empty-successor.t
Manuel Jacob
rebase: consider rewrite.empty-successor configuration...
r45683 $ cat << EOF >> $HGRCPATH
> [extensions]
> rebase=
> [alias]
> tglog = log -G -T "{rev} '{desc}'\n"
> EOF
$ hg init
$ echo a > a; hg add a; hg ci -m a
$ echo b > b; hg add b; hg ci -m b1
$ hg up 0 -q
$ echo b > b; hg add b; hg ci -m b2 -q
$ hg tglog
@ 2 'b2'
|
| o 1 'b1'
|/
o 0 'a'
With rewrite.empty-successor=skip, b2 is skipped because it would become empty.
$ hg rebase -s 2 -d 1 --config rewrite.empty-successor=skip --dry-run
starting dry-run rebase; repository will not be changed
Martin von Zweigbergk
rebase: change and standarize template for rebase's one-line summary...
r46356 rebasing 2:6e2aad5e0f3c tip "b2"
note: not rebasing 2:6e2aad5e0f3c tip "b2", its destination already has all its changes
Manuel Jacob
rebase: consider rewrite.empty-successor configuration...
r45683 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
Martin von Zweigbergk
rebase: change and standarize template for rebase's one-line summary...
r46356 rebasing 2:6e2aad5e0f3c tip "b2"
note: created empty successor for 2:6e2aad5e0f3c tip "b2", its destination already has all its changes
Manuel Jacob
rebase: consider rewrite.empty-successor configuration...
r45683 saved backup bundle to $TESTTMP/.hg/strip-backup/6e2aad5e0f3c-7d7c8801-rebase.hg
$ hg tglog
@ 2 'b2'
|
o 1 'b1'
|
o 0 'a'