diff options
Diffstat (limited to 'xdiff-interface.h')
-rw-r--r-- | xdiff-interface.h | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/xdiff-interface.h b/xdiff-interface.h new file mode 100644 index 000000000000..ede4246bbd33 --- /dev/null +++ b/xdiff-interface.h @@ -0,0 +1,59 @@ +#ifndef XDIFF_INTERFACE_H +#define XDIFF_INTERFACE_H + +#include "cache.h" +#include "xdiff/xdiff.h" + +/* + * xdiff isn't equipped to handle content over a gigabyte; + * we make the cutoff 1GB - 1MB to give some breathing + * room for constant-sized additions (e.g., merge markers) + */ +#define MAX_XDIFF_SIZE (1024UL * 1024 * 1023) + +typedef void (*xdiff_emit_line_fn)(void *, char *, unsigned long); +typedef void (*xdiff_emit_hunk_fn)(void *data, + long old_begin, long old_nr, + long new_begin, long new_nr, + const char *func, long funclen); + +int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb); +int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2, + xdiff_emit_hunk_fn hunk_fn, + xdiff_emit_line_fn line_fn, + void *consume_callback_data, + xpparam_t const *xpp, xdemitconf_t const *xecfg); +int read_mmfile(mmfile_t *ptr, const char *filename); +void read_mmblob(mmfile_t *ptr, const struct object_id *oid); +int buffer_is_binary(const char *ptr, unsigned long size); + +void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags); +void xdiff_clear_find_func(xdemitconf_t *xecfg); +int git_xmerge_config(const char *var, const char *value, void *cb); +extern int git_xmerge_style; + +/* + * Can be used as a no-op hunk_fn for xdi_diff_outf(), since a NULL + * one just sends the hunk line to the line_fn callback). + */ +void discard_hunk_line(void *priv, + long ob, long on, long nb, long nn, + const char *func, long funclen); + +/* + * Compare the strings l1 with l2 which are of size s1 and s2 respectively. + * Returns 1 if the strings are deemed equal, 0 otherwise. + * The `flags` given as XDF_WHITESPACE_FLAGS determine how white spaces + * are treated for the comparision. + */ +int xdiff_compare_lines(const char *l1, long s1, + const char *l2, long s2, long flags); + +/* + * Returns a hash of the string s of length len. + * The `flags` given as XDF_WHITESPACE_FLAGS determine how white spaces + * are treated for the hash. + */ +unsigned long xdiff_hash_string(const char *s, size_t len, long flags); + +#endif |