tests: unify test-share

tests/test-share.t

@@ -1,48 +1,99 b''
-#!/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
+  
+