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

login
register
mail settings
Submitter phabricator
Date Feb. 18, 2018, 6 a.m.
Message ID <differential-rev-PHID-DREV-yrwsdipyzqosln7vvy7j-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/28056/
State Superseded
Headers show

Comments

phabricator - Feb. 18, 2018, 6 a.m.
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION 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.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D2316

AFFECTED FILES
  mercurial/manifest.py

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/manifest.py b/mercurial/manifest.py
--- a/mercurial/manifest.py
+++ b/mercurial/manifest.py
@@ -960,7 +960,7 @@ 
                 else:
                     files.update(m1.iterkeys())
 
-            for fn in t1._files.iterkeys():
+            for fn in t1._files:
                 if fn not in t2._files:
                     files.add(t1._subpath(fn))