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