tests/failfilemerge.py
author Joerg Sonnenberger <joerg@bec.de>
Thu, 18 Jun 2020 15:13:38 +0200
changeset 45025 24b1a8eb73aa
parent 43076 2372284d9457
child 45681 a736ab681b78
permissions -rw-r--r--
ui: add option to timestamp status and diagnostic messages Differential Revision: https://phab.mercurial-scm.org/D8640

# 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)