406 # else: regular merges (no action necessary) |
406 # else: regular merges (no action necessary) |
407 self._results[dfile] = merge_ret, action |
407 self._results[dfile] = merge_ret, action |
408 |
408 |
409 return complete, merge_ret |
409 return complete, merge_ret |
410 |
410 |
411 def preresolve(self, dfile, wctx): |
|
412 """run premerge process for dfile |
|
413 |
|
414 Returns whether the merge is complete, and the exit code.""" |
|
415 return self._resolve(True, dfile, wctx) |
|
416 |
|
417 def resolve(self, dfile, wctx): |
411 def resolve(self, dfile, wctx): |
418 """run merge process (assuming premerge was run) for dfile |
412 """run merge process for dfile |
419 |
413 |
420 Returns the exit code of the merge.""" |
414 Returns the exit code of the merge.""" |
421 return self._resolve(False, dfile, wctx)[1] |
415 complete, r = self._resolve(True, dfile, wctx) |
|
416 if not complete: |
|
417 r = self._resolve(False, dfile, wctx)[1] |
|
418 return r |
422 |
419 |
423 def counts(self): |
420 def counts(self): |
424 """return counts for updated, merged and removed files in this |
421 """return counts for updated, merged and removed files in this |
425 session""" |
422 session""" |
426 updated, merged, removed = 0, 0, 0 |
423 updated, merged, removed = 0, 0, 0 |