mercurial/merge.py
changeset 48927 c17aee610bab
parent 48913 f254fc73d956
child 48946 642e31cb55f0
equal deleted inserted replaced
48926:3d35e7483602 48927:c17aee610bab
   623             if sort:
   623             if sort:
   624                 for f in sorted(self._actionmapping[a]):
   624                 for f in sorted(self._actionmapping[a]):
   625                     args, msg = self._actionmapping[a][f]
   625                     args, msg = self._actionmapping[a][f]
   626                     yield f, args, msg
   626                     yield f, args, msg
   627             else:
   627             else:
   628                 for f, (args, msg) in pycompat.iteritems(
   628                 for f, (args, msg) in self._actionmapping[a].items():
   629                     self._actionmapping[a]
       
   630                 ):
       
   631                     yield f, args, msg
   629                     yield f, args, msg
   632 
   630 
   633     def len(self, actions=None):
   631     def len(self, actions=None):
   634         """returns number of files which needs actions
   632         """returns number of files which needs actions
   635 
   633