tests: unify test-addremove

tests/test-addremove.t

@@ -1,27 +1,47 b''
-#!/bin/sh
-
-hg init rep
-cd rep
-mkdir dir
-touch foo dir/bar
-hg -v addremove
-hg -v commit -m "add 1" -d "1000000 0"
-cd dir/
-touch ../foo_2 bar_2
-hg -v addremove
-hg -v commit -m "add 2" -d "1000000 0"
+  $ hg init rep
+  $ cd rep
+  $ mkdir dir
+  $ touch foo dir/bar
+  $ hg -v addremove
+  adding dir/bar
+  adding foo
+  $ hg -v commit -m "add 1" -d "1000000 0"
+  dir/bar
+  foo
+  committed changeset 0:d44511117907
+  $ cd dir/
+  $ touch ../foo_2 bar_2
+  $ hg -v addremove
+  adding dir/bar_2
+  adding foo_2
+  $ hg -v commit -m "add 2" -d "1000000 0"
+  dir/bar_2
+  foo_2
+  committed changeset 1:a85812e0561a
 
-cd ..
-hg init sim
-cd sim
-echo a > a
-echo a >> a
-echo a >> a
-echo c > c
-hg commit -Ama
-mv a b
-rm c
-echo d > d
-hg addremove -n -s 50 # issue 1696
-hg addremove -s 50
-hg commit -mb
+  $ cd ..
+  $ hg init sim
+  $ cd sim
+  $ echo a > a
+  $ echo a >> a
+  $ echo a >> a
+  $ echo c > c
+  $ hg commit -Ama
+  adding a
+  adding c
+  $ mv a b
+  $ rm c
+  $ echo d > d
+  $ hg addremove -n -s 50 # issue 1696
+  removing a
+  adding b
+  removing c
+  adding d
+  recording removal of a as rename to b (100% similar)
+  $ hg addremove -s 50
+  removing a
+  adding b
+  removing c
+  adding d
+  recording removal of a as rename to b (100% similar)
+  $ hg commit -mb