Mercurial > hg
view mercurial/cffi/mpatchbuild.py @ 45275:8e8d513941b4
merge: introduce 'commitinfo' in mergeresult
commitinfo will be used to pass information which is required on commit phase
from the merge phase.
One common example is, merge chooses filenode from second parent and we need to
tell commit to choose that. Right now this one and related cases are not very
neatly implement and there is no clear line on how to pass on such information.
Upcoming patches will try to work on in this area and make things easier.
Differential Revision: https://phab.mercurial-scm.org/D8742
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Tue, 14 Jul 2020 16:21:08 +0530 |
parents | 53607fd3ec6c |
children | 6000f5b25c9b |
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') ) with open(mpatch_c) as f: ffi.set_source( "mercurial.cffi._mpatch", f.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()