tests: unify test-manifest*

tests/test-manifest-merging.t

@@ -1,34 +1,36 b''
-#!/bin/sh
+  $ hg init base
 
-echo % init foo-base
-hg init foo-base
+  $ cd base
+  $ echo 'alpha' > alpha
+  $ hg ci -A -m 'add alpha'
+  adding alpha
+  $ cd ..
 
-echo % create alpha in first repo
-cd foo-base
-echo 'alpha' > alpha
-hg ci -A -m 'add alpha' -d '1 0'
-cd ..
+  $ hg clone base work
+  updating to branch default
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
-echo % clone foo-base to foo-work
-hg clone foo-base foo-work
+  $ cd work
+  $ echo 'beta' > beta
+  $ hg ci -A -m 'add beta'
+  adding beta
+  $ cd ..
 
-echo % create beta in second repo
-cd foo-work
-echo 'beta' > beta
-hg ci -A -m 'add beta' -d '2 0'
-cd ..
+  $ cd base
+  $ echo 'gamma' > gamma
+  $ hg ci -A -m 'add gamma'
+  adding gamma
+  $ cd ..
 
-echo % create gamma in first repo
-cd foo-base
-echo 'gamma' > gamma
-hg ci -A -m 'add gamma' -d '3 0'
-cd ..
+  $ cd work
+  $ hg pull -q
+  $ hg merge
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
 
-echo % pull into work and merge
-cd foo-work
-hg pull -q
-hg merge
+Update --clean to revision 1 to simulate a failed merge:
 
-echo % revert to changeset 1 to simulate a failed merge
-rm alpha beta gamma
-hg up -C 1
+  $ rm alpha beta gamma
+  $ hg update --clean 1
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+

tests/test-manifest.t

@@ -1,5 +1,3 b''
-#!/bin/sh
-
 # Source bundle was generated with the following script.
 #
 # hg init
@@ -11,22 +9,61 b''
 # chmod +x b/a
 # hg ci -Amb -d'1 0'
 
-hg init
-hg -q pull "$TESTDIR/test-manifest.hg"
+  $ hg init
+  $ hg -q pull "$TESTDIR/test-manifest.hg"
+
+
+The next call is expected to return nothing:
+
+  $ hg manifest
+
+
+  $ hg co
+  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
-echo % should be empty
-hg manifest
+  $ hg manifest
+  a
+  b/a
+  l
+
+  $ hg manifest -v
+  644   a
+  755 * b/a
+  644 @ l
+
+  $ hg manifest --debug
+  b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644   a
+  b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 755 * b/a
+  047b75c6d7a3ef6a2243bd0e99f94f6ea6683597 644 @ l
 
-hg co
-hg manifest
-hg manifest -v
-hg manifest --debug
-hg manifest -r 0
-hg manifest -r 1
-hg manifest -r tip
+  $ hg manifest -r 0
+  a
+  l
+
+  $ hg manifest -r 1
+  a
+  b/a
+  l
+
+  $ hg manifest -r tip
+  a
+  b/a
+  l
 
-echo % should fail
-hg manifest -r 2
-hg manifest -r tip tip
+  $ hg manifest tip
+  a
+  b/a
+  l
+
+
+The next two calls are expected to abort:
 
-hg manifest tip
+  $ hg manifest -r 2
+  abort: unknown revision '2'!
+
+  $ hg manifest -r tip tip
+  abort: please specify just one revision
+
+
+  $ true
+