view tests/failfilemerge.py @ 48644:23db8460974b

test-bundle: split each variant in there own section Having conditional line matching for this kind of big block is quite inconvenient to update. The new way should be simpler to maintain. Differential Revision: https://phab.mercurial-scm.org/D12075
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 18 Jan 2022 15:27:51 +0100
parents f45a4a47f6a8
children 6000f5b25c9b
line wrap: on
line source

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