]> git.ipfire.org Git - thirdparty/git.git/blame_incremental - xdiff-interface.h
Merge branch 'nd/index-doc' into maint
[thirdparty/git.git] / xdiff-interface.h
... / ...
CommitLineData
1#ifndef XDIFF_INTERFACE_H
2#define XDIFF_INTERFACE_H
3
4#include "xdiff/xdiff.h"
5
6typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long);
7typedef void (*xdiff_emit_hunk_consume_fn)(void *, long, long, long);
8
9int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb);
10int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
11 xdiff_emit_consume_fn fn, void *consume_callback_data,
12 xpparam_t const *xpp, xdemitconf_t const *xecfg);
13int xdi_diff_hunks(mmfile_t *mf1, mmfile_t *mf2,
14 xdiff_emit_hunk_consume_fn fn, void *consume_callback_data,
15 xpparam_t const *xpp, xdemitconf_t *xecfg);
16int parse_hunk_header(char *line, int len,
17 int *ob, int *on,
18 int *nb, int *nn);
19int read_mmfile(mmfile_t *ptr, const char *filename);
20void read_mmblob(mmfile_t *ptr, const unsigned char *sha1);
21int buffer_is_binary(const char *ptr, unsigned long size);
22
23extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);
24extern void xdiff_clear_find_func(xdemitconf_t *xecfg);
25extern int git_xmerge_config(const char *var, const char *value, void *cb);
26extern int git_xmerge_style;
27
28#endif