view tests/failfilemerge.py @ 32247:e05cfb4a6a8e

sslutil: remove conditional cipher code needed for Python 2.6

We dropped support for Python 2.6. So this code to work around a
missing feature on 2.6 is no longer necessary.

# extension to emulate interrupting filemerge._filemerge

from __future__ import absolute_import

from mercurial import (
    error,
    extensions,
    filemerge,
)

def failfilemerge(filemergefn,
                  premerge, repo, 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)