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