This is an archive of the discontinued Mercurial Phabricator instance.

Differential D151

match: override visitdir() in nevermatcher to return False
ClosedPublic

Authored by martinvonz on Jul 19 2017, 6:06 PM.

Details

Reviewers
durham
durin42
Group Reviewers
hg-reviewers
Commits
rHG44bc181b9835: match: override visitdir() in nevermatcher to return False
Summary

When we changed basematcher.visitdir() in cf15c3cc304c (match: make
base matcher return True for visitdir, 2017-07-14), we forgot to add
an override in nevermatcher. This led to tests failing in narrowhg.

As Durham pointed out, it's high time to add unit tests for the
matcher, so this patch also adds a first unit test.

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 19 2017, 6:06 PM
martinvonz edited the summary of this revision. (Show Details)Jul 19 2017, 6:08 PM
durham accepted this revision.Jul 21 2017, 6:19 AM
durham added a subscriber: durham.

Nice!

durin42 accepted this revision.Jul 25 2017, 10:55 AM
durin42 added a subscriber: durin42.

Seems fine for stable. Queued.

This revision is now accepted and ready to land.Jul 25 2017, 10:55 AM
Closed by commit rHG44bc181b9835: match: override visitdir() in nevermatcher to return False (authored by martinvonz). · Explain WhyJul 25 2017, 1:21 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/match.py (3 lines)
AMtests/test-match.py (19 lines)

Diff 401

mercurial/match.py

# prefixes (files() returns []), so fast paths iterating over them should # prefixes (files() returns []), so fast paths iterating over them should
# be efficient (and correct). # be efficient (and correct).
def isexact(self): def isexact(self):
return True return True
def prefix(self): def prefix(self):
return True return True
def visitdir(self, dir):
return False
def __repr__(self): def __repr__(self):
return '<nevermatcher>' return '<nevermatcher>'
class patternmatcher(basematcher): class patternmatcher(basematcher):
def __init__(self, root, cwd, kindpats, ctx=None, listsubrepos=False, def __init__(self, root, cwd, kindpats, ctx=None, listsubrepos=False,
badfn=None): badfn=None):
super(patternmatcher, self).__init__(root, cwd, badfn) super(patternmatcher, self).__init__(root, cwd, badfn)

tests/test-match.py

  • This file was added.
from __future__ import absolute_import
import unittest
import silenttestrunner
from mercurial import (
match as matchmod,
)
class NeverMatcherTests(unittest.TestCase):
def testVisitdir(self):
m = matchmod.nevermatcher('', '')
self.assertFalse(m.visitdir('.'))
self.assertFalse(m.visitdir('dir'))
if __name__ == '__main__':
silenttestrunner.main(__name__)