tests/failfilemerge.py
author Augie Fackler <raf@durin42.com>
Tue, 22 Aug 2017 23:11:35 -0400
changeset 34025 626a28f30dbd
parent 30332 318a24b52eeb
child 34122 c0ce60459d84
permissions -rw-r--r--
debugcommands: stabilize output of debugbundle by having a custom repr We handle all dict-like things the same, and don't worry about it actually being a repr.

# extension to emulate interrupting 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)