tests/failfilemerge.py
author Pierre-Yves David <pierre-yves.david@octobus.net>
Wed, 10 Mar 2021 06:03:55 +0100
changeset 46776 954bad9c32a0
parent 45681 a736ab681b78
child 48471 de8181c5414d
permissions -rw-r--r--
pull: pre-indent a part of the function We are about to run it in a loop, so lets pre-indent it to clarify the actual change in the next changesets. Differential Revision: https://phab.mercurial-scm.org/D10158

# 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(b"^C")
    return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)


def extsetup(ui):
    extensions.wrapfunction(filemerge, '_filemerge', failfilemerge)