mercurial/merge.py
changeset 43104 74802979dd9d
parent 43090 1f339b503a40
child 43106 d783f945a701
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