# HG changeset patch # User Matt Mackall <mpm@selenic.com> # Date 1285526689 18000 # Sun Sep 26 13:44:49 2010 -0500 # Node ID 9792013e2f5345abbf683dddd7e42ba5d0276290 # Parent 95b4af4eaa06eec73bcf0609f871c7d31e625f20 tests: unify test-share diff --git a/tests/test-share.out b/tests/test-share.out deleted file mode 100644 --- a/tests/test-share.out +++ /dev/null @@ -1,53 +0,0 @@ -% prepare repo1 -adding a -% share it -updating working directory -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -% contents of repo2/.hg -pass: .hg/store does not exist -$HGTMP/test-share/repo1/.hg -% commit in shared clone -% check original -changeset: 1:8af4dc49db9e -tag: tip -user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: change in shared clone - -changeset: 0:d3873e73d99e -user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: init - -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -a -a -% commit in original -adding b -% check in shared clone -changeset: 2:c2e0ac586386 -tag: tip -user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: another file - -changeset: 1:8af4dc49db9e -user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: change in shared clone - -changeset: 0:d3873e73d99e -user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: init - -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -b -% hg serve shared clone -200 Script output follows - - --rw-r--r-- 4 a --rw-r--r-- 2 b - - diff --git a/tests/test-share b/tests/test-share.t old mode 100755 new mode 100644 rename from tests/test-share rename to tests/test-share.t --- a/tests/test-share +++ b/tests/test-share.t @@ -1,48 +1,99 @@ -#!/bin/sh -echo "[extensions]" >> $HGRCPATH -echo "share = " >> $HGRCPATH + $ echo "[extensions]" >> $HGRCPATH + $ echo "share = " >> $HGRCPATH + +prepare repo1 -echo % prepare repo1 -hg init repo1 -cd repo1 -echo a > a -hg commit -A -m'init' + $ hg init repo1 + $ cd repo1 + $ echo a > a + $ hg commit -A -m'init' + adding a + +share it -echo % share it -cd .. -hg share repo1 repo2 + $ cd .. + $ hg share repo1 repo2 + updating working directory + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + +share shouldn't have a store dir + + $ cd repo2 + $ test -d .hg/store + [1] -echo % contents of repo2/.hg -cd repo2 -[ -d .hg/store ] \ - && echo "fail: .hg/store should not exist" \ - || echo "pass: .hg/store does not exist" -# Some sed versions appends newline, some don't, and some just fails -(cat .hg/sharedpath; echo) | head -n1 | "$TESTDIR/filtertmp.py" +Some sed versions appends newline, some don't, and some just fails + + $ cat .hg/sharedpath; echo + */repo1/.hg (glob) + +commit in shared clone + + $ echo a >> a + $ hg commit -m'change in shared clone' + +check original -echo % commit in shared clone -echo a >> a -hg commit -m'change in shared clone' + $ cd ../repo1 + $ hg log + changeset: 1:8af4dc49db9e + tag: tip + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: change in shared clone + + changeset: 0:d3873e73d99e + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: init + + $ hg update + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ cat a # should be two lines of "a" + a + a -echo % check original -cd ../repo1 -hg log -hg update -cat a # should be two lines of "a" +commit in original + + $ echo b > b + $ hg commit -A -m'another file' + adding b + +check in shared clone -echo % commit in original -echo b > b -hg commit -A -m'another file' + $ cd ../repo2 + $ hg log + changeset: 2:c2e0ac586386 + tag: tip + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: another file + + changeset: 1:8af4dc49db9e + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: change in shared clone + + changeset: 0:d3873e73d99e + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: init + + $ hg update + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ cat b # should exist with one "b" + b -echo % check in shared clone -cd ../repo2 -hg log -hg update -cat b # should exist with one "b" +hg serve shared clone -echo % hg serve shared clone -hg serve -n test -p $HGPORT -d --pid-file=hg.pid -cat hg.pid >> $DAEMON_PIDS - -"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/raw-file/' + $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid + $ cat hg.pid >> $DAEMON_PIDS + $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/raw-file/' + 200 Script output follows + + + -rw-r--r-- 4 a + -rw-r--r-- 2 b + +