mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 08:18:15 +03:00
a1eba8f292
In the in-memory merge branch. we'll need to call a function (``flushall``) on the wctx inside of _xmerge. This prepares the way so it can be done without hacks like ``fcd.ctx()``. Differential Revision: https://phab.mercurial-scm.org/D449
20 lines
518 B
Python
20 lines
518 B
Python
# extension to emulate interrupting filemerge._filemerge
|
|
|
|
from __future__ import absolute_import
|
|
|
|
from 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)
|