[PATCH 8 of 8] merge: simplify mergestate iter

[Mads Kiilerich]

# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1336923908 -7200
#      Sun May 13 17:45:08 2012 +0200
# Branch stable
# Node ID c87a958142be7cb4f6e16b46f1795051996f010b
# Parent  9f41180aced9c82a5bf73680fb2adebe6dcdbd8f
merge: simplify mergestate iter

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -232,10 +232,7 @@ class mergestate(object):
         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()