view tests/failfilemerge.py @ 29314:bde283a1ad1a

py3: make largefiles/reposetup.py use absolute_import
author liscju <piotr.listkiewicz@gmail.com>
date Tue, 10 May 2016 15:04:22 +0200
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)