tests: unify test-relink

tests/test-relink.t

@@ -1,54 +1,89 b''
-#!/bin/sh
+  $ echo "[extensions]" >> $HGRCPATH
+  $ echo "relink=" >> $HGRCPATH
 
-echo "[extensions]" >> $HGRCPATH
-echo "relink=" >> $HGRCPATH
+  $ fix_path() {
+  >     tr '\\' /
+  > }
 
-fix_path()
-{
-    tr '\\' /
-}
+  $ cat > arelinked.py <<EOF
+  > import sys, os
+  > from mercurial import util
+  > path1, path2 = sys.argv[1:3]
+  > if util.samefile(path1, path2):
+  >     print '%s == %s' % (path1, path2)
+  > else:
+  >     print '%s != %s' % (path1, path2)
+  > EOF
+
+
+create source repository
 
-cat > arelinked.py <<EOF
-import sys, os
-from mercurial import util
-path1, path2 = sys.argv[1:3]
-if util.samefile(path1, path2):
-    print '%s == %s' % (path1, path2)
-else:
-    print '%s != %s' % (path1, path2)
-EOF
+  $ hg init repo
+  $ cd repo
+  $ echo '[ui]' > .hg/hgrc
+  $ echo 'username= A. Foo <[e-mail]>' >> .hg/hgrc
+  $ echo a > a
+  $ echo b > b
+  $ hg ci -Am addfile
+  adding a
+  adding b
+  $ echo a >> a
+  $ echo a >> b
+  $ hg ci -Am changefiles
+
+Test files are read in binary mode
+
+  $ python -c "file('.hg/store/data/dummy.i', 'wb').write('a\r\nb\n')"
+  $ cd ..
+
+
+clone and pull to break links
 
-echo '% create source repository'
-hg init repo
-cd repo
-echo '[ui]' > .hg/hgrc
-echo 'username= A. Foo <[e-mail]>' >> .hg/hgrc
-echo a > a
-echo b > b
-hg ci -Am addfile
-echo a >> a
-echo a >> b
-hg ci -Am changefiles
-# Test files are read in binary mode
-python -c "file('.hg/store/data/dummy.i', 'wb').write('a\r\nb\n')"
-cd ..
+  $ hg clone --pull -r0 repo clone
+  requesting all changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 1 changesets with 2 changes to 2 files
+  updating to branch default
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cd clone
+  $ echo '[ui]' >> .hg/hgrc
+  $ echo 'username= A. Baz <[e-mail]>' >> .hg/hgrc
+  $ hg pull -q
+  $ echo b >> b
+  $ hg ci -m changeb
+  created new head
+  $ python -c "file('.hg/store/data/dummy.i', 'wb').write('a\nb\r\n')"
+
+
+relink
 
-echo '% clone and pull to break links'
-hg clone --pull -r0 repo clone
-cd clone
-echo '[ui]' >> .hg/hgrc
-echo 'username= A. Baz <[e-mail]>' >> .hg/hgrc
-hg pull -q
-echo b >> b
-hg ci -m changeb
-python -c "file('.hg/store/data/dummy.i', 'wb').write('a\nb\r\n')"
+  $ hg relink --debug | fix_path
+  relinking .*/.hg/store
+  tip has 2 files, estimated total number of files: 3
+  collecting: 00changelog.i 1/3 files (33.33%)
+  collecting: 00manifest.i 2/3 files (66.67%)
+  collecting: a.i 3/3 files (100.00%)
+  collecting: b.i 4/3 files (133.33%)
+  collecting: dummy.i 5/3 files (166.67%)
+  collected 5 candidate storage files
+  not linkable: 00changelog.i
+  not linkable: 00manifest.i
+  pruning: data/a.i 3/5  files (60.00%)
+  not linkable: data/b.i
+  pruning: data/dummy.i 5/5  files (100.00%)
+  pruned down to 2 probably relinkable files
+  relinking: data/a.i 1/2  files (50.00%)
+  not linkable: data/dummy.i
+  relinked 1 files (136 bytes reclaimed)
+  $ cd ..
 
-echo '% relink'
-hg relink --debug | sed 's:relinking.*store:relinking .hg/store:g' \
-    | fix_path
-cd ..
+
+check hardlinks
 
-echo '% check hardlinks'
-python arelinked.py repo/.hg/store/data/a.i clone/.hg/store/data/a.i
-python arelinked.py repo/.hg/store/data/b.i clone/.hg/store/data/b.i
+  $ python arelinked.py repo/.hg/store/data/a.i clone/.hg/store/data/a.i
+  repo/.hg/store/data/a.i == clone/.hg/store/data/a.i
+  $ python arelinked.py repo/.hg/store/data/b.i clone/.hg/store/data/b.i
+  repo/.hg/store/data/b.i != clone/.hg/store/data/b.i