--- a/hgext/convert/subversion.py Thu Mar 03 17:39:20 2022 -0800
+++ b/hgext/convert/subversion.py Thu Mar 03 18:28:30 2022 -0800
@@ -202,7 +202,7 @@
def receiver(orig_paths, revnum, author, date, message, pool):
paths = {}
if orig_paths is not None:
- for k, v in pycompat.iteritems(orig_paths):
+ for k, v in orig_paths.items():
paths[k] = changedpath(v)
pickle.dump((paths, revnum, author, date, message), fp, protocol)
@@ -297,7 +297,7 @@
def receiver(orig_paths, revnum, author, date, message, pool):
paths = {}
if orig_paths is not None:
- for k, v in pycompat.iteritems(orig_paths):
+ for k, v in orig_paths.items():
paths[k] = changedpath(v)
self.append((paths, revnum, author, date, message))
@@ -729,7 +729,7 @@
)
files = [
n
- for n, e in pycompat.iteritems(entries)
+ for n, e in entries.items()
if e.kind == svn.core.svn_node_file
]
self.removed = set()
@@ -819,7 +819,7 @@
origpaths = []
copies = [
(e.copyfrom_path, e.copyfrom_rev, p)
- for p, e in pycompat.iteritems(origpaths)
+ for p, e in origpaths.items()
if e.copyfrom_path
]
# Apply moves/copies from more specific to general
@@ -850,7 +850,7 @@
# be represented in mercurial.
addeds = {
p: e.copyfrom_path
- for p, e in pycompat.iteritems(origpaths)
+ for p, e in origpaths.items()
if e.action == b'A' and e.copyfrom_path
}
badroots = set()
@@ -1139,7 +1139,7 @@
parents = []
# check whether this revision is the start of a branch or part
# of a branch renaming
- orig_paths = sorted(pycompat.iteritems(orig_paths))
+ orig_paths = sorted(orig_paths.items())
root_paths = [
(p, e) for p, e in orig_paths if self.module.startswith(p)
]
@@ -1301,7 +1301,7 @@
path += b'/'
return (
(path + p)
- for p, e in pycompat.iteritems(entries)
+ for p, e in entries.items()
if e.kind == svn.core.svn_node_file
)