Mercurial > hg-stable
changeset 26575:d60815664c34
filemerge: move post-merge checks into a separate function
This makes the overall filemerge function easier to follow, and makes upcoming
work simpler.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Wed, 07 Oct 2015 23:35:30 -0700 |
| parents | f82cb7dffb49 |
| children | 9e0aaac0d9eb |
| files | mercurial/filemerge.py |
| diffstat | 1 files changed, 33 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/filemerge.py Thu Oct 08 14:18:43 2015 -0700 +++ b/mercurial/filemerge.py Wed Oct 07 23:35:30 2015 -0700 @@ -521,41 +521,8 @@ needcheck, r = func(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=labels) - if not needcheck: - if r: - if onfailure: - ui.warn(onfailure % fd) - else: - util.unlink(back) - - util.unlink(b) - util.unlink(c) - return r - - if not r and (_toolbool(ui, tool, "checkconflicts") or - 'conflicts' in _toollist(ui, tool, "check")): - if re.search("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data(), - re.MULTILINE): - r = 1 - - checked = False - if 'prompt' in _toollist(ui, tool, "check"): - checked = True - if ui.promptchoice(_("was merge of '%s' successful (yn)?" - "$$ &Yes $$ &No") % fd, 1): - r = 1 - - if not r and not checked and (_toolbool(ui, tool, "checkchanged") or - 'changed' in - _toollist(ui, tool, "check")): - if filecmp.cmp(a, back): - if ui.promptchoice(_(" output file %s appears unchanged\n" - "was merge successful (yn)?" - "$$ &Yes $$ &No") % fd, 1): - r = 1 - - if _toolbool(ui, tool, "fixeol"): - _matcheol(a, back) + if needcheck: + r = _check(r, ui, tool, fcd, files) if r: if onfailure: @@ -567,5 +534,36 @@ util.unlink(c) return r +def _check(r, ui, tool, fcd, files): + fd = fcd.path() + a, b, c, back = files + + if not r and (_toolbool(ui, tool, "checkconflicts") or + 'conflicts' in _toollist(ui, tool, "check")): + if re.search("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data(), + re.MULTILINE): + r = 1 + + checked = False + if 'prompt' in _toollist(ui, tool, "check"): + checked = True + if ui.promptchoice(_("was merge of '%s' successful (yn)?" + "$$ &Yes $$ &No") % fd, 1): + r = 1 + + if not r and not checked and (_toolbool(ui, tool, "checkchanged") or + 'changed' in + _toollist(ui, tool, "check")): + if filecmp.cmp(a, back): + if ui.promptchoice(_(" output file %s appears unchanged\n" + "was merge successful (yn)?" + "$$ &Yes $$ &No") % fd, 1): + r = 1 + + if _toolbool(ui, tool, "fixeol"): + _matcheol(a, back) + + return r + # tell hggettext to extract docstrings from these functions: i18nfunctions = internals.values()