tests/failfilemerge.py
author Jun Wu <quark@fb.com>
Thu, 28 Jul 2016 20:49:57 +0100
changeset 30410 7a5d6e2fd2d5
parent 30332 318a24b52eeb
child 34122 c0ce60459d84
permissions -rw-r--r--
worker: move killworkers and waitforworkers up We need to use them in the SIGCHLD handler and SIGCHLD handler should be installed before fork.

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