# HG changeset patch # User Augie Fackler # Date 2018-02-18 05:49:11 # Node ID 413c179cf7d5e5d7a0a8d7a92c28fa683dff267f # Parent 238646784294bb1700c1230ee5cff642464d43c3 manifest: correct the one use of iterkeys() on a dict 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. Differential Revision: https://phab.mercurial-scm.org/D2316 diff --git a/mercurial/manifest.py b/mercurial/manifest.py --- a/mercurial/manifest.py +++ b/mercurial/manifest.py @@ -960,7 +960,7 @@ class treemanifest(object): 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))