( )⚙ D6406 match: drop unnecessary adding of '' to set of dirs

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6406

match: drop unnecessary adding of '' to set of dirs
ClosedPublic

Authored by martinvonz on May 17 2019, 1:57 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG38d85ec06552: match: drop unnecessary adding of '' to set of dirs
Summary

This breaks some tests for "rootfilesin:" in a pattern matcher even
more, but that just shows how broken that case is.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.May 17 2019, 1:57 PM
Closed by commit rHG38d85ec06552: match: drop unnecessary adding of '' to set of dirs (authored by martinvonz). · Explain WhyMay 20 2019, 11:47 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/match.py (6 lines)
Mtests/test-match.py (8 lines)

Diff 15178

mercurial/match.py

super(patternmatcher, self).__init__(badfn) super(patternmatcher, self).__init__(badfn)
self._files = _explicitfiles(kindpats) self._files = _explicitfiles(kindpats)
self._prefix = _prefix(kindpats) self._prefix = _prefix(kindpats)
self._pats, self.matchfn = _buildmatch(kindpats, '$', root) self._pats, self.matchfn = _buildmatch(kindpats, '$', root)
@propertycache @propertycache
def _dirs(self): def _dirs(self):
return set(util.dirs(self._fileset)) | {''} return set(util.dirs(self._fileset))
def visitdir(self, dir): def visitdir(self, dir):
dir = normalizerootdir(dir, 'visitdir') dir = normalizerootdir(dir, 'visitdir')
if self._prefix and dir in self._fileset: if self._prefix and dir in self._fileset:
return 'all' return 'all'
return (dir in self._fileset or return (dir in self._fileset or
dir in self._dirs or dir in self._dirs or
any(parentdir in self._fileset any(parentdir in self._fileset
self._files = files self._files = files
else: else:
self._files = list(files) self._files = list(files)
matchfn = basematcher.exact matchfn = basematcher.exact
@propertycache @propertycache
def _dirs(self): def _dirs(self):
return set(util.dirs(self._fileset)) | {''} return set(util.dirs(self._fileset))
def visitdir(self, dir): def visitdir(self, dir):
dir = normalizerootdir(dir, 'visitdir') dir = normalizerootdir(dir, 'visitdir')
return dir in self._dirs return dir in self._dirs
def visitchildrenset(self, dir): def visitchildrenset(self, dir):
dir = normalizerootdir(dir, 'visitchildrenset') dir = normalizerootdir(dir, 'visitchildrenset')
def matchfn(self, f): def matchfn(self, f):
if not f.startswith(self._pathprefix): if not f.startswith(self._pathprefix):
return False return False
return self._matcher.matchfn(f[len(self._pathprefix):]) return self._matcher.matchfn(f[len(self._pathprefix):])
@propertycache @propertycache
def _pathdirs(self): def _pathdirs(self):
return set(util.finddirs(self._path)) | {''} return set(util.finddirs(self._path))
def visitdir(self, dir): def visitdir(self, dir):
if dir == self._path: if dir == self._path:
return self._matcher.visitdir('') return self._matcher.visitdir('')
if dir.startswith(self._pathprefix): if dir.startswith(self._pathprefix):
return self._matcher.visitdir(dir[len(self._pathprefix):]) return self._matcher.visitdir(dir[len(self._pathprefix):])
return dir in self._pathdirs return dir in self._pathdirs

tests/test-match.py

self.assertEqual(m.visitchildrenset(b'dir/subdir'), b'all') self.assertEqual(m.visitchildrenset(b'dir/subdir'), b'all')
# OPT: This should probably be 'all' if its parent is? # OPT: This should probably be 'all' if its parent is?
self.assertEqual(m.visitchildrenset(b'dir/subdir/x'), b'this') self.assertEqual(m.visitchildrenset(b'dir/subdir/x'), b'this')
self.assertEqual(m.visitchildrenset(b'folder'), set()) self.assertEqual(m.visitchildrenset(b'folder'), set())
def testVisitdirRootfilesin(self): def testVisitdirRootfilesin(self):
m = matchmod.match(b'x', b'', patterns=[b'rootfilesin:dir/subdir']) m = matchmod.match(b'x', b'', patterns=[b'rootfilesin:dir/subdir'])
assert isinstance(m, matchmod.patternmatcher) assert isinstance(m, matchmod.patternmatcher)
self.assertTrue(m.visitdir(b''))
self.assertFalse(m.visitdir(b'dir/subdir/x')) self.assertFalse(m.visitdir(b'dir/subdir/x'))
self.assertFalse(m.visitdir(b'folder')) self.assertFalse(m.visitdir(b'folder'))
# FIXME: These should probably be True. # FIXME: These should probably be True.
self.assertFalse(m.visitdir(b''))
self.assertFalse(m.visitdir(b'dir')) self.assertFalse(m.visitdir(b'dir'))
self.assertFalse(m.visitdir(b'dir/subdir')) self.assertFalse(m.visitdir(b'dir/subdir'))
def testVisitchildrensetRootfilesin(self): def testVisitchildrensetRootfilesin(self):
m = matchmod.match(b'x', b'', patterns=[b'rootfilesin:dir/subdir']) m = matchmod.match(b'x', b'', patterns=[b'rootfilesin:dir/subdir'])
assert isinstance(m, matchmod.patternmatcher) assert isinstance(m, matchmod.patternmatcher)
self.assertEqual(m.visitchildrenset(b''), b'this')
self.assertEqual(m.visitchildrenset(b'dir/subdir/x'), set()) self.assertEqual(m.visitchildrenset(b'dir/subdir/x'), set())
self.assertEqual(m.visitchildrenset(b'folder'), set()) self.assertEqual(m.visitchildrenset(b'folder'), set())
# FIXME: These should probably be {'subdir'} and 'this', respectively, # FIXME: These should probably be {'dir'}, {'subdir'} and 'this',
# or at least 'this' and 'this'. # respectively, or at least 'this' for all three.
self.assertEqual(m.visitchildrenset(b''), set())
self.assertEqual(m.visitchildrenset(b'dir'), set()) self.assertEqual(m.visitchildrenset(b'dir'), set())
self.assertEqual(m.visitchildrenset(b'dir/subdir'), set()) self.assertEqual(m.visitchildrenset(b'dir/subdir'), set())
def testVisitdirGlob(self): def testVisitdirGlob(self):
m = matchmod.match(b'x', b'', patterns=[b'glob:dir/z*']) m = matchmod.match(b'x', b'', patterns=[b'glob:dir/z*'])
assert isinstance(m, matchmod.patternmatcher) assert isinstance(m, matchmod.patternmatcher)
self.assertTrue(m.visitdir(b'')) self.assertTrue(m.visitdir(b''))
self.assertTrue(m.visitdir(b'dir')) self.assertTrue(m.visitdir(b'dir'))