This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4897

status: intersect matcher with narrow matcher instead of filtering afterwards
ClosedPublic

Authored by martinvonz on Oct 5 2018, 6:35 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG48a0ce67d67a: status: intersect matcher with narrow matcher instead of filtering afterwards
Summary

I seem to have done a very naive move of the code from the narrow
extension into core in e411774a2e0f (narrow: move status-filtering to
core and to ctx, 2018-08-02). It seems obvious that a better way is to
intersect the matchers.

Note that this means that when requesting status for the working
directory in a narrow repo, we now pass the narrow matcher (possibly
intersected with a user-provided matcher) into _buildstatus() and then
into dirstate.status() and dirstate.walk(), which will the intersect
it again with the narrow matcher. That's functionally fine, but
wasteful. I hope to later remove the dirstate wrapping that adds the
second layer of matcher intersection.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (6 lines)

Diff 11721

mercurial/context.py

# 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 = self._repo.narrowmatch(match)
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.
rev2 = None rev2 = None
submatch = matchmod.subdirmatcher(subpath, match) submatch = matchmod.subdirmatcher(subpath, match)
s = sub.status(rev2, match=submatch, ignored=listignored, s = sub.status(rev2, match=submatch, ignored=listignored,
clean=listclean, unknown=listunknown, clean=listclean, unknown=listunknown,
listsubrepos=True) listsubrepos=True)
for rfiles, sfiles in zip(r, s): for rfiles, sfiles in zip(r, s):
rfiles.extend("%s/%s" % (subpath, f) for f in sfiles) rfiles.extend("%s/%s" % (subpath, f) for f in sfiles)
narrowmatch = self._repo.narrowmatch()
if not narrowmatch.always():
for l in r:
l[:] = list(filter(narrowmatch, l))
for l in r: for l in r:
l.sort() l.sort()
return r return r
class changectx(basectx): class changectx(basectx):
"""A changecontext object makes access to data related to a particular """A changecontext object makes access to data related to a particular
changeset convenient. It represents a read-only context already present in changeset convenient. It represents a read-only context already present in