[PATCH] tests: unify test-dumprevlog

[Adrian Buehlmann]

# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1281652484 -7200
# Node ID 6fd86f7b59dd3c15b534f2e5c40e598fca5d6212
# Parent  f1c2de22b8a88baf36c69b852f8a3b35ca6b6c91
tests: unify test-dumprevlog

diff --git a/tests/test-dumprevlog.out b/tests/test-dumprevlog.out
deleted file mode 100644
--- a/tests/test-dumprevlog.out
+++ /dev/null
@@ -1,67 +0,0 @@
-% prepare repo-a
-checking changesets
-checking manifests
-crosschecking files in changesets and manifests
-checking files
-1 files, 3 changesets, 3 total revisions
-
-% dumping revlog of file a to stdout
-file: .hg/store/data/a.i
-node: 183d2312b35066fb6b3b449b84efc370d50993d0
-linkrev: 0
-parents: 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000
-length: 15
--start-
-this is file a
-
--end-
-node: b1047953b6e6b633c0d8197eaa5116fbdfd3095b
-linkrev: 1
-parents: 183d2312b35066fb6b3b449b84efc370d50993d0 0000000000000000000000000000000000000000
-length: 32
--start-
-this is file a
-adding to file a
-
--end-
-node: 8c4fd1f7129b8cdec6c7f58bf48fb5237a4030c1
-linkrev: 2
-parents: b1047953b6e6b633c0d8197eaa5116fbdfd3095b 0000000000000000000000000000000000000000
-length: 54
--start-
-this is file a
-adding to file a
-adding more to file a
-
--end-
-% dumprevlog done
-
-% dump all revlogs to file repo.dump
-
-% undumping into repo-b
-.hg/store/00changelog.i
-.hg/store/00manifest.i
-.hg/store/data/a.i
-% undumping done
-
-% clone --pull repo-b repo-c to rebuild fncache
-requesting all changes
-adding changesets
-adding manifests
-adding file changes
-added 3 changesets with 3 changes to 1 files
-
-% verify repo-c
-checking changesets
-checking manifests
-crosschecking files in changesets and manifests
-checking files
-1 files, 3 changesets, 3 total revisions
-
-% comparing repos
-comparing with repo-a
-searching for changes
-no changes found
-comparing with repo-c
-searching for changes
-no changes found
diff --git a/tests/test-dumprevlog b/tests/test-dumprevlog.t
old mode 100755
new mode 100644
rename from tests/test-dumprevlog
rename to tests/test-dumprevlog.t
--- a/tests/test-dumprevlog
+++ b/tests/test-dumprevlog.t
@@ -1,61 +1,107 @@
-#!/bin/sh
+Set vars:
 
-CONTRIBDIR=$TESTDIR/../contrib
+  $ CONTRIBDIR=$TESTDIR/../contrib
 
-echo % prepare repo-a
-mkdir repo-a
-cd repo-a
-hg init
+Prepare repo-a:
 
-echo this is file a > a
-hg add a
-hg commit -m first
+  $ mkdir repo-a
+  $ cd repo-a
+  $ hg init
 
-echo adding to file a >> a
-hg commit -m second
+  $ echo this is file a > a
+  $ hg add a
+  $ hg commit -m first
 
-echo adding more to file a >> a
-hg commit -m third
+  $ echo adding to file a >> a
+  $ hg commit -m second
 
-hg verify
+  $ echo adding more to file a >> a
+  $ hg commit -m third
 
-echo
-echo % dumping revlog of file a to stdout
-python $CONTRIBDIR/dumprevlog .hg/store/data/a.i
-echo % dumprevlog done
+  $ hg verify
+  checking changesets
+  checking manifests
+  crosschecking files in changesets and manifests
+  checking files
+  1 files, 3 changesets, 3 total revisions
 
-echo
-echo % dump all revlogs to file repo.dump
-find .hg/store -name "*.i" | sort | xargs python $CONTRIBDIR/dumprevlog > ../repo.dump
+Dumping revlog of file a to stdout:
 
-cd ..
+  $ python $CONTRIBDIR/dumprevlog .hg/store/data/a.i
+  file: .hg/store/data/a.i
+  node: 183d2312b35066fb6b3b449b84efc370d50993d0
+  linkrev: 0
+  parents: 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000
+  length: 15
+  -start-
+  this is file a
+  
+  -end-
+  node: b1047953b6e6b633c0d8197eaa5116fbdfd3095b
+  linkrev: 1
+  parents: 183d2312b35066fb6b3b449b84efc370d50993d0 0000000000000000000000000000000000000000
+  length: 32
+  -start-
+  this is file a
+  adding to file a
+  
+  -end-
+  node: 8c4fd1f7129b8cdec6c7f58bf48fb5237a4030c1
+  linkrev: 2
+  parents: b1047953b6e6b633c0d8197eaa5116fbdfd3095b 0000000000000000000000000000000000000000
+  length: 54
+  -start-
+  this is file a
+  adding to file a
+  adding more to file a
+  
+  -end-
 
-mkdir repo-b
-cd repo-b
-hg init
+Dump all revlogs to file repo.dump:
 
-echo
-echo % undumping into repo-b
-python $CONTRIBDIR/undumprevlog < ../repo.dump
-echo % undumping done
+  $ find .hg/store -name "*.i" | sort | xargs python $CONTRIBDIR/dumprevlog > ../repo.dump
+  $ cd ..
 
-cd ..
+Undumping into repo-b:
 
-echo
-echo % clone --pull repo-b repo-c  to rebuild fncache
-hg clone --pull -U repo-b repo-c
+  $ mkdir repo-b
+  $ cd repo-b
+  $ hg init
+  $ python $CONTRIBDIR/undumprevlog < ../repo.dump
+  .hg/store/00changelog.i
+  .hg/store/00manifest.i
+  .hg/store/data/a.i
+  $ cd ..
 
-cd repo-c
+Rebuild fncache with clone --pull:
 
-echo
-echo % verify repo-c
-hg verify
+  $ hg clone --pull -U repo-b repo-c
+  requesting all changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 3 changesets with 3 changes to 1 files
 
-cd ..
+Verify:
 
-echo
-echo % comparing repos
-hg -R repo-c incoming repo-a
-hg -R repo-a incoming repo-c
+  $ hg -R repo-c verify
+  checking changesets
+  checking manifests
+  crosschecking files in changesets and manifests
+  checking files
+  1 files, 3 changesets, 3 total revisions
 
-exit 0
+Compare repos:
+
+  $ hg -R repo-c incoming repo-a
+  comparing with repo-a
+  searching for changes
+  no changes found
+
+  $ hg -R repo-a incoming repo-c
+  comparing with repo-c
+  searching for changes
+  no changes found
+
+  $ exit 0
+