commit doc: document that -c, -C, -F and --fixup with -m error
[git.git] / xdiff-interface.h
4 #include "cache.h"
5 #include "xdiff/xdiff.h"
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)
12 #define MAX_XDIFF_SIZE (1024UL * 1024 * 1023)
14 typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long);
16 int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb);
17 int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
18 xdiff_emit_consume_fn fn, void *consume_callback_data,
19 xpparam_t const *xpp, xdemitconf_t const *xecfg);
20 int parse_hunk_header(char *line, int len,
21 int *ob, int *on,
22 int *nb, int *nn);
23 int read_mmfile(mmfile_t *ptr, const char *filename);
24 void read_mmblob(mmfile_t *ptr, const struct object_id *oid);
25 int buffer_is_binary(const char *ptr, unsigned long size);
27 extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);
28 extern void xdiff_clear_find_func(xdemitconf_t *xecfg);
29 extern int git_xmerge_config(const char *var, const char *value, void *cb);
30 extern int git_xmerge_style;
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.
38 extern int xdiff_compare_lines(const char *l1, long s1,
39 const char *l2, long s2, long flags);
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.
46 extern unsigned long xdiff_hash_string(const char *s, size_t len, long flags);
48 #endif