mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 07:49:11 +03:00
19 lines
494 B
Python
19 lines
494 B
Python
# extension to emulate interrupting filemerge._filemerge
|
|
|
|
from __future__ import absolute_import
|
|
|
|
from mercurial import (
|
|
error,
|
|
extensions,
|
|
filemerge,
|
|
)
|
|
|
|
def failfilemerge(filemergefn,
|
|
premerge, repo, mynode, orig, fcd, fco, fca, labels=None):
|
|
raise error.Abort("^C")
|
|
return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)
|
|
|
|
def extsetup(ui):
|
|
extensions.wrapfunction(filemerge, '_filemerge',
|
|
failfilemerge)
|