tests/failfilemerge.py
author Yuya Nishihara <yuya@tcha.org>
Thu, 15 Mar 2018 20:43:39 +0900
changeset 37076 44757e6dad93
parent 34137 c0ce60459d84
child 43076 2372284d9457
permissions -rw-r--r--
templater: introduce resourcemapper class A couple more functions will be added later to work around nested mapping bugs such as the issue 5612.

# extension to emulate interrupting filemerge._filemerge

from __future__ import absolute_import

from mercurial import (
    error,
    extensions,
    filemerge,
)

def failfilemerge(filemergefn,
                  premerge, repo, wctx, 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)