This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8736

tests: make drawdag try to draw nodes in alphabetical order
AbandonedPublic

Authored by martinvonz on Jul 14 2020, 1:11 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

drawdag currently adds nodes in alphabetical order, but "layer by
layer" in a BFS traversal. I find that that makes it harder to reason
about and convince drawdag to add in the order I want it to draw. This
patch makes it so we don't do the "layer by layer" thing and we
instead add the first possible node in alphabetical order every time.

I apologize for the impact on the test cases.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Jul 14 2020, 1:11 AM
marmoute added a subscriber: marmoute.Jul 15 2020, 1:09 PM

Are you trying to optimise you experience for here? log ouput with less crossing or version number in other command output ?

martinvonz added a comment.Jul 15 2020, 1:24 PM
In D8736#130696, @marmoute wrote:

Are you trying to optimise you experience for here? log ouput with less crossing or version number in other command output ?

Good question. It was quite a long time ago that I wrote this patch. I think I just wanted to be able to produce a graph that looked the way I wanted in graphlog. I found it very hard to do that before this patch. The order would also matter for tests that care about stripping and linkrev, but I can't remember if I had any such cases in mind when I wrote the patch,

marmoute added a comment.Jul 16 2020, 10:26 AM

Could the hg log ordering thing be solved by using topological ordering when displaying thing ?

martinvonz abandoned this revision.Jul 16 2020, 11:15 AM
In D8736#130829, @marmoute wrote:

Could the hg log ordering thing be solved by using topological ordering when displaying thing ?

That's possible. I'll abandon this patch and I might get back to it later if I can better remember what the motivation was :)

Revision Contents
Changeset List

Diff 21885

tests/drawdag.py

for v in vs: for v in vs:
if v not in remaining: if v not in remaining:
remaining[v] = [] remaining[v] = []
remaining[k] = vs[:] remaining[k] = vs[:]
while remaining: while remaining:
leafs = [k for k, v in remaining.items() if not v] leafs = [k for k, v in remaining.items() if not v]
if not leafs: if not leafs:
raise error.Abort(_('the graph has cycles')) raise error.Abort(_('the graph has cycles'))
for leaf in sorted(leafs): leaf = min(leafs)
if leaf in visible: if leaf in visible:
yield leaf, edges[leaf] yield leaf, edges[leaf]
del remaining[leaf] del remaining[leaf]
for k, v in remaining.items(): for k, v in remaining.items():
if leaf in v: if leaf in v:
v.remove(leaf) v.remove(leaf)
def _getcomments(text): def _getcomments(text):
r""" r"""
>>> [pycompat.sysstr(s) for s in _getcomments(br''' >>> [pycompat.sysstr(s) for s in _getcomments(br'''
... G ... G
... | ... |
... I D C F # split: B -> E, F, G ... I D C F # split: B -> E, F, G

tests/test-drawdag.t

> foo bar bar foo > foo bar bar foo
> | / | | > | / | |
> ancestor(c,d) a baz > ancestor(c,d) a baz
> EOS > EOS
$ hg log -G -T '{desc}' $ hg log -G -T '{desc}'
o foo o foo
|\ |\
+---o bar | o baz
| | | |
| o | baz | o bar
| / |/|
+---o d +---o d
| | | |
+---o c +---o c
| | | |
o | b o | b
|/ |/
o a o a
> o | b > o | b
> |/ > |/
> o a > o a
> EOS > EOS
$ hg log -G -T '{desc}' $ hg log -G -T '{desc}'
o foo o foo
|\ |\
| | o d +---o d
| |/ | |
| | o c +---o c
| |/ | |
| | o bar | o baz
| |/| |
| o | b | o bar
| |/ |/|
o / baz o | b
/ |/
o a o a
$ reinit $ reinit
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> o foo > o foo
> |\ > |\
> | | o d > | | o d
> | |/ > | |/
> | | o c > | | o c
> | |/ > | |/
> | | o bar > | | o bar
> | |/| > | |/|
> | o | b > | o | b
> | |/ > | |/
> o / baz > o / baz
> / > /
> o a > o a
> EOS > EOS
$ hg log -G -T '{desc}' $ hg log -G -T '{desc}'
o foo o foo
|\ |\
| | o d +---o d
| |/ | |
| | o c +---o c
| |/ | |
| | o bar | o baz
| |/| |
| o | b | o bar
| |/ |/|
o / baz o | b
/ |/
o a o a
$ hg manifest -r a $ hg manifest -r a
a a
$ hg manifest -r b $ hg manifest -r b
a a
b b
$ hg manifest -r bar $ hg manifest -r bar
> \ \| | # replace: C -> D -> H > \ \| | # replace: C -> D -> H
> H B E # prune: F, I > H B E # prune: F, I
> \|/ > \|/
> A > A
> EOS > EOS
1 new orphan changesets 1 new orphan changesets
$ hg log -r 'sort(all(), topo)' -G --hidden -T '{desc} {node}' $ hg log -r 'sort(all(), topo)' -G --hidden -T '{desc} {node}'
* G 711f53bbef0bebd12eb6f0511d5e2e998b984846 x I 58e6b987bf7045fcd9c54f496396ca1d1fc81047
|
x F 64a8289d249234b9886244d379f15e6b650b28e3
| |
o E 7fb047a69f220c21711122dfd94305a9efb60cba o H 575c4b5ec114d64b681d33f8792853568bfb2b2c
| |
| * G 711f53bbef0bebd12eb6f0511d5e2e998b984846
| |
| x F 64a8289d249234b9886244d379f15e6b650b28e3
| |
| o E 7fb047a69f220c21711122dfd94305a9efb60cba
|/
| x D be0ef73c17ade3fc89dc41701eb9fc3a91b58282 | x D be0ef73c17ade3fc89dc41701eb9fc3a91b58282
| | | |
| | x C 26805aba1e600a82e93661149f2313866a221a7b | | x C 26805aba1e600a82e93661149f2313866a221a7b
| |/ | |/
| x B 112478962961147124edd43549aedd1a335e44bf | x B 112478962961147124edd43549aedd1a335e44bf
|/ |/
| x I 58e6b987bf7045fcd9c54f496396ca1d1fc81047
| |
| o H 575c4b5ec114d64b681d33f8792853568bfb2b2c
|/
o A 426bada5c67598ca65036d57d9e4b64b0c1ce7a0 o A 426bada5c67598ca65036d57d9e4b64b0c1ce7a0
$ hg debugobsolete $ hg debugobsolete
112478962961147124edd43549aedd1a335e44bf 7fb047a69f220c21711122dfd94305a9efb60cba 64a8289d249234b9886244d379f15e6b650b28e3 711f53bbef0bebd12eb6f0511d5e2e998b984846 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'split', 'user': 'test'} 112478962961147124edd43549aedd1a335e44bf 7fb047a69f220c21711122dfd94305a9efb60cba 64a8289d249234b9886244d379f15e6b650b28e3 711f53bbef0bebd12eb6f0511d5e2e998b984846 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'split', 'user': 'test'}
26805aba1e600a82e93661149f2313866a221a7b be0ef73c17ade3fc89dc41701eb9fc3a91b58282 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'replace', 'user': 'test'} 26805aba1e600a82e93661149f2313866a221a7b be0ef73c17ade3fc89dc41701eb9fc3a91b58282 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'replace', 'user': 'test'}
be0ef73c17ade3fc89dc41701eb9fc3a91b58282 575c4b5ec114d64b681d33f8792853568bfb2b2c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'replace', 'user': 'test'} be0ef73c17ade3fc89dc41701eb9fc3a91b58282 575c4b5ec114d64b681d33f8792853568bfb2b2c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'replace', 'user': 'test'}
64a8289d249234b9886244d379f15e6b650b28e3 0 {7fb047a69f220c21711122dfd94305a9efb60cba} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} 64a8289d249234b9886244d379f15e6b650b28e3 0 {7fb047a69f220c21711122dfd94305a9efb60cba} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
58e6b987bf7045fcd9c54f496396ca1d1fc81047 0 {575c4b5ec114d64b681d33f8792853568bfb2b2c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} 58e6b987bf7045fcd9c54f496396ca1d1fc81047 0 {575c4b5ec114d64b681d33f8792853568bfb2b2c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}

tests/test-obsolete-divergent.t

$ rm .hg/localtags $ rm .hg/localtags
$ hg cleanup --config extensions.t=$TESTTMP/scmutilcleanup.py $ hg cleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
2 new content-divergent changesets 2 new content-divergent changesets
$ hg log -G -T '{rev}:{node|short} {desc} {instabilities}' -r 'sort(all(), topo)' $ hg log -G -T '{rev}:{node|short} {desc} {instabilities}' -r 'sort(all(), topo)'
@ 5:1a2a9b5b0030 B2 content-divergent @ 5:1a2a9b5b0030 B2 content-divergent
| |
| * 4:70d5a63ca112 B4 content-divergent | * 4:70d5a63ca112 B4 content-divergent
| | | |
| o 1:48b9aae0607f Z | o 2:48b9aae0607f Z
| |
o 0:426bada5c675 A o 0:426bada5c675 A
$ hg debugobsolete $ hg debugobsolete
a178212c3433c4e77b573f6011e29affb8aefa33 1a2a9b5b0030632400aa78e00388c20f99d3ec44 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} a178212c3433c4e77b573f6011e29affb8aefa33 1a2a9b5b0030632400aa78e00388c20f99d3ec44 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
a178212c3433c4e77b573f6011e29affb8aefa33 ad6478fb94ecec98b86daae98722865d494ac561 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'test', 'user': 'test'} a178212c3433c4e77b573f6011e29affb8aefa33 ad6478fb94ecec98b86daae98722865d494ac561 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'test', 'user': 'test'}
ad6478fb94ecec98b86daae98722865d494ac561 70d5a63ca112acb3764bc1d7320ca90ea688d671 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'test', 'user': 'test'} ad6478fb94ecec98b86daae98722865d494ac561 70d5a63ca112acb3764bc1d7320ca90ea688d671 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'test', 'user': 'test'}

tests/test-phases-exchange.t

test-debug-phase: new rev 5: x -> 1 test-debug-phase: new rev 5: x -> 1
test-debug-phase: new rev 6: x -> 1 test-debug-phase: new rev 6: x -> 1
test-debug-phase: new rev 7: x -> 1 test-debug-phase: new rev 7: x -> 1
$ hg phase --public -r D $ hg phase --public -r D
test-debug-phase: move rev 0: 1 -> 0 test-debug-phase: move rev 0: 1 -> 0
test-debug-phase: move rev 1: 1 -> 0 test-debug-phase: move rev 1: 1 -> 0
test-debug-phase: move rev 2: 1 -> 0 test-debug-phase: move rev 2: 1 -> 0
test-debug-phase: move rev 4: 1 -> 0 test-debug-phase: move rev 3: 1 -> 0
$ hg log -G -T '{shortest(node, 5)} {phase}' $ hg log -G -T '{shortest(node, 5)} {phase}'
o bb947 draft o bb947 draft
| |
| o 5ac28 draft | o 5ac28 draft
|/| |/|
o | 13b7b draft o | 13b7b draft
| | | |
| o f5853 public
| |
o | c67c4 draft o | c67c4 draft
| | | |
| o f5853 public
| |
| o 26805 public | o 26805 public
|/ |/
o 11247 public o 11247 public
| |
o 426ba public o 426ba public
$ cd .. $ cd ..
Works with default settings Works with default settings
$ hg -R mergetest serve -p $HGPORT -d --pid-file=hg.pid $ hg -R mergetest serve -p $HGPORT -d --pid-file=hg.pid
$ cat hg.pid >> $DAEMON_PIDS $ cat hg.pid >> $DAEMON_PIDS
$ hg clone -U http://localhost:$HGPORT mergetest-normal $ hg clone -U http://localhost:$HGPORT mergetest-normal
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 8 changesets with 7 changes to 7 files (+1 heads) added 8 changesets with 7 changes to 7 files (+1 heads)
new changesets 426bada5c675:bb94757e651a (4 drafts) new changesets 426bada5c675:bb94757e651a (4 drafts)
test-debug-phase: new rev 0: x -> 0 test-debug-phase: new rev 0: x -> 0
test-debug-phase: new rev 1: x -> 0 test-debug-phase: new rev 1: x -> 0
test-debug-phase: new rev 2: x -> 0 test-debug-phase: new rev 2: x -> 0
test-debug-phase: new rev 3: x -> 1 test-debug-phase: new rev 3: x -> 0
test-debug-phase: new rev 4: x -> 0 test-debug-phase: new rev 4: x -> 1
test-debug-phase: new rev 5: x -> 1 test-debug-phase: new rev 5: x -> 1
test-debug-phase: new rev 6: x -> 1 test-debug-phase: new rev 6: x -> 1
test-debug-phase: new rev 7: x -> 1 test-debug-phase: new rev 7: x -> 1
$ hg -R mergetest-normal log -G -T '{shortest(node, 5)} {phase}' $ hg -R mergetest-normal log -G -T '{shortest(node, 5)} {phase}'
o bb947 draft o bb947 draft
| |
| o 5ac28 draft | o 5ac28 draft
|/| |/|
o | 13b7b draft o | 13b7b draft
| | | |
| o f5853 public
| |
o | c67c4 draft o | c67c4 draft
| | | |
| o f5853 public
| |
| o 26805 public | o 26805 public
|/ |/
o 11247 public o 11247 public
| |
o 426ba public o 426ba public
$ killdaemons.py $ killdaemons.py
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 8 changesets with 7 changes to 7 files (+1 heads) added 8 changesets with 7 changes to 7 files (+1 heads)
new changesets 426bada5c675:bb94757e651a (4 drafts) new changesets 426bada5c675:bb94757e651a (4 drafts)
test-debug-phase: new rev 0: x -> 0 test-debug-phase: new rev 0: x -> 0
test-debug-phase: new rev 1: x -> 0 test-debug-phase: new rev 1: x -> 0
test-debug-phase: new rev 2: x -> 0 test-debug-phase: new rev 2: x -> 0
test-debug-phase: new rev 3: x -> 1 test-debug-phase: new rev 3: x -> 0
test-debug-phase: new rev 4: x -> 0 test-debug-phase: new rev 4: x -> 1
test-debug-phase: new rev 5: x -> 1 test-debug-phase: new rev 5: x -> 1
test-debug-phase: new rev 6: x -> 1 test-debug-phase: new rev 6: x -> 1
test-debug-phase: new rev 7: x -> 1 test-debug-phase: new rev 7: x -> 1
$ hg -R mergetest-nobinarypart log -G -T '{shortest(node, 5)} {phase}' $ hg -R mergetest-nobinarypart log -G -T '{shortest(node, 5)} {phase}'
o bb947 draft o bb947 draft
| |
| o 5ac28 draft | o 5ac28 draft
|/| |/|
o | 13b7b draft o | 13b7b draft
| | | |
| o f5853 public
| |
o | c67c4 draft o | c67c4 draft
| | | |
| o f5853 public
| |
| o 26805 public | o 26805 public
|/ |/
o 11247 public o 11247 public
| |
o 426ba public o 426ba public
$ killdaemons.py $ killdaemons.py
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 8 changesets with 7 changes to 7 files (+1 heads) added 8 changesets with 7 changes to 7 files (+1 heads)
new changesets 426bada5c675:bb94757e651a (4 drafts) new changesets 426bada5c675:bb94757e651a (4 drafts)
test-debug-phase: new rev 0: x -> 0 test-debug-phase: new rev 0: x -> 0
test-debug-phase: new rev 1: x -> 0 test-debug-phase: new rev 1: x -> 0
test-debug-phase: new rev 2: x -> 0 test-debug-phase: new rev 2: x -> 0
test-debug-phase: new rev 3: x -> 1 test-debug-phase: new rev 3: x -> 0
test-debug-phase: new rev 4: x -> 0 test-debug-phase: new rev 4: x -> 1
test-debug-phase: new rev 5: x -> 1 test-debug-phase: new rev 5: x -> 1
test-debug-phase: new rev 6: x -> 1 test-debug-phase: new rev 6: x -> 1
test-debug-phase: new rev 7: x -> 1 test-debug-phase: new rev 7: x -> 1
$ hg -R mergetest-bundle1 log -G -T '{shortest(node, 5)} {phase}' $ hg -R mergetest-bundle1 log -G -T '{shortest(node, 5)} {phase}'
o bb947 draft o bb947 draft
| |
| o 5ac28 draft | o 5ac28 draft
|/| |/|
o | 13b7b draft o | 13b7b draft
| | | |
| o f5853 public
| |
o | c67c4 draft o | c67c4 draft
| | | |
| o f5853 public
| |
| o 26805 public | o 26805 public
|/ |/
o 11247 public o 11247 public
| |
o 426ba public o 426ba public
$ killdaemons.py $ killdaemons.py

tests/test-rebase-base-flag.t

> |/ > |/
> Z B C # C: branching point, E should be picked > Z B C # C: branching point, E should be picked
> \|/ # B should not be picked > \|/ # B should not be picked
> A > A
> | > |
> R > R
> EOS > EOS
rebasing 3:d6003a550c2c "C" (C) rebasing 3:d6003a550c2c "C" (C)
rebasing 5:4526cf523425 "D" (D) rebasing 4:4526cf523425 "D" (D)
rebasing 6:b296604d9846 "E" (E tip) rebasing 5:b296604d9846 "E" (E)
o 6: 4870f5e7df37 E o 6: 4870f5e7df37 E
| |
| o 5: dc999528138a D | o 5: dc999528138a D
|/ |/
o 4: 6b3e11729672 C o 4: 6b3e11729672 C
| |
o 3: 57e70bad1ea3 Z o 3: 57e70bad1ea3 Z
| |
> Z | / > Z | /
> \|/ > \|/
> A > A
> | > |
> R > R
> EOS > EOS
rebasing 2:c1e6b162678d "B" (B) rebasing 2:c1e6b162678d "B" (B)
rebasing 3:d6003a550c2c "C" (C) rebasing 3:d6003a550c2c "C" (C)
rebasing 6:54c8f00cb91c "E" (E tip) rebasing 5:54c8f00cb91c "E" (E)
o 6: 00598421b616 E o 6: 00598421b616 E
|\ |\
| o 5: 6b3e11729672 C | o 5: 6b3e11729672 C
| | | |
o | 4: 85260910e847 B o | 4: 85260910e847 B
|/ |/
o 3: 57e70bad1ea3 Z o 3: 57e70bad1ea3 Z
| |
> /| > /|
> Z B C # descendants(B) = B+E. With E, C will be included incorrectly > Z B C # descendants(B) = B+E. With E, C will be included incorrectly
> \|/ > \|/
> A > A
> | > |
> R > R
> EOS > EOS
rebasing 2:c1e6b162678d "B" (B) rebasing 2:c1e6b162678d "B" (B)
rebasing 5:54c8f00cb91c "E" (E tip) rebasing 4:54c8f00cb91c "E" (E)
o 5: e583bf3ff54c E o 5: e583bf3ff54c E
|\ |\
| o 4: 85260910e847 B | o 4: 85260910e847 B
| | | |
| o 3: 57e70bad1ea3 Z | o 3: 57e70bad1ea3 Z
| | | |
o | 2: d6003a550c2c C o | 2: d6003a550c2c C
|/ |/
> Z B C # roots(B+E) = B. Without E, C will be missed incorrectly > Z B C # roots(B+E) = B. Without E, C will be missed incorrectly
> \|/ > \|/
> A > A
> | > |
> R > R
> EOS > EOS
rebasing 2:c1e6b162678d "B" (B) rebasing 2:c1e6b162678d "B" (B)
rebasing 3:d6003a550c2c "C" (C) rebasing 3:d6003a550c2c "C" (C)
rebasing 5:54c8f00cb91c "E" (E tip) rebasing 4:54c8f00cb91c "E" (E)
o 5: 00598421b616 E o 5: 00598421b616 E
|\ |\
| o 4: 6b3e11729672 C | o 4: 6b3e11729672 C
| | | |
o | 3: 85260910e847 B o | 3: 85260910e847 B
|/ |/
o 2: 57e70bad1ea3 Z o 2: 57e70bad1ea3 Z
| |
> |/ > |/
> B > B
> | > |
> A > A
> | > |
> R > R
> EOS > EOS
rebasing 3:a113dbaa660a "B1" (B1) rebasing 3:a113dbaa660a "B1" (B1)
rebasing 5:06ce7b1cc8c2 "B2" (B2) rebasing 4:06ce7b1cc8c2 "B2" (B2)
rebasing 6:0ac98cce32d3 "C1" (C1) rebasing 6:0ac98cce32d3 "C1" (C1)
rebasing 8:781512f5e33d "C2" (C2) rebasing 7:781512f5e33d "C2" (C2)
rebasing 9:428d8c18f641 "E1" (E1) rebasing 9:428d8c18f641 "E1" (E1)
rebasing 11:e1bf82f6b6df "E2" (E2) rebasing 10:e1bf82f6b6df "E2" (E2)
o 12: e4a37b6fdbd2 E2 o 12: e4a37b6fdbd2 E2
| |
o 11: 9675bea983df E1 o 11: 9675bea983df E1
| |
| o 10: 4faf5d4c80dc C2 | o 10: 4faf5d4c80dc C2
| | | |
| o 9: d4799b1ad57d C1 | o 9: d4799b1ad57d C1
|/ |/
> |\ /| |\ > |\ /| |\
> F E D M N > F E D M N
> \|/| /| |\ > \|/| /| |\
> Z C B I J K L > Z C B I J K L
> \|/ |/ |/ > \|/ |/ |/
> A A A > A A A
> EOS > EOS
rebasing 2:dc0947a82db8 "C" (C) rebasing 2:dc0947a82db8 "C" (C)
rebasing 8:4e4f9194f9f1 "D" (D) rebasing 3:4e4f9194f9f1 "D" (D)
rebasing 9:03ca77807e91 "E" (E) rebasing 4:03ca77807e91 "E" (E)
rebasing 10:afc707c82df0 "F" (F) rebasing 5:afc707c82df0 "F" (F)
rebasing 13:690dfff91e9e "G" (G) rebasing 6:690dfff91e9e "G" (G)
rebasing 14:2893b886bb10 "H" (H) rebasing 7:2893b886bb10 "H" (H)
rebasing 3:08ebfeb61bac "I" (I) rebasing 8:08ebfeb61bac "I" (I)
rebasing 4:a0a5005cec67 "J" (J) rebasing 9:a0a5005cec67 "J" (J)
rebasing 5:83780307a7e8 "K" (K) rebasing 10:83780307a7e8 "K" (K)
rebasing 6:e131637a1cb6 "L" (L) rebasing 11:e131637a1cb6 "L" (L)
rebasing 11:d1f6d0c3c7e4 "M" (M) rebasing 12:d1f6d0c3c7e4 "M" (M)
rebasing 12:7aaec6f81888 "N" (N) rebasing 13:7aaec6f81888 "N" (N)
rebasing 15:325bc8f1760d "P" (P tip) rebasing 14:325bc8f1760d "P" (P)
o 15: 6ef6a0ea3b18 P o 15: 6ef6a0ea3b18 P
|\ |\
| o 14: 20ba3610a7e5 N | o 14: 20ba3610a7e5 N
| |\ | |\
o \ \ 13: cd4f6c06d2ab M o \ \ 13: cd4f6c06d2ab M
|\ \ \ |\ \ \
| | | o 12: bca872041455 L | | | o 12: bca872041455 L
| | | | | | | |
> | / | | | | > | / | | | |
> M2 M1 C1 C1 M3 > M2 M1 C1 C1 M3
> | > |
> M1 > M1
> | > |
> M0 > M0
> EOF > EOF
rebasing 4:8817fae53c94 "C0" (C0) rebasing 4:8817fae53c94 "C0" (C0)
rebasing 6:06ca5dfe3b5b "B2" (B2) rebasing 5:73508237b032 "C1" (C1)
rebasing 7:73508237b032 "C1" (C1) rebasing 6:fdb955e2faed "A2" (A2)
rebasing 9:fdb955e2faed "A2" (A2) rebasing 7:4e449bd1a643 "A3" (A3)
rebasing 11:4e449bd1a643 "A3" (A3) rebasing 8:0a33b0519128 "B1" (B1)
rebasing 10:0a33b0519128 "B1" (B1) rebasing 10:06ca5dfe3b5b "B2" (B2)
rebasing 12:209327807c3a "B3" (B3 tip) rebasing 11:209327807c3a "B3" (B3)
o 12: ceb984566332 B3 o 12: ceb984566332 B3
|\ |\
| o 11: 19d93caac497 B1 | o 11: 74275896650e B2
| | | |
| | o 10: 058e73d3916b A3 o | 10: 19d93caac497 B1
| |
| | o 9: 058e73d3916b A3
| | |\ | | |\
| +---o 9: 0ba13ad72234 A2 +-----o 8: 0ba13ad72234 A2
| | |
| o | 8: c122c2af10c6 C1
| | | | | |
o | | 7: 74275896650e B2 o | | 7: c122c2af10c6 C1
| | | | | |
| o | 6: 455ba9bd3ea2 C0 o | | 6: 455ba9bd3ea2 C0
|/ / |/ /
o | 5: b3d7d2fda53b Z o | 5: b3d7d2fda53b Z
| | | |
o | 4: 182ab6383dd7 M3 o | 4: 182ab6383dd7 M3
| | | |
o | 3: 6c3f73563d5f M2 o | 3: 6c3f73563d5f M2
| | | |
| o 2: 88c860fffcc2 A1 | o 2: 88c860fffcc2 A1
Multiple roots. Roots are ancestors of dest: Multiple roots. Roots are ancestors of dest:
$ rebasewithdag -b B+D -d Z <<'EOF' $ rebasewithdag -b B+D -d Z <<'EOF'
> D Z B > D Z B
> \|\| > \|\|
> C A > C A
> EOF > EOF
rebasing 2:112478962961 "B" (B) rebasing 1:112478962961 "B" (B)
rebasing 3:b70f76719894 "D" (D) rebasing 3:b70f76719894 "D" (D)
o 4: 511efad7bf13 D o 4: 511efad7bf13 D
| |
| o 3: 25c4e279af62 B | o 3: 25c4e279af62 B
|/ |/
o 2: 3a49f54d7bb1 Z o 2: 3a49f54d7bb1 Z
|\ |\
| o 1: 96cc3511f894 C | o 1: 96cc3511f894 C
$ rebasewithdag -b E -d Z <<'EOF' $ rebasewithdag -b E -d Z <<'EOF'
> E > E
> |\ > |\
> Z B D > Z B D
> \|\| > \|\|
> A C > A C
> EOF > EOF
rebasing 2:f675d5a1c6a4 "B" (B) rebasing 2:f675d5a1c6a4 "B" (B)
rebasing 5:f68696fe6af8 "E" (E tip) rebasing 4:f68696fe6af8 "E" (E)
o 5: f6e6f5081554 E o 5: f6e6f5081554 E
|\ |\
| o 4: 30cabcba27be B | o 4: 30cabcba27be B
| |\ | |\
| | o 3: 262e37e34f63 Z | | o 3: 262e37e34f63 Z
| | | | | |
o | | 2: b70f76719894 D o | | 2: b70f76719894 D
|/ / |/ /

tests/test-rebase-brute-force.t

> |\| > |\|
> A B Z > A B Z
> EOS > EOS
$ hg debugbruterebase 'all()-Z' Z $ hg debugbruterebase 'all()-Z' Z
A: A':Z A: A':Z
B: B':Z B: B':Z
AB: A':Z B':Z AB: A':Z B':Z
C: ABORT: cannot rebase 3:a35c07e8a2a4 without moving at least one of its parents C: ABORT: cannot rebase 2:a35c07e8a2a4 without moving at least one of its parents
AC: A':Z C':A'B AC: A':Z C':A'B
BC: B':Z C':B'A BC: B':Z C':B'A
ABC: A':Z B':Z C':A'B' ABC: A':Z B':Z C':A'B'
D: D':Z D: D':Z
AD: A':Z D':Z AD: A':Z D':Z
BD: B':Z D':B' BD: B':Z D':B'
ABD: A':Z B':Z D':B' ABD: A':Z B':Z D':B'
CD: ABORT: cannot rebase 3:a35c07e8a2a4 without moving at least one of its parents CD: ABORT: cannot rebase 2:a35c07e8a2a4 without moving at least one of its parents
ACD: A':Z C':A'B D':Z ACD: A':Z C':A'B D':Z
BCD: B':Z C':B'A D':B' BCD: B':Z C':B'A D':B'
ABCD: A':Z B':Z C':A'B' D':B' ABCD: A':Z B':Z C':A'B' D':B'
Moving backwards Moving backwards
$ init <<'EOS' $ init <<'EOS'
> C > C

tests/test-rebase-collapse.t

$ cat > $TESTTMP/editor.sh <<EOF $ cat > $TESTTMP/editor.sh <<EOF
> echo "==== before editing" > echo "==== before editing"
> cat \$1 > cat \$1
> echo "====" > echo "===="
> echo "edited manually" >> \$1 > echo "edited manually" >> \$1
> EOF > EOF
$ HGEDITOR="sh $TESTTMP/editor.sh" hg rebase --collapse --keepbranches -e --source B --dest F $ HGEDITOR="sh $TESTTMP/editor.sh" hg rebase --collapse --keepbranches -e --source B --dest F
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 "B" (B)
rebasing 3:26805aba1e60 "C" (C) rebasing 2:26805aba1e60 "C" (C)
rebasing 5:f585351a92f8 "D" (D tip) rebasing 3:f585351a92f8 "D" (D)
==== before editing ==== before editing
Collapsed revision Collapsed revision
* B * B
* C * C
* D * D
HG: Enter commit message. Lines beginning with 'HG:' are removed. HG: Enter commit message. Lines beginning with 'HG:' are removed.
[255] [255]
$ cat > $TESTTMP/checkeditform.sh <<EOF $ cat > $TESTTMP/checkeditform.sh <<EOF
> env | grep HGEDITFORM > env | grep HGEDITFORM
> true > true
> EOF > EOF
$ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source B --collapse -m 'custom message' -e --dest D $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source B --collapse -m 'custom message' -e --dest D
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 "B" (B)
rebasing 3:26805aba1e60 "C" (C tip) rebasing 2:26805aba1e60 "C" (C)
HGEDITFORM=rebase.collapse HGEDITFORM=rebase.collapse
saved backup bundle to $TESTTMP/message/.hg/strip-backup/112478962961-f4131707-rebase.hg saved backup bundle to $TESTTMP/message/.hg/strip-backup/112478962961-f4131707-rebase.hg
$ hg tglog $ hg tglog
o 2: 2f197b9a08f3 'custom message' o 2: 2f197b9a08f3 'custom message'
| |
o 1: b18e25de2cf5 'D' o 1: b18e25de2cf5 'D'
| |
> D E > D E
> |\| > |\|
> H C B > H C B
> \|/ > \|/
> A > A
> EOF > EOF
$ hg rebase -s C --dest H --collapse $ hg rebase -s C --dest H --collapse
abort: unable to collapse on top of 3, there is more than one external parent: 1, 6 abort: unable to collapse on top of 7, there is more than one external parent: 1, 5
[255] [255]
Rebase and collapse - E onto H: Rebase and collapse - E onto H:
$ hg rebase -s E --dest H --collapse # root (E) is not a merge $ hg rebase -s E --dest H --collapse # root (E) is not a merge
rebasing 5:49cb92066bfd "E" (E) rebasing 4:49cb92066bfd "E" (E)
rebasing 6:11abe3fb10b8 "F" (F) rebasing 5:11abe3fb10b8 "F" (F)
rebasing 7:64e264db77f0 "G" (G tip) rebasing 6:64e264db77f0 "G" (G)
saved backup bundle to $TESTTMP/multiple-external-parents/.hg/strip-backup/49cb92066bfd-ee8a8a79-rebase.hg saved backup bundle to $TESTTMP/multiple-external-parents/.hg/strip-backup/49cb92066bfd-ee8a8a79-rebase.hg
$ hg tglog $ hg tglog
o 5: 8b2315790719 'Collapsed revision o 5: 8b2315790719 'Collapsed revision
|\ * E |\ * E
| | * F | | * F
| | * G' | | * G'
| o 4: 4e4f9194f9f1 'D' | o 4: 575c4b5ec114 'H'
| |\
o | | 3: 575c4b5ec114 'H'
| | |
+---o 2: dc0947a82db8 'C'
| | | |
| o 1: 112478962961 'B' o | 3: 4e4f9194f9f1 'D'
|\ \
| o | 2: dc0947a82db8 'C'
| |/
o / 1: 112478962961 'B'
|/ |/
o 0: 426bada5c675 'A' o 0: 426bada5c675 'A'
$ hg manifest --rev tip $ hg manifest --rev tip
A A
C C
E E
F F
> D E > D E
> |\| > |\|
> H C B > H C B
> \|/ > \|/
> A > A
> EOF > EOF
$ hg heads --template="{rev}:{node} {branch}\n" $ hg heads --template="{rev}:{node} {branch}\n"
7:64e264db77f061f16d9132b70c5a58e2461fb630 default 7:575c4b5ec114d64b681d33f8792853568bfb2b2c default
3:575c4b5ec114d64b681d33f8792853568bfb2b2c default 6:64e264db77f061f16d9132b70c5a58e2461fb630 default
$ cat $TESTTMP/branch-heads/.hg/cache/branch2-served $ cat $TESTTMP/branch-heads/.hg/cache/branch2-served
64e264db77f061f16d9132b70c5a58e2461fb630 7 575c4b5ec114d64b681d33f8792853568bfb2b2c 7
575c4b5ec114d64b681d33f8792853568bfb2b2c o default
64e264db77f061f16d9132b70c5a58e2461fb630 o default 64e264db77f061f16d9132b70c5a58e2461fb630 o default
575c4b5ec114d64b681d33f8792853568bfb2b2c o default
$ hg strip 4 $ hg strip 4
saved backup bundle to $TESTTMP/branch-heads/.hg/strip-backup/4e4f9194f9f1-5ec4b5e6-backup.hg saved backup bundle to $TESTTMP/branch-heads/.hg/strip-backup/49cb92066bfd-ee8a8a79-backup.hg
$ cat $TESTTMP/branch-heads/.hg/cache/branch2-served $ cat $TESTTMP/branch-heads/.hg/cache/branch2-served
11abe3fb10b8689b560681094b17fe161871d043 5 575c4b5ec114d64b681d33f8792853568bfb2b2c 4
dc0947a82db884575bb76ea10ac97b08536bfa03 o default 4e4f9194f9f181c57f62e823e8bdfa46ab9e4ff4 o default
575c4b5ec114d64b681d33f8792853568bfb2b2c o default 575c4b5ec114d64b681d33f8792853568bfb2b2c o default
11abe3fb10b8689b560681094b17fe161871d043 o default
$ hg heads --template="{rev}:{node} {branch}\n" $ hg heads --template="{rev}:{node} {branch}\n"
5:11abe3fb10b8689b560681094b17fe161871d043 default 4:575c4b5ec114d64b681d33f8792853568bfb2b2c default
3:575c4b5ec114d64b681d33f8792853568bfb2b2c default 3:4e4f9194f9f181c57f62e823e8bdfa46ab9e4ff4 default
2:dc0947a82db884575bb76ea10ac97b08536bfa03 default
$ cd .. $ cd ..
Preserves external parent Preserves external parent
$ hg init external-parent $ hg init external-parent
> D E # D/D = D\n > D E # D/D = D\n
> |\| > |\|
> I C B > I C B
> \|/ > \|/
> A > A
> EOF > EOF
$ hg rebase -s F --dest I --collapse # root (F) is not a merge $ hg rebase -s F --dest I --collapse # root (F) is not a merge
rebasing 6:c82b08f646f1 "F" (F) rebasing 5:c82b08f646f1 "F" (F)
file 'E' was deleted in local [dest] but was modified in other [source]. file 'E' was deleted in local [dest] but was modified in other [source].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u What do you want to do? u
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ echo F > E $ echo F > E
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase -c $ hg rebase -c
rebasing 6:c82b08f646f1 "F" (F) rebasing 5:c82b08f646f1 "F" (F)
rebasing 7:a6db7fa104e1 "G" (G) rebasing 6:a6db7fa104e1 "G" (G)
rebasing 8:e1d201b72d91 "H" (H tip) rebasing 7:e1d201b72d91 "H" (H)
saved backup bundle to $TESTTMP/external-parent/.hg/strip-backup/c82b08f646f1-f2721fbf-rebase.hg saved backup bundle to $TESTTMP/external-parent/.hg/strip-backup/c82b08f646f1-f2721fbf-rebase.hg
$ hg tglog $ hg tglog
o 6: 681daa3e686d 'Collapsed revision o 6: 681daa3e686d 'Collapsed revision
|\ * F |\ * F
| | * G | | * G
| | * H' | | * H'
| | o 5: 49cb92066bfd 'E' | o 5: 08ebfeb61bac 'I'
| |
| | o 4: 49cb92066bfd 'E'
| | | | | |
| o | 4: 09143c0bf13e 'D' o---+ 3: 09143c0bf13e 'D'
| |\|
o | | 3: 08ebfeb61bac 'I'
| | | | | |
| o | 2: dc0947a82db8 'C' o | | 2: dc0947a82db8 'C'
|/ / |/ /
| o 1: 112478962961 'B' | o 1: 112478962961 'B'
|/ |/
o 0: 426bada5c675 'A' o 0: 426bada5c675 'A'
$ hg manifest --rev tip $ hg manifest --rev tip
A A
C C
> | > |
> B G > B G
> |/ > |/
> A > A
> EOF > EOF
BROKEN: should be allowed BROKEN: should be allowed
$ hg rebase --collapse -r 'B+D+F' -d G $ hg rebase --collapse -r 'B+D+F' -d G
abort: unable to collapse on top of 2, there is more than one external parent: 3, 5 abort: unable to collapse on top of 6, there is more than one external parent: 2, 4
[255] [255]
$ cd .. $ cd ..
$ hg init multiple-external-parents-2 $ hg init multiple-external-parents-2
$ cd multiple-external-parents-2 $ cd multiple-external-parents-2
$ hg debugdrawdag << 'EOF' $ hg debugdrawdag << 'EOF'
> D G > D G
> |\ /| > |\ /|
> B C E F > B C E F
> \| |/ > \| |/
> \ H / > \ H /
> \|/ > \|/
> A > A
> EOF > EOF
$ hg rebase --collapse -d H -s 'B+F' $ hg rebase --collapse -d H -s 'B+F'
abort: unable to collapse on top of 5, there is more than one external parent: 1, 3 abort: unable to collapse on top of 7, there is more than one external parent: 2, 4
[255] [255]
$ cd .. $ cd ..
With internal merge: With internal merge:
$ hg init internal-merge $ hg init internal-merge
$ cd internal-merge $ cd internal-merge
$ hg debugdrawdag << 'EOF' $ hg debugdrawdag << 'EOF'
> E > E
> |\ > |\
> C D > C D
> |/ > |/
> F B > F B
> |/ > |/
> A > A
> EOF > EOF
$ hg rebase -s B --collapse --dest F $ hg rebase -s B --collapse --dest F
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 "B" (B)
rebasing 3:26805aba1e60 "C" (C) rebasing 2:26805aba1e60 "C" (C)
rebasing 4:be0ef73c17ad "D" (D) rebasing 3:be0ef73c17ad "D" (D)
rebasing 5:02c4367d6973 "E" (E tip) rebasing 4:02c4367d6973 "E" (E)
saved backup bundle to $TESTTMP/internal-merge/.hg/strip-backup/112478962961-1dfb057b-rebase.hg saved backup bundle to $TESTTMP/internal-merge/.hg/strip-backup/112478962961-1dfb057b-rebase.hg
$ hg tglog $ hg tglog
o 2: c0512a1797b0 'Collapsed revision o 2: c0512a1797b0 'Collapsed revision
| * B | * B
| * C | * C
| * D | * D
| * E' | * E'
> EOF > EOF
$ hg rebase --collapse -t internal:merge3 -s B -d D $ hg rebase --collapse -t internal:merge3 -s B -d D
rebasing 1:f899f3910ce7 "B" (B) rebasing 1:f899f3910ce7 "B" (B)
merging A merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark') warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ hg tglog $ hg tglog
o 3: 63668d570d21 'C' @ 3: 82b8abf9c185 'D'
| |
| @ 2: 82b8abf9c185 'D' | o 2: 63668d570d21 'C'
| | | |
% | 1: f899f3910ce7 'B' | % 1: f899f3910ce7 'B'
|/ |/
o 0: 4a2df7238c3b 'A' o 0: 4a2df7238c3b 'A'
$ cat A $ cat A
<<<<<<< dest: 82b8abf9c185 D - test: D <<<<<<< dest: 82b8abf9c185 D tip - test: D
D D
||||||| base ||||||| base
A A
======= =======
B B
>>>>>>> source: f899f3910ce7 B - test: B >>>>>>> source: f899f3910ce7 B - test: B
$ echo BC > A $ echo BC > A
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
rebasing 1:f899f3910ce7 "B" (B) rebasing 1:f899f3910ce7 "B" (B)
rebasing 3:63668d570d21 "C" (C tip) rebasing 2:63668d570d21 "C" (C)
merging A merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark') warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ hg tglog $ hg tglog
% 3: 63668d570d21 'C' @ 3: 82b8abf9c185 'D'
| |
| @ 2: 82b8abf9c185 'D' | % 2: 63668d570d21 'C'
| | | |
o | 1: f899f3910ce7 'B' | o 1: f899f3910ce7 'B'
|/ |/
o 0: 4a2df7238c3b 'A' o 0: 4a2df7238c3b 'A'
$ cat A $ cat A
<<<<<<< dest: 82b8abf9c185 D - test: D <<<<<<< dest: 82b8abf9c185 D tip - test: D
BC BC
||||||| base ||||||| base
B B
======= =======
C C
>>>>>>> source: 63668d570d21 C tip - test: C >>>>>>> source: 63668d570d21 C - test: C
$ echo BD > A $ echo BD > A
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ HGEDITOR=false hg rebase --continue --config ui.interactive=1 $ HGEDITOR=false hg rebase --continue --config ui.interactive=1
already rebased 1:f899f3910ce7 "B" (B) as 82b8abf9c185 already rebased 1:f899f3910ce7 "B" (B) as 82b8abf9c185
rebasing 3:63668d570d21 "C" (C tip) rebasing 2:63668d570d21 "C" (C)
abort: edit failed: false exited with status 1 abort: edit failed: false exited with status 1
[255] [255]
$ hg tglog $ hg tglog
% 3: 63668d570d21 'C' @ 3: 82b8abf9c185 'D'
| |
| @ 2: 82b8abf9c185 'D' | % 2: 63668d570d21 'C'
| | | |
o | 1: f899f3910ce7 'B' | o 1: f899f3910ce7 'B'
|/ |/
o 0: 4a2df7238c3b 'A' o 0: 4a2df7238c3b 'A'
$ hg rebase --continue $ hg rebase --continue
already rebased 1:f899f3910ce7 "B" (B) as 82b8abf9c185 already rebased 1:f899f3910ce7 "B" (B) as 82b8abf9c185
already rebased 3:63668d570d21 "C" (C tip) as 82b8abf9c185 already rebased 2:63668d570d21 "C" (C) as 82b8abf9c185
saved backup bundle to $TESTTMP/aborted-editor/.hg/strip-backup/f899f3910ce7-7cab5e15-rebase.hg saved backup bundle to $TESTTMP/aborted-editor/.hg/strip-backup/f899f3910ce7-7cab5e15-rebase.hg

tests/test-rebase-dest.t

$ rebasewithdag -s 'all() - roots(all())' -d 'roots(all()) - ::SRC' <<'EOS' $ rebasewithdag -s 'all() - roots(all())' -d 'roots(all()) - ::SRC' <<'EOS'
> C F > C F
> | | > | |
> B E > B E
> | | > | |
> A D > A D
> EOS > EOS
rebasing 2:112478962961 "B" (B) rebasing 1:112478962961 "B" (B)
rebasing 4:26805aba1e60 "C" (C) rebasing 2:26805aba1e60 "C" (C)
rebasing 3:cd488e83d208 "E" (E) rebasing 4:cd488e83d208 "E" (E)
rebasing 5:0069ba24938a "F" (F tip) rebasing 5:0069ba24938a "F" (F tip)
o 9: d150ff263fc8 F o 9: d150ff263fc8 F
| |
o 8: 66f30a1a2eab E o 8: 66f30a1a2eab E
| |
| o 7: 93db94ffae0e C | o 7: 93db94ffae0e C
| | | |
| o 6: d0071c3b0c88 B | o 6: d0071c3b0c88 B
| | | |
| o 1: 058c1e1fb10a D | o 3: 058c1e1fb10a D
| |
o 0: 426bada5c675 A o 0: 426bada5c675 A
Different destinations for merge changesets with a same root: Different destinations for merge changesets with a same root:
$ rebasewithdag -s B -d '((parents(SRC)-B-A)::) - (::ALLSRC)' <<'EOS' $ rebasewithdag -s B -d '((parents(SRC)-B-A)::) - (::ALLSRC)' <<'EOS'
> C G > C G
> |\| > |\|
> | F > | F
> | > |
> B E > B E
> |\| > |\|
> A D > A D
> EOS > EOS
rebasing 3:a4256619d830 "B" (B) rebasing 2:a4256619d830 "B" (B)
rebasing 6:8e139e245220 "C" (C tip) rebasing 5:8e139e245220 "C" (C)
o 8: d7d1169e9b1c C o 8: d7d1169e9b1c C
|\ |\
| o 7: 2ed0c8546285 B | o 7: 2ed0c8546285 B
| |\ | |\
o | | 5: 8fdb2c1feb20 G o | | 6: 8fdb2c1feb20 G
| | |
| | o 4: cd488e83d208 E
| | | | | |
o | | 2: a6661b868de9 F o | | 4: a6661b868de9 F
/ / / /
| o 3: cd488e83d208 E
| |
| o 1: 058c1e1fb10a D | o 1: 058c1e1fb10a D
| |
o 0: 426bada5c675 A o 0: 426bada5c675 A
Move to a previous parent: Move to a previous parent:
$ rebasewithdag -s E -s F -s G -d 'SRC^^' <<'EOS' $ rebasewithdag -s E -s F -s G -d 'SRC^^' <<'EOS'
> H > H
> | > |
> D G > D G
> |/ > |/
> C F > C F
> |/ > |/
> B E # E will be ignored, since E^^ is empty > B E # E will be ignored, since E^^ is empty
> |/ > |/
> A > A
> EOS > EOS
rebasing 4:33441538d4aa "F" (F) rebasing 5:33441538d4aa "F" (F)
rebasing 6:cf43ad9da869 "G" (G) rebasing 6:cf43ad9da869 "G" (G)
rebasing 7:eef94f3b5f03 "H" (H tip) rebasing 7:eef94f3b5f03 "H" (H tip)
o 10: b3d84c6666cf H o 10: b3d84c6666cf H
| |
| o 5: f585351a92f8 D | o 3: f585351a92f8 D
|/ |/
o 3: 26805aba1e60 C o 2: 26805aba1e60 C
| |
| o 9: f7c28a1a15e2 G | o 9: f7c28a1a15e2 G
|/ |/
o 1: 112478962961 B o 1: 112478962961 B
| |
| o 8: 02aa697facf7 F | o 8: 02aa697facf7 F
|/ |/
| o 2: 7fb047a69f22 E | o 4: 7fb047a69f22 E
|/ |/
o 0: 426bada5c675 A o 0: 426bada5c675 A
Source overlaps with destination: Source overlaps with destination:
$ rebasewithdag -s 'B+C+D' -d 'map(SRC, "B:C,C:D")' <<'EOS' $ rebasewithdag -s 'B+C+D' -d 'map(SRC, "B:C,C:D")' <<'EOS'
> B C D > B C D
> \|/ > \|/
> D G K > D G K
> | | | > | | |
> C F J > C F J
> | | | > | | |
> B E I > B E I
> \| | > \| |
> A H > A H
> EOS > EOS
rebasing 4:701514e1408d "I" (I) rebasing 8:701514e1408d "I" (I)
rebasing 0:426bada5c675 "A" (A) rebasing 0:426bada5c675 "A" (A)
rebasing 1:e7050b6e5048 "H" (H) rebasing 7:e7050b6e5048 "H" (H)
rebasing 5:26805aba1e60 "C" (C) rebasing 2:26805aba1e60 "C" (C)
rebasing 7:cf89f86b485b "J" (J) rebasing 9:cf89f86b485b "J" (J)
rebasing 2:112478962961 "B" (B) rebasing 1:112478962961 "B" (B)
rebasing 3:7fb047a69f22 "E" (E) rebasing 4:7fb047a69f22 "E" (E)
rebasing 8:f585351a92f8 "D" (D) rebasing 3:f585351a92f8 "D" (D)
rebasing 10:ae41898d7875 "K" (K tip) rebasing 10:ae41898d7875 "K" (K tip)
rebasing 9:711f53bbef0b "G" (G) rebasing 6:711f53bbef0b "G" (G)
rebasing 6:64a8289d2492 "F" (F) rebasing 5:64a8289d2492 "F" (F)
o 21: 3735afb3713a F o 21: 3735afb3713a F
| |
o 20: 07698142d7a7 G o 20: 07698142d7a7 G
| |
o 19: 33aba52e7e72 K o 19: 33aba52e7e72 K
| |
o 18: 9fdae89dc5a1 D o 18: 9fdae89dc5a1 D
| |
> N C # amend: E -> E2 > N C # amend: E -> E2
> | | # amend: E2 -> E3 > | | # amend: E2 -> E3
> M B # rebase: F -> F2 > M B # rebase: F -> F2
> \| # amend: I -> I2 > \| # amend: I -> I2
> A > A
> EOF > EOF
6 new orphan changesets 6 new orphan changesets
rebasing 16:5c432343bf59 "J" (J tip) rebasing 16:5c432343bf59 "J" (J tip)
rebasing 3:26805aba1e60 "C" (C) rebasing 2:26805aba1e60 "C" (C)
rebasing 6:f585351a92f8 "D" (D) rebasing 3:f585351a92f8 "D" (D)
rebasing 10:ffebc37c5d0b "E3" (E3) rebasing 6:ffebc37c5d0b "E3" (E3)
rebasing 13:fb184bcfeee8 "F2" (F2) rebasing 8:fb184bcfeee8 "F2" (F2)
rebasing 11:dc838ab4c0da "G" (G) rebasing 9:dc838ab4c0da "G" (G)
o 22: 174f63d574a8 G o 22: 174f63d574a8 G
| |
o 21: c9d9fbe76705 F2 o 21: c9d9fbe76705 F2
| |
o 20: 0a03c2ede755 E3 o 20: 0a03c2ede755 E3
| |
o 19: 228d9d2541b1 D o 19: 228d9d2541b1 D
| |
o 18: cd856b400c95 C o 18: cd856b400c95 C
| |
o 17: 9148200c858c J o 17: 9148200c858c J
| |
o 15: eb74780f5094 I2 o 15: eb74780f5094 I2
| |
o 12: 78309edd643f H o 13: 78309edd643f H
| |
o 5: 4b4531bd8e1d B2 o 12: 4b4531bd8e1d B2
| |
o 4: 337c285c272b N o 11: 337c285c272b N
| |
o 2: 699bc4b6fa22 M o 10: 699bc4b6fa22 M
| |
o 0: 426bada5c675 A o 0: 426bada5c675 A

tests/test-rebase-legacy.t

> EOF > EOF
#if continuecommand #if continuecommand
$ hg continue --dry-run $ hg continue --dry-run
rebase in progress, will be resumed rebase in progress, will be resumed
#endif #endif
$ hg continue $ hg continue
rebasing 4:c1e6b162678d "B" (B) rebasing 2:c1e6b162678d "B" (B)
rebasing 8:6f7a236de685 "D" (D) rebasing 4:6f7a236de685 "D" (D)
rebasing 2:de008c61a447 "E" (E) rebasing 5:de008c61a447 "E" (E)
rebasing 7:d2fa1c02b240 "G" (G) rebasing 7:d2fa1c02b240 "G" (G)
rebasing 9:6582e6951a9c "H" (H tip) rebasing 8:6582e6951a9c "H" (H)
warning: orphaned descendants detected, not stripping c1e6b162678d, de008c61a447 warning: orphaned descendants detected, not stripping c1e6b162678d, de008c61a447
saved backup bundle to $TESTTMP/.hg/strip-backup/6f7a236de685-9880a3dc-rebase.hg saved backup bundle to $TESTTMP/.hg/strip-backup/d2fa1c02b240-9880a3dc-rebase.hg
$ hg log -G -T '{rev}:{node|short} {desc}\n' $ hg log -G -T '{rev}:{node|short} {desc}\n'
o 11:721b8da0a708 H o 11:721b8da0a708 H
| |
o 10:9d65695ec3c2 G o 10:9d65695ec3c2 G
| |
o 9:21c8397a5d68 E o 9:21c8397a5d68 E
| |
| o 8:fc52970345e8 D | o 8:fc52970345e8 D
| | | |
| o 7:eac96551b107 B | o 7:eac96551b107 B
|/ |/
| o 6:bd5548558fcf C o 6:f424eb6a8c01 Z
|
| o 5:aeba276fcb7d F
| |
| o 4:de008c61a447 E
|/
| o 3:bd5548558fcf C
| | | |
| | o 5:aeba276fcb7d F | o 2:c1e6b162678d B
| | |
| o | 4:c1e6b162678d B
| | |
o | | 3:f424eb6a8c01 Z
| | |
+---o 2:de008c61a447 E
| | | |
| o 1:21a6c4502885 A | o 1:21a6c4502885 A
|/ |/
o 0:b41ce7760717 R o 0:b41ce7760717 R

tests/test-rebase-newancestor.t

> | | > | |
> B C > B C
> |/ > |/
> A Z > A Z
> |/ > |/
> R > R
> EOS > EOS
$ hg rebase -r D+E+F -d Z $ hg rebase -r D+E+F -d Z
rebasing 5:5f2c926dfecf "D" (D) rebasing 4:5f2c926dfecf "D" (D)
rebasing 6:b296604d9846 "E" (E) rebasing 5:b296604d9846 "E" (E)
rebasing 7:caa9781e507d "F" (F tip) rebasing 6:caa9781e507d "F" (F)
abort: rebasing 7:caa9781e507d will include unwanted changes from 4:d6003a550c2c or 3:c1e6b162678d abort: rebasing 6:caa9781e507d will include unwanted changes from 3:d6003a550c2c or 2:c1e6b162678d
[255] [255]
The warning does not get printed if there is no unwanted change detected: The warning does not get printed if there is no unwanted change detected:
$ hg init $TESTTMP/dual-merge-base2 $ hg init $TESTTMP/dual-merge-base2
$ cd $TESTTMP/dual-merge-base2 $ cd $TESTTMP/dual-merge-base2
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> D > D
> /| > /|
> B C > B C
> |/ > |/
> A Z > A Z
> |/ > |/
> R > R
> EOS > EOS
$ hg rebase -r B+C+D -d Z $ hg rebase -r B+C+D -d Z
rebasing 3:c1e6b162678d "B" (B) rebasing 2:c1e6b162678d "B" (B)
rebasing 4:d6003a550c2c "C" (C) rebasing 3:d6003a550c2c "C" (C)
rebasing 5:c8f78076273e "D" (D tip) rebasing 4:c8f78076273e "D" (D)
saved backup bundle to $TESTTMP/dual-merge-base2/.hg/strip-backup/d6003a550c2c-6f1424b6-rebase.hg saved backup bundle to $TESTTMP/dual-merge-base2/.hg/strip-backup/d6003a550c2c-6f1424b6-rebase.hg
$ hg manifest -r 'desc(D)' $ hg manifest -r 'desc(D)'
B B
C C
R R
Z Z
The merge base could be different from old p1 (changed parent becomes new p1): The merge base could be different from old p1 (changed parent becomes new p1):
$ hg init $TESTTMP/chosen-merge-base1 $ hg init $TESTTMP/chosen-merge-base1
$ cd $TESTTMP/chosen-merge-base1 $ cd $TESTTMP/chosen-merge-base1
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> F > F
> /| > /|
> D E > D E
> | | > | |
> B C Z > B C Z
> EOS > EOS
$ hg rebase -r D+F -d Z $ hg rebase -r D+F -d Z
rebasing 3:004dc1679908 "D" (D) rebasing 2:004dc1679908 "D" (D)
rebasing 5:4be4cbf6f206 "F" (F tip) rebasing 4:4be4cbf6f206 "F" (F)
saved backup bundle to $TESTTMP/chosen-merge-base1/.hg/strip-backup/004dc1679908-06a66a3c-rebase.hg saved backup bundle to $TESTTMP/chosen-merge-base1/.hg/strip-backup/004dc1679908-06a66a3c-rebase.hg
$ hg manifest -r 'desc(F)' $ hg manifest -r 'desc(F)'
C C
D D
E E
Z Z
$ hg log -r `hg log -r 'desc(F)' -T '{p1node}'` -T '{desc}\n' $ hg log -r `hg log -r 'desc(F)' -T '{p1node}'` -T '{desc}\n'
D D
$ hg init $TESTTMP/chosen-merge-base2 $ hg init $TESTTMP/chosen-merge-base2
$ cd $TESTTMP/chosen-merge-base2 $ cd $TESTTMP/chosen-merge-base2
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> F > F
> /| > /|
> D E > D E
> | | > | |
> B C Z > B C Z
> EOS > EOS
$ hg rebase -r E+F -d Z $ hg rebase -r E+F -d Z
rebasing 4:974e4943c210 "E" (E) rebasing 3:974e4943c210 "E" (E)
rebasing 5:4be4cbf6f206 "F" (F tip) rebasing 4:4be4cbf6f206 "F" (F)
saved backup bundle to $TESTTMP/chosen-merge-base2/.hg/strip-backup/974e4943c210-b2874da5-rebase.hg saved backup bundle to $TESTTMP/chosen-merge-base2/.hg/strip-backup/974e4943c210-b2874da5-rebase.hg
$ hg manifest -r 'desc(F)' $ hg manifest -r 'desc(F)'
B B
D D
E E
Z Z
$ hg log -r `hg log -r 'desc(F)' -T '{p1node}'` -T '{desc}\n' $ hg log -r `hg log -r 'desc(F)' -T '{p1node}'` -T '{desc}\n'
E E

tests/test-rebase-obsolete.t

> | | > | |
> B D G > B D G
> \|/ > \|/
> A > A
> EOF > EOF
$ hg rebase -d G -r 'B + D + F' $ hg rebase -d G -r 'B + D + F'
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 "B" (B)
rebasing 2:b18e25de2cf5 "D" (D) rebasing 3:b18e25de2cf5 "D" (D)
rebasing 6:f15c3adaf214 "F" (F tip) rebasing 5:f15c3adaf214 "F" (F)
abort: cannot rebase 6:f15c3adaf214 without moving at least one of its parents abort: cannot rebase 5:f15c3adaf214 without moving at least one of its parents
[255] [255]
$ cd .. $ cd ..
test on rebase dropping a merge test on rebase dropping a merge
(setup) (setup)
> c > c
> | > |
> x b > x b
> \| > \|
> a > a
> EOF > EOF
1 new orphan changesets 1 new orphan changesets
$ hg log -G -r 'a':: $ hg log -G -r 'a'::
* 7:1143e9adc121 f o 7:630d7c95eff7 x
| |
| o 6:d60ebfa0f1cb e | * 6:1143e9adc121 f
| | | |
| o 5:027ad6c5830d d' | | o 5:d60ebfa0f1cb e
| | | | |
x | 4:76be324c128b d (rewritten using replace as 5:027ad6c5830d) | | o 4:027ad6c5830d d'
|/ | | |
o 3:a82ac2b38757 c | x | 3:76be324c128b d (rewritten using replace as 4:027ad6c5830d)
| | |/
| o 2:630d7c95eff7 x | o 2:a82ac2b38757 c
| | | |
o | 1:488e1b7e7341 b | o 1:488e1b7e7341 b
|/ |/
o 0:b173517d0057 a o 0:b173517d0057 a
Changeset d and its descendants are excluded to avoid divergence of d, which Changeset d and its descendants are excluded to avoid divergence of d, which
would occur because the successor of d (d') is also in rebaseset. As a would occur because the successor of d (d') is also in rebaseset. As a
consequence f (descendant of d) is left behind. consequence f (descendant of d) is left behind.
$ hg rebase -b 'e' -d 'x' $ hg rebase -b 'e' -d 'x'
rebasing 1:488e1b7e7341 "b" (b) rebasing 1:488e1b7e7341 "b" (b)
rebasing 3:a82ac2b38757 "c" (c) rebasing 2:a82ac2b38757 "c" (c)
rebasing 5:027ad6c5830d "d'" (d') rebasing 4:027ad6c5830d "d'" (d')
rebasing 6:d60ebfa0f1cb "e" (e) rebasing 5:d60ebfa0f1cb "e" (e)
note: not rebasing 4:76be324c128b "d" (d) and its descendants as this would cause divergence note: not rebasing 3:76be324c128b "d" (d) and its descendants as this would cause divergence
$ hg log -G -r 'a':: $ hg log -G -r 'a'::
o 11:eb6d63fc4ed5 e o 11:eb6d63fc4ed5 e
| |
o 10:44d8c724a70c d' o 10:44d8c724a70c d'
| |
o 9:d008e6b4d3fd c o 9:d008e6b4d3fd c
| |
o 8:67e8f4a16c49 b o 8:67e8f4a16c49 b
| |
| * 7:1143e9adc121 f o 7:630d7c95eff7 x
|
| * 6:1143e9adc121 f
| | | |
| | x 6:d60ebfa0f1cb e (rewritten using rebase as 11:eb6d63fc4ed5) | | x 5:d60ebfa0f1cb e (rewritten using rebase as 11:eb6d63fc4ed5)
| | | | | |
| | x 5:027ad6c5830d d' (rewritten using rebase as 10:44d8c724a70c) | | x 4:027ad6c5830d d' (rewritten using rebase as 10:44d8c724a70c)
| | | | | |
| x | 4:76be324c128b d (rewritten using replace as 5:027ad6c5830d) | x | 3:76be324c128b d (rewritten using replace as 4:027ad6c5830d)
| |/ | |/
| x 3:a82ac2b38757 c (rewritten using rebase as 9:d008e6b4d3fd) | x 2:a82ac2b38757 c (rewritten using rebase as 9:d008e6b4d3fd)
| |
o | 2:630d7c95eff7 x
| | | |
| x 1:488e1b7e7341 b (rewritten using rebase as 8:67e8f4a16c49) | x 1:488e1b7e7341 b (rewritten using rebase as 8:67e8f4a16c49)
|/ |/
o 0:b173517d0057 a o 0:b173517d0057 a
$ hg strip -r 8: $ hg strip -r 8:
$ hg log -G -r 'a':: $ hg log -G -r 'a'::
* 7:1143e9adc121 f o 7:630d7c95eff7 x
| |
| o 6:d60ebfa0f1cb e | * 6:1143e9adc121 f
| |
| o 5:027ad6c5830d d'
| | | |
x | 4:76be324c128b d (rewritten using replace as 5:027ad6c5830d) | | o 5:d60ebfa0f1cb e
|/ | | |
o 3:a82ac2b38757 c | | o 4:027ad6c5830d d'
| | | |
| o 2:630d7c95eff7 x | x | 3:76be324c128b d (rewritten using replace as 4:027ad6c5830d)
| |/
| o 2:a82ac2b38757 c
| | | |
o | 1:488e1b7e7341 b | o 1:488e1b7e7341 b
|/ |/
o 0:b173517d0057 a o 0:b173517d0057 a
If the rebase set has an obsolete (d) with a successor (d') outside the rebase If the rebase set has an obsolete (d) with a successor (d') outside the rebase
set and none in destination, we still get the divergence warning. set and none in destination, we still get the divergence warning.
By allowing divergence, we can perform the rebase. By allowing divergence, we can perform the rebase.
$ hg rebase -r 'c'::'f' -d 'x' $ hg rebase -r 'c'::'f' -d 'x'
abort: this rebase will cause divergences from: 76be324c128b abort: this rebase will cause divergences from: 76be324c128b
(to force the rebase please set experimental.evolution.allowdivergence=True) (to force the rebase please set experimental.evolution.allowdivergence=True)
[255] [255]
$ hg rebase --config experimental.evolution.allowdivergence=true -r 'c'::'f' -d 'x' $ hg rebase --config experimental.evolution.allowdivergence=true -r 'c'::'f' -d 'x'
rebasing 3:a82ac2b38757 "c" (c) rebasing 2:a82ac2b38757 "c" (c)
rebasing 4:76be324c128b "d" (d) rebasing 3:76be324c128b "d" (d)
rebasing 7:1143e9adc121 "f" (f tip) rebasing 6:1143e9adc121 "f" (f)
1 new orphan changesets 1 new orphan changesets
2 new content-divergent changesets 2 new content-divergent changesets
$ hg log -G -r 'a':: -T instabilities $ hg log -G -r 'a':: -T instabilities
o 10:e1744ea07510 f o 10:e1744ea07510 f
| |
* 9:e2b36ea9a0a0 d (content-divergent) * 9:e2b36ea9a0a0 d (content-divergent)
| |
o 8:6a0376de376e c o 8:6a0376de376e c
| |
| x 7:1143e9adc121 f o 7:630d7c95eff7 x
|
| x 6:1143e9adc121 f
| | | |
| | * 6:d60ebfa0f1cb e (orphan) | | * 5:d60ebfa0f1cb e (orphan)
| | | | | |
| | * 5:027ad6c5830d d' (orphan content-divergent) | | * 4:027ad6c5830d d' (orphan content-divergent)
| | | | | |
| x | 4:76be324c128b d | x | 3:76be324c128b d
| |/ | |/
| x 3:a82ac2b38757 c | x 2:a82ac2b38757 c
| |
o | 2:630d7c95eff7 x
| | | |
| o 1:488e1b7e7341 b | o 1:488e1b7e7341 b
|/ |/
o 0:b173517d0057 a o 0:b173517d0057 a
$ hg strip -r 8: $ hg strip -r 8:
(Not skipping obsoletes means that divergence is allowed.) (Not skipping obsoletes means that divergence is allowed.)
$ hg rebase --config experimental.rebaseskipobsolete=false -r 'c'::'f' -d 'x' $ hg rebase --config experimental.rebaseskipobsolete=false -r 'c'::'f' -d 'x'
rebasing 3:a82ac2b38757 "c" (c) rebasing 2:a82ac2b38757 "c" (c)
rebasing 4:76be324c128b "d" (d) rebasing 3:76be324c128b "d" (d)
rebasing 7:1143e9adc121 "f" (f tip) rebasing 6:1143e9adc121 "f" (f)
1 new orphan changesets 1 new orphan changesets
2 new content-divergent changesets 2 new content-divergent changesets
$ hg strip -r 0: $ hg strip -r 0:
Similar test on a more complex graph Similar test on a more complex graph
$ hg debugdrawdag <<EOF $ hg debugdrawdag <<EOF
> g > g
> | > |
> f e > f e
> | | > | |
> e' d # replace: e -> e' > e' d # replace: e -> e'
> \ / > \ /
> c > c
> | > |
> x b > x b
> \| > \|
> a > a
> EOF > EOF
1 new orphan changesets 1 new orphan changesets
$ hg log -G -r 'a': $ hg log -G -r 'a':
* 8:2876ce66c6eb g o 8:630d7c95eff7 x
| |
| o 7:3ffec603ab53 f | * 7:2876ce66c6eb g
| |
x | 6:e36fae928aec e (rewritten using replace as 5:63324dc512ea)
| |
| o 5:63324dc512ea e'
| | | |
o | 4:76be324c128b d | | o 6:3ffec603ab53 f
|/ | | |
o 3:a82ac2b38757 c | | o 5:63324dc512ea e'
| | | |
| o 2:630d7c95eff7 x | x | 4:e36fae928aec e (rewritten using replace as 5:63324dc512ea)
| | |
| o | 3:76be324c128b d
| |/
| o 2:a82ac2b38757 c
| | | |
o | 1:488e1b7e7341 b | o 1:488e1b7e7341 b
|/ |/
o 0:b173517d0057 a o 0:b173517d0057 a
$ hg rebase -b 'f' -d 'x' $ hg rebase -b 'f' -d 'x'
rebasing 1:488e1b7e7341 "b" (b) rebasing 1:488e1b7e7341 "b" (b)
rebasing 3:a82ac2b38757 "c" (c) rebasing 2:a82ac2b38757 "c" (c)
rebasing 5:63324dc512ea "e'" (e') rebasing 5:63324dc512ea "e'" (e')
rebasing 7:3ffec603ab53 "f" (f) rebasing 6:3ffec603ab53 "f" (f)
rebasing 4:76be324c128b "d" (d) rebasing 3:76be324c128b "d" (d)
note: not rebasing 6:e36fae928aec "e" (e) and its descendants as this would cause divergence note: not rebasing 4:e36fae928aec "e" (e) and its descendants as this would cause divergence
$ hg log -G -r 'a': $ hg log -G -r 'a':
o 13:a1707a5b7c2c d o 13:a1707a5b7c2c d
| |
| o 12:ef6251596616 f | o 12:ef6251596616 f
| | | |
| o 11:b6f172e64af9 e' | o 11:b6f172e64af9 e'
|/ |/
o 10:d008e6b4d3fd c o 10:d008e6b4d3fd c
| |
o 9:67e8f4a16c49 b o 9:67e8f4a16c49 b
| |
| * 8:2876ce66c6eb g o 8:630d7c95eff7 x
|
| * 7:2876ce66c6eb g
| | | |
| | x 7:3ffec603ab53 f (rewritten using rebase as 12:ef6251596616) | | x 6:3ffec603ab53 f (rewritten using rebase as 12:ef6251596616)
| | |
| x | 6:e36fae928aec e (rewritten using replace as 5:63324dc512ea)
| | | | | |
| | x 5:63324dc512ea e' (rewritten using rebase as 11:b6f172e64af9) | | x 5:63324dc512ea e' (rewritten using rebase as 11:b6f172e64af9)
| | | | | |
| x | 4:76be324c128b d (rewritten using rebase as 13:a1707a5b7c2c) | x | 4:e36fae928aec e (rewritten using replace as 5:63324dc512ea)
| | |
| x | 3:76be324c128b d (rewritten using rebase as 13:a1707a5b7c2c)
| |/ | |/
| x 3:a82ac2b38757 c (rewritten using rebase as 10:d008e6b4d3fd) | x 2:a82ac2b38757 c (rewritten using rebase as 10:d008e6b4d3fd)
| |
o | 2:630d7c95eff7 x
| | | |
| x 1:488e1b7e7341 b (rewritten using rebase as 9:67e8f4a16c49) | x 1:488e1b7e7341 b (rewritten using rebase as 9:67e8f4a16c49)
|/ |/
o 0:b173517d0057 a o 0:b173517d0057 a
issue5782 issue5782
$ hg strip -r 0: $ hg strip -r 0:
> /| | > /| |
> E D B # replace: D -> B > E D B # replace: D -> B
> \|/ > \|/
> A > A
> EOF > EOF
1 new orphan changesets 1 new orphan changesets
$ hg rebase -d C -s D $ hg rebase -d C -s D
note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B) note: not rebasing 3:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
rebasing 5:66f1a38021c9 "F" (F tip) rebasing 5:66f1a38021c9 "F" (F tip)
$ hg log -G $ hg log -G
o 6:0913febf6439 F o 6:0913febf6439 F
|\ |\
+---x 5:66f1a38021c9 F (rewritten using rebase as 6:0913febf6439) | | x 5:66f1a38021c9 F (rewritten using rebase as 6:0913febf6439)
| | | | |/|
| o | 4:26805aba1e60 C | o | 4:7fb047a69f22 E
| | |
o | | 3:7fb047a69f22 E
| | | | | |
+---x 2:b18e25de2cf5 D (rewritten using replace as 1:112478962961) | | x 3:b18e25de2cf5 D (rewritten using replace as 1:112478962961)
| |/
o | 2:26805aba1e60 C
| | | |
| o 1:112478962961 B o | 1:112478962961 B
|/ |/
o 0:426bada5c675 A o 0:426bada5c675 A
$ cd .. $ cd ..
Rebase merge where successor of other parent is ancestor of destination Rebase merge where successor of other parent is ancestor of destination
$ hg init p2-succ-in-dest $ hg init p2-succ-in-dest
$ cd p2-succ-in-dest $ cd p2-succ-in-dest
$ hg debugdrawdag <<EOF $ hg debugdrawdag <<EOF
> F C > F C
> /| | > /| |
> E D B # replace: E -> B > E D B # replace: E -> B
> \|/ > \|/
> A > A
> EOF > EOF
1 new orphan changesets 1 new orphan changesets
$ hg rebase -d C -s E $ hg rebase -d C -s E
note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B) note: not rebasing 4:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
rebasing 5:66f1a38021c9 "F" (F tip) rebasing 5:66f1a38021c9 "F" (F tip)
$ hg log -G $ hg log -G
o 6:c6ab0cc6d220 F o 6:c6ab0cc6d220 F
|\ |\
+---x 5:66f1a38021c9 F (rewritten using rebase as 6:c6ab0cc6d220) | | x 5:66f1a38021c9 F (rewritten using rebase as 6:c6ab0cc6d220)
| | | | |/|
| o | 4:26805aba1e60 C | | x 4:7fb047a69f22 E (rewritten using replace as 1:112478962961)
| | |
| | x 3:7fb047a69f22 E (rewritten using replace as 1:112478962961)
| | | | | |
o---+ 2:b18e25de2cf5 D | o | 3:b18e25de2cf5 D
/ / | |/
o / 1:112478962961 B o | 2:26805aba1e60 C
| |
o | 1:112478962961 B
|/ |/
o 0:426bada5c675 A o 0:426bada5c675 A
$ cd .. $ cd ..
Rebase merge where successor of one parent is ancestor of destination Rebase merge where successor of one parent is ancestor of destination
$ hg init p1-succ-in-dest-b $ hg init p1-succ-in-dest-b
$ cd p1-succ-in-dest-b $ cd p1-succ-in-dest-b
$ hg debugdrawdag <<EOF $ hg debugdrawdag <<EOF
> F C > F C
> /| | > /| |
> E D B # replace: E -> B > E D B # replace: E -> B
> \|/ > \|/
> A > A
> EOF > EOF
1 new orphan changesets 1 new orphan changesets
$ hg rebase -d C -b F $ hg rebase -d C -b F
rebasing 2:b18e25de2cf5 "D" (D) rebasing 3:b18e25de2cf5 "D" (D)
note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B) note: not rebasing 4:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
rebasing 5:66f1a38021c9 "F" (F tip) rebasing 5:66f1a38021c9 "F" (F tip)
note: not rebasing 5:66f1a38021c9 "F" (F tip), its destination already has all its changes note: not rebasing 5:66f1a38021c9 "F" (F tip), its destination already has all its changes
$ hg log -G $ hg log -G
o 6:8f47515dda15 D o 6:8f47515dda15 D
| |
| x 5:66f1a38021c9 F (pruned using rebase) | x 5:66f1a38021c9 F (pruned using rebase)
| |\ | |\
o | | 4:26805aba1e60 C | | x 4:7fb047a69f22 E (rewritten using replace as 1:112478962961)
| | | | | |
| | x 3:7fb047a69f22 E (rewritten using replace as 1:112478962961) | x | 3:b18e25de2cf5 D (rewritten using rebase as 6:8f47515dda15)
| | |
| x | 2:b18e25de2cf5 D (rewritten using rebase as 6:8f47515dda15)
| |/ | |/
o / 1:112478962961 B o | 2:26805aba1e60 C
| |
o | 1:112478962961 B
|/ |/
o 0:426bada5c675 A o 0:426bada5c675 A
$ cd .. $ cd ..
Rebase merge where successor of other parent is ancestor of destination Rebase merge where successor of other parent is ancestor of destination
$ hg init p2-succ-in-dest-b $ hg init p2-succ-in-dest-b
$ cd p2-succ-in-dest-b $ cd p2-succ-in-dest-b
$ hg debugdrawdag <<EOF $ hg debugdrawdag <<EOF
> F C > F C
> /| | > /| |
> E D B # replace: D -> B > E D B # replace: D -> B
> \|/ > \|/
> A > A
> EOF > EOF
1 new orphan changesets 1 new orphan changesets
$ hg rebase -d C -b F $ hg rebase -d C -b F
note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B) note: not rebasing 3:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
rebasing 3:7fb047a69f22 "E" (E) rebasing 4:7fb047a69f22 "E" (E)
rebasing 5:66f1a38021c9 "F" (F tip) rebasing 5:66f1a38021c9 "F" (F tip)
note: not rebasing 5:66f1a38021c9 "F" (F tip), its destination already has all its changes note: not rebasing 5:66f1a38021c9 "F" (F tip), its destination already has all its changes
$ hg log -G $ hg log -G
o 6:533690786a86 E o 6:533690786a86 E
| |
| x 5:66f1a38021c9 F (pruned using rebase) | x 5:66f1a38021c9 F (pruned using rebase)
| |\ | |\
o | | 4:26805aba1e60 C | | x 4:7fb047a69f22 E (rewritten using rebase as 6:533690786a86)
| | |
| | x 3:7fb047a69f22 E (rewritten using rebase as 6:533690786a86)
| | | | | |
| x | 2:b18e25de2cf5 D (rewritten using replace as 1:112478962961) | x | 3:b18e25de2cf5 D (rewritten using replace as 1:112478962961)
| |/ | |/
o / 1:112478962961 B o | 2:26805aba1e60 C
| |
o | 1:112478962961 B
|/ |/
o 0:426bada5c675 A o 0:426bada5c675 A
$ cd .. $ cd ..
Rebase merge where extinct node has successor that is not an ancestor of Rebase merge where extinct node has successor that is not an ancestor of
destination destination
$ hg init extinct-with-succ-not-in-dest $ hg init extinct-with-succ-not-in-dest
$ cd extinct-with-succ-not-in-dest $ cd extinct-with-succ-not-in-dest
$ hg debugdrawdag <<EOF $ hg debugdrawdag <<EOF
> E C # replace: C -> E > E C # replace: C -> E
> | | > | |
> D B > D B
> |/ > |/
> A > A
> EOF > EOF
$ hg rebase -d D -s B $ hg rebase -d D -s B
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 "B" (B)
note: not rebasing 3:26805aba1e60 "C" (C) and its descendants as this would cause divergence note: not rebasing 2:26805aba1e60 "C" (C) and its descendants as this would cause divergence
$ cd .. $ cd ..
$ hg init p2-succ-in-dest-c $ hg init p2-succ-in-dest-c
$ cd p2-succ-in-dest-c $ cd p2-succ-in-dest-c
The scenario here was that B::D were developed on default. B was queued on The scenario here was that B::D were developed on default. B was queued on
stable, but amended before being push to hg-committed. C was queued on default, stable, but amended before being push to hg-committed. C was queued on default,
> | B |/ > | B |/
> |/ G > |/ G
> A > A
> EOF > EOF
1 new orphan changesets 1 new orphan changesets
This strip seems to be the key to avoid an early divergence warning. This strip seems to be the key to avoid an early divergence warning.
$ hg --config extensions.strip= --hidden strip -qr H $ hg --config extensions.strip= --hidden strip -qr H
1 new orphan changesets
$ hg rebase -b 'desc("D")' -d 'desc("J")' $ hg rebase -b 'desc("D")' -d 'desc("J")'
abort: this rebase will cause divergences from: 112478962961 abort: this rebase will cause divergences from: 112478962961
(to force the rebase please set experimental.evolution.allowdivergence=True) (to force the rebase please set experimental.evolution.allowdivergence=True)
[255] [255]
Rebase merge where both parents have successors in destination Rebase merge where both parents have successors in destination
$ hg init p12-succ-in-dest $ hg init p12-succ-in-dest
$ cd p12-succ-in-dest $ cd p12-succ-in-dest
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> E F > E F
> /| /| # replace: A -> C > /| /| # replace: A -> C
> A B C D # replace: B -> D > A B C D # replace: B -> D
> | | > | |
> X Y > X Y
> EOS > EOS
1 new orphan changesets 1 new orphan changesets
$ hg rebase -r A+B+E -d F $ hg rebase -r A+B+E -d F
note: not rebasing 4:a3d17304151f "A" (A), already in destination as 0:96cc3511f894 "C" (C) note: not rebasing 4:a3d17304151f "A" (A), already in destination as 0:96cc3511f894 "C" (C)
note: not rebasing 5:b23a2cc00842 "B" (B), already in destination as 1:058c1e1fb10a "D" (D) note: not rebasing 6:b23a2cc00842 "B" (B), already in destination as 1:058c1e1fb10a "D" (D)
rebasing 7:dac5d11c5a7d "E" (E tip) rebasing 7:dac5d11c5a7d "E" (E tip)
abort: rebasing 7:dac5d11c5a7d will include unwanted changes from 3:59c792af609c, 5:b23a2cc00842 or 2:ba2b7fa7166d, 4:a3d17304151f abort: rebasing 7:dac5d11c5a7d will include unwanted changes from 5:59c792af609c, 6:b23a2cc00842 or 3:ba2b7fa7166d, 4:a3d17304151f
[255] [255]
$ cd .. $ cd ..
Rebase a non-clean merge. One parent has successor in destination, the other Rebase a non-clean merge. One parent has successor in destination, the other
parent moves as requested. parent moves as requested.
$ hg init p1-succ-p2-move $ hg init p1-succ-p2-move
$ cd p1-succ-p2-move $ cd p1-succ-p2-move
> | B > | B
> |/ > |/
> A > A
> EOS > EOS
$ hg update D1 -q $ hg update D1 -q
$ hg bookmark book -i $ hg bookmark book -i
$ hg rebase -r B+D1 -d E $ hg rebase -r B+D1 -d E
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 "B" (B)
note: not rebasing 5:15ecf15e0114 "D1" (book D1 tip), already in destination as 2:0807738e0be9 "D2" (D2) note: not rebasing 3:15ecf15e0114 "D1" (book D1), already in destination as 4:0807738e0be9 "D2" (D2)
1 new orphan changesets 1 new orphan changesets
$ hg log -G -T '{desc} {bookmarks}' $ hg log -G -T '{desc} {bookmarks}'
@ B book @ B book
| |
o E
|
o D2
|
| x D1 | x D1
| | | |
o | E
| |
| * C | * C
| | | |
o | D2
| |
| x B | x B
|/ |/
o A o A
Rebasing a merge with one of its parent having a hidden successor Rebasing a merge with one of its parent having a hidden successor
$ hg init $TESTTMP/merge-p1-hidden-successor $ hg init $TESTTMP/merge-p1-hidden-successor
$ cd $TESTTMP/merge-p1-hidden-successor $ cd $TESTTMP/merge-p1-hidden-successor
$ hg rebase -r $D -d $E $ hg rebase -r $D -d $E
rebasing 5:9e62094e4d94 "D" rebasing 5:9e62094e4d94 "D"
$ hg log -G $ hg log -G
o 7:a699d059adcf D o 7:a699d059adcf D
|\ |\
| o 6:ecc93090a95c E | o 6:ecc93090a95c E
| | | |
| o 4:0dc878468a23 B3 o | 4:96cc3511f894 C
| |
o | 1:96cc3511f894 C
/ /
o 3:0dc878468a23 B3
|
o 0:426bada5c675 A o 0:426bada5c675 A
For some reasons (--hidden, rebaseskipobsolete=0, directaccess, etc.), For some reasons (--hidden, rebaseskipobsolete=0, directaccess, etc.),
rebasestate may contain hidden hashes. "rebase --abort" should work regardless. rebasestate may contain hidden hashes. "rebase --abort" should work regardless.
$ hg init $TESTTMP/hidden-state1 $ hg init $TESTTMP/hidden-state1
$ cd $TESTTMP/hidden-state1 $ cd $TESTTMP/hidden-state1
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
merging D merging D
warning: conflicts while merging D! (edit, then use 'hg resolve --mark') warning: conflicts while merging D! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ cp -R . $TESTTMP/hidden-state2 $ cp -R . $TESTTMP/hidden-state2
$ hg log -G $ hg log -G
@ 2:b18e25de2cf5 D @ 3:b18e25de2cf5 D
| |
o 0:426bada5c675 A o 0:426bada5c675 A
$ hg summary $ hg summary
parent: 2:b18e25de2cf5 tip parent: 3:b18e25de2cf5 tip
D D
branch: default branch: default
commit: 1 modified, 1 added, 1 unknown, 1 unresolved commit: 1 modified, 1 added, 1 unknown, 1 unresolved
update: (current) update: (current)
phases: 2 draft phases: 2 draft
rebase: 0 rebased, 2 remaining (rebase --continue) rebase: 0 rebased, 2 remaining (rebase --continue)
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
Also test --continue for the above case Also test --continue for the above case
$ cd $TESTTMP/hidden-state2 $ cd $TESTTMP/hidden-state2
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
rebasing 1:2ec65233581b "B" rebasing 1:2ec65233581b "B"
rebasing 3:7829726be4dc "C" (tip) rebasing 2:7829726be4dc "C"
$ hg log -G $ hg log -G
@ 5:1964d5d5b547 C @ 5:1964d5d5b547 C
| |
o 4:68deb90c12a2 B o 4:68deb90c12a2 B
| |
o 2:b18e25de2cf5 D o 3:b18e25de2cf5 D
| |
o 0:426bada5c675 A o 0:426bada5c675 A
==================== ====================
Test --stop option | Test --stop option |
==================== ====================
$ cd .. $ cd ..
$ hg init rbstop $ hg init rbstop

tests/test-rebase-partial.t

$ rebasewithdag -r C+D -d B <<EOF $ rebasewithdag -r C+D -d B <<EOF
> C > C
> | > |
> B D > B D
> |/ > |/
> A > A
> EOF > EOF
rebasing 2:b18e25de2cf5 "D" (D) already rebased 2:26805aba1e60 "C" (C)
already rebased 3:26805aba1e60 "C" (C tip) rebasing 3:b18e25de2cf5 "D" (D tip)
o 4: fe3b4c6498fa D o 4: fe3b4c6498fa D
| |
| o 3: 26805aba1e60 C | x 3: b18e25de2cf5 D
|/ | |
| x 2: b18e25de2cf5 D +---o 2: 26805aba1e60 C
| | | |
o | 1: 112478962961 B o | 1: 112478962961 B
|/ |/
o 0: 426bada5c675 A o 0: 426bada5c675 A
Can collapse commits even if one is already in the right place Can collapse commits even if one is already in the right place
$ rebasewithdag --collapse -r C+D -d B <<EOF $ rebasewithdag --collapse -r C+D -d B <<EOF
> C > C
> | > |
> B D > B D
> |/ > |/
> A > A
> EOF > EOF
rebasing 2:b18e25de2cf5 "D" (D) rebasing 2:26805aba1e60 "C" (C)
rebasing 3:26805aba1e60 "C" (C tip) rebasing 3:b18e25de2cf5 "D" (D tip)
o 4: a2493f4ace65 Collapsed revision o 4: 43ff9c6a4b68 Collapsed revision
| * D
| * C | * C
| x 3: 26805aba1e60 C | * D
|/ | x 3: b18e25de2cf5 D
| x 2: b18e25de2cf5 D | |
+---x 2: 26805aba1e60 C
| | | |
o | 1: 112478962961 B o | 1: 112478962961 B
|/ |/
o 0: 426bada5c675 A o 0: 426bada5c675 A
Abort doesn't lose the commits that were already in the right place Abort doesn't lose the commits that were already in the right place
$ hg init abort $ hg init abort
$ cd abort $ cd abort
$ hg debugdrawdag <<EOF $ hg debugdrawdag <<EOF
> C > C
> | > |
> B D # B/file = B > B D # B/file = B
> |/ # D/file = D > |/ # D/file = D
> A > A
> EOF > EOF
$ hg rebase -r C+D -d B $ hg rebase -r C+D -d B
rebasing 2:ef8c0fe0897b "D" (D) already rebased 2:79f6d6ab7b14 "C" (C)
rebasing 3:ef8c0fe0897b "D" (D tip)
merging file merging file
warning: conflicts while merging file! (edit, then use 'hg resolve --mark') warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
$ hg tglog $ hg tglog
o 3: 79f6d6ab7b14 C o 3: ef8c0fe0897b D
| |
| o 2: ef8c0fe0897b D | o 2: 79f6d6ab7b14 C
| | | |
o | 1: 594087dbaf71 B | o 1: 594087dbaf71 B
|/ |/
o 0: 426bada5c675 A o 0: 426bada5c675 A
$ cd .. $ cd ..
Rebase with "holes". The commits after the hole should end up on the parent of Rebase with "holes". The commits after the hole should end up on the parent of
the hole (B below), not on top of the destination (A). the hole (B below), not on top of the destination (A).

tests/test-rebase-transaction.t

> | C # C/conflict=C > | C # C/conflict=C
> | | > | |
> Y B > Y B
> |/ > |/
> A > A
> EOF > EOF
$ hg rebase --collapse -b D -d Z $ hg rebase --collapse -b D -d Z
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 "B" (B)
rebasing 3:c26739dbe603 "C" (C) rebasing 2:c26739dbe603 "C" (C)
merging conflict merging conflict
warning: conflicts while merging conflict! (edit, then use 'hg resolve --mark') warning: conflicts while merging conflict! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ hg tglog $ hg tglog
o 5: D @ 5: Z
| |
| @ 4: Z o 4: Y
| | |
% | 3: C | o 3: D
| | | |
| o 2: Y | % 2: C
| | | |
o | 1: B | o 1: B
|/ |/
o 0: A o 0: A
$ hg st $ hg st
M conflict M conflict
A B A B
A C A C
? conflict.orig ? conflict.orig
$ echo resolved > conflict $ echo resolved > conflict
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg continue $ hg continue
already rebased 1:112478962961 "B" (B) as 79bc8f4973ce already rebased 1:112478962961 "B" (B) as 79bc8f4973ce
rebasing 3:c26739dbe603 "C" (C) rebasing 2:c26739dbe603 "C" (C)
rebasing 5:d24bb333861c "D" (D tip) rebasing 3:d24bb333861c "D" (D)
saved backup bundle to $TESTTMP/collapse-conflict/.hg/strip-backup/112478962961-b5b34645-rebase.hg saved backup bundle to $TESTTMP/collapse-conflict/.hg/strip-backup/112478962961-b5b34645-rebase.hg
$ hg tglog $ hg tglog
o 3: Collapsed revision o 3: Collapsed revision
| * B | * B
| * C | * C
| * D | * D
o 2: Z o 2: Z
| |
> | C > | C
> | | > | |
> Y B > Y B
> |/ > |/
> A > A
> EOF > EOF
$ HGEDITOR=false hg --config ui.interactive=1 rebase --collapse -b D -d Z $ HGEDITOR=false hg --config ui.interactive=1 rebase --collapse -b D -d Z
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 "B" (B)
rebasing 3:26805aba1e60 "C" (C) rebasing 2:26805aba1e60 "C" (C)
rebasing 5:f585351a92f8 "D" (D tip) rebasing 3:f585351a92f8 "D" (D)
transaction abort! transaction abort!
rollback completed rollback completed
abort: edit failed: false exited with status 1 abort: edit failed: false exited with status 1
[255] [255]
$ hg tglog $ hg tglog
o 5: D o 5: Z
| |
| o 4: Z o 4: Y
| | |
o | 3: C | o 3: D
| | | |
| o 2: Y | o 2: C
| | | |
o | 1: B | o 1: B
|/ |/
o 0: A o 0: A
$ hg continue $ hg continue
rebasing 1:112478962961 "B" (B) rebasing 1:112478962961 "B" (B)
rebasing 3:26805aba1e60 "C" (C) rebasing 2:26805aba1e60 "C" (C)
rebasing 5:f585351a92f8 "D" (D tip) rebasing 3:f585351a92f8 "D" (D)
saved backup bundle to $TESTTMP/collapse-cancel-editor/.hg/strip-backup/112478962961-cb2a9b47-rebase.hg saved backup bundle to $TESTTMP/collapse-cancel-editor/.hg/strip-backup/112478962961-cb2a9b47-rebase.hg
$ hg tglog $ hg tglog
o 3: Collapsed revision o 3: Collapsed revision
| * B | * B
| * C | * C
| * D | * D
o 2: Z o 2: Z
| |
o 1: Y o 1: Y
| |
o 0: A o 0: A
$ cd .. $ cd ..

tests/test-revset2.t

$ hg log -r 'successors(B)-obsolete()' -T '{desc}\n' --hidden $ hg log -r 'successors(B)-obsolete()' -T '{desc}\n' --hidden
D D
E E
G G
$ hg log -r 'successors(B+A)-contentdivergent()' -T '{desc}\n' $ hg log -r 'successors(B+A)-contentdivergent()' -T '{desc}\n'
A A
Z
B B
Z
$ hg log -r 'successors(B+A)-contentdivergent()-obsolete()' -T '{desc}\n' $ hg log -r 'successors(B+A)-contentdivergent()-obsolete()' -T '{desc}\n'
Z Z
Test `draft() & ::x` optimization Test `draft() & ::x` optimization
$ hg init $TESTTMP/repo2 $ hg init $TESTTMP/repo2
$ cd $TESTTMP/repo2 $ cd $TESTTMP/repo2
> | > |
> P0 > P0
> EOS > EOS
$ hg phase --public -r P5 $ hg phase --public -r P5
$ hg phase --force --secret -r S1+S2 $ hg phase --force --secret -r S1+S2
$ hg log -G -T '{rev} {desc} {phase}' -r 'sort(all(), topo, topo.firstbranch=P5)' $ hg log -G -T '{rev} {desc} {phase}' -r 'sort(all(), topo, topo.firstbranch=P5)'
o 8 P5 public o 8 P5 public
| |
| o 10 S1 secret | o 9 S1 secret
| | | |
| o 7 D3 draft | o 7 D3 draft
|/ |/
| o 9 S2 secret | o 10 S2 secret
|/ |/
o 6 P4 public o 6 P4 public
| |
o 5 P3 public o 5 P3 public
| |
o 3 P2 public o 4 P2 public
| |
| o 4 D2 draft | o 3 D2 draft
| | | |
| o 2 D1 draft | o 2 D1 draft
|/ |/
o 1 P1 public o 1 P1 public
| |
o 0 P0 public o 0 P0 public
$ hg debugrevspec --verify -p analyzed -p optimized 'draft() & ::(((S1+D1+P5)-D3)+S2)' $ hg debugrevspec --verify -p analyzed -p optimized 'draft() & ::(((S1+D1+P5)-D3)+S2)'

tests/test-strip.t

> with repo.lock(): > with repo.lock():
> with repo.transaction(b'delayedstrip'): > with repo.transaction(b'delayedstrip'):
> repair.delayedstrip(ui, repo, getnodes(b'B+I+Z+D+E'), b'J') > repair.delayedstrip(ui, repo, getnodes(b'B+I+Z+D+E'), b'J')
> repair.delayedstrip(ui, repo, getnodes(b'G+H+Z'), b'I') > repair.delayedstrip(ui, repo, getnodes(b'G+H+Z'), b'I')
> commands.commit(ui, repo, message=b'J', date=b'0 0') > commands.commit(ui, repo, message=b'J', date=b'0 0')
> EOF > EOF
$ hg testdelayedstrip --config extensions.t=$TESTTMP/delayedstrip.py $ hg testdelayedstrip --config extensions.t=$TESTTMP/delayedstrip.py
warning: orphaned descendants detected, not stripping 08ebfeb61bac, 112478962961, 7fb047a69f22 warning: orphaned descendants detected, not stripping 08ebfeb61bac, 112478962961, 7fb047a69f22
saved backup bundle to $TESTTMP/delayedstrip/.hg/strip-backup/f585351a92f8-17475721-I.hg saved backup bundle to $TESTTMP/delayedstrip/.hg/strip-backup/48b9aae0607f-17475721-I.hg
$ hg log -G -T '{rev}:{node|short} {desc}' -r 'sort(all(), topo)' $ hg log -G -T '{rev}:{node|short} {desc}' -r 'sort(all(), topo)'
@ 6:2f2d51af6205 J @ 6:2f2d51af6205 J
| |
o 3:08ebfeb61bac I o 5:08ebfeb61bac I
| |
| o 5:64a8289d2492 F | o 4:64a8289d2492 F
| | | |
| o 2:7fb047a69f22 E | o 3:7fb047a69f22 E
|/ |/
| o 4:26805aba1e60 C | o 2:26805aba1e60 C
| | | |
| o 1:112478962961 B | o 1:112478962961 B
|/ |/
o 0:426bada5c675 A o 0:426bada5c675 A
Test high-level scmutil.cleanupnodes API Test high-level scmutil.cleanupnodes API
$ cd $TESTTMP/scmutilcleanup $ cd $TESTTMP/scmutilcleanup
> node(b'D'): [node(b'D2')], > node(b'D'): [node(b'D2')],
> node(b'G'): [node(b'G2')]} > node(b'G'): [node(b'G2')]}
> scmutil.cleanupnodes(repo, mapping, b'replace') > scmutil.cleanupnodes(repo, mapping, b'replace')
> scmutil.cleanupnodes(repo, nodes(b'((B::)+I+Z)-D2-obsolete()'), > scmutil.cleanupnodes(repo, nodes(b'((B::)+I+Z)-D2-obsolete()'),
> b'replace') > b'replace')
> EOF > EOF
$ hg testnodescleanup --config extensions.t=$TESTTMP/scmutilcleanup.py $ hg testnodescleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
warning: orphaned descendants detected, not stripping 112478962961, 1fc8102cda62, 26805aba1e60 warning: orphaned descendants detected, not stripping 112478962961, 1fc8102cda62, 26805aba1e60
saved backup bundle to $TESTTMP/scmutilcleanup/.hg/strip-backup/f585351a92f8-73fb7c03-replace.hg saved backup bundle to $TESTTMP/scmutilcleanup/.hg/strip-backup/48b9aae0607f-73fb7c03-replace.hg
$ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)' $ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)'
o 8:1473d4b996d1 G2 b-F@divergent3 b-G o 8:d11b3456a873 F2 b-F
| |
| o 7:d11b3456a873 F2 b-F o 5:5cb05ba470a7 H
|\
| | o 7:1473d4b996d1 G2 b-F@divergent3 b-G
| |/
| o 4:1fc8102cda62 G
|
o 3:7fb047a69f22 E b-F@divergent1
|
| o 6:7c78f703e465 D2 b-D
| | | |
| o 5:5cb05ba470a7 H | o 2:26805aba1e60 C
|/|
| o 3:7fb047a69f22 E b-F@divergent1
| | | |
| | o 6:7c78f703e465 D2 b-D | o 1:112478962961 B
| | | |/
| | o 4:26805aba1e60 C
| | |
| | o 2:112478962961 B
| |/
o | 1:1fc8102cda62 G
/
o 0:426bada5c675 A b-B b-C b-I o 0:426bada5c675 A b-B b-C b-I
$ hg bookmark $ hg bookmark
b-B 0:426bada5c675 b-B 0:426bada5c675
b-C 0:426bada5c675 b-C 0:426bada5c675
b-D 6:7c78f703e465 b-D 6:7c78f703e465
b-F 7:d11b3456a873 b-F 8:d11b3456a873
b-F@divergent1 3:7fb047a69f22 b-F@divergent1 3:7fb047a69f22
b-F@divergent3 8:1473d4b996d1 b-F@divergent3 7:1473d4b996d1
b-G 8:1473d4b996d1 b-G 7:1473d4b996d1
b-I 0:426bada5c675 b-I 0:426bada5c675
b-Z -1:000000000000 b-Z -1:000000000000
Test the above using obsstore "by the way". Not directly related to strip, but Test the above using obsstore "by the way". Not directly related to strip, but
we have reusable code here we have reusable code here
$ cd $TESTTMP/scmutilcleanup.obsstore $ cd $TESTTMP/scmutilcleanup.obsstore
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [experimental] > [experimental]
> evolution=true > evolution=true
> evolution.track-operation=1 > evolution.track-operation=1
> EOF > EOF
$ hg testnodescleanup --config extensions.t=$TESTTMP/scmutilcleanup.py $ hg testnodescleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
4 new orphan changesets 4 new orphan changesets
$ rm .hg/localtags $ rm .hg/localtags
$ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)' $ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)'
* 12:1473d4b996d1 G2 b-F@divergent3 b-G * 12:d11b3456a873 F2 b-F
|
* 7:5cb05ba470a7 H
|\
| | * 11:1473d4b996d1 G2 b-F@divergent3 b-G
| |/
| x 6:1fc8102cda62 G
| |
| * 11:d11b3456a873 F2 b-F o 4:7fb047a69f22 E b-F@divergent1
|
| * 10:7c78f703e465 D2 b-D
| | | |
| * 8:5cb05ba470a7 H | x 2:26805aba1e60 C
|/|
| o 4:7fb047a69f22 E b-F@divergent1
| | | |
| | * 10:7c78f703e465 D2 b-D | x 1:112478962961 B
| | | |/
| | x 6:26805aba1e60 C
| | |
| | x 3:112478962961 B
| |/
x | 1:1fc8102cda62 G
/
o 0:426bada5c675 A b-B b-C b-I o 0:426bada5c675 A b-B b-C b-I
$ hg debugobsolete $ hg debugobsolete
1fc8102cda6204549f031015641606ccf5513ec3 1473d4b996d1d1b121de6b39fab6a04fbf9d873e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'replace', 'user': 'test'}
64a8289d249234b9886244d379f15e6b650b28e3 d11b3456a873daec7c7bc53e5622e8df6d741bd2 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'replace', 'user': 'test'}
f585351a92f85104bff7c284233c338b10eb1df7 7c78f703e465d73102cc8780667ce269c5208a40 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'replace', 'user': 'test'} f585351a92f85104bff7c284233c338b10eb1df7 7c78f703e465d73102cc8780667ce269c5208a40 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'replace', 'user': 'test'}
48b9aae0607f43ff110d84e6883c151942add5ab 0 {0000000000000000000000000000000000000000} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'replace', 'user': 'test'} 64a8289d249234b9886244d379f15e6b650b28e3 d11b3456a873daec7c7bc53e5622e8df6d741bd2 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'replace', 'user': 'test'}
1fc8102cda6204549f031015641606ccf5513ec3 1473d4b996d1d1b121de6b39fab6a04fbf9d873e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'replace', 'user': 'test'}
112478962961147124edd43549aedd1a335e44bf 0 {426bada5c67598ca65036d57d9e4b64b0c1ce7a0} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'replace', 'user': 'test'} 112478962961147124edd43549aedd1a335e44bf 0 {426bada5c67598ca65036d57d9e4b64b0c1ce7a0} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'replace', 'user': 'test'}
08ebfeb61bac6e3f12079de774d285a0d6689eba 0 {426bada5c67598ca65036d57d9e4b64b0c1ce7a0} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'replace', 'user': 'test'}
26805aba1e600a82e93661149f2313866a221a7b 0 {112478962961147124edd43549aedd1a335e44bf} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'replace', 'user': 'test'} 26805aba1e600a82e93661149f2313866a221a7b 0 {112478962961147124edd43549aedd1a335e44bf} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'replace', 'user': 'test'}
08ebfeb61bac6e3f12079de774d285a0d6689eba 0 {426bada5c67598ca65036d57d9e4b64b0c1ce7a0} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'replace', 'user': 'test'}
48b9aae0607f43ff110d84e6883c151942add5ab 0 {0000000000000000000000000000000000000000} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'replace', 'user': 'test'}
$ cd .. $ cd ..
Test that obsmarkers are restored even when not using generaldelta Test that obsmarkers are restored even when not using generaldelta
$ hg --config format.usegeneraldelta=no init issue5678 $ hg --config format.usegeneraldelta=no init issue5678
$ cd issue5678 $ cd issue5678
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [experimental] > [experimental]

tests/test-template-graph.t

> b | > b |
> | > |
> a > a
> EOF > EOF
$ hg log -Gq -T'{rev} {tags}\n' $ hg log -Gq -T'{rev} {tags}\n'
o 11 l tip o 11 l tip
|\ |\
| o 10 i | o 10 k
| |\ | |\
o \ \ 9 k | | o 9 j
|\ \ \
+-----o 8 g
| | |
| o | 7 j
| | | | | |
| | o 6 h o | | 8 i
|\ \ \
| o | | 7 h
| | | |
o---+ | 6 g
/ / /
o | | 5 f
| | | | | |
o | | 5 e | o | 4 e
|/ / | |/
| o 4 f | o 3 d
| | |/|
o | 3 d o | 2 c
|\|
| o 2 c
| | | |
| o 1 b o | 1 b
| /
o 0 a o 0 a
$ cd .. $ cd ..
Create repository containing merges of p1 > p2: Create repository containing merges of p1 > p2:
$ hg init named-branch-order $ hg init named-branch-order
$ cd .. $ cd ..
subsetparents subsetparents
------------- -------------
$ cd a $ cd a
$ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("c+i"))}\n' -r 'c+i' $ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("c+i"))}\n' -r 'c+i'
o 10 i: 2 o 8 i: 2
: :
o 2 c: o 2 c:
| |
~ ~
$ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("c+h+i"))}\n' -r 'c+h+i' $ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("c+h+i"))}\n' -r 'c+h+i'
o 10 i: 6 o 8 i: 7
|\ |\
o : 6 h: 2 o : 7 h: 2
:/ :/
o 2 c: o 2 c:
| |
~ ~
$ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("c+h+l"))}\n' -r 'c+h+l' $ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("c+h+l"))}\n' -r 'c+h+l'
o 11 l tip: 6 o 11 l tip: 7
:\ :\
: o 6 h: 2 : o 7 h: 2
:/ :/
o 2 c: o 2 c:
| |
~ ~
$ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("c+f+l"))}\n' -r 'c+f+l' $ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("c+f+l"))}\n' -r 'c+f+l'
o 11 l tip: 4 o 11 l tip: 5
:\ :\
: o 4 f: 2 : o 5 f: 2
:/ :/
o 2 c: o 2 c:
| |
~ ~
$ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("c+h+i+k"))}\n' -r 'c+h+i+k' $ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("c+h+i+k"))}\n' -r 'c+h+i+k'
o 10 i: 6 o 10 k: 2
|\ :
| : o 9 k: 2 : o 8 i: 7
| :/ :/|
o : 6 h: 2 : o 7 h: 2
:/ :/
o 2 c: o 2 c:
| |
~ ~
$ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("c+d+h+i+k"))}\n' -r 'c+d+h+i+k' $ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("c+d+h+i+k"))}\n' -r 'c+d+h+i+k'
o 10 i: 6 3 o 10 k: 3
|\ :
| : o 9 k: 3 : o 8 i: 7 3
| :/
o : 6 h: 2
: :
: o 3 d: 2
:/| :/|
: ~ : o 7 h: 2
: :
o : 3 d: 2
|\:
~ :
/
o 2 c: o 2 c:
| |
~ ~
$ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("c+j+k+i"))}\n' -r 'c+j+k+i' $ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("c+j+k+i"))}\n' -r 'c+j+k+i'
o 10 i: 2 o 10 k: 9
: |\
: o 9 k: 7 o : 9 j: 2
:/| :/
: o 7 j: 2 : o 8 i: 2
:/ :/
o 2 c: o 2 c:
| |
~ ~
$ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("c+e+f+j"))}\n' -r 'c+e+f+j' $ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("c+e+f+j"))}\n' -r 'c+e+f+j'
o 7 j: 2 o 9 j: 2
: :
: o 5 e: 2 : o 5 f: 2
:/ :/
: o 4 f: 2 : o 4 e: 2
:/ :/
o 2 c: o 2 c:
| |
~ ~
$ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("b+e+f+j"))}\n' -r 'b+e+f+j' $ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("b+e+f+j"))}\n' -r 'b+e+f+j'
o 7 j: 1 o 9 j: 1
: :
: o 5 e: 1 : o 5 f: 1
:/ :/
: o 4 f: 1 : o 4 e: 1
:/ :/
o 1 b: o 1 b:
$ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("a+c+f+g+j+l"))}\n' -r 'a+c+f+g+j+l' $ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("a+c+f+g+j+l"))}\n' -r 'a+c+f+g+j+l'
o 11 l tip: 4 8 7 o 11 l tip: 5 6 9
:\ :\
: \ : \
: :\ : :\
: : \ : : \
: : :\ : : :\
: : : \ : : : \
: : : :\ : : : :\
: o---+ : 8 g: 0 2 : : +---o 9 j: 0 2
: :/ / / : : : :/
: +---o 7 j: 0 2 : o---+ 6 g: 0 2
: : :/ : :/ /
o---+ 4 f: 2 o---+ 5 f: 2
/ / / /
: o 2 c: : o 2 c:
: | : |
: ~ : ~
o 0 a: o 0 a:
$ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("b+i+l"))}\n' -r 'b+i+l' $ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("b+i+l"))}\n' -r 'b+i+l'
o 11 l tip: 10 o 11 l tip: 8
|\ |\
o : 10 i: 1 o : 8 i: 1
:/ :/
o 1 b: o 1 b:
$ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("b+i+j+l"))}\n' -r 'b+i+j+l' $ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("b+i+j+l"))}\n' -r 'b+i+j+l'
o 11 l tip: 10 7 o 11 l tip: 8 9
|\ |\
| \ | \
| :\ | :\
o : : 10 i: 1 | : o 9 j: 1
:/ / | :/
: o 7 j: 1 o : 8 i: 1
:/ :/
o 1 b: o 1 b:
null in subset: null in subset:
$ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("null+a+c+f"))}\n' -r 'null+a+c+f' $ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("null+a+c+f"))}\n' -r 'null+a+c+f'
o 4 f: 2 o 5 f: 2
| |
o 2 c: -1 o 2 c: -1
: :
: o 0 a: -1 : o 0 a: -1
:/ :/
@ -1 : -1 @ -1 : -1
$ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("null+a+b+c+f"))}\n' -r 'null+a+b+c+f' $ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("null+a+b+c+f"))}\n' -r 'null+a+b+c+f'
o 4 f: 2 o 5 f: 2
| |
o 2 c: 1 o 2 c: 1
| |
o 1 b: -1 o 1 b: -1
| |
| o 0 a: -1 | o 0 a: -1
|/ |/
@ -1 : -1 @ -1 : -1
wdir in subset: wdir in subset:
$ hg update -qC i $ hg update -qC i
$ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("f+k+wdir()"))}\n' -r 'f+k+wdir()' $ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("f+k+wdir()"))}\n' -r 'f+k+wdir()'
o 2147483647 : 4 o 2147483647 : 5
: :
: o 9 k: : o 10 k:
: |\ : |\
: ~ ~ : ~ ~
o 4 f: o 5 f:
| |
~ ~
$ hg update -qC null $ hg update -qC null
Revisions not in subset: Revisions not in subset:
$ hg log -T '{rev} {tags}: {subsetparents(rev, revset("a+c+f+g+j+l"))}\n' $ hg log -T '{rev} {tags}: {subsetparents(rev, revset("a+c+f+g+j+l"))}\n'
11 l tip: 4 8 7 11 l tip: 5 6 9
10 i: 10 k:
9 k: 9 j: 0 2
8 g: 0 2 8 i:
7 j: 0 2 7 h:
6 h: 6 g: 0 2
5 e: 5 f: 2
4 f: 2 4 e:
3 d: 3 d:
2 c: 2 c:
1 b: 1 b:
0 a: 0 a:
$ hg log -T '{rev} {tags}: {subsetparents(rev, revset("b+c"))}\n' $ hg log -T '{rev} {tags}: {subsetparents(rev, revset("b+c"))}\n'
11 l tip: 11 l tip:
10 i: 10 k:
9 k: 9 j:
8 g: 8 i:
7 j: 7 h:
6 h: 6 g:
5 e: 5 f:
4 f: 4 e:
3 d: 3 d:
2 c: 1 2 c: 1
1 b: 1 b:
0 a: 0 a:
$ hg log -T '{rev} {tags}: {subsetparents(rev, revset("b+c"))}\n' -r'reverse(null:2)' $ hg log -T '{rev} {tags}: {subsetparents(rev, revset("b+c"))}\n' -r'reverse(null:2)'
2 c: 1 2 c: 1
1 b: 1 b:
0 a: 0 a:
-1 : -1 :
Nothing excluded: Nothing excluded:
$ hg log -T '{rev} {tags}: {subsetparents(rev, revset("null:wdir()"))}\n' -r'reverse(null:wdir())' $ hg log -T '{rev} {tags}: {subsetparents(rev, revset("null:wdir()"))}\n' -r'reverse(null:wdir())'
2147483647 : -1 2147483647 : -1
11 l tip: 10 9 11 l tip: 8 10
10 i: 6 8 10 k: 4 9
9 k: 5 7 9 j: 3
8 g: 5 8 i: 7 6
7 j: 3 7 h: 5
6 h: 4 6 g: 4
5 e: 3 5 f: 2
4 f: 2 4 e: 3
3 d: 0 2 3 d: 0 2
2 c: 1 2 c: 1
1 b: -1 1 b: -1
0 a: -1 0 a: -1
-1 : -1 -1 : -1
Uncachable query: Uncachable query:
$ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("%d:%d", rev, rev - 1))}\n' $ hg log -Gq -T '{rev} {tags}: {subsetparents(rev, revset("%d:%d", rev, rev - 1))}\n'
o 11 l tip: 10 o 11 l tip: 10
|\ |\
| o 10 i: | o 10 k: 9
| |\ | |\
o \ \ 9 k: | | o 9 j:
|\ \ \
+-----o 8 g:
| | | | | |
| o | 7 j: o | | 8 i: 7
| | | |\ \ \
| | o 6 h: | o | | 7 h:
| | | |
o---+ | 6 g:
/ / /
o | | 5 f:
| | | | | |
o | | 5 e: | o | 4 e: 3
|/ / | |/
| o 4 f: | o 3 d: 2
|/|
o | 2 c: 1
| | | |
o | 3 d: 2 o | 1 b:
|\| /
| o 2 c: 1
| |
| o 1 b:
|
o 0 a: -1 o 0 a: -1
Invalid arguments: Invalid arguments:
$ hg log -T '{subsetparents()}\n' $ hg log -T '{subsetparents()}\n'
hg: parse error: subsetparents expects two arguments hg: parse error: subsetparents expects two arguments
[255] [255]