Patchwork tests: convert \ to / on test output lines containing $TESTTMP

login
register
mail settings
Submitter Mads Kiilerich
Date Feb. 26, 2013, 8:33 p.m.
Message ID <2c246fef46d1f70b0882.1361910797@mk-desktop>
Download mbox | patch
Permalink /patch/1058/
State Deferred, archived
Headers show

Comments

Mads Kiilerich - Feb. 26, 2013, 8:33 p.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1361907870 -3600
# Node ID 2c246fef46d1f70b088284dafa00b0911920949f
# Parent  0ade08dcb3c3d9a1418f38bf875d6c737750b19f
tests: convert \ to / on test output lines containing $TESTTMP

This reduces the need for adding '(glob)' on random lines in test output.
Bryan O'Sullivan - Feb. 28, 2013, 9:53 p.m.
On Tue, Feb 26, 2013 at 12:33 PM, Mads Kiilerich <mads@kiilerich.com> wrote:

> tests: convert \ to / on test output lines containing $TESTTMP
>

Looks good, thanks.
Simon Heimberg - March 9, 2013, 5:41 p.m.
I'm all for this idea. Why did nobody think about this before?

But I see some problems:
* lines containing several paths (test-largefiles.t #1863) [1]
* lines containing file:$TESTTMP (test-hook.t #268) [2]
* lines containing $TESTTMP in a http url (test-hgcia.t #88) [3]
* ...
  (sorry, I am not sure anymore if this really works...)


=Lines containing several paths=
Not all slashes on the line should be converted. Some tests containing
multiple paths on one line will fail.
An example is in test-local (line 1863) [1], with a absolute local path
and a http url.
Only the slashes between $TESTTMP and the following space should be
converted. (Except when there ever is a path with spaces. Luckily there
is none in the current test suite.) When $TESTTMP is several times on
one line, this should be repeated. (For lines looking like this: "abort:
$TESTTMP/t/.. not under root '$TESTTMP/t'")

=Lines containing file:$TESTTMP and Lines containing $TESTTMP in an url=
Urls contain slashes, not backslashes. An example of a http url
containing $TESTTMP is in test-hgcia.t #88 [3].
Also uris starting with "file:" do (normally) use slashes. Not sure if
test-hook.t #268 [2] really contains a file uri. At least the same line
also contains an other occurrence of $TESTTMP which should not be
converted.
I propose to only convert the slashes if the character before $TESTTMP
is one of [ "'] (space or quotes). (list the skipped lines with [4]).
About eight lines will be skipped this which should not, but this can be
handled by appending (glob). code-check regexp for this lines:
r'^  error getting id .* from url file:$TESTTMP/.*[^)]$'

=more?=
I doubt I found all exceptions. To list all output lines containing
$TESTTMP but not "(glob)", run this line in the shell when in the test
dir:
 grep -n '^  [^$>].*$TESTTMP/.*[^)]$' *.t
Many of the results are from tests not running on windows. But there are
also lines I do not know why they did not need (glob). They seem to
contain absolute paths with slashes even on windows. (An absolute path
is shortened to $TESTTMP.) This is why I am not sure anymore if this
will work (at the end of writing this mail).

Is there anybody which could test the (newly written) patch on windows?
My toughs tend to be error-prone and unfinished. A computer should test
all the details, (best before pushing to crew).


[1] test-local #1863
http://hg.intevation.org/mercurial/crew/file/6aca4d1c744e/tests/test-largefiles.t#l1638
[2] test-hook.t #268
http://hg.intevation.org/mercurial/crew/file/6aca4d1c744e/tests/test-hook.t#l268
[3] test-hgcia.t #88
http://hg.intevation.org/mercurial/crew/file/6aca4d1c744e/tests/test-hgcia.t#l88
[4] grep for listing all lines containing $TESTTMP but skipped
grep -n "  [^$].*[^ '\"]\$TESTTMP" *.t


On Tuesday, 26.02.2013, 21:33 +0100 Mads Kiilerich wrote: 
> # HG changeset patch
> # User Mads Kiilerich <madski@unity3d.com>
> # Date 1361907870 -3600
> # Node ID 2c246fef46d1f70b088284dafa00b0911920949f
> # Parent  0ade08dcb3c3d9a1418f38bf875d6c737750b19f
> tests: convert \ to / on test output lines containing $TESTTMP
> 
> This reduces the need for adding '(glob)' on random lines in test output.
> 
> diff --git a/contrib/check-code.py b/contrib/check-code.py
> --- a/contrib/check-code.py
> +++ b/contrib/check-code.py
> @@ -101,8 +101,6 @@
>       "explicit exit code checks unnecessary"),
>      (uprefix + r'set -e', "don't use set -e"),
>      (uprefix + r'\s', "don't indent commands, use > for continued lines"),
> -    (r'^  saved backup bundle to \$TESTTMP.*\.hg$',
> -     "use (glob) to match Windows paths too"),
>    ],
>    # warnings
>    [
> diff --git a/tests/run-tests.py b/tests/run-tests.py
> --- a/tests/run-tests.py
> +++ b/tests/run-tests.py
> @@ -570,6 +570,10 @@
>      if el == l: # perfect match (fast)
>          return True
>      if el:
> +        if os.name == 'nt' and '$TESTTMP' in l:
> +            l = l.replace('\\', '/')
> +            if el == l:
> +                return True
>          if el.endswith(" (esc)\n"):
>              el = el[:-7].decode('string-escape') + '\n'
>          if el == l or os.name == 'nt' and el[:-1] + '\r\n' == l:
> diff --git a/tests/test-blackbox.t b/tests/test-blackbox.t
> --- a/tests/test-blackbox.t
> +++ b/tests/test-blackbox.t
> @@ -48,7 +48,7 @@
>    adding c
>    $ cd ../blackboxtest2
>    $ hg pull
> -  pulling from $TESTTMP/blackboxtest (glob)
> +  pulling from $TESTTMP/blackboxtest
>    searching for changes
>    adding changesets
>    adding manifests
> diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t
> --- a/tests/test-bookmarks-pushpull.t
> +++ b/tests/test-bookmarks-pushpull.t
> @@ -139,7 +139,7 @@
>     * foobar                    1:9b140be10808
>  
>    $ hg pull --config paths.foo=../a foo
> -  pulling from $TESTTMP/a (glob)
> +  pulling from $TESTTMP/a
>    searching for changes
>    adding changesets
>    adding manifests
> diff --git a/tests/test-clone.t b/tests/test-clone.t
> --- a/tests/test-clone.t
> +++ b/tests/test-clone.t
> @@ -92,7 +92,7 @@
>  
>    $ hg clone -q -U --config 'paths.foobar=a#0' foobar f
>    $ hg -R f showconfig paths.default
> -  $TESTTMP/a#0 (glob)
> +  $TESTTMP/a#0
>  
>  Use --pull:
>  
> diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t
> --- a/tests/test-commit-amend.t
> +++ b/tests/test-commit-amend.t
> @@ -35,7 +35,7 @@
>    $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -m 'amend base1'
>    pretxncommit 43f1ba15f28a50abf0aae529cf8a16bfced7b149
>    43f1ba15f28a tip
> -  saved backup bundle to $TESTTMP/.hg/strip-backup/489edb5b847d-amend-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/.hg/strip-backup/489edb5b847d-amend-backup.hg
>    $ echo 'pretxncommit.foo = ' >> $HGRCPATH
>    $ hg diff -c .
>    diff -r ad120869acf0 -r 43f1ba15f28a a
> @@ -86,7 +86,7 @@
>  
>  Add new file:
>    $ hg ci --amend -m 'amend base1 new file'
> -  saved backup bundle to $TESTTMP/.hg/strip-backup/43f1ba15f28a-amend-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/.hg/strip-backup/43f1ba15f28a-amend-backup.hg
>  
>  Remove file that was added in amended commit:
>  (and test logfile option)
> @@ -95,7 +95,7 @@
>    $ hg rm b
>    $ echo 'amend base1 remove new file' > ../logfile
>    $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg ci --amend --logfile ../logfile
> -  saved backup bundle to $TESTTMP/.hg/strip-backup/b8e3cb2b3882-amend-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/.hg/strip-backup/b8e3cb2b3882-amend-backup.hg
>  
>    $ hg cat b
>    b: no such file in rev 74609c7f506e
> @@ -109,7 +109,7 @@
>    a
>    stripping amended changeset 74609c7f506e
>    1 changesets found
> -  saved backup bundle to $TESTTMP/.hg/strip-backup/74609c7f506e-amend-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/.hg/strip-backup/74609c7f506e-amend-backup.hg
>    1 changesets found
>    adding branch
>    adding changesets
> @@ -146,10 +146,10 @@
>  Test -u/-d:
>  
>    $ hg ci --amend -u foo -d '1 0'
> -  saved backup bundle to $TESTTMP/.hg/strip-backup/1cd866679df8-amend-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/.hg/strip-backup/1cd866679df8-amend-backup.hg
>    $ echo a >> a
>    $ hg ci --amend -u foo -d '1 0'
> -  saved backup bundle to $TESTTMP/.hg/strip-backup/780e6f23e03d-amend-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/.hg/strip-backup/780e6f23e03d-amend-backup.hg
>    $ hg log -r .
>    changeset:   1:5f357c7560ab
>    tag:         tip
> @@ -180,7 +180,7 @@
>    a
>    stripping amended changeset 5f357c7560ab
>    1 changesets found
> -  saved backup bundle to $TESTTMP/.hg/strip-backup/5f357c7560ab-amend-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/.hg/strip-backup/5f357c7560ab-amend-backup.hg
>    1 changesets found
>    adding branch
>    adding changesets
> @@ -209,7 +209,7 @@
>    stripping intermediate changeset a0ea9b1a4c8c
>    stripping amended changeset 7ab3bf440b54
>    2 changesets found
> -  saved backup bundle to $TESTTMP/.hg/strip-backup/7ab3bf440b54-amend-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/.hg/strip-backup/7ab3bf440b54-amend-backup.hg
>    1 changesets found
>    adding branch
>    adding changesets
> @@ -232,13 +232,13 @@
>    $ hg book book1
>    $ hg book book2
>    $ hg ci --amend -m 'move bookmarks'
> -  saved backup bundle to $TESTTMP/.hg/strip-backup/ea22a388757c-amend-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/.hg/strip-backup/ea22a388757c-amend-backup.hg
>    $ hg book
>       book1                     1:6cec5aa930e2
>     * book2                     1:6cec5aa930e2
>    $ echo a >> a
>    $ hg ci --amend -m 'move bookmarks'
> -  saved backup bundle to $TESTTMP/.hg/strip-backup/6cec5aa930e2-amend-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/.hg/strip-backup/6cec5aa930e2-amend-backup.hg
>    $ hg book
>       book1                     1:48bb6e53a15f
>     * book2                     1:48bb6e53a15f
> @@ -275,7 +275,7 @@
>    marked working directory as branch default
>    (branches are permanent and global, did you want a bookmark?)
>    $ hg ci --amend -m 'back to default'
> -  saved backup bundle to $TESTTMP/.hg/strip-backup/8ac881fbf49d-amend-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/.hg/strip-backup/8ac881fbf49d-amend-backup.hg
>    $ hg branches
>    default                        2:ce12b0b57d46
>  
> @@ -291,7 +291,7 @@
>    $ echo b >> b
>    $ hg ci -mb
>    $ hg ci --amend --close-branch -m 'closing branch foo'
> -  saved backup bundle to $TESTTMP/.hg/strip-backup/c962248fa264-amend-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/.hg/strip-backup/c962248fa264-amend-backup.hg
>  
>  Same thing, different code path:
>  
> @@ -300,7 +300,7 @@
>    reopening closed branch head 4
>    $ echo b >> b
>    $ hg ci --amend --close-branch
> -  saved backup bundle to $TESTTMP/.hg/strip-backup/027371728205-amend-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/.hg/strip-backup/027371728205-amend-backup.hg
>    $ hg branches
>    default                        2:ce12b0b57d46
>  
> @@ -324,7 +324,7 @@
>    $ hg ci -m 'b -> c'
>    $ hg mv c d
>    $ hg ci --amend -m 'b -> d'
> -  saved backup bundle to $TESTTMP/.hg/strip-backup/b8c6eac7f12e-amend-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/.hg/strip-backup/b8c6eac7f12e-amend-backup.hg
>    $ hg st --rev '.^' --copies d
>    A d
>      b
> @@ -332,7 +332,7 @@
>    $ hg ci -m 'e = d'
>    $ hg cp e f
>    $ hg ci --amend -m 'f = d'
> -  saved backup bundle to $TESTTMP/.hg/strip-backup/7f9761d65613-amend-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/.hg/strip-backup/7f9761d65613-amend-backup.hg
>    $ hg st --rev '.^' --copies f
>    A f
>      d
> @@ -343,7 +343,7 @@
>    $ hg cp a f
>    $ mv f.orig f
>    $ hg ci --amend -m replacef
> -  saved backup bundle to $TESTTMP/.hg/strip-backup/9e8c5f7e3d95-amend-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/.hg/strip-backup/9e8c5f7e3d95-amend-backup.hg
>    $ hg st --change . --copies
>    $ hg log -r . --template "{file_copies}\n"
>    
> @@ -355,7 +355,7 @@
>    adding g
>    $ hg mv g h
>    $ hg ci --amend
> -  saved backup bundle to $TESTTMP/.hg/strip-backup/24aa8eacce2b-amend-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/.hg/strip-backup/24aa8eacce2b-amend-backup.hg
>    $ hg st --change . --copies h
>    A h
>    $ hg log -r . --template "{file_copies}\n"
> @@ -375,11 +375,11 @@
>    $ echo a >> a
>    $ hg ci -ma
>    $ hg ci --amend -m "a'"
> -  saved backup bundle to $TESTTMP/.hg/strip-backup/3837aa2a2fdb-amend-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/.hg/strip-backup/3837aa2a2fdb-amend-backup.hg
>    $ hg log -r . --template "{branch}\n"
>    a
>    $ hg ci --amend -m "a''"
> -  saved backup bundle to $TESTTMP/.hg/strip-backup/c05c06be7514-amend-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/.hg/strip-backup/c05c06be7514-amend-backup.hg
>    $ hg log -r . --template "{branch}\n"
>    a
>  
> @@ -396,7 +396,7 @@
>    $ hg graft 12
>    grafting revision 12
>    $ hg ci --amend -m 'graft amend'
> -  saved backup bundle to $TESTTMP/.hg/strip-backup/bd010aea3f39-amend-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/.hg/strip-backup/bd010aea3f39-amend-backup.hg
>    $ hg log -r . --debug | grep extra
>    extra:       amend_source=bd010aea3f39f3fb2a2f884b9ccb0471cd77398e
>    extra:       branch=a
> diff --git a/tests/test-contrib.t b/tests/test-contrib.t
> --- a/tests/test-contrib.t
> +++ b/tests/test-contrib.t
> @@ -109,7 +109,7 @@
>  Test shrink-revlog:
>    $ cd repo-a
>    $ hg --config extensions.shrink="$CONTRIBDIR/shrink-revlog.py" shrink
> -  shrinking $TESTTMP/repo-a/.hg/store/00manifest.i (glob)
> +  shrinking $TESTTMP/repo-a/.hg/store/00manifest.i
>    reading revs
>    sorting revs
>    writing revs
> @@ -117,8 +117,8 @@
>    new file size:          324 bytes (   0.0 MiB)
>    shrinkage: 0.0% (1.0x)
>    note: old revlog saved in:
> -    $TESTTMP/repo-a/.hg/store/00manifest.i.old (glob)
> -    $TESTTMP/repo-a/.hg/store/00manifest.d.old (glob)
> +    $TESTTMP/repo-a/.hg/store/00manifest.i.old
> +    $TESTTMP/repo-a/.hg/store/00manifest.d.old
>    (You can delete those files when you are satisfied that your
>    repository is still sane.  Running 'hg verify' is strongly recommended.)
>    $ hg verify
> diff --git a/tests/test-convert-authormap.t b/tests/test-convert-authormap.t
> --- a/tests/test-convert-authormap.t
> +++ b/tests/test-convert-authormap.t
> @@ -27,7 +27,7 @@
>    sorting...
>    converting...
>    0 foo
> -  writing author map file $TESTTMP/new/.hg/authormap (glob)
> +  writing author map file $TESTTMP/new/.hg/authormap
>    $ cat new/.hg/authormap
>    user name=Long User Name
>    $ hg -Rnew log
> @@ -44,7 +44,7 @@
>    $ hg init new
>    $ mv authormap.txt new/.hg/authormap
>    $ hg convert orig new
> -  ignoring bad line in author map file $TESTTMP/new/.hg/authormap: this line is ignored (glob)
> +  ignoring bad line in author map file $TESTTMP/new/.hg/authormap: this line is ignored
>    scanning source...
>    sorting...
>    converting...
> diff --git a/tests/test-convert-filemap.t b/tests/test-convert-filemap.t
> --- a/tests/test-convert-filemap.t
> +++ b/tests/test-convert-filemap.t
> @@ -568,7 +568,7 @@
>    $ cd namedbranch
>    $ hg --config extensions.mq= strip tip
>    1 files updated, 0 files merged, 0 files removed, 0 files unresolved
> -  saved backup bundle to $TESTTMP/namedbranch/.hg/strip-backup/73899bcbe45c-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/namedbranch/.hg/strip-backup/73899bcbe45c-backup.hg
>    $ hg up foo
>    2 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    $ hg merge default
> 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 $TESTTMP/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 $TESTTMP/c (glob)
> +  pushing to $TESTTMP/c
>    searching for changes
>    adding changesets
>    adding manifests
> diff --git a/tests/test-extension.t b/tests/test-extension.t
> --- a/tests/test-extension.t
> +++ b/tests/test-extension.t
> @@ -475,9 +475,9 @@
>    > cmdtable = None
>    > EOF
>    $ hg --config extensions.path=./path.py help foo > /dev/null
> -  warning: error finding commands in $TESTTMP/hgext/forest.py (glob)
> +  warning: error finding commands in $TESTTMP/hgext/forest.py
>    hg: unknown command 'foo'
> -  warning: error finding commands in $TESTTMP/hgext/forest.py (glob)
> +  warning: error finding commands in $TESTTMP/hgext/forest.py
>    [255]
>  
>    $ cat > throw.py <<EOF
> diff --git a/tests/test-globalopts.t b/tests/test-globalopts.t
> --- a/tests/test-globalopts.t
> +++ b/tests/test-globalopts.t
> @@ -87,7 +87,7 @@
>    abort: no repository found in '$TESTTMP' (.hg not found)!
>    [255]
>    $ hg -R b ann a/a
> -  abort: a/a not under root '$TESTTMP/b' (glob)
> +  abort: a/a not under root '$TESTTMP/b'
>    [255]
>    $ hg log
>    abort: no repository found in '$TESTTMP' (.hg not found)!
> diff --git a/tests/test-hardlinks.t b/tests/test-hardlinks.t
> --- a/tests/test-hardlinks.t
> +++ b/tests/test-hardlinks.t
> @@ -138,7 +138,7 @@
>  
>    $ cd r3
>    $ hg push
> -  pushing to $TESTTMP/r1 (glob)
> +  pushing to $TESTTMP/r1
>    searching for changes
>    adding changesets
>    adding manifests
> 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: $TESTTMP/.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
> -  $TESTTMP/.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
> @@ -29,12 +29,12 @@
>    $ cd foobar
>    $ cat .hg/hgrc
>    [paths]
> -  default = $TESTTMP/foo%bar (glob)
> +  default = $TESTTMP/foo%bar
>    $ hg paths
> -  default = $TESTTMP/foo%bar (glob)
> +  default = $TESTTMP/foo%bar
>    $ hg showconfig
> -  bundle.mainreporoot=$TESTTMP/foobar (glob)
> -  paths.default=$TESTTMP/foo%bar (glob)
> +  bundle.mainreporoot=$TESTTMP/foobar
> +  paths.default=$TESTTMP/foo%bar
>    $ cd ..
>  
>  issue1829: wrong indentation
> diff --git a/tests/test-histedit-bookmark-motion.t b/tests/test-histedit-bookmark-motion.t
> --- a/tests/test-histedit-bookmark-motion.t
> +++ b/tests/test-histedit-bookmark-motion.t
> @@ -90,8 +90,8 @@
>    histedit: moving bookmarks three from 055a42cdd887 to 59d9f330561f
>    histedit: moving bookmarks two from 177f92b77385 to b346ab9a313d
>    histedit: moving bookmarks will-move-backwards from d2ae7f538514 to cb9a9f314b8b
> -  saved backup bundle to $TESTTMP/r/.hg/strip-backup/d2ae7f538514-backup.hg (glob)
> -  saved backup bundle to $TESTTMP/r/.hg/strip-backup/96e494a2d553-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/r/.hg/strip-backup/d2ae7f538514-backup.hg
> +  saved backup bundle to $TESTTMP/r/.hg/strip-backup/96e494a2d553-backup.hg
>    $ hg log --graph
>    @  changeset:   3:cacdfd884a93
>    |  bookmark:    five
> @@ -144,7 +144,7 @@
>    histedit: moving bookmarks five from cacdfd884a93 to c04e50810e4b
>    histedit: moving bookmarks four from 59d9f330561f to c04e50810e4b
>    histedit: moving bookmarks three from 59d9f330561f to c04e50810e4b
> -  saved backup bundle to $TESTTMP/r/.hg/strip-backup/59d9f330561f-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/r/.hg/strip-backup/59d9f330561f-backup.hg
>  
>  We expect 'five' to stay at tip, since the tipmost bookmark is most
>  likely the useful signal.
> diff --git a/tests/test-histedit-edit.t b/tests/test-histedit-edit.t
> --- a/tests/test-histedit-edit.t
> +++ b/tests/test-histedit-edit.t
> @@ -157,7 +157,7 @@
>    A f
>    $ HGEDITOR='true' hg histedit --continue
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> -  saved backup bundle to $TESTTMP/r/.hg/strip-backup/b5f70786f9b0-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/r/.hg/strip-backup/b5f70786f9b0-backup.hg
>  
>    $ hg status
>  
> diff --git a/tests/test-histedit-fold.t b/tests/test-histedit-fold.t
> --- a/tests/test-histedit-fold.t
> +++ b/tests/test-histedit-fold.t
> @@ -278,7 +278,7 @@
>    HG: changed file
>    1 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> -  saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-backup.hg
>    $ hg log -G
>    @  changeset:   1:10c647b2cdd5
>    |  tag:         tip
> diff --git a/tests/test-histedit-obsolete.t b/tests/test-histedit-obsolete.t
> --- a/tests/test-histedit-obsolete.t
> +++ b/tests/test-histedit-obsolete.t
> @@ -67,7 +67,7 @@
>    > pick 652413bf663e 5 f
>    > EOF
>    $ hg histedit 1 --commands commands.txt --verbose | grep histedit
> -  saved backup bundle to $TESTTMP/base/.hg/strip-backup/96e494a2d553-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/base/.hg/strip-backup/96e494a2d553-backup.hg
>    $ hg log --graph --hidden
>    @  8:cacdfd884a93 f
>    |
> @@ -437,9 +437,9 @@
>    0 files updated, 0 files merged, 2 files removed, 0 files unresolved
>    2 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> -  saved backup bundle to $TESTTMP/folding/.hg/strip-backup/58019c66f35f-backup.hg (glob)
> -  saved backup bundle to $TESTTMP/folding/.hg/strip-backup/83d1858e070b-backup.hg (glob)
> -  saved backup bundle to $TESTTMP/folding/.hg/strip-backup/859969f5ed7e-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/folding/.hg/strip-backup/58019c66f35f-backup.hg
> +  saved backup bundle to $TESTTMP/folding/.hg/strip-backup/83d1858e070b-backup.hg
> +  saved backup bundle to $TESTTMP/folding/.hg/strip-backup/859969f5ed7e-backup.hg
>    $ hg log -G
>    @  19:f9daec13fb98 (secret) i
>    |
> diff --git a/tests/test-hook.t b/tests/test-hook.t
> --- a/tests/test-hook.t
> +++ b/tests/test-hook.t
> @@ -630,7 +630,7 @@
>    $ echo aa >> from/a
>    $ hg --cwd from ci -mb
>    $ hg --cwd from push
> -  pushing to $TESTTMP/to (glob)
> +  pushing to $TESTTMP/to
>    searching for changes
>    adding changesets
>    adding manifests
> diff --git a/tests/test-issue1502.t b/tests/test-issue1502.t
> --- a/tests/test-issue1502.t
> +++ b/tests/test-issue1502.t
> @@ -13,7 +13,7 @@
>    $ echo "bar" > foo1/a && hg -R foo1 commit -m "edit a in foo1"
>    $ echo "hi" > foo/a && hg -R foo commit -m "edited a foo"
>    $ hg -R foo1 pull -u
> -  pulling from $TESTTMP/foo (glob)
> +  pulling from $TESTTMP/foo
>    searching for changes
>    adding changesets
>    adding manifests
> @@ -29,7 +29,7 @@
>  
>    $ echo "there" >> foo/a && hg -R foo commit -m "edited a again"
>    $ hg -R foo1 pull
> -  pulling from $TESTTMP/foo (glob)
> +  pulling from $TESTTMP/foo
>    searching for changes
>    adding changesets
>    adding manifests
> diff --git a/tests/test-keyword.t b/tests/test-keyword.t
> --- a/tests/test-keyword.t
> +++ b/tests/test-keyword.t
> @@ -229,7 +229,7 @@
>    Message-Id: <hg.a2392c293916*> (glob)
>    To: Test
>    
> -  changeset a2392c293916 in $TESTTMP/Test (glob)
> +  changeset a2392c293916 in $TESTTMP/Test
>    details: $TESTTMP/Test?cmd=changeset;node=a2392c293916
>    description:
>    	addsym
> @@ -252,7 +252,7 @@
>    Message-Id: <hg.ef63ca68695b*> (glob)
>    To: Test
>    
> -  changeset ef63ca68695b in $TESTTMP/Test (glob)
> +  changeset ef63ca68695b in $TESTTMP/Test
>    details: $TESTTMP/Test?cmd=changeset;node=ef63ca68695b
>    description:
>    	absym
> @@ -863,7 +863,7 @@
>    > default = ../Test
>    > EOF
>    $ hg incoming
> -  comparing with $TESTTMP/Test (glob)
> +  comparing with $TESTTMP/Test
>    searching for changes
>    changeset:   2:bb948857c743
>    tag:         tip
> diff --git a/tests/test-largefiles-cache.t b/tests/test-largefiles-cache.t
> --- a/tests/test-largefiles-cache.t
> +++ b/tests/test-largefiles-cache.t
> @@ -44,7 +44,7 @@
>  
>    $ hg update
>    getting changed largefiles
> -  error getting id 7f7097b041ccf68cc5561e9600da4655d21c6d18 from url file:$TESTTMP/mirror for file large: can't get file locally (glob)
> +  error getting id 7f7097b041ccf68cc5561e9600da4655d21c6d18 from url file:$TESTTMP/mirror for file large: can't get file locally
>    0 largefiles updated, 0 removed
>    1 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    $ hg status
> @@ -61,7 +61,7 @@
>  
>    $ hg update
>    getting changed largefiles
> -  error getting id 7f7097b041ccf68cc5561e9600da4655d21c6d18 from url file:$TESTTMP/mirror for file large: can't get file locally (glob)
> +  error getting id 7f7097b041ccf68cc5561e9600da4655d21c6d18 from url file:$TESTTMP/mirror for file large: can't get file locally
>    0 largefiles updated, 0 removed
>    1 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    $ hg status
> diff --git a/tests/test-largefiles.t b/tests/test-largefiles.t
> --- a/tests/test-largefiles.t
> +++ b/tests/test-largefiles.t
> @@ -670,7 +670,7 @@
>  
>  Test that outgoing --large works (with revsets too)
>    $ hg outgoing --rev '.^' --large
> -  comparing with $TESTTMP/a (glob)
> +  comparing with $TESTTMP/a
>    searching for changes
>    changeset:   8:c02fd3b77ec4
>    user:        test
> @@ -876,7 +876,7 @@
>    $ rm "${USERCACHE}"/*
>    $ cd a-backup
>    $ hg pull --all-largefiles --config paths.default-push=bogus/path
> -  pulling from $TESTTMP/a (glob)
> +  pulling from $TESTTMP/a
>    searching for changes
>    adding changesets
>    adding manifests
> @@ -920,7 +920,7 @@
>  'default' instead of 'default-push' when no source is specified (issue3584).
>  The error messages go away if repo 'b' is created with --all-largefiles.
>    $ hg pull --rebase --all-largefiles --config paths.default-push=bogus/path --config paths.default=../b
> -  pulling from $TESTTMP/b (glob)
> +  pulling from $TESTTMP/b
>    searching for changes
>    adding changesets
>    adding manifests
> @@ -929,16 +929,16 @@
>    Invoking status precommit hook
>    M sub/normal4
>    M sub2/large6
> -  saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
> -  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file large3: can't get file locally (glob)
> -  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large4: can't get file locally (glob)
> -  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file large1: can't get file locally (glob)
> -  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large2: can't get file locally (glob)
> -  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large2: can't get file locally (glob)
> -  error getting id 5f78770c0e77ba4287ad6ef3071c9bf9c379742f from url file:$TESTTMP/b for file large1: can't get file locally (glob)
> -  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large2: can't get file locally (glob)
> -  error getting id 4669e532d5b2c093a78eca010077e708a071bb64 from url file:$TESTTMP/b for file large1: can't get file locally (glob)
> -  error getting id 1deebade43c8c498a3c8daddac0244dc55d1331d from url file:$TESTTMP/b for file sub/large2: can't get file locally (glob)
> +  saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg
> +  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file large3: can't get file locally
> +  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large4: can't get file locally
> +  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file large1: can't get file locally
> +  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large2: can't get file locally
> +  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large2: can't get file locally
> +  error getting id 5f78770c0e77ba4287ad6ef3071c9bf9c379742f from url file:$TESTTMP/b for file large1: can't get file locally
> +  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large2: can't get file locally
> +  error getting id 4669e532d5b2c093a78eca010077e708a071bb64 from url file:$TESTTMP/b for file large1: can't get file locally
> +  error getting id 1deebade43c8c498a3c8daddac0244dc55d1331d from url file:$TESTTMP/b for file sub/large2: can't get file locally
>    0 additional largefiles cached
>    9 largefiles failed to download
>    nothing to rebase
> @@ -976,7 +976,7 @@
>    Invoking status precommit hook
>    M sub/normal4
>    M sub2/large6
> -  saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg
>    $ hg log --template '{rev}:{node|short}  {desc|firstline}\n'
>    9:598410d3eb9a  modify normal file largefile in repo d
>    8:a381d2c8c80e  modify normal file and largefile in repo b
> @@ -1186,7 +1186,7 @@
>    $ pwd
>    $TESTTMP/e
>    $ hg paths
> -  default = $TESTTMP/d (glob)
> +  default = $TESTTMP/d
>  
>    $ hg verify --large
>    checking changesets
> @@ -1206,14 +1206,14 @@
>    checking files
>    10 files, 10 changesets, 28 total revisions
>    searching 1 changesets for largefiles
> -  changeset 9:598410d3eb9a: sub/large4 references missing $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 (glob)
> +  changeset 9:598410d3eb9a: sub/large4 references missing $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928
>    verified existence of 3 revisions of 3 largefiles
>    [1]
>  
>  - introduce corruption and make sure that it is caught when checking content:
>    $ echo '5 cents' > $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928
>    $ hg verify -q --large --lfc
> -  changeset 9:598410d3eb9a: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 (glob)
> +  changeset 9:598410d3eb9a: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928
>    [1]
>  
>  - cleanup
> @@ -1222,13 +1222,13 @@
>  - verifying all revisions will fail because we didn't clone all largefiles to d:
>    $ echo 'T-shirt' > $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
>    $ hg verify -q --lfa --lfc
> -  changeset 0:30d30fe6a5be: large1 references missing $TESTTMP/d/.hg/largefiles/4669e532d5b2c093a78eca010077e708a071bb64 (glob)
> -  changeset 0:30d30fe6a5be: sub/large2 references missing $TESTTMP/d/.hg/largefiles/1deebade43c8c498a3c8daddac0244dc55d1331d (glob)
> -  changeset 1:ce8896473775: large1 references missing $TESTTMP/d/.hg/largefiles/5f78770c0e77ba4287ad6ef3071c9bf9c379742f (glob)
> -  changeset 1:ce8896473775: sub/large2 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
> -  changeset 3:9e8fbc4bce62: large1 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
> -  changeset 4:74c02385b94c: large3 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
> -  changeset 4:74c02385b94c: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
> +  changeset 0:30d30fe6a5be: large1 references missing $TESTTMP/d/.hg/largefiles/4669e532d5b2c093a78eca010077e708a071bb64
> +  changeset 0:30d30fe6a5be: sub/large2 references missing $TESTTMP/d/.hg/largefiles/1deebade43c8c498a3c8daddac0244dc55d1331d
> +  changeset 1:ce8896473775: large1 references missing $TESTTMP/d/.hg/largefiles/5f78770c0e77ba4287ad6ef3071c9bf9c379742f
> +  changeset 1:ce8896473775: sub/large2 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
> +  changeset 3:9e8fbc4bce62: large1 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
> +  changeset 4:74c02385b94c: large3 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
> +  changeset 4:74c02385b94c: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
>    [1]
>  
>  - cleanup
> @@ -1574,7 +1574,7 @@
>    pushing to http://localhost:$HGPORT1/
>    searching for changes
>    remote: largefiles: failed to put 4cdac4d8b084d0b599525cf732437fb337d422a8 into store: largefile contents do not match hash
> -  abort: remotestore: could not put $TESTTMP/r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 to remote store http://localhost:$HGPORT1/ (glob)
> +  abort: remotestore: could not put $TESTTMP/r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 to remote store http://localhost:$HGPORT1/
>    [255]
>    $ mv 4cdac4d8b084d0b599525cf732437fb337d422a8 r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8
>  Push of file that exists on server but is corrupted - magic healing would be nice ... but too magic
> @@ -2036,7 +2036,7 @@
>  
>    $ hg -q clone src clone2
>    $ hg -R clone2 paths | grep default
> -  default = $TESTTMP/issue3651/src (glob)
> +  default = $TESTTMP/issue3651/src
>  
>    $ hg -R clone2 summary --large
>    parent: 0:fc0bd45326d3 tip
> @@ -2047,7 +2047,7 @@
>    searching for changes
>    largefiles: (no files to upload)
>    $ hg -R clone2 outgoing --large
> -  comparing with $TESTTMP/issue3651/src (glob)
> +  comparing with $TESTTMP/issue3651/src
>    searching for changes
>    no changes found
>    searching for changes
> @@ -2070,7 +2070,7 @@
>    searching for changes
>    largefiles: 1 to upload
>    $ hg -R clone2 outgoing --large
> -  comparing with $TESTTMP/issue3651/src (glob)
> +  comparing with $TESTTMP/issue3651/src
>    searching for changes
>    changeset:   1:1acbe71ce432
>    tag:         tip
> diff --git a/tests/test-lfconvert.t b/tests/test-lfconvert.t
> --- a/tests/test-lfconvert.t
> +++ b/tests/test-lfconvert.t
> @@ -125,7 +125,7 @@
>    $ hg commit -q -m"remove large, normal3"
>    $ hg merge
>    merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat
> -  warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file. (glob)
> +  warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file.
>    merging stuff/maybelarge.dat incomplete! (edit conflicts, then use 'hg resolve --mark')
>    merging sub/normal2 and stuff/normal2 to stuff/normal2
>    0 files updated, 1 files merged, 0 files removed, 1 files unresolved
> @@ -212,7 +212,7 @@
>    $ hg share -q -U bigfile-repo shared
>    $ printf 'bogus' > shared/.hg/sharedpath
>    $ hg lfconvert shared foo
> -  abort: .hg/sharedpath points to nonexistent directory $TESTTMP/bogus! (glob)
> +  abort: .hg/sharedpath points to nonexistent directory $TESTTMP/bogus!
>    [255]
>    $ hg lfconvert bigfile-repo largefiles-repo
>    initializing destination largefiles-repo
> @@ -317,12 +317,12 @@
>    checking files
>    8 files, 7 changesets, 12 total revisions
>    searching 7 changesets for largefiles
> -  changeset 0:d4892ec57ce2: large references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/2e000fa7e85759c7f4c254d4d9c33ef481e459a7 (glob)
> -  changeset 1:334e5237836d: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c (glob)
> -  changeset 2:261ad3f3f037: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c (glob)
> -  changeset 3:55759520c76f: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38 (glob)
> -  changeset 5:9cc5aa7204f0: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38 (glob)
> -  changeset 6:17126745edfd: anotherlarge references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3 (glob)
> +  changeset 0:d4892ec57ce2: large references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/2e000fa7e85759c7f4c254d4d9c33ef481e459a7
> +  changeset 1:334e5237836d: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c
> +  changeset 2:261ad3f3f037: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c
> +  changeset 3:55759520c76f: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38
> +  changeset 5:9cc5aa7204f0: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38
> +  changeset 6:17126745edfd: anotherlarge references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3
>    verified existence of 6 revisions of 4 largefiles
>    [1]
>    $ hg -R largefiles-repo-hg showconfig paths
> @@ -343,7 +343,7 @@
>    $ rm largefiles-repo/.hg/largefiles/*
>    $ hg lfconvert --to-normal issue3519 normalized3519
>    initializing destination normalized3519
> -  error getting id 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 from url file:$TESTTMP/largefiles-repo for file large: can't get file locally (glob)
> +  error getting id 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 from url file:$TESTTMP/largefiles-repo for file large: can't get file locally
>    abort: missing largefile 'large' from revision d4892ec57ce212905215fad1d9018f56b99202ad
>    [255]
>  
> 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
> @@ -56,7 +56,7 @@
>  Save the patch queue so we can merge it later:
>  
>    $ hg qsave -c -e
> -  copy $TESTTMP/t/.hg/patches to $TESTTMP/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:
> @@ -76,7 +76,7 @@
>    b
>  
>    $ hg qpush -a -m
> -  merging with queue at: $TESTTMP/t/.hg/patches.1 (glob)
> +  merging with queue at: $TESTTMP/t/.hg/patches.1
>    applying rm_a
>    now at: rm_a
>  
> @@ -115,14 +115,14 @@
>  Create the reference queue:
>  
>    $ hg qsave -c -e -n refqueue
> -  copy $TESTTMP/t2/.hg/patches to $TESTTMP/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: $TESTTMP/t2/.hg/refqueue (glob)
> +  merging with queue at: $TESTTMP/t2/.hg/refqueue
>    applying patcha
>    patching file a
>    Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines).
> 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
> @@ -69,7 +69,7 @@
>    abort: popping would remove a revision not managed by this patch queue
>    [255]
>    $ hg qpop -n patches
> -  using patch queue: $TESTTMP/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.t b/tests/test-mq.t
> --- a/tests/test-mq.t
> +++ b/tests/test-mq.t
> @@ -151,7 +151,7 @@
>    guards
>    $ cat .hg/patches/series
>    $ hg qinit -c
> -  abort: repository $TESTTMP/d/.hg/patches already exists! (glob)
> +  abort: repository $TESTTMP/d/.hg/patches already exists!
>    [255]
>    $ cd ..
>  
> 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,11 +56,11 @@
>    Message-Id: <*> (glob)
>    To: baz, foo@bar
>    
> -  changeset cb9a9f314b8b in $TESTTMP/a (glob)
> +  changeset cb9a9f314b8b in $TESTTMP/a
>    details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b
>    summary: a
>    
> -  changeset ba677d0156c1 in $TESTTMP/a (glob)
> +  changeset ba677d0156c1 in $TESTTMP/a
>    details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1
>    summary: b
>    
> @@ -107,11 +107,11 @@
>    Message-Id: <*> (glob)
>    To: baz, foo@bar
>    
> -  changeset cb9a9f314b8b in $TESTTMP/a (glob)
> +  changeset cb9a9f314b8b in $TESTTMP/a
>    details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b
>    summary: a
>    
> -  changeset ba677d0156c1 in $TESTTMP/a (glob)
> +  changeset ba677d0156c1 in $TESTTMP/a
>    details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1
>    summary: b
>    
> @@ -184,19 +184,19 @@
>    Message-Id: <*> (glob)
>    To: baz, foo@bar
>    
> -  changeset 84e487dddc58 in $TESTTMP/a (glob)
> +  changeset 84e487dddc58 in $TESTTMP/a
>    details: $TESTTMP/a?cmd=changeset;node=84e487dddc58
>    summary: newfile
>    
> -  changeset b29c7a2b6b0c in $TESTTMP/a (glob)
> +  changeset b29c7a2b6b0c in $TESTTMP/a
>    details: $TESTTMP/a?cmd=changeset;node=b29c7a2b6b0c
>    summary: x
>    
> -  changeset 0957c7d64886 in $TESTTMP/a (glob)
> +  changeset 0957c7d64886 in $TESTTMP/a
>    details: $TESTTMP/a?cmd=changeset;node=0957c7d64886
>    summary: y
>    
> -  changeset 485b4e6b0249 in $TESTTMP/a (glob)
> +  changeset 485b4e6b0249 in $TESTTMP/a
>    details: $TESTTMP/a?cmd=changeset;node=485b4e6b0249
>    summary: merged
>    
> diff --git a/tests/test-notify.t b/tests/test-notify.t
> --- a/tests/test-notify.t
> +++ b/tests/test-notify.t
> @@ -193,7 +193,7 @@
>    Message-Id: <*> (glob)
>    To: baz, foo@bar
>    
> -  changeset 0647d048b600 in $TESTTMP/b (glob)
> +  changeset 0647d048b600 in $TESTTMP/b
>    details: $TESTTMP/b?cmd=changeset;node=0647d048b600
>    description: b
>    
> diff --git a/tests/test-obsolete-checkheads.t b/tests/test-obsolete-checkheads.t
> --- a/tests/test-obsolete-checkheads.t
> +++ b/tests/test-obsolete-checkheads.t
> @@ -42,7 +42,7 @@
>  
>    $ mkcommit old
>    $ hg push
> -  pushing to $TESTTMP/remote (glob)
> +  pushing to $TESTTMP/remote
>    searching for changes
>    adding changesets
>    adding manifests
> @@ -65,7 +65,7 @@
>  Push should not warn about creating new head
>  
>    $ hg push
> -  pushing to $TESTTMP/remote (glob)
> +  pushing to $TESTTMP/remote
>    searching for changes
>    adding changesets
>    adding manifests
> @@ -81,7 +81,7 @@
>    $ cp -r ../backup1 ../remote
>    $ hg -R ../remote phase --public c70b08862e08
>    $ hg pull -v
> -  pulling from $TESTTMP/remote (glob)
> +  pulling from $TESTTMP/remote
>    searching for changes
>    no changes found
>    $ hg glog --hidden
> @@ -95,7 +95,7 @@
>  Abort: old will still be an head because it's public.
>  
>    $ hg push
> -  pushing to $TESTTMP/remote (glob)
> +  pushing to $TESTTMP/remote
>    searching for changes
>    abort: push creates new remote head 71e3228bffe1!
>    (did you forget to merge? use push -f to force)
> @@ -155,7 +155,7 @@
>  Push should abort on new head
>  
>    $ hg push -r 'desc("other")'
> -  pushing to $TESTTMP/remote (glob)
> +  pushing to $TESTTMP/remote
>    searching for changes
>    abort: push creates new remote head d7d41ccbd4de!
>    (did you forget to merge? use push -f to force)
> @@ -182,7 +182,7 @@
>    $ mkcommit new
>    created new head
>    $ hg push -f
> -  pushing to $TESTTMP/remote (glob)
> +  pushing to $TESTTMP/remote
>    searching for changes
>    adding changesets
>    adding manifests
> @@ -217,7 +217,7 @@
>  one anyway.
>  
>    $ hg push
> -  pushing to $TESTTMP/remote (glob)
> +  pushing to $TESTTMP/remote
>    searching for changes
>    adding changesets
>    adding manifests
> @@ -265,7 +265,7 @@
>  handled yet.
>  
>    $ hg push --traceback
> -  pushing to $TESTTMP/remote (glob)
> +  pushing to $TESTTMP/remote
>    searching for changes
>    adding changesets
>    adding manifests
> diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
> --- a/tests/test-obsolete.t
> +++ b/tests/test-obsolete.t
> @@ -816,7 +816,7 @@
>       summary:     A
>    
>    $ hg incoming
> -  comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
> +  comparing with $TESTTMP/tmpe/repo-issue3805
>    searching for changes
>    changeset:   2:3816541e5485
>    tag:         tip
> @@ -826,7 +826,7 @@
>    summary:     A
>    
>    $ hg incoming --bundle ../issue3805.hg
> -  comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
> +  comparing with $TESTTMP/tmpe/repo-issue3805
>    searching for changes
>    changeset:   2:3816541e5485
>    tag:         tip
> @@ -836,7 +836,7 @@
>    summary:     A
>    
>    $ hg outgoing
> -  comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
> +  comparing with $TESTTMP/tmpe/repo-issue3805
>    searching for changes
>    no changes found
>    [1]
> diff --git a/tests/test-parents.t b/tests/test-parents.t
> --- a/tests/test-parents.t
> +++ b/tests/test-parents.t
> @@ -71,7 +71,7 @@
>    
>  
>    $ hg parents -r 2 ../a
> -  abort: ../a not under root '$TESTTMP/repo' (glob)
> +  abort: ../a not under root '$TESTTMP/repo'
>    [255]
>  
> 
> diff --git a/tests/test-paths.t b/tests/test-paths.t
> --- a/tests/test-paths.t
> +++ b/tests/test-paths.t
> @@ -7,35 +7,35 @@
>    $ echo 'dupe = ../b' >> .hg/hgrc
>    $ echo 'expand = $SOMETHING/bar' >> .hg/hgrc
>    $ hg in dupe
> -  comparing with $TESTTMP/b (glob)
> +  comparing with $TESTTMP/b
>    no changes found
>    [1]
>    $ cd ..
>    $ hg -R a in dupe
> -  comparing with $TESTTMP/b (glob)
> +  comparing with $TESTTMP/b
>    no changes found
>    [1]
>    $ cd a
>    $ hg paths
> -  dupe = $TESTTMP/b (glob)
> -  expand = $TESTTMP/a/$SOMETHING/bar (glob)
> +  dupe = $TESTTMP/b
> +  expand = $TESTTMP/a/$SOMETHING/bar
>    $ SOMETHING=foo hg paths
> -  dupe = $TESTTMP/b (glob)
> -  expand = $TESTTMP/a/foo/bar (glob)
> +  dupe = $TESTTMP/b
> +  expand = $TESTTMP/a/foo/bar
>  #if msys
>    $ SOMETHING=//foo hg paths
> -  dupe = $TESTTMP/b (glob)
> +  dupe = $TESTTMP/b
>    expand = /foo/bar
>  #else
>    $ SOMETHING=/foo hg paths
> -  dupe = $TESTTMP/b (glob)
> +  dupe = $TESTTMP/b
>    expand = /foo/bar
>  #endif
>    $ hg paths -q
>    dupe
>    expand
>    $ hg paths dupe
> -  $TESTTMP/b (glob)
> +  $TESTTMP/b
>    $ hg paths -q dupe
>    $ hg paths unknown
>    not found!
> diff --git a/tests/test-pull-r.t b/tests/test-pull-r.t
> --- a/tests/test-pull-r.t
> +++ b/tests/test-pull-r.t
> @@ -43,7 +43,7 @@
>    2:effea6de0384
>    1:ed1b79f46b9a
>    $ hg pull
> -  pulling from $TESTTMP/repo2 (glob)
> +  pulling from $TESTTMP/repo2
>    searching for changes
>    adding changesets
>    adding manifests
> 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
> @@ -44,7 +44,7 @@
>    [1]
>  
>    $ hg push
> -  pushing to $TESTTMP/test (glob)
> +  pushing to $TESTTMP/test
>    searching for changes
>    adding changesets
>    adding manifests
> @@ -79,7 +79,7 @@
>    [1]
>  
>    $ hg push
> -  pushing to $TESTTMP/test (glob)
> +  pushing to $TESTTMP/test
>    searching for changes
>    adding changesets
>    adding manifests
> diff --git a/tests/test-rebase-bookmarks.t b/tests/test-rebase-bookmarks.t
> --- a/tests/test-rebase-bookmarks.t
> +++ b/tests/test-rebase-bookmarks.t
> @@ -146,7 +146,7 @@
>    $ echo 'c' > c
>    $ hg resolve --mark c
>    $ hg rebase --continue
> -  saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-backup.hg
>    $ hg tglog
>    @  4: 'C' bookmarks: Y Z
>    |
> 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
> @@ -281,7 +281,7 @@
>    c65502d4178782309ce0574c5ae6ee9485a9bafa default
>  
>    $ hg strip 4
> -  saved backup bundle to $TESTTMP/b2/.hg/strip-backup/8a5212ebc852-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/b2/.hg/strip-backup/8a5212ebc852-backup.hg
>  
>    $ cat $TESTTMP/b2/.hg/cache/branchheads-served
>    c65502d4178782309ce0574c5ae6ee9485a9bafa 4
> 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
> @@ -288,7 +288,7 @@
>    
>  
>    $ hg rebase -d 5 -s 7
> -  saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-backup.hg
>    $ hg tglog
>    @  8: 'D'
>    |
> @@ -378,7 +378,7 @@
>    [255]
>    $ hg resolve --all -t internal:local
>    $ hg rebase -c
> -  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg
>    $ hg  log -G --template "{rev}:{phase} '{desc}' {branches}\n"
>    @  7:draft 'H'
>    |
> 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,7 +48,7 @@
>  Now b has one revision to be pulled from a:
>  
>    $ hg pull --rebase
> -  pulling from $TESTTMP/a (glob)
> +  pulling from $TESTTMP/a
>    searching for changes
>    adding changesets
>    adding manifests
> @@ -68,7 +68,7 @@
>  Re-run:
>  
>    $ hg pull --rebase
> -  pulling from $TESTTMP/a (glob)
> +  pulling from $TESTTMP/a
>    searching for changes
>    no changes found
>  
> @@ -79,7 +79,7 @@
>  
>    $ hg book norebase
>    $ hg pull --rebase
> -  pulling from $TESTTMP/a (glob)
> +  pulling from $TESTTMP/a
>    searching for changes
>    adding changesets
>    adding manifests
> @@ -96,7 +96,7 @@
>  pull --rebase --update should ignore --update:
>  
>    $ hg pull --rebase --update
> -  pulling from $TESTTMP/a (glob)
> +  pulling from $TESTTMP/a
>    searching for changes
>    no changes found
>  
> @@ -105,7 +105,7 @@
>    $ hg up -q 1
>  
>    $ hg pull --rebase
> -  pulling from $TESTTMP/a (glob)
> +  pulling from $TESTTMP/a
>    searching for changes
>    no changes found
>  
> @@ -144,13 +144,13 @@
>    adding L1
>    created new head
>    $ hg pull --rev tip --rebase
> -  pulling from $TESTTMP/a (glob)
> +  pulling from $TESTTMP/a
>    searching for changes
>    adding changesets
>    adding manifests
>    adding file changes
>    added 2 changesets with 2 changes to 2 files
> -  saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-backup.hg
>    $ hg tglog
>    @  5: 'L1'
>    |
> 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
> @@ -254,7 +254,7 @@
>  C onto A - rebase onto an ancestor:
>  
>    $ hg rebase -d 0 -s 2
> -  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg
>    $ hg tglog
>    @  7: 'D'
>    |
> @@ -286,25 +286,25 @@
>  Check rebasing mutable changeset
>  Source phase greater or equal to destination phase: new changeset get the phase of source:
>    $ hg rebase -s9 -d0
> -  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-backup.hg
>    $ hg log --template "{phase}\n" -r 9
>    draft
>    $ hg rebase -s9 -d1
> -  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-backup.hg
>    $ hg log --template "{phase}\n" -r 9
>    draft
>    $ hg phase --force --secret 9
>    $ hg rebase -s9 -d0
> -  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-backup.hg
>    $ hg log --template "{phase}\n" -r 9
>    secret
>    $ hg rebase -s9 -d1
> -  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-backup.hg
>    $ hg log --template "{phase}\n" -r 9
>    secret
>  Source phase lower than destination phase: new changeset get the phase of destination:
>    $ hg rebase -s8 -d9
> -  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-backup.hg
>    $ hg log --template "{phase}\n" -r 'rev(9)'
>    secret
>  
> @@ -512,7 +512,7 @@
>    $ hg clone -q -u . ah ah5
>    $ cd ah5
>    $ hg rebase -r '6::' -d 2
> -  saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-backup.hg
>    $ hg tglog
>    @  8: 'I'
>    |
> @@ -542,7 +542,7 @@
>    $ hg clone -q -u . ah ah6
>    $ cd ah6
>    $ hg rebase -r '(4+6)::' -d 1
> -  saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-backup.hg
>    $ hg tglog
>    @  8: 'I'
>    |
> @@ -609,7 +609,7 @@
>  (actual test)
>  
>    $ hg rebase --dest 'desc(G)' --rev 'desc(K) + desc(I)'
> -  saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-backup.hg
>    $ hg log --rev 'children(desc(G))'
>    changeset:   9:adb617877056
>    parent:      6:eea13746799a
> diff --git a/tests/test-relink.t b/tests/test-relink.t
> --- a/tests/test-relink.t
> +++ b/tests/test-relink.t
> @@ -41,7 +41,7 @@
>  don't sit forever trying to double-lock the source repo
>  
>    $ hg relink .
> -  relinking $TESTTMP/repo/.hg/store to $TESTTMP/repo/.hg/store (glob)
> +  relinking $TESTTMP/repo/.hg/store to $TESTTMP/repo/.hg/store
>    there is nothing to relink
>  
> 
> diff --git a/tests/test-revset-outgoing.t b/tests/test-revset-outgoing.t
> --- a/tests/test-revset-outgoing.t
> +++ b/tests/test-revset-outgoing.t
> @@ -40,7 +40,7 @@
>    $ cd b
>    $ cat .hg/hgrc
>    [paths]
> -  default = $TESTTMP/a#stable (glob)
> +  default = $TESTTMP/a#stable
>  
>    $ echo red >> a
>    $ hg ci -qm3
> @@ -61,7 +61,7 @@
>    
>  
>    $ hg tout
> -  comparing with $TESTTMP/a (glob)
> +  comparing with $TESTTMP/a
>    searching for changes
>    2:1d4099801a4e: '3' stable
>  
> @@ -80,11 +80,11 @@
>  
>    $ cat .hg/hgrc
>    [paths]
> -  default = $TESTTMP/a#stable (glob)
> +  default = $TESTTMP/a#stable
>    green = ../a#default
>  
>    $ hg tout green
> -  comparing with $TESTTMP/a (glob)
> +  comparing with $TESTTMP/a
>    searching for changes
>    3:f0461977a3db: '4' 
>  
> diff --git a/tests/test-share.t b/tests/test-share.t
> --- a/tests/test-share.t
> +++ b/tests/test-share.t
> @@ -27,14 +27,14 @@
>  Some sed versions appends newline, some don't, and some just fails
>  
>    $ cat .hg/sharedpath; echo
> -  $TESTTMP/repo1/.hg (glob)
> +  $TESTTMP/repo1/.hg
>  
>  trailing newline on .hg/sharedpath is ok
>    $ hg tip -q
>    0:d3873e73d99e
>    $ echo '' >> .hg/sharedpath
>    $ cat .hg/sharedpath
> -  $TESTTMP/repo1/.hg (glob)
> +  $TESTTMP/repo1/.hg
>    $ hg tip -q
>    0:d3873e73d99e
>  
> diff --git a/tests/test-ssh.t b/tests/test-ssh.t
> --- a/tests/test-ssh.t
> +++ b/tests/test-ssh.t
> @@ -308,7 +308,7 @@
>    73649e48688a
>  
>    $ hg id --ssh "sh ssh.sh" "ssh://user@dummy/a'repo"
> -  remote: Illegal repository "$TESTTMP/a'repo" (glob)
> +  remote: Illegal repository "$TESTTMP/a'repo"
>    abort: no suitable response from remote hg!
>    [255]
>  
> 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
> @@ -49,7 +49,7 @@
>    $ hg clone main cloned
>    updating to branch default
>    cloning subrepo sub1 from $TESTTMP/sub1
> -  cloning subrepo sub1/sub2 from $TESTTMP/sub2 (glob)
> +  cloning subrepo sub1/sub2 from $TESTTMP/sub2
>    3 files updated, 0 files merged, 0 files removed, 0 files unresolved
>  
>  Checking cloned repo ids
> diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t
> --- a/tests/test-subrepo-git.t
> +++ b/tests/test-subrepo-git.t
> @@ -135,7 +135,7 @@
>  user b push changes
>  
>    $ hg push 2>/dev/null
> -  pushing to $TESTTMP/t (glob)
> +  pushing to $TESTTMP/t
>    pushing branch testing of subrepo s
>    searching for changes
>    adding changesets
> @@ -147,7 +147,7 @@
>  
>    $ cd ../ta
>    $ hg pull
> -  pulling from $TESTTMP/t (glob)
> +  pulling from $TESTTMP/t
>    searching for changes
>    adding changesets
>    adding manifests
> @@ -175,7 +175,7 @@
>     source   ../gitroot
>     revision f47b465e1bce645dbf37232a00574aa1546ca8d3
>    $ hg push 2>/dev/null
> -  pushing to $TESTTMP/t (glob)
> +  pushing to $TESTTMP/t
>    pushing branch testing of subrepo s
>    searching for changes
>    adding changesets
> @@ -207,7 +207,7 @@
>    $ echo aa >> a
>    $ hg commit -m aa
>    $ hg push
> -  pushing to $TESTTMP/t (glob)
> +  pushing to $TESTTMP/t
>    searching for 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
> @@ -55,7 +55,7 @@
>    > .* = \1
>    > EOF
>    $ hg debugsub
> -  abort: bad subrepository pattern in $TESTTMP/outer/.hg/hgrc:2: invalid group reference (glob)
> +  abort: bad subrepository pattern in $TESTTMP/outer/.hg/hgrc:2: invalid group reference
>    [255]
>  
>    $ cd ..
> 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
> @@ -363,7 +363,7 @@
>    archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
>                                                                \r (no-eol) (esc)
>    cloning subrepo foo from $TESTTMP/repo/foo
> -  cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
> +  cloning subrepo foo/bar from $TESTTMP/repo/foo/bar
>  
>  The newly cloned subrepos contain no working copy:
>  
> @@ -386,7 +386,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 (in subrepo foo) (glob)
> +  abort: destination '$TESTTMP/almost-empty/foo' is not empty (in subrepo foo)
>    [255]
>  
>  Clone and test outgoing:
> @@ -395,11 +395,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 (glob)
> +  cloning subrepo foo/bar from $TESTTMP/repo/foo/bar
>    3 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    $ cd repo2
>    $ hg outgoing -S
> -  comparing with $TESTTMP/repo (glob)
> +  comparing with $TESTTMP/repo
>    searching for changes
>    no changes found
>    comparing with $TESTTMP/repo/foo
> @@ -425,7 +425,7 @@
>    $ hg commit --subrepos -m 3-4-2
>    committing subrepository foo
>    $ hg outgoing -S
> -  comparing with $TESTTMP/repo (glob)
> +  comparing with $TESTTMP/repo
>    searching for changes
>    changeset:   3:2655b8ecc4ee
>    tag:         tip
> @@ -455,7 +455,7 @@
>  Test incoming:
>  
>    $ hg incoming -S
> -  comparing with $TESTTMP/repo2 (glob)
> +  comparing with $TESTTMP/repo2
>    searching for changes
>    changeset:   3:2655b8ecc4ee
>    tag:         tip
> diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
> --- a/tests/test-subrepo.t
> +++ b/tests/test-subrepo.t
> @@ -270,7 +270,7 @@
>    $ hg clone t tc
>    updating to branch default
>    cloning subrepo s from $TESTTMP/t/s
> -  cloning subrepo s/ss from $TESTTMP/t/s/ss (glob)
> +  cloning subrepo s/ss from $TESTTMP/t/s/ss
>    cloning subrepo t from $TESTTMP/t/t
>    3 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    $ cd tc
> @@ -288,8 +288,8 @@
>    $ hg ci -m11
>    committing subrepository t
>    $ hg push
> -  pushing to $TESTTMP/t (glob)
> -  pushing subrepo s/ss to $TESTTMP/t/s/ss (glob)
> +  pushing to $TESTTMP/t
> +  pushing subrepo s/ss to $TESTTMP/t/s/ss
>    searching for changes
>    no changes found
>    pushing subrepo s to $TESTTMP/t/s
> @@ -313,8 +313,8 @@
>    $ hg ci -m12
>    committing subrepository s
>    $ hg push
> -  pushing to $TESTTMP/t (glob)
> -  pushing subrepo s/ss to $TESTTMP/t/s/ss (glob)
> +  pushing to $TESTTMP/t
> +  pushing subrepo s/ss to $TESTTMP/t/s/ss
>    searching for changes
>    no changes found
>    pushing subrepo s to $TESTTMP/t/s
> @@ -323,8 +323,8 @@
>    (did you forget to merge? use push -f to force)
>    [255]
>    $ hg push -f
> -  pushing to $TESTTMP/t (glob)
> -  pushing subrepo s/ss to $TESTTMP/t/s/ss (glob)
> +  pushing to $TESTTMP/t
> +  pushing subrepo s/ss to $TESTTMP/t/s/ss
>    searching for changes
>    no changes found
>    pushing subrepo s to $TESTTMP/t/s
> @@ -355,7 +355,7 @@
>  
>    $ cd ../tc
>    $ hg pull
> -  pulling from $TESTTMP/t (glob)
> +  pulling from $TESTTMP/t
>    searching for changes
>    adding changesets
>    adding manifests
> @@ -670,7 +670,7 @@
>  
>    $ hg -R issue1852a push `pwd`/issue1852c
>    pushing to $TESTTMP/issue1852c
> -  pushing subrepo sub/repo to $TESTTMP/issue1852c/sub/repo (glob)
> +  pushing subrepo sub/repo to $TESTTMP/issue1852c/sub/repo
>    searching for changes
>    no changes found
>    searching for changes
> @@ -1077,7 +1077,7 @@
>    > default=../issue3781-dest/
>    > EOF
>    $ hg push
> -  pushing to $TESTTMP/issue3781-dest (glob)
> +  pushing to $TESTTMP/issue3781-dest
>    pushing subrepo s to $TESTTMP/issue3781-dest/s
>    searching for changes
>    no changes found
> 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 = $TESTTMP/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
> @@ -181,10 +181,10 @@
>    f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon
>    f  mammals/skunk                   mammals/skunk
>    $ hg debugwalk ..
> -  abort: .. not under root '$TESTTMP/t' (glob)
> +  abort: .. not under root '$TESTTMP/t'
>    [255]
>    $ hg debugwalk beans/../..
> -  abort: beans/../.. not under root '$TESTTMP/t' (glob)
> +  abort: beans/../.. not under root '$TESTTMP/t'
>    [255]
>    $ hg debugwalk .hg
>    abort: path contains illegal component: .hg
> @@ -209,7 +209,7 @@
>    f  beans/pinto     beans/pinto
>    f  beans/turtle    beans/turtle
>    $ hg debugwalk `pwd`/..
> -  abort: $TESTTMP/t/.. not under root '$TESTTMP/t' (glob)
> +  abort: $TESTTMP/t/.. not under root '$TESTTMP/t'
>    [255]
>  
>  Test patterns:
> diff --git a/tests/test-win32text.t b/tests/test-win32text.t
> --- a/tests/test-win32text.t
> +++ b/tests/test-win32text.t
> @@ -385,7 +385,7 @@
>    WARNING: f4.bat already has CRLF line endings
>    and does not need EOL conversion by the win32text plugin.
>    Before your next commit, please reconsider your encode/decode settings in 
> -  Mercurial.ini or $TESTTMP/t/.hg/hgrc. (glob)
> +  Mercurial.ini or $TESTTMP/t/.hg/hgrc.
>    3 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    $ cat bin
>    hello\x00\r (esc)
Simon Heimberg - March 20, 2013, 4:11 p.m.
Sorry, I take back what I have written. I misread / and \. When a
backslash \ in the output is replaced by a slash, nothing will go wrong
of course.

There is one disadvantage. As you have written in [1] the advantage of
the current approach is that markup is necessary. So we have some
control where ui.slash is respected and where it is not.
What is the advantage of partially dropping this? Then we could also
generally match \ for / on windows.

Maybe we should start fixing ui.slash. Or do we want to drop it? What is
it useful for? This is not explained the introducing patch [2].

Greetings,
simohe

[1] mail of Mads Kiilerich about glob matching on \
http://www.selenic.com/pipermail/mercurial-devel/2012-October/045168.html
[2] rev introducing ui.slash
http://hg.intevation.org/mercurial/rev/b422b558015b


On 2012-03-09 18:41, 18:41 +0100 simohe@besonet.ch wrote:
> I'm all for this idea. Why did nobody think about this before?
> 
> But I see some problems:
> * lines containing several paths (test-largefiles.t #1863) [1]
> * lines containing file:$TESTTMP (test-hook.t #268) [2]
> * lines containing $TESTTMP in a http url (test-hgcia.t #88) [3]
> * ...
>   (sorry, I am not sure anymore if this really works...)
> 
<snip>
> 
> On Tuesday, 26.02.2013, 21:33 +0100 Mads Kiilerich wrote: 
> > # HG changeset patch
> > # User Mads Kiilerich <madski@unity3d.com>
> > # Date 1361907870 -3600
> > # Node ID 2c246fef46d1f70b088284dafa00b0911920949f
> > # Parent  0ade08dcb3c3d9a1418f38bf875d6c737750b19f
> > tests: convert \ to / on test output lines containing $TESTTMP
> > 
> > This reduces the need for adding '(glob)' on random lines in test output.
> > 
> > diff --git a/contrib/check-code.py b/contrib/check-code.py
> > --- a/contrib/check-code.py
> > +++ b/contrib/check-code.py
> > @@ -101,8 +101,6 @@
> >       "explicit exit code checks unnecessary"),
> >      (uprefix + r'set -e', "don't use set -e"),
> >      (uprefix + r'\s', "don't indent commands, use > for continued lines"),
> > -    (r'^  saved backup bundle to \$TESTTMP.*\.hg$',
> > -     "use (glob) to match Windows paths too"),
> >    ],
> >    # warnings
> >    [
> > diff --git a/tests/run-tests.py b/tests/run-tests.py
> > --- a/tests/run-tests.py
> > +++ b/tests/run-tests.py
> > @@ -570,6 +570,10 @@
> >      if el == l: # perfect match (fast)
> >          return True
> >      if el:
> > +        if os.name == 'nt' and '$TESTTMP' in l:
> > +            l = l.replace('\\', '/')
> > +            if el == l:
> > +                return True
> >          if el.endswith(" (esc)\n"):
> >              el = el[:-7].decode('string-escape') + '\n'
> >          if el == l or os.name == 'nt' and el[:-1] + '\r\n' == l:
> > diff --git a/tests/test-blackbox.t b/tests/test-blackbox.t
> > --- a/tests/test-blackbox.t
> > +++ b/tests/test-blackbox.t
> > @@ -48,7 +48,7 @@
> >    adding c
> >    $ cd ../blackboxtest2
> >    $ hg pull
> > -  pulling from $TESTTMP/blackboxtest (glob)
> > +  pulling from $TESTTMP/blackboxtest
> >    searching for changes
> >    adding changesets
> >    adding manifests
> > diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t
> > --- a/tests/test-bookmarks-pushpull.t
> > +++ b/tests/test-bookmarks-pushpull.t
> > @@ -139,7 +139,7 @@
> >     * foobar                    1:9b140be10808
> >  
> >    $ hg pull --config paths.foo=../a foo
> > -  pulling from $TESTTMP/a (glob)
> > +  pulling from $TESTTMP/a
> >    searching for changes
> >    adding changesets
> >    adding manifests
> > diff --git a/tests/test-clone.t b/tests/test-clone.t
> > --- a/tests/test-clone.t
> > +++ b/tests/test-clone.t
> > @@ -92,7 +92,7 @@
> >  
> >    $ hg clone -q -U --config 'paths.foobar=a#0' foobar f
> >    $ hg -R f showconfig paths.default
> > -  $TESTTMP/a#0 (glob)
> > +  $TESTTMP/a#0
> >  
> >  Use --pull:
> >  
> > diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t
> > --- a/tests/test-commit-amend.t
> > +++ b/tests/test-commit-amend.t
> > @@ -35,7 +35,7 @@
> >    $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -m 'amend base1'
> >    pretxncommit 43f1ba15f28a50abf0aae529cf8a16bfced7b149
> >    43f1ba15f28a tip
> > -  saved backup bundle to $TESTTMP/.hg/strip-backup/489edb5b847d-amend-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/.hg/strip-backup/489edb5b847d-amend-backup.hg
> >    $ echo 'pretxncommit.foo = ' >> $HGRCPATH
> >    $ hg diff -c .
> >    diff -r ad120869acf0 -r 43f1ba15f28a a
> > @@ -86,7 +86,7 @@
> >  
> >  Add new file:
> >    $ hg ci --amend -m 'amend base1 new file'
> > -  saved backup bundle to $TESTTMP/.hg/strip-backup/43f1ba15f28a-amend-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/.hg/strip-backup/43f1ba15f28a-amend-backup.hg
> >  
> >  Remove file that was added in amended commit:
> >  (and test logfile option)
> > @@ -95,7 +95,7 @@
> >    $ hg rm b
> >    $ echo 'amend base1 remove new file' > ../logfile
> >    $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg ci --amend --logfile ../logfile
> > -  saved backup bundle to $TESTTMP/.hg/strip-backup/b8e3cb2b3882-amend-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/.hg/strip-backup/b8e3cb2b3882-amend-backup.hg
> >  
> >    $ hg cat b
> >    b: no such file in rev 74609c7f506e
> > @@ -109,7 +109,7 @@
> >    a
> >    stripping amended changeset 74609c7f506e
> >    1 changesets found
> > -  saved backup bundle to $TESTTMP/.hg/strip-backup/74609c7f506e-amend-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/.hg/strip-backup/74609c7f506e-amend-backup.hg
> >    1 changesets found
> >    adding branch
> >    adding changesets
> > @@ -146,10 +146,10 @@
> >  Test -u/-d:
> >  
> >    $ hg ci --amend -u foo -d '1 0'
> > -  saved backup bundle to $TESTTMP/.hg/strip-backup/1cd866679df8-amend-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/.hg/strip-backup/1cd866679df8-amend-backup.hg
> >    $ echo a >> a
> >    $ hg ci --amend -u foo -d '1 0'
> > -  saved backup bundle to $TESTTMP/.hg/strip-backup/780e6f23e03d-amend-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/.hg/strip-backup/780e6f23e03d-amend-backup.hg
> >    $ hg log -r .
> >    changeset:   1:5f357c7560ab
> >    tag:         tip
> > @@ -180,7 +180,7 @@
> >    a
> >    stripping amended changeset 5f357c7560ab
> >    1 changesets found
> > -  saved backup bundle to $TESTTMP/.hg/strip-backup/5f357c7560ab-amend-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/.hg/strip-backup/5f357c7560ab-amend-backup.hg
> >    1 changesets found
> >    adding branch
> >    adding changesets
> > @@ -209,7 +209,7 @@
> >    stripping intermediate changeset a0ea9b1a4c8c
> >    stripping amended changeset 7ab3bf440b54
> >    2 changesets found
> > -  saved backup bundle to $TESTTMP/.hg/strip-backup/7ab3bf440b54-amend-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/.hg/strip-backup/7ab3bf440b54-amend-backup.hg
> >    1 changesets found
> >    adding branch
> >    adding changesets
> > @@ -232,13 +232,13 @@
> >    $ hg book book1
> >    $ hg book book2
> >    $ hg ci --amend -m 'move bookmarks'
> > -  saved backup bundle to $TESTTMP/.hg/strip-backup/ea22a388757c-amend-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/.hg/strip-backup/ea22a388757c-amend-backup.hg
> >    $ hg book
> >       book1                     1:6cec5aa930e2
> >     * book2                     1:6cec5aa930e2
> >    $ echo a >> a
> >    $ hg ci --amend -m 'move bookmarks'
> > -  saved backup bundle to $TESTTMP/.hg/strip-backup/6cec5aa930e2-amend-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/.hg/strip-backup/6cec5aa930e2-amend-backup.hg
> >    $ hg book
> >       book1                     1:48bb6e53a15f
> >     * book2                     1:48bb6e53a15f
> > @@ -275,7 +275,7 @@
> >    marked working directory as branch default
> >    (branches are permanent and global, did you want a bookmark?)
> >    $ hg ci --amend -m 'back to default'
> > -  saved backup bundle to $TESTTMP/.hg/strip-backup/8ac881fbf49d-amend-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/.hg/strip-backup/8ac881fbf49d-amend-backup.hg
> >    $ hg branches
> >    default                        2:ce12b0b57d46
> >  
> > @@ -291,7 +291,7 @@
> >    $ echo b >> b
> >    $ hg ci -mb
> >    $ hg ci --amend --close-branch -m 'closing branch foo'
> > -  saved backup bundle to $TESTTMP/.hg/strip-backup/c962248fa264-amend-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/.hg/strip-backup/c962248fa264-amend-backup.hg
> >  
> >  Same thing, different code path:
> >  
> > @@ -300,7 +300,7 @@
> >    reopening closed branch head 4
> >    $ echo b >> b
> >    $ hg ci --amend --close-branch
> > -  saved backup bundle to $TESTTMP/.hg/strip-backup/027371728205-amend-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/.hg/strip-backup/027371728205-amend-backup.hg
> >    $ hg branches
> >    default                        2:ce12b0b57d46
> >  
> > @@ -324,7 +324,7 @@
> >    $ hg ci -m 'b -> c'
> >    $ hg mv c d
> >    $ hg ci --amend -m 'b -> d'
> > -  saved backup bundle to $TESTTMP/.hg/strip-backup/b8c6eac7f12e-amend-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/.hg/strip-backup/b8c6eac7f12e-amend-backup.hg
> >    $ hg st --rev '.^' --copies d
> >    A d
> >      b
> > @@ -332,7 +332,7 @@
> >    $ hg ci -m 'e = d'
> >    $ hg cp e f
> >    $ hg ci --amend -m 'f = d'
> > -  saved backup bundle to $TESTTMP/.hg/strip-backup/7f9761d65613-amend-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/.hg/strip-backup/7f9761d65613-amend-backup.hg
> >    $ hg st --rev '.^' --copies f
> >    A f
> >      d
> > @@ -343,7 +343,7 @@
> >    $ hg cp a f
> >    $ mv f.orig f
> >    $ hg ci --amend -m replacef
> > -  saved backup bundle to $TESTTMP/.hg/strip-backup/9e8c5f7e3d95-amend-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/.hg/strip-backup/9e8c5f7e3d95-amend-backup.hg
> >    $ hg st --change . --copies
> >    $ hg log -r . --template "{file_copies}\n"
> >    
> > @@ -355,7 +355,7 @@
> >    adding g
> >    $ hg mv g h
> >    $ hg ci --amend
> > -  saved backup bundle to $TESTTMP/.hg/strip-backup/24aa8eacce2b-amend-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/.hg/strip-backup/24aa8eacce2b-amend-backup.hg
> >    $ hg st --change . --copies h
> >    A h
> >    $ hg log -r . --template "{file_copies}\n"
> > @@ -375,11 +375,11 @@
> >    $ echo a >> a
> >    $ hg ci -ma
> >    $ hg ci --amend -m "a'"
> > -  saved backup bundle to $TESTTMP/.hg/strip-backup/3837aa2a2fdb-amend-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/.hg/strip-backup/3837aa2a2fdb-amend-backup.hg
> >    $ hg log -r . --template "{branch}\n"
> >    a
> >    $ hg ci --amend -m "a''"
> > -  saved backup bundle to $TESTTMP/.hg/strip-backup/c05c06be7514-amend-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/.hg/strip-backup/c05c06be7514-amend-backup.hg
> >    $ hg log -r . --template "{branch}\n"
> >    a
> >  
> > @@ -396,7 +396,7 @@
> >    $ hg graft 12
> >    grafting revision 12
> >    $ hg ci --amend -m 'graft amend'
> > -  saved backup bundle to $TESTTMP/.hg/strip-backup/bd010aea3f39-amend-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/.hg/strip-backup/bd010aea3f39-amend-backup.hg
> >    $ hg log -r . --debug | grep extra
> >    extra:       amend_source=bd010aea3f39f3fb2a2f884b9ccb0471cd77398e
> >    extra:       branch=a
> > diff --git a/tests/test-contrib.t b/tests/test-contrib.t
> > --- a/tests/test-contrib.t
> > +++ b/tests/test-contrib.t
> > @@ -109,7 +109,7 @@
> >  Test shrink-revlog:
> >    $ cd repo-a
> >    $ hg --config extensions.shrink="$CONTRIBDIR/shrink-revlog.py" shrink
> > -  shrinking $TESTTMP/repo-a/.hg/store/00manifest.i (glob)
> > +  shrinking $TESTTMP/repo-a/.hg/store/00manifest.i
> >    reading revs
> >    sorting revs
> >    writing revs
> > @@ -117,8 +117,8 @@
> >    new file size:          324 bytes (   0.0 MiB)
> >    shrinkage: 0.0% (1.0x)
> >    note: old revlog saved in:
> > -    $TESTTMP/repo-a/.hg/store/00manifest.i.old (glob)
> > -    $TESTTMP/repo-a/.hg/store/00manifest.d.old (glob)
> > +    $TESTTMP/repo-a/.hg/store/00manifest.i.old
> > +    $TESTTMP/repo-a/.hg/store/00manifest.d.old
> >    (You can delete those files when you are satisfied that your
> >    repository is still sane.  Running 'hg verify' is strongly recommended.)
> >    $ hg verify
> > diff --git a/tests/test-convert-authormap.t b/tests/test-convert-authormap.t
> > --- a/tests/test-convert-authormap.t
> > +++ b/tests/test-convert-authormap.t
> > @@ -27,7 +27,7 @@
> >    sorting...
> >    converting...
> >    0 foo
> > -  writing author map file $TESTTMP/new/.hg/authormap (glob)
> > +  writing author map file $TESTTMP/new/.hg/authormap
> >    $ cat new/.hg/authormap
> >    user name=Long User Name
> >    $ hg -Rnew log
> > @@ -44,7 +44,7 @@
> >    $ hg init new
> >    $ mv authormap.txt new/.hg/authormap
> >    $ hg convert orig new
> > -  ignoring bad line in author map file $TESTTMP/new/.hg/authormap: this line is ignored (glob)
> > +  ignoring bad line in author map file $TESTTMP/new/.hg/authormap: this line is ignored
> >    scanning source...
> >    sorting...
> >    converting...
> > diff --git a/tests/test-convert-filemap.t b/tests/test-convert-filemap.t
> > --- a/tests/test-convert-filemap.t
> > +++ b/tests/test-convert-filemap.t
> > @@ -568,7 +568,7 @@
> >    $ cd namedbranch
> >    $ hg --config extensions.mq= strip tip
> >    1 files updated, 0 files merged, 0 files removed, 0 files unresolved
> > -  saved backup bundle to $TESTTMP/namedbranch/.hg/strip-backup/73899bcbe45c-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/namedbranch/.hg/strip-backup/73899bcbe45c-backup.hg
> >    $ hg up foo
> >    2 files updated, 0 files merged, 0 files removed, 0 files unresolved
> >    $ hg merge default
> > 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 $TESTTMP/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 $TESTTMP/c (glob)
> > +  pushing to $TESTTMP/c
> >    searching for changes
> >    adding changesets
> >    adding manifests
> > diff --git a/tests/test-extension.t b/tests/test-extension.t
> > --- a/tests/test-extension.t
> > +++ b/tests/test-extension.t
> > @@ -475,9 +475,9 @@
> >    > cmdtable = None
> >    > EOF
> >    $ hg --config extensions.path=./path.py help foo > /dev/null
> > -  warning: error finding commands in $TESTTMP/hgext/forest.py (glob)
> > +  warning: error finding commands in $TESTTMP/hgext/forest.py
> >    hg: unknown command 'foo'
> > -  warning: error finding commands in $TESTTMP/hgext/forest.py (glob)
> > +  warning: error finding commands in $TESTTMP/hgext/forest.py
> >    [255]
> >  
> >    $ cat > throw.py <<EOF
> > diff --git a/tests/test-globalopts.t b/tests/test-globalopts.t
> > --- a/tests/test-globalopts.t
> > +++ b/tests/test-globalopts.t
> > @@ -87,7 +87,7 @@
> >    abort: no repository found in '$TESTTMP' (.hg not found)!
> >    [255]
> >    $ hg -R b ann a/a
> > -  abort: a/a not under root '$TESTTMP/b' (glob)
> > +  abort: a/a not under root '$TESTTMP/b'
> >    [255]
> >    $ hg log
> >    abort: no repository found in '$TESTTMP' (.hg not found)!
> > diff --git a/tests/test-hardlinks.t b/tests/test-hardlinks.t
> > --- a/tests/test-hardlinks.t
> > +++ b/tests/test-hardlinks.t
> > @@ -138,7 +138,7 @@
> >  
> >    $ cd r3
> >    $ hg push
> > -  pushing to $TESTTMP/r1 (glob)
> > +  pushing to $TESTTMP/r1
> >    searching for changes
> >    adding changesets
> >    adding manifests
> > 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: $TESTTMP/.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
> > -  $TESTTMP/.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
> > @@ -29,12 +29,12 @@
> >    $ cd foobar
> >    $ cat .hg/hgrc
> >    [paths]
> > -  default = $TESTTMP/foo%bar (glob)
> > +  default = $TESTTMP/foo%bar
> >    $ hg paths
> > -  default = $TESTTMP/foo%bar (glob)
> > +  default = $TESTTMP/foo%bar
> >    $ hg showconfig
> > -  bundle.mainreporoot=$TESTTMP/foobar (glob)
> > -  paths.default=$TESTTMP/foo%bar (glob)
> > +  bundle.mainreporoot=$TESTTMP/foobar
> > +  paths.default=$TESTTMP/foo%bar
> >    $ cd ..
> >  
> >  issue1829: wrong indentation
> > diff --git a/tests/test-histedit-bookmark-motion.t b/tests/test-histedit-bookmark-motion.t
> > --- a/tests/test-histedit-bookmark-motion.t
> > +++ b/tests/test-histedit-bookmark-motion.t
> > @@ -90,8 +90,8 @@
> >    histedit: moving bookmarks three from 055a42cdd887 to 59d9f330561f
> >    histedit: moving bookmarks two from 177f92b77385 to b346ab9a313d
> >    histedit: moving bookmarks will-move-backwards from d2ae7f538514 to cb9a9f314b8b
> > -  saved backup bundle to $TESTTMP/r/.hg/strip-backup/d2ae7f538514-backup.hg (glob)
> > -  saved backup bundle to $TESTTMP/r/.hg/strip-backup/96e494a2d553-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/r/.hg/strip-backup/d2ae7f538514-backup.hg
> > +  saved backup bundle to $TESTTMP/r/.hg/strip-backup/96e494a2d553-backup.hg
> >    $ hg log --graph
> >    @  changeset:   3:cacdfd884a93
> >    |  bookmark:    five
> > @@ -144,7 +144,7 @@
> >    histedit: moving bookmarks five from cacdfd884a93 to c04e50810e4b
> >    histedit: moving bookmarks four from 59d9f330561f to c04e50810e4b
> >    histedit: moving bookmarks three from 59d9f330561f to c04e50810e4b
> > -  saved backup bundle to $TESTTMP/r/.hg/strip-backup/59d9f330561f-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/r/.hg/strip-backup/59d9f330561f-backup.hg
> >  
> >  We expect 'five' to stay at tip, since the tipmost bookmark is most
> >  likely the useful signal.
> > diff --git a/tests/test-histedit-edit.t b/tests/test-histedit-edit.t
> > --- a/tests/test-histedit-edit.t
> > +++ b/tests/test-histedit-edit.t
> > @@ -157,7 +157,7 @@
> >    A f
> >    $ HGEDITOR='true' hg histedit --continue
> >    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> > -  saved backup bundle to $TESTTMP/r/.hg/strip-backup/b5f70786f9b0-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/r/.hg/strip-backup/b5f70786f9b0-backup.hg
> >  
> >    $ hg status
> >  
> > diff --git a/tests/test-histedit-fold.t b/tests/test-histedit-fold.t
> > --- a/tests/test-histedit-fold.t
> > +++ b/tests/test-histedit-fold.t
> > @@ -278,7 +278,7 @@
> >    HG: changed file
> >    1 files updated, 0 files merged, 0 files removed, 0 files unresolved
> >    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> > -  saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-backup.hg
> >    $ hg log -G
> >    @  changeset:   1:10c647b2cdd5
> >    |  tag:         tip
> > diff --git a/tests/test-histedit-obsolete.t b/tests/test-histedit-obsolete.t
> > --- a/tests/test-histedit-obsolete.t
> > +++ b/tests/test-histedit-obsolete.t
> > @@ -67,7 +67,7 @@
> >    > pick 652413bf663e 5 f
> >    > EOF
> >    $ hg histedit 1 --commands commands.txt --verbose | grep histedit
> > -  saved backup bundle to $TESTTMP/base/.hg/strip-backup/96e494a2d553-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/base/.hg/strip-backup/96e494a2d553-backup.hg
> >    $ hg log --graph --hidden
> >    @  8:cacdfd884a93 f
> >    |
> > @@ -437,9 +437,9 @@
> >    0 files updated, 0 files merged, 2 files removed, 0 files unresolved
> >    2 files updated, 0 files merged, 0 files removed, 0 files unresolved
> >    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> > -  saved backup bundle to $TESTTMP/folding/.hg/strip-backup/58019c66f35f-backup.hg (glob)
> > -  saved backup bundle to $TESTTMP/folding/.hg/strip-backup/83d1858e070b-backup.hg (glob)
> > -  saved backup bundle to $TESTTMP/folding/.hg/strip-backup/859969f5ed7e-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/folding/.hg/strip-backup/58019c66f35f-backup.hg
> > +  saved backup bundle to $TESTTMP/folding/.hg/strip-backup/83d1858e070b-backup.hg
> > +  saved backup bundle to $TESTTMP/folding/.hg/strip-backup/859969f5ed7e-backup.hg
> >    $ hg log -G
> >    @  19:f9daec13fb98 (secret) i
> >    |
> > diff --git a/tests/test-hook.t b/tests/test-hook.t
> > --- a/tests/test-hook.t
> > +++ b/tests/test-hook.t
> > @@ -630,7 +630,7 @@
> >    $ echo aa >> from/a
> >    $ hg --cwd from ci -mb
> >    $ hg --cwd from push
> > -  pushing to $TESTTMP/to (glob)
> > +  pushing to $TESTTMP/to
> >    searching for changes
> >    adding changesets
> >    adding manifests
> > diff --git a/tests/test-issue1502.t b/tests/test-issue1502.t
> > --- a/tests/test-issue1502.t
> > +++ b/tests/test-issue1502.t
> > @@ -13,7 +13,7 @@
> >    $ echo "bar" > foo1/a && hg -R foo1 commit -m "edit a in foo1"
> >    $ echo "hi" > foo/a && hg -R foo commit -m "edited a foo"
> >    $ hg -R foo1 pull -u
> > -  pulling from $TESTTMP/foo (glob)
> > +  pulling from $TESTTMP/foo
> >    searching for changes
> >    adding changesets
> >    adding manifests
> > @@ -29,7 +29,7 @@
> >  
> >    $ echo "there" >> foo/a && hg -R foo commit -m "edited a again"
> >    $ hg -R foo1 pull
> > -  pulling from $TESTTMP/foo (glob)
> > +  pulling from $TESTTMP/foo
> >    searching for changes
> >    adding changesets
> >    adding manifests
> > diff --git a/tests/test-keyword.t b/tests/test-keyword.t
> > --- a/tests/test-keyword.t
> > +++ b/tests/test-keyword.t
> > @@ -229,7 +229,7 @@
> >    Message-Id: <hg.a2392c293916*> (glob)
> >    To: Test
> >    
> > -  changeset a2392c293916 in $TESTTMP/Test (glob)
> > +  changeset a2392c293916 in $TESTTMP/Test
> >    details: $TESTTMP/Test?cmd=changeset;node=a2392c293916
> >    description:
> >    	addsym
> > @@ -252,7 +252,7 @@
> >    Message-Id: <hg.ef63ca68695b*> (glob)
> >    To: Test
> >    
> > -  changeset ef63ca68695b in $TESTTMP/Test (glob)
> > +  changeset ef63ca68695b in $TESTTMP/Test
> >    details: $TESTTMP/Test?cmd=changeset;node=ef63ca68695b
> >    description:
> >    	absym
> > @@ -863,7 +863,7 @@
> >    > default = ../Test
> >    > EOF
> >    $ hg incoming
> > -  comparing with $TESTTMP/Test (glob)
> > +  comparing with $TESTTMP/Test
> >    searching for changes
> >    changeset:   2:bb948857c743
> >    tag:         tip
> > diff --git a/tests/test-largefiles-cache.t b/tests/test-largefiles-cache.t
> > --- a/tests/test-largefiles-cache.t
> > +++ b/tests/test-largefiles-cache.t
> > @@ -44,7 +44,7 @@
> >  
> >    $ hg update
> >    getting changed largefiles
> > -  error getting id 7f7097b041ccf68cc5561e9600da4655d21c6d18 from url file:$TESTTMP/mirror for file large: can't get file locally (glob)
> > +  error getting id 7f7097b041ccf68cc5561e9600da4655d21c6d18 from url file:$TESTTMP/mirror for file large: can't get file locally
> >    0 largefiles updated, 0 removed
> >    1 files updated, 0 files merged, 0 files removed, 0 files unresolved
> >    $ hg status
> > @@ -61,7 +61,7 @@
> >  
> >    $ hg update
> >    getting changed largefiles
> > -  error getting id 7f7097b041ccf68cc5561e9600da4655d21c6d18 from url file:$TESTTMP/mirror for file large: can't get file locally (glob)
> > +  error getting id 7f7097b041ccf68cc5561e9600da4655d21c6d18 from url file:$TESTTMP/mirror for file large: can't get file locally
> >    0 largefiles updated, 0 removed
> >    1 files updated, 0 files merged, 0 files removed, 0 files unresolved
> >    $ hg status
> > diff --git a/tests/test-largefiles.t b/tests/test-largefiles.t
> > --- a/tests/test-largefiles.t
> > +++ b/tests/test-largefiles.t
> > @@ -670,7 +670,7 @@
> >  
> >  Test that outgoing --large works (with revsets too)
> >    $ hg outgoing --rev '.^' --large
> > -  comparing with $TESTTMP/a (glob)
> > +  comparing with $TESTTMP/a
> >    searching for changes
> >    changeset:   8:c02fd3b77ec4
> >    user:        test
> > @@ -876,7 +876,7 @@
> >    $ rm "${USERCACHE}"/*
> >    $ cd a-backup
> >    $ hg pull --all-largefiles --config paths.default-push=bogus/path
> > -  pulling from $TESTTMP/a (glob)
> > +  pulling from $TESTTMP/a
> >    searching for changes
> >    adding changesets
> >    adding manifests
> > @@ -920,7 +920,7 @@
> >  'default' instead of 'default-push' when no source is specified (issue3584).
> >  The error messages go away if repo 'b' is created with --all-largefiles.
> >    $ hg pull --rebase --all-largefiles --config paths.default-push=bogus/path --config paths.default=../b
> > -  pulling from $TESTTMP/b (glob)
> > +  pulling from $TESTTMP/b
> >    searching for changes
> >    adding changesets
> >    adding manifests
> > @@ -929,16 +929,16 @@
> >    Invoking status precommit hook
> >    M sub/normal4
> >    M sub2/large6
> > -  saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
> > -  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file large3: can't get file locally (glob)
> > -  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large4: can't get file locally (glob)
> > -  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file large1: can't get file locally (glob)
> > -  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large2: can't get file locally (glob)
> > -  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large2: can't get file locally (glob)
> > -  error getting id 5f78770c0e77ba4287ad6ef3071c9bf9c379742f from url file:$TESTTMP/b for file large1: can't get file locally (glob)
> > -  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large2: can't get file locally (glob)
> > -  error getting id 4669e532d5b2c093a78eca010077e708a071bb64 from url file:$TESTTMP/b for file large1: can't get file locally (glob)
> > -  error getting id 1deebade43c8c498a3c8daddac0244dc55d1331d from url file:$TESTTMP/b for file sub/large2: can't get file locally (glob)
> > +  saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg
> > +  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file large3: can't get file locally
> > +  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large4: can't get file locally
> > +  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file large1: can't get file locally
> > +  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large2: can't get file locally
> > +  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large2: can't get file locally
> > +  error getting id 5f78770c0e77ba4287ad6ef3071c9bf9c379742f from url file:$TESTTMP/b for file large1: can't get file locally
> > +  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large2: can't get file locally
> > +  error getting id 4669e532d5b2c093a78eca010077e708a071bb64 from url file:$TESTTMP/b for file large1: can't get file locally
> > +  error getting id 1deebade43c8c498a3c8daddac0244dc55d1331d from url file:$TESTTMP/b for file sub/large2: can't get file locally
> >    0 additional largefiles cached
> >    9 largefiles failed to download
> >    nothing to rebase
> > @@ -976,7 +976,7 @@
> >    Invoking status precommit hook
> >    M sub/normal4
> >    M sub2/large6
> > -  saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg
> >    $ hg log --template '{rev}:{node|short}  {desc|firstline}\n'
> >    9:598410d3eb9a  modify normal file largefile in repo d
> >    8:a381d2c8c80e  modify normal file and largefile in repo b
> > @@ -1186,7 +1186,7 @@
> >    $ pwd
> >    $TESTTMP/e
> >    $ hg paths
> > -  default = $TESTTMP/d (glob)
> > +  default = $TESTTMP/d
> >  
> >    $ hg verify --large
> >    checking changesets
> > @@ -1206,14 +1206,14 @@
> >    checking files
> >    10 files, 10 changesets, 28 total revisions
> >    searching 1 changesets for largefiles
> > -  changeset 9:598410d3eb9a: sub/large4 references missing $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 (glob)
> > +  changeset 9:598410d3eb9a: sub/large4 references missing $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928
> >    verified existence of 3 revisions of 3 largefiles
> >    [1]
> >  
> >  - introduce corruption and make sure that it is caught when checking content:
> >    $ echo '5 cents' > $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928
> >    $ hg verify -q --large --lfc
> > -  changeset 9:598410d3eb9a: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 (glob)
> > +  changeset 9:598410d3eb9a: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928
> >    [1]
> >  
> >  - cleanup
> > @@ -1222,13 +1222,13 @@
> >  - verifying all revisions will fail because we didn't clone all largefiles to d:
> >    $ echo 'T-shirt' > $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
> >    $ hg verify -q --lfa --lfc
> > -  changeset 0:30d30fe6a5be: large1 references missing $TESTTMP/d/.hg/largefiles/4669e532d5b2c093a78eca010077e708a071bb64 (glob)
> > -  changeset 0:30d30fe6a5be: sub/large2 references missing $TESTTMP/d/.hg/largefiles/1deebade43c8c498a3c8daddac0244dc55d1331d (glob)
> > -  changeset 1:ce8896473775: large1 references missing $TESTTMP/d/.hg/largefiles/5f78770c0e77ba4287ad6ef3071c9bf9c379742f (glob)
> > -  changeset 1:ce8896473775: sub/large2 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
> > -  changeset 3:9e8fbc4bce62: large1 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
> > -  changeset 4:74c02385b94c: large3 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
> > -  changeset 4:74c02385b94c: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
> > +  changeset 0:30d30fe6a5be: large1 references missing $TESTTMP/d/.hg/largefiles/4669e532d5b2c093a78eca010077e708a071bb64
> > +  changeset 0:30d30fe6a5be: sub/large2 references missing $TESTTMP/d/.hg/largefiles/1deebade43c8c498a3c8daddac0244dc55d1331d
> > +  changeset 1:ce8896473775: large1 references missing $TESTTMP/d/.hg/largefiles/5f78770c0e77ba4287ad6ef3071c9bf9c379742f
> > +  changeset 1:ce8896473775: sub/large2 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
> > +  changeset 3:9e8fbc4bce62: large1 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
> > +  changeset 4:74c02385b94c: large3 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
> > +  changeset 4:74c02385b94c: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
> >    [1]
> >  
> >  - cleanup
> > @@ -1574,7 +1574,7 @@
> >    pushing to http://localhost:$HGPORT1/
> >    searching for changes
> >    remote: largefiles: failed to put 4cdac4d8b084d0b599525cf732437fb337d422a8 into store: largefile contents do not match hash
> > -  abort: remotestore: could not put $TESTTMP/r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 to remote store http://localhost:$HGPORT1/ (glob)
> > +  abort: remotestore: could not put $TESTTMP/r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 to remote store http://localhost:$HGPORT1/
> >    [255]
> >    $ mv 4cdac4d8b084d0b599525cf732437fb337d422a8 r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8
> >  Push of file that exists on server but is corrupted - magic healing would be nice ... but too magic
> > @@ -2036,7 +2036,7 @@
> >  
> >    $ hg -q clone src clone2
> >    $ hg -R clone2 paths | grep default
> > -  default = $TESTTMP/issue3651/src (glob)
> > +  default = $TESTTMP/issue3651/src
> >  
> >    $ hg -R clone2 summary --large
> >    parent: 0:fc0bd45326d3 tip
> > @@ -2047,7 +2047,7 @@
> >    searching for changes
> >    largefiles: (no files to upload)
> >    $ hg -R clone2 outgoing --large
> > -  comparing with $TESTTMP/issue3651/src (glob)
> > +  comparing with $TESTTMP/issue3651/src
> >    searching for changes
> >    no changes found
> >    searching for changes
> > @@ -2070,7 +2070,7 @@
> >    searching for changes
> >    largefiles: 1 to upload
> >    $ hg -R clone2 outgoing --large
> > -  comparing with $TESTTMP/issue3651/src (glob)
> > +  comparing with $TESTTMP/issue3651/src
> >    searching for changes
> >    changeset:   1:1acbe71ce432
> >    tag:         tip
> > diff --git a/tests/test-lfconvert.t b/tests/test-lfconvert.t
> > --- a/tests/test-lfconvert.t
> > +++ b/tests/test-lfconvert.t
> > @@ -125,7 +125,7 @@
> >    $ hg commit -q -m"remove large, normal3"
> >    $ hg merge
> >    merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat
> > -  warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file. (glob)
> > +  warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file.
> >    merging stuff/maybelarge.dat incomplete! (edit conflicts, then use 'hg resolve --mark')
> >    merging sub/normal2 and stuff/normal2 to stuff/normal2
> >    0 files updated, 1 files merged, 0 files removed, 1 files unresolved
> > @@ -212,7 +212,7 @@
> >    $ hg share -q -U bigfile-repo shared
> >    $ printf 'bogus' > shared/.hg/sharedpath
> >    $ hg lfconvert shared foo
> > -  abort: .hg/sharedpath points to nonexistent directory $TESTTMP/bogus! (glob)
> > +  abort: .hg/sharedpath points to nonexistent directory $TESTTMP/bogus!
> >    [255]
> >    $ hg lfconvert bigfile-repo largefiles-repo
> >    initializing destination largefiles-repo
> > @@ -317,12 +317,12 @@
> >    checking files
> >    8 files, 7 changesets, 12 total revisions
> >    searching 7 changesets for largefiles
> > -  changeset 0:d4892ec57ce2: large references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/2e000fa7e85759c7f4c254d4d9c33ef481e459a7 (glob)
> > -  changeset 1:334e5237836d: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c (glob)
> > -  changeset 2:261ad3f3f037: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c (glob)
> > -  changeset 3:55759520c76f: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38 (glob)
> > -  changeset 5:9cc5aa7204f0: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38 (glob)
> > -  changeset 6:17126745edfd: anotherlarge references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3 (glob)
> > +  changeset 0:d4892ec57ce2: large references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/2e000fa7e85759c7f4c254d4d9c33ef481e459a7
> > +  changeset 1:334e5237836d: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c
> > +  changeset 2:261ad3f3f037: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c
> > +  changeset 3:55759520c76f: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38
> > +  changeset 5:9cc5aa7204f0: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38
> > +  changeset 6:17126745edfd: anotherlarge references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3
> >    verified existence of 6 revisions of 4 largefiles
> >    [1]
> >    $ hg -R largefiles-repo-hg showconfig paths
> > @@ -343,7 +343,7 @@
> >    $ rm largefiles-repo/.hg/largefiles/*
> >    $ hg lfconvert --to-normal issue3519 normalized3519
> >    initializing destination normalized3519
> > -  error getting id 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 from url file:$TESTTMP/largefiles-repo for file large: can't get file locally (glob)
> > +  error getting id 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 from url file:$TESTTMP/largefiles-repo for file large: can't get file locally
> >    abort: missing largefile 'large' from revision d4892ec57ce212905215fad1d9018f56b99202ad
> >    [255]
> >  
> > 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
> > @@ -56,7 +56,7 @@
> >  Save the patch queue so we can merge it later:
> >  
> >    $ hg qsave -c -e
> > -  copy $TESTTMP/t/.hg/patches to $TESTTMP/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:
> > @@ -76,7 +76,7 @@
> >    b
> >  
> >    $ hg qpush -a -m
> > -  merging with queue at: $TESTTMP/t/.hg/patches.1 (glob)
> > +  merging with queue at: $TESTTMP/t/.hg/patches.1
> >    applying rm_a
> >    now at: rm_a
> >  
> > @@ -115,14 +115,14 @@
> >  Create the reference queue:
> >  
> >    $ hg qsave -c -e -n refqueue
> > -  copy $TESTTMP/t2/.hg/patches to $TESTTMP/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: $TESTTMP/t2/.hg/refqueue (glob)
> > +  merging with queue at: $TESTTMP/t2/.hg/refqueue
> >    applying patcha
> >    patching file a
> >    Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines).
> > 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
> > @@ -69,7 +69,7 @@
> >    abort: popping would remove a revision not managed by this patch queue
> >    [255]
> >    $ hg qpop -n patches
> > -  using patch queue: $TESTTMP/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.t b/tests/test-mq.t
> > --- a/tests/test-mq.t
> > +++ b/tests/test-mq.t
> > @@ -151,7 +151,7 @@
> >    guards
> >    $ cat .hg/patches/series
> >    $ hg qinit -c
> > -  abort: repository $TESTTMP/d/.hg/patches already exists! (glob)
> > +  abort: repository $TESTTMP/d/.hg/patches already exists!
> >    [255]
> >    $ cd ..
> >  
> > 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,11 +56,11 @@
> >    Message-Id: <*> (glob)
> >    To: baz, foo@bar
> >    
> > -  changeset cb9a9f314b8b in $TESTTMP/a (glob)
> > +  changeset cb9a9f314b8b in $TESTTMP/a
> >    details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b
> >    summary: a
> >    
> > -  changeset ba677d0156c1 in $TESTTMP/a (glob)
> > +  changeset ba677d0156c1 in $TESTTMP/a
> >    details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1
> >    summary: b
> >    
> > @@ -107,11 +107,11 @@
> >    Message-Id: <*> (glob)
> >    To: baz, foo@bar
> >    
> > -  changeset cb9a9f314b8b in $TESTTMP/a (glob)
> > +  changeset cb9a9f314b8b in $TESTTMP/a
> >    details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b
> >    summary: a
> >    
> > -  changeset ba677d0156c1 in $TESTTMP/a (glob)
> > +  changeset ba677d0156c1 in $TESTTMP/a
> >    details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1
> >    summary: b
> >    
> > @@ -184,19 +184,19 @@
> >    Message-Id: <*> (glob)
> >    To: baz, foo@bar
> >    
> > -  changeset 84e487dddc58 in $TESTTMP/a (glob)
> > +  changeset 84e487dddc58 in $TESTTMP/a
> >    details: $TESTTMP/a?cmd=changeset;node=84e487dddc58
> >    summary: newfile
> >    
> > -  changeset b29c7a2b6b0c in $TESTTMP/a (glob)
> > +  changeset b29c7a2b6b0c in $TESTTMP/a
> >    details: $TESTTMP/a?cmd=changeset;node=b29c7a2b6b0c
> >    summary: x
> >    
> > -  changeset 0957c7d64886 in $TESTTMP/a (glob)
> > +  changeset 0957c7d64886 in $TESTTMP/a
> >    details: $TESTTMP/a?cmd=changeset;node=0957c7d64886
> >    summary: y
> >    
> > -  changeset 485b4e6b0249 in $TESTTMP/a (glob)
> > +  changeset 485b4e6b0249 in $TESTTMP/a
> >    details: $TESTTMP/a?cmd=changeset;node=485b4e6b0249
> >    summary: merged
> >    
> > diff --git a/tests/test-notify.t b/tests/test-notify.t
> > --- a/tests/test-notify.t
> > +++ b/tests/test-notify.t
> > @@ -193,7 +193,7 @@
> >    Message-Id: <*> (glob)
> >    To: baz, foo@bar
> >    
> > -  changeset 0647d048b600 in $TESTTMP/b (glob)
> > +  changeset 0647d048b600 in $TESTTMP/b
> >    details: $TESTTMP/b?cmd=changeset;node=0647d048b600
> >    description: b
> >    
> > diff --git a/tests/test-obsolete-checkheads.t b/tests/test-obsolete-checkheads.t
> > --- a/tests/test-obsolete-checkheads.t
> > +++ b/tests/test-obsolete-checkheads.t
> > @@ -42,7 +42,7 @@
> >  
> >    $ mkcommit old
> >    $ hg push
> > -  pushing to $TESTTMP/remote (glob)
> > +  pushing to $TESTTMP/remote
> >    searching for changes
> >    adding changesets
> >    adding manifests
> > @@ -65,7 +65,7 @@
> >  Push should not warn about creating new head
> >  
> >    $ hg push
> > -  pushing to $TESTTMP/remote (glob)
> > +  pushing to $TESTTMP/remote
> >    searching for changes
> >    adding changesets
> >    adding manifests
> > @@ -81,7 +81,7 @@
> >    $ cp -r ../backup1 ../remote
> >    $ hg -R ../remote phase --public c70b08862e08
> >    $ hg pull -v
> > -  pulling from $TESTTMP/remote (glob)
> > +  pulling from $TESTTMP/remote
> >    searching for changes
> >    no changes found
> >    $ hg glog --hidden
> > @@ -95,7 +95,7 @@
> >  Abort: old will still be an head because it's public.
> >  
> >    $ hg push
> > -  pushing to $TESTTMP/remote (glob)
> > +  pushing to $TESTTMP/remote
> >    searching for changes
> >    abort: push creates new remote head 71e3228bffe1!
> >    (did you forget to merge? use push -f to force)
> > @@ -155,7 +155,7 @@
> >  Push should abort on new head
> >  
> >    $ hg push -r 'desc("other")'
> > -  pushing to $TESTTMP/remote (glob)
> > +  pushing to $TESTTMP/remote
> >    searching for changes
> >    abort: push creates new remote head d7d41ccbd4de!
> >    (did you forget to merge? use push -f to force)
> > @@ -182,7 +182,7 @@
> >    $ mkcommit new
> >    created new head
> >    $ hg push -f
> > -  pushing to $TESTTMP/remote (glob)
> > +  pushing to $TESTTMP/remote
> >    searching for changes
> >    adding changesets
> >    adding manifests
> > @@ -217,7 +217,7 @@
> >  one anyway.
> >  
> >    $ hg push
> > -  pushing to $TESTTMP/remote (glob)
> > +  pushing to $TESTTMP/remote
> >    searching for changes
> >    adding changesets
> >    adding manifests
> > @@ -265,7 +265,7 @@
> >  handled yet.
> >  
> >    $ hg push --traceback
> > -  pushing to $TESTTMP/remote (glob)
> > +  pushing to $TESTTMP/remote
> >    searching for changes
> >    adding changesets
> >    adding manifests
> > diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
> > --- a/tests/test-obsolete.t
> > +++ b/tests/test-obsolete.t
> > @@ -816,7 +816,7 @@
> >       summary:     A
> >    
> >    $ hg incoming
> > -  comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
> > +  comparing with $TESTTMP/tmpe/repo-issue3805
> >    searching for changes
> >    changeset:   2:3816541e5485
> >    tag:         tip
> > @@ -826,7 +826,7 @@
> >    summary:     A
> >    
> >    $ hg incoming --bundle ../issue3805.hg
> > -  comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
> > +  comparing with $TESTTMP/tmpe/repo-issue3805
> >    searching for changes
> >    changeset:   2:3816541e5485
> >    tag:         tip
> > @@ -836,7 +836,7 @@
> >    summary:     A
> >    
> >    $ hg outgoing
> > -  comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
> > +  comparing with $TESTTMP/tmpe/repo-issue3805
> >    searching for changes
> >    no changes found
> >    [1]
> > diff --git a/tests/test-parents.t b/tests/test-parents.t
> > --- a/tests/test-parents.t
> > +++ b/tests/test-parents.t
> > @@ -71,7 +71,7 @@
> >    
> >  
> >    $ hg parents -r 2 ../a
> > -  abort: ../a not under root '$TESTTMP/repo' (glob)
> > +  abort: ../a not under root '$TESTTMP/repo'
> >    [255]
> >  
> > 
> > diff --git a/tests/test-paths.t b/tests/test-paths.t
> > --- a/tests/test-paths.t
> > +++ b/tests/test-paths.t
> > @@ -7,35 +7,35 @@
> >    $ echo 'dupe = ../b' >> .hg/hgrc
> >    $ echo 'expand = $SOMETHING/bar' >> .hg/hgrc
> >    $ hg in dupe
> > -  comparing with $TESTTMP/b (glob)
> > +  comparing with $TESTTMP/b
> >    no changes found
> >    [1]
> >    $ cd ..
> >    $ hg -R a in dupe
> > -  comparing with $TESTTMP/b (glob)
> > +  comparing with $TESTTMP/b
> >    no changes found
> >    [1]
> >    $ cd a
> >    $ hg paths
> > -  dupe = $TESTTMP/b (glob)
> > -  expand = $TESTTMP/a/$SOMETHING/bar (glob)
> > +  dupe = $TESTTMP/b
> > +  expand = $TESTTMP/a/$SOMETHING/bar
> >    $ SOMETHING=foo hg paths
> > -  dupe = $TESTTMP/b (glob)
> > -  expand = $TESTTMP/a/foo/bar (glob)
> > +  dupe = $TESTTMP/b
> > +  expand = $TESTTMP/a/foo/bar
> >  #if msys
> >    $ SOMETHING=//foo hg paths
> > -  dupe = $TESTTMP/b (glob)
> > +  dupe = $TESTTMP/b
> >    expand = /foo/bar
> >  #else
> >    $ SOMETHING=/foo hg paths
> > -  dupe = $TESTTMP/b (glob)
> > +  dupe = $TESTTMP/b
> >    expand = /foo/bar
> >  #endif
> >    $ hg paths -q
> >    dupe
> >    expand
> >    $ hg paths dupe
> > -  $TESTTMP/b (glob)
> > +  $TESTTMP/b
> >    $ hg paths -q dupe
> >    $ hg paths unknown
> >    not found!
> > diff --git a/tests/test-pull-r.t b/tests/test-pull-r.t
> > --- a/tests/test-pull-r.t
> > +++ b/tests/test-pull-r.t
> > @@ -43,7 +43,7 @@
> >    2:effea6de0384
> >    1:ed1b79f46b9a
> >    $ hg pull
> > -  pulling from $TESTTMP/repo2 (glob)
> > +  pulling from $TESTTMP/repo2
> >    searching for changes
> >    adding changesets
> >    adding manifests
> > 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
> > @@ -44,7 +44,7 @@
> >    [1]
> >  
> >    $ hg push
> > -  pushing to $TESTTMP/test (glob)
> > +  pushing to $TESTTMP/test
> >    searching for changes
> >    adding changesets
> >    adding manifests
> > @@ -79,7 +79,7 @@
> >    [1]
> >  
> >    $ hg push
> > -  pushing to $TESTTMP/test (glob)
> > +  pushing to $TESTTMP/test
> >    searching for changes
> >    adding changesets
> >    adding manifests
> > diff --git a/tests/test-rebase-bookmarks.t b/tests/test-rebase-bookmarks.t
> > --- a/tests/test-rebase-bookmarks.t
> > +++ b/tests/test-rebase-bookmarks.t
> > @@ -146,7 +146,7 @@
> >    $ echo 'c' > c
> >    $ hg resolve --mark c
> >    $ hg rebase --continue
> > -  saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-backup.hg
> >    $ hg tglog
> >    @  4: 'C' bookmarks: Y Z
> >    |
> > 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
> > @@ -281,7 +281,7 @@
> >    c65502d4178782309ce0574c5ae6ee9485a9bafa default
> >  
> >    $ hg strip 4
> > -  saved backup bundle to $TESTTMP/b2/.hg/strip-backup/8a5212ebc852-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/b2/.hg/strip-backup/8a5212ebc852-backup.hg
> >  
> >    $ cat $TESTTMP/b2/.hg/cache/branchheads-served
> >    c65502d4178782309ce0574c5ae6ee9485a9bafa 4
> > 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
> > @@ -288,7 +288,7 @@
> >    
> >  
> >    $ hg rebase -d 5 -s 7
> > -  saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-backup.hg
> >    $ hg tglog
> >    @  8: 'D'
> >    |
> > @@ -378,7 +378,7 @@
> >    [255]
> >    $ hg resolve --all -t internal:local
> >    $ hg rebase -c
> > -  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg
> >    $ hg  log -G --template "{rev}:{phase} '{desc}' {branches}\n"
> >    @  7:draft 'H'
> >    |
> > 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,7 +48,7 @@
> >  Now b has one revision to be pulled from a:
> >  
> >    $ hg pull --rebase
> > -  pulling from $TESTTMP/a (glob)
> > +  pulling from $TESTTMP/a
> >    searching for changes
> >    adding changesets
> >    adding manifests
> > @@ -68,7 +68,7 @@
> >  Re-run:
> >  
> >    $ hg pull --rebase
> > -  pulling from $TESTTMP/a (glob)
> > +  pulling from $TESTTMP/a
> >    searching for changes
> >    no changes found
> >  
> > @@ -79,7 +79,7 @@
> >  
> >    $ hg book norebase
> >    $ hg pull --rebase
> > -  pulling from $TESTTMP/a (glob)
> > +  pulling from $TESTTMP/a
> >    searching for changes
> >    adding changesets
> >    adding manifests
> > @@ -96,7 +96,7 @@
> >  pull --rebase --update should ignore --update:
> >  
> >    $ hg pull --rebase --update
> > -  pulling from $TESTTMP/a (glob)
> > +  pulling from $TESTTMP/a
> >    searching for changes
> >    no changes found
> >  
> > @@ -105,7 +105,7 @@
> >    $ hg up -q 1
> >  
> >    $ hg pull --rebase
> > -  pulling from $TESTTMP/a (glob)
> > +  pulling from $TESTTMP/a
> >    searching for changes
> >    no changes found
> >  
> > @@ -144,13 +144,13 @@
> >    adding L1
> >    created new head
> >    $ hg pull --rev tip --rebase
> > -  pulling from $TESTTMP/a (glob)
> > +  pulling from $TESTTMP/a
> >    searching for changes
> >    adding changesets
> >    adding manifests
> >    adding file changes
> >    added 2 changesets with 2 changes to 2 files
> > -  saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-backup.hg
> >    $ hg tglog
> >    @  5: 'L1'
> >    |
> > 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
> > @@ -254,7 +254,7 @@
> >  C onto A - rebase onto an ancestor:
> >  
> >    $ hg rebase -d 0 -s 2
> > -  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg
> >    $ hg tglog
> >    @  7: 'D'
> >    |
> > @@ -286,25 +286,25 @@
> >  Check rebasing mutable changeset
> >  Source phase greater or equal to destination phase: new changeset get the phase of source:
> >    $ hg rebase -s9 -d0
> > -  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-backup.hg
> >    $ hg log --template "{phase}\n" -r 9
> >    draft
> >    $ hg rebase -s9 -d1
> > -  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-backup.hg
> >    $ hg log --template "{phase}\n" -r 9
> >    draft
> >    $ hg phase --force --secret 9
> >    $ hg rebase -s9 -d0
> > -  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-backup.hg
> >    $ hg log --template "{phase}\n" -r 9
> >    secret
> >    $ hg rebase -s9 -d1
> > -  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-backup.hg
> >    $ hg log --template "{phase}\n" -r 9
> >    secret
> >  Source phase lower than destination phase: new changeset get the phase of destination:
> >    $ hg rebase -s8 -d9
> > -  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-backup.hg
> >    $ hg log --template "{phase}\n" -r 'rev(9)'
> >    secret
> >  
> > @@ -512,7 +512,7 @@
> >    $ hg clone -q -u . ah ah5
> >    $ cd ah5
> >    $ hg rebase -r '6::' -d 2
> > -  saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-backup.hg
> >    $ hg tglog
> >    @  8: 'I'
> >    |
> > @@ -542,7 +542,7 @@
> >    $ hg clone -q -u . ah ah6
> >    $ cd ah6
> >    $ hg rebase -r '(4+6)::' -d 1
> > -  saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-backup.hg
> >    $ hg tglog
> >    @  8: 'I'
> >    |
> > @@ -609,7 +609,7 @@
> >  (actual test)
> >  
> >    $ hg rebase --dest 'desc(G)' --rev 'desc(K) + desc(I)'
> > -  saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-backup.hg (glob)
> > +  saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-backup.hg
> >    $ hg log --rev 'children(desc(G))'
> >    changeset:   9:adb617877056
> >    parent:      6:eea13746799a
> > diff --git a/tests/test-relink.t b/tests/test-relink.t
> > --- a/tests/test-relink.t
> > +++ b/tests/test-relink.t
> > @@ -41,7 +41,7 @@
> >  don't sit forever trying to double-lock the source repo
> >  
> >    $ hg relink .
> > -  relinking $TESTTMP/repo/.hg/store to $TESTTMP/repo/.hg/store (glob)
> > +  relinking $TESTTMP/repo/.hg/store to $TESTTMP/repo/.hg/store
> >    there is nothing to relink
> >  
> > 
> > diff --git a/tests/test-revset-outgoing.t b/tests/test-revset-outgoing.t
> > --- a/tests/test-revset-outgoing.t
> > +++ b/tests/test-revset-outgoing.t
> > @@ -40,7 +40,7 @@
> >    $ cd b
> >    $ cat .hg/hgrc
> >    [paths]
> > -  default = $TESTTMP/a#stable (glob)
> > +  default = $TESTTMP/a#stable
> >  
> >    $ echo red >> a
> >    $ hg ci -qm3
> > @@ -61,7 +61,7 @@
> >    
> >  
> >    $ hg tout
> > -  comparing with $TESTTMP/a (glob)
> > +  comparing with $TESTTMP/a
> >    searching for changes
> >    2:1d4099801a4e: '3' stable
> >  
> > @@ -80,11 +80,11 @@
> >  
> >    $ cat .hg/hgrc
> >    [paths]
> > -  default = $TESTTMP/a#stable (glob)
> > +  default = $TESTTMP/a#stable
> >    green = ../a#default
> >  
> >    $ hg tout green
> > -  comparing with $TESTTMP/a (glob)
> > +  comparing with $TESTTMP/a
> >    searching for changes
> >    3:f0461977a3db: '4' 
> >  
> > diff --git a/tests/test-share.t b/tests/test-share.t
> > --- a/tests/test-share.t
> > +++ b/tests/test-share.t
> > @@ -27,14 +27,14 @@
> >  Some sed versions appends newline, some don't, and some just fails
> >  
> >    $ cat .hg/sharedpath; echo
> > -  $TESTTMP/repo1/.hg (glob)
> > +  $TESTTMP/repo1/.hg
> >  
> >  trailing newline on .hg/sharedpath is ok
> >    $ hg tip -q
> >    0:d3873e73d99e
> >    $ echo '' >> .hg/sharedpath
> >    $ cat .hg/sharedpath
> > -  $TESTTMP/repo1/.hg (glob)
> > +  $TESTTMP/repo1/.hg
> >    $ hg tip -q
> >    0:d3873e73d99e
> >  
> > diff --git a/tests/test-ssh.t b/tests/test-ssh.t
> > --- a/tests/test-ssh.t
> > +++ b/tests/test-ssh.t
> > @@ -308,7 +308,7 @@
> >    73649e48688a
> >  
> >    $ hg id --ssh "sh ssh.sh" "ssh://user@dummy/a'repo"
> > -  remote: Illegal repository "$TESTTMP/a'repo" (glob)
> > +  remote: Illegal repository "$TESTTMP/a'repo"
> >    abort: no suitable response from remote hg!
> >    [255]
> >  
> > 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
> > @@ -49,7 +49,7 @@
> >    $ hg clone main cloned
> >    updating to branch default
> >    cloning subrepo sub1 from $TESTTMP/sub1
> > -  cloning subrepo sub1/sub2 from $TESTTMP/sub2 (glob)
> > +  cloning subrepo sub1/sub2 from $TESTTMP/sub2
> >    3 files updated, 0 files merged, 0 files removed, 0 files unresolved
> >  
> >  Checking cloned repo ids
> > diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t
> > --- a/tests/test-subrepo-git.t
> > +++ b/tests/test-subrepo-git.t
> > @@ -135,7 +135,7 @@
> >  user b push changes
> >  
> >    $ hg push 2>/dev/null
> > -  pushing to $TESTTMP/t (glob)
> > +  pushing to $TESTTMP/t
> >    pushing branch testing of subrepo s
> >    searching for changes
> >    adding changesets
> > @@ -147,7 +147,7 @@
> >  
> >    $ cd ../ta
> >    $ hg pull
> > -  pulling from $TESTTMP/t (glob)
> > +  pulling from $TESTTMP/t
> >    searching for changes
> >    adding changesets
> >    adding manifests
> > @@ -175,7 +175,7 @@
> >     source   ../gitroot
> >     revision f47b465e1bce645dbf37232a00574aa1546ca8d3
> >    $ hg push 2>/dev/null
> > -  pushing to $TESTTMP/t (glob)
> > +  pushing to $TESTTMP/t
> >    pushing branch testing of subrepo s
> >    searching for changes
> >    adding changesets
> > @@ -207,7 +207,7 @@
> >    $ echo aa >> a
> >    $ hg commit -m aa
> >    $ hg push
> > -  pushing to $TESTTMP/t (glob)
> > +  pushing to $TESTTMP/t
> >    searching for 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
> > @@ -55,7 +55,7 @@
> >    > .* = \1
> >    > EOF
> >    $ hg debugsub
> > -  abort: bad subrepository pattern in $TESTTMP/outer/.hg/hgrc:2: invalid group reference (glob)
> > +  abort: bad subrepository pattern in $TESTTMP/outer/.hg/hgrc:2: invalid group reference
> >    [255]
> >  
> >    $ cd ..
> > 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
> > @@ -363,7 +363,7 @@
> >    archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
> >                                                                \r (no-eol) (esc)
> >    cloning subrepo foo from $TESTTMP/repo/foo
> > -  cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
> > +  cloning subrepo foo/bar from $TESTTMP/repo/foo/bar
> >  
> >  The newly cloned subrepos contain no working copy:
> >  
> > @@ -386,7 +386,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 (in subrepo foo) (glob)
> > +  abort: destination '$TESTTMP/almost-empty/foo' is not empty (in subrepo foo)
> >    [255]
> >  
> >  Clone and test outgoing:
> > @@ -395,11 +395,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 (glob)
> > +  cloning subrepo foo/bar from $TESTTMP/repo/foo/bar
> >    3 files updated, 0 files merged, 0 files removed, 0 files unresolved
> >    $ cd repo2
> >    $ hg outgoing -S
> > -  comparing with $TESTTMP/repo (glob)
> > +  comparing with $TESTTMP/repo
> >    searching for changes
> >    no changes found
> >    comparing with $TESTTMP/repo/foo
> > @@ -425,7 +425,7 @@
> >    $ hg commit --subrepos -m 3-4-2
> >    committing subrepository foo
> >    $ hg outgoing -S
> > -  comparing with $TESTTMP/repo (glob)
> > +  comparing with $TESTTMP/repo
> >    searching for changes
> >    changeset:   3:2655b8ecc4ee
> >    tag:         tip
> > @@ -455,7 +455,7 @@
> >  Test incoming:
> >  
> >    $ hg incoming -S
> > -  comparing with $TESTTMP/repo2 (glob)
> > +  comparing with $TESTTMP/repo2
> >    searching for changes
> >    changeset:   3:2655b8ecc4ee
> >    tag:         tip
> > diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
> > --- a/tests/test-subrepo.t
> > +++ b/tests/test-subrepo.t
> > @@ -270,7 +270,7 @@
> >    $ hg clone t tc
> >    updating to branch default
> >    cloning subrepo s from $TESTTMP/t/s
> > -  cloning subrepo s/ss from $TESTTMP/t/s/ss (glob)
> > +  cloning subrepo s/ss from $TESTTMP/t/s/ss
> >    cloning subrepo t from $TESTTMP/t/t
> >    3 files updated, 0 files merged, 0 files removed, 0 files unresolved
> >    $ cd tc
> > @@ -288,8 +288,8 @@
> >    $ hg ci -m11
> >    committing subrepository t
> >    $ hg push
> > -  pushing to $TESTTMP/t (glob)
> > -  pushing subrepo s/ss to $TESTTMP/t/s/ss (glob)
> > +  pushing to $TESTTMP/t
> > +  pushing subrepo s/ss to $TESTTMP/t/s/ss
> >    searching for changes
> >    no changes found
> >    pushing subrepo s to $TESTTMP/t/s
> > @@ -313,8 +313,8 @@
> >    $ hg ci -m12
> >    committing subrepository s
> >    $ hg push
> > -  pushing to $TESTTMP/t (glob)
> > -  pushing subrepo s/ss to $TESTTMP/t/s/ss (glob)
> > +  pushing to $TESTTMP/t
> > +  pushing subrepo s/ss to $TESTTMP/t/s/ss
> >    searching for changes
> >    no changes found
> >    pushing subrepo s to $TESTTMP/t/s
> > @@ -323,8 +323,8 @@
> >    (did you forget to merge? use push -f to force)
> >    [255]
> >    $ hg push -f
> > -  pushing to $TESTTMP/t (glob)
> > -  pushing subrepo s/ss to $TESTTMP/t/s/ss (glob)
> > +  pushing to $TESTTMP/t
> > +  pushing subrepo s/ss to $TESTTMP/t/s/ss
> >    searching for changes
> >    no changes found
> >    pushing subrepo s to $TESTTMP/t/s
> > @@ -355,7 +355,7 @@
> >  
> >    $ cd ../tc
> >    $ hg pull
> > -  pulling from $TESTTMP/t (glob)
> > +  pulling from $TESTTMP/t
> >    searching for changes
> >    adding changesets
> >    adding manifests
> > @@ -670,7 +670,7 @@
> >  
> >    $ hg -R issue1852a push `pwd`/issue1852c
> >    pushing to $TESTTMP/issue1852c
> > -  pushing subrepo sub/repo to $TESTTMP/issue1852c/sub/repo (glob)
> > +  pushing subrepo sub/repo to $TESTTMP/issue1852c/sub/repo
> >    searching for changes
> >    no changes found
> >    searching for changes
> > @@ -1077,7 +1077,7 @@
> >    > default=../issue3781-dest/
> >    > EOF
> >    $ hg push
> > -  pushing to $TESTTMP/issue3781-dest (glob)
> > +  pushing to $TESTTMP/issue3781-dest
> >    pushing subrepo s to $TESTTMP/issue3781-dest/s
> >    searching for changes
> >    no changes found
> > 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 = $TESTTMP/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
> > @@ -181,10 +181,10 @@
> >    f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon
> >    f  mammals/skunk                   mammals/skunk
> >    $ hg debugwalk ..
> > -  abort: .. not under root '$TESTTMP/t' (glob)
> > +  abort: .. not under root '$TESTTMP/t'
> >    [255]
> >    $ hg debugwalk beans/../..
> > -  abort: beans/../.. not under root '$TESTTMP/t' (glob)
> > +  abort: beans/../.. not under root '$TESTTMP/t'
> >    [255]
> >    $ hg debugwalk .hg
> >    abort: path contains illegal component: .hg
> > @@ -209,7 +209,7 @@
> >    f  beans/pinto     beans/pinto
> >    f  beans/turtle    beans/turtle
> >    $ hg debugwalk `pwd`/..
> > -  abort: $TESTTMP/t/.. not under root '$TESTTMP/t' (glob)
> > +  abort: $TESTTMP/t/.. not under root '$TESTTMP/t'
> >    [255]
> >  
> >  Test patterns:
> > diff --git a/tests/test-win32text.t b/tests/test-win32text.t
> > --- a/tests/test-win32text.t
> > +++ b/tests/test-win32text.t
> > @@ -385,7 +385,7 @@
> >    WARNING: f4.bat already has CRLF line endings
> >    and does not need EOL conversion by the win32text plugin.
> >    Before your next commit, please reconsider your encode/decode settings in 
> > -  Mercurial.ini or $TESTTMP/t/.hg/hgrc. (glob)
> > +  Mercurial.ini or $TESTTMP/t/.hg/hgrc.
> >    3 files updated, 0 files merged, 0 files removed, 0 files unresolved
> >    $ cat bin
> >    hello\x00\r (esc)
> 
>

Patch

diff --git a/contrib/check-code.py b/contrib/check-code.py
--- a/contrib/check-code.py
+++ b/contrib/check-code.py
@@ -101,8 +101,6 @@ 
      "explicit exit code checks unnecessary"),
     (uprefix + r'set -e', "don't use set -e"),
     (uprefix + r'\s', "don't indent commands, use > for continued lines"),
-    (r'^  saved backup bundle to \$TESTTMP.*\.hg$',
-     "use (glob) to match Windows paths too"),
   ],
   # warnings
   [
diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -570,6 +570,10 @@ 
     if el == l: # perfect match (fast)
         return True
     if el:
+        if os.name == 'nt' and '$TESTTMP' in l:
+            l = l.replace('\\', '/')
+            if el == l:
+                return True
         if el.endswith(" (esc)\n"):
             el = el[:-7].decode('string-escape') + '\n'
         if el == l or os.name == 'nt' and el[:-1] + '\r\n' == l:
diff --git a/tests/test-blackbox.t b/tests/test-blackbox.t
--- a/tests/test-blackbox.t
+++ b/tests/test-blackbox.t
@@ -48,7 +48,7 @@ 
   adding c
   $ cd ../blackboxtest2
   $ hg pull
-  pulling from $TESTTMP/blackboxtest (glob)
+  pulling from $TESTTMP/blackboxtest
   searching for changes
   adding changesets
   adding manifests
diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t
--- a/tests/test-bookmarks-pushpull.t
+++ b/tests/test-bookmarks-pushpull.t
@@ -139,7 +139,7 @@ 
    * foobar                    1:9b140be10808
 
   $ hg pull --config paths.foo=../a foo
-  pulling from $TESTTMP/a (glob)
+  pulling from $TESTTMP/a
   searching for changes
   adding changesets
   adding manifests
diff --git a/tests/test-clone.t b/tests/test-clone.t
--- a/tests/test-clone.t
+++ b/tests/test-clone.t
@@ -92,7 +92,7 @@ 
 
   $ hg clone -q -U --config 'paths.foobar=a#0' foobar f
   $ hg -R f showconfig paths.default
-  $TESTTMP/a#0 (glob)
+  $TESTTMP/a#0
 
 Use --pull:
 
diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t
--- a/tests/test-commit-amend.t
+++ b/tests/test-commit-amend.t
@@ -35,7 +35,7 @@ 
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -m 'amend base1'
   pretxncommit 43f1ba15f28a50abf0aae529cf8a16bfced7b149
   43f1ba15f28a tip
-  saved backup bundle to $TESTTMP/.hg/strip-backup/489edb5b847d-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/.hg/strip-backup/489edb5b847d-amend-backup.hg
   $ echo 'pretxncommit.foo = ' >> $HGRCPATH
   $ hg diff -c .
   diff -r ad120869acf0 -r 43f1ba15f28a a
@@ -86,7 +86,7 @@ 
 
 Add new file:
   $ hg ci --amend -m 'amend base1 new file'
-  saved backup bundle to $TESTTMP/.hg/strip-backup/43f1ba15f28a-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/.hg/strip-backup/43f1ba15f28a-amend-backup.hg
 
 Remove file that was added in amended commit:
 (and test logfile option)
@@ -95,7 +95,7 @@ 
   $ hg rm b
   $ echo 'amend base1 remove new file' > ../logfile
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg ci --amend --logfile ../logfile
-  saved backup bundle to $TESTTMP/.hg/strip-backup/b8e3cb2b3882-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/.hg/strip-backup/b8e3cb2b3882-amend-backup.hg
 
   $ hg cat b
   b: no such file in rev 74609c7f506e
@@ -109,7 +109,7 @@ 
   a
   stripping amended changeset 74609c7f506e
   1 changesets found
-  saved backup bundle to $TESTTMP/.hg/strip-backup/74609c7f506e-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/.hg/strip-backup/74609c7f506e-amend-backup.hg
   1 changesets found
   adding branch
   adding changesets
@@ -146,10 +146,10 @@ 
 Test -u/-d:
 
   $ hg ci --amend -u foo -d '1 0'
-  saved backup bundle to $TESTTMP/.hg/strip-backup/1cd866679df8-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/.hg/strip-backup/1cd866679df8-amend-backup.hg
   $ echo a >> a
   $ hg ci --amend -u foo -d '1 0'
-  saved backup bundle to $TESTTMP/.hg/strip-backup/780e6f23e03d-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/.hg/strip-backup/780e6f23e03d-amend-backup.hg
   $ hg log -r .
   changeset:   1:5f357c7560ab
   tag:         tip
@@ -180,7 +180,7 @@ 
   a
   stripping amended changeset 5f357c7560ab
   1 changesets found
-  saved backup bundle to $TESTTMP/.hg/strip-backup/5f357c7560ab-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/.hg/strip-backup/5f357c7560ab-amend-backup.hg
   1 changesets found
   adding branch
   adding changesets
@@ -209,7 +209,7 @@ 
   stripping intermediate changeset a0ea9b1a4c8c
   stripping amended changeset 7ab3bf440b54
   2 changesets found
-  saved backup bundle to $TESTTMP/.hg/strip-backup/7ab3bf440b54-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/.hg/strip-backup/7ab3bf440b54-amend-backup.hg
   1 changesets found
   adding branch
   adding changesets
@@ -232,13 +232,13 @@ 
   $ hg book book1
   $ hg book book2
   $ hg ci --amend -m 'move bookmarks'
-  saved backup bundle to $TESTTMP/.hg/strip-backup/ea22a388757c-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/.hg/strip-backup/ea22a388757c-amend-backup.hg
   $ hg book
      book1                     1:6cec5aa930e2
    * book2                     1:6cec5aa930e2
   $ echo a >> a
   $ hg ci --amend -m 'move bookmarks'
-  saved backup bundle to $TESTTMP/.hg/strip-backup/6cec5aa930e2-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/.hg/strip-backup/6cec5aa930e2-amend-backup.hg
   $ hg book
      book1                     1:48bb6e53a15f
    * book2                     1:48bb6e53a15f
@@ -275,7 +275,7 @@ 
   marked working directory as branch default
   (branches are permanent and global, did you want a bookmark?)
   $ hg ci --amend -m 'back to default'
-  saved backup bundle to $TESTTMP/.hg/strip-backup/8ac881fbf49d-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/.hg/strip-backup/8ac881fbf49d-amend-backup.hg
   $ hg branches
   default                        2:ce12b0b57d46
 
@@ -291,7 +291,7 @@ 
   $ echo b >> b
   $ hg ci -mb
   $ hg ci --amend --close-branch -m 'closing branch foo'
-  saved backup bundle to $TESTTMP/.hg/strip-backup/c962248fa264-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/.hg/strip-backup/c962248fa264-amend-backup.hg
 
 Same thing, different code path:
 
@@ -300,7 +300,7 @@ 
   reopening closed branch head 4
   $ echo b >> b
   $ hg ci --amend --close-branch
-  saved backup bundle to $TESTTMP/.hg/strip-backup/027371728205-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/.hg/strip-backup/027371728205-amend-backup.hg
   $ hg branches
   default                        2:ce12b0b57d46
 
@@ -324,7 +324,7 @@ 
   $ hg ci -m 'b -> c'
   $ hg mv c d
   $ hg ci --amend -m 'b -> d'
-  saved backup bundle to $TESTTMP/.hg/strip-backup/b8c6eac7f12e-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/.hg/strip-backup/b8c6eac7f12e-amend-backup.hg
   $ hg st --rev '.^' --copies d
   A d
     b
@@ -332,7 +332,7 @@ 
   $ hg ci -m 'e = d'
   $ hg cp e f
   $ hg ci --amend -m 'f = d'
-  saved backup bundle to $TESTTMP/.hg/strip-backup/7f9761d65613-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/.hg/strip-backup/7f9761d65613-amend-backup.hg
   $ hg st --rev '.^' --copies f
   A f
     d
@@ -343,7 +343,7 @@ 
   $ hg cp a f
   $ mv f.orig f
   $ hg ci --amend -m replacef
-  saved backup bundle to $TESTTMP/.hg/strip-backup/9e8c5f7e3d95-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/.hg/strip-backup/9e8c5f7e3d95-amend-backup.hg
   $ hg st --change . --copies
   $ hg log -r . --template "{file_copies}\n"
   
@@ -355,7 +355,7 @@ 
   adding g
   $ hg mv g h
   $ hg ci --amend
-  saved backup bundle to $TESTTMP/.hg/strip-backup/24aa8eacce2b-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/.hg/strip-backup/24aa8eacce2b-amend-backup.hg
   $ hg st --change . --copies h
   A h
   $ hg log -r . --template "{file_copies}\n"
@@ -375,11 +375,11 @@ 
   $ echo a >> a
   $ hg ci -ma
   $ hg ci --amend -m "a'"
-  saved backup bundle to $TESTTMP/.hg/strip-backup/3837aa2a2fdb-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/.hg/strip-backup/3837aa2a2fdb-amend-backup.hg
   $ hg log -r . --template "{branch}\n"
   a
   $ hg ci --amend -m "a''"
-  saved backup bundle to $TESTTMP/.hg/strip-backup/c05c06be7514-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/.hg/strip-backup/c05c06be7514-amend-backup.hg
   $ hg log -r . --template "{branch}\n"
   a
 
@@ -396,7 +396,7 @@ 
   $ hg graft 12
   grafting revision 12
   $ hg ci --amend -m 'graft amend'
-  saved backup bundle to $TESTTMP/.hg/strip-backup/bd010aea3f39-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/.hg/strip-backup/bd010aea3f39-amend-backup.hg
   $ hg log -r . --debug | grep extra
   extra:       amend_source=bd010aea3f39f3fb2a2f884b9ccb0471cd77398e
   extra:       branch=a
diff --git a/tests/test-contrib.t b/tests/test-contrib.t
--- a/tests/test-contrib.t
+++ b/tests/test-contrib.t
@@ -109,7 +109,7 @@ 
 Test shrink-revlog:
   $ cd repo-a
   $ hg --config extensions.shrink="$CONTRIBDIR/shrink-revlog.py" shrink
-  shrinking $TESTTMP/repo-a/.hg/store/00manifest.i (glob)
+  shrinking $TESTTMP/repo-a/.hg/store/00manifest.i
   reading revs
   sorting revs
   writing revs
@@ -117,8 +117,8 @@ 
   new file size:          324 bytes (   0.0 MiB)
   shrinkage: 0.0% (1.0x)
   note: old revlog saved in:
-    $TESTTMP/repo-a/.hg/store/00manifest.i.old (glob)
-    $TESTTMP/repo-a/.hg/store/00manifest.d.old (glob)
+    $TESTTMP/repo-a/.hg/store/00manifest.i.old
+    $TESTTMP/repo-a/.hg/store/00manifest.d.old
   (You can delete those files when you are satisfied that your
   repository is still sane.  Running 'hg verify' is strongly recommended.)
   $ hg verify
diff --git a/tests/test-convert-authormap.t b/tests/test-convert-authormap.t
--- a/tests/test-convert-authormap.t
+++ b/tests/test-convert-authormap.t
@@ -27,7 +27,7 @@ 
   sorting...
   converting...
   0 foo
-  writing author map file $TESTTMP/new/.hg/authormap (glob)
+  writing author map file $TESTTMP/new/.hg/authormap
   $ cat new/.hg/authormap
   user name=Long User Name
   $ hg -Rnew log
@@ -44,7 +44,7 @@ 
   $ hg init new
   $ mv authormap.txt new/.hg/authormap
   $ hg convert orig new
-  ignoring bad line in author map file $TESTTMP/new/.hg/authormap: this line is ignored (glob)
+  ignoring bad line in author map file $TESTTMP/new/.hg/authormap: this line is ignored
   scanning source...
   sorting...
   converting...
diff --git a/tests/test-convert-filemap.t b/tests/test-convert-filemap.t
--- a/tests/test-convert-filemap.t
+++ b/tests/test-convert-filemap.t
@@ -568,7 +568,7 @@ 
   $ cd namedbranch
   $ hg --config extensions.mq= strip tip
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  saved backup bundle to $TESTTMP/namedbranch/.hg/strip-backup/73899bcbe45c-backup.hg (glob)
+  saved backup bundle to $TESTTMP/namedbranch/.hg/strip-backup/73899bcbe45c-backup.hg
   $ hg up foo
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge default
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 $TESTTMP/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 $TESTTMP/c (glob)
+  pushing to $TESTTMP/c
   searching for changes
   adding changesets
   adding manifests
diff --git a/tests/test-extension.t b/tests/test-extension.t
--- a/tests/test-extension.t
+++ b/tests/test-extension.t
@@ -475,9 +475,9 @@ 
   > cmdtable = None
   > EOF
   $ hg --config extensions.path=./path.py help foo > /dev/null
-  warning: error finding commands in $TESTTMP/hgext/forest.py (glob)
+  warning: error finding commands in $TESTTMP/hgext/forest.py
   hg: unknown command 'foo'
-  warning: error finding commands in $TESTTMP/hgext/forest.py (glob)
+  warning: error finding commands in $TESTTMP/hgext/forest.py
   [255]
 
   $ cat > throw.py <<EOF
diff --git a/tests/test-globalopts.t b/tests/test-globalopts.t
--- a/tests/test-globalopts.t
+++ b/tests/test-globalopts.t
@@ -87,7 +87,7 @@ 
   abort: no repository found in '$TESTTMP' (.hg not found)!
   [255]
   $ hg -R b ann a/a
-  abort: a/a not under root '$TESTTMP/b' (glob)
+  abort: a/a not under root '$TESTTMP/b'
   [255]
   $ hg log
   abort: no repository found in '$TESTTMP' (.hg not found)!
diff --git a/tests/test-hardlinks.t b/tests/test-hardlinks.t
--- a/tests/test-hardlinks.t
+++ b/tests/test-hardlinks.t
@@ -138,7 +138,7 @@ 
 
   $ cd r3
   $ hg push
-  pushing to $TESTTMP/r1 (glob)
+  pushing to $TESTTMP/r1
   searching for changes
   adding changesets
   adding manifests
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: $TESTTMP/.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
-  $TESTTMP/.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
@@ -29,12 +29,12 @@ 
   $ cd foobar
   $ cat .hg/hgrc
   [paths]
-  default = $TESTTMP/foo%bar (glob)
+  default = $TESTTMP/foo%bar
   $ hg paths
-  default = $TESTTMP/foo%bar (glob)
+  default = $TESTTMP/foo%bar
   $ hg showconfig
-  bundle.mainreporoot=$TESTTMP/foobar (glob)
-  paths.default=$TESTTMP/foo%bar (glob)
+  bundle.mainreporoot=$TESTTMP/foobar
+  paths.default=$TESTTMP/foo%bar
   $ cd ..
 
 issue1829: wrong indentation
diff --git a/tests/test-histedit-bookmark-motion.t b/tests/test-histedit-bookmark-motion.t
--- a/tests/test-histedit-bookmark-motion.t
+++ b/tests/test-histedit-bookmark-motion.t
@@ -90,8 +90,8 @@ 
   histedit: moving bookmarks three from 055a42cdd887 to 59d9f330561f
   histedit: moving bookmarks two from 177f92b77385 to b346ab9a313d
   histedit: moving bookmarks will-move-backwards from d2ae7f538514 to cb9a9f314b8b
-  saved backup bundle to $TESTTMP/r/.hg/strip-backup/d2ae7f538514-backup.hg (glob)
-  saved backup bundle to $TESTTMP/r/.hg/strip-backup/96e494a2d553-backup.hg (glob)
+  saved backup bundle to $TESTTMP/r/.hg/strip-backup/d2ae7f538514-backup.hg
+  saved backup bundle to $TESTTMP/r/.hg/strip-backup/96e494a2d553-backup.hg
   $ hg log --graph
   @  changeset:   3:cacdfd884a93
   |  bookmark:    five
@@ -144,7 +144,7 @@ 
   histedit: moving bookmarks five from cacdfd884a93 to c04e50810e4b
   histedit: moving bookmarks four from 59d9f330561f to c04e50810e4b
   histedit: moving bookmarks three from 59d9f330561f to c04e50810e4b
-  saved backup bundle to $TESTTMP/r/.hg/strip-backup/59d9f330561f-backup.hg (glob)
+  saved backup bundle to $TESTTMP/r/.hg/strip-backup/59d9f330561f-backup.hg
 
 We expect 'five' to stay at tip, since the tipmost bookmark is most
 likely the useful signal.
diff --git a/tests/test-histedit-edit.t b/tests/test-histedit-edit.t
--- a/tests/test-histedit-edit.t
+++ b/tests/test-histedit-edit.t
@@ -157,7 +157,7 @@ 
   A f
   $ HGEDITOR='true' hg histedit --continue
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  saved backup bundle to $TESTTMP/r/.hg/strip-backup/b5f70786f9b0-backup.hg (glob)
+  saved backup bundle to $TESTTMP/r/.hg/strip-backup/b5f70786f9b0-backup.hg
 
   $ hg status
 
diff --git a/tests/test-histedit-fold.t b/tests/test-histedit-fold.t
--- a/tests/test-histedit-fold.t
+++ b/tests/test-histedit-fold.t
@@ -278,7 +278,7 @@ 
   HG: changed file
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-backup.hg (glob)
+  saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-backup.hg
   $ hg log -G
   @  changeset:   1:10c647b2cdd5
   |  tag:         tip
diff --git a/tests/test-histedit-obsolete.t b/tests/test-histedit-obsolete.t
--- a/tests/test-histedit-obsolete.t
+++ b/tests/test-histedit-obsolete.t
@@ -67,7 +67,7 @@ 
   > pick 652413bf663e 5 f
   > EOF
   $ hg histedit 1 --commands commands.txt --verbose | grep histedit
-  saved backup bundle to $TESTTMP/base/.hg/strip-backup/96e494a2d553-backup.hg (glob)
+  saved backup bundle to $TESTTMP/base/.hg/strip-backup/96e494a2d553-backup.hg
   $ hg log --graph --hidden
   @  8:cacdfd884a93 f
   |
@@ -437,9 +437,9 @@ 
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  saved backup bundle to $TESTTMP/folding/.hg/strip-backup/58019c66f35f-backup.hg (glob)
-  saved backup bundle to $TESTTMP/folding/.hg/strip-backup/83d1858e070b-backup.hg (glob)
-  saved backup bundle to $TESTTMP/folding/.hg/strip-backup/859969f5ed7e-backup.hg (glob)
+  saved backup bundle to $TESTTMP/folding/.hg/strip-backup/58019c66f35f-backup.hg
+  saved backup bundle to $TESTTMP/folding/.hg/strip-backup/83d1858e070b-backup.hg
+  saved backup bundle to $TESTTMP/folding/.hg/strip-backup/859969f5ed7e-backup.hg
   $ hg log -G
   @  19:f9daec13fb98 (secret) i
   |
diff --git a/tests/test-hook.t b/tests/test-hook.t
--- a/tests/test-hook.t
+++ b/tests/test-hook.t
@@ -630,7 +630,7 @@ 
   $ echo aa >> from/a
   $ hg --cwd from ci -mb
   $ hg --cwd from push
-  pushing to $TESTTMP/to (glob)
+  pushing to $TESTTMP/to
   searching for changes
   adding changesets
   adding manifests
diff --git a/tests/test-issue1502.t b/tests/test-issue1502.t
--- a/tests/test-issue1502.t
+++ b/tests/test-issue1502.t
@@ -13,7 +13,7 @@ 
   $ echo "bar" > foo1/a && hg -R foo1 commit -m "edit a in foo1"
   $ echo "hi" > foo/a && hg -R foo commit -m "edited a foo"
   $ hg -R foo1 pull -u
-  pulling from $TESTTMP/foo (glob)
+  pulling from $TESTTMP/foo
   searching for changes
   adding changesets
   adding manifests
@@ -29,7 +29,7 @@ 
 
   $ echo "there" >> foo/a && hg -R foo commit -m "edited a again"
   $ hg -R foo1 pull
-  pulling from $TESTTMP/foo (glob)
+  pulling from $TESTTMP/foo
   searching for changes
   adding changesets
   adding manifests
diff --git a/tests/test-keyword.t b/tests/test-keyword.t
--- a/tests/test-keyword.t
+++ b/tests/test-keyword.t
@@ -229,7 +229,7 @@ 
   Message-Id: <hg.a2392c293916*> (glob)
   To: Test
   
-  changeset a2392c293916 in $TESTTMP/Test (glob)
+  changeset a2392c293916 in $TESTTMP/Test
   details: $TESTTMP/Test?cmd=changeset;node=a2392c293916
   description:
   	addsym
@@ -252,7 +252,7 @@ 
   Message-Id: <hg.ef63ca68695b*> (glob)
   To: Test
   
-  changeset ef63ca68695b in $TESTTMP/Test (glob)
+  changeset ef63ca68695b in $TESTTMP/Test
   details: $TESTTMP/Test?cmd=changeset;node=ef63ca68695b
   description:
   	absym
@@ -863,7 +863,7 @@ 
   > default = ../Test
   > EOF
   $ hg incoming
-  comparing with $TESTTMP/Test (glob)
+  comparing with $TESTTMP/Test
   searching for changes
   changeset:   2:bb948857c743
   tag:         tip
diff --git a/tests/test-largefiles-cache.t b/tests/test-largefiles-cache.t
--- a/tests/test-largefiles-cache.t
+++ b/tests/test-largefiles-cache.t
@@ -44,7 +44,7 @@ 
 
   $ hg update
   getting changed largefiles
-  error getting id 7f7097b041ccf68cc5561e9600da4655d21c6d18 from url file:$TESTTMP/mirror for file large: can't get file locally (glob)
+  error getting id 7f7097b041ccf68cc5561e9600da4655d21c6d18 from url file:$TESTTMP/mirror for file large: can't get file locally
   0 largefiles updated, 0 removed
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg status
@@ -61,7 +61,7 @@ 
 
   $ hg update
   getting changed largefiles
-  error getting id 7f7097b041ccf68cc5561e9600da4655d21c6d18 from url file:$TESTTMP/mirror for file large: can't get file locally (glob)
+  error getting id 7f7097b041ccf68cc5561e9600da4655d21c6d18 from url file:$TESTTMP/mirror for file large: can't get file locally
   0 largefiles updated, 0 removed
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg status
diff --git a/tests/test-largefiles.t b/tests/test-largefiles.t
--- a/tests/test-largefiles.t
+++ b/tests/test-largefiles.t
@@ -670,7 +670,7 @@ 
 
 Test that outgoing --large works (with revsets too)
   $ hg outgoing --rev '.^' --large
-  comparing with $TESTTMP/a (glob)
+  comparing with $TESTTMP/a
   searching for changes
   changeset:   8:c02fd3b77ec4
   user:        test
@@ -876,7 +876,7 @@ 
   $ rm "${USERCACHE}"/*
   $ cd a-backup
   $ hg pull --all-largefiles --config paths.default-push=bogus/path
-  pulling from $TESTTMP/a (glob)
+  pulling from $TESTTMP/a
   searching for changes
   adding changesets
   adding manifests
@@ -920,7 +920,7 @@ 
 'default' instead of 'default-push' when no source is specified (issue3584).
 The error messages go away if repo 'b' is created with --all-largefiles.
   $ hg pull --rebase --all-largefiles --config paths.default-push=bogus/path --config paths.default=../b
-  pulling from $TESTTMP/b (glob)
+  pulling from $TESTTMP/b
   searching for changes
   adding changesets
   adding manifests
@@ -929,16 +929,16 @@ 
   Invoking status precommit hook
   M sub/normal4
   M sub2/large6
-  saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
-  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file large3: can't get file locally (glob)
-  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large4: can't get file locally (glob)
-  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file large1: can't get file locally (glob)
-  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large2: can't get file locally (glob)
-  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large2: can't get file locally (glob)
-  error getting id 5f78770c0e77ba4287ad6ef3071c9bf9c379742f from url file:$TESTTMP/b for file large1: can't get file locally (glob)
-  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large2: can't get file locally (glob)
-  error getting id 4669e532d5b2c093a78eca010077e708a071bb64 from url file:$TESTTMP/b for file large1: can't get file locally (glob)
-  error getting id 1deebade43c8c498a3c8daddac0244dc55d1331d from url file:$TESTTMP/b for file sub/large2: can't get file locally (glob)
+  saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg
+  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file large3: can't get file locally
+  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large4: can't get file locally
+  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file large1: can't get file locally
+  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large2: can't get file locally
+  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large2: can't get file locally
+  error getting id 5f78770c0e77ba4287ad6ef3071c9bf9c379742f from url file:$TESTTMP/b for file large1: can't get file locally
+  error getting id eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 from url file:$TESTTMP/b for file sub/large2: can't get file locally
+  error getting id 4669e532d5b2c093a78eca010077e708a071bb64 from url file:$TESTTMP/b for file large1: can't get file locally
+  error getting id 1deebade43c8c498a3c8daddac0244dc55d1331d from url file:$TESTTMP/b for file sub/large2: can't get file locally
   0 additional largefiles cached
   9 largefiles failed to download
   nothing to rebase
@@ -976,7 +976,7 @@ 
   Invoking status precommit hook
   M sub/normal4
   M sub2/large6
-  saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
+  saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg
   $ hg log --template '{rev}:{node|short}  {desc|firstline}\n'
   9:598410d3eb9a  modify normal file largefile in repo d
   8:a381d2c8c80e  modify normal file and largefile in repo b
@@ -1186,7 +1186,7 @@ 
   $ pwd
   $TESTTMP/e
   $ hg paths
-  default = $TESTTMP/d (glob)
+  default = $TESTTMP/d
 
   $ hg verify --large
   checking changesets
@@ -1206,14 +1206,14 @@ 
   checking files
   10 files, 10 changesets, 28 total revisions
   searching 1 changesets for largefiles
-  changeset 9:598410d3eb9a: sub/large4 references missing $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 (glob)
+  changeset 9:598410d3eb9a: sub/large4 references missing $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928
   verified existence of 3 revisions of 3 largefiles
   [1]
 
 - introduce corruption and make sure that it is caught when checking content:
   $ echo '5 cents' > $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928
   $ hg verify -q --large --lfc
-  changeset 9:598410d3eb9a: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 (glob)
+  changeset 9:598410d3eb9a: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928
   [1]
 
 - cleanup
@@ -1222,13 +1222,13 @@ 
 - verifying all revisions will fail because we didn't clone all largefiles to d:
   $ echo 'T-shirt' > $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
   $ hg verify -q --lfa --lfc
-  changeset 0:30d30fe6a5be: large1 references missing $TESTTMP/d/.hg/largefiles/4669e532d5b2c093a78eca010077e708a071bb64 (glob)
-  changeset 0:30d30fe6a5be: sub/large2 references missing $TESTTMP/d/.hg/largefiles/1deebade43c8c498a3c8daddac0244dc55d1331d (glob)
-  changeset 1:ce8896473775: large1 references missing $TESTTMP/d/.hg/largefiles/5f78770c0e77ba4287ad6ef3071c9bf9c379742f (glob)
-  changeset 1:ce8896473775: sub/large2 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
-  changeset 3:9e8fbc4bce62: large1 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
-  changeset 4:74c02385b94c: large3 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
-  changeset 4:74c02385b94c: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
+  changeset 0:30d30fe6a5be: large1 references missing $TESTTMP/d/.hg/largefiles/4669e532d5b2c093a78eca010077e708a071bb64
+  changeset 0:30d30fe6a5be: sub/large2 references missing $TESTTMP/d/.hg/largefiles/1deebade43c8c498a3c8daddac0244dc55d1331d
+  changeset 1:ce8896473775: large1 references missing $TESTTMP/d/.hg/largefiles/5f78770c0e77ba4287ad6ef3071c9bf9c379742f
+  changeset 1:ce8896473775: sub/large2 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
+  changeset 3:9e8fbc4bce62: large1 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
+  changeset 4:74c02385b94c: large3 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
+  changeset 4:74c02385b94c: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
   [1]
 
 - cleanup
@@ -1574,7 +1574,7 @@ 
   pushing to http://localhost:$HGPORT1/
   searching for changes
   remote: largefiles: failed to put 4cdac4d8b084d0b599525cf732437fb337d422a8 into store: largefile contents do not match hash
-  abort: remotestore: could not put $TESTTMP/r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 to remote store http://localhost:$HGPORT1/ (glob)
+  abort: remotestore: could not put $TESTTMP/r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 to remote store http://localhost:$HGPORT1/
   [255]
   $ mv 4cdac4d8b084d0b599525cf732437fb337d422a8 r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8
 Push of file that exists on server but is corrupted - magic healing would be nice ... but too magic
@@ -2036,7 +2036,7 @@ 
 
   $ hg -q clone src clone2
   $ hg -R clone2 paths | grep default
-  default = $TESTTMP/issue3651/src (glob)
+  default = $TESTTMP/issue3651/src
 
   $ hg -R clone2 summary --large
   parent: 0:fc0bd45326d3 tip
@@ -2047,7 +2047,7 @@ 
   searching for changes
   largefiles: (no files to upload)
   $ hg -R clone2 outgoing --large
-  comparing with $TESTTMP/issue3651/src (glob)
+  comparing with $TESTTMP/issue3651/src
   searching for changes
   no changes found
   searching for changes
@@ -2070,7 +2070,7 @@ 
   searching for changes
   largefiles: 1 to upload
   $ hg -R clone2 outgoing --large
-  comparing with $TESTTMP/issue3651/src (glob)
+  comparing with $TESTTMP/issue3651/src
   searching for changes
   changeset:   1:1acbe71ce432
   tag:         tip
diff --git a/tests/test-lfconvert.t b/tests/test-lfconvert.t
--- a/tests/test-lfconvert.t
+++ b/tests/test-lfconvert.t
@@ -125,7 +125,7 @@ 
   $ hg commit -q -m"remove large, normal3"
   $ hg merge
   merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat
-  warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file. (glob)
+  warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file.
   merging stuff/maybelarge.dat incomplete! (edit conflicts, then use 'hg resolve --mark')
   merging sub/normal2 and stuff/normal2 to stuff/normal2
   0 files updated, 1 files merged, 0 files removed, 1 files unresolved
@@ -212,7 +212,7 @@ 
   $ hg share -q -U bigfile-repo shared
   $ printf 'bogus' > shared/.hg/sharedpath
   $ hg lfconvert shared foo
-  abort: .hg/sharedpath points to nonexistent directory $TESTTMP/bogus! (glob)
+  abort: .hg/sharedpath points to nonexistent directory $TESTTMP/bogus!
   [255]
   $ hg lfconvert bigfile-repo largefiles-repo
   initializing destination largefiles-repo
@@ -317,12 +317,12 @@ 
   checking files
   8 files, 7 changesets, 12 total revisions
   searching 7 changesets for largefiles
-  changeset 0:d4892ec57ce2: large references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/2e000fa7e85759c7f4c254d4d9c33ef481e459a7 (glob)
-  changeset 1:334e5237836d: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c (glob)
-  changeset 2:261ad3f3f037: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c (glob)
-  changeset 3:55759520c76f: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38 (glob)
-  changeset 5:9cc5aa7204f0: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38 (glob)
-  changeset 6:17126745edfd: anotherlarge references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3 (glob)
+  changeset 0:d4892ec57ce2: large references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/2e000fa7e85759c7f4c254d4d9c33ef481e459a7
+  changeset 1:334e5237836d: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c
+  changeset 2:261ad3f3f037: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c
+  changeset 3:55759520c76f: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38
+  changeset 5:9cc5aa7204f0: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38
+  changeset 6:17126745edfd: anotherlarge references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3
   verified existence of 6 revisions of 4 largefiles
   [1]
   $ hg -R largefiles-repo-hg showconfig paths
@@ -343,7 +343,7 @@ 
   $ rm largefiles-repo/.hg/largefiles/*
   $ hg lfconvert --to-normal issue3519 normalized3519
   initializing destination normalized3519
-  error getting id 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 from url file:$TESTTMP/largefiles-repo for file large: can't get file locally (glob)
+  error getting id 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 from url file:$TESTTMP/largefiles-repo for file large: can't get file locally
   abort: missing largefile 'large' from revision d4892ec57ce212905215fad1d9018f56b99202ad
   [255]
 
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
@@ -56,7 +56,7 @@ 
 Save the patch queue so we can merge it later:
 
   $ hg qsave -c -e
-  copy $TESTTMP/t/.hg/patches to $TESTTMP/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:
@@ -76,7 +76,7 @@ 
   b
 
   $ hg qpush -a -m
-  merging with queue at: $TESTTMP/t/.hg/patches.1 (glob)
+  merging with queue at: $TESTTMP/t/.hg/patches.1
   applying rm_a
   now at: rm_a
 
@@ -115,14 +115,14 @@ 
 Create the reference queue:
 
   $ hg qsave -c -e -n refqueue
-  copy $TESTTMP/t2/.hg/patches to $TESTTMP/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: $TESTTMP/t2/.hg/refqueue (glob)
+  merging with queue at: $TESTTMP/t2/.hg/refqueue
   applying patcha
   patching file a
   Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines).
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
@@ -69,7 +69,7 @@ 
   abort: popping would remove a revision not managed by this patch queue
   [255]
   $ hg qpop -n patches
-  using patch queue: $TESTTMP/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.t b/tests/test-mq.t
--- a/tests/test-mq.t
+++ b/tests/test-mq.t
@@ -151,7 +151,7 @@ 
   guards
   $ cat .hg/patches/series
   $ hg qinit -c
-  abort: repository $TESTTMP/d/.hg/patches already exists! (glob)
+  abort: repository $TESTTMP/d/.hg/patches already exists!
   [255]
   $ cd ..
 
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,11 +56,11 @@ 
   Message-Id: <*> (glob)
   To: baz, foo@bar
   
-  changeset cb9a9f314b8b in $TESTTMP/a (glob)
+  changeset cb9a9f314b8b in $TESTTMP/a
   details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b
   summary: a
   
-  changeset ba677d0156c1 in $TESTTMP/a (glob)
+  changeset ba677d0156c1 in $TESTTMP/a
   details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1
   summary: b
   
@@ -107,11 +107,11 @@ 
   Message-Id: <*> (glob)
   To: baz, foo@bar
   
-  changeset cb9a9f314b8b in $TESTTMP/a (glob)
+  changeset cb9a9f314b8b in $TESTTMP/a
   details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b
   summary: a
   
-  changeset ba677d0156c1 in $TESTTMP/a (glob)
+  changeset ba677d0156c1 in $TESTTMP/a
   details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1
   summary: b
   
@@ -184,19 +184,19 @@ 
   Message-Id: <*> (glob)
   To: baz, foo@bar
   
-  changeset 84e487dddc58 in $TESTTMP/a (glob)
+  changeset 84e487dddc58 in $TESTTMP/a
   details: $TESTTMP/a?cmd=changeset;node=84e487dddc58
   summary: newfile
   
-  changeset b29c7a2b6b0c in $TESTTMP/a (glob)
+  changeset b29c7a2b6b0c in $TESTTMP/a
   details: $TESTTMP/a?cmd=changeset;node=b29c7a2b6b0c
   summary: x
   
-  changeset 0957c7d64886 in $TESTTMP/a (glob)
+  changeset 0957c7d64886 in $TESTTMP/a
   details: $TESTTMP/a?cmd=changeset;node=0957c7d64886
   summary: y
   
-  changeset 485b4e6b0249 in $TESTTMP/a (glob)
+  changeset 485b4e6b0249 in $TESTTMP/a
   details: $TESTTMP/a?cmd=changeset;node=485b4e6b0249
   summary: merged
   
diff --git a/tests/test-notify.t b/tests/test-notify.t
--- a/tests/test-notify.t
+++ b/tests/test-notify.t
@@ -193,7 +193,7 @@ 
   Message-Id: <*> (glob)
   To: baz, foo@bar
   
-  changeset 0647d048b600 in $TESTTMP/b (glob)
+  changeset 0647d048b600 in $TESTTMP/b
   details: $TESTTMP/b?cmd=changeset;node=0647d048b600
   description: b
   
diff --git a/tests/test-obsolete-checkheads.t b/tests/test-obsolete-checkheads.t
--- a/tests/test-obsolete-checkheads.t
+++ b/tests/test-obsolete-checkheads.t
@@ -42,7 +42,7 @@ 
 
   $ mkcommit old
   $ hg push
-  pushing to $TESTTMP/remote (glob)
+  pushing to $TESTTMP/remote
   searching for changes
   adding changesets
   adding manifests
@@ -65,7 +65,7 @@ 
 Push should not warn about creating new head
 
   $ hg push
-  pushing to $TESTTMP/remote (glob)
+  pushing to $TESTTMP/remote
   searching for changes
   adding changesets
   adding manifests
@@ -81,7 +81,7 @@ 
   $ cp -r ../backup1 ../remote
   $ hg -R ../remote phase --public c70b08862e08
   $ hg pull -v
-  pulling from $TESTTMP/remote (glob)
+  pulling from $TESTTMP/remote
   searching for changes
   no changes found
   $ hg glog --hidden
@@ -95,7 +95,7 @@ 
 Abort: old will still be an head because it's public.
 
   $ hg push
-  pushing to $TESTTMP/remote (glob)
+  pushing to $TESTTMP/remote
   searching for changes
   abort: push creates new remote head 71e3228bffe1!
   (did you forget to merge? use push -f to force)
@@ -155,7 +155,7 @@ 
 Push should abort on new head
 
   $ hg push -r 'desc("other")'
-  pushing to $TESTTMP/remote (glob)
+  pushing to $TESTTMP/remote
   searching for changes
   abort: push creates new remote head d7d41ccbd4de!
   (did you forget to merge? use push -f to force)
@@ -182,7 +182,7 @@ 
   $ mkcommit new
   created new head
   $ hg push -f
-  pushing to $TESTTMP/remote (glob)
+  pushing to $TESTTMP/remote
   searching for changes
   adding changesets
   adding manifests
@@ -217,7 +217,7 @@ 
 one anyway.
 
   $ hg push
-  pushing to $TESTTMP/remote (glob)
+  pushing to $TESTTMP/remote
   searching for changes
   adding changesets
   adding manifests
@@ -265,7 +265,7 @@ 
 handled yet.
 
   $ hg push --traceback
-  pushing to $TESTTMP/remote (glob)
+  pushing to $TESTTMP/remote
   searching for changes
   adding changesets
   adding manifests
diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -816,7 +816,7 @@ 
      summary:     A
   
   $ hg incoming
-  comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
+  comparing with $TESTTMP/tmpe/repo-issue3805
   searching for changes
   changeset:   2:3816541e5485
   tag:         tip
@@ -826,7 +826,7 @@ 
   summary:     A
   
   $ hg incoming --bundle ../issue3805.hg
-  comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
+  comparing with $TESTTMP/tmpe/repo-issue3805
   searching for changes
   changeset:   2:3816541e5485
   tag:         tip
@@ -836,7 +836,7 @@ 
   summary:     A
   
   $ hg outgoing
-  comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
+  comparing with $TESTTMP/tmpe/repo-issue3805
   searching for changes
   no changes found
   [1]
diff --git a/tests/test-parents.t b/tests/test-parents.t
--- a/tests/test-parents.t
+++ b/tests/test-parents.t
@@ -71,7 +71,7 @@ 
   
 
   $ hg parents -r 2 ../a
-  abort: ../a not under root '$TESTTMP/repo' (glob)
+  abort: ../a not under root '$TESTTMP/repo'
   [255]
 
 
diff --git a/tests/test-paths.t b/tests/test-paths.t
--- a/tests/test-paths.t
+++ b/tests/test-paths.t
@@ -7,35 +7,35 @@ 
   $ echo 'dupe = ../b' >> .hg/hgrc
   $ echo 'expand = $SOMETHING/bar' >> .hg/hgrc
   $ hg in dupe
-  comparing with $TESTTMP/b (glob)
+  comparing with $TESTTMP/b
   no changes found
   [1]
   $ cd ..
   $ hg -R a in dupe
-  comparing with $TESTTMP/b (glob)
+  comparing with $TESTTMP/b
   no changes found
   [1]
   $ cd a
   $ hg paths
-  dupe = $TESTTMP/b (glob)
-  expand = $TESTTMP/a/$SOMETHING/bar (glob)
+  dupe = $TESTTMP/b
+  expand = $TESTTMP/a/$SOMETHING/bar
   $ SOMETHING=foo hg paths
-  dupe = $TESTTMP/b (glob)
-  expand = $TESTTMP/a/foo/bar (glob)
+  dupe = $TESTTMP/b
+  expand = $TESTTMP/a/foo/bar
 #if msys
   $ SOMETHING=//foo hg paths
-  dupe = $TESTTMP/b (glob)
+  dupe = $TESTTMP/b
   expand = /foo/bar
 #else
   $ SOMETHING=/foo hg paths
-  dupe = $TESTTMP/b (glob)
+  dupe = $TESTTMP/b
   expand = /foo/bar
 #endif
   $ hg paths -q
   dupe
   expand
   $ hg paths dupe
-  $TESTTMP/b (glob)
+  $TESTTMP/b
   $ hg paths -q dupe
   $ hg paths unknown
   not found!
diff --git a/tests/test-pull-r.t b/tests/test-pull-r.t
--- a/tests/test-pull-r.t
+++ b/tests/test-pull-r.t
@@ -43,7 +43,7 @@ 
   2:effea6de0384
   1:ed1b79f46b9a
   $ hg pull
-  pulling from $TESTTMP/repo2 (glob)
+  pulling from $TESTTMP/repo2
   searching for changes
   adding changesets
   adding manifests
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
@@ -44,7 +44,7 @@ 
   [1]
 
   $ hg push
-  pushing to $TESTTMP/test (glob)
+  pushing to $TESTTMP/test
   searching for changes
   adding changesets
   adding manifests
@@ -79,7 +79,7 @@ 
   [1]
 
   $ hg push
-  pushing to $TESTTMP/test (glob)
+  pushing to $TESTTMP/test
   searching for changes
   adding changesets
   adding manifests
diff --git a/tests/test-rebase-bookmarks.t b/tests/test-rebase-bookmarks.t
--- a/tests/test-rebase-bookmarks.t
+++ b/tests/test-rebase-bookmarks.t
@@ -146,7 +146,7 @@ 
   $ echo 'c' > c
   $ hg resolve --mark c
   $ hg rebase --continue
-  saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-backup.hg (glob)
+  saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-backup.hg
   $ hg tglog
   @  4: 'C' bookmarks: Y Z
   |
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
@@ -281,7 +281,7 @@ 
   c65502d4178782309ce0574c5ae6ee9485a9bafa default
 
   $ hg strip 4
-  saved backup bundle to $TESTTMP/b2/.hg/strip-backup/8a5212ebc852-backup.hg (glob)
+  saved backup bundle to $TESTTMP/b2/.hg/strip-backup/8a5212ebc852-backup.hg
 
   $ cat $TESTTMP/b2/.hg/cache/branchheads-served
   c65502d4178782309ce0574c5ae6ee9485a9bafa 4
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
@@ -288,7 +288,7 @@ 
   
 
   $ hg rebase -d 5 -s 7
-  saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-backup.hg (glob)
+  saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-backup.hg
   $ hg tglog
   @  8: 'D'
   |
@@ -378,7 +378,7 @@ 
   [255]
   $ hg resolve --all -t internal:local
   $ hg rebase -c
-  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg (glob)
+  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg
   $ hg  log -G --template "{rev}:{phase} '{desc}' {branches}\n"
   @  7:draft 'H'
   |
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,7 +48,7 @@ 
 Now b has one revision to be pulled from a:
 
   $ hg pull --rebase
-  pulling from $TESTTMP/a (glob)
+  pulling from $TESTTMP/a
   searching for changes
   adding changesets
   adding manifests
@@ -68,7 +68,7 @@ 
 Re-run:
 
   $ hg pull --rebase
-  pulling from $TESTTMP/a (glob)
+  pulling from $TESTTMP/a
   searching for changes
   no changes found
 
@@ -79,7 +79,7 @@ 
 
   $ hg book norebase
   $ hg pull --rebase
-  pulling from $TESTTMP/a (glob)
+  pulling from $TESTTMP/a
   searching for changes
   adding changesets
   adding manifests
@@ -96,7 +96,7 @@ 
 pull --rebase --update should ignore --update:
 
   $ hg pull --rebase --update
-  pulling from $TESTTMP/a (glob)
+  pulling from $TESTTMP/a
   searching for changes
   no changes found
 
@@ -105,7 +105,7 @@ 
   $ hg up -q 1
 
   $ hg pull --rebase
-  pulling from $TESTTMP/a (glob)
+  pulling from $TESTTMP/a
   searching for changes
   no changes found
 
@@ -144,13 +144,13 @@ 
   adding L1
   created new head
   $ hg pull --rev tip --rebase
-  pulling from $TESTTMP/a (glob)
+  pulling from $TESTTMP/a
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
-  saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-backup.hg (glob)
+  saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-backup.hg
   $ hg tglog
   @  5: 'L1'
   |
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
@@ -254,7 +254,7 @@ 
 C onto A - rebase onto an ancestor:
 
   $ hg rebase -d 0 -s 2
-  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg (glob)
+  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg
   $ hg tglog
   @  7: 'D'
   |
@@ -286,25 +286,25 @@ 
 Check rebasing mutable changeset
 Source phase greater or equal to destination phase: new changeset get the phase of source:
   $ hg rebase -s9 -d0
-  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-backup.hg (glob)
+  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-backup.hg
   $ hg log --template "{phase}\n" -r 9
   draft
   $ hg rebase -s9 -d1
-  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-backup.hg (glob)
+  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-backup.hg
   $ hg log --template "{phase}\n" -r 9
   draft
   $ hg phase --force --secret 9
   $ hg rebase -s9 -d0
-  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-backup.hg (glob)
+  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-backup.hg
   $ hg log --template "{phase}\n" -r 9
   secret
   $ hg rebase -s9 -d1
-  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-backup.hg (glob)
+  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-backup.hg
   $ hg log --template "{phase}\n" -r 9
   secret
 Source phase lower than destination phase: new changeset get the phase of destination:
   $ hg rebase -s8 -d9
-  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-backup.hg (glob)
+  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-backup.hg
   $ hg log --template "{phase}\n" -r 'rev(9)'
   secret
 
@@ -512,7 +512,7 @@ 
   $ hg clone -q -u . ah ah5
   $ cd ah5
   $ hg rebase -r '6::' -d 2
-  saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-backup.hg (glob)
+  saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-backup.hg
   $ hg tglog
   @  8: 'I'
   |
@@ -542,7 +542,7 @@ 
   $ hg clone -q -u . ah ah6
   $ cd ah6
   $ hg rebase -r '(4+6)::' -d 1
-  saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-backup.hg (glob)
+  saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-backup.hg
   $ hg tglog
   @  8: 'I'
   |
@@ -609,7 +609,7 @@ 
 (actual test)
 
   $ hg rebase --dest 'desc(G)' --rev 'desc(K) + desc(I)'
-  saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-backup.hg (glob)
+  saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-backup.hg
   $ hg log --rev 'children(desc(G))'
   changeset:   9:adb617877056
   parent:      6:eea13746799a
diff --git a/tests/test-relink.t b/tests/test-relink.t
--- a/tests/test-relink.t
+++ b/tests/test-relink.t
@@ -41,7 +41,7 @@ 
 don't sit forever trying to double-lock the source repo
 
   $ hg relink .
-  relinking $TESTTMP/repo/.hg/store to $TESTTMP/repo/.hg/store (glob)
+  relinking $TESTTMP/repo/.hg/store to $TESTTMP/repo/.hg/store
   there is nothing to relink
 
 
diff --git a/tests/test-revset-outgoing.t b/tests/test-revset-outgoing.t
--- a/tests/test-revset-outgoing.t
+++ b/tests/test-revset-outgoing.t
@@ -40,7 +40,7 @@ 
   $ cd b
   $ cat .hg/hgrc
   [paths]
-  default = $TESTTMP/a#stable (glob)
+  default = $TESTTMP/a#stable
 
   $ echo red >> a
   $ hg ci -qm3
@@ -61,7 +61,7 @@ 
   
 
   $ hg tout
-  comparing with $TESTTMP/a (glob)
+  comparing with $TESTTMP/a
   searching for changes
   2:1d4099801a4e: '3' stable
 
@@ -80,11 +80,11 @@ 
 
   $ cat .hg/hgrc
   [paths]
-  default = $TESTTMP/a#stable (glob)
+  default = $TESTTMP/a#stable
   green = ../a#default
 
   $ hg tout green
-  comparing with $TESTTMP/a (glob)
+  comparing with $TESTTMP/a
   searching for changes
   3:f0461977a3db: '4' 
 
diff --git a/tests/test-share.t b/tests/test-share.t
--- a/tests/test-share.t
+++ b/tests/test-share.t
@@ -27,14 +27,14 @@ 
 Some sed versions appends newline, some don't, and some just fails
 
   $ cat .hg/sharedpath; echo
-  $TESTTMP/repo1/.hg (glob)
+  $TESTTMP/repo1/.hg
 
 trailing newline on .hg/sharedpath is ok
   $ hg tip -q
   0:d3873e73d99e
   $ echo '' >> .hg/sharedpath
   $ cat .hg/sharedpath
-  $TESTTMP/repo1/.hg (glob)
+  $TESTTMP/repo1/.hg
   $ hg tip -q
   0:d3873e73d99e
 
diff --git a/tests/test-ssh.t b/tests/test-ssh.t
--- a/tests/test-ssh.t
+++ b/tests/test-ssh.t
@@ -308,7 +308,7 @@ 
   73649e48688a
 
   $ hg id --ssh "sh ssh.sh" "ssh://user@dummy/a'repo"
-  remote: Illegal repository "$TESTTMP/a'repo" (glob)
+  remote: Illegal repository "$TESTTMP/a'repo"
   abort: no suitable response from remote hg!
   [255]
 
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
@@ -49,7 +49,7 @@ 
   $ hg clone main cloned
   updating to branch default
   cloning subrepo sub1 from $TESTTMP/sub1
-  cloning subrepo sub1/sub2 from $TESTTMP/sub2 (glob)
+  cloning subrepo sub1/sub2 from $TESTTMP/sub2
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Checking cloned repo ids
diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t
--- a/tests/test-subrepo-git.t
+++ b/tests/test-subrepo-git.t
@@ -135,7 +135,7 @@ 
 user b push changes
 
   $ hg push 2>/dev/null
-  pushing to $TESTTMP/t (glob)
+  pushing to $TESTTMP/t
   pushing branch testing of subrepo s
   searching for changes
   adding changesets
@@ -147,7 +147,7 @@ 
 
   $ cd ../ta
   $ hg pull
-  pulling from $TESTTMP/t (glob)
+  pulling from $TESTTMP/t
   searching for changes
   adding changesets
   adding manifests
@@ -175,7 +175,7 @@ 
    source   ../gitroot
    revision f47b465e1bce645dbf37232a00574aa1546ca8d3
   $ hg push 2>/dev/null
-  pushing to $TESTTMP/t (glob)
+  pushing to $TESTTMP/t
   pushing branch testing of subrepo s
   searching for changes
   adding changesets
@@ -207,7 +207,7 @@ 
   $ echo aa >> a
   $ hg commit -m aa
   $ hg push
-  pushing to $TESTTMP/t (glob)
+  pushing to $TESTTMP/t
   searching for 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
@@ -55,7 +55,7 @@ 
   > .* = \1
   > EOF
   $ hg debugsub
-  abort: bad subrepository pattern in $TESTTMP/outer/.hg/hgrc:2: invalid group reference (glob)
+  abort: bad subrepository pattern in $TESTTMP/outer/.hg/hgrc:2: invalid group reference
   [255]
 
   $ cd ..
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
@@ -363,7 +363,7 @@ 
   archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
                                                               \r (no-eol) (esc)
   cloning subrepo foo from $TESTTMP/repo/foo
-  cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
+  cloning subrepo foo/bar from $TESTTMP/repo/foo/bar
 
 The newly cloned subrepos contain no working copy:
 
@@ -386,7 +386,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 (in subrepo foo) (glob)
+  abort: destination '$TESTTMP/almost-empty/foo' is not empty (in subrepo foo)
   [255]
 
 Clone and test outgoing:
@@ -395,11 +395,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 (glob)
+  cloning subrepo foo/bar from $TESTTMP/repo/foo/bar
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd repo2
   $ hg outgoing -S
-  comparing with $TESTTMP/repo (glob)
+  comparing with $TESTTMP/repo
   searching for changes
   no changes found
   comparing with $TESTTMP/repo/foo
@@ -425,7 +425,7 @@ 
   $ hg commit --subrepos -m 3-4-2
   committing subrepository foo
   $ hg outgoing -S
-  comparing with $TESTTMP/repo (glob)
+  comparing with $TESTTMP/repo
   searching for changes
   changeset:   3:2655b8ecc4ee
   tag:         tip
@@ -455,7 +455,7 @@ 
 Test incoming:
 
   $ hg incoming -S
-  comparing with $TESTTMP/repo2 (glob)
+  comparing with $TESTTMP/repo2
   searching for changes
   changeset:   3:2655b8ecc4ee
   tag:         tip
diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
--- a/tests/test-subrepo.t
+++ b/tests/test-subrepo.t
@@ -270,7 +270,7 @@ 
   $ hg clone t tc
   updating to branch default
   cloning subrepo s from $TESTTMP/t/s
-  cloning subrepo s/ss from $TESTTMP/t/s/ss (glob)
+  cloning subrepo s/ss from $TESTTMP/t/s/ss
   cloning subrepo t from $TESTTMP/t/t
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd tc
@@ -288,8 +288,8 @@ 
   $ hg ci -m11
   committing subrepository t
   $ hg push
-  pushing to $TESTTMP/t (glob)
-  pushing subrepo s/ss to $TESTTMP/t/s/ss (glob)
+  pushing to $TESTTMP/t
+  pushing subrepo s/ss to $TESTTMP/t/s/ss
   searching for changes
   no changes found
   pushing subrepo s to $TESTTMP/t/s
@@ -313,8 +313,8 @@ 
   $ hg ci -m12
   committing subrepository s
   $ hg push
-  pushing to $TESTTMP/t (glob)
-  pushing subrepo s/ss to $TESTTMP/t/s/ss (glob)
+  pushing to $TESTTMP/t
+  pushing subrepo s/ss to $TESTTMP/t/s/ss
   searching for changes
   no changes found
   pushing subrepo s to $TESTTMP/t/s
@@ -323,8 +323,8 @@ 
   (did you forget to merge? use push -f to force)
   [255]
   $ hg push -f
-  pushing to $TESTTMP/t (glob)
-  pushing subrepo s/ss to $TESTTMP/t/s/ss (glob)
+  pushing to $TESTTMP/t
+  pushing subrepo s/ss to $TESTTMP/t/s/ss
   searching for changes
   no changes found
   pushing subrepo s to $TESTTMP/t/s
@@ -355,7 +355,7 @@ 
 
   $ cd ../tc
   $ hg pull
-  pulling from $TESTTMP/t (glob)
+  pulling from $TESTTMP/t
   searching for changes
   adding changesets
   adding manifests
@@ -670,7 +670,7 @@ 
 
   $ hg -R issue1852a push `pwd`/issue1852c
   pushing to $TESTTMP/issue1852c
-  pushing subrepo sub/repo to $TESTTMP/issue1852c/sub/repo (glob)
+  pushing subrepo sub/repo to $TESTTMP/issue1852c/sub/repo
   searching for changes
   no changes found
   searching for changes
@@ -1077,7 +1077,7 @@ 
   > default=../issue3781-dest/
   > EOF
   $ hg push
-  pushing to $TESTTMP/issue3781-dest (glob)
+  pushing to $TESTTMP/issue3781-dest
   pushing subrepo s to $TESTTMP/issue3781-dest/s
   searching for changes
   no changes found
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 = $TESTTMP/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
@@ -181,10 +181,10 @@ 
   f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon
   f  mammals/skunk                   mammals/skunk
   $ hg debugwalk ..
-  abort: .. not under root '$TESTTMP/t' (glob)
+  abort: .. not under root '$TESTTMP/t'
   [255]
   $ hg debugwalk beans/../..
-  abort: beans/../.. not under root '$TESTTMP/t' (glob)
+  abort: beans/../.. not under root '$TESTTMP/t'
   [255]
   $ hg debugwalk .hg
   abort: path contains illegal component: .hg
@@ -209,7 +209,7 @@ 
   f  beans/pinto     beans/pinto
   f  beans/turtle    beans/turtle
   $ hg debugwalk `pwd`/..
-  abort: $TESTTMP/t/.. not under root '$TESTTMP/t' (glob)
+  abort: $TESTTMP/t/.. not under root '$TESTTMP/t'
   [255]
 
 Test patterns:
diff --git a/tests/test-win32text.t b/tests/test-win32text.t
--- a/tests/test-win32text.t
+++ b/tests/test-win32text.t
@@ -385,7 +385,7 @@ 
   WARNING: f4.bat already has CRLF line endings
   and does not need EOL conversion by the win32text plugin.
   Before your next commit, please reconsider your encode/decode settings in 
-  Mercurial.ini or $TESTTMP/t/.hg/hgrc. (glob)
+  Mercurial.ini or $TESTTMP/t/.hg/hgrc.
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat bin
   hello\x00\r (esc)