freshlybakedca.ke
Git fork
1#define USE_THE_REPOSITORY_VARIABLE
2#define DISABLE_SIGN_COMPARE_WARNINGS
3
4#include "git-compat-util.h"
5#include "environment.h"
6#include "gettext.h"
7#include "config.h"
8#include "hex.h"
9#include "odb.h"
10#include "strbuf.h"
11#include "xdiff-interface.h"
12#include "xdiff/xtypes.h"
13#include "xdiff/xdiffi.h"
14#include "xdiff/xutils.h"
15
16struct xdiff_emit_state {
17 xdiff_emit_hunk_fn hunk_fn;
18 xdiff_emit_line_fn line_fn;
19 void *consume_callback_data;
20 struct strbuf remainder;
21};
22
23static int xdiff_out_hunk(void *priv_,
24 long old_begin, long old_nr,
25 long new_begin, long new_nr,
26 const char *func, long funclen)
27{
28 struct xdiff_emit_state *priv = priv_;
29
30 if (priv->remainder.len)
31 BUG("xdiff emitted hunk in the middle of a line");
32
33 priv->hunk_fn(priv->consume_callback_data,
34 old_begin, old_nr, new_begin, new_nr,
35 func, funclen);
36 return 0;
37}
38
39static int consume_one(void *priv_, char *s, unsigned long size)
40{
41 struct xdiff_emit_state *priv = priv_;
42 char *ep;
43 while (size) {
44 unsigned long this_size;
45 int ret;
46 ep = memchr(s, '\n', size);
47 this_size = (ep == NULL) ? size : (ep - s + 1);
48 ret = priv->line_fn(priv->consume_callback_data, s, this_size);
49 if (ret)
50 return ret;
51 size -= this_size;
52 s += this_size;
53 }
54 return 0;
55}
56
57static int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf)
58{
59 struct xdiff_emit_state *priv = priv_;
60 int i;
61 int stop = 0;
62
63 if (!priv->line_fn)
64 return 0;
65
66 for (i = 0; i < nbuf; i++) {
67 if (stop)
68 return 1;
69 if (mb[i].ptr[mb[i].size-1] != '\n') {
70 /* Incomplete line */
71 strbuf_add(&priv->remainder, mb[i].ptr, mb[i].size);
72 continue;
73 }
74
75 /* we have a complete line */
76 if (!priv->remainder.len) {
77 stop = consume_one(priv, mb[i].ptr, mb[i].size);
78 continue;
79 }
80 strbuf_add(&priv->remainder, mb[i].ptr, mb[i].size);
81 stop = consume_one(priv, priv->remainder.buf, priv->remainder.len);
82 strbuf_reset(&priv->remainder);
83 }
84 if (stop)
85 return -1;
86 if (priv->remainder.len) {
87 stop = consume_one(priv, priv->remainder.buf, priv->remainder.len);
88 strbuf_reset(&priv->remainder);
89 }
90 if (stop)
91 return -1;
92 return 0;
93}
94
95/*
96 * Trim down common substring at the end of the buffers,
97 * but end on a complete line.
98 */
99static void trim_common_tail(mmfile_t *a, mmfile_t *b)
100{
101 const int blk = 1024;
102 long trimmed = 0, recovered = 0;
103 char *ap = a->size ? a->ptr + a->size : a->ptr;
104 char *bp = b->size ? b->ptr + b->size : b->ptr;
105 long smaller = (a->size < b->size) ? a->size : b->size;
106
107 while (blk + trimmed <= smaller && !memcmp(ap - blk, bp - blk, blk)) {
108 trimmed += blk;
109 ap -= blk;
110 bp -= blk;
111 }
112
113 while (recovered < trimmed)
114 if (ap[recovered++] == '\n')
115 break;
116 a->size -= trimmed - recovered;
117 b->size -= trimmed - recovered;
118}
119
120int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *xecb)
121{
122 mmfile_t a = *mf1;
123 mmfile_t b = *mf2;
124
125 if (mf1->size > MAX_XDIFF_SIZE || mf2->size > MAX_XDIFF_SIZE)
126 return -1;
127
128 if (!xecfg->ctxlen && !(xecfg->flags & XDL_EMIT_FUNCCONTEXT))
129 trim_common_tail(&a, &b);
130
131 return xdl_diff(&a, &b, xpp, xecfg, xecb);
132}
133
134int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
135 xdiff_emit_hunk_fn hunk_fn,
136 xdiff_emit_line_fn line_fn,
137 void *consume_callback_data,
138 xpparam_t const *xpp, xdemitconf_t const *xecfg)
139{
140 int ret;
141 struct xdiff_emit_state state;
142 xdemitcb_t ecb;
143
144 memset(&state, 0, sizeof(state));
145 state.hunk_fn = hunk_fn;
146 state.line_fn = line_fn;
147 state.consume_callback_data = consume_callback_data;
148 memset(&ecb, 0, sizeof(ecb));
149 if (hunk_fn)
150 ecb.out_hunk = xdiff_out_hunk;
151 ecb.out_line = xdiff_outf;
152 ecb.priv = &state;
153 strbuf_init(&state.remainder, 0);
154 ret = xdi_diff(mf1, mf2, xpp, xecfg, &ecb);
155 strbuf_release(&state.remainder);
156 return ret;
157}
158
159int read_mmfile(mmfile_t *ptr, const char *filename)
160{
161 struct stat st;
162 FILE *f;
163 size_t sz;
164
165 if (stat(filename, &st))
166 return error_errno("Could not stat %s", filename);
167 if (!(f = fopen(filename, "rb")))
168 return error_errno("Could not open %s", filename);
169 sz = xsize_t(st.st_size);
170 ptr->ptr = xmalloc(sz ? sz : 1);
171 if (sz && fread(ptr->ptr, sz, 1, f) != 1) {
172 fclose(f);
173 return error("Could not read %s", filename);
174 }
175 fclose(f);
176 ptr->size = sz;
177 return 0;
178}
179
180void read_mmblob(mmfile_t *ptr, const struct object_id *oid)
181{
182 unsigned long size;
183 enum object_type type;
184
185 if (oideq(oid, null_oid(the_hash_algo))) {
186 ptr->ptr = xstrdup("");
187 ptr->size = 0;
188 return;
189 }
190
191 ptr->ptr = odb_read_object(the_repository->objects, oid, &type, &size);
192 if (!ptr->ptr || type != OBJ_BLOB)
193 die("unable to read blob object %s", oid_to_hex(oid));
194 ptr->size = size;
195}
196
197#define FIRST_FEW_BYTES 8000
198int buffer_is_binary(const char *ptr, unsigned long size)
199{
200 if (FIRST_FEW_BYTES < size)
201 size = FIRST_FEW_BYTES;
202 return !!memchr(ptr, 0, size);
203}
204
205struct ff_regs {
206 int nr;
207 struct ff_reg {
208 regex_t re;
209 int negate;
210 } *array;
211};
212
213static long ff_regexp(const char *line, long len,
214 char *buffer, long buffer_size, void *priv)
215{
216 struct ff_regs *regs = priv;
217 regmatch_t pmatch[2];
218 int i;
219 int result;
220
221 /* Exclude terminating newline (and cr) from matching */
222 if (len > 0 && line[len-1] == '\n') {
223 if (len > 1 && line[len-2] == '\r')
224 len -= 2;
225 else
226 len--;
227 }
228
229 for (i = 0; i < regs->nr; i++) {
230 struct ff_reg *reg = regs->array + i;
231 if (!regexec_buf(®->re, line, len, 2, pmatch, 0)) {
232 if (reg->negate)
233 return -1;
234 break;
235 }
236 }
237 if (regs->nr <= i)
238 return -1;
239 i = pmatch[1].rm_so >= 0 ? 1 : 0;
240 line += pmatch[i].rm_so;
241 result = pmatch[i].rm_eo - pmatch[i].rm_so;
242 if (result > buffer_size)
243 result = buffer_size;
244 while (result > 0 && (isspace(line[result - 1])))
245 result--;
246 memcpy(buffer, line, result);
247 return result;
248}
249
250void xdiff_set_find_func(xdemitconf_t *xecfg, const char *value, int cflags)
251{
252 int i;
253 struct ff_regs *regs;
254
255 xecfg->find_func = ff_regexp;
256 regs = xecfg->find_func_priv = xmalloc(sizeof(struct ff_regs));
257 for (i = 0, regs->nr = 1; value[i]; i++)
258 if (value[i] == '\n')
259 regs->nr++;
260 ALLOC_ARRAY(regs->array, regs->nr);
261 for (i = 0; i < regs->nr; i++) {
262 struct ff_reg *reg = regs->array + i;
263 const char *ep, *expression;
264 char *buffer = NULL;
265
266 if (!value)
267 BUG("mismatch between line count and parsing");
268 ep = strchr(value, '\n');
269
270 reg->negate = (*value == '!');
271 if (reg->negate && i == regs->nr - 1)
272 die("Last expression must not be negated: %s", value);
273 if (*value == '!')
274 value++;
275 if (ep)
276 expression = buffer = xstrndup(value, ep - value);
277 else
278 expression = value;
279 if (regcomp(®->re, expression, cflags))
280 die("Invalid regexp to look for hunk header: %s", expression);
281 free(buffer);
282 value = ep ? ep + 1 : NULL;
283 }
284}
285
286void xdiff_clear_find_func(xdemitconf_t *xecfg)
287{
288 if (xecfg->find_func) {
289 int i;
290 struct ff_regs *regs = xecfg->find_func_priv;
291
292 for (i = 0; i < regs->nr; i++)
293 regfree(®s->array[i].re);
294 free(regs->array);
295 free(regs);
296 xecfg->find_func = NULL;
297 xecfg->find_func_priv = NULL;
298 }
299}
300
301unsigned long xdiff_hash_string(const char *s, size_t len, long flags)
302{
303 return xdl_hash_record(&s, s + len, flags);
304}
305
306int xdiff_compare_lines(const char *l1, long s1,
307 const char *l2, long s2, long flags)
308{
309 return xdl_recmatch(l1, s1, l2, s2, flags);
310}
311
312int parse_conflict_style_name(const char *value)
313{
314 if (!strcmp(value, "diff3"))
315 return XDL_MERGE_DIFF3;
316 else if (!strcmp(value, "zdiff3"))
317 return XDL_MERGE_ZEALOUS_DIFF3;
318 else if (!strcmp(value, "merge"))
319 return 0;
320 /*
321 * Please update _git_checkout() in git-completion.bash when
322 * you add new merge config
323 */
324 else
325 return -1;
326}
327
328int git_xmerge_style = -1;
329
330int git_xmerge_config(const char *var, const char *value,
331 const struct config_context *ctx, void *cb)
332{
333 if (!strcmp(var, "merge.conflictstyle")) {
334 if (!value)
335 return config_error_nonbool(var);
336 git_xmerge_style = parse_conflict_style_name(value);
337 if (git_xmerge_style == -1)
338 return error(_("unknown style '%s' given for '%s'"),
339 value, var);
340 return 0;
341 }
342 return git_default_config(var, value, ctx, cb);
343}