view tests/failfilemerge.py @ 36035:95791b275b73

py3: convert content-type to bytes

This fixes the exception:

  TypeError: %b requires a bytes-like object, or an object that
  implements __bytes__, not 'str'

On the line:

  ui.debug('Content-Type: %s\n' % content_type)

And it prevents additional exceptions that use the content_type
variable later.

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

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