annotate tests/failfilemerge.py @ 36735:ef345f9e4295

transaction: fix an error string with bytestr() on a repr()d value

Fixes test-rollback.t on Python 3.

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

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