Show More
@@ -490,6 +490,20 b' class mergestate(object):' | |||||
490 | Returns the exit code of the merge.""" |
|
490 | Returns the exit code of the merge.""" | |
491 | return self._resolve(False, dfile, wctx, labels=labels)[1] |
|
491 | return self._resolve(False, dfile, wctx, labels=labels)[1] | |
492 |
|
492 | |||
|
493 | def counts(self): | |||
|
494 | """return counts for updated, merged and removed files in this | |||
|
495 | session""" | |||
|
496 | updated, merged, removed = 0, 0, 0 | |||
|
497 | for r, action in self._results.itervalues(): | |||
|
498 | if r is None: | |||
|
499 | updated += 1 | |||
|
500 | elif r == 0: | |||
|
501 | if action == 'r': | |||
|
502 | removed += 1 | |||
|
503 | else: | |||
|
504 | merged += 1 | |||
|
505 | return updated, merged, removed | |||
|
506 | ||||
493 | def _checkunknownfile(repo, wctx, mctx, f, f2=None): |
|
507 | def _checkunknownfile(repo, wctx, mctx, f, f2=None): | |
494 | if f2 is None: |
|
508 | if f2 is None: | |
495 | f2 = f |
|
509 | f2 = f |
General Comments 0
You need to be logged in to leave comments.
Login now