tests/failfilemerge.py
author Pierre-Yves David <pierre-yves.david@octobus.net>
Sat, 17 Jun 2017 12:52:02 +0200
changeset 32965 36e16797df32
parent 30332 318a24b52eeb
child 34122 c0ce60459d84
permissions -rw-r--r--
config: use the new '_unset' value for 'configpath' This should let 'configpath' delegate all special processing of the default config value to the main 'config' method.

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