Mercurial > hg
view mercurial/cffi/bdiffbuild.py @ 45524:6877b0ee5f9d
mergestate: introduce a new ACTION_KEEP_NEW
`ACTION_KEEP` is overloaded and it's hard to figure out how we end up with this
KEEP, what was the state of things.
In a previous patch, we introduced `ACTION_KEEP_ABSENT` which represents files
which are kept absent in the working directory.
There is another special case where we keep the file when it's not present on
both ancestor and remote side. We introduce a dedicated action for that.
The goal is to use these information to make bid merge smarter.
Differential Revision: https://phab.mercurial-scm.org/D9002
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Wed, 09 Sep 2020 16:49:19 +0530 |
parents | 53607fd3ec6c |
children | 6000f5b25c9b |
line wrap: on
line source
from __future__ import absolute_import import cffi import os ffi = cffi.FFI() with open( os.path.join(os.path.join(os.path.dirname(__file__), '..'), 'bdiff.c') ) as f: ffi.set_source( "mercurial.cffi._bdiff", f.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()