]>
Commit | Line | Data |
---|---|---|
3a5ad90a RB |
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 | |
eae0bfdc PP |
16 | * License along with this library; if not, see |
17 | * <http://www.gnu.org/licenses/>. | |
3a5ad90a RB |
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 | ||
e579e0f7 MB |
30 | #include "git-xdiff.h" |
31 | ||
eae0bfdc PP |
32 | /* xpparm_t.flags */ |
33 | #define XDF_NEED_MINIMAL (1 << 0) | |
34 | ||
35 | #define XDF_IGNORE_WHITESPACE (1 << 1) | |
36 | #define XDF_IGNORE_WHITESPACE_CHANGE (1 << 2) | |
37 | #define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 3) | |
38 | #define XDF_IGNORE_CR_AT_EOL (1 << 4) | |
39 | #define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | \ | |
40 | XDF_IGNORE_WHITESPACE_CHANGE | \ | |
41 | XDF_IGNORE_WHITESPACE_AT_EOL | \ | |
42 | XDF_IGNORE_CR_AT_EOL) | |
3a5ad90a | 43 | |
eae0bfdc | 44 | #define XDF_IGNORE_BLANK_LINES (1 << 7) |
234ca40a | 45 | |
eae0bfdc PP |
46 | #define XDF_PATIENCE_DIFF (1 << 14) |
47 | #define XDF_HISTOGRAM_DIFF (1 << 15) | |
234ca40a ET |
48 | #define XDF_DIFF_ALGORITHM_MASK (XDF_PATIENCE_DIFF | XDF_HISTOGRAM_DIFF) |
49 | #define XDF_DIFF_ALG(x) ((x) & XDF_DIFF_ALGORITHM_MASK) | |
3a5ad90a | 50 | |
eae0bfdc | 51 | #define XDF_INDENT_HEURISTIC (1 << 23) |
3a5ad90a | 52 | |
eae0bfdc | 53 | /* xdemitconf_t.flags */ |
3a5ad90a | 54 | #define XDL_EMIT_FUNCNAMES (1 << 0) |
e579e0f7 | 55 | #define XDL_EMIT_NO_HUNK_HDR (1 << 1) |
3a5ad90a RB |
56 | #define XDL_EMIT_FUNCCONTEXT (1 << 2) |
57 | ||
3a5ad90a RB |
58 | /* merge simplification levels */ |
59 | #define XDL_MERGE_MINIMAL 0 | |
60 | #define XDL_MERGE_EAGER 1 | |
61 | #define XDL_MERGE_ZEALOUS 2 | |
62 | #define XDL_MERGE_ZEALOUS_ALNUM 3 | |
63 | ||
64 | /* merge favor modes */ | |
65 | #define XDL_MERGE_FAVOR_OURS 1 | |
66 | #define XDL_MERGE_FAVOR_THEIRS 2 | |
67 | #define XDL_MERGE_FAVOR_UNION 3 | |
68 | ||
69 | /* merge output styles */ | |
70 | #define XDL_MERGE_DIFF3 1 | |
e579e0f7 | 71 | #define XDL_MERGE_ZEALOUS_DIFF3 2 |
3a5ad90a RB |
72 | |
73 | typedef struct s_mmfile { | |
74 | char *ptr; | |
e579e0f7 | 75 | long size; |
3a5ad90a RB |
76 | } mmfile_t; |
77 | ||
78 | typedef struct s_mmbuffer { | |
79 | char *ptr; | |
e579e0f7 | 80 | long size; |
3a5ad90a RB |
81 | } mmbuffer_t; |
82 | ||
83 | typedef struct s_xpparam { | |
84 | unsigned long flags; | |
eae0bfdc | 85 | |
e579e0f7 MB |
86 | /* -I<regex> */ |
87 | xdl_regex_t **ignore_regex; | |
88 | size_t ignore_regex_nr; | |
89 | ||
eae0bfdc PP |
90 | /* See Documentation/diff-options.txt. */ |
91 | char **anchors; | |
92 | size_t anchors_nr; | |
3a5ad90a RB |
93 | } xpparam_t; |
94 | ||
95 | typedef struct s_xdemitcb { | |
96 | void *priv; | |
e579e0f7 MB |
97 | int (*out_hunk)(void *, |
98 | long old_begin, long old_nr, | |
99 | long new_begin, long new_nr, | |
100 | const char *func, long funclen); | |
101 | int (*out_line)(void *, mmbuffer_t *, int); | |
3a5ad90a RB |
102 | } xdemitcb_t; |
103 | ||
104 | typedef long (*find_func_t)(const char *line, long line_len, char *buffer, long buffer_size, void *priv); | |
105 | ||
234ca40a ET |
106 | typedef int (*xdl_emit_hunk_consume_func_t)(long start_a, long count_a, |
107 | long start_b, long count_b, | |
108 | void *cb_data); | |
109 | ||
3a5ad90a RB |
110 | typedef struct s_xdemitconf { |
111 | long ctxlen; | |
112 | long interhunkctxlen; | |
113 | unsigned long flags; | |
114 | find_func_t find_func; | |
115 | void *find_func_priv; | |
234ca40a | 116 | xdl_emit_hunk_consume_func_t hunk_func; |
3a5ad90a RB |
117 | } xdemitconf_t; |
118 | ||
119 | typedef struct s_bdiffparam { | |
120 | long bsize; | |
121 | } bdiffparam_t; | |
122 | ||
123 | ||
3a5ad90a RB |
124 | void *xdl_mmfile_first(mmfile_t *mmf, long *size); |
125 | long xdl_mmfile_size(mmfile_t *mmf); | |
126 | ||
127 | int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, | |
128 | xdemitconf_t const *xecfg, xdemitcb_t *ecb); | |
129 | ||
130 | typedef struct s_xmparam { | |
131 | xpparam_t xpp; | |
132 | int marker_size; | |
133 | int level; | |
134 | int favor; | |
135 | int style; | |
136 | const char *ancestor; /* label for orig */ | |
137 | const char *file1; /* label for mf1 */ | |
138 | const char *file2; /* label for mf2 */ | |
139 | } xmparam_t; | |
140 | ||
141 | #define DEFAULT_CONFLICT_MARKER_SIZE 7 | |
142 | ||
143 | int xdl_merge(mmfile_t *orig, mmfile_t *mf1, mmfile_t *mf2, | |
144 | xmparam_t const *xmp, mmbuffer_t *result); | |
145 | ||
146 | #ifdef __cplusplus | |
147 | } | |
148 | #endif /* #ifdef __cplusplus */ | |
149 | ||
150 | #endif /* #if !defined(XDIFF_H) */ |