tests/failfilemerge.py
author Sean Farley <sean@farley.io>
Sat, 16 Apr 2016 13:01:47 -0700
branchstable
changeset 28994 8797f03db5b6
parent 28772 424c1632fffb
child 29785 a7f8939641aa
permissions -rw-r--r--
builddeb: add flag for a source-only deb This is required for building a ppa for ubuntu which following patches will use.

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