##// END OF EJS Templates
revlog: subclass the new `repository.iverifyproblem` Protocol class...
revlog: subclass the new `repository.iverifyproblem` Protocol class This is the same transformation as 3a90a6fd710d did for dirstate, but the CamelCase naming was already cleaned up here. We shouldn't have to explicitly subclass, but I'm doing so to test the interplay of regular attributes and the `attrs` class. Also, PyCharm has a nifty feature that puts a jump point in the gutter to navigate back and forth between the base class and subclasses (and override functions and base class functions) when there's an explicit subclassing. Additionally, PyCharm will immediately flag signature mismatches without a 40m pytype run.

File last commit:

r46356:f90a5c21 default
r53365:4ef6dbc2 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'