annotate tests/failfilemerge.py @ 44120:35cd52c4a5cc

py3: conditionalize test-flagprocessor.t on Python 3.8

For reasons I don't understand, Python 3.8 is outputting a different
lint in the traceback than prior Pythons.

The lines in question are:

    flagutil.addflagprocessor(
        REVIDX_NOOP, (noopdonothingread, noopdonothing, validatehash,)
    )

Python <3.8 prints the 2nd line but 3.8 the first line. Perhaps Python
changed its traceback logic to always print the first line of a
multiple line expression?

Whatever the case, with this change, the test now passes on
Python 3.8.

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

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