xdiff-interface: provide a separate consume callback for hunks
[git/git.git] / xdiff-interface.h
CommitLineData
d9ea73e0
JH
1#ifndef XDIFF_INTERFACE_H
2#define XDIFF_INTERFACE_H
3
d449347d 4#include "cache.h"
d9ea73e0 5#include "xdiff/xdiff.h"
d9ea73e0 6
dcd1742e
JK
7/*
8 * xdiff isn't equipped to handle content over a gigabyte;
9 * we make the cutoff 1GB - 1MB to give some breathing
10 * room for constant-sized additions (e.g., merge markers)
11 */
12#define MAX_XDIFF_SIZE (1024UL * 1024 * 1023)
13
9346d6d1
JK
14typedef void (*xdiff_emit_line_fn)(void *, char *, unsigned long);
15typedef void (*xdiff_emit_hunk_fn)(void *data,
16 long old_begin, long old_nr,
17 long new_begin, long new_nr,
18 const char *func, long funclen);
d9ea73e0 19
c279d7e9 20int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb);
c99db9d2 21int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
9346d6d1
JK
22 xdiff_emit_hunk_fn hunk_fn,
23 xdiff_emit_line_fn line_fn,
24 void *consume_callback_data,
dfea7900 25 xpparam_t const *xpp, xdemitconf_t const *xecfg);
c1e335a4 26int parse_hunk_header(char *line, int len,
a0fd3146
JH
27 int *ob, int *on,
28 int *nb, int *nn);
7cab5883 29int read_mmfile(mmfile_t *ptr, const char *filename);
d449347d 30void read_mmblob(mmfile_t *ptr, const struct object_id *oid);
6bfce93e 31int buffer_is_binary(const char *ptr, unsigned long size);
d9ea73e0 32
a013585b 33extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);
8cfe5f1c 34extern void xdiff_clear_find_func(xdemitconf_t *xecfg);
b5412484
JH
35extern int git_xmerge_config(const char *var, const char *value, void *cb);
36extern int git_xmerge_style;
f258475a 37
5ec8274b
SB
38/*
39 * Compare the strings l1 with l2 which are of size s1 and s2 respectively.
40 * Returns 1 if the strings are deemed equal, 0 otherwise.
41 * The `flags` given as XDF_WHITESPACE_FLAGS determine how white spaces
42 * are treated for the comparision.
43 */
44extern int xdiff_compare_lines(const char *l1, long s1,
45 const char *l2, long s2, long flags);
46
47/*
48 * Returns a hash of the string s of length len.
49 * The `flags` given as XDF_WHITESPACE_FLAGS determine how white spaces
50 * are treated for the hash.
51 */
52extern unsigned long xdiff_hash_string(const char *s, size_t len, long flags);
53
d9ea73e0 54#endif