mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 14:58:03 +03:00
ab3a7cb21f
Summary: In preparation for merging fb-mercurial sources to the Eden repository, move everything from the top-level directory into an `eden/scm` subdirectory.
17 lines
453 B
Python
17 lines
453 B
Python
# extension to emulate interrupting filemerge._filemerge
|
|
|
|
from __future__ import absolute_import
|
|
|
|
from edenscm.mercurial import error, extensions, filemerge
|
|
|
|
|
|
def failfilemerge(
|
|
filemergefn, premerge, repo, wctx, 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)
|