view tests/failfilemerge.py @ 28846:18f2fc517098

help: remove references to "Python 2.6 or later" We require Python 2.6. So there is no value to these docs.
author Gregory Szorc <gregory.szorc@gmail.com>
date Sun, 10 Apr 2016 10:58:47 -0700
parents 424c1632fffb
children a7f8939641aa
line wrap: on
line source

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