tests/failfilemerge.py
author timeless <timeless@mozdev.org>
Tue, 20 Sep 2016 23:47:46 +0000
changeset 29974 7109d5ddeb0c
parent 29774 a7f8939641aa
child 30332 318a24b52eeb
permissions -rw-r--r--
help: use single quotes in use warning

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