annotate tests/failfilemerge.py @ 48321:f35529784079 stable

dirstate-v2: fix confusion between requirement and format config variable

None of those outputs failed on the CI because dirstate-v2 is not fully tested
yet. This also updates the documentation.

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

# 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(b"^C")
    return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)


def extsetup(ui):
    extensions.wrapfunction(filemerge, '_filemerge', failfilemerge)