This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2316

manifest: correct the one use of iterkeys() on a dict
ClosedPublic

Authored by durin42 on Feb 18 2018, 1:00 AM.

Details

Reviewers
pulkit
indygreg
Group Reviewers
hg-reviewers
Commits
rHG413c179cf7d5: manifest: correct the one use of iterkeys() on a dict
Summary

As far as I can tell, this is the only iterkeys() in this file that
was actually on a dict. The rest are on custom manifest types.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Feb 18 2018, 1:00 AM
pulkit accepted this revision.Feb 18 2018, 6:56 AM
indygreg accepted this revision.Feb 18 2018, 11:25 AM
This revision is now accepted and ready to land.Feb 18 2018, 11:25 AM
Closed by commit rHG413c179cf7d5: manifest: correct the one use of iterkeys() on a dict (authored by durin42). · Explain WhyFeb 18 2018, 11:26 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/manifest.py (2 lines)

Diff 5834

mercurial/manifest.py

t2._load() t2._load()
for d, m1 in t1._dirs.iteritems(): for d, m1 in t1._dirs.iteritems():
if d in t2._dirs: if d in t2._dirs:
m2 = t2._dirs[d] m2 = t2._dirs[d]
_filesnotin(m1, m2) _filesnotin(m1, m2)
else: else:
files.update(m1.iterkeys()) files.update(m1.iterkeys())
for fn in t1._files.iterkeys(): for fn in t1._files:
if fn not in t2._files: if fn not in t2._files:
files.add(t1._subpath(fn)) files.add(t1._subpath(fn))
_filesnotin(self, m2) _filesnotin(self, m2)
return files return files
@propertycache @propertycache
def _alldirs(self): def _alldirs(self):