##// END OF EJS Templates
Fix income/pull with bundle and -R (issue 820)....
Fix income/pull with bundle and -R (issue 820). Uses ui.setconfig() to tell bundlerepo where the main repo is. This is needed for when the --repository option is used. Adds tests to test-bundle and a new test script test-mq-pull-from-bundle, which plays out the situation that initially made me detect this bug (hg -R .hg/patches pull ../bundle.hg).

File last commit:

r5664:da72b4d2 default
r5664:da72b4d2 default
Show More
test-bundle
117 lines | 2.8 KiB | text/plain | TextLexer
Benoit Boissinot
tests for bundles and bundlerepo
r2274 #!/bin/sh
Alexis S. L. Carvalho
test-bundle: use printenv.py
r4287 cp "$TESTDIR"/printenv.py .
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 echo "====== Setting up test"
Benoit Boissinot
tests for bundles and bundlerepo
r2274 hg init test
cd test
echo 0 > afile
hg add afile
hg commit -m "0.0" -d "1000000 0"
echo 1 >> afile
hg commit -m "0.1" -d "1000000 0"
echo 2 >> afile
hg commit -m "0.2" -d "1000000 0"
echo 3 >> afile
hg commit -m "0.3" -d "1000000 0"
hg update -C 0
echo 1 >> afile
hg commit -m "1.1" -d "1000000 0"
echo 2 >> afile
hg commit -m "1.2" -d "1000000 0"
echo "a line" > fred
echo 3 >> afile
hg add fred
hg commit -m "1.3" -d "1000000 0"
hg mv afile adifferentfile
hg commit -m "1.3m" -d "1000000 0"
hg update -C 3
hg mv afile anotherfile
hg commit -m "0.3m" -d "1000000 0"
hg verify
cd ..
hg init empty
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663
echo "====== Bundle test to full.hg"
Benoit Boissinot
tests for bundles and bundlerepo
r2274 hg -R test bundle full.hg empty
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 echo "====== Unbundle full.hg in test"
Benoit Boissinot
tests for bundles and bundlerepo
r2274 hg -R test unbundle full.hg
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 echo "====== Verify empty"
Benoit Boissinot
tests for bundles and bundlerepo
r2274 hg -R empty heads
hg -R empty verify
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 echo "====== Pull full.hg into test (using --cwd)"
Vadim Gelfer
pull: allow to pull from bundle file without need for bundle: syntax
r2738 hg --cwd test pull ../full.hg
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 echo "====== Pull full.hg into empty (using --cwd)"
Vadim Gelfer
pull: allow to pull from bundle file without need for bundle: syntax
r2738 hg --cwd empty pull ../full.hg
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 echo "====== Rollback empty"
Vadim Gelfer
pull: allow to pull from bundle file without need for bundle: syntax
r2738 hg -R empty rollback
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 echo "====== Pull full.hg into empty again (using --cwd)"
Vadim Gelfer
pull: allow to pull from bundle file without need for bundle: syntax
r2738 hg --cwd empty pull ../full.hg
Peter Arrenbrecht
Fix income/pull with bundle and -R (issue 820)....
r5664 echo "====== Pull full.hg into test (using -R)"
hg -R test pull full.hg
echo "====== Pull full.hg into empty (using -R)"
hg -R empty pull full.hg
echo "====== Rollback empty"
hg -R empty rollback
echo "====== Pull full.hg into empty again (using -R)"
hg -R empty pull full.hg
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 echo "====== Log -R full.hg in fresh empty"
Thomas Arendsen Hein
Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm.
r3988 rm -r empty
Benoit Boissinot
tests for bundles and bundlerepo
r2274 hg init empty
cd empty
hg -R bundle://../full.hg log
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663
echo "====== Pull ../full.hg into empty (with hook)"
Vadim Gelfer
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks...
r2673 echo '[hooks]' >> .hg/hgrc
Alexis S. L. Carvalho
test-bundle: use printenv.py
r4287 echo 'changegroup = python ../printenv.py changegroup' >> .hg/hgrc
Benoit Boissinot
tests for bundles and bundlerepo
r2274 #doesn't work (yet ?)
#hg -R bundle://../full.hg verify
hg pull bundle://../full.hg
cd ..
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 echo "====== Create partial clones"
Thomas Arendsen Hein
Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm.
r3988 rm -r empty
Benoit Boissinot
tests for bundles and bundlerepo
r2274 hg init empty
hg clone -r 3 test partial
hg clone partial partial2
cd partial
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 echo "====== Log -R full.hg in partial"
Benoit Boissinot
tests for bundles and bundlerepo
r2274 hg -R bundle://../full.hg log
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 echo "====== Incoming full.hg in partial"
Benoit Boissinot
tests for bundles and bundlerepo
r2274 hg incoming bundle://../full.hg
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 echo "====== Outgoing -R full.hg vs partial2 in partial"
Benoit Boissinot
tests for bundles and bundlerepo
r2274 hg -R bundle://../full.hg outgoing ../partial2
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 echo "====== Outgoing -R does-not-exist.hg vs partial2 in partial"
Alexis S. L. Carvalho
bundlerepo: avoid exception in __del__ when the bundle doesn't exist...
r3429 hg -R bundle://../does-not-exist.hg outgoing ../partial2
Benoit Boissinot
tests for bundles and bundlerepo
r2274 cd ..
Alexis S. L. Carvalho
add test for 540d1059c802
r4042
Giorgos Keramidas
unbundle: accept multiple file arguments...
r4699 # test for http://www.selenic.com/mercurial/bts/issue216
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 echo "====== Unbundle incremental bundles into fresh empty in one go"
Giorgos Keramidas
unbundle: accept multiple file arguments...
r4699 rm -r empty
hg init empty
hg -R test bundle --base null -r 0 ../0.hg
hg -R test bundle --base 0 -r 1 ../1.hg
hg -R empty unbundle -u ../0.hg ../1.hg
Alexis S. L. Carvalho
add test for 540d1059c802
r4042 # test for 540d1059c802
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 echo "====== test for 540d1059c802"
Alexis S. L. Carvalho
add test for 540d1059c802
r4042 hg init orig
cd orig
echo foo > foo
hg add foo
hg ci -m 'add foo' -d '0 0'
hg clone . ../copy
hg tag -d '0 0' foo
cd ../copy
echo >> foo
hg ci -m 'change foo' -d '0 0'
hg bundle ../bundle.hg ../orig
cd ../orig
hg incoming ../bundle.hg
cd ..