tests/failfilemerge.py
author Kostia Balytskyi <ikostia@fb.com>
Mon, 04 Apr 2016 02:05:10 -0700
changeset 28845 5a398627db92
parent 28772 424c1632fffb
child 29774 a7f8939641aa
permissions -rw-r--r--
commands: make --rev and --index compatible in debugobsolete

# extension to emulate interupting filemerge._filemerge

from __future__ import absolute_import

from mercurial import (
    error,
    extensions,
    filemerge,
)

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)