# HG changeset patch # User Eric Hopper # Date 1161155666 18000 # Node ID c8686e3f0291fb77553b053a422c0d84337aef57 # Parent 6ca49c5fe2689008b9947115d0990ffc942338e3 Testing the new changegroupsubset remote function in the ssh and http protocols. diff --git a/tests/test-http-clone-r b/tests/test-http-clone-r new file mode 100755 --- /dev/null +++ b/tests/test-http-clone-r @@ -0,0 +1,78 @@ +#!/bin/sh + +hg init remote +cd remote +echo "# creating 'remote'" +cat >>afile <>afile <>afile <>afile <>afile <>afile <fred <>afile <> $DAEMON_PIDS + +echo "# clone remote via stream" +for i in 0 1 2 3 4 5 6 7 8; do + hg clone -r "$i" http://localhost:20061/ test-"$i" 2>&1 + if cd test-"$i"; then + hg verify + cd .. + fi +done +cd test-8 +hg pull ../test-7 +hg verify +cd .. +cd test-1 +hg pull -r 4 http://localhost:20061/ 2>&1 +hg verify +hg pull http://localhost:20061/ 2>&1 +cd .. +cd test-2 +hg pull -r 5 http://localhost:20061/ 2>&1 +hg verify +hg pull http://localhost:20061/ 2>&1 +hg verify +cd .. diff --git a/tests/test-http-clone-r.out b/tests/test-http-clone-r.out new file mode 100644 --- /dev/null +++ b/tests/test-http-clone-r.out @@ -0,0 +1,183 @@ +# creating 'remote' +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +1 files updated, 0 files merged, 2 files removed, 0 files unresolved + rev offset length base linkrev nodeid p1 p2 + 0 0 3 0 0 362fef284ce2 000000000000 000000000000 + 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000 + 2 8 7 2 2 4c982badb186 125144f7e028 000000000000 + 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000 + rev offset length base linkrev nodeid p1 p2 + 0 0 75 0 7 905359268f77 000000000000 000000000000 + rev offset length base linkrev nodeid p1 p2 + 0 0 75 0 8 905359268f77 000000000000 000000000000 + rev offset length base linkrev nodeid p1 p2 + 0 0 8 0 6 12ab3bcc5ea4 000000000000 000000000000 + rev offset length base linkrev nodeid p1 p2 + 0 0 48 0 0 43eadb1d2d06 000000000000 000000000000 + 1 48 48 1 1 8b89697eba2c 43eadb1d2d06 000000000000 + 2 96 48 2 2 626a32663c2f 8b89697eba2c 000000000000 + 3 144 48 3 3 f54c32f13478 626a32663c2f 000000000000 + 4 192 58 3 6 de68e904d169 626a32663c2f 000000000000 + 5 250 68 3 7 3b45cc2ab868 de68e904d169 000000000000 + 6 318 54 6 8 24d86153a002 f54c32f13478 000000000000 +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +4 files, 9 changesets, 7 total revisions +# Starting server +# clone remote via stream +requesting all changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +1 files, 1 changesets, 1 total revisions +requesting all changes +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +1 files, 2 changesets, 2 total revisions +requesting all changes +adding changesets +adding manifests +adding file changes +added 3 changesets with 3 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +1 files, 3 changesets, 3 total revisions +requesting all changes +adding changesets +adding manifests +adding file changes +added 4 changesets with 4 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +1 files, 4 changesets, 4 total revisions +requesting all changes +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +1 files, 2 changesets, 2 total revisions +requesting all changes +adding changesets +adding manifests +adding file changes +added 3 changesets with 3 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +1 files, 3 changesets, 3 total revisions +requesting all changes +adding changesets +adding manifests +adding file changes +added 4 changesets with 5 changes to 2 files +2 files updated, 0 files merged, 0 files removed, 0 files unresolved +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +2 files, 4 changesets, 5 total revisions +requesting all changes +adding changesets +adding manifests +adding file changes +added 5 changesets with 6 changes to 3 files +2 files updated, 0 files merged, 0 files removed, 0 files unresolved +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +3 files, 5 changesets, 6 total revisions +requesting all changes +adding changesets +adding manifests +adding file changes +added 5 changesets with 5 changes to 2 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +2 files, 5 changesets, 5 total revisions +pulling from ../test-7 +searching for changes +adding changesets +adding manifests +adding file changes +added 4 changesets with 2 changes to 3 files (+1 heads) +(run 'hg heads' to see heads, 'hg merge' to merge) +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +4 files, 9 changesets, 7 total revisions +pulling from http://localhost:20061/ +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 0 changes to 1 files (+1 heads) +(run 'hg heads' to see heads, 'hg merge' to merge) +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +1 files, 3 changesets, 2 total revisions +pulling from http://localhost:20061/ +searching for changes +adding changesets +adding manifests +adding file changes +added 6 changesets with 5 changes to 4 files +(run 'hg update' to get a working copy) +pulling from http://localhost:20061/ +searching for changes +adding changesets +adding manifests +adding file changes +added 2 changesets with 0 changes to 1 files (+1 heads) +(run 'hg heads' to see heads, 'hg merge' to merge) +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +1 files, 5 changesets, 3 total revisions +pulling from http://localhost:20061/ +searching for changes +adding changesets +adding manifests +adding file changes +added 4 changesets with 4 changes to 4 files +(run 'hg update' to get a working copy) +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +4 files, 9 changesets, 7 total revisions diff --git a/tests/test-ssh-clone-r b/tests/test-ssh-clone-r new file mode 100755 --- /dev/null +++ b/tests/test-ssh-clone-r @@ -0,0 +1,99 @@ +#!/bin/sh + +# This test tries to exercise the ssh functionality with a dummy script + +cat <<'EOF' > dummyssh +#!/bin/sh +# this attempts to deal with relative pathnames +cd `dirname $0` + +# check for proper args +if [ $1 != "user@dummy" ] ; then + exit -1 +fi + +# check that we're in the right directory +if [ ! -x dummyssh ] ; then + exit -1 +fi + +SSH_CLIENT='127.0.0.1 1 2' +export SSH_CLIENT +echo Got arguments 1:$1 2:$2 3:$3 4:$4 5:$5 >> dummylog +$2 +EOF +chmod +x dummyssh + +hg init remote +cd remote +echo "# creating 'remote'" +cat >>afile <>afile <>afile <>afile <>afile <>afile <fred <>afile <&1 + if cd test-"$i"; then + hg verify + cd .. + fi +done +cd test-8 +hg pull ../test-7 +hg verify +cd .. +cd test-1 +hg pull -e ../dummyssh -r 4 ssh://user@dummy/remote 2>&1 +hg verify +hg pull -e ../dummyssh ssh://user@dummy/remote 2>&1 +cd .. +cd test-2 +hg pull -e ../dummyssh -r 5 ssh://user@dummy/remote 2>&1 +hg verify +hg pull -e ../dummyssh ssh://user@dummy/remote 2>&1 +hg verify +cd .. diff --git a/tests/test-ssh-clone-r.out b/tests/test-ssh-clone-r.out new file mode 100644 --- /dev/null +++ b/tests/test-ssh-clone-r.out @@ -0,0 +1,182 @@ +# creating 'remote' +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +1 files updated, 0 files merged, 2 files removed, 0 files unresolved + rev offset length base linkrev nodeid p1 p2 + 0 0 3 0 0 362fef284ce2 000000000000 000000000000 + 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000 + 2 8 7 2 2 4c982badb186 125144f7e028 000000000000 + 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000 + rev offset length base linkrev nodeid p1 p2 + 0 0 75 0 7 905359268f77 000000000000 000000000000 + rev offset length base linkrev nodeid p1 p2 + 0 0 75 0 8 905359268f77 000000000000 000000000000 + rev offset length base linkrev nodeid p1 p2 + 0 0 8 0 6 12ab3bcc5ea4 000000000000 000000000000 + rev offset length base linkrev nodeid p1 p2 + 0 0 48 0 0 43eadb1d2d06 000000000000 000000000000 + 1 48 48 1 1 8b89697eba2c 43eadb1d2d06 000000000000 + 2 96 48 2 2 626a32663c2f 8b89697eba2c 000000000000 + 3 144 48 3 3 f54c32f13478 626a32663c2f 000000000000 + 4 192 58 3 6 de68e904d169 626a32663c2f 000000000000 + 5 250 68 3 7 3b45cc2ab868 de68e904d169 000000000000 + 6 318 54 6 8 24d86153a002 f54c32f13478 000000000000 +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +4 files, 9 changesets, 7 total revisions +# clone remote via stream +requesting all changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +1 files, 1 changesets, 1 total revisions +requesting all changes +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +1 files, 2 changesets, 2 total revisions +requesting all changes +adding changesets +adding manifests +adding file changes +added 3 changesets with 3 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +1 files, 3 changesets, 3 total revisions +requesting all changes +adding changesets +adding manifests +adding file changes +added 4 changesets with 4 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +1 files, 4 changesets, 4 total revisions +requesting all changes +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +1 files, 2 changesets, 2 total revisions +requesting all changes +adding changesets +adding manifests +adding file changes +added 3 changesets with 3 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +1 files, 3 changesets, 3 total revisions +requesting all changes +adding changesets +adding manifests +adding file changes +added 4 changesets with 5 changes to 2 files +2 files updated, 0 files merged, 0 files removed, 0 files unresolved +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +2 files, 4 changesets, 5 total revisions +requesting all changes +adding changesets +adding manifests +adding file changes +added 5 changesets with 6 changes to 3 files +2 files updated, 0 files merged, 0 files removed, 0 files unresolved +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +3 files, 5 changesets, 6 total revisions +requesting all changes +adding changesets +adding manifests +adding file changes +added 5 changesets with 5 changes to 2 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +2 files, 5 changesets, 5 total revisions +pulling from ../test-7 +searching for changes +adding changesets +adding manifests +adding file changes +added 4 changesets with 2 changes to 3 files (+1 heads) +(run 'hg heads' to see heads, 'hg merge' to merge) +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +4 files, 9 changesets, 7 total revisions +pulling from ssh://user@dummy/remote +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 0 changes to 1 files (+1 heads) +(run 'hg heads' to see heads, 'hg merge' to merge) +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +1 files, 3 changesets, 2 total revisions +pulling from ssh://user@dummy/remote +searching for changes +adding changesets +adding manifests +adding file changes +added 6 changesets with 5 changes to 4 files +(run 'hg update' to get a working copy) +pulling from ssh://user@dummy/remote +searching for changes +adding changesets +adding manifests +adding file changes +added 2 changesets with 0 changes to 1 files (+1 heads) +(run 'hg heads' to see heads, 'hg merge' to merge) +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +1 files, 5 changesets, 3 total revisions +pulling from ssh://user@dummy/remote +searching for changes +adding changesets +adding manifests +adding file changes +added 4 changesets with 4 changes to 4 files +(run 'hg update' to get a working copy) +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +4 files, 9 changesets, 7 total revisions