mercurial: comparison mercurial/match.py

equal deleted inserted replaced

-:9595b6a9f0d5
+:8b1a9ba375e5
 'subinclude:<path>' - a file of patterns to match against files under
 the same directory
 '<something>' - a pattern of the specified default type
 Usually a patternmatcher is returned:
->>> match(b'foo', b'.', [b're:.*\.c$', b'path:foo/a', b'*.py'])
+>>> match(b'/foo', b'.', [b're:.*\.c$', b'path:foo/a', b'*.py'])
 <patternmatcher patterns='.*\\.c$|foo/a(?:/|$)|[^/]*\\.py$'>
 Combining 'patterns' with 'include' (resp. 'exclude') gives an
 intersectionmatcher (resp. a differencematcher):
->>> type(match(b'foo', b'.', [b're:.*\.c$'], include=[b'path:lib']))
+>>> type(match(b'/foo', b'.', [b're:.*\.c$'], include=[b'path:lib']))
 <class 'mercurial.match.intersectionmatcher'>
->>> type(match(b'foo', b'.', [b're:.*\.c$'], exclude=[b'path:build']))
+>>> type(match(b'/foo', b'.', [b're:.*\.c$'], exclude=[b'path:build']))
 <class 'mercurial.match.differencematcher'>
 Notice that, if 'patterns' is empty, an alwaysmatcher is returned:
->>> match(b'foo', b'.', [])
+>>> match(b'/foo', b'.', [])
 <alwaysmatcher>
 The 'default' argument determines which kind of pattern is assumed if a
 pattern has no prefix:
->>> match(b'foo', b'.', [b'.*\.c$'], default=b're')
+>>> match(b'/foo', b'.', [b'.*\.c$'], default=b're')
 <patternmatcher patterns='.*\\.c$'>
->>> match(b'foo', b'.', [b'main.py'], default=b'relpath')
+>>> match(b'/foo', b'.', [b'main.py'], default=b'relpath')
 <patternmatcher patterns='main\\.py(?:/|$)'>
->>> match(b'foo', b'.', [b'main.py'], default=b're')
+>>> match(b'/foo', b'.', [b'main.py'], default=b're')
 <patternmatcher patterns='main.py'>
 The primary use of matchers is to check whether a value (usually a file
 name) matches againset one of the patterns given at initialization. There
 are two ways of doing this check.
->>> m = match(b'foo', b'', [b're:.*\.c$', b'relpath:a'])
+>>> m = match(b'/foo', b'', [b're:.*\.c$', b'relpath:a'])
 1. Calling the matcher with a file name returns True if any pattern
 matches that file name:
 >>> m(b'a')
 True
 >>> m.exact(b'a')
 True
 >>> m.exact(b'main.c')
 False
 """
+assert os.path.isabs(root)
 normalize = _donormalize
 if icasefs:
 dirstate = ctx.repo().dirstate
 dsnormalize = dirstate.normalize
 """Adapt a matcher to work on a subdirectory only.
 The paths are remapped to remove/insert the path as needed:
 >>> from . import pycompat
->>> m1 = match(b'root', b'', [b'a.txt', b'sub/b.txt'])
+>>> m1 = match(b'/root', b'', [b'a.txt', b'sub/b.txt'])
 >>> m2 = subdirmatcher(b'sub', m1)
 >>> m2(b'a.txt')
 False
 >>> m2(b'b.txt')
 True
 The matcher's non-matching-attributes (bad, traversedir) are ignored.
 The prefix path should usually be the relative path from the root of
 this matcher to the root of the wrapped matcher.
->>> m1 = match(util.localpath(b'root/d/e'), b'f', [b'../a.txt', b'b.txt'])
+>>> m1 = match(util.localpath(b'/root/d/e'), b'f', [b'../a.txt', b'b.txt'], auditor=lambda name: None)
 >>> m2 = prefixdirmatcher(b'd/e', m1)
 >>> m2(b'a.txt')
 False
 >>> m2(b'd/e/a.txt')
 True

changeset 43949	8b1a9ba375e5
parent 43735	7eb701e355bd
child 43950	5685ce2ea3bf