mercurial: comparison tests/test-phases-exchange.t

equal deleted inserted replaced

-:cf694e6422f0
+:67a3204c83c1
 #require killdaemons
+$ cat >> $HGRCPATH << EOF
+> [extensions]
+> phasereport=$TESTDIR/testlib/ext-phase-report.py
+> EOF
 $ hgph() { hg log -G --template "{rev} {phase} {desc} - {node|short}\n" $*; }
 $ mkcommit() {
 >    echo "$1" > "$1"
 > }
 $ hg init alpha
 $ cd alpha
 $ mkcommit a-A
+test-debug-phase: new rev 0:  x -> 1
 $ mkcommit a-B
+test-debug-phase: new rev 1:  x -> 1
 $ mkcommit a-C
+test-debug-phase: new rev 2:  x -> 1
 $ mkcommit a-D
+test-debug-phase: new rev 3:  x -> 1
 $ hgph
 @  3 draft a-D - b555f63b6063
 |
 o  2 draft a-C - 54acac6f23ab
 |
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 2 files
+test-debug-phase: new rev 0:  x -> 0
+test-debug-phase: new rev 1:  x -> 0
+test-debug-phase: move rev 0: 1 -> 0
+test-debug-phase: move rev 1: 1 -> 0
 $ hgph
 @  3 draft a-D - b555f63b6063
 |
 o  2 draft a-C - 54acac6f23ab
 |
 |
 o  0 public a-A - 054250a37db4
 $ hg up -q
 $ mkcommit b-A
+test-debug-phase: new rev 2:  x -> 1
 $ hgph
 @  2 draft b-A - f54f1bb90ff3
 |
 o  1 public a-B - 548a3d25dbf0
 |
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 2 files (+1 heads)
+test-debug-phase: new rev 3:  x -> 0
+test-debug-phase: new rev 4:  x -> 0
 (run 'hg heads' to see heads, 'hg merge' to merge)
 $ hgph
 o  4 public a-D - b555f63b6063
 |
 o  3 public a-C - 54acac6f23ab
 $ hg push -r 2 ../beta
 pushing to ../beta
 searching for changes
 no changes found
+test-debug-phase: move rev 2: 1 -> 0
 [1]
 $ hgph
 @  3 draft a-D - b555f63b6063
 |
 o  2 public a-C - 54acac6f23ab
 $ hg push ../beta
 pushing to ../beta
 searching for changes
 no changes found
+test-debug-phase: move rev 3: 1 -> 0
 [1]
 $ hgph
 @  3 public a-D - b555f63b6063
 |
 o  2 public a-C - 54acac6f23ab
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
+test-debug-phase: new rev 4:  x -> 0
 (run 'hg heads' to see heads, 'hg merge' to merge)
 $ cd ../beta
 $ hgph # not updated by remote pull
 o  4 public a-D - b555f63b6063
 $ hg pull ../alpha
 pulling from ../alpha
 searching for changes
 no changes found
+test-debug-phase: move rev 2: 1 -> 0
 $ hgph
 o  4 public a-D - b555f63b6063
 |
 o  3 public a-C - 54acac6f23ab
 |
 $ hg unbundle ../base.bundle
 adding changesets
 adding manifests
 adding file changes
 added 5 changesets with 5 changes to 5 files (+1 heads)
+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
 (run 'hg heads' to see heads, 'hg merge' to merge)
 $ hgph
 o  4 draft a-D - b555f63b6063
 |
 o  3 draft a-C - 54acac6f23ab
 pulling from ../mu
 adding changesets
 adding manifests
 adding file changes
 added 3 changesets with 3 changes to 3 files
+test-debug-phase: new rev 0:  x -> 1
+test-debug-phase: new rev 1:  x -> 1
+test-debug-phase: new rev 2:  x -> 1
 (run 'hg update' to get a working copy)
 $ hgph
 o  2 draft a-C - 54acac6f23ab
 |
 o  1 draft a-B - 548a3d25dbf0
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
+test-debug-phase: new rev 3:  x -> 1
 (run 'hg heads' to see heads, 'hg merge' to merge)
 $ hgph
 o  3 draft b-A - f54f1bb90ff3
 |
 | o  2 draft a-C - 54acac6f23ab
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
+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: new rev 4:  x -> 0
 (run 'hg update' to get a working copy)
 $ hgph # f54f1bb90ff3 stay draft, not ancestor of -r
 o  4 public a-D - b555f63b6063
 |
 | o  3 draft b-A - f54f1bb90ff3
 pulling from Publish=False to publish=False with some public
 $ hg up -q f54f1bb90ff3
 $ mkcommit n-A
+test-debug-phase: new rev 5:  x -> 1
 $ mkcommit n-B
+test-debug-phase: new rev 6:  x -> 1
 $ hgph
 @  6 draft n-B - 145e75495359
 |
 o  5 draft n-A - d6bcb4f74035
 |
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 2 files
+test-debug-phase: move rev 0: 1 -> 0
+test-debug-phase: move rev 1: 1 -> 0
+test-debug-phase: move rev 3: 1 -> 0
+test-debug-phase: move rev 4: 1 -> 0
+test-debug-phase: new rev 5:  x -> 1
+test-debug-phase: new rev 6:  x -> 1
 (run 'hg update' to get a working copy)
 $ hgph
 o  6 draft n-B - 145e75495359
 |
 o  5 draft n-A - d6bcb4f74035
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 2 files
+test-debug-phase: new rev 5:  x -> 1
+test-debug-phase: new rev 6:  x -> 1
 (run 'hg update' to get a working copy)
 $ hgph
 o  6 draft n-B - 145e75495359
 |
 o  5 draft n-A - d6bcb4f74035
 $ cd nu
 $ hg pull ../alpha
 pulling from ../alpha
 searching for changes
 no changes found
+test-debug-phase: move rev 3: 1 -> 0
+test-debug-phase: move rev 5: 1 -> 0
+test-debug-phase: move rev 6: 1 -> 0
 $ hgph
 @  6 public n-B - 145e75495359
 |
 o  5 public n-A - d6bcb4f74035
 |
 $ hg push ../alpha # from nu
 pushing to ../alpha
 searching for changes
 no changes found
+test-debug-phase: move rev 5: 1 -> 0
+test-debug-phase: move rev 6: 1 -> 0
 [1]
 $ cd ..
 $ cd alpha
 $ hgph
 o  6 public n-B - 145e75495359
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     a-A
 $ mkcommit a-E
+test-debug-phase: new rev 7:  x -> 1
 $ mkcommit a-F
+test-debug-phase: new rev 8:  x -> 1
 $ mkcommit a-G
+test-debug-phase: new rev 9:  x -> 1
 $ hg up d6bcb4f74035 -q
 $ mkcommit a-H
+test-debug-phase: new rev 10:  x -> 1
 created new head
 $ hgph
 @  10 draft a-H - 967b449fbc94
 |
 | o  9 draft a-G - 3e27b6f1eee1
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 2 files
+test-debug-phase: new rev 7:  x -> 1
+test-debug-phase: new rev 8:  x -> 1
 $ hgph
 @  10 draft a-H - 967b449fbc94
 |
 | o  9 draft a-G - 3e27b6f1eee1
 | |
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 2 files
+test-debug-phase: new rev 5:  x -> 0
+test-debug-phase: new rev 6:  x -> 0
+test-debug-phase: move rev 7: 1 -> 0
+test-debug-phase: move rev 8: 1 -> 0
 $ hgph # again f54f1bb90ff3, d6bcb4f74035 and 145e75495359 stay draft,
 >      # not ancestor of -r
 o  8 public a-F - b740e3e5c05d
 |
 o  7 public a-E - e9f537e46dea
 $ cd ../beta
 $ hg push ../alpha
 pushing to ../alpha
 searching for changes
 no changes found
+test-debug-phase: move rev 7: 1 -> 0
+test-debug-phase: move rev 8: 1 -> 0
 [1]
 $ hgph
 o  6 public a-F - b740e3e5c05d
 |
 o  5 public a-E - e9f537e46dea
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
+test-debug-phase: move rev 2: 1 -> 0
+test-debug-phase: move rev 5: 1 -> 0
+test-debug-phase: new rev 9:  x -> 1
 $ hgph
 @  10 draft a-H - 967b449fbc94
 |
 | o  9 draft a-G - 3e27b6f1eee1
 | |
 (in mu)
 $ hg push ../alpha
 pushing to ../alpha
 searching for changes
 no changes found
+test-debug-phase: move rev 10: 1 -> 0
+test-debug-phase: move rev 6: 1 -> 0
+test-debug-phase: move rev 9: 1 -> 0
 [1]
 $ hgph
 o  9 public a-H - 967b449fbc94
 |
 | o  8 public a-F - b740e3e5c05d
 (reset some stat on remote repo to avoid confusing other tests)
 $ hg -R ../alpha --config extensions.strip= strip --no-backup 967b449fbc94
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 $ hg phase --force --draft b740e3e5c05d 967b449fbc94
+test-debug-phase: move rev 8: 0 -> 1
+test-debug-phase: move rev 9: 0 -> 1
 $ hg push -fv ../alpha
 pushing to ../alpha
 searching for changes
 1 changesets found
 uncompressed size of bundle content:
 131  a-H
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
+test-debug-phase: new rev 10:  x -> 0
+test-debug-phase: move rev 8: 1 -> 0
+test-debug-phase: move rev 9: 1 -> 0
 $ hgph
 o  9 public a-H - 967b449fbc94
 |
 | o  8 public a-F - b740e3e5c05d
 | |
 - should make it non-secret
 $ cd ../alpha
 $ mkcommit A-secret --config phases.new-commit=2
+test-debug-phase: new rev 11:  x -> 2
 $ hgph
 @  11 secret A-secret - 435b5d83910c
 |
 o  10 public a-H - 967b449fbc94
 |
 $ hg -R ../mu unbundle ../secret-bundle.hg
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
+test-debug-phase: new rev 10:  x -> 1
 (run 'hg update' to get a working copy)
 $ hgph -R ../mu
 o  10 draft A-secret - 435b5d83910c
 |
 o  9 public a-H - 967b449fbc94
 $ hg pull ../mu
 pulling from ../mu
 searching for changes
 no changes found
+test-debug-phase: move rev 11: 2 -> 1
 $ hgph
 @  11 draft A-secret - 435b5d83910c
 |
 o  10 public a-H - 967b449fbc94
 |
 pushing a locally public and draft changesets remotely secret should make them
 appear on the remote side.
 $ hg -R ../mu phase --secret --force 967b449fbc94
+test-debug-phase: move rev 9: 0 -> 2
+test-debug-phase: move rev 10: 1 -> 2
 $ hg push -r 435b5d83910c ../mu
 pushing to ../mu
 searching for changes
 abort: push creates new remote head 435b5d83910c!
 (merge or see 'hg help push' for details about pushing new heads)
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 0 changesets with 0 changes to 2 files
+test-debug-phase: move rev 9: 2 -> 0
+test-debug-phase: move rev 10: 2 -> 1
 $ hgph -R ../mu
 o  10 draft A-secret - 435b5d83910c
 |
 o  9 public a-H - 967b449fbc94
 |
 pull new changeset with common draft locally
 $ hg up -q 967b449fbc94 # create a new root for draft
 $ mkcommit 'alpha-more'
+test-debug-phase: new rev 12:  x -> 1
 created new head
 $ hg push -fr . ../mu
 pushing to ../mu
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
+test-debug-phase: new rev 11:  x -> 1
 $ cd ../mu
 $ hg phase --secret --force 1c5cfd894796
+test-debug-phase: move rev 11: 1 -> 2
 $ hg up -q 435b5d83910c
 $ mkcommit 'mu-more'
+test-debug-phase: new rev 12:  x -> 1
 $ cd ../alpha
 $ hg pull ../mu
 pulling from ../mu
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
+test-debug-phase: new rev 13:  x -> 1
 (run 'hg update' to get a working copy)
 $ hgph
 o  13 draft mu-more - 5237fb433fc8
 |
 | @  12 draft alpha-more - 1c5cfd894796
 Test that test are properly ignored on remote event when existing locally
 $ cd ..
 $ hg clone -qU -r b555f63b6063 -r f54f1bb90ff3 beta gamma
+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 -> 0
+test-debug-phase: new rev 4:  x -> 0
 # pathological case are
 #
 # * secret remotely
 # * known locally
 # * repo have uncommon changeset
 $ hg -R beta phase --secret --force f54f1bb90ff3
+test-debug-phase: move rev 2: 0 -> 2
 $ hg -R gamma phase --draft --force f54f1bb90ff3
+test-debug-phase: move rev 2: 0 -> 1
 $ cd gamma
 $ hg pull ../beta
 pulling from ../beta
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 2 files
+test-debug-phase: new rev 5:  x -> 0
+test-debug-phase: new rev 6:  x -> 0
 (run 'hg update' to get a working copy)
 $ hg phase f54f1bb90ff3
 2: draft
 same over the wire
 (Phase should be preserved)
 # make sure there is no secret so we can use a copy clone
 $ hg -R mu phase --draft 'secret()'
+test-debug-phase: move rev 11: 2 -> 1
 $ hg clone -U mu Tau
 $ hgph -R Tau
 o  12 draft mu-more - 5237fb433fc8
 |
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 14 changesets with 14 changes to 14 files (+3 heads)
+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 -> 0
+test-debug-phase: new rev 4:  x -> 0
+test-debug-phase: new rev 5:  x -> 0
+test-debug-phase: new rev 6:  x -> 0
+test-debug-phase: new rev 7:  x -> 0
+test-debug-phase: new rev 8:  x -> 0
+test-debug-phase: new rev 9:  x -> 0
+test-debug-phase: new rev 10:  x -> 0
+test-debug-phase: new rev 11:  x -> 0
+test-debug-phase: new rev 12:  x -> 0
+test-debug-phase: new rev 13:  x -> 0
 $ chmod -R +w .hg
 2. Test that failed phases movement are reported
 $ hg phase --force --draft 3
+test-debug-phase: move rev 3: 0 -> 1
+test-debug-phase: move rev 7: 0 -> 1
+test-debug-phase: move rev 8: 0 -> 1
+test-debug-phase: move rev 9: 0 -> 1
 $ chmod -R -w .hg
 $ hg push ../Phi
 pushing to ../Phi
 searching for changes
 no changes found
 Test that clone behaves like pull and doesn't
 publish changesets as plain push does
 $ hg -R Upsilon phase -q --force --draft 2
+test-debug-phase: move rev 2: 0 -> 1
 $ hg clone -q Upsilon Pi -r 7
+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 -> 0
+test-debug-phase: new rev 4:  x -> 0
 $ hgph Upsilon -r 'min(draft())'
 o  2 draft a-C - 54acac6f23ab
 |
 ~
 $ hg -R Upsilon push Pi -r 7
 pushing to Pi
 searching for changes
 no changes found
+test-debug-phase: move rev 2: 1 -> 0
+test-debug-phase: move rev 3: 1 -> 0
+test-debug-phase: move rev 7: 1 -> 0
 [1]
 $ hgph Upsilon -r 'min(draft())'
 o  8 draft a-F - b740e3e5c05d
 |
 ~
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
+test-debug-phase: new rev 5:  x -> 0
+test-debug-phase: move rev 8: 1 -> 0
 $ hgph Upsilon -r 'min(draft())'
 o  9 draft a-G - 3e27b6f1eee1
 |
 ~

changeset 33459	67a3204c83c1
parent 30211	6b0741d6d234
child 33508	d09de637cbc8