view tests/failfilemerge.py @ 28254:c82b290c9560 stable

i18n-ja: synchronized with cb6a952efbf4
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Mon, 29 Feb 2016 22:52:29 +0900
parents 61f4d59e9a0b
children 424c1632fffb
line wrap: on
line source

# extension to emulate interupting filemerge._filemerge

from __future__ import absolute_import

from mercurial import (
    filemerge,
    extensions,
    error,
)

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)