This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4160

match: add missing "return set()", add FIXME to test to doc a bug
ClosedPublic

Authored by spectral on Aug 8 2018, 8:08 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHGb9f94d67ea73: match: add missing "return set()", add FIXME to test to doc a bug
Summary

These were both brought up during the codereview of D4130.

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

spectral created this revision.Aug 8 2018, 8:08 PM
martinvonz accepted this revision.Aug 8 2018, 8:15 PM
This revision is now accepted and ready to land.Aug 8 2018, 8:15 PM
Closed by commit rHGb9f94d67ea73: match: add missing "return set()", add FIXME to test to doc a bug (authored by spectral). · Explain WhyAug 8 2018, 8:22 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/match.py (1 line)
Mtests/test-match.py (2 lines)

Diff 10086

mercurial/match.py

def visitchildrenset(self, dir): def visitchildrenset(self, dir):
if dir == self._path: if dir == self._path:
return self._matcher.visitchildrenset('.') return self._matcher.visitchildrenset('.')
if dir.startswith(self._pathprefix): if dir.startswith(self._pathprefix):
return self._matcher.visitchildrenset(dir[len(self._pathprefix):]) return self._matcher.visitchildrenset(dir[len(self._pathprefix):])
if dir in self._pathdirs: if dir in self._pathdirs:
return 'this' return 'this'
return set()
def isexact(self): def isexact(self):
return self._matcher.isexact() return self._matcher.isexact()
def prefix(self): def prefix(self):
return self._matcher.prefix() return self._matcher.prefix()
@encoding.strmethod @encoding.strmethod

tests/test-match.py

self.assertFalse(m.visitdir('dir/subdir')) self.assertFalse(m.visitdir('dir/subdir'))
def testVisitchildrensetRootfilesin(self): def testVisitchildrensetRootfilesin(self):
m = matchmod.match('x', '', patterns=['rootfilesin:dir/subdir']) m = matchmod.match('x', '', patterns=['rootfilesin:dir/subdir'])
assert isinstance(m, matchmod.patternmatcher) assert isinstance(m, matchmod.patternmatcher)
self.assertEqual(m.visitchildrenset('.'), 'this') self.assertEqual(m.visitchildrenset('.'), 'this')
self.assertEqual(m.visitchildrenset('dir/subdir/x'), set()) self.assertEqual(m.visitchildrenset('dir/subdir/x'), set())
self.assertEqual(m.visitchildrenset('folder'), set()) self.assertEqual(m.visitchildrenset('folder'), set())
# FIXME: These should probably be {'subdir'} and 'this', respectively,
# or at least 'this' and 'this'.
self.assertEqual(m.visitchildrenset('dir'), set()) self.assertEqual(m.visitchildrenset('dir'), set())
self.assertEqual(m.visitchildrenset('dir/subdir'), set()) self.assertEqual(m.visitchildrenset('dir/subdir'), set())
def testVisitdirGlob(self): def testVisitdirGlob(self):
m = matchmod.match('x', '', patterns=['glob:dir/z*']) m = matchmod.match('x', '', patterns=['glob:dir/z*'])
assert isinstance(m, matchmod.patternmatcher) assert isinstance(m, matchmod.patternmatcher)
self.assertTrue(m.visitdir('.')) self.assertTrue(m.visitdir('.'))
self.assertTrue(m.visitdir('dir')) self.assertTrue(m.visitdir('dir'))