tests/failfilemerge.py
author Augie Fackler <augie@google.com>
Sat, 13 Oct 2018 06:34:53 -0400
changeset 40246 be0a5d2d5c78
parent 34122 c0ce60459d84
child 43076 2372284d9457
permissions -rw-r--r--
tests: fix last failure in test-tools.t Differential Revision: https://phab.mercurial-scm.org/D5072

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