This is an archive of the discontinued Mercurial Phabricator instance.

Differential D491

context: always pass a matcher into _matchstatus() (API)
ClosedPublic

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

Details

Reviewers
dsp
Group Reviewers
hg-reviewers
Commits
rHGc714e82b9ac2: context: always pass a matcher into _matchstatus() (API)
Summary

This just makes it a little easier to follow and removes the need to
call the superclass's method in workingctx.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Aug 23 2017, 12:35 PM
dsp accepted this revision.Aug 24 2017, 1:03 AM
dsp added a subscriber: dsp.

I guess either works. I personally prefer the inheritance here as it feels easier to get it right from an unsuspected caller, but i can see benefits on both sides.

Closed by commit rHGc714e82b9ac2: context: always pass a matcher into _matchstatus() (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 (9 lines)

Diff 1206

mercurial/context.py

def _buildstatusmanifest(self, status): def _buildstatusmanifest(self, status):
"""Builds a manifest that includes the given status results, if this is """Builds a manifest that includes the given status results, if this is
a working copy context. For non-working copy contexts, it just returns a working copy context. For non-working copy contexts, it just returns
the normal manifest.""" the normal manifest."""
return self.manifest() return self.manifest()
def _matchstatus(self, other, match): def _matchstatus(self, other, match):
"""return match.always if match is none """This internal method provides a way for child objects to override the
This internal method provides a way for child objects to override the
match operator. match operator.
""" """
return match or matchmod.always(self._repo.root, self._repo.getcwd()) return match
def _buildstatus(self, other, s, match, listignored, listclean, def _buildstatus(self, other, s, match, listignored, listclean,
listunknown): listunknown):
"""build a status with respect to another context""" """build a status with respect to another context"""
# Load earliest manifest first for caching reasons. More specifically, # Load earliest manifest first for caching reasons. More specifically,
# if you have revisions 1000 and 1001, 1001 is probably stored as a # if you have revisions 1000 and 1001, 1001 is probably stored as a
# delta against 1000. Thus, if you read 1000 first, we'll reconstruct # delta against 1000. Thus, if you read 1000 first, we'll reconstruct
# 1000 and cache it so that when you read 1001, we just need to apply a # 1000 and cache it so that when you read 1001, we just need to apply a
# then we'd be done. But the special case of the above call means we # then we'd be done. But the special case of the above call means we
# just copy the manifest of the parent. # just copy the manifest of the parent.
reversed = False reversed = False
if (not isinstance(ctx1, changectx) if (not isinstance(ctx1, changectx)
and isinstance(ctx2, changectx)): and isinstance(ctx2, changectx)):
reversed = True reversed = True
ctx1, ctx2 = ctx2, ctx1 ctx1, ctx2 = ctx2, ctx1
match = match or matchmod.always(self._repo.root, self._repo.getcwd())
match = ctx2._matchstatus(ctx1, match) match = ctx2._matchstatus(ctx1, match)
r = scmutil.status([], [], [], [], [], [], []) r = scmutil.status([], [], [], [], [], [], [])
r = ctx2._buildstatus(ctx1, r, match, listignored, listclean, r = ctx2._buildstatus(ctx1, r, match, listignored, listclean,
listunknown) listunknown)
if reversed: if reversed:
# Reverse added and removed. Clear deleted, unknown and ignored as # Reverse added and removed. Clear deleted, unknown and ignored as
# these make no sense to reverse. # these make no sense to reverse.
We use inheritance to customize the match.bad method only in cases of We use inheritance to customize the match.bad method only in cases of
workingctx since it belongs only to the working directory when workingctx since it belongs only to the working directory when
comparing against the parent changeset. comparing against the parent changeset.
If we aren't comparing against the working directory's parent, then we If we aren't comparing against the working directory's parent, then we
just use the default match object sent to us. just use the default match object sent to us.
""" """
superself = super(workingctx, self)
match = superself._matchstatus(other, match)
if other != self._repo['.']: if other != self._repo['.']:
def bad(f, msg): def bad(f, msg):
# 'f' may be a directory pattern from 'match.files()', # 'f' may be a directory pattern from 'match.files()',
# so 'f not in ctx1' is not enough # so 'f not in ctx1' is not enough
if f not in other and not other.hasdir(f): if f not in other and not other.hasdir(f):
self._repo.ui.warn('%s: %s\n' % self._repo.ui.warn('%s: %s\n' %
(self._repo.dirstate.pathto(f), msg)) (self._repo.dirstate.pathto(f), msg))
match.bad = bad match.bad = bad