mirrors/git - Incest Forge: Beyond sex. We incest.

mirrors/git

mirror of https://github.com/git/git.git synced 2024-11-09 02:33:11 +01:00

27 lines

742 B

C

Raw Normal View History

combine-diff: refactor built-in xdiff interface. This refactors the line-by-line callback mechanism used in combine-diff so that other programs can reuse it more easily. Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-04-05 11:03:58 +02:00			`#ifndef XDIFF_INTERFACE_H`
			`#define XDIFF_INTERFACE_H`

			`#include "xdiff/xdiff.h"`

			`struct xdiff_emit_state;`

			`typedef void (xdiff_emit_consume_fn)(void , char *, unsigned long);`

			`struct xdiff_emit_state {`
			`xdiff_emit_consume_fn consume;`
			`char *remainder;`
			`unsigned long remainder_size;`
			`};`

xdl_diff: identify call sites. This inserts a new function xdi_diff() that currently does not do anything other than calling the underlying xdl_diff() to the callchain of current callers of xdl_diff() function. Signed-off-by: Junio C Hamano <gitster@pobox.com> 2007-12-13 22:25:07 +01:00			`int xdi_diff(mmfile_t mf1, mmfile_t mf2, xpparam_t const xpp, xdemitconf_t const xecfg, xdemitcb_t *ecb);`
combine-diff: refactor built-in xdiff interface. This refactors the line-by-line callback mechanism used in combine-diff so that other programs can reuse it more easily. Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-04-05 11:03:58 +02:00			`int xdiff_outf(void priv_, mmbuffer_t mb, int nbuf);`
combine-diff: move the code to parse hunk-header into common library. Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-04-05 21:22:35 +02:00			`int parse_hunk_header(char *line, int len,`
Match ofs/cnt types in diff interface. Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-04-07 07:29:55 +02:00			`int ob, int on,`
			`int nb, int nn);`
move read_mmfile() into xdiff-interface read_file() was a useful function if you want to work with the xdiff stuff, so it was renamed and put into a more central place. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-12-20 17:37:07 +01:00			`int read_mmfile(mmfile_t ptr, const char filename);`
Move buffer_is_binary() to xdiff-interface.h We already have two instances where we want to determine if a buffer contains binary data as opposed to text. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2007-06-05 04:36:11 +02:00			`int buffer_is_binary(const char *ptr, unsigned long size);`
combine-diff: refactor built-in xdiff interface. This refactors the line-by-line callback mechanism used in combine-diff so that other programs can reuse it more easily. Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-04-05 11:03:58 +02:00
Per-path attribute based hunk header selection. This makes"diff -p" hunk headers customizable via gitattributes mechanism. It is based on Johannes's earlier patch that allowed to define a single regexp to be used for everything. The mechanism to arrive at the regexp that is used to define hunk header is the same as other use of gitattributes. You assign an attribute, funcname (because "diff -p" typically uses the name of the function the patch is about as the hunk header), a simple string value. This can be one of the names of built-in pattern (currently, "java" is defined) or a custom pattern name, to be looked up from the configuration file. (in .gitattributes) .java funcname=java .perl funcname=perl (in .git/config) [funcname] java = ... # ugly and complicated regexp to override the built-in one. perl = ... # another ugly and complicated regexp to define a new one. Signed-off-by: Junio C Hamano <gitster@pobox.com> 2007-07-06 09:45:10 +02:00			`extern void xdiff_set_find_func(xdemitconf_t xecfg, const char line);`

combine-diff: refactor built-in xdiff interface. This refactors the line-by-line callback mechanism used in combine-diff so that other programs can reuse it more easily. Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-04-05 11:03:58 +02:00			`#endif`