changeset 48935 | 2cce2fa5bcf7 |
parent 48913 | f254fc73d956 |
child 48946 | 642e31cb55f0 |
--- a/mercurial/mergestate.py Mon Feb 21 11:24:57 2022 -0700 +++ b/mercurial/mergestate.py Tue Mar 01 20:52:32 2022 -0800 @@ -13,7 +13,6 @@ from . import ( error, filemerge, - pycompat, util, ) from .utils import hashutil @@ -467,7 +466,7 @@ """return counts for updated, merged and removed files in this session""" updated, merged, removed = 0, 0, 0 - for r, action in pycompat.itervalues(self._results): + for r, action in self._results.values(): if r is None: updated += 1 elif r == 0: