Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 33310:b4d517d736a1
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 | 634b259079c5 |
| children | f8f716da90fa |
comparison
equal
deleted
inserted
replaced
| 33309:69c4493a54f9 | 33310:b4d517d736a1 |
|---|---|
| 442 return self._mdstate | 442 return self._mdstate |
| 443 | 443 |
| 444 def unresolved(self): | 444 def unresolved(self): |
| 445 """Obtain the paths of unresolved files.""" | 445 """Obtain the paths of unresolved files.""" |
| 446 | 446 |
| 447 for f, entry in self._state.items(): | 447 for f, entry in self._state.iteritems(): |
| 448 if entry[0] == 'u': | 448 if entry[0] == 'u': |
| 449 yield f | 449 yield f |
| 450 | 450 |
| 451 def driverresolved(self): | 451 def driverresolved(self): |
| 452 """Obtain the paths of driver-resolved files.""" | 452 """Obtain the paths of driver-resolved files.""" |