view tests/failfilemerge.py @ 33061:c41cbe98822c

configitems: register 'ui.interactive' That item default value is a bit special (None) so this adds a second proof that everything is still working fine.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 23 Jun 2017 17:19:29 +0200
parents 318a24b52eeb
children c0ce60459d84
line wrap: on
line source

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