tests: fix reported patch tool name in test-mq

Strip any path of the patch executable, which it might return on failure.

tests/test-mq

@@ -1,531 +1,531 b''
 #!/bin/sh
 
 checkundo()
 {
     if [ -f .hg/store/undo ]; then
 	echo ".hg/store/undo still exists after $1"
     fi
 }
 
 echo "[extensions]" >> $HGRCPATH
 echo "mq=" >> $HGRCPATH
 
 echo % help
 hg help mq
 
 hg init a
 cd a
 echo a > a
 hg ci -Ama
 
 hg clone . ../k
 
 mkdir b
 echo z > b/z
 hg ci -Ama
 
 echo % qinit
 
 hg qinit
 
 cd ..
 hg init b
 
 echo % -R qinit
 
 hg -R b qinit
 
 hg init c
 
 echo % qinit -c
 
 hg --cwd c qinit -c
 hg -R c/.hg/patches st
 
 echo % qnew should refuse bad patch names
 hg -R c qnew series
 hg -R c qnew status
 hg -R c qnew guards
 hg -R c qnew .hgignore
 
 echo % qnew implies add
 
 hg -R c qnew test.patch
 hg -R c/.hg/patches st
 
 echo '% qinit; qinit -c'
 hg init d
 cd d
 hg qinit
 hg qinit -c
 # qinit -c should create both files if they don't exist
 echo '  .hgignore:'
 cat .hg/patches/.hgignore
 echo '  series:'
 cat .hg/patches/series
 hg qinit -c 2>&1 | sed -e 's/repository.*already/repository already/'
 cd ..
 
 echo '% qinit; <stuff>; qinit -c'
 hg init e
 cd e
 hg qnew A
 checkundo qnew
 echo foo > foo
 hg add foo
 hg qrefresh
 hg qnew B
 echo >> foo
 hg qrefresh
 echo status >> .hg/patches/.hgignore
 echo bleh >> .hg/patches/.hgignore
 hg qinit -c
 hg -R .hg/patches status
 # qinit -c shouldn't touch these files if they already exist
 echo '  .hgignore:'
 cat .hg/patches/.hgignore
 echo '  series:'
 cat .hg/patches/series
 cd ..
 
 cd a
 
 echo a > somefile
 hg add somefile
 
 echo % qnew with uncommitted changes
 
 hg qnew uncommitted.patch
 hg st
 hg qseries
 
 echo '% qnew with uncommitted changes and missing file (issue 803)'
 
 hg qnew issue803.patch someotherfile 2>&1 | \
     sed -e 's/someotherfile:.*/someotherfile: No such file or directory/'
 hg st
 hg qseries
 hg qpop -f
 hg qdel issue803.patch
 
 hg revert --no-backup somefile
 rm somefile
 
 echo % qnew -m
 
 hg qnew -m 'foo bar' test.patch
 cat .hg/patches/test.patch
 
 echo % qrefresh
 
 echo a >> a
 hg qrefresh
 sed -e "s/^\(diff -r \)\([a-f0-9]* \)/\1 x/" \
     -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
     -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/test.patch
 
 echo % empty qrefresh
 
 hg qrefresh -X a
 echo 'revision:'
 hg diff -r -2 -r -1
 echo 'patch:'
 cat .hg/patches/test.patch
 echo 'working dir diff:'
 hg diff --nodates -q
 # restore things
 hg qrefresh
 checkundo qrefresh
 
 echo % qpop
 
 hg qpop
 checkundo qpop
 
 echo % qpush
 
 hg qpush
 checkundo qpush
 
 cd ..
 
 echo % pop/push outside repo
 
 hg -R a qpop
 hg -R a qpush
 
 cd a
 hg qnew test2.patch
 
 echo % qrefresh in subdir
 
 cd b
 echo a > a
 hg add a
 hg qrefresh
 
 echo % pop/push -a in subdir
 
 hg qpop -a
 hg --traceback qpush -a
 
 echo % qseries
 hg qseries
 hg qpop
 hg qseries -vs
 hg qpush
 
 echo % qapplied
 hg qapplied
 
 echo % qtop
 hg qtop
 
 echo % qprev
 hg qprev
 
 echo % qnext
 hg qnext
 
 echo % pop, qnext, qprev, qapplied
 hg qpop
 hg qnext
 hg qprev
 hg qapplied
 
 echo % commit should fail
 hg commit
 
 echo % push should fail
 hg push ../../k
 
 echo % qunapplied
 hg qunapplied
 
 echo % qpush/qpop with index
 hg qnew test1b.patch
 echo 1b > 1b
 hg add 1b
 hg qrefresh
 hg qpush 2
 hg qpop 0
 hg qpush test.patch+1
 hg qpush test.patch+2
 hg qpop test2.patch-1
 hg qpop test2.patch-2
 hg qpush test1b.patch+1
 
 echo % push should succeed
 hg qpop -a
 hg push ../../k
 
 echo % qpush/qpop error codes
 errorcode()
 {
     hg "$@" && echo "  $@ succeeds" || echo "  $@ fails"
 }
 
 # we want to start with some patches applied
 hg qpush -a
 echo "  % pops all patches and succeeds"
 errorcode qpop -a
 echo "  % does nothing and succeeds"
 errorcode qpop -a
 echo "  % fails - nothing else to pop"
 errorcode qpop
 echo "  % pushes a patch and succeeds"
 errorcode qpush
 echo "  % pops a patch and succeeds"
 errorcode qpop
 echo "  % pushes up to test1b.patch and succeeds"
 errorcode qpush test1b.patch
 echo "  % does nothing and succeeds"
 errorcode qpush test1b.patch
 echo "  % does nothing and succeeds"
 errorcode qpop test1b.patch
 echo "  % fails - can't push to this patch"
 errorcode qpush test.patch
 echo "  % fails - can't pop to this patch"
 errorcode qpop test2.patch
 echo "  % pops up to test.patch and succeeds"
 errorcode qpop test.patch
 echo "  % pushes all patches and succeeds"
 errorcode qpush -a
 echo "  % does nothing and succeeds"
 errorcode qpush -a
 echo "  % fails - nothing else to push"
 errorcode qpush
 echo "  % does nothing and succeeds"
 errorcode qpush test2.patch
 
 
 echo % strip
 cd ../../b
 echo x>x
 hg ci -Ama
 hg strip tip 2>&1 | sed 's/\(saving bundle to \).*/\1/'
 hg unbundle .hg/strip-backup/*
 
 echo '% cd b; hg qrefresh'
 hg init refresh
 cd refresh
 echo a > a
 hg ci -Ama -d'0 0'
 hg qnew -mfoo foo
 echo a >> a
 hg qrefresh
 mkdir b
 cd b
 echo f > f
 hg add f
 hg qrefresh
 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
     -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" ../.hg/patches/foo
 echo % hg qrefresh .
 hg qrefresh .
 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
     -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" ../.hg/patches/foo
 hg status
 
 echo % qpush failure
 cd ..
 hg qrefresh
 hg qnew -mbar bar
 echo foo > foo
 echo bar > bar
 hg add foo bar
 hg qrefresh
 hg qpop -a
 echo bar > foo
 hg qpush -a
 hg st
 
 echo % mq tags
 hg log --template '{rev} {tags}\n' -r qparent:qtip
 
 echo % bad node in status
 hg qpop
 hg strip -qn tip
 hg tip 2>&1 | sed -e 's/unknown node .*/unknown node/'
 hg branches 2>&1 | sed -e 's/unknown node .*/unknown node/'
 hg qpop
 
 cat >>$HGRCPATH <<EOF
 [diff]
 git = True
 EOF
 cd ..
 hg init git
 cd git
 hg qinit
 
 hg qnew -m'new file' new
 echo foo > new
 chmod +x new
 hg add new
 hg qrefresh
 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
     -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/new
 
 hg qnew -m'copy file' copy
 hg cp new copy
 hg qrefresh
 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
     -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/copy
 
 hg qpop
 hg qpush
 hg qdiff
 cat >>$HGRCPATH <<EOF
 [diff]
 git = False
 EOF
 hg qdiff --git
 
 cd ..
 hg init slow
 cd slow
 hg qinit
 echo foo > foo
 hg add foo
 hg ci -m 'add foo'
 hg qnew bar
 echo bar > bar
 hg add bar
 hg mv foo baz
 hg qrefresh --git
 hg up -C 0
 echo >> foo
 hg ci -m 'change foo'
 hg up -C 1
 hg qrefresh --git 2>&1 | grep -v 'saving bundle'
 cat .hg/patches/bar
 hg log -vC --template '{rev} {file_copies%filecopy}\n' -r .
 hg qrefresh --git
 cat .hg/patches/bar
 hg log -vC --template '{rev} {file_copies%filecopy}\n' -r .
 hg qrefresh
 grep 'diff --git' .hg/patches/bar
 
 echo
 hg up -C 1
 echo >> foo
 hg ci -m 'change foo again'
 hg up -C 2
 hg mv bar quux
 hg mv baz bleh
 hg qrefresh --git 2>&1 | grep -v 'saving bundle'
 cat .hg/patches/bar
 hg log -vC --template '{rev} {file_copies%filecopy}\n' -r .
 hg mv quux fred
 hg mv bleh barney
 hg qrefresh --git
 cat .hg/patches/bar
 hg log -vC --template '{rev} {file_copies%filecopy}\n' -r .
 
 echo % refresh omitting an added file
 hg qnew baz
 echo newfile > newfile
 hg add newfile
 hg qrefresh
 hg st -A newfile
 hg qrefresh -X newfile
 hg st -A newfile
 hg revert newfile
 rm newfile
 hg qpop
 hg qdel baz
 
 echo % create a git patch
 echo a > alexander
 hg add alexander
 hg qnew -f --git addalexander
 grep diff .hg/patches/addalexander
 
 echo % create a git binary patch
 cat > writebin.py <<EOF
 import sys
 path = sys.argv[1]
 open(path, 'wb').write('BIN\x00ARY')
 EOF
 python writebin.py bucephalus
 
 python "$TESTDIR/md5sum.py" bucephalus
 hg add bucephalus
 hg qnew -f --git addbucephalus
 grep diff .hg/patches/addbucephalus
 
 echo % check binary patches can be popped and pushed
 hg qpop
 test -f bucephalus && echo % bucephalus should not be there
 hg qpush
 test -f bucephalus || echo % bucephalus should be there
 python "$TESTDIR/md5sum.py" bucephalus
 
 
 echo '% strip again'
 cd ..
 hg init strip
 cd strip
 touch foo
 hg add foo
 hg ci -m 'add foo' -d '0 0'
 echo >> foo
 hg ci -m 'change foo 1' -d '0 0'
 hg up -C 0
 echo 1 >> foo
 hg ci -m 'change foo 2' -d '0 0'
 HGMERGE=true hg merge
 hg ci -m merge -d '0 0'
 hg log
 hg strip 1 2>&1 | sed 's/\(saving bundle to \).*/\1/'
 checkundo strip
 hg log
 cd ..
 
 echo '% qclone'
 qlog()
 {
     echo 'main repo:'
     hg log --template '    rev {rev}: {desc}\n'
     echo 'patch repo:'
     hg -R .hg/patches log --template '    rev {rev}: {desc}\n'
 }
 hg init qclonesource
 cd qclonesource
 echo foo > foo
 hg add foo
 hg ci -m 'add foo'
 hg qinit
 hg qnew patch1
 echo bar >> foo
 hg qrefresh -m 'change foo'
 cd ..
 
 # repo with unversioned patch dir
 hg qclone qclonesource failure
 
 cd qclonesource
 hg qinit -c
 hg qci -m checkpoint
 qlog
 cd ..
 
 # repo with patches applied
 hg qclone qclonesource qclonedest
 cd qclonedest
 qlog
 cd ..
 
 # repo with patches unapplied
 cd qclonesource
 hg qpop -a
 qlog
 cd ..
 hg qclone qclonesource qclonedest2
 cd qclonedest2
 qlog
 cd ..
 
 echo % 'test applying on an empty file (issue 1033)'
 hg init empty
 cd empty
 touch a
 hg ci -Am addempty
 echo a > a
 hg qnew -f -e changea
 hg qpop
 hg qpush
 cd ..
 
 echo % test qpush with --force, issue1087
 hg init forcepush
 cd forcepush
 echo hello > hello.txt
 echo bye > bye.txt
 hg ci -Ama
 hg qnew -d '0 0' empty
 hg qpop
 echo world >> hello.txt
 
 echo % qpush should fail, local changes
 hg qpush
 
 echo % apply force, should not discard changes with empty patch
-hg qpush -f
+hg qpush -f 2>&1 | sed 's,^.*/patch,patch,g'
 hg diff --config diff.nodates=True
 hg qdiff --config diff.nodates=True
 hg log -l1 -p
 hg qref -d '0 0'
 hg qpop
 echo universe >> hello.txt
 echo universe >> bye.txt
 
 echo % qpush should fail, local changes
 hg qpush
 
 echo % apply force, should discard changes in hello, but not bye
 hg qpush -f
 hg st
 hg diff --config diff.nodates=True
 hg qdiff --config diff.nodates=True

tests/test-mq.out

@@ -1,546 +1,546 b''
 % help
 mq extension - patch management and development
 
 This extension lets you work with a stack of patches in a Mercurial
 repository.  It manages two stacks of patches - all known patches, and
 applied patches (subset of known patches).
 
 Known patches are represented as patch files in the .hg/patches
 directory.  Applied patches are both patch files and changesets.
 
 Common tasks (use "hg help command" for more details):
 
 prepare repository to work with patches   qinit
 create new patch                          qnew
 import existing patch                     qimport
 
 print patch series                        qseries
 print applied patches                     qapplied
 print name of top applied patch           qtop
 
 add known patch to applied stack          qpush
 remove patch from applied stack           qpop
 refresh contents of top applied patch     qrefresh
 
 list of commands:
 
  qapplied     print the patches already applied
  qclone       clone main and patch repository at same time
  qcommit      commit changes in the queue repository
  qdelete      remove patches from queue
  qdiff        diff of the current patch and subsequent modifications
  qfold        fold the named patches into the current patch
  qgoto        push or pop patches until named patch is at top of stack
  qguard       set or print guards for a patch
  qheader      Print the header of the topmost or specified patch
  qimport      import a patch
  qinit        init a new queue repository
  qnew         create a new patch
  qnext        print the name of the next patch
  qpop         pop the current patch off the stack
  qprev        print the name of the previous patch
  qpush        push the next patch onto the stack
  qrefresh     update the current patch
  qrename      rename a patch
  qrestore     restore the queue state saved by a rev
  qsave        save current queue state
  qselect      set or print guarded patches to push
  qseries      print the entire series file
  qtop         print the name of the current patch
  qunapplied   print the patches not yet applied
  strip        strip a revision and all its descendants from the repository
 
 use "hg -v help mq" to show aliases and global options
 adding a
 updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding b/z
 % qinit
 % -R qinit
 % qinit -c
 A .hgignore
 A series
 % qnew should refuse bad patch names
 abort: "series" cannot be used as the name of a patch
 abort: "status" cannot be used as the name of a patch
 abort: "guards" cannot be used as the name of a patch
 abort: ".hgignore" cannot be used as the name of a patch
 % qnew implies add
 A .hgignore
 A series
 A test.patch
 % qinit; qinit -c
   .hgignore:
 ^\.hg
 ^\.mq
 syntax: glob
 status
 guards
   series:
 abort: repository already exists!
 % qinit; <stuff>; qinit -c
 adding .hg/patches/A
 adding .hg/patches/B
 A .hgignore
 A A
 A B
 A series
   .hgignore:
 status
 bleh
   series:
 A
 B
 % qnew with uncommitted changes
 abort: local changes found, refresh first
 A somefile
 % qnew with uncommitted changes and missing file (issue 803)
 someotherfile: No such file or directory
 A somefile
 issue803.patch
 Patch queue now empty
 % qnew -m
 foo bar
 % qrefresh
 foo bar
 
 diff -r  xa
 --- a/a
 +++ b/a
 @@ -1,1 +1,2 @@
  a
 +a
 % empty qrefresh
 revision:
 patch:
 foo bar
 
 working dir diff:
 --- a/a
 +++ b/a
 @@ -1,1 +1,2 @@
  a
 +a
 % qpop
 Patch queue now empty
 % qpush
 applying test.patch
 Now at: test.patch
 % pop/push outside repo
 Patch queue now empty
 applying test.patch
 Now at: test.patch
 % qrefresh in subdir
 % pop/push -a in subdir
 Patch queue now empty
 applying test.patch
 applying test2.patch
 Now at: test2.patch
 % qseries
 test.patch
 test2.patch
 Now at: test.patch
 0 A test.patch: foo bar
 1 U test2.patch: 
 applying test2.patch
 Now at: test2.patch
 % qapplied
 test.patch
 test2.patch
 % qtop
 test2.patch
 % qprev
 test.patch
 % qnext
 All patches applied
 % pop, qnext, qprev, qapplied
 Now at: test.patch
 test2.patch
 Only one patch applied
 test.patch
 % commit should fail
 abort: cannot commit over an applied mq patch
 % push should fail
 pushing to ../../k
 abort: source has mq patches applied
 % qunapplied
 test2.patch
 % qpush/qpop with index
 applying test2.patch
 Now at: test2.patch
 Now at: test.patch
 applying test1b.patch
 Now at: test1b.patch
 applying test2.patch
 Now at: test2.patch
 Now at: test1b.patch
 Now at: test.patch
 applying test1b.patch
 applying test2.patch
 Now at: test2.patch
 % push should succeed
 Patch queue now empty
 pushing to ../../k
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 % qpush/qpop error codes
 applying test.patch
 applying test1b.patch
 applying test2.patch
 Now at: test2.patch
   % pops all patches and succeeds
 Patch queue now empty
   qpop -a succeeds
   % does nothing and succeeds
 no patches applied
   qpop -a succeeds
   % fails - nothing else to pop
 no patches applied
   qpop fails
   % pushes a patch and succeeds
 applying test.patch
 Now at: test.patch
   qpush succeeds
   % pops a patch and succeeds
 Patch queue now empty
   qpop succeeds
   % pushes up to test1b.patch and succeeds
 applying test.patch
 applying test1b.patch
 Now at: test1b.patch
   qpush test1b.patch succeeds
   % does nothing and succeeds
 qpush: test1b.patch is already at the top
   qpush test1b.patch succeeds
   % does nothing and succeeds
 qpop: test1b.patch is already at the top
   qpop test1b.patch succeeds
   % fails - can't push to this patch
 abort: cannot push to a previous patch: test.patch
   qpush test.patch fails
   % fails - can't pop to this patch
 abort: patch test2.patch is not applied
   qpop test2.patch fails
   % pops up to test.patch and succeeds
 Now at: test.patch
   qpop test.patch succeeds
   % pushes all patches and succeeds
 applying test1b.patch
 applying test2.patch
 Now at: test2.patch
   qpush -a succeeds
   % does nothing and succeeds
 all patches are currently applied
   qpush -a succeeds
   % fails - nothing else to push
 patch series already fully applied
   qpush fails
   % does nothing and succeeds
 all patches are currently applied
   qpush test2.patch succeeds
 % strip
 adding x
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 saving bundle to 
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 (run 'hg update' to get a working copy)
 % cd b; hg qrefresh
 adding a
 foo
 
 diff -r cb9a9f314b8b a
 --- a/a
 +++ b/a
 @@ -1,1 +1,2 @@
  a
 +a
 diff -r cb9a9f314b8b b/f
 --- /dev/null
 +++ b/b/f
 @@ -0,0 +1,1 @@
 +f
 % hg qrefresh .
 foo
 
 diff -r cb9a9f314b8b b/f
 --- /dev/null
 +++ b/b/f
 @@ -0,0 +1,1 @@
 +f
 M a
 % qpush failure
 Patch queue now empty
 applying foo
 applying bar
 file foo already exists
 1 out of 1 hunk FAILED -- saving rejects to file foo.rej
 patch failed, unable to continue (try -v)
 patch failed, rejects left in working dir
 Errors during apply, please fix and refresh bar
 ? foo
 ? foo.rej
 % mq tags
 0 qparent
 1 qbase foo
 2 qtip bar tip
 % bad node in status
 Now at: foo
 changeset:   0:cb9a9f314b8b
 mq status file refers to unknown node
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     a
 
 mq status file refers to unknown node
 default                        0:cb9a9f314b8b
 abort: working directory revision is not qtip
 new file
 
 diff --git a/new b/new
 new file mode 100755
 --- /dev/null
 +++ b/new
 @@ -0,0 +1,1 @@
 +foo
 copy file
 
 diff --git a/new b/copy
 copy from new
 copy to copy
 Now at: new
 applying copy
 Now at: copy
 diff --git a/new b/copy
 copy from new
 copy to copy
 diff --git a/new b/copy
 copy from new
 copy to copy
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 created new head
 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 adding branch
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 Patch queue now empty
 (working directory not at tip)
 applying bar
 Now at: bar
 diff --git a/bar b/bar
 new file mode 100644
 --- /dev/null
 +++ b/bar
 @@ -0,0 +1,1 @@
 +bar
 diff --git a/foo b/baz
 rename from foo
 rename to baz
 2 baz (foo)
 diff --git a/bar b/bar
 new file mode 100644
 --- /dev/null
 +++ b/bar
 @@ -0,0 +1,1 @@
 +bar
 diff --git a/foo b/baz
 rename from foo
 rename to baz
 2 baz (foo)
 diff --git a/bar b/bar
 diff --git a/foo b/baz
 
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 adding branch
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 Patch queue now empty
 (working directory not at tip)
 applying bar
 Now at: bar
 diff --git a/foo b/bleh
 rename from foo
 rename to bleh
 diff --git a/quux b/quux
 new file mode 100644
 --- /dev/null
 +++ b/quux
 @@ -0,0 +1,1 @@
 +bar
 3 bleh (foo)
 diff --git a/foo b/barney
 rename from foo
 rename to barney
 diff --git a/fred b/fred
 new file mode 100644
 --- /dev/null
 +++ b/fred
 @@ -0,0 +1,1 @@
 +bar
 3 barney (foo)
 % refresh omitting an added file
 C newfile
 A newfile
 Now at: bar
 % create a git patch
 diff --git a/alexander b/alexander
 % create a git binary patch
 8ba2a2f3e77b55d03051ff9c24ad65e7  bucephalus
 diff --git a/bucephalus b/bucephalus
 % check binary patches can be popped and pushed
 Now at: addalexander
 applying addbucephalus
 Now at: addbucephalus
 8ba2a2f3e77b55d03051ff9c24ad65e7  bucephalus
 % strip again
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 merging foo
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 changeset:   3:99615015637b
 tag:         tip
 parent:      2:20cbbe65cff7
 parent:      1:d2871fc282d4
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     merge
 
 changeset:   2:20cbbe65cff7
 parent:      0:53245c60e682
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     change foo 2
 
 changeset:   1:d2871fc282d4
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     change foo 1
 
 changeset:   0:53245c60e682
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     add foo
 
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 saving bundle to 
 saving bundle to 
 adding branch
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 changeset:   1:20cbbe65cff7
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     change foo 2
 
 changeset:   0:53245c60e682
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     add foo
 
 % qclone
 abort: versioned patch repository not found (see qinit -c)
 adding .hg/patches/patch1
 main repo:
     rev 1: change foo
     rev 0: add foo
 patch repo:
     rev 0: checkpoint
 updating working directory
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 main repo:
     rev 0: add foo
 patch repo:
     rev 0: checkpoint
 Patch queue now empty
 main repo:
     rev 0: add foo
 patch repo:
     rev 0: checkpoint
 updating working directory
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 main repo:
     rev 0: add foo
 patch repo:
     rev 0: checkpoint
 % test applying on an empty file (issue 1033)
 adding a
 Patch queue now empty
 applying changea
 Now at: changea
 % test qpush with --force, issue1087
 adding bye.txt
 adding hello.txt
 Patch queue now empty
 % qpush should fail, local changes
 abort: local changes found, refresh first
 % apply force, should not discard changes with empty patch
 applying empty
-/usr/bin/patch: **** Only garbage was found in the patch input.
+patch: **** Only garbage was found in the patch input.
 patch failed, unable to continue (try -v)
 patch empty is empty
 Now at: empty
 diff -r bf5fc3f07a0a hello.txt
 --- a/hello.txt
 +++ b/hello.txt
 @@ -1,1 +1,2 @@
  hello
 +world
 diff -r 9ecee4f634e3 hello.txt
 --- a/hello.txt
 +++ b/hello.txt
 @@ -1,1 +1,2 @@
  hello
 +world
 changeset:   1:bf5fc3f07a0a
 tag:         qtip
 tag:         tip
 tag:         empty
 tag:         qbase
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     imported patch empty
 
 
 Patch queue now empty
 % qpush should fail, local changes
 abort: local changes found, refresh first
 % apply force, should discard changes in hello, but not bye
 applying empty
 Now at: empty
 M bye.txt
 diff -r ba252371dbc1 bye.txt
 --- a/bye.txt
 +++ b/bye.txt
 @@ -1,1 +1,2 @@
  bye
 +universe
 diff -r 9ecee4f634e3 bye.txt
 --- a/bye.txt
 +++ b/bye.txt
 @@ -1,1 +1,2 @@
  bye
 +universe
 diff -r 9ecee4f634e3 hello.txt
 --- a/hello.txt
 +++ b/hello.txt
 @@ -1,1 +1,3 @@
  hello
 +world
 +universe