view tests/failfilemerge.py @ 28439:b6e71f8af5b8

largefiles: use iterbatch instead of batch This actually makes the code a little cleaner to read.
author Augie Fackler <augie@google.com>
date Wed, 02 Mar 2016 13:13:05 -0500
parents 61f4d59e9a0b
children 424c1632fffb
line wrap: on
line source

# extension to emulate interupting filemerge._filemerge

from __future__ import absolute_import

from mercurial import (
    filemerge,
    extensions,
    error,
)

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)