Mercurial > hg
view setup_bdiff_cffi.py @ 30007:aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
There are two reasons that rebase should be done this way:
1. This would make rebasing faster because it would minimize the total
number of files to be checked out in the process, as it don't need
to switch back and forth between branches.
2. It makes resolving conflicts easier as user has a better context.
This commit changes the behavior in "Test multiple root handling" of
test-rebase-obsolete.t. It is an expected change which reflects the new
behavior that commits in a branch are grouped together when rebased.
author | Xidorn Quan <me@upsuper.org> |
---|---|
date | Sat, 17 Sep 2016 17:02:56 +1000 |
parents | a8933d992a71 |
children |
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__), 'mercurial'), '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()