Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: simplify mergestate iter
authorMads Kiilerich <mads@kiilerich.com>
Sun, 13 May 2012 17:45:08 +0200
changeset 21268 a0b8a912ec81
parent 21267 e4f451c8c05c
child 21269 fa601c4e03f9
merge: simplify mergestate iter
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Fri May 09 14:46:50 2014 -0500
+++ b/mercurial/merge.py	Sun May 13 17:45:08 2012 +0200
@@ -248,10 +248,7 @@
         return self._state[dfile][0]
 
     def __iter__(self):
-        l = self._state.keys()
-        l.sort()
-        for f in l:
-            yield f
+        return iter(sorted(self._state))
 
     def files(self):
         return self._state.keys()
Mercurial