--- a/hgext/remotefilelog/remotefilelog.py Thu Mar 03 17:39:20 2022 -0800
+++ b/hgext/remotefilelog/remotefilelog.py Thu Mar 03 18:28:30 2022 -0800
@@ -15,7 +15,6 @@
ancestor,
error,
mdiff,
- pycompat,
revlog,
)
from mercurial.utils import storageutil
@@ -423,7 +422,7 @@
return self.repo.nullid
revmap, parentfunc = self._buildrevgraph(a, b)
- nodemap = {v: k for (k, v) in pycompat.iteritems(revmap)}
+ nodemap = {v: k for (k, v) in revmap.items()}
ancs = ancestor.ancestors(parentfunc, revmap[a], revmap[b])
if ancs:
@@ -438,7 +437,7 @@
return self.repo.nullid
revmap, parentfunc = self._buildrevgraph(a, b)
- nodemap = {v: k for (k, v) in pycompat.iteritems(revmap)}
+ nodemap = {v: k for (k, v) in revmap.items()}
ancs = ancestor.commonancestorsheads(parentfunc, revmap[a], revmap[b])
return map(nodemap.__getitem__, ancs)
@@ -454,7 +453,7 @@
parentsmap = collections.defaultdict(list)
allparents = set()
for mapping in (amap, bmap):
- for node, pdata in pycompat.iteritems(mapping):
+ for node, pdata in mapping.items():
parents = parentsmap[node]
p1, p2, linknode, copyfrom = pdata
# Don't follow renames (copyfrom).