view tests/failfilemerge.py @ 38734:25880ddf9a86

macosx: fixing macOS version generation after db9d1dd01bf0

With the Python3 change, the string is now something like
version = b'4.6.2+848-88be288e8ac1'
where it was previously just:
version = '4.6.2+848-88be288e8ac1'

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

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