Mercurial > public > mercurial-scm > hg
diff mercurial/filemerge.py @ 34796:ed91846c29cf
filemerge: introduce functions to halt merge flow
Depends on D931.
This patch introduces functions and a config option that will allow a user
to halt the merge if there are failures during a file merge. These functions
will be used in the next patch.
Differential Revision: https://phab.mercurial-scm.org/D932
| author | Ryan McElroy <rmcelroy@fb.com> |
|---|---|
| date | Fri, 06 Oct 2017 06:48:43 -0700 |
| parents | 1af4561b6bfe |
| children | 284fa44f7f39 |
line wrap: on
line diff
--- a/mercurial/filemerge.py Sun Oct 15 19:29:56 2017 +0530 +++ b/mercurial/filemerge.py Fri Oct 06 06:48:43 2017 -0700 @@ -745,6 +745,20 @@ if not r and back is not None: back.remove() +def _haltmerge(): + msg = _('merge halted after failed merge (see hg resolve)') + raise error.InterventionRequired(msg) + +def _onfilemergefailure(ui): + action = ui.config('merge', 'on-failure') + if action == 'prompt': + msg = _('continue merge operation (yn)?' '$$ &Yes $$ &No') + if ui.promptchoice(msg, 0) == 1: + _haltmerge() + if action == 'halt': + _haltmerge() + # default action is 'continue', in which case we neither prompt nor halt + def _check(repo, r, ui, tool, fcd, files): fd = fcd.path() unused, unused, unused, back = files