tests/failfilemerge.py
author Matt Harbison <matt_harbison@yahoo.com>
Wed, 24 Oct 2018 22:40:48 -0400
branchstable
changeset 40419 5e917b224c20
parent 34122 c0ce60459d84
child 43076 2372284d9457
permissions -rw-r--r--
help: update the default value specified for `profiling.time-track` I tried conditionalizing this in a `.. container::` block, but that seemed to add an extra blank line between the main text and the parenthetical.

# extension to emulate interrupting filemerge._filemerge

from __future__ import absolute_import

from mercurial import (
    error,
    extensions,
    filemerge,
)

def failfilemerge(filemergefn,
                  premerge, repo, wctx, 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)