D789: merge: add option to abort merge process on failure
yuja (Yuya Nishihara)
phabricator at mercurial-scm.org
Tue Sep 26 09:39:38 EDT 2017
yuja requested changes to this revision.
yuja added a comment.
This revision now requires changes to proceed.
Can you rename or fold the test so we can do `./run-tests.py test-merge-*`?
INLINE COMMENTS
> filemerge.py:536
> + if repo.ui.configbool('merge', 'abortonfailure'):
> + def onerr(*args):
> + msg = _('merge aborted due to nonrzero mergetool return code')
Nit: onerr() is a function to return an exception object (e.g. an exception type), not a function to raise an exception.
> filemerge.py:734
> if onfailure:
> ui.warn(onfailure % fd)
>
Perhaps it's better to abort here, not in _xmerge().
Several merge tools do not return non-zero status on error, so
we have extra _check() to detect merge error.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D789
To: ryanmce, #hg-reviewers, quark, yuja
Cc: yuja, quark, mercurial-devel
More information about the Mercurial-devel
mailing list