tests/failfilemerge.py
author Pulkit Goyal <7895pulkit@gmail.com>
Sat, 24 Jun 2017 19:57:50 +0530
changeset 33106 4c5af472a599
parent 30342 318a24b52eeb
child 34137 c0ce60459d84
permissions -rw-r--r--
py3: add b'' to make a triple quoted string bytes on Python 3 Transformer does not adds b'' in front of triple quoted strings to prevent converting docs to bytes.

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