tests/failfilemerge.py
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
Sun, 06 Nov 2016 20:16:01 +0100
changeset 31115 f5131d4f512a
parent 30332 318a24b52eeb
child 34122 c0ce60459d84
permissions -rw-r--r--
color: move 'styles' definition on the 'ui' object Same logic as for '_terminfoparams'. The content depends on the config so it should be specific to each 'ui instance.

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