🌐 AI搜索 & 代理 主页
Google Git
Sign in
chromium / external / github.com / git / git / refs/tags/v2.45.0 / . / merge-ll.c
blob: bf1077ae0928e99cb0c5dc0814fecf9e141447b7 [file] [log] [blame]
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]1/*
2 * Low level 3-way in-core file merge.
3 *
4 * Copyright (c) 2007 Junio C Hamano
5 */
6
Elijah Newren5e3f94d2023-04-22 20:17:23[diff] [blame]7#include "git-compat-util.h"
Brandon Williamsb2141fc2017-06-14 18:07:36[diff] [blame]8#include "config.h"
Elijah Newren73359a92023-04-11 03:00:40[diff] [blame]9#include "convert.h"
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]10#include "attr.h"
11#include "xdiff-interface.h"
12#include "run-command.h"
Elijah Newren67238992023-05-16 06:34:04[diff] [blame]13#include "merge-ll.h"
Junio C Hamanoef45bb12015-06-04 22:10:29[diff] [blame]14#include "quote.h"
Elijah Newren69a63fe2023-04-22 20:17:08[diff] [blame]15#include "strbuf.h"
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]16
17struct ll_merge_driver;
18
Elijah Newren35f69672022-02-02 02:37:30[diff] [blame]19typedef enum ll_merge_result (*ll_merge_fn)(const struct ll_merge_driver *,
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]20 mmbuffer_t *result,
21 const char *path,
Jonathan Niederf01de622010-03-21 00:38:58[diff] [blame]22 mmfile_t *orig, const char *orig_name,
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]23 mmfile_t *src1, const char *name1,
24 mmfile_t *src2, const char *name2,
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]25 const struct ll_merge_options *opts,
Junio C Hamano23a64c92010-01-16 06:37:32[diff] [blame]26 int marker_size);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]27
28struct ll_merge_driver {
29 const char *name;
30 const char *description;
31 ll_merge_fn fn;
32 const char *recursive;
33 struct ll_merge_driver *next;
34 char *cmdline;
35};
36
brian m. carlson2c65d902019-09-02 22:39:44[diff] [blame]37static struct attr_check *merge_attributes;
38static struct attr_check *load_merge_attributes(void)
39{
40 if (!merge_attributes)
41 merge_attributes = attr_check_initl("merge", "conflict-marker-size", NULL);
42 return merge_attributes;
43}
44
45void reset_merge_attributes(void)
46{
47 attr_check_free(merge_attributes);
48 merge_attributes = NULL;
49}
50
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]51/*
52 * Built-in low-levels
53 */
Jeff King4b992f02022-10-18 01:10:24[diff] [blame]54static enum ll_merge_result ll_binary_merge(const struct ll_merge_driver *drv UNUSED,
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]55 mmbuffer_t *result,
Jeff King4b992f02022-10-18 01:10:24[diff] [blame]56 const char *path UNUSED,
57 mmfile_t *orig, const char *orig_name UNUSED,
58 mmfile_t *src1, const char *name1 UNUSED,
59 mmfile_t *src2, const char *name2 UNUSED,
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]60 const struct ll_merge_options *opts,
Jeff King4b992f02022-10-18 01:10:24[diff] [blame]61 int marker_size UNUSED)
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]62{
Elijah Newren35f69672022-02-02 02:37:30[diff] [blame]63 enum ll_merge_result ret;
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]64 mmfile_t *stolen;
65 assert(opts);
66
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]67 /*
Junio C Hamanoed345672016-04-14 22:12:15[diff] [blame]68 * The tentative merge result is the common ancestor for an
69 * internal merge. For the final merge, it is "ours" by
70 * default but -Xours/-Xtheirs can tweak the choice.
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]71 */
Junio C Hamanoa944af12012-09-09 04:27:19[diff] [blame]72 if (opts->virtual_ancestor) {
73 stolen = orig;
Elijah Newren35f69672022-02-02 02:37:30[diff] [blame]74 ret = LL_MERGE_OK;
Junio C Hamanoa944af12012-09-09 04:27:19[diff] [blame]75 } else {
76 switch (opts->variant) {
77 default:
Elijah Newren35f69672022-02-02 02:37:30[diff] [blame]78 ret = LL_MERGE_BINARY_CONFLICT;
79 stolen = src1;
80 break;
Junio C Hamanoa944af12012-09-09 04:27:19[diff] [blame]81 case XDL_MERGE_FAVOR_OURS:
Elijah Newren35f69672022-02-02 02:37:30[diff] [blame]82 ret = LL_MERGE_OK;
Junio C Hamanoa944af12012-09-09 04:27:19[diff] [blame]83 stolen = src1;
84 break;
85 case XDL_MERGE_FAVOR_THEIRS:
Elijah Newren35f69672022-02-02 02:37:30[diff] [blame]86 ret = LL_MERGE_OK;
Junio C Hamanoa944af12012-09-09 04:27:19[diff] [blame]87 stolen = src2;
88 break;
89 }
90 }
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]91
92 result->ptr = stolen->ptr;
93 result->size = stolen->size;
94 stolen->ptr = NULL;
Junio C Hamanoa944af12012-09-09 04:27:19[diff] [blame]95
Elijah Newren35f69672022-02-02 02:37:30[diff] [blame]96 return ret;
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]97}
98
Elijah Newren35f69672022-02-02 02:37:30[diff] [blame]99static enum ll_merge_result ll_xdl_merge(const struct ll_merge_driver *drv_unused,
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]100 mmbuffer_t *result,
Martin Renold606475f2009-07-01 20:18:04[diff] [blame]101 const char *path,
Jonathan Niederf01de622010-03-21 00:38:58[diff] [blame]102 mmfile_t *orig, const char *orig_name,
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]103 mmfile_t *src1, const char *name1,
104 mmfile_t *src2, const char *name2,
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]105 const struct ll_merge_options *opts,
106 int marker_size)
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]107{
Elijah Newren35f69672022-02-02 02:37:30[diff] [blame]108 enum ll_merge_result ret;
Junio C Hamano00f8f972010-01-17 05:01:28[diff] [blame]109 xmparam_t xmp;
Elijah Newren35f69672022-02-02 02:37:30[diff] [blame]110 int status;
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]111 assert(opts);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]112
Jeff Kingdcd17422015-09-24 23:12:45[diff] [blame]113 if (orig->size > MAX_XDIFF_SIZE ||
114 src1->size > MAX_XDIFF_SIZE ||
115 src2->size > MAX_XDIFF_SIZE ||
116 buffer_is_binary(orig->ptr, orig->size) ||
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]117 buffer_is_binary(src1->ptr, src1->size) ||
118 buffer_is_binary(src2->ptr, src2->size)) {
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]119 return ll_binary_merge(drv_unused, result,
Martin Renold606475f2009-07-01 20:18:04[diff] [blame]120 path,
Jonathan Niederf01de622010-03-21 00:38:58[diff] [blame]121 orig, orig_name,
122 src1, name1,
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]123 src2, name2,
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]124 opts, marker_size);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]125 }
126
Junio C Hamano00f8f972010-01-17 05:01:28[diff] [blame]127 memset(&xmp, 0, sizeof(xmp));
Bert Wesarg560119b2010-03-01 21:46:26[diff] [blame]128 xmp.level = XDL_MERGE_ZEALOUS;
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]129 xmp.favor = opts->variant;
Justin Frankel58a1ece2010-08-26 05:50:45[diff] [blame]130 xmp.xpp.flags = opts->xdl_opts;
Phillip Wood135cc712024-03-14 17:05:05[diff] [blame]131 if (opts->conflict_style >= 0)
132 xmp.style = opts->conflict_style;
133 else if (git_xmerge_style >= 0)
Bert Wesarg560119b2010-03-01 21:46:26[diff] [blame]134 xmp.style = git_xmerge_style;
Junio C Hamano23a64c92010-01-16 06:37:32[diff] [blame]135 if (marker_size > 0)
136 xmp.marker_size = marker_size;
Jonathan Niederf01de622010-03-21 00:38:58[diff] [blame]137 xmp.ancestor = orig_name;
Jonathan Niedera4b5e912010-03-21 00:35:18[diff] [blame]138 xmp.file1 = name1;
139 xmp.file2 = name2;
Elijah Newren35f69672022-02-02 02:37:30[diff] [blame]140 status = xdl_merge(orig, src1, src2, &xmp, result);
141 ret = (status > 0) ? LL_MERGE_CONFLICT : status;
142 return ret;
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]143}
144
Elijah Newren35f69672022-02-02 02:37:30[diff] [blame]145static enum ll_merge_result ll_union_merge(const struct ll_merge_driver *drv_unused,
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]146 mmbuffer_t *result,
Jeff King382b6012021-06-10 16:14:12[diff] [blame]147 const char *path,
Jonathan Niederf01de622010-03-21 00:38:58[diff] [blame]148 mmfile_t *orig, const char *orig_name,
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]149 mmfile_t *src1, const char *name1,
150 mmfile_t *src2, const char *name2,
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]151 const struct ll_merge_options *opts,
152 int marker_size)
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]153{
Bert Wesargcd1d61c2010-03-01 21:46:25[diff] [blame]154 /* Use union favor */
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]155 struct ll_merge_options o;
156 assert(opts);
157 o = *opts;
158 o.variant = XDL_MERGE_FAVOR_UNION;
Jeff King382b6012021-06-10 16:14:12[diff] [blame]159 return ll_xdl_merge(drv_unused, result, path,
Jeff King7f53f782021-06-10 12:58:43[diff] [blame]160 orig, orig_name, src1, name1, src2, name2,
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]161 &o, marker_size);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]162}
163
164#define LL_BINARY_MERGE 0
165#define LL_TEXT_MERGE 1
166#define LL_UNION_MERGE 2
167static struct ll_merge_driver ll_merge_drv[] = {
168 { "binary", "built-in binary merge", ll_binary_merge },
169 { "text", "built-in 3-way text merge", ll_xdl_merge },
170 { "union", "built-in union merge", ll_union_merge },
171};
172
Jeff King5096d492015-09-24 21:06:08[diff] [blame]173static void create_temp(mmfile_t *src, char *path, size_t len)
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]174{
175 int fd;
176
Jeff King5096d492015-09-24 21:06:08[diff] [blame]177 xsnprintf(path, len, ".merge_file_XXXXXX");
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]178 fd = xmkstemp(path);
Jeff King06f46f22017-09-13 17:16:03[diff] [blame]179 if (write_in_full(fd, src->ptr, src->size) < 0)
Thomas Rast0721c312009-06-27 15:58:47[diff] [blame]180 die_errno("unable to write temp-file");
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]181 close(fd);
182}
183
184/*
185 * User defined low-level merge driver support.
186 */
Elijah Newren35f69672022-02-02 02:37:30[diff] [blame]187static enum ll_merge_result ll_ext_merge(const struct ll_merge_driver *fn,
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]188 mmbuffer_t *result,
189 const char *path,
Antonin Delpeuch81effe92024-01-24 20:09:11[diff] [blame]190 mmfile_t *orig, const char *orig_name,
191 mmfile_t *src1, const char *name1,
192 mmfile_t *src2, const char *name2,
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]193 const struct ll_merge_options *opts,
194 int marker_size)
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]195{
René Scharfe39dbd492023-06-17 20:42:26[diff] [blame]196 char temp[3][50];
René Scharfeced621b2008-11-22 23:13:00[diff] [blame]197 struct strbuf cmd = STRBUF_INIT;
René Scharfe39dbd492023-06-17 20:42:26[diff] [blame]198 const char *format = fn->cmdline;
René Scharfe41202942022-10-30 11:50:27[diff] [blame]199 struct child_process child = CHILD_PROCESS_INIT;
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]200 int status, fd, i;
201 struct stat st;
Elijah Newren35f69672022-02-02 02:37:30[diff] [blame]202 enum ll_merge_result ret;
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]203 assert(opts);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]204
Junio C Hamanoafe8a902022-05-02 16:50:37[diff] [blame]205 if (!fn->cmdline)
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]206 die("custom merge driver %s lacks command line.", fn->name);
207
208 result->ptr = NULL;
209 result->size = 0;
Jeff King5096d492015-09-24 21:06:08[diff] [blame]210 create_temp(orig, temp[0], sizeof(temp[0]));
211 create_temp(src1, temp[1], sizeof(temp[1]));
212 create_temp(src2, temp[2], sizeof(temp[2]));
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]213
René Scharfe39dbd492023-06-17 20:42:26[diff] [blame]214 while (strbuf_expand_step(&cmd, &format)) {
215 if (skip_prefix(format, "%", &format))
216 strbuf_addch(&cmd, '%');
217 else if (skip_prefix(format, "O", &format))
218 strbuf_addstr(&cmd, temp[0]);
219 else if (skip_prefix(format, "A", &format))
220 strbuf_addstr(&cmd, temp[1]);
221 else if (skip_prefix(format, "B", &format))
222 strbuf_addstr(&cmd, temp[2]);
223 else if (skip_prefix(format, "L", &format))
224 strbuf_addf(&cmd, "%d", marker_size);
225 else if (skip_prefix(format, "P", &format))
226 sq_quote_buf(&cmd, path);
Antonin Delpeuch81effe92024-01-24 20:09:11[diff] [blame]227 else if (skip_prefix(format, "S", &format))
228 sq_quote_buf(&cmd, orig_name ? orig_name : "");
229 else if (skip_prefix(format, "X", &format))
230 sq_quote_buf(&cmd, name1 ? name1 : "");
231 else if (skip_prefix(format, "Y", &format))
232 sq_quote_buf(&cmd, name2 ? name2 : "");
René Scharfe39dbd492023-06-17 20:42:26[diff] [blame]233 else
234 strbuf_addch(&cmd, '%');
235 }
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]236
René Scharfe41202942022-10-30 11:50:27[diff] [blame]237 child.use_shell = 1;
238 strvec_push(&child.args, cmd.buf);
239 status = run_command(&child);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]240 fd = open(temp[1], O_RDONLY);
241 if (fd < 0)
242 goto bad;
243 if (fstat(fd, &st))
244 goto close_bad;
245 result->size = st.st_size;
Jeff King3733e692016-02-22 22:44:28[diff] [blame]246 result->ptr = xmallocz(result->size);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]247 if (read_in_full(fd, result->ptr, result->size) != result->size) {
Ævar Arnfjörð Bjarmasone140f7a2017-06-15 23:15:48[diff] [blame]248 FREE_AND_NULL(result->ptr);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]249 result->size = 0;
250 }
251 close_bad:
252 close(fd);
253 bad:
254 for (i = 0; i < 3; i++)
Alex Riesen691f1a22009-04-29 21:22:56[diff] [blame]255 unlink_or_warn(temp[i]);
René Scharfeced621b2008-11-22 23:13:00[diff] [blame]256 strbuf_release(&cmd);
Junio C Hamano2b7b7882023-06-23 00:33:01[diff] [blame]257 if (!status)
258 ret = LL_MERGE_OK;
259 else if (status <= 128)
260 ret = LL_MERGE_CONFLICT;
261 else
262 /* died due to a signal: WTERMSIG(status) + 128 */
263 ret = LL_MERGE_ERROR;
Elijah Newren35f69672022-02-02 02:37:30[diff] [blame]264 return ret;
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]265}
266
267/*
268 * merge.default and merge.driver configuration items
269 */
270static struct ll_merge_driver *ll_user_merge, **ll_user_merge_tail;
271static const char *default_ll_merge;
272
Jeff King783a86c2022-08-19 10:08:44[diff] [blame]273static int read_merge_config(const char *var, const char *value,
Glen Chooa4e7e312023-06-28 19:26:22[diff] [blame]274 const struct config_context *ctx UNUSED,
Ævar Arnfjörð Bjarmason5cf88fd2022-08-25 17:09:48[diff] [blame]275 void *cb UNUSED)
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]276{
277 struct ll_merge_driver *fn;
Jeff Kingd731f0a2013-01-23 06:24:23[diff] [blame]278 const char *key, *name;
Jeff Kingf5914f42020-04-10 19:44:28[diff] [blame]279 size_t namelen;
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]280
Tanay Abhra6ea358f2014-08-13 12:43:04[diff] [blame]281 if (!strcmp(var, "merge.default"))
282 return git_config_string(&default_ll_merge, var, value);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]283
284 /*
285 * We are not interested in anything but "merge.<name>.variable";
286 * especially, we do not want to look at variables such as
287 * "merge.summary", "merge.tool", and "merge.verbosity".
288 */
Jeff Kingd731f0a2013-01-23 06:24:23[diff] [blame]289 if (parse_config_key(var, "merge", &name, &namelen, &key) < 0 || !name)
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]290 return 0;
291
292 /*
293 * Find existing one as we might be processing merge.<name>.var2
294 * after seeing merge.<name>.var1.
295 */
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]296 for (fn = ll_user_merge; fn; fn = fn->next)
René Scharfef0e578c2024-02-10 07:43:01[diff] [blame]297 if (!xstrncmpz(fn->name, name, namelen))
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]298 break;
299 if (!fn) {
René Scharfeca56dad2021-03-13 16:17:22[diff] [blame]300 CALLOC_ARRAY(fn, 1);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]301 fn->name = xmemdupz(name, namelen);
302 fn->fn = ll_ext_merge;
303 *ll_user_merge_tail = fn;
304 ll_user_merge_tail = &(fn->next);
305 }
306
Tanay Abhra6ea358f2014-08-13 12:43:04[diff] [blame]307 if (!strcmp("name", key))
308 return git_config_string(&fn->description, var, value);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]309
Jeff Kingd731f0a2013-01-23 06:24:23[diff] [blame]310 if (!strcmp("driver", key)) {
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]311 if (!value)
Jeff King92cecce2023-12-07 07:25:16[diff] [blame]312 return config_error_nonbool(var);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]313 /*
314 * merge.<name>.driver specifies the command line:
315 *
316 * command-line
317 *
318 * The command-line will be interpolated with the following
319 * tokens and is given to the shell:
320 *
321 * %O - temporary file name for the merge base.
322 * %A - temporary file name for our version.
323 * %B - temporary file name for the other branches' version.
Junio C Hamano23a64c92010-01-16 06:37:32[diff] [blame]324 * %L - conflict marker length
Junio C Hamanoef45bb12015-06-04 22:10:29[diff] [blame]325 * %P - the original path (safely quoted for the shell)
Antonin Delpeuch81effe92024-01-24 20:09:11[diff] [blame]326 * %S - the revision for the merge base
327 * %X - the revision for our version
328 * %Y - the revision for their version
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]329 *
Antonin Delpeuch81effe92024-01-24 20:09:11[diff] [blame]330 * If the file is not named indentically in all versions, then each
331 * revision is joined with the corresponding path, separated by a colon.
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]332 * The external merge driver should write the results in the
333 * file named by %A, and signal that it has done with zero exit
334 * status.
335 */
Jim Meyering90dce512009-06-14 19:47:54[diff] [blame]336 fn->cmdline = xstrdup(value);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]337 return 0;
338 }
339
Tanay Abhra6ea358f2014-08-13 12:43:04[diff] [blame]340 if (!strcmp("recursive", key))
341 return git_config_string(&fn->recursive, var, value);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]342
343 return 0;
344}
345
346static void initialize_ll_merge(void)
347{
348 if (ll_user_merge_tail)
349 return;
350 ll_user_merge_tail = &ll_user_merge;
Johannes Schindelinef90d6d2008-05-14 17:46:53[diff] [blame]351 git_config(read_merge_config, NULL);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]352}
353
354static const struct ll_merge_driver *find_ll_merge_driver(const char *merge_attr)
355{
356 struct ll_merge_driver *fn;
357 const char *name;
358 int i;
359
360 initialize_ll_merge();
361
362 if (ATTR_TRUE(merge_attr))
363 return &ll_merge_drv[LL_TEXT_MERGE];
364 else if (ATTR_FALSE(merge_attr))
365 return &ll_merge_drv[LL_BINARY_MERGE];
366 else if (ATTR_UNSET(merge_attr)) {
367 if (!default_ll_merge)
368 return &ll_merge_drv[LL_TEXT_MERGE];
369 else
370 name = default_ll_merge;
371 }
372 else
373 name = merge_attr;
374
375 for (fn = ll_user_merge; fn; fn = fn->next)
376 if (!strcmp(fn->name, name))
377 return fn;
378
379 for (i = 0; i < ARRAY_SIZE(ll_merge_drv); i++)
380 if (!strcmp(ll_merge_drv[i].name, name))
381 return &ll_merge_drv[i];
382
383 /* default to the 3-way */
384 return &ll_merge_drv[LL_TEXT_MERGE];
385}
386
Nguyễn Thái Ngọc Duy32eaa462018-09-21 15:57:27[diff] [blame]387static void normalize_file(mmfile_t *mm, const char *path, struct index_state *istate)
Eyvind Bernhardsenf217f0e2010-07-02 19:20:47[diff] [blame]388{
389 struct strbuf strbuf = STRBUF_INIT;
Nguyễn Thái Ngọc Duy32eaa462018-09-21 15:57:27[diff] [blame]390 if (renormalize_buffer(istate, path, mm->ptr, mm->size, &strbuf)) {
Eyvind Bernhardsenf217f0e2010-07-02 19:20:47[diff] [blame]391 free(mm->ptr);
392 mm->size = strbuf.len;
393 mm->ptr = strbuf_detach(&strbuf, NULL);
394 }
395}
396
Elijah Newren35f69672022-02-02 02:37:30[diff] [blame]397enum ll_merge_result ll_merge(mmbuffer_t *result_buf,
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]398 const char *path,
Jonathan Niederf01de622010-03-21 00:38:58[diff] [blame]399 mmfile_t *ancestor, const char *ancestor_label,
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]400 mmfile_t *ours, const char *our_label,
401 mmfile_t *theirs, const char *their_label,
Nguyễn Thái Ngọc Duy32eaa462018-09-21 15:57:27[diff] [blame]402 struct index_state *istate,
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]403 const struct ll_merge_options *opts)
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]404{
brian m. carlson2c65d902019-09-02 22:39:44[diff] [blame]405 struct attr_check *check = load_merge_attributes();
Phillip Wood412aff72024-03-14 17:05:04[diff] [blame]406 static const struct ll_merge_options default_opts = LL_MERGE_OPTIONS_INIT;
Junio C Hamano23a64c92010-01-16 06:37:32[diff] [blame]407 const char *ll_driver_name = NULL;
408 int marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]409 const struct ll_merge_driver *driver;
410
Jonathan Nieder4fb40c22011-01-16 01:08:42[diff] [blame]411 if (!opts)
412 opts = &default_opts;
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]413
414 if (opts->renormalize) {
Nguyễn Thái Ngọc Duy32eaa462018-09-21 15:57:27[diff] [blame]415 normalize_file(ancestor, path, istate);
416 normalize_file(ours, path, istate);
417 normalize_file(theirs, path, istate);
Eyvind Bernhardsenf217f0e2010-07-02 19:20:47[diff] [blame]418 }
Junio C Hamano2aef63d2017-01-28 02:01:57[diff] [blame]419
John Cai44451a22023-05-06 04:15:29[diff] [blame]420 git_check_attr(istate, path, check);
Torsten Bögershausend64324c2018-09-12 19:32:02[diff] [blame]421 ll_driver_name = check->items[0].value;
422 if (check->items[1].value) {
423 marker_size = atoi(check->items[1].value);
424 if (marker_size <= 0)
425 marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
Junio C Hamano23a64c92010-01-16 06:37:32[diff] [blame]426 }
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]427 driver = find_ll_merge_driver(ll_driver_name);
Junio C Hamanod694a172016-04-14 22:35:09[diff] [blame]428
429 if (opts->virtual_ancestor) {
430 if (driver->recursive)
431 driver = find_ll_merge_driver(driver->recursive);
Elijah Newrenb2a79422018-11-08 04:40:24[diff] [blame]432 }
433 if (opts->extra_marker_size) {
434 marker_size += opts->extra_marker_size;
Junio C Hamanod694a172016-04-14 22:35:09[diff] [blame]435 }
Jonathan Niederf01de622010-03-21 00:38:58[diff] [blame]436 return driver->fn(driver, result_buf, path, ancestor, ancestor_label,
Junio C Hamano23a64c92010-01-16 06:37:32[diff] [blame]437 ours, our_label, theirs, their_label,
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]438 opts, marker_size);
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]439}
Junio C Hamano85885672010-01-17 07:28:46[diff] [blame]440
Nguyễn Thái Ngọc Duy32eaa462018-09-21 15:57:27[diff] [blame]441int ll_merge_marker_size(struct index_state *istate, const char *path)
Junio C Hamano85885672010-01-17 07:28:46[diff] [blame]442{
Junio C Hamano2aef63d2017-01-28 02:01:57[diff] [blame]443 static struct attr_check *check;
Junio C Hamano85885672010-01-17 07:28:46[diff] [blame]444 int marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
445
Junio C Hamano2aef63d2017-01-28 02:01:57[diff] [blame]446 if (!check)
447 check = attr_check_initl("conflict-marker-size", NULL);
John Cai44451a22023-05-06 04:15:29[diff] [blame]448 git_check_attr(istate, path, check);
Torsten Bögershausend64324c2018-09-12 19:32:02[diff] [blame]449 if (check->items[0].value) {
Junio C Hamano2aef63d2017-01-28 02:01:57[diff] [blame]450 marker_size = atoi(check->items[0].value);
Junio C Hamano85885672010-01-17 07:28:46[diff] [blame]451 if (marker_size <= 0)
452 marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
453 }
454 return marker_size;
Junio C Hamano525ab632007-12-24 08:36:00[diff] [blame]455}