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