view tests/failfilemerge.py @ 51926:70fe33bdab54

typing: add type hints for the overloads of `matchmod.readpatternfile()` The return type is conditional on an argument passed, and it very much confused both pytype and PyCharm inside `dirstate._ignorefileandline()` after adding type hints for the return value there.
author Matt Harbison <matt_harbison@yahoo.com>
date Fri, 27 Sep 2024 11:57:42 -0400
parents 6000f5b25c9b
children
line wrap: on
line source

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