tests/failfilemerge.py

match: delete unused root and cwd arguments to constructors (API)

Most matchers no longer need the root and cwd
arguments. patternmatcher and includematcher still need the root
argument for subincludes.

Differential Revision: https://phab.mercurial-scm.org/D5929

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