tests/failfilemerge.py
author Gregory Szorc <gregory.szorc@gmail.com>
Sun, 01 Oct 2017 10:17:11 +0100
changeset 34393 aea6344e989b
parent 34137 c0ce60459d84
child 43076 2372284d9457
permissions -rw-r--r--
commands: remove suggestion to clone via `cp -al` This was added in 2df98f616645 in 2006. This may be possible but it seems like a bad idea to even suggest it. Differential Revision: https://phab.mercurial-scm.org/D863

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