tests/failfilemerge.py
author Boris Feld <boris.feld@octobus.net>
Fri, 30 Jun 2017 03:42:39 +0200
changeset 34472 12c068377273
parent 34122 c0ce60459d84
child 43076 2372284d9457
permissions -rw-r--r--
configitems: register the 'histedit.linelen' config

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