Mercurial > hg
view setup_mpatch_cffi.py @ 30195:88626de195f8
copies: make _checkcopies handle simple renames in a rotated DAG
This introduces a distinction between "merge base" and
"topological common ancestor". During a regular merge, these two are
identical. Graft, however, performs a merge in a rotated DAG, where the
merge base will not be a common ancestor at all in the
original DAG.
To correctly find copies in case of a graft, we need to take both the
merge base and the topological CA into account, and track any renames
between them in reverse. Fortunately we can detect this in advance,
see comment in the code about "backwards".
This patch only supports finding non-divergent renames contained entirely
between the merge base and the topological CA. Further patches are coming
to support more complex cases.
(Pierre-Yves David was involved in the cleanup of this patch.)
author | Gábor Stefanik <gabor.stefanik@nng.com> |
---|---|
date | Thu, 13 Oct 2016 02:03:54 +0200 |
parents | 90af59b40d8a |
children |
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__), 'mercurial', '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()