The third batch for 2.18
[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
8383408d
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
ea625cb0
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,
3b9616f1 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)
bc9204d4 319 return err(o, _("addinfo_cache failed for path '%s'"), 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)
1749053d 327 return err(o, _("addinfo_cache failed for path '%s'"), 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
e0052f46 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
e0052f46
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
e0052f46
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
e0052f46
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
a5bbc299 430static int get_tree_entry_if_blob(struct tree *tree,
7d38849e 431 const char *path,
a5bbc299 432 struct object_id *hashy,
7d38849e
EN
433 unsigned int *mode_o)
434{
435 int ret;
436
a5bbc299 437 ret = get_tree_entry(&tree->object.oid, path, hashy, mode_o);
7d38849e 438 if (S_ISDIR(*mode_o)) {
a5bbc299 439 oidcpy(hashy, &null_oid);
7d38849e
EN
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));
a5bbc299
JH
455 get_tree_entry_if_blob(o, path,
456 &e->stages[1].oid, &e->stages[1].mode);
457 get_tree_entry_if_blob(a, path,
458 &e->stages[2].oid, &e->stages[2].mode);
459 get_tree_entry_if_blob(b, 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;
3b9616f1 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
3b9616f1
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
e0052f46
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)
bc9204d4 945 add_cacheinfo(o, mode, oid, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
6003303a 946 return ret;
9047ebbc
MV
947}
948
75456f96
JS
949static int update_file(struct merge_options *o,
950 int clean,
951 const struct object_id *oid,
952 unsigned mode,
953 const char *path)
9047ebbc 954{
75456f96 955 return update_file_flags(o, oid, mode, path, o->call_depth || clean, !o->call_depth);
9047ebbc
MV
956}
957
958/* Low level file merging, update and removal */
959
9cba13ca 960struct merge_file_info {
9b561499 961 struct object_id oid;
9047ebbc
MV
962 unsigned mode;
963 unsigned clean:1,
964 merge:1;
965};
966
b7fa51da
MV
967static int merge_3way(struct merge_options *o,
968 mmbuffer_t *result_buf,
0c059420
EN
969 const struct diff_filespec *one,
970 const struct diff_filespec *a,
971 const struct diff_filespec *b,
9047ebbc
MV
972 const char *branch1,
973 const char *branch2)
974{
975 mmfile_t orig, src1, src2;
712516bc 976 struct ll_merge_options ll_opts = {0};
4c5868f4 977 char *base_name, *name1, *name2;
9047ebbc 978 int merge_status;
8cc5b290 979
712516bc 980 ll_opts.renormalize = o->renormalize;
58a1ece4 981 ll_opts.xdl_opts = o->xdl_opts;
712516bc
JN
982
983 if (o->call_depth) {
984 ll_opts.virtual_ancestor = 1;
985 ll_opts.variant = 0;
986 } else {
8cc5b290
AP
987 switch (o->recursive_variant) {
988 case MERGE_RECURSIVE_OURS:
712516bc 989 ll_opts.variant = XDL_MERGE_FAVOR_OURS;
8cc5b290
AP
990 break;
991 case MERGE_RECURSIVE_THEIRS:
712516bc 992 ll_opts.variant = XDL_MERGE_FAVOR_THEIRS;
8cc5b290
AP
993 break;
994 default:
712516bc 995 ll_opts.variant = 0;
8cc5b290
AP
996 break;
997 }
998 }
9047ebbc 999
4c5868f4
JN
1000 if (strcmp(a->path, b->path) ||
1001 (o->ancestor != NULL && strcmp(a->path, one->path) != 0)) {
1002 base_name = o->ancestor == NULL ? NULL :
4e2d094d
RJ
1003 mkpathdup("%s:%s", o->ancestor, one->path);
1004 name1 = mkpathdup("%s:%s", branch1, a->path);
1005 name2 = mkpathdup("%s:%s", branch2, b->path);
606475f3 1006 } else {
4c5868f4 1007 base_name = o->ancestor == NULL ? NULL :
4e2d094d
RJ
1008 mkpathdup("%s", o->ancestor);
1009 name1 = mkpathdup("%s", branch1);
1010 name2 = mkpathdup("%s", branch2);
606475f3 1011 }
9047ebbc 1012
d449347d 1013 read_mmblob(&orig, &one->oid);
1014 read_mmblob(&src1, &a->oid);
1015 read_mmblob(&src2, &b->oid);
9047ebbc 1016
4c5868f4 1017 merge_status = ll_merge(result_buf, a->path, &orig, base_name,
712516bc 1018 &src1, name1, &src2, name2, &ll_opts);
9047ebbc 1019
4e2d094d 1020 free(base_name);
9047ebbc
MV
1021 free(name1);
1022 free(name2);
1023 free(orig.ptr);
1024 free(src1.ptr);
1025 free(src2.ptr);
1026 return merge_status;
1027}
1028
3c8a51e8 1029static int merge_file_1(struct merge_options *o,
6bdaead1
EN
1030 const struct diff_filespec *one,
1031 const struct diff_filespec *a,
1032 const struct diff_filespec *b,
1033 const char *branch1,
3c8a51e8
JS
1034 const char *branch2,
1035 struct merge_file_info *result)
9047ebbc 1036{
3c8a51e8
JS
1037 result->merge = 0;
1038 result->clean = 1;
9047ebbc
MV
1039
1040 if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
3c8a51e8 1041 result->clean = 0;
9047ebbc 1042 if (S_ISREG(a->mode)) {
3c8a51e8
JS
1043 result->mode = a->mode;
1044 oidcpy(&result->oid, &a->oid);
9047ebbc 1045 } else {
3c8a51e8
JS
1046 result->mode = b->mode;
1047 oidcpy(&result->oid, &b->oid);
9047ebbc
MV
1048 }
1049 } else {
b4da9d62 1050 if (!oid_eq(&a->oid, &one->oid) && !oid_eq(&b->oid, &one->oid))
3c8a51e8 1051 result->merge = 1;
9047ebbc
MV
1052
1053 /*
1054 * Merge modes
1055 */
b7fa51da 1056 if (a->mode == b->mode || a->mode == one->mode)
3c8a51e8 1057 result->mode = b->mode;
9047ebbc 1058 else {
3c8a51e8 1059 result->mode = a->mode;
b7fa51da 1060 if (b->mode != one->mode) {
3c8a51e8
JS
1061 result->clean = 0;
1062 result->merge = 1;
9047ebbc
MV
1063 }
1064 }
1065
b4da9d62 1066 if (oid_eq(&a->oid, &b->oid) || oid_eq(&a->oid, &one->oid))
3c8a51e8 1067 oidcpy(&result->oid, &b->oid);
b4da9d62 1068 else if (oid_eq(&b->oid, &one->oid))
3c8a51e8 1069 oidcpy(&result->oid, &a->oid);
9047ebbc
MV
1070 else if (S_ISREG(a->mode)) {
1071 mmbuffer_t result_buf;
6003303a 1072 int ret = 0, merge_status;
9047ebbc 1073
b7fa51da 1074 merge_status = merge_3way(o, &result_buf, one, a, b,
9047ebbc
MV
1075 branch1, branch2);
1076
1077 if ((merge_status < 0) || !result_buf.ptr)
bc9204d4 1078 ret = err(o, _("Failed to execute internal merge"));
9047ebbc 1079
a09c985e
PO
1080 if (!ret &&
1081 write_object_file(result_buf.ptr, result_buf.size,
1082 blob_type, &result->oid))
bc9204d4
JS
1083 ret = err(o, _("Unable to add %s to database"),
1084 a->path);
9047ebbc
MV
1085
1086 free(result_buf.ptr);
6003303a
JS
1087 if (ret)
1088 return ret;
3c8a51e8 1089 result->clean = (merge_status == 0);
9047ebbc 1090 } else if (S_ISGITLINK(a->mode)) {
71f35d5c 1091 result->clean = merge_submodule(&result->oid,
a0d12c44 1092 one->path,
71f35d5c 1093 &one->oid,
1094 &a->oid,
1095 &b->oid,
80988783 1096 !o->call_depth);
9047ebbc 1097 } else if (S_ISLNK(a->mode)) {
fd48b464
JH
1098 switch (o->recursive_variant) {
1099 case MERGE_RECURSIVE_NORMAL:
1100 oidcpy(&result->oid, &a->oid);
1101 if (!oid_eq(&a->oid, &b->oid))
1102 result->clean = 0;
1103 break;
1104 case MERGE_RECURSIVE_OURS:
1105 oidcpy(&result->oid, &a->oid);
1106 break;
1107 case MERGE_RECURSIVE_THEIRS:
1108 oidcpy(&result->oid, &b->oid);
1109 break;
1110 }
ef1177d1 1111 } else
7e97e100 1112 die("BUG: unsupported object type in the tree");
9047ebbc
MV
1113 }
1114
3c8a51e8 1115 return 0;
9047ebbc
MV
1116}
1117
3c8a51e8 1118static int merge_file_special_markers(struct merge_options *o,
dac47415
EN
1119 const struct diff_filespec *one,
1120 const struct diff_filespec *a,
1121 const struct diff_filespec *b,
1122 const char *branch1,
1123 const char *filename1,
1124 const char *branch2,
3c8a51e8
JS
1125 const char *filename2,
1126 struct merge_file_info *mfi)
dac47415
EN
1127{
1128 char *side1 = NULL;
1129 char *side2 = NULL;
3c8a51e8 1130 int ret;
dac47415 1131
28310186
JK
1132 if (filename1)
1133 side1 = xstrfmt("%s:%s", branch1, filename1);
1134 if (filename2)
1135 side2 = xstrfmt("%s:%s", branch2, filename2);
dac47415 1136
3c8a51e8
JS
1137 ret = merge_file_1(o, one, a, b,
1138 side1 ? side1 : branch1,
1139 side2 ? side2 : branch2, mfi);
dac47415
EN
1140 free(side1);
1141 free(side2);
3c8a51e8 1142 return ret;
dac47415
EN
1143}
1144
3c8a51e8 1145static int merge_file_one(struct merge_options *o,
6bdaead1 1146 const char *path,
b4da9d62 1147 const struct object_id *o_oid, int o_mode,
1148 const struct object_id *a_oid, int a_mode,
1149 const struct object_id *b_oid, int b_mode,
6bdaead1 1150 const char *branch1,
3c8a51e8
JS
1151 const char *branch2,
1152 struct merge_file_info *mfi)
6bdaead1
EN
1153{
1154 struct diff_filespec one, a, b;
1155
1156 one.path = a.path = b.path = (char *)path;
b4da9d62 1157 oidcpy(&one.oid, o_oid);
6bdaead1 1158 one.mode = o_mode;
b4da9d62 1159 oidcpy(&a.oid, a_oid);
6bdaead1 1160 a.mode = a_mode;
b4da9d62 1161 oidcpy(&b.oid, b_oid);
6bdaead1 1162 b.mode = b_mode;
3c8a51e8 1163 return merge_file_1(o, &one, &a, &b, branch1, branch2, mfi);
6bdaead1
EN
1164}
1165
3b9616f1
EN
1166static int conflict_rename_dir(struct merge_options *o,
1167 struct diff_filepair *pair,
1168 const char *rename_branch,
1169 const char *other_branch)
1170{
1171 const struct diff_filespec *dest = pair->two;
1172
7b3d3b06
EN
1173 if (!o->call_depth && would_lose_untracked(dest->path)) {
1174 char *alt_path = unique_path(o, dest->path, rename_branch);
1175
1176 output(o, 1, _("Error: Refusing to lose untracked file at %s; "
1177 "writing to %s instead."),
1178 dest->path, alt_path);
1179 /*
1180 * Write the file in worktree at alt_path, but not in the
1181 * index. Instead, write to dest->path for the index but
1182 * only at the higher appropriate stage.
1183 */
1184 if (update_file(o, 0, &dest->oid, dest->mode, alt_path))
1185 return -1;
1186 free(alt_path);
1187 return update_stages(o, dest->path, NULL,
1188 rename_branch == o->branch1 ? dest : NULL,
1189 rename_branch == o->branch1 ? NULL : dest);
1190 }
1191
1192 /* Update dest->path both in index and in worktree */
3b9616f1
EN
1193 if (update_file(o, 1, &dest->oid, dest->mode, dest->path))
1194 return -1;
1195 return 0;
1196}
1197
75456f96 1198static int handle_change_delete(struct merge_options *o,
b26d87f2 1199 const char *path, const char *old_path,
b4da9d62 1200 const struct object_id *o_oid, int o_mode,
b26d87f2
MM
1201 const struct object_id *changed_oid,
1202 int changed_mode,
1203 const char *change_branch,
1204 const char *delete_branch,
b7033252
EN
1205 const char *change, const char *change_past)
1206{
b26d87f2
MM
1207 char *alt_path = NULL;
1208 const char *update_path = path;
75456f96 1209 int ret = 0;
b26d87f2 1210
7b3d3b06
EN
1211 if (dir_in_way(path, !o->call_depth, 0) ||
1212 (!o->call_depth && would_lose_untracked(path))) {
b26d87f2 1213 update_path = alt_path = unique_path(o, path, change_branch);
b7033252
EN
1214 }
1215
1216 if (o->call_depth) {
1217 /*
1218 * We cannot arbitrarily accept either a_sha or b_sha as
1219 * correct; since there is no true "middle point" between
1220 * them, simply reuse the base version for virtual merge base.
1221 */
75456f96
JS
1222 ret = remove_file_from_cache(path);
1223 if (!ret)
b26d87f2 1224 ret = update_file(o, 0, o_oid, o_mode, update_path);
b7033252 1225 } else {
b26d87f2
MM
1226 if (!alt_path) {
1227 if (!old_path) {
1228 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1229 "and %s in %s. Version %s of %s left in tree."),
1230 change, path, delete_branch, change_past,
1231 change_branch, change_branch, path);
1232 } else {
1233 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1234 "and %s to %s in %s. Version %s of %s left in tree."),
1235 change, old_path, delete_branch, change_past, path,
1236 change_branch, change_branch, path);
1237 }
55653a68 1238 } else {
b26d87f2
MM
1239 if (!old_path) {
1240 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1241 "and %s in %s. Version %s of %s left in tree at %s."),
1242 change, path, delete_branch, change_past,
1243 change_branch, change_branch, path, alt_path);
1244 } else {
1245 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1246 "and %s to %s in %s. Version %s of %s left in tree at %s."),
1247 change, old_path, delete_branch, change_past, path,
1248 change_branch, change_branch, path, alt_path);
1249 }
55653a68 1250 }
35a74abf 1251 /*
b26d87f2
MM
1252 * No need to call update_file() on path when change_branch ==
1253 * o->branch1 && !alt_path, since that would needlessly touch
1254 * path. We could call update_file_flags() with update_cache=0
1255 * and update_wd=0, but that's a no-op.
35a74abf 1256 */
b26d87f2
MM
1257 if (change_branch != o->branch1 || alt_path)
1258 ret = update_file(o, 0, changed_oid, changed_mode, update_path);
b7033252 1259 }
b26d87f2 1260 free(alt_path);
75456f96
JS
1261
1262 return ret;
b7033252
EN
1263}
1264
75456f96 1265static int conflict_rename_delete(struct merge_options *o,
6ef2cb00
EN
1266 struct diff_filepair *pair,
1267 const char *rename_branch,
b26d87f2 1268 const char *delete_branch)
9047ebbc 1269{
e03acb8b
EN
1270 const struct diff_filespec *orig = pair->one;
1271 const struct diff_filespec *dest = pair->two;
6ef2cb00 1272
75456f96
JS
1273 if (handle_change_delete(o,
1274 o->call_depth ? orig->path : dest->path,
b26d87f2 1275 o->call_depth ? NULL : orig->path,
75456f96 1276 &orig->oid, orig->mode,
b26d87f2
MM
1277 &dest->oid, dest->mode,
1278 rename_branch, delete_branch,
75456f96
JS
1279 _("rename"), _("renamed")))
1280 return -1;
e03acb8b 1281
75456f96
JS
1282 if (o->call_depth)
1283 return remove_file_from_cache(dest->path);
1284 else
bc9204d4 1285 return update_stages(o, dest->path, NULL,
75456f96
JS
1286 rename_branch == o->branch1 ? dest : NULL,
1287 rename_branch == o->branch1 ? NULL : dest);
6ef2cb00
EN
1288}
1289
1ac91b32
EN
1290static struct diff_filespec *filespec_from_entry(struct diff_filespec *target,
1291 struct stage_data *entry,
1292 int stage)
9047ebbc 1293{
b4da9d62 1294 struct object_id *oid = &entry->stages[stage].oid;
1ac91b32 1295 unsigned mode = entry->stages[stage].mode;
b4da9d62 1296 if (mode == 0 || is_null_oid(oid))
1ac91b32 1297 return NULL;
b4da9d62 1298 oidcpy(&target->oid, oid);
1ac91b32
EN
1299 target->mode = mode;
1300 return target;
1301}
1302
75456f96 1303static int handle_file(struct merge_options *o,
3672c971
EN
1304 struct diff_filespec *rename,
1305 int stage,
1306 struct rename_conflict_info *ci)
1307{
1308 char *dst_name = rename->path;
1309 struct stage_data *dst_entry;
1310 const char *cur_branch, *other_branch;
1311 struct diff_filespec other;
1312 struct diff_filespec *add;
75456f96 1313 int ret;
3672c971
EN
1314
1315 if (stage == 2) {
1316 dst_entry = ci->dst_entry1;
1317 cur_branch = ci->branch1;
1318 other_branch = ci->branch2;
1319 } else {
1320 dst_entry = ci->dst_entry2;
1321 cur_branch = ci->branch2;
1322 other_branch = ci->branch1;
9047ebbc 1323 }
3672c971
EN
1324
1325 add = filespec_from_entry(&other, dst_entry, stage ^ 1);
3672c971 1326 if (add) {
bbafab7f 1327 int ren_src_was_dirty = was_dirty(o, rename->path);
3672c971 1328 char *add_name = unique_path(o, rename->path, other_branch);
75456f96
JS
1329 if (update_file(o, 0, &add->oid, add->mode, add_name))
1330 return -1;
3672c971 1331
bbafab7f
EN
1332 if (ren_src_was_dirty) {
1333 output(o, 1, _("Refusing to lose dirty file at %s"),
1334 rename->path);
1335 }
1336 /*
1337 * Because the double negatives somehow keep confusing me...
1338 * 1) update_wd iff !ren_src_was_dirty.
1339 * 2) no_wd iff !update_wd
1340 * 3) so, no_wd == !!ren_src_was_dirty == ren_src_was_dirty
1341 */
1342 remove_file(o, 0, rename->path, ren_src_was_dirty);
3672c971
EN
1343 dst_name = unique_path(o, rename->path, cur_branch);
1344 } else {
5423d2e7 1345 if (dir_in_way(rename->path, !o->call_depth, 0)) {
3672c971 1346 dst_name = unique_path(o, rename->path, cur_branch);
55653a68 1347 output(o, 1, _("%s is a directory in %s adding as %s instead"),
3672c971 1348 rename->path, other_branch, dst_name);
7b3d3b06
EN
1349 } else if (!o->call_depth &&
1350 would_lose_untracked(rename->path)) {
1351 dst_name = unique_path(o, rename->path, cur_branch);
1352 output(o, 1, _("Refusing to lose untracked file at %s; "
1353 "adding as %s instead"),
1354 rename->path, dst_name);
3672c971 1355 }
9047ebbc 1356 }
75456f96
JS
1357 if ((ret = update_file(o, 0, &rename->oid, rename->mode, dst_name)))
1358 ; /* fall through, do allow dst_name to be released */
1359 else if (stage == 2)
bc9204d4 1360 ret = update_stages(o, rename->path, NULL, rename, add);
f53d3977 1361 else
bc9204d4 1362 ret = update_stages(o, rename->path, NULL, add, rename);
3672c971
EN
1363
1364 if (dst_name != rename->path)
1365 free(dst_name);
75456f96
JS
1366
1367 return ret;
3672c971
EN
1368}
1369
75456f96 1370static int conflict_rename_rename_1to2(struct merge_options *o,
a99b7f22 1371 struct rename_conflict_info *ci)
9047ebbc 1372{
09c01f85 1373 /* One file was renamed in both branches, but to different names. */
a99b7f22
EN
1374 struct diff_filespec *one = ci->pair1->one;
1375 struct diff_filespec *a = ci->pair1->two;
1376 struct diff_filespec *b = ci->pair2->two;
4f66dade 1377
55653a68 1378 output(o, 1, _("CONFLICT (rename/rename): "
4f66dade 1379 "Rename \"%s\"->\"%s\" in branch \"%s\" "
55653a68 1380 "rename \"%s\"->\"%s\" in \"%s\"%s"),
a99b7f22
EN
1381 one->path, a->path, ci->branch1,
1382 one->path, b->path, ci->branch2,
55653a68 1383 o->call_depth ? _(" (left unresolved)") : "");
b7fa51da 1384 if (o->call_depth) {
c52ff85d 1385 struct merge_file_info mfi;
6d63070c
EN
1386 struct diff_filespec other;
1387 struct diff_filespec *add;
3c8a51e8 1388 if (merge_file_one(o, one->path,
b4da9d62 1389 &one->oid, one->mode,
1390 &a->oid, a->mode,
1391 &b->oid, b->mode,
3c8a51e8 1392 ci->branch1, ci->branch2, &mfi))
75456f96
JS
1393 return -1;
1394
9047ebbc 1395 /*
c52ff85d
EN
1396 * FIXME: For rename/add-source conflicts (if we could detect
1397 * such), this is wrong. We should instead find a unique
1398 * pathname and then either rename the add-source file to that
1399 * unique path, or use that unique path instead of src here.
9047ebbc 1400 */
75456f96
JS
1401 if (update_file(o, 0, &mfi.oid, mfi.mode, one->path))
1402 return -1;
07413c5a 1403
6d63070c
EN
1404 /*
1405 * Above, we put the merged content at the merge-base's
1406 * path. Now we usually need to delete both a->path and
1407 * b->path. However, the rename on each side of the merge
1408 * could also be involved in a rename/add conflict. In
1409 * such cases, we should keep the added file around,
1410 * resolving the conflict at that path in its favor.
1411 */
1412 add = filespec_from_entry(&other, ci->dst_entry1, 2 ^ 1);
75456f96
JS
1413 if (add) {
1414 if (update_file(o, 0, &add->oid, add->mode, a->path))
1415 return -1;
1416 }
6d63070c
EN
1417 else
1418 remove_file_from_cache(a->path);
1419 add = filespec_from_entry(&other, ci->dst_entry2, 3 ^ 1);
75456f96
JS
1420 if (add) {
1421 if (update_file(o, 0, &add->oid, add->mode, b->path))
1422 return -1;
1423 }
6d63070c
EN
1424 else
1425 remove_file_from_cache(b->path);
75456f96
JS
1426 } else if (handle_file(o, a, 2, ci) || handle_file(o, b, 3, ci))
1427 return -1;
1428
1429 return 0;
9047ebbc
MV
1430}
1431
75456f96 1432static int conflict_rename_rename_2to1(struct merge_options *o,
461f5041 1433 struct rename_conflict_info *ci)
9047ebbc 1434{
461f5041
EN
1435 /* Two files, a & b, were renamed to the same thing, c. */
1436 struct diff_filespec *a = ci->pair1->one;
1437 struct diff_filespec *b = ci->pair2->one;
1438 struct diff_filespec *c1 = ci->pair1->two;
1439 struct diff_filespec *c2 = ci->pair2->two;
1440 char *path = c1->path; /* == c2->path */
434b8525
EN
1441 struct merge_file_info mfi_c1;
1442 struct merge_file_info mfi_c2;
75456f96 1443 int ret;
461f5041 1444
55653a68 1445 output(o, 1, _("CONFLICT (rename/rename): "
461f5041 1446 "Rename %s->%s in %s. "
55653a68 1447 "Rename %s->%s in %s"),
461f5041
EN
1448 a->path, c1->path, ci->branch1,
1449 b->path, c2->path, ci->branch2);
1450
8e1b62f1
EN
1451 remove_file(o, 1, a->path, o->call_depth || would_lose_untracked(a->path));
1452 remove_file(o, 1, b->path, o->call_depth || would_lose_untracked(b->path));
461f5041 1453
3c8a51e8
JS
1454 if (merge_file_special_markers(o, a, c1, &ci->ren1_other,
1455 o->branch1, c1->path,
1456 o->branch2, ci->ren1_other.path, &mfi_c1) ||
1457 merge_file_special_markers(o, b, &ci->ren2_other, c2,
1458 o->branch1, ci->ren2_other.path,
1459 o->branch2, c2->path, &mfi_c2))
75456f96 1460 return -1;
434b8525 1461
0a6b8712 1462 if (o->call_depth) {
434b8525
EN
1463 /*
1464 * If mfi_c1.clean && mfi_c2.clean, then it might make
1465 * sense to do a two-way merge of those results. But, I
1466 * think in all cases, it makes sense to have the virtual
1467 * merge base just undo the renames; they can be detected
1468 * again later for the non-recursive merge.
1469 */
1470 remove_file(o, 0, path, 0);
75456f96
JS
1471 ret = update_file(o, 0, &mfi_c1.oid, mfi_c1.mode, a->path);
1472 if (!ret)
1473 ret = update_file(o, 0, &mfi_c2.oid, mfi_c2.mode,
1474 b->path);
0a6b8712 1475 } else {
461f5041
EN
1476 char *new_path1 = unique_path(o, path, ci->branch1);
1477 char *new_path2 = unique_path(o, path, ci->branch2);
55653a68 1478 output(o, 1, _("Renaming %s to %s and %s to %s instead"),
461f5041 1479 a->path, new_path1, b->path, new_path2);
bbafab7f
EN
1480 if (was_dirty(o, path))
1481 output(o, 1, _("Refusing to lose dirty file at %s"),
1482 path);
1483 else if (would_lose_untracked(path))
7b3d3b06
EN
1484 /*
1485 * Only way we get here is if both renames were from
1486 * a directory rename AND user had an untracked file
1487 * at the location where both files end up after the
1488 * two directory renames. See testcase 10d of t6043.
1489 */
1490 output(o, 1, _("Refusing to lose untracked file at "
1491 "%s, even though it's in the way."),
1492 path);
1493 else
1494 remove_file(o, 0, path, 0);
75456f96
JS
1495 ret = update_file(o, 0, &mfi_c1.oid, mfi_c1.mode, new_path1);
1496 if (!ret)
1497 ret = update_file(o, 0, &mfi_c2.oid, mfi_c2.mode,
1498 new_path2);
3b9616f1
EN
1499 /*
1500 * unpack_trees() actually populates the index for us for
1501 * "normal" rename/rename(2to1) situtations so that the
1502 * correct entries are at the higher stages, which would
1503 * make the call below to update_stages_for_stage_data
1504 * unnecessary. However, if either of the renames came
1505 * from a directory rename, then unpack_trees() will not
1506 * have gotten the right data loaded into the index, so we
1507 * need to do so now. (While it'd be tempting to move this
1508 * call to update_stages_for_stage_data() to
1509 * apply_directory_rename_modifications(), that would break
1510 * our intermediate calls to would_lose_untracked() since
1511 * those rely on the current in-memory index. See also the
1512 * big "NOTE" in update_stages()).
1513 */
1514 if (update_stages_for_stage_data(o, path, ci->dst_entry1))
1515 ret = -1;
1516
0a6b8712
EN
1517 free(new_path2);
1518 free(new_path1);
1519 }
75456f96
JS
1520
1521 return ret;
9047ebbc
MV
1522}
1523
a706e8f6 1524/*
3f646871 1525 * Get the diff_filepairs changed between o_tree and tree.
a706e8f6 1526 */
3f646871
EN
1527static struct diff_queue_struct *get_diffpairs(struct merge_options *o,
1528 struct tree *o_tree,
1529 struct tree *tree)
a706e8f6 1530{
3f646871 1531 struct diff_queue_struct *ret;
a706e8f6
EN
1532 struct diff_options opts;
1533
a706e8f6
EN
1534 diff_setup(&opts);
1535 opts.flags.recursive = 1;
1536 opts.flags.rename_empty = 0;
1537 opts.detect_rename = DIFF_DETECT_RENAME;
1538 opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
1539 o->diff_rename_limit >= 0 ? o->diff_rename_limit :
1540 1000;
1541 opts.rename_score = o->rename_score;
1542 opts.show_rename_progress = o->show_rename_progress;
1543 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
1544 diff_setup_done(&opts);
1545 diff_tree_oid(&o_tree->object.oid, &tree->object.oid, "", &opts);
1546 diffcore_std(&opts);
1547 if (opts.needed_rename_limit > o->needed_rename_limit)
1548 o->needed_rename_limit = opts.needed_rename_limit;
3f646871
EN
1549
1550 ret = xmalloc(sizeof(*ret));
1551 *ret = diff_queued_diff;
1552
1553 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
1554 diff_queued_diff.nr = 0;
1555 diff_queued_diff.queue = NULL;
1556 diff_flush(&opts);
1557 return ret;
1558}
1559
53e32d46
EN
1560static int tree_has_path(struct tree *tree, const char *path)
1561{
a5bbc299 1562 struct object_id hashy;
53e32d46
EN
1563 unsigned int mode_o;
1564
a5bbc299
JH
1565 return !get_tree_entry(&tree->object.oid, path,
1566 &hashy, &mode_o);
53e32d46
EN
1567}
1568
ea625cb0
EN
1569/*
1570 * Return a new string that replaces the beginning portion (which matches
1571 * entry->dir), with entry->new_dir. In perl-speak:
1572 * new_path_name = (old_path =~ s/entry->dir/entry->new_dir/);
1573 * NOTE:
1574 * Caller must ensure that old_path starts with entry->dir + '/'.
1575 */
1576static char *apply_dir_rename(struct dir_rename_entry *entry,
1577 const char *old_path)
1578{
1579 struct strbuf new_path = STRBUF_INIT;
1580 int oldlen, newlen;
1581
1582 if (entry->non_unique_new_dir)
1583 return NULL;
1584
1585 oldlen = strlen(entry->dir);
1586 newlen = entry->new_dir.len + (strlen(old_path) - oldlen) + 1;
1587 strbuf_grow(&new_path, newlen);
1588 strbuf_addbuf(&new_path, &entry->new_dir);
1589 strbuf_addstr(&new_path, &old_path[oldlen]);
1590
1591 return strbuf_detach(&new_path, NULL);
1592}
1593
8383408d
EN
1594static void get_renamed_dir_portion(const char *old_path, const char *new_path,
1595 char **old_dir, char **new_dir)
1596{
1597 char *end_of_old, *end_of_new;
1598 int old_len, new_len;
1599
1600 *old_dir = NULL;
1601 *new_dir = NULL;
1602
1603 /*
1604 * For
1605 * "a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c"
1606 * the "e/foo.c" part is the same, we just want to know that
1607 * "a/b/c/d" was renamed to "a/b/some/thing/else"
1608 * so, for this example, this function returns "a/b/c/d" in
1609 * *old_dir and "a/b/some/thing/else" in *new_dir.
1610 *
1611 * Also, if the basename of the file changed, we don't care. We
1612 * want to know which portion of the directory, if any, changed.
1613 */
1614 end_of_old = strrchr(old_path, '/');
1615 end_of_new = strrchr(new_path, '/');
1616
1617 if (end_of_old == NULL || end_of_new == NULL)
1618 return;
1619 while (*--end_of_new == *--end_of_old &&
1620 end_of_old != old_path &&
1621 end_of_new != new_path)
1622 ; /* Do nothing; all in the while loop */
1623 /*
1624 * We've found the first non-matching character in the directory
1625 * paths. That means the current directory we were comparing
1626 * represents the rename. Move end_of_old and end_of_new back
1627 * to the full directory name.
1628 */
1629 if (*end_of_old == '/')
1630 end_of_old++;
1631 if (*end_of_old != '/')
1632 end_of_new++;
1633 end_of_old = strchr(end_of_old, '/');
1634 end_of_new = strchr(end_of_new, '/');
1635
1636 /*
1637 * It may have been the case that old_path and new_path were the same
1638 * directory all along. Don't claim a rename if they're the same.
1639 */
1640 old_len = end_of_old - old_path;
1641 new_len = end_of_new - new_path;
1642
1643 if (old_len != new_len || strncmp(old_path, new_path, old_len)) {
1644 *old_dir = xstrndup(old_path, old_len);
1645 *new_dir = xstrndup(new_path, new_len);
1646 }
1647}
1648
53e32d46
EN
1649static void remove_hashmap_entries(struct hashmap *dir_renames,
1650 struct string_list *items_to_remove)
1651{
1652 int i;
1653 struct dir_rename_entry *entry;
1654
1655 for (i = 0; i < items_to_remove->nr; i++) {
1656 entry = items_to_remove->items[i].util;
1657 hashmap_remove(dir_renames, entry, NULL);
1658 }
1659 string_list_clear(items_to_remove, 0);
1660}
1661
79d49b7d
EN
1662/*
1663 * See if there is a directory rename for path, and if there are any file
1664 * level conflicts for the renamed location. If there is a rename and
1665 * there are no conflicts, return the new name. Otherwise, return NULL.
1666 */
1667static char *handle_path_level_conflicts(struct merge_options *o,
1668 const char *path,
1669 struct dir_rename_entry *entry,
1670 struct hashmap *collisions,
1671 struct tree *tree)
1672{
1673 char *new_path = NULL;
1674 struct collision_entry *collision_ent;
1675 int clean = 1;
1676 struct strbuf collision_paths = STRBUF_INIT;
1677
1678 /*
1679 * entry has the mapping of old directory name to new directory name
1680 * that we want to apply to path.
1681 */
1682 new_path = apply_dir_rename(entry, path);
1683
1684 if (!new_path) {
1685 /* This should only happen when entry->non_unique_new_dir set */
1686 if (!entry->non_unique_new_dir)
1687 BUG("entry->non_unqiue_dir not set and !new_path");
1688 output(o, 1, _("CONFLICT (directory rename split): "
1689 "Unclear where to place %s because directory "
1690 "%s was renamed to multiple other directories, "
1691 "with no destination getting a majority of the "
1692 "files."),
1693 path, entry->dir);
1694 clean = 0;
1695 return NULL;
1696 }
1697
1698 /*
1699 * The caller needs to have ensured that it has pre-populated
1700 * collisions with all paths that map to new_path. Do a quick check
1701 * to ensure that's the case.
1702 */
1703 collision_ent = collision_find_entry(collisions, new_path);
1704 if (collision_ent == NULL)
1705 BUG("collision_ent is NULL");
1706
1707 /*
1708 * Check for one-sided add/add/.../add conflicts, i.e.
1709 * where implicit renames from the other side doing
1710 * directory rename(s) can affect this side of history
1711 * to put multiple paths into the same location. Warn
1712 * and bail on directory renames for such paths.
1713 */
1714 if (collision_ent->reported_already) {
1715 clean = 0;
1716 } else if (tree_has_path(tree, new_path)) {
1717 collision_ent->reported_already = 1;
1718 strbuf_add_separated_string_list(&collision_paths, ", ",
1719 &collision_ent->source_files);
1720 output(o, 1, _("CONFLICT (implicit dir rename): Existing "
1721 "file/dir at %s in the way of implicit "
1722 "directory rename(s) putting the following "
1723 "path(s) there: %s."),
1724 new_path, collision_paths.buf);
1725 clean = 0;
1726 } else if (collision_ent->source_files.nr > 1) {
1727 collision_ent->reported_already = 1;
1728 strbuf_add_separated_string_list(&collision_paths, ", ",
1729 &collision_ent->source_files);
1730 output(o, 1, _("CONFLICT (implicit dir rename): Cannot map "
1731 "more than one path to %s; implicit directory "
1732 "renames tried to put these paths there: %s"),
1733 new_path, collision_paths.buf);
1734 clean = 0;
1735 }
1736
1737 /* Free memory we no longer need */
1738 strbuf_release(&collision_paths);
1739 if (!clean && new_path) {
1740 free(new_path);
1741 return NULL;
1742 }
1743
1744 return new_path;
1745}
1746
53e32d46
EN
1747/*
1748 * There are a couple things we want to do at the directory level:
1749 * 1. Check for both sides renaming to the same thing, in order to avoid
1750 * implicit renaming of files that should be left in place. (See
1751 * testcase 6b in t6043 for details.)
1752 * 2. Prune directory renames if there are still files left in the
1753 * the original directory. These represent a partial directory rename,
1754 * i.e. a rename where only some of the files within the directory
1755 * were renamed elsewhere. (Technically, this could be done earlier
1756 * in get_directory_renames(), except that would prevent us from
1757 * doing the previous check and thus failing testcase 6b.)
1758 * 3. Check for rename/rename(1to2) conflicts (at the directory level).
1759 * In the future, we could potentially record this info as well and
1760 * omit reporting rename/rename(1to2) conflicts for each path within
1761 * the affected directories, thus cleaning up the merge output.
1762 * NOTE: We do NOT check for rename/rename(2to1) conflicts at the
1763 * directory level, because merging directories is fine. If it
1764 * causes conflicts for files within those merged directories, then
1765 * that should be detected at the individual path level.
1766 */
1767static void handle_directory_level_conflicts(struct merge_options *o,
1768 struct hashmap *dir_re_head,
1769 struct tree *head,
1770 struct hashmap *dir_re_merge,
1771 struct tree *merge)
1772{
1773 struct hashmap_iter iter;
1774 struct dir_rename_entry *head_ent;
1775 struct dir_rename_entry *merge_ent;
1776
1777 struct string_list remove_from_head = STRING_LIST_INIT_NODUP;
1778 struct string_list remove_from_merge = STRING_LIST_INIT_NODUP;
1779
1780 hashmap_iter_init(dir_re_head, &iter);
1781 while ((head_ent = hashmap_iter_next(&iter))) {
1782 merge_ent = dir_rename_find_entry(dir_re_merge, head_ent->dir);
1783 if (merge_ent &&
1784 !head_ent->non_unique_new_dir &&
1785 !merge_ent->non_unique_new_dir &&
1786 !strbuf_cmp(&head_ent->new_dir, &merge_ent->new_dir)) {
1787 /* 1. Renamed identically; remove it from both sides */
1788 string_list_append(&remove_from_head,
1789 head_ent->dir)->util = head_ent;
1790 strbuf_release(&head_ent->new_dir);
1791 string_list_append(&remove_from_merge,
1792 merge_ent->dir)->util = merge_ent;
1793 strbuf_release(&merge_ent->new_dir);
1794 } else if (tree_has_path(head, head_ent->dir)) {
1795 /* 2. This wasn't a directory rename after all */
1796 string_list_append(&remove_from_head,
1797 head_ent->dir)->util = head_ent;
1798 strbuf_release(&head_ent->new_dir);
1799 }
1800 }
1801
1802 remove_hashmap_entries(dir_re_head, &remove_from_head);
1803 remove_hashmap_entries(dir_re_merge, &remove_from_merge);
1804
1805 hashmap_iter_init(dir_re_merge, &iter);
1806 while ((merge_ent = hashmap_iter_next(&iter))) {
1807 head_ent = dir_rename_find_entry(dir_re_head, merge_ent->dir);
1808 if (tree_has_path(merge, merge_ent->dir)) {
1809 /* 2. This wasn't a directory rename after all */
1810 string_list_append(&remove_from_merge,
1811 merge_ent->dir)->util = merge_ent;
1812 } else if (head_ent &&
1813 !head_ent->non_unique_new_dir &&
1814 !merge_ent->non_unique_new_dir) {
1815 /* 3. rename/rename(1to2) */
1816 /*
1817 * We can assume it's not rename/rename(1to1) because
1818 * that was case (1), already checked above. So we
1819 * know that head_ent->new_dir and merge_ent->new_dir
1820 * are different strings.
1821 */
1822 output(o, 1, _("CONFLICT (rename/rename): "
1823 "Rename directory %s->%s in %s. "
1824 "Rename directory %s->%s in %s"),
1825 head_ent->dir, head_ent->new_dir.buf, o->branch1,
1826 head_ent->dir, merge_ent->new_dir.buf, o->branch2);
1827 string_list_append(&remove_from_head,
1828 head_ent->dir)->util = head_ent;
1829 strbuf_release(&head_ent->new_dir);
1830 string_list_append(&remove_from_merge,
1831 merge_ent->dir)->util = merge_ent;
1832 strbuf_release(&merge_ent->new_dir);
1833 }
1834 }
1835
1836 remove_hashmap_entries(dir_re_head, &remove_from_head);
1837 remove_hashmap_entries(dir_re_merge, &remove_from_merge);
1838}
1839
8383408d
EN
1840static struct hashmap *get_directory_renames(struct diff_queue_struct *pairs,
1841 struct tree *tree)
1842{
1843 struct hashmap *dir_renames;
1844 struct hashmap_iter iter;
1845 struct dir_rename_entry *entry;
1846 int i;
1847
1848 /*
1849 * Typically, we think of a directory rename as all files from a
1850 * certain directory being moved to a target directory. However,
1851 * what if someone first moved two files from the original
1852 * directory in one commit, and then renamed the directory
1853 * somewhere else in a later commit? At merge time, we just know
1854 * that files from the original directory went to two different
1855 * places, and that the bulk of them ended up in the same place.
1856 * We want each directory rename to represent where the bulk of the
1857 * files from that directory end up; this function exists to find
1858 * where the bulk of the files went.
1859 *
1860 * The first loop below simply iterates through the list of file
1861 * renames, finding out how often each directory rename pair
1862 * possibility occurs.
1863 */
1864 dir_renames = xmalloc(sizeof(struct hashmap));
1865 dir_rename_init(dir_renames);
1866 for (i = 0; i < pairs->nr; ++i) {
1867 struct string_list_item *item;
1868 int *count;
1869 struct diff_filepair *pair = pairs->queue[i];
1870 char *old_dir, *new_dir;
1871
1872 /* File not part of directory rename if it wasn't renamed */
1873 if (pair->status != 'R')
1874 continue;
1875
1876 get_renamed_dir_portion(pair->one->path, pair->two->path,
1877 &old_dir, &new_dir);
1878 if (!old_dir)
1879 /* Directory didn't change at all; ignore this one. */
1880 continue;
1881
1882 entry = dir_rename_find_entry(dir_renames, old_dir);
1883 if (!entry) {
1884 entry = xmalloc(sizeof(struct dir_rename_entry));
1885 dir_rename_entry_init(entry, old_dir);
1886 hashmap_put(dir_renames, entry);
1887 } else {
1888 free(old_dir);
1889 }
1890 item = string_list_lookup(&entry->possible_new_dirs, new_dir);
1891 if (!item) {
1892 item = string_list_insert(&entry->possible_new_dirs,
1893 new_dir);
1894 item->util = xcalloc(1, sizeof(int));
1895 } else {
1896 free(new_dir);
1897 }
1898 count = item->util;
1899 *count += 1;
1900 }
1901
1902 /*
1903 * For each directory with files moved out of it, we find out which
1904 * target directory received the most files so we can declare it to
1905 * be the "winning" target location for the directory rename. This
1906 * winner gets recorded in new_dir. If there is no winner
1907 * (multiple target directories received the same number of files),
1908 * we set non_unique_new_dir. Once we've determined the winner (or
1909 * that there is no winner), we no longer need possible_new_dirs.
1910 */
1911 hashmap_iter_init(dir_renames, &iter);
1912 while ((entry = hashmap_iter_next(&iter))) {
1913 int max = 0;
1914 int bad_max = 0;
1915 char *best = NULL;
1916
1917 for (i = 0; i < entry->possible_new_dirs.nr; i++) {
1918 int *count = entry->possible_new_dirs.items[i].util;
1919
1920 if (*count == max)
1921 bad_max = max;
1922 else if (*count > max) {
1923 max = *count;
1924 best = entry->possible_new_dirs.items[i].string;
1925 }
1926 }
1927 if (bad_max == max)
1928 entry->non_unique_new_dir = 1;
1929 else {
1930 assert(entry->new_dir.len == 0);
1931 strbuf_addstr(&entry->new_dir, best);
1932 }
1933 /*
1934 * The relevant directory sub-portion of the original full
1935 * filepaths were xstrndup'ed before inserting into
1936 * possible_new_dirs, and instead of manually iterating the
1937 * list and free'ing each, just lie and tell
1938 * possible_new_dirs that it did the strdup'ing so that it
1939 * will free them for us.
1940 */
1941 entry->possible_new_dirs.strdup_strings = 1;
1942 string_list_clear(&entry->possible_new_dirs, 1);
1943 }
1944
1945 return dir_renames;
1946}
1947
ea625cb0
EN
1948static struct dir_rename_entry *check_dir_renamed(const char *path,
1949 struct hashmap *dir_renames)
1950{
1951 char temp[PATH_MAX];
1952 char *end;
1953 struct dir_rename_entry *entry;
1954
1955 strcpy(temp, path);
1956 while ((end = strrchr(temp, '/'))) {
1957 *end = '\0';
1958 entry = dir_rename_find_entry(dir_renames, temp);
1959 if (entry)
1960 return entry;
1961 }
1962 return NULL;
1963}
1964
1965static void compute_collisions(struct hashmap *collisions,
1966 struct hashmap *dir_renames,
1967 struct diff_queue_struct *pairs)
1968{
1969 int i;
1970
1971 /*
1972 * Multiple files can be mapped to the same path due to directory
1973 * renames done by the other side of history. Since that other
1974 * side of history could have merged multiple directories into one,
1975 * if our side of history added the same file basename to each of
1976 * those directories, then all N of them would get implicitly
1977 * renamed by the directory rename detection into the same path,
1978 * and we'd get an add/add/.../add conflict, and all those adds
1979 * from *this* side of history. This is not representable in the
1980 * index, and users aren't going to easily be able to make sense of
1981 * it. So we need to provide a good warning about what's
1982 * happening, and fall back to no-directory-rename detection
1983 * behavior for those paths.
1984 *
1985 * See testcases 9e and all of section 5 from t6043 for examples.
1986 */
1987 collision_init(collisions);
1988
1989 for (i = 0; i < pairs->nr; ++i) {
1990 struct dir_rename_entry *dir_rename_ent;
1991 struct collision_entry *collision_ent;
1992 char *new_path;
1993 struct diff_filepair *pair = pairs->queue[i];
1994
febb3a86 1995 if (pair->status != 'A' && pair->status != 'R')
ea625cb0
EN
1996 continue;
1997 dir_rename_ent = check_dir_renamed(pair->two->path,
1998 dir_renames);
1999 if (!dir_rename_ent)
2000 continue;
2001
2002 new_path = apply_dir_rename(dir_rename_ent, pair->two->path);
2003 if (!new_path)
2004 /*
2005 * dir_rename_ent->non_unique_new_path is true, which
2006 * means there is no directory rename for us to use,
2007 * which means it won't cause us any additional
2008 * collisions.
2009 */
2010 continue;
2011 collision_ent = collision_find_entry(collisions, new_path);
2012 if (!collision_ent) {
2013 collision_ent = xcalloc(1,
2014 sizeof(struct collision_entry));
2015 hashmap_entry_init(collision_ent, strhash(new_path));
2016 hashmap_put(collisions, collision_ent);
2017 collision_ent->target_file = new_path;
2018 } else {
2019 free(new_path);
2020 }
2021 string_list_insert(&collision_ent->source_files,
2022 pair->two->path);
2023 }
2024}
2025
79d49b7d
EN
2026static char *check_for_directory_rename(struct merge_options *o,
2027 const char *path,
2028 struct tree *tree,
2029 struct hashmap *dir_renames,
2030 struct hashmap *dir_rename_exclusions,
2031 struct hashmap *collisions,
2032 int *clean_merge)
2033{
2034 char *new_path = NULL;
2035 struct dir_rename_entry *entry = check_dir_renamed(path, dir_renames);
2036 struct dir_rename_entry *oentry = NULL;
2037
2038 if (!entry)
2039 return new_path;
2040
2041 /*
2042 * This next part is a little weird. We do not want to do an
2043 * implicit rename into a directory we renamed on our side, because
2044 * that will result in a spurious rename/rename(1to2) conflict. An
2045 * example:
2046 * Base commit: dumbdir/afile, otherdir/bfile
2047 * Side 1: smrtdir/afile, otherdir/bfile
2048 * Side 2: dumbdir/afile, dumbdir/bfile
2049 * Here, while working on Side 1, we could notice that otherdir was
2050 * renamed/merged to dumbdir, and change the diff_filepair for
2051 * otherdir/bfile into a rename into dumbdir/bfile. However, Side
2052 * 2 will notice the rename from dumbdir to smrtdir, and do the
2053 * transitive rename to move it from dumbdir/bfile to
2054 * smrtdir/bfile. That gives us bfile in dumbdir vs being in
2055 * smrtdir, a rename/rename(1to2) conflict. We really just want
2056 * the file to end up in smrtdir. And the way to achieve that is
2057 * to not let Side1 do the rename to dumbdir, since we know that is
2058 * the source of one of our directory renames.
2059 *
2060 * That's why oentry and dir_rename_exclusions is here.
2061 *
2062 * As it turns out, this also prevents N-way transient rename
2063 * confusion; See testcases 9c and 9d of t6043.
2064 */
2065 oentry = dir_rename_find_entry(dir_rename_exclusions, entry->new_dir.buf);
2066 if (oentry) {
2067 output(o, 1, _("WARNING: Avoiding applying %s -> %s rename "
2068 "to %s, because %s itself was renamed."),
2069 entry->dir, entry->new_dir.buf, path, entry->new_dir.buf);
2070 } else {
2071 new_path = handle_path_level_conflicts(o, path, entry,
2072 collisions, tree);
2073 *clean_merge &= (new_path != NULL);
2074 }
2075
2076 return new_path;
2077}
2078
3b9616f1
EN
2079static void apply_directory_rename_modifications(struct merge_options *o,
2080 struct diff_filepair *pair,
2081 char *new_path,
2082 struct rename *re,
2083 struct tree *tree,
2084 struct tree *o_tree,
2085 struct tree *a_tree,
2086 struct tree *b_tree,
2087 struct string_list *entries,
2088 int *clean)
2089{
2090 struct string_list_item *item;
2091 int stage = (tree == a_tree ? 2 : 3);
bbafab7f 2092 int update_wd;
3b9616f1
EN
2093
2094 /*
2095 * In all cases where we can do directory rename detection,
2096 * unpack_trees() will have read pair->two->path into the
2097 * index and the working copy. We need to remove it so that
2098 * we can instead place it at new_path. It is guaranteed to
2099 * not be untracked (unpack_trees() would have errored out
2100 * saying the file would have been overwritten), but it might
2101 * be dirty, though.
2102 */
bbafab7f
EN
2103 update_wd = !was_dirty(o, pair->two->path);
2104 if (!update_wd)
2105 output(o, 1, _("Refusing to lose dirty file at %s"),
2106 pair->two->path);
2107 remove_file(o, 1, pair->two->path, !update_wd);
3b9616f1
EN
2108
2109 /* Find or create a new re->dst_entry */
2110 item = string_list_lookup(entries, new_path);
2111 if (item) {
2112 /*
2113 * Since we're renaming on this side of history, and it's
2114 * due to a directory rename on the other side of history
2115 * (which we only allow when the directory in question no
2116 * longer exists on the other side of history), the
2117 * original entry for re->dst_entry is no longer
2118 * necessary...
2119 */
2120 re->dst_entry->processed = 1;
2121
2122 /*
2123 * ...because we'll be using this new one.
2124 */
2125 re->dst_entry = item->util;
2126 } else {
2127 /*
2128 * re->dst_entry is for the before-dir-rename path, and we
2129 * need it to hold information for the after-dir-rename
2130 * path. Before creating a new entry, we need to mark the
2131 * old one as unnecessary (...unless it is shared by
2132 * src_entry, i.e. this didn't use to be a rename, in which
2133 * case we can just allow the normal processing to happen
2134 * for it).
2135 */
2136 if (pair->status == 'R')
2137 re->dst_entry->processed = 1;
2138
2139 re->dst_entry = insert_stage_data(new_path,
2140 o_tree, a_tree, b_tree,
2141 entries);
2142 item = string_list_insert(entries, new_path);
2143 item->util = re->dst_entry;
2144 }
2145
2146 /*
2147 * Update the stage_data with the information about the path we are
2148 * moving into place. That slot will be empty and available for us
2149 * to write to because of the collision checks in
2150 * handle_path_level_conflicts(). In other words,
2151 * re->dst_entry->stages[stage].oid will be the null_oid, so it's
2152 * open for us to write to.
2153 *
2154 * It may be tempting to actually update the index at this point as
2155 * well, using update_stages_for_stage_data(), but as per the big
2156 * "NOTE" in update_stages(), doing so will modify the current
2157 * in-memory index which will break calls to would_lose_untracked()
2158 * that we need to make. Instead, we need to just make sure that
2159 * the various conflict_rename_*() functions update the index
2160 * explicitly rather than relying on unpack_trees() to have done it.
2161 */
a5bbc299 2162 get_tree_entry(&tree->object.oid,
3b9616f1 2163 pair->two->path,
a5bbc299 2164 &re->dst_entry->stages[stage].oid,
3b9616f1
EN
2165 &re->dst_entry->stages[stage].mode);
2166
2167 /* Update pair status */
2168 if (pair->status == 'A') {
2169 /*
2170 * Recording rename information for this add makes it look
2171 * like a rename/delete conflict. Make sure we can
2172 * correctly handle this as an add that was moved to a new
2173 * directory instead of reporting a rename/delete conflict.
2174 */
2175 re->add_turned_into_rename = 1;
2176 }
2177 /*
2178 * We don't actually look at pair->status again, but it seems
2179 * pedagogically correct to adjust it.
2180 */
2181 pair->status = 'R';
2182
2183 /*
2184 * Finally, record the new location.
2185 */
2186 pair->two->path = new_path;
2187}
2188
3f646871
EN
2189/*
2190 * Get information of all renames which occurred in 'pairs', making use of
2191 * any implicit directory renames inferred from the other side of history.
2192 * We need the three trees in the merge ('o_tree', 'a_tree' and 'b_tree')
2193 * to be able to associate the correct cache entries with the rename
2194 * information; tree is always equal to either a_tree or b_tree.
2195 */
2196static struct string_list *get_renames(struct merge_options *o,
2197 struct diff_queue_struct *pairs,
ea625cb0 2198 struct hashmap *dir_renames,
79d49b7d 2199 struct hashmap *dir_rename_exclusions,
3f646871
EN
2200 struct tree *tree,
2201 struct tree *o_tree,
2202 struct tree *a_tree,
2203 struct tree *b_tree,
79d49b7d
EN
2204 struct string_list *entries,
2205 int *clean_merge)
3f646871
EN
2206{
2207 int i;
ea625cb0
EN
2208 struct hashmap collisions;
2209 struct hashmap_iter iter;
2210 struct collision_entry *e;
3f646871
EN
2211 struct string_list *renames;
2212
ea625cb0 2213 compute_collisions(&collisions, dir_renames, pairs);
3f646871
EN
2214 renames = xcalloc(1, sizeof(struct string_list));
2215
2216 for (i = 0; i < pairs->nr; ++i) {
a706e8f6
EN
2217 struct string_list_item *item;
2218 struct rename *re;
3f646871 2219 struct diff_filepair *pair = pairs->queue[i];
79d49b7d 2220 char *new_path; /* non-NULL only with directory renames */
a706e8f6 2221
febb3a86 2222 if (pair->status != 'A' && pair->status != 'R') {
a706e8f6
EN
2223 diff_free_filepair(pair);
2224 continue;
2225 }
79d49b7d
EN
2226 new_path = check_for_directory_rename(o, pair->two->path, tree,
2227 dir_renames,
2228 dir_rename_exclusions,
2229 &collisions,
2230 clean_merge);
2231 if (pair->status != 'R' && !new_path) {
2232 diff_free_filepair(pair);
2233 continue;
2234 }
2235
a706e8f6
EN
2236 re = xmalloc(sizeof(*re));
2237 re->processed = 0;
3b9616f1 2238 re->add_turned_into_rename = 0;
a706e8f6
EN
2239 re->pair = pair;
2240 item = string_list_lookup(entries, re->pair->one->path);
2241 if (!item)
2242 re->src_entry = insert_stage_data(re->pair->one->path,
2243 o_tree, a_tree, b_tree, entries);
2244 else
2245 re->src_entry = item->util;
2246
2247 item = string_list_lookup(entries, re->pair->two->path);
2248 if (!item)
2249 re->dst_entry = insert_stage_data(re->pair->two->path,
2250 o_tree, a_tree, b_tree, entries);
2251 else
2252 re->dst_entry = item->util;
2253 item = string_list_insert(renames, pair->one->path);
2254 item->util = re;
3b9616f1
EN
2255 if (new_path)
2256 apply_directory_rename_modifications(o, pair, new_path,
2257 re, tree, o_tree,
2258 a_tree, b_tree,
2259 entries,
2260 clean_merge);
a706e8f6 2261 }
ea625cb0
EN
2262
2263 hashmap_iter_init(&collisions, &iter);
2264 while ((e = hashmap_iter_next(&iter))) {
2265 free(e->target_file);
2266 string_list_clear(&e->source_files, 0);
2267 }
2268 hashmap_free(&collisions, 1);
a706e8f6
EN
2269 return renames;
2270}
2271
8a2fce18
MV
2272static int process_renames(struct merge_options *o,
2273 struct string_list *a_renames,
2274 struct string_list *b_renames)
9047ebbc
MV
2275{
2276 int clean_merge = 1, i, j;
183113a5
TF
2277 struct string_list a_by_dst = STRING_LIST_INIT_NODUP;
2278 struct string_list b_by_dst = STRING_LIST_INIT_NODUP;
9047ebbc
MV
2279 const struct rename *sre;
2280
2281 for (i = 0; i < a_renames->nr; i++) {
2282 sre = a_renames->items[i].util;
78a395d3 2283 string_list_insert(&a_by_dst, sre->pair->two->path)->util
0a6b8712 2284 = (void *)sre;
9047ebbc
MV
2285 }
2286 for (i = 0; i < b_renames->nr; i++) {
2287 sre = b_renames->items[i].util;
78a395d3 2288 string_list_insert(&b_by_dst, sre->pair->two->path)->util
0a6b8712 2289 = (void *)sre;
9047ebbc
MV
2290 }
2291
2292 for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
8e24cbae 2293 struct string_list *renames1, *renames2Dst;
9047ebbc
MV
2294 struct rename *ren1 = NULL, *ren2 = NULL;
2295 const char *branch1, *branch2;
2296 const char *ren1_src, *ren1_dst;
461f5041 2297 struct string_list_item *lookup;
9047ebbc
MV
2298
2299 if (i >= a_renames->nr) {
9047ebbc
MV
2300 ren2 = b_renames->items[j++].util;
2301 } else if (j >= b_renames->nr) {
9047ebbc
MV
2302 ren1 = a_renames->items[i++].util;
2303 } else {
8e24cbae
BK
2304 int compare = strcmp(a_renames->items[i].string,
2305 b_renames->items[j].string);
9047ebbc
MV
2306 if (compare <= 0)
2307 ren1 = a_renames->items[i++].util;
2308 if (compare >= 0)
2309 ren2 = b_renames->items[j++].util;
2310 }
2311
2312 /* TODO: refactor, so that 1/2 are not needed */
2313 if (ren1) {
2314 renames1 = a_renames;
9047ebbc 2315 renames2Dst = &b_by_dst;
8a2fce18
MV
2316 branch1 = o->branch1;
2317 branch2 = o->branch2;
9047ebbc 2318 } else {
9047ebbc 2319 renames1 = b_renames;
9047ebbc 2320 renames2Dst = &a_by_dst;
8a2fce18
MV
2321 branch1 = o->branch2;
2322 branch2 = o->branch1;
35d803bc 2323 SWAP(ren2, ren1);
9047ebbc 2324 }
9047ebbc 2325
9047ebbc
MV
2326 if (ren1->processed)
2327 continue;
2328 ren1->processed = 1;
9047ebbc 2329 ren1->dst_entry->processed = 1;
7769a75e
EN
2330 /* BUG: We should only mark src_entry as processed if we
2331 * are not dealing with a rename + add-source case.
2332 */
9047ebbc 2333 ren1->src_entry->processed = 1;
9047ebbc
MV
2334
2335 ren1_src = ren1->pair->one->path;
2336 ren1_dst = ren1->pair->two->path;
2337
2338 if (ren2) {
461f5041 2339 /* One file renamed on both sides */
9047ebbc
MV
2340 const char *ren2_src = ren2->pair->one->path;
2341 const char *ren2_dst = ren2->pair->two->path;
4f66dade 2342 enum rename_type rename_type;
9047ebbc 2343 if (strcmp(ren1_src, ren2_src) != 0)
ef1177d1 2344 die("BUG: ren1_src != ren2_src");
9047ebbc
MV
2345 ren2->dst_entry->processed = 1;
2346 ren2->processed = 1;
2347 if (strcmp(ren1_dst, ren2_dst) != 0) {
4f66dade 2348 rename_type = RENAME_ONE_FILE_TO_TWO;
461f5041 2349 clean_merge = 0;
9047ebbc 2350 } else {
4f66dade 2351 rename_type = RENAME_ONE_FILE_TO_ONE;
7769a75e
EN
2352 /* BUG: We should only remove ren1_src in
2353 * the base stage (think of rename +
2354 * add-source cases).
2355 */
b7fa51da 2356 remove_file(o, 1, ren1_src, 1);
b8ddf164
EN
2357 update_entry(ren1->dst_entry,
2358 ren1->pair->one,
2359 ren1->pair->two,
2360 ren2->pair->two);
9047ebbc 2361 }
4f66dade
EN
2362 setup_rename_conflict_info(rename_type,
2363 ren1->pair,
2364 ren2->pair,
2365 branch1,
2366 branch2,
2367 ren1->dst_entry,
232c635f
EN
2368 ren2->dst_entry,
2369 o,
2370 NULL,
2371 NULL);
461f5041
EN
2372 } else if ((lookup = string_list_lookup(renames2Dst, ren1_dst))) {
2373 /* Two different files renamed to the same thing */
2374 char *ren2_dst;
2375 ren2 = lookup->util;
2376 ren2_dst = ren2->pair->two->path;
2377 if (strcmp(ren1_dst, ren2_dst) != 0)
ef1177d1 2378 die("BUG: ren1_dst != ren2_dst");
461f5041
EN
2379
2380 clean_merge = 0;
2381 ren2->processed = 1;
2382 /*
2383 * BUG: We should only mark src_entry as processed
2384 * if we are not dealing with a rename + add-source
2385 * case.
2386 */
2387 ren2->src_entry->processed = 1;
2388
2389 setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE,
2390 ren1->pair,
2391 ren2->pair,
2392 branch1,
2393 branch2,
2394 ren1->dst_entry,
232c635f
EN
2395 ren2->dst_entry,
2396 o,
2397 ren1->src_entry,
2398 ren2->src_entry);
2399
9047ebbc
MV
2400 } else {
2401 /* Renamed in 1, maybe changed in 2 */
9047ebbc
MV
2402 /* we only use sha1 and mode of these */
2403 struct diff_filespec src_other, dst_other;
41d70bd6 2404 int try_merge;
9047ebbc 2405
41d70bd6
EN
2406 /*
2407 * unpack_trees loads entries from common-commit
2408 * into stage 1, from head-commit into stage 2, and
2409 * from merge-commit into stage 3. We keep track
2410 * of which side corresponds to the rename.
2411 */
2412 int renamed_stage = a_renames == renames1 ? 2 : 3;
2413 int other_stage = a_renames == renames1 ? 3 : 2;
9047ebbc 2414
7769a75e
EN
2415 /* BUG: We should only remove ren1_src in the base
2416 * stage and in other_stage (think of rename +
2417 * add-source case).
2418 */
531357a4
EN
2419 remove_file(o, 1, ren1_src,
2420 renamed_stage == 2 || !was_tracked(ren1_src));
9047ebbc 2421
fd429e98 2422 oidcpy(&src_other.oid,
2423 &ren1->src_entry->stages[other_stage].oid);
41d70bd6 2424 src_other.mode = ren1->src_entry->stages[other_stage].mode;
fd429e98 2425 oidcpy(&dst_other.oid,
2426 &ren1->dst_entry->stages[other_stage].oid);
41d70bd6 2427 dst_other.mode = ren1->dst_entry->stages[other_stage].mode;
9047ebbc
MV
2428 try_merge = 0;
2429
3b9616f1
EN
2430 if (oid_eq(&src_other.oid, &null_oid) &&
2431 ren1->add_turned_into_rename) {
2432 setup_rename_conflict_info(RENAME_DIR,
2433 ren1->pair,
2434 NULL,
2435 branch1,
2436 branch2,
2437 ren1->dst_entry,
2438 NULL,
2439 o,
2440 NULL,
2441 NULL);
2442 } else if (oid_eq(&src_other.oid, &null_oid)) {
4f66dade
EN
2443 setup_rename_conflict_info(RENAME_DELETE,
2444 ren1->pair,
2445 NULL,
2446 branch1,
2447 branch2,
2448 ren1->dst_entry,
232c635f
EN
2449 NULL,
2450 o,
2451 NULL,
4f66dade 2452 NULL);
d5af5105 2453 } else if ((dst_other.mode == ren1->pair->two->mode) &&
b4da9d62 2454 oid_eq(&dst_other.oid, &ren1->pair->two->oid)) {
35a74abf
EN
2455 /*
2456 * Added file on the other side identical to
2457 * the file being renamed: clean merge.
2458 * Also, there is no need to overwrite the
2459 * file already in the working copy, so call
2460 * update_file_flags() instead of
2461 * update_file().
2462 */
75456f96
JS
2463 if (update_file_flags(o,
2464 &ren1->pair->two->oid,
2465 ren1->pair->two->mode,
2466 ren1_dst,
2467 1, /* update_cache */
2468 0 /* update_wd */))
2469 clean_merge = -1;
b4da9d62 2470 } else if (!oid_eq(&dst_other.oid, &null_oid)) {
9047ebbc
MV
2471 clean_merge = 0;
2472 try_merge = 1;
55653a68
JX
2473 output(o, 1, _("CONFLICT (rename/add): Rename %s->%s in %s. "
2474 "%s added in %s"),
9047ebbc
MV
2475 ren1_src, ren1_dst, branch1,
2476 ren1_dst, branch2);
c94736a2
JH
2477 if (o->call_depth) {
2478 struct merge_file_info mfi;
3c8a51e8
JS
2479 if (merge_file_one(o, ren1_dst, &null_oid, 0,
2480 &ren1->pair->two->oid,
2481 ren1->pair->two->mode,
2482 &dst_other.oid,
2483 dst_other.mode,
75456f96
JS
2484 branch1, branch2, &mfi)) {
2485 clean_merge = -1;
2486 goto cleanup_and_return;
2487 }
55653a68 2488 output(o, 1, _("Adding merged %s"), ren1_dst);
75456f96
JS
2489 if (update_file(o, 0, &mfi.oid,
2490 mfi.mode, ren1_dst))
2491 clean_merge = -1;
2a669c34 2492 try_merge = 0;
c94736a2 2493 } else {
3d6b8e88 2494 char *new_path = unique_path(o, ren1_dst, branch2);
55653a68 2495 output(o, 1, _("Adding as %s instead"), new_path);
75456f96
JS
2496 if (update_file(o, 0, &dst_other.oid,
2497 dst_other.mode, new_path))
2498 clean_merge = -1;
3d6b8e88 2499 free(new_path);
c94736a2 2500 }
9047ebbc
MV
2501 } else
2502 try_merge = 1;
2503
75456f96
JS
2504 if (clean_merge < 0)
2505 goto cleanup_and_return;
9047ebbc 2506 if (try_merge) {
8a2fce18 2507 struct diff_filespec *one, *a, *b;
9047ebbc
MV
2508 src_other.path = (char *)ren1_src;
2509
8a2fce18 2510 one = ren1->pair->one;
9047ebbc
MV
2511 if (a_renames == renames1) {
2512 a = ren1->pair->two;
2513 b = &src_other;
2514 } else {
2515 b = ren1->pair->two;
2516 a = &src_other;
2517 }
b8ddf164 2518 update_entry(ren1->dst_entry, one, a, b);
4f66dade
EN
2519 setup_rename_conflict_info(RENAME_NORMAL,
2520 ren1->pair,
2521 NULL,
2522 branch1,
2523 NULL,
2524 ren1->dst_entry,
232c635f
EN
2525 NULL,
2526 o,
2527 NULL,
4f66dade 2528 NULL);
9047ebbc
MV
2529 }
2530 }
2531 }
75456f96 2532cleanup_and_return:
9047ebbc
MV
2533 string_list_clear(&a_by_dst, 0);
2534 string_list_clear(&b_by_dst, 0);
2535
2536 return clean_merge;
2537}
2538
2dd6f8aa
EN
2539struct rename_info {
2540 struct string_list *head_renames;
2541 struct string_list *merge_renames;
2542};
2543
8383408d
EN
2544static void initial_cleanup_rename(struct diff_queue_struct *pairs,
2545 struct hashmap *dir_renames)
84a548de 2546{
8383408d
EN
2547 struct hashmap_iter iter;
2548 struct dir_rename_entry *e;
2549
2550 hashmap_iter_init(dir_renames, &iter);
2551 while ((e = hashmap_iter_next(&iter))) {
2552 free(e->dir);
2553 strbuf_release(&e->new_dir);
2554 /* possible_new_dirs already cleared in get_directory_renames */
2555 }
2556 hashmap_free(dir_renames, 1);
2557 free(dir_renames);
2558
84a548de
EN
2559 free(pairs->queue);
2560 free(pairs);
2561}
2562
2dd6f8aa
EN
2563static int handle_renames(struct merge_options *o,
2564 struct tree *common,
2565 struct tree *head,
2566 struct tree *merge,
2567 struct string_list *entries,
2568 struct rename_info *ri)
2569{
3f646871 2570 struct diff_queue_struct *head_pairs, *merge_pairs;
8383408d 2571 struct hashmap *dir_re_head, *dir_re_merge;
79d49b7d 2572 int clean = 1;
3f646871 2573
e7f04a3a
EN
2574 ri->head_renames = NULL;
2575 ri->merge_renames = NULL;
2576
2577 if (!o->detect_rename)
2578 return 1;
2579
3f646871
EN
2580 head_pairs = get_diffpairs(o, common, head);
2581 merge_pairs = get_diffpairs(o, common, merge);
2582
8383408d
EN
2583 dir_re_head = get_directory_renames(head_pairs, head);
2584 dir_re_merge = get_directory_renames(merge_pairs, merge);
2585
53e32d46
EN
2586 handle_directory_level_conflicts(o,
2587 dir_re_head, head,
2588 dir_re_merge, merge);
2589
ea625cb0 2590 ri->head_renames = get_renames(o, head_pairs,
79d49b7d
EN
2591 dir_re_merge, dir_re_head, head,
2592 common, head, merge, entries,
2593 &clean);
2594 if (clean < 0)
2595 goto cleanup;
ea625cb0 2596 ri->merge_renames = get_renames(o, merge_pairs,
79d49b7d
EN
2597 dir_re_head, dir_re_merge, merge,
2598 common, head, merge, entries,
2599 &clean);
2600 if (clean < 0)
2601 goto cleanup;
2602 clean &= process_renames(o, ri->head_renames, ri->merge_renames);
2603
2604cleanup:
3f646871
EN
2605 /*
2606 * Some cleanup is deferred until cleanup_renames() because the
2607 * data structures are still needed and referenced in
2608 * process_entry(). But there are a few things we can free now.
2609 */
8383408d
EN
2610 initial_cleanup_rename(head_pairs, dir_re_head);
2611 initial_cleanup_rename(merge_pairs, dir_re_merge);
3f646871
EN
2612
2613 return clean;
2dd6f8aa
EN
2614}
2615
84a548de 2616static void final_cleanup_rename(struct string_list *rename)
2dd6f8aa 2617{
9622f8af
EN
2618 const struct rename *re;
2619 int i;
2dd6f8aa 2620
e7f04a3a
EN
2621 if (rename == NULL)
2622 return;
2623
9622f8af
EN
2624 for (i = 0; i < rename->nr; i++) {
2625 re = rename->items[i].util;
2626 diff_free_filepair(re->pair);
2627 }
2628 string_list_clear(rename, 1);
2629 free(rename);
2630}
2631
84a548de 2632static void final_cleanup_renames(struct rename_info *re_info)
9622f8af 2633{
84a548de
EN
2634 final_cleanup_rename(re_info->head_renames);
2635 final_cleanup_rename(re_info->merge_renames);
2dd6f8aa
EN
2636}
2637
b4da9d62 2638static struct object_id *stage_oid(const struct object_id *oid, unsigned mode)
9047ebbc 2639{
b4da9d62 2640 return (is_null_oid(oid) || mode == 0) ? NULL: (struct object_id *)oid;
9047ebbc
MV
2641}
2642
bc9204d4
JS
2643static int read_oid_strbuf(struct merge_options *o,
2644 const struct object_id *oid, struct strbuf *dst)
331a1838
EB
2645{
2646 void *buf;
2647 enum object_type type;
2648 unsigned long size;
b4f5aca4 2649 buf = read_object_file(oid, &type, &size);
331a1838 2650 if (!buf)
bc9204d4 2651 return err(o, _("cannot read object %s"), oid_to_hex(oid));
331a1838
EB
2652 if (type != OBJ_BLOB) {
2653 free(buf);
bc9204d4 2654 return err(o, _("object %s is not a blob"), oid_to_hex(oid));
331a1838
EB
2655 }
2656 strbuf_attach(dst, buf, size, size + 1);
2657 return 0;
2658}
2659
bc9204d4
JS
2660static int blob_unchanged(struct merge_options *opt,
2661 const struct object_id *o_oid,
72fac66b 2662 unsigned o_mode,
b4da9d62 2663 const struct object_id *a_oid,
72fac66b 2664 unsigned a_mode,
3e7589b7 2665 int renormalize, const char *path)
331a1838
EB
2666{
2667 struct strbuf o = STRBUF_INIT;
2668 struct strbuf a = STRBUF_INIT;
2669 int ret = 0; /* assume changed for safety */
2670
72fac66b
JK
2671 if (a_mode != o_mode)
2672 return 0;
b4da9d62 2673 if (oid_eq(o_oid, a_oid))
331a1838 2674 return 1;
3e7589b7 2675 if (!renormalize)
331a1838
EB
2676 return 0;
2677
b4da9d62 2678 assert(o_oid && a_oid);
bc9204d4 2679 if (read_oid_strbuf(opt, o_oid, &o) || read_oid_strbuf(opt, a_oid, &a))
331a1838
EB
2680 goto error_return;
2681 /*
2682 * Note: binary | is used so that both renormalizations are
2683 * performed. Comparison can be skipped if both files are
2684 * unchanged since their sha1s have already been compared.
2685 */
a33e0b2a
BW
2686 if (renormalize_buffer(&the_index, path, o.buf, o.len, &o) |
2687 renormalize_buffer(&the_index, path, a.buf, a.len, &a))
331a1838
EB
2688 ret = (o.len == a.len && !memcmp(o.buf, a.buf, o.len));
2689
2690error_return:
2691 strbuf_release(&o);
2692 strbuf_release(&a);
2693 return ret;
2694}
2695
75456f96 2696static int handle_modify_delete(struct merge_options *o,
5e3ce663 2697 const char *path,
b4da9d62 2698 struct object_id *o_oid, int o_mode,
2699 struct object_id *a_oid, int a_mode,
2700 struct object_id *b_oid, int b_mode)
5e3ce663 2701{
b26d87f2
MM
2702 const char *modify_branch, *delete_branch;
2703 struct object_id *changed_oid;
2704 int changed_mode;
2705
2706 if (a_oid) {
2707 modify_branch = o->branch1;
2708 delete_branch = o->branch2;
2709 changed_oid = a_oid;
2710 changed_mode = a_mode;
2711 } else {
2712 modify_branch = o->branch2;
2713 delete_branch = o->branch1;
2714 changed_oid = b_oid;
2715 changed_mode = b_mode;
2716 }
2717
75456f96 2718 return handle_change_delete(o,
b26d87f2 2719 path, NULL,
75456f96 2720 o_oid, o_mode,
b26d87f2
MM
2721 changed_oid, changed_mode,
2722 modify_branch, delete_branch,
75456f96 2723 _("modify"), _("modified"));
5e3ce663
EN
2724}
2725
0c4918d1
EN
2726static int merge_content(struct merge_options *o,
2727 const char *path,
e0052f46 2728 int file_in_way,
b4da9d62 2729 struct object_id *o_oid, int o_mode,
2730 struct object_id *a_oid, int a_mode,
2731 struct object_id *b_oid, int b_mode,
4f66dade 2732 struct rename_conflict_info *rename_conflict_info)
0c4918d1 2733{
55653a68 2734 const char *reason = _("content");
5b448b85 2735 const char *path1 = NULL, *path2 = NULL;
0c4918d1
EN
2736 struct merge_file_info mfi;
2737 struct diff_filespec one, a, b;
4ab9a157 2738 unsigned df_conflict_remains = 0;
0c4918d1 2739
b4da9d62 2740 if (!o_oid) {
55653a68 2741 reason = _("add/add");
b4da9d62 2742 o_oid = (struct object_id *)&null_oid;
0c4918d1
EN
2743 }
2744 one.path = a.path = b.path = (char *)path;
b4da9d62 2745 oidcpy(&one.oid, o_oid);
0c4918d1 2746 one.mode = o_mode;
b4da9d62 2747 oidcpy(&a.oid, a_oid);
0c4918d1 2748 a.mode = a_mode;
b4da9d62 2749 oidcpy(&b.oid, b_oid);
0c4918d1
EN
2750 b.mode = b_mode;
2751
3c217c07 2752 if (rename_conflict_info) {
3c217c07
EN
2753 struct diff_filepair *pair1 = rename_conflict_info->pair1;
2754
2755 path1 = (o->branch1 == rename_conflict_info->branch1) ?
2756 pair1->two->path : pair1->one->path;
2757 /* If rename_conflict_info->pair2 != NULL, we are in
2758 * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
2759 * normal rename.
2760 */
2761 path2 = (rename_conflict_info->pair2 ||
2762 o->branch2 == rename_conflict_info->branch1) ?
2763 pair1->two->path : pair1->one->path;
3c217c07 2764
5423d2e7
DT
2765 if (dir_in_way(path, !o->call_depth,
2766 S_ISGITLINK(pair1->two->mode)))
3c217c07 2767 df_conflict_remains = 1;
4ab9a157 2768 }
3c8a51e8
JS
2769 if (merge_file_special_markers(o, &one, &a, &b,
2770 o->branch1, path1,
2771 o->branch2, path2, &mfi))
2772 return -1;
4ab9a157
EN
2773
2774 if (mfi.clean && !df_conflict_remains &&
b4da9d62 2775 oid_eq(&mfi.oid, a_oid) && mfi.mode == a_mode) {
55653a68 2776 output(o, 3, _("Skipped %s (merged same as existing)"), path);
5b448b85
EN
2777 /*
2778 * The content merge resulted in the same file contents we
2779 * already had. We can return early if those file contents
2780 * are recorded at the correct path (which may not be true
2781 * if the merge involves a rename).
2782 */
c5b761fb 2783 if (was_tracked(path)) {
bc9204d4 2784 add_cacheinfo(o, mfi.mode, &mfi.oid, path,
d45b7f40 2785 0, (!o->call_depth), 0);
5b448b85
EN
2786 return mfi.clean;
2787 }
2788 } else
55653a68 2789 output(o, 2, _("Auto-merging %s"), path);
0c4918d1
EN
2790
2791 if (!mfi.clean) {
2792 if (S_ISGITLINK(mfi.mode))
55653a68
JX
2793 reason = _("submodule");
2794 output(o, 1, _("CONFLICT (%s): Merge conflict in %s"),
0c4918d1 2795 reason, path);
4f66dade 2796 if (rename_conflict_info && !df_conflict_remains)
bc9204d4 2797 if (update_stages(o, path, &one, &a, &b))
75456f96 2798 return -1;
0c4918d1
EN
2799 }
2800
e0052f46 2801 if (df_conflict_remains || file_in_way) {
3d6b8e88 2802 char *new_path;
51931bf0
EN
2803 if (o->call_depth) {
2804 remove_file_from_cache(path);
2805 } else {
75456f96 2806 if (!mfi.clean) {
bc9204d4 2807 if (update_stages(o, path, &one, &a, &b))
75456f96
JS
2808 return -1;
2809 } else {
51931bf0
EN
2810 int file_from_stage2 = was_tracked(path);
2811 struct diff_filespec merged;
9b561499 2812 oidcpy(&merged.oid, &mfi.oid);
51931bf0
EN
2813 merged.mode = mfi.mode;
2814
bc9204d4 2815 if (update_stages(o, path, NULL,
75456f96
JS
2816 file_from_stage2 ? &merged : NULL,
2817 file_from_stage2 ? NULL : &merged))
2818 return -1;
51931bf0
EN
2819 }
2820
2821 }
4f66dade 2822 new_path = unique_path(o, path, rename_conflict_info->branch1);
55653a68 2823 output(o, 1, _("Adding as %s instead"), new_path);
75456f96
JS
2824 if (update_file(o, 0, &mfi.oid, mfi.mode, new_path)) {
2825 free(new_path);
2826 return -1;
2827 }
3d6b8e88 2828 free(new_path);
51931bf0 2829 mfi.clean = 0;
75456f96
JS
2830 } else if (update_file(o, mfi.clean, &mfi.oid, mfi.mode, path))
2831 return -1;
0c4918d1 2832 return mfi.clean;
0c4918d1
EN
2833}
2834
e0052f46
EN
2835static int conflict_rename_normal(struct merge_options *o,
2836 const char *path,
2837 struct object_id *o_oid, unsigned int o_mode,
2838 struct object_id *a_oid, unsigned int a_mode,
2839 struct object_id *b_oid, unsigned int b_mode,
2840 struct rename_conflict_info *ci)
2841{
2842 int clean_merge;
2843 int file_in_the_way = 0;
2844
2845 if (was_dirty(o, path)) {
2846 file_in_the_way = 1;
2847 output(o, 1, _("Refusing to lose dirty file at %s"), path);
2848 }
2849
2850 /* Merge the content and write it out */
2851 clean_merge = merge_content(o, path, file_in_the_way,
2852 o_oid, o_mode, a_oid, a_mode, b_oid, b_mode,
2853 ci);
2854 if (clean_merge > 0 && file_in_the_way)
2855 clean_merge = 0;
2856 return clean_merge;
2857}
2858
9047ebbc 2859/* Per entry merge function */
8a2fce18
MV
2860static int process_entry(struct merge_options *o,
2861 const char *path, struct stage_data *entry)
9047ebbc 2862{
9047ebbc 2863 int clean_merge = 1;
1bc0ab7c 2864 int normalize = o->renormalize;
9047ebbc
MV
2865 unsigned o_mode = entry->stages[1].mode;
2866 unsigned a_mode = entry->stages[2].mode;
2867 unsigned b_mode = entry->stages[3].mode;
b4da9d62 2868 struct object_id *o_oid = stage_oid(&entry->stages[1].oid, o_mode);
2869 struct object_id *a_oid = stage_oid(&entry->stages[2].oid, a_mode);
2870 struct object_id *b_oid = stage_oid(&entry->stages[3].oid, b_mode);
9047ebbc 2871
37348937 2872 entry->processed = 1;
4f66dade
EN
2873 if (entry->rename_conflict_info) {
2874 struct rename_conflict_info *conflict_info = entry->rename_conflict_info;
07413c5a 2875 switch (conflict_info->rename_type) {
882fd11a 2876 case RENAME_NORMAL:
4f66dade 2877 case RENAME_ONE_FILE_TO_ONE:
e0052f46
EN
2878 clean_merge = conflict_rename_normal(o,
2879 path,
2880 o_oid, o_mode,
2881 a_oid, a_mode,
2882 b_oid, b_mode,
2883 conflict_info);
882fd11a 2884 break;
3b9616f1
EN
2885 case RENAME_DIR:
2886 clean_merge = 1;
2887 if (conflict_rename_dir(o,
2888 conflict_info->pair1,
2889 conflict_info->branch1,
2890 conflict_info->branch2))
2891 clean_merge = -1;
882fd11a 2892 break;
3b130adf
EN
2893 case RENAME_DELETE:
2894 clean_merge = 0;
75456f96
JS
2895 if (conflict_rename_delete(o,
2896 conflict_info->pair1,
2897 conflict_info->branch1,
2898 conflict_info->branch2))
2899 clean_merge = -1;
3b130adf 2900 break;
07413c5a 2901 case RENAME_ONE_FILE_TO_TWO:
07413c5a 2902 clean_merge = 0;
75456f96
JS
2903 if (conflict_rename_rename_1to2(o, conflict_info))
2904 clean_merge = -1;
07413c5a 2905 break;
461f5041
EN
2906 case RENAME_TWO_FILES_TO_ONE:
2907 clean_merge = 0;
75456f96
JS
2908 if (conflict_rename_rename_2to1(o, conflict_info))
2909 clean_merge = -1;
07413c5a
EN
2910 break;
2911 default:
2912 entry->processed = 0;
2913 break;
2914 }
b4da9d62 2915 } else if (o_oid && (!a_oid || !b_oid)) {
edd2faf5 2916 /* Case A: Deleted in one */
b4da9d62 2917 if ((!a_oid && !b_oid) ||
bc9204d4
JS
2918 (!b_oid && blob_unchanged(o, o_oid, o_mode, a_oid, a_mode, normalize, path)) ||
2919 (!a_oid && blob_unchanged(o, o_oid, o_mode, b_oid, b_mode, normalize, path))) {
edd2faf5
EN
2920 /* Deleted in both or deleted in one and
2921 * unchanged in the other */
b4da9d62 2922 if (a_oid)
55653a68 2923 output(o, 2, _("Removing %s"), path);
edd2faf5 2924 /* do not touch working file if it did not exist */
b4da9d62 2925 remove_file(o, 1, path, !a_oid);
edd2faf5
EN
2926 } else {
2927 /* Modify/delete; deleted side may have put a directory in the way */
edd2faf5 2928 clean_merge = 0;
75456f96
JS
2929 if (handle_modify_delete(o, path, o_oid, o_mode,
2930 a_oid, a_mode, b_oid, b_mode))
2931 clean_merge = -1;
3d6b8e88 2932 }
b4da9d62 2933 } else if ((!o_oid && a_oid && !b_oid) ||
2934 (!o_oid && !a_oid && b_oid)) {
edd2faf5
EN
2935 /* Case B: Added in one. */
2936 /* [nothing|directory] -> ([nothing|directory], file) */
2937
9c0bbb50
EN
2938 const char *add_branch;
2939 const char *other_branch;
2940 unsigned mode;
b4da9d62 2941 const struct object_id *oid;
9c0bbb50 2942 const char *conf;
37348937 2943
b4da9d62 2944 if (a_oid) {
9c0bbb50
EN
2945 add_branch = o->branch1;
2946 other_branch = o->branch2;
2947 mode = a_mode;
b4da9d62 2948 oid = a_oid;
55653a68 2949 conf = _("file/directory");
9c0bbb50
EN
2950 } else {
2951 add_branch = o->branch2;
2952 other_branch = o->branch1;
2953 mode = b_mode;
b4da9d62 2954 oid = b_oid;
55653a68 2955 conf = _("directory/file");
9c0bbb50 2956 }
c641ca67
EN
2957 if (dir_in_way(path,
2958 !o->call_depth && !S_ISGITLINK(a_mode),
2959 0)) {
3d6b8e88 2960 char *new_path = unique_path(o, path, add_branch);
9c0bbb50 2961 clean_merge = 0;
55653a68
JX
2962 output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
2963 "Adding %s as %s"),
9c0bbb50 2964 conf, path, other_branch, path, new_path);
75456f96
JS
2965 if (update_file(o, 0, oid, mode, new_path))
2966 clean_merge = -1;
2967 else if (o->call_depth)
7b1c610f 2968 remove_file_from_cache(path);
3d6b8e88 2969 free(new_path);
9c0bbb50 2970 } else {
55653a68 2971 output(o, 2, _("Adding %s"), path);
35a74abf 2972 /* do not overwrite file if already present */
75456f96
JS
2973 if (update_file_flags(o, oid, mode, path, 1, !a_oid))
2974 clean_merge = -1;
9c0bbb50 2975 }
b4da9d62 2976 } else if (a_oid && b_oid) {
edd2faf5
EN
2977 /* Case C: Added in both (check for same permissions) and */
2978 /* case D: Modified in both, but differently. */
e0052f46 2979 clean_merge = merge_content(o, path, 0 /* file_in_way */,
b4da9d62 2980 o_oid, o_mode, a_oid, a_mode, b_oid, b_mode,
edd2faf5 2981 NULL);
b4da9d62 2982 } else if (!o_oid && !a_oid && !b_oid) {
edd2faf5
EN
2983 /*
2984 * this entry was deleted altogether. a_mode == 0 means
2985 * we had that path and want to actively remove it.
2986 */
2987 remove_file(o, 1, path, !a_mode);
2988 } else
7e97e100 2989 die("BUG: fatal merge failure, shouldn't happen.");
37348937
EN
2990
2991 return clean_merge;
2992}
2993
8a2fce18
MV
2994int merge_trees(struct merge_options *o,
2995 struct tree *head,
9047ebbc
MV
2996 struct tree *merge,
2997 struct tree *common,
9047ebbc
MV
2998 struct tree **result)
2999{
3000 int code, clean;
3001
85e51b78
JH
3002 if (o->subtree_shift) {
3003 merge = shift_tree_object(head, merge, o->subtree_shift);
3004 common = shift_tree_object(head, common, o->subtree_shift);
9047ebbc
MV
3005 }
3006
b4da9d62 3007 if (oid_eq(&common->object.oid, &merge->object.oid)) {
65170c07
EN
3008 struct strbuf sb = STRBUF_INIT;
3009
f309e8e7 3010 if (!o->call_depth && index_has_changes(&sb)) {
65170c07
EN
3011 err(o, _("Dirty index: cannot merge (dirty: %s)"),
3012 sb.buf);
3013 return 0;
3014 }
7560f547 3015 output(o, 0, _("Already up to date!"));
9047ebbc
MV
3016 *result = head;
3017 return 1;
3018 }
3019
e0052f46 3020 code = git_merge_trees(o, common, head, merge);
9047ebbc 3021
fadd069d
JH
3022 if (code != 0) {
3023 if (show(o, 4) || o->call_depth)
bc9204d4 3024 err(o, _("merging of trees %s and %s failed"),
f2fd0760 3025 oid_to_hex(&head->object.oid),
3026 oid_to_hex(&merge->object.oid));
6003303a 3027 return -1;
fadd069d 3028 }
9047ebbc
MV
3029
3030 if (unmerged_cache()) {
2dd6f8aa
EN
3031 struct string_list *entries;
3032 struct rename_info re_info;
9047ebbc 3033 int i;
fc65b00d
KW
3034 /*
3035 * Only need the hashmap while processing entries, so
3036 * initialize it here and free it when we are done running
3037 * through the entries. Keeping it in the merge_options as
3038 * opposed to decaring a local hashmap is for convenience
3039 * so that we don't have to pass it to around.
3040 */
3041 hashmap_init(&o->current_file_dir_set, path_hashmap_cmp, NULL, 512);
696ee23c
MV
3042 get_files_dirs(o, head);
3043 get_files_dirs(o, merge);
9047ebbc
MV
3044
3045 entries = get_unmerged();
2dd6f8aa
EN
3046 clean = handle_renames(o, common, head, merge, entries,
3047 &re_info);
6c8647da 3048 record_df_conflict_files(o, entries);
75456f96 3049 if (clean < 0)
e336bdc5 3050 goto cleanup;
edd2faf5 3051 for (i = entries->nr-1; 0 <= i; i--) {
9047ebbc
MV
3052 const char *path = entries->items[i].string;
3053 struct stage_data *e = entries->items[i].util;
75456f96
JS
3054 if (!e->processed) {
3055 int ret = process_entry(o, path, e);
3056 if (!ret)
3057 clean = 0;
e336bdc5
KW
3058 else if (ret < 0) {
3059 clean = ret;
3060 goto cleanup;
3061 }
75456f96 3062 }
9047ebbc 3063 }
7edba4c4
JH
3064 for (i = 0; i < entries->nr; i++) {
3065 struct stage_data *e = entries->items[i].util;
3066 if (!e->processed)
7e97e100 3067 die("BUG: unprocessed path??? %s",
7edba4c4
JH
3068 entries->items[i].string);
3069 }
9047ebbc 3070
e336bdc5 3071cleanup:
84a548de 3072 final_cleanup_renames(&re_info);
2dd6f8aa 3073
9047ebbc 3074 string_list_clear(entries, 1);
2dd6f8aa 3075 free(entries);
9047ebbc 3076
fc65b00d
KW
3077 hashmap_free(&o->current_file_dir_set, 1);
3078
e336bdc5
KW
3079 if (clean < 0)
3080 return clean;
9047ebbc
MV
3081 }
3082 else
3083 clean = 1;
3084
fbc87eb5
JS
3085 if (o->call_depth && !(*result = write_tree_from_memory(o)))
3086 return -1;
9047ebbc
MV
3087
3088 return clean;
3089}
3090
3091static struct commit_list *reverse_commit_list(struct commit_list *list)
3092{
3093 struct commit_list *next = NULL, *current, *backup;
3094 for (current = list; current; current = backup) {
3095 backup = current->next;
3096 current->next = next;
3097 next = current;
3098 }
3099 return next;
3100}
3101
3102/*
3103 * Merge the commits h1 and h2, return the resulting virtual
3104 * commit object and a flag indicating the cleanness of the merge.
3105 */
8a2fce18
MV
3106int merge_recursive(struct merge_options *o,
3107 struct commit *h1,
9047ebbc 3108 struct commit *h2,
9047ebbc
MV
3109 struct commit_list *ca,
3110 struct commit **result)
3111{
3112 struct commit_list *iter;
3113 struct commit *merged_common_ancestors;
156e1782 3114 struct tree *mrtree;
9047ebbc
MV
3115 int clean;
3116
8a2fce18 3117 if (show(o, 4)) {
55653a68 3118 output(o, 4, _("Merging:"));
5033639c
MV
3119 output_commit_title(o, h1);
3120 output_commit_title(o, h2);
9047ebbc
MV
3121 }
3122
3123 if (!ca) {
2ce406cc 3124 ca = get_merge_bases(h1, h2);
9047ebbc
MV
3125 ca = reverse_commit_list(ca);
3126 }
3127
8a2fce18 3128 if (show(o, 5)) {
e0453cd8
RT
3129 unsigned cnt = commit_list_count(ca);
3130
3131 output(o, 5, Q_("found %u common ancestor:",
3132 "found %u common ancestors:", cnt), cnt);
9047ebbc 3133 for (iter = ca; iter; iter = iter->next)
5033639c 3134 output_commit_title(o, iter->item);
9047ebbc
MV
3135 }
3136
3137 merged_common_ancestors = pop_commit(&ca);
3138 if (merged_common_ancestors == NULL) {
03f622c8
JN
3139 /* if there is no common ancestor, use an empty tree */
3140 struct tree *tree;
9047ebbc 3141
eb0ccfd7 3142 tree = lookup_tree(the_hash_algo->empty_tree);
9047ebbc
MV
3143 merged_common_ancestors = make_virtual_commit(tree, "ancestor");
3144 }
3145
3146 for (iter = ca; iter; iter = iter->next) {
8a2fce18 3147 const char *saved_b1, *saved_b2;
5033639c 3148 o->call_depth++;
9047ebbc
MV
3149 /*
3150 * When the merge fails, the result contains files
3151 * with conflict markers. The cleanness flag is
de8946de
JS
3152 * ignored (unless indicating an error), it was never
3153 * actually used, as result of merge_trees has always
3154 * overwritten it: the committed "conflicts" were
3155 * already resolved.
9047ebbc
MV
3156 */
3157 discard_cache();
8a2fce18
MV
3158 saved_b1 = o->branch1;
3159 saved_b2 = o->branch2;
3160 o->branch1 = "Temporary merge branch 1";
3161 o->branch2 = "Temporary merge branch 2";
de8946de
JS
3162 if (merge_recursive(o, merged_common_ancestors, iter->item,
3163 NULL, &merged_common_ancestors) < 0)
3164 return -1;
8a2fce18
MV
3165 o->branch1 = saved_b1;
3166 o->branch2 = saved_b2;
5033639c 3167 o->call_depth--;
9047ebbc
MV
3168
3169 if (!merged_common_ancestors)
bc9204d4 3170 return err(o, _("merge returned no commit"));
9047ebbc
MV
3171 }
3172
3173 discard_cache();
b7fa51da 3174 if (!o->call_depth)
9047ebbc 3175 read_cache();
9047ebbc 3176
7ca56aa0 3177 o->ancestor = "merged common ancestors";
8a2fce18
MV
3178 clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree,
3179 &mrtree);
6999bc70
JS
3180 if (clean < 0) {
3181 flush_output(o);
de8946de 3182 return clean;
6999bc70 3183 }
9047ebbc 3184
b7fa51da 3185 if (o->call_depth) {
9047ebbc
MV
3186 *result = make_virtual_commit(mrtree, "merged tree");
3187 commit_list_insert(h1, &(*result)->parents);
3188 commit_list_insert(h2, &(*result)->parents->next);
3189 }
c7d84924 3190 flush_output(o);
548009c0
JS
3191 if (!o->call_depth && o->buffer_output < 2)
3192 strbuf_release(&o->obuf);
f31027c9
JH
3193 if (show(o, 2))
3194 diff_warn_rename_limit("merge.renamelimit",
3195 o->needed_rename_limit, 0);
9047ebbc
MV
3196 return clean;
3197}
3198
4e8161a8 3199static struct commit *get_ref(const struct object_id *oid, const char *name)
73118f89
SB
3200{
3201 struct object *object;
3202
c251c83d 3203 object = deref_tag(parse_object(oid), name, strlen(name));
73118f89
SB
3204 if (!object)
3205 return NULL;
3206 if (object->type == OBJ_TREE)
3207 return make_virtual_commit((struct tree*)object, name);
3208 if (object->type != OBJ_COMMIT)
3209 return NULL;
3210 if (parse_commit((struct commit *)object))
3211 return NULL;
3212 return (struct commit *)object;
3213}
3214
8a2fce18 3215int merge_recursive_generic(struct merge_options *o,
4e8161a8 3216 const struct object_id *head,
3217 const struct object_id *merge,
8a2fce18 3218 int num_base_list,
4e8161a8 3219 const struct object_id **base_list,
8a2fce18 3220 struct commit **result)
73118f89 3221{
03b86647 3222 int clean;
837e34eb 3223 struct lock_file lock = LOCK_INIT;
8a2fce18
MV
3224 struct commit *head_commit = get_ref(head, o->branch1);
3225 struct commit *next_commit = get_ref(merge, o->branch2);
73118f89
SB
3226 struct commit_list *ca = NULL;
3227
3228 if (base_list) {
3229 int i;
8a2fce18 3230 for (i = 0; i < num_base_list; ++i) {
73118f89 3231 struct commit *base;
4e8161a8 3232 if (!(base = get_ref(base_list[i], oid_to_hex(base_list[i]))))
bc9204d4 3233 return err(o, _("Could not parse object '%s'"),
4e8161a8 3234 oid_to_hex(base_list[i]));
73118f89
SB
3235 commit_list_insert(base, &ca);
3236 }
3237 }
3238
837e34eb 3239 hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
8a2fce18
MV
3240 clean = merge_recursive(o, head_commit, next_commit, ca,
3241 result);
51d3f43d
3242 if (clean < 0) {
3243 rollback_lock_file(&lock);
de8946de 3244 return clean;
51d3f43d 3245 }
de8946de 3246
61000814
3247 if (write_locked_index(&the_index, &lock,
3248 COMMIT_LOCK | SKIP_IF_UNCHANGED))
bc9204d4 3249 return err(o, _("Unable to write index."));
73118f89
SB
3250
3251 return clean ? 0 : 1;
3252}
3253
0e7bcb1b 3254static void merge_recursive_config(struct merge_options *o)
9047ebbc 3255{
0e7bcb1b
TA
3256 git_config_get_int("merge.verbosity", &o->verbosity);
3257 git_config_get_int("diff.renamelimit", &o->diff_rename_limit);
3258 git_config_get_int("merge.renamelimit", &o->merge_rename_limit);
3259 git_config(git_xmerge_config, NULL);
9047ebbc
MV
3260}
3261
8a2fce18 3262void init_merge_options(struct merge_options *o)
9047ebbc 3263{
80486220 3264 const char *merge_verbosity;
8a2fce18
MV
3265 memset(o, 0, sizeof(struct merge_options));
3266 o->verbosity = 2;
3267 o->buffer_output = 1;
3268 o->diff_rename_limit = -1;
3269 o->merge_rename_limit = -1;
7610fa57 3270 o->renormalize = 0;
d2b11eca 3271 o->detect_rename = 1;
0e7bcb1b 3272 merge_recursive_config(o);
80486220
AO
3273 merge_verbosity = getenv("GIT_MERGE_VERBOSITY");
3274 if (merge_verbosity)
3275 o->verbosity = strtol(merge_verbosity, NULL, 10);
8a2fce18
MV
3276 if (o->verbosity >= 5)
3277 o->buffer_output = 0;
c7d84924 3278 strbuf_init(&o->obuf, 0);
f93d7c6f 3279 string_list_init(&o->df_conflict_file_set, 1);
9047ebbc 3280}
635a7bb1
JN
3281
3282int parse_merge_opt(struct merge_options *o, const char *s)
3283{
95b567c7
JK
3284 const char *arg;
3285
635a7bb1
JN
3286 if (!s || !*s)
3287 return -1;
3288 if (!strcmp(s, "ours"))
3289 o->recursive_variant = MERGE_RECURSIVE_OURS;
3290 else if (!strcmp(s, "theirs"))
3291 o->recursive_variant = MERGE_RECURSIVE_THEIRS;
3292 else if (!strcmp(s, "subtree"))
3293 o->subtree_shift = "";
95b567c7
JK
3294 else if (skip_prefix(s, "subtree=", &arg))
3295 o->subtree_shift = arg;
58a1ece4 3296 else if (!strcmp(s, "patience"))
307ab20b 3297 o->xdl_opts = DIFF_WITH_ALG(o, PATIENCE_DIFF);
8c912eea 3298 else if (!strcmp(s, "histogram"))
307ab20b 3299 o->xdl_opts = DIFF_WITH_ALG(o, HISTOGRAM_DIFF);
95b567c7
JK
3300 else if (skip_prefix(s, "diff-algorithm=", &arg)) {
3301 long value = parse_algorithm_value(arg);
07924d4d
MP
3302 if (value < 0)
3303 return -1;
3304 /* clear out previous settings */
3305 DIFF_XDL_CLR(o, NEED_MINIMAL);
3306 o->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
3307 o->xdl_opts |= value;
3308 }
4e5dd044 3309 else if (!strcmp(s, "ignore-space-change"))
c2d4b4cd 3310 DIFF_XDL_SET(o, IGNORE_WHITESPACE_CHANGE);
4e5dd044 3311 else if (!strcmp(s, "ignore-all-space"))
c2d4b4cd 3312 DIFF_XDL_SET(o, IGNORE_WHITESPACE);
4e5dd044 3313 else if (!strcmp(s, "ignore-space-at-eol"))
c2d4b4cd 3314 DIFF_XDL_SET(o, IGNORE_WHITESPACE_AT_EOL);
e9282f02
JH
3315 else if (!strcmp(s, "ignore-cr-at-eol"))
3316 DIFF_XDL_SET(o, IGNORE_CR_AT_EOL);
635a7bb1
JN
3317 else if (!strcmp(s, "renormalize"))
3318 o->renormalize = 1;
3319 else if (!strcmp(s, "no-renormalize"))
3320 o->renormalize = 0;
d2b11eca
FGA
3321 else if (!strcmp(s, "no-renames"))
3322 o->detect_rename = 0;
87892f60 3323 else if (!strcmp(s, "find-renames")) {
1b47ad16 3324 o->detect_rename = 1;
87892f60
FGA
3325 o->rename_score = 0;
3326 }
1b47ad16
FGA
3327 else if (skip_prefix(s, "find-renames=", &arg) ||
3328 skip_prefix(s, "rename-threshold=", &arg)) {
95b567c7 3329 if ((o->rename_score = parse_rename_score(&arg)) == -1 || *arg != 0)
10ae7526 3330 return -1;
d2b11eca 3331 o->detect_rename = 1;
10ae7526 3332 }
635a7bb1
JN
3333 else
3334 return -1;
3335 return 0;
3336}