test-obsolete-divergent.t
766 lines
| 22.3 KiB
| text/troff
|
Tads3Lexer
/ tests / test-obsolete-divergent.t
|
r18068 | Test file dedicated to testing the divergent troubles from obsolete changeset. | ||
|
r18644 | This is the most complex troubles from far so we isolate it in a dedicated | ||
|
r18068 | file. | ||
Enable obsolete | ||||
$ cat >> $HGRCPATH << EOF | ||||
> [ui] | ||||
|
r34848 | > logtemplate = {rev}:{node|short} {desc}{if(obsfate, " [{join(obsfate, "; ")}]")}\n | ||
|
r22955 | > [experimental] | ||
|
r34867 | > evolution.createmarkers=True | ||
|
r33330 | > [extensions] | ||
> drawdag=$TESTDIR/drawdag.py | ||||
|
r18068 | > [alias] | ||
> debugobsolete = debugobsolete -d '0 0' | ||||
> [phases] | ||||
> publish=False | ||||
r37724 | > [templates] | |||
r37725 | > wuentryshort = '{instability}:{if(divergentnodes, " ")}{divergentnodes} {reason} {node|shortest}\n' | |||
r37724 | > whyunstableshort = '{whyunstable % wuentryshort}' | |||
> wuentryshorter = '{instability}:{divergentnodes % " {node|shortest} ({phase})"} {reason} {node|shortest}\n' | ||||
> whyunstableshorter = '{whyunstable % wuentryshorter}' | ||||
|
r18068 | > EOF | ||
$ mkcommit() { | ||||
> echo "$1" > "$1" | ||||
> hg add "$1" | ||||
> hg ci -m "$1" | ||||
> } | ||||
$ getid() { | ||||
|
r21789 | > hg log --hidden -r "desc('$1')" -T '{node}\n' | ||
|
r18068 | > } | ||
setup repo | ||||
$ hg init reference | ||||
$ cd reference | ||||
$ mkcommit base | ||||
$ mkcommit A_0 | ||||
$ hg up 0 | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ mkcommit A_1 | ||||
created new head | ||||
$ hg up 0 | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ mkcommit A_2 | ||||
created new head | ||||
$ hg up 0 | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ cd .. | ||||
$ newcase() { | ||||
> hg clone -u 0 -q reference $1 | ||||
> cd $1 | ||||
> } | ||||
direct divergence | ||||
----------------- | ||||
A_1 have two direct and divergent successors A_1 and A_1 | ||||
$ newcase direct | ||||
$ hg debugobsolete `getid A_0` `getid A_1` | ||||
|
r33542 | obsoleted 1 changesets | ||
|
r18068 | $ hg debugobsolete `getid A_0` `getid A_2` | ||
|
r35727 | 2 new content-divergent changesets | ||
|
r18068 | $ hg log -G --hidden | ||
r35524 | * 3:392fd25390da A_2 | |||
|
r18068 | | | ||
r35524 | | * 2:82623d38b9ba A_1 | |||
|
r18068 | |/ | ||
|
r34852 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] | ||
|
r18068 | |/ | ||
@ 0:d20a80d4def3 base | ||||
|
r18267 | $ hg debugsuccessorssets --hidden 'all()' | ||
|
r18068 | d20a80d4def3 | ||
d20a80d4def3 | ||||
007dc284c1f8 | ||||
|
r18365 | 82623d38b9ba | ||
|
r18069 | 392fd25390da | ||
|
r18068 | 82623d38b9ba | ||
82623d38b9ba | ||||
392fd25390da | ||||
392fd25390da | ||||
|
r33770 | $ hg log -r 'contentdivergent()' | ||
|
r18071 | 2:82623d38b9ba A_1 | ||
3:392fd25390da A_2 | ||||
|
r33274 | $ hg debugsuccessorssets 'all()' --closest | ||
d20a80d4def3 | ||||
d20a80d4def3 | ||||
82623d38b9ba | ||||
82623d38b9ba | ||||
392fd25390da | ||||
392fd25390da | ||||
$ hg debugsuccessorssets 'all()' --closest --hidden | ||||
d20a80d4def3 | ||||
d20a80d4def3 | ||||
007dc284c1f8 | ||||
82623d38b9ba | ||||
392fd25390da | ||||
82623d38b9ba | ||||
82623d38b9ba | ||||
392fd25390da | ||||
392fd25390da | ||||
|
r18073 | |||
check that mercurial refuse to push | ||||
$ hg init ../other | ||||
$ hg push ../other | ||||
pushing to ../other | ||||
searching for changes | ||||
|
r33651 | abort: push includes content-divergent changeset: 392fd25390da! | ||
|
r18073 | [255] | ||
|
r18068 | $ cd .. | ||
indirect divergence with known changeset | ||||
------------------------------------------- | ||||
$ newcase indirect_known | ||||
$ hg debugobsolete `getid A_0` `getid A_1` | ||||
|
r33542 | obsoleted 1 changesets | ||
|
r18068 | $ hg debugobsolete `getid A_0` `getid A_2` | ||
|
r35727 | 2 new content-divergent changesets | ||
|
r18068 | $ mkcommit A_3 | ||
created new head | ||||
$ hg debugobsolete `getid A_2` `getid A_3` | ||||
|
r33542 | obsoleted 1 changesets | ||
|
r18068 | $ hg log -G --hidden | ||
@ 4:01f36c5a8fda A_3 | ||||
| | ||||
|
r34852 | | x 3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda] | ||
|
r18068 | |/ | ||
r35524 | | * 2:82623d38b9ba A_1 | |||
|
r18068 | |/ | ||
|
r34852 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] | ||
|
r18068 | |/ | ||
o 0:d20a80d4def3 base | ||||
|
r18267 | $ hg debugsuccessorssets --hidden 'all()' | ||
|
r18068 | d20a80d4def3 | ||
d20a80d4def3 | ||||
007dc284c1f8 | ||||
|
r18365 | 82623d38b9ba | ||
|
r18068 | 01f36c5a8fda | ||
82623d38b9ba | ||||
82623d38b9ba | ||||
392fd25390da | ||||
01f36c5a8fda | ||||
01f36c5a8fda | ||||
01f36c5a8fda | ||||
|
r33770 | $ hg log -r 'contentdivergent()' | ||
|
r18071 | 2:82623d38b9ba A_1 | ||
4:01f36c5a8fda A_3 | ||||
|
r33274 | $ hg debugsuccessorssets 'all()' --closest | ||
d20a80d4def3 | ||||
d20a80d4def3 | ||||
82623d38b9ba | ||||
82623d38b9ba | ||||
01f36c5a8fda | ||||
01f36c5a8fda | ||||
$ hg debugsuccessorssets 'all()' --closest --hidden | ||||
d20a80d4def3 | ||||
d20a80d4def3 | ||||
007dc284c1f8 | ||||
82623d38b9ba | ||||
392fd25390da | ||||
82623d38b9ba | ||||
82623d38b9ba | ||||
392fd25390da | ||||
392fd25390da | ||||
01f36c5a8fda | ||||
01f36c5a8fda | ||||
|
r18068 | $ cd .. | ||
indirect divergence with known changeset | ||||
------------------------------------------- | ||||
$ newcase indirect_unknown | ||||
$ hg debugobsolete `getid A_0` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | ||||
|
r33542 | obsoleted 1 changesets | ||
|
r18068 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1` | ||
$ hg debugobsolete `getid A_0` `getid A_2` | ||||
|
r35727 | 2 new content-divergent changesets | ||
|
r18068 | $ hg log -G --hidden | ||
r35524 | * 3:392fd25390da A_2 | |||
|
r18068 | | | ||
r35524 | | * 2:82623d38b9ba A_1 | |||
|
r18068 | |/ | ||
|
r34852 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] | ||
|
r18068 | |/ | ||
@ 0:d20a80d4def3 base | ||||
|
r18267 | $ hg debugsuccessorssets --hidden 'all()' | ||
|
r18068 | d20a80d4def3 | ||
d20a80d4def3 | ||||
007dc284c1f8 | ||||
|
r18365 | 82623d38b9ba | ||
|
r18069 | 392fd25390da | ||
|
r18068 | 82623d38b9ba | ||
82623d38b9ba | ||||
392fd25390da | ||||
392fd25390da | ||||
|
r33770 | $ hg log -r 'contentdivergent()' | ||
|
r18071 | 2:82623d38b9ba A_1 | ||
3:392fd25390da A_2 | ||||
|
r33274 | $ hg debugsuccessorssets 'all()' --closest | ||
d20a80d4def3 | ||||
d20a80d4def3 | ||||
82623d38b9ba | ||||
82623d38b9ba | ||||
392fd25390da | ||||
392fd25390da | ||||
$ hg debugsuccessorssets 'all()' --closest --hidden | ||||
d20a80d4def3 | ||||
d20a80d4def3 | ||||
007dc284c1f8 | ||||
82623d38b9ba | ||||
392fd25390da | ||||
82623d38b9ba | ||||
82623d38b9ba | ||||
392fd25390da | ||||
392fd25390da | ||||
|
r18068 | $ cd .. | ||
do not take unknown node in account if they are final | ||||
----------------------------------------------------- | ||||
$ newcase final-unknown | ||||
$ hg debugobsolete `getid A_0` `getid A_1` | ||||
|
r33542 | obsoleted 1 changesets | ||
|
r18068 | $ hg debugobsolete `getid A_1` `getid A_2` | ||
|
r33542 | obsoleted 1 changesets | ||
|
r18068 | $ hg debugobsolete `getid A_0` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb | ||
$ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccccccccccccccccccccccccccccccc | ||||
$ hg debugobsolete `getid A_1` dddddddddddddddddddddddddddddddddddddddd | ||||
|
r18267 | $ hg debugsuccessorssets --hidden 'desc('A_0')' | ||
|
r18068 | 007dc284c1f8 | ||
392fd25390da | ||||
|
r33274 | $ hg debugsuccessorssets 'desc('A_0')' --closest | ||
$ hg debugsuccessorssets 'desc('A_0')' --closest --hidden | ||||
007dc284c1f8 | ||||
82623d38b9ba | ||||
|
r18068 | |||
$ cd .. | ||||
divergence that converge again is not divergence anymore | ||||
----------------------------------------------------- | ||||
$ newcase converged_divergence | ||||
$ hg debugobsolete `getid A_0` `getid A_1` | ||||
|
r33542 | obsoleted 1 changesets | ||
|
r18068 | $ hg debugobsolete `getid A_0` `getid A_2` | ||
|
r35727 | 2 new content-divergent changesets | ||
|
r18068 | $ mkcommit A_3 | ||
created new head | ||||
$ hg debugobsolete `getid A_1` `getid A_3` | ||||
|
r33542 | obsoleted 1 changesets | ||
|
r18068 | $ hg debugobsolete `getid A_2` `getid A_3` | ||
|
r33542 | obsoleted 1 changesets | ||
|
r18068 | $ hg log -G --hidden | ||
@ 4:01f36c5a8fda A_3 | ||||
| | ||||
|
r34852 | | x 3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda] | ||
|
r18068 | |/ | ||
|
r34852 | | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] | ||
|
r18068 | |/ | ||
|
r34852 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] | ||
|
r18068 | |/ | ||
o 0:d20a80d4def3 base | ||||
|
r18267 | $ hg debugsuccessorssets --hidden 'all()' | ||
|
r18068 | d20a80d4def3 | ||
d20a80d4def3 | ||||
007dc284c1f8 | ||||
01f36c5a8fda | ||||
82623d38b9ba | ||||
01f36c5a8fda | ||||
392fd25390da | ||||
01f36c5a8fda | ||||
01f36c5a8fda | ||||
01f36c5a8fda | ||||
|
r33770 | $ hg log -r 'contentdivergent()' | ||
|
r33274 | $ hg debugsuccessorssets 'all()' --closest | ||
d20a80d4def3 | ||||
d20a80d4def3 | ||||
01f36c5a8fda | ||||
01f36c5a8fda | ||||
$ hg debugsuccessorssets 'all()' --closest --hidden | ||||
d20a80d4def3 | ||||
d20a80d4def3 | ||||
007dc284c1f8 | ||||
82623d38b9ba | ||||
392fd25390da | ||||
82623d38b9ba | ||||
82623d38b9ba | ||||
392fd25390da | ||||
392fd25390da | ||||
01f36c5a8fda | ||||
01f36c5a8fda | ||||
|
r18068 | $ cd .. | ||
split is not divergences | ||||
----------------------------- | ||||
$ newcase split | ||||
$ hg debugobsolete `getid A_0` `getid A_1` `getid A_2` | ||||
|
r33542 | obsoleted 1 changesets | ||
|
r18068 | $ hg log -G --hidden | ||
o 3:392fd25390da A_2 | ||||
| | ||||
| o 2:82623d38b9ba A_1 | ||||
|/ | ||||
|
r34852 | | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] | ||
|
r18068 | |/ | ||
@ 0:d20a80d4def3 base | ||||
|
r18267 | $ hg debugsuccessorssets --hidden 'all()' | ||
|
r18068 | d20a80d4def3 | ||
d20a80d4def3 | ||||
007dc284c1f8 | ||||
82623d38b9ba 392fd25390da | ||||
82623d38b9ba | ||||
82623d38b9ba | ||||
392fd25390da | ||||
392fd25390da | ||||
|
r33770 | $ hg log -r 'contentdivergent()' | ||
|
r33274 | $ hg debugsuccessorssets 'all()' --closest | ||
d20a80d4def3 | ||||
d20a80d4def3 | ||||
82623d38b9ba | ||||
82623d38b9ba | ||||
392fd25390da | ||||
392fd25390da | ||||
$ hg debugsuccessorssets 'all()' --closest --hidden | ||||
d20a80d4def3 | ||||
d20a80d4def3 | ||||
007dc284c1f8 | ||||
82623d38b9ba 392fd25390da | ||||
82623d38b9ba | ||||
82623d38b9ba | ||||
392fd25390da | ||||
392fd25390da | ||||
|
r18068 | |||
|
r21024 | Even when subsequent rewriting happen | ||
|
r18068 | |||
$ mkcommit A_3 | ||||
created new head | ||||
$ hg debugobsolete `getid A_1` `getid A_3` | ||||
|
r33542 | obsoleted 1 changesets | ||
|
r18068 | $ hg up 0 | ||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ mkcommit A_4 | ||||
created new head | ||||
$ hg debugobsolete `getid A_2` `getid A_4` | ||||
|
r33542 | obsoleted 1 changesets | ||
|
r18068 | $ hg up 0 | ||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ mkcommit A_5 | ||||
created new head | ||||
$ hg debugobsolete `getid A_4` `getid A_5` | ||||
|
r33542 | obsoleted 1 changesets | ||
|
r18068 | $ hg log -G --hidden | ||
@ 6:e442cfc57690 A_5 | ||||
| | ||||
|
r34852 | | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690] | ||
|
r18068 | |/ | ||
| o 4:01f36c5a8fda A_3 | ||||
|/ | ||||
|
r34852 | | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a] | ||
|
r18068 | |/ | ||
|
r34852 | | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] | ||
|
r18068 | |/ | ||
|
r34852 | | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] | ||
|
r18068 | |/ | ||
o 0:d20a80d4def3 base | ||||
|
r18267 | $ hg debugsuccessorssets --hidden 'all()' | ||
|
r18068 | d20a80d4def3 | ||
d20a80d4def3 | ||||
007dc284c1f8 | ||||
01f36c5a8fda e442cfc57690 | ||||
82623d38b9ba | ||||
01f36c5a8fda | ||||
392fd25390da | ||||
e442cfc57690 | ||||
01f36c5a8fda | ||||
01f36c5a8fda | ||||
6a411f0d7a0a | ||||
e442cfc57690 | ||||
e442cfc57690 | ||||
e442cfc57690 | ||||
|
r33274 | $ hg debugsuccessorssets 'all()' --closest | ||
d20a80d4def3 | ||||
d20a80d4def3 | ||||
01f36c5a8fda | ||||
01f36c5a8fda | ||||
e442cfc57690 | ||||
e442cfc57690 | ||||
$ hg debugsuccessorssets 'all()' --closest --hidden | ||||
d20a80d4def3 | ||||
d20a80d4def3 | ||||
007dc284c1f8 | ||||
82623d38b9ba 392fd25390da | ||||
82623d38b9ba | ||||
82623d38b9ba | ||||
392fd25390da | ||||
392fd25390da | ||||
01f36c5a8fda | ||||
01f36c5a8fda | ||||
6a411f0d7a0a | ||||
e442cfc57690 | ||||
e442cfc57690 | ||||
e442cfc57690 | ||||
|
r33770 | $ hg log -r 'contentdivergent()' | ||
|
r18068 | |||
|
r18644 | Check more complex obsolescence graft (with divergence) | ||
|
r18068 | |||
$ mkcommit B_0; hg up 0 | ||||
0 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
$ hg debugobsolete `getid B_0` `getid A_2` | ||||
|
r33542 | obsoleted 1 changesets | ||
|
r18068 | $ mkcommit A_7; hg up 0 | ||
created new head | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ mkcommit A_8; hg up 0 | ||||
created new head | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg debugobsolete `getid A_5` `getid A_7` `getid A_8` | ||||
|
r33542 | obsoleted 1 changesets | ||
|
r18068 | $ mkcommit A_9; hg up 0 | ||
created new head | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg debugobsolete `getid A_5` `getid A_9` | ||||
|
r35727 | 4 new content-divergent changesets | ||
|
r18068 | $ hg log -G --hidden | ||
r35524 | * 10:bed64f5d2f5a A_9 | |||
|
r18068 | | | ||
r35524 | | * 9:14608b260df8 A_8 | |||
|
r18068 | |/ | ||
r35524 | | * 8:7ae126973a96 A_7 | |||
|
r18068 | |/ | ||
|
r34852 | | x 7:3750ebee865d B_0 [rewritten as 3:392fd25390da] | ||
|
r18068 | | | | ||
|
r34852 | | x 6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a; split as 8:7ae126973a96, 9:14608b260df8] | ||
|
r18068 | |/ | ||
|
r34852 | | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690] | ||
|
r18068 | |/ | ||
r35524 | | * 4:01f36c5a8fda A_3 | |||
|
r18068 | |/ | ||
|
r34852 | | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a] | ||
|
r18068 | |/ | ||
|
r34852 | | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] | ||
|
r18068 | |/ | ||
|
r34852 | | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] | ||
|
r18068 | |/ | ||
@ 0:d20a80d4def3 base | ||||
|
r18267 | $ hg debugsuccessorssets --hidden 'all()' | ||
|
r18068 | d20a80d4def3 | ||
d20a80d4def3 | ||||
007dc284c1f8 | ||||
01f36c5a8fda bed64f5d2f5a | ||||
01f36c5a8fda 7ae126973a96 14608b260df8 | ||||
82623d38b9ba | ||||
01f36c5a8fda | ||||
392fd25390da | ||||
bed64f5d2f5a | ||||
7ae126973a96 14608b260df8 | ||||
01f36c5a8fda | ||||
01f36c5a8fda | ||||
6a411f0d7a0a | ||||
bed64f5d2f5a | ||||
7ae126973a96 14608b260df8 | ||||
e442cfc57690 | ||||
bed64f5d2f5a | ||||
7ae126973a96 14608b260df8 | ||||
3750ebee865d | ||||
bed64f5d2f5a | ||||
7ae126973a96 14608b260df8 | ||||
7ae126973a96 | ||||
7ae126973a96 | ||||
14608b260df8 | ||||
14608b260df8 | ||||
bed64f5d2f5a | ||||
bed64f5d2f5a | ||||
|
r33274 | $ hg debugsuccessorssets 'all()' --closest | ||
d20a80d4def3 | ||||
d20a80d4def3 | ||||
01f36c5a8fda | ||||
01f36c5a8fda | ||||
7ae126973a96 | ||||
7ae126973a96 | ||||
14608b260df8 | ||||
14608b260df8 | ||||
bed64f5d2f5a | ||||
bed64f5d2f5a | ||||
$ hg debugsuccessorssets 'all()' --closest --hidden | ||||
d20a80d4def3 | ||||
d20a80d4def3 | ||||
007dc284c1f8 | ||||
82623d38b9ba 392fd25390da | ||||
82623d38b9ba | ||||
82623d38b9ba | ||||
392fd25390da | ||||
392fd25390da | ||||
01f36c5a8fda | ||||
01f36c5a8fda | ||||
6a411f0d7a0a | ||||
e442cfc57690 | ||||
e442cfc57690 | ||||
e442cfc57690 | ||||
3750ebee865d | ||||
392fd25390da | ||||
7ae126973a96 | ||||
7ae126973a96 | ||||
14608b260df8 | ||||
14608b260df8 | ||||
bed64f5d2f5a | ||||
bed64f5d2f5a | ||||
|
r33770 | $ hg log -r 'contentdivergent()' | ||
|
r18071 | 4:01f36c5a8fda A_3 | ||
8:7ae126973a96 A_7 | ||||
9:14608b260df8 A_8 | ||||
10:bed64f5d2f5a A_9 | ||||
|
r18068 | |||
r37725 | $ hg log -r bed64f5d2f5a -T '{whyunstable}\n' | sort | |||
content-divergent: 4:01f36c5a8fda (draft) 8:7ae126973a96 (draft) 9:14608b260df8 (draft) predecessor 007dc284c1f8 | ||||
content-divergent: 8:7ae126973a96 (draft) 9:14608b260df8 (draft) predecessor e442cfc57690 | ||||
$ hg log -r bed64f5d2f5a -T whyunstableshort | sort | ||||
content-divergent: 4:01f36c5a8fda (draft) 8:7ae126973a96 (draft) 9:14608b260df8 (draft) predecessor 007d | ||||
content-divergent: 8:7ae126973a96 (draft) 9:14608b260df8 (draft) predecessor e442 | ||||
$ hg log -r bed64f5d2f5a -T whyunstableshorter | sort | ||||
content-divergent: 01f3 (draft) 7ae1 (draft) 1460 (draft) predecessor 007d | ||||
content-divergent: 7ae1 (draft) 1460 (draft) predecessor e442 | ||||
|
r18068 | fix the divergence | ||
$ mkcommit A_A; hg up 0 | ||||
created new head | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg debugobsolete `getid A_9` `getid A_A` | ||||
|
r33542 | obsoleted 1 changesets | ||
|
r18068 | $ hg debugobsolete `getid A_7` `getid A_A` | ||
|
r33542 | obsoleted 1 changesets | ||
|
r18068 | $ hg debugobsolete `getid A_8` `getid A_A` | ||
|
r33542 | obsoleted 1 changesets | ||
|
r18068 | $ hg log -G --hidden | ||
o 11:a139f71be9da A_A | ||||
| | ||||
|
r34852 | | x 10:bed64f5d2f5a A_9 [rewritten as 11:a139f71be9da] | ||
|
r18068 | |/ | ||
|
r34852 | | x 9:14608b260df8 A_8 [rewritten as 11:a139f71be9da] | ||
|
r18068 | |/ | ||
|
r34852 | | x 8:7ae126973a96 A_7 [rewritten as 11:a139f71be9da] | ||
|
r18068 | |/ | ||
|
r34852 | | x 7:3750ebee865d B_0 [rewritten as 3:392fd25390da] | ||
|
r18068 | | | | ||
|
r34852 | | x 6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a; split as 8:7ae126973a96, 9:14608b260df8] | ||
|
r18068 | |/ | ||
|
r34852 | | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690] | ||
|
r18068 | |/ | ||
| o 4:01f36c5a8fda A_3 | ||||
|/ | ||||
|
r34852 | | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a] | ||
|
r18068 | |/ | ||
|
r34852 | | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] | ||
|
r18068 | |/ | ||
|
r34852 | | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] | ||
|
r18068 | |/ | ||
@ 0:d20a80d4def3 base | ||||
|
r18267 | $ hg debugsuccessorssets --hidden 'all()' | ||
|
r18068 | d20a80d4def3 | ||
d20a80d4def3 | ||||
007dc284c1f8 | ||||
01f36c5a8fda a139f71be9da | ||||
82623d38b9ba | ||||
01f36c5a8fda | ||||
392fd25390da | ||||
a139f71be9da | ||||
01f36c5a8fda | ||||
01f36c5a8fda | ||||
6a411f0d7a0a | ||||
a139f71be9da | ||||
e442cfc57690 | ||||
a139f71be9da | ||||
3750ebee865d | ||||
a139f71be9da | ||||
7ae126973a96 | ||||
a139f71be9da | ||||
14608b260df8 | ||||
a139f71be9da | ||||
bed64f5d2f5a | ||||
a139f71be9da | ||||
a139f71be9da | ||||
a139f71be9da | ||||
|
r33274 | $ hg debugsuccessorssets 'all()' --closest | ||
d20a80d4def3 | ||||
d20a80d4def3 | ||||
01f36c5a8fda | ||||
01f36c5a8fda | ||||
a139f71be9da | ||||
a139f71be9da | ||||
$ hg debugsuccessorssets 'all()' --closest --hidden | ||||
d20a80d4def3 | ||||
d20a80d4def3 | ||||
007dc284c1f8 | ||||
82623d38b9ba 392fd25390da | ||||
82623d38b9ba | ||||
82623d38b9ba | ||||
392fd25390da | ||||
392fd25390da | ||||
01f36c5a8fda | ||||
01f36c5a8fda | ||||
6a411f0d7a0a | ||||
e442cfc57690 | ||||
e442cfc57690 | ||||
e442cfc57690 | ||||
3750ebee865d | ||||
392fd25390da | ||||
7ae126973a96 | ||||
a139f71be9da | ||||
14608b260df8 | ||||
a139f71be9da | ||||
bed64f5d2f5a | ||||
a139f71be9da | ||||
a139f71be9da | ||||
a139f71be9da | ||||
|
r33770 | $ hg log -r 'contentdivergent()' | ||
|
r18068 | |||
r36339 | #if serve | |||
$ hg serve -n test -p $HGPORT -d --pid-file=hg.pid --config web.view=all \ | ||||
> -A access.log -E errors.log | ||||
$ cat hg.pid >> $DAEMON_PIDS | ||||
check an obsolete changeset that was rewritten and also split | ||||
$ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=paper' | egrep 'rewritten|split' | ||||
r36340 | <td>rewritten as <a href="/rev/bed64f5d2f5a?style=paper">bed64f5d2f5a</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span><br> | |||
split as <a href="/rev/7ae126973a96?style=paper">7ae126973a96</a> <a href="/rev/14608b260df8?style=paper">14608b260df8</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> | ||||
r36339 | $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=coal' | egrep 'rewritten|split' | |||
r36340 | <td>rewritten as <a href="/rev/bed64f5d2f5a?style=coal">bed64f5d2f5a</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span><br> | |||
split as <a href="/rev/7ae126973a96?style=coal">7ae126973a96</a> <a href="/rev/14608b260df8?style=coal">14608b260df8</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> | ||||
r36339 | $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=gitweb' | egrep 'rewritten|split' | |||
r36340 | <td>rewritten as <a class="list" href="/rev/bed64f5d2f5a?style=gitweb">bed64f5d2f5a</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> | |||
<td>split as <a class="list" href="/rev/7ae126973a96?style=gitweb">7ae126973a96</a> <a class="list" href="/rev/14608b260df8?style=gitweb">14608b260df8</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> | ||||
r36339 | $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=monoblue' | egrep 'rewritten|split' | |||
r36340 | <dd>rewritten as <a href="/rev/bed64f5d2f5a?style=monoblue">bed64f5d2f5a</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></dd> | |||
<dd>split as <a href="/rev/7ae126973a96?style=monoblue">7ae126973a96</a> <a href="/rev/14608b260df8?style=monoblue">14608b260df8</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></dd> | ||||
r36339 | $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=spartan' | egrep 'rewritten|split' | |||
r36340 | <td class="obsolete">rewritten as <a href="/rev/bed64f5d2f5a?style=spartan">bed64f5d2f5a</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> | |||
<td class="obsolete">split as <a href="/rev/7ae126973a96?style=spartan">7ae126973a96</a> <a href="/rev/14608b260df8?style=spartan">14608b260df8</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> | ||||
r36339 | ||||
$ killdaemons.py | ||||
#endif | ||||
|
r18068 | $ cd .. | ||
|
r18069 | |||
Subset does not diverge | ||||
------------------------------ | ||||
Do not report divergent successors-set if it is a subset of another | ||||
successors-set. (report [A,B] not [A] + [A,B]) | ||||
$ newcase subset | ||||
$ hg debugobsolete `getid A_0` `getid A_2` | ||||
|
r33542 | obsoleted 1 changesets | ||
|
r18069 | $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2` | ||
|
r18267 | $ hg debugsuccessorssets --hidden 'desc('A_0')' | ||
|
r18069 | 007dc284c1f8 | ||
82623d38b9ba 392fd25390da | ||||
|
r33274 | $ hg debugsuccessorssets 'desc('A_0')' --closest | ||
$ hg debugsuccessorssets 'desc('A_0')' --closest --hidden | ||||
007dc284c1f8 | ||||
82623d38b9ba 392fd25390da | ||||
|
r18069 | |||
$ cd .. | ||||
|
r33330 | |||
Use scmutil.cleanupnodes API to create divergence | ||||
$ hg init cleanupnodes | ||||
$ cd cleanupnodes | ||||
$ hg debugdrawdag <<'EOS' | ||||
> B1 B3 B4 | ||||
> | \| | ||||
> A Z | ||||
> EOS | ||||
$ hg update -q B1 | ||||
$ echo 3 >> B | ||||
$ hg commit --amend -m B2 | ||||
$ cat > $TESTTMP/scmutilcleanup.py <<EOF | ||||
> from mercurial import registrar, scmutil | ||||
> cmdtable = {} | ||||
> command = registrar.command(cmdtable) | ||||
> @command('cleanup') | ||||
> def cleanup(ui, repo): | ||||
> def node(expr): | ||||
> unfi = repo.unfiltered() | ||||
> rev = unfi.revs(expr).first() | ||||
> return unfi.changelog.node(rev) | ||||
> with repo.wlock(), repo.lock(), repo.transaction('delayedstrip'): | ||||
> mapping = {node('desc(B1)'): [node('desc(B3)')], | ||||
> node('desc(B3)'): [node('desc(B4)')]} | ||||
> scmutil.cleanupnodes(repo, mapping, 'test') | ||||
> EOF | ||||
$ rm .hg/localtags | ||||
$ hg cleanup --config extensions.t=$TESTTMP/scmutilcleanup.py | ||||
|
r35727 | 2 new content-divergent changesets | ||
|
r33675 | $ hg log -G -T '{rev}:{node|short} {desc} {instabilities}' -r 'sort(all(), topo)' | ||
|
r33651 | @ 5:1a2a9b5b0030 B2 content-divergent | ||
|
r33330 | | | ||
r35524 | | * 4:70d5a63ca112 B4 content-divergent | |||
|
r33330 | | | | ||
| o 1:48b9aae0607f Z | ||||
| | ||||
o 0:426bada5c675 A | ||||
$ hg debugobsolete | ||||
|
r34962 | 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'} | ||||
ad6478fb94ecec98b86daae98722865d494ac561 70d5a63ca112acb3764bc1d7320ca90ea688d671 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'test', 'user': 'test'} | ||||
r36972 | ||||
$ hg debugwhyunstable 1a2a9b5b0030 | ||||
content-divergent: 70d5a63ca112acb3764bc1d7320ca90ea688d671 (draft) predecessor a178212c3433c4e77b573f6011e29affb8aefa33 | ||||
r36973 | ||||
r37722 | $ hg log -r 1a2a9b5b0030 -T '{whyunstable}\n' | |||
r37703 | content-divergent: 4:70d5a63ca112 (draft) predecessor a178212c3433 | |||
r37724 | $ hg log -r 1a2a9b5b0030 -T whyunstableshort | |||
r37723 | content-divergent: 4:70d5a63ca112 (draft) predecessor a178 | |||
r37724 | $ hg log -r 1a2a9b5b0030 -T whyunstableshorter | |||
r37723 | content-divergent: 70d5 (draft) predecessor a178 | |||
r37703 | ||||
r36973 | #if serve | |||
$ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | ||||
$ cat hg.pid >> $DAEMON_PIDS | ||||
check explanation for a content-divergent changeset | ||||
$ get-with-headers.py localhost:$HGPORT 'rev/1a2a9b5b0030?style=paper' | grep divergent: | ||||
<td>content-divergent: <a href="/rev/70d5a63ca112?style=paper">70d5a63ca112</a> (draft) predecessor <a href="/rev/a178212c3433?style=paper">a178212c3433</a></td> | ||||
$ get-with-headers.py localhost:$HGPORT 'rev/1a2a9b5b0030?style=coal' | grep divergent: | ||||
<td>content-divergent: <a href="/rev/70d5a63ca112?style=coal">70d5a63ca112</a> (draft) predecessor <a href="/rev/a178212c3433?style=coal">a178212c3433</a></td> | ||||
r37042 | $ get-with-headers.py localhost:$HGPORT 'rev/1a2a9b5b0030?style=gitweb' | grep divergent: | |||
<td>content-divergent: <a class="list" href="/rev/70d5a63ca112?style=gitweb">70d5a63ca112</a> (draft) predecessor <a class="list" href="/rev/a178212c3433?style=gitweb">a178212c3433</a></td> | ||||
$ get-with-headers.py localhost:$HGPORT 'rev/1a2a9b5b0030?style=monoblue' | grep divergent: | ||||
<dd>content-divergent: <a href="/rev/70d5a63ca112?style=monoblue">70d5a63ca112</a> (draft) predecessor <a href="/rev/a178212c3433?style=monoblue">a178212c3433</a></dd> | ||||
$ get-with-headers.py localhost:$HGPORT 'rev/1a2a9b5b0030?style=spartan' | grep divergent: | ||||
<td class="unstable">content-divergent: <a href="/rev/70d5a63ca112?style=spartan">70d5a63ca112</a> (draft) predecessor <a href="/rev/a178212c3433?style=spartan">a178212c3433</a></td> | ||||
r36973 | ||||
$ killdaemons.py | ||||
#endif | ||||