merge-recursive: increase marker length with depth of recursion
[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 */
6#include "cache.h"
b2141fc1 7#include "config.h"
1c4b6604 8#include "advice.h"
697cc8ef 9#include "lockfile.h"
9047ebbc 10#include "cache-tree.h"
cbd53a21 11#include "object-store.h"
109cd76d 12#include "repository.h"
9047ebbc
MV
13#include "commit.h"
14#include "blob.h"
15#include "builtin.h"
16#include "tree-walk.h"
17#include "diff.h"
18#include "diffcore.h"
19#include "tag.h"
14ba97f8 20#include "alloc.h"
9047ebbc
MV
21#include "unpack-trees.h"
22#include "string-list.h"
23#include "xdiff-interface.h"
24#include "ll-merge.h"
9047ebbc
MV
25#include "attr.h"
26#include "merge-recursive.h"
9800c0df 27#include "dir.h"
68d03e4a 28#include "submodule.h"
18cfc088 29#include "revision.h"
64043556 30#include "commit-reach.h"
9047ebbc 31
fc65b00d
KW
32struct path_hashmap_entry {
33 struct hashmap_entry e;
34 char path[FLEX_ARRAY];
35};
36
37static int path_hashmap_cmp(const void *cmp_data,
38 const void *entry,
39 const void *entry_or_key,
40 const void *keydata)
41{
42 const struct path_hashmap_entry *a = entry;
43 const struct path_hashmap_entry *b = entry_or_key;
44 const char *key = keydata;
45
46 if (ignore_case)
47 return strcasecmp(a->path, key ? key : b->path);
48 else
49 return strcmp(a->path, key ? key : b->path);
50}
51
52static unsigned int path_hash(const char *path)
53{
54 return ignore_case ? strihash(path) : strhash(path);
55}
56
7fe40b88
EN
57static struct dir_rename_entry *dir_rename_find_entry(struct hashmap *hashmap,
58 char *dir)
59{
60 struct dir_rename_entry key;
61
62 if (dir == NULL)
63 return NULL;
64 hashmap_entry_init(&key, strhash(dir));
65 key.dir = dir;
66 return hashmap_get(hashmap, &key, NULL);
67}
68
69static int dir_rename_cmp(const void *unused_cmp_data,
70 const void *entry,
71 const void *entry_or_key,
72 const void *unused_keydata)
73{
74 const struct dir_rename_entry *e1 = entry;
75 const struct dir_rename_entry *e2 = entry_or_key;
76
77 return strcmp(e1->dir, e2->dir);
78}
79
80static void dir_rename_init(struct hashmap *map)
81{
82 hashmap_init(map, dir_rename_cmp, NULL, 0);
83}
84
85static void dir_rename_entry_init(struct dir_rename_entry *entry,
86 char *directory)
87{
88 hashmap_entry_init(entry, strhash(directory));
89 entry->dir = directory;
90 entry->non_unique_new_dir = 0;
91 strbuf_init(&entry->new_dir, 0);
92 string_list_init(&entry->possible_new_dirs, 0);
93}
94
e95ab70a
EN
95static struct collision_entry *collision_find_entry(struct hashmap *hashmap,
96 char *target_file)
97{
98 struct collision_entry key;
99
100 hashmap_entry_init(&key, strhash(target_file));
101 key.target_file = target_file;
102 return hashmap_get(hashmap, &key, NULL);
103}
104
105static int collision_cmp(void *unused_cmp_data,
106 const struct collision_entry *e1,
107 const struct collision_entry *e2,
108 const void *unused_keydata)
109{
110 return strcmp(e1->target_file, e2->target_file);
111}
112
113static void collision_init(struct hashmap *map)
114{
115 hashmap_init(map, (hashmap_cmp_fn) collision_cmp, NULL, 0);
116}
117
bc9204d4
JS
118static void flush_output(struct merge_options *o)
119{
f1e2426b 120 if (o->buffer_output < 2 && o->obuf.len) {
bc9204d4
JS
121 fputs(o->obuf.buf, stdout);
122 strbuf_reset(&o->obuf);
123 }
124}
125
126static int err(struct merge_options *o, const char *err, ...)
127{
128 va_list params;
129
f1e2426b
JS
130 if (o->buffer_output < 2)
131 flush_output(o);
132 else {
133 strbuf_complete(&o->obuf, '\n');
134 strbuf_addstr(&o->obuf, "error: ");
135 }
bc9204d4
JS
136 va_start(params, err);
137 strbuf_vaddf(&o->obuf, err, params);
138 va_end(params);
f1e2426b
JS
139 if (o->buffer_output > 1)
140 strbuf_addch(&o->obuf, '\n');
141 else {
142 error("%s", o->obuf.buf);
143 strbuf_reset(&o->obuf);
144 }
bc9204d4
JS
145
146 return -1;
147}
148
85e51b78
JH
149static struct tree *shift_tree_object(struct tree *one, struct tree *two,
150 const char *subtree_shift)
9047ebbc 151{
f2fd0760 152 struct object_id shifted;
9047ebbc 153
85e51b78 154 if (!*subtree_shift) {
82db3d44 155 shift_tree(&one->object.oid, &two->object.oid, &shifted, 0);
85e51b78 156 } else {
82db3d44 157 shift_tree_by(&one->object.oid, &two->object.oid, &shifted,
85e51b78
JH
158 subtree_shift);
159 }
4a7e27e9 160 if (oideq(&two->object.oid, &shifted))
9047ebbc 161 return two;
f86bcc7b 162 return lookup_tree(the_repository, &shifted);
9047ebbc
MV
163}
164
2af202be 165static struct commit *make_virtual_commit(struct tree *tree, const char *comment)
9047ebbc 166{
8ba0e5ec 167 struct commit *commit = alloc_commit_node(the_repository);
ae8e4c9c 168
a2571653 169 set_merge_remote_desc(commit, comment, (struct object *)commit);
891435d5 170 commit->maybe_tree = tree;
9047ebbc
MV
171 commit->object.parsed = 1;
172 return commit;
173}
174
175/*
176 * Since we use get_tree_entry(), which does not put the read object into
177 * the object pool, we cannot rely on a == b.
178 */
b4da9d62 179static int oid_eq(const struct object_id *a, const struct object_id *b)
9047ebbc
MV
180{
181 if (!a && !b)
182 return 2;
4a7e27e9 183 return a && b && oideq(a, b);
9047ebbc
MV
184}
185
25c39363
EN
186enum rename_type {
187 RENAME_NORMAL = 0,
5455c338 188 RENAME_VIA_DIR,
25c39363 189 RENAME_DELETE,
4f66dade 190 RENAME_ONE_FILE_TO_ONE,
461f5041
EN
191 RENAME_ONE_FILE_TO_TWO,
192 RENAME_TWO_FILES_TO_ONE
25c39363
EN
193};
194
4f66dade 195struct rename_conflict_info {
25c39363
EN
196 enum rename_type rename_type;
197 struct diff_filepair *pair1;
198 struct diff_filepair *pair2;
199 const char *branch1;
200 const char *branch2;
201 struct stage_data *dst_entry1;
202 struct stage_data *dst_entry2;
232c635f
EN
203 struct diff_filespec ren1_other;
204 struct diff_filespec ren2_other;
25c39363
EN
205};
206
9047ebbc
MV
207/*
208 * Since we want to write the index eventually, we cannot reuse the index
209 * for these (temporary) data.
210 */
9cba13ca
JN
211struct stage_data {
212 struct {
9047ebbc 213 unsigned mode;
fd429e98 214 struct object_id oid;
9047ebbc 215 } stages[4];
4f66dade 216 struct rename_conflict_info *rename_conflict_info;
9047ebbc
MV
217 unsigned processed:1;
218};
219
4f66dade
EN
220static inline void setup_rename_conflict_info(enum rename_type rename_type,
221 struct diff_filepair *pair1,
222 struct diff_filepair *pair2,
223 const char *branch1,
224 const char *branch2,
225 struct stage_data *dst_entry1,
232c635f
EN
226 struct stage_data *dst_entry2,
227 struct merge_options *o,
228 struct stage_data *src_entry1,
229 struct stage_data *src_entry2)
25c39363 230{
4f445453
EN
231 struct rename_conflict_info *ci;
232
233 /*
234 * When we have two renames involved, it's easiest to get the
235 * correct things into stage 2 and 3, and to make sure that the
236 * content merge puts HEAD before the other branch if we just
237 * ensure that branch1 == o->branch1. So, simply flip arguments
238 * around if we don't have that.
239 */
240 if (dst_entry2 && branch1 != o->branch1) {
241 setup_rename_conflict_info(rename_type,
242 pair2, pair1,
243 branch2, branch1,
244 dst_entry2, dst_entry1,
245 o,
246 src_entry2, src_entry1);
247 return;
248 }
249
250 ci = xcalloc(1, sizeof(struct rename_conflict_info));
25c39363
EN
251 ci->rename_type = rename_type;
252 ci->pair1 = pair1;
253 ci->branch1 = branch1;
254 ci->branch2 = branch2;
255
256 ci->dst_entry1 = dst_entry1;
4f66dade 257 dst_entry1->rename_conflict_info = ci;
25c39363
EN
258 dst_entry1->processed = 0;
259
260 assert(!pair2 == !dst_entry2);
261 if (dst_entry2) {
262 ci->dst_entry2 = dst_entry2;
263 ci->pair2 = pair2;
4f66dade 264 dst_entry2->rename_conflict_info = ci;
25c39363 265 }
232c635f
EN
266
267 if (rename_type == RENAME_TWO_FILES_TO_ONE) {
268 /*
269 * For each rename, there could have been
270 * modifications on the side of history where that
271 * file was not renamed.
272 */
273 int ostage1 = o->branch1 == branch1 ? 3 : 2;
274 int ostage2 = ostage1 ^ 1;
275
276 ci->ren1_other.path = pair1->one->path;
fd429e98 277 oidcpy(&ci->ren1_other.oid, &src_entry1->stages[ostage1].oid);
232c635f
EN
278 ci->ren1_other.mode = src_entry1->stages[ostage1].mode;
279
280 ci->ren2_other.path = pair2->one->path;
fd429e98 281 oidcpy(&ci->ren2_other.oid, &src_entry2->stages[ostage2].oid);
232c635f 282 ci->ren2_other.mode = src_entry2->stages[ostage2].mode;
25c39363
EN
283 }
284}
285
8a2fce18 286static int show(struct merge_options *o, int v)
9047ebbc 287{
5033639c 288 return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5;
9047ebbc
MV
289}
290
28bea9e5 291__attribute__((format (printf, 3, 4)))
8a2fce18 292static void output(struct merge_options *o, int v, const char *fmt, ...)
9047ebbc 293{
9047ebbc
MV
294 va_list ap;
295
8a2fce18 296 if (!show(o, v))
9047ebbc
MV
297 return;
298
415792ed 299 strbuf_addchars(&o->obuf, ' ', o->call_depth * 2);
9047ebbc
MV
300
301 va_start(ap, fmt);
ebeb6090 302 strbuf_vaddf(&o->obuf, fmt, ap);
9047ebbc
MV
303 va_end(ap);
304
294b2680 305 strbuf_addch(&o->obuf, '\n');
8a2fce18 306 if (!o->buffer_output)
c7d84924 307 flush_output(o);
9047ebbc
MV
308}
309
5033639c 310static void output_commit_title(struct merge_options *o, struct commit *commit)
9047ebbc 311{
e2e5ac23
NTND
312 struct merge_remote_desc *desc;
313
dde75cb0 314 strbuf_addchars(&o->obuf, ' ', o->call_depth * 2);
e2e5ac23
NTND
315 desc = merge_remote_util(commit);
316 if (desc)
317 strbuf_addf(&o->obuf, "virtual %s\n", desc->name);
9047ebbc 318 else {
30e677e0 319 strbuf_add_unique_abbrev(&o->obuf, &commit->object.oid,
a94bb683
RS
320 DEFAULT_ABBREV);
321 strbuf_addch(&o->obuf, ' ');
9047ebbc 322 if (parse_commit(commit) != 0)
a22ae753 323 strbuf_addstr(&o->obuf, _("(bad commit)\n"));
9047ebbc 324 else {
49b7120e 325 const char *title;
8597ea3a 326 const char *msg = get_commit_buffer(commit, NULL);
bc6b8fc1 327 int len = find_commit_subject(msg, &title);
49b7120e 328 if (len)
dde75cb0 329 strbuf_addf(&o->obuf, "%.*s\n", len, title);
bc6b8fc1 330 unuse_commit_buffer(commit, msg);
9047ebbc
MV
331 }
332 }
dde75cb0 333 flush_output(o);
9047ebbc
MV
334}
335
bc9204d4 336static int add_cacheinfo(struct merge_options *o,
d90e759f
EN
337 unsigned int mode, const struct object_id *oid,
338 const char *path, int stage, int refresh, int options)
9047ebbc
MV
339{
340 struct cache_entry *ce;
1335d76e
JH
341 int ret;
342
a849735b 343 ce = make_cache_entry(&the_index, mode, oid ? oid : &null_oid, path, stage, 0);
9047ebbc 344 if (!ce)
fd53b7ff 345 return err(o, _("add_cacheinfo failed for path '%s'; merge aborting."), path);
1335d76e
JH
346
347 ret = add_cache_entry(ce, options);
348 if (refresh) {
349 struct cache_entry *nce;
350
768d7965 351 nce = refresh_cache_entry(&the_index, ce, CE_MATCH_REFRESH | CE_MATCH_IGNORE_MISSING);
55e9f0e5 352 if (!nce)
fd53b7ff 353 return err(o, _("add_cacheinfo failed to refresh for path '%s'; merge aborting."), path);
1335d76e
JH
354 if (nce != ce)
355 ret = add_cache_entry(nce, options);
356 }
357 return ret;
9047ebbc
MV
358}
359
9047ebbc
MV
360static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
361{
362 parse_tree(tree);
363 init_tree_desc(desc, tree->buffer, tree->size);
364}
365
3f1c1c36
EN
366static int unpack_trees_start(struct merge_options *o,
367 struct tree *common,
368 struct tree *head,
369 struct tree *merge)
9047ebbc
MV
370{
371 int rc;
372 struct tree_desc t[3];
a35edc84 373 struct index_state tmp_index = { NULL };
9047ebbc 374
64b1abe9
EN
375 memset(&o->unpack_opts, 0, sizeof(o->unpack_opts));
376 if (o->call_depth)
377 o->unpack_opts.index_only = 1;
9047ebbc 378 else
64b1abe9
EN
379 o->unpack_opts.update = 1;
380 o->unpack_opts.merge = 1;
381 o->unpack_opts.head_idx = 2;
382 o->unpack_opts.fn = threeway_merge;
383 o->unpack_opts.src_index = &the_index;
a35edc84 384 o->unpack_opts.dst_index = &tmp_index;
6f10a09e 385 o->unpack_opts.aggressive = !merge_detect_rename(o);
64b1abe9 386 setup_unpack_trees_porcelain(&o->unpack_opts, "merge");
9047ebbc
MV
387
388 init_tree_desc_from_tree(t+0, common);
389 init_tree_desc_from_tree(t+1, head);
390 init_tree_desc_from_tree(t+2, merge);
391
64b1abe9 392 rc = unpack_trees(3, t, &o->unpack_opts);
9047ebbc 393 cache_tree_free(&active_cache_tree);
a35edc84 394
64b1abe9 395 /*
a35edc84
EN
396 * Update the_index to match the new results, AFTER saving a copy
397 * in o->orig_index. Update src_index to point to the saved copy.
398 * (verify_uptodate() checks src_index, and the original index is
399 * the one that had the necessary modification timestamps.)
64b1abe9 400 */
a35edc84
EN
401 o->orig_index = the_index;
402 the_index = tmp_index;
403 o->unpack_opts.src_index = &o->orig_index;
404
9047ebbc
MV
405 return rc;
406}
407
3f1c1c36
EN
408static void unpack_trees_finish(struct merge_options *o)
409{
410 discard_index(&o->orig_index);
1c41d280 411 clear_unpack_trees_porcelain(&o->unpack_opts);
3f1c1c36
EN
412}
413
8a2fce18 414struct tree *write_tree_from_memory(struct merge_options *o)
9047ebbc
MV
415{
416 struct tree *result = NULL;
417
418 if (unmerged_cache()) {
419 int i;
19c6a4f8 420 fprintf(stderr, "BUG: There are unmerged index entries:\n");
9047ebbc 421 for (i = 0; i < active_nr; i++) {
9c5e6c80 422 const struct cache_entry *ce = active_cache[i];
9047ebbc 423 if (ce_stage(ce))
c43ba42e 424 fprintf(stderr, "BUG: %d %.*s\n", ce_stage(ce),
19c6a4f8 425 (int)ce_namelen(ce), ce->name);
9047ebbc 426 }
033abf97 427 BUG("unmerged index entries in merge-recursive.c");
9047ebbc
MV
428 }
429
430 if (!active_cache_tree)
431 active_cache_tree = cache_tree();
432
433 if (!cache_tree_fully_valid(active_cache_tree) &&
6003303a 434 cache_tree_update(&the_index, 0) < 0) {
bc9204d4 435 err(o, _("error building trees"));
6003303a
JS
436 return NULL;
437 }
9047ebbc 438
f86bcc7b 439 result = lookup_tree(the_repository, &active_cache_tree->oid);
9047ebbc
MV
440
441 return result;
442}
443
df46d77e 444static int save_files_dirs(const struct object_id *oid,
d90e759f
EN
445 struct strbuf *base, const char *path,
446 unsigned int mode, int stage, void *context)
9047ebbc 447{
fc65b00d 448 struct path_hashmap_entry *entry;
6a0b0b6d 449 int baselen = base->len;
696ee23c
MV
450 struct merge_options *o = context;
451
6a0b0b6d 452 strbuf_addstr(base, path);
9047ebbc 453
fc65b00d
KW
454 FLEX_ALLOC_MEM(entry, path, base->buf, base->len);
455 hashmap_entry_init(entry, path_hash(entry->path));
456 hashmap_add(&o->current_file_dir_set, entry);
9047ebbc 457
6a0b0b6d 458 strbuf_setlen(base, baselen);
d3bee161 459 return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
9047ebbc
MV
460}
461
ef9c4dc3 462static void get_files_dirs(struct merge_options *o, struct tree *tree)
9047ebbc 463{
f0096c06 464 struct pathspec match_all;
9a087274 465 memset(&match_all, 0, sizeof(match_all));
ef9c4dc3 466 read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o);
9047ebbc
MV
467}
468
5b047ac0
EN
469static int get_tree_entry_if_blob(const struct object_id *tree,
470 const char *path,
471 struct object_id *hashy,
472 unsigned int *mode_o)
473{
474 int ret;
475
476 ret = get_tree_entry(tree, path, hashy, mode_o);
477 if (S_ISDIR(*mode_o)) {
478 oidcpy(hashy, &null_oid);
479 *mode_o = 0;
480 }
481 return ret;
482}
483
9047ebbc
MV
484/*
485 * Returns an index_entry instance which doesn't have to correspond to
486 * a real cache entry in Git's index.
487 */
488static struct stage_data *insert_stage_data(const char *path,
489 struct tree *o, struct tree *a, struct tree *b,
490 struct string_list *entries)
491{
492 struct string_list_item *item;
493 struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
5b047ac0
EN
494 get_tree_entry_if_blob(&o->object.oid, path,
495 &e->stages[1].oid, &e->stages[1].mode);
496 get_tree_entry_if_blob(&a->object.oid, path,
497 &e->stages[2].oid, &e->stages[2].mode);
498 get_tree_entry_if_blob(&b->object.oid, path,
499 &e->stages[3].oid, &e->stages[3].mode);
78a395d3 500 item = string_list_insert(entries, path);
9047ebbc
MV
501 item->util = e;
502 return e;
503}
504
505/*
506 * Create a dictionary mapping file names to stage_data objects. The
507 * dictionary contains one entry for every path with a non-zero stage entry.
508 */
509static struct string_list *get_unmerged(void)
510{
511 struct string_list *unmerged = xcalloc(1, sizeof(struct string_list));
512 int i;
513
514 unmerged->strdup_strings = 1;
515
516 for (i = 0; i < active_nr; i++) {
517 struct string_list_item *item;
518 struct stage_data *e;
9c5e6c80 519 const struct cache_entry *ce = active_cache[i];
9047ebbc
MV
520 if (!ce_stage(ce))
521 continue;
522
e8c8b713 523 item = string_list_lookup(unmerged, ce->name);
9047ebbc 524 if (!item) {
78a395d3 525 item = string_list_insert(unmerged, ce->name);
9047ebbc
MV
526 item->util = xcalloc(1, sizeof(struct stage_data));
527 }
528 e = item->util;
529 e->stages[ce_stage(ce)].mode = ce->ce_mode;
99d1a986 530 oidcpy(&e->stages[ce_stage(ce)].oid, &ce->oid);
9047ebbc
MV
531 }
532
533 return unmerged;
534}
535
fa6ca111 536static int string_list_df_name_compare(const char *one, const char *two)
ef02b317 537{
fa6ca111
NTND
538 int onelen = strlen(one);
539 int twolen = strlen(two);
f0fd4d05
EN
540 /*
541 * Here we only care that entries for D/F conflicts are
542 * adjacent, in particular with the file of the D/F conflict
543 * appearing before files below the corresponding directory.
544 * The order of the rest of the list is irrelevant for us.
ef02b317 545 *
f0fd4d05
EN
546 * To achieve this, we sort with df_name_compare and provide
547 * the mode S_IFDIR so that D/F conflicts will sort correctly.
548 * We use the mode S_IFDIR for everything else for simplicity,
549 * since in other cases any changes in their order due to
550 * sorting cause no problems for us.
551 */
fa6ca111
NTND
552 int cmp = df_name_compare(one, onelen, S_IFDIR,
553 two, twolen, S_IFDIR);
f0fd4d05
EN
554 /*
555 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
556 * that 'foo' comes before 'foo/bar'.
ef02b317 557 */
f0fd4d05
EN
558 if (cmp)
559 return cmp;
560 return onelen - twolen;
561}
562
70cc3d36
EN
563static void record_df_conflict_files(struct merge_options *o,
564 struct string_list *entries)
ef02b317 565{
70cc3d36 566 /* If there is a D/F conflict and the file for such a conflict
2d6bad91 567 * currently exists in the working tree, we want to allow it to be
edd2faf5
EN
568 * removed to make room for the corresponding directory if needed.
569 * The files underneath the directories of such D/F conflicts will
570 * be processed before the corresponding file involved in the D/F
571 * conflict. If the D/F directory ends up being removed by the
572 * merge, then we won't have to touch the D/F file. If the D/F
573 * directory needs to be written to the working copy, then the D/F
574 * file will simply be removed (in make_room_for_path()) to make
575 * room for the necessary paths. Note that if both the directory
576 * and the file need to be present, then the D/F file will be
577 * reinstated with a new unique name at the time it is processed.
ef02b317 578 */
af4941d4 579 struct string_list df_sorted_entries = STRING_LIST_INIT_NODUP;
ef02b317 580 const char *last_file = NULL;
c8516500 581 int last_len = 0;
ef02b317
EN
582 int i;
583
0b30e812
EN
584 /*
585 * If we're merging merge-bases, we don't want to bother with
586 * any working directory changes.
587 */
588 if (o->call_depth)
589 return;
590
f0fd4d05 591 /* Ensure D/F conflicts are adjacent in the entries list. */
ef02b317 592 for (i = 0; i < entries->nr; i++) {
f701aae0
EN
593 struct string_list_item *next = &entries->items[i];
594 string_list_append(&df_sorted_entries, next->string)->util =
595 next->util;
596 }
fa6ca111
NTND
597 df_sorted_entries.cmp = string_list_df_name_compare;
598 string_list_sort(&df_sorted_entries);
f0fd4d05 599
70cc3d36 600 string_list_clear(&o->df_conflict_file_set, 1);
f701aae0
EN
601 for (i = 0; i < df_sorted_entries.nr; i++) {
602 const char *path = df_sorted_entries.items[i].string;
ef02b317 603 int len = strlen(path);
f701aae0 604 struct stage_data *e = df_sorted_entries.items[i].util;
ef02b317
EN
605
606 /*
607 * Check if last_file & path correspond to a D/F conflict;
608 * i.e. whether path is last_file+'/'+<something>.
70cc3d36
EN
609 * If so, record that it's okay to remove last_file to make
610 * room for path and friends if needed.
ef02b317
EN
611 */
612 if (last_file &&
613 len > last_len &&
614 memcmp(path, last_file, last_len) == 0 &&
615 path[last_len] == '/') {
70cc3d36 616 string_list_insert(&o->df_conflict_file_set, last_file);
ef02b317
EN
617 }
618
619 /*
620 * Determine whether path could exist as a file in the
621 * working directory as a possible D/F conflict. This
622 * will only occur when it exists in stage 2 as a
623 * file.
624 */
625 if (S_ISREG(e->stages[2].mode) || S_ISLNK(e->stages[2].mode)) {
626 last_file = path;
627 last_len = len;
ef02b317
EN
628 } else {
629 last_file = NULL;
630 }
631 }
f701aae0 632 string_list_clear(&df_sorted_entries, 0);
ef02b317
EN
633}
634
9cba13ca 635struct rename {
9047ebbc 636 struct diff_filepair *pair;
379fc378
EN
637 /*
638 * Purpose of src_entry and dst_entry:
639 *
640 * If 'before' is renamed to 'after' then src_entry will contain
641 * the versions of 'before' from the merge_base, HEAD, and MERGE in
642 * stages 1, 2, and 3; dst_entry will contain the respective
643 * versions of 'after' in corresponding locations. Thus, we have a
644 * total of six modes and oids, though some will be null. (Stage 0
645 * is ignored; we're interested in handling conflicts.)
646 *
647 * Since we don't turn on break-rewrites by default, neither
648 * src_entry nor dst_entry can have all three of their stages have
649 * non-null oids, meaning at most four of the six will be non-null.
650 * Also, since this is a rename, both src_entry and dst_entry will
651 * have at least one non-null oid, meaning at least two will be
652 * non-null. Of the six oids, a typical rename will have three be
653 * non-null. Only two implies a rename/delete, and four implies a
654 * rename/add.
655 */
9047ebbc
MV
656 struct stage_data *src_entry;
657 struct stage_data *dst_entry;
9c0743fe 658 unsigned add_turned_into_rename:1;
9047ebbc
MV
659 unsigned processed:1;
660};
661
bc9204d4
JS
662static int update_stages(struct merge_options *opt, const char *path,
663 const struct diff_filespec *o,
650467cf
EN
664 const struct diff_filespec *a,
665 const struct diff_filespec *b)
9047ebbc 666{
f53d3977
EN
667
668 /*
669 * NOTE: It is usually a bad idea to call update_stages on a path
670 * before calling update_file on that same path, since it can
671 * sometimes lead to spurious "refusing to lose untracked file..."
672 * messages from update_file (via make_room_for path via
673 * would_lose_untracked). Instead, reverse the order of the calls
674 * (executing update_file first and then update_stages).
675 */
650467cf
EN
676 int clear = 1;
677 int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_SKIP_DFCHECK;
9047ebbc
MV
678 if (clear)
679 if (remove_file_from_cache(path))
680 return -1;
681 if (o)
bc9204d4 682 if (add_cacheinfo(opt, o->mode, &o->oid, path, 1, 0, options))
9047ebbc
MV
683 return -1;
684 if (a)
bc9204d4 685 if (add_cacheinfo(opt, a->mode, &a->oid, path, 2, 0, options))
9047ebbc
MV
686 return -1;
687 if (b)
bc9204d4 688 if (add_cacheinfo(opt, b->mode, &b->oid, path, 3, 0, options))
9047ebbc
MV
689 return -1;
690 return 0;
691}
692
9c0743fe
EN
693static int update_stages_for_stage_data(struct merge_options *opt,
694 const char *path,
695 const struct stage_data *stage_data)
696{
697 struct diff_filespec o, a, b;
698
699 o.mode = stage_data->stages[1].mode;
700 oidcpy(&o.oid, &stage_data->stages[1].oid);
701
702 a.mode = stage_data->stages[2].mode;
703 oidcpy(&a.oid, &stage_data->stages[2].oid);
704
705 b.mode = stage_data->stages[3].mode;
706 oidcpy(&b.oid, &stage_data->stages[3].oid);
707
708 return update_stages(opt, path,
709 is_null_oid(&o.oid) ? NULL : &o,
710 is_null_oid(&a.oid) ? NULL : &a,
711 is_null_oid(&b.oid) ? NULL : &b);
712}
713
b8ddf164
EN
714static void update_entry(struct stage_data *entry,
715 struct diff_filespec *o,
716 struct diff_filespec *a,
717 struct diff_filespec *b)
2ff739f9 718{
2ff739f9
EN
719 entry->processed = 0;
720 entry->stages[1].mode = o->mode;
721 entry->stages[2].mode = a->mode;
722 entry->stages[3].mode = b->mode;
fd429e98 723 oidcpy(&entry->stages[1].oid, &o->oid);
724 oidcpy(&entry->stages[2].oid, &a->oid);
725 oidcpy(&entry->stages[3].oid, &b->oid);
2ff739f9
EN
726}
727
b7fa51da
MV
728static int remove_file(struct merge_options *o, int clean,
729 const char *path, int no_wd)
9047ebbc 730{
b7fa51da
MV
731 int update_cache = o->call_depth || clean;
732 int update_working_directory = !o->call_depth && !no_wd;
9047ebbc
MV
733
734 if (update_cache) {
735 if (remove_file_from_cache(path))
736 return -1;
737 }
738 if (update_working_directory) {
ae352c7f
DT
739 if (ignore_case) {
740 struct cache_entry *ce;
741 ce = cache_file_exists(path, strlen(path), ignore_case);
4cba2b01 742 if (ce && ce_stage(ce) == 0 && strcmp(path, ce->name))
ae352c7f
DT
743 return 0;
744 }
25755e84 745 if (remove_path(path))
9047ebbc 746 return -1;
9047ebbc
MV
747 }
748 return 0;
749}
750
45bc131d
JK
751/* add a string to a strbuf, but converting "/" to "_" */
752static void add_flattened_path(struct strbuf *out, const char *s)
753{
754 size_t i = out->len;
755 strbuf_addstr(out, s);
756 for (; i < out->len; i++)
757 if (out->buf[i] == '/')
758 out->buf[i] = '_';
759}
760
696ee23c 761static char *unique_path(struct merge_options *o, const char *path, const char *branch)
9047ebbc 762{
fc65b00d 763 struct path_hashmap_entry *entry;
45bc131d 764 struct strbuf newpath = STRBUF_INIT;
9047ebbc 765 int suffix = 0;
45bc131d
JK
766 size_t base_len;
767
768 strbuf_addf(&newpath, "%s~", path);
769 add_flattened_path(&newpath, branch);
770
771 base_len = newpath.len;
fc65b00d
KW
772 while (hashmap_get_from_hash(&o->current_file_dir_set,
773 path_hash(newpath.buf), newpath.buf) ||
8e1b62f1 774 (!o->call_depth && file_exists(newpath.buf))) {
45bc131d
JK
775 strbuf_setlen(&newpath, base_len);
776 strbuf_addf(&newpath, "_%d", suffix++);
777 }
778
fc65b00d
KW
779 FLEX_ALLOC_MEM(entry, path, newpath.buf, newpath.len);
780 hashmap_entry_init(entry, path_hash(entry->path));
781 hashmap_add(&o->current_file_dir_set, entry);
45bc131d 782 return strbuf_detach(&newpath, NULL);
9047ebbc
MV
783}
784
5423d2e7
DT
785/**
786 * Check whether a directory in the index is in the way of an incoming
787 * file. Return 1 if so. If check_working_copy is non-zero, also
788 * check the working directory. If empty_ok is non-zero, also return
789 * 0 in the case where the working-tree dir exists but is empty.
790 */
791static int dir_in_way(const char *path, int check_working_copy, int empty_ok)
f2507b4e 792{
b4600fbe
JK
793 int pos;
794 struct strbuf dirpath = STRBUF_INIT;
f2507b4e
EN
795 struct stat st;
796
b4600fbe
JK
797 strbuf_addstr(&dirpath, path);
798 strbuf_addch(&dirpath, '/');
f2507b4e 799
b4600fbe 800 pos = cache_name_pos(dirpath.buf, dirpath.len);
f2507b4e
EN
801
802 if (pos < 0)
803 pos = -1 - pos;
804 if (pos < active_nr &&
b4600fbe
JK
805 !strncmp(dirpath.buf, active_cache[pos]->name, dirpath.len)) {
806 strbuf_release(&dirpath);
f2507b4e
EN
807 return 1;
808 }
809
b4600fbe 810 strbuf_release(&dirpath);
5423d2e7
DT
811 return check_working_copy && !lstat(path, &st) && S_ISDIR(st.st_mode) &&
812 !(empty_ok && is_empty_dir(path));
f2507b4e
EN
813}
814
1de70dbd
EN
815/*
816 * Returns whether path was tracked in the index before the merge started,
817 * and its oid and mode match the specified values
818 */
819static int was_tracked_and_matches(struct merge_options *o, const char *path,
820 const struct object_id *oid, unsigned mode)
60c91181 821{
1de70dbd
EN
822 int pos = index_name_pos(&o->orig_index, path, strlen(path));
823 struct cache_entry *ce;
824
825 if (0 > pos)
826 /* we were not tracking this path before the merge */
827 return 0;
828
829 /* See if the file we were tracking before matches */
830 ce = o->orig_index.cache[pos];
831 return (oid_eq(&ce->oid, oid) && ce->ce_mode == mode);
832}
833
a35edc84
EN
834/*
835 * Returns whether path was tracked in the index before the merge started
836 */
837static int was_tracked(struct merge_options *o, const char *path)
60c91181 838{
a35edc84 839 int pos = index_name_pos(&o->orig_index, path, strlen(path));
60c91181 840
f8d83fb6 841 if (0 <= pos)
a35edc84 842 /* we were tracking this path before the merge */
f8d83fb6
JS
843 return 1;
844
aacb82de 845 return 0;
60c91181
JH
846}
847
aacb82de 848static int would_lose_untracked(const char *path)
9047ebbc 849{
a35edc84
EN
850 /*
851 * This may look like it can be simplified to:
852 * return !was_tracked(o, path) && file_exists(path)
853 * but it can't. This function needs to know whether path was in
854 * the working tree due to EITHER having been tracked in the index
855 * before the merge OR having been put into the working copy and
856 * index by unpack_trees(). Due to that either-or requirement, we
857 * check the current index instead of the original one.
858 *
859 * Note that we do not need to worry about merge-recursive itself
860 * updating the index after unpack_trees() and before calling this
861 * function, because we strictly require all code paths in
862 * merge-recursive to update the working tree first and the index
863 * second. Doing otherwise would break
864 * update_file()/would_lose_untracked(); see every comment in this
865 * file which mentions "update_stages".
866 */
867 int pos = cache_name_pos(path, strlen(path));
868
869 if (pos < 0)
870 pos = -1 - pos;
871 while (pos < active_nr &&
872 !strcmp(path, active_cache[pos]->name)) {
873 /*
874 * If stage #0, it is definitely tracked.
875 * If it has stage #2 then it was tracked
876 * before this merge started. All other
877 * cases the path was not tracked.
878 */
879 switch (ce_stage(active_cache[pos])) {
880 case 0:
881 case 2:
882 return 0;
883 }
884 pos++;
885 }
886 return file_exists(path);
60c91181
JH
887}
888
64b1abe9
EN
889static int was_dirty(struct merge_options *o, const char *path)
890{
891 struct cache_entry *ce;
892 int dirty = 1;
893
a35edc84 894 if (o->call_depth || !was_tracked(o, path))
64b1abe9
EN
895 return !dirty;
896
277292d5
EN
897 ce = index_file_exists(o->unpack_opts.src_index,
898 path, strlen(path), ignore_case);
899 dirty = verify_uptodate(ce, &o->unpack_opts) != 0;
64b1abe9 900 return dirty;
60c91181
JH
901}
902
ed0148a5 903static int make_room_for_path(struct merge_options *o, const char *path)
9047ebbc 904{
ed0148a5 905 int status, i;
55653a68 906 const char *msg = _("failed to create path '%s'%s");
9047ebbc 907
ed0148a5
EN
908 /* Unlink any D/F conflict files that are in the way */
909 for (i = 0; i < o->df_conflict_file_set.nr; i++) {
910 const char *df_path = o->df_conflict_file_set.items[i].string;
911 size_t pathlen = strlen(path);
912 size_t df_pathlen = strlen(df_path);
913 if (df_pathlen < pathlen &&
914 path[df_pathlen] == '/' &&
915 strncmp(path, df_path, df_pathlen) == 0) {
916 output(o, 3,
55653a68 917 _("Removing %s to make room for subdirectory\n"),
ed0148a5
EN
918 df_path);
919 unlink(df_path);
920 unsorted_string_list_delete_item(&o->df_conflict_file_set,
921 i, 0);
922 break;
923 }
924 }
925
926 /* Make sure leading directories are created */
9047ebbc
MV
927 status = safe_create_leading_directories_const(path);
928 if (status) {
6003303a 929 if (status == SCLD_EXISTS)
9047ebbc 930 /* something else exists */
bc9204d4
JS
931 return err(o, msg, path, _(": perhaps a D/F conflict?"));
932 return err(o, msg, path, "");
9047ebbc
MV
933 }
934
60c91181
JH
935 /*
936 * Do not unlink a file in the work tree if we are not
937 * tracking it.
938 */
939 if (would_lose_untracked(path))
bc9204d4 940 return err(o, _("refusing to lose untracked file at '%s'"),
d90e759f 941 path);
60c91181 942
9047ebbc
MV
943 /* Successful unlink is good.. */
944 if (!unlink(path))
945 return 0;
946 /* .. and so is no existing file */
947 if (errno == ENOENT)
948 return 0;
949 /* .. but not some other error (who really cares what?) */
bc9204d4 950 return err(o, msg, path, _(": perhaps a D/F conflict?"));
9047ebbc
MV
951}
952
75456f96
JS
953static int update_file_flags(struct merge_options *o,
954 const struct object_id *oid,
955 unsigned mode,
956 const char *path,
957 int update_cache,
958 int update_wd)
9047ebbc 959{
6003303a
JS
960 int ret = 0;
961
b7fa51da 962 if (o->call_depth)
9047ebbc
MV
963 update_wd = 0;
964
965 if (update_wd) {
966 enum object_type type;
967 void *buf;
968 unsigned long size;
969
68d03e4a 970 if (S_ISGITLINK(mode)) {
0c44c943
JH
971 /*
972 * We may later decide to recursively descend into
973 * the submodule directory and update its index
974 * and/or work tree, but we do not do that now.
975 */
68d03e4a 976 update_wd = 0;
0c44c943 977 goto update_index;
68d03e4a 978 }
9047ebbc 979
b4f5aca4 980 buf = read_object_file(oid, &type, &size);
9047ebbc 981 if (!buf)
bc9204d4 982 return err(o, _("cannot read object %s '%s'"), oid_to_hex(oid), path);
6003303a 983 if (type != OBJ_BLOB) {
bc9204d4 984 ret = err(o, _("blob expected for %s '%s'"), oid_to_hex(oid), path);
6003303a
JS
985 goto free_buf;
986 }
9047ebbc 987 if (S_ISREG(mode)) {
f285a2d7 988 struct strbuf strbuf = STRBUF_INIT;
7f944e26 989 if (convert_to_working_tree(&the_index, path, buf, size, &strbuf)) {
9047ebbc
MV
990 free(buf);
991 size = strbuf.len;
992 buf = strbuf_detach(&strbuf, NULL);
993 }
994 }
995
ed0148a5 996 if (make_room_for_path(o, path) < 0) {
9047ebbc 997 update_wd = 0;
75456f96 998 goto free_buf;
9047ebbc
MV
999 }
1000 if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) {
1001 int fd;
1002 if (mode & 0100)
1003 mode = 0777;
1004 else
1005 mode = 0666;
1006 fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
6003303a 1007 if (fd < 0) {
bc9204d4
JS
1008 ret = err(o, _("failed to open '%s': %s"),
1009 path, strerror(errno));
6003303a
JS
1010 goto free_buf;
1011 }
f633ea2c 1012 write_in_full(fd, buf, size);
9047ebbc
MV
1013 close(fd);
1014 } else if (S_ISLNK(mode)) {
1015 char *lnk = xmemdupz(buf, size);
1016 safe_create_leading_directories_const(path);
1017 unlink(path);
304dcf26 1018 if (symlink(lnk, path))
bc9204d4 1019 ret = err(o, _("failed to symlink '%s': %s"),
d90e759f 1020 path, strerror(errno));
9047ebbc
MV
1021 free(lnk);
1022 } else
bc9204d4
JS
1023 ret = err(o,
1024 _("do not know what to do with %06o %s '%s'"),
1025 mode, oid_to_hex(oid), path);
93665365 1026 free_buf:
9047ebbc
MV
1027 free(buf);
1028 }
93665365 1029update_index:
6003303a 1030 if (!ret && update_cache)
fd53b7ff
EN
1031 if (add_cacheinfo(o, mode, oid, path, 0, update_wd,
1032 ADD_CACHE_OK_TO_ADD))
1033 return -1;
6003303a 1034 return ret;
9047ebbc
MV
1035}
1036
75456f96
JS
1037static int update_file(struct merge_options *o,
1038 int clean,
1039 const struct object_id *oid,
1040 unsigned mode,
1041 const char *path)
9047ebbc 1042{
75456f96 1043 return update_file_flags(o, oid, mode, path, o->call_depth || clean, !o->call_depth);
9047ebbc
MV
1044}
1045
1046/* Low level file merging, update and removal */
1047
9cba13ca 1048struct merge_file_info {
9b561499 1049 struct object_id oid;
9047ebbc
MV
1050 unsigned mode;
1051 unsigned clean:1,
1052 merge:1;
1053};
1054
b7fa51da
MV
1055static int merge_3way(struct merge_options *o,
1056 mmbuffer_t *result_buf,
0c059420
EN
1057 const struct diff_filespec *one,
1058 const struct diff_filespec *a,
1059 const struct diff_filespec *b,
9047ebbc 1060 const char *branch1,
b2a7942b
EN
1061 const char *branch2,
1062 const int extra_marker_size)
9047ebbc
MV
1063{
1064 mmfile_t orig, src1, src2;
712516bc 1065 struct ll_merge_options ll_opts = {0};
4c5868f4 1066 char *base_name, *name1, *name2;
9047ebbc 1067 int merge_status;
8cc5b290 1068
712516bc 1069 ll_opts.renormalize = o->renormalize;
b2a7942b 1070 ll_opts.extra_marker_size = extra_marker_size;
58a1ece4 1071 ll_opts.xdl_opts = o->xdl_opts;
712516bc
JN
1072
1073 if (o->call_depth) {
1074 ll_opts.virtual_ancestor = 1;
1075 ll_opts.variant = 0;
1076 } else {
8cc5b290
AP
1077 switch (o->recursive_variant) {
1078 case MERGE_RECURSIVE_OURS:
712516bc 1079 ll_opts.variant = XDL_MERGE_FAVOR_OURS;
8cc5b290
AP
1080 break;
1081 case MERGE_RECURSIVE_THEIRS:
712516bc 1082 ll_opts.variant = XDL_MERGE_FAVOR_THEIRS;
8cc5b290
AP
1083 break;
1084 default:
712516bc 1085 ll_opts.variant = 0;
8cc5b290
AP
1086 break;
1087 }
1088 }
9047ebbc 1089
4c5868f4
JN
1090 if (strcmp(a->path, b->path) ||
1091 (o->ancestor != NULL && strcmp(a->path, one->path) != 0)) {
1092 base_name = o->ancestor == NULL ? NULL :
4e2d094d
RJ
1093 mkpathdup("%s:%s", o->ancestor, one->path);
1094 name1 = mkpathdup("%s:%s", branch1, a->path);
1095 name2 = mkpathdup("%s:%s", branch2, b->path);
606475f3 1096 } else {
4c5868f4 1097 base_name = o->ancestor == NULL ? NULL :
4e2d094d
RJ
1098 mkpathdup("%s", o->ancestor);
1099 name1 = mkpathdup("%s", branch1);
1100 name2 = mkpathdup("%s", branch2);
606475f3 1101 }
9047ebbc 1102
d449347d 1103 read_mmblob(&orig, &one->oid);
1104 read_mmblob(&src1, &a->oid);
1105 read_mmblob(&src2, &b->oid);
9047ebbc 1106
4c5868f4 1107 merge_status = ll_merge(result_buf, a->path, &orig, base_name,
712516bc 1108 &src1, name1, &src2, name2, &ll_opts);
9047ebbc 1109
4e2d094d 1110 free(base_name);
9047ebbc
MV
1111 free(name1);
1112 free(name2);
1113 free(orig.ptr);
1114 free(src1.ptr);
1115 free(src2.ptr);
1116 return merge_status;
1117}
1118
18cfc088 1119static int find_first_merges(struct object_array *result, const char *path,
d90e759f 1120 struct commit *a, struct commit *b)
18cfc088
SB
1121{
1122 int i, j;
1123 struct object_array merges = OBJECT_ARRAY_INIT;
1124 struct commit *commit;
1125 int contains_another;
1126
1127 char merged_revision[42];
1128 const char *rev_args[] = { "rev-list", "--merges", "--ancestry-path",
1129 "--all", merged_revision, NULL };
1130 struct rev_info revs;
1131 struct setup_revision_opt rev_opts;
1132
1133 memset(result, 0, sizeof(struct object_array));
1134 memset(&rev_opts, 0, sizeof(rev_opts));
1135
1136 /* get all revisions that merge commit a */
1137 xsnprintf(merged_revision, sizeof(merged_revision), "^%s",
d90e759f 1138 oid_to_hex(&a->object.oid));
18cfc088
SB
1139 init_revisions(&revs, NULL);
1140 rev_opts.submodule = path;
1141 /* FIXME: can't handle linked worktrees in submodules yet */
1142 revs.single_worktree = path != NULL;
1143 setup_revisions(ARRAY_SIZE(rev_args)-1, rev_args, &revs, &rev_opts);
1144
1145 /* save all revisions from the above list that contain b */
1146 if (prepare_revision_walk(&revs))
1147 die("revision walk setup failed");
1148 while ((commit = get_revision(&revs)) != NULL) {
1149 struct object *o = &(commit->object);
1150 if (in_merge_bases(b, commit))
1151 add_object_array(o, NULL, &merges);
1152 }
1153 reset_revision_walk();
1154
1155 /* Now we've got all merges that contain a and b. Prune all
1156 * merges that contain another found merge and save them in
1157 * result.
1158 */
1159 for (i = 0; i < merges.nr; i++) {
1160 struct commit *m1 = (struct commit *) merges.objects[i].item;
1161
1162 contains_another = 0;
1163 for (j = 0; j < merges.nr; j++) {
1164 struct commit *m2 = (struct commit *) merges.objects[j].item;
1165 if (i != j && in_merge_bases(m2, m1)) {
1166 contains_another = 1;
1167 break;
1168 }
1169 }
1170
1171 if (!contains_another)
1172 add_object_array(merges.objects[i].item, NULL, result);
1173 }
1174
1175 object_array_clear(&merges);
1176 return result->nr;
1177}
1178
1179static void print_commit(struct commit *commit)
1180{
1181 struct strbuf sb = STRBUF_INIT;
1182 struct pretty_print_context ctx = {0};
1183 ctx.date_mode.type = DATE_NORMAL;
1184 format_commit_message(commit, " %h: %m %s", &sb, &ctx);
1185 fprintf(stderr, "%s\n", sb.buf);
1186 strbuf_release(&sb);
1187}
1188
325f3a8e
SB
1189static int merge_submodule(struct merge_options *o,
1190 struct object_id *result, const char *path,
18cfc088 1191 const struct object_id *base, const struct object_id *a,
325f3a8e 1192 const struct object_id *b)
18cfc088
SB
1193{
1194 struct commit *commit_base, *commit_a, *commit_b;
1195 int parent_count;
1196 struct object_array merges;
1197
1198 int i;
325f3a8e 1199 int search = !o->call_depth;
18cfc088
SB
1200
1201 /* store a in result in case we fail */
1202 oidcpy(result, a);
1203
1204 /* we can not handle deletion conflicts */
1205 if (is_null_oid(base))
1206 return 0;
1207 if (is_null_oid(a))
1208 return 0;
1209 if (is_null_oid(b))
1210 return 0;
1211
1212 if (add_submodule_odb(path)) {
325f3a8e 1213 output(o, 1, _("Failed to merge submodule %s (not checked out)"), path);
18cfc088
SB
1214 return 0;
1215 }
1216
2122f675
SB
1217 if (!(commit_base = lookup_commit_reference(the_repository, base)) ||
1218 !(commit_a = lookup_commit_reference(the_repository, a)) ||
1219 !(commit_b = lookup_commit_reference(the_repository, b))) {
325f3a8e 1220 output(o, 1, _("Failed to merge submodule %s (commits not present)"), path);
18cfc088
SB
1221 return 0;
1222 }
1223
1224 /* check whether both changes are forward */
1225 if (!in_merge_bases(commit_base, commit_a) ||
1226 !in_merge_bases(commit_base, commit_b)) {
325f3a8e 1227 output(o, 1, _("Failed to merge submodule %s (commits don't follow merge-base)"), path);
18cfc088
SB
1228 return 0;
1229 }
1230
1231 /* Case #1: a is contained in b or vice versa */
1232 if (in_merge_bases(commit_a, commit_b)) {
1233 oidcpy(result, b);
76f42125
LM
1234 if (show(o, 3)) {
1235 output(o, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
1236 output_commit_title(o, commit_b);
1237 } else if (show(o, 2))
40aac22b 1238 output(o, 2, _("Fast-forwarding submodule %s"), path);
76f42125
LM
1239 else
1240 ; /* no output */
1241
18cfc088
SB
1242 return 1;
1243 }
1244 if (in_merge_bases(commit_b, commit_a)) {
1245 oidcpy(result, a);
76f42125
LM
1246 if (show(o, 3)) {
1247 output(o, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
1248 output_commit_title(o, commit_a);
1249 } else if (show(o, 2))
40aac22b 1250 output(o, 2, _("Fast-forwarding submodule %s"), path);
76f42125
LM
1251 else
1252 ; /* no output */
1253
18cfc088
SB
1254 return 1;
1255 }
1256
1257 /*
1258 * Case #2: There are one or more merges that contain a and b in
1259 * the submodule. If there is only one, then present it as a
1260 * suggestion to the user, but leave it marked unmerged so the
1261 * user needs to confirm the resolution.
1262 */
1263
1264 /* Skip the search if makes no sense to the calling context. */
1265 if (!search)
1266 return 0;
1267
1268 /* find commit which merges them */
1269 parent_count = find_first_merges(&merges, path, commit_a, commit_b);
1270 switch (parent_count) {
1271 case 0:
325f3a8e 1272 output(o, 1, _("Failed to merge submodule %s (merge following commits not found)"), path);
18cfc088
SB
1273 break;
1274
1275 case 1:
325f3a8e
SB
1276 output(o, 1, _("Failed to merge submodule %s (not fast-forward)"), path);
1277 output(o, 2, _("Found a possible merge resolution for the submodule:\n"));
18cfc088 1278 print_commit((struct commit *) merges.objects[0].item);
325f3a8e 1279 output(o, 2, _(
d90e759f
EN
1280 "If this is correct simply add it to the index "
1281 "for example\n"
1282 "by using:\n\n"
1283 " git update-index --cacheinfo 160000 %s \"%s\"\n\n"
1284 "which will accept this suggestion.\n"),
1285 oid_to_hex(&merges.objects[0].item->oid), path);
18cfc088
SB
1286 break;
1287
1288 default:
325f3a8e 1289 output(o, 1, _("Failed to merge submodule %s (multiple merges found)"), path);
18cfc088
SB
1290 for (i = 0; i < merges.nr; i++)
1291 print_commit((struct commit *) merges.objects[i].item);
1292 }
1293
1294 object_array_clear(&merges);
1295 return 0;
1296}
1297
d9573556
EN
1298static int merge_mode_and_contents(struct merge_options *o,
1299 const struct diff_filespec *one,
1300 const struct diff_filespec *a,
1301 const struct diff_filespec *b,
1302 const char *filename,
1303 const char *branch1,
1304 const char *branch2,
b2a7942b 1305 const int extra_marker_size,
d9573556 1306 struct merge_file_info *result)
9047ebbc 1307{
4f445453
EN
1308 if (o->branch1 != branch1) {
1309 /*
1310 * It's weird getting a reverse merge with HEAD on the bottom
1311 * side of the conflict markers and the other branch on the
1312 * top. Fix that.
1313 */
1314 return merge_mode_and_contents(o, one, b, a,
1315 filename,
b2a7942b
EN
1316 branch2, branch1,
1317 extra_marker_size, result);
4f445453
EN
1318 }
1319
3c8a51e8
JS
1320 result->merge = 0;
1321 result->clean = 1;
9047ebbc
MV
1322
1323 if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
3c8a51e8 1324 result->clean = 0;
9047ebbc 1325 if (S_ISREG(a->mode)) {
3c8a51e8
JS
1326 result->mode = a->mode;
1327 oidcpy(&result->oid, &a->oid);
9047ebbc 1328 } else {
3c8a51e8
JS
1329 result->mode = b->mode;
1330 oidcpy(&result->oid, &b->oid);
9047ebbc
MV
1331 }
1332 } else {
b4da9d62 1333 if (!oid_eq(&a->oid, &one->oid) && !oid_eq(&b->oid, &one->oid))
3c8a51e8 1334 result->merge = 1;
9047ebbc
MV
1335
1336 /*
1337 * Merge modes
1338 */
b7fa51da 1339 if (a->mode == b->mode || a->mode == one->mode)
3c8a51e8 1340 result->mode = b->mode;
9047ebbc 1341 else {
3c8a51e8 1342 result->mode = a->mode;
b7fa51da 1343 if (b->mode != one->mode) {
3c8a51e8
JS
1344 result->clean = 0;
1345 result->merge = 1;
9047ebbc
MV
1346 }
1347 }
1348
b4da9d62 1349 if (oid_eq(&a->oid, &b->oid) || oid_eq(&a->oid, &one->oid))
3c8a51e8 1350 oidcpy(&result->oid, &b->oid);
b4da9d62 1351 else if (oid_eq(&b->oid, &one->oid))
3c8a51e8 1352 oidcpy(&result->oid, &a->oid);
9047ebbc
MV
1353 else if (S_ISREG(a->mode)) {
1354 mmbuffer_t result_buf;
6003303a 1355 int ret = 0, merge_status;
9047ebbc 1356
b7fa51da 1357 merge_status = merge_3way(o, &result_buf, one, a, b,
b2a7942b
EN
1358 branch1, branch2,
1359 extra_marker_size);
9047ebbc
MV
1360
1361 if ((merge_status < 0) || !result_buf.ptr)
bc9204d4 1362 ret = err(o, _("Failed to execute internal merge"));
9047ebbc 1363
a09c985e
PO
1364 if (!ret &&
1365 write_object_file(result_buf.ptr, result_buf.size,
1366 blob_type, &result->oid))
bc9204d4
JS
1367 ret = err(o, _("Unable to add %s to database"),
1368 a->path);
9047ebbc
MV
1369
1370 free(result_buf.ptr);
6003303a
JS
1371 if (ret)
1372 return ret;
3c8a51e8 1373 result->clean = (merge_status == 0);
9047ebbc 1374 } else if (S_ISGITLINK(a->mode)) {
325f3a8e 1375 result->clean = merge_submodule(o, &result->oid,
d90e759f
EN
1376 one->path,
1377 &one->oid,
1378 &a->oid,
1379 &b->oid);
9047ebbc 1380 } else if (S_ISLNK(a->mode)) {
fd48b464
JH
1381 switch (o->recursive_variant) {
1382 case MERGE_RECURSIVE_NORMAL:
1383 oidcpy(&result->oid, &a->oid);
1384 if (!oid_eq(&a->oid, &b->oid))
1385 result->clean = 0;
1386 break;
1387 case MERGE_RECURSIVE_OURS:
1388 oidcpy(&result->oid, &a->oid);
1389 break;
1390 case MERGE_RECURSIVE_THEIRS:
1391 oidcpy(&result->oid, &b->oid);
1392 break;
1393 }
ef1177d1 1394 } else
033abf97 1395 BUG("unsupported object type in the tree");
9047ebbc
MV
1396 }
1397
05cf21eb
EN
1398 if (result->merge)
1399 output(o, 2, _("Auto-merging %s"), filename);
1400
3c8a51e8 1401 return 0;
9047ebbc
MV
1402}
1403
8ebe7b05
EN
1404static int handle_rename_via_dir(struct merge_options *o,
1405 struct diff_filepair *pair,
1406 const char *rename_branch,
1407 const char *other_branch)
9c0743fe 1408{
5455c338
EN
1409 /*
1410 * Handle file adds that need to be renamed due to directory rename
1411 * detection. This differs from handle_rename_normal, because
1412 * there is no content merge to do; just move the file into the
1413 * desired final location.
1414 */
9c0743fe
EN
1415 const struct diff_filespec *dest = pair->two;
1416
79c47598
EN
1417 if (!o->call_depth && would_lose_untracked(dest->path)) {
1418 char *alt_path = unique_path(o, dest->path, rename_branch);
1419
1420 output(o, 1, _("Error: Refusing to lose untracked file at %s; "
1421 "writing to %s instead."),
1422 dest->path, alt_path);
1423 /*
1424 * Write the file in worktree at alt_path, but not in the
1425 * index. Instead, write to dest->path for the index but
1426 * only at the higher appropriate stage.
1427 */
1428 if (update_file(o, 0, &dest->oid, dest->mode, alt_path))
1429 return -1;
1430 free(alt_path);
1431 return update_stages(o, dest->path, NULL,
1432 rename_branch == o->branch1 ? dest : NULL,
1433 rename_branch == o->branch1 ? NULL : dest);
1434 }
1435
1436 /* Update dest->path both in index and in worktree */
9c0743fe
EN
1437 if (update_file(o, 1, &dest->oid, dest->mode, dest->path))
1438 return -1;
1439 return 0;
6bdaead1
EN
1440}
1441
75456f96 1442static int handle_change_delete(struct merge_options *o,
d90e759f
EN
1443 const char *path, const char *old_path,
1444 const struct object_id *o_oid, int o_mode,
1445 const struct object_id *changed_oid,
1446 int changed_mode,
1447 const char *change_branch,
1448 const char *delete_branch,
1449 const char *change, const char *change_past)
b7033252 1450{
b26d87f2
MM
1451 char *alt_path = NULL;
1452 const char *update_path = path;
75456f96 1453 int ret = 0;
b26d87f2 1454
79c47598
EN
1455 if (dir_in_way(path, !o->call_depth, 0) ||
1456 (!o->call_depth && would_lose_untracked(path))) {
b26d87f2 1457 update_path = alt_path = unique_path(o, path, change_branch);
b7033252
EN
1458 }
1459
1460 if (o->call_depth) {
1461 /*
1462 * We cannot arbitrarily accept either a_sha or b_sha as
1463 * correct; since there is no true "middle point" between
1464 * them, simply reuse the base version for virtual merge base.
1465 */
75456f96
JS
1466 ret = remove_file_from_cache(path);
1467 if (!ret)
b26d87f2 1468 ret = update_file(o, 0, o_oid, o_mode, update_path);
b7033252 1469 } else {
5b26c3c9
EN
1470 /*
1471 * Despite the four nearly duplicate messages and argument
1472 * lists below and the ugliness of the nested if-statements,
1473 * having complete messages makes the job easier for
1474 * translators.
1475 *
1476 * The slight variance among the cases is due to the fact
1477 * that:
1478 * 1) directory/file conflicts (in effect if
1479 * !alt_path) could cause us to need to write the
1480 * file to a different path.
1481 * 2) renames (in effect if !old_path) could mean that
1482 * there are two names for the path that the user
1483 * may know the file by.
1484 */
b26d87f2
MM
1485 if (!alt_path) {
1486 if (!old_path) {
1487 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1488 "and %s in %s. Version %s of %s left in tree."),
1489 change, path, delete_branch, change_past,
1490 change_branch, change_branch, path);
1491 } else {
1492 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1493 "and %s to %s in %s. Version %s of %s left in tree."),
1494 change, old_path, delete_branch, change_past, path,
1495 change_branch, change_branch, path);
1496 }
55653a68 1497 } else {
b26d87f2
MM
1498 if (!old_path) {
1499 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1500 "and %s in %s. Version %s of %s left in tree at %s."),
1501 change, path, delete_branch, change_past,
1502 change_branch, change_branch, path, alt_path);
1503 } else {
1504 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1505 "and %s to %s in %s. Version %s of %s left in tree at %s."),
1506 change, old_path, delete_branch, change_past, path,
1507 change_branch, change_branch, path, alt_path);
1508 }
55653a68 1509 }
35a74abf 1510 /*
b26d87f2
MM
1511 * No need to call update_file() on path when change_branch ==
1512 * o->branch1 && !alt_path, since that would needlessly touch
1513 * path. We could call update_file_flags() with update_cache=0
1514 * and update_wd=0, but that's a no-op.
35a74abf 1515 */
b26d87f2
MM
1516 if (change_branch != o->branch1 || alt_path)
1517 ret = update_file(o, 0, changed_oid, changed_mode, update_path);
b7033252 1518 }
b26d87f2 1519 free(alt_path);
75456f96
JS
1520
1521 return ret;
b7033252
EN
1522}
1523
8ebe7b05
EN
1524static int handle_rename_delete(struct merge_options *o,
1525 struct diff_filepair *pair,
1526 const char *rename_branch,
1527 const char *delete_branch)
9047ebbc 1528{
e03acb8b
EN
1529 const struct diff_filespec *orig = pair->one;
1530 const struct diff_filespec *dest = pair->two;
6ef2cb00 1531
75456f96
JS
1532 if (handle_change_delete(o,
1533 o->call_depth ? orig->path : dest->path,
b26d87f2 1534 o->call_depth ? NULL : orig->path,
75456f96 1535 &orig->oid, orig->mode,
b26d87f2
MM
1536 &dest->oid, dest->mode,
1537 rename_branch, delete_branch,
75456f96
JS
1538 _("rename"), _("renamed")))
1539 return -1;
e03acb8b 1540
75456f96
JS
1541 if (o->call_depth)
1542 return remove_file_from_cache(dest->path);
1543 else
bc9204d4 1544 return update_stages(o, dest->path, NULL,
75456f96
JS
1545 rename_branch == o->branch1 ? dest : NULL,
1546 rename_branch == o->branch1 ? NULL : dest);
6ef2cb00
EN
1547}
1548
1ac91b32
EN
1549static struct diff_filespec *filespec_from_entry(struct diff_filespec *target,
1550 struct stage_data *entry,
1551 int stage)
9047ebbc 1552{
b4da9d62 1553 struct object_id *oid = &entry->stages[stage].oid;
1ac91b32 1554 unsigned mode = entry->stages[stage].mode;
b4da9d62 1555 if (mode == 0 || is_null_oid(oid))
1ac91b32 1556 return NULL;
b4da9d62 1557 oidcpy(&target->oid, oid);
1ac91b32
EN
1558 target->mode = mode;
1559 return target;
1560}
1561
75456f96 1562static int handle_file(struct merge_options *o,
3672c971
EN
1563 struct diff_filespec *rename,
1564 int stage,
1565 struct rename_conflict_info *ci)
1566{
1567 char *dst_name = rename->path;
1568 struct stage_data *dst_entry;
1569 const char *cur_branch, *other_branch;
1570 struct diff_filespec other;
1571 struct diff_filespec *add;
75456f96 1572 int ret;
3672c971
EN
1573
1574 if (stage == 2) {
1575 dst_entry = ci->dst_entry1;
1576 cur_branch = ci->branch1;
1577 other_branch = ci->branch2;
1578 } else {
1579 dst_entry = ci->dst_entry2;
1580 cur_branch = ci->branch2;
1581 other_branch = ci->branch1;
9047ebbc 1582 }
3672c971
EN
1583
1584 add = filespec_from_entry(&other, dst_entry, stage ^ 1);
3672c971 1585 if (add) {
18797a3b 1586 int ren_src_was_dirty = was_dirty(o, rename->path);
3672c971 1587 char *add_name = unique_path(o, rename->path, other_branch);
75456f96
JS
1588 if (update_file(o, 0, &add->oid, add->mode, add_name))
1589 return -1;
3672c971 1590
18797a3b
EN
1591 if (ren_src_was_dirty) {
1592 output(o, 1, _("Refusing to lose dirty file at %s"),
1593 rename->path);
1594 }
1595 /*
1596 * Because the double negatives somehow keep confusing me...
1597 * 1) update_wd iff !ren_src_was_dirty.
1598 * 2) no_wd iff !update_wd
1599 * 3) so, no_wd == !!ren_src_was_dirty == ren_src_was_dirty
1600 */
1601 remove_file(o, 0, rename->path, ren_src_was_dirty);
3672c971
EN
1602 dst_name = unique_path(o, rename->path, cur_branch);
1603 } else {
5423d2e7 1604 if (dir_in_way(rename->path, !o->call_depth, 0)) {
3672c971 1605 dst_name = unique_path(o, rename->path, cur_branch);
55653a68 1606 output(o, 1, _("%s is a directory in %s adding as %s instead"),
3672c971 1607 rename->path, other_branch, dst_name);
79c47598
EN
1608 } else if (!o->call_depth &&
1609 would_lose_untracked(rename->path)) {
1610 dst_name = unique_path(o, rename->path, cur_branch);
1611 output(o, 1, _("Refusing to lose untracked file at %s; "
1612 "adding as %s instead"),
1613 rename->path, dst_name);
3672c971 1614 }
9047ebbc 1615 }
75456f96
JS
1616 if ((ret = update_file(o, 0, &rename->oid, rename->mode, dst_name)))
1617 ; /* fall through, do allow dst_name to be released */
1618 else if (stage == 2)
bc9204d4 1619 ret = update_stages(o, rename->path, NULL, rename, add);
f53d3977 1620 else
bc9204d4 1621 ret = update_stages(o, rename->path, NULL, add, rename);
3672c971
EN
1622
1623 if (dst_name != rename->path)
1624 free(dst_name);
75456f96
JS
1625
1626 return ret;
3672c971
EN
1627}
1628
8ebe7b05
EN
1629static int handle_rename_rename_1to2(struct merge_options *o,
1630 struct rename_conflict_info *ci)
9047ebbc 1631{
09c01f85 1632 /* One file was renamed in both branches, but to different names. */
a99b7f22
EN
1633 struct diff_filespec *one = ci->pair1->one;
1634 struct diff_filespec *a = ci->pair1->two;
1635 struct diff_filespec *b = ci->pair2->two;
4f66dade 1636
55653a68 1637 output(o, 1, _("CONFLICT (rename/rename): "
4f66dade 1638 "Rename \"%s\"->\"%s\" in branch \"%s\" "
55653a68 1639 "rename \"%s\"->\"%s\" in \"%s\"%s"),
a99b7f22
EN
1640 one->path, a->path, ci->branch1,
1641 one->path, b->path, ci->branch2,
55653a68 1642 o->call_depth ? _(" (left unresolved)") : "");
b7fa51da 1643 if (o->call_depth) {
c52ff85d 1644 struct merge_file_info mfi;
6d63070c
EN
1645 struct diff_filespec other;
1646 struct diff_filespec *add;
d9573556 1647 if (merge_mode_and_contents(o, one, a, b, one->path,
b2a7942b
EN
1648 ci->branch1, ci->branch2,
1649 o->call_depth * 2, &mfi))
75456f96
JS
1650 return -1;
1651
9047ebbc 1652 /*
c52ff85d
EN
1653 * FIXME: For rename/add-source conflicts (if we could detect
1654 * such), this is wrong. We should instead find a unique
1655 * pathname and then either rename the add-source file to that
1656 * unique path, or use that unique path instead of src here.
9047ebbc 1657 */
75456f96
JS
1658 if (update_file(o, 0, &mfi.oid, mfi.mode, one->path))
1659 return -1;
07413c5a 1660
6d63070c
EN
1661 /*
1662 * Above, we put the merged content at the merge-base's
1663 * path. Now we usually need to delete both a->path and
1664 * b->path. However, the rename on each side of the merge
1665 * could also be involved in a rename/add conflict. In
1666 * such cases, we should keep the added file around,
1667 * resolving the conflict at that path in its favor.
1668 */
1669 add = filespec_from_entry(&other, ci->dst_entry1, 2 ^ 1);
75456f96
JS
1670 if (add) {
1671 if (update_file(o, 0, &add->oid, add->mode, a->path))
1672 return -1;
1673 }
6d63070c
EN
1674 else
1675 remove_file_from_cache(a->path);
1676 add = filespec_from_entry(&other, ci->dst_entry2, 3 ^ 1);
75456f96
JS
1677 if (add) {
1678 if (update_file(o, 0, &add->oid, add->mode, b->path))
1679 return -1;
1680 }
6d63070c
EN
1681 else
1682 remove_file_from_cache(b->path);
75456f96
JS
1683 } else if (handle_file(o, a, 2, ci) || handle_file(o, b, 3, ci))
1684 return -1;
1685
1686 return 0;
9047ebbc
MV
1687}
1688
8ebe7b05
EN
1689static int handle_rename_rename_2to1(struct merge_options *o,
1690 struct rename_conflict_info *ci)
9047ebbc 1691{
461f5041
EN
1692 /* Two files, a & b, were renamed to the same thing, c. */
1693 struct diff_filespec *a = ci->pair1->one;
1694 struct diff_filespec *b = ci->pair2->one;
1695 struct diff_filespec *c1 = ci->pair1->two;
1696 struct diff_filespec *c2 = ci->pair2->two;
1697 char *path = c1->path; /* == c2->path */
05cf21eb
EN
1698 char *path_side_1_desc;
1699 char *path_side_2_desc;
434b8525
EN
1700 struct merge_file_info mfi_c1;
1701 struct merge_file_info mfi_c2;
75456f96 1702 int ret;
461f5041 1703
55653a68 1704 output(o, 1, _("CONFLICT (rename/rename): "
461f5041 1705 "Rename %s->%s in %s. "
55653a68 1706 "Rename %s->%s in %s"),
461f5041
EN
1707 a->path, c1->path, ci->branch1,
1708 b->path, c2->path, ci->branch2);
1709
8e1b62f1
EN
1710 remove_file(o, 1, a->path, o->call_depth || would_lose_untracked(a->path));
1711 remove_file(o, 1, b->path, o->call_depth || would_lose_untracked(b->path));
461f5041 1712
2b168ef3
EN
1713 path_side_1_desc = xstrfmt("version of %s from %s", path, a->path);
1714 path_side_2_desc = xstrfmt("version of %s from %s", path, b->path);
d9573556 1715 if (merge_mode_and_contents(o, a, c1, &ci->ren1_other, path_side_1_desc,
b2a7942b
EN
1716 o->branch1, o->branch2,
1717 o->call_depth * 2, &mfi_c1) ||
d9573556 1718 merge_mode_and_contents(o, b, &ci->ren2_other, c2, path_side_2_desc,
b2a7942b
EN
1719 o->branch1, o->branch2,
1720 o->call_depth * 2, &mfi_c2))
75456f96 1721 return -1;
05cf21eb
EN
1722 free(path_side_1_desc);
1723 free(path_side_2_desc);
434b8525 1724
0a6b8712 1725 if (o->call_depth) {
434b8525
EN
1726 /*
1727 * If mfi_c1.clean && mfi_c2.clean, then it might make
1728 * sense to do a two-way merge of those results. But, I
1729 * think in all cases, it makes sense to have the virtual
1730 * merge base just undo the renames; they can be detected
1731 * again later for the non-recursive merge.
1732 */
1733 remove_file(o, 0, path, 0);
75456f96
JS
1734 ret = update_file(o, 0, &mfi_c1.oid, mfi_c1.mode, a->path);
1735 if (!ret)
1736 ret = update_file(o, 0, &mfi_c2.oid, mfi_c2.mode,
1737 b->path);
0a6b8712 1738 } else {
461f5041
EN
1739 char *new_path1 = unique_path(o, path, ci->branch1);
1740 char *new_path2 = unique_path(o, path, ci->branch2);
55653a68 1741 output(o, 1, _("Renaming %s to %s and %s to %s instead"),
461f5041 1742 a->path, new_path1, b->path, new_path2);
18797a3b
EN
1743 if (was_dirty(o, path))
1744 output(o, 1, _("Refusing to lose dirty file at %s"),
1745 path);
1746 else if (would_lose_untracked(path))
79c47598
EN
1747 /*
1748 * Only way we get here is if both renames were from
1749 * a directory rename AND user had an untracked file
1750 * at the location where both files end up after the
1751 * two directory renames. See testcase 10d of t6043.
1752 */
1753 output(o, 1, _("Refusing to lose untracked file at "
1754 "%s, even though it's in the way."),
1755 path);
1756 else
1757 remove_file(o, 0, path, 0);
75456f96
JS
1758 ret = update_file(o, 0, &mfi_c1.oid, mfi_c1.mode, new_path1);
1759 if (!ret)
1760 ret = update_file(o, 0, &mfi_c2.oid, mfi_c2.mode,
1761 new_path2);
9c0743fe
EN
1762 /*
1763 * unpack_trees() actually populates the index for us for
1764 * "normal" rename/rename(2to1) situtations so that the
1765 * correct entries are at the higher stages, which would
1766 * make the call below to update_stages_for_stage_data
1767 * unnecessary. However, if either of the renames came
1768 * from a directory rename, then unpack_trees() will not
1769 * have gotten the right data loaded into the index, so we
1770 * need to do so now. (While it'd be tempting to move this
1771 * call to update_stages_for_stage_data() to
1772 * apply_directory_rename_modifications(), that would break
1773 * our intermediate calls to would_lose_untracked() since
1774 * those rely on the current in-memory index. See also the
1775 * big "NOTE" in update_stages()).
1776 */
1777 if (update_stages_for_stage_data(o, path, ci->dst_entry1))
1778 ret = -1;
1779
0a6b8712
EN
1780 free(new_path2);
1781 free(new_path1);
1782 }
75456f96
JS
1783
1784 return ret;
9047ebbc
MV
1785}
1786
9ba91557 1787/*
e5257b2a 1788 * Get the diff_filepairs changed between o_tree and tree.
9ba91557 1789 */
e5257b2a
EN
1790static struct diff_queue_struct *get_diffpairs(struct merge_options *o,
1791 struct tree *o_tree,
1792 struct tree *tree)
9ba91557 1793{
e5257b2a 1794 struct diff_queue_struct *ret;
9ba91557
EN
1795 struct diff_options opts;
1796
9ba91557
EN
1797 diff_setup(&opts);
1798 opts.flags.recursive = 1;
1799 opts.flags.rename_empty = 0;
85b46030
BP
1800 opts.detect_rename = merge_detect_rename(o);
1801 /*
1802 * We do not have logic to handle the detection of copies. In
1803 * fact, it may not even make sense to add such logic: would we
1804 * really want a change to a base file to be propagated through
1805 * multiple other files by a merge?
1806 */
1807 if (opts.detect_rename > DIFF_DETECT_RENAME)
1808 opts.detect_rename = DIFF_DETECT_RENAME;
9ba91557
EN
1809 opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
1810 o->diff_rename_limit >= 0 ? o->diff_rename_limit :
1811 1000;
1812 opts.rename_score = o->rename_score;
1813 opts.show_rename_progress = o->show_rename_progress;
1814 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
1815 diff_setup_done(&opts);
1816 diff_tree_oid(&o_tree->object.oid, &tree->object.oid, "", &opts);
1817 diffcore_std(&opts);
1818 if (opts.needed_rename_limit > o->needed_rename_limit)
1819 o->needed_rename_limit = opts.needed_rename_limit;
e5257b2a
EN
1820
1821 ret = xmalloc(sizeof(*ret));
1822 *ret = diff_queued_diff;
1823
1824 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
1825 diff_queued_diff.nr = 0;
1826 diff_queued_diff.queue = NULL;
1827 diff_flush(&opts);
1828 return ret;
1829}
1830
96e7ffbd
EN
1831static int tree_has_path(struct tree *tree, const char *path)
1832{
1833 struct object_id hashy;
1834 unsigned int mode_o;
1835
1836 return !get_tree_entry(&tree->object.oid, path,
1837 &hashy, &mode_o);
1838}
1839
e95ab70a
EN
1840/*
1841 * Return a new string that replaces the beginning portion (which matches
1842 * entry->dir), with entry->new_dir. In perl-speak:
1843 * new_path_name = (old_path =~ s/entry->dir/entry->new_dir/);
1844 * NOTE:
1845 * Caller must ensure that old_path starts with entry->dir + '/'.
1846 */
1847static char *apply_dir_rename(struct dir_rename_entry *entry,
1848 const char *old_path)
1849{
1850 struct strbuf new_path = STRBUF_INIT;
1851 int oldlen, newlen;
1852
1853 if (entry->non_unique_new_dir)
1854 return NULL;
1855
1856 oldlen = strlen(entry->dir);
1857 newlen = entry->new_dir.len + (strlen(old_path) - oldlen) + 1;
1858 strbuf_grow(&new_path, newlen);
1859 strbuf_addbuf(&new_path, &entry->new_dir);
1860 strbuf_addstr(&new_path, &old_path[oldlen]);
1861
1862 return strbuf_detach(&new_path, NULL);
1863}
1864
7fe40b88
EN
1865static void get_renamed_dir_portion(const char *old_path, const char *new_path,
1866 char **old_dir, char **new_dir)
1867{
1868 char *end_of_old, *end_of_new;
1869 int old_len, new_len;
1870
1871 *old_dir = NULL;
1872 *new_dir = NULL;
1873
1874 /*
1875 * For
1876 * "a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c"
1877 * the "e/foo.c" part is the same, we just want to know that
1878 * "a/b/c/d" was renamed to "a/b/some/thing/else"
1879 * so, for this example, this function returns "a/b/c/d" in
1880 * *old_dir and "a/b/some/thing/else" in *new_dir.
1881 *
1882 * Also, if the basename of the file changed, we don't care. We
1883 * want to know which portion of the directory, if any, changed.
1884 */
1885 end_of_old = strrchr(old_path, '/');
1886 end_of_new = strrchr(new_path, '/');
1887
1888 if (end_of_old == NULL || end_of_new == NULL)
1889 return;
1890 while (*--end_of_new == *--end_of_old &&
1891 end_of_old != old_path &&
1892 end_of_new != new_path)
1893 ; /* Do nothing; all in the while loop */
1894 /*
1895 * We've found the first non-matching character in the directory
1896 * paths. That means the current directory we were comparing
1897 * represents the rename. Move end_of_old and end_of_new back
1898 * to the full directory name.
1899 */
1900 if (*end_of_old == '/')
1901 end_of_old++;
1902 if (*end_of_old != '/')
1903 end_of_new++;
1904 end_of_old = strchr(end_of_old, '/');
1905 end_of_new = strchr(end_of_new, '/');
1906
1907 /*
1908 * It may have been the case that old_path and new_path were the same
1909 * directory all along. Don't claim a rename if they're the same.
1910 */
1911 old_len = end_of_old - old_path;
1912 new_len = end_of_new - new_path;
1913
1914 if (old_len != new_len || strncmp(old_path, new_path, old_len)) {
1915 *old_dir = xstrndup(old_path, old_len);
1916 *new_dir = xstrndup(new_path, new_len);
1917 }
1918}
1919
96e7ffbd
EN
1920static void remove_hashmap_entries(struct hashmap *dir_renames,
1921 struct string_list *items_to_remove)
1922{
1923 int i;
1924 struct dir_rename_entry *entry;
1925
1926 for (i = 0; i < items_to_remove->nr; i++) {
1927 entry = items_to_remove->items[i].util;
1928 hashmap_remove(dir_renames, entry, NULL);
1929 }
1930 string_list_clear(items_to_remove, 0);
1931}
1932
f6f77559
EN
1933/*
1934 * See if there is a directory rename for path, and if there are any file
1935 * level conflicts for the renamed location. If there is a rename and
1936 * there are no conflicts, return the new name. Otherwise, return NULL.
1937 */
1938static char *handle_path_level_conflicts(struct merge_options *o,
1939 const char *path,
1940 struct dir_rename_entry *entry,
1941 struct hashmap *collisions,
1942 struct tree *tree)
1943{
1944 char *new_path = NULL;
1945 struct collision_entry *collision_ent;
1946 int clean = 1;
1947 struct strbuf collision_paths = STRBUF_INIT;
1948
1949 /*
1950 * entry has the mapping of old directory name to new directory name
1951 * that we want to apply to path.
1952 */
1953 new_path = apply_dir_rename(entry, path);
1954
1955 if (!new_path) {
1956 /* This should only happen when entry->non_unique_new_dir set */
1957 if (!entry->non_unique_new_dir)
1958 BUG("entry->non_unqiue_dir not set and !new_path");
1959 output(o, 1, _("CONFLICT (directory rename split): "
1960 "Unclear where to place %s because directory "
1961 "%s was renamed to multiple other directories, "
1962 "with no destination getting a majority of the "
1963 "files."),
1964 path, entry->dir);
1965 clean = 0;
1966 return NULL;
1967 }
1968
1969 /*
1970 * The caller needs to have ensured that it has pre-populated
1971 * collisions with all paths that map to new_path. Do a quick check
1972 * to ensure that's the case.
1973 */
1974 collision_ent = collision_find_entry(collisions, new_path);
1975 if (collision_ent == NULL)
1976 BUG("collision_ent is NULL");
1977
1978 /*
1979 * Check for one-sided add/add/.../add conflicts, i.e.
1980 * where implicit renames from the other side doing
1981 * directory rename(s) can affect this side of history
1982 * to put multiple paths into the same location. Warn
1983 * and bail on directory renames for such paths.
1984 */
1985 if (collision_ent->reported_already) {
1986 clean = 0;
1987 } else if (tree_has_path(tree, new_path)) {
1988 collision_ent->reported_already = 1;
1989 strbuf_add_separated_string_list(&collision_paths, ", ",
1990 &collision_ent->source_files);
1991 output(o, 1, _("CONFLICT (implicit dir rename): Existing "
1992 "file/dir at %s in the way of implicit "
1993 "directory rename(s) putting the following "
1994 "path(s) there: %s."),
1995 new_path, collision_paths.buf);
1996 clean = 0;
1997 } else if (collision_ent->source_files.nr > 1) {
1998 collision_ent->reported_already = 1;
1999 strbuf_add_separated_string_list(&collision_paths, ", ",
2000 &collision_ent->source_files);
2001 output(o, 1, _("CONFLICT (implicit dir rename): Cannot map "
2002 "more than one path to %s; implicit directory "
2003 "renames tried to put these paths there: %s"),
2004 new_path, collision_paths.buf);
2005 clean = 0;
2006 }
2007
2008 /* Free memory we no longer need */
2009 strbuf_release(&collision_paths);
2010 if (!clean && new_path) {
2011 free(new_path);
2012 return NULL;
2013 }
2014
2015 return new_path;
2016}
2017
96e7ffbd
EN
2018/*
2019 * There are a couple things we want to do at the directory level:
2020 * 1. Check for both sides renaming to the same thing, in order to avoid
2021 * implicit renaming of files that should be left in place. (See
2022 * testcase 6b in t6043 for details.)
2023 * 2. Prune directory renames if there are still files left in the
2024 * the original directory. These represent a partial directory rename,
2025 * i.e. a rename where only some of the files within the directory
2026 * were renamed elsewhere. (Technically, this could be done earlier
2027 * in get_directory_renames(), except that would prevent us from
2028 * doing the previous check and thus failing testcase 6b.)
2029 * 3. Check for rename/rename(1to2) conflicts (at the directory level).
2030 * In the future, we could potentially record this info as well and
2031 * omit reporting rename/rename(1to2) conflicts for each path within
2032 * the affected directories, thus cleaning up the merge output.
2033 * NOTE: We do NOT check for rename/rename(2to1) conflicts at the
2034 * directory level, because merging directories is fine. If it
2035 * causes conflicts for files within those merged directories, then
2036 * that should be detected at the individual path level.
2037 */
2038static void handle_directory_level_conflicts(struct merge_options *o,
2039 struct hashmap *dir_re_head,
2040 struct tree *head,
2041 struct hashmap *dir_re_merge,
2042 struct tree *merge)
2043{
2044 struct hashmap_iter iter;
2045 struct dir_rename_entry *head_ent;
2046 struct dir_rename_entry *merge_ent;
2047
2048 struct string_list remove_from_head = STRING_LIST_INIT_NODUP;
2049 struct string_list remove_from_merge = STRING_LIST_INIT_NODUP;
2050
2051 hashmap_iter_init(dir_re_head, &iter);
2052 while ((head_ent = hashmap_iter_next(&iter))) {
2053 merge_ent = dir_rename_find_entry(dir_re_merge, head_ent->dir);
2054 if (merge_ent &&
2055 !head_ent->non_unique_new_dir &&
2056 !merge_ent->non_unique_new_dir &&
2057 !strbuf_cmp(&head_ent->new_dir, &merge_ent->new_dir)) {
2058 /* 1. Renamed identically; remove it from both sides */
2059 string_list_append(&remove_from_head,
2060 head_ent->dir)->util = head_ent;
2061 strbuf_release(&head_ent->new_dir);
2062 string_list_append(&remove_from_merge,
2063 merge_ent->dir)->util = merge_ent;
2064 strbuf_release(&merge_ent->new_dir);
2065 } else if (tree_has_path(head, head_ent->dir)) {
2066 /* 2. This wasn't a directory rename after all */
2067 string_list_append(&remove_from_head,
2068 head_ent->dir)->util = head_ent;
2069 strbuf_release(&head_ent->new_dir);
2070 }
2071 }
2072
2073 remove_hashmap_entries(dir_re_head, &remove_from_head);
2074 remove_hashmap_entries(dir_re_merge, &remove_from_merge);
2075
2076 hashmap_iter_init(dir_re_merge, &iter);
2077 while ((merge_ent = hashmap_iter_next(&iter))) {
2078 head_ent = dir_rename_find_entry(dir_re_head, merge_ent->dir);
2079 if (tree_has_path(merge, merge_ent->dir)) {
2080 /* 2. This wasn't a directory rename after all */
2081 string_list_append(&remove_from_merge,
2082 merge_ent->dir)->util = merge_ent;
2083 } else if (head_ent &&
2084 !head_ent->non_unique_new_dir &&
2085 !merge_ent->non_unique_new_dir) {
2086 /* 3. rename/rename(1to2) */
2087 /*
2088 * We can assume it's not rename/rename(1to1) because
2089 * that was case (1), already checked above. So we
2090 * know that head_ent->new_dir and merge_ent->new_dir
2091 * are different strings.
2092 */
2093 output(o, 1, _("CONFLICT (rename/rename): "
2094 "Rename directory %s->%s in %s. "
2095 "Rename directory %s->%s in %s"),
2096 head_ent->dir, head_ent->new_dir.buf, o->branch1,
2097 head_ent->dir, merge_ent->new_dir.buf, o->branch2);
2098 string_list_append(&remove_from_head,
2099 head_ent->dir)->util = head_ent;
2100 strbuf_release(&head_ent->new_dir);
2101 string_list_append(&remove_from_merge,
2102 merge_ent->dir)->util = merge_ent;
2103 strbuf_release(&merge_ent->new_dir);
2104 }
2105 }
2106
2107 remove_hashmap_entries(dir_re_head, &remove_from_head);
2108 remove_hashmap_entries(dir_re_merge, &remove_from_merge);
2109}
2110
7fe40b88
EN
2111static struct hashmap *get_directory_renames(struct diff_queue_struct *pairs,
2112 struct tree *tree)
2113{
2114 struct hashmap *dir_renames;
2115 struct hashmap_iter iter;
2116 struct dir_rename_entry *entry;
2117 int i;
2118
2119 /*
2120 * Typically, we think of a directory rename as all files from a
2121 * certain directory being moved to a target directory. However,
2122 * what if someone first moved two files from the original
2123 * directory in one commit, and then renamed the directory
2124 * somewhere else in a later commit? At merge time, we just know
2125 * that files from the original directory went to two different
2126 * places, and that the bulk of them ended up in the same place.
2127 * We want each directory rename to represent where the bulk of the
2128 * files from that directory end up; this function exists to find
2129 * where the bulk of the files went.
2130 *
2131 * The first loop below simply iterates through the list of file
2132 * renames, finding out how often each directory rename pair
2133 * possibility occurs.
2134 */
2135 dir_renames = xmalloc(sizeof(*dir_renames));
2136 dir_rename_init(dir_renames);
2137 for (i = 0; i < pairs->nr; ++i) {
2138 struct string_list_item *item;
2139 int *count;
2140 struct diff_filepair *pair = pairs->queue[i];
2141 char *old_dir, *new_dir;
2142
2143 /* File not part of directory rename if it wasn't renamed */
2144 if (pair->status != 'R')
2145 continue;
2146
2147 get_renamed_dir_portion(pair->one->path, pair->two->path,
2148 &old_dir, &new_dir);
2149 if (!old_dir)
2150 /* Directory didn't change at all; ignore this one. */
2151 continue;
2152
2153 entry = dir_rename_find_entry(dir_renames, old_dir);
2154 if (!entry) {
2155 entry = xmalloc(sizeof(*entry));
2156 dir_rename_entry_init(entry, old_dir);
2157 hashmap_put(dir_renames, entry);
2158 } else {
2159 free(old_dir);
2160 }
2161 item = string_list_lookup(&entry->possible_new_dirs, new_dir);
2162 if (!item) {
2163 item = string_list_insert(&entry->possible_new_dirs,
2164 new_dir);
2165 item->util = xcalloc(1, sizeof(int));
2166 } else {
2167 free(new_dir);
2168 }
2169 count = item->util;
2170 *count += 1;
2171 }
2172
2173 /*
2174 * For each directory with files moved out of it, we find out which
2175 * target directory received the most files so we can declare it to
2176 * be the "winning" target location for the directory rename. This
2177 * winner gets recorded in new_dir. If there is no winner
2178 * (multiple target directories received the same number of files),
2179 * we set non_unique_new_dir. Once we've determined the winner (or
2180 * that there is no winner), we no longer need possible_new_dirs.
2181 */
2182 hashmap_iter_init(dir_renames, &iter);
2183 while ((entry = hashmap_iter_next(&iter))) {
2184 int max = 0;
2185 int bad_max = 0;
2186 char *best = NULL;
2187
2188 for (i = 0; i < entry->possible_new_dirs.nr; i++) {
2189 int *count = entry->possible_new_dirs.items[i].util;
2190
2191 if (*count == max)
2192 bad_max = max;
2193 else if (*count > max) {
2194 max = *count;
2195 best = entry->possible_new_dirs.items[i].string;
2196 }
2197 }
2198 if (bad_max == max)
2199 entry->non_unique_new_dir = 1;
2200 else {
2201 assert(entry->new_dir.len == 0);
2202 strbuf_addstr(&entry->new_dir, best);
2203 }
2204 /*
2205 * The relevant directory sub-portion of the original full
2206 * filepaths were xstrndup'ed before inserting into
2207 * possible_new_dirs, and instead of manually iterating the
2208 * list and free'ing each, just lie and tell
2209 * possible_new_dirs that it did the strdup'ing so that it
2210 * will free them for us.
2211 */
2212 entry->possible_new_dirs.strdup_strings = 1;
2213 string_list_clear(&entry->possible_new_dirs, 1);
2214 }
2215
2216 return dir_renames;
2217}
2218
e95ab70a
EN
2219static struct dir_rename_entry *check_dir_renamed(const char *path,
2220 struct hashmap *dir_renames)
2221{
9da2d037 2222 char *temp = xstrdup(path);
e95ab70a 2223 char *end;
9da2d037 2224 struct dir_rename_entry *entry = NULL;;
e95ab70a 2225
e95ab70a
EN
2226 while ((end = strrchr(temp, '/'))) {
2227 *end = '\0';
2228 entry = dir_rename_find_entry(dir_renames, temp);
2229 if (entry)
9da2d037 2230 break;
e95ab70a 2231 }
9da2d037
RS
2232 free(temp);
2233 return entry;
e95ab70a
EN
2234}
2235
2236static void compute_collisions(struct hashmap *collisions,
2237 struct hashmap *dir_renames,
2238 struct diff_queue_struct *pairs)
2239{
2240 int i;
2241
2242 /*
2243 * Multiple files can be mapped to the same path due to directory
2244 * renames done by the other side of history. Since that other
2245 * side of history could have merged multiple directories into one,
2246 * if our side of history added the same file basename to each of
2247 * those directories, then all N of them would get implicitly
2248 * renamed by the directory rename detection into the same path,
2249 * and we'd get an add/add/.../add conflict, and all those adds
2250 * from *this* side of history. This is not representable in the
2251 * index, and users aren't going to easily be able to make sense of
2252 * it. So we need to provide a good warning about what's
2253 * happening, and fall back to no-directory-rename detection
2254 * behavior for those paths.
2255 *
2256 * See testcases 9e and all of section 5 from t6043 for examples.
2257 */
2258 collision_init(collisions);
2259
2260 for (i = 0; i < pairs->nr; ++i) {
2261 struct dir_rename_entry *dir_rename_ent;
2262 struct collision_entry *collision_ent;
2263 char *new_path;
2264 struct diff_filepair *pair = pairs->queue[i];
2265
6e7e027f 2266 if (pair->status != 'A' && pair->status != 'R')
e95ab70a
EN
2267 continue;
2268 dir_rename_ent = check_dir_renamed(pair->two->path,
2269 dir_renames);
2270 if (!dir_rename_ent)
2271 continue;
2272
2273 new_path = apply_dir_rename(dir_rename_ent, pair->two->path);
2274 if (!new_path)
2275 /*
2276 * dir_rename_ent->non_unique_new_path is true, which
2277 * means there is no directory rename for us to use,
2278 * which means it won't cause us any additional
2279 * collisions.
2280 */
2281 continue;
2282 collision_ent = collision_find_entry(collisions, new_path);
2283 if (!collision_ent) {
2284 collision_ent = xcalloc(1,
2285 sizeof(struct collision_entry));
2286 hashmap_entry_init(collision_ent, strhash(new_path));
2287 hashmap_put(collisions, collision_ent);
2288 collision_ent->target_file = new_path;
2289 } else {
2290 free(new_path);
2291 }
2292 string_list_insert(&collision_ent->source_files,
2293 pair->two->path);
2294 }
2295}
2296
f6f77559
EN
2297static char *check_for_directory_rename(struct merge_options *o,
2298 const char *path,
2299 struct tree *tree,
2300 struct hashmap *dir_renames,
2301 struct hashmap *dir_rename_exclusions,
2302 struct hashmap *collisions,
2303 int *clean_merge)
2304{
2305 char *new_path = NULL;
2306 struct dir_rename_entry *entry = check_dir_renamed(path, dir_renames);
2307 struct dir_rename_entry *oentry = NULL;
2308
2309 if (!entry)
2310 return new_path;
2311
2312 /*
2313 * This next part is a little weird. We do not want to do an
2314 * implicit rename into a directory we renamed on our side, because
2315 * that will result in a spurious rename/rename(1to2) conflict. An
2316 * example:
2317 * Base commit: dumbdir/afile, otherdir/bfile
2318 * Side 1: smrtdir/afile, otherdir/bfile
2319 * Side 2: dumbdir/afile, dumbdir/bfile
2320 * Here, while working on Side 1, we could notice that otherdir was
2321 * renamed/merged to dumbdir, and change the diff_filepair for
2322 * otherdir/bfile into a rename into dumbdir/bfile. However, Side
2323 * 2 will notice the rename from dumbdir to smrtdir, and do the
2324 * transitive rename to move it from dumbdir/bfile to
2325 * smrtdir/bfile. That gives us bfile in dumbdir vs being in
2326 * smrtdir, a rename/rename(1to2) conflict. We really just want
2327 * the file to end up in smrtdir. And the way to achieve that is
2328 * to not let Side1 do the rename to dumbdir, since we know that is
2329 * the source of one of our directory renames.
2330 *
2331 * That's why oentry and dir_rename_exclusions is here.
2332 *
2333 * As it turns out, this also prevents N-way transient rename
2334 * confusion; See testcases 9c and 9d of t6043.
2335 */
2336 oentry = dir_rename_find_entry(dir_rename_exclusions, entry->new_dir.buf);
2337 if (oentry) {
2338 output(o, 1, _("WARNING: Avoiding applying %s -> %s rename "
2339 "to %s, because %s itself was renamed."),
2340 entry->dir, entry->new_dir.buf, path, entry->new_dir.buf);
2341 } else {
2342 new_path = handle_path_level_conflicts(o, path, entry,
2343 collisions, tree);
2344 *clean_merge &= (new_path != NULL);
2345 }
2346
2347 return new_path;
2348}
2349
9c0743fe
EN
2350static void apply_directory_rename_modifications(struct merge_options *o,
2351 struct diff_filepair *pair,
2352 char *new_path,
2353 struct rename *re,
2354 struct tree *tree,
2355 struct tree *o_tree,
2356 struct tree *a_tree,
2357 struct tree *b_tree,
2358 struct string_list *entries,
2359 int *clean)
2360{
2361 struct string_list_item *item;
2362 int stage = (tree == a_tree ? 2 : 3);
18797a3b 2363 int update_wd;
9c0743fe
EN
2364
2365 /*
2366 * In all cases where we can do directory rename detection,
2367 * unpack_trees() will have read pair->two->path into the
2368 * index and the working copy. We need to remove it so that
2369 * we can instead place it at new_path. It is guaranteed to
2370 * not be untracked (unpack_trees() would have errored out
2371 * saying the file would have been overwritten), but it might
2372 * be dirty, though.
2373 */
18797a3b
EN
2374 update_wd = !was_dirty(o, pair->two->path);
2375 if (!update_wd)
2376 output(o, 1, _("Refusing to lose dirty file at %s"),
2377 pair->two->path);
2378 remove_file(o, 1, pair->two->path, !update_wd);
9c0743fe
EN
2379
2380 /* Find or create a new re->dst_entry */
2381 item = string_list_lookup(entries, new_path);
2382 if (item) {
2383 /*
2384 * Since we're renaming on this side of history, and it's
2385 * due to a directory rename on the other side of history
2386 * (which we only allow when the directory in question no
2387 * longer exists on the other side of history), the
2388 * original entry for re->dst_entry is no longer
2389 * necessary...
2390 */
2391 re->dst_entry->processed = 1;
2392
2393 /*
2394 * ...because we'll be using this new one.
2395 */
2396 re->dst_entry = item->util;
2397 } else {
2398 /*
2399 * re->dst_entry is for the before-dir-rename path, and we
2400 * need it to hold information for the after-dir-rename
2401 * path. Before creating a new entry, we need to mark the
2402 * old one as unnecessary (...unless it is shared by
2403 * src_entry, i.e. this didn't use to be a rename, in which
2404 * case we can just allow the normal processing to happen
2405 * for it).
2406 */
2407 if (pair->status == 'R')
2408 re->dst_entry->processed = 1;
2409
2410 re->dst_entry = insert_stage_data(new_path,
2411 o_tree, a_tree, b_tree,
2412 entries);
2413 item = string_list_insert(entries, new_path);
2414 item->util = re->dst_entry;
2415 }
2416
2417 /*
2418 * Update the stage_data with the information about the path we are
2419 * moving into place. That slot will be empty and available for us
2420 * to write to because of the collision checks in
2421 * handle_path_level_conflicts(). In other words,
2422 * re->dst_entry->stages[stage].oid will be the null_oid, so it's
2423 * open for us to write to.
2424 *
2425 * It may be tempting to actually update the index at this point as
2426 * well, using update_stages_for_stage_data(), but as per the big
2427 * "NOTE" in update_stages(), doing so will modify the current
2428 * in-memory index which will break calls to would_lose_untracked()
2429 * that we need to make. Instead, we need to just make sure that
8ebe7b05 2430 * the various handle_rename_*() functions update the index
9c0743fe
EN
2431 * explicitly rather than relying on unpack_trees() to have done it.
2432 */
2433 get_tree_entry(&tree->object.oid,
2434 pair->two->path,
2435 &re->dst_entry->stages[stage].oid,
2436 &re->dst_entry->stages[stage].mode);
2437
2438 /* Update pair status */
2439 if (pair->status == 'A') {
2440 /*
2441 * Recording rename information for this add makes it look
2442 * like a rename/delete conflict. Make sure we can
2443 * correctly handle this as an add that was moved to a new
2444 * directory instead of reporting a rename/delete conflict.
2445 */
2446 re->add_turned_into_rename = 1;
2447 }
2448 /*
2449 * We don't actually look at pair->status again, but it seems
2450 * pedagogically correct to adjust it.
2451 */
2452 pair->status = 'R';
2453
2454 /*
2455 * Finally, record the new location.
2456 */
2457 pair->two->path = new_path;
2458}
2459
e5257b2a
EN
2460/*
2461 * Get information of all renames which occurred in 'pairs', making use of
2462 * any implicit directory renames inferred from the other side of history.
2463 * We need the three trees in the merge ('o_tree', 'a_tree' and 'b_tree')
2464 * to be able to associate the correct cache entries with the rename
2465 * information; tree is always equal to either a_tree or b_tree.
2466 */
2467static struct string_list *get_renames(struct merge_options *o,
2468 struct diff_queue_struct *pairs,
e95ab70a 2469 struct hashmap *dir_renames,
f6f77559 2470 struct hashmap *dir_rename_exclusions,
e5257b2a
EN
2471 struct tree *tree,
2472 struct tree *o_tree,
2473 struct tree *a_tree,
2474 struct tree *b_tree,
f6f77559
EN
2475 struct string_list *entries,
2476 int *clean_merge)
e5257b2a
EN
2477{
2478 int i;
e95ab70a
EN
2479 struct hashmap collisions;
2480 struct hashmap_iter iter;
2481 struct collision_entry *e;
e5257b2a
EN
2482 struct string_list *renames;
2483
e95ab70a 2484 compute_collisions(&collisions, dir_renames, pairs);
e5257b2a
EN
2485 renames = xcalloc(1, sizeof(struct string_list));
2486
2487 for (i = 0; i < pairs->nr; ++i) {
9ba91557
EN
2488 struct string_list_item *item;
2489 struct rename *re;
e5257b2a 2490 struct diff_filepair *pair = pairs->queue[i];
f6f77559 2491 char *new_path; /* non-NULL only with directory renames */
9ba91557 2492
6e7e027f 2493 if (pair->status != 'A' && pair->status != 'R') {
9ba91557
EN
2494 diff_free_filepair(pair);
2495 continue;
2496 }
f6f77559
EN
2497 new_path = check_for_directory_rename(o, pair->two->path, tree,
2498 dir_renames,
2499 dir_rename_exclusions,
2500 &collisions,
2501 clean_merge);
2502 if (pair->status != 'R' && !new_path) {
2503 diff_free_filepair(pair);
2504 continue;
2505 }
2506
9ba91557
EN
2507 re = xmalloc(sizeof(*re));
2508 re->processed = 0;
9c0743fe 2509 re->add_turned_into_rename = 0;
9ba91557
EN
2510 re->pair = pair;
2511 item = string_list_lookup(entries, re->pair->one->path);
2512 if (!item)
2513 re->src_entry = insert_stage_data(re->pair->one->path,
2514 o_tree, a_tree, b_tree, entries);
2515 else
2516 re->src_entry = item->util;
2517
2518 item = string_list_lookup(entries, re->pair->two->path);
2519 if (!item)
2520 re->dst_entry = insert_stage_data(re->pair->two->path,
2521 o_tree, a_tree, b_tree, entries);
2522 else
2523 re->dst_entry = item->util;
2524 item = string_list_insert(renames, pair->one->path);
2525 item->util = re;
9c0743fe
EN
2526 if (new_path)
2527 apply_directory_rename_modifications(o, pair, new_path,
2528 re, tree, o_tree,
2529 a_tree, b_tree,
2530 entries,
2531 clean_merge);
9ba91557 2532 }
e95ab70a
EN
2533
2534 hashmap_iter_init(&collisions, &iter);
2535 while ((e = hashmap_iter_next(&iter))) {
2536 free(e->target_file);
2537 string_list_clear(&e->source_files, 0);
2538 }
2539 hashmap_free(&collisions, 1);
9ba91557
EN
2540 return renames;
2541}
2542
8a2fce18
MV
2543static int process_renames(struct merge_options *o,
2544 struct string_list *a_renames,
2545 struct string_list *b_renames)
9047ebbc
MV
2546{
2547 int clean_merge = 1, i, j;
183113a5
TF
2548 struct string_list a_by_dst = STRING_LIST_INIT_NODUP;
2549 struct string_list b_by_dst = STRING_LIST_INIT_NODUP;
9047ebbc
MV
2550 const struct rename *sre;
2551
2552 for (i = 0; i < a_renames->nr; i++) {
2553 sre = a_renames->items[i].util;
78a395d3 2554 string_list_insert(&a_by_dst, sre->pair->two->path)->util
0a6b8712 2555 = (void *)sre;
9047ebbc
MV
2556 }
2557 for (i = 0; i < b_renames->nr; i++) {
2558 sre = b_renames->items[i].util;
78a395d3 2559 string_list_insert(&b_by_dst, sre->pair->two->path)->util
0a6b8712 2560 = (void *)sre;
9047ebbc
MV
2561 }
2562
2563 for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
8e24cbae 2564 struct string_list *renames1, *renames2Dst;
9047ebbc
MV
2565 struct rename *ren1 = NULL, *ren2 = NULL;
2566 const char *branch1, *branch2;
2567 const char *ren1_src, *ren1_dst;
461f5041 2568 struct string_list_item *lookup;
9047ebbc
MV
2569
2570 if (i >= a_renames->nr) {
9047ebbc
MV
2571 ren2 = b_renames->items[j++].util;
2572 } else if (j >= b_renames->nr) {
9047ebbc
MV
2573 ren1 = a_renames->items[i++].util;
2574 } else {
8e24cbae
BK
2575 int compare = strcmp(a_renames->items[i].string,
2576 b_renames->items[j].string);
9047ebbc
MV
2577 if (compare <= 0)
2578 ren1 = a_renames->items[i++].util;
2579 if (compare >= 0)
2580 ren2 = b_renames->items[j++].util;
2581 }
2582
2583 /* TODO: refactor, so that 1/2 are not needed */
2584 if (ren1) {
2585 renames1 = a_renames;
9047ebbc 2586 renames2Dst = &b_by_dst;
8a2fce18
MV
2587 branch1 = o->branch1;
2588 branch2 = o->branch2;
9047ebbc 2589 } else {
9047ebbc 2590 renames1 = b_renames;
9047ebbc 2591 renames2Dst = &a_by_dst;
8a2fce18
MV
2592 branch1 = o->branch2;
2593 branch2 = o->branch1;
35d803bc 2594 SWAP(ren2, ren1);
9047ebbc 2595 }
9047ebbc 2596
9047ebbc
MV
2597 if (ren1->processed)
2598 continue;
2599 ren1->processed = 1;
9047ebbc 2600 ren1->dst_entry->processed = 1;
7769a75e
EN
2601 /* BUG: We should only mark src_entry as processed if we
2602 * are not dealing with a rename + add-source case.
2603 */
9047ebbc 2604 ren1->src_entry->processed = 1;
9047ebbc
MV
2605
2606 ren1_src = ren1->pair->one->path;
2607 ren1_dst = ren1->pair->two->path;
2608
2609 if (ren2) {
461f5041 2610 /* One file renamed on both sides */
9047ebbc
MV
2611 const char *ren2_src = ren2->pair->one->path;
2612 const char *ren2_dst = ren2->pair->two->path;
4f66dade 2613 enum rename_type rename_type;
9047ebbc 2614 if (strcmp(ren1_src, ren2_src) != 0)
033abf97 2615 BUG("ren1_src != ren2_src");
9047ebbc
MV
2616 ren2->dst_entry->processed = 1;
2617 ren2->processed = 1;
2618 if (strcmp(ren1_dst, ren2_dst) != 0) {
4f66dade 2619 rename_type = RENAME_ONE_FILE_TO_TWO;
461f5041 2620 clean_merge = 0;
9047ebbc 2621 } else {
4f66dade 2622 rename_type = RENAME_ONE_FILE_TO_ONE;
7769a75e
EN
2623 /* BUG: We should only remove ren1_src in
2624 * the base stage (think of rename +
2625 * add-source cases).
2626 */
b7fa51da 2627 remove_file(o, 1, ren1_src, 1);
b8ddf164
EN
2628 update_entry(ren1->dst_entry,
2629 ren1->pair->one,
2630 ren1->pair->two,
2631 ren2->pair->two);
9047ebbc 2632 }
4f66dade
EN
2633 setup_rename_conflict_info(rename_type,
2634 ren1->pair,
2635 ren2->pair,
2636 branch1,
2637 branch2,
2638 ren1->dst_entry,
232c635f
EN
2639 ren2->dst_entry,
2640 o,
2641 NULL,
2642 NULL);
461f5041
EN
2643 } else if ((lookup = string_list_lookup(renames2Dst, ren1_dst))) {
2644 /* Two different files renamed to the same thing */
2645 char *ren2_dst;
2646 ren2 = lookup->util;
2647 ren2_dst = ren2->pair->two->path;
2648 if (strcmp(ren1_dst, ren2_dst) != 0)
033abf97 2649 BUG("ren1_dst != ren2_dst");
461f5041
EN
2650
2651 clean_merge = 0;
2652 ren2->processed = 1;
2653 /*
2654 * BUG: We should only mark src_entry as processed
2655 * if we are not dealing with a rename + add-source
2656 * case.
2657 */
2658 ren2->src_entry->processed = 1;
2659
2660 setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE,
2661 ren1->pair,
2662 ren2->pair,
2663 branch1,
2664 branch2,
2665 ren1->dst_entry,
232c635f
EN
2666 ren2->dst_entry,
2667 o,
2668 ren1->src_entry,
2669 ren2->src_entry);
2670
9047ebbc
MV
2671 } else {
2672 /* Renamed in 1, maybe changed in 2 */
9047ebbc
MV
2673 /* we only use sha1 and mode of these */
2674 struct diff_filespec src_other, dst_other;
41d70bd6 2675 int try_merge;
9047ebbc 2676
41d70bd6
EN
2677 /*
2678 * unpack_trees loads entries from common-commit
2679 * into stage 1, from head-commit into stage 2, and
2680 * from merge-commit into stage 3. We keep track
2681 * of which side corresponds to the rename.
2682 */
2683 int renamed_stage = a_renames == renames1 ? 2 : 3;
2684 int other_stage = a_renames == renames1 ? 3 : 2;
9047ebbc 2685
7769a75e
EN
2686 /* BUG: We should only remove ren1_src in the base
2687 * stage and in other_stage (think of rename +
2688 * add-source case).
2689 */
531357a4 2690 remove_file(o, 1, ren1_src,
a35edc84 2691 renamed_stage == 2 || !was_tracked(o, ren1_src));
9047ebbc 2692
fd429e98 2693 oidcpy(&src_other.oid,
2694 &ren1->src_entry->stages[other_stage].oid);
41d70bd6 2695 src_other.mode = ren1->src_entry->stages[other_stage].mode;
fd429e98 2696 oidcpy(&dst_other.oid,
2697 &ren1->dst_entry->stages[other_stage].oid);
41d70bd6 2698 dst_other.mode = ren1->dst_entry->stages[other_stage].mode;
9047ebbc
MV
2699 try_merge = 0;
2700
9c0743fe
EN
2701 if (oid_eq(&src_other.oid, &null_oid) &&
2702 ren1->add_turned_into_rename) {
5455c338 2703 setup_rename_conflict_info(RENAME_VIA_DIR,
9c0743fe
EN
2704 ren1->pair,
2705 NULL,
2706 branch1,
2707 branch2,
2708 ren1->dst_entry,
2709 NULL,
2710 o,
2711 NULL,
2712 NULL);
2713 } else if (oid_eq(&src_other.oid, &null_oid)) {
4f66dade
EN
2714 setup_rename_conflict_info(RENAME_DELETE,
2715 ren1->pair,
2716 NULL,
2717 branch1,
2718 branch2,
2719 ren1->dst_entry,
232c635f
EN
2720 NULL,
2721 o,
2722 NULL,
4f66dade 2723 NULL);
d5af5105 2724 } else if ((dst_other.mode == ren1->pair->two->mode) &&
b4da9d62 2725 oid_eq(&dst_other.oid, &ren1->pair->two->oid)) {
35a74abf
EN
2726 /*
2727 * Added file on the other side identical to
2728 * the file being renamed: clean merge.
2729 * Also, there is no need to overwrite the
2730 * file already in the working copy, so call
2731 * update_file_flags() instead of
2732 * update_file().
2733 */
75456f96
JS
2734 if (update_file_flags(o,
2735 &ren1->pair->two->oid,
2736 ren1->pair->two->mode,
2737 ren1_dst,
2738 1, /* update_cache */
2739 0 /* update_wd */))
2740 clean_merge = -1;
b4da9d62 2741 } else if (!oid_eq(&dst_other.oid, &null_oid)) {
9047ebbc
MV
2742 clean_merge = 0;
2743 try_merge = 1;
55653a68
JX
2744 output(o, 1, _("CONFLICT (rename/add): Rename %s->%s in %s. "
2745 "%s added in %s"),
9047ebbc
MV
2746 ren1_src, ren1_dst, branch1,
2747 ren1_dst, branch2);
c94736a2
JH
2748 if (o->call_depth) {
2749 struct merge_file_info mfi;
0270a07a
EN
2750 struct diff_filespec one, a, b;
2751
2752 oidcpy(&one.oid, &null_oid);
2753 one.mode = 0;
2754 one.path = ren1->pair->two->path;
2755
2756 oidcpy(&a.oid, &ren1->pair->two->oid);
2757 a.mode = ren1->pair->two->mode;
2758 a.path = one.path;
2759
2760 oidcpy(&b.oid, &dst_other.oid);
2761 b.mode = dst_other.mode;
2762 b.path = one.path;
2763
d9573556
EN
2764 if (merge_mode_and_contents(o, &one, &a, &b, ren1_dst,
2765 branch1, branch2,
b2a7942b 2766 o->call_depth * 2, &mfi)) {
75456f96
JS
2767 clean_merge = -1;
2768 goto cleanup_and_return;
2769 }
55653a68 2770 output(o, 1, _("Adding merged %s"), ren1_dst);
75456f96
JS
2771 if (update_file(o, 0, &mfi.oid,
2772 mfi.mode, ren1_dst))
2773 clean_merge = -1;
2a669c34 2774 try_merge = 0;
c94736a2 2775 } else {
3d6b8e88 2776 char *new_path = unique_path(o, ren1_dst, branch2);
55653a68 2777 output(o, 1, _("Adding as %s instead"), new_path);
75456f96
JS
2778 if (update_file(o, 0, &dst_other.oid,
2779 dst_other.mode, new_path))
2780 clean_merge = -1;
3d6b8e88 2781 free(new_path);
c94736a2 2782 }
9047ebbc
MV
2783 } else
2784 try_merge = 1;
2785
75456f96
JS
2786 if (clean_merge < 0)
2787 goto cleanup_and_return;
9047ebbc 2788 if (try_merge) {
8a2fce18 2789 struct diff_filespec *one, *a, *b;
9047ebbc
MV
2790 src_other.path = (char *)ren1_src;
2791
8a2fce18 2792 one = ren1->pair->one;
9047ebbc
MV
2793 if (a_renames == renames1) {
2794 a = ren1->pair->two;
2795 b = &src_other;
2796 } else {
2797 b = ren1->pair->two;
2798 a = &src_other;
2799 }
b8ddf164 2800 update_entry(ren1->dst_entry, one, a, b);
4f66dade
EN
2801 setup_rename_conflict_info(RENAME_NORMAL,
2802 ren1->pair,
2803 NULL,
2804 branch1,
2805 NULL,
2806 ren1->dst_entry,
232c635f
EN
2807 NULL,
2808 o,
2809 NULL,
4f66dade 2810 NULL);
9047ebbc
MV
2811 }
2812 }
2813 }
75456f96 2814cleanup_and_return:
9047ebbc
MV
2815 string_list_clear(&a_by_dst, 0);
2816 string_list_clear(&b_by_dst, 0);
2817
2818 return clean_merge;
2819}
2820
f172589e
EN
2821struct rename_info {
2822 struct string_list *head_renames;
2823 struct string_list *merge_renames;
2824};
2825
7fe40b88
EN
2826static void initial_cleanup_rename(struct diff_queue_struct *pairs,
2827 struct hashmap *dir_renames)
ffc16c49 2828{
7fe40b88
EN
2829 struct hashmap_iter iter;
2830 struct dir_rename_entry *e;
2831
2832 hashmap_iter_init(dir_renames, &iter);
2833 while ((e = hashmap_iter_next(&iter))) {
2834 free(e->dir);
2835 strbuf_release(&e->new_dir);
2836 /* possible_new_dirs already cleared in get_directory_renames */
2837 }
2838 hashmap_free(dir_renames, 1);
2839 free(dir_renames);
2840
ffc16c49
EN
2841 free(pairs->queue);
2842 free(pairs);
2843}
2844
8ebe7b05
EN
2845static int detect_and_process_renames(struct merge_options *o,
2846 struct tree *common,
2847 struct tree *head,
2848 struct tree *merge,
2849 struct string_list *entries,
2850 struct rename_info *ri)
f172589e 2851{
e5257b2a 2852 struct diff_queue_struct *head_pairs, *merge_pairs;
7fe40b88 2853 struct hashmap *dir_re_head, *dir_re_merge;
f6f77559 2854 int clean = 1;
e5257b2a 2855
3992ff0c
EN
2856 ri->head_renames = NULL;
2857 ri->merge_renames = NULL;
2858
85b46030 2859 if (!merge_detect_rename(o))
3992ff0c
EN
2860 return 1;
2861
e5257b2a
EN
2862 head_pairs = get_diffpairs(o, common, head);
2863 merge_pairs = get_diffpairs(o, common, merge);
2864
5fdddd9b
EN
2865 if (o->detect_directory_renames) {
2866 dir_re_head = get_directory_renames(head_pairs, head);
2867 dir_re_merge = get_directory_renames(merge_pairs, merge);
7fe40b88 2868
5fdddd9b
EN
2869 handle_directory_level_conflicts(o,
2870 dir_re_head, head,
2871 dir_re_merge, merge);
2872 } else {
2873 dir_re_head = xmalloc(sizeof(*dir_re_head));
2874 dir_re_merge = xmalloc(sizeof(*dir_re_merge));
2875 dir_rename_init(dir_re_head);
2876 dir_rename_init(dir_re_merge);
2877 }
96e7ffbd 2878
e95ab70a 2879 ri->head_renames = get_renames(o, head_pairs,
f6f77559
EN
2880 dir_re_merge, dir_re_head, head,
2881 common, head, merge, entries,
2882 &clean);
2883 if (clean < 0)
2884 goto cleanup;
e95ab70a 2885 ri->merge_renames = get_renames(o, merge_pairs,
f6f77559
EN
2886 dir_re_head, dir_re_merge, merge,
2887 common, head, merge, entries,
2888 &clean);
2889 if (clean < 0)
2890 goto cleanup;
2891 clean &= process_renames(o, ri->head_renames, ri->merge_renames);
2892
2893cleanup:
e5257b2a
EN
2894 /*
2895 * Some cleanup is deferred until cleanup_renames() because the
2896 * data structures are still needed and referenced in
2897 * process_entry(). But there are a few things we can free now.
2898 */
7fe40b88
EN
2899 initial_cleanup_rename(head_pairs, dir_re_head);
2900 initial_cleanup_rename(merge_pairs, dir_re_merge);
e5257b2a
EN
2901
2902 return clean;
f172589e
EN
2903}
2904
ffc16c49 2905static void final_cleanup_rename(struct string_list *rename)
f172589e 2906{
9cfee25a
EN
2907 const struct rename *re;
2908 int i;
f172589e 2909
3992ff0c
EN
2910 if (rename == NULL)
2911 return;
2912
9cfee25a
EN
2913 for (i = 0; i < rename->nr; i++) {
2914 re = rename->items[i].util;
2915 diff_free_filepair(re->pair);
2916 }
2917 string_list_clear(rename, 1);
2918 free(rename);
2919}
2920
ffc16c49 2921static void final_cleanup_renames(struct rename_info *re_info)
9cfee25a 2922{
ffc16c49
EN
2923 final_cleanup_rename(re_info->head_renames);
2924 final_cleanup_rename(re_info->merge_renames);
f172589e
EN
2925}
2926
b4da9d62 2927static struct object_id *stage_oid(const struct object_id *oid, unsigned mode)
9047ebbc 2928{
b4da9d62 2929 return (is_null_oid(oid) || mode == 0) ? NULL: (struct object_id *)oid;
9047ebbc
MV
2930}
2931
bc9204d4 2932static int read_oid_strbuf(struct merge_options *o,
d90e759f
EN
2933 const struct object_id *oid,
2934 struct strbuf *dst)
331a1838
EB
2935{
2936 void *buf;
2937 enum object_type type;
2938 unsigned long size;
b4f5aca4 2939 buf = read_object_file(oid, &type, &size);
331a1838 2940 if (!buf)
bc9204d4 2941 return err(o, _("cannot read object %s"), oid_to_hex(oid));
331a1838
EB
2942 if (type != OBJ_BLOB) {
2943 free(buf);
bc9204d4 2944 return err(o, _("object %s is not a blob"), oid_to_hex(oid));
331a1838
EB
2945 }
2946 strbuf_attach(dst, buf, size, size + 1);
2947 return 0;
2948}
2949
bc9204d4
JS
2950static int blob_unchanged(struct merge_options *opt,
2951 const struct object_id *o_oid,
72fac66b 2952 unsigned o_mode,
b4da9d62 2953 const struct object_id *a_oid,
72fac66b 2954 unsigned a_mode,
3e7589b7 2955 int renormalize, const char *path)
331a1838
EB
2956{
2957 struct strbuf o = STRBUF_INIT;
2958 struct strbuf a = STRBUF_INIT;
2959 int ret = 0; /* assume changed for safety */
2960
72fac66b
JK
2961 if (a_mode != o_mode)
2962 return 0;
b4da9d62 2963 if (oid_eq(o_oid, a_oid))
331a1838 2964 return 1;
3e7589b7 2965 if (!renormalize)
331a1838
EB
2966 return 0;
2967
b4da9d62 2968 assert(o_oid && a_oid);
bc9204d4 2969 if (read_oid_strbuf(opt, o_oid, &o) || read_oid_strbuf(opt, a_oid, &a))
331a1838
EB
2970 goto error_return;
2971 /*
2972 * Note: binary | is used so that both renormalizations are
2973 * performed. Comparison can be skipped if both files are
2974 * unchanged since their sha1s have already been compared.
2975 */
a33e0b2a
BW
2976 if (renormalize_buffer(&the_index, path, o.buf, o.len, &o) |
2977 renormalize_buffer(&the_index, path, a.buf, a.len, &a))
331a1838
EB
2978 ret = (o.len == a.len && !memcmp(o.buf, a.buf, o.len));
2979
2980error_return:
2981 strbuf_release(&o);
2982 strbuf_release(&a);
2983 return ret;
2984}
2985
75456f96 2986static int handle_modify_delete(struct merge_options *o,
d90e759f
EN
2987 const char *path,
2988 struct object_id *o_oid, int o_mode,
2989 struct object_id *a_oid, int a_mode,
2990 struct object_id *b_oid, int b_mode)
5e3ce663 2991{
b26d87f2
MM
2992 const char *modify_branch, *delete_branch;
2993 struct object_id *changed_oid;
2994 int changed_mode;
2995
2996 if (a_oid) {
2997 modify_branch = o->branch1;
2998 delete_branch = o->branch2;
2999 changed_oid = a_oid;
3000 changed_mode = a_mode;
3001 } else {
3002 modify_branch = o->branch2;
3003 delete_branch = o->branch1;
3004 changed_oid = b_oid;
3005 changed_mode = b_mode;
3006 }
3007
75456f96 3008 return handle_change_delete(o,
b26d87f2 3009 path, NULL,
75456f96 3010 o_oid, o_mode,
b26d87f2
MM
3011 changed_oid, changed_mode,
3012 modify_branch, delete_branch,
75456f96 3013 _("modify"), _("modified"));
5e3ce663
EN
3014}
3015
d9573556
EN
3016static int handle_content_merge(struct merge_options *o,
3017 const char *path,
3018 int is_dirty,
3019 struct object_id *o_oid, int o_mode,
3020 struct object_id *a_oid, int a_mode,
3021 struct object_id *b_oid, int b_mode,
3022 struct rename_conflict_info *rename_conflict_info)
0c4918d1 3023{
55653a68 3024 const char *reason = _("content");
5b448b85 3025 const char *path1 = NULL, *path2 = NULL;
0c4918d1
EN
3026 struct merge_file_info mfi;
3027 struct diff_filespec one, a, b;
4ab9a157 3028 unsigned df_conflict_remains = 0;
0c4918d1 3029
b4da9d62 3030 if (!o_oid) {
55653a68 3031 reason = _("add/add");
b4da9d62 3032 o_oid = (struct object_id *)&null_oid;
0c4918d1
EN
3033 }
3034 one.path = a.path = b.path = (char *)path;
b4da9d62 3035 oidcpy(&one.oid, o_oid);
0c4918d1 3036 one.mode = o_mode;
b4da9d62 3037 oidcpy(&a.oid, a_oid);
0c4918d1 3038 a.mode = a_mode;
b4da9d62 3039 oidcpy(&b.oid, b_oid);
0c4918d1
EN
3040 b.mode = b_mode;
3041
3c217c07 3042 if (rename_conflict_info) {
3c217c07
EN
3043 struct diff_filepair *pair1 = rename_conflict_info->pair1;
3044
3045 path1 = (o->branch1 == rename_conflict_info->branch1) ?
3046 pair1->two->path : pair1->one->path;
3047 /* If rename_conflict_info->pair2 != NULL, we are in
3048 * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
3049 * normal rename.
3050 */
3051 path2 = (rename_conflict_info->pair2 ||
3052 o->branch2 == rename_conflict_info->branch1) ?
3053 pair1->two->path : pair1->one->path;
52396e1d
EN
3054 one.path = pair1->one->path;
3055 a.path = (char *)path1;
3056 b.path = (char *)path2;
3c217c07 3057
5423d2e7
DT
3058 if (dir_in_way(path, !o->call_depth,
3059 S_ISGITLINK(pair1->two->mode)))
3c217c07 3060 df_conflict_remains = 1;
4ab9a157 3061 }
d9573556 3062 if (merge_mode_and_contents(o, &one, &a, &b, path,
b2a7942b
EN
3063 o->branch1, o->branch2,
3064 o->call_depth * 2, &mfi))
3c8a51e8 3065 return -1;
4ab9a157 3066
1de70dbd
EN
3067 /*
3068 * We can skip updating the working tree file iff:
3069 * a) The merge is clean
3070 * b) The merge matches what was in HEAD (content, mode, pathname)
3071 * c) The target path is usable (i.e. not involved in D/F conflict)
3072 */
3073 if (mfi.clean &&
3074 was_tracked_and_matches(o, path, &mfi.oid, mfi.mode) &&
3075 !df_conflict_remains) {
2b75fb60
EN
3076 int pos;
3077 struct cache_entry *ce;
3078
55653a68 3079 output(o, 3, _("Skipped %s (merged same as existing)"), path);
1de70dbd
EN
3080 if (add_cacheinfo(o, mfi.mode, &mfi.oid, path,
3081 0, (!o->call_depth && !is_dirty), 0))
3082 return -1;
2b75fb60
EN
3083 /*
3084 * However, add_cacheinfo() will delete the old cache entry
3085 * and add a new one. We need to copy over any skip_worktree
3086 * flag to avoid making the file appear as if it were
3087 * deleted by the user.
3088 */
3089 pos = index_name_pos(&o->orig_index, path, strlen(path));
3090 ce = o->orig_index.cache[pos];
3091 if (ce_skip_worktree(ce)) {
3092 pos = index_name_pos(&the_index, path, strlen(path));
3093 ce = the_index.cache[pos];
3094 ce->ce_flags |= CE_SKIP_WORKTREE;
3095 }
1de70dbd 3096 return mfi.clean;
05cf21eb 3097 }
0c4918d1
EN
3098
3099 if (!mfi.clean) {
3100 if (S_ISGITLINK(mfi.mode))
55653a68
JX
3101 reason = _("submodule");
3102 output(o, 1, _("CONFLICT (%s): Merge conflict in %s"),
0c4918d1 3103 reason, path);
4f66dade 3104 if (rename_conflict_info && !df_conflict_remains)
bc9204d4 3105 if (update_stages(o, path, &one, &a, &b))
75456f96 3106 return -1;
0c4918d1
EN
3107 }
3108
bd42380e 3109 if (df_conflict_remains || is_dirty) {
3d6b8e88 3110 char *new_path;
51931bf0
EN
3111 if (o->call_depth) {
3112 remove_file_from_cache(path);
3113 } else {
75456f96 3114 if (!mfi.clean) {
bc9204d4 3115 if (update_stages(o, path, &one, &a, &b))
75456f96
JS
3116 return -1;
3117 } else {
a35edc84 3118 int file_from_stage2 = was_tracked(o, path);
51931bf0 3119 struct diff_filespec merged;
9b561499 3120 oidcpy(&merged.oid, &mfi.oid);
51931bf0
EN
3121 merged.mode = mfi.mode;
3122
bc9204d4 3123 if (update_stages(o, path, NULL,
75456f96
JS
3124 file_from_stage2 ? &merged : NULL,
3125 file_from_stage2 ? NULL : &merged))
3126 return -1;
51931bf0
EN
3127 }
3128
3129 }
4f66dade 3130 new_path = unique_path(o, path, rename_conflict_info->branch1);
bd42380e
EN
3131 if (is_dirty) {
3132 output(o, 1, _("Refusing to lose dirty file at %s"),
3133 path);
3134 }
55653a68 3135 output(o, 1, _("Adding as %s instead"), new_path);
75456f96
JS
3136 if (update_file(o, 0, &mfi.oid, mfi.mode, new_path)) {
3137 free(new_path);
3138 return -1;
3139 }
3d6b8e88 3140 free(new_path);
51931bf0 3141 mfi.clean = 0;
75456f96
JS
3142 } else if (update_file(o, mfi.clean, &mfi.oid, mfi.mode, path))
3143 return -1;
bd42380e 3144 return !is_dirty && mfi.clean;
0c4918d1
EN
3145}
3146
8ebe7b05
EN
3147static int handle_rename_normal(struct merge_options *o,
3148 const char *path,
3149 struct object_id *o_oid, unsigned int o_mode,
3150 struct object_id *a_oid, unsigned int a_mode,
3151 struct object_id *b_oid, unsigned int b_mode,
3152 struct rename_conflict_info *ci)
64b1abe9 3153{
64b1abe9 3154 /* Merge the content and write it out */
d9573556
EN
3155 return handle_content_merge(o, path, was_dirty(o, path),
3156 o_oid, o_mode, a_oid, a_mode, b_oid, b_mode,
3157 ci);
0c4918d1
EN
3158}
3159
9047ebbc 3160/* Per entry merge function */
8a2fce18
MV
3161static int process_entry(struct merge_options *o,
3162 const char *path, struct stage_data *entry)
9047ebbc 3163{
9047ebbc 3164 int clean_merge = 1;
1bc0ab7c 3165 int normalize = o->renormalize;
9047ebbc
MV
3166 unsigned o_mode = entry->stages[1].mode;
3167 unsigned a_mode = entry->stages[2].mode;
3168 unsigned b_mode = entry->stages[3].mode;
b4da9d62 3169 struct object_id *o_oid = stage_oid(&entry->stages[1].oid, o_mode);
3170 struct object_id *a_oid = stage_oid(&entry->stages[2].oid, a_mode);
3171 struct object_id *b_oid = stage_oid(&entry->stages[3].oid, b_mode);
9047ebbc 3172
37348937 3173 entry->processed = 1;
4f66dade
EN
3174 if (entry->rename_conflict_info) {
3175 struct rename_conflict_info *conflict_info = entry->rename_conflict_info;
07413c5a 3176 switch (conflict_info->rename_type) {
882fd11a 3177 case RENAME_NORMAL:
4f66dade 3178 case RENAME_ONE_FILE_TO_ONE:
8ebe7b05
EN
3179 clean_merge = handle_rename_normal(o,
3180 path,
3181 o_oid, o_mode,
3182 a_oid, a_mode,
3183 b_oid, b_mode,
3184 conflict_info);
882fd11a 3185 break;
5455c338 3186 case RENAME_VIA_DIR:
9c0743fe 3187 clean_merge = 1;
8ebe7b05
EN
3188 if (handle_rename_via_dir(o,
3189 conflict_info->pair1,
3190 conflict_info->branch1,
3191 conflict_info->branch2))
9c0743fe 3192 clean_merge = -1;
882fd11a 3193 break;
3b130adf
EN
3194 case RENAME_DELETE:
3195 clean_merge = 0;
8ebe7b05
EN
3196 if (handle_rename_delete(o,
3197 conflict_info->pair1,
3198 conflict_info->branch1,
3199 conflict_info->branch2))
75456f96 3200 clean_merge = -1;
3b130adf 3201 break;
07413c5a 3202 case RENAME_ONE_FILE_TO_TWO:
07413c5a 3203 clean_merge = 0;
8ebe7b05 3204 if (handle_rename_rename_1to2(o, conflict_info))
75456f96 3205 clean_merge = -1;
07413c5a 3206 break;
461f5041
EN
3207 case RENAME_TWO_FILES_TO_ONE:
3208 clean_merge = 0;
8ebe7b05 3209 if (handle_rename_rename_2to1(o, conflict_info))
75456f96 3210 clean_merge = -1;
07413c5a
EN
3211 break;
3212 default:
3213 entry->processed = 0;
3214 break;
3215 }
b4da9d62 3216 } else if (o_oid && (!a_oid || !b_oid)) {
edd2faf5 3217 /* Case A: Deleted in one */
b4da9d62 3218 if ((!a_oid && !b_oid) ||
bc9204d4
JS
3219 (!b_oid && blob_unchanged(o, o_oid, o_mode, a_oid, a_mode, normalize, path)) ||
3220 (!a_oid && blob_unchanged(o, o_oid, o_mode, b_oid, b_mode, normalize, path))) {
edd2faf5
EN
3221 /* Deleted in both or deleted in one and
3222 * unchanged in the other */
b4da9d62 3223 if (a_oid)
55653a68 3224 output(o, 2, _("Removing %s"), path);
edd2faf5 3225 /* do not touch working file if it did not exist */
b4da9d62 3226 remove_file(o, 1, path, !a_oid);
edd2faf5
EN
3227 } else {
3228 /* Modify/delete; deleted side may have put a directory in the way */
edd2faf5 3229 clean_merge = 0;
75456f96
JS
3230 if (handle_modify_delete(o, path, o_oid, o_mode,
3231 a_oid, a_mode, b_oid, b_mode))
3232 clean_merge = -1;
3d6b8e88 3233 }
b4da9d62 3234 } else if ((!o_oid && a_oid && !b_oid) ||
3235 (!o_oid && !a_oid && b_oid)) {
edd2faf5
EN
3236 /* Case B: Added in one. */
3237 /* [nothing|directory] -> ([nothing|directory], file) */
3238
9c0bbb50
EN
3239 const char *add_branch;
3240 const char *other_branch;
3241 unsigned mode;
b4da9d62 3242 const struct object_id *oid;
9c0bbb50 3243 const char *conf;
37348937 3244
b4da9d62 3245 if (a_oid) {
9c0bbb50
EN
3246 add_branch = o->branch1;
3247 other_branch = o->branch2;
3248 mode = a_mode;
b4da9d62 3249 oid = a_oid;
55653a68 3250 conf = _("file/directory");
9c0bbb50
EN
3251 } else {
3252 add_branch = o->branch2;
3253 other_branch = o->branch1;
3254 mode = b_mode;
b4da9d62 3255 oid = b_oid;
55653a68 3256 conf = _("directory/file");
9c0bbb50 3257 }
c641ca67
EN
3258 if (dir_in_way(path,
3259 !o->call_depth && !S_ISGITLINK(a_mode),
3260 0)) {
3d6b8e88 3261 char *new_path = unique_path(o, path, add_branch);
9c0bbb50 3262 clean_merge = 0;
55653a68
JX
3263 output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
3264 "Adding %s as %s"),
9c0bbb50 3265 conf, path, other_branch, path, new_path);
75456f96
JS
3266 if (update_file(o, 0, oid, mode, new_path))
3267 clean_merge = -1;
3268 else if (o->call_depth)
7b1c610f 3269 remove_file_from_cache(path);
3d6b8e88 3270 free(new_path);
9c0bbb50 3271 } else {
55653a68 3272 output(o, 2, _("Adding %s"), path);
35a74abf 3273 /* do not overwrite file if already present */
75456f96
JS
3274 if (update_file_flags(o, oid, mode, path, 1, !a_oid))
3275 clean_merge = -1;
9c0bbb50 3276 }
b4da9d62 3277 } else if (a_oid && b_oid) {
edd2faf5
EN
3278 /* Case C: Added in both (check for same permissions) and */
3279 /* case D: Modified in both, but differently. */
bd42380e 3280 int is_dirty = 0; /* unpack_trees would have bailed if dirty */
d9573556
EN
3281 clean_merge = handle_content_merge(o, path, is_dirty,
3282 o_oid, o_mode,
3283 a_oid, a_mode,
3284 b_oid, b_mode,
3285 NULL);
b4da9d62 3286 } else if (!o_oid && !a_oid && !b_oid) {
edd2faf5
EN
3287 /*
3288 * this entry was deleted altogether. a_mode == 0 means
3289 * we had that path and want to actively remove it.
3290 */
3291 remove_file(o, 1, path, !a_mode);
3292 } else
033abf97 3293 BUG("fatal merge failure, shouldn't happen.");
37348937
EN
3294
3295 return clean_merge;
3296}
3297
8a2fce18
MV
3298int merge_trees(struct merge_options *o,
3299 struct tree *head,
9047ebbc
MV
3300 struct tree *merge,
3301 struct tree *common,
9047ebbc
MV
3302 struct tree **result)
3303{
3304 int code, clean;
eddd1a41
EN
3305 struct strbuf sb = STRBUF_INIT;
3306
3307 if (!o->call_depth && index_has_changes(&the_index, head, &sb)) {
3308 err(o, _("Your local changes to the following files would be overwritten by merge:\n %s"),
3309 sb.buf);
3310 return -1;
3311 }
9047ebbc 3312
85e51b78
JH
3313 if (o->subtree_shift) {
3314 merge = shift_tree_object(head, merge, o->subtree_shift);
3315 common = shift_tree_object(head, common, o->subtree_shift);
9047ebbc
MV
3316 }
3317
b4da9d62 3318 if (oid_eq(&common->object.oid, &merge->object.oid)) {
7560f547 3319 output(o, 0, _("Already up to date!"));
9047ebbc
MV
3320 *result = head;
3321 return 1;
3322 }
3323
3f1c1c36 3324 code = unpack_trees_start(o, common, head, merge);
9047ebbc 3325
fadd069d
JH
3326 if (code != 0) {
3327 if (show(o, 4) || o->call_depth)
bc9204d4 3328 err(o, _("merging of trees %s and %s failed"),
f2fd0760 3329 oid_to_hex(&head->object.oid),
3330 oid_to_hex(&merge->object.oid));
3f1c1c36 3331 unpack_trees_finish(o);
6003303a 3332 return -1;
fadd069d 3333 }
9047ebbc
MV
3334
3335 if (unmerged_cache()) {
f172589e
EN
3336 struct string_list *entries;
3337 struct rename_info re_info;
9047ebbc 3338 int i;
fc65b00d
KW
3339 /*
3340 * Only need the hashmap while processing entries, so
3341 * initialize it here and free it when we are done running
3342 * through the entries. Keeping it in the merge_options as
3343 * opposed to decaring a local hashmap is for convenience
3344 * so that we don't have to pass it to around.
3345 */
3346 hashmap_init(&o->current_file_dir_set, path_hashmap_cmp, NULL, 512);
696ee23c
MV
3347 get_files_dirs(o, head);
3348 get_files_dirs(o, merge);
9047ebbc
MV
3349
3350 entries = get_unmerged();
8ebe7b05
EN
3351 clean = detect_and_process_renames(o, common, head, merge,
3352 entries, &re_info);
6c8647da 3353 record_df_conflict_files(o, entries);
75456f96 3354 if (clean < 0)
e336bdc5 3355 goto cleanup;
edd2faf5 3356 for (i = entries->nr-1; 0 <= i; i--) {
9047ebbc
MV
3357 const char *path = entries->items[i].string;
3358 struct stage_data *e = entries->items[i].util;
75456f96
JS
3359 if (!e->processed) {
3360 int ret = process_entry(o, path, e);
3361 if (!ret)
3362 clean = 0;
e336bdc5
KW
3363 else if (ret < 0) {
3364 clean = ret;
3365 goto cleanup;
3366 }
75456f96 3367 }
9047ebbc 3368 }
7edba4c4
JH
3369 for (i = 0; i < entries->nr; i++) {
3370 struct stage_data *e = entries->items[i].util;
3371 if (!e->processed)
033abf97 3372 BUG("unprocessed path??? %s",
7edba4c4
JH
3373 entries->items[i].string);
3374 }
9047ebbc 3375
93665365 3376 cleanup:
ffc16c49 3377 final_cleanup_renames(&re_info);
f172589e 3378
9047ebbc 3379 string_list_clear(entries, 1);
f172589e 3380 free(entries);
9047ebbc 3381
fc65b00d
KW
3382 hashmap_free(&o->current_file_dir_set, 1);
3383
3f1c1c36
EN
3384 if (clean < 0) {
3385 unpack_trees_finish(o);
e336bdc5 3386 return clean;
3f1c1c36 3387 }
9047ebbc
MV
3388 }
3389 else
3390 clean = 1;
3391
3f1c1c36 3392 unpack_trees_finish(o);
a35edc84 3393
fbc87eb5
JS
3394 if (o->call_depth && !(*result = write_tree_from_memory(o)))
3395 return -1;
9047ebbc
MV
3396
3397 return clean;
3398}
3399
3400static struct commit_list *reverse_commit_list(struct commit_list *list)
3401{
3402 struct commit_list *next = NULL, *current, *backup;
3403 for (current = list; current; current = backup) {
3404 backup = current->next;
3405 current->next = next;
3406 next = current;
3407 }
3408 return next;
3409}
3410
3411/*
3412 * Merge the commits h1 and h2, return the resulting virtual
3413 * commit object and a flag indicating the cleanness of the merge.
3414 */
8a2fce18
MV
3415int merge_recursive(struct merge_options *o,
3416 struct commit *h1,
9047ebbc 3417 struct commit *h2,
9047ebbc
MV
3418 struct commit_list *ca,
3419 struct commit **result)
3420{
3421 struct commit_list *iter;
3422 struct commit *merged_common_ancestors;
156e1782 3423 struct tree *mrtree;
9047ebbc
MV
3424 int clean;
3425
8a2fce18 3426 if (show(o, 4)) {
55653a68 3427 output(o, 4, _("Merging:"));
5033639c
MV
3428 output_commit_title(o, h1);
3429 output_commit_title(o, h2);
9047ebbc
MV
3430 }
3431
3432 if (!ca) {
2ce406cc 3433 ca = get_merge_bases(h1, h2);
9047ebbc
MV
3434 ca = reverse_commit_list(ca);
3435 }
3436
8a2fce18 3437 if (show(o, 5)) {
e0453cd8
RT
3438 unsigned cnt = commit_list_count(ca);
3439
3440 output(o, 5, Q_("found %u common ancestor:",
3441 "found %u common ancestors:", cnt), cnt);
9047ebbc 3442 for (iter = ca; iter; iter = iter->next)
5033639c 3443 output_commit_title(o, iter->item);
9047ebbc
MV
3444 }
3445
3446 merged_common_ancestors = pop_commit(&ca);
3447 if (merged_common_ancestors == NULL) {
03f622c8
JN
3448 /* if there is no common ancestor, use an empty tree */
3449 struct tree *tree;
9047ebbc 3450
f86bcc7b 3451 tree = lookup_tree(the_repository, the_repository->hash_algo->empty_tree);
9047ebbc
MV
3452 merged_common_ancestors = make_virtual_commit(tree, "ancestor");
3453 }
3454
3455 for (iter = ca; iter; iter = iter->next) {
8a2fce18 3456 const char *saved_b1, *saved_b2;
5033639c 3457 o->call_depth++;
9047ebbc
MV
3458 /*
3459 * When the merge fails, the result contains files
3460 * with conflict markers. The cleanness flag is
de8946de
JS
3461 * ignored (unless indicating an error), it was never
3462 * actually used, as result of merge_trees has always
3463 * overwritten it: the committed "conflicts" were
3464 * already resolved.
9047ebbc
MV
3465 */
3466 discard_cache();
8a2fce18
MV
3467 saved_b1 = o->branch1;
3468 saved_b2 = o->branch2;
3469 o->branch1 = "Temporary merge branch 1";
3470 o->branch2 = "Temporary merge branch 2";
de8946de
JS
3471 if (merge_recursive(o, merged_common_ancestors, iter->item,
3472 NULL, &merged_common_ancestors) < 0)
3473 return -1;
8a2fce18
MV
3474 o->branch1 = saved_b1;
3475 o->branch2 = saved_b2;
5033639c 3476 o->call_depth--;
9047ebbc
MV
3477
3478 if (!merged_common_ancestors)
bc9204d4 3479 return err(o, _("merge returned no commit"));
9047ebbc
MV
3480 }
3481
3482 discard_cache();
b7fa51da 3483 if (!o->call_depth)
9047ebbc 3484 read_cache();
9047ebbc