This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4899

narrow: filter files by narrowspec in ctx.matches()
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGaa41f1b01f31: narrow: filter files by narrowspec in ctx.matches()
Summary

This has no effect yet because 1) for committed changes, ctx.matches()
just calls ctx.walk(), which we updated in the previous patch, and 2)
for the working copy, the filtering is also done in the overridden
dirstate.walk() in narrowdirstate.

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.Oct 5 2018, 6:35 PM
Closed by commit rHGaa41f1b01f31: narrow: filter files by narrowspec in ctx.matches() (authored by martinvonz). · Explain WhyOct 6 2018, 1:07 AM
This revision was automatically updated to reflect the committed changes.
martinvonz added a comment.Nov 13 2018, 12:09 AM

This has no effect yet [...] for the working copy, the filtering is also done in the overridden dirstate.walk() in narrowdirstate.

For the record, that turned out to be a (small) lie: dirstate.matches() doesn't call dirstate.walk(), so the override of dirstate.walk() had no effect here. A consequence is that we'll now filter out paths in the dirstate that are outside the narrowspec. That doesn't normally happen, but it can happen e.g. with hg share (that's how I noticed). I think the change is for the better, but I thought I should let you know that the commit message was incorrect.

Revision Contents
Changeset List

Diff 11737

mercurial/context.py

def walk(self, match): def walk(self, match):
'''Generates matching file names.''' '''Generates matching file names.'''
return sorted(self._repo.dirstate.walk(self._repo.narrowmatch(match), return sorted(self._repo.dirstate.walk(self._repo.narrowmatch(match),
subrepos=sorted(self.substate), subrepos=sorted(self.substate),
unknown=True, ignored=False)) unknown=True, ignored=False))
def matches(self, match): def matches(self, match):
match = self._repo.narrowmatch(match)
ds = self._repo.dirstate ds = self._repo.dirstate
return sorted(f for f in ds.matches(match) if ds[f] != 'r') return sorted(f for f in ds.matches(match) if ds[f] != 'r')
def ancestors(self): def ancestors(self):
for p in self._parents: for p in self._parents:
yield p yield p
for a in self._repo.changelog.ancestors( for a in self._repo.changelog.ancestors(
[p.rev() for p in self._parents]): [p.rev() for p in self._parents]):