]>
Commit | Line | Data |
---|---|---|
9047ebbc MV |
1 | /* |
2 | * Recursive Merge algorithm stolen from git-merge-recursive.py by | |
3 | * Fredrik Kuivinen. | |
4 | * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006 | |
5 | */ | |
4c371f91 | 6 | #include "advice.h" |
9047ebbc MV |
7 | #include "cache.h" |
8 | #include "cache-tree.h" | |
9 | #include "commit.h" | |
10 | #include "blob.h" | |
11 | #include "builtin.h" | |
12 | #include "tree-walk.h" | |
13 | #include "diff.h" | |
14 | #include "diffcore.h" | |
15 | #include "tag.h" | |
16 | #include "unpack-trees.h" | |
17 | #include "string-list.h" | |
18 | #include "xdiff-interface.h" | |
19 | #include "ll-merge.h" | |
9047ebbc MV |
20 | #include "attr.h" |
21 | #include "merge-recursive.h" | |
9800c0df | 22 | #include "dir.h" |
68d03e4a | 23 | #include "submodule.h" |
9047ebbc | 24 | |
85e51b78 JH |
25 | static struct tree *shift_tree_object(struct tree *one, struct tree *two, |
26 | const char *subtree_shift) | |
9047ebbc MV |
27 | { |
28 | unsigned char shifted[20]; | |
29 | ||
85e51b78 JH |
30 | if (!*subtree_shift) { |
31 | shift_tree(one->object.sha1, two->object.sha1, shifted, 0); | |
32 | } else { | |
33 | shift_tree_by(one->object.sha1, two->object.sha1, shifted, | |
34 | subtree_shift); | |
35 | } | |
9047ebbc MV |
36 | if (!hashcmp(two->object.sha1, shifted)) |
37 | return two; | |
38 | return lookup_tree(shifted); | |
39 | } | |
40 | ||
41 | /* | |
a6f63ae0 | 42 | * A virtual commit has (const char *)commit->util set to the name. |
9047ebbc MV |
43 | */ |
44 | ||
2af202be | 45 | static struct commit *make_virtual_commit(struct tree *tree, const char *comment) |
9047ebbc MV |
46 | { |
47 | struct commit *commit = xcalloc(1, sizeof(struct commit)); | |
9047ebbc MV |
48 | commit->tree = tree; |
49 | commit->util = (void*)comment; | |
9047ebbc MV |
50 | /* avoid warnings */ |
51 | commit->object.parsed = 1; | |
52 | return commit; | |
53 | } | |
54 | ||
55 | /* | |
56 | * Since we use get_tree_entry(), which does not put the read object into | |
57 | * the object pool, we cannot rely on a == b. | |
58 | */ | |
59 | static int sha_eq(const unsigned char *a, const unsigned char *b) | |
60 | { | |
61 | if (!a && !b) | |
62 | return 2; | |
63 | return a && b && hashcmp(a, b) == 0; | |
64 | } | |
65 | ||
66 | /* | |
67 | * Since we want to write the index eventually, we cannot reuse the index | |
68 | * for these (temporary) data. | |
69 | */ | |
70 | struct stage_data | |
71 | { | |
72 | struct | |
73 | { | |
74 | unsigned mode; | |
75 | unsigned char sha[20]; | |
76 | } stages[4]; | |
77 | unsigned processed:1; | |
78 | }; | |
79 | ||
8a2fce18 | 80 | static int show(struct merge_options *o, int v) |
9047ebbc | 81 | { |
5033639c | 82 | return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5; |
9047ebbc MV |
83 | } |
84 | ||
c7d84924 | 85 | static void flush_output(struct merge_options *o) |
9047ebbc | 86 | { |
c7d84924 MV |
87 | if (o->obuf.len) { |
88 | fputs(o->obuf.buf, stdout); | |
89 | strbuf_reset(&o->obuf); | |
9047ebbc MV |
90 | } |
91 | } | |
92 | ||
28bea9e5 | 93 | __attribute__((format (printf, 3, 4))) |
8a2fce18 | 94 | static void output(struct merge_options *o, int v, const char *fmt, ...) |
9047ebbc MV |
95 | { |
96 | int len; | |
97 | va_list ap; | |
98 | ||
8a2fce18 | 99 | if (!show(o, v)) |
9047ebbc MV |
100 | return; |
101 | ||
c7d84924 MV |
102 | strbuf_grow(&o->obuf, o->call_depth * 2 + 2); |
103 | memset(o->obuf.buf + o->obuf.len, ' ', o->call_depth * 2); | |
104 | strbuf_setlen(&o->obuf, o->obuf.len + o->call_depth * 2); | |
9047ebbc MV |
105 | |
106 | va_start(ap, fmt); | |
c7d84924 | 107 | len = vsnprintf(o->obuf.buf + o->obuf.len, strbuf_avail(&o->obuf), fmt, ap); |
9047ebbc MV |
108 | va_end(ap); |
109 | ||
110 | if (len < 0) | |
111 | len = 0; | |
c7d84924 MV |
112 | if (len >= strbuf_avail(&o->obuf)) { |
113 | strbuf_grow(&o->obuf, len + 2); | |
9047ebbc | 114 | va_start(ap, fmt); |
c7d84924 | 115 | len = vsnprintf(o->obuf.buf + o->obuf.len, strbuf_avail(&o->obuf), fmt, ap); |
9047ebbc | 116 | va_end(ap); |
c7d84924 | 117 | if (len >= strbuf_avail(&o->obuf)) { |
9047ebbc MV |
118 | die("this should not happen, your snprintf is broken"); |
119 | } | |
120 | } | |
c7d84924 MV |
121 | strbuf_setlen(&o->obuf, o->obuf.len + len); |
122 | strbuf_add(&o->obuf, "\n", 1); | |
8a2fce18 | 123 | if (!o->buffer_output) |
c7d84924 | 124 | flush_output(o); |
9047ebbc MV |
125 | } |
126 | ||
5033639c | 127 | static void output_commit_title(struct merge_options *o, struct commit *commit) |
9047ebbc MV |
128 | { |
129 | int i; | |
c7d84924 | 130 | flush_output(o); |
5033639c | 131 | for (i = o->call_depth; i--;) |
9047ebbc MV |
132 | fputs(" ", stdout); |
133 | if (commit->util) | |
134 | printf("virtual %s\n", (char *)commit->util); | |
135 | else { | |
136 | printf("%s ", find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV)); | |
137 | if (parse_commit(commit) != 0) | |
138 | printf("(bad commit)\n"); | |
139 | else { | |
49b7120e CC |
140 | const char *title; |
141 | int len = find_commit_subject(commit->buffer, &title); | |
142 | if (len) | |
143 | printf("%.*s\n", len, title); | |
9047ebbc MV |
144 | } |
145 | } | |
146 | } | |
147 | ||
148 | static int add_cacheinfo(unsigned int mode, const unsigned char *sha1, | |
149 | const char *path, int stage, int refresh, int options) | |
150 | { | |
151 | struct cache_entry *ce; | |
152 | ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage, refresh); | |
153 | if (!ce) | |
154 | return error("addinfo_cache failed for path '%s'", path); | |
155 | return add_cache_entry(ce, options); | |
156 | } | |
157 | ||
9047ebbc MV |
158 | static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree) |
159 | { | |
160 | parse_tree(tree); | |
161 | init_tree_desc(desc, tree->buffer, tree->size); | |
162 | } | |
163 | ||
164 | static int git_merge_trees(int index_only, | |
165 | struct tree *common, | |
166 | struct tree *head, | |
167 | struct tree *merge) | |
168 | { | |
169 | int rc; | |
170 | struct tree_desc t[3]; | |
171 | struct unpack_trees_options opts; | |
172 | ||
173 | memset(&opts, 0, sizeof(opts)); | |
174 | if (index_only) | |
175 | opts.index_only = 1; | |
176 | else | |
177 | opts.update = 1; | |
178 | opts.merge = 1; | |
179 | opts.head_idx = 2; | |
180 | opts.fn = threeway_merge; | |
181 | opts.src_index = &the_index; | |
182 | opts.dst_index = &the_index; | |
e294030f | 183 | setup_unpack_trees_porcelain(&opts, "merge"); |
9047ebbc MV |
184 | |
185 | init_tree_desc_from_tree(t+0, common); | |
186 | init_tree_desc_from_tree(t+1, head); | |
187 | init_tree_desc_from_tree(t+2, merge); | |
188 | ||
189 | rc = unpack_trees(3, t, &opts); | |
190 | cache_tree_free(&active_cache_tree); | |
191 | return rc; | |
192 | } | |
193 | ||
8a2fce18 | 194 | struct tree *write_tree_from_memory(struct merge_options *o) |
9047ebbc MV |
195 | { |
196 | struct tree *result = NULL; | |
197 | ||
198 | if (unmerged_cache()) { | |
199 | int i; | |
19c6a4f8 | 200 | fprintf(stderr, "BUG: There are unmerged index entries:\n"); |
9047ebbc MV |
201 | for (i = 0; i < active_nr; i++) { |
202 | struct cache_entry *ce = active_cache[i]; | |
203 | if (ce_stage(ce)) | |
19c6a4f8 JH |
204 | fprintf(stderr, "BUG: %d %.*s", ce_stage(ce), |
205 | (int)ce_namelen(ce), ce->name); | |
9047ebbc | 206 | } |
19c6a4f8 | 207 | die("Bug in merge-recursive.c"); |
9047ebbc MV |
208 | } |
209 | ||
210 | if (!active_cache_tree) | |
211 | active_cache_tree = cache_tree(); | |
212 | ||
213 | if (!cache_tree_fully_valid(active_cache_tree) && | |
214 | cache_tree_update(active_cache_tree, | |
215 | active_cache, active_nr, 0, 0) < 0) | |
216 | die("error building trees"); | |
217 | ||
218 | result = lookup_tree(active_cache_tree->sha1); | |
219 | ||
220 | return result; | |
221 | } | |
222 | ||
223 | static int save_files_dirs(const unsigned char *sha1, | |
224 | const char *base, int baselen, const char *path, | |
225 | unsigned int mode, int stage, void *context) | |
226 | { | |
227 | int len = strlen(path); | |
228 | char *newpath = xmalloc(baselen + len + 1); | |
696ee23c MV |
229 | struct merge_options *o = context; |
230 | ||
9047ebbc MV |
231 | memcpy(newpath, base, baselen); |
232 | memcpy(newpath + baselen, path, len); | |
233 | newpath[baselen + len] = '\0'; | |
234 | ||
235 | if (S_ISDIR(mode)) | |
78a395d3 | 236 | string_list_insert(&o->current_directory_set, newpath); |
9047ebbc | 237 | else |
78a395d3 | 238 | string_list_insert(&o->current_file_set, newpath); |
9047ebbc MV |
239 | free(newpath); |
240 | ||
d3bee161 | 241 | return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0); |
9047ebbc MV |
242 | } |
243 | ||
696ee23c | 244 | static int get_files_dirs(struct merge_options *o, struct tree *tree) |
9047ebbc MV |
245 | { |
246 | int n; | |
696ee23c | 247 | if (read_tree_recursive(tree, "", 0, 0, NULL, save_files_dirs, o)) |
9047ebbc | 248 | return 0; |
696ee23c | 249 | n = o->current_file_set.nr + o->current_directory_set.nr; |
9047ebbc MV |
250 | return n; |
251 | } | |
252 | ||
253 | /* | |
254 | * Returns an index_entry instance which doesn't have to correspond to | |
255 | * a real cache entry in Git's index. | |
256 | */ | |
257 | static struct stage_data *insert_stage_data(const char *path, | |
258 | struct tree *o, struct tree *a, struct tree *b, | |
259 | struct string_list *entries) | |
260 | { | |
261 | struct string_list_item *item; | |
262 | struct stage_data *e = xcalloc(1, sizeof(struct stage_data)); | |
263 | get_tree_entry(o->object.sha1, path, | |
264 | e->stages[1].sha, &e->stages[1].mode); | |
265 | get_tree_entry(a->object.sha1, path, | |
266 | e->stages[2].sha, &e->stages[2].mode); | |
267 | get_tree_entry(b->object.sha1, path, | |
268 | e->stages[3].sha, &e->stages[3].mode); | |
78a395d3 | 269 | item = string_list_insert(entries, path); |
9047ebbc MV |
270 | item->util = e; |
271 | return e; | |
272 | } | |
273 | ||
274 | /* | |
275 | * Create a dictionary mapping file names to stage_data objects. The | |
276 | * dictionary contains one entry for every path with a non-zero stage entry. | |
277 | */ | |
278 | static struct string_list *get_unmerged(void) | |
279 | { | |
280 | struct string_list *unmerged = xcalloc(1, sizeof(struct string_list)); | |
281 | int i; | |
282 | ||
283 | unmerged->strdup_strings = 1; | |
284 | ||
285 | for (i = 0; i < active_nr; i++) { | |
286 | struct string_list_item *item; | |
287 | struct stage_data *e; | |
288 | struct cache_entry *ce = active_cache[i]; | |
289 | if (!ce_stage(ce)) | |
290 | continue; | |
291 | ||
e8c8b713 | 292 | item = string_list_lookup(unmerged, ce->name); |
9047ebbc | 293 | if (!item) { |
78a395d3 | 294 | item = string_list_insert(unmerged, ce->name); |
9047ebbc MV |
295 | item->util = xcalloc(1, sizeof(struct stage_data)); |
296 | } | |
297 | e = item->util; | |
298 | e->stages[ce_stage(ce)].mode = ce->ce_mode; | |
299 | hashcpy(e->stages[ce_stage(ce)].sha, ce->sha1); | |
300 | } | |
301 | ||
302 | return unmerged; | |
303 | } | |
304 | ||
305 | struct rename | |
306 | { | |
307 | struct diff_filepair *pair; | |
308 | struct stage_data *src_entry; | |
309 | struct stage_data *dst_entry; | |
310 | unsigned processed:1; | |
311 | }; | |
312 | ||
313 | /* | |
314 | * Get information of all renames which occurred between 'o_tree' and | |
315 | * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and | |
316 | * 'b_tree') to be able to associate the correct cache entries with | |
317 | * the rename information. 'tree' is always equal to either a_tree or b_tree. | |
318 | */ | |
8a2fce18 MV |
319 | static struct string_list *get_renames(struct merge_options *o, |
320 | struct tree *tree, | |
321 | struct tree *o_tree, | |
322 | struct tree *a_tree, | |
323 | struct tree *b_tree, | |
324 | struct string_list *entries) | |
9047ebbc MV |
325 | { |
326 | int i; | |
327 | struct string_list *renames; | |
328 | struct diff_options opts; | |
329 | ||
330 | renames = xcalloc(1, sizeof(struct string_list)); | |
331 | diff_setup(&opts); | |
332 | DIFF_OPT_SET(&opts, RECURSIVE); | |
333 | opts.detect_rename = DIFF_DETECT_RENAME; | |
8a2fce18 MV |
334 | opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit : |
335 | o->diff_rename_limit >= 0 ? o->diff_rename_limit : | |
9047ebbc | 336 | 500; |
10ae7526 | 337 | opts.rename_score = o->rename_score; |
9047ebbc MV |
338 | opts.warn_on_too_large_rename = 1; |
339 | opts.output_format = DIFF_FORMAT_NO_OUTPUT; | |
340 | if (diff_setup_done(&opts) < 0) | |
341 | die("diff setup failed"); | |
342 | diff_tree_sha1(o_tree->object.sha1, tree->object.sha1, "", &opts); | |
343 | diffcore_std(&opts); | |
344 | for (i = 0; i < diff_queued_diff.nr; ++i) { | |
345 | struct string_list_item *item; | |
346 | struct rename *re; | |
347 | struct diff_filepair *pair = diff_queued_diff.queue[i]; | |
348 | if (pair->status != 'R') { | |
349 | diff_free_filepair(pair); | |
350 | continue; | |
351 | } | |
352 | re = xmalloc(sizeof(*re)); | |
353 | re->processed = 0; | |
354 | re->pair = pair; | |
e8c8b713 | 355 | item = string_list_lookup(entries, re->pair->one->path); |
9047ebbc MV |
356 | if (!item) |
357 | re->src_entry = insert_stage_data(re->pair->one->path, | |
358 | o_tree, a_tree, b_tree, entries); | |
359 | else | |
360 | re->src_entry = item->util; | |
361 | ||
e8c8b713 | 362 | item = string_list_lookup(entries, re->pair->two->path); |
9047ebbc MV |
363 | if (!item) |
364 | re->dst_entry = insert_stage_data(re->pair->two->path, | |
365 | o_tree, a_tree, b_tree, entries); | |
366 | else | |
367 | re->dst_entry = item->util; | |
78a395d3 | 368 | item = string_list_insert(renames, pair->one->path); |
9047ebbc MV |
369 | item->util = re; |
370 | } | |
371 | opts.output_format = DIFF_FORMAT_NO_OUTPUT; | |
372 | diff_queued_diff.nr = 0; | |
373 | diff_flush(&opts); | |
374 | return renames; | |
375 | } | |
376 | ||
377 | static int update_stages(const char *path, struct diff_filespec *o, | |
378 | struct diff_filespec *a, struct diff_filespec *b, | |
379 | int clear) | |
380 | { | |
381 | int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE; | |
382 | if (clear) | |
383 | if (remove_file_from_cache(path)) | |
384 | return -1; | |
385 | if (o) | |
386 | if (add_cacheinfo(o->mode, o->sha1, path, 1, 0, options)) | |
387 | return -1; | |
388 | if (a) | |
389 | if (add_cacheinfo(a->mode, a->sha1, path, 2, 0, options)) | |
390 | return -1; | |
391 | if (b) | |
392 | if (add_cacheinfo(b->mode, b->sha1, path, 3, 0, options)) | |
393 | return -1; | |
394 | return 0; | |
395 | } | |
396 | ||
b7fa51da MV |
397 | static int remove_file(struct merge_options *o, int clean, |
398 | const char *path, int no_wd) | |
9047ebbc | 399 | { |
b7fa51da MV |
400 | int update_cache = o->call_depth || clean; |
401 | int update_working_directory = !o->call_depth && !no_wd; | |
9047ebbc MV |
402 | |
403 | if (update_cache) { | |
404 | if (remove_file_from_cache(path)) | |
405 | return -1; | |
406 | } | |
407 | if (update_working_directory) { | |
25755e84 | 408 | if (remove_path(path)) |
9047ebbc | 409 | return -1; |
9047ebbc MV |
410 | } |
411 | return 0; | |
412 | } | |
413 | ||
696ee23c | 414 | static char *unique_path(struct merge_options *o, const char *path, const char *branch) |
9047ebbc MV |
415 | { |
416 | char *newpath = xmalloc(strlen(path) + 1 + strlen(branch) + 8 + 1); | |
417 | int suffix = 0; | |
418 | struct stat st; | |
419 | char *p = newpath + strlen(path); | |
420 | strcpy(newpath, path); | |
421 | *(p++) = '~'; | |
422 | strcpy(p, branch); | |
423 | for (; *p; ++p) | |
424 | if ('/' == *p) | |
425 | *p = '_'; | |
696ee23c MV |
426 | while (string_list_has_string(&o->current_file_set, newpath) || |
427 | string_list_has_string(&o->current_directory_set, newpath) || | |
9047ebbc MV |
428 | lstat(newpath, &st) == 0) |
429 | sprintf(p, "_%d", suffix++); | |
430 | ||
78a395d3 | 431 | string_list_insert(&o->current_file_set, newpath); |
9047ebbc MV |
432 | return newpath; |
433 | } | |
434 | ||
435 | static void flush_buffer(int fd, const char *buf, unsigned long size) | |
436 | { | |
437 | while (size > 0) { | |
438 | long ret = write_in_full(fd, buf, size); | |
439 | if (ret < 0) { | |
440 | /* Ignore epipe */ | |
441 | if (errno == EPIPE) | |
442 | break; | |
d824cbba | 443 | die_errno("merge-recursive"); |
9047ebbc MV |
444 | } else if (!ret) { |
445 | die("merge-recursive: disk full?"); | |
446 | } | |
447 | size -= ret; | |
448 | buf += ret; | |
449 | } | |
450 | } | |
451 | ||
60c91181 JH |
452 | static int would_lose_untracked(const char *path) |
453 | { | |
454 | int pos = cache_name_pos(path, strlen(path)); | |
455 | ||
456 | if (pos < 0) | |
457 | pos = -1 - pos; | |
458 | while (pos < active_nr && | |
459 | !strcmp(path, active_cache[pos]->name)) { | |
460 | /* | |
461 | * If stage #0, it is definitely tracked. | |
462 | * If it has stage #2 then it was tracked | |
463 | * before this merge started. All other | |
464 | * cases the path was not tracked. | |
465 | */ | |
466 | switch (ce_stage(active_cache[pos])) { | |
467 | case 0: | |
468 | case 2: | |
469 | return 0; | |
470 | } | |
471 | pos++; | |
472 | } | |
473 | return file_exists(path); | |
474 | } | |
475 | ||
9047ebbc MV |
476 | static int make_room_for_path(const char *path) |
477 | { | |
478 | int status; | |
479 | const char *msg = "failed to create path '%s'%s"; | |
480 | ||
481 | status = safe_create_leading_directories_const(path); | |
482 | if (status) { | |
483 | if (status == -3) { | |
484 | /* something else exists */ | |
485 | error(msg, path, ": perhaps a D/F conflict?"); | |
486 | return -1; | |
487 | } | |
488 | die(msg, path, ""); | |
489 | } | |
490 | ||
60c91181 JH |
491 | /* |
492 | * Do not unlink a file in the work tree if we are not | |
493 | * tracking it. | |
494 | */ | |
495 | if (would_lose_untracked(path)) | |
496 | return error("refusing to lose untracked file at '%s'", | |
497 | path); | |
498 | ||
9047ebbc MV |
499 | /* Successful unlink is good.. */ |
500 | if (!unlink(path)) | |
501 | return 0; | |
502 | /* .. and so is no existing file */ | |
503 | if (errno == ENOENT) | |
504 | return 0; | |
505 | /* .. but not some other error (who really cares what?) */ | |
506 | return error(msg, path, ": perhaps a D/F conflict?"); | |
507 | } | |
508 | ||
b7fa51da MV |
509 | static void update_file_flags(struct merge_options *o, |
510 | const unsigned char *sha, | |
9047ebbc MV |
511 | unsigned mode, |
512 | const char *path, | |
513 | int update_cache, | |
514 | int update_wd) | |
515 | { | |
b7fa51da | 516 | if (o->call_depth) |
9047ebbc MV |
517 | update_wd = 0; |
518 | ||
519 | if (update_wd) { | |
520 | enum object_type type; | |
521 | void *buf; | |
522 | unsigned long size; | |
523 | ||
68d03e4a | 524 | if (S_ISGITLINK(mode)) { |
0c44c943 JH |
525 | /* |
526 | * We may later decide to recursively descend into | |
527 | * the submodule directory and update its index | |
528 | * and/or work tree, but we do not do that now. | |
529 | */ | |
68d03e4a | 530 | update_wd = 0; |
0c44c943 | 531 | goto update_index; |
68d03e4a | 532 | } |
9047ebbc MV |
533 | |
534 | buf = read_sha1_file(sha, &type, &size); | |
535 | if (!buf) | |
536 | die("cannot read object %s '%s'", sha1_to_hex(sha), path); | |
537 | if (type != OBJ_BLOB) | |
538 | die("blob expected for %s '%s'", sha1_to_hex(sha), path); | |
539 | if (S_ISREG(mode)) { | |
f285a2d7 | 540 | struct strbuf strbuf = STRBUF_INIT; |
9047ebbc MV |
541 | if (convert_to_working_tree(path, buf, size, &strbuf)) { |
542 | free(buf); | |
543 | size = strbuf.len; | |
544 | buf = strbuf_detach(&strbuf, NULL); | |
545 | } | |
546 | } | |
547 | ||
548 | if (make_room_for_path(path) < 0) { | |
549 | update_wd = 0; | |
550 | free(buf); | |
551 | goto update_index; | |
552 | } | |
553 | if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) { | |
554 | int fd; | |
555 | if (mode & 0100) | |
556 | mode = 0777; | |
557 | else | |
558 | mode = 0666; | |
559 | fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode); | |
560 | if (fd < 0) | |
d824cbba | 561 | die_errno("failed to open '%s'", path); |
9047ebbc MV |
562 | flush_buffer(fd, buf, size); |
563 | close(fd); | |
564 | } else if (S_ISLNK(mode)) { | |
565 | char *lnk = xmemdupz(buf, size); | |
566 | safe_create_leading_directories_const(path); | |
567 | unlink(path); | |
304dcf26 | 568 | if (symlink(lnk, path)) |
d824cbba | 569 | die_errno("failed to symlink '%s'", path); |
9047ebbc MV |
570 | free(lnk); |
571 | } else | |
572 | die("do not know what to do with %06o %s '%s'", | |
573 | mode, sha1_to_hex(sha), path); | |
574 | free(buf); | |
575 | } | |
576 | update_index: | |
577 | if (update_cache) | |
578 | add_cacheinfo(mode, sha, path, 0, update_wd, ADD_CACHE_OK_TO_ADD); | |
579 | } | |
580 | ||
b7fa51da MV |
581 | static void update_file(struct merge_options *o, |
582 | int clean, | |
9047ebbc MV |
583 | const unsigned char *sha, |
584 | unsigned mode, | |
585 | const char *path) | |
586 | { | |
b7fa51da | 587 | update_file_flags(o, sha, mode, path, o->call_depth || clean, !o->call_depth); |
9047ebbc MV |
588 | } |
589 | ||
590 | /* Low level file merging, update and removal */ | |
591 | ||
592 | struct merge_file_info | |
593 | { | |
594 | unsigned char sha[20]; | |
595 | unsigned mode; | |
596 | unsigned clean:1, | |
597 | merge:1; | |
598 | }; | |
599 | ||
b7fa51da MV |
600 | static int merge_3way(struct merge_options *o, |
601 | mmbuffer_t *result_buf, | |
602 | struct diff_filespec *one, | |
9047ebbc MV |
603 | struct diff_filespec *a, |
604 | struct diff_filespec *b, | |
605 | const char *branch1, | |
606 | const char *branch2) | |
607 | { | |
608 | mmfile_t orig, src1, src2; | |
712516bc | 609 | struct ll_merge_options ll_opts = {0}; |
4c5868f4 | 610 | char *base_name, *name1, *name2; |
9047ebbc | 611 | int merge_status; |
8cc5b290 | 612 | |
712516bc | 613 | ll_opts.renormalize = o->renormalize; |
58a1ece4 | 614 | ll_opts.xdl_opts = o->xdl_opts; |
712516bc JN |
615 | |
616 | if (o->call_depth) { | |
617 | ll_opts.virtual_ancestor = 1; | |
618 | ll_opts.variant = 0; | |
619 | } else { | |
8cc5b290 AP |
620 | switch (o->recursive_variant) { |
621 | case MERGE_RECURSIVE_OURS: | |
712516bc | 622 | ll_opts.variant = XDL_MERGE_FAVOR_OURS; |
8cc5b290 AP |
623 | break; |
624 | case MERGE_RECURSIVE_THEIRS: | |
712516bc | 625 | ll_opts.variant = XDL_MERGE_FAVOR_THEIRS; |
8cc5b290 AP |
626 | break; |
627 | default: | |
712516bc | 628 | ll_opts.variant = 0; |
8cc5b290 AP |
629 | break; |
630 | } | |
631 | } | |
9047ebbc | 632 | |
4c5868f4 JN |
633 | if (strcmp(a->path, b->path) || |
634 | (o->ancestor != NULL && strcmp(a->path, one->path) != 0)) { | |
635 | base_name = o->ancestor == NULL ? NULL : | |
636 | xstrdup(mkpath("%s:%s", o->ancestor, one->path)); | |
606475f3 MR |
637 | name1 = xstrdup(mkpath("%s:%s", branch1, a->path)); |
638 | name2 = xstrdup(mkpath("%s:%s", branch2, b->path)); | |
639 | } else { | |
4c5868f4 JN |
640 | base_name = o->ancestor == NULL ? NULL : |
641 | xstrdup(mkpath("%s", o->ancestor)); | |
606475f3 MR |
642 | name1 = xstrdup(mkpath("%s", branch1)); |
643 | name2 = xstrdup(mkpath("%s", branch2)); | |
644 | } | |
9047ebbc | 645 | |
06b65939 ML |
646 | read_mmblob(&orig, one->sha1); |
647 | read_mmblob(&src1, a->sha1); | |
648 | read_mmblob(&src2, b->sha1); | |
9047ebbc | 649 | |
4c5868f4 | 650 | merge_status = ll_merge(result_buf, a->path, &orig, base_name, |
712516bc | 651 | &src1, name1, &src2, name2, &ll_opts); |
9047ebbc MV |
652 | |
653 | free(name1); | |
654 | free(name2); | |
655 | free(orig.ptr); | |
656 | free(src1.ptr); | |
657 | free(src2.ptr); | |
658 | return merge_status; | |
659 | } | |
660 | ||
b7fa51da MV |
661 | static struct merge_file_info merge_file(struct merge_options *o, |
662 | struct diff_filespec *one, | |
663 | struct diff_filespec *a, | |
664 | struct diff_filespec *b, | |
665 | const char *branch1, | |
666 | const char *branch2) | |
9047ebbc MV |
667 | { |
668 | struct merge_file_info result; | |
669 | result.merge = 0; | |
670 | result.clean = 1; | |
671 | ||
672 | if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) { | |
673 | result.clean = 0; | |
674 | if (S_ISREG(a->mode)) { | |
675 | result.mode = a->mode; | |
676 | hashcpy(result.sha, a->sha1); | |
677 | } else { | |
678 | result.mode = b->mode; | |
679 | hashcpy(result.sha, b->sha1); | |
680 | } | |
681 | } else { | |
b7fa51da | 682 | if (!sha_eq(a->sha1, one->sha1) && !sha_eq(b->sha1, one->sha1)) |
9047ebbc MV |
683 | result.merge = 1; |
684 | ||
685 | /* | |
686 | * Merge modes | |
687 | */ | |
b7fa51da | 688 | if (a->mode == b->mode || a->mode == one->mode) |
9047ebbc MV |
689 | result.mode = b->mode; |
690 | else { | |
691 | result.mode = a->mode; | |
b7fa51da | 692 | if (b->mode != one->mode) { |
9047ebbc MV |
693 | result.clean = 0; |
694 | result.merge = 1; | |
695 | } | |
696 | } | |
697 | ||
b7fa51da | 698 | if (sha_eq(a->sha1, b->sha1) || sha_eq(a->sha1, one->sha1)) |
9047ebbc | 699 | hashcpy(result.sha, b->sha1); |
b7fa51da | 700 | else if (sha_eq(b->sha1, one->sha1)) |
9047ebbc MV |
701 | hashcpy(result.sha, a->sha1); |
702 | else if (S_ISREG(a->mode)) { | |
703 | mmbuffer_t result_buf; | |
704 | int merge_status; | |
705 | ||
b7fa51da | 706 | merge_status = merge_3way(o, &result_buf, one, a, b, |
9047ebbc MV |
707 | branch1, branch2); |
708 | ||
709 | if ((merge_status < 0) || !result_buf.ptr) | |
710 | die("Failed to execute internal merge"); | |
711 | ||
712 | if (write_sha1_file(result_buf.ptr, result_buf.size, | |
713 | blob_type, result.sha)) | |
714 | die("Unable to add %s to database", | |
715 | a->path); | |
716 | ||
717 | free(result_buf.ptr); | |
718 | result.clean = (merge_status == 0); | |
719 | } else if (S_ISGITLINK(a->mode)) { | |
68d03e4a HV |
720 | result.clean = merge_submodule(result.sha, one->path, one->sha1, |
721 | a->sha1, b->sha1); | |
9047ebbc MV |
722 | } else if (S_ISLNK(a->mode)) { |
723 | hashcpy(result.sha, a->sha1); | |
724 | ||
725 | if (!sha_eq(a->sha1, b->sha1)) | |
726 | result.clean = 0; | |
727 | } else { | |
728 | die("unsupported object type in the tree"); | |
729 | } | |
730 | } | |
731 | ||
732 | return result; | |
733 | } | |
734 | ||
8a2fce18 MV |
735 | static void conflict_rename_rename(struct merge_options *o, |
736 | struct rename *ren1, | |
9047ebbc MV |
737 | const char *branch1, |
738 | struct rename *ren2, | |
739 | const char *branch2) | |
740 | { | |
741 | char *del[2]; | |
742 | int delp = 0; | |
743 | const char *ren1_dst = ren1->pair->two->path; | |
744 | const char *ren2_dst = ren2->pair->two->path; | |
745 | const char *dst_name1 = ren1_dst; | |
746 | const char *dst_name2 = ren2_dst; | |
696ee23c MV |
747 | if (string_list_has_string(&o->current_directory_set, ren1_dst)) { |
748 | dst_name1 = del[delp++] = unique_path(o, ren1_dst, branch1); | |
8a2fce18 | 749 | output(o, 1, "%s is a directory in %s adding as %s instead", |
9047ebbc | 750 | ren1_dst, branch2, dst_name1); |
b7fa51da | 751 | remove_file(o, 0, ren1_dst, 0); |
9047ebbc | 752 | } |
696ee23c MV |
753 | if (string_list_has_string(&o->current_directory_set, ren2_dst)) { |
754 | dst_name2 = del[delp++] = unique_path(o, ren2_dst, branch2); | |
8a2fce18 | 755 | output(o, 1, "%s is a directory in %s adding as %s instead", |
9047ebbc | 756 | ren2_dst, branch1, dst_name2); |
b7fa51da | 757 | remove_file(o, 0, ren2_dst, 0); |
9047ebbc | 758 | } |
b7fa51da | 759 | if (o->call_depth) { |
9047ebbc MV |
760 | remove_file_from_cache(dst_name1); |
761 | remove_file_from_cache(dst_name2); | |
762 | /* | |
763 | * Uncomment to leave the conflicting names in the resulting tree | |
764 | * | |
b7fa51da MV |
765 | * update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, dst_name1); |
766 | * update_file(o, 0, ren2->pair->two->sha1, ren2->pair->two->mode, dst_name2); | |
9047ebbc MV |
767 | */ |
768 | } else { | |
769 | update_stages(dst_name1, NULL, ren1->pair->two, NULL, 1); | |
770 | update_stages(dst_name2, NULL, NULL, ren2->pair->two, 1); | |
771 | } | |
772 | while (delp--) | |
773 | free(del[delp]); | |
774 | } | |
775 | ||
8a2fce18 MV |
776 | static void conflict_rename_dir(struct merge_options *o, |
777 | struct rename *ren1, | |
9047ebbc MV |
778 | const char *branch1) |
779 | { | |
696ee23c | 780 | char *new_path = unique_path(o, ren1->pair->two->path, branch1); |
8a2fce18 | 781 | output(o, 1, "Renaming %s to %s instead", ren1->pair->one->path, new_path); |
b7fa51da MV |
782 | remove_file(o, 0, ren1->pair->two->path, 0); |
783 | update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path); | |
9047ebbc MV |
784 | free(new_path); |
785 | } | |
786 | ||
8a2fce18 MV |
787 | static void conflict_rename_rename_2(struct merge_options *o, |
788 | struct rename *ren1, | |
9047ebbc MV |
789 | const char *branch1, |
790 | struct rename *ren2, | |
791 | const char *branch2) | |
792 | { | |
696ee23c MV |
793 | char *new_path1 = unique_path(o, ren1->pair->two->path, branch1); |
794 | char *new_path2 = unique_path(o, ren2->pair->two->path, branch2); | |
8a2fce18 | 795 | output(o, 1, "Renaming %s to %s and %s to %s instead", |
9047ebbc MV |
796 | ren1->pair->one->path, new_path1, |
797 | ren2->pair->one->path, new_path2); | |
b7fa51da MV |
798 | remove_file(o, 0, ren1->pair->two->path, 0); |
799 | update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path1); | |
800 | update_file(o, 0, ren2->pair->two->sha1, ren2->pair->two->mode, new_path2); | |
9047ebbc MV |
801 | free(new_path2); |
802 | free(new_path1); | |
803 | } | |
804 | ||
8a2fce18 MV |
805 | static int process_renames(struct merge_options *o, |
806 | struct string_list *a_renames, | |
807 | struct string_list *b_renames) | |
9047ebbc MV |
808 | { |
809 | int clean_merge = 1, i, j; | |
183113a5 TF |
810 | struct string_list a_by_dst = STRING_LIST_INIT_NODUP; |
811 | struct string_list b_by_dst = STRING_LIST_INIT_NODUP; | |
9047ebbc MV |
812 | const struct rename *sre; |
813 | ||
814 | for (i = 0; i < a_renames->nr; i++) { | |
815 | sre = a_renames->items[i].util; | |
78a395d3 | 816 | string_list_insert(&a_by_dst, sre->pair->two->path)->util |
9047ebbc MV |
817 | = sre->dst_entry; |
818 | } | |
819 | for (i = 0; i < b_renames->nr; i++) { | |
820 | sre = b_renames->items[i].util; | |
78a395d3 | 821 | string_list_insert(&b_by_dst, sre->pair->two->path)->util |
9047ebbc MV |
822 | = sre->dst_entry; |
823 | } | |
824 | ||
825 | for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) { | |
9047ebbc | 826 | char *src; |
8e24cbae | 827 | struct string_list *renames1, *renames2Dst; |
9047ebbc MV |
828 | struct rename *ren1 = NULL, *ren2 = NULL; |
829 | const char *branch1, *branch2; | |
830 | const char *ren1_src, *ren1_dst; | |
831 | ||
832 | if (i >= a_renames->nr) { | |
9047ebbc MV |
833 | ren2 = b_renames->items[j++].util; |
834 | } else if (j >= b_renames->nr) { | |
9047ebbc MV |
835 | ren1 = a_renames->items[i++].util; |
836 | } else { | |
8e24cbae BK |
837 | int compare = strcmp(a_renames->items[i].string, |
838 | b_renames->items[j].string); | |
9047ebbc MV |
839 | if (compare <= 0) |
840 | ren1 = a_renames->items[i++].util; | |
841 | if (compare >= 0) | |
842 | ren2 = b_renames->items[j++].util; | |
843 | } | |
844 | ||
845 | /* TODO: refactor, so that 1/2 are not needed */ | |
846 | if (ren1) { | |
847 | renames1 = a_renames; | |
9047ebbc | 848 | renames2Dst = &b_by_dst; |
8a2fce18 MV |
849 | branch1 = o->branch1; |
850 | branch2 = o->branch2; | |
9047ebbc MV |
851 | } else { |
852 | struct rename *tmp; | |
853 | renames1 = b_renames; | |
9047ebbc | 854 | renames2Dst = &a_by_dst; |
8a2fce18 MV |
855 | branch1 = o->branch2; |
856 | branch2 = o->branch1; | |
9047ebbc MV |
857 | tmp = ren2; |
858 | ren2 = ren1; | |
859 | ren1 = tmp; | |
860 | } | |
861 | src = ren1->pair->one->path; | |
862 | ||
863 | ren1->dst_entry->processed = 1; | |
864 | ren1->src_entry->processed = 1; | |
865 | ||
866 | if (ren1->processed) | |
867 | continue; | |
868 | ren1->processed = 1; | |
869 | ||
870 | ren1_src = ren1->pair->one->path; | |
871 | ren1_dst = ren1->pair->two->path; | |
872 | ||
873 | if (ren2) { | |
874 | const char *ren2_src = ren2->pair->one->path; | |
875 | const char *ren2_dst = ren2->pair->two->path; | |
876 | /* Renamed in 1 and renamed in 2 */ | |
877 | if (strcmp(ren1_src, ren2_src) != 0) | |
878 | die("ren1.src != ren2.src"); | |
879 | ren2->dst_entry->processed = 1; | |
880 | ren2->processed = 1; | |
881 | if (strcmp(ren1_dst, ren2_dst) != 0) { | |
882 | clean_merge = 0; | |
8a2fce18 | 883 | output(o, 1, "CONFLICT (rename/rename): " |
9047ebbc MV |
884 | "Rename \"%s\"->\"%s\" in branch \"%s\" " |
885 | "rename \"%s\"->\"%s\" in \"%s\"%s", | |
886 | src, ren1_dst, branch1, | |
887 | src, ren2_dst, branch2, | |
b7fa51da MV |
888 | o->call_depth ? " (left unresolved)": ""); |
889 | if (o->call_depth) { | |
9047ebbc | 890 | remove_file_from_cache(src); |
b7fa51da | 891 | update_file(o, 0, ren1->pair->one->sha1, |
9047ebbc MV |
892 | ren1->pair->one->mode, src); |
893 | } | |
8a2fce18 | 894 | conflict_rename_rename(o, ren1, branch1, ren2, branch2); |
9047ebbc MV |
895 | } else { |
896 | struct merge_file_info mfi; | |
b7fa51da MV |
897 | remove_file(o, 1, ren1_src, 1); |
898 | mfi = merge_file(o, | |
899 | ren1->pair->one, | |
9047ebbc MV |
900 | ren1->pair->two, |
901 | ren2->pair->two, | |
902 | branch1, | |
903 | branch2); | |
904 | if (mfi.merge || !mfi.clean) | |
8a2fce18 | 905 | output(o, 1, "Renaming %s->%s", src, ren1_dst); |
9047ebbc MV |
906 | |
907 | if (mfi.merge) | |
8a2fce18 | 908 | output(o, 2, "Auto-merging %s", ren1_dst); |
9047ebbc MV |
909 | |
910 | if (!mfi.clean) { | |
8a2fce18 | 911 | output(o, 1, "CONFLICT (content): merge conflict in %s", |
9047ebbc MV |
912 | ren1_dst); |
913 | clean_merge = 0; | |
914 | ||
b7fa51da | 915 | if (!o->call_depth) |
9047ebbc MV |
916 | update_stages(ren1_dst, |
917 | ren1->pair->one, | |
918 | ren1->pair->two, | |
919 | ren2->pair->two, | |
920 | 1 /* clear */); | |
921 | } | |
b7fa51da | 922 | update_file(o, mfi.clean, mfi.sha, mfi.mode, ren1_dst); |
9047ebbc MV |
923 | } |
924 | } else { | |
925 | /* Renamed in 1, maybe changed in 2 */ | |
926 | struct string_list_item *item; | |
927 | /* we only use sha1 and mode of these */ | |
928 | struct diff_filespec src_other, dst_other; | |
929 | int try_merge, stage = a_renames == renames1 ? 3: 2; | |
930 | ||
b7fa51da | 931 | remove_file(o, 1, ren1_src, o->call_depth || stage == 3); |
9047ebbc MV |
932 | |
933 | hashcpy(src_other.sha1, ren1->src_entry->stages[stage].sha); | |
934 | src_other.mode = ren1->src_entry->stages[stage].mode; | |
935 | hashcpy(dst_other.sha1, ren1->dst_entry->stages[stage].sha); | |
936 | dst_other.mode = ren1->dst_entry->stages[stage].mode; | |
937 | ||
938 | try_merge = 0; | |
939 | ||
696ee23c | 940 | if (string_list_has_string(&o->current_directory_set, ren1_dst)) { |
9047ebbc | 941 | clean_merge = 0; |
8a2fce18 | 942 | output(o, 1, "CONFLICT (rename/directory): Rename %s->%s in %s " |
9047ebbc MV |
943 | " directory %s added in %s", |
944 | ren1_src, ren1_dst, branch1, | |
945 | ren1_dst, branch2); | |
8a2fce18 | 946 | conflict_rename_dir(o, ren1, branch1); |
9047ebbc MV |
947 | } else if (sha_eq(src_other.sha1, null_sha1)) { |
948 | clean_merge = 0; | |
8a2fce18 | 949 | output(o, 1, "CONFLICT (rename/delete): Rename %s->%s in %s " |
9047ebbc MV |
950 | "and deleted in %s", |
951 | ren1_src, ren1_dst, branch1, | |
952 | branch2); | |
b7fa51da | 953 | update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, ren1_dst); |
bf74106a DO |
954 | if (!o->call_depth) |
955 | update_stages(ren1_dst, NULL, | |
956 | branch1 == o->branch1 ? | |
957 | ren1->pair->two : NULL, | |
958 | branch1 == o->branch1 ? | |
959 | NULL : ren1->pair->two, 1); | |
d5af5105 SK |
960 | } else if ((dst_other.mode == ren1->pair->two->mode) && |
961 | sha_eq(dst_other.sha1, ren1->pair->two->sha1)) { | |
962 | /* Added file on the other side | |
963 | identical to the file being | |
964 | renamed: clean merge */ | |
965 | update_file(o, 1, ren1->pair->two->sha1, ren1->pair->two->mode, ren1_dst); | |
9047ebbc MV |
966 | } else if (!sha_eq(dst_other.sha1, null_sha1)) { |
967 | const char *new_path; | |
968 | clean_merge = 0; | |
969 | try_merge = 1; | |
8a2fce18 | 970 | output(o, 1, "CONFLICT (rename/add): Rename %s->%s in %s. " |
9047ebbc MV |
971 | "%s added in %s", |
972 | ren1_src, ren1_dst, branch1, | |
973 | ren1_dst, branch2); | |
c94736a2 JH |
974 | if (o->call_depth) { |
975 | struct merge_file_info mfi; | |
976 | struct diff_filespec one, a, b; | |
977 | ||
978 | one.path = a.path = b.path = | |
979 | (char *)ren1_dst; | |
980 | hashcpy(one.sha1, null_sha1); | |
981 | one.mode = 0; | |
982 | hashcpy(a.sha1, ren1->pair->two->sha1); | |
983 | a.mode = ren1->pair->two->mode; | |
984 | hashcpy(b.sha1, dst_other.sha1); | |
985 | b.mode = dst_other.mode; | |
986 | mfi = merge_file(o, &one, &a, &b, | |
987 | branch1, | |
988 | branch2); | |
989 | output(o, 1, "Adding merged %s", ren1_dst); | |
990 | update_file(o, 0, | |
991 | mfi.sha, | |
992 | mfi.mode, | |
993 | ren1_dst); | |
994 | } else { | |
995 | new_path = unique_path(o, ren1_dst, branch2); | |
996 | output(o, 1, "Adding as %s instead", new_path); | |
997 | update_file(o, 0, dst_other.sha1, dst_other.mode, new_path); | |
998 | } | |
e8c8b713 | 999 | } else if ((item = string_list_lookup(renames2Dst, ren1_dst))) { |
9047ebbc MV |
1000 | ren2 = item->util; |
1001 | clean_merge = 0; | |
1002 | ren2->processed = 1; | |
8a2fce18 MV |
1003 | output(o, 1, "CONFLICT (rename/rename): " |
1004 | "Rename %s->%s in %s. " | |
9047ebbc MV |
1005 | "Rename %s->%s in %s", |
1006 | ren1_src, ren1_dst, branch1, | |
1007 | ren2->pair->one->path, ren2->pair->two->path, branch2); | |
8a2fce18 | 1008 | conflict_rename_rename_2(o, ren1, branch1, ren2, branch2); |
9047ebbc MV |
1009 | } else |
1010 | try_merge = 1; | |
1011 | ||
1012 | if (try_merge) { | |
8a2fce18 | 1013 | struct diff_filespec *one, *a, *b; |
9047ebbc MV |
1014 | struct merge_file_info mfi; |
1015 | src_other.path = (char *)ren1_src; | |
1016 | ||
8a2fce18 | 1017 | one = ren1->pair->one; |
9047ebbc MV |
1018 | if (a_renames == renames1) { |
1019 | a = ren1->pair->two; | |
1020 | b = &src_other; | |
1021 | } else { | |
1022 | b = ren1->pair->two; | |
1023 | a = &src_other; | |
1024 | } | |
b7fa51da | 1025 | mfi = merge_file(o, one, a, b, |
8a2fce18 | 1026 | o->branch1, o->branch2); |
9047ebbc MV |
1027 | |
1028 | if (mfi.clean && | |
1029 | sha_eq(mfi.sha, ren1->pair->two->sha1) && | |
5a2580d6 | 1030 | mfi.mode == ren1->pair->two->mode) { |
9047ebbc | 1031 | /* |
a3e41367 | 1032 | * This message is part of |
9047ebbc MV |
1033 | * t6022 test. If you change |
1034 | * it update the test too. | |
1035 | */ | |
8a2fce18 | 1036 | output(o, 3, "Skipped %s (merged same as existing)", ren1_dst); |
5a2580d6 EN |
1037 | |
1038 | /* There may be higher stage entries left | |
1039 | * in the index (e.g. due to a D/F | |
1040 | * conflict) that need to be resolved. | |
1041 | */ | |
96ecac67 EN |
1042 | if (!ren1->dst_entry->stages[2].mode != |
1043 | !ren1->dst_entry->stages[3].mode) | |
5a2580d6 | 1044 | ren1->dst_entry->processed = 0; |
5a2580d6 | 1045 | } else { |
9047ebbc | 1046 | if (mfi.merge || !mfi.clean) |
8a2fce18 | 1047 | output(o, 1, "Renaming %s => %s", ren1_src, ren1_dst); |
9047ebbc | 1048 | if (mfi.merge) |
8a2fce18 | 1049 | output(o, 2, "Auto-merging %s", ren1_dst); |
9047ebbc | 1050 | if (!mfi.clean) { |
8a2fce18 | 1051 | output(o, 1, "CONFLICT (rename/modify): Merge conflict in %s", |
9047ebbc MV |
1052 | ren1_dst); |
1053 | clean_merge = 0; | |
1054 | ||
b7fa51da | 1055 | if (!o->call_depth) |
9047ebbc | 1056 | update_stages(ren1_dst, |
8a2fce18 | 1057 | one, a, b, 1); |
9047ebbc | 1058 | } |
b7fa51da | 1059 | update_file(o, mfi.clean, mfi.sha, mfi.mode, ren1_dst); |
9047ebbc MV |
1060 | } |
1061 | } | |
1062 | } | |
1063 | } | |
1064 | string_list_clear(&a_by_dst, 0); | |
1065 | string_list_clear(&b_by_dst, 0); | |
1066 | ||
1067 | return clean_merge; | |
1068 | } | |
1069 | ||
1070 | static unsigned char *stage_sha(const unsigned char *sha, unsigned mode) | |
1071 | { | |
1072 | return (is_null_sha1(sha) || mode == 0) ? NULL: (unsigned char *)sha; | |
1073 | } | |
1074 | ||
331a1838 EB |
1075 | static int read_sha1_strbuf(const unsigned char *sha1, struct strbuf *dst) |
1076 | { | |
1077 | void *buf; | |
1078 | enum object_type type; | |
1079 | unsigned long size; | |
1080 | buf = read_sha1_file(sha1, &type, &size); | |
1081 | if (!buf) | |
1082 | return error("cannot read object %s", sha1_to_hex(sha1)); | |
1083 | if (type != OBJ_BLOB) { | |
1084 | free(buf); | |
1085 | return error("object %s is not a blob", sha1_to_hex(sha1)); | |
1086 | } | |
1087 | strbuf_attach(dst, buf, size, size + 1); | |
1088 | return 0; | |
1089 | } | |
1090 | ||
1091 | static int blob_unchanged(const unsigned char *o_sha, | |
1092 | const unsigned char *a_sha, | |
3e7589b7 | 1093 | int renormalize, const char *path) |
331a1838 EB |
1094 | { |
1095 | struct strbuf o = STRBUF_INIT; | |
1096 | struct strbuf a = STRBUF_INIT; | |
1097 | int ret = 0; /* assume changed for safety */ | |
1098 | ||
1099 | if (sha_eq(o_sha, a_sha)) | |
1100 | return 1; | |
3e7589b7 | 1101 | if (!renormalize) |
331a1838 EB |
1102 | return 0; |
1103 | ||
1104 | assert(o_sha && a_sha); | |
1105 | if (read_sha1_strbuf(o_sha, &o) || read_sha1_strbuf(a_sha, &a)) | |
1106 | goto error_return; | |
1107 | /* | |
1108 | * Note: binary | is used so that both renormalizations are | |
1109 | * performed. Comparison can be skipped if both files are | |
1110 | * unchanged since their sha1s have already been compared. | |
1111 | */ | |
1112 | if (renormalize_buffer(path, o.buf, o.len, &o) | | |
1113 | renormalize_buffer(path, a.buf, o.len, &a)) | |
1114 | ret = (o.len == a.len && !memcmp(o.buf, a.buf, o.len)); | |
1115 | ||
1116 | error_return: | |
1117 | strbuf_release(&o); | |
1118 | strbuf_release(&a); | |
1119 | return ret; | |
1120 | } | |
1121 | ||
9047ebbc | 1122 | /* Per entry merge function */ |
8a2fce18 MV |
1123 | static int process_entry(struct merge_options *o, |
1124 | const char *path, struct stage_data *entry) | |
9047ebbc MV |
1125 | { |
1126 | /* | |
1127 | printf("processing entry, clean cache: %s\n", index_only ? "yes": "no"); | |
1128 | print_index_entry("\tpath: ", entry); | |
1129 | */ | |
1130 | int clean_merge = 1; | |
1bc0ab7c | 1131 | int normalize = o->renormalize; |
9047ebbc MV |
1132 | unsigned o_mode = entry->stages[1].mode; |
1133 | unsigned a_mode = entry->stages[2].mode; | |
1134 | unsigned b_mode = entry->stages[3].mode; | |
1135 | unsigned char *o_sha = stage_sha(entry->stages[1].sha, o_mode); | |
1136 | unsigned char *a_sha = stage_sha(entry->stages[2].sha, a_mode); | |
1137 | unsigned char *b_sha = stage_sha(entry->stages[3].sha, b_mode); | |
1138 | ||
37348937 | 1139 | entry->processed = 1; |
9047ebbc MV |
1140 | if (o_sha && (!a_sha || !b_sha)) { |
1141 | /* Case A: Deleted in one */ | |
1142 | if ((!a_sha && !b_sha) || | |
3e7589b7 JN |
1143 | (!b_sha && blob_unchanged(o_sha, a_sha, normalize, path)) || |
1144 | (!a_sha && blob_unchanged(o_sha, b_sha, normalize, path))) { | |
9047ebbc MV |
1145 | /* Deleted in both or deleted in one and |
1146 | * unchanged in the other */ | |
1147 | if (a_sha) | |
8a2fce18 | 1148 | output(o, 2, "Removing %s", path); |
9047ebbc | 1149 | /* do not touch working file if it did not exist */ |
b7fa51da | 1150 | remove_file(o, 1, path, !a_sha); |
9047ebbc MV |
1151 | } else { |
1152 | /* Deleted in one and changed in the other */ | |
1153 | clean_merge = 0; | |
1154 | if (!a_sha) { | |
8a2fce18 | 1155 | output(o, 1, "CONFLICT (delete/modify): %s deleted in %s " |
9047ebbc | 1156 | "and modified in %s. Version %s of %s left in tree.", |
8a2fce18 MV |
1157 | path, o->branch1, |
1158 | o->branch2, o->branch2, path); | |
b7fa51da | 1159 | update_file(o, 0, b_sha, b_mode, path); |
9047ebbc | 1160 | } else { |
8a2fce18 | 1161 | output(o, 1, "CONFLICT (delete/modify): %s deleted in %s " |
9047ebbc | 1162 | "and modified in %s. Version %s of %s left in tree.", |
8a2fce18 MV |
1163 | path, o->branch2, |
1164 | o->branch1, o->branch1, path); | |
b7fa51da | 1165 | update_file(o, 0, a_sha, a_mode, path); |
9047ebbc MV |
1166 | } |
1167 | } | |
1168 | ||
1169 | } else if ((!o_sha && a_sha && !b_sha) || | |
1170 | (!o_sha && !a_sha && b_sha)) { | |
1171 | /* Case B: Added in one. */ | |
9047ebbc MV |
1172 | unsigned mode; |
1173 | const unsigned char *sha; | |
9047ebbc MV |
1174 | |
1175 | if (a_sha) { | |
9047ebbc MV |
1176 | mode = a_mode; |
1177 | sha = a_sha; | |
9047ebbc | 1178 | } else { |
9047ebbc MV |
1179 | mode = b_mode; |
1180 | sha = b_sha; | |
9047ebbc | 1181 | } |
696ee23c | 1182 | if (string_list_has_string(&o->current_directory_set, path)) { |
37348937 EN |
1183 | /* Handle D->F conflicts after all subfiles */ |
1184 | entry->processed = 0; | |
1185 | /* But get any file out of the way now, so conflicted | |
1186 | * entries below the directory of the same name can | |
1187 | * be put in the working directory. | |
1188 | */ | |
1189 | if (a_sha) | |
1190 | output(o, 2, "Removing %s", path); | |
1191 | /* do not touch working file if it did not exist */ | |
1192 | remove_file(o, 0, path, !a_sha); | |
1193 | return 1; /* Assume clean till processed */ | |
9047ebbc | 1194 | } else { |
8a2fce18 | 1195 | output(o, 2, "Adding %s", path); |
b7fa51da | 1196 | update_file(o, 1, sha, mode, path); |
9047ebbc MV |
1197 | } |
1198 | } else if (a_sha && b_sha) { | |
1199 | /* Case C: Added in both (check for same permissions) and */ | |
1200 | /* case D: Modified in both, but differently. */ | |
1201 | const char *reason = "content"; | |
1202 | struct merge_file_info mfi; | |
8a2fce18 | 1203 | struct diff_filespec one, a, b; |
9047ebbc MV |
1204 | |
1205 | if (!o_sha) { | |
1206 | reason = "add/add"; | |
1207 | o_sha = (unsigned char *)null_sha1; | |
1208 | } | |
8a2fce18 MV |
1209 | output(o, 2, "Auto-merging %s", path); |
1210 | one.path = a.path = b.path = (char *)path; | |
1211 | hashcpy(one.sha1, o_sha); | |
1212 | one.mode = o_mode; | |
9047ebbc MV |
1213 | hashcpy(a.sha1, a_sha); |
1214 | a.mode = a_mode; | |
1215 | hashcpy(b.sha1, b_sha); | |
1216 | b.mode = b_mode; | |
1217 | ||
b7fa51da | 1218 | mfi = merge_file(o, &one, &a, &b, |
8a2fce18 | 1219 | o->branch1, o->branch2); |
9047ebbc MV |
1220 | |
1221 | clean_merge = mfi.clean; | |
39d8e271 CB |
1222 | if (!mfi.clean) { |
1223 | if (S_ISGITLINK(mfi.mode)) | |
1224 | reason = "submodule"; | |
8a2fce18 | 1225 | output(o, 1, "CONFLICT (%s): Merge conflict in %s", |
9047ebbc | 1226 | reason, path); |
9047ebbc | 1227 | } |
39d8e271 | 1228 | update_file(o, mfi.clean, mfi.sha, mfi.mode, path); |
9047ebbc MV |
1229 | } else if (!o_sha && !a_sha && !b_sha) { |
1230 | /* | |
1231 | * this entry was deleted altogether. a_mode == 0 means | |
1232 | * we had that path and want to actively remove it. | |
1233 | */ | |
b7fa51da | 1234 | remove_file(o, 1, path, !a_mode); |
9047ebbc MV |
1235 | } else |
1236 | die("Fatal merge failure, shouldn't happen."); | |
1237 | ||
1238 | return clean_merge; | |
1239 | } | |
1240 | ||
37348937 EN |
1241 | /* |
1242 | * Per entry merge function for D/F conflicts, to be called only after | |
1243 | * all files below dir have been processed. We do this because in the | |
1244 | * cases we can cleanly resolve D/F conflicts, process_entry() can clean | |
1245 | * out all the files below the directory for us. | |
1246 | */ | |
1247 | static int process_df_entry(struct merge_options *o, | |
1248 | const char *path, struct stage_data *entry) | |
1249 | { | |
1250 | int clean_merge = 1; | |
1251 | unsigned o_mode = entry->stages[1].mode; | |
1252 | unsigned a_mode = entry->stages[2].mode; | |
1253 | unsigned b_mode = entry->stages[3].mode; | |
1254 | unsigned char *o_sha = stage_sha(entry->stages[1].sha, o_mode); | |
1255 | unsigned char *a_sha = stage_sha(entry->stages[2].sha, a_mode); | |
1256 | unsigned char *b_sha = stage_sha(entry->stages[3].sha, b_mode); | |
1257 | const char *add_branch; | |
1258 | const char *other_branch; | |
1259 | unsigned mode; | |
1260 | const unsigned char *sha; | |
1261 | const char *conf; | |
1262 | struct stat st; | |
1263 | ||
1264 | /* We currently only handle D->F cases */ | |
1265 | assert((!o_sha && a_sha && !b_sha) || | |
1266 | (!o_sha && !a_sha && b_sha)); | |
1267 | ||
1268 | entry->processed = 1; | |
1269 | ||
1270 | if (a_sha) { | |
1271 | add_branch = o->branch1; | |
1272 | other_branch = o->branch2; | |
1273 | mode = a_mode; | |
1274 | sha = a_sha; | |
1275 | conf = "file/directory"; | |
1276 | } else { | |
1277 | add_branch = o->branch2; | |
1278 | other_branch = o->branch1; | |
1279 | mode = b_mode; | |
1280 | sha = b_sha; | |
1281 | conf = "directory/file"; | |
1282 | } | |
1283 | if (lstat(path, &st) == 0 && S_ISDIR(st.st_mode)) { | |
1284 | const char *new_path = unique_path(o, path, add_branch); | |
1285 | clean_merge = 0; | |
1286 | output(o, 1, "CONFLICT (%s): There is a directory with name %s in %s. " | |
1287 | "Adding %s as %s", | |
1288 | conf, path, other_branch, path, new_path); | |
1289 | remove_file(o, 0, path, 0); | |
1290 | update_file(o, 0, sha, mode, new_path); | |
1291 | } else { | |
1292 | output(o, 2, "Adding %s", path); | |
1293 | update_file(o, 1, sha, mode, path); | |
1294 | } | |
1295 | ||
1296 | return clean_merge; | |
1297 | } | |
1298 | ||
8a2fce18 MV |
1299 | int merge_trees(struct merge_options *o, |
1300 | struct tree *head, | |
9047ebbc MV |
1301 | struct tree *merge, |
1302 | struct tree *common, | |
9047ebbc MV |
1303 | struct tree **result) |
1304 | { | |
1305 | int code, clean; | |
1306 | ||
85e51b78 JH |
1307 | if (o->subtree_shift) { |
1308 | merge = shift_tree_object(head, merge, o->subtree_shift); | |
1309 | common = shift_tree_object(head, common, o->subtree_shift); | |
9047ebbc MV |
1310 | } |
1311 | ||
1312 | if (sha_eq(common->object.sha1, merge->object.sha1)) { | |
5e5ffa09 | 1313 | output(o, 0, "Already up-to-date!"); |
9047ebbc MV |
1314 | *result = head; |
1315 | return 1; | |
1316 | } | |
1317 | ||
b7fa51da | 1318 | code = git_merge_trees(o->call_depth, common, head, merge); |
9047ebbc | 1319 | |
fadd069d JH |
1320 | if (code != 0) { |
1321 | if (show(o, 4) || o->call_depth) | |
1322 | die("merging of trees %s and %s failed", | |
1323 | sha1_to_hex(head->object.sha1), | |
1324 | sha1_to_hex(merge->object.sha1)); | |
1325 | else | |
1326 | exit(128); | |
1327 | } | |
9047ebbc MV |
1328 | |
1329 | if (unmerged_cache()) { | |
1330 | struct string_list *entries, *re_head, *re_merge; | |
1331 | int i; | |
696ee23c MV |
1332 | string_list_clear(&o->current_file_set, 1); |
1333 | string_list_clear(&o->current_directory_set, 1); | |
1334 | get_files_dirs(o, head); | |
1335 | get_files_dirs(o, merge); | |
9047ebbc MV |
1336 | |
1337 | entries = get_unmerged(); | |
8a2fce18 MV |
1338 | re_head = get_renames(o, head, common, head, merge, entries); |
1339 | re_merge = get_renames(o, merge, common, head, merge, entries); | |
1340 | clean = process_renames(o, re_head, re_merge); | |
9047ebbc MV |
1341 | for (i = 0; i < entries->nr; i++) { |
1342 | const char *path = entries->items[i].string; | |
1343 | struct stage_data *e = entries->items[i].util; | |
1344 | if (!e->processed | |
8a2fce18 | 1345 | && !process_entry(o, path, e)) |
9047ebbc MV |
1346 | clean = 0; |
1347 | } | |
37348937 EN |
1348 | for (i = 0; i < entries->nr; i++) { |
1349 | const char *path = entries->items[i].string; | |
1350 | struct stage_data *e = entries->items[i].util; | |
1351 | if (!e->processed | |
1352 | && !process_df_entry(o, path, e)) | |
1353 | clean = 0; | |
1354 | } | |
9047ebbc MV |
1355 | |
1356 | string_list_clear(re_merge, 0); | |
1357 | string_list_clear(re_head, 0); | |
1358 | string_list_clear(entries, 1); | |
1359 | ||
1360 | } | |
1361 | else | |
1362 | clean = 1; | |
1363 | ||
b7fa51da | 1364 | if (o->call_depth) |
8a2fce18 | 1365 | *result = write_tree_from_memory(o); |
9047ebbc MV |
1366 | |
1367 | return clean; | |
1368 | } | |
1369 | ||
1370 | static struct commit_list *reverse_commit_list(struct commit_list *list) | |
1371 | { | |
1372 | struct commit_list *next = NULL, *current, *backup; | |
1373 | for (current = list; current; current = backup) { | |
1374 | backup = current->next; | |
1375 | current->next = next; | |
1376 | next = current; | |
1377 | } | |
1378 | return next; | |
1379 | } | |
1380 | ||
1381 | /* | |
1382 | * Merge the commits h1 and h2, return the resulting virtual | |
1383 | * commit object and a flag indicating the cleanness of the merge. | |
1384 | */ | |
8a2fce18 MV |
1385 | int merge_recursive(struct merge_options *o, |
1386 | struct commit *h1, | |
9047ebbc | 1387 | struct commit *h2, |
9047ebbc MV |
1388 | struct commit_list *ca, |
1389 | struct commit **result) | |
1390 | { | |
1391 | struct commit_list *iter; | |
1392 | struct commit *merged_common_ancestors; | |
1393 | struct tree *mrtree = mrtree; | |
1394 | int clean; | |
1395 | ||
8a2fce18 MV |
1396 | if (show(o, 4)) { |
1397 | output(o, 4, "Merging:"); | |
5033639c MV |
1398 | output_commit_title(o, h1); |
1399 | output_commit_title(o, h2); | |
9047ebbc MV |
1400 | } |
1401 | ||
1402 | if (!ca) { | |
1403 | ca = get_merge_bases(h1, h2, 1); | |
1404 | ca = reverse_commit_list(ca); | |
1405 | } | |
1406 | ||
8a2fce18 MV |
1407 | if (show(o, 5)) { |
1408 | output(o, 5, "found %u common ancestor(s):", commit_list_count(ca)); | |
9047ebbc | 1409 | for (iter = ca; iter; iter = iter->next) |
5033639c | 1410 | output_commit_title(o, iter->item); |
9047ebbc MV |
1411 | } |
1412 | ||
1413 | merged_common_ancestors = pop_commit(&ca); | |
1414 | if (merged_common_ancestors == NULL) { | |
1415 | /* if there is no common ancestor, make an empty tree */ | |
1416 | struct tree *tree = xcalloc(1, sizeof(struct tree)); | |
1417 | ||
1418 | tree->object.parsed = 1; | |
1419 | tree->object.type = OBJ_TREE; | |
1420 | pretend_sha1_file(NULL, 0, OBJ_TREE, tree->object.sha1); | |
1421 | merged_common_ancestors = make_virtual_commit(tree, "ancestor"); | |
1422 | } | |
1423 | ||
1424 | for (iter = ca; iter; iter = iter->next) { | |
8a2fce18 | 1425 | const char *saved_b1, *saved_b2; |
5033639c | 1426 | o->call_depth++; |
9047ebbc MV |
1427 | /* |
1428 | * When the merge fails, the result contains files | |
1429 | * with conflict markers. The cleanness flag is | |
1430 | * ignored, it was never actually used, as result of | |
1431 | * merge_trees has always overwritten it: the committed | |
1432 | * "conflicts" were already resolved. | |
1433 | */ | |
1434 | discard_cache(); | |
8a2fce18 MV |
1435 | saved_b1 = o->branch1; |
1436 | saved_b2 = o->branch2; | |
1437 | o->branch1 = "Temporary merge branch 1"; | |
1438 | o->branch2 = "Temporary merge branch 2"; | |
1439 | merge_recursive(o, merged_common_ancestors, iter->item, | |
1440 | NULL, &merged_common_ancestors); | |
1441 | o->branch1 = saved_b1; | |
1442 | o->branch2 = saved_b2; | |
5033639c | 1443 | o->call_depth--; |
9047ebbc MV |
1444 | |
1445 | if (!merged_common_ancestors) | |
1446 | die("merge returned no commit"); | |
1447 | } | |
1448 | ||
1449 | discard_cache(); | |
b7fa51da | 1450 | if (!o->call_depth) |
9047ebbc | 1451 | read_cache(); |
9047ebbc | 1452 | |
7ca56aa0 | 1453 | o->ancestor = "merged common ancestors"; |
8a2fce18 MV |
1454 | clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree, |
1455 | &mrtree); | |
9047ebbc | 1456 | |
b7fa51da | 1457 | if (o->call_depth) { |
9047ebbc MV |
1458 | *result = make_virtual_commit(mrtree, "merged tree"); |
1459 | commit_list_insert(h1, &(*result)->parents); | |
1460 | commit_list_insert(h2, &(*result)->parents->next); | |
1461 | } | |
c7d84924 | 1462 | flush_output(o); |
9047ebbc MV |
1463 | return clean; |
1464 | } | |
1465 | ||
73118f89 SB |
1466 | static struct commit *get_ref(const unsigned char *sha1, const char *name) |
1467 | { | |
1468 | struct object *object; | |
1469 | ||
1470 | object = deref_tag(parse_object(sha1), name, strlen(name)); | |
1471 | if (!object) | |
1472 | return NULL; | |
1473 | if (object->type == OBJ_TREE) | |
1474 | return make_virtual_commit((struct tree*)object, name); | |
1475 | if (object->type != OBJ_COMMIT) | |
1476 | return NULL; | |
1477 | if (parse_commit((struct commit *)object)) | |
1478 | return NULL; | |
1479 | return (struct commit *)object; | |
1480 | } | |
1481 | ||
8a2fce18 MV |
1482 | int merge_recursive_generic(struct merge_options *o, |
1483 | const unsigned char *head, | |
1484 | const unsigned char *merge, | |
1485 | int num_base_list, | |
1486 | const unsigned char **base_list, | |
1487 | struct commit **result) | |
73118f89 SB |
1488 | { |
1489 | int clean, index_fd; | |
1490 | struct lock_file *lock = xcalloc(1, sizeof(struct lock_file)); | |
8a2fce18 MV |
1491 | struct commit *head_commit = get_ref(head, o->branch1); |
1492 | struct commit *next_commit = get_ref(merge, o->branch2); | |
73118f89 SB |
1493 | struct commit_list *ca = NULL; |
1494 | ||
1495 | if (base_list) { | |
1496 | int i; | |
8a2fce18 | 1497 | for (i = 0; i < num_base_list; ++i) { |
73118f89 | 1498 | struct commit *base; |
8a2fce18 | 1499 | if (!(base = get_ref(base_list[i], sha1_to_hex(base_list[i])))) |
73118f89 | 1500 | return error("Could not parse object '%s'", |
8a2fce18 | 1501 | sha1_to_hex(base_list[i])); |
73118f89 SB |
1502 | commit_list_insert(base, &ca); |
1503 | } | |
1504 | } | |
1505 | ||
1506 | index_fd = hold_locked_index(lock, 1); | |
8a2fce18 MV |
1507 | clean = merge_recursive(o, head_commit, next_commit, ca, |
1508 | result); | |
73118f89 SB |
1509 | if (active_cache_changed && |
1510 | (write_cache(index_fd, active_cache, active_nr) || | |
1511 | commit_locked_index(lock))) | |
1512 | return error("Unable to write index."); | |
1513 | ||
1514 | return clean ? 0 : 1; | |
1515 | } | |
1516 | ||
8a2fce18 | 1517 | static int merge_recursive_config(const char *var, const char *value, void *cb) |
9047ebbc | 1518 | { |
8a2fce18 | 1519 | struct merge_options *o = cb; |
9047ebbc | 1520 | if (!strcasecmp(var, "merge.verbosity")) { |
8a2fce18 | 1521 | o->verbosity = git_config_int(var, value); |
9047ebbc MV |
1522 | return 0; |
1523 | } | |
1524 | if (!strcasecmp(var, "diff.renamelimit")) { | |
8a2fce18 | 1525 | o->diff_rename_limit = git_config_int(var, value); |
9047ebbc MV |
1526 | return 0; |
1527 | } | |
1528 | if (!strcasecmp(var, "merge.renamelimit")) { | |
8a2fce18 | 1529 | o->merge_rename_limit = git_config_int(var, value); |
9047ebbc MV |
1530 | return 0; |
1531 | } | |
e137a892 | 1532 | return git_xmerge_config(var, value, cb); |
9047ebbc MV |
1533 | } |
1534 | ||
8a2fce18 | 1535 | void init_merge_options(struct merge_options *o) |
9047ebbc | 1536 | { |
8a2fce18 MV |
1537 | memset(o, 0, sizeof(struct merge_options)); |
1538 | o->verbosity = 2; | |
1539 | o->buffer_output = 1; | |
1540 | o->diff_rename_limit = -1; | |
1541 | o->merge_rename_limit = -1; | |
7610fa57 | 1542 | o->renormalize = 0; |
8a2fce18 | 1543 | git_config(merge_recursive_config, o); |
9047ebbc | 1544 | if (getenv("GIT_MERGE_VERBOSITY")) |
8a2fce18 | 1545 | o->verbosity = |
9047ebbc | 1546 | strtol(getenv("GIT_MERGE_VERBOSITY"), NULL, 10); |
8a2fce18 MV |
1547 | if (o->verbosity >= 5) |
1548 | o->buffer_output = 0; | |
c7d84924 | 1549 | strbuf_init(&o->obuf, 0); |
696ee23c MV |
1550 | memset(&o->current_file_set, 0, sizeof(struct string_list)); |
1551 | o->current_file_set.strdup_strings = 1; | |
1552 | memset(&o->current_directory_set, 0, sizeof(struct string_list)); | |
1553 | o->current_directory_set.strdup_strings = 1; | |
9047ebbc | 1554 | } |
635a7bb1 JN |
1555 | |
1556 | int parse_merge_opt(struct merge_options *o, const char *s) | |
1557 | { | |
1558 | if (!s || !*s) | |
1559 | return -1; | |
1560 | if (!strcmp(s, "ours")) | |
1561 | o->recursive_variant = MERGE_RECURSIVE_OURS; | |
1562 | else if (!strcmp(s, "theirs")) | |
1563 | o->recursive_variant = MERGE_RECURSIVE_THEIRS; | |
1564 | else if (!strcmp(s, "subtree")) | |
1565 | o->subtree_shift = ""; | |
1566 | else if (!prefixcmp(s, "subtree=")) | |
1567 | o->subtree_shift = s + strlen("subtree="); | |
58a1ece4 JF |
1568 | else if (!strcmp(s, "patience")) |
1569 | o->xdl_opts |= XDF_PATIENCE_DIFF; | |
4e5dd044 JF |
1570 | else if (!strcmp(s, "ignore-space-change")) |
1571 | o->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE; | |
1572 | else if (!strcmp(s, "ignore-all-space")) | |
1573 | o->xdl_opts |= XDF_IGNORE_WHITESPACE; | |
1574 | else if (!strcmp(s, "ignore-space-at-eol")) | |
1575 | o->xdl_opts |= XDF_IGNORE_WHITESPACE_AT_EOL; | |
635a7bb1 JN |
1576 | else if (!strcmp(s, "renormalize")) |
1577 | o->renormalize = 1; | |
1578 | else if (!strcmp(s, "no-renormalize")) | |
1579 | o->renormalize = 0; | |
10ae7526 KB |
1580 | else if (!prefixcmp(s, "rename-threshold=")) { |
1581 | const char *score = s + strlen("rename-threshold="); | |
1582 | if ((o->rename_score = parse_rename_score(&score)) == -1 || *score != 0) | |
1583 | return -1; | |
1584 | } | |
635a7bb1 JN |
1585 | else |
1586 | return -1; | |
1587 | return 0; | |
1588 | } |