Mercurial > hg > mercurial-source

changeset 34093:b4d517d736a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergestate: make unresolved() use iteritems() mergestate.unresolved() is a generator, so it seems better for it to rely on iteritems() than items(), although it also seems unlikely for it to make a noticeable difference.
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 01 Dec 2015 09:26:10 -0800
parents 69c4493a54f9
children f8f716da90fa
files mercurial/merge.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -444,7 +444,7 @@
     def unresolved(self):
         """Obtain the paths of unresolved files."""
 
-        for f, entry in self._state.items():
+        for f, entry in self._state.iteritems():
             if entry[0] == 'u':
                 yield f