tests/failfilemerge.py
author Martijn Pieters <mjpieters@fb.com>
Wed, 08 Jun 2016 16:18:43 +0100
changeset 29335 631617262e55
parent 28772 424c1632fffb
child 29785 a7f8939641aa
permissions -rw-r--r--
graphmod: avoid sorting when already sorted This is somewhat redundant now, but allows us to add a toposort that should not be re-sorted either.

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