tests: unify test-rebuildstate

tests/test-rebuildstate.t

@@ -1,19 +1,29 b''
-#!/bin/sh
-# basic test for hg debugrebuildstate
+basic test for hg debugrebuildstate
+
+  $ hg init repo
+  $ cd repo
 
-hg init repo
-cd repo
+  $ touch foo bar
+  $ hg ci -Am 'add foo bar'
+  adding bar
+  adding foo
 
-touch foo bar
-hg ci -Am 'add foo bar'
+  $ touch baz
+  $ hg add baz
+  $ hg rm bar
 
-touch baz
-hg add baz
-hg rm bar
+  $ hg debugrebuildstate
+
+state dump after
+
+  $ hg debugstate --nodates | sort
+  n 666         -1 bar
+  n 666         -1 foo
 
-hg debugrebuildstate
-echo '% state dump after'
-hg debugstate --nodates | sort
-echo '% status'
-hg st -A
+status
 
+  $ hg st -A
+  ! bar
+  ? baz
+  C foo
+