Mercurial > hg
diff tests/test-phases-exchange.t @ 15650:5b26667fc4d3
phases: exchange phase boundaries on pull
Add an extra argument to addchangegroup to all phase code to execute before the
lock is released.
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Thu, 15 Dec 2011 11:28:42 +0100 |
parents | ce193147f492 |
children | e69a3cdad37e |
line wrap: on
line diff
--- a/tests/test-phases-exchange.t Thu Dec 15 02:18:24 2011 +0100 +++ b/tests/test-phases-exchange.t Thu Dec 15 11:28:42 2011 +0100 @@ -112,6 +112,9 @@ Publish configuration option ---------------------------- +Pull +```` + changegroup are added without phase movement $ hg bundle -a ../base.bundle @@ -137,3 +140,133 @@ 0 1 a-A - 054250a37db4 $ cd .. +Pulling from publish=False to publish=False does not move boundary. + + $ hg init nu + $ cd nu + $ cat > .hg/hgrc << EOF + > [phases] + > publish=0 + > EOF + $ hg pull ../mu -r 54acac6f23ab + pulling from ../mu + adding changesets + adding manifests + adding file changes + added 3 changesets with 3 changes to 3 files + (run 'hg update' to get a working copy) + $ hgph + 2 1 a-C - 54acac6f23ab + 1 1 a-B - 548a3d25dbf0 + 0 1 a-A - 054250a37db4 + +Even for common + + $ hg pull ../mu -r f54f1bb90ff3 + pulling from ../mu + searching for changes + adding changesets + adding manifests + adding file changes + added 1 changesets with 1 changes to 1 files (+1 heads) + (run 'hg heads' to see heads, 'hg merge' to merge) + $ hgph + 3 1 b-A - f54f1bb90ff3 + 2 1 a-C - 54acac6f23ab + 1 1 a-B - 548a3d25dbf0 + 0 1 a-A - 054250a37db4 + + +Pulling from Publish=True to Publish=False move boundary in common set. +we are in nu + + $ hg pull ../alpha -r b555f63b6063 + pulling from ../alpha + searching for changes + adding changesets + adding manifests + adding file changes + added 1 changesets with 1 changes to 1 files + (run 'hg update' to get a working copy) + $ hgph + 4 0 a-D - b555f63b6063 + 3 0 b-A - f54f1bb90ff3 + 2 0 a-C - 54acac6f23ab + 1 0 a-B - 548a3d25dbf0 + 0 0 a-A - 054250a37db4 + +pulling from Publish=False to publish=False with some public + + $ hg up -q f54f1bb90ff3 + $ mkcommit n-A + $ mkcommit n-B + $ hgph + 6 1 n-B - 145e75495359 + 5 1 n-A - d6bcb4f74035 + 4 0 a-D - b555f63b6063 + 3 0 b-A - f54f1bb90ff3 + 2 0 a-C - 54acac6f23ab + 1 0 a-B - 548a3d25dbf0 + 0 0 a-A - 054250a37db4 + $ cd ../mu + $ hg pull ../nu + pulling from ../nu + searching for changes + adding changesets + adding manifests + adding file changes + added 2 changesets with 2 changes to 2 files + (run 'hg update' to get a working copy) + $ hgph + 6 1 n-B - 145e75495359 + 5 1 n-A - d6bcb4f74035 + 4 0 a-D - b555f63b6063 + 3 0 a-C - 54acac6f23ab + 2 0 b-A - f54f1bb90ff3 + 1 0 a-B - 548a3d25dbf0 + 0 0 a-A - 054250a37db4 + $ cd .. + +pulling into publish=True + + $ cd alpha + $ hgph + 4 0 b-A - f54f1bb90ff3 + 3 0 a-D - b555f63b6063 + 2 0 a-C - 54acac6f23ab + 1 0 a-B - 548a3d25dbf0 + 0 0 a-A - 054250a37db4 + $ hg pull ../mu + pulling from ../mu + searching for changes + adding changesets + adding manifests + adding file changes + added 2 changesets with 2 changes to 2 files + (run 'hg update' to get a working copy) + $ hgph + 6 0 n-B - 145e75495359 + 5 0 n-A - d6bcb4f74035 + 4 0 b-A - f54f1bb90ff3 + 3 0 a-D - b555f63b6063 + 2 0 a-C - 54acac6f23ab + 1 0 a-B - 548a3d25dbf0 + 0 0 a-A - 054250a37db4 + $ cd .. + +pulling back into original repo + + $ cd nu + $ hg pull ../alpha + pulling from ../alpha + searching for changes + no changes found + $ hgph + 6 0 n-B - 145e75495359 + 5 0 n-A - d6bcb4f74035 + 4 0 a-D - b555f63b6063 + 3 0 b-A - f54f1bb90ff3 + 2 0 a-C - 54acac6f23ab + 1 0 a-B - 548a3d25dbf0 + 0 0 a-A - 054250a37db4 + $ cd ..