Mercurial > public > mercurial-scm > hg-stable

diff mercurial/mergestate.py @ 49026:2cce2fa5bcf7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: replace pycompat.itervalues(x) with x.values() pycompat.itervalues(x) just calls x.values(). So this is equivalent. The rewrite was perfomed via an automated search and replace. Differential Revision: https://phab.mercurial-scm.org/D12341
author Gregory Szorc <gregory.szorc@gmail.com>
date Tue, 01 Mar 2022 20:52:32 -0800
parents f254fc73d956
children 642e31cb55f0
line wrap: on
line diff
--- 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: