]> git.ipfire.org Git - thirdparty/git.git/blame - xdiff-interface.h
Sync with 2.16.6
[thirdparty/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
d9ea73e0
JH
14typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long);
15
c279d7e9 16int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb);
c99db9d2 17int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
8a3f524b 18 xdiff_emit_consume_fn fn, void *consume_callback_data,
dfea7900 19 xpparam_t const *xpp, xdemitconf_t const *xecfg);
c1e335a4 20int parse_hunk_header(char *line, int len,
a0fd3146
JH
21 int *ob, int *on,
22 int *nb, int *nn);
7cab5883 23int read_mmfile(mmfile_t *ptr, const char *filename);
d449347d 24void read_mmblob(mmfile_t *ptr, const struct object_id *oid);
6bfce93e 25int buffer_is_binary(const char *ptr, unsigned long size);
d9ea73e0 26
a013585b 27extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);
8cfe5f1c 28extern void xdiff_clear_find_func(xdemitconf_t *xecfg);
b5412484
JH
29extern int git_xmerge_config(const char *var, const char *value, void *cb);
30extern int git_xmerge_style;
f258475a 31
5ec8274b
SB
32/*
33 * Compare the strings l1 with l2 which are of size s1 and s2 respectively.
34 * Returns 1 if the strings are deemed equal, 0 otherwise.
35 * The `flags` given as XDF_WHITESPACE_FLAGS determine how white spaces
36 * are treated for the comparision.
37 */
38extern int xdiff_compare_lines(const char *l1, long s1,
39 const char *l2, long s2, long flags);
40
41/*
42 * Returns a hash of the string s of length len.
43 * The `flags` given as XDF_WHITESPACE_FLAGS determine how white spaces
44 * are treated for the hash.
45 */
46extern unsigned long xdiff_hash_string(const char *s, size_t len, long flags);
47
d9ea73e0 48#endif