2016-10-18 00:16:55 +03:00
|
|
|
# extension to emulate interrupting filemerge._filemerge
|
2016-02-05 04:56:46 +03:00
|
|
|
|
|
|
|
from __future__ import absolute_import
|
|
|
|
|
|
|
|
from mercurial import (
|
|
|
|
error,
|
2016-04-03 13:41:00 +03:00
|
|
|
extensions,
|
|
|
|
filemerge,
|
2016-02-05 04:56:46 +03:00
|
|
|
)
|
|
|
|
|
|
|
|
def failfilemerge(filemergefn,
|
2017-09-11 23:03:27 +03:00
|
|
|
premerge, repo, wctx, mynode, orig, fcd, fco, fca,
|
|
|
|
labels=None):
|
2016-02-05 04:56:46 +03:00
|
|
|
raise error.Abort("^C")
|
|
|
|
return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)
|
|
|
|
|
|
|
|
def extsetup(ui):
|
|
|
|
extensions.wrapfunction(filemerge, '_filemerge',
|
|
|
|
failfilemerge)
|