##// END OF EJS Templates
mergestate: add a method to compute actions to perform on dirstate...
Siddharth Agarwal -
r27079:a88a10a9 default
parent child Browse files
Show More
@@ -509,6 +509,14 b' class mergestate(object):'
509 509 return len([True for f, entry in self._state.iteritems()
510 510 if entry[0] == 'u'])
511 511
512 def actions(self):
513 """return lists of actions to perform on the dirstate"""
514 actions = {'r': [], 'a': [], 'g': []}
515 for f, (r, action) in self._results.iteritems():
516 if action is not None:
517 actions[action].append((f, None, "merge result"))
518 return actions
519
512 520 def _checkunknownfile(repo, wctx, mctx, f, f2=None):
513 521 if f2 is None:
514 522 f2 = f
General Comments 0
You need to be logged in to leave comments. Login now