This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8080

context: use manifest.walk() instead of manifest.match() to get file list
ClosedPublic

Authored by durin42 on Feb 5 2020, 5:34 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGbeea86e4d332: context: use manifest.walk() instead of manifest.match() to get file list
Summary

The former doesn't create a whole extra manifest in order to produce the
matching file list, which is all we actually cared about here. Sigh.

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

durin42 created this revision.Feb 5 2020, 5:34 PM
durin42 added a commit: rHGbeea86e4d332: context: use manifest.walk() instead of manifest.match() to get file list.Feb 6 2020, 11:11 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGbeea86e4d332: context: use manifest.walk() instead of manifest.match() to get file list (authored by durin42). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (3 lines)

Diff 19951

mercurial/context.py

for i in pycompat.xrange(len(components)): for i in pycompat.xrange(len(components)):
component = b"/".join(components[0:i]) component = b"/".join(components[0:i])
if component in self: if component in self:
fail(path, component) fail(path, component)
# Test the other direction -- that this path from p2 isn't a directory # Test the other direction -- that this path from p2 isn't a directory
# in p1 (test that p1 doesn't have any paths matching `path/*`). # in p1 (test that p1 doesn't have any paths matching `path/*`).
match = self.match([path], default=b'path') match = self.match([path], default=b'path')
matches = self.p1().manifest().matches(match) mfiles = list(self.p1().manifest().walk(match))
mfiles = matches.keys()
if len(mfiles) > 0: if len(mfiles) > 0:
if len(mfiles) == 1 and mfiles[0] == path: if len(mfiles) == 1 and mfiles[0] == path:
return return
# omit the files which are deleted in current IMM wctx # omit the files which are deleted in current IMM wctx
mfiles = [m for m in mfiles if m in self] mfiles = [m for m in mfiles if m in self]
if not mfiles: if not mfiles:
return return
raise error.Abort( raise error.Abort(