Add output markers to test-bundle so it's easier to spot the source of
output diffs.
--- a/tests/test-bundle Mon Dec 10 12:16:59 2007 -0600
+++ b/tests/test-bundle Sat Nov 03 11:11:13 2007 +0100
@@ -2,6 +2,7 @@
cp "$TESTDIR"/printenv.py .
+echo "====== Setting up test"
hg init test
cd test
echo 0 > afile
@@ -30,20 +31,31 @@
hg verify
cd ..
hg init empty
+
+echo "====== Bundle test to full.hg"
hg -R test bundle full.hg empty
+echo "====== Unbundle full.hg in test"
hg -R test unbundle full.hg
+echo "====== Verify empty"
hg -R empty heads
hg -R empty verify
+echo "====== Pull full.hg into test (using --cwd)"
hg --cwd test pull ../full.hg
+echo "====== Pull full.hg into empty (using --cwd)"
hg --cwd empty pull ../full.hg
+echo "====== Rollback empty"
hg -R empty rollback
+echo "====== Pull full.hg into empty again (using --cwd)"
hg --cwd empty pull ../full.hg
+echo "====== Log -R full.hg in fresh empty"
rm -r empty
hg init empty
cd empty
hg -R bundle://../full.hg log
+
+echo "====== Pull ../full.hg into empty (with hook)"
echo '[hooks]' >> .hg/hgrc
echo 'changegroup = python ../printenv.py changegroup' >> .hg/hgrc
#doesn't work (yet ?)
@@ -51,18 +63,24 @@
hg pull bundle://../full.hg
cd ..
+echo "====== Create partial clones"
rm -r empty
hg init empty
hg clone -r 3 test partial
hg clone partial partial2
cd partial
+echo "====== Log -R full.hg in partial"
hg -R bundle://../full.hg log
+echo "====== Incoming full.hg in partial"
hg incoming bundle://../full.hg
+echo "====== Outgoing -R full.hg vs partial2 in partial"
hg -R bundle://../full.hg outgoing ../partial2
+echo "====== Outgoing -R does-not-exist.hg vs partial2 in partial"
hg -R bundle://../does-not-exist.hg outgoing ../partial2
cd ..
# test for http://www.selenic.com/mercurial/bts/issue216
+echo "====== Unbundle incremental bundles into fresh empty in one go"
rm -r empty
hg init empty
hg -R test bundle --base null -r 0 ../0.hg
@@ -70,6 +88,7 @@
hg -R empty unbundle -u ../0.hg ../1.hg
# test for 540d1059c802
+echo "====== test for 540d1059c802"
hg init orig
cd orig
echo foo > foo
--- a/tests/test-bundle.out Mon Dec 10 12:16:59 2007 -0600
+++ b/tests/test-bundle.out Sat Nov 03 11:11:13 2007 +0100
@@ -1,3 +1,4 @@
+====== Setting up test
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
checking changesets
@@ -5,12 +6,15 @@
crosschecking files in changesets and manifests
checking files
4 files, 9 changesets, 7 total revisions
+====== Bundle test to full.hg
searching for changes
+====== Unbundle full.hg in test
adding changesets
adding manifests
adding file changes
added 0 changesets with 0 changes to 4 files
(run 'hg update' to get a working copy)
+====== Verify empty
changeset: -1:000000000000
tag: tip
user:
@@ -21,9 +25,11 @@
crosschecking files in changesets and manifests
checking files
0 files, 0 changesets, 0 total revisions
+====== Pull full.hg into test (using --cwd)
pulling from ../full.hg
searching for changes
no changes found
+====== Pull full.hg into empty (using --cwd)
pulling from ../full.hg
requesting all changes
adding changesets
@@ -31,7 +37,9 @@
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
+====== Rollback empty
rolling back last transaction
+====== Pull full.hg into empty again (using --cwd)
pulling from ../full.hg
requesting all changes
adding changesets
@@ -39,6 +47,7 @@
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
+====== Log -R full.hg in fresh empty
changeset: 8:836ac62537ab
tag: tip
parent: 3:ac69c658229d
@@ -87,6 +96,7 @@
date: Mon Jan 12 13:46:40 1970 +0000
summary: 0.0
+====== Pull ../full.hg into empty (with hook)
changegroup hook: HG_NODE=5649c9d34dd87d0ecb5fd39672128376e83b22e1 HG_SOURCE=pull HG_URL=bundle:../full.hg
pulling from bundle://../full.hg
requesting all changes
@@ -95,6 +105,7 @@
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
+====== Create partial clones
requesting all changes
adding changesets
adding manifests
@@ -102,6 +113,7 @@
added 4 changesets with 4 changes to 1 files
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+====== Log -R full.hg in partial
changeset: 8:836ac62537ab
tag: tip
parent: 3:ac69c658229d
@@ -150,6 +162,7 @@
date: Mon Jan 12 13:46:40 1970 +0000
summary: 0.0
+====== Incoming full.hg in partial
comparing with bundle://../full.hg
searching for changes
changeset: 4:5f4f3ceb285e
@@ -180,6 +193,7 @@
date: Mon Jan 12 13:46:40 1970 +0000
summary: 0.3m
+====== Outgoing -R full.hg vs partial2 in partial
comparing with ../partial2
searching for changes
changeset: 4:5f4f3ceb285e
@@ -210,7 +224,9 @@
date: Mon Jan 12 13:46:40 1970 +0000
summary: 0.3m
+====== Outgoing -R does-not-exist.hg vs partial2 in partial
abort: No such file or directory: ../does-not-exist.hg
+====== Unbundle incremental bundles into fresh empty in one go
adding changesets
adding manifests
adding file changes
@@ -220,6 +236,7 @@
adding file changes
added 1 changesets with 1 changes to 1 files
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+====== test for 540d1059c802
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
searching for changes
comparing with ../bundle.hg