Mercurial > hg
view mercurial/cffi/bdiffbuild.py @ 44450:7d5455b988ec stable
discovery: avoid wrong detection of multiple branch heads (issue6256)
This fix the code using obsolescence markers to remove "to be obsoleted" heads
during the detection of new head creation from push. The code turned out to not
use the branch information at all. This lead changeset from different branch to
be detected as new head on unrelated branch.
The code fix is actually quite simple. New tests have been added to covers
these cases.
Differential Revision: https://phab.mercurial-scm.org/D8259
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 06 Mar 2020 23:27:28 +0100 |
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()