Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/filemerge.py @ 26613:abb5ec3eb6ce
filemerge: clean up some dead code
We now exit early if we do a premerge, so extra checks are no longer necessary.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Sun, 11 Oct 2015 15:04:00 -0700 |
| parents | a5ff66e6d77a |
| children | ef1eb6df7071 |
comparison
equal
deleted
inserted
replaced
| 26612:a38924f7680c | 26613:abb5ec3eb6ce |
|---|---|
| 520 if premerge and mergetype == fullmerge: | 520 if premerge and mergetype == fullmerge: |
| 521 r = _premerge(repo, toolconf, files, labels=labels) | 521 r = _premerge(repo, toolconf, files, labels=labels) |
| 522 # complete if premerge successful (r is 0) | 522 # complete if premerge successful (r is 0) |
| 523 return not r, r | 523 return not r, r |
| 524 | 524 |
| 525 if not r: # premerge successfully merged the file | 525 needcheck, r = func(repo, mynode, orig, fcd, fco, fca, toolconf, files, |
| 526 needcheck = False | 526 labels=labels) |
| 527 else: | |
| 528 needcheck, r = func(repo, mynode, orig, fcd, fco, fca, toolconf, | |
| 529 files, labels=labels) | |
| 530 | |
| 531 if needcheck: | 527 if needcheck: |
| 532 r = _check(r, ui, tool, fcd, files) | 528 r = _check(r, ui, tool, fcd, files) |
| 533 | 529 |
| 534 if r: | 530 if r: |
| 535 if onfailure: | 531 if onfailure: |