tests/failfilemerge.py
author Gregory Szorc <gregory.szorc@gmail.com>
Mon, 10 Jul 2017 21:39:49 -0700
changeset 33374 4dc04cdf2520
parent 30332 318a24b52eeb
child 34122 c0ce60459d84
permissions -rw-r--r--
sparse: move config updating function into core As part of the move, the ui argument was dropped. Additional fixups will be made in a follow-up commit.

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