This is an archive of the discontinued Mercurial Phabricator instance.

Differential D951

merge: allow user to halt merge on merge-tool failures
ClosedPublic

Authored by ryanmce on Oct 5 2017, 5:15 AM.

Details

Reviewers
mbthomas
durin42
Group Reviewers
hg-reviewers
Commits
rHG284fa44f7f39: merge: allow user to halt merge on merge-tool failures
rHGf583cef55995: merge: allow user to halt merge on merge-tool failures
Summary

Depends on D932.

Call the new _onfilemergefailure function when a merge tool reports failure
via a return code.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

ryanmce created this revision.Oct 5 2017, 5:15 AM
mbthomas accepted this revision.Oct 6 2017, 5:16 AM
ryanmce updated this revision to Diff 2502.Oct 6 2017, 9:51 AM
quark set the repository for this revision to rHG Mercurial.Oct 7 2017, 1:14 PM
durin42 accepted this revision.Oct 16 2017, 9:40 PM
This revision is now accepted and ready to land.Oct 16 2017, 9:40 PM
Closed by commit rHGf583cef55995: merge: allow user to halt merge on merge-tool failures (authored by ryanmce). · Explain WhyOct 16 2017, 9:47 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (1 line)
Mtests/test-merge-halt.t (7 lines)

Diff 2877

mercurial/filemerge.py

toolconf, files, labels=labels) toolconf, files, labels=labels)
if needcheck: if needcheck:
r = _check(repo, r, ui, tool, fcd, files) r = _check(repo, r, ui, tool, fcd, files)
if r: if r:
if onfailure: if onfailure:
ui.warn(onfailure % fd) ui.warn(onfailure % fd)
_onfilemergefailure(ui)
return True, r, deleted return True, r, deleted
finally: finally:
if not r and back is not None: if not r and back is not None:
back.remove() back.remove()
def _haltmerge(): def _haltmerge():
msg = _('merge halted after failed merge (see hg resolve)') msg = _('merge halted after failed merge (see hg resolve)')

tests/test-merge-halt.t

Testing on-failure=halt Testing on-failure=halt
$ echo on-failure=halt >> $HGRCPATH $ echo on-failure=halt >> $HGRCPATH
$ hg rebase -s 1 -d 2 --tool false $ hg rebase -s 1 -d 2 --tool false
rebasing 1:1f28a51c3c9b "c" rebasing 1:1f28a51c3c9b "c"
merging a merging a
merging b merging b
merging a failed! merging a failed!
merging b failed! merge halted after failed merge (see hg resolve)
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ hg resolve --list $ hg resolve --list
U a U a
U b U b
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
Testing on-failure=prompt Testing on-failure=prompt
$ echo on-failure=prompt >> $HGRCPATH $ echo on-failure=prompt >> $HGRCPATH
$ cat <<EOS | hg rebase -s 1 -d 2 --tool false --config ui.interactive=1 $ cat <<EOS | hg rebase -s 1 -d 2 --tool false --config ui.interactive=1
> y > y
> n > n
> EOS > EOS
rebasing 1:1f28a51c3c9b "c" rebasing 1:1f28a51c3c9b "c"
merging a merging a
merging b merging b
merging a failed! merging a failed!
continue merge operation (yn)? y
merging b failed! merging b failed!
unresolved conflicts (see hg resolve, then hg rebase --continue) continue merge operation (yn)? n
merge halted after failed merge (see hg resolve)
[1] [1]
$ hg resolve --list $ hg resolve --list
U a U a
U b U b
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted