# HG changeset patch # User Martin von Zweigbergk # Date 2017-05-16 23:36:48 # Node ID a83a7d27911ebfc0e5dff3255c215bf02b9e2064 # Parent 2e80a691e57517373cf81b35d18d8667e0e3d065 match: handle excludes using new differencematcher As I've said on earlier patches, I'm hoping to use more composition of simpler matchers instead of the single complex matcher we currently have. This extracts a first new matcher that composes two other matchers. It matches if the first matcher matches but the second does not. As such, we can use it for excludes, which this patch also does. We'll remove the now-unncessary code for excludes in the next patch. diff --git a/mercurial/match.py b/mercurial/match.py --- a/mercurial/match.py +++ b/mercurial/match.py @@ -142,10 +142,15 @@ def match(root, cwd, patterns, include=N kindpats.append((kind, pats, source)) return kindpats - return matcher(root, cwd, normalize, patterns, include=include, - exclude=exclude, default=default, exact=exact, - auditor=auditor, ctx=ctx, listsubrepos=listsubrepos, - warn=warn, badfn=badfn) + m = matcher(root, cwd, normalize, patterns, include=include, exclude=None, + default=default, exact=exact, auditor=auditor, ctx=ctx, + listsubrepos=listsubrepos, warn=warn, badfn=badfn) + if exclude: + em = matcher(root, cwd, normalize, [], include=exclude, exclude=None, + default=default, exact=False, auditor=auditor, ctx=ctx, + listsubrepos=listsubrepos, warn=warn, badfn=None) + m = differencematcher(m, em) + return m def exact(root, cwd, files, badfn=None): return match(root, cwd, files, exact=True, badfn=badfn) @@ -418,6 +423,62 @@ class matcher(basematcher): (self._files, self.patternspat, self.includepat, self.excludepat)) +class differencematcher(basematcher): + '''Composes two matchers by matching if the first matches and the second + does not. Well, almost... If the user provides a pattern like "-X foo foo", + Mercurial actually does match "foo" against that. That's because exact + matches are treated specially. So, since this differencematcher is used for + excludes, it needs to special-case exact matching. + + The second matcher's non-matching-attributes (root, cwd, bad, explicitdir, + traversedir) are ignored. + + TODO: If we want to keep the behavior described above for exact matches, we + should consider instead treating the above case something like this: + union(exact(foo), difference(pattern(foo), include(foo))) + ''' + def __init__(self, m1, m2): + super(differencematcher, self).__init__(m1._root, m1._cwd) + self._m1 = m1 + self._m2 = m2 + self.bad = m1.bad + self.explicitdir = m1.explicitdir + self.traversedir = m1.traversedir + + def matchfn(self, f): + return self._m1(f) and (not self._m2(f) or self._m1.exact(f)) + + @propertycache + def _files(self): + if self.isexact(): + return [f for f in self._m1.files() if self(f)] + # If m1 is not an exact matcher, we can't easily figure out the set of + # files, because its files() are not always files. For example, if + # m1 is "path:dir" and m2 is "rootfileins:.", we don't + # want to remove "dir" from the set even though it would match m2, + # because the "dir" in m1 may not be a file. + return self._m1.files() + + def visitdir(self, dir): + if self._m2.visitdir(dir) == 'all': + # There's a bug here: If m1 matches file 'dir/file' and m2 excludes + # 'dir' (recursively), we should still visit 'dir' due to the + # exception we have for exact matches. + return False + return bool(self._m1.visitdir(dir)) + + def isexact(self): + return self._m1.isexact() + + def anypats(self): + return self._m1.anypats() or self._m2.anypats() + + def prefix(self): + return not self.always() and not self.isexact() and not self.anypats() + + def __repr__(self): + return ('' % (self._m1, self._m2)) + class subdirmatcher(basematcher): """Adapt a matcher to work on a subdirectory only. diff --git a/tests/test-walk.t b/tests/test-walk.t --- a/tests/test-walk.t +++ b/tests/test-walk.t @@ -76,7 +76,7 @@ f mammals/Procyonidae/raccoon Procyonidae/raccoon f mammals/skunk skunk $ hg debugwalk -X ../beans - matcher: + matcher: , m2=> f fennel ../fennel f fenugreek ../fenugreek f fiddlehead ../fiddlehead @@ -146,7 +146,7 @@ f fenugreek ../fenugreek f fiddlehead ../fiddlehead $ hg debugwalk -X 'rootfilesin:' - matcher: + matcher: , m2=> f beans/black ../beans/black f beans/borlotti ../beans/borlotti f beans/kidney ../beans/kidney @@ -194,7 +194,7 @@ matcher: f mammals/skunk skunk $ hg debugwalk -X 'rootfilesin:mammals' - matcher: + matcher: , m2=> f beans/black ../beans/black f beans/borlotti ../beans/borlotti f beans/kidney ../beans/kidney @@ -289,35 +289,35 @@ matcher: f beans/black beans/black $ hg debugwalk -Xbeans/black beans - matcher: + matcher: , m2=> f beans/borlotti beans/borlotti f beans/kidney beans/kidney f beans/navy beans/navy f beans/pinto beans/pinto f beans/turtle beans/turtle $ hg debugwalk -Xbeans/black -Ibeans - matcher: + matcher: , m2=> f beans/borlotti beans/borlotti f beans/kidney beans/kidney f beans/navy beans/navy f beans/pinto beans/pinto f beans/turtle beans/turtle $ hg debugwalk -Xbeans/black beans/black - matcher: + matcher: , m2=> f beans/black beans/black exact $ hg debugwalk -Xbeans/black -Ibeans/black - matcher: + matcher: , m2=> $ hg debugwalk -Xbeans beans/black - matcher: + matcher: , m2=> f beans/black beans/black exact $ hg debugwalk -Xbeans -Ibeans/black - matcher: + matcher: , m2=> $ hg debugwalk 'glob:mammals/../beans/b*' matcher: f beans/black beans/black f beans/borlotti beans/borlotti $ hg debugwalk '-X*/Procyonidae' mammals - matcher: + matcher: , m2=> f mammals/skunk mammals/skunk $ hg debugwalk path:mammals matcher: