This is an archive of the discontinued Mercurial Phabricator instance.

Differential D60

match: remove unused negatematcher
ClosedPublic

Authored by martinvonz on Jul 11 2017, 8:01 PM.

Details

Reviewers
durham
durin42
Group Reviewers
hg-reviewers
Commits
rHG80e1331a7fe9: match: remove unused negatematcher
Summary

This was only used by the sparse extension's dirstate._ignore
override, which no longer exists.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jul 11 2017, 8:01 PM
martinvonz updated this revision to Diff 130.Jul 14 2017, 2:47 AM
durham accepted this revision.Jul 14 2017, 2:09 PM

As I mentioned in IRC, this is actually important for scalability, since I think 'visitdir' has to return True for any negatematcher, since it can't know what is or isn't relevant to the underlying matcher.

martinvonz added a comment.Jul 14 2017, 2:16 PM
In D60#1166, @durham wrote:

As I mentioned in IRC, this is actually important for scalability, since I think 'visitdir' has to return True for any negatematcher, since it can't know what is or isn't relevant to the underlying matcher.

It could actually return False if the underlying matcher returns 'all'.

I now realize that that value is poorly documented. What 'all' actually means is not just that all subdirectories should be visited, but also that all files in them match. See use in treemanifest._match(). I should fix the docstring...

durin42 accepted this revision.Jul 14 2017, 3:18 PM
This revision is now accepted and ready to land.Jul 14 2017, 3:18 PM
Closed by commit rHG80e1331a7fe9: match: remove unused negatematcher (authored by martinvonz). · Explain WhyJul 17 2017, 2:29 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/match.py (10 lines)

Diff 205

mercurial/match.py

if v == 'all': if v == 'all':
return v return v
r |= v r |= v
return r return r
def __repr__(self): def __repr__(self):
return ('<unionmatcher matchers=%r>' % self._matchers) return ('<unionmatcher matchers=%r>' % self._matchers)
class negatematcher(basematcher):
def __init__(self, matcher):
self._matcher = matcher
def matchfn(self, f):
return not self._matcher(f)
def __repr__(self):
return ('<negatematcher matcher=%r>' % self._matcher)
def patkind(pattern, default=None): def patkind(pattern, default=None):
'''If pattern is 'kind:pat' with a known kind, return kind.''' '''If pattern is 'kind:pat' with a known kind, return kind.'''
return _patsplit(pattern, default)[0] return _patsplit(pattern, default)[0]
def _patsplit(pattern, default): def _patsplit(pattern, default):
"""Split a string into the optional pattern kind prefix and the actual """Split a string into the optional pattern kind prefix and the actual
pattern.""" pattern."""
if ':' in pattern: if ':' in pattern: