tests/failfilemerge.py
author timeless <timeless@mozdev.org>
Fri, 05 Feb 2016 01:56:46 +0000
branchstable
changeset 27988 61f4d59e9a0b
child 28772 424c1632fffb
permissions -rw-r--r--
rebase: update working directory when aborting (issue5084)

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