view tests/failfilemerge.py @ 44133:1f8f215219ff stable

relnotes: copy "next" to "5.3" and clear "next"

This is the same thing as we've done for the last two releases.

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

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