Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Newer
Older
100644 29 lines (23 sloc) 1.177 kb
d9ea73e combine-diff: refactor built-in xdiff interface.
Junio C Hamano authored
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);
86295bb add xdi_diff_hunks() for callers that only need hunk lengths
René Scharfe authored
7 typedef void (*xdiff_emit_hunk_consume_fn)(void *, long, long, long);
d9ea73e combine-diff: refactor built-in xdiff interface.
Junio C Hamano authored
8
c279d7e @gitster xdl_diff: identify call sites.
gitster authored
9 int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb);
c99db9d @bdowning Make xdi_diff_outf interface for running xdiff_outf diffs
bdowning authored
10 int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
8a3f524 @gitster xdiff-interface: hide the whole "xdiff_emit_state" business from the cal...
gitster authored
11 xdiff_emit_consume_fn fn, void *consume_callback_data,
dfea790 remove ecb parameter from xdi_diff_outf()
René Scharfe authored
12 xpparam_t const *xpp, xdemitconf_t const *xecfg);
86295bb add xdi_diff_hunks() for callers that only need hunk lengths
René Scharfe authored
13 int 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);
c1e335a combine-diff: move the code to parse hunk-header into common library.
Junio C Hamano authored
16 int parse_hunk_header(char *line, int len,
a0fd314 Match ofs/cnt types in diff interface.
Junio C Hamano authored
17 int *ob, int *on,
18 int *nb, int *nn);
7cab588 @dscho move read_mmfile() into xdiff-interface
dscho authored
19 int read_mmfile(mmfile_t *ptr, const char *filename);
06b6593 @michaellukashov refactor duplicated fill_mm() in checkout and merge-recursive
michaellukashov authored
20 void read_mmblob(mmfile_t *ptr, const unsigned char *sha1);
6bfce93 @dscho Move buffer_is_binary() to xdiff-interface.h
dscho authored
21 int buffer_is_binary(const char *ptr, unsigned long size);
d9ea73e combine-diff: refactor built-in xdiff interface.
Junio C Hamano authored
22
a013585 diff.c: associate a flag with each pattern and use it for compiling rege...
Brandon Casey authored
23 extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);
8cfe5f1 userdiff: add xdiff_clear_find_func()
René Scharfe authored
24 extern void xdiff_clear_find_func(xdemitconf_t *xecfg);
b541248 @gitster merge.conflictstyle: choose between "merge" and "diff3 -m" styles
gitster authored
25 extern int git_xmerge_config(const char *var, const char *value, void *cb);
26 extern int git_xmerge_style;
f258475 @gitster Per-path attribute based hunk header selection.
gitster authored
27
d9ea73e combine-diff: refactor built-in xdiff interface.
Junio C Hamano authored
28 #endif
Something went wrong with that request. Please try again.