tests/failfilemerge.py
author Martin von Zweigbergk <martinvonz@google.com>
Wed, 22 Mar 2017 16:36:53 -0700
changeset 31591 2c02bb7fd7fc
parent 30332 318a24b52eeb
child 34122 c0ce60459d84
permissions -rw-r--r--
help: format ``commands`` heading correctly The number of dashes under it needs to match exactly for it to be rendered as a heading. Without this change, the dashes end up on the same line as "commands", and "hg help config.commands" does not work.

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