Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Newer
Older
100644 29 lines (23 sloc) 1.139 kb
d9ea73e0 »
2006-04-05 combine-diff: refactor built-in xdiff interface.
1 #ifndef XDIFF_INTERFACE_H
2 #define XDIFF_INTERFACE_H
3
4 #include "xdiff/xdiff.h"
5
6 typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long);
86295bb6 »
2008-10-25 add xdi_diff_hunks() for callers that only need hunk lengths
7 typedef void (*xdiff_emit_hunk_consume_fn)(void *, long, long, long);
d9ea73e0 »
2006-04-05 combine-diff: refactor built-in xdiff interface.
8
c279d7e9 »
2007-12-13 xdl_diff: identify call sites.
9 int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb);
c99db9d2 »
2008-08-14 Make xdi_diff_outf interface for running xdiff_outf diffs
10 int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
8a3f524b »
2008-08-13 xdiff-interface: hide the whole "xdiff_emit_state" business from the …
11 xdiff_emit_consume_fn fn, void *consume_callback_data,
12 xpparam_t const *xpp,
c99db9d2 »
2008-08-14 Make xdi_diff_outf interface for running xdiff_outf diffs
13 xdemitconf_t const *xecfg, xdemitcb_t *xecb);
86295bb6 »
2008-10-25 add xdi_diff_hunks() for callers that only need hunk lengths
14 int xdi_diff_hunks(mmfile_t *mf1, mmfile_t *mf2,
15 xdiff_emit_hunk_consume_fn fn, void *consume_callback_data,
16 xpparam_t const *xpp, xdemitconf_t *xecfg);
c1e335a4 »
2006-04-05 combine-diff: move the code to parse hunk-header into common library.
17 int parse_hunk_header(char *line, int len,
a0fd3146 »
2006-04-06 Match ofs/cnt types in diff interface.
18 int *ob, int *on,
19 int *nb, int *nn);
7cab5883 »
2006-12-20 move read_mmfile() into xdiff-interface
20 int read_mmfile(mmfile_t *ptr, const char *filename);
6bfce93e »
2007-06-05 Move buffer_is_binary() to xdiff-interface.h
21 int buffer_is_binary(const char *ptr, unsigned long size);
d9ea73e0 »
2006-04-05 combine-diff: refactor built-in xdiff interface.
22
a013585b »
2008-09-18 diff.c: associate a flag with each pattern and use it for compiling r…
23 extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);
8cfe5f1c »
2009-07-02 userdiff: add xdiff_clear_find_func()
24 extern void xdiff_clear_find_func(xdemitconf_t *xecfg);
b5412484 »
2008-08-29 merge.conflictstyle: choose between "merge" and "diff3 -m" styles
25 extern int git_xmerge_config(const char *var, const char *value, void *cb);
26 extern int git_xmerge_style;
f258475a »
2007-07-06 Per-path attribute based hunk header selection.
27
d9ea73e0 »
2006-04-05 combine-diff: refactor built-in xdiff interface.
28 #endif
Something went wrong with that request. Please try again.