Mercurial > hg
comparison mercurial/merge.py @ 43104:74802979dd9d
py3: define and use pycompat.itervalues()
.itervalues() only exists on Python 2. Python 3's equivalent is
.values(). But we don't want to blindly use .values() everywhere
because on Python 2, it will create a list, which will have performance
implications.
This commit introduces pycompat.itervalues() which will call the appropriate
method on the passed object. We update all callers of obj.itervalues()
to pycompat.itervalues(obj) instead.
With this commit, the only source tranforming remaining is for
iteritems(). Victory is near...
Differential Revision: https://phab.mercurial-scm.org/D7013
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Sun, 06 Oct 2019 17:59:15 -0400 |
parents | 1f339b503a40 |
children | d783f945a701 |
comparison
equal
deleted
inserted
replaced
43103:c95b2f40db7c | 43104:74802979dd9d |
---|---|
700 | 700 |
701 def counts(self): | 701 def counts(self): |
702 """return counts for updated, merged and removed files in this | 702 """return counts for updated, merged and removed files in this |
703 session""" | 703 session""" |
704 updated, merged, removed = 0, 0, 0 | 704 updated, merged, removed = 0, 0, 0 |
705 for r, action in self._results.itervalues(): | 705 for r, action in pycompat.itervalues(self._results): |
706 if r is None: | 706 if r is None: |
707 updated += 1 | 707 updated += 1 |
708 elif r == 0: | 708 elif r == 0: |
709 if action == ACTION_REMOVE: | 709 if action == ACTION_REMOVE: |
710 removed += 1 | 710 removed += 1 |