failfilemerge.py
20 lines
| 462 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 | ) | ||
Augie Fackler
|
r43346 | |||
def failfilemerge( | ||||
filemergefn, 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) | ||||
Augie Fackler
|
r43346 | |||
timeless
|
r27988 | def extsetup(ui): | ||
Augie Fackler
|
r43346 | extensions.wrapfunction(filemerge, '_filemerge', failfilemerge) | ||