blob: eff7762ee1a1bb0ea648c60a07389e22e9a1ac07 [file] [log] [blame]
Junio C Hamanod9ea73e2006-04-05 02:03:58 -07001#ifndef XDIFF_INTERFACE_H
2#define XDIFF_INTERFACE_H
3
4#include "xdiff/xdiff.h"
Junio C Hamanod9ea73e2006-04-05 02:03:58 -07005
6typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long);
7
Junio C Hamanoc279d7e2007-12-13 13:25:07 -08008int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb);
Brian Downingc99db9d22008-08-14 00:36:50 -05009int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
Junio C Hamano8a3f5242008-08-13 23:18:22 -070010 xdiff_emit_consume_fn fn, void *consume_callback_data,
René Scharfedfea7902010-05-04 22:41:34 +020011 xpparam_t const *xpp, xdemitconf_t const *xecfg);
Junio C Hamanoc1e335a2006-04-05 12:22:35 -070012int parse_hunk_header(char *line, int len,
Junio C Hamanoa0fd3142006-04-06 22:29:55 -070013 int *ob, int *on,
14 int *nb, int *nn);
Johannes Schindelin7cab5882006-12-20 17:37:07 +010015int read_mmfile(mmfile_t *ptr, const char *filename);
Michael Lukashov06b65932010-02-16 23:42:55 +000016void read_mmblob(mmfile_t *ptr, const unsigned char *sha1);
Johannes Schindelin6bfce932007-06-05 03:36:11 +010017int buffer_is_binary(const char *ptr, unsigned long size);
Junio C Hamanod9ea73e2006-04-05 02:03:58 -070018
Brandon Caseya0135852008-09-18 17:42:48 -050019extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);
René Scharfe8cfe5f12009-07-02 00:01:43 +020020extern void xdiff_clear_find_func(xdemitconf_t *xecfg);
Junio C Hamanob5412482008-08-29 10:49:56 -070021extern int git_xmerge_config(const char *var, const char *value, void *cb);
22extern int git_xmerge_style;
Junio C Hamanof2584752007-07-06 00:45:10 -070023
Junio C Hamanod9ea73e2006-04-05 02:03:58 -070024#endif