Show More
@@ -145,9 +145,9 b' def match(root, cwd, patterns, include=N' | |||||
145 | if exact: |
|
145 | if exact: | |
146 | m = exactmatcher(root, cwd, patterns, badfn) |
|
146 | m = exactmatcher(root, cwd, patterns, badfn) | |
147 | else: |
|
147 | else: | |
148 |
m = patternmatcher(root, cwd, normalize, patterns, |
|
148 | m = patternmatcher(root, cwd, normalize, patterns, default=default, | |
149 |
|
|
149 | auditor=auditor, ctx=ctx, listsubrepos=listsubrepos, | |
150 |
|
|
150 | warn=warn, badfn=badfn) | |
151 | if include: |
|
151 | if include: | |
152 | im = includematcher(root, cwd, normalize, include, auditor=auditor, |
|
152 | im = includematcher(root, cwd, normalize, include, auditor=auditor, | |
153 | ctx=ctx, listsubrepos=listsubrepos, warn=warn, |
|
153 | ctx=ctx, listsubrepos=listsubrepos, warn=warn, | |
@@ -313,36 +313,17 b' class basematcher(object):' | |||||
313 |
|
313 | |||
314 | class patternmatcher(basematcher): |
|
314 | class patternmatcher(basematcher): | |
315 |
|
315 | |||
316 |
def __init__(self, root, cwd, normalize, patterns, |
|
316 | def __init__(self, root, cwd, normalize, patterns, default='glob', | |
317 |
|
|
317 | auditor=None, ctx=None, listsubrepos=False, warn=None, | |
318 |
|
|
318 | badfn=None): | |
319 | super(patternmatcher, self).__init__(root, cwd, badfn, |
|
319 | super(patternmatcher, self).__init__(root, cwd, badfn, | |
320 |
relativeuipath=bool( |
|
320 | relativeuipath=bool(patterns)) | |
321 | patterns)) |
|
|||
322 | if include is None: |
|
|||
323 | include = [] |
|
|||
324 |
|
321 | |||
325 |
self._anypats = |
|
322 | self._anypats = False | |
326 | self._anyincludepats = False |
|
|||
327 | self._always = False |
|
323 | self._always = False | |
328 | self.patternspat = None |
|
324 | self.patternspat = None | |
329 | self.includepat = None |
|
|||
330 |
|
||||
331 | # roots are directories which are recursively included. |
|
|||
332 | self._includeroots = set() |
|
|||
333 | # dirs are directories which are non-recursively included. |
|
|||
334 | self._includedirs = set() |
|
|||
335 |
|
325 | |||
336 | matchfns = [] |
|
326 | matchfns = [] | |
337 | if include: |
|
|||
338 | kindpats = normalize(include, 'glob', root, cwd, auditor, warn) |
|
|||
339 | self.includepat, im = _buildmatch(ctx, kindpats, '(?:/|$)', |
|
|||
340 | listsubrepos, root) |
|
|||
341 | self._anyincludepats = _anypats(kindpats) |
|
|||
342 | roots, dirs = _rootsanddirs(kindpats) |
|
|||
343 | self._includeroots.update(roots) |
|
|||
344 | self._includedirs.update(dirs) |
|
|||
345 | matchfns.append(im) |
|
|||
346 | if patterns: |
|
327 | if patterns: | |
347 | kindpats = normalize(patterns, default, root, cwd, auditor, warn) |
|
328 | kindpats = normalize(patterns, default, root, cwd, auditor, warn) | |
348 | if not _kindpatsalwaysmatch(kindpats): |
|
329 | if not _kindpatsalwaysmatch(kindpats): | |
@@ -373,17 +354,6 b' class patternmatcher(basematcher):' | |||||
373 | def visitdir(self, dir): |
|
354 | def visitdir(self, dir): | |
374 | if self.prefix() and dir in self._fileset: |
|
355 | if self.prefix() and dir in self._fileset: | |
375 | return 'all' |
|
356 | return 'all' | |
376 | if self._includeroots or self._includedirs: |
|
|||
377 | if (not self._anyincludepats and |
|
|||
378 | dir in self._includeroots): |
|
|||
379 | # The condition above is essentially self.prefix() for includes |
|
|||
380 | return 'all' |
|
|||
381 | if ('.' not in self._includeroots and |
|
|||
382 | dir not in self._includeroots and |
|
|||
383 | dir not in self._includedirs and |
|
|||
384 | not any(parent in self._includeroots |
|
|||
385 | for parent in util.finddirs(dir))): |
|
|||
386 | return False |
|
|||
387 | return (not self._fileset or |
|
357 | return (not self._fileset or | |
388 | '.' in self._fileset or |
|
358 | '.' in self._fileset or | |
389 | dir in self._fileset or |
|
359 | dir in self._fileset or | |
@@ -398,8 +368,7 b' class patternmatcher(basematcher):' | |||||
398 | return self._always |
|
368 | return self._always | |
399 |
|
369 | |||
400 | def __repr__(self): |
|
370 | def __repr__(self): | |
401 |
return ('<patternmatcher patterns=%r |
|
371 | return ('<patternmatcher patterns=%r>' % self.patternspat) | |
402 | (self.patternspat, self.includepat)) |
|
|||
403 |
|
372 | |||
404 | class includematcher(basematcher): |
|
373 | class includematcher(basematcher): | |
405 |
|
374 |
@@ -33,7 +33,7 b' test issue352' | |||||
33 | [255] |
|
33 | [255] | |
34 | $ echo foo > "$A" |
|
34 | $ echo foo > "$A" | |
35 | $ hg debugwalk |
|
35 | $ hg debugwalk | |
36 |
matcher: <patternmatcher patterns=None |
|
36 | matcher: <patternmatcher patterns=None> | |
37 | f he\r (no-eol) (esc) |
|
37 | f he\r (no-eol) (esc) | |
38 | llo he\r (no-eol) (esc) |
|
38 | llo he\r (no-eol) (esc) | |
39 | llo |
|
39 | llo |
@@ -29,7 +29,7 b'' | |||||
29 | $ hg commit -m "commit #0" |
|
29 | $ hg commit -m "commit #0" | |
30 |
|
30 | |||
31 | $ hg debugwalk |
|
31 | $ hg debugwalk | |
32 |
matcher: <patternmatcher patterns=None |
|
32 | matcher: <patternmatcher patterns=None> | |
33 | f beans/black beans/black |
|
33 | f beans/black beans/black | |
34 | f beans/borlotti beans/borlotti |
|
34 | f beans/borlotti beans/borlotti | |
35 | f beans/kidney beans/kidney |
|
35 | f beans/kidney beans/kidney | |
@@ -61,7 +61,7 b'' | |||||
61 |
|
61 | |||
62 | $ cd mammals |
|
62 | $ cd mammals | |
63 | $ hg debugwalk |
|
63 | $ hg debugwalk | |
64 |
matcher: <patternmatcher patterns=None |
|
64 | matcher: <patternmatcher patterns=None> | |
65 | f beans/black ../beans/black |
|
65 | f beans/black ../beans/black | |
66 | f beans/borlotti ../beans/borlotti |
|
66 | f beans/borlotti ../beans/borlotti | |
67 | f beans/kidney ../beans/kidney |
|
67 | f beans/kidney ../beans/kidney | |
@@ -76,7 +76,7 b'' | |||||
76 | f mammals/Procyonidae/raccoon Procyonidae/raccoon |
|
76 | f mammals/Procyonidae/raccoon Procyonidae/raccoon | |
77 | f mammals/skunk skunk |
|
77 | f mammals/skunk skunk | |
78 | $ hg debugwalk -X ../beans |
|
78 | $ hg debugwalk -X ../beans | |
79 |
matcher: <differencematcher m1=<patternmatcher patterns=None |
|
79 | matcher: <differencematcher m1=<patternmatcher patterns=None>, m2=<includematcher includes='(?:beans(?:/|$))'>> | |
80 | f fennel ../fennel |
|
80 | f fennel ../fennel | |
81 | f fenugreek ../fenugreek |
|
81 | f fenugreek ../fenugreek | |
82 | f fiddlehead ../fiddlehead |
|
82 | f fiddlehead ../fiddlehead | |
@@ -96,7 +96,7 b'' | |||||
96 | f fenugreek ../fenugreek |
|
96 | f fenugreek ../fenugreek | |
97 | f mammals/skunk skunk |
|
97 | f mammals/skunk skunk | |
98 | $ hg debugwalk -I 'relglob:*k' . |
|
98 | $ hg debugwalk -I 'relglob:*k' . | |
99 |
matcher: <intersectionmatcher m1=<patternmatcher patterns='(?:mammals(?:/|$))' |
|
99 | matcher: <intersectionmatcher m1=<patternmatcher patterns='(?:mammals(?:/|$))'>, m2=<includematcher includes='(?:(?:|.*/)[^/]*k(?:/|$))'>> | |
100 | f mammals/skunk skunk |
|
100 | f mammals/skunk skunk | |
101 | $ hg debugwalk -I 're:.*k$' |
|
101 | $ hg debugwalk -I 're:.*k$' | |
102 | matcher: <includematcher includes='(?:.*k$)'> |
|
102 | matcher: <includematcher includes='(?:.*k$)'> | |
@@ -126,7 +126,7 b'' | |||||
126 | f beans/turtle ../beans/turtle |
|
126 | f beans/turtle ../beans/turtle | |
127 |
|
127 | |||
128 | $ hg debugwalk 'rootfilesin:' |
|
128 | $ hg debugwalk 'rootfilesin:' | |
129 |
matcher: <patternmatcher patterns='(?:^[^/]+$)' |
|
129 | matcher: <patternmatcher patterns='(?:^[^/]+$)'> | |
130 | f fennel ../fennel |
|
130 | f fennel ../fennel | |
131 | f fenugreek ../fenugreek |
|
131 | f fenugreek ../fenugreek | |
132 | f fiddlehead ../fiddlehead |
|
132 | f fiddlehead ../fiddlehead | |
@@ -136,7 +136,7 b'' | |||||
136 | f fenugreek ../fenugreek |
|
136 | f fenugreek ../fenugreek | |
137 | f fiddlehead ../fiddlehead |
|
137 | f fiddlehead ../fiddlehead | |
138 | $ hg debugwalk 'rootfilesin:.' |
|
138 | $ hg debugwalk 'rootfilesin:.' | |
139 |
matcher: <patternmatcher patterns='(?:^[^/]+$)' |
|
139 | matcher: <patternmatcher patterns='(?:^[^/]+$)'> | |
140 | f fennel ../fennel |
|
140 | f fennel ../fennel | |
141 | f fenugreek ../fenugreek |
|
141 | f fenugreek ../fenugreek | |
142 | f fiddlehead ../fiddlehead |
|
142 | f fiddlehead ../fiddlehead | |
@@ -146,7 +146,7 b'' | |||||
146 | f fenugreek ../fenugreek |
|
146 | f fenugreek ../fenugreek | |
147 | f fiddlehead ../fiddlehead |
|
147 | f fiddlehead ../fiddlehead | |
148 | $ hg debugwalk -X 'rootfilesin:' |
|
148 | $ hg debugwalk -X 'rootfilesin:' | |
149 |
matcher: <differencematcher m1=<patternmatcher patterns=None |
|
149 | matcher: <differencematcher m1=<patternmatcher patterns=None>, m2=<includematcher includes='(?:^[^/]+$)'>> | |
150 | f beans/black ../beans/black |
|
150 | f beans/black ../beans/black | |
151 | f beans/borlotti ../beans/borlotti |
|
151 | f beans/borlotti ../beans/borlotti | |
152 | f beans/kidney ../beans/kidney |
|
152 | f beans/kidney ../beans/kidney | |
@@ -158,15 +158,15 b'' | |||||
158 | f mammals/Procyonidae/raccoon Procyonidae/raccoon |
|
158 | f mammals/Procyonidae/raccoon Procyonidae/raccoon | |
159 | f mammals/skunk skunk |
|
159 | f mammals/skunk skunk | |
160 | $ hg debugwalk 'rootfilesin:fennel' |
|
160 | $ hg debugwalk 'rootfilesin:fennel' | |
161 |
matcher: <patternmatcher patterns='(?:^fennel/[^/]+$)' |
|
161 | matcher: <patternmatcher patterns='(?:^fennel/[^/]+$)'> | |
162 | $ hg debugwalk -I 'rootfilesin:fennel' |
|
162 | $ hg debugwalk -I 'rootfilesin:fennel' | |
163 | matcher: <includematcher includes='(?:^fennel/[^/]+$)'> |
|
163 | matcher: <includematcher includes='(?:^fennel/[^/]+$)'> | |
164 | $ hg debugwalk 'rootfilesin:skunk' |
|
164 | $ hg debugwalk 'rootfilesin:skunk' | |
165 |
matcher: <patternmatcher patterns='(?:^skunk/[^/]+$)' |
|
165 | matcher: <patternmatcher patterns='(?:^skunk/[^/]+$)'> | |
166 | $ hg debugwalk -I 'rootfilesin:skunk' |
|
166 | $ hg debugwalk -I 'rootfilesin:skunk' | |
167 | matcher: <includematcher includes='(?:^skunk/[^/]+$)'> |
|
167 | matcher: <includematcher includes='(?:^skunk/[^/]+$)'> | |
168 | $ hg debugwalk 'rootfilesin:beans' |
|
168 | $ hg debugwalk 'rootfilesin:beans' | |
169 |
matcher: <patternmatcher patterns='(?:^beans/[^/]+$)' |
|
169 | matcher: <patternmatcher patterns='(?:^beans/[^/]+$)'> | |
170 | f beans/black ../beans/black |
|
170 | f beans/black ../beans/black | |
171 | f beans/borlotti ../beans/borlotti |
|
171 | f beans/borlotti ../beans/borlotti | |
172 | f beans/kidney ../beans/kidney |
|
172 | f beans/kidney ../beans/kidney | |
@@ -182,19 +182,19 b'' | |||||
182 | f beans/pinto ../beans/pinto |
|
182 | f beans/pinto ../beans/pinto | |
183 | f beans/turtle ../beans/turtle |
|
183 | f beans/turtle ../beans/turtle | |
184 | $ hg debugwalk 'rootfilesin:mammals' |
|
184 | $ hg debugwalk 'rootfilesin:mammals' | |
185 |
matcher: <patternmatcher patterns='(?:^mammals/[^/]+$)' |
|
185 | matcher: <patternmatcher patterns='(?:^mammals/[^/]+$)'> | |
186 | f mammals/skunk skunk |
|
186 | f mammals/skunk skunk | |
187 | $ hg debugwalk -I 'rootfilesin:mammals' |
|
187 | $ hg debugwalk -I 'rootfilesin:mammals' | |
188 | matcher: <includematcher includes='(?:^mammals/[^/]+$)'> |
|
188 | matcher: <includematcher includes='(?:^mammals/[^/]+$)'> | |
189 | f mammals/skunk skunk |
|
189 | f mammals/skunk skunk | |
190 | $ hg debugwalk 'rootfilesin:mammals/' |
|
190 | $ hg debugwalk 'rootfilesin:mammals/' | |
191 |
matcher: <patternmatcher patterns='(?:^mammals/[^/]+$)' |
|
191 | matcher: <patternmatcher patterns='(?:^mammals/[^/]+$)'> | |
192 | f mammals/skunk skunk |
|
192 | f mammals/skunk skunk | |
193 | $ hg debugwalk -I 'rootfilesin:mammals/' |
|
193 | $ hg debugwalk -I 'rootfilesin:mammals/' | |
194 | matcher: <includematcher includes='(?:^mammals/[^/]+$)'> |
|
194 | matcher: <includematcher includes='(?:^mammals/[^/]+$)'> | |
195 | f mammals/skunk skunk |
|
195 | f mammals/skunk skunk | |
196 | $ hg debugwalk -X 'rootfilesin:mammals' |
|
196 | $ hg debugwalk -X 'rootfilesin:mammals' | |
197 |
matcher: <differencematcher m1=<patternmatcher patterns=None |
|
197 | matcher: <differencematcher m1=<patternmatcher patterns=None>, m2=<includematcher includes='(?:^mammals/[^/]+$)'>> | |
198 | f beans/black ../beans/black |
|
198 | f beans/black ../beans/black | |
199 | f beans/borlotti ../beans/borlotti |
|
199 | f beans/borlotti ../beans/borlotti | |
200 | f beans/kidney ../beans/kidney |
|
200 | f beans/kidney ../beans/kidney | |
@@ -209,7 +209,7 b'' | |||||
209 | f mammals/Procyonidae/raccoon Procyonidae/raccoon |
|
209 | f mammals/Procyonidae/raccoon Procyonidae/raccoon | |
210 |
|
210 | |||
211 | $ hg debugwalk . |
|
211 | $ hg debugwalk . | |
212 |
matcher: <patternmatcher patterns='(?:mammals(?:/|$))' |
|
212 | matcher: <patternmatcher patterns='(?:mammals(?:/|$))'> | |
213 | f mammals/Procyonidae/cacomistle Procyonidae/cacomistle |
|
213 | f mammals/Procyonidae/cacomistle Procyonidae/cacomistle | |
214 | f mammals/Procyonidae/coatimundi Procyonidae/coatimundi |
|
214 | f mammals/Procyonidae/coatimundi Procyonidae/coatimundi | |
215 | f mammals/Procyonidae/raccoon Procyonidae/raccoon |
|
215 | f mammals/Procyonidae/raccoon Procyonidae/raccoon | |
@@ -221,19 +221,19 b'' | |||||
221 | f mammals/Procyonidae/raccoon Procyonidae/raccoon |
|
221 | f mammals/Procyonidae/raccoon Procyonidae/raccoon | |
222 | f mammals/skunk skunk |
|
222 | f mammals/skunk skunk | |
223 | $ hg debugwalk Procyonidae |
|
223 | $ hg debugwalk Procyonidae | |
224 |
matcher: <patternmatcher patterns='(?:mammals\\/Procyonidae(?:/|$))' |
|
224 | matcher: <patternmatcher patterns='(?:mammals\\/Procyonidae(?:/|$))'> | |
225 | f mammals/Procyonidae/cacomistle Procyonidae/cacomistle |
|
225 | f mammals/Procyonidae/cacomistle Procyonidae/cacomistle | |
226 | f mammals/Procyonidae/coatimundi Procyonidae/coatimundi |
|
226 | f mammals/Procyonidae/coatimundi Procyonidae/coatimundi | |
227 | f mammals/Procyonidae/raccoon Procyonidae/raccoon |
|
227 | f mammals/Procyonidae/raccoon Procyonidae/raccoon | |
228 |
|
228 | |||
229 | $ cd Procyonidae |
|
229 | $ cd Procyonidae | |
230 | $ hg debugwalk . |
|
230 | $ hg debugwalk . | |
231 |
matcher: <patternmatcher patterns='(?:mammals\\/Procyonidae(?:/|$))' |
|
231 | matcher: <patternmatcher patterns='(?:mammals\\/Procyonidae(?:/|$))'> | |
232 | f mammals/Procyonidae/cacomistle cacomistle |
|
232 | f mammals/Procyonidae/cacomistle cacomistle | |
233 | f mammals/Procyonidae/coatimundi coatimundi |
|
233 | f mammals/Procyonidae/coatimundi coatimundi | |
234 | f mammals/Procyonidae/raccoon raccoon |
|
234 | f mammals/Procyonidae/raccoon raccoon | |
235 | $ hg debugwalk .. |
|
235 | $ hg debugwalk .. | |
236 |
matcher: <patternmatcher patterns='(?:mammals(?:/|$))' |
|
236 | matcher: <patternmatcher patterns='(?:mammals(?:/|$))'> | |
237 | f mammals/Procyonidae/cacomistle cacomistle |
|
237 | f mammals/Procyonidae/cacomistle cacomistle | |
238 | f mammals/Procyonidae/coatimundi coatimundi |
|
238 | f mammals/Procyonidae/coatimundi coatimundi | |
239 | f mammals/Procyonidae/raccoon raccoon |
|
239 | f mammals/Procyonidae/raccoon raccoon | |
@@ -241,7 +241,7 b'' | |||||
241 | $ cd .. |
|
241 | $ cd .. | |
242 |
|
242 | |||
243 | $ hg debugwalk ../beans |
|
243 | $ hg debugwalk ../beans | |
244 |
matcher: <patternmatcher patterns='(?:beans(?:/|$))' |
|
244 | matcher: <patternmatcher patterns='(?:beans(?:/|$))'> | |
245 | f beans/black ../beans/black |
|
245 | f beans/black ../beans/black | |
246 | f beans/borlotti ../beans/borlotti |
|
246 | f beans/borlotti ../beans/borlotti | |
247 | f beans/kidney ../beans/kidney |
|
247 | f beans/kidney ../beans/kidney | |
@@ -249,7 +249,7 b'' | |||||
249 | f beans/pinto ../beans/pinto |
|
249 | f beans/pinto ../beans/pinto | |
250 | f beans/turtle ../beans/turtle |
|
250 | f beans/turtle ../beans/turtle | |
251 | $ hg debugwalk . |
|
251 | $ hg debugwalk . | |
252 |
matcher: <patternmatcher patterns='(?:mammals(?:/|$))' |
|
252 | matcher: <patternmatcher patterns='(?:mammals(?:/|$))'> | |
253 | f mammals/Procyonidae/cacomistle Procyonidae/cacomistle |
|
253 | f mammals/Procyonidae/cacomistle Procyonidae/cacomistle | |
254 | f mammals/Procyonidae/coatimundi Procyonidae/coatimundi |
|
254 | f mammals/Procyonidae/coatimundi Procyonidae/coatimundi | |
255 | f mammals/Procyonidae/raccoon Procyonidae/raccoon |
|
255 | f mammals/Procyonidae/raccoon Procyonidae/raccoon | |
@@ -276,20 +276,20 b'' | |||||
276 | f fenugreek fenugreek |
|
276 | f fenugreek fenugreek | |
277 | f mammals/skunk mammals/skunk |
|
277 | f mammals/skunk mammals/skunk | |
278 | $ hg debugwalk -Ibeans mammals |
|
278 | $ hg debugwalk -Ibeans mammals | |
279 |
matcher: <intersectionmatcher m1=<patternmatcher patterns='(?:mammals(?:/|$))' |
|
279 | matcher: <intersectionmatcher m1=<patternmatcher patterns='(?:mammals(?:/|$))'>, m2=<includematcher includes='(?:beans(?:/|$))'>> | |
280 | $ hg debugwalk -Inon-existent |
|
280 | $ hg debugwalk -Inon-existent | |
281 | matcher: <includematcher includes='(?:non\\-existent(?:/|$))'> |
|
281 | matcher: <includematcher includes='(?:non\\-existent(?:/|$))'> | |
282 | $ hg debugwalk -Inon-existent -Ibeans/black |
|
282 | $ hg debugwalk -Inon-existent -Ibeans/black | |
283 | matcher: <includematcher includes='(?:non\\-existent(?:/|$)|beans\\/black(?:/|$))'> |
|
283 | matcher: <includematcher includes='(?:non\\-existent(?:/|$)|beans\\/black(?:/|$))'> | |
284 | f beans/black beans/black |
|
284 | f beans/black beans/black | |
285 | $ hg debugwalk -Ibeans beans/black |
|
285 | $ hg debugwalk -Ibeans beans/black | |
286 |
matcher: <intersectionmatcher m1=<patternmatcher patterns='(?:beans\\/black(?:/|$))' |
|
286 | matcher: <intersectionmatcher m1=<patternmatcher patterns='(?:beans\\/black(?:/|$))'>, m2=<includematcher includes='(?:beans(?:/|$))'>> | |
287 | f beans/black beans/black exact |
|
287 | f beans/black beans/black exact | |
288 | $ hg debugwalk -Ibeans/black beans |
|
288 | $ hg debugwalk -Ibeans/black beans | |
289 |
matcher: <intersectionmatcher m1=<patternmatcher patterns='(?:beans(?:/|$))' |
|
289 | matcher: <intersectionmatcher m1=<patternmatcher patterns='(?:beans(?:/|$))'>, m2=<includematcher includes='(?:beans\\/black(?:/|$))'>> | |
290 | f beans/black beans/black |
|
290 | f beans/black beans/black | |
291 | $ hg debugwalk -Xbeans/black beans |
|
291 | $ hg debugwalk -Xbeans/black beans | |
292 |
matcher: <differencematcher m1=<patternmatcher patterns='(?:beans(?:/|$))' |
|
292 | matcher: <differencematcher m1=<patternmatcher patterns='(?:beans(?:/|$))'>, m2=<includematcher includes='(?:beans\\/black(?:/|$))'>> | |
293 | f beans/borlotti beans/borlotti |
|
293 | f beans/borlotti beans/borlotti | |
294 | f beans/kidney beans/kidney |
|
294 | f beans/kidney beans/kidney | |
295 | f beans/navy beans/navy |
|
295 | f beans/navy beans/navy | |
@@ -303,24 +303,24 b'' | |||||
303 | f beans/pinto beans/pinto |
|
303 | f beans/pinto beans/pinto | |
304 | f beans/turtle beans/turtle |
|
304 | f beans/turtle beans/turtle | |
305 | $ hg debugwalk -Xbeans/black beans/black |
|
305 | $ hg debugwalk -Xbeans/black beans/black | |
306 |
matcher: <differencematcher m1=<patternmatcher patterns='(?:beans\\/black(?:/|$))' |
|
306 | matcher: <differencematcher m1=<patternmatcher patterns='(?:beans\\/black(?:/|$))'>, m2=<includematcher includes='(?:beans\\/black(?:/|$))'>> | |
307 | f beans/black beans/black exact |
|
307 | f beans/black beans/black exact | |
308 | $ hg debugwalk -Xbeans/black -Ibeans/black |
|
308 | $ hg debugwalk -Xbeans/black -Ibeans/black | |
309 | matcher: <differencematcher m1=<includematcher includes='(?:beans\\/black(?:/|$))'>, m2=<includematcher includes='(?:beans\\/black(?:/|$))'>> |
|
309 | matcher: <differencematcher m1=<includematcher includes='(?:beans\\/black(?:/|$))'>, m2=<includematcher includes='(?:beans\\/black(?:/|$))'>> | |
310 | $ hg debugwalk -Xbeans beans/black |
|
310 | $ hg debugwalk -Xbeans beans/black | |
311 |
matcher: <differencematcher m1=<patternmatcher patterns='(?:beans\\/black(?:/|$))' |
|
311 | matcher: <differencematcher m1=<patternmatcher patterns='(?:beans\\/black(?:/|$))'>, m2=<includematcher includes='(?:beans(?:/|$))'>> | |
312 | f beans/black beans/black exact |
|
312 | f beans/black beans/black exact | |
313 | $ hg debugwalk -Xbeans -Ibeans/black |
|
313 | $ hg debugwalk -Xbeans -Ibeans/black | |
314 | matcher: <differencematcher m1=<includematcher includes='(?:beans\\/black(?:/|$))'>, m2=<includematcher includes='(?:beans(?:/|$))'>> |
|
314 | matcher: <differencematcher m1=<includematcher includes='(?:beans\\/black(?:/|$))'>, m2=<includematcher includes='(?:beans(?:/|$))'>> | |
315 | $ hg debugwalk 'glob:mammals/../beans/b*' |
|
315 | $ hg debugwalk 'glob:mammals/../beans/b*' | |
316 |
matcher: <patternmatcher patterns='(?:beans\\/b[^/]*$)' |
|
316 | matcher: <patternmatcher patterns='(?:beans\\/b[^/]*$)'> | |
317 | f beans/black beans/black |
|
317 | f beans/black beans/black | |
318 | f beans/borlotti beans/borlotti |
|
318 | f beans/borlotti beans/borlotti | |
319 | $ hg debugwalk '-X*/Procyonidae' mammals |
|
319 | $ hg debugwalk '-X*/Procyonidae' mammals | |
320 |
matcher: <differencematcher m1=<patternmatcher patterns='(?:mammals(?:/|$))' |
|
320 | matcher: <differencematcher m1=<patternmatcher patterns='(?:mammals(?:/|$))'>, m2=<includematcher includes='(?:[^/]*\\/Procyonidae(?:/|$))'>> | |
321 | f mammals/skunk mammals/skunk |
|
321 | f mammals/skunk mammals/skunk | |
322 | $ hg debugwalk path:mammals |
|
322 | $ hg debugwalk path:mammals | |
323 |
matcher: <patternmatcher patterns='(?:^mammals(?:/|$))' |
|
323 | matcher: <patternmatcher patterns='(?:^mammals(?:/|$))'> | |
324 | f mammals/Procyonidae/cacomistle mammals/Procyonidae/cacomistle |
|
324 | f mammals/Procyonidae/cacomistle mammals/Procyonidae/cacomistle | |
325 | f mammals/Procyonidae/coatimundi mammals/Procyonidae/coatimundi |
|
325 | f mammals/Procyonidae/coatimundi mammals/Procyonidae/coatimundi | |
326 | f mammals/Procyonidae/raccoon mammals/Procyonidae/raccoon |
|
326 | f mammals/Procyonidae/raccoon mammals/Procyonidae/raccoon | |
@@ -347,7 +347,7 b'' | |||||
347 | Test absolute paths: |
|
347 | Test absolute paths: | |
348 |
|
348 | |||
349 | $ hg debugwalk `pwd`/beans |
|
349 | $ hg debugwalk `pwd`/beans | |
350 |
matcher: <patternmatcher patterns='(?:beans(?:/|$))' |
|
350 | matcher: <patternmatcher patterns='(?:beans(?:/|$))'> | |
351 | f beans/black beans/black |
|
351 | f beans/black beans/black | |
352 | f beans/borlotti beans/borlotti |
|
352 | f beans/borlotti beans/borlotti | |
353 | f beans/kidney beans/kidney |
|
353 | f beans/kidney beans/kidney | |
@@ -361,7 +361,7 b' Test absolute paths:' | |||||
361 | Test patterns: |
|
361 | Test patterns: | |
362 |
|
362 | |||
363 | $ hg debugwalk glob:\* |
|
363 | $ hg debugwalk glob:\* | |
364 |
matcher: <patternmatcher patterns='(?:[^/]*$)' |
|
364 | matcher: <patternmatcher patterns='(?:[^/]*$)'> | |
365 | f fennel fennel |
|
365 | f fennel fennel | |
366 | f fenugreek fenugreek |
|
366 | f fenugreek fenugreek | |
367 | f fiddlehead fiddlehead |
|
367 | f fiddlehead fiddlehead | |
@@ -371,19 +371,19 b' Test patterns:' | |||||
371 | adding glob:glob |
|
371 | adding glob:glob | |
372 | warning: filename contains ':', which is reserved on Windows: 'glob:glob' |
|
372 | warning: filename contains ':', which is reserved on Windows: 'glob:glob' | |
373 | $ hg debugwalk glob:\* |
|
373 | $ hg debugwalk glob:\* | |
374 |
matcher: <patternmatcher patterns='(?:[^/]*$)' |
|
374 | matcher: <patternmatcher patterns='(?:[^/]*$)'> | |
375 | f fennel fennel |
|
375 | f fennel fennel | |
376 | f fenugreek fenugreek |
|
376 | f fenugreek fenugreek | |
377 | f fiddlehead fiddlehead |
|
377 | f fiddlehead fiddlehead | |
378 | f glob:glob glob:glob |
|
378 | f glob:glob glob:glob | |
379 | $ hg debugwalk glob:glob |
|
379 | $ hg debugwalk glob:glob | |
380 |
matcher: <patternmatcher patterns='(?:glob$)' |
|
380 | matcher: <patternmatcher patterns='(?:glob$)'> | |
381 | glob: No such file or directory |
|
381 | glob: No such file or directory | |
382 | $ hg debugwalk glob:glob:glob |
|
382 | $ hg debugwalk glob:glob:glob | |
383 |
matcher: <patternmatcher patterns='(?:glob\\:glob$)' |
|
383 | matcher: <patternmatcher patterns='(?:glob\\:glob$)'> | |
384 | f glob:glob glob:glob exact |
|
384 | f glob:glob glob:glob exact | |
385 | $ hg debugwalk path:glob:glob |
|
385 | $ hg debugwalk path:glob:glob | |
386 |
matcher: <patternmatcher patterns='(?:^glob\\:glob(?:/|$))' |
|
386 | matcher: <patternmatcher patterns='(?:^glob\\:glob(?:/|$))'> | |
387 | f glob:glob glob:glob exact |
|
387 | f glob:glob glob:glob exact | |
388 | $ rm glob:glob |
|
388 | $ rm glob:glob | |
389 | $ hg addremove |
|
389 | $ hg addremove | |
@@ -391,38 +391,38 b' Test patterns:' | |||||
391 | #endif |
|
391 | #endif | |
392 |
|
392 | |||
393 | $ hg debugwalk 'glob:**e' |
|
393 | $ hg debugwalk 'glob:**e' | |
394 |
matcher: <patternmatcher patterns='(?:.*e$)' |
|
394 | matcher: <patternmatcher patterns='(?:.*e$)'> | |
395 | f beans/turtle beans/turtle |
|
395 | f beans/turtle beans/turtle | |
396 | f mammals/Procyonidae/cacomistle mammals/Procyonidae/cacomistle |
|
396 | f mammals/Procyonidae/cacomistle mammals/Procyonidae/cacomistle | |
397 |
|
397 | |||
398 | $ hg debugwalk 're:.*[kb]$' |
|
398 | $ hg debugwalk 're:.*[kb]$' | |
399 |
matcher: <patternmatcher patterns='(?:.*[kb]$)' |
|
399 | matcher: <patternmatcher patterns='(?:.*[kb]$)'> | |
400 | f beans/black beans/black |
|
400 | f beans/black beans/black | |
401 | f fenugreek fenugreek |
|
401 | f fenugreek fenugreek | |
402 | f mammals/skunk mammals/skunk |
|
402 | f mammals/skunk mammals/skunk | |
403 |
|
403 | |||
404 | $ hg debugwalk path:beans/black |
|
404 | $ hg debugwalk path:beans/black | |
405 |
matcher: <patternmatcher patterns='(?:^beans\\/black(?:/|$))' |
|
405 | matcher: <patternmatcher patterns='(?:^beans\\/black(?:/|$))'> | |
406 | f beans/black beans/black exact |
|
406 | f beans/black beans/black exact | |
407 | $ hg debugwalk path:beans//black |
|
407 | $ hg debugwalk path:beans//black | |
408 |
matcher: <patternmatcher patterns='(?:^beans\\/black(?:/|$))' |
|
408 | matcher: <patternmatcher patterns='(?:^beans\\/black(?:/|$))'> | |
409 | f beans/black beans/black exact |
|
409 | f beans/black beans/black exact | |
410 |
|
410 | |||
411 | $ hg debugwalk relglob:Procyonidae |
|
411 | $ hg debugwalk relglob:Procyonidae | |
412 |
matcher: <patternmatcher patterns='(?:(?:|.*/)Procyonidae$)' |
|
412 | matcher: <patternmatcher patterns='(?:(?:|.*/)Procyonidae$)'> | |
413 | $ hg debugwalk 'relglob:Procyonidae/**' |
|
413 | $ hg debugwalk 'relglob:Procyonidae/**' | |
414 |
matcher: <patternmatcher patterns='(?:(?:|.*/)Procyonidae\\/.*$)' |
|
414 | matcher: <patternmatcher patterns='(?:(?:|.*/)Procyonidae\\/.*$)'> | |
415 | f mammals/Procyonidae/cacomistle mammals/Procyonidae/cacomistle |
|
415 | f mammals/Procyonidae/cacomistle mammals/Procyonidae/cacomistle | |
416 | f mammals/Procyonidae/coatimundi mammals/Procyonidae/coatimundi |
|
416 | f mammals/Procyonidae/coatimundi mammals/Procyonidae/coatimundi | |
417 | f mammals/Procyonidae/raccoon mammals/Procyonidae/raccoon |
|
417 | f mammals/Procyonidae/raccoon mammals/Procyonidae/raccoon | |
418 | $ hg debugwalk 'relglob:Procyonidae/**' fennel |
|
418 | $ hg debugwalk 'relglob:Procyonidae/**' fennel | |
419 |
matcher: <patternmatcher patterns='(?:(?:|.*/)Procyonidae\\/.*$|fennel(?:/|$))' |
|
419 | matcher: <patternmatcher patterns='(?:(?:|.*/)Procyonidae\\/.*$|fennel(?:/|$))'> | |
420 | f fennel fennel exact |
|
420 | f fennel fennel exact | |
421 | f mammals/Procyonidae/cacomistle mammals/Procyonidae/cacomistle |
|
421 | f mammals/Procyonidae/cacomistle mammals/Procyonidae/cacomistle | |
422 | f mammals/Procyonidae/coatimundi mammals/Procyonidae/coatimundi |
|
422 | f mammals/Procyonidae/coatimundi mammals/Procyonidae/coatimundi | |
423 | f mammals/Procyonidae/raccoon mammals/Procyonidae/raccoon |
|
423 | f mammals/Procyonidae/raccoon mammals/Procyonidae/raccoon | |
424 | $ hg debugwalk beans 'glob:beans/*' |
|
424 | $ hg debugwalk beans 'glob:beans/*' | |
425 |
matcher: <patternmatcher patterns='(?:beans(?:/|$)|beans\\/[^/]*$)' |
|
425 | matcher: <patternmatcher patterns='(?:beans(?:/|$)|beans\\/[^/]*$)'> | |
426 | f beans/black beans/black |
|
426 | f beans/black beans/black | |
427 | f beans/borlotti beans/borlotti |
|
427 | f beans/borlotti beans/borlotti | |
428 | f beans/kidney beans/kidney |
|
428 | f beans/kidney beans/kidney | |
@@ -430,51 +430,51 b' Test patterns:' | |||||
430 | f beans/pinto beans/pinto |
|
430 | f beans/pinto beans/pinto | |
431 | f beans/turtle beans/turtle |
|
431 | f beans/turtle beans/turtle | |
432 | $ hg debugwalk 'glob:mamm**' |
|
432 | $ hg debugwalk 'glob:mamm**' | |
433 |
matcher: <patternmatcher patterns='(?:mamm.*$)' |
|
433 | matcher: <patternmatcher patterns='(?:mamm.*$)'> | |
434 | f mammals/Procyonidae/cacomistle mammals/Procyonidae/cacomistle |
|
434 | f mammals/Procyonidae/cacomistle mammals/Procyonidae/cacomistle | |
435 | f mammals/Procyonidae/coatimundi mammals/Procyonidae/coatimundi |
|
435 | f mammals/Procyonidae/coatimundi mammals/Procyonidae/coatimundi | |
436 | f mammals/Procyonidae/raccoon mammals/Procyonidae/raccoon |
|
436 | f mammals/Procyonidae/raccoon mammals/Procyonidae/raccoon | |
437 | f mammals/skunk mammals/skunk |
|
437 | f mammals/skunk mammals/skunk | |
438 | $ hg debugwalk 'glob:mamm**' fennel |
|
438 | $ hg debugwalk 'glob:mamm**' fennel | |
439 |
matcher: <patternmatcher patterns='(?:mamm.*$|fennel(?:/|$))' |
|
439 | matcher: <patternmatcher patterns='(?:mamm.*$|fennel(?:/|$))'> | |
440 | f fennel fennel exact |
|
440 | f fennel fennel exact | |
441 | f mammals/Procyonidae/cacomistle mammals/Procyonidae/cacomistle |
|
441 | f mammals/Procyonidae/cacomistle mammals/Procyonidae/cacomistle | |
442 | f mammals/Procyonidae/coatimundi mammals/Procyonidae/coatimundi |
|
442 | f mammals/Procyonidae/coatimundi mammals/Procyonidae/coatimundi | |
443 | f mammals/Procyonidae/raccoon mammals/Procyonidae/raccoon |
|
443 | f mammals/Procyonidae/raccoon mammals/Procyonidae/raccoon | |
444 | f mammals/skunk mammals/skunk |
|
444 | f mammals/skunk mammals/skunk | |
445 | $ hg debugwalk 'glob:j*' |
|
445 | $ hg debugwalk 'glob:j*' | |
446 |
matcher: <patternmatcher patterns='(?:j[^/]*$)' |
|
446 | matcher: <patternmatcher patterns='(?:j[^/]*$)'> | |
447 | $ hg debugwalk NOEXIST |
|
447 | $ hg debugwalk NOEXIST | |
448 |
matcher: <patternmatcher patterns='(?:NOEXIST(?:/|$))' |
|
448 | matcher: <patternmatcher patterns='(?:NOEXIST(?:/|$))'> | |
449 | NOEXIST: * (glob) |
|
449 | NOEXIST: * (glob) | |
450 |
|
450 | |||
451 | #if fifo |
|
451 | #if fifo | |
452 | $ mkfifo fifo |
|
452 | $ mkfifo fifo | |
453 | $ hg debugwalk fifo |
|
453 | $ hg debugwalk fifo | |
454 |
matcher: <patternmatcher patterns='(?:fifo(?:/|$))' |
|
454 | matcher: <patternmatcher patterns='(?:fifo(?:/|$))'> | |
455 | fifo: unsupported file type (type is fifo) |
|
455 | fifo: unsupported file type (type is fifo) | |
456 | #endif |
|
456 | #endif | |
457 |
|
457 | |||
458 | $ rm fenugreek |
|
458 | $ rm fenugreek | |
459 | $ hg debugwalk fenugreek |
|
459 | $ hg debugwalk fenugreek | |
460 |
matcher: <patternmatcher patterns='(?:fenugreek(?:/|$))' |
|
460 | matcher: <patternmatcher patterns='(?:fenugreek(?:/|$))'> | |
461 | f fenugreek fenugreek exact |
|
461 | f fenugreek fenugreek exact | |
462 | $ hg rm fenugreek |
|
462 | $ hg rm fenugreek | |
463 | $ hg debugwalk fenugreek |
|
463 | $ hg debugwalk fenugreek | |
464 |
matcher: <patternmatcher patterns='(?:fenugreek(?:/|$))' |
|
464 | matcher: <patternmatcher patterns='(?:fenugreek(?:/|$))'> | |
465 | f fenugreek fenugreek exact |
|
465 | f fenugreek fenugreek exact | |
466 | $ touch new |
|
466 | $ touch new | |
467 | $ hg debugwalk new |
|
467 | $ hg debugwalk new | |
468 |
matcher: <patternmatcher patterns='(?:new(?:/|$))' |
|
468 | matcher: <patternmatcher patterns='(?:new(?:/|$))'> | |
469 | f new new exact |
|
469 | f new new exact | |
470 |
|
470 | |||
471 | $ mkdir ignored |
|
471 | $ mkdir ignored | |
472 | $ touch ignored/file |
|
472 | $ touch ignored/file | |
473 | $ echo '^ignored$' > .hgignore |
|
473 | $ echo '^ignored$' > .hgignore | |
474 | $ hg debugwalk ignored |
|
474 | $ hg debugwalk ignored | |
475 |
matcher: <patternmatcher patterns='(?:ignored(?:/|$))' |
|
475 | matcher: <patternmatcher patterns='(?:ignored(?:/|$))'> | |
476 | $ hg debugwalk ignored/file |
|
476 | $ hg debugwalk ignored/file | |
477 |
matcher: <patternmatcher patterns='(?:ignored\\/file(?:/|$))' |
|
477 | matcher: <patternmatcher patterns='(?:ignored\\/file(?:/|$))'> | |
478 | f ignored/file ignored/file exact |
|
478 | f ignored/file ignored/file exact | |
479 |
|
479 | |||
480 | Test listfile and listfile0 |
|
480 | Test listfile and listfile0 | |
@@ -493,15 +493,15 b' Test listfile and listfile0' | |||||
493 |
|
493 | |||
494 | $ cd .. |
|
494 | $ cd .. | |
495 | $ hg debugwalk -R t t/mammals/skunk |
|
495 | $ hg debugwalk -R t t/mammals/skunk | |
496 |
matcher: <patternmatcher patterns='(?:mammals\\/skunk(?:/|$))' |
|
496 | matcher: <patternmatcher patterns='(?:mammals\\/skunk(?:/|$))'> | |
497 | f mammals/skunk t/mammals/skunk exact |
|
497 | f mammals/skunk t/mammals/skunk exact | |
498 | $ mkdir t2 |
|
498 | $ mkdir t2 | |
499 | $ cd t2 |
|
499 | $ cd t2 | |
500 | $ hg debugwalk -R ../t ../t/mammals/skunk |
|
500 | $ hg debugwalk -R ../t ../t/mammals/skunk | |
501 |
matcher: <patternmatcher patterns='(?:mammals\\/skunk(?:/|$))' |
|
501 | matcher: <patternmatcher patterns='(?:mammals\\/skunk(?:/|$))'> | |
502 | f mammals/skunk ../t/mammals/skunk exact |
|
502 | f mammals/skunk ../t/mammals/skunk exact | |
503 | $ hg debugwalk --cwd ../t mammals/skunk |
|
503 | $ hg debugwalk --cwd ../t mammals/skunk | |
504 |
matcher: <patternmatcher patterns='(?:mammals\\/skunk(?:/|$))' |
|
504 | matcher: <patternmatcher patterns='(?:mammals\\/skunk(?:/|$))'> | |
505 | f mammals/skunk mammals/skunk exact |
|
505 | f mammals/skunk mammals/skunk exact | |
506 |
|
506 | |||
507 | $ cd .. |
|
507 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now