tests/failfilemerge.py
author Cédric Krier <ced@b2ck.com>
Wed, 25 Jul 2018 10:05:24 +0200
branchstable
changeset 38745 258d90f69076
parent 34137 c0ce60459d84
child 43076 2372284d9457
permissions -rw-r--r--
hgweb: strip trailing '/' in apppath before appending '/static/' (issue5943) Differential Revision: https://phab.mercurial-scm.org/D3978

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