]>
Commit | Line | Data |
---|---|---|
d9ea73e0 JH |
1 | #ifndef XDIFF_INTERFACE_H |
2 | #define XDIFF_INTERFACE_H | |
3 | ||
4 | #include "xdiff/xdiff.h" | |
d9ea73e0 | 5 | |
dcd1742e JK |
6 | /* |
7 | * xdiff isn't equipped to handle content over a gigabyte; | |
8 | * we make the cutoff 1GB - 1MB to give some breathing | |
9 | * room for constant-sized additions (e.g., merge markers) | |
10 | */ | |
11 | #define MAX_XDIFF_SIZE (1024UL * 1024 * 1023) | |
12 | ||
d9ea73e0 JH |
13 | typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long); |
14 | ||
c279d7e9 | 15 | int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb); |
c99db9d2 | 16 | int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2, |
8a3f524b | 17 | xdiff_emit_consume_fn fn, void *consume_callback_data, |
dfea7900 | 18 | xpparam_t const *xpp, xdemitconf_t const *xecfg); |
c1e335a4 | 19 | int parse_hunk_header(char *line, int len, |
a0fd3146 JH |
20 | int *ob, int *on, |
21 | int *nb, int *nn); | |
7cab5883 | 22 | int read_mmfile(mmfile_t *ptr, const char *filename); |
06b65939 | 23 | void read_mmblob(mmfile_t *ptr, const unsigned char *sha1); |
6bfce93e | 24 | int buffer_is_binary(const char *ptr, unsigned long size); |
d9ea73e0 | 25 | |
a013585b | 26 | extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags); |
8cfe5f1c | 27 | extern void xdiff_clear_find_func(xdemitconf_t *xecfg); |
b5412484 JH |
28 | extern int git_xmerge_config(const char *var, const char *value, void *cb); |
29 | extern int git_xmerge_style; | |
f258475a | 30 | |
d9ea73e0 | 31 | #endif |