tests/failfilemerge.py
author Anton Shestakov <av6@dwimlabs.net>
Thu, 04 Aug 2016 10:42:03 +0800
branchstable
changeset 29653 7ce05671a5e3
parent 28772 424c1632fffb
child 29785 a7f8939641aa
permissions -rw-r--r--
help: update link to wiki/CommandServer

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