Documentation/stash: remove mention of git reset --hard
[git.git] / xdiff-interface.c
blob060038c2d6b92512e6625d0f5d94ed5439cd249c
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 end on a complete line.
105 static void trim_common_tail(mmfile_t *a, mmfile_t *b)
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 while (blk + trimmed <= smaller && !memcmp(ap - blk, bp - blk, blk)) {
114 trimmed += blk;
115 ap -= blk;
116 bp -= blk;
119 while (recovered < trimmed)
120 if (ap[recovered++] == '\n')
121 break;
122 a->size -= trimmed - recovered;
123 b->size -= trimmed - recovered;
126 int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *xecb)
128 mmfile_t a = *mf1;
129 mmfile_t b = *mf2;
131 if (mf1->size > MAX_XDIFF_SIZE || mf2->size > MAX_XDIFF_SIZE)
132 return -1;
134 if (!xecfg->ctxlen && !(xecfg->flags & XDL_EMIT_FUNCCONTEXT))
135 trim_common_tail(&a, &b);
137 return xdl_diff(&a, &b, xpp, xecfg, xecb);
140 int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
141 xdiff_emit_consume_fn fn, void *consume_callback_data,
142 xpparam_t const *xpp, xdemitconf_t const *xecfg)
144 int ret;
145 struct xdiff_emit_state state;
146 xdemitcb_t ecb;
148 memset(&state, 0, sizeof(state));
149 state.consume = fn;
150 state.consume_callback_data = consume_callback_data;
151 memset(&ecb, 0, sizeof(ecb));
152 ecb.outf = xdiff_outf;
153 ecb.priv = &state;
154 strbuf_init(&state.remainder, 0);
155 ret = xdi_diff(mf1, mf2, xpp, xecfg, &ecb);
156 strbuf_release(&state.remainder);
157 return ret;
160 int read_mmfile(mmfile_t *ptr, const char *filename)
162 struct stat st;
163 FILE *f;
164 size_t sz;
166 if (stat(filename, &st))
167 return error("Could not stat %s", filename);
168 if ((f = fopen(filename, "rb")) == NULL)
169 return error("Could not open %s", filename);
170 sz = xsize_t(st.st_size);
171 ptr->ptr = xmalloc(sz ? sz : 1);
172 if (sz && fread(ptr->ptr, sz, 1, f) != 1) {
173 fclose(f);
174 return error("Could not read %s", filename);
176 fclose(f);
177 ptr->size = sz;
178 return 0;
181 void read_mmblob(mmfile_t *ptr, const struct object_id *oid)
183 unsigned long size;
184 enum object_type type;
186 if (!oidcmp(oid, &null_oid)) {
187 ptr->ptr = xstrdup("");
188 ptr->size = 0;
189 return;
192 ptr->ptr = read_sha1_file(oid->hash, &type, &size);
193 if (!ptr->ptr || type != OBJ_BLOB)
194 die("unable to read blob object %s", oid_to_hex(oid));
195 ptr->size = size;
198 #define FIRST_FEW_BYTES 8000
199 int buffer_is_binary(const char *ptr, unsigned long size)
201 if (FIRST_FEW_BYTES < size)
202 size = FIRST_FEW_BYTES;
203 return !!memchr(ptr, 0, size);
206 struct ff_regs {
207 int nr;
208 struct ff_reg {
209 regex_t re;
210 int negate;
211 } *array;
214 static long ff_regexp(const char *line, long len,
215 char *buffer, long buffer_size, void *priv)
217 struct ff_regs *regs = priv;
218 regmatch_t pmatch[2];
219 int i;
220 int result;
222 /* Exclude terminating newline (and cr) from matching */
223 if (len > 0 && line[len-1] == '\n') {
224 if (len > 1 && line[len-2] == '\r')
225 len -= 2;
226 else
227 len--;
230 for (i = 0; i < regs->nr; i++) {
231 struct ff_reg *reg = regs->array + i;
232 if (!regexec_buf(&reg->re, line, len, 2, pmatch, 0)) {
233 if (reg->negate)
234 return -1;
235 break;
238 if (regs->nr <= i)
239 return -1;
240 i = pmatch[1].rm_so >= 0 ? 1 : 0;
241 line += pmatch[i].rm_so;
242 result = pmatch[i].rm_eo - pmatch[i].rm_so;
243 if (result > buffer_size)
244 result = buffer_size;
245 while (result > 0 && (isspace(line[result - 1])))
246 result--;
247 memcpy(buffer, line, result);
248 return result;
251 void xdiff_set_find_func(xdemitconf_t *xecfg, const char *value, int cflags)
253 int i;
254 struct ff_regs *regs;
256 xecfg->find_func = ff_regexp;
257 regs = xecfg->find_func_priv = xmalloc(sizeof(struct ff_regs));
258 for (i = 0, regs->nr = 1; value[i]; i++)
259 if (value[i] == '\n')
260 regs->nr++;
261 ALLOC_ARRAY(regs->array, regs->nr);
262 for (i = 0; i < regs->nr; i++) {
263 struct ff_reg *reg = regs->array + i;
264 const char *ep = strchr(value, '\n'), *expression;
265 char *buffer = NULL;
267 reg->negate = (*value == '!');
268 if (reg->negate && i == regs->nr - 1)
269 die("Last expression must not be negated: %s", value);
270 if (*value == '!')
271 value++;
272 if (ep)
273 expression = buffer = xstrndup(value, ep - value);
274 else
275 expression = value;
276 if (regcomp(&reg->re, expression, cflags))
277 die("Invalid regexp to look for hunk header: %s", expression);
278 free(buffer);
279 value = ep + 1;
283 void xdiff_clear_find_func(xdemitconf_t *xecfg)
285 if (xecfg->find_func) {
286 int i;
287 struct ff_regs *regs = xecfg->find_func_priv;
289 for (i = 0; i < regs->nr; i++)
290 regfree(&regs->array[i].re);
291 free(regs->array);
292 free(regs);
293 xecfg->find_func = NULL;
294 xecfg->find_func_priv = NULL;
298 int git_xmerge_style = -1;
300 int git_xmerge_config(const char *var, const char *value, void *cb)
302 if (!strcmp(var, "merge.conflictstyle")) {
303 if (!value)
304 die("'%s' is not a boolean", var);
305 if (!strcmp(value, "diff3"))
306 git_xmerge_style = XDL_MERGE_DIFF3;
307 else if (!strcmp(value, "merge"))
308 git_xmerge_style = 0;
309 else
310 die("unknown style '%s' given for '%s'",
311 value, var);
312 return 0;
314 return git_default_config(var, value, cb);