tests/failfilemerge.py
author Martin von Zweigbergk <martinvonz@google.com>
Tue, 29 Jan 2019 12:01:13 -0800
changeset 41511 72a9aacff645
parent 34122 c0ce60459d84
child 43076 2372284d9457
permissions -rw-r--r--
resolve: respect ui.relative-paths Differential Revision: https://phab.mercurial-scm.org/D5748

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