Mercurial > hg

changeset 48914:417a1691a273

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: remove pycompat.iteritems() Differential Revision: https://phab.mercurial-scm.org/D12319
author Gregory Szorc <gregory.szorc@gmail.com>
date Tue, 01 Mar 2022 20:44:59 -0800
parents f254fc73d956
children 78911231ed33
files hgext/convert/cvs.py hgext/convert/hg.py
diffstat 2 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/convert/cvs.py	Thu Mar 03 18:28:30 2022 -0800
+++ b/hgext/convert/cvs.py	Tue Mar 01 20:44:59 2022 -0800
@@ -18,7 +18,6 @@
 from mercurial import (
     encoding,
     error,
-    pycompat,
     util,
 )
 from mercurial.utils import (
@@ -316,7 +315,7 @@
         if full:
             raise error.Abort(_(b"convert from cvs does not support --full"))
         self._parse()
-        return sorted(pycompat.iteritems(self.files[rev])), {}, set()
+        return sorted(self.files[rev].items()), {}, set()
 
     def getcommit(self, rev):
         self._parse()
--- a/hgext/convert/hg.py	Thu Mar 03 18:28:30 2022 -0800
+++ b/hgext/convert/hg.py	Tue Mar 01 20:44:59 2022 -0800
@@ -39,7 +39,6 @@
     merge as mergemod,
     mergestate,
     phases,
-    pycompat,
     util,
 )
 from mercurial.utils import dateutil
@@ -423,7 +422,7 @@
         tagparent = tagparent or self.repo.nullid
 
         oldlines = set()
-        for branch, heads in pycompat.iteritems(self.repo.branchmap()):
+        for branch, heads in self.repo.branchmap().items():
             for h in heads:
                 if b'.hgtags' in self.repo[h]:
                     oldlines.update(