Mercurial > hg

view tests/failfilemerge.py @ 29281:9ac309946df9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obsolete: fix grammar
author timeless <timeless@mozdev.org>
date Fri, 27 May 2016 05:24:45 +0000
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)