diff -r a0674e916fb6 -r f254fc73d956 mercurial/dirstatemap.py --- a/mercurial/dirstatemap.py Thu Mar 03 17:39:20 2022 -0800 +++ b/mercurial/dirstatemap.py Thu Mar 03 18:28:30 2022 -0800 @@ -12,7 +12,6 @@ error, pathutil, policy, - pycompat, txnutil, util, ) @@ -354,7 +353,7 @@ util.clearcachedproperty(self, b"dirfoldmap") def items(self): - return pycompat.iteritems(self._map) + return self._map.items() # forward for python2,3 compat iteritems = items @@ -378,7 +377,7 @@ self._dirtyparents = True copies = {} if fold_p2: - for f, s in pycompat.iteritems(self._map): + for f, s in self._map.items(): # Discard "merged" markers when moving away from a merge state if s.p2_info: source = self.copymap.pop(f, None) @@ -501,7 +500,7 @@ f = {} normcase = util.normcase - for name, s in pycompat.iteritems(self._map): + for name, s in self._map.items(): if not s.removed: f[normcase(name)] = name f[b'.'] = b'.' # prevents useless util.fspath() invocation