tests/failfilemerge.py
author Yuya Nishihara <yuya@tcha.org>
Wed, 17 Feb 2016 21:30:04 +0900
changeset 34060 90896b61fe26
parent 30342 318a24b52eeb
child 34137 c0ce60459d84
permissions -rw-r--r--
parser: add helper function that constructs parsed tree from template This function will be used as follows: build('only(_, _)', x, y) See the next patch for details.

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