This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3932

tests: add test demonstrating phase loss when cloning (issue5939)
ClosedPublic

Authored by indygreg on Jul 11 2018, 8:15 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG2a227782e754: tests: add test demonstrating phase loss when cloning (issue5939)
Summary

The added tests demonstrate that phases exchange when using the
listkeys based phases exchange fails to preserve public phase in
a certain scenario when a merge is a phase root. Both non-bundle2
and bundle2 prior to the binary phase data part are buggy.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Jul 11 2018, 8:15 PM
indygreg added a subscriber: lothiraldan.Jul 11 2018, 8:17 PM

I don't understand phases code that well and am not sure if I'll be able to contribute a fix for the underlying issue in the next few days. If someone wants to take a shot at it, I could use the help.

CC @lothiraldan

Closed by commit rHG2a227782e754: tests: add test demonstrating phase loss when cloning (issue5939) (authored by indygreg). · Explain WhyJul 13 2018, 9:42 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-phases-exchange.t (178 lines)

Diff 9590

tests/test-phases-exchange.t

$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> drawdag=$TESTDIR/drawdag.py
> phasereport=$TESTDIR/testlib/ext-phase-report.py > phasereport=$TESTDIR/testlib/ext-phase-report.py
> EOF > EOF
$ hgph() { hg log -G --template "{rev} {phase} {desc} - {node|short}\n" $*; } $ hgph() { hg log -G --template "{rev} {phase} {desc} - {node|short}\n" $*; }
$ mkcommit() { $ mkcommit() {
> echo "$1" > "$1" > echo "$1" > "$1"
> hg add "$1" > hg add "$1"
$ hg push -r b555f63b6063 http://localhost:$HGPORT/ $ hg push -r b555f63b6063 http://localhost:$HGPORT/
pushing to http://localhost:$HGPORT/ pushing to http://localhost:$HGPORT/
searching for changes searching for changes
no changes found no changes found
[1] [1]
$ hg phase f54f1bb90ff3 $ hg phase f54f1bb90ff3
2: draft 2: draft
$ killdaemons.py
put the changeset in the draft state again put the changeset in the draft state again
(first test after this one expect to be able to copy) (first test after this one expect to be able to copy)
$ cd .. $ cd ..
Test Clone behavior Test Clone behavior
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
test-debug-phase: new rev 5: x -> 0 test-debug-phase: new rev 5: x -> 0
test-debug-phase: move rev 8: 1 -> 0 test-debug-phase: move rev 8: 1 -> 0
$ hgph Upsilon -r 'min(draft())' $ hgph Upsilon -r 'min(draft())'
o 9 draft a-G - 3e27b6f1eee1 o 9 draft a-G - 3e27b6f1eee1
| |
~ ~
Test phases exchange when a phaseroot is on a merge
$ hg init mergetest
$ cd mergetest
> cat > .hg/hgrc << EOF
> [phases]
> publish = false
> EOF
$ hg debugdrawdag << EOF
> E Z
> |\|
> D Y
> | |
> C X
> |/
> B
> |
> A
> EOF
test-debug-phase: new rev 0: x -> 1
test-debug-phase: new rev 1: x -> 1
test-debug-phase: new rev 2: x -> 1
test-debug-phase: new rev 3: x -> 1
test-debug-phase: new rev 4: x -> 1
test-debug-phase: new rev 5: x -> 1
test-debug-phase: new rev 6: x -> 1
test-debug-phase: new rev 7: x -> 1
$ hg phase --public -r D
test-debug-phase: move rev 0: 1 -> 0
test-debug-phase: move rev 1: 1 -> 0
test-debug-phase: move rev 2: 1 -> 0
test-debug-phase: move rev 4: 1 -> 0
$ hg log -G -T '{shortest(node, 5)} {phase}'
o bb947 draft
|
| o 5ac28 draft
|/|
o | 13b7b draft
| |
| o f5853 public
| |
o | c67c4 draft
| |
| o 26805 public
|/
o 11247 public
|
o 426ba public
$ cd ..
Works with default settings
$ hg -R mergetest serve -p $HGPORT -d --pid-file=hg.pid
$ cat hg.pid >> $DAEMON_PIDS
$ hg clone -U http://localhost:$HGPORT mergetest-normal
requesting all changes
adding changesets
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+1 heads)
new changesets 426bada5c675:bb94757e651a
test-debug-phase: new rev 0: x -> 0
test-debug-phase: new rev 1: x -> 0
test-debug-phase: new rev 2: x -> 0
test-debug-phase: new rev 3: x -> 1
test-debug-phase: new rev 4: x -> 0
test-debug-phase: new rev 5: x -> 1
test-debug-phase: new rev 6: x -> 1
test-debug-phase: new rev 7: x -> 1
$ hg -R mergetest-normal log -G -T '{shortest(node, 5)} {phase}'
o bb947 draft
|
| o 5ac28 draft
|/|
o | 13b7b draft
| |
| o f5853 public
| |
o | c67c4 draft
| |
| o 26805 public
|/
o 11247 public
|
o 426ba public
$ killdaemons.py
With legacy listkeys over bundle2
TODO issue 5939: public phase lost on 26805 and f5853
$ hg -R mergetest --config devel.legacy.exchange=phases serve -p $HGPORT -d --pid-file=hg.pid
$ cat hg.pid >> $DAEMON_PIDS
$ hg clone -U http://localhost:$HGPORT mergetest-nobinarypart
requesting all changes
adding changesets
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+1 heads)
new changesets 426bada5c675:bb94757e651a
test-debug-phase: new rev 0: x -> 0
test-debug-phase: new rev 1: x -> 0
test-debug-phase: new rev 2: x -> 1
test-debug-phase: new rev 3: x -> 1
test-debug-phase: new rev 4: x -> 1
test-debug-phase: new rev 5: x -> 1
test-debug-phase: new rev 6: x -> 1
test-debug-phase: new rev 7: x -> 1
$ hg -R mergetest-nobinarypart log -G -T '{shortest(node, 5)} {phase}'
o bb947 draft
|
| o 5ac28 draft
|/|
o | 13b7b draft
| |
| o f5853 draft
| |
o | c67c4 draft
| |
| o 26805 draft
|/
o 11247 public
|
o 426ba public
$ killdaemons.py
Without bundle2
TODO issue 5939: public phase lost on 26805 and f5853
$ hg -R mergetest serve -p $HGPORT -d --pid-file=hg.pid
$ cat hg.pid >> $DAEMON_PIDS
$ hg --config devel.legacy.exchange=bundle1 clone -U http://localhost:$HGPORT mergetest-bundle1
requesting all changes
adding changesets
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+1 heads)
new changesets 426bada5c675:bb94757e651a
test-debug-phase: new rev 0: x -> 0
test-debug-phase: new rev 1: x -> 0
test-debug-phase: new rev 2: x -> 1
test-debug-phase: new rev 3: x -> 1
test-debug-phase: new rev 4: x -> 1
test-debug-phase: new rev 5: x -> 1
test-debug-phase: new rev 6: x -> 1
test-debug-phase: new rev 7: x -> 1
$ hg -R mergetest-bundle1 log -G -T '{shortest(node, 5)} {phase}'
o bb947 draft
|
| o 5ac28 draft
|/|
o | 13b7b draft
| |
| o f5853 draft
| |
o | c67c4 draft
| |
| o 26805 draft
|/
o 11247 public
|
o 426ba public