MSVC: fix poll-related macro redefines
[git/dscho.git] / xdiff-interface.c
blob0e2c169227ad29b5bf546c6c1b97e1a1d8ed7409
1 #include "cache.h"
2 #include "xdiff-interface.h"
3 #include "xdiff/xtypes.h"
4 #include "xdiff/xdiffi.h"
5 #include "xdiff/xemit.h"
6 #include "xdiff/xmacros.h"
8 struct xdiff_emit_state {
9 xdiff_emit_consume_fn consume;
10 void *consume_callback_data;
11 struct strbuf remainder;
14 static int parse_num(char **cp_p, int *num_p)
16 char *cp = *cp_p;
17 int num = 0;
19 while ('0' <= *cp && *cp <= '9')
20 num = num * 10 + *cp++ - '0';
21 if (!(cp - *cp_p))
22 return -1;
23 *cp_p = cp;
24 *num_p = num;
25 return 0;
28 int parse_hunk_header(char *line, int len,
29 int *ob, int *on,
30 int *nb, int *nn)
32 char *cp;
33 cp = line + 4;
34 if (parse_num(&cp, ob)) {
35 bad_line:
36 return error("malformed diff output: %s", line);
38 if (*cp == ',') {
39 cp++;
40 if (parse_num(&cp, on))
41 goto bad_line;
43 else
44 *on = 1;
45 if (*cp++ != ' ' || *cp++ != '+')
46 goto bad_line;
47 if (parse_num(&cp, nb))
48 goto bad_line;
49 if (*cp == ',') {
50 cp++;
51 if (parse_num(&cp, nn))
52 goto bad_line;
54 else
55 *nn = 1;
56 return -!!memcmp(cp, " @@", 3);
59 static void consume_one(void *priv_, char *s, unsigned long size)
61 struct xdiff_emit_state *priv = priv_;
62 char *ep;
63 while (size) {
64 unsigned long this_size;
65 ep = memchr(s, '\n', size);
66 this_size = (ep == NULL) ? size : (ep - s + 1);
67 priv->consume(priv->consume_callback_data, s, this_size);
68 size -= this_size;
69 s += this_size;
73 static int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf)
75 struct xdiff_emit_state *priv = priv_;
76 int i;
78 for (i = 0; i < nbuf; i++) {
79 if (mb[i].ptr[mb[i].size-1] != '\n') {
80 /* Incomplete line */
81 strbuf_add(&priv->remainder, mb[i].ptr, mb[i].size);
82 continue;
85 /* we have a complete line */
86 if (!priv->remainder.len) {
87 consume_one(priv, mb[i].ptr, mb[i].size);
88 continue;
90 strbuf_add(&priv->remainder, mb[i].ptr, mb[i].size);
91 consume_one(priv, priv->remainder.buf, priv->remainder.len);
92 strbuf_reset(&priv->remainder);
94 if (priv->remainder.len) {
95 consume_one(priv, priv->remainder.buf, priv->remainder.len);
96 strbuf_reset(&priv->remainder);
98 return 0;
102 * Trim down common substring at the end of the buffers,
103 * but leave at least ctx lines at the end.
105 static void trim_common_tail(mmfile_t *a, mmfile_t *b, long ctx)
107 const int blk = 1024;
108 long trimmed = 0, recovered = 0;
109 char *ap = a->ptr + a->size;
110 char *bp = b->ptr + b->size;
111 long smaller = (a->size < b->size) ? a->size : b->size;
113 if (ctx)
114 return;
116 while (blk + trimmed <= smaller && !memcmp(ap - blk, bp - blk, blk)) {
117 trimmed += blk;
118 ap -= blk;
119 bp -= blk;
122 while (recovered < trimmed)
123 if (ap[recovered++] == '\n')
124 break;
125 a->size -= trimmed - recovered;
126 b->size -= trimmed - recovered;
129 int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *xecb)
131 mmfile_t a = *mf1;
132 mmfile_t b = *mf2;
134 trim_common_tail(&a, &b, xecfg->ctxlen);
136 return xdl_diff(&a, &b, xpp, xecfg, xecb);
139 int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
140 xdiff_emit_consume_fn fn, void *consume_callback_data,
141 xpparam_t const *xpp, xdemitconf_t const *xecfg)
143 int ret;
144 struct xdiff_emit_state state;
145 xdemitcb_t ecb;
147 memset(&state, 0, sizeof(state));
148 state.consume = fn;
149 state.consume_callback_data = consume_callback_data;
150 memset(&ecb, 0, sizeof(ecb));
151 ecb.outf = 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;
159 struct xdiff_emit_hunk_state {
160 xdiff_emit_hunk_consume_fn consume;
161 void *consume_callback_data;
164 static int process_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
165 xdemitconf_t const *xecfg)
167 long s1, s2, same, p_next, t_next;
168 xdchange_t *xch, *xche;
169 struct xdiff_emit_hunk_state *state = ecb->priv;
170 xdiff_emit_hunk_consume_fn fn = state->consume;
171 void *consume_callback_data = state->consume_callback_data;
173 for (xch = xscr; xch; xch = xche->next) {
174 xche = xdl_get_hunk(xch, xecfg);
176 s1 = XDL_MAX(xch->i1 - xecfg->ctxlen, 0);
177 s2 = XDL_MAX(xch->i2 - xecfg->ctxlen, 0);
178 same = s2 + XDL_MAX(xch->i1 - s1, 0);
179 p_next = xche->i1 + xche->chg1;
180 t_next = xche->i2 + xche->chg2;
182 fn(consume_callback_data, same, p_next, t_next);
184 return 0;
187 int xdi_diff_hunks(mmfile_t *mf1, mmfile_t *mf2,
188 xdiff_emit_hunk_consume_fn fn, void *consume_callback_data,
189 xpparam_t const *xpp, xdemitconf_t *xecfg)
191 struct xdiff_emit_hunk_state state;
192 xdemitcb_t ecb;
194 memset(&state, 0, sizeof(state));
195 memset(&ecb, 0, sizeof(ecb));
196 state.consume = fn;
197 state.consume_callback_data = consume_callback_data;
198 xecfg->emit_func = (void (*)())process_diff;
199 ecb.priv = &state;
200 return xdi_diff(mf1, mf2, xpp, xecfg, &ecb);
203 int read_mmfile(mmfile_t *ptr, const char *filename)
205 struct stat st;
206 FILE *f;
207 size_t sz;
209 if (stat(filename, &st))
210 return error("Could not stat %s", filename);
211 if ((f = fopen(filename, "rb")) == NULL)
212 return error("Could not open %s", filename);
213 sz = xsize_t(st.st_size);
214 ptr->ptr = xmalloc(sz ? sz : 1);
215 if (sz && fread(ptr->ptr, sz, 1, f) != 1) {
216 fclose(f);
217 return error("Could not read %s", filename);
219 fclose(f);
220 ptr->size = sz;
221 return 0;
224 void read_mmblob(mmfile_t *ptr, const unsigned char *sha1)
226 unsigned long size;
227 enum object_type type;
229 if (!hashcmp(sha1, null_sha1)) {
230 ptr->ptr = xstrdup("");
231 ptr->size = 0;
232 return;
235 ptr->ptr = read_sha1_file(sha1, &type, &size);
236 if (!ptr->ptr || type != OBJ_BLOB)
237 die("unable to read blob object %s", sha1_to_hex(sha1));
238 ptr->size = size;
241 #define FIRST_FEW_BYTES 8000
242 int buffer_is_binary(const char *ptr, unsigned long size)
244 if (FIRST_FEW_BYTES < size)
245 size = FIRST_FEW_BYTES;
246 return !!memchr(ptr, 0, size);
249 struct ff_regs {
250 int nr;
251 struct ff_reg {
252 regex_t re;
253 int negate;
254 } *array;
257 static long ff_regexp(const char *line, long len,
258 char *buffer, long buffer_size, void *priv)
260 char *line_buffer;
261 struct ff_regs *regs = priv;
262 regmatch_t pmatch[2];
263 int i;
264 int result = -1;
266 /* Exclude terminating newline (and cr) from matching */
267 if (len > 0 && line[len-1] == '\n') {
268 if (len > 1 && line[len-2] == '\r')
269 len -= 2;
270 else
271 len--;
274 line_buffer = xstrndup(line, len); /* make NUL terminated */
276 for (i = 0; i < regs->nr; i++) {
277 struct ff_reg *reg = regs->array + i;
278 if (!regexec(&reg->re, line_buffer, 2, pmatch, 0)) {
279 if (reg->negate)
280 goto fail;
281 break;
284 if (regs->nr <= i)
285 goto fail;
286 i = pmatch[1].rm_so >= 0 ? 1 : 0;
287 line += pmatch[i].rm_so;
288 result = pmatch[i].rm_eo - pmatch[i].rm_so;
289 if (result > buffer_size)
290 result = buffer_size;
291 while (result > 0 && (isspace(line[result - 1])))
292 result--;
293 memcpy(buffer, line, result);
294 fail:
295 free(line_buffer);
296 return result;
299 void xdiff_set_find_func(xdemitconf_t *xecfg, const char *value, int cflags)
301 int i;
302 struct ff_regs *regs;
304 xecfg->find_func = ff_regexp;
305 regs = xecfg->find_func_priv = xmalloc(sizeof(struct ff_regs));
306 for (i = 0, regs->nr = 1; value[i]; i++)
307 if (value[i] == '\n')
308 regs->nr++;
309 regs->array = xmalloc(regs->nr * sizeof(struct ff_reg));
310 for (i = 0; i < regs->nr; i++) {
311 struct ff_reg *reg = regs->array + i;
312 const char *ep = strchr(value, '\n'), *expression;
313 char *buffer = NULL;
315 reg->negate = (*value == '!');
316 if (reg->negate && i == regs->nr - 1)
317 die("Last expression must not be negated: %s", value);
318 if (*value == '!')
319 value++;
320 if (ep)
321 expression = buffer = xstrndup(value, ep - value);
322 else
323 expression = value;
324 if (regcomp(&reg->re, expression, cflags))
325 die("Invalid regexp to look for hunk header: %s", expression);
326 free(buffer);
327 value = ep + 1;
331 void xdiff_clear_find_func(xdemitconf_t *xecfg)
333 if (xecfg->find_func) {
334 int i;
335 struct ff_regs *regs = xecfg->find_func_priv;
337 for (i = 0; i < regs->nr; i++)
338 regfree(&regs->array[i].re);
339 free(regs->array);
340 free(regs);
341 xecfg->find_func = NULL;
342 xecfg->find_func_priv = NULL;
346 int git_xmerge_style = -1;
348 int git_xmerge_config(const char *var, const char *value, void *cb)
350 if (!strcmp(var, "merge.conflictstyle")) {
351 if (!value)
352 die("'%s' is not a boolean", var);
353 if (!strcmp(value, "diff3"))
354 git_xmerge_style = XDL_MERGE_DIFF3;
355 else if (!strcmp(value, "merge"))
356 git_xmerge_style = 0;
357 else
358 die("unknown style '%s' given for '%s'",
359 value, var);
360 return 0;
362 return git_default_config(var, value, cb);