Mercurial > hg
view mercurial/cffi/mpatch.py @ 32253:7d4ce4b567c5
filemerge: show warning about choice of :prompt only at an actual fallback
Before this patch, internal merge tool :prompt shows "no tool found to
merge FILE" line, even if :prompt is explicitly specified as a tool to
be used.
This patch shows warning message about choice of :prompt only at an
actual fallback, in which case any tool is rejected by capability for
binary or symlink.
It is for backward compatibility to omit warning message in
"changedelete" case.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sat, 13 May 2017 03:28:36 +0900 |
parents | 9cc438bf7d9a |
children | 857876ebaed4 |
line wrap: on
line source
from __future__ import absolute_import import cffi import os ffi = cffi.FFI() mpatch_c = os.path.join(os.path.join(os.path.dirname(__file__), '..', 'mpatch.c')) ffi.set_source("_mpatch_cffi", open(mpatch_c).read(), include_dirs=["mercurial"]) ffi.cdef(""" struct mpatch_frag { int start, end, len; const char *data; }; struct mpatch_flist { struct mpatch_frag *base, *head, *tail; }; extern "Python" struct mpatch_flist* cffi_get_next_item(void*, ssize_t); int mpatch_decode(const char *bin, ssize_t len, struct mpatch_flist** res); ssize_t mpatch_calcsize(size_t len, struct mpatch_flist *l); void mpatch_lfree(struct mpatch_flist *a); static int mpatch_apply(char *buf, const char *orig, size_t len, struct mpatch_flist *l); struct mpatch_flist *mpatch_fold(void *bins, struct mpatch_flist* (*get_next_item)(void*, ssize_t), ssize_t start, ssize_t end); """) if __name__ == '__main__': ffi.compile()