Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: remove pycompat.iteritems()
authorGregory Szorc <gregory.szorc@gmail.com>
Mon, 21 Feb 2022 11:11:59 -0700
changeset 49018 c17aee610bab
parent 49017 3d35e7483602
child 49019 ceafb0f81250
merge: remove pycompat.iteritems() Differential Revision: https://phab.mercurial-scm.org/D12332
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Mon Feb 21 11:11:27 2022 -0700
+++ b/mercurial/merge.py	Mon Feb 21 11:11:59 2022 -0700
@@ -625,9 +625,7 @@
                     args, msg = self._actionmapping[a][f]
                     yield f, args, msg
             else:
-                for f, (args, msg) in pycompat.iteritems(
-                    self._actionmapping[a]
-                ):
+                for f, (args, msg) in self._actionmapping[a].items():
                     yield f, args, msg
 
     def len(self, actions=None):
hg-stable