|
|
|
|
#ifndef XDIFF_INTERFACE_H
|
|
|
|
|
#define XDIFF_INTERFACE_H
|
|
|
|
|
|
|
|
|
|
#include "xdiff/xdiff.h"
|
|
|
|
|
|
|
|
|
|
typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long);
|
|
|
|
|
typedef void (*xdiff_emit_hunk_consume_fn)(void *, long, long, long);
|
|
|
|
|
|
|
|
|
|
int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb);
|
Make xdi_diff_outf interface for running xdiff_outf diffs
To prepare for the need to initialize and release resources for an
xdi_diff with the xdiff_outf output function, make a new function to
wrap this usage.
Old:
ecb.outf = xdiff_outf;
ecb.priv = &state;
...
xdi_diff(file_p, file_o, &xpp, &xecfg, &ecb);
New:
xdi_diff_outf(file_p, file_o, &state.xm, &xpp, &xecfg, &ecb);
Signed-off-by: Brian Downing <bdowning@lavos.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years ago
|
|
|
int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
|
|
|
|
|
xdiff_emit_consume_fn fn, void *consume_callback_data,
|
|
|
|
|
xpparam_t const *xpp,
|
Make xdi_diff_outf interface for running xdiff_outf diffs
To prepare for the need to initialize and release resources for an
xdi_diff with the xdiff_outf output function, make a new function to
wrap this usage.
Old:
ecb.outf = xdiff_outf;
ecb.priv = &state;
...
xdi_diff(file_p, file_o, &xpp, &xecfg, &ecb);
New:
xdi_diff_outf(file_p, file_o, &state.xm, &xpp, &xecfg, &ecb);
Signed-off-by: Brian Downing <bdowning@lavos.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years ago
|
|
|
xdemitconf_t const *xecfg, xdemitcb_t *xecb);
|
|
|
|
|
int xdi_diff_hunks(mmfile_t *mf1, mmfile_t *mf2,
|
|
|
|
|
xdiff_emit_hunk_consume_fn fn, void *consume_callback_data,
|
|
|
|
|
xpparam_t const *xpp, xdemitconf_t *xecfg);
|
|
|
|
|
int parse_hunk_header(char *line, int len,
|
|
|
|
|
int *ob, int *on,
|
|
|
|
|
int *nb, int *nn);
|
|
|
|
|
int read_mmfile(mmfile_t *ptr, const char *filename);
|
|
|
|
|
int buffer_is_binary(const char *ptr, unsigned long size);
|
|
|
|
|
|
|
|
|
|
extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);
|
|
|
|
|
extern int git_xmerge_config(const char *var, const char *value, void *cb);
|
|
|
|
|
extern int git_xmerge_style;
|
|
|
|
|
|
|
|
|
|
#endif
|
