This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8081

manifest: fix _very_ subtle bug with exact matchers passed to walk()
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG48a1a974a92c: manifest: fix _very_ subtle bug with exact matchers passed to walk()
Summary

Prior to this fix, manifestdict.walk() with an exact matcher would blindly
list the files in the matcher, even if they weren't in the manifest. This was
exposed by my next patch where I rewrite filesnotin() to use walk() instead of
matches().

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: rHG48a1a974a92c: manifest: fix _very_ subtle bug with exact matchers passed to walk().Feb 6 2020, 5:12 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG48a1a974a92c: manifest: fix _very_ subtle bug with exact matchers passed to walk() (authored by durin42). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/manifest.py (3 lines)

Diff 19968

mercurial/manifest.py

yield f yield f
return return
fset = set(match.files()) fset = set(match.files())
# avoid the entire walk if we're only looking for specific files # avoid the entire walk if we're only looking for specific files
if self._filesfastpath(match): if self._filesfastpath(match):
for fn in sorted(fset): for fn in sorted(fset):
if fn in self:
yield fn yield fn
return return
for fn in self: for fn in self:
if fn in fset: if fn in fset:
# specified pattern is the exact name # specified pattern is the exact name
fset.remove(fn) fset.remove(fn)
if match(fn): if match(fn):
yield fn yield fn