tests/failfilemerge.py
author Yuya Nishihara <yuya@tcha.org>
Mon, 04 Jan 2016 22:55:05 +0900
changeset 28210 964ad57eff30
parent 27988 61f4d59e9a0b
child 28772 424c1632fffb
permissions -rw-r--r--
hgweb: remove unused argument from graphdata() factory As graphdata() is wrapped by lambda, there's no reason to pass unused arguments to it.

# extension to emulate interupting filemerge._filemerge

from __future__ import absolute_import

from mercurial import (
    filemerge,
    extensions,
    error,
)

def failfilemerge(filemergefn,
        premerge, repo, 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)