##// END OF EJS Templates
test: also deactivate `ui.merge` when testing merge tool...
test: also deactivate `ui.merge` when testing merge tool We are about to introduce a default config for `ui.merge`. Since `test-merge-tools.t` is about testing merge configuration, we need to make sure it won't interfere.

File last commit:

r32506:2dcb3d52 default
r40501:1736450c default
Show More
bdiffbuild.py
32 lines | 773 B | text/x-python | PythonLexer
Yuya Nishihara
cffi: rename build scripts...
r32505 from __future__ import absolute_import
import cffi
import os
ffi = cffi.FFI()
Augie Fackler
cleanup: fix some latent open(path).read() et al calls we previously missed...
r36966 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'])
Yuya Nishihara
cffi: rename build scripts...
r32505 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()