##// END OF EJS Templates
tests: add glob matching for unified tests...
Brodie Rao -
r12376:97ffc68f default
parent child Browse files
Show More
@@ -509,6 +509,25 b' def tsttest(test, options):'
509 509 # el is an invalid regex
510 510 return False
511 511
512 def globmatch(el, l):
513 # The only supported special characters are * and ?. Escaping is
514 # supported.
515 i, n = 0, len(el)
516 res = ''
517 while i < n:
518 c = el[i]
519 i += 1
520 if c == '\\' and el[i] in '*?\\':
521 res += el[i-1:i+1]
522 i += 1
523 elif c == '*':
524 res += '.*'
525 elif c == '?':
526 res += '.'
527 else:
528 res += re.escape(c)
529 return rematch(res, l)
530
512 531 pos = -1
513 532 postout = []
514 533 ret = 0
@@ -528,8 +547,10 b' def tsttest(test, options):'
528 547
529 548 if el == l: # perfect match (fast)
530 549 postout.append(" " + l)
531 elif el and el.endswith(" (re)\n") and rematch(el[:-6] + '\n', l):
532 postout.append(" " + el) # fallback regex match
550 elif (el and
551 (el.endswith(" (re)\n") and rematch(el[:-6] + '\n', l) or
552 el.endswith(" (glob)\n") and globmatch(el[:-8] + '\n', l))):
553 postout.append(" " + el) # fallback regex/glob match
533 554 else:
534 555 postout.append(" " + l) # let diff deal with it
535 556
@@ -228,8 +228,8 b' old file -- date clamped to 1980'
228 228 $ unzip -l ../old.zip
229 229 Archive: ../old.zip
230 230 \s*Length.* (re)
231 .*-----.* (re)
232 .*147.*80.*00:00.*old/\.hg_archival\.txt (re)
233 .*0.*80.*00:00.*old/old (re)
234 .*-----.* (re)
231 *-----* (glob)
232 *147*80*00:00*old/.hg_archival.txt (glob)
233 *0*80*00:00*old/old (glob)
234 *-----* (glob)
235 235 \s*147\s+2 files (re)
@@ -78,5 +78,5 b' attack /tmp/test'
78 78 $ hg manifest -r4
79 79 /tmp/test
80 80 $ hg update -Cr4
81 abort: No such file or directory: .*/test-audit-path\.t/target//tmp/test (re)
81 abort: No such file or directory: */test-audit-path.t/target//tmp/test (glob)
82 82 [255]
@@ -8,7 +8,7 b''
8 8 $ echo "badext2 =" >> $HGRCPATH
9 9
10 10 $ hg -q help help
11 \*\*\* failed to import extension badext from .*/badext.py: bit bucket overflow (re)
11 \*\*\* failed to import extension badext from */badext.py: bit bucket overflow (glob)
12 12 *** failed to import extension badext2: No module named badext2
13 13 hg help [TOPIC]
14 14
@@ -24,7 +24,7 b' give the server some time to start runni'
24 24 $ sleep 1
25 25
26 26 $ hg clone http://localhost:$HGPORT/foo copy2 2>&1
27 abort: HTTP Error 404: .* (re)
27 abort: HTTP Error 404: * (glob)
28 28 [255]
29 29
30 30 $ kill $!
@@ -37,7 +37,7 b' bookmark list'
37 37 rebase
38 38
39 39 $ hg rebase -s two -d one
40 saved backup bundle to .* (re)
40 saved backup bundle to * (glob)
41 41
42 42 $ hg log
43 43 changeset: 3:9163974d1cb5
@@ -50,7 +50,7 b' bookmarks updated?'
50 50 strip to revision 1
51 51
52 52 $ hg strip 1
53 saved backup bundle to .* (re)
53 saved backup bundle to * (glob)
54 54
55 55 list bookmarks
56 56
@@ -80,7 +80,7 b' Check that path aliases are expanded:'
80 80
81 81 $ hg clone -q -U --config 'paths.foobar=a#0' foobar f
82 82 $ hg -R f showconfig paths.default
83 .*/a#0 (re)
83 */a#0 (glob)
84 84
85 85 Use --pull:
86 86
@@ -18,7 +18,7 b''
18 18 Push should push to 'default' when 'default-push' not set:
19 19
20 20 $ hg --cwd b push
21 pushing to .*/a (re)
21 pushing to */a (glob)
22 22 searching for changes
23 23 adding changesets
24 24 adding manifests
@@ -29,7 +29,7 b" Push should push to 'default-push' when "
29 29
30 30 $ echo 'default-push = ../c' >> b/.hg/hgrc
31 31 $ hg --cwd b push
32 pushing to .*/c (re)
32 pushing to */c (glob)
33 33 searching for changes
34 34 adding changesets
35 35 adding manifests
@@ -240,12 +240,12 b' Testing --time:'
240 240
241 241 $ hg --cwd a --time id
242 242 8580ff50825a tip
243 Time: real .* (re)
243 Time: real * (glob)
244 244
245 245 Testing --version:
246 246
247 247 $ hg --version -q
248 Mercurial Distributed SCM .* (re)
248 Mercurial Distributed SCM * (glob)
249 249
250 250 Testing -h/--help:
251 251
@@ -189,7 +189,7 b' Short help:'
189 189 Test short command list with verbose option
190 190
191 191 $ hg -v help shortlist
192 Mercurial Distributed SCM \(version .*\) (re)
192 Mercurial Distributed SCM (version *) (glob)
193 193
194 194 Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others
195 195 This is free software; see the source for copying conditions. There is NO
@@ -341,7 +341,7 b' Verbose help for add'
341 341 Test help option with version option
342 342
343 343 $ hg add -h --version
344 Mercurial Distributed SCM \(version .+?\) (re)
344 Mercurial Distributed SCM (version *) (glob)
345 345
346 346 Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others
347 347 This is free software; see the source for copying conditions. There is NO
@@ -44,7 +44,7 b' Should display baz only:'
44 44
45 45 $ echo "*.o" > .hgignore
46 46 $ hg status
47 abort: .*/\.hgignore: invalid pattern \(relre\): \*\.o (re)
47 abort: */.hgignore: invalid pattern (relre): \*.o (glob)
48 48 [255]
49 49
50 50 $ echo ".*\.o" > .hgignore
@@ -88,7 +88,7 b' Check it does not ignore the current dir'
88 88
89 89 $ echo "syntax: invalid" > .hgignore
90 90 $ hg status
91 .*/\.hgignore: ignoring invalid syntax 'invalid' (re)
91 */.hgignore: ignoring invalid syntax 'invalid' (glob)
92 92 A dir/b.o
93 93 ? .hgignore
94 94 ? a.c
@@ -1,6 +1,6 b''
1 1 $ echo "invalid" > $HGRCPATH
2 2 $ hg version
3 hg: parse error at .*/\.hgrc:1: invalid (re)
3 hg: parse error at */.hgrc:1: invalid (glob)
4 4 [255]
5 5 $ echo "" > $HGRCPATH
6 6
@@ -14,12 +14,12 b' issue1199: escaping'
14 14 $ cd foobar
15 15 $ cat .hg/hgrc
16 16 [paths]
17 default = .*/foo%bar (re)
17 default = */foo%bar (glob)
18 18 $ hg paths
19 default = .*/foo%bar (re)
19 default = */foo%bar (glob)
20 20 $ hg showconfig
21 bundle\.mainreporoot=.*/foobar (re)
22 paths\.default=.*/foo%bar (re)
21 bundle.mainreporoot=*/foobar (glob)
22 paths.default=*/foo%bar (glob)
23 23 $ cd ..
24 24
25 25 issue1829: wrong indentation
@@ -27,7 +27,7 b' issue1829: wrong indentation'
27 27 $ echo '[foo]' > $HGRCPATH
28 28 $ echo ' x = y' >> $HGRCPATH
29 29 $ hg version
30 hg: parse error at .*/\.hgrc:2: x = y (re)
30 hg: parse error at */.hgrc:2: x = y (glob)
31 31 [255]
32 32
33 33 $ python -c "print '[foo]\nbar = a\n b\n c \n de\n fg \nbaz = bif cb \n'" \
@@ -40,7 +40,7 b' issue1829: wrong indentation'
40 40 $ export FAKEPATH
41 41 $ echo '%include $FAKEPATH/no-such-file' > $HGRCPATH
42 42 $ hg version
43 hg: parse error at .*/\.hgrc:1: cannot include /path/to/nowhere/no-such-file \(No such file or directory\) (re)
43 hg: parse error at */.hgrc:1: cannot include /path/to/nowhere/no-such-file (No such file or directory) (glob)
44 44 [255]
45 45 $ unset FAKEPATH
46 46
@@ -90,23 +90,23 b' HGPLAIN'
90 90 customized hgrc
91 91
92 92 $ hg showconfig
93 read config from: .*/\.hgrc (re)
94 .*/\.hgrc:13: alias\.log=log -g (re)
95 .*/\.hgrc:11: defaults\.identify=-n (re)
96 .*/\.hgrc:2: ui\.debug=true (re)
97 .*/\.hgrc:3: ui\.fallbackencoding=ASCII (re)
98 .*/\.hgrc:4: ui\.quiet=true (re)
99 .*/\.hgrc:5: ui\.slash=true (re)
100 .*/\.hgrc:6: ui\.traceback=true (re)
101 .*/\.hgrc:7: ui\.verbose=true (re)
102 .*/\.hgrc:8: ui\.style=~/.hgstyle (re)
103 .*/\.hgrc:9: ui\.logtemplate=\{node\} (re)
93 read config from: */.hgrc (glob)
94 */.hgrc:13: alias.log=log -g (glob)
95 */.hgrc:11: defaults.identify=-n (glob)
96 */.hgrc:2: ui.debug=true (glob)
97 */.hgrc:3: ui.fallbackencoding=ASCII (glob)
98 */.hgrc:4: ui.quiet=true (glob)
99 */.hgrc:5: ui.slash=true (glob)
100 */.hgrc:6: ui.traceback=true (glob)
101 */.hgrc:7: ui.verbose=true (glob)
102 */.hgrc:8: ui.style=~/.hgstyle (glob)
103 */.hgrc:9: ui.logtemplate={node} (glob)
104 104
105 105 plain hgrc
106 106
107 107 $ HGPLAIN=; export HGPLAIN
108 108 $ hg showconfig --config ui.traceback=True --debug
109 read config from: .*/\.hgrc (re)
109 read config from: */.hgrc (glob)
110 110 none: ui.traceback=True
111 111 none: ui.verbose=False
112 112 none: ui.debug=True
@@ -415,12 +415,12 b' make sure --traceback works'
415 415 $ echo >> foo
416 416 $ hg ci --debug -d '0 0' -m 'change foo'
417 417 foo
418 calling hook commit\.auto: <function autohook at .*> (re)
418 calling hook commit.auto: <function autohook at *> (glob)
419 419 Automatically installed hook
420 420 committed changeset 1:52998019f6252a2b893452765fcb0a47351a5708
421 421
422 422 $ hg showconfig hooks
423 hooks\.commit\.auto=<function autohook at .*> (re)
423 hooks.commit.auto=<function autohook at *> (glob)
424 424
425 425 test python hook configured with python:[file]:[hook] syntax
426 426
@@ -1,7 +1,7 b''
1 1 hg debuginstall
2 2 $ hg debuginstall
3 3 Checking encoding (ascii)...
4 Checking installed modules \(.*/mercurial\)\.\.\. (re)
4 Checking installed modules (*/mercurial)... (glob)
5 5 Checking templates...
6 6 Checking patch...
7 7 Checking commit editor...
@@ -11,7 +11,7 b' hg debuginstall'
11 11 hg debuginstall with no username
12 12 $ HGUSER= hg debuginstall
13 13 Checking encoding (ascii)...
14 Checking installed modules \(.*/mercurial\)\.\.\. (re)
14 Checking installed modules (*/mercurial)... (glob)
15 15 Checking templates...
16 16 Checking patch...
17 17 Checking commit editor...
@@ -27,7 +27,7 b' Check that zero-size journals are correc'
27 27
28 28 $ hg -R foo unbundle repo.hg
29 29 adding changesets
30 abort: Permission denied: .* (re)
30 abort: Permission denied: * (glob)
31 31 [255]
32 32
33 33 $ if test -f foo/.hg/store/journal; then echo 'journal exists :-('; fi
@@ -27,13 +27,13 b' as it would succeed without uisetup othe'
27 27 Revision = {node|short}
28 28 Source = {root}/{file},v
29 29 $Author: test $
30 \$Date: ..../../.. ..:..:.. \$ (re)
31 \$Header: .*/demo\.txt,v ............ ..../../.. ..:..:.. test \$ (re)
32 \$Id: demo\.txt,v ............ ..../../.. ..:..:.. test \$ (re)
30 $Date: ????/??/?? ??:??:?? $ (glob)
31 $Header: */demo.txt,v ???????????? ????/??/?? ??:??:?? test $ (glob)
32 $Id: demo.txt,v ???????????? ????/??/?? ??:??:?? test $ (glob)
33 33 $RCSFile: demo.txt,v $
34 34 $RCSfile: demo.txt,v $
35 \$Revision: ............ \$ (re)
36 \$Source: .*/demo.txt,v \$ (re)
35 $Revision: ???????????? $ (glob)
36 $Source: */demo.txt,v $ (glob)
37 37
38 38 $ hg --quiet kwdemo "Branch = {branches}"
39 39 [extensions]
@@ -71,7 +71,7 b' A bundle to test this was made with:'
71 71 hg bundle --base null ../test-keyword.hg
72 72
73 73 $ hg pull -u "$TESTDIR"/test-keyword.hg
74 pulling from .*test-keyword\.hg (re)
74 pulling from *test-keyword.hg (glob)
75 75 requesting all changes
76 76 adding changesets
77 77 adding manifests
@@ -150,7 +150,7 b' hg cat files and symlink, no expansion'
150 150 do not process $Id:
151 151 xxx $
152 152 ignore $Id$
153 a.* (re)
153 a* (glob)
154 154
155 155 Test hook execution
156 156
@@ -195,15 +195,15 b' Pull from bundle and trigger notify'
195 195 Content-Type: text/plain; charset="us-ascii"
196 196 MIME-Version: 1.0
197 197 Content-Transfer-Encoding: 7bit
198 Date: .* (re)
199 Subject: changeset in .* (re)
198 Date: * (glob)
199 Subject: changeset in * (glob)
200 200 From: mercurial
201 201 X-Hg-Notification: changeset a2392c293916
202 Message-Id: <hg\.a2392c293916.*> (re)
202 Message-Id: <hg.a2392c293916*> (glob)
203 203 To: Test
204 204
205 changeset a2392c293916 in .* (re)
206 details: .*\?cmd=changeset;node=a2392c293916 (re)
205 changeset a2392c293916 in * (glob)
206 details: *cmd=changeset;node=a2392c293916 (glob)
207 207 description:
208 208 addsym
209 209
@@ -218,15 +218,15 b' Pull from bundle and trigger notify'
218 218 Content-Type: text/plain; charset="us-ascii"
219 219 MIME-Version: 1.0
220 220 Content-Transfer-Encoding: 7bit
221 Date:.* (re)
222 Subject: changeset in.* (re)
221 Date:* (glob)
222 Subject: changeset in* (glob)
223 223 From: User Name <user@example.com>
224 224 X-Hg-Notification: changeset ef63ca68695b
225 Message-Id: <hg\.ef63ca68695b.*> (re)
225 Message-Id: <hg.ef63ca68695b*> (glob)
226 226 To: Test
227 227
228 changeset ef63ca68695b in .* (re)
229 details: .*\?cmd=changeset;node=ef63ca68695b (re)
228 changeset ef63ca68695b in * (glob)
229 details: *cmd=changeset;node=ef63ca68695b (glob)
230 230 description:
231 231 absym
232 232
@@ -335,7 +335,7 b' Diff remaining chunk'
335 335 $ hg diff
336 336 diff -r d17e03c92c97 a
337 337 --- a/a Wed Dec 31 23:59:51 1969 -0000
338 \+\+\+ b/a .* (re)
338 +++ b/a * (glob)
339 339 @@ -2,3 +2,4 @@
340 340 foo
341 341 do not process $Id:
@@ -479,7 +479,7 b' Diff specific revision'
479 479 $ hg diff --rev 1
480 480 diff -r ef63ca68695b c
481 481 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
482 \+\+\+ b/c .* (re)
482 +++ b/c * (glob)
483 483 @@ -0,0 +1,3 @@
484 484 +expand $Id$
485 485 +do not process $Id:
@@ -527,7 +527,7 b' Cat and hg cat files before custom expan'
527 527 do not process $Id:
528 528 xxx $
529 529 ignore $Id$
530 a.* (re)
530 a* (glob)
531 531
532 532 Write custom keyword and prepare multiline commit message
533 533
@@ -577,7 +577,7 b' Stat, verify and show custom expansion ('
577 577 xxx $
578 578 $Xinfo: User Name <user@example.com>: firstline $
579 579 ignore $Id$
580 a.* (re)
580 a* (glob)
581 581
582 582 annotate
583 583
@@ -648,7 +648,7 b' Clone to test incoming'
648 648 > default = ../Test
649 649 > EOF
650 650 $ hg incoming
651 comparing with .*test-keyword\.t/Test (re)
651 comparing with *test-keyword.t/Test (glob)
652 652 searching for changes
653 653 changeset: 2:bb948857c743
654 654 tag: tip
@@ -718,7 +718,7 b' kwshrink a inside directory x'
718 718 kwexpand nonexistent
719 719
720 720 $ hg kwexpand nonexistent
721 nonexistent:.* (re)
721 nonexistent:* (glob)
722 722
723 723
724 724 hg serve
@@ -907,7 +907,7 b' Keywords shrunk in working directory, bu'
907 907 xxx $
908 908 $Xinfo: User Name <user@example.com>: firstline $
909 909 ignore $Id$
910 a.* (re)
910 a* (glob)
911 911
912 912 Now disable keyword expansion
913 913
@@ -924,4 +924,4 b' Now disable keyword expansion'
924 924 xxx $
925 925 $Xinfo$
926 926 ignore $Id$
927 a.* (re)
927 a* (glob)
@@ -32,7 +32,7 b' Create a patch removing a:'
32 32 Save the patch queue so we can merge it later:
33 33
34 34 $ hg qsave -c -e
35 copy .*/t/\.hg/patches to .*/t/\.hg/patches\.1 (re)
35 copy */t/.hg/patches to */t/.hg/patches.1 (glob)
36 36 $ checkundo
37 37
38 38 Update b and commit in an "update" changeset:
@@ -52,7 +52,7 b' Update b and commit in an "update" chang'
52 52 b
53 53
54 54 $ hg qpush -a -m
55 merging with queue at: .*/t/\.hg/patches\.1 (re)
55 merging with queue at: */t/.hg/patches.1 (glob)
56 56 applying rm_a
57 57 now at: rm_a
58 58
@@ -91,14 +91,14 b' Classic MQ merge sequence *with an expli'
91 91 Create the reference queue:
92 92
93 93 $ hg qsave -c -e -n refqueue
94 copy .*/t2/\.hg/patches to .*/t2/\.hg/refqueue (re)
94 copy */t2/.hg/patches to */t2/.hg/refqueue (glob)
95 95 $ hg up -C 1
96 96 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
97 97
98 98 Merge:
99 99
100 100 $ HGMERGE=internal:other hg qpush -a -m -n refqueue
101 merging with queue at: .*/t2/\.hg/refqueue (re)
101 merging with queue at: */t2/.hg/refqueue (glob)
102 102 applying patcha
103 103 patching file a
104 104 Hunk #1 FAILED at 0
@@ -138,10 +138,10 b' Check patcha2 is still a regular patch:'
138 138
139 139 $ cat .hg/patches/patcha2
140 140 # HG changeset patch
141 # Parent ........................................ (re)
141 # Parent ???????????????????????????????????????? (glob)
142 142 # Date 0 0
143 143
144 diff -r ............ -r ............ a (re)
144 diff -r ???????????? -r ???????????? a (glob)
145 145 --- a/a
146 146 +++ b/a
147 147 @@ -1,2 +1,3 @@
@@ -59,7 +59,7 b' Fold with local changes:'
59 59 [255]
60 60
61 61 $ hg diff -c .
62 diff -r 07f494440405 -r ............ a (re)
62 diff -r 07f494440405 -r ???????????? a (glob)
63 63 --- a/a
64 64 +++ b/a
65 65 @@ -1,1 +1,3 @@
@@ -85,7 +85,7 b' Fold git patch into a regular patch, exp'
85 85
86 86 $ cat .hg/patches/regular
87 87 # HG changeset patch
88 # Parent ........................................ (re)
88 # Parent ???????????????????????????????????????? (glob)
89 89
90 90 diff --git a/a b/a
91 91 --- a/a
@@ -127,7 +127,7 b' Fold regular patch into a git patch, exp'
127 127
128 128 $ cat .hg/patches/git
129 129 # HG changeset patch
130 # Parent ........................................ (re)
130 # Parent ???????????????????????????????????????? (glob)
131 131
132 132 diff --git a/a b/aa
133 133 copy from a
@@ -255,7 +255,7 b' qrefresh --short tests:'
255 255 diff shows what is not in patch:
256 256
257 257 $ hg diff
258 diff -r ............ orphanchild (re)
258 diff -r ???????????? orphanchild (glob)
259 259 --- /dev/null
260 260 +++ b/orphanchild
261 261 @@ -0,0 +1,1 @@
@@ -39,7 +39,7 b' qpop/qrefresh on the wrong revision'
39 39 abort: popping would remove a revision not managed by this patch queue
40 40 [255]
41 41 $ hg qpop -n patches
42 using patch queue: .*/repo/\.hg/patches (re)
42 using patch queue: */repo/.hg/patches (glob)
43 43 abort: popping would remove a revision not managed by this patch queue
44 44 [255]
45 45 $ hg qrefresh
@@ -77,7 +77,7 b''
77 77 summary: e
78 78
79 79 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
80 saved backup bundle to .* (re)
80 saved backup bundle to * (glob)
81 81 % after update 4, strip 4
82 82 changeset: 3:65bd5f99a4a3
83 83 tag: tip
@@ -96,7 +96,7 b''
96 96 summary: e
97 97
98 98 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
99 saved backup bundle to .* (re)
99 saved backup bundle to * (glob)
100 100 % after update 4, strip 3
101 101 changeset: 1:ef3a871183d7
102 102 user: test
@@ -111,7 +111,7 b''
111 111 date: Thu Jan 01 00:00:00 1970 +0000
112 112 summary: b
113 113
114 saved backup bundle to .* (re)
114 saved backup bundle to * (glob)
115 115 % after update 1, strip 4
116 116 changeset: 1:ef3a871183d7
117 117 user: test
@@ -127,7 +127,7 b''
127 127 date: Thu Jan 01 00:00:00 1970 +0000
128 128 summary: e
129 129
130 saved backup bundle to .* (re)
130 saved backup bundle to * (glob)
131 131 % after update 4, strip 2
132 132 changeset: 3:443431ffac4f
133 133 tag: tip
@@ -146,7 +146,7 b''
146 146 summary: c
147 147
148 148 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
149 saved backup bundle to .* (re)
149 saved backup bundle to * (glob)
150 150 % after update 4, strip 1
151 151 changeset: 0:9ab35a2d17cb
152 152 tag: tip
@@ -157,7 +157,7 b''
157 157 $ teststrip null 4
158 158 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
159 159 % before update null, strip 4
160 saved backup bundle to .* (re)
160 saved backup bundle to * (glob)
161 161 % after update null, strip 4
162 162
163 163 $ hg log
@@ -212,7 +212,7 b' before strip of merge parent'
212 212
213 213 $ hg strip 4
214 214 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
215 saved backup bundle to .* (re)
215 saved backup bundle to * (glob)
216 216
217 217 after strip of merge parent
218 218
@@ -258,7 +258,7 b' after strip of merge parent'
258 258 2 is parent of 3, only one strip should happen
259 259
260 260 $ hg strip 2 3
261 saved backup bundle to .* (re)
261 saved backup bundle to * (glob)
262 262 $ hg glog
263 263 @ changeset: 2:264128213d29
264 264 | tag: tip
@@ -310,8 +310,8 b' 2 different branches: 2 strips'
310 310
311 311 $ hg strip 2 4
312 312 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
313 saved backup bundle to .* (re)
314 saved backup bundle to .* (re)
313 saved backup bundle to * (glob)
314 saved backup bundle to * (glob)
315 315 $ hg glog
316 316 @ changeset: 2:65bd5f99a4a3
317 317 | tag: tip
@@ -335,14 +335,14 b' 2 different branches and a common ancest'
335 335
336 336 $ hg strip 1 2 4
337 337 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
338 saved backup bundle to .* (re)
338 saved backup bundle to * (glob)
339 339 $ restore
340 340
341 341
342 342 remove branchy history for qimport tests
343 343
344 344 $ hg strip 3
345 saved backup bundle to .* (re)
345 saved backup bundle to * (glob)
346 346
347 347
348 348 strip of applied mq should cleanup status file
@@ -364,7 +364,7 b' stripping revision in queue'
364 364
365 365 $ hg strip 3
366 366 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
367 saved backup bundle to .* (re)
367 saved backup bundle to * (glob)
368 368
369 369 applied patches after stripping rev in queue
370 370
@@ -375,7 +375,7 b' stripping ancestor of queue'
375 375
376 376 $ hg strip 1
377 377 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
378 saved backup bundle to .* (re)
378 saved backup bundle to * (glob)
379 379
380 380 applied patches after stripping ancestor of queue
381 381
@@ -135,7 +135,7 b' qinit -c should create both files if the'
135 135 guards
136 136 $ cat .hg/patches/series
137 137 $ hg qinit -c
138 abort: repository .* already exists! (re)
138 abort: repository * already exists! (glob)
139 139 [255]
140 140 $ cd ..
141 141
@@ -737,7 +737,7 b' strip'
737 737 adding x
738 738 $ hg strip tip
739 739 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
740 saved backup bundle to .* (re)
740 saved backup bundle to * (glob)
741 741 $ hg unbundle .hg/strip-backup/*
742 742 adding changesets
743 743 adding manifests
@@ -760,7 +760,7 b' strip with local changes, should complai'
760 760
761 761 $ hg strip -f tip
762 762 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
763 saved backup bundle to .* (re)
763 saved backup bundle to * (glob)
764 764
765 765
766 766 cd b; hg qrefresh
@@ -1118,7 +1118,7 b' strip again'
1118 1118
1119 1119 $ hg strip 1
1120 1120 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1121 saved backup bundle to .* (re)
1121 saved backup bundle to * (glob)
1122 1122 $ checkundo strip
1123 1123 $ hg log
1124 1124 changeset: 1:20cbbe65cff7
@@ -25,8 +25,8 b''
25 25 Content-Transfer-Encoding: 7bit
26 26 Subject: [PATCH] a
27 27 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
28 Message-Id: <8580ff50825a50c8f716\.60@.* (re)
29 User-Agent: Mercurial-patchbomb/.* (re)
28 Message-Id: <8580ff50825a50c8f716.60@* (glob)
29 User-Agent: Mercurial-patchbomb/* (glob)
30 30 Date: Thu, 01 Jan 1970 00:01:00 +0000
31 31 From: quux
32 32 To: foo
@@ -81,7 +81,7 b''
81 81 Content-Transfer-Encoding: 7bit
82 82 Subject: [PATCH 0 of 2] test
83 83 Message-Id: <patchbomb\.120@[^>]*> (re)
84 User-Agent: Mercurial-patchbomb/.* (re)
84 User-Agent: Mercurial-patchbomb/* (glob)
85 85 Date: Thu, 01 Jan 1970 00:02:00 +0000
86 86 From: quux
87 87 To: foo
@@ -97,7 +97,7 b''
97 97 Message-Id: <8580ff50825a50c8f716\.121@[^>]*> (re)
98 98 In-Reply-To: <patchbomb\.120@[^>]*> (re)
99 99 References: <patchbomb\.120@[^>]*> (re)
100 User-Agent: Mercurial-patchbomb/.* (re)
100 User-Agent: Mercurial-patchbomb/* (glob)
101 101 Date: Thu, 01 Jan 1970 00:02:01 +0000
102 102 From: quux
103 103 To: foo
@@ -125,7 +125,7 b''
125 125 Message-Id: <97d72e5f12c7e84f8506\.122@[^>]*> (re)
126 126 In-Reply-To: <patchbomb\.120@[^>]*> (re)
127 127 References: <patchbomb\.120@[^>]*> (re)
128 User-Agent: Mercurial-patchbomb/.* (re)
128 User-Agent: Mercurial-patchbomb/* (glob)
129 129 Date: Thu, 01 Jan 1970 00:02:02 +0000
130 130 From: quux
131 131 To: foo
@@ -241,8 +241,8 b' mime encoded mbox (base64):'
241 241 Content-Transfer-Encoding: base64
242 242 Subject: [PATCH] charset=utf-8; content-transfer-encoding: base64
243 243 X-Mercurial-Node: c3c9e37db9f4fe4882cda39baf42fed6bad8b15a
244 Message-Id: <c3c9e37db9f4fe4882cd\.240@.* (re)
245 User-Agent: Mercurial-patchbomb/.* (re)
244 Message-Id: <c3c9e37db9f4fe4882cd.240@* (glob)
245 User-Agent: Mercurial-patchbomb/* (glob)
246 246 Date: Thu, 01 Jan 1970 00:04:00 +0000
247 247 From: quux
248 248 To: foo
@@ -1810,8 +1810,8 b' test multi-byte domain parsing:'
1810 1810 Content-Transfer-Encoding: 7bit
1811 1811 Subject: [PATCH] test
1812 1812 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
1813 Message-Id: <8580ff50825a50c8f716\.315532860@.* (re)
1814 User-Agent: Mercurial-patchbomb/.* (re)
1813 Message-Id: <8580ff50825a50c8f716.315532860@* (glob)
1814 User-Agent: Mercurial-patchbomb/* (glob)
1815 1815 Date: Tue, 01 Jan 1980 00:01:00 +0000
1816 1816 From: quux
1817 1817 To: bar@xn--nicode-2ya.com
@@ -1857,8 +1857,8 b' test outgoing:'
1857 1857 MIME-Version: 1.0
1858 1858 Content-Transfer-Encoding: 7bit
1859 1859 Subject: [PATCH 0 of 8] test
1860 Message-Id: <patchbomb\.315532860@.* (re)
1861 User-Agent: Mercurial-patchbomb/.* (re)
1860 Message-Id: <patchbomb.315532860@* (glob)
1861 User-Agent: Mercurial-patchbomb/* (glob)
1862 1862 Date: Tue, 01 Jan 1980 00:01:00 +0000
1863 1863 From: test
1864 1864 To: foo
@@ -1870,10 +1870,10 b' test outgoing:'
1870 1870 Content-Transfer-Encoding: 7bit
1871 1871 Subject: [PATCH 1 of 8] c
1872 1872 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
1873 Message-Id: <ff2c9fa2018b15fa74b3\.315532861@.* (re)
1873 Message-Id: <ff2c9fa2018b15fa74b3.315532861@* (glob)
1874 1874 In-Reply-To: <patchbomb\.315532860@[^>]*> (re)
1875 1875 References: <patchbomb\.315532860@[^>]*> (re)
1876 User-Agent: Mercurial-patchbomb/.* (re)
1876 User-Agent: Mercurial-patchbomb/* (glob)
1877 1877 Date: Tue, 01 Jan 1980 00:01:01 +0000
1878 1878 From: test
1879 1879 To: foo
@@ -1897,10 +1897,10 b' test outgoing:'
1897 1897 Content-Transfer-Encoding: 8bit
1898 1898 Subject: [PATCH 2 of 8] charset=utf-8; content-transfer-encoding: base64
1899 1899 X-Mercurial-Node: c3c9e37db9f4fe4882cda39baf42fed6bad8b15a
1900 Message-Id: <c3c9e37db9f4fe4882cd\.315532862@.* (re)
1900 Message-Id: <c3c9e37db9f4fe4882cd.315532862@* (glob)
1901 1901 In-Reply-To: <patchbomb\.315532860@[^>]*> (re)
1902 1902 References: <patchbomb\.315532860@[^>]*> (re)
1903 User-Agent: Mercurial-patchbomb/.* (re)
1903 User-Agent: Mercurial-patchbomb/* (glob)
1904 1904 Date: Tue, 01 Jan 1980 00:01:02 +0000
1905 1905 From: test
1906 1906 To: foo
@@ -1932,10 +1932,10 b' test outgoing:'
1932 1932 Subject: [PATCH 3 of 8] charset=utf-8;
1933 1933 content-transfer-encoding: quoted-printable
1934 1934 X-Mercurial-Node: c655633f8c87700bb38cc6a59a2753bdc5a6c376
1935 Message-Id: <c655633f8c87700bb38c\.315532863@.* (re)
1935 Message-Id: <c655633f8c87700bb38c.315532863@* (glob)
1936 1936 In-Reply-To: <patchbomb\.315532860@[^>]*> (re)
1937 1937 References: <patchbomb\.315532860@[^>]*> (re)
1938 User-Agent: Mercurial-patchbomb/.* (re)
1938 User-Agent: Mercurial-patchbomb/* (glob)
1939 1939 Date: Tue, 01 Jan 1980 00:01:03 +0000
1940 1940 From: test
1941 1941 To: foo
@@ -1975,10 +1975,10 b' test outgoing:'
1975 1975 Content-Transfer-Encoding: 8bit
1976 1976 Subject: [PATCH 4 of 8] charset=us-ascii; content-transfer-encoding: 8bit
1977 1977 X-Mercurial-Node: 22d0f96be12f5945fd67d101af58f7bc8263c835
1978 Message-Id: <22d0f96be12f5945fd67\.315532864@.* (re)
1978 Message-Id: <22d0f96be12f5945fd67.315532864@* (glob)
1979 1979 In-Reply-To: <patchbomb\.315532860@[^>]*> (re)
1980 1980 References: <patchbomb\.315532860@[^>]*> (re)
1981 User-Agent: Mercurial-patchbomb/.* (re)
1981 User-Agent: Mercurial-patchbomb/* (glob)
1982 1982 Date: Tue, 01 Jan 1980 00:01:04 +0000
1983 1983 From: test
1984 1984 To: foo
@@ -2002,10 +2002,10 b' test outgoing:'
2002 2002 Content-Transfer-Encoding: 7bit
2003 2003 Subject: [PATCH 5 of 8] Added tag zero, zero.foo for changeset 8580ff50825a
2004 2004 X-Mercurial-Node: dd9c2b4b8a8a0934d5523c15f2c119b362360903
2005 Message-Id: <dd9c2b4b8a8a0934d552\.315532865@.* (re)
2005 Message-Id: <dd9c2b4b8a8a0934d552.315532865@* (glob)
2006 2006 In-Reply-To: <patchbomb\.315532860@[^>]*> (re)
2007 2007 References: <patchbomb\.315532860@[^>]*> (re)
2008 User-Agent: Mercurial-patchbomb/.* (re)
2008 User-Agent: Mercurial-patchbomb/* (glob)
2009 2009 Date: Tue, 01 Jan 1980 00:01:05 +0000
2010 2010 From: test
2011 2011 To: foo
@@ -2030,10 +2030,10 b' test outgoing:'
2030 2030 Content-Transfer-Encoding: 7bit
2031 2031 Subject: [PATCH 6 of 8] Added tag one, one.patch for changeset 97d72e5f12c7
2032 2032 X-Mercurial-Node: eae5fcf795eee29d0e45ffc9f519a91cd79fc9ff
2033 Message-Id: <eae5fcf795eee29d0e45\.315532866@.* (re)
2033 Message-Id: <eae5fcf795eee29d0e45.315532866@* (glob)
2034 2034 In-Reply-To: <patchbomb\.315532860@[^>]*> (re)
2035 2035 References: <patchbomb\.315532860@[^>]*> (re)
2036 User-Agent: Mercurial-patchbomb/.* (re)
2036 User-Agent: Mercurial-patchbomb/* (glob)
2037 2037 Date: Tue, 01 Jan 1980 00:01:06 +0000
2038 2038 From: test
2039 2039 To: foo
@@ -2060,10 +2060,10 b' test outgoing:'
2060 2060 Content-Transfer-Encoding: 7bit
2061 2061 Subject: [PATCH 7 of 8] Added tag two, two.diff for changeset ff2c9fa2018b
2062 2062 X-Mercurial-Node: e317db6a6f288748d1f6cb064f3810fcba66b1b6
2063 Message-Id: <e317db6a6f288748d1f6\.315532867@.* (re)
2063 Message-Id: <e317db6a6f288748d1f6.315532867@* (glob)
2064 2064 In-Reply-To: <patchbomb\.315532860@[^>]*> (re)
2065 2065 References: <patchbomb\.315532860@[^>]*> (re)
2066 User-Agent: Mercurial-patchbomb/.* (re)
2066 User-Agent: Mercurial-patchbomb/* (glob)
2067 2067 Date: Tue, 01 Jan 1980 00:01:07 +0000
2068 2068 From: test
2069 2069 To: foo
@@ -2094,7 +2094,7 b' test outgoing:'
2094 2094 Message-Id: <2f9fa9b998c5fe3ac2bd\.315532868[^>]*> (re)
2095 2095 In-Reply-To: <patchbomb\.315532860@[^>]*> (re)
2096 2096 References: <patchbomb\.315532860@[^>]*> (re)
2097 User-Agent: Mercurial-patchbomb/.* (re)
2097 User-Agent: Mercurial-patchbomb/* (glob)
2098 2098 Date: Tue, 01 Jan 1980 00:01:08 +0000
2099 2099 From: test
2100 2100 To: foo
@@ -2129,8 +2129,8 b' dest#branch URIs:'
2129 2129 Content-Transfer-Encoding: 7bit
2130 2130 Subject: [PATCH] test
2131 2131 X-Mercurial-Node: 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268
2132 Message-Id: <2f9fa9b998c5fe3ac2bd\.315532860@.* (re)
2133 User-Agent: Mercurial-patchbomb/.* (re)
2132 Message-Id: <2f9fa9b998c5fe3ac2bd.315532860@* (glob)
2133 User-Agent: Mercurial-patchbomb/* (glob)
2134 2134 Date: Tue, 01 Jan 1980 00:01:00 +0000
2135 2135 From: test
2136 2136 To: foo
@@ -6,11 +6,11 b''
6 6 $ echo '[paths]' >> .hg/hgrc
7 7 $ echo 'dupe = ../b' >> .hg/hgrc
8 8 $ hg in dupe
9 comparing with .*/test-paths\.t/b (re)
9 comparing with */test-paths.t/b (glob)
10 10 no changes found
11 11 [1]
12 12 $ cd ..
13 13 $ hg -R a in dupe
14 comparing with .*/test-paths\.t/b (re)
14 comparing with */test-paths.t/b (glob)
15 15 no changes found
16 16 [1]
@@ -20,7 +20,7 b''
20 20 checking manifests
21 21 crosschecking files in changesets and manifests
22 22 checking files
23 abort: Permission denied: .* (re)
23 abort: Permission denied: * (glob)
24 24 [255]
25 25
26 26 $ chmod +r .hg/store/data/a.i
@@ -37,7 +37,7 b''
37 37 $ echo barber > a
38 38 $ hg commit -m "2"
39 39 trouble committing a!
40 abort: Permission denied: .* (re)
40 abort: Permission denied: * (glob)
41 41 [255]
42 42
43 43 $ chmod -w .
@@ -40,7 +40,7 b' Expected to fail:'
40 40 Expected to fail:
41 41
42 42 $ hg push
43 pushing to .* (re)
43 pushing to * (glob)
44 44 searching for changes
45 45 adding changesets
46 46 adding manifests
@@ -60,7 +60,7 b' clone and pull to break links'
60 60 relink
61 61
62 62 $ hg relink --debug | fix_path
63 relinking .*/\.hg/store (re)
63 relinking */.hg/store (glob)
64 64 tip has 2 files, estimated total number of files: 3
65 65 collecting: 00changelog.i 1/3 files (33.33%)
66 66 collecting: 00manifest.i 2/3 files (66.67%)
@@ -263,8 +263,8 b' overwrite existing files (d2/b)'
263 263 R d1/ba
264 264 R d1/d11/a1
265 265 $ diff -u d1/b d2/b
266 --- d1/b .* (re)
267 \+\+\+ d2/b .* (re)
266 --- d1/b * (glob)
267 +++ d2/b * (glob)
268 268 @@ -1 +1 @@
269 269 -d1/b
270 270 +d2/b
@@ -21,6 +21,11 b' Regular expressions:'
21 21 $ echo barbazquux
22 22 .*quux.* (re)
23 23
24 Globs:
25
26 $ echo '* \\foobarbaz {10}'
27 \* \\fo?bar* {10} (glob)
28
24 29 Literal match ending in " (re)":
25 30
26 31 $ echo 'foo (re)'
@@ -27,7 +27,7 b" Preparing the 'main' repo which depends "
27 27 $ echo "sub1 = ../sub1" > main/.hgsub
28 28 $ hg clone sub1 main/sub1
29 29 updating to branch default
30 pulling subrepo sub2 from .*/sub2 (re)
30 pulling subrepo sub2 from */sub2 (glob)
31 31 requesting all changes
32 32 adding changesets
33 33 adding manifests
@@ -55,13 +55,13 b' Clone main'
55 55
56 56 $ hg clone main cloned
57 57 updating to branch default
58 pulling subrepo sub1 from .*/sub1 (re)
58 pulling subrepo sub1 from */sub1 (glob)
59 59 requesting all changes
60 60 adding changesets
61 61 adding manifests
62 62 adding file changes
63 63 added 1 changesets with 3 changes to 3 files
64 pulling subrepo sub1/sub2 from .*/sub2 (re)
64 pulling subrepo sub1/sub2 from */sub2 (glob)
65 65 requesting all changes
66 66 adding changesets
67 67 adding manifests
@@ -28,5 +28,5 b' test bad subpaths pattern'
28 28 > .* = \1
29 29 > EOF
30 30 $ hg debugsub
31 abort: bad subrepository pattern in .*/test-subrepo-paths\.t/outer/\.hg/hgrc:2: invalid group reference (re)
31 abort: bad subrepository pattern in */test-subrepo-paths.t/outer/.hg/hgrc:2: invalid group reference (glob)
32 32 [255]
@@ -252,13 +252,13 b' Clone and test outgoing:'
252 252 $ cd ..
253 253 $ hg clone repo repo2
254 254 updating to branch default
255 pulling subrepo foo from .*/test-subrepo-recursion\.t/repo/foo (re)
255 pulling subrepo foo from */test-subrepo-recursion.t/repo/foo (glob)
256 256 requesting all changes
257 257 adding changesets
258 258 adding manifests
259 259 adding file changes
260 260 added 4 changesets with 7 changes to 3 files
261 pulling subrepo foo/bar from .*/test-subrepo-recursion\.t/repo/foo/bar (re)
261 pulling subrepo foo/bar from */test-subrepo-recursion.t/repo/foo/bar (glob)
262 262 requesting all changes
263 263 adding changesets
264 264 adding manifests
@@ -267,10 +267,10 b' Clone and test outgoing:'
267 267 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
268 268 $ cd repo2
269 269 $ hg outgoing -S
270 comparing with .*/test-subrepo-recursion\.t/repo (re)
270 comparing with */test-subrepo-recursion.t/repo (glob)
271 271 searching for changes
272 272 no changes found
273 comparing with .*/test-subrepo-recursion\.t/repo/foo (re)
273 comparing with */test-subrepo-recursion.t/repo/foo (glob)
274 274 searching for changes
275 275 no changes found
276 276 [1]
@@ -290,7 +290,7 b' Make nested change:'
290 290 $ hg commit -m 3-4-2
291 291 committing subrepository foo
292 292 $ hg outgoing -S
293 comparing with .*/test-subrepo-recursion\.t/repo (re)
293 comparing with */test-subrepo-recursion.t/repo (glob)
294 294 searching for changes
295 295 changeset: 3:2655b8ecc4ee
296 296 tag: tip
@@ -298,7 +298,7 b' Make nested change:'
298 298 date: Thu Jan 01 00:00:00 1970 +0000
299 299 summary: 3-4-2
300 300
301 comparing with .*/test-subrepo-recursion\.t/repo/foo (re)
301 comparing with */test-subrepo-recursion.t/repo/foo (glob)
302 302 searching for changes
303 303 changeset: 4:e96193d6cb36
304 304 tag: tip
@@ -316,7 +316,7 b' Switch to original repo and setup defaul'
316 316 Test incoming:
317 317
318 318 $ hg incoming -S
319 comparing with .*/test-subrepo-recursion\.t/repo2 (re)
319 comparing with */test-subrepo-recursion.t/repo2 (glob)
320 320 searching for changes
321 321 changeset: 3:2655b8ecc4ee
322 322 tag: tip
@@ -324,7 +324,7 b' Test incoming:'
324 324 date: Thu Jan 01 00:00:00 1970 +0000
325 325 summary: 3-4-2
326 326
327 comparing with .*/test-subrepo-recursion\.t/repo2/foo (re)
327 comparing with */test-subrepo-recursion.t/repo2/foo (glob)
328 328 searching for changes
329 329 changeset: 4:e96193d6cb36
330 330 tag: tip
@@ -86,7 +86,7 b' change file in svn and hg, commit'
86 86 Transmitting file data .
87 87 Committed revision 3.
88 88
89 Fetching external item into '.*/s/externals' (re)
89 Fetching external item into '*/s/externals' (glob)
90 90 External at revision 1.
91 91
92 92 At revision 3.
@@ -236,19 +236,19 b' clone'
236 236 $ cd ..
237 237 $ hg clone t tc
238 238 updating to branch default
239 pulling subrepo s from .*/sub/t/s (re)
239 pulling subrepo s from */sub/t/s (glob)
240 240 requesting all changes
241 241 adding changesets
242 242 adding manifests
243 243 adding file changes
244 244 added 4 changesets with 5 changes to 3 files
245 pulling subrepo s/ss from .*/sub/t/s/ss (re)
245 pulling subrepo s/ss from */sub/t/s/ss (glob)
246 246 requesting all changes
247 247 adding changesets
248 248 adding manifests
249 249 adding file changes
250 250 added 1 changesets with 1 changes to 1 files
251 pulling subrepo t from .*/sub/t/t (re)
251 pulling subrepo t from */sub/t/t (glob)
252 252 requesting all changes
253 253 adding changesets
254 254 adding manifests
@@ -270,14 +270,14 b' push'
270 270 $ hg ci -m11
271 271 committing subrepository t
272 272 $ hg push
273 pushing .*sub/t (re)
274 pushing .*sub/t/s/ss (re)
273 pushing *sub/t (glob)
274 pushing *sub/t/s/ss (glob)
275 275 searching for changes
276 276 no changes found
277 pushing .*sub/t/s (re)
277 pushing *sub/t/s (glob)
278 278 searching for changes
279 279 no changes found
280 pushing .*sub/t/t (re)
280 pushing *sub/t/t (glob)
281 281 searching for changes
282 282 adding changesets
283 283 adding manifests
@@ -295,27 +295,27 b' push -f'
295 295 $ hg ci -m12
296 296 committing subrepository s
297 297 $ hg push
298 pushing .*sub/t (re)
299 pushing .*sub/t/s/ss (re)
298 pushing *sub/t (glob)
299 pushing *sub/t/s/ss (glob)
300 300 searching for changes
301 301 no changes found
302 pushing .*sub/t/s (re)
302 pushing *sub/t/s (glob)
303 303 searching for changes
304 304 abort: push creates new remote heads on branch 'default'!
305 305 (did you forget to merge? use push -f to force)
306 306 [255]
307 307 $ hg push -f
308 pushing .*sub/t (re)
309 pushing .*sub/t/s/ss (re)
308 pushing *sub/t (glob)
309 pushing *sub/t/s/ss (glob)
310 310 searching for changes
311 311 no changes found
312 pushing .*sub/t/s (re)
312 pushing *sub/t/s (glob)
313 313 searching for changes
314 314 adding changesets
315 315 adding manifests
316 316 adding file changes
317 317 added 1 changesets with 1 changes to 1 files (+1 heads)
318 pushing .*sub/t/t (re)
318 pushing *sub/t/t (glob)
319 319 searching for changes
320 320 no changes found
321 321 searching for changes
@@ -337,7 +337,7 b' pull'
337 337
338 338 $ cd ../tc
339 339 $ hg pull
340 pulling .*sub/t (re)
340 pulling *sub/t (glob)
341 341 searching for changes
342 342 adding changesets
343 343 adding manifests
@@ -348,7 +348,7 b' pull'
348 348 should pull t
349 349
350 350 $ hg up
351 pulling subrepo t from .*/sub/t/t (re)
351 pulling subrepo t from */sub/t/t (glob)
352 352 searching for changes
353 353 adding changesets
354 354 adding manifests
@@ -541,9 +541,9 b' test repository cloning'
541 541 $ cat mercurial2/main/nested_absolute/.hg/hgrc \
542 542 > mercurial2/main/nested_relative/.hg/hgrc
543 543 [paths]
544 default = .*/test-subrepo\.t/sub/mercurial/nested_absolute (re)
544 default = */test-subrepo.t/sub/mercurial/nested_absolute (glob)
545 545 [paths]
546 default = .*/test-subrepo\.t/sub/mercurial/nested_relative (re)
546 default = */test-subrepo.t/sub/mercurial/nested_relative (glob)
547 547 $ rm -rf mercurial mercurial2
548 548
549 549 issue 1977
@@ -559,7 +559,7 b' issue 1977'
559 559 committing subrepository s
560 560 $ hg clone repo repo2
561 561 updating to branch default
562 pulling subrepo s from .*/sub/repo/s (re)
562 pulling subrepo s from */sub/repo/s (glob)
563 563 requesting all changes
564 564 adding changesets
565 565 adding manifests
@@ -299,7 +299,7 b" Don't allow moving tag without -f:"
299 299 Strip 1: expose an old head:
300 300
301 301 $ hg --config extensions.mq= strip 5
302 saved backup bundle to .* (re)
302 saved backup bundle to * (glob)
303 303 $ hg tags # partly stale cache
304 304 tip 5:735c3ca72986
305 305 bar 1:78391a272241
@@ -310,7 +310,7 b' Strip 1: expose an old head:'
310 310 Strip 2: destroy whole branch, no old head exposed
311 311
312 312 $ hg --config extensions.mq= strip 4
313 saved backup bundle to .* (re)
313 saved backup bundle to * (glob)
314 314 $ hg tags # partly stale
315 315 tip 4:735c3ca72986
316 316 bar 0:bbd179dfa0a7
@@ -285,16 +285,16 b' test filter'
285 285 > EOF
286 286 $ chmod +x test-filter
287 287 $ hg transplant -s ../t -b tip -a --filter ./test-filter
288 filtering .* (re)
288 filtering * (glob)
289 289 applying 17ab29e464c6
290 290 17ab29e464c6 transplanted to e9ffc54ea104
291 filtering .* (re)
291 filtering * (glob)
292 292 applying 37a1297eb21b
293 293 37a1297eb21b transplanted to 348b36d0b6a5
294 filtering .* (re)
294 filtering * (glob)
295 295 applying 722f4667af76
296 296 722f4667af76 transplanted to 0aa6979afb95
297 filtering .* (re)
297 filtering * (glob)
298 298 applying a53251cdf717
299 299 a53251cdf717 transplanted to 14f8512272b5
300 300 $ hg log --template '{rev} {parents} {desc}\n'
@@ -316,7 +316,7 b' test filter with failed patch'
316 316 adding test-filter
317 317 created new head
318 318 $ hg transplant 1 --filter ./test-filter
319 filtering .* (re)
319 filtering * (glob)
320 320 applying 348b36d0b6a5
321 321 file b1 already exists
322 322 1 out of 1 hunks FAILED -- saving rejects to file b1.rej
@@ -42,7 +42,7 b' Test basic functionality of url#rev synt'
42 42
43 43 $ cat clone/.hg/hgrc
44 44 [paths]
45 default = .*/repo#foo (re)
45 default = */repo#foo (glob)
46 46
47 47 Changing original repo:
48 48
@@ -216,7 +216,7 b' Test absolute paths:'
216 216 f beans/pinto beans/pinto
217 217 f beans/turtle beans/turtle
218 218 $ hg debugwalk `pwd`/..
219 abort: .*/\.\. not under root (re)
219 abort: */.. not under root (glob)
220 220 [255]
221 221
222 222 Test patterns:
General Comments 0
You need to be logged in to leave comments. Login now