tests/failfilemerge.py
author Mathias De Mare <mathias.de_mare@nokia.com>
Mon, 07 Nov 2022 09:25:20 +0100
changeset 49725 53e4f44ba0e8
parent 48966 6000f5b25c9b
permissions -rw-r--r--
configitems: enable pullbundles by default The use of pullbundles is already protected: they are only used when a pullbundles.manifest file is created on the server. Having an additional flag doesn't really make sense and can confuse users (as indicated in the mercurial mailing list on the topic "Can't get pull-bundles working").

# extension to emulate interrupting filemerge._filemerge


from mercurial import (
    error,
    extensions,
    filemerge,
)


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


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