comparison mercurial/mdiff.py @ 36655:68026dd7c4f9

cext: accept arguments as Py_buffer

The s*/y* value formatters receive a Py_buffer instead of a char *.
This value format is more flexible in the types that it allows.

We change bdiff() to accept any object that conforms to the buffer
protocol. We validate the buffers are contiguous and have a single
dimension.

This allows memoryview instances to be handled by the function, so
we revert a recent change to cast arguments to bytes before calling
this function.

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

36654:b864f4536ca8

blocks = bdiff.blocks
fixws = bdiff.fixws
patches = mpatch.patches
patchedsize = mpatch.patchedsize
_textdiff = bdiff.bdiff
splitnewlines = bdiff.splitnewlines

# On Python 3, util.buffer() creates a memoryview, which appears not
# supporting the buffer protocol
if pycompat.ispy3:
    def textdiff(a, b):
        return _textdiff(bytes(a), bytes(b))
else:
    textdiff = _textdiff

class diffopts(object):
    '''context is the number of context lines
    text treats all files as text
    showfunc enables diff -p output

36655:68026dd7c4f9

blocks = bdiff.blocks
fixws = bdiff.fixws
patches = mpatch.patches
patchedsize = mpatch.patchedsize
textdiff = bdiff.bdiff
splitnewlines = bdiff.splitnewlines

class diffopts(object):
    '''context is the number of context lines
    text treats all files as text
    showfunc enables diff -p output