]>
Commit | Line | Data |
---|---|---|
525ab639 JH |
1 | /* |
2 | * Low level 3-way in-core file merge. | |
3 | * | |
4 | * Copyright (c) 2007 Junio C Hamano | |
5 | */ | |
6 | ||
5e3f94df | 7 | #include "git-compat-util.h" |
b2141fc1 | 8 | #include "config.h" |
73359a9b | 9 | #include "convert.h" |
525ab639 JH |
10 | #include "attr.h" |
11 | #include "xdiff-interface.h" | |
12 | #include "run-command.h" | |
525ab639 | 13 | #include "ll-merge.h" |
ef45bb1f | 14 | #include "quote.h" |
69a63fe6 | 15 | #include "strbuf.h" |
d5ebb50d | 16 | #include "wrapper.h" |
525ab639 JH |
17 | |
18 | struct ll_merge_driver; | |
19 | ||
35f69671 | 20 | typedef enum ll_merge_result (*ll_merge_fn)(const struct ll_merge_driver *, |
525ab639 JH |
21 | mmbuffer_t *result, |
22 | const char *path, | |
f01de62e | 23 | mmfile_t *orig, const char *orig_name, |
525ab639 JH |
24 | mmfile_t *src1, const char *name1, |
25 | mmfile_t *src2, const char *name2, | |
712516bc | 26 | const struct ll_merge_options *opts, |
23a64c9e | 27 | int marker_size); |
525ab639 JH |
28 | |
29 | struct ll_merge_driver { | |
30 | const char *name; | |
31 | const char *description; | |
32 | ll_merge_fn fn; | |
33 | const char *recursive; | |
34 | struct ll_merge_driver *next; | |
35 | char *cmdline; | |
36 | }; | |
37 | ||
2c65d90f | 38 | static struct attr_check *merge_attributes; |
39 | static struct attr_check *load_merge_attributes(void) | |
40 | { | |
41 | if (!merge_attributes) | |
42 | merge_attributes = attr_check_initl("merge", "conflict-marker-size", NULL); | |
43 | return merge_attributes; | |
44 | } | |
45 | ||
46 | void reset_merge_attributes(void) | |
47 | { | |
48 | attr_check_free(merge_attributes); | |
49 | merge_attributes = NULL; | |
50 | } | |
51 | ||
525ab639 JH |
52 | /* |
53 | * Built-in low-levels | |
54 | */ | |
4b992f0a | 55 | static enum ll_merge_result ll_binary_merge(const struct ll_merge_driver *drv UNUSED, |
525ab639 | 56 | mmbuffer_t *result, |
4b992f0a JK |
57 | const char *path UNUSED, |
58 | mmfile_t *orig, const char *orig_name UNUSED, | |
59 | mmfile_t *src1, const char *name1 UNUSED, | |
60 | mmfile_t *src2, const char *name2 UNUSED, | |
712516bc | 61 | const struct ll_merge_options *opts, |
4b992f0a | 62 | int marker_size UNUSED) |
525ab639 | 63 | { |
35f69671 | 64 | enum ll_merge_result ret; |
712516bc JN |
65 | mmfile_t *stolen; |
66 | assert(opts); | |
67 | ||
525ab639 | 68 | /* |
ed34567c JH |
69 | * The tentative merge result is the common ancestor for an |
70 | * internal merge. For the final merge, it is "ours" by | |
71 | * default but -Xours/-Xtheirs can tweak the choice. | |
525ab639 | 72 | */ |
a944af1d JH |
73 | if (opts->virtual_ancestor) { |
74 | stolen = orig; | |
35f69671 | 75 | ret = LL_MERGE_OK; |
a944af1d JH |
76 | } else { |
77 | switch (opts->variant) { | |
78 | default: | |
35f69671 EN |
79 | ret = LL_MERGE_BINARY_CONFLICT; |
80 | stolen = src1; | |
81 | break; | |
a944af1d | 82 | case XDL_MERGE_FAVOR_OURS: |
35f69671 | 83 | ret = LL_MERGE_OK; |
a944af1d JH |
84 | stolen = src1; |
85 | break; | |
86 | case XDL_MERGE_FAVOR_THEIRS: | |
35f69671 | 87 | ret = LL_MERGE_OK; |
a944af1d JH |
88 | stolen = src2; |
89 | break; | |
90 | } | |
91 | } | |
525ab639 JH |
92 | |
93 | result->ptr = stolen->ptr; | |
94 | result->size = stolen->size; | |
95 | stolen->ptr = NULL; | |
a944af1d | 96 | |
35f69671 | 97 | return ret; |
525ab639 JH |
98 | } |
99 | ||
35f69671 | 100 | static enum ll_merge_result ll_xdl_merge(const struct ll_merge_driver *drv_unused, |
525ab639 | 101 | mmbuffer_t *result, |
606475f3 | 102 | const char *path, |
f01de62e | 103 | mmfile_t *orig, const char *orig_name, |
525ab639 JH |
104 | mmfile_t *src1, const char *name1, |
105 | mmfile_t *src2, const char *name2, | |
712516bc JN |
106 | const struct ll_merge_options *opts, |
107 | int marker_size) | |
525ab639 | 108 | { |
35f69671 | 109 | enum ll_merge_result ret; |
00f8f97d | 110 | xmparam_t xmp; |
35f69671 | 111 | int status; |
712516bc | 112 | assert(opts); |
525ab639 | 113 | |
dcd1742e JK |
114 | if (orig->size > MAX_XDIFF_SIZE || |
115 | src1->size > MAX_XDIFF_SIZE || | |
116 | src2->size > MAX_XDIFF_SIZE || | |
117 | buffer_is_binary(orig->ptr, orig->size) || | |
525ab639 JH |
118 | buffer_is_binary(src1->ptr, src1->size) || |
119 | buffer_is_binary(src2->ptr, src2->size)) { | |
525ab639 | 120 | return ll_binary_merge(drv_unused, result, |
606475f3 | 121 | path, |
f01de62e JN |
122 | orig, orig_name, |
123 | src1, name1, | |
525ab639 | 124 | src2, name2, |
712516bc | 125 | opts, marker_size); |
525ab639 JH |
126 | } |
127 | ||
00f8f97d | 128 | memset(&xmp, 0, sizeof(xmp)); |
560119b9 | 129 | xmp.level = XDL_MERGE_ZEALOUS; |
712516bc | 130 | xmp.favor = opts->variant; |
58a1ece4 | 131 | xmp.xpp.flags = opts->xdl_opts; |
c236bcd0 | 132 | if (git_xmerge_style >= 0) |
560119b9 | 133 | xmp.style = git_xmerge_style; |
23a64c9e JH |
134 | if (marker_size > 0) |
135 | xmp.marker_size = marker_size; | |
f01de62e | 136 | xmp.ancestor = orig_name; |
a4b5e91c JN |
137 | xmp.file1 = name1; |
138 | xmp.file2 = name2; | |
35f69671 EN |
139 | status = xdl_merge(orig, src1, src2, &xmp, result); |
140 | ret = (status > 0) ? LL_MERGE_CONFLICT : status; | |
141 | return ret; | |
525ab639 JH |
142 | } |
143 | ||
35f69671 | 144 | static enum ll_merge_result ll_union_merge(const struct ll_merge_driver *drv_unused, |
525ab639 | 145 | mmbuffer_t *result, |
382b601a | 146 | const char *path, |
f01de62e | 147 | mmfile_t *orig, const char *orig_name, |
525ab639 JH |
148 | mmfile_t *src1, const char *name1, |
149 | mmfile_t *src2, const char *name2, | |
712516bc JN |
150 | const struct ll_merge_options *opts, |
151 | int marker_size) | |
525ab639 | 152 | { |
cd1d61c4 | 153 | /* Use union favor */ |
712516bc JN |
154 | struct ll_merge_options o; |
155 | assert(opts); | |
156 | o = *opts; | |
157 | o.variant = XDL_MERGE_FAVOR_UNION; | |
382b601a | 158 | return ll_xdl_merge(drv_unused, result, path, |
7f53f78b | 159 | orig, orig_name, src1, name1, src2, name2, |
712516bc | 160 | &o, marker_size); |
525ab639 JH |
161 | } |
162 | ||
163 | #define LL_BINARY_MERGE 0 | |
164 | #define LL_TEXT_MERGE 1 | |
165 | #define LL_UNION_MERGE 2 | |
166 | static struct ll_merge_driver ll_merge_drv[] = { | |
167 | { "binary", "built-in binary merge", ll_binary_merge }, | |
168 | { "text", "built-in 3-way text merge", ll_xdl_merge }, | |
169 | { "union", "built-in union merge", ll_union_merge }, | |
170 | }; | |
171 | ||
5096d490 | 172 | static void create_temp(mmfile_t *src, char *path, size_t len) |
525ab639 JH |
173 | { |
174 | int fd; | |
175 | ||
5096d490 | 176 | xsnprintf(path, len, ".merge_file_XXXXXX"); |
525ab639 | 177 | fd = xmkstemp(path); |
06f46f23 | 178 | if (write_in_full(fd, src->ptr, src->size) < 0) |
0721c314 | 179 | die_errno("unable to write temp-file"); |
525ab639 JH |
180 | close(fd); |
181 | } | |
182 | ||
183 | /* | |
184 | * User defined low-level merge driver support. | |
185 | */ | |
35f69671 | 186 | static enum ll_merge_result ll_ext_merge(const struct ll_merge_driver *fn, |
525ab639 JH |
187 | mmbuffer_t *result, |
188 | const char *path, | |
4b992f0a JK |
189 | mmfile_t *orig, const char *orig_name UNUSED, |
190 | mmfile_t *src1, const char *name1 UNUSED, | |
191 | mmfile_t *src2, const char *name2 UNUSED, | |
712516bc JN |
192 | const struct ll_merge_options *opts, |
193 | int marker_size) | |
525ab639 | 194 | { |
23a64c9e | 195 | char temp[4][50]; |
ced621b2 | 196 | struct strbuf cmd = STRBUF_INIT; |
ef45bb1f JH |
197 | struct strbuf_expand_dict_entry dict[6]; |
198 | struct strbuf path_sq = STRBUF_INIT; | |
4120294c | 199 | struct child_process child = CHILD_PROCESS_INIT; |
525ab639 JH |
200 | int status, fd, i; |
201 | struct stat st; | |
35f69671 | 202 | enum ll_merge_result ret; |
712516bc | 203 | assert(opts); |
525ab639 | 204 | |
ef45bb1f | 205 | sq_quote_buf(&path_sq, path); |
66dbfd55 GV |
206 | dict[0].placeholder = "O"; dict[0].value = temp[0]; |
207 | dict[1].placeholder = "A"; dict[1].value = temp[1]; | |
208 | dict[2].placeholder = "B"; dict[2].value = temp[2]; | |
209 | dict[3].placeholder = "L"; dict[3].value = temp[3]; | |
ef45bb1f JH |
210 | dict[4].placeholder = "P"; dict[4].value = path_sq.buf; |
211 | dict[5].placeholder = NULL; dict[5].value = NULL; | |
66dbfd55 | 212 | |
afe8a907 | 213 | if (!fn->cmdline) |
525ab639 JH |
214 | die("custom merge driver %s lacks command line.", fn->name); |
215 | ||
216 | result->ptr = NULL; | |
217 | result->size = 0; | |
5096d490 JK |
218 | create_temp(orig, temp[0], sizeof(temp[0])); |
219 | create_temp(src1, temp[1], sizeof(temp[1])); | |
220 | create_temp(src2, temp[2], sizeof(temp[2])); | |
221 | xsnprintf(temp[3], sizeof(temp[3]), "%d", marker_size); | |
525ab639 | 222 | |
ced621b2 | 223 | strbuf_expand(&cmd, fn->cmdline, strbuf_expand_dict_cb, &dict); |
525ab639 | 224 | |
4120294c RS |
225 | child.use_shell = 1; |
226 | strvec_push(&child.args, cmd.buf); | |
227 | status = run_command(&child); | |
525ab639 JH |
228 | fd = open(temp[1], O_RDONLY); |
229 | if (fd < 0) | |
230 | goto bad; | |
231 | if (fstat(fd, &st)) | |
232 | goto close_bad; | |
233 | result->size = st.st_size; | |
3733e694 | 234 | result->ptr = xmallocz(result->size); |
525ab639 | 235 | if (read_in_full(fd, result->ptr, result->size) != result->size) { |
e140f7af | 236 | FREE_AND_NULL(result->ptr); |
525ab639 JH |
237 | result->size = 0; |
238 | } | |
239 | close_bad: | |
240 | close(fd); | |
241 | bad: | |
242 | for (i = 0; i < 3; i++) | |
691f1a28 | 243 | unlink_or_warn(temp[i]); |
ced621b2 | 244 | strbuf_release(&cmd); |
ef45bb1f | 245 | strbuf_release(&path_sq); |
35f69671 EN |
246 | ret = (status > 0) ? LL_MERGE_CONFLICT : status; |
247 | return ret; | |
525ab639 JH |
248 | } |
249 | ||
250 | /* | |
251 | * merge.default and merge.driver configuration items | |
252 | */ | |
253 | static struct ll_merge_driver *ll_user_merge, **ll_user_merge_tail; | |
254 | static const char *default_ll_merge; | |
255 | ||
783a86c1 | 256 | static int read_merge_config(const char *var, const char *value, |
5cf88fd8 | 257 | void *cb UNUSED) |
525ab639 JH |
258 | { |
259 | struct ll_merge_driver *fn; | |
d731f0ad | 260 | const char *key, *name; |
f5914f4b | 261 | size_t namelen; |
525ab639 | 262 | |
6ea358f7 TA |
263 | if (!strcmp(var, "merge.default")) |
264 | return git_config_string(&default_ll_merge, var, value); | |
525ab639 JH |
265 | |
266 | /* | |
267 | * We are not interested in anything but "merge.<name>.variable"; | |
268 | * especially, we do not want to look at variables such as | |
269 | * "merge.summary", "merge.tool", and "merge.verbosity". | |
270 | */ | |
d731f0ad | 271 | if (parse_config_key(var, "merge", &name, &namelen, &key) < 0 || !name) |
525ab639 JH |
272 | return 0; |
273 | ||
274 | /* | |
275 | * Find existing one as we might be processing merge.<name>.var2 | |
276 | * after seeing merge.<name>.var1. | |
277 | */ | |
525ab639 JH |
278 | for (fn = ll_user_merge; fn; fn = fn->next) |
279 | if (!strncmp(fn->name, name, namelen) && !fn->name[namelen]) | |
280 | break; | |
281 | if (!fn) { | |
ca56dadb | 282 | CALLOC_ARRAY(fn, 1); |
525ab639 JH |
283 | fn->name = xmemdupz(name, namelen); |
284 | fn->fn = ll_ext_merge; | |
285 | *ll_user_merge_tail = fn; | |
286 | ll_user_merge_tail = &(fn->next); | |
287 | } | |
288 | ||
6ea358f7 TA |
289 | if (!strcmp("name", key)) |
290 | return git_config_string(&fn->description, var, value); | |
525ab639 | 291 | |
d731f0ad | 292 | if (!strcmp("driver", key)) { |
525ab639 JH |
293 | if (!value) |
294 | return error("%s: lacks value", var); | |
295 | /* | |
296 | * merge.<name>.driver specifies the command line: | |
297 | * | |
298 | * command-line | |
299 | * | |
300 | * The command-line will be interpolated with the following | |
301 | * tokens and is given to the shell: | |
302 | * | |
303 | * %O - temporary file name for the merge base. | |
304 | * %A - temporary file name for our version. | |
305 | * %B - temporary file name for the other branches' version. | |
23a64c9e | 306 | * %L - conflict marker length |
ef45bb1f | 307 | * %P - the original path (safely quoted for the shell) |
525ab639 JH |
308 | * |
309 | * The external merge driver should write the results in the | |
310 | * file named by %A, and signal that it has done with zero exit | |
311 | * status. | |
312 | */ | |
90dce515 | 313 | fn->cmdline = xstrdup(value); |
525ab639 JH |
314 | return 0; |
315 | } | |
316 | ||
6ea358f7 TA |
317 | if (!strcmp("recursive", key)) |
318 | return git_config_string(&fn->recursive, var, value); | |
525ab639 JH |
319 | |
320 | return 0; | |
321 | } | |
322 | ||
323 | static void initialize_ll_merge(void) | |
324 | { | |
325 | if (ll_user_merge_tail) | |
326 | return; | |
327 | ll_user_merge_tail = &ll_user_merge; | |
ef90d6d4 | 328 | git_config(read_merge_config, NULL); |
525ab639 JH |
329 | } |
330 | ||
331 | static const struct ll_merge_driver *find_ll_merge_driver(const char *merge_attr) | |
332 | { | |
333 | struct ll_merge_driver *fn; | |
334 | const char *name; | |
335 | int i; | |
336 | ||
337 | initialize_ll_merge(); | |
338 | ||
339 | if (ATTR_TRUE(merge_attr)) | |
340 | return &ll_merge_drv[LL_TEXT_MERGE]; | |
341 | else if (ATTR_FALSE(merge_attr)) | |
342 | return &ll_merge_drv[LL_BINARY_MERGE]; | |
343 | else if (ATTR_UNSET(merge_attr)) { | |
344 | if (!default_ll_merge) | |
345 | return &ll_merge_drv[LL_TEXT_MERGE]; | |
346 | else | |
347 | name = default_ll_merge; | |
348 | } | |
349 | else | |
350 | name = merge_attr; | |
351 | ||
352 | for (fn = ll_user_merge; fn; fn = fn->next) | |
353 | if (!strcmp(fn->name, name)) | |
354 | return fn; | |
355 | ||
356 | for (i = 0; i < ARRAY_SIZE(ll_merge_drv); i++) | |
357 | if (!strcmp(ll_merge_drv[i].name, name)) | |
358 | return &ll_merge_drv[i]; | |
359 | ||
360 | /* default to the 3-way */ | |
361 | return &ll_merge_drv[LL_TEXT_MERGE]; | |
362 | } | |
363 | ||
32eaa468 | 364 | static void normalize_file(mmfile_t *mm, const char *path, struct index_state *istate) |
f217f0e8 EB |
365 | { |
366 | struct strbuf strbuf = STRBUF_INIT; | |
32eaa468 | 367 | if (renormalize_buffer(istate, path, mm->ptr, mm->size, &strbuf)) { |
f217f0e8 EB |
368 | free(mm->ptr); |
369 | mm->size = strbuf.len; | |
370 | mm->ptr = strbuf_detach(&strbuf, NULL); | |
371 | } | |
372 | } | |
373 | ||
35f69671 | 374 | enum ll_merge_result ll_merge(mmbuffer_t *result_buf, |
525ab639 | 375 | const char *path, |
f01de62e | 376 | mmfile_t *ancestor, const char *ancestor_label, |
525ab639 JH |
377 | mmfile_t *ours, const char *our_label, |
378 | mmfile_t *theirs, const char *their_label, | |
32eaa468 | 379 | struct index_state *istate, |
712516bc | 380 | const struct ll_merge_options *opts) |
525ab639 | 381 | { |
2c65d90f | 382 | struct attr_check *check = load_merge_attributes(); |
4fb40c2b | 383 | static const struct ll_merge_options default_opts; |
23a64c9e JH |
384 | const char *ll_driver_name = NULL; |
385 | int marker_size = DEFAULT_CONFLICT_MARKER_SIZE; | |
525ab639 JH |
386 | const struct ll_merge_driver *driver; |
387 | ||
4fb40c2b JN |
388 | if (!opts) |
389 | opts = &default_opts; | |
712516bc JN |
390 | |
391 | if (opts->renormalize) { | |
32eaa468 NTND |
392 | normalize_file(ancestor, path, istate); |
393 | normalize_file(ours, path, istate); | |
394 | normalize_file(theirs, path, istate); | |
f217f0e8 | 395 | } |
2aef63d3 | 396 | |
47cfc9bd | 397 | git_check_attr(istate, NULL, path, check); |
d64324cb TB |
398 | ll_driver_name = check->items[0].value; |
399 | if (check->items[1].value) { | |
400 | marker_size = atoi(check->items[1].value); | |
401 | if (marker_size <= 0) | |
402 | marker_size = DEFAULT_CONFLICT_MARKER_SIZE; | |
23a64c9e | 403 | } |
525ab639 | 404 | driver = find_ll_merge_driver(ll_driver_name); |
d694a179 JH |
405 | |
406 | if (opts->virtual_ancestor) { | |
407 | if (driver->recursive) | |
408 | driver = find_ll_merge_driver(driver->recursive); | |
b2a7942b EN |
409 | } |
410 | if (opts->extra_marker_size) { | |
411 | marker_size += opts->extra_marker_size; | |
d694a179 | 412 | } |
f01de62e | 413 | return driver->fn(driver, result_buf, path, ancestor, ancestor_label, |
23a64c9e | 414 | ours, our_label, theirs, their_label, |
712516bc | 415 | opts, marker_size); |
525ab639 | 416 | } |
8588567c | 417 | |
32eaa468 | 418 | int ll_merge_marker_size(struct index_state *istate, const char *path) |
8588567c | 419 | { |
2aef63d3 | 420 | static struct attr_check *check; |
8588567c JH |
421 | int marker_size = DEFAULT_CONFLICT_MARKER_SIZE; |
422 | ||
2aef63d3 JH |
423 | if (!check) |
424 | check = attr_check_initl("conflict-marker-size", NULL); | |
47cfc9bd | 425 | git_check_attr(istate, NULL, path, check); |
d64324cb | 426 | if (check->items[0].value) { |
2aef63d3 | 427 | marker_size = atoi(check->items[0].value); |
8588567c JH |
428 | if (marker_size <= 0) |
429 | marker_size = DEFAULT_CONFLICT_MARKER_SIZE; | |
430 | } | |
431 | return marker_size; | |
525ab639 | 432 | } |