tests/failfilemerge.py
author Pierre-Yves David <pierre-yves.david@octobus.net>
Sun, 30 Jan 2022 06:01:42 +0100
changeset 48729 7d073df49a54
parent 48477 f45a4a47f6a8
child 48966 6000f5b25c9b
permissions -rw-r--r--
merge-actions: add some information about the "changes" the action do This will be useful when processing merges action outside of the narrow-spec. "support" outside of narrow file on commit Differential Revision: https://phab.mercurial-scm.org/D12118

# extension to emulate interrupting filemerge._filemerge

from __future__ import absolute_import

from mercurial import (
    error,
    extensions,
    filemerge,
)


def failfilemerge(*args, **kwargs):
    raise error.Abort(b"^C")


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