failfilemerge.py
19 lines
| 518 B
| text/x-python
|
PythonLexer
/ tests / failfilemerge.py
Mads Kiilerich
|
r30332 | # extension to emulate interrupting filemerge._filemerge | ||
timeless
|
r27988 | |||
| from __future__ import absolute_import | ||||
| from mercurial import ( | ||||
Yuya Nishihara
|
r28772 | error, | ||
|
timeless
|
r27988 | extensions, | ||
|
Yuya Nishihara
|
r28772 | filemerge, | ||
|
timeless
|
r27988 | ) | ||
| def failfilemerge(filemergefn, | ||||
Phil Cohen
|
r34124 | premerge, repo, wctx, mynode, orig, fcd, fco, fca, | ||
| labels=None): | ||||
|
timeless
|
r27988 | raise error.Abort("^C") | ||
| return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels) | ||||
| def extsetup(ui): | ||||
| extensions.wrapfunction(filemerge, '_filemerge', | ||||
| failfilemerge) | ||||