--- a/mercurial/sparse.py Sun Oct 06 19:25:18 2019 -0400
+++ b/mercurial/sparse.py Mon Oct 07 00:04:04 2019 -0400
@@ -389,7 +389,7 @@
sparsematch = matcher(repo, [mctx.rev()])
temporaryfiles = []
- for file, action in actions.iteritems():
+ for file, action in pycompat.iteritems(actions):
type, args, msg = action
files.add(file)
if sparsematch(file):
@@ -532,7 +532,7 @@
)
# Check for files that were only in the dirstate.
- for file, state in dirstate.iteritems():
+ for file, state in pycompat.iteritems(dirstate):
if not file in files:
old = origsparsematch(file)
new = sparsematch(file)
@@ -541,7 +541,7 @@
# Apply changes to disk
typeactions = mergemod.emptyactions()
- for f, (m, args, msg) in actions.iteritems():
+ for f, (m, args, msg) in pycompat.iteritems(actions):
typeactions[m].append((f, args, msg))
mergemod.applyupdates(