tests/failfilemerge.py
author Pierre-Yves David <pierre-yves.david@octobus.net>
Fri, 28 Feb 2020 02:23:38 +0100
changeset 44633 dd5b47fb0860
parent 43076 2372284d9457
child 45681 a736ab681b78
permissions -rw-r--r--
nodemap: test that concurrent process don't see the pending transaction We don't want other client to read uncommitted data, until the transaction is really committed. Differential Revision: https://phab.mercurial-scm.org/D8190

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