From patchwork Sun Feb 18 16:26:45 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D2316: manifest: correct the one use of iterkeys() on a dict
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 28111
Message-Id: <01caabe4d0a424d59fe8d5bdea392e5b@localhost.localdomain>
To: mercurial-devel@mercurial-scm.org
Date: Sun, 18 Feb 2018 16:26:45 +0000

This revision was automatically updated to reflect the committed changes.
Closed by commit rHG413c179cf7d5: manifest: correct the one use of iterkeys() on a dict (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2316?vs=5834&id=5885

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

AFFECTED FILES
  mercurial/manifest.py

CHANGE DETAILS




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

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))