tests/failfilemerge.py
author Manuel Jacob <me@manueljacob.de>
Wed, 24 Jun 2020 04:25:34 +0200
branchstable
changeset 44977 afcad425a0b6
parent 43076 2372284d9457
child 45681 a736ab681b78
permissions -rw-r--r--
pycompat: fix crash when default locale is unknown Instead, fall back to the filesystem encoding if the default locale is unknown.

# extension to emulate interrupting filemerge._filemerge

from __future__ import absolute_import

from mercurial import (
    error,
    extensions,
    filemerge,
)


def failfilemerge(
    filemergefn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None
):
    raise error.Abort("^C")
    return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)


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