tests/failfilemerge.py
author Pierre-Yves David <pierre-yves.david@octobus.net>
Fri, 14 Jun 2019 13:59:47 +0100
changeset 42872 141bb77b606b
parent 34137 c0ce60459d84
child 43076 2372284d9457
permissions -rw-r--r--
run-tests: use symbolic constant instead of arbitrary number line matching (This is a gratuitous cleanup that I made while investigating a bug).

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