This is an archive of the discontinued Mercurial Phabricator instance.

Differential D492

context: remove unnecessary default values for matchers (API)
ClosedPublic

Authored by martinvonz on Aug 23 2017, 12:35 PM.

Details

Reviewers
dsp
Group Reviewers
hg-reviewers
Commits
rHGe43264525ce5: context: remove unnecessary default values for matchers (API)
Summary

ctx._dirstatestatus() is called only from workingctx._buildstatus()
and that function, in turn, is called only from
basectx.status(). basectx.status() will always pass a matcher to
_buildstatus(), so there's no need to handle a None matcher there.

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.Aug 23 2017, 12:35 PM
dsp requested changes to this revision.Aug 24 2017, 1:05 AM
dsp added a subscriber: dsp.

if match can't be None, then we should remove it as the default value. Otherwise I look at this in a year and think "why do we not handle a None matcher, when it clearly can be None if the value for match is not set".

This revision now requires changes to proceed.Aug 24 2017, 1:05 AM
martinvonz edited edge metadata.Aug 24 2017, 1:08 AM
martinvonz updated this revision to Diff 1243.
martinvonz added a comment.Aug 24 2017, 1:08 AM
In D492#7991, @dsp wrote:

if match can't be None, then we should remove it as the default value. Otherwise I look at this in a year and think "why do we not handle a None matcher, when it clearly can be None if the value for match is not set".

Definitely. Good catch.

Closed by commit rHGe43264525ce5: context: remove unnecessary default values for matchers (API) (authored by martinvonz). · Explain WhyAug 27 2017, 8:33 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (8 lines)

Diff 1328

mercurial/context.py

self._repo.ui.debug('skip updating dirstate: ' self._repo.ui.debug('skip updating dirstate: '
'identity mismatch\n') 'identity mismatch\n')
except error.LockError: except error.LockError:
pass pass
finally: finally:
# Even if the wlock couldn't be grabbed, clear out the list. # Even if the wlock couldn't be grabbed, clear out the list.
self._repo.clearpostdsstatus() self._repo.clearpostdsstatus()
def _dirstatestatus(self, match=None, ignored=False, clean=False, def _dirstatestatus(self, match, ignored=False, clean=False, unknown=False):
unknown=False):
'''Gets the status from the dirstate -- internal use only.''' '''Gets the status from the dirstate -- internal use only.'''
listignored, listclean, listunknown = ignored, clean, unknown listignored, listclean, listunknown = ignored, clean, unknown
match = match or matchmod.always(self._repo.root, self._repo.getcwd())
subrepos = [] subrepos = []
if '.hgsub' in self: if '.hgsub' in self:
subrepos = sorted(self.substate) subrepos = sorted(self.substate)
cmp, s = self._repo.dirstate.status(match, subrepos, listignored, cmp, s = self._repo.dirstate.status(match, subrepos, listignored,
listclean, listunknown) listclean, listunknown)
# check for any possibly clean files # check for any possibly clean files
fixup = [] fixup = []
This hides changes in the working directory, if they aren't This hides changes in the working directory, if they aren't
committed in this context. committed in this context.
""" """
def __init__(self, repo, changes, def __init__(self, repo, changes,
text="", user=None, date=None, extra=None): text="", user=None, date=None, extra=None):
super(workingctx, self).__init__(repo, text, user, date, extra, super(workingctx, self).__init__(repo, text, user, date, extra,
changes) changes)
def _dirstatestatus(self, match=None, ignored=False, clean=False, def _dirstatestatus(self, match, ignored=False, clean=False, unknown=False):
unknown=False):
"""Return matched files only in ``self._status`` """Return matched files only in ``self._status``
Uncommitted files appear "clean" via this context, even if Uncommitted files appear "clean" via this context, even if
they aren't actually so in the working directory. they aren't actually so in the working directory.
""" """
match = match or matchmod.always(self._repo.root, self._repo.getcwd())
if clean: if clean:
clean = [f for f in self._manifest if f not in self._changedset] clean = [f for f in self._manifest if f not in self._changedset]
else: else:
clean = [] clean = []
return scmutil.status([f for f in self._status.modified if match(f)], return scmutil.status([f for f in self._status.modified if match(f)],
[f for f in self._status.added if match(f)], [f for f in self._status.added if match(f)],
[f for f in self._status.removed if match(f)], [f for f in self._status.removed if match(f)],
[], [], [], clean) [], [], [], clean)