# HG changeset patch # User Matt Mackall # Date 1285526601 18000 # Node ID 9f551ca3bb44f47ceb5b2c0c5fce9d3e165dcc7f # Parent da2cfdc33fe8f6b4749e4db07f55f6df608d4905 tests: unify test-mq-qclone-http diff -r da2cfdc33fe8 -r 9f551ca3bb44 tests/test-mq-qclone-http --- a/tests/test-mq-qclone-http Sun Sep 26 13:43:21 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +0,0 @@ -#! /bin/sh - -echo "[extensions]" >> $HGRCPATH -echo "mq=" >> $HGRCPATH - -mkdir webdir -cd webdir - -hg init a -hg --cwd a qinit -c -echo a > a/a -hg --cwd a ci -A -m a -echo b > a/b -hg --cwd a addremove -hg --cwd a qnew -f b.patch -hg --cwd a qcommit -m b.patch - -hg --cwd a log --template "{desc}\n" -hg --cwd a/.hg/patches log --template "{desc}\n" - -root=`pwd` - -cd .. - -echo % test with recursive collection - -cat > collections.conf <> $DAEMON_PIDS - -"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/?style=raw' - -hg qclone http://localhost:$HGPORT/a b -hg --cwd b log --template "{desc}\n" -hg --cwd b qpush -a -hg --cwd b log --template "{desc}\n" - -echo % test with normal collection - -cat > collections1.conf <> $DAEMON_PIDS - -"$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/?style=raw' - -hg qclone http://localhost:$HGPORT1/a c -hg --cwd c log --template "{desc}\n" -hg --cwd c qpush -a -hg --cwd c log --template "{desc}\n" - -echo % test with old-style collection - -cat > collections2.conf <> $DAEMON_PIDS - -"$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/?style=raw' - -hg qclone http://localhost:$HGPORT2/a d -hg --cwd d log --template "{desc}\n" -hg --cwd d qpush -a -hg --cwd d log --template "{desc}\n" - -echo '% test --mq works and uses correct repository config' -hg --cwd d outgoing --mq | sed "s|$HGPORT2|\$HGPORT2|" -hg --cwd d log --mq --template '{rev} {desc|firstline}\n' diff -r da2cfdc33fe8 -r 9f551ca3bb44 tests/test-mq-qclone-http.out --- a/tests/test-mq-qclone-http.out Sun Sep 26 13:43:21 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,85 +0,0 @@ -adding a -adding b -[mq]: b.patch -a -b.patch -% test with recursive collection -200 Script output follows - - -/a/ -/a/.hg/patches/ - -requesting all changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files -requesting all changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 3 changes to 3 files -updating to branch default -3 files updated, 0 files merged, 0 files removed, 0 files unresolved -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -a -applying b.patch -now at: b.patch -imported patch b.patch -a -% test with normal collection -200 Script output follows - - -/a/ -/a/.hg/patches/ - -requesting all changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files -requesting all changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 3 changes to 3 files -updating to branch default -3 files updated, 0 files merged, 0 files removed, 0 files unresolved -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -a -applying b.patch -now at: b.patch -imported patch b.patch -a -% test with old-style collection -200 Script output follows - - -/a/ -/a/.hg/patches/ - -requesting all changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files -requesting all changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 3 changes to 3 files -updating to branch default -3 files updated, 0 files merged, 0 files removed, 0 files unresolved -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -a -applying b.patch -now at: b.patch -imported patch b.patch -a -% test --mq works and uses correct repository config -comparing with http://localhost:$HGPORT2/a/.hg/patches -searching for changes -no changes found -0 b.patch diff -r da2cfdc33fe8 -r 9f551ca3bb44 tests/test-mq-qclone-http.t --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-mq-qclone-http.t Sun Sep 26 13:43:21 2010 -0500 @@ -0,0 +1,149 @@ + + $ echo "[extensions]" >> $HGRCPATH + $ echo "mq=" >> $HGRCPATH + $ mkdir webdir + $ cd webdir + $ hg init a + $ hg --cwd a qinit -c + $ echo a > a/a + $ hg --cwd a ci -A -m a + adding a + $ echo b > a/b + $ hg --cwd a addremove + adding b + $ hg --cwd a qnew -f b.patch + $ hg --cwd a qcommit -m b.patch + $ hg --cwd a log --template "{desc}\n" + [mq]: b.patch + a + $ hg --cwd a/.hg/patches log --template "{desc}\n" + b.patch + $ root=`pwd` + $ cd .. + +test with recursive collection + + $ cat > collections.conf < [paths] + > /=$root/** + > EOF + $ hg serve -p $HGPORT -d --pid-file=hg.pid --webdir-conf collections.conf \ + > -A access-paths.log -E error-paths-1.log + $ cat hg.pid >> $DAEMON_PIDS + $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/?style=raw' + 200 Script output follows + + + /a/ + /a/.hg/patches/ + + $ hg qclone http://localhost:$HGPORT/a b + requesting all changes + adding changesets + adding manifests + adding file changes + added 2 changesets with 2 changes to 2 files + requesting all changes + adding changesets + adding manifests + adding file changes + added 1 changesets with 3 changes to 3 files + updating to branch default + 3 files updated, 0 files merged, 0 files removed, 0 files unresolved + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg --cwd b log --template "{desc}\n" + a + $ hg --cwd b qpush -a + applying b.patch + now at: b.patch + $ hg --cwd b log --template "{desc}\n" + imported patch b.patch + a + +test with normal collection + + $ cat > collections1.conf < [paths] + > /=$root/* + > EOF + $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf collections1.conf \ + > -A access-paths.log -E error-paths-1.log + $ cat hg.pid >> $DAEMON_PIDS + $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/?style=raw' + 200 Script output follows + + + /a/ + /a/.hg/patches/ + + $ hg qclone http://localhost:$HGPORT1/a c + requesting all changes + adding changesets + adding manifests + adding file changes + added 2 changesets with 2 changes to 2 files + requesting all changes + adding changesets + adding manifests + adding file changes + added 1 changesets with 3 changes to 3 files + updating to branch default + 3 files updated, 0 files merged, 0 files removed, 0 files unresolved + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg --cwd c log --template "{desc}\n" + a + $ hg --cwd c qpush -a + applying b.patch + now at: b.patch + $ hg --cwd c log --template "{desc}\n" + imported patch b.patch + a + +test with old-style collection + + $ cat > collections2.conf < [collections] + > $root=$root + > EOF + $ hg serve -p $HGPORT2 -d --pid-file=hg.pid --webdir-conf collections2.conf \ + > -A access-paths.log -E error-paths-1.log + $ cat hg.pid >> $DAEMON_PIDS + $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/?style=raw' + 200 Script output follows + + + /a/ + /a/.hg/patches/ + + $ hg qclone http://localhost:$HGPORT2/a d + requesting all changes + adding changesets + adding manifests + adding file changes + added 2 changesets with 2 changes to 2 files + requesting all changes + adding changesets + adding manifests + adding file changes + added 1 changesets with 3 changes to 3 files + updating to branch default + 3 files updated, 0 files merged, 0 files removed, 0 files unresolved + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg --cwd d log --template "{desc}\n" + a + $ hg --cwd d qpush -a + applying b.patch + now at: b.patch + $ hg --cwd d log --template "{desc}\n" + imported patch b.patch + a + +test --mq works and uses correct repository config + + $ hg --cwd d outgoing --mq + comparing with http://localhost:*/a/.hg/patches (glob) + searching for changes + no changes found + [1] + $ hg --cwd d log --mq --template '{rev} {desc|firstline}\n' + 0 b.patch