Mercurial > public > mercurial-scm > hg-stable

view tests/failfilemerge.py @ 48560:d6c53b40b078

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rust: fix build errors on darwin I'm not all _that_ versed in Rust, but I think the root cause is that some constants are u16 rather than u32 on Darwin. I checked that the code still compiles on the latest Ubuntu. Differential Revision: https://phab.mercurial-scm.org/D11955
author Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date Thu, 30 Dec 2021 13:25:44 +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)