Mercurial > public > mercurial-scm > hg-stable
diff mercurial/merge.py @ 7622:4dd7b28003d2
use dict.iteritems() rather than dict.items()
This should be faster and more future-proof. Calls where the result is to be
sorted using util.sort() have been left unchanged. Calls to .items() on
configparser objects have been left as-is, too.
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Mon, 12 Jan 2009 09:16:03 +0100 |
| parents | 89207edf3973 |
| children | 0b2ee57dfdb1 |
line wrap: on
line diff
--- a/mercurial/merge.py Mon Jan 12 09:07:02 2009 +0100 +++ b/mercurial/merge.py Mon Jan 12 09:16:03 2009 +0100 @@ -36,7 +36,7 @@ def _write(self): f = self._repo.opener("merge/state", "w") f.write(hex(self._local) + "\n") - for d, v in self._state.items(): + for d, v in self._state.iteritems(): f.write("\0".join([d] + v) + "\n") def add(self, fcl, fco, fca, fd, flags): hash = util.sha1(fcl.path()).hexdigest() @@ -166,7 +166,7 @@ dirs = repo.ui.configbool("merge", "followdirs", True) copy, diverge = copies.copies(repo, p1, p2, pa, dirs) copied = dict.fromkeys(copy.values()) - for of, fl in diverge.items(): + for of, fl in diverge.iteritems(): act("divergent renames", "dr", of, fl) # Compare manifests