mercurial/exchangev2.py
changeset 43106 d783f945a701
parent 43104 74802979dd9d
child 43117 8ff1ecfadcd1
--- a/mercurial/exchangev2.py	Sun Oct 06 19:25:18 2019 -0400
+++ b/mercurial/exchangev2.py	Mon Oct 07 00:04:04 2019 -0400
@@ -429,7 +429,7 @@
     linkrevs = {}
     seen = set()
 
-    for clrev, node in sorted(manifestnodes.iteritems()):
+    for clrev, node in sorted(pycompat.iteritems(manifestnodes)):
         if node in seen:
             continue
 
@@ -641,7 +641,7 @@
 
                 locallinkrevs[path] = {
                     node: linkrevs[manifestnode]
-                    for node, manifestnode in nodes.iteritems()
+                    for node, manifestnode in pycompat.iteritems(nodes)
                 }
 
             for path, f in fs:
@@ -758,7 +758,7 @@
 
                 linkrevs = {
                     fnode: manlinkrevs[mnode]
-                    for fnode, mnode in fnodes[path].iteritems()
+                    for fnode, mnode in pycompat.iteritems(fnodes[path])
                 }
 
                 def getlinkrev(node):