tests/failfilemerge.py
author timeless <timeless@mozdev.org>
Fri, 08 Apr 2016 16:05:52 +0000
changeset 28827 1e184241de51
parent 28772 424c1632fffb
child 29774 a7f8939641aa
permissions -rw-r--r--
compact: add color labels to -Tcompact

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