tests: unify test-identify

tests/test-identify.t

@@ -1,46 +1,69 b''
-#!/bin/sh
+  $ "$TESTDIR/hghave" no-outer-repo || exit 80
+
+no repo
 
-"$TESTDIR/hghave" no-outer-repo || exit 80
+  $ hg id
+  abort: There is no Mercurial repository here (.hg not found)
 
-echo % no repo
-hg id
+create repo
 
-echo % create repo
-hg init test
-cd test
-echo a > a
-hg ci -Ama
+  $ hg init test
+  $ cd test
+  $ echo a > a
+  $ hg ci -Ama
+  adding a
+
+basic id usage
 
-echo % basic id usage
-hg id
-hg id --debug
-hg id -q
-hg id -v
+  $ hg id
+  cb9a9f314b8b tip
+  $ hg id --debug
+  cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b tip
+  $ hg id -q
+  cb9a9f314b8b
+  $ hg id -v
+  cb9a9f314b8b tip
+
+with options
 
-echo % with options
-hg id -r.
-hg id -n
-hg id -t
-hg id -b
-hg id -i
-hg id -n -t -b -i
+  $ hg id -r.
+  cb9a9f314b8b tip
+  $ hg id -n
+  0
+  $ hg id -t
+  tip
+  $ hg id -b
+  default
+  $ hg id -i
+  cb9a9f314b8b
+  $ hg id -n -t -b -i
+  cb9a9f314b8b 0 default tip
 
-echo % with modifications
-echo b > a
-hg id -n -t -b -i
+with modifications
+
+  $ echo b > a
+  $ hg id -n -t -b -i
+  cb9a9f314b8b+ 0+ default tip
+
+other local repo
 
-echo % other local repo
-cd ..
-hg -R test id
-hg id test
+  $ cd ..
+  $ hg -R test id
+  cb9a9f314b8b+ tip
+  $ hg id test
+  cb9a9f314b8b+ tip
+
+with remote http repo
 
-echo % with remote http repo
-cd test
-hg serve -p $HGPORT1 -d --pid-file=hg.pid
-cat hg.pid >> $DAEMON_PIDS
-hg id http://localhost:$HGPORT1/
+  $ cd test
+  $ hg serve -p $HGPORT1 -d --pid-file=hg.pid
+  $ cat hg.pid >> $DAEMON_PIDS
+  $ hg id http://localhost:$HGPORT1/
+  cb9a9f314b8b
 
-echo % remote with tags?
-hg id -t http://localhost:$HGPORT1/
+remote with tags?
 
-true # ends with util.Abort -> returns 255
+  $ hg id -t http://localhost:$HGPORT1/
+  abort: can't query remote revision number, branch, or tags
+
+  $ true # ends with util.Abort -> returns 255