diff: add option to show whole functions as context
[git/git.git] / xdiff / xdiff.h
CommitLineData
3443546f
LT
1/*
2 * LibXDiff by Davide Libenzi ( File Differential Library )
3 * Copyright (C) 2003 Davide Libenzi
4 *
5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Lesser General Public
7 * License as published by the Free Software Foundation; either
8 * version 2.1 of the License, or (at your option) any later version.
9 *
10 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Lesser General Public License for more details.
14 *
15 * You should have received a copy of the GNU Lesser General Public
16 * License along with this library; if not, write to the Free Software
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18 *
19 * Davide Libenzi <davidel@xmailserver.org>
20 *
21 */
22
23#if !defined(XDIFF_H)
24#define XDIFF_H
25
26#ifdef __cplusplus
27extern "C" {
28#endif /* #ifdef __cplusplus */
29
30
31#define XDF_NEED_MINIMAL (1 << 1)
0d21efa5
JS
32#define XDF_IGNORE_WHITESPACE (1 << 2)
33#define XDF_IGNORE_WHITESPACE_CHANGE (1 << 3)
859f9c45 34#define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 4)
92b7de93 35#define XDF_PATIENCE_DIFF (1 << 5)
8c912eea 36#define XDF_HISTOGRAM_DIFF (1 << 6)
859f9c45 37#define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE | XDF_IGNORE_WHITESPACE_AT_EOL)
3443546f
LT
38
39#define XDL_PATCH_NORMAL '-'
40#define XDL_PATCH_REVERSE '+'
41#define XDL_PATCH_MODEMASK ((1 << 8) - 1)
42#define XDL_PATCH_IGNOREBSPACE (1 << 8)
43
acb72577 44#define XDL_EMIT_FUNCNAMES (1 << 0)
a9ed376b 45#define XDL_EMIT_COMMON (1 << 1)
14937c2c 46#define XDL_EMIT_FUNCCONTEXT (1 << 2)
acb72577 47
3443546f
LT
48#define XDL_MMB_READONLY (1 << 0)
49
50#define XDL_MMF_ATOMIC (1 << 0)
51
52#define XDL_BDOP_INS 1
53#define XDL_BDOP_CPY 2
54#define XDL_BDOP_INSB 3
55
e0af48e4 56/* merge simplification levels */
857b933e
JS
57#define XDL_MERGE_MINIMAL 0
58#define XDL_MERGE_EAGER 1
59#define XDL_MERGE_ZEALOUS 2
ee95ec5d 60#define XDL_MERGE_ZEALOUS_ALNUM 3
e0af48e4 61
73eb40ee
JH
62/* merge favor modes */
63#define XDL_MERGE_FAVOR_OURS 1
64#define XDL_MERGE_FAVOR_THEIRS 2
cd1d61c4 65#define XDL_MERGE_FAVOR_UNION 3
73eb40ee 66
e0af48e4 67/* merge output styles */
560119b9 68#define XDL_MERGE_DIFF3 1
3443546f
LT
69
70typedef struct s_mmfile {
71 char *ptr;
72 long size;
73} mmfile_t;
74
75typedef struct s_mmbuffer {
76 char *ptr;
77 long size;
78} mmbuffer_t;
79
80typedef struct s_xpparam {
81 unsigned long flags;
82} xpparam_t;
83
84typedef struct s_xdemitcb {
85 void *priv;
86 int (*outf)(void *, mmbuffer_t *, int);
87} xdemitcb_t;
88
f258475a
JH
89typedef long (*find_func_t)(const char *line, long line_len, char *buffer, long buffer_size, void *priv);
90
3443546f
LT
91typedef struct s_xdemitconf {
92 long ctxlen;
6d0e674a 93 long interhunkctxlen;
acb72577 94 unsigned long flags;
f258475a
JH
95 find_func_t find_func;
96 void *find_func_priv;
ef2e62fe 97 void (*emit_func)();
3443546f
LT
98} xdemitconf_t;
99
100typedef struct s_bdiffparam {
101 long bsize;
102} bdiffparam_t;
103
104
105#define xdl_malloc(x) malloc(x)
106#define xdl_free(ptr) free(ptr)
107#define xdl_realloc(ptr,x) realloc(ptr,x)
108
109void *xdl_mmfile_first(mmfile_t *mmf, long *size);
3443546f
LT
110long xdl_mmfile_size(mmfile_t *mmf);
111
112int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
113 xdemitconf_t const *xecfg, xdemitcb_t *ecb);
114
00f8f97d
JH
115typedef struct s_xmparam {
116 xpparam_t xpp;
9914cf46 117 int marker_size;
560119b9
BW
118 int level;
119 int favor;
120 int style;
8a161433 121 const char *ancestor; /* label for orig */
a4b5e91c
JN
122 const char *file1; /* label for mf1 */
123 const char *file2; /* label for mf2 */
00f8f97d
JH
124} xmparam_t;
125
9914cf46
JH
126#define DEFAULT_CONFLICT_MARKER_SIZE 7
127
a4b5e91c 128int xdl_merge(mmfile_t *orig, mmfile_t *mf1, mmfile_t *mf2,
560119b9 129 xmparam_t const *xmp, mmbuffer_t *result);
857b933e 130
3443546f
LT
131#ifdef __cplusplus
132}
133#endif /* #ifdef __cplusplus */
134
135#endif /* #if !defined(XDIFF_H) */