run-tests: remove '+ hg' trick

This was causing me a fair amount of debugging confusion. Let's just
forget it entirely. Updated tests to match.

tests/run-tests

@@ -1,131 +1,124 b''
 #!/bin/sh -e
 
 LANG="C"; export LANG
 LC_CTYPE="C"; export LC_CTYPE
 LC_NUMERIC="C"; export LC_NUMERIC
 LC_TIME="C"; export LC_TIME
 LC_COLLATE="C"; export LC_COLLATE
 LC_MONETARY="C"; export LC_MONETARY
 LC_MESSAGES="C"; export LC_MESSAGES
 LC_PAPER="C"; export LC_PAPER
 LC_NAME="C"; export LC_NAME
 LC_ADDRESS="C"; export LC_ADDRESS
 LC_TELEPHONE="C"; export LC_TELEPHONE
 LC_MEASUREMENT="C"; export LC_MEASUREMENT
 LC_IDENTIFICATION="C"; export LC_IDENTIFICATION
 LC_ALL=""; export LC_ALL
 TZ=GMT; export TZ
 HGEDITOR=true; export HGEDITOR
 HGMERGE=true; export HGMERGE
 HGUSER="test"; export HGUSER
 
 umask 022
 
 tests=0
 failed=0
 
 HGTMP=""
 cleanup_exit() {
     rm -rf "$HGTMP"
 }
 
 # Remove temporary files even if we get interrupted
 trap "cleanup_exit" 0 # normal exit
 trap "exit 255" 1 2 3 6 15 # HUP INT QUIT ABRT TERM
 
 HGTMP="${TMPDIR-/tmp}/hgtests.$RANDOM.$RANDOM.$RANDOM.$$"
 (umask 077 && mkdir "$HGTMP") || {
     echo "Could not create temporary directory! Exiting." 1>&2
     exit 1
 }
 
 TESTDIR="$PWD"
 
 if [ -d /usr/lib64 ]; then
     lib=lib64
 else
     lib=lib
 fi
 
 INST="$HGTMP/install"
 cd ..
 if ${PYTHON-python} setup.py install --home="$INST" > tests/install.err 2>&1
 then
     rm tests/install.err
-    mv "$INST/bin/hg" "$INST/bin/hg.real"
-    (
-	echo '#!/bin/sh'
-	echo 'echo "+ hg $@"'
-	echo 'exec hg.real "$@"'
-    ) > "$INST/bin/hg"
-    chmod 755 "$INST/bin/hg"
 else
     cat tests/install.err
     exit 1
 fi
 cd "$TESTDIR"
 
 PATH="$INST/bin:$PATH"; export PATH
 PYTHONPATH="$INST/$lib/python"; export PYTHONPATH
 
 
 run_one() {
     rm -f "$1.err"
 
     mkdir "$HGTMP/$1"
     cd "$HGTMP/$1"
     fail=0
     HOME="$HGTMP/$1"; export HOME
     OUT="$HGTMP/$1.out"
     OUTOK="$TESTDIR/$1.out"
     ERR="$TESTDIR/$1.err"
 
     if "$TESTDIR/$1" > "$OUT" 2>&1; then
 	: no error
     else
 	echo "$1 failed with error code $?"
 	fail=1
     fi
 
     if [ -s "$OUT" -a ! -s "$OUTOK" ] ; then
 	cp "$OUT" "$ERR"
 	echo
 	echo "$1 generated unexpected output:"
 	cat "$ERR"
 	fail=1
     elif [ -r "$OUTOK" ]; then
 	if diff -u "$OUTOK" "$OUT" > /dev/null; then
 	    : no differences
 	else
 	    cp "$OUT" "$ERR"
 	    echo
 	    echo "$1 output changed:"
 	    diff -u "$OUTOK" "$ERR" || true
 	    fail=1
 	fi
     fi
 
     cd "$TESTDIR"
     rm -f "$HGTMP/$1.out"
     rm -rf "$HGTMP/$1"
     return $fail
 }
 
 TESTS="$*"
 if [ -z "$TESTS" ] ; then
     TESTS=`ls test-* | grep -v "[.~]"`
 fi
 
 for f in $TESTS ; do
     echo -n "."
     run_one $f || failed=`expr $failed + 1`
     tests=`expr $tests + 1`
 done
 
 echo
 echo "Ran $tests tests, $failed failed."
 
 if [ $failed -gt 0 ] ; then
     exit 1
 fi
 exit 0

tests/test-backwards-remove.out

@@ -1,8 +1,2 b''
-+ hg init
-+ hg add a
-+ hg commit -m commit #0 -d 0 0
 a
-+ hg add b
-+ hg commit -m commit #1 -d 0 0
-+ hg co 0
 a

tests/test-bad-pull.out

@@ -1,9 +1,7 b''
-+ hg clone http://localhost:20059/ copy
 requesting all changes
 abort: error: Connection refused
 255
 ls: copy: No such file or directory
-+ hg clone http://localhost:20059/foo copy2
 requesting all changes
 abort: HTTP Error 404: File not found
 255

tests/test-basic.out

@@ -1,20 +1,13 b''
-+ hg init
-+ hg add a
-+ hg commit -m test -d 0 0
-+ hg history
 changeset:   0:acb14030fe0a
 tag:         tip
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     test
 
-+ hg manifest
 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a
-+ hg cat a
 a
-+ hg verify
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions

tests/test-clone-failure.out

@@ -1,20 +1,12 b''
-+ hg clone a b
 abort: repository a/.hg not found!
 255
-+ hg clone http://127.0.0.1:3121/a b
 requesting all changes
 abort: error: Connection refused
 255
-+ hg clone a b
 abort: repository a/.hg not found!
 255
-+ hg init
-+ hg clone . ../a
 abort: destination '../a' already exists
 1
-+ hg clone a b
 abort: repository a/.hg not found!
 255
-+ hg init
-+ hg clone q
 abort: destination 'q' already exists

tests/test-clone.out

@@ -1,22 +1,13 b''
-+ hg init
-+ hg add a
-+ hg commit -m test -d 0 0
-+ hg clone . ../b
 a
-+ hg verify
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
-+ hg clone -U . ../c
 cat: a: No such file or directory
-+ hg verify
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
-+ hg clone ../a
-+ hg cat a
 a

tests/test-conflict.out

@@ -1,17 +1,8 b''
-+ hg init
-+ hg add a
-+ hg commit -m ancestor -d 0 0
-+ hg commit -m branch1 -d 0 0
-+ hg co 0
-+ hg commit -m branch2 -d 0 0
-+ hg up -m 1
 merge: warning: conflicts during merge
 merging a
 merging a failed!
-+ hg id
 32e80765d7fe+75234512624c+ tip
 something else
 =======
 something
-+ hg status
 M a

tests/test-copy.out

@@ -1,37 +1,27 b''
-+ hg init
-+ hg add a
-+ hg commit -m 1 -d 0 0
-+ hg status
-+ hg copy a b
-+ hg status
 A b
-+ hg --debug commit -m 2 -d 0 0
 b
  b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
-+ hg history
 changeset:   1:3b5b84850bbe
 tag:         tip
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     2
 
 changeset:   0:c19d34741b0a
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     1
 
-+ hg log a
 changeset:   0:c19d34741b0a
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     1
 
 566e338d09a089ba737c21e0d3759980  .hg/data/b.d
-3268d2f51b2d2d423ff01b59eb6fbb14  bsum
-70909ca2ecf494c71e9184b445e040ee  asum
-+ hg verify
+60b725f10c9c85c70d97880dfe8191b3  bsum
+60b725f10c9c85c70d97880dfe8191b3  asum
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 2 files, 2 changesets, 2 total revisions

tests/test-diffdir.out

@@ -1,16 +1,10 b''
-+ hg init
-+ hg add a
-+ hg ci -m a -d 0 0
-+ hg add b
-+ hg diff
 diff -r 3903775176ed b
 --- /dev/null
 +++ b/b
 @@ -0,0 +1,1 @@
 +123
-+ hg diff -r tip
 diff -r 3903775176ed b
 --- /dev/null
 +++ b/b
 @@ -0,0 +1,1 @@
 +123

tests/test-empty-dir.out

@@ -1,9 +1,3 b''
-+ hg init
-+ hg add a
-+ hg commit -m first -d 0 0 a
-+ hg add sub/b
-+ hg commit -m second -d 0 0 sub/b
 321
-+ hg co 0
 cat: sub/b: No such file or directory
 ls: sub: No such file or directory

tests/test-flags.out

@@ -1,60 +1,48 b''
-+ hg init
-+ hg add a b
-+ hg ci -m added a b -d 0 0
-+ hg init
-+ hg pull ../test1
 pulling from ../test1
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 2 changes to 2 files
 (run 'hg update' to get a working copy)
-+ hg co
-+ hg ci -m chmod +x a -d 0 0
-+ hg ci -m a updated -d 0 0
-+ hg pull ../test2
 pulling from ../test2
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 (run 'hg update' to get a working copy)
-+ hg heads
 changeset:   2:3ef543305655
 tag:         tip
 parent:      0:22a449e20da5
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     chmod +x a
 
 changeset:   1:c6ecefc45368
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     a updated
 
-+ hg history
 changeset:   2:3ef543305655
 tag:         tip
 parent:      0:22a449e20da5
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     chmod +x a
 
 changeset:   1:c6ecefc45368
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     a updated
 
 changeset:   0:22a449e20da5
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     added a b
 
-+ hg -v co -m
 resolving manifests
 merging a
 resolving a
 -rwxr-x---
 -rwxr-x---

tests/test-help.out

@@ -1,221 +1,212 b''
-+ hg 
 Mercurial Distributed SCM
 
 basic commands (use "hg help" for the full list or option "-v" for details):
 
  add        add the specified files on the next commit
  annotate   show changeset information per file line
  clone      make a copy of an existing repository
  commit     commit the specified files or all outstanding changes
  diff       diff working directory (or selected files)
  export     dump the header and diffs for one or more changesets
  init       create a new repository in the given directory
  log        show the revision history of the repository or a single file
  pull       pull changes from the specified source
  push       push changes to the specified destination
  remove     remove the specified files on the next commit
  revert     revert modified files or dirs back to their unmodified states
  serve      export the repository via HTTP
  status     show changed files in the working directory
  update     update or merge working directory
-+ hg -q
  add        add the specified files on the next commit
  annotate   show changeset information per file line
  clone      make a copy of an existing repository
  commit     commit the specified files or all outstanding changes
  diff       diff working directory (or selected files)
  export     dump the header and diffs for one or more changesets
  init       create a new repository in the given directory
  log        show the revision history of the repository or a single file
  pull       pull changes from the specified source
  push       push changes to the specified destination
  remove     remove the specified files on the next commit
  revert     revert modified files or dirs back to their unmodified states
  serve      export the repository via HTTP
  status     show changed files in the working directory
  update     update or merge working directory
-+ hg help
 Mercurial Distributed SCM
 
 list of commands (use "hg help -v" to show aliases and global options):
 
  add         add the specified files on the next commit
  addremove   add all new files, delete all missing files
  annotate    show changeset information per file line
  cat         output the latest or given revision of a file
  clone       make a copy of an existing repository
  commit      commit the specified files or all outstanding changes
  copy        mark a file as copied or renamed for the next commit
  diff        diff working directory (or selected files)
  export      dump the header and diffs for one or more changesets
  forget      don't add the specified files on the next commit
  heads       show current repository heads
  help        show help for a given command or all commands
  identify    print information about the working copy
  import      import an ordered set of patches
  init        create a new repository in the given directory
  locate      locate files matching specific patterns
  log         show the revision history of the repository or a single file
  manifest    output the latest or given revision of the project manifest
+ outgoing    show changesets not found in destination
  parents     show the parents of the working dir or revision
- paths       show path or list of available paths
+ paths       show definition of symbolic path names
  pull        pull changes from the specified source
  push        push changes to the specified destination
  rawcommit   raw commit interface
  recover     roll back an interrupted transaction
  remove      remove the specified files on the next commit
  revert      revert modified files or dirs back to their unmodified states
  root        print the root (top) of the current working dir
  serve       export the repository via HTTP
  status      show changed files in the working directory
  tag         add a tag for the current tip or a given revision
  tags        list repository tags
  tip         show the tip revision
  undo        undo the last commit or pull
  update      update or merge working directory
  verify      verify the integrity of the repository
  version     output version and copyright information
-+ hg -q help
  add         add the specified files on the next commit
  addremove   add all new files, delete all missing files
  annotate    show changeset information per file line
  cat         output the latest or given revision of a file
  clone       make a copy of an existing repository
  commit      commit the specified files or all outstanding changes
  copy        mark a file as copied or renamed for the next commit
  diff        diff working directory (or selected files)
  export      dump the header and diffs for one or more changesets
  forget      don't add the specified files on the next commit
  heads       show current repository heads
  help        show help for a given command or all commands
  identify    print information about the working copy
  import      import an ordered set of patches
  init        create a new repository in the given directory
  locate      locate files matching specific patterns
  log         show the revision history of the repository or a single file
  manifest    output the latest or given revision of the project manifest
+ outgoing    show changesets not found in destination
  parents     show the parents of the working dir or revision
- paths       show path or list of available paths
+ paths       show definition of symbolic path names
  pull        pull changes from the specified source
  push        push changes to the specified destination
  rawcommit   raw commit interface
  recover     roll back an interrupted transaction
  remove      remove the specified files on the next commit
  revert      revert modified files or dirs back to their unmodified states
  root        print the root (top) of the current working dir
  serve       export the repository via HTTP
  status      show changed files in the working directory
  tag         add a tag for the current tip or a given revision
  tags        list repository tags
  tip         show the tip revision
  undo        undo the last commit or pull
  update      update or merge working directory
  verify      verify the integrity of the repository
  version     output version and copyright information
-+ hg add -h
 hg add: option -h not recognized
 hg add [OPTION]... [FILE]...
 
 add the specified files on the next commit
 
 options:
 
  -I --include 
    include path in search
  -X --exclude 
    exclude path from search
-+ hg add --skjdfks
 hg add: option --skjdfks not recognized
 hg add [OPTION]... [FILE]...
 
 add the specified files on the next commit
 
 options:
 
  -I --include 
    include path in search
  -X --exclude 
    exclude path from search
-+ hg help diff
 hg diff [-I] [-X] [-r REV1 [-r REV2]] [FILE]...
 
 diff working directory (or selected files)
 
 options:
 
  -r --rev 
    revision
  -I --include 
    include path in search
  -X --exclude 
    exclude path from search
-+ hg help status
 hg status [OPTION]... [FILE]...
 
 show changed files in the working directory
 
     M = modified
     A = added
     R = removed
     ? = not tracked
 
 options:
 
  -m --modified 
    show only modified files
  -a --added 
    show only added files
  -r --removed 
    show only removed files
  -u --unknown 
    show only unknown (not tracked) files
  -I --include 
    include path in search
  -X --exclude 
    exclude path from search
-+ hg -q help status
 hg status [OPTION]... [FILE]...
 
 show changed files in the working directory
-+ hg help foo
 hg: unknown command 'foo'
 Mercurial Distributed SCM
 
 basic commands (use "hg help" for the full list or option "-v" for details):
 
  add        add the specified files on the next commit
  annotate   show changeset information per file line
  clone      make a copy of an existing repository
  commit     commit the specified files or all outstanding changes
  diff       diff working directory (or selected files)
  export     dump the header and diffs for one or more changesets
  init       create a new repository in the given directory
  log        show the revision history of the repository or a single file
  pull       pull changes from the specified source
  push       push changes to the specified destination
  remove     remove the specified files on the next commit
  revert     revert modified files or dirs back to their unmodified states
  serve      export the repository via HTTP
  status     show changed files in the working directory
  update     update or merge working directory
-+ hg skjdfks
 hg: unknown command 'skjdfks'
 Mercurial Distributed SCM
 
 basic commands (use "hg help" for the full list or option "-v" for details):
 
  add        add the specified files on the next commit
  annotate   show changeset information per file line
  clone      make a copy of an existing repository
  commit     commit the specified files or all outstanding changes
  diff       diff working directory (or selected files)
  export     dump the header and diffs for one or more changesets
  init       create a new repository in the given directory
  log        show the revision history of the repository or a single file
  pull       pull changes from the specified source
  push       push changes to the specified destination
  remove     remove the specified files on the next commit
  revert     revert modified files or dirs back to their unmodified states
  serve      export the repository via HTTP
  status     show changed files in the working directory
  update     update or merge working directory

tests/test-hook.out

@@ -1,5 +1,2 b''
-+ hg init
-+ hg add a
-+ hg commit -m test -d 0 0
 precommit hook
 commit hook: acb14030fe0a21b60322c440ad2d20cf7685a376

tests/test-hup.out

@@ -1,12 +1,10 b''
-+ hg init
-+ hg serve --stdio
 0
 0
 adding changesets
 killed!
 transaction abort!
 rollback completed
 00changelog.d
 00changelog.i
 data
 journal.dirstate

tests/test-merge-revert.out

@@ -1,46 +1,12 b''
-+ hg init
-+ hg add file1 file2
-+ hg commit -m added file1 and file2 -d 0 0 -u user
-+ hg commit -m changed file1 -d 0 0 -u user
-+ hg -q log
-1:3aa14bbc23d90e3f8b5b639b4a43d76509bae76c
-0:8633637036c18f021d771208e16ae3508ab81d28
-+ hg id
+1:3aa14bbc23d9
+0:8633637036c1
 3aa14bbc23d9 tip
-+ hg update -C 0
-+ hg id
 8633637036c1
-+ hg id
 8633637036c1+
-+ hg revert
-+ hg diff
-+ hg status
-+ hg id
 8633637036c1
-+ hg update
-+ hg diff
-+ hg status
-+ hg id
 3aa14bbc23d9 tip
-+ hg update -C 0
-+ hg update
 merging file1
-+ hg diff
-+ hg status
-+ hg id
 3aa14bbc23d9 tip
-+ hg revert
-+ hg diff
-+ hg status
-+ hg id
+3aa14bbc23d9 tip
 3aa14bbc23d9 tip
-+ hg revert -r tip
-+ hg diff
-+ hg status
-+ hg id
 3aa14bbc23d9 tip
-+ hg update -C
-+ hg diff
-+ hg status
-+ hg id
-3aa14bbc23d9 tip

tests/test-merge-revert2.out

@@ -1,60 +1,26 b''
-+ hg init
-+ hg add file1 file2
-+ hg commit -m added file1 and file2 -d 0 0 -u user
-+ hg commit -m changed file1 -d 0 0 -u user
-+ hg -q log
-1:f4d7a8c73d231bc078e2a5e791325e55e8a4c252
-0:232e179b3f294d467cfa66e1439bc5b0d44e4a93
-+ hg id
+1:f4d7a8c73d23
+0:232e179b3f29
 f4d7a8c73d23 tip
-+ hg update -C 0
-+ hg id
 232e179b3f29
-+ hg id
 232e179b3f29+
-+ hg revert
-+ hg diff
-+ hg status
-+ hg id
 232e179b3f29
-+ hg update
-+ hg diff
-+ hg status
-+ hg id
 f4d7a8c73d23 tip
-+ hg update -C 0
-+ hg update
 merge: warning: conflicts during merge
 merging file1
 merging file1 failed!
-+ hg diff
 diff -r f4d7a8c73d23 file1
 --- a/file1
 +++ b/file1
 @@ -1,3 +1,7 @@
  added file1
  another line of text
 +<<<<<<<
 +changed file1 different
 +=======
  changed file1
 +>>>>>>>
-+ hg status
 M file1
-+ hg id
 f4d7a8c73d23+ tip
-+ hg revert
-+ hg diff
-+ hg status
-+ hg id
 f4d7a8c73d23 tip
-+ hg revert -r tip
-+ hg diff
-+ hg status
-+ hg id
 f4d7a8c73d23 tip
-+ hg update -C
-+ hg diff
-+ hg status
-+ hg id
 f4d7a8c73d23 tip

tests/test-merge1.out

@@ -1,45 +1,7 b''
-+ hg init
-+ hg add a
-+ hg commit -m commit #0 -d 0 0
-+ hg add b
-+ hg commit -m commit #1 -d 0 0
-+ hg update 0
-+ hg add c
-+ hg commit -m commit #2 -d 0 0
-+ hg update -m 1
-+ hg init
-+ hg add a
-+ hg commit -m commit #0 -d 0 0
-+ hg add b
-+ hg commit -m commit #1 -d 0 0
-+ hg update 0
-+ hg add c
-+ hg commit -m commit #2 -d 0 0
-+ hg update -m 1
 merging for b
 merging b
-+ hg init
-+ hg add a
-+ hg commit -m commit #0 -d 0 0
-+ hg add b
-+ hg commit -m commit #1 -d 0 0
-+ hg commit -m commit #2 -d 0 0
-+ hg update 1
-+ hg add c
-+ hg commit -m commit #3 -d 0 0
 This is file b1
-+ hg update -m 2
 merging for b
 merging b
-+ hg init
-+ hg add a
-+ hg commit -m commit #0 -d 0 0
-+ hg add b
-+ hg commit -m commit #1 -d 0 0
-+ hg commit -m commit #2 -d 0 0
-+ hg update 1
-+ hg add c
-+ hg commit -m commit #3 -d 0 0
-+ hg update -m 2
 merging for b
 merging b

tests/test-merge2.out

@@ -1,25 +1,2 b''
-+ hg init
-+ hg add a
-+ hg commit -m commit #0 -d 0 0
-+ hg add b
-+ hg commit -m commit #1 -d 0 0
-+ hg update 0
-+ hg add b
-+ hg commit -m commit #2 -d 0 0
-+ hg init
-+ hg add a
-+ hg commit -m commit #0 -d 0 0
-+ hg add b
-+ hg commit -m commit #1 -d 0 0
-+ hg update 0
-+ hg commit -A -m commit #2 -d 0 0
 adding b
-+ hg init
-+ hg add a
-+ hg commit -m commit #0 -d 0 0
-+ hg add b
-+ hg commit -m commit #1 -d 0 0
-+ hg remove b
-+ hg update 0
-+ hg commit -A -m commit #2 -d 0 0
 adding b

tests/test-merge3.out

@@ -1,8 +1,3 b''
-+ hg init
-+ hg add a
-+ hg commit -m commit #0 -d 0 0
-+ hg add b
-+ hg commit -A -mcomment #1 -d 0 0
 removing b
 b never committed!
 nothing changed

tests/test-merge4.out

@@ -1,10 +0,0 b''
-+ hg init
-+ hg add a
-+ hg commit -m commit #0 -d 0 0
-+ hg add b
-+ hg commit -m commit #1 -d 0 0
-+ hg update 0
-+ hg add c
-+ hg commit -m commit #2 -d 0 0
-+ hg update -m 1
-+ hg commit -m commit #3 -d 0 0

tests/test-merge5.out

@@ -1,12 +1,5 b''
-+ hg init
-+ hg add a b
-+ hg commit -m commit #0 -d 0 0
-+ hg commit -mcomment #1 -d 0 0
-+ hg update 0
-+ hg commit -A -mcomment #2 -d 0 0
 removing b
-+ hg update 1
 this update spans a branch affecting the following files:
  b
 aborting update spanning branches!
 (use update -m to merge across branches or -C to lose changes)

tests/test-merge6.out

@@ -1,35 +1,18 b''
-+ hg init
-+ hg add foo bar
-+ hg commit -m commit text -d 0 0
-+ hg clone A1 B1
-+ hg remove bar
-+ hg commit -m commit test -d 0 0
-+ hg commit -m commit test -d 0 0
-+ hg clone A1 A2
-+ hg clone B1 B2
-+ hg pull ../B1
 pulling from ../B1
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 (run 'hg update' to get a working copy)
-+ hg update -m
-+ hg commit -m commit test -d 0 0
 bar should remain deleted.
-+ hg manifest
 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo
-+ hg pull ../A2
 pulling from ../A2
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 0 changes to 0 files
 (run 'hg update' to get a working copy)
-+ hg update -m
-+ hg commit -m commit test -d 0 0
 bar should remain deleted.
-+ hg manifest
 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo

tests/test-notfound.out

@@ -1,9 +1,6 b''
-+ hg init
 Is there an error message when trying to diff non-existing files?
-+ hg diff not found
 not: No such file or directory
 found: No such file or directory
 Is there an error message when trying to add non-existing files?
-+ hg add not found
 not: No such file or directory
 found: No such file or directory

tests/test-pull.out

@@ -1,31 +1,22 b''
-+ hg init
-+ hg addremove
 adding foo
-+ hg commit -m 1
-+ hg verify
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
-+ hg clone http://localhost:20059/ copy
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
-+ hg verify
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
-+ hg co
 foo
-+ hg manifest
 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo
-+ hg pull
 pulling from http://localhost:20059/
 searching for changes
 no changes found
 killed!

tests/test-push-warn.out

@@ -1,35 +1,21 b''
-+ hg init
-+ hg add t1
-+ hg commit -m 1 -d 0 0
-+ hg clone a b
-+ hg add t2
-+ hg commit -m 2 -d 0 0
-+ hg add t3
-+ hg commit -m 3 -d 0 0
-+ hg push ../a
 pushing to ../a
 searching for changes
 abort: unsynced remote changes!
 (did you forget to sync? use push -f to force)
-+ hg pull ../a
 pulling from ../a
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 (run 'hg update' to get a working copy)
-+ hg push ../a
 pushing to ../a
 searching for changes
 abort: push creates new remote branches!
 (did you forget to merge? use push -f to force)
-+ hg up -m
-+ hg commit -m 4 -d 0 0
-+ hg push ../a
 pushing to ../a
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 2 files

tests/test-rawcommit1.out

@@ -1,77 +1,53 b''
-+ hg --debug init
-+ hg add a
-+ hg commit -m0 -d 0 0
-+ hg add b
-+ hg commit -m1 -d 0 0
-+ hg manifest 1
 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
-+ hg rawcommit -p 1 -d 0 0 -m2 c
-+ hg manifest 2
 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
-+ hg parents
 changeset:   2:9f827976dae4
 tag:         tip
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     2
 
-+ hg rawcommit -p 2 -d 0 0 -m3 b
-+ hg manifest 3
 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
-+ hg parents
 changeset:   3:c8225a106186
 tag:         tip
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     3
 
-+ hg rawcommit -p 3 -d 0 0 -m4 a
-+ hg manifest 4
 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
-+ hg parents
 changeset:   4:8dfeee82a94b
 tag:         tip
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     4
 
-+ hg rawcommit -p 1 -d 0 0 -m5 c
-+ hg manifest 5
 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
 3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c
-+ hg parents
 changeset:   4:8dfeee82a94b
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     4
 
-+ hg rawcommit -p 4 -p 5 -d 0 0 -m6
-+ hg manifest 6
 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
-+ hg parents
 changeset:   6:c0e932ecae5e
 tag:         tip
 parent:      4:8dfeee82a94b
 parent:      5:a7925a42d0df
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     6
 
-+ hg rawcommit -p 6 -d 0 0 -m7
-+ hg manifest 7
 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
-+ hg parents
 changeset:   7:3a157da4365d
 tag:         tip
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     7
 

tests/test-simple-update.out

@@ -1,32 +1,21 b''
-+ hg init
-+ hg addremove
 adding foo
-+ hg commit -m 1
-+ hg verify
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
-+ hg clone . ../branch
-+ hg co
-+ hg commit -m 2
-+ hg pull ../branch
 pulling from ../branch
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 (run 'hg update' to get a working copy)
-+ hg verify
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 2 changesets, 2 total revisions
-+ hg co
 foo
 bar
-+ hg manifest
 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo

tests/test-tag.out

@@ -1,28 +1,21 b''
-+ hg init
-+ hg add a
-+ hg commit -m test -d 0 0
-+ hg history
 changeset:   0:acb14030fe0a
 tag:         tip
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     test
 
-+ hg tag -d 0 0 bleah
-+ hg history
 changeset:   1:863197ef0378
 tag:         tip
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     Added tag bleah for changeset acb14030fe0a21b60322c440ad2d20cf7685a376
 
 changeset:   0:acb14030fe0a
 tag:         bleah
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     test
 
-+ hg tag -d 0 0 bleah2
 abort: working copy of .hgtags is changed!
 (please commit .hgtags manually)
 failed

tests/test-tags

@@ -1,33 +1,33 b''
 #!/bin/sh
 
 mkdir t
 cd t
 hg init
 hg id
 echo a > a
 hg add a
 hg commit -m "test" -d "0 0"
 hg co
 hg identify
-T=`hg -q tip | cut -d : -f 2`
+T=`hg tip -v | head -n 1 | cut -d : -f 3`
 echo "$T first" > .hgtags
 cat .hgtags
 hg add .hgtags
 hg commit -m "add tags" -d "0 0"
 hg tags
 hg identify
 echo bb > a
 hg status
 hg identify
 hg co first
 hg id
 hg -v id
 hg status
 echo 1 > b
 hg add b
 hg commit -m "branch" -d "0 0"
 hg id
 hg co -m 1
 hg id
 hg status
 

tests/test-tags.out

@@ -1,39 +1,15 b''
-+ hg init
-+ hg id
 unknown
-+ hg add a
-+ hg commit -m test -d 0 0
-+ hg co
-+ hg identify
 acb14030fe0a tip
-+ hg -q tip
 acb14030fe0a21b60322c440ad2d20cf7685a376 first
-+ hg add .hgtags
-+ hg commit -m add tags -d 0 0
-+ hg tags
-tip                                1:b53d0e1f3043ecbccf1b9ad2cea562c1b50462b2
+tip                                1:b9154636be938d3d431e75a7c906504a079bfe07
 first                              0:acb14030fe0a21b60322c440ad2d20cf7685a376
-hg -q tip                          ?:?
-+ hg identify
-b53d0e1f3043 tip
-+ hg status
+b9154636be93 tip
 M a
-+ hg identify
-b53d0e1f3043+ tip
-+ hg co first
-+ hg id
+b9154636be93+ tip
 acb14030fe0a+ first
-+ hg -v id
 acb14030fe0a21b60322c440ad2d20cf7685a376+ first
-+ hg status
 M a
-+ hg add b
-+ hg commit -m branch -d 0 0
-+ hg id
 c8edf04160c7 tip
-+ hg co -m 1
-+ hg id
-c8edf04160c7+b53d0e1f3043+ tip
-+ hg status
+c8edf04160c7+b9154636be93+ tip
 M .hgtags
 M a

tests/test-undo.out

@@ -1,28 +1,18 b''
-+ hg init
-+ hg add a
-+ hg commit -m test -d 0 0
-+ hg verify
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
-+ hg parents
 changeset:   0:acb14030fe0a
 tag:         tip
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     test
 
-+ hg status
-+ hg undo
 rolling back last transaction
-+ hg verify
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 0 files, 0 changesets, 0 total revisions
-+ hg parents
-+ hg status
 A a

tests/test-unrelated-pull.out

@@ -1,27 +1,19 b''
-+ hg init
-+ hg add a
-+ hg commit -m a -u a -d 0 0
-+ hg init
-+ hg add b
-+ hg commit -m b -u b -d 0 0
-+ hg pull ../a
 pulling from ../a
 searching for changes
 warning: pulling from an unrelated repository!
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 (run 'hg update' to get a working copy)
-+ hg heads
 changeset:   1:9a79c33a9db3
 tag:         tip
 user:        a
 date:        Thu Jan  1 00:00:00 1970
 summary:     a
 
 changeset:   0:01f8062b2de5
 user:        b
 date:        Thu Jan  1 00:00:00 1970
 summary:     b
 

tests/test-up-local-change.out

@@ -1,65 +1,50 b''
-+ hg init
-+ hg addremove
 adding a
-+ hg commit -m 1 -d 0 0
-+ hg clone . ../r2
-+ hg up
-+ hg diff
 diff -r c19d34741b0a a
 --- a/a
 +++ b/a
 @@ -1,1 +1,1 @@
 -a
 +abc
-+ hg addremove
 adding b
-+ hg commit -m 2 -d 0 0
-+ hg -q pull ../r1
-+ hg status
 M a
-+ hg --debug up
 resolving manifests
  force None allow None moddirstate True linear True
  ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
  a versions differ, resolve
 remote created b
 getting b
 merging a
 resolving a
 file a: other d730145abbf9 ancestor b789fdd96dc2
-+ hg --debug up -m
 resolving manifests
  force None allow 1 moddirstate True linear True
  ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
-+ hg parents
 changeset:   1:1e71731e6fbb
 tag:         tip
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     2
 
-+ hg -v history
 changeset:   1:1e71731e6fbb5b35fae293120dea6964371c13c6
 tag:         tip
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 files:       a b
 description:
 2
 
 
 changeset:   0:c19d34741b0a4ced8e4ba74bb834597d5193851e
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 files:       a
 description:
 1
 
 
-+ hg diff
 diff -r 1e71731e6fbb a
 --- a/a
 +++ b/a
 @@ -1,1 +1,1 @@
 -a2
 +abc

tests/test-walk.out

@@ -1,114 +1,87 b''
-+ hg init
-+ hg addremove
 adding fennel
 adding fenugreek
 adding fiddlehead
 adding glob:glob
 adding beans/black
 adding beans/borlotti
 adding beans/kidney
 adding beans/navy
 adding beans/pinto
 adding beans/turtle
 adding mammals/skunk
 adding mammals/Procyonidae/cacomistle
 adding mammals/Procyonidae/coatimundi
 adding mammals/Procyonidae/raccoon
-+ hg commit -m commit #0 -d 0 0
-+ hg debugwalk
 f  fennel                          fennel
 f  fenugreek                       fenugreek
 f  fiddlehead                      fiddlehead
 f  glob:glob                       glob:glob
 f  beans/black                     beans/black
 f  beans/borlotti                  beans/borlotti
 f  beans/kidney                    beans/kidney
 f  beans/navy                      beans/navy
 f  beans/pinto                     beans/pinto
 f  beans/turtle                    beans/turtle
 f  mammals/skunk                   mammals/skunk
 f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle
 f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi
 f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon
-+ hg debugwalk
 f  mammals/skunk                   skunk
 f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle
 f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi
 f  mammals/Procyonidae/raccoon     Procyonidae/raccoon
-+ hg debugwalk Procyonidae
 f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle
 f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi
 f  mammals/Procyonidae/raccoon     Procyonidae/raccoon
-+ hg debugwalk
 f  mammals/Procyonidae/cacomistle  cacomistle
 f  mammals/Procyonidae/coatimundi  coatimundi
 f  mammals/Procyonidae/raccoon     raccoon
-+ hg debugwalk ..
 f  mammals/skunk                   ../skunk
 f  mammals/Procyonidae/cacomistle  cacomistle
 f  mammals/Procyonidae/coatimundi  coatimundi
 f  mammals/Procyonidae/raccoon     raccoon
-+ hg debugwalk ../beans
 f  beans/black     ../beans/black
 f  beans/borlotti  ../beans/borlotti
 f  beans/kidney    ../beans/kidney
 f  beans/navy      ../beans/navy
 f  beans/pinto     ../beans/pinto
 f  beans/turtle    ../beans/turtle
-+ hg debugwalk
 f  mammals/skunk                   skunk
 f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle
 f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi
 f  mammals/Procyonidae/raccoon     Procyonidae/raccoon
-+ hg debugwalk -Ibeans
 f  beans/black     beans/black
 f  beans/borlotti  beans/borlotti
 f  beans/kidney    beans/kidney
 f  beans/navy      beans/navy
 f  beans/pinto     beans/pinto
 f  beans/turtle    beans/turtle
-+ hg debugwalk mammals/../beans/b*
 f  beans/black     beans/black
 f  beans/borlotti  beans/borlotti
-+ hg debugwalk -X*/Procyonidae mammals
 f  mammals/skunk  mammals/skunk
-+ hg debugwalk path:mammals
 f  mammals/skunk                   mammals/skunk
 f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle
 f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi
 f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon
-+ hg debugwalk ..
 abort: .. not under repository root
-+ hg debugwalk beans/../..
 abort: beans/../.. not under repository root
-+ hg debugwalk glob:*
 f  fennel      fennel
 f  fenugreek   fenugreek
 f  fiddlehead  fiddlehead
 f  glob:glob   glob:glob
-+ hg debugwalk re:.*[kb]$
 f  fenugreek      fenugreek
 f  glob:glob      glob:glob
 f  beans/black    beans/black
 f  mammals/skunk  mammals/skunk
-+ hg debugwalk path:beans/black
 f  beans/black  beans/black
-+ hg debugwalk beans beans/*
 f  beans/black     beans/black
 f  beans/borlotti  beans/borlotti
 f  beans/kidney    beans/kidney
 f  beans/navy      beans/navy
 f  beans/pinto     beans/pinto
 f  beans/turtle    beans/turtle
-+ hg debugwalk j*
-+ hg debugwalk NOEXIST
 NOEXIST: No such file or directory
-+ hg debugwalk fifo
 fifo: unsupported file type (type is fifo)
-+ hg debugwalk fenugreek
+m  fenugreek  fenugreek
 m  fenugreek  fenugreek
-+ hg rm fenugreek
-+ hg debugwalk fenugreek
-m  fenugreek  fenugreek
-+ hg debugwalk new
 f  new  new