[PATCH 13 of 19] tests: make (glob) on windows accept \ instead of /
Mads Kiilerich
mads at kiilerich.com
Sun Nov 6 20:41:03 CST 2011
# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1320632710 -3600
# Node ID 8606e94a5568547bc595c7ff2cd485c52504fd40
# Parent e4f9281d2a8e02e08d3fb3f85dd64144a8abe6bb
tests: make (glob) on windows accept \ instead of /
Globbing is usually used for filenames, so on windows it is reasonable and very
convenient that glob patterns accepts '\' or '/' when the pattern specifies
'/'.
diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -530,20 +530,22 @@
return False
def globmatch(el, l):
- # The only supported special characters are * and ?. Escaping is
- # supported.
+ # The only supported special characters are * and ? plus / which also
+ # matches \ on windows. Escaping of these caracters is supported.
i, n = 0, len(el)
res = ''
while i < n:
c = el[i]
i += 1
- if c == '\\' and el[i] in '*?\\':
+ if c == '\\' and el[i] in '*?\\/':
res += el[i - 1:i + 1]
i += 1
elif c == '*':
res += '.*'
elif c == '?':
res += '.'
+ elif c == '/' and os.name == 'nt':
+ res += '[/\\\\]'
else:
res += re.escape(c)
return rematch(res, l)
diff --git a/tests/test-addremove-similar.t b/tests/test-addremove-similar.t
--- a/tests/test-addremove-similar.t
+++ b/tests/test-addremove-similar.t
@@ -81,7 +81,7 @@
$ hg addremove -s80
removing d/a
adding d/b
- recording removal of d/a as rename to d/b (100% similar)
+ recording removal of d/a as rename to d/b (100% similar) (glob)
$ hg debugstate
r 0 0 1970-01-01 00:00:00 d/a
a 0 -1 unset d/b
@@ -91,10 +91,10 @@
no copies found here (since the target isn't in d
$ hg addremove -s80 d
- removing d/b
+ removing d/b (glob)
copies here
$ hg addremove -s80
adding c
- recording removal of d/a as rename to c (100% similar)
+ recording removal of d/a as rename to c (100% similar) (glob)
diff --git a/tests/test-audit-path.t b/tests/test-audit-path.t
--- a/tests/test-audit-path.t
+++ b/tests/test-audit-path.t
@@ -5,7 +5,7 @@
should fail
$ hg add .hg/00changelog.i
- abort: path contains illegal component: .hg/00changelog.i
+ abort: path contains illegal component: .hg/00changelog.i (glob)
[255]
$ mkdir a
@@ -18,7 +18,7 @@
should fail
$ hg add b/b
- abort: path 'b/b' traverses symbolic link 'b'
+ abort: path 'b/b' traverses symbolic link 'b' (glob)
[255]
should succeed
@@ -28,7 +28,7 @@
should still fail - maybe
$ hg add b/b
- abort: path 'b/b' traverses symbolic link 'b'
+ abort: path 'b/b' traverses symbolic link 'b' (glob)
[255]
unbundle tampered bundle
diff --git a/tests/test-commit.t b/tests/test-commit.t
--- a/tests/test-commit.t
+++ b/tests/test-commit.t
@@ -45,7 +45,7 @@
$ mkdir dir
$ echo boo > dir/file
$ hg add
- adding dir/file
+ adding dir/file (glob)
$ hg -v commit -m commit-9 dir
dir/file
committed changeset 2:d2a76177cb42
@@ -115,8 +115,8 @@
$ mkdir bar
$ echo bar > bar/bar
$ hg add
- adding bar/bar
- adding foo/foo
+ adding bar/bar (glob)
+ adding foo/foo (glob)
$ hg ci -m commit-subdir-1 foo
$ hg ci -m commit-subdir-2 bar
diff --git a/tests/test-contrib.t b/tests/test-contrib.t
--- a/tests/test-contrib.t
+++ b/tests/test-contrib.t
@@ -107,7 +107,7 @@
Test shrink-revlog:
$ cd repo-a
$ hg --config extensions.shrink=$CONTRIBDIR/shrink-revlog.py shrink
- shrinking $TESTTMP/repo-a/.hg/store/00manifest.i
+ shrinking $TESTTMP/repo-a/.hg/store/00manifest.i (glob)
reading revs
sorting revs
writing revs
@@ -115,8 +115,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
- $TESTTMP/repo-a/.hg/store/00manifest.d.old
+ $TESTTMP/repo-a/.hg/store/00manifest.i.old (glob)
+ $TESTTMP/repo-a/.hg/store/00manifest.d.old (glob)
(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
+ Writing author map file $TESTTMP/new/.hg/authormap (glob)
$ 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
+ Ignoring bad line in author map file $TESTTMP/new/.hg/authormap: this line is ignored (glob)
scanning source...
sorting...
converting...
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
+ pushing to $TESTTMP/a (glob)
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
+ pushing to $TESTTMP/c (glob)
searching for changes
adding changesets
adding manifests
diff --git a/tests/test-dirstate.t b/tests/test-dirstate.t
--- a/tests/test-dirstate.t
+++ b/tests/test-dirstate.t
@@ -11,9 +11,9 @@
adding a/b/c/d/y
adding a/b/c/d/z
$ hg mv a z
- moving a/b/c/d/x to z/b/c/d/x
- moving a/b/c/d/y to z/b/c/d/y
- moving a/b/c/d/z to z/b/c/d/z
+ moving a/b/c/d/x to z/b/c/d/x (glob)
+ moving a/b/c/d/y to z/b/c/d/y (glob)
+ moving a/b/c/d/z to z/b/c/d/z (glob)
$ cd ..
Issue1790: dirstate entry locked into unset if file mtime is set into
diff --git a/tests/test-extension.t b/tests/test-extension.t
--- a/tests/test-extension.t
+++ b/tests/test-extension.t
@@ -473,7 +473,7 @@
> cmdtable = None
> EOF
$ hg --config extensions.path=./path.py help foo > /dev/null
- warning: error finding commands in $TESTTMP/hgext/forest.py
+ warning: error finding commands in $TESTTMP/hgext/forest.py (glob)
hg: unknown command 'foo'
- warning: error finding commands in $TESTTMP/hgext/forest.py
+ warning: error finding commands in $TESTTMP/hgext/forest.py (glob)
[255]
diff --git a/tests/test-fncache.t b/tests/test-fncache.t
--- a/tests/test-fncache.t
+++ b/tests/test-fncache.t
@@ -14,7 +14,7 @@
$ mkdir a.i
$ echo "some other text" > a.i/b
$ hg add
- adding a.i/b
+ adding a.i/b (glob)
$ hg ci -m second
$ cat .hg/store/fncache | sort
data/a.i
@@ -25,7 +25,7 @@
$ mkdir a.i.hg
$ echo "yet another text" > a.i.hg/c
$ hg add
- adding a.i.hg/c
+ adding a.i.hg/c (glob)
$ hg ci -m third
$ cat .hg/store/fncache | sort
data/a.i
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
+ abort: $TESTTMP/.hgignore: invalid pattern (relre): *.o (glob)
[255]
$ echo ".*\.o" > .hgignore
@@ -88,7 +88,7 @@
$ echo "syntax: invalid" > .hgignore
$ hg status
- $TESTTMP/.hgignore: ignoring invalid syntax 'invalid'
+ $TESTTMP/.hgignore: ignoring invalid syntax 'invalid' (glob)
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
@@ -26,12 +26,12 @@
$ cd foobar
$ cat .hg/hgrc
[paths]
- default = $TESTTMP/foo%bar
+ default = $TESTTMP/foo%bar (glob)
$ hg paths
- default = $TESTTMP/foo%bar
+ default = $TESTTMP/foo%bar (glob)
$ hg showconfig
- bundle.mainreporoot=$TESTTMP/foobar
- paths.default=$TESTTMP/foo%bar
+ bundle.mainreporoot=$TESTTMP/foobar (glob)
+ paths.default=$TESTTMP/foo%bar (glob)
$ cd ..
issue1829: wrong indentation
diff --git a/tests/test-install.t b/tests/test-install.t
--- a/tests/test-install.t
+++ b/tests/test-install.t
@@ -1,8 +1,8 @@
hg debuginstall
$ hg debuginstall
Checking encoding (ascii)...
- Checking installed modules (*/mercurial)... (glob)
- Checking templates (*/mercurial/templates)... (glob)
+ Checking installed modules (*mercurial)... (glob)
+ Checking templates (*mercurial?templates)... (glob)
Checking commit editor...
Checking username...
No problems detected
@@ -10,8 +10,8 @@
hg debuginstall with no username
$ HGUSER= hg debuginstall
Checking encoding (ascii)...
- Checking installed modules (*/mercurial)... (glob)
- Checking templates (*/mercurial/templates)... (glob)
+ Checking installed modules (*mercurial)... (glob)
+ Checking templates (*mercurial?templates)... (glob)
Checking commit editor...
Checking username...
no username supplied (see "hg help config")
diff --git a/tests/test-issue1089.t b/tests/test-issue1089.t
--- a/tests/test-issue1089.t
+++ b/tests/test-issue1089.t
@@ -7,7 +7,7 @@
adding a/b
$ hg rm a
- removing a/b
+ removing a/b (glob)
$ hg ci -m m a
$ mkdir a b
@@ -16,7 +16,7 @@
adding a/b
$ hg rm a
- removing a/b
+ removing a/b (glob)
$ cd b
Relative delete:
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
+ pulling from $TESTTMP/foo (glob)
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
+ pulling from $TESTTMP/foo (glob)
searching for changes
adding changesets
adding manifests
diff --git a/tests/test-issue612.t b/tests/test-issue612.t
--- a/tests/test-issue612.t
+++ b/tests/test-issue612.t
@@ -7,7 +7,7 @@
adding src/a.c
$ hg mv src source
- moving src/a.c to source/a.c
+ moving src/a.c to source/a.c (glob)
$ hg ci -Ammove
diff --git a/tests/test-issue660.t b/tests/test-issue660.t
--- a/tests/test-issue660.t
+++ b/tests/test-issue660.t
@@ -67,9 +67,9 @@
$ hg revert --all
undeleting a
- forgetting a/a
+ forgetting a/a (glob)
forgetting b
- undeleting b/b
+ undeleting b/b (glob)
$ hg st
diff --git a/tests/test-keyword.t b/tests/test-keyword.t
--- a/tests/test-keyword.t
+++ b/tests/test-keyword.t
@@ -210,7 +210,7 @@
Message-Id: <hg.a2392c293916*> (glob)
To: Test
- changeset a2392c293916 in $TESTTMP/Test
+ changeset a2392c293916 in $TESTTMP/Test (glob)
details: $TESTTMP/Test?cmd=changeset;node=a2392c293916
description:
addsym
@@ -233,7 +233,7 @@
Message-Id: <hg.ef63ca68695b*> (glob)
To: Test
- changeset ef63ca68695b in $TESTTMP/Test
+ changeset ef63ca68695b in $TESTTMP/Test (glob)
details: $TESTTMP/Test?cmd=changeset;node=ef63ca68695b
description:
absym
@@ -799,7 +799,7 @@
> default = ../Test
> EOF
$ hg incoming
- comparing with $TESTTMP/Test
+ comparing with $TESTTMP/Test (glob)
searching for changes
changeset: 2:bb948857c743
tag: tip
diff --git a/tests/test-largefiles.t b/tests/test-largefiles.t
--- a/tests/test-largefiles.t
+++ b/tests/test-largefiles.t
@@ -185,8 +185,8 @@
$ echo large6 > sub2/large6
$ echo large7 > sub2/large7
$ hg add --large sub2
- adding sub2/large6 as a largefile
- adding sub2/large7 as a largefile
+ adding sub2/large6 as a largefile (glob)
+ adding sub2/large7 as a largefile (glob)
$ hg st
M large3
A large5
@@ -350,7 +350,7 @@
added 1 changesets with 2 changes to 2 files (+1 heads)
getting changed largefiles
1 largefiles updated, 0 removed
- saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg
+ saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
nothing to rebase
$ hg log --template '{rev}:{node|short} {desc|firstline}\n'
9:598410d3eb9a modify normal file largefile in repo d
@@ -385,7 +385,7 @@
$ hg rebase
getting changed largefiles
1 largefiles updated, 0 removed
- saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg
+ saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
$ hg log
changeset: 9:598410d3eb9a
tag: tip
@@ -555,8 +555,8 @@
# XXX we don't really want to report that we're reverting the standin;
# that's just an implementation detail. But I don't see an obvious fix. ;-(
$ hg revert sub
- reverting .hglf/sub/large4
- reverting sub/normal4
+ reverting .hglf/sub/large4 (glob)
+ reverting sub/normal4 (glob)
$ hg status
M normal3
A sub2/large8
@@ -568,8 +568,8 @@
$ cat sub/large4
large4-modified
$ hg revert -a --no-backup
- undeleting .hglf/sub2/large6
- forgetting .hglf/sub2/large8
+ undeleting .hglf/sub2/large6 (glob)
+ forgetting .hglf/sub2/large8 (glob)
reverting normal3
$ hg status
? sub/large4.orig
@@ -583,11 +583,11 @@
revert some files to an older revision
$ hg revert --no-backup -r 8 sub2
- reverting .hglf/sub2/large6
+ reverting .hglf/sub2/large6 (glob)
$ cat sub2/large6
large6
$ hg revert --no-backup sub2
- reverting .hglf/sub2/large6
+ reverting .hglf/sub2/large6 (glob)
$ hg status
"verify --large" actually verifies largefiles
diff --git a/tests/test-lfconvert.t b/tests/test-lfconvert.t
--- a/tests/test-lfconvert.t
+++ b/tests/test-lfconvert.t
@@ -83,7 +83,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.
+ warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file. (glob)
merging stuff/maybelarge.dat failed!
merging sub/normal2 and stuff/normal2 to stuff/normal2
0 files updated, 1 files merged, 0 files removed, 1 files unresolved
@@ -170,7 +170,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!
+ abort: .hg/sharedpath points to nonexistent directory $TESTTMP/bogus! (glob)
[255]
$ hg lfconvert bigfile-repo largefiles-repo
initializing destination largefiles-repo
diff --git a/tests/test-locate.t b/tests/test-locate.t
--- a/tests/test-locate.t
+++ b/tests/test-locate.t
@@ -88,33 +88,33 @@
$ rm -r t
$ hg locate 't/**'
- t/b
- t/e.h
- t/x
+ t/b (glob)
+ t/e.h (glob)
+ t/x (glob)
$ mkdir otherdir
$ cd otherdir
$ hg locate b
- ../b
- ../t/b
+ ../b (glob)
+ ../t/b (glob)
$ hg locate '*.h'
- ../t.h
- ../t/e.h
+ ../t.h (glob)
+ ../t/e.h (glob)
$ hg locate path:t/x
- ../t/x
+ ../t/x (glob)
$ hg locate 're:.*\.h$'
- ../t.h
- ../t/e.h
+ ../t.h (glob)
+ ../t/e.h (glob)
$ hg locate -r 0 b
- ../b
- ../t/b
+ ../b (glob)
+ ../t/b (glob)
$ hg locate -r 0 '*.h'
- ../t.h
- ../t/e.h
+ ../t.h (glob)
+ ../t/e.h (glob)
$ hg locate -r 0 path:t/x
- ../t/x
+ ../t/x (glob)
$ hg locate -r 0 're:.*\.h$'
- ../t.h
- ../t/e.h
+ ../t.h (glob)
+ ../t/e.h (glob)
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
+ copy $TESTTMP/t/.hg/patches to $TESTTMP/t/.hg/patches.1 (glob)
$ 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
+ merging with queue at: $TESTTMP/t/.hg/patches.1 (glob)
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
+ copy $TESTTMP/t2/.hg/patches to $TESTTMP/t2/.hg/refqueue (glob)
$ 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
+ merging with queue at: $TESTTMP/t2/.hg/refqueue (glob)
applying patcha
patching file a
Hunk #1 FAILED at 0
diff --git a/tests/test-mq-safety.t b/tests/test-mq-safety.t
--- a/tests/test-mq-safety.t
+++ b/tests/test-mq-safety.t
@@ -39,7 +39,7 @@
abort: popping would remove a revision not managed by this patch queue
[255]
$ hg qpop -n patches
- using patch queue: $TESTTMP/repo/.hg/patches
+ using patch queue: $TESTTMP/repo/.hg/patches (glob)
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
@@ -137,7 +137,7 @@
guards
$ cat .hg/patches/series
$ hg qinit -c
- abort: repository $TESTTMP/d/.hg/patches already exists!
+ abort: repository $TESTTMP/d/.hg/patches already exists! (glob)
[255]
$ cd ..
@@ -156,8 +156,8 @@
$ echo status >> .hg/patches/.hgignore
$ echo bleh >> .hg/patches/.hgignore
$ hg qinit -c
- adding .hg/patches/A
- adding .hg/patches/B
+ adding .hg/patches/A (glob)
+ adding .hg/patches/B (glob)
$ hg -R .hg/patches status
A .hgignore
A A
@@ -1193,7 +1193,7 @@
$ cd qclonesource
$ hg qinit -c
- adding .hg/patches/patch1
+ adding .hg/patches/patch1 (glob)
$ hg qci -m checkpoint
$ qlog
main repo:
diff --git a/tests/test-mv-cp-st-diff.t b/tests/test-mv-cp-st-diff.t
--- a/tests/test-mv-cp-st-diff.t
+++ b/tests/test-mv-cp-st-diff.t
@@ -1138,7 +1138,7 @@
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
- moving x/x to y/x
+ moving x/x to y/x (glob)
** directory move **
** hg mv x y / add y/x x1 / add y/x x2
- working to parent:
diff --git a/tests/test-nested-repo.t b/tests/test-nested-repo.t
--- a/tests/test-nested-repo.t
+++ b/tests/test-nested-repo.t
@@ -11,16 +11,16 @@
Should fail:
$ hg st b/x
- abort: path 'b/x' is inside nested repo 'b'
+ abort: path 'b/x' is inside nested repo 'b' (glob)
[255]
$ hg add b/x
- abort: path 'b/x' is inside nested repo 'b'
+ abort: path 'b/x' is inside nested repo 'b' (glob)
[255]
Should fail:
$ hg add b b/x
- abort: path 'b/x' is inside nested repo 'b'
+ abort: path 'b/x' is inside nested repo 'b' (glob)
[255]
$ hg st
@@ -34,7 +34,7 @@
Should fail:
$ hg mv a b
- abort: path 'b/a' is inside nested repo 'b'
+ abort: path 'b/a' is inside nested repo 'b' (glob)
[255]
$ hg st
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 at bar
- changeset cb9a9f314b8b in $TESTTMP/a
+ changeset cb9a9f314b8b in $TESTTMP/a (glob)
details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b
summary: a
- changeset ba677d0156c1 in $TESTTMP/a
+ changeset ba677d0156c1 in $TESTTMP/a (glob)
details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1
summary: b
@@ -107,11 +107,11 @@
Message-Id: <*> (glob)
To: baz, foo at bar
- changeset cb9a9f314b8b in $TESTTMP/a
+ changeset cb9a9f314b8b in $TESTTMP/a (glob)
details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b
summary: a
- changeset ba677d0156c1 in $TESTTMP/a
+ changeset ba677d0156c1 in $TESTTMP/a (glob)
details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1
summary: b
diff --git a/tests/test-notify.t b/tests/test-notify.t
--- a/tests/test-notify.t
+++ b/tests/test-notify.t
@@ -173,7 +173,7 @@
Message-Id: <*> (glob)
To: baz, foo at bar
- changeset 0647d048b600 in $TESTTMP/b
+ changeset 0647d048b600 in $TESTTMP/b (glob)
details: $TESTTMP/b?cmd=changeset;node=0647d048b600
description: b
diff --git a/tests/test-paths.t b/tests/test-paths.t
--- a/tests/test-paths.t
+++ b/tests/test-paths.t
@@ -7,29 +7,29 @@
$ echo 'dupe = ../b' >> .hg/hgrc
$ echo 'expand = $SOMETHING/bar' >> .hg/hgrc
$ hg in dupe
- comparing with $TESTTMP/b
+ comparing with $TESTTMP/b (glob)
no changes found
[1]
$ cd ..
$ hg -R a in dupe
- comparing with $TESTTMP/b
+ comparing with $TESTTMP/b (glob)
no changes found
[1]
$ cd a
$ hg paths
- dupe = $TESTTMP/b
- expand = $TESTTMP/a/$SOMETHING/bar
+ dupe = $TESTTMP/b (glob)
+ expand = $TESTTMP/a/$SOMETHING/bar (glob)
$ SOMETHING=foo hg paths
- dupe = $TESTTMP/b
- expand = $TESTTMP/a/foo/bar
+ dupe = $TESTTMP/b (glob)
+ expand = $TESTTMP/a/foo/bar (glob)
$ SOMETHING=/foo hg paths
- dupe = $TESTTMP/b
+ dupe = $TESTTMP/b (glob)
expand = /foo/bar
$ hg paths -q
dupe
expand
$ hg paths dupe
- $TESTTMP/b
+ $TESTTMP/b (glob)
$ 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
+ pulling from $TESTTMP/repo2 (glob)
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
@@ -40,7 +40,7 @@
Expected to fail:
$ hg push
- pushing to $TESTTMP/test
+ pushing to $TESTTMP/test (glob)
searching for changes
adding changesets
adding manifests
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
@@ -283,7 +283,7 @@
$ hg rebase -d 5 -s 7
- saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-backup.hg
+ saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-backup.hg (glob)
$ hg tglog
@ 8: 'D'
|
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
+ pulling from $TESTTMP/a (glob)
searching for changes
adding changesets
adding manifests
@@ -68,7 +68,7 @@
Re-run:
$ hg pull --rebase
- pulling from $TESTTMP/a
+ pulling from $TESTTMP/a (glob)
searching for changes
no changes found
@@ -78,7 +78,7 @@
$ cd ../c
$ hg pull --rebase
- pulling from $TESTTMP/a
+ pulling from $TESTTMP/a (glob)
searching for changes
adding changesets
adding manifests
@@ -94,7 +94,7 @@
pull --rebase --update should ignore --update:
$ hg pull --rebase --update
- pulling from $TESTTMP/a
+ pulling from $TESTTMP/a (glob)
searching for changes
no changes found
@@ -103,7 +103,7 @@
$ hg up -q 1
$ hg pull --rebase
- pulling from $TESTTMP/a
+ pulling from $TESTTMP/a (glob)
searching for changes
no changes found
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
@@ -251,7 +251,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
+ saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg (glob)
$ hg tglog
@ 7: 'D'
|
@@ -473,7 +473,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
+ saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-backup.hg (glob)
$ hg tglog
@ 8: 'I'
|
diff --git a/tests/test-relink.t b/tests/test-relink.t
--- a/tests/test-relink.t
+++ b/tests/test-relink.t
@@ -39,7 +39,7 @@
don't sit forever trying to double-lock the source repo
$ hg relink .
- relinking $TESTTMP/repo/.hg/store to $TESTTMP/repo/.hg/store
+ relinking $TESTTMP/repo/.hg/store to $TESTTMP/repo/.hg/store (glob)
there is nothing to relink
diff --git a/tests/test-remove.t b/tests/test-remove.t
--- a/tests/test-remove.t
+++ b/tests/test-remove.t
@@ -196,8 +196,8 @@
$ rm test/bar
$ remove test
- removing test/bar
- removing test/foo
+ removing test/bar (glob)
+ removing test/foo (glob)
exit code: 0
R test/bar
R test/foo
@@ -208,8 +208,8 @@
$ rm test/bar
$ remove -f test
- removing test/bar
- removing test/foo
+ removing test/bar (glob)
+ removing test/foo (glob)
exit code: 0
R test/bar
R test/foo
@@ -220,8 +220,8 @@
$ rm test/bar
$ remove -A test
- not removing test/foo: file still exists (use -f to force removal)
- removing test/bar
+ not removing test/foo: file still exists (use -f to force removal) (glob)
+ removing test/bar (glob)
exit code: 1
R test/bar
./foo
@@ -232,8 +232,8 @@
$ rm test/bar
$ remove -Af test
- removing test/bar
- removing test/foo
+ removing test/bar (glob)
+ removing test/foo (glob)
exit code: 0
R test/bar
R test/foo
@@ -250,7 +250,7 @@
adding issue1861/b/c/y
adding issue1861/x
$ hg rm issue1861/b
- removing issue1861/b/c/y
+ removing issue1861/b/c/y (glob)
$ hg ci -m remove
$ ls issue1861
x
diff --git a/tests/test-rename-dir-merge.t b/tests/test-rename-dir-merge.t
--- a/tests/test-rename-dir-merge.t
+++ b/tests/test-rename-dir-merge.t
@@ -11,8 +11,8 @@
$ hg co -C 0
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg mv a b
- moving a/a to b/a
- moving a/b to b/b
+ moving a/a to b/a (glob)
+ moving a/b to b/b (glob)
$ hg ci -m "1 mv a/ b/"
$ hg co -C 0
@@ -75,7 +75,7 @@
? b/d
$ hg ci -m "3 merge 2+1"
$ hg debugrename b/c
- b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88
+ b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 (glob)
$ hg co -C 1
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -111,7 +111,7 @@
$ hg ci -m "4 merge 1+2"
created new head
$ hg debugrename b/c
- b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88
+ b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 (glob)
Second scenario with two repos:
@@ -122,7 +122,7 @@
$ mkdir a
$ echo foo > a/f
$ hg add a
- adding a/f
+ adding a/f (glob)
$ hg ci -m "a/f == foo"
$ cd ..
@@ -131,7 +131,7 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd r2
$ hg mv a b
- moving a/f to b/f
+ moving a/f to b/f (glob)
$ echo foo1 > b/f
$ hg ci -m" a -> b, b/f == foo1"
$ cd ..
@@ -140,7 +140,7 @@
$ mkdir a/aa
$ echo bar > a/aa/g
$ hg add a/aa
- adding a/aa/g
+ adding a/aa/g (glob)
$ hg ci -m "a/aa/g"
$ hg pull ../r2
pulling from ../r2
diff --git a/tests/test-rename.t b/tests/test-rename.t
--- a/tests/test-rename.t
+++ b/tests/test-rename.t
@@ -71,7 +71,7 @@
rename --after a single file to a nonexistant target filename
$ hg rename --after d1/a dummy
- d1/a: not recording move - dummy does not exist
+ d1/a: not recording move - dummy does not exist (glob)
move a single file to an existing directory
@@ -121,10 +121,10 @@
rename directory d1 as d3
$ hg rename d1/ d3
- moving d1/a to d3/a
- moving d1/b to d3/b
- moving d1/ba to d3/ba
- moving d1/d11/a1 to d3/d11/a1
+ moving d1/a to d3/a (glob)
+ moving d1/b to d3/b (glob)
+ moving d1/ba to d3/ba (glob)
+ moving d1/d11/a1 to d3/d11/a1 (glob)
$ hg status -C
A d3/a
d1/a
@@ -146,10 +146,10 @@
$ mv d1 d3
$ hg rename --after d1 d3
- moving d1/a to d3/a
- moving d1/b to d3/b
- moving d1/ba to d3/ba
- moving d1/d11/a1 to d3/d11/a1
+ moving d1/a to d3/a (glob)
+ moving d1/b to d3/b (glob)
+ moving d1/ba to d3/ba (glob)
+ moving d1/d11/a1 to d3/d11/a1 (glob)
$ hg status -C
A d3/a
d1/a
@@ -170,7 +170,7 @@
move a directory using a relative path
$ (cd d2; mkdir d3; hg rename ../d1/d11 d3)
- moving ../d1/d11/a1 to d3/d11/a1
+ moving ../d1/d11/a1 to d3/d11/a1 (glob)
$ hg status -C
A d2/d3/d11/a1
d1/d11/a1
@@ -182,7 +182,7 @@
move --after a directory using a relative path
$ (cd d2; mkdir d3; mv ../d1/d11 d3; hg rename --after ../d1/d11 d3)
- moving ../d1/d11/a1 to d3/d11/a1
+ moving ../d1/d11/a1 to d3/d11/a1 (glob)
$ hg status -C
A d2/d3/d11/a1
d1/d11/a1
@@ -194,7 +194,7 @@
move directory d1/d11 to an existing directory d2 (removes empty d1)
$ hg rename d1/d11/ d2
- moving d1/d11/a1 to d2/d11/a1
+ moving d1/d11/a1 to d2/d11/a1 (glob)
$ hg status -C
A d2/d11/a1
d1/d11/a1
@@ -207,11 +207,11 @@
$ mkdir d3
$ hg rename d1 d2 d3
- moving d1/a to d3/d1/a
- moving d1/b to d3/d1/b
- moving d1/ba to d3/d1/ba
- moving d1/d11/a1 to d3/d1/d11/a1
- moving d2/b to d3/d2/b
+ moving d1/a to d3/d1/a (glob)
+ moving d1/b to d3/d1/b (glob)
+ moving d1/ba to d3/d1/ba (glob)
+ moving d1/d11/a1 to d3/d1/d11/a1 (glob)
+ moving d2/b to d3/d2/b (glob)
$ hg status -C
A d3/d1/a
d1/a
@@ -237,11 +237,11 @@
$ mkdir d3
$ mv d1 d2 d3
$ hg rename --after d1 d2 d3
- moving d1/a to d3/d1/a
- moving d1/b to d3/d1/b
- moving d1/ba to d3/d1/ba
- moving d1/d11/a1 to d3/d1/d11/a1
- moving d2/b to d3/d2/b
+ moving d1/a to d3/d1/a (glob)
+ moving d1/b to d3/d1/b (glob)
+ moving d1/ba to d3/d1/ba (glob)
+ moving d1/d11/a1 to d3/d1/d11/a1 (glob)
+ moving d2/b to d3/d2/b (glob)
$ hg status -C
A d3/d1/a
d1/a
@@ -267,7 +267,7 @@
$ hg rename d1/* d2
d2/b: not overwriting - file exists
- moving d1/d11/a1 to d2/d11/a1
+ moving d1/d11/a1 to d2/d11/a1 (glob)
$ hg status -C
A d2/a
d1/a
@@ -308,10 +308,10 @@
$ mkdir d2/d21
$ hg rename 'glob:d1/**' d2/d21
- moving d1/a to d2/d21/a
- moving d1/b to d2/d21/b
- moving d1/ba to d2/d21/ba
- moving d1/d11/a1 to d2/d21/a1
+ moving d1/a to d2/d21/a (glob)
+ moving d1/b to d2/d21/b (glob)
+ moving d1/ba to d2/d21/ba (glob)
+ moving d1/d11/a1 to d2/d21/a1 (glob)
$ hg status -C
A d2/d21/a
d1/a
@@ -334,10 +334,10 @@
$ mkdir d2/d21
$ mv d1/a d1/d11/a1 d2/d21
$ hg rename --after 'glob:d1/**' d2/d21
- moving d1/a to d2/d21/a
- d1/b: not recording move - d2/d21/b does not exist
- d1/ba: not recording move - d2/d21/ba does not exist
- moving d1/d11/a1 to d2/d21/a1
+ moving d1/a to d2/d21/a (glob)
+ d1/b: not recording move - d2/d21/b does not exist (glob)
+ d1/ba: not recording move - d2/d21/ba does not exist (glob)
+ moving d1/d11/a1 to d2/d21/a1 (glob)
$ hg status -C
A d2/d21/a
d1/a
@@ -353,8 +353,8 @@
$ mkdir d2/d21
$ hg rename 're:d1/([^a][^/]*/)*a.*' d2/d21
- moving d1/a to d2/d21/a
- moving d1/d11/a1 to d2/d21/a1
+ moving d1/a to d2/d21/a (glob)
+ moving d1/d11/a1 to d2/d21/a1 (glob)
$ hg status -C
A d2/d21/a
d1/a
@@ -415,7 +415,7 @@
$ mkdir d3
$ hg rename d1/* d2/* d3
- moving d1/d11/a1 to d3/d11/a1
+ moving d1/d11/a1 to d3/d11/a1 (glob)
d3/b: not overwriting - d2/b collides with d1/b
$ hg status -C
A d3/a
@@ -441,7 +441,7 @@
moving a to ../d3/d1/a
moving b to ../d3/d1/b
moving ba to ../d3/d1/ba
- moving d11/a1 to ../d3/d1/d11/a1
+ moving d11/a1 to ../d3/d1/d11/a1 (glob)
$ hg status -C
A d3/d1/a
d1/a
@@ -467,7 +467,7 @@
moving a to ../d3/a
moving b to ../d3/b
moving ba to ../d3/ba
- moving d11/a1 to ../d3/d11/a1
+ moving d11/a1 to ../d3/d11/a1 (glob)
$ hg status -C
A d3/a
d1/a
@@ -488,9 +488,9 @@
move the parent tree with "hg rename .."
$ (cd d1/d11; hg rename .. ../../d3)
- moving ../a to ../../d3/a
- moving ../b to ../../d3/b
- moving ../ba to ../../d3/ba
+ moving ../a to ../../d3/a (glob)
+ moving ../b to ../../d3/b (glob)
+ moving ../ba to ../../d3/ba (glob)
moving a1 to ../../d3/d11/a1
$ hg status -C
A d3/a
@@ -513,9 +513,9 @@
$ hg remove d1/b
$ hg rename d1 d3
- moving d1/a to d3/a
- moving d1/ba to d3/ba
- moving d1/d11/a1 to d3/d11/a1
+ moving d1/a to d3/a (glob)
+ moving d1/ba to d3/ba (glob)
+ moving d1/d11/a1 to d3/d11/a1 (glob)
$ hg status -C
A d3/a
d1/a
@@ -589,7 +589,7 @@
check illegal path components
$ hg rename d1/d11/a1 .hg/foo
- abort: path contains illegal component: .hg/foo
+ abort: path contains illegal component: .hg/foo (glob)
[255]
$ hg status -C
$ hg rename d1/d11/a1 ../foo
@@ -599,7 +599,7 @@
$ mv d1/d11/a1 .hg/foo
$ hg rename --after d1/d11/a1 .hg/foo
- abort: path contains illegal component: .hg/foo
+ abort: path contains illegal component: .hg/foo (glob)
[255]
$ hg status -C
! d1/d11/a1
@@ -608,17 +608,17 @@
$ rm .hg/foo
$ hg rename d1/d11/a1 .hg
- abort: path contains illegal component: .hg/a1
+ abort: path contains illegal component: .hg/a1 (glob)
[255]
$ hg status -C
$ hg rename d1/d11/a1 ..
- abort: ../a1 not under root
+ abort: ../a1 not under root (glob)
[255]
$ hg status -C
$ mv d1/d11/a1 .hg
$ hg rename --after d1/d11/a1 .hg
- abort: path contains illegal component: .hg/a1
+ abort: path contains illegal component: .hg/a1 (glob)
[255]
$ hg status -C
! d1/d11/a1
@@ -627,7 +627,7 @@
$ rm .hg/a1
$ (cd d1/d11; hg rename ../../d2/b ../../.hg/foo)
- abort: path contains illegal component: .hg/foo
+ abort: path contains illegal component: .hg/foo (glob)
[255]
$ hg status -C
$ (cd d1/d11; hg rename ../../d2/b ../../../foo)
diff --git a/tests/test-revert.t b/tests/test-revert.t
--- a/tests/test-revert.t
+++ b/tests/test-revert.t
@@ -216,11 +216,11 @@
$ echo foo > newdir/newfile
$ hg add newdir/newfile
$ hg revert b newdir
- reverting b/b
- forgetting newdir/newfile
+ reverting b/b (glob)
+ forgetting newdir/newfile (glob)
$ echo foobar > b/b
$ hg revert .
- reverting b/b
+ reverting b/b (glob)
reverting a rename target should revert the source
@@ -261,8 +261,8 @@
$ hg revert -a --no-backup
reverting ignored
- reverting ignoreddir/file
- undeleting ignoreddir/removed
+ reverting ignoreddir/file (glob)
+ undeleting ignoreddir/removed (glob)
undeleting removed
$ hg st -mardi
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
@@ -39,7 +39,7 @@
$ cd b
$ cat .hg/hgrc
[paths]
- default = $TESTTMP/a#stable
+ default = $TESTTMP/a#stable (glob)
$ echo red >> a
$ hg ci -qm3
@@ -60,7 +60,7 @@
$ hg tout
- comparing with $TESTTMP/a
+ comparing with $TESTTMP/a (glob)
searching for changes
2:1d4099801a4e: '3' stable
@@ -79,11 +79,11 @@
$ cat .hg/hgrc
[paths]
- default = $TESTTMP/a#stable
+ default = $TESTTMP/a#stable (glob)
green = ../a#default
$ hg tout green
- comparing with $TESTTMP/a
+ comparing with $TESTTMP/a (glob)
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
+ $TESTTMP/repo1/.hg (glob)
trailing newline on .hg/sharedpath is ok
$ hg tip -q
0:d3873e73d99e
$ echo '' >> .hg/sharedpath
$ cat .hg/sharedpath
- $TESTTMP/repo1/.hg
+ $TESTTMP/repo1/.hg (glob)
$ hg tip -q
0:d3873e73d99e
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
@@ -3,7 +3,7 @@
$ hg init sub2
$ echo sub2 > sub2/sub2
$ hg add -R sub2
- adding sub2/sub2
+ adding sub2/sub2 (glob)
$ hg commit -R sub2 -m "sub2 import"
Preparing the 'sub1' repo which depends on the subrepo 'sub2'
@@ -15,8 +15,8 @@
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg add -R sub1
- adding sub1/.hgsub
- adding sub1/sub1
+ adding sub1/.hgsub (glob)
+ adding sub1/sub1 (glob)
$ hg commit -R sub1 -m "sub1 import"
committing subrepository sub2
@@ -30,8 +30,8 @@
cloning subrepo sub2 from $TESTTMP/sub2
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg add -R main
- adding main/.hgsub
- adding main/main
+ adding main/.hgsub (glob)
+ adding main/main (glob)
$ hg commit -R main -m "main import"
committing subrepository sub1
@@ -51,7 +51,7 @@
$ hg clone main cloned
updating to branch default
cloning subrepo sub1 from $TESTTMP/sub1
- cloning subrepo sub1/sub2 from $TESTTMP/sub2
+ cloning subrepo sub1/sub2 from $TESTTMP/sub2 (glob)
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
Checking cloned repo ids
@@ -79,7 +79,7 @@
$ echo modified > cloned/sub1/sub2/sub2
$ hg commit --subrepos -m "deep nested modif should trigger a commit" -R cloned
committing subrepository sub1
- committing subrepository sub1/sub2
+ committing subrepository sub1/sub2 (glob)
Checking modified node ids
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,5 +55,5 @@
> .* = \1
> EOF
$ hg debugsub
- abort: bad subrepository pattern in $TESTTMP/outer/.hg/hgrc:2: invalid group reference
+ abort: bad subrepository pattern in $TESTTMP/outer/.hg/hgrc:2: invalid group reference (glob)
[255]
diff --git a/tests/test-subrepo-recursion.t b/tests/test-subrepo-recursion.t
--- a/tests/test-subrepo-recursion.t
+++ b/tests/test-subrepo-recursion.t
@@ -265,10 +265,10 @@
archiving (foo) [====================================>] 3/3
archiving (foo) [====================================>] 3/3
- archiving (foo/bar) [ ] 0/1
- archiving (foo/bar) [ ] 0/1
- archiving (foo/bar) [================================>] 1/1
- archiving (foo/bar) [================================>] 1/1
+ archiving (foo/bar) [ ] 0/1 (glob)
+ archiving (foo/bar) [ ] 0/1 (glob)
+ archiving (foo/bar) [================================>] 1/1 (glob)
+ archiving (foo/bar) [================================>] 1/1 (glob)
\r (esc)
$ find ../archive | sort
../archive
@@ -305,10 +305,10 @@
archiving (foo) [====================================>] 3/3
archiving (foo) [====================================>] 3/3
- archiving (foo/bar) [ ] 0/1
- archiving (foo/bar) [ ] 0/1
- archiving (foo/bar) [================================>] 1/1
- archiving (foo/bar) [================================>] 1/1
+ archiving (foo/bar) [ ] 0/1 (glob)
+ archiving (foo/bar) [ ] 0/1 (glob)
+ archiving (foo/bar) [================================>] 1/1 (glob)
+ archiving (foo/bar) [================================>] 1/1 (glob)
\r (esc)
Test archiving a revision that references a subrepo that is not yet
@@ -336,10 +336,10 @@
archiving (foo) [====================================>] 3/3
archiving (foo) [====================================>] 3/3
- archiving (foo/bar) [ ] 0/1
- archiving (foo/bar) [ ] 0/1
- archiving (foo/bar) [================================>] 1/1
- archiving (foo/bar) [================================>] 1/1
+ archiving (foo/bar) [ ] 0/1 (glob)
+ archiving (foo/bar) [ ] 0/1 (glob)
+ archiving (foo/bar) [================================>] 1/1 (glob)
+ archiving (foo/bar) [================================>] 1/1 (glob)
cloning subrepo foo from $TESTTMP/repo/foo
cloning subrepo foo/bar from $TESTTMP/repo/foo/bar
diff --git a/tests/test-subrepo-relative-path.t b/tests/test-subrepo-relative-path.t
--- a/tests/test-subrepo-relative-path.t
+++ b/tests/test-subrepo-relative-path.t
@@ -5,7 +5,7 @@
$ hg init sub
$ echo sub > sub/sub
$ hg add -R sub
- adding sub/sub
+ adding sub/sub (glob)
$ hg commit -R sub -m "sub import"
Preparing the 'main' repo which depends on the subrepo 'sub'
@@ -17,8 +17,8 @@
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg add -R main
- adding main/.hgsub
- adding main/main
+ adding main/.hgsub (glob)
+ adding main/main (glob)
$ hg commit -R main -m "main import"
committing subrepository sub
diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
--- a/tests/test-subrepo.t
+++ b/tests/test-subrepo.t
@@ -49,7 +49,7 @@
$ hg revert -a
$ hg revert -R s -a -C
- reverting s/a
+ reverting s/a (glob)
Issue2022: update -C
@@ -92,7 +92,7 @@
update: (current)
$ hg ci -m2
committing subrepository s
- committing subrepository s/ss
+ committing subrepository s/ss (glob)
$ hg sum
parent: 2:df30734270ae tip
2
@@ -147,7 +147,7 @@
$ hg init t
$ echo t > t/t
$ hg -R t add t
- adding t/t
+ adding t/t (glob)
5
@@ -265,9 +265,9 @@
$ cd ..
$ hg clone t tc
updating to branch default
- cloning subrepo s from $TESTTMP/sub/t/s
- cloning subrepo s/ss from $TESTTMP/sub/t/s/ss
- cloning subrepo t from $TESTTMP/sub/t/t
+ cloning subrepo s from $TESTTMP/sub/t/s (glob)
+ cloning subrepo s/ss from $TESTTMP/sub/t/s/ss (glob)
+ cloning subrepo t from $TESTTMP/sub/t/t (glob)
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd tc
$ hg debugsub
@@ -284,14 +284,14 @@
$ hg ci -m11
committing subrepository t
$ hg push
- pushing to $TESTTMP/sub/t
- pushing subrepo s/ss to $TESTTMP/sub/t/s/ss
+ pushing to $TESTTMP/sub/t (glob)
+ pushing subrepo s/ss to $TESTTMP/sub/t/s/ss (glob)
searching for changes
no changes found
- pushing subrepo s to $TESTTMP/sub/t/s
+ pushing subrepo s to $TESTTMP/sub/t/s (glob)
searching for changes
no changes found
- pushing subrepo t to $TESTTMP/sub/t/t
+ pushing subrepo t to $TESTTMP/sub/t/t (glob)
searching for changes
adding changesets
adding manifests
@@ -309,27 +309,27 @@
$ hg ci -m12
committing subrepository s
$ hg push
- pushing to $TESTTMP/sub/t
- pushing subrepo s/ss to $TESTTMP/sub/t/s/ss
+ pushing to $TESTTMP/sub/t (glob)
+ pushing subrepo s/ss to $TESTTMP/sub/t/s/ss (glob)
searching for changes
no changes found
- pushing subrepo s to $TESTTMP/sub/t/s
+ pushing subrepo s to $TESTTMP/sub/t/s (glob)
searching for changes
abort: push creates new remote head 12a213df6fa9!
(did you forget to merge? use push -f to force)
[255]
$ hg push -f
- pushing to $TESTTMP/sub/t
- pushing subrepo s/ss to $TESTTMP/sub/t/s/ss
+ pushing to $TESTTMP/sub/t (glob)
+ pushing subrepo s/ss to $TESTTMP/sub/t/s/ss (glob)
searching for changes
no changes found
- pushing subrepo s to $TESTTMP/sub/t/s
+ pushing subrepo s to $TESTTMP/sub/t/s (glob)
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- pushing subrepo t to $TESTTMP/sub/t/t
+ pushing subrepo t to $TESTTMP/sub/t/t (glob)
searching for changes
no changes found
searching for changes
@@ -351,7 +351,7 @@
$ cd ../tc
$ hg pull
- pulling from $TESTTMP/sub/t
+ pulling from $TESTTMP/sub/t (glob)
searching for changes
adding changesets
adding manifests
@@ -362,7 +362,7 @@
should pull t
$ hg up
- pulling subrepo t from $TESTTMP/sub/t/t
+ pulling subrepo t from $TESTTMP/sub/t/t (glob)
searching for changes
adding changesets
adding manifests
@@ -507,15 +507,15 @@
$ echo test > testdelete/nested/foo
$ echo test > testdelete/nested2/foo
$ hg -R testdelete/nested add
- adding testdelete/nested/foo
+ adding testdelete/nested/foo (glob)
$ hg -R testdelete/nested2 add
- adding testdelete/nested2/foo
+ adding testdelete/nested2/foo (glob)
$ hg -R testdelete/nested ci -m test
$ hg -R testdelete/nested2 ci -m test
$ echo nested = nested > testdelete/.hgsub
$ echo nested2 = nested2 >> testdelete/.hgsub
$ hg -R testdelete add
- adding testdelete/.hgsub
+ adding testdelete/.hgsub (glob)
$ hg -R testdelete ci -m "nested 1 & 2 added"
committing subrepository nested
committing subrepository nested2
@@ -534,19 +534,19 @@
$ hg init nested_absolute
$ echo test > nested_absolute/foo
$ hg -R nested_absolute add
- adding nested_absolute/foo
+ adding nested_absolute/foo (glob)
$ hg -R nested_absolute ci -mtest
$ cd mercurial
$ hg init nested_relative
$ echo test2 > nested_relative/foo2
$ hg -R nested_relative add
- adding nested_relative/foo2
+ adding nested_relative/foo2 (glob)
$ hg -R nested_relative ci -mtest2
$ hg init main
$ echo "nested_relative = ../nested_relative" > main/.hgsub
$ echo "nested_absolute = `pwd`/nested_absolute" >> main/.hgsub
$ hg -R main add
- adding main/.hgsub
+ adding main/.hgsub (glob)
$ hg -R main ci -m "add subrepos"
committing subrepository nested_absolute
committing subrepository nested_relative
@@ -575,7 +575,7 @@
committing subrepository s
$ hg clone repo repo2
updating to branch default
- cloning subrepo s from $TESTTMP/sub/repo/s
+ cloning subrepo s from $TESTTMP/sub/repo/s (glob)
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -q -R repo2 pull -u
$ echo 1 > repo2/s/a
@@ -609,10 +609,10 @@
$ echo sub/repo = sub/repo > .hgsub
$ hg add .hgsub
$ hg ci -mtest
- committing subrepository sub/repo
+ committing subrepository sub/repo (glob)
$ echo test >> sub/repo/foo
$ hg ci -mtest
- committing subrepository sub/repo
+ committing subrepository sub/repo (glob)
$ cd ..
Create repo without default path, pull top repo, and see what happens on update
@@ -627,7 +627,7 @@
added 2 changesets with 3 changes to 2 files
(run 'hg update' to get a working copy)
$ hg -R issue1852b update
- abort: default path for subrepository sub/repo not found
+ abort: default path for subrepository sub/repo not found (glob)
[255]
Pull -u now doesn't help
@@ -646,14 +646,14 @@
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
- cloning subrepo sub/repo from issue1852a/sub/repo
+ cloning subrepo sub/repo from issue1852a/sub/repo (glob)
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Try to push from the other side
$ hg -R issue1852a push `pwd`/issue1852c
pushing to $TESTTMP/sub/issue1852c
- pushing subrepo sub/repo to $TESTTMP/sub/issue1852c/sub/repo
+ pushing subrepo sub/repo to $TESTTMP/sub/issue1852c/sub/repo (glob)
searching for changes
no changes found
searching for changes
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
@@ -41,7 +41,7 @@
$ cat clone/.hg/hgrc
[paths]
- default = $TESTTMP/repo#foo
+ default = $TESTTMP/repo#foo (glob)
Changing original repo:
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.
+ Mercurial.ini or $TESTTMP/t/.hg/hgrc. (glob)
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat bin
hello\x00\r (esc)
More information about the Mercurial-devel
mailing list