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