--- a/tests/run-tests.py Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/run-tests.py Thu Nov 17 23:02:18 2011 -0600
@@ -508,7 +508,7 @@
return run(cmd, wd, options, replacements)
def shtest(test, wd, options, replacements):
- cmd = '"%s"' % test
+ cmd = '%s "%s"' % (options.shell, test)
vlog("# Running", cmd)
return run(cmd, wd, options, replacements)
--- a/tests/test-acl.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-acl.t Thu Nov 17 23:02:18 2011 -0600
@@ -868,10 +868,10 @@
added 3 changesets with 3 changes to 3 files
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: checking access for user "barney"
- error: pretxnchangegroup.acl hook raised an exception: [Errno 2] No such file or directory: '../acl.config'
+ error: pretxnchangegroup.acl hook raised an exception: [Errno 2] *: '../acl.config' (glob)
transaction abort!
rollback completed
- abort: No such file or directory: ../acl.config
+ abort: *: ../acl.config (glob)
no rollback information available
0:6675d58eff77
--- a/tests/test-add.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-add.t Thu Nov 17 23:02:18 2011 -0600
@@ -123,11 +123,11 @@
? a.orig
$ hg add c && echo "unexpected addition of missing file"
- c: No such file or directory
+ c: * (glob)
[1]
$ echo c > c
$ hg add d c && echo "unexpected addition of missing file"
- d: No such file or directory
+ d: * (glob)
[1]
$ hg st
M a
--- a/tests/test-audit-path.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-audit-path.t Thu Nov 17 23:02:18 2011 -0600
@@ -80,5 +80,5 @@
$ hg manifest -r4
/tmp/test
$ hg update -Cr4
- abort: No such file or directory: $TESTTMP/target//tmp/test
+ abort: *: $TESTTMP/target//tmp/test (glob)
[255]
--- a/tests/test-backout.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-backout.t Thu Nov 17 23:02:18 2011 -0600
@@ -48,8 +48,8 @@
$ hg backout -d '3 0' --merge tip --tool=true
removing a
changeset 3:7f6d0f120113 backs out changeset 2:de31bdc76c0d
- $ cat a 2>/dev/null || echo cat: a: No such file or directory
- cat: a: No such file or directory
+ $ test -f a
+ [1]
across branch
--- a/tests/test-bad-pull.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-bad-pull.t Thu Nov 17 23:02:18 2011 -0600
@@ -4,8 +4,8 @@
abort: error: Connection refused
[255]
- $ test -d copy || echo copy: No such file or directory
- copy: No such file or directory
+ $ test -d copy
+ [1]
$ cat > dumb.py <<EOF
> import BaseHTTPServer, SimpleHTTPServer, os, signal
--- a/tests/test-bisect.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-bisect.t Thu Nov 17 23:02:18 2011 -0600
@@ -1,3 +1,5 @@
+ $ "$TESTDIR/hghave" system-sh || exit 80
+
$ hg init
--- a/tests/test-bundle.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-bundle.t Thu Nov 17 23:02:18 2011 -0600
@@ -1,3 +1,5 @@
+ $ "$TESTDIR/hghave" system-sh || exit 80
+
Setting up test
$ hg init test
@@ -375,7 +377,7 @@
Outgoing -R does-not-exist.hg vs partial2 in partial
$ hg -R bundle://../does-not-exist.hg outgoing ../partial2
- abort: No such file or directory: ../does-not-exist.hg
+ abort: *: ../does-not-exist.hg (glob)
[255]
$ cd ..
@@ -408,7 +410,7 @@
recurse infinitely (issue 2528)
$ hg clone full.hg ''
- abort: No such file or directory
+ abort: * (glob)
[255]
test for http://mercurial.selenic.com/bts/issue216
--- a/tests/test-clone.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-clone.t Thu Nov 17 23:02:18 2011 -0600
@@ -10,7 +10,7 @@
Create a non-inlined filelog:
- $ python -c 'for x in range(10000): print x' >> data1
+ $ python -c 'file("data1", "wb").write("".join("%s\n" % x for x in range(10000)))'
$ for j in 0 1 2 3 4 5 6 7 8 9; do
> cat data1 >> b
> hg commit -m test
@@ -43,7 +43,7 @@
Invalid dest '' must abort:
$ hg clone . ''
- abort: No such file or directory
+ abort: * (glob)
[255]
No update, with debug option:
@@ -85,7 +85,7 @@
$ hg clone -q -U --config 'paths.foobar=a#0' foobar f
$ hg -R f showconfig paths.default
- $TESTTMP/a#0
+ $TESTTMP/a#0 (glob)
Use --pull:
@@ -107,7 +107,7 @@
Invalid dest '' with --pull must abort (issue2528):
$ hg clone --pull a ''
- abort: No such file or directory
+ abort: * (glob)
[255]
Clone to '.':
--- a/tests/test-commit.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-commit.t Thu Nov 17 23:02:18 2011 -0600
@@ -73,7 +73,7 @@
$ cd ..
$ hg commit -m commit-14 does-not-exist
- abort: does-not-exist: No such file or directory
+ abort: does-not-exist: * (glob)
[255]
$ ln -s foo baz
$ hg commit -m commit-15 baz
--- a/tests/test-diff-hashes.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-diff-hashes.t Thu Nov 17 23:02:18 2011 -0600
@@ -2,8 +2,8 @@
$ cd a
$ hg diff inexistent1 inexistent2
- inexistent1: No such file or directory
- inexistent2: No such file or directory
+ inexistent1: * (glob)
+ inexistent2: * (glob)
$ echo bar > foo
$ hg add foo
--- a/tests/test-diff-newlines.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-diff-newlines.t Thu Nov 17 23:02:18 2011 -0600
@@ -1,6 +1,6 @@
$ hg init
- $ python -c 'print "confuse str.splitlines\nembedded\rnewline"' > a
+ $ python -c 'file("a", "wb").write("confuse str.splitlines\nembedded\rnewline\n")'
$ hg ci -Ama -d '1 0'
adding a
--- a/tests/test-filecache.py Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-filecache.py Thu Nov 17 23:02:18 2011 -0600
@@ -1,6 +1,6 @@
import sys, os, subprocess
-if subprocess.call(['%s/hghave' % os.environ['TESTDIR'], 'cacheable']):
+if subprocess.call(['python', '%s/hghave' % os.environ['TESTDIR'], 'cacheable']):
sys.exit(80)
from mercurial import util, scmutil, extensions
--- a/tests/test-import.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-import.t Thu Nov 17 23:02:18 2011 -0600
@@ -233,7 +233,7 @@
> msg.set_payload('email commit message\n' + patch)
> msg['Subject'] = 'email patch'
> msg['From'] = 'email patcher'
- > sys.stdout.write(msg.as_string())
+ > file(sys.argv[2], 'wb').write(msg.as_string())
> EOF
@@ -246,7 +246,7 @@
added 1 changesets with 2 changes to 2 files
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ python mkmsg.py diffed-tip.patch > msg.patch
+ $ python mkmsg.py diffed-tip.patch msg.patch
$ hg --cwd b import ../msg.patch
applying ../msg.patch
$ hg --cwd b tip | grep email
@@ -308,7 +308,8 @@
added 1 changesets with 2 changes to 2 files
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ python mkmsg.py exported-tip.patch | hg --cwd b import -
+ $ python mkmsg.py exported-tip.patch msg.patch
+ $ cat msg.patch | hg --cwd b import -
applying patch from stdin
$ hg --cwd b tip | grep second
summary: second change
@@ -325,7 +326,7 @@
> msg.set_payload('email patch\n\nnext line\n---\n' + patch)
> msg['Subject'] = '[PATCH] email patch'
> msg['From'] = 'email patcher'
- > sys.stdout.write(msg.as_string())
+ > file(sys.argv[2], 'wb').write(msg.as_string())
> EOF
@@ -338,7 +339,8 @@
added 1 changesets with 2 changes to 2 files
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ python mkmsg2.py diffed-tip.patch | hg --cwd b import -
+ $ python mkmsg2.py diffed-tip.patch msg.patch
+ $ cat msg.patch | hg --cwd b import -
applying patch from stdin
$ hg --cwd b tip --template '{desc}\n'
email patch
--- a/tests/test-largefiles.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-largefiles.t Thu Nov 17 23:02:18 2011 -0600
@@ -818,6 +818,7 @@
getting changed largefiles
1 largefiles updated, 0 removed
$ cd ..
+ $ chmod -R u+w alice/pubrepo
$ HOME="$ORIGHOME"
Symlink to a large largefile should behave the same as a symlink to a normal file
--- a/tests/test-merge-prompt.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-merge-prompt.t Thu Nov 17 23:02:18 2011 -0600
@@ -77,7 +77,7 @@
$ status
--- status ---
- file2: No such file or directory
+ file2: * (glob)
C file1
--- file1 ---
1
@@ -133,7 +133,7 @@
$ status
--- status ---
- file2: No such file or directory
+ file2: * (glob)
C file1
--- file1 ---
1
--- a/tests/test-merge-tools.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-merge-tools.t Thu Nov 17 23:02:18 2011 -0600
@@ -1,3 +1,5 @@
+ $ "$TESTDIR/hghave" system-sh || exit 80
+
test merge-tools configuration - mostly exercising filemerge.py
$ unset HGMERGE # make sure HGMERGE doesn't interfere with the test
--- a/tests/test-mq-qnew.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-mq-qnew.t Thu Nov 17 23:02:18 2011 -0600
@@ -123,7 +123,7 @@
A series
A uncommitted.patch
% qnew missing
- abort: missing: No such file or directory
+ abort: missing: * (glob)
% qnew -m
foo bar
@@ -190,7 +190,7 @@
A series
A uncommitted.patch
% qnew missing
- abort: missing: No such file or directory
+ abort: missing: * (glob)
% qnew -m
# HG changeset patch
# Parent
--- a/tests/test-patchbomb.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-patchbomb.t Thu Nov 17 23:02:18 2011 -0600
@@ -1,3 +1,5 @@
+ $ "$TESTDIR/hghave" system-sh || exit 80
+
$ fixheaders()
> {
> sed -e 's/\(Message-Id:.*@\).*/\1/' \
--- a/tests/test-pending.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-pending.t Thu Nov 17 23:02:18 2011 -0600
@@ -1,3 +1,5 @@
+ $ "$TESTDIR/hghave" system-sh || exit 80
+
Verify that pending changesets are seen by pretxn* hooks but not by other
processes that access the destination repo while the hooks are running.
--- a/tests/test-pull-permission.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-pull-permission.t Thu Nov 17 23:02:18 2011 -0600
@@ -1,3 +1,5 @@
+ $ "$TESTDIR/hghave" unix-permissions || exit 80
+
$ hg init a
$ cd a
$ echo foo > b
--- a/tests/test-qrecord.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-qrecord.t Thu Nov 17 23:02:18 2011 -0600
@@ -107,7 +107,7 @@
$ echo "mq=nonexistant" >> $HGRCPATH
$ hg help qrecord
- *** failed to import extension mq from nonexistant: [Errno 2] No such file or directory
+ *** failed to import extension mq from nonexistant: [Errno 2] * (glob)
hg qrecord [OPTION]... PATCH [FILE]...
interactively record a new patch
--- a/tests/test-rebase-detach.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-rebase-detach.t Thu Nov 17 23:02:18 2011 -0600
@@ -372,7 +372,7 @@
[255]
$ hg resolve --all -t internal:local
$ hg rebase -c
- saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg
+ saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg (glob)
$ hg tglog
@ 8: 'H2'
|
--- a/tests/test-revert.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-revert.t Thu Nov 17 23:02:18 2011 -0600
@@ -82,7 +82,7 @@
should not find b
$ hg status b
- b: No such file or directory
+ b: * (glob)
should show a c e
--- a/tests/test-status-color.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-status-color.t Thu Nov 17 23:02:18 2011 -0600
@@ -134,7 +134,7 @@
hg status modified added removed deleted unknown never-existed ignored:
$ hg status --color=always modified added removed deleted unknown never-existed ignored
- never-existed: No such file or directory
+ never-existed: * (glob)
\x1b[0;32;1mA added\x1b[0m (esc)
\x1b[0;31;1mR removed\x1b[0m (esc)
\x1b[0;36;1;4m! deleted\x1b[0m (esc)
--- a/tests/test-status.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-status.t Thu Nov 17 23:02:18 2011 -0600
@@ -127,7 +127,7 @@
hg status modified added removed deleted unknown never-existed ignored:
$ hg status modified added removed deleted unknown never-existed ignored
- never-existed: No such file or directory
+ never-existed: * (glob)
A added
R removed
! deleted
--- a/tests/test-subrepo-recursion.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-subrepo-recursion.t Thu Nov 17 23:02:18 2011 -0600
@@ -23,10 +23,10 @@
$ hg add -S .hgsub
$ hg add -S foo/.hgsub
$ hg add -S foo/bar
- adding foo/bar/z.txt
+ adding foo/bar/z.txt (glob)
$ hg add -S
adding x.txt
- adding foo/y.txt
+ adding foo/y.txt (glob)
Test recursive status without committing anything:
@@ -67,7 +67,7 @@
$ hg commit -m 0-0-0 --config ui.commitsubrepos=No --subrepos
committing subrepository foo
- committing subrepository foo/bar
+ committing subrepository foo/bar (glob)
$ cd foo
$ echo y2 >> y.txt
@@ -186,7 +186,7 @@
$ rm -r dir
$ hg commit --subrepos -m 2-3-2
committing subrepository foo
- committing subrepository foo/bar
+ committing subrepository foo/bar (glob)
Log with the relationships between repo and its subrepo:
@@ -342,7 +342,7 @@
archiving (foo/bar) [================================>] 1/1 (glob)
cloning subrepo foo from $TESTTMP/repo/foo
- cloning subrepo foo/bar from $TESTTMP/repo/foo/bar
+ cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
The newly cloned subrepos contain no working copy:
@@ -365,7 +365,7 @@
$ echo f > foo/f
$ hg archive --subrepos -r tip archive
cloning subrepo foo from $TESTTMP/empty/foo
- abort: destination '$TESTTMP/almost-empty/foo' is not empty
+ abort: destination '$TESTTMP/almost-empty/foo' is not empty (glob)
[255]
Clone and test outgoing:
@@ -374,11 +374,11 @@
$ hg clone repo repo2
updating to branch default
cloning subrepo foo from $TESTTMP/repo/foo
- cloning subrepo foo/bar from $TESTTMP/repo/foo/bar
+ cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd repo2
$ hg outgoing -S
- comparing with $TESTTMP/repo
+ comparing with $TESTTMP/repo (glob)
searching for changes
no changes found
comparing with $TESTTMP/repo/foo
@@ -404,7 +404,7 @@
$ hg commit --subrepos -m 3-4-2
committing subrepository foo
$ hg outgoing -S
- comparing with $TESTTMP/repo
+ comparing with $TESTTMP/repo (glob)
searching for changes
changeset: 3:2655b8ecc4ee
tag: tip
@@ -434,7 +434,7 @@
Test incoming:
$ hg incoming -S
- comparing with $TESTTMP/repo2
+ comparing with $TESTTMP/repo2 (glob)
searching for changes
changeset: 3:2655b8ecc4ee
tag: tip
--- a/tests/test-subrepo.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-subrepo.t Thu Nov 17 23:02:18 2011 -0600
@@ -949,8 +949,8 @@
? s/f9
$ hg add -S
adding f8
- adding s/f10
- adding s/f9
+ adding s/f10 (glob)
+ adding s/f9 (glob)
$ hg st -S
A f8
A s/f10
@@ -993,7 +993,7 @@
? s/fn18
$ hg add -S 'glob:**fm*'
adding fm15
- adding s/fm17
+ adding s/fm17 (glob)
$ hg st -S
A fm15
A s/fm17
--- a/tests/test-tag.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-tag.t Thu Nov 17 23:02:18 2011 -0600
@@ -1,3 +1,5 @@
+ $ "$TESTDIR/hghave" system-sh || exit 80
+
$ hg init test
$ cd test
--- a/tests/test-walk.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-walk.t Thu Nov 17 23:02:18 2011 -0600
@@ -274,7 +274,7 @@
f mammals/skunk mammals/skunk
$ hg debugwalk 'glob:j*'
$ hg debugwalk NOEXIST
- NOEXIST: No such file or directory
+ NOEXIST: * (glob)
$ mkfifo fifo
$ hg debugwalk fifo
--- a/tests/test-win32text.t Thu Nov 17 23:01:58 2011 -0600
+++ b/tests/test-win32text.t Thu Nov 17 23:02:18 2011 -0600
@@ -112,7 +112,7 @@
abort: pretxncommit.crlf hook failed
[255]
$ hg revert -a
- forgetting d/f2
+ forgetting d/f2 (glob)
$ rm d/f2
$ hg rem f
@@ -177,10 +177,10 @@
$ for x in a b c d; do echo content > dupe/$x; done
$ hg -R dupe add
- adding dupe/a
- adding dupe/b
- adding dupe/c
- adding dupe/d
+ adding dupe/a (glob)
+ adding dupe/b (glob)
+ adding dupe/c (glob)
+ adding dupe/d (glob)
$ python unix2dos.py dupe/b dupe/c dupe/d
$ hg -R dupe ci -m a dupe/a
$ hg -R dupe ci -m b/c dupe/[bc]