Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/filemerge.py @ 34797:284fa44f7f39

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: allow user to halt merge on merge-tool failures Depends on D932. Call the new _onfilemergefailure function when a merge tool reports failure via a return code. Differential Revision: https://phab.mercurial-scm.org/D951
author Ryan McElroy <rmcelroy@fb.com>
date Fri, 06 Oct 2017 06:48:43 -0700
parents ed91846c29cf
children 18a3274ed675
comparison
equal deleted inserted replaced
34796:ed91846c29cf 34797:284fa44f7f39
737 r = _check(repo, r, ui, tool, fcd, files) 737 r = _check(repo, r, ui, tool, fcd, files)
738 738
739 if r: 739 if r:
740 if onfailure: 740 if onfailure:
741 ui.warn(onfailure % fd) 741 ui.warn(onfailure % fd)
742 _onfilemergefailure(ui)
742 743
743 return True, r, deleted 744 return True, r, deleted
744 finally: 745 finally:
745 if not r and back is not None: 746 if not r and back is not None:
746 back.remove() 747 back.remove()