view tests/failfilemerge.py @ 39486:43d92d68ac88

wireprotov2peer: properly format errors

formatrichmessage() expects an iterable containing dicts with
well-defined keys. We were passing in something else. This caused
an exception.

Change the code to call formatrichmessage() with the proper argument.

And add a TODO to potentially emit the proper data structure from
the server in the first place.

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

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