[PATCH 2 of 6] tests: remove redundant globs
Mads Kiilerich
mads at kiilerich.com
Wed Oct 6 04:01:49 CDT 2010
# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1286355389 -7200
# Node ID 7c320ad1a7b032aeff2ad065c3b1bf222f7d761c
# Parent 560bdda78abd98c1b921097048c6ce375062daa0
tests: remove redundant globs
Many globs now just match $TESTTMP and is no longer needed.
diff --git a/tests/test-audit-path.t b/tests/test-audit-path.t
--- a/tests/test-audit-path.t
+++ b/tests/test-audit-path.t
@@ -78,5 +78,5 @@
$ hg manifest -r4
/tmp/test
$ hg update -Cr4
- abort: No such file or directory: */target//tmp/test (glob)
+ abort: No such file or directory: $TESTTMP/target//tmp/test
[255]
diff --git a/tests/test-bad-extension.t b/tests/test-bad-extension.t
--- a/tests/test-bad-extension.t
+++ b/tests/test-bad-extension.t
@@ -8,7 +8,7 @@
$ echo "badext2 =" >> $HGRCPATH
$ hg -q help help
- \*\*\* failed to import extension badext from */badext.py: bit bucket overflow (glob)
+ *** failed to import extension badext from $TESTTMP/badext.py: bit bucket overflow
*** failed to import extension badext2: No module named badext2
hg help [TOPIC]
diff --git a/tests/test-bookmarks-rebase.t b/tests/test-bookmarks-rebase.t
--- a/tests/test-bookmarks-rebase.t
+++ b/tests/test-bookmarks-rebase.t
@@ -37,7 +37,7 @@
rebase
$ hg rebase -s two -d one
- saved backup bundle to * (glob)
+ saved backup bundle to $TESTTMP/.hg/strip-backup/*-backup.hg (glob)
$ hg log
changeset: 3:9163974d1cb5
diff --git a/tests/test-bookmarks-strip.t b/tests/test-bookmarks-strip.t
--- a/tests/test-bookmarks-strip.t
+++ b/tests/test-bookmarks-strip.t
@@ -50,7 +50,7 @@
strip to revision 1
$ hg strip 1
- saved backup bundle to * (glob)
+ saved backup bundle to $TESTTMP/.hg/strip-backup/*-backup.hg (glob)
list bookmarks
diff --git a/tests/test-clone.t b/tests/test-clone.t
--- a/tests/test-clone.t
+++ b/tests/test-clone.t
@@ -80,7 +80,7 @@
$ hg clone -q -U --config 'paths.foobar=a#0' foobar f
$ hg -R f showconfig paths.default
- */a#0 (glob)
+ $TESTTMP/a#0
Use --pull:
diff --git a/tests/test-convert-cvs-branch.t b/tests/test-convert-cvs-branch.t
--- a/tests/test-convert-cvs-branch.t
+++ b/tests/test-convert-cvs-branch.t
@@ -62,7 +62,7 @@
$ hg convert src
assuming destination src-hg
initializing destination src-hg repository
- connecting to */cvsrepo (glob)
+ connecting to $TESTTMP/cvsrepo
scanning source...
collecting CVS rlog
7 log entries
diff --git a/tests/test-convert-cvs-detectmerge.t b/tests/test-convert-cvs-detectmerge.t
--- a/tests/test-convert-cvs-detectmerge.t
+++ b/tests/test-convert-cvs-detectmerge.t
@@ -69,7 +69,7 @@
merge file1 to v1_1
$ cvscall -Q update -jv1_0
- RCS file: */cvsrepo/proj/file1,v (glob)
+ RCS file: $TESTTMP/cvsrepo/proj/file1,v
retrieving revision 1.1
retrieving revision 1.1.2.1
Merging differences between 1.1 and 1.1.2.1 into file1
@@ -80,7 +80,7 @@
$ cvscall -Q update -A
$ cvscall -Q update -jv1_1
- RCS file: */cvsrepo/proj/file1,v (glob)
+ RCS file: $TESTTMP/cvsrepo/proj/file1,v
retrieving revision 1.1
retrieving revision 1.1.4.1
Merging differences between 1.1 and 1.1.4.1 into file1
@@ -101,7 +101,7 @@
$ cvsci -m"add other text" file1
$ cvscall log file1
- RCS file: */cvsrepo/proj/file1,v (glob)
+ RCS file: $TESTTMP/cvsrepo/proj/file1,v
Working file: file1
head: 1.3
branch:
@@ -141,7 +141,7 @@
$ cvscall -Q update -rv1_1
$ cvscall -Q update -j1.2 -j1.3 file1
- RCS file: */cvsrepo/proj/file1,v (glob)
+ RCS file: $TESTTMP/cvsrepo/proj/file1,v
retrieving revision 1.2
retrieving revision 1.3
Merging differences between 1.2 and 1.3 into file1
@@ -157,7 +157,7 @@
cvs commit: Examining .
$ cvscall -Q update -A
$ cvscall -Q update -junmerged -jv1_1
- RCS file: */cvsrepo/proj/file1,v (glob)
+ RCS file: $TESTTMP/cvsrepo/proj/file1,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
Merging differences between 1.1.4.2 and 1.1.4.3 into file1
@@ -173,7 +173,7 @@
$ cd ..
$ hg convert proj proj.hg
initializing destination proj.hg repository
- connecting to */cvsrepo (glob)
+ connecting to $TESTTMP/cvsrepo
scanning source...
collecting CVS rlog
12 log entries
diff --git a/tests/test-convert-cvs-synthetic.t b/tests/test-convert-cvs-synthetic.t
--- a/tests/test-convert-cvs-synthetic.t
+++ b/tests/test-convert-cvs-synthetic.t
@@ -107,24 +107,24 @@
cvs rlog output
$ cvscall -q rlog proj | egrep '^(RCS file|revision)'
- RCS file: */cvsrepo/proj/file1,v (glob)
+ RCS file: $TESTTMP/cvsrepo/proj/file1,v
revision 1.1
- RCS file: */cvsrepo/proj/Attic/file2,v (glob)
+ RCS file: $TESTTMP/cvsrepo/proj/Attic/file2,v
revision 1.1
revision 1.1.4.2
revision 1.1.4.1
revision 1.1.2.1
- RCS file: */cvsrepo/proj/Attic/file3,v (glob)
+ RCS file: $TESTTMP/cvsrepo/proj/Attic/file3,v
revision 1.1
revision 1.1.2.1
- RCS file: */cvsrepo/proj/Attic/file4,v (glob)
+ RCS file: $TESTTMP/cvsrepo/proj/Attic/file4,v
revision 1.1
revision 1.1.2.1
- RCS file: */cvsrepo/proj/file5,v (glob)
+ RCS file: $TESTTMP/cvsrepo/proj/file5,v
revision 1.2
revision 1.1
revision 1.1.2.1
- RCS file: */cvsrepo/proj/file6,v (glob)
+ RCS file: $TESTTMP/cvsrepo/proj/file6,v
revision 1.1
revision 1.1.2.2
revision 1.1.2.1
@@ -134,7 +134,7 @@
$ cd ..
$ hg convert --datesort proj proj.hg
initializing destination proj.hg repository
- connecting to */cvsrepo (glob)
+ connecting to $TESTTMP/cvsrepo
scanning source...
collecting CVS rlog
15 log entries
@@ -178,7 +178,7 @@
> --datesort \
> proj proj.hg2
initializing destination proj.hg2 repository
- connecting to */cvsrepo (glob)
+ connecting to $TESTTMP/cvsrepo
scanning source...
collecting CVS rlog
15 log entries
diff --git a/tests/test-convert-cvs.t b/tests/test-convert-cvs.t
--- a/tests/test-convert-cvs.t
+++ b/tests/test-convert-cvs.t
@@ -66,14 +66,14 @@
$ sleep 1
$ echo c >> b/c
$ cvscall -q commit -mci0 . | grep '<--'
- */cvsrepo/src/b/c,v <-- *c (glob)
+ $TESTTMP/cvsrepo/src/b/c,v <-- *c (glob)
$ cd ..
convert fresh repo
$ hg convert src src-hg
initializing destination src-hg repository
- connecting to */cvsrepo (glob)
+ connecting to $TESTTMP/cvsrepo
scanning source...
collecting CVS rlog
5 log entries
@@ -98,7 +98,7 @@
$ echo include b/c > filemap
$ hg convert --filemap filemap src src-filemap
initializing destination src-filemap repository
- connecting to */cvsrepo (glob)
+ connecting to $TESTTMP/cvsrepo
scanning source...
collecting CVS rlog
5 log entries
@@ -135,7 +135,7 @@
> | grep -v 'log entries' | grep -v 'hook:' \
> | grep -v '^[0-3] .*' # filter instable changeset order
initializing destination srcfull-hg repository
- connecting to */cvsrepo (glob)
+ connecting to $TESTTMP/cvsrepo
scanning source...
collecting CVS rlog
creating changesets
@@ -155,14 +155,14 @@
$ echo a >> a
$ echo c >> b/c
$ cvscall -q commit -mci1 . | grep '<--'
- */cvsrepo/src/a,v <-- a (glob)
- */cvsrepo/src/b/c,v <-- *c (glob)
+ $TESTTMP/cvsrepo/src/a,v <-- a
+ $TESTTMP/cvsrepo/src/b/c,v <-- *c (glob)
$ cd ..
convert again
$ hg convert src src-hg
- connecting to */cvsrepo (glob)
+ connecting to $TESTTMP/cvsrepo
scanning source...
collecting CVS rlog
7 log entries
@@ -184,7 +184,7 @@
convert again with --filemap
$ hg convert --filemap filemap src src-filemap
- connecting to */cvsrepo (glob)
+ connecting to $TESTTMP/cvsrepo
scanning source...
collecting CVS rlog
7 log entries
@@ -216,13 +216,13 @@
$ cvs -q update -r branch > /dev/null
$ echo d >> b/c
$ cvs -q commit -mci2 . | grep '<--'
- */cvsrepo/src/b/c,v <-- *c (glob)
+ $TESTTMP/cvsrepo/src/b/c,v <-- *c (glob)
$ cd ..
convert again
$ hg convert src src-hg
- connecting to */cvsrepo (glob)
+ connecting to $TESTTMP/cvsrepo
scanning source...
collecting CVS rlog
8 log entries
@@ -240,7 +240,7 @@
convert again with --filemap
$ hg convert --filemap filemap src src-filemap
- connecting to */cvsrepo (glob)
+ connecting to $TESTTMP/cvsrepo
scanning source...
collecting CVS rlog
8 log entries
@@ -277,17 +277,17 @@
$ sleep 1
$ echo f >> a
$ cvscall -q commit -mfuzzy . | grep '<--'
- */cvsrepo/src/a,v <-- a (glob)
+ $TESTTMP/cvsrepo/src/a,v <-- a
$ sleep 4 # the two changes will be split if fuzz < 4
$ echo g >> b/c
$ cvscall -q commit -mfuzzy . | grep '<--'
- */cvsrepo/src/b/c,v <-- *c (glob)
+ $TESTTMP/cvsrepo/src/b/c,v <-- *c (glob)
$ cd ..
convert again
$ hg convert --config convert.cvsps.fuzz=2 src src-hg
- connecting to */cvsrepo (glob)
+ connecting to $TESTTMP/cvsrepo
scanning source...
collecting CVS rlog
11 log entries
diff --git a/tests/test-convert-svn-encoding.t b/tests/test-convert-svn-encoding.t
--- a/tests/test-convert-svn-encoding.t
+++ b/tests/test-convert-svn-encoding.t
@@ -14,7 +14,7 @@
$ hg --debug convert svn-repo A-hg
initializing destination A-hg repository
- reparent to file://*/svn-repo (glob)
+ reparent to file://$TESTTMP/svn-repo
run hg sink pre-conversion action
scanning source...
found trunk at 'trunk'
@@ -23,7 +23,7 @@
found branch branché at 5
found branch branchée at 6
scanning: 1 revisions
- reparent to file://*/svn-repo/trunk (glob)
+ reparent to file://$TESTTMP/svn-repo/trunk
fetching revision log for "/trunk" from 4 to 0
parsing revision 4 (2 changes)
parsing revision 3 (4 changes)
@@ -33,18 +33,18 @@
'/branches' is not under '/trunk', ignoring
'/tags' is not under '/trunk', ignoring
scanning: 2 revisions
- reparent to file://*/svn-repo/branches/branch%C3%A9 (glob)
+ reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9
fetching revision log for "/branches/branché" from 5 to 0
parsing revision 5 (1 changes)
- reparent to file://*/svn-repo (glob)
- reparent to file://*/svn-repo/branches/branch%C3%A9 (glob)
+ reparent to file://$TESTTMP/svn-repo
+ reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9
found parent of branch /branches/branché at 4: /trunk
scanning: 3 revisions
- reparent to file://*/svn-repo/branches/branch%C3%A9e (glob)
+ reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9e
fetching revision log for "/branches/branchée" from 6 to 0
parsing revision 6 (1 changes)
- reparent to file://*/svn-repo (glob)
- reparent to file://*/svn-repo/branches/branch%C3%A9e (glob)
+ reparent to file://$TESTTMP/svn-repo
+ reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9e
found parent of branch /branches/branchée at 5: /branches/branché
scanning: 4 revisions
scanning: 5 revisions
@@ -57,7 +57,7 @@
4 hello
source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk at 2
converting: 1/6 revisions (16.67%)
- reparent to file://*/svn-repo/trunk (glob)
+ reparent to file://$TESTTMP/svn-repo/trunk
scanning paths: /trunk/à 0/3 (0.00%)
scanning paths: /trunk/à/é 1/3 (33.33%)
scanning paths: /trunk/é 2/3 (66.67%)
@@ -70,14 +70,14 @@
converting: 2/6 revisions (33.33%)
scanning paths: /trunk/à 0/4 (0.00%)
gone from -1
- reparent to file://*/svn-repo (glob)
- reparent to file://*/svn-repo/trunk (glob)
+ reparent to file://$TESTTMP/svn-repo
+ reparent to file://$TESTTMP/svn-repo/trunk
scanning paths: /trunk/è 1/4 (25.00%)
copied to è from é@2
scanning paths: /trunk/é 2/4 (50.00%)
gone from -1
- reparent to file://*/svn-repo (glob)
- reparent to file://*/svn-repo/trunk (glob)
+ reparent to file://$TESTTMP/svn-repo
+ reparent to file://$TESTTMP/svn-repo/trunk
scanning paths: /trunk/ù 3/4 (75.00%)
mark /trunk/ù came from à:2
à/é
@@ -95,12 +95,12 @@
converting: 3/6 revisions (50.00%)
scanning paths: /trunk/è 0/2 (0.00%)
gone from -1
- reparent to file://*/svn-repo (glob)
- reparent to file://*/svn-repo/trunk (glob)
+ reparent to file://$TESTTMP/svn-repo
+ reparent to file://$TESTTMP/svn-repo/trunk
scanning paths: /trunk/ù 1/2 (50.00%)
gone from -1
- reparent to file://*/svn-repo (glob)
- reparent to file://*/svn-repo/trunk (glob)
+ reparent to file://$TESTTMP/svn-repo
+ reparent to file://$TESTTMP/svn-repo/trunk
è
getting files: è 1/2 (50.00%)
ù/é
@@ -108,17 +108,17 @@
1 branch to branch?
source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?@5
converting: 4/6 revisions (66.67%)
- reparent to file://*/svn-repo/branches/branch%C3%A9 (glob)
+ reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9
scanning paths: /branches/branché 0/1 (0.00%)
0 branch to branch?e
source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?e at 6
converting: 5/6 revisions (83.33%)
- reparent to file://*svn-repo/branches/branch%C3%A9e (glob)
+ reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9e
scanning paths: /branches/branchée 0/1 (0.00%)
- reparent to file://*svn-repo (glob)
- reparent to file://*svn-repo/branches/branch%C3%A9e (glob)
- reparent to file://*svn-repo (glob)
- reparent to file://*svn-repo/branches/branch%C3%A9e (glob)
+ reparent to file://$TESTTMP/svn-repo
+ reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9e
+ reparent to file://$TESTTMP/svn-repo
+ reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9e
updating tags
.hgtags
run hg sink post-conversion action
diff --git a/tests/test-default-push.t b/tests/test-default-push.t
--- a/tests/test-default-push.t
+++ b/tests/test-default-push.t
@@ -18,7 +18,7 @@
Push should push to 'default' when 'default-push' not set:
$ hg --cwd b push
- pushing to */a (glob)
+ pushing to $TESTTMP/a
searching for changes
adding changesets
adding manifests
@@ -29,7 +29,7 @@
$ echo 'default-push = ../c' >> b/.hg/hgrc
$ hg --cwd b push
- pushing to */c (glob)
+ pushing to $TESTTMP/c
searching for changes
adding changesets
adding manifests
diff --git a/tests/test-extdiff.t b/tests/test-extdiff.t
--- a/tests/test-extdiff.t
+++ b/tests/test-extdiff.t
@@ -75,7 +75,7 @@
Should diff cloned file against wc file:
$ hg falabala
- diffing a.2a13a4d2da36/a */a/a (glob)
+ diffing a.2a13a4d2da36/a $TESTTMP/a/a
[1]
diff --git a/tests/test-hgignore.t b/tests/test-hgignore.t
--- a/tests/test-hgignore.t
+++ b/tests/test-hgignore.t
@@ -44,7 +44,7 @@
$ echo "*.o" > .hgignore
$ hg status
- abort: */.hgignore: invalid pattern (relre): \*.o (glob)
+ abort: $TESTTMP/.hgignore: invalid pattern (relre): *.o
[255]
$ echo ".*\.o" > .hgignore
@@ -88,7 +88,7 @@
$ echo "syntax: invalid" > .hgignore
$ hg status
- */.hgignore: ignoring invalid syntax 'invalid' (glob)
+ $TESTTMP/.hgignore: ignoring invalid syntax 'invalid'
A dir/b.o
? .hgignore
? a.c
diff --git a/tests/test-hgrc.t b/tests/test-hgrc.t
--- a/tests/test-hgrc.t
+++ b/tests/test-hgrc.t
@@ -1,6 +1,13 @@
+Use hgrc within $TESTTMP
+
+ $ HGRCPATH=`pwd`/hgrc
+ $ export HGRCPATH
+
+Basic syntax error
+
$ echo "invalid" > $HGRCPATH
$ hg version
- hg: parse error at */.hgrc:1: invalid (glob)
+ hg: parse error at $TESTTMP/hgrc:1: invalid
[255]
$ echo "" > $HGRCPATH
@@ -10,7 +17,6 @@
$ hg clone "foo%bar" foobar
updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ p=`pwd`
$ cd foobar
$ cat .hg/hgrc
[paths]
@@ -27,7 +33,7 @@
$ echo '[foo]' > $HGRCPATH
$ echo ' x = y' >> $HGRCPATH
$ hg version
- hg: parse error at */.hgrc:2: x = y (glob)
+ hg: parse error at $TESTTMP/hgrc:2: x = y
[255]
$ python -c "print '[foo]\nbar = a\n b\n c \n de\n fg \nbaz = bif cb \n'" \
@@ -40,7 +46,7 @@
$ export FAKEPATH
$ echo '%include $FAKEPATH/no-such-file' > $HGRCPATH
$ hg version
- hg: parse error at */.hgrc:1: cannot include /path/to/nowhere/no-such-file (No such file or directory) (glob)
+ hg: parse error at $TESTTMP/hgrc:1: cannot include /path/to/nowhere/no-such-file (No such file or directory)
[255]
$ unset FAKEPATH
@@ -90,23 +96,23 @@
customized hgrc
$ hg showconfig
- read config from: */.hgrc (glob)
- */.hgrc:13: alias.log=log -g (glob)
- */.hgrc:11: defaults.identify=-n (glob)
- */.hgrc:2: ui.debug=true (glob)
- */.hgrc:3: ui.fallbackencoding=ASCII (glob)
- */.hgrc:4: ui.quiet=true (glob)
- */.hgrc:5: ui.slash=true (glob)
- */.hgrc:6: ui.traceback=true (glob)
- */.hgrc:7: ui.verbose=true (glob)
- */.hgrc:8: ui.style=~/.hgstyle (glob)
- */.hgrc:9: ui.logtemplate={node} (glob)
+ read config from: $TESTTMP/hgrc
+ $TESTTMP/hgrc:13: alias.log=log -g
+ $TESTTMP/hgrc:11: defaults.identify=-n
+ $TESTTMP/hgrc:2: ui.debug=true
+ $TESTTMP/hgrc:3: ui.fallbackencoding=ASCII
+ $TESTTMP/hgrc:4: ui.quiet=true
+ $TESTTMP/hgrc:5: ui.slash=true
+ $TESTTMP/hgrc:6: ui.traceback=true
+ $TESTTMP/hgrc:7: ui.verbose=true
+ $TESTTMP/hgrc:8: ui.style=~/.hgstyle
+ $TESTTMP/hgrc:9: ui.logtemplate={node}
plain hgrc
$ HGPLAIN=; export HGPLAIN
$ hg showconfig --config ui.traceback=True --debug
- read config from: */.hgrc (glob)
+ read config from: $TESTTMP/hgrc
none: ui.traceback=True
none: ui.verbose=False
none: ui.debug=True
diff --git a/tests/test-hook.t b/tests/test-hook.t
--- a/tests/test-hook.t
+++ b/tests/test-hook.t
@@ -17,7 +17,7 @@
$ hg add a
$ hg commit -m a
precommit hook: HG_PARENT1=0000000000000000000000000000000000000000
- pretxncommit hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000 HG_PENDING=$HGTMP/*/a (glob)
+ pretxncommit hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000 HG_PENDING=$TESTTMP/a
0:cb9a9f314b8b
commit hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000
commit.b hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000
@@ -40,7 +40,7 @@
$ echo b >> a
$ hg commit -m a1 -d "1 0"
precommit hook: HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
- pretxncommit hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$HGTMP/*/a (glob)
+ pretxncommit hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$TESTTMP/a
1:ab228980c14d
commit hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
commit.b hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
@@ -50,7 +50,7 @@
$ hg add b
$ hg commit -m b -d '1 0'
precommit hook: HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
- pretxncommit hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$HGTMP/*/a (glob)
+ pretxncommit hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$TESTTMP/a
2:ee9deb46ab31
commit hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
commit.b hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
@@ -60,7 +60,7 @@
(branch merge, don't forget to commit)
$ hg commit -m merge -d '2 0'
precommit hook: HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd
- pretxncommit hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd HG_PENDING=$HGTMP/*/a (glob)
+ pretxncommit hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd HG_PENDING=$TESTTMP/a
3:07f3376c1e65
commit hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd
commit.b hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd
@@ -99,7 +99,7 @@
$ hg tag -d '3 0' a
pretag hook: HG_LOCAL=0 HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_TAG=a
precommit hook: HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2
- pretxncommit hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PENDING=$HGTMP/*/a (glob)
+ pretxncommit hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PENDING=$TESTTMP/a
4:539e4b31b6dc
commit hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2
commit.b hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2
@@ -133,10 +133,10 @@
4:539e4b31b6dc
$ hg commit -m 'fail' -d '4 0'
precommit hook: HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
- pretxncommit hook: HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$HGTMP/*/a (glob)
+ pretxncommit hook: HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$TESTTMP/a
5:6f611f8018c1
5:6f611f8018c1
- pretxncommit.forbid hook: HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$HGTMP/*/a (glob)
+ pretxncommit.forbid hook: HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$TESTTMP/a
transaction abort!
rollback completed
abort: pretxncommit.forbid1 hook exited with status 1
@@ -192,7 +192,7 @@
$ echo 'pretxnchangegroup.forbid1 = python ../printenv.py pretxnchangegroup.forbid 1' >> .hg/hgrc
$ hg pull ../a
4:539e4b31b6dc
- pretxnchangegroup.forbid hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$HGTMP/*/b HG_SOURCE=pull HG_URL=file: (glob)
+ pretxnchangegroup.forbid hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$TESTTMP/b HG_SOURCE=pull HG_URL=file:
pulling from ../a
searching for changes
adding changesets
diff --git a/tests/test-journal-exists.t b/tests/test-journal-exists.t
--- a/tests/test-journal-exists.t
+++ b/tests/test-journal-exists.t
@@ -27,7 +27,7 @@
$ hg -R foo unbundle repo.hg
adding changesets
- abort: Permission denied: * (glob)
+ abort: Permission denied: $TESTTMP/foo/.hg/store/.00changelog.i-* (glob)
[255]
$ if test -f foo/.hg/store/journal; then echo 'journal exists :-('; fi
diff --git a/tests/test-keyword.t b/tests/test-keyword.t
--- a/tests/test-keyword.t
+++ b/tests/test-keyword.t
@@ -150,7 +150,7 @@
do not process $Id:
xxx $
ignore $Id$
- a* (glob)
+ a
Test hook execution
@@ -196,13 +196,13 @@
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Date: * (glob)
- Subject: changeset in * (glob)
+ Subject: changeset in $TESTTMP/Test: addsym
From: mercurial
X-Hg-Notification: changeset a2392c293916
Message-Id: <hg.a2392c293916*> (glob)
To: Test
- changeset a2392c293916 in * (glob)
+ changeset a2392c293916 in $TESTTMP/Test
details: *cmd=changeset;node=a2392c293916 (glob)
description:
addsym
@@ -219,14 +219,14 @@
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Date:* (glob)
- Subject: changeset in* (glob)
+ Subject: changeset in $TESTTMP/Test: absym
From: User Name <user at example.com>
X-Hg-Notification: changeset ef63ca68695b
Message-Id: <hg.ef63ca68695b*> (glob)
To: Test
- changeset ef63ca68695b in * (glob)
- details: *cmd=changeset;node=ef63ca68695b (glob)
+ changeset ef63ca68695b in $TESTTMP/Test
+ details: $TESTTMP/Test?cmd=changeset;node=ef63ca68695b
description:
absym
@@ -565,7 +565,7 @@
do not process $Id:
xxx $
ignore $Id$
- a* (glob)
+ a
Write custom keyword and prepare multiline commit message
@@ -615,7 +615,7 @@
xxx $
$Xinfo: User Name <user at example.com>: firstline $
ignore $Id$
- a* (glob)
+ a
annotate
@@ -686,7 +686,7 @@
> default = ../Test
> EOF
$ hg incoming
- comparing with */Test (glob)
+ comparing with $TESTTMP/Test
searching for changes
changeset: 2:bb948857c743
tag: tip
@@ -945,7 +945,7 @@
xxx $
$Xinfo: User Name <user at example.com>: firstline $
ignore $Id$
- a* (glob)
+ a
Now disable keyword expansion
@@ -962,4 +962,4 @@
xxx $
$Xinfo$
ignore $Id$
- a* (glob)
+ a
diff --git a/tests/test-mq-merge.t b/tests/test-mq-merge.t
--- a/tests/test-mq-merge.t
+++ b/tests/test-mq-merge.t
@@ -32,7 +32,7 @@
Save the patch queue so we can merge it later:
$ hg qsave -c -e
- copy */t/.hg/patches to */t/.hg/patches.1 (glob)
+ copy $TESTTMP/t/.hg/patches to $TESTTMP/t/.hg/patches.1
$ checkundo
Update b and commit in an "update" changeset:
@@ -52,7 +52,7 @@
b
$ hg qpush -a -m
- merging with queue at: */t/.hg/patches.1 (glob)
+ merging with queue at: $TESTTMP/t/.hg/patches.1
applying rm_a
now at: rm_a
@@ -91,14 +91,14 @@
Create the reference queue:
$ hg qsave -c -e -n refqueue
- copy */t2/.hg/patches to */t2/.hg/refqueue (glob)
+ copy $TESTTMP/t2/.hg/patches to $TESTTMP/t2/.hg/refqueue
$ hg up -C 1
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
Merge:
$ HGMERGE=internal:other hg qpush -a -m -n refqueue
- merging with queue at: */t2/.hg/refqueue (glob)
+ merging with queue at: $TESTTMP/t2/.hg/refqueue
applying patcha
patching file a
Hunk #1 FAILED at 0
diff --git a/tests/test-mq-safety.t b/tests/test-mq-safety.t
--- a/tests/test-mq-safety.t
+++ b/tests/test-mq-safety.t
@@ -39,7 +39,7 @@
abort: popping would remove a revision not managed by this patch queue
[255]
$ hg qpop -n patches
- using patch queue: */repo/.hg/patches (glob)
+ using patch queue: $TESTTMP/repo/.hg/patches
abort: popping would remove a revision not managed by this patch queue
[255]
$ hg qrefresh
diff --git a/tests/test-mq-strip.t b/tests/test-mq-strip.t
--- a/tests/test-mq-strip.t
+++ b/tests/test-mq-strip.t
@@ -77,7 +77,7 @@
summary: e
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- saved backup bundle to * (glob)
+ saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
% after update 4, strip 4
changeset: 3:65bd5f99a4a3
tag: tip
@@ -96,7 +96,7 @@
summary: e
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- saved backup bundle to * (glob)
+ saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
% after update 4, strip 3
changeset: 1:ef3a871183d7
user: test
@@ -111,7 +111,7 @@
date: Thu Jan 01 00:00:00 1970 +0000
summary: b
- saved backup bundle to * (glob)
+ saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
% after update 1, strip 4
changeset: 1:ef3a871183d7
user: test
@@ -127,7 +127,7 @@
date: Thu Jan 01 00:00:00 1970 +0000
summary: e
- saved backup bundle to * (glob)
+ saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
% after update 4, strip 2
changeset: 3:443431ffac4f
tag: tip
@@ -146,7 +146,7 @@
summary: c
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- saved backup bundle to * (glob)
+ saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
% after update 4, strip 1
changeset: 0:9ab35a2d17cb
tag: tip
@@ -157,7 +157,7 @@
$ teststrip null 4
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
% before update null, strip 4
- saved backup bundle to * (glob)
+ saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
% after update null, strip 4
$ hg log
@@ -212,7 +212,7 @@
$ hg strip 4
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- saved backup bundle to * (glob)
+ saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
after strip of merge parent
@@ -258,7 +258,7 @@
2 is parent of 3, only one strip should happen
$ hg strip 2 3
- saved backup bundle to * (glob)
+ saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
$ hg glog
@ changeset: 2:264128213d29
| tag: tip
@@ -310,8 +310,8 @@
$ hg strip 2 4
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- saved backup bundle to * (glob)
- saved backup bundle to * (glob)
+ saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
$ hg glog
@ changeset: 2:65bd5f99a4a3
| tag: tip
@@ -335,14 +335,14 @@
$ hg strip 1 2 4
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- saved backup bundle to * (glob)
+ saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
$ restore
remove branchy history for qimport tests
$ hg strip 3
- saved backup bundle to * (glob)
+ saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
strip of applied mq should cleanup status file
@@ -364,7 +364,7 @@
$ hg strip 3
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- saved backup bundle to * (glob)
+ saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
applied patches after stripping rev in queue
@@ -375,7 +375,7 @@
$ hg strip 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- saved backup bundle to * (glob)
+ saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
applied patches after stripping ancestor of queue
diff --git a/tests/test-mq.t b/tests/test-mq.t
--- a/tests/test-mq.t
+++ b/tests/test-mq.t
@@ -135,7 +135,7 @@
guards
$ cat .hg/patches/series
$ hg qinit -c
- abort: repository * already exists! (glob)
+ abort: repository $TESTTMP/d/.hg/patches already exists!
[255]
$ cd ..
@@ -737,7 +737,7 @@
adding x
$ hg strip tip
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- saved backup bundle to * (glob)
+ saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
$ hg unbundle .hg/strip-backup/*
adding changesets
adding manifests
@@ -760,7 +760,7 @@
$ hg strip -f tip
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- saved backup bundle to * (glob)
+ saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
cd b; hg qrefresh
@@ -1118,7 +1118,7 @@
$ hg strip 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- saved backup bundle to * (glob)
+ saved backup bundle to $TESTTMP/b/strip/.hg/strip-backup/*-backup.hg (glob)
$ checkundo strip
$ hg log
changeset: 1:20cbbe65cff7
diff --git a/tests/test-notify-changegroup.t b/tests/test-notify-changegroup.t
--- a/tests/test-notify-changegroup.t
+++ b/tests/test-notify-changegroup.t
@@ -56,12 +56,12 @@
Message-Id: <*> (glob)
To: baz, foo at bar
- changeset cb9a9f314b8b in */a (glob)
- details: */a?cmd=changeset;node=cb9a9f314b8b (glob)
+ changeset cb9a9f314b8b in $TESTTMP/a
+ details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b
summary: a
- changeset ba677d0156c1 in */a (glob)
- details: */a?cmd=changeset;node=ba677d0156c1 (glob)
+ changeset ba677d0156c1 in $TESTTMP/a
+ details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1
summary: b
diffs (6 lines):
diff --git a/tests/test-notify.t b/tests/test-notify.t
--- a/tests/test-notify.t
+++ b/tests/test-notify.t
@@ -120,14 +120,14 @@
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Date: * (glob)
- Subject: changeset in */b: b (glob)
+ Subject: changeset in $TESTTMP/b: b
From: test
X-Hg-Notification: changeset 0647d048b600
Message-Id: <*> (glob)
To: baz, foo at bar
- changeset 0647d048b600 in */b (glob)
- details: *?cmd=changeset;node=0647d048b600 (glob)
+ changeset 0647d048b600 in $TESTTMP/b
+ details: $TESTTMP/b?cmd=changeset;node=0647d048b600
description: b
diffs (6 lines):
diff --git a/tests/test-paths.t b/tests/test-paths.t
--- a/tests/test-paths.t
+++ b/tests/test-paths.t
@@ -6,11 +6,11 @@
$ echo '[paths]' >> .hg/hgrc
$ echo 'dupe = ../b' >> .hg/hgrc
$ hg in dupe
- comparing with */b (glob)
+ comparing with $TESTTMP/b
no changes found
[1]
$ cd ..
$ hg -R a in dupe
- comparing with */b (glob)
+ comparing with $TESTTMP/b
no changes found
[1]
diff --git a/tests/test-permissions.t b/tests/test-permissions.t
--- a/tests/test-permissions.t
+++ b/tests/test-permissions.t
@@ -20,7 +20,7 @@
checking manifests
crosschecking files in changesets and manifests
checking files
- abort: Permission denied: * (glob)
+ abort: Permission denied: $TESTTMP/t/.hg/store/data/a.i
[255]
$ chmod +r .hg/store/data/a.i
@@ -37,7 +37,7 @@
$ echo barber > a
$ hg commit -m "2"
trouble committing a!
- abort: Permission denied: * (glob)
+ abort: Permission denied: $TESTTMP/t/.hg/store/data/a.i
[255]
$ chmod -w .
diff --git a/tests/test-push-validation.t b/tests/test-push-validation.t
--- a/tests/test-push-validation.t
+++ b/tests/test-push-validation.t
@@ -40,7 +40,7 @@
Expected to fail:
$ hg push
- pushing to * (glob)
+ pushing to $TESTTMP/test
searching for changes
adding changesets
adding manifests
diff --git a/tests/test-rebase-abort.t b/tests/test-rebase-abort.t
--- a/tests/test-rebase-abort.t
+++ b/tests/test-rebase-abort.t
@@ -56,7 +56,7 @@
Abort:
$ hg rebase --abort
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
rebase aborted
$ hg tglog
diff --git a/tests/test-rebase-cache.t b/tests/test-rebase-cache.t
--- a/tests/test-rebase-cache.t
+++ b/tests/test-rebase-cache.t
@@ -98,7 +98,7 @@
0: 'A'
$ hg rebase --detach -s 5 -d 8
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
$ hg branches
branch3 8:c1d4b9719987
@@ -159,7 +159,7 @@
o 0: 'A'
$ hg rebase --detach -s 8 -d 6
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
$ hg branches
branch2 8:e1e80ed73210
@@ -223,7 +223,7 @@
o 0: 'A'
$ hg rebase --detach -s 7 -d 6
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
$ hg branches
branch2 7:e1e80ed73210
diff --git a/tests/test-rebase-check-restore.t b/tests/test-rebase-check-restore.t
--- a/tests/test-rebase-check-restore.t
+++ b/tests/test-rebase-check-restore.t
@@ -125,7 +125,7 @@
$ rm A.orig
$ hg resolve -m A
$ hg rebase --continue
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 5: 'F' notdefault
diff --git a/tests/test-rebase-collapse.t b/tests/test-rebase-collapse.t
--- a/tests/test-rebase-collapse.t
+++ b/tests/test-rebase-collapse.t
@@ -77,7 +77,7 @@
$ cd a1
$ hg rebase --collapse --keepbranches
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 5: 'Collapsed revision
@@ -111,7 +111,7 @@
$ cd a2
$ hg rebase --base 6 --collapse
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 6: 'Collapsed revision
@@ -220,7 +220,7 @@
Rebase and collapse - E onto H:
$ hg rebase -s 4 --collapse
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/b1/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 5: 'Collapsed revision
@@ -331,7 +331,7 @@
$ hg rebase -s 4 --collapse
merging E
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/c1/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 5: 'Collapsed revision
@@ -420,7 +420,7 @@
$ cd d1
$ hg rebase -s 1 --collapse
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/d1/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 2: 'Collapsed revision
diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t
+++ b/tests/test-rebase-conflicts.t
@@ -73,7 +73,7 @@
$ echo 'resolved merge' >common
$ hg resolve -m common
$ hg rebase --continue
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 5: 'L3'
diff --git a/tests/test-rebase-detach.t b/tests/test-rebase-detach.t
--- a/tests/test-rebase-detach.t
+++ b/tests/test-rebase-detach.t
@@ -54,7 +54,7 @@
o 0: 'A'
$ hg rebase --detach -s 3 -d 4
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 4: 'D'
@@ -92,7 +92,7 @@
o 0: 'A'
$ hg rebase --detach -s 2 -d 4
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 4: 'D'
@@ -131,7 +131,7 @@
o 0: 'A'
$ hg rebase --detach -s 1 -d 4
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 4: 'D'
@@ -171,7 +171,7 @@
o 0: 'A'
$ hg rebase --detach --collapse -s 2 -d 4
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 3: 'Collapsed revision
diff --git a/tests/test-rebase-issue-noparam-single-rev.t b/tests/test-rebase-issue-noparam-single-rev.t
--- a/tests/test-rebase-issue-noparam-single-rev.t
+++ b/tests/test-rebase-issue-noparam-single-rev.t
@@ -50,7 +50,7 @@
$ hg up -q -C 2
$ hg rebase
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 4: 'l1'
@@ -108,7 +108,7 @@
$ hg up -q -C 3
$ hg rebase
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 4: 'l2'
diff --git a/tests/test-rebase-keep-branch.t b/tests/test-rebase-keep-branch.t
--- a/tests/test-rebase-keep-branch.t
+++ b/tests/test-rebase-keep-branch.t
@@ -53,7 +53,7 @@
$ hg up -q -C 3
$ hg rebase -b 4 -d 3 --keepbranches
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 4: 'r1' notdefault
diff --git a/tests/test-rebase-mq-skip.t b/tests/test-rebase-mq-skip.t
--- a/tests/test-rebase-mq-skip.t
+++ b/tests/test-rebase-mq-skip.t
@@ -48,7 +48,7 @@
$ hg up -q -C qtip
$ hg rebase
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 3: 'P0' tags: p0.patch qbase qtip tip
@@ -111,7 +111,7 @@
$ HGMERGE=internal:local hg resolve --all
$ hg rebase --continue
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 9: 'r5' tags: 5.diff qtip tip
diff --git a/tests/test-rebase-mq.t b/tests/test-rebase-mq.t
--- a/tests/test-rebase-mq.t
+++ b/tests/test-rebase-mq.t
@@ -82,7 +82,7 @@
$ echo mq1r1mq2 > f
$ hg resolve -m f
$ hg rebase -c
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 3: 'P1' tags: f2.patch qtip tip
@@ -191,7 +191,7 @@
Rebase the applied mq patches:
$ hg rebase -s 2 -d 1
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
$ hg qci -m 'save patch state'
diff --git a/tests/test-rebase-newancestor.t b/tests/test-rebase-newancestor.t
--- a/tests/test-rebase-newancestor.t
+++ b/tests/test-rebase-newancestor.t
@@ -41,7 +41,7 @@
$ hg rebase -s 1 -d 3
merging a
merging a
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 3: 'C'
diff --git a/tests/test-rebase-parameters.t b/tests/test-rebase-parameters.t
--- a/tests/test-rebase-parameters.t
+++ b/tests/test-rebase-parameters.t
@@ -107,7 +107,7 @@
$ hg up -q -C 5
$ hg rebase
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 7: 'l3'
@@ -141,7 +141,7 @@
$ cd a2
$ hg rebase --base .
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 7: 'l3'
@@ -169,7 +169,7 @@
$ cd a3
$ hg rebase --dest `hg branch`
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 7: 'l3'
@@ -197,7 +197,7 @@
$ cd a4
$ hg rebase --source 4
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 7: 'l3'
@@ -225,7 +225,7 @@
$ cd a5
$ hg rebase --dest 6
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 7: 'l3'
@@ -253,7 +253,7 @@
$ cd a6
$ hg rebase --base 5
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 7: 'l3'
@@ -281,7 +281,7 @@
$ cd a7
$ hg rebase --source 4 --dest 6
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a7/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 7: 'l3'
@@ -309,7 +309,7 @@
$ cd a8
$ hg rebase --base 4 --dest 6
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a8/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 7: 'l3'
diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t
--- a/tests/test-rebase-pull.t
+++ b/tests/test-rebase-pull.t
@@ -48,13 +48,13 @@
Now b has one revision to be pulled from a:
$ hg pull --rebase
- pulling from */a (glob)
+ pulling from $TESTTMP/a
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 3: 'L1'
@@ -68,7 +68,7 @@
Re-run:
$ hg pull --rebase
- pulling from */a (glob)
+ pulling from $TESTTMP/a
searching for changes
no changes found
@@ -78,7 +78,7 @@
$ cd ../c
$ hg pull --rebase
- pulling from */a (glob)
+ pulling from $TESTTMP/a
searching for changes
adding changesets
adding manifests
@@ -94,7 +94,7 @@
pull --rebase --update should ignore --update:
$ hg pull --rebase --update
- pulling from */a (glob)
+ pulling from $TESTTMP/a
searching for changes
no changes found
@@ -103,7 +103,7 @@
$ hg up -q 1
$ hg pull --rebase
- pulling from */a (glob)
+ pulling from $TESTTMP/a
searching for changes
no changes found
diff --git a/tests/test-rebase-rename.t b/tests/test-rebase-rename.t
--- a/tests/test-rebase-rename.t
+++ b/tests/test-rebase-rename.t
@@ -46,7 +46,7 @@
Rebase the revision containing the rename:
$ hg rebase -s 2 -d 1
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 2: 'rename A'
@@ -102,7 +102,7 @@
Rebase the revision containing the copy:
$ hg rebase -s 2 -d 1
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 2: 'copy A'
diff --git a/tests/test-rebase-scenario-global.t b/tests/test-rebase-scenario-global.t
--- a/tests/test-rebase-scenario-global.t
+++ b/tests/test-rebase-scenario-global.t
@@ -69,7 +69,7 @@
o 0: 'A'
$ hg rebase -s 1 -d 5
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 5: 'B'
@@ -93,7 +93,7 @@
$ cd a2
$ hg rebase -s 1 -d 3
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 5: 'B'
@@ -117,7 +117,7 @@
$ cd a3
$ hg rebase -s 2 -d 5
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 4: 'C'
@@ -139,7 +139,7 @@
$ cd a4
$ hg rebase -s 3 -d 2
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 4: 'F'
@@ -161,7 +161,7 @@
$ cd a5
$ hg rebase -s 4 -d 5
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 5: 'E'
@@ -185,7 +185,7 @@
$ cd a6
$ hg rebase -s 3 -d 1
- saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+ saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 5: 'F'
diff --git a/tests/test-relink.t b/tests/test-relink.t
--- a/tests/test-relink.t
+++ b/tests/test-relink.t
@@ -60,7 +60,7 @@
relink
$ hg relink --debug | fix_path
- relinking */.hg/store (glob)
+ relinking $TESTTMP/repo/.hg/store to $TESTTMP/clone/.hg/store
tip has 2 files, estimated total number of files: 3
collecting: 00changelog.i 1/3 files (33.33%)
collecting: 00manifest.i 2/3 files (66.67%)
diff --git a/tests/test-share.t b/tests/test-share.t
--- a/tests/test-share.t
+++ b/tests/test-share.t
@@ -26,7 +26,7 @@
Some sed versions appends newline, some don't, and some just fails
$ cat .hg/sharedpath; echo
- */repo1/.hg (glob)
+ $TESTTMP/repo1/.hg
commit in shared clone
diff --git a/tests/test-ssh.t b/tests/test-ssh.t
--- a/tests/test-ssh.t
+++ b/tests/test-ssh.t
@@ -144,7 +144,7 @@
find incoming on the remote side (using absolute path)
$ hg incoming -R ../remote -e "python ../dummyssh" "ssh://user@dummy/`pwd`"
- comparing with ssh://user@dummy/*/local (glob)
+ comparing with ssh://user@dummy/$TESTTMP/local
searching for changes
changeset: 1:a28a9d1a809c
tag: tip
@@ -220,13 +220,13 @@
$ cd ..
$ cat dummylog
Got arguments 1:user at dummy 2:hg -R nonexistent serve --stdio
- Got arguments 1:user at dummy 2:hg -R */nonexistent serve --stdio (glob)
+ Got arguments 1:user at dummy 2:hg -R /$TESTTMP/nonexistent serve --stdio
Got arguments 1:user at dummy 2:hg -R remote serve --stdio
Got arguments 1:user at dummy 2:hg -R remote serve --stdio
Got arguments 1:user at dummy 2:hg -R remote serve --stdio
Got arguments 1:user at dummy 2:hg -R remote serve --stdio
Got arguments 1:user at dummy 2:hg -R local serve --stdio
- Got arguments 1:user at dummy 2:hg -R /*/local serve --stdio (glob)
+ Got arguments 1:user at dummy 2:hg -R $TESTTMP/local serve --stdio
Got arguments 1:user at dummy 2:hg -R remote serve --stdio
changegroup-in-remote hook: HG_NODE=a28a9d1a809cab7d4e2fde4bee738a9ede948b60 HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1
Got arguments 1:user at dummy 2:hg -R remote serve --stdio
diff --git a/tests/test-strip-cross.t b/tests/test-strip-cross.t
--- a/tests/test-strip-cross.t
+++ b/tests/test-strip-cross.t
@@ -1,6 +1,5 @@
test stripping of filelogs where the linkrev doesn't always increase
- $ . $TESTDIR/helpers.sh
$ echo '[extensions]' >> $HGRCPATH
$ echo 'hgext.mq =' >> $HGRCPATH
$ hg init orig
@@ -90,13 +89,13 @@
$ for i in 0 1 2 3 4; do
> hg clone -q -U --pull crossed $i
> echo "% Trying to strip revision $i"
- > hg --cwd $i strip $i | hidebackup
+ > hg --cwd $i strip $i
> echo "% Verifying"
> hg --cwd $i verify
> echo
> done
% Trying to strip revision 0
- saved backup bundle to
+ saved backup bundle to $TESTTMP/0/.hg/strip-backup/*-backup.hg (glob)
% Verifying
checking changesets
checking manifests
@@ -105,7 +104,7 @@
7 files, 4 changesets, 15 total revisions
% Trying to strip revision 1
- saved backup bundle to
+ saved backup bundle to $TESTTMP/1/.hg/strip-backup/*-backup.hg (glob)
% Verifying
checking changesets
checking manifests
@@ -114,7 +113,7 @@
7 files, 4 changesets, 14 total revisions
% Trying to strip revision 2
- saved backup bundle to
+ saved backup bundle to $TESTTMP/2/.hg/strip-backup/*-backup.hg (glob)
% Verifying
checking changesets
checking manifests
@@ -123,7 +122,7 @@
7 files, 4 changesets, 14 total revisions
% Trying to strip revision 3
- saved backup bundle to
+ saved backup bundle to $TESTTMP/3/.hg/strip-backup/*-backup.hg (glob)
% Verifying
checking changesets
checking manifests
@@ -132,7 +131,7 @@
7 files, 4 changesets, 19 total revisions
% Trying to strip revision 4
- saved backup bundle to
+ saved backup bundle to $TESTTMP/4/.hg/strip-backup/*-backup.hg (glob)
% Verifying
checking changesets
checking manifests
diff --git a/tests/test-subrepo-deep-nested-change.t b/tests/test-subrepo-deep-nested-change.t
--- a/tests/test-subrepo-deep-nested-change.t
+++ b/tests/test-subrepo-deep-nested-change.t
@@ -27,7 +27,7 @@
$ echo "sub1 = ../sub1" > main/.hgsub
$ hg clone sub1 main/sub1
updating to branch default
- pulling subrepo sub2 from */sub2 (glob)
+ pulling subrepo sub2 from $TESTTMP/sub2
requesting all changes
adding changesets
adding manifests
@@ -55,13 +55,13 @@
$ hg clone main cloned
updating to branch default
- pulling subrepo sub1 from */sub1 (glob)
+ pulling subrepo sub1 from $TESTTMP/sub1
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
- pulling subrepo sub1/sub2 from */sub2 (glob)
+ pulling subrepo sub1/sub2 from $TESTTMP/sub2
requesting all changes
adding changesets
adding manifests
diff --git a/tests/test-subrepo-paths.t b/tests/test-subrepo-paths.t
--- a/tests/test-subrepo-paths.t
+++ b/tests/test-subrepo-paths.t
@@ -28,5 +28,5 @@
> .* = \1
> EOF
$ hg debugsub
- abort: bad subrepository pattern in */outer/.hg/hgrc:2: invalid group reference (glob)
+ abort: bad subrepository pattern in $TESTTMP/outer/.hg/hgrc:2: invalid group reference
[255]
diff --git a/tests/test-subrepo-recursion.t b/tests/test-subrepo-recursion.t
--- a/tests/test-subrepo-recursion.t
+++ b/tests/test-subrepo-recursion.t
@@ -246,13 +246,13 @@
$ cd ..
$ hg clone repo repo2
updating to branch default
- pulling subrepo foo from */repo/foo (glob)
+ pulling subrepo foo from $TESTTMP/repo/foo
requesting all changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 7 changes to 3 files
- pulling subrepo foo/bar from */repo/foo/bar (glob)
+ pulling subrepo foo/bar from $TESTTMP/repo/foo/bar
requesting all changes
adding changesets
adding manifests
@@ -261,13 +261,13 @@
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd repo2
$ hg outgoing -S
- comparing with */repo (glob)
+ comparing with $TESTTMP/repo
searching for changes
no changes found
- comparing with */repo/foo (glob)
+ comparing with $TESTTMP/repo/foo
searching for changes
no changes found
- comparing with */repo/foo/bar (glob)
+ comparing with $TESTTMP/repo/foo/bar
searching for changes
no changes found
[1]
@@ -287,7 +287,7 @@
$ hg commit -m 3-4-2
committing subrepository foo
$ hg outgoing -S
- comparing with */repo (glob)
+ comparing with $TESTTMP/repo
searching for changes
changeset: 3:2655b8ecc4ee
tag: tip
@@ -295,7 +295,7 @@
date: Thu Jan 01 00:00:00 1970 +0000
summary: 3-4-2
- comparing with */repo/foo (glob)
+ comparing with $TESTTMP/repo/foo
searching for changes
changeset: 4:e96193d6cb36
tag: tip
@@ -303,7 +303,7 @@
date: Thu Jan 01 00:00:00 1970 +0000
summary: 3-4-2
- comparing with */repo/foo/bar (glob)
+ comparing with $TESTTMP/repo/foo/bar
searching for changes
no changes found
@@ -317,7 +317,7 @@
Test incoming:
$ hg incoming -S
- comparing with */repo2 (glob)
+ comparing with $TESTTMP/repo2
searching for changes
changeset: 3:2655b8ecc4ee
tag: tip
@@ -325,7 +325,7 @@
date: Thu Jan 01 00:00:00 1970 +0000
summary: 3-4-2
- comparing with */repo2/foo (glob)
+ comparing with $TESTTMP/repo2/foo
searching for changes
changeset: 4:e96193d6cb36
tag: tip
@@ -333,7 +333,7 @@
date: Thu Jan 01 00:00:00 1970 +0000
summary: 3-4-2
- comparing with */repo2/foo/bar (glob)
+ comparing with $TESTTMP/repo2/foo/bar
searching for changes
no changes found
diff --git a/tests/test-subrepo-svn.t b/tests/test-subrepo-svn.t
--- a/tests/test-subrepo-svn.t
+++ b/tests/test-subrepo-svn.t
@@ -73,7 +73,7 @@
$ hg debugsub
path s
- source file:///*/svn-repo/src (glob)
+ source file://$TESTTMP/svn-repo/src
revision 2
change file in svn and hg, commit
@@ -86,13 +86,13 @@
Transmitting file data .
Committed revision 3.
- Fetching external item into '*/s/externals' (glob)
+ Fetching external item into '$TESTTMP/sub/t/s/externals'
External at revision 1.
At revision 3.
$ hg debugsub
path s
- source file:///*/svn-repo/src (glob)
+ source file://$TESTTMP/svn-repo/src
revision 3
$ echo a > s/a
@@ -192,7 +192,7 @@
$ hg debugsub
path s
- source file:///*/svn-repo/src (glob)
+ source file://$TESTTMP/svn-repo/src
revision 3
verify subrepo is contained within the repo directory
diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
--- a/tests/test-subrepo.t
+++ b/tests/test-subrepo.t
@@ -236,19 +236,19 @@
$ cd ..
$ hg clone t tc
updating to branch default
- pulling subrepo s from */sub/t/s (glob)
+ pulling subrepo s from $TESTTMP/sub/t/s
requesting all changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 5 changes to 3 files
- pulling subrepo s/ss from */sub/t/s/ss (glob)
+ pulling subrepo s/ss from $TESTTMP/sub/t/s/ss
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- pulling subrepo t from */sub/t/t (glob)
+ pulling subrepo t from $TESTTMP/sub/t/t
requesting all changes
adding changesets
adding manifests
@@ -270,14 +270,14 @@
$ hg ci -m11
committing subrepository t
$ hg push
- pushing *sub/t (glob)
- pushing *sub/t/s/ss (glob)
+ pushing to $TESTTMP/sub/t
+ pushing subrepo s/ss to $TESTTMP/sub/t/s/ss
searching for changes
no changes found
- pushing *sub/t/s (glob)
+ pushing subrepo s to $TESTTMP/sub/t/s
searching for changes
no changes found
- pushing *sub/t/t (glob)
+ pushing subrepo t to $TESTTMP/sub/t/t
searching for changes
adding changesets
adding manifests
@@ -295,27 +295,27 @@
$ hg ci -m12
committing subrepository s
$ hg push
- pushing *sub/t (glob)
- pushing *sub/t/s/ss (glob)
+ pushing to $TESTTMP/sub/t
+ pushing subrepo s/ss to $TESTTMP/sub/t/s/ss
searching for changes
no changes found
- pushing *sub/t/s (glob)
+ pushing subrepo s to $TESTTMP/sub/t/s
searching for changes
abort: push creates new remote heads on branch 'default'!
(did you forget to merge? use push -f to force)
[255]
$ hg push -f
- pushing *sub/t (glob)
- pushing *sub/t/s/ss (glob)
+ pushing to $TESTTMP/sub/t
+ pushing subrepo s/ss to $TESTTMP/sub/t/s/ss
searching for changes
no changes found
- pushing *sub/t/s (glob)
+ pushing subrepo s to $TESTTMP/sub/t/s
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- pushing *sub/t/t (glob)
+ pushing subrepo t to $TESTTMP/sub/t/t
searching for changes
no changes found
searching for changes
@@ -337,7 +337,7 @@
$ cd ../tc
$ hg pull
- pulling *sub/t (glob)
+ pulling from $TESTTMP/sub/t
searching for changes
adding changesets
adding manifests
@@ -348,7 +348,7 @@
should pull t
$ hg up
- pulling subrepo t from */sub/t/t (glob)
+ pulling subrepo t from $TESTTMP/sub/t/t
searching for changes
adding changesets
adding manifests
@@ -542,9 +542,9 @@
$ cat mercurial2/main/nested_absolute/.hg/hgrc \
> mercurial2/main/nested_relative/.hg/hgrc
[paths]
- default = */sub/mercurial/nested_absolute (glob)
+ default = $TESTTMP/sub/mercurial/nested_absolute
[paths]
- default = */sub/mercurial/nested_relative (glob)
+ default = $TESTTMP/sub/mercurial/nested_relative
$ rm -rf mercurial mercurial2
Issue1977: multirepo push should fail if subrepo push fails
@@ -560,7 +560,7 @@
committing subrepository s
$ hg clone repo repo2
updating to branch default
- pulling subrepo s from */sub/repo/s (glob)
+ pulling subrepo s from $TESTTMP/sub/repo/s
requesting all changes
adding changesets
adding manifests
diff --git a/tests/test-tags.t b/tests/test-tags.t
--- a/tests/test-tags.t
+++ b/tests/test-tags.t
@@ -299,7 +299,7 @@
Strip 1: expose an old head:
$ hg --config extensions.mq= strip 5
- saved backup bundle to * (glob)
+ saved backup bundle to $TESTTMP/t3/.hg/strip-backup/*-backup.hg (glob)
$ hg tags # partly stale cache
tip 5:735c3ca72986
bar 1:78391a272241
@@ -310,7 +310,7 @@
Strip 2: destroy whole branch, no old head exposed
$ hg --config extensions.mq= strip 4
- saved backup bundle to * (glob)
+ saved backup bundle to $TESTTMP/t3/.hg/strip-backup/*-backup.hg (glob)
$ hg tags # partly stale
tip 4:735c3ca72986
bar 0:bbd179dfa0a7
diff --git a/tests/test-url-rev.t b/tests/test-url-rev.t
--- a/tests/test-url-rev.t
+++ b/tests/test-url-rev.t
@@ -42,7 +42,7 @@
$ cat clone/.hg/hgrc
[paths]
- default = */repo#foo (glob)
+ default = $TESTTMP/repo#foo
Changing original repo:
diff --git a/tests/test-walk.t b/tests/test-walk.t
--- a/tests/test-walk.t
+++ b/tests/test-walk.t
@@ -216,7 +216,7 @@
f beans/pinto beans/pinto
f beans/turtle beans/turtle
$ hg debugwalk `pwd`/..
- abort: */.. not under root (glob)
+ abort: $TESTTMP/t/.. not under root
[255]
Test patterns:
More information about the Mercurial-devel
mailing list