tests: unify test-bookmarks-strip

tests/test-bookmarks-strip.t

@@ -1,45 +1,61 b''
-#!/bin/sh
+  $ . $TESTDIR/helpers.sh
+  $ echo "[extensions]" >> $HGRCPATH
+  $ echo "bookmarks=" >> $HGRCPATH
+  $ echo "mq=" >> $HGRCPATH
+
+  $ hg init
 
-. $TESTDIR/helpers.sh
-echo "[extensions]" >> $HGRCPATH
-echo "bookmarks=" >> $HGRCPATH
-echo "mq=" >> $HGRCPATH
+  $ echo qqq>qqq.txt
 
-hg init
+add file
 
-echo qqq>qqq.txt
+  $ hg add
+  adding qqq.txt
 
-echo % add file
-hg add
+commit first revision
+
+  $ hg ci -m 1 -u user -d "1 0"
+
+set bookmark
+
+  $ hg book test
 
-echo % commit first revision
-hg ci -m 1 -u user -d "1 0"
+  $ echo www>>qqq.txt
+
+commit second revision
 
-echo % set bookmark
-hg book test
+  $ hg ci -m 2 -u usr -d "1 0"
 
-echo www>>qqq.txt
+set bookmark
 
-echo % commit second revision
-hg ci -m 2 -u usr -d "1 0"
+  $ hg book test2
+
+update to -2
+
+  $ hg update -r -2
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
-echo % set bookmark
-hg book test2
+  $ echo eee>>qqq.txt
+
+commit new head
 
-echo % update to -2
-hg update -r -2
+  $ hg ci -m 3 -u user -d "1 0"
+  created new head
 
-echo eee>>qqq.txt
+bookmarks updated?
 
-echo % commit new head
-hg ci -m 3 -u user -d "1 0"
+  $ hg book
+     test                      1:16b24da7e457
+     test2                     1:16b24da7e457
 
-echo % bookmarks updated?
-hg book
+strip to revision 1
 
-echo % strip to revision 1
-hg strip 1 | hidebackup
+  $ hg strip 1 | hidebackup
+  saved backup bundle to 
+
+list bookmarks
 
-echo % list bookmarks
-hg book
+  $ hg book
+   * test                      1:9f1b7e78eff8
+   * test2                     1:9f1b7e78eff8