Mercurial > hg
view mercurial/cffi/bdiff.py @ 32095:c52728b383b4 stable
discovery: prevent crash caused by prune marker having no parent data
If a marker has no parent information, parents field is set to None, which
caused TypeError. I think this shouldn't normally happen, but somehow
I have such marker in my repo.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Wed, 19 Apr 2017 23:10:05 +0900 |
parents | 9cc438bf7d9a |
children | 857876ebaed4 |
line wrap: on
line source
from __future__ import absolute_import import cffi import os ffi = cffi.FFI() ffi.set_source("_bdiff_cffi", open(os.path.join(os.path.join(os.path.dirname(__file__), '..'), 'bdiff.c')).read(), include_dirs=['mercurial']) ffi.cdef(""" struct bdiff_line { int hash, n, e; ssize_t len; const char *l; }; struct bdiff_hunk; struct bdiff_hunk { int a1, a2, b1, b2; struct bdiff_hunk *next; }; int bdiff_splitlines(const char *a, ssize_t len, struct bdiff_line **lr); int bdiff_diff(struct bdiff_line *a, int an, struct bdiff_line *b, int bn, struct bdiff_hunk *base); void bdiff_freehunks(struct bdiff_hunk *l); void free(void*); """) if __name__ == '__main__': ffi.compile()