tests/failfilemerge.py
author Kevin Bullock <kbullock+mercurial@ringworld.org>
Fri, 06 May 2016 08:41:24 -0500
changeset 29135 3879d02cd1cc
parent 28772 424c1632fffb
child 29774 a7f8939641aa
permissions -rw-r--r--
subrepo: use unset instead of env -u to fix test on BSDs (issue5229)

# extension to emulate interupting 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)