diff: add option to show whole functions as context
[git/git.git] / xdiff / xdiff.h
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
27 extern "C" {
28 #endif /* #ifdef __cplusplus */
29
30
31 #define XDF_NEED_MINIMAL (1 << 1)
32 #define XDF_IGNORE_WHITESPACE (1 << 2)
33 #define XDF_IGNORE_WHITESPACE_CHANGE (1 << 3)
34 #define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 4)
35 #define XDF_PATIENCE_DIFF (1 << 5)
36 #define XDF_HISTOGRAM_DIFF (1 << 6)
37 #define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE | XDF_IGNORE_WHITESPACE_AT_EOL)
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
44 #define XDL_EMIT_FUNCNAMES (1 << 0)
45 #define XDL_EMIT_COMMON (1 << 1)
46 #define XDL_EMIT_FUNCCONTEXT (1 << 2)
47
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
56 /* merge simplification levels */
57 #define XDL_MERGE_MINIMAL 0
58 #define XDL_MERGE_EAGER 1
59 #define XDL_MERGE_ZEALOUS 2
60 #define XDL_MERGE_ZEALOUS_ALNUM 3
61
62 /* merge favor modes */
63 #define XDL_MERGE_FAVOR_OURS 1
64 #define XDL_MERGE_FAVOR_THEIRS 2
65 #define XDL_MERGE_FAVOR_UNION 3
66
67 /* merge output styles */
68 #define XDL_MERGE_DIFF3 1
69
70 typedef struct s_mmfile {
71 char *ptr;
72 long size;
73 } mmfile_t;
74
75 typedef struct s_mmbuffer {
76 char *ptr;
77 long size;
78 } mmbuffer_t;
79
80 typedef struct s_xpparam {
81 unsigned long flags;
82 } xpparam_t;
83
84 typedef struct s_xdemitcb {
85 void *priv;
86 int (*outf)(void *, mmbuffer_t *, int);
87 } xdemitcb_t;
88
89 typedef long (*find_func_t)(const char *line, long line_len, char *buffer, long buffer_size, void *priv);
90
91 typedef struct s_xdemitconf {
92 long ctxlen;
93 long interhunkctxlen;
94 unsigned long flags;
95 find_func_t find_func;
96 void *find_func_priv;
97 void (*emit_func)();
98 } xdemitconf_t;
99
100 typedef 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
109 void *xdl_mmfile_first(mmfile_t *mmf, long *size);
110 long xdl_mmfile_size(mmfile_t *mmf);
111
112 int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
113 xdemitconf_t const *xecfg, xdemitcb_t *ecb);
114
115 typedef struct s_xmparam {
116 xpparam_t xpp;
117 int marker_size;
118 int level;
119 int favor;
120 int style;
121 const char *ancestor; /* label for orig */
122 const char *file1; /* label for mf1 */
123 const char *file2; /* label for mf2 */
124 } xmparam_t;
125
126 #define DEFAULT_CONFLICT_MARKER_SIZE 7
127
128 int xdl_merge(mmfile_t *orig, mmfile_t *mf1, mmfile_t *mf2,
129 xmparam_t const *xmp, mmbuffer_t *result);
130
131 #ifdef __cplusplus
132 }
133 #endif /* #ifdef __cplusplus */
134
135 #endif /* #if !defined(XDIFF_H) */