tests/failfilemerge.py
author Mads Kiilerich <madski@unity3d.com>
Mon, 17 Oct 2016 23:16:55 +0200
changeset 30332 318a24b52eeb
parent 29774 a7f8939641aa
child 34122 c0ce60459d84
permissions -rw-r--r--
spelling: fixes of non-dictionary words

# extension to emulate interrupting 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)