Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: replace dict.iterkeys() with iter(dict)
authorPulkit Goyal <7895pulkit@gmail.com>
Fri, 16 Jun 2017 01:46:47 +0530
changeset 32863 9e3733d93f64
parent 32862 e4a43b810528
child 32864 f57f1f37290d
py3: replace dict.iterkeys() with iter(dict) dict.iterkeys() does not exists on Python 3.
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Fri Jun 16 01:28:23 2017 +0530
+++ b/mercurial/merge.py	Fri Jun 16 01:46:47 2017 +0530
@@ -838,7 +838,7 @@
         for copykey, copyvalue in copy.iteritems():
             if copyvalue in relevantfiles:
                 relevantfiles.add(copykey)
-        for movedirkey in movewithdir.iterkeys():
+        for movedirkey in movewithdir:
             relevantfiles.add(movedirkey)
         filesmatcher = scmutil.matchfiles(repo, relevantfiles)
         matcher = matchmod.intersectmatchers(matcher, filesmatcher)
mercurial