convert logmsg_reencode to get_commit_buffer
[git/git.git] / merge-recursive.c
CommitLineData
9047ebbc
MV
1/*
2 * Recursive Merge algorithm stolen from git-merge-recursive.py by
3 * Fredrik Kuivinen.
4 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
5 */
4c371f91 6#include "advice.h"
9047ebbc
MV
7#include "cache.h"
8#include "cache-tree.h"
9#include "commit.h"
10#include "blob.h"
11#include "builtin.h"
12#include "tree-walk.h"
13#include "diff.h"
14#include "diffcore.h"
15#include "tag.h"
16#include "unpack-trees.h"
17#include "string-list.h"
18#include "xdiff-interface.h"
19#include "ll-merge.h"
9047ebbc
MV
20#include "attr.h"
21#include "merge-recursive.h"
9800c0df 22#include "dir.h"
68d03e4a 23#include "submodule.h"
9047ebbc 24
85e51b78
JH
25static struct tree *shift_tree_object(struct tree *one, struct tree *two,
26 const char *subtree_shift)
9047ebbc
MV
27{
28 unsigned char shifted[20];
29
85e51b78
JH
30 if (!*subtree_shift) {
31 shift_tree(one->object.sha1, two->object.sha1, shifted, 0);
32 } else {
33 shift_tree_by(one->object.sha1, two->object.sha1, shifted,
34 subtree_shift);
35 }
9047ebbc
MV
36 if (!hashcmp(two->object.sha1, shifted))
37 return two;
38 return lookup_tree(shifted);
39}
40
2af202be 41static struct commit *make_virtual_commit(struct tree *tree, const char *comment)
9047ebbc 42{
10322a0a 43 struct commit *commit = alloc_commit_node();
ae8e4c9c
JH
44 struct merge_remote_desc *desc = xmalloc(sizeof(*desc));
45
46 desc->name = comment;
47 desc->obj = (struct object *)commit;
9047ebbc 48 commit->tree = tree;
ae8e4c9c 49 commit->util = desc;
9047ebbc
MV
50 commit->object.parsed = 1;
51 return commit;
52}
53
54/*
55 * Since we use get_tree_entry(), which does not put the read object into
56 * the object pool, we cannot rely on a == b.
57 */
58static int sha_eq(const unsigned char *a, const unsigned char *b)
59{
60 if (!a && !b)
61 return 2;
62 return a && b && hashcmp(a, b) == 0;
63}
64
25c39363
EN
65enum rename_type {
66 RENAME_NORMAL = 0,
67 RENAME_DELETE,
4f66dade 68 RENAME_ONE_FILE_TO_ONE,
461f5041
EN
69 RENAME_ONE_FILE_TO_TWO,
70 RENAME_TWO_FILES_TO_ONE
25c39363
EN
71};
72
4f66dade 73struct rename_conflict_info {
25c39363
EN
74 enum rename_type rename_type;
75 struct diff_filepair *pair1;
76 struct diff_filepair *pair2;
77 const char *branch1;
78 const char *branch2;
79 struct stage_data *dst_entry1;
80 struct stage_data *dst_entry2;
232c635f
EN
81 struct diff_filespec ren1_other;
82 struct diff_filespec ren2_other;
25c39363
EN
83};
84
9047ebbc
MV
85/*
86 * Since we want to write the index eventually, we cannot reuse the index
87 * for these (temporary) data.
88 */
9cba13ca
JN
89struct stage_data {
90 struct {
9047ebbc
MV
91 unsigned mode;
92 unsigned char sha[20];
93 } stages[4];
4f66dade 94 struct rename_conflict_info *rename_conflict_info;
9047ebbc
MV
95 unsigned processed:1;
96};
97
4f66dade
EN
98static inline void setup_rename_conflict_info(enum rename_type rename_type,
99 struct diff_filepair *pair1,
100 struct diff_filepair *pair2,
101 const char *branch1,
102 const char *branch2,
103 struct stage_data *dst_entry1,
232c635f
EN
104 struct stage_data *dst_entry2,
105 struct merge_options *o,
106 struct stage_data *src_entry1,
107 struct stage_data *src_entry2)
25c39363 108{
4f66dade 109 struct rename_conflict_info *ci = xcalloc(1, sizeof(struct rename_conflict_info));
25c39363
EN
110 ci->rename_type = rename_type;
111 ci->pair1 = pair1;
112 ci->branch1 = branch1;
113 ci->branch2 = branch2;
114
115 ci->dst_entry1 = dst_entry1;
4f66dade 116 dst_entry1->rename_conflict_info = ci;
25c39363
EN
117 dst_entry1->processed = 0;
118
119 assert(!pair2 == !dst_entry2);
120 if (dst_entry2) {
121 ci->dst_entry2 = dst_entry2;
122 ci->pair2 = pair2;
4f66dade 123 dst_entry2->rename_conflict_info = ci;
25c39363 124 }
232c635f
EN
125
126 if (rename_type == RENAME_TWO_FILES_TO_ONE) {
127 /*
128 * For each rename, there could have been
129 * modifications on the side of history where that
130 * file was not renamed.
131 */
132 int ostage1 = o->branch1 == branch1 ? 3 : 2;
133 int ostage2 = ostage1 ^ 1;
134
135 ci->ren1_other.path = pair1->one->path;
136 hashcpy(ci->ren1_other.sha1, src_entry1->stages[ostage1].sha);
137 ci->ren1_other.mode = src_entry1->stages[ostage1].mode;
138
139 ci->ren2_other.path = pair2->one->path;
140 hashcpy(ci->ren2_other.sha1, src_entry2->stages[ostage2].sha);
141 ci->ren2_other.mode = src_entry2->stages[ostage2].mode;
25c39363
EN
142 }
143}
144
8a2fce18 145static int show(struct merge_options *o, int v)
9047ebbc 146{
5033639c 147 return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5;
9047ebbc
MV
148}
149
c7d84924 150static void flush_output(struct merge_options *o)
9047ebbc 151{
c7d84924
MV
152 if (o->obuf.len) {
153 fputs(o->obuf.buf, stdout);
154 strbuf_reset(&o->obuf);
9047ebbc
MV
155 }
156}
157
28bea9e5 158__attribute__((format (printf, 3, 4)))
8a2fce18 159static void output(struct merge_options *o, int v, const char *fmt, ...)
9047ebbc 160{
9047ebbc
MV
161 va_list ap;
162
8a2fce18 163 if (!show(o, v))
9047ebbc
MV
164 return;
165
c7d84924
MV
166 strbuf_grow(&o->obuf, o->call_depth * 2 + 2);
167 memset(o->obuf.buf + o->obuf.len, ' ', o->call_depth * 2);
168 strbuf_setlen(&o->obuf, o->obuf.len + o->call_depth * 2);
9047ebbc
MV
169
170 va_start(ap, fmt);
ebeb6090 171 strbuf_vaddf(&o->obuf, fmt, ap);
9047ebbc
MV
172 va_end(ap);
173
c7d84924 174 strbuf_add(&o->obuf, "\n", 1);
8a2fce18 175 if (!o->buffer_output)
c7d84924 176 flush_output(o);
9047ebbc
MV
177}
178
5033639c 179static void output_commit_title(struct merge_options *o, struct commit *commit)
9047ebbc
MV
180{
181 int i;
c7d84924 182 flush_output(o);
5033639c 183 for (i = o->call_depth; i--;)
9047ebbc
MV
184 fputs(" ", stdout);
185 if (commit->util)
ae8e4c9c 186 printf("virtual %s\n", merge_remote_util(commit)->name);
9047ebbc
MV
187 else {
188 printf("%s ", find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
189 if (parse_commit(commit) != 0)
55653a68 190 printf(_("(bad commit)\n"));
9047ebbc 191 else {
49b7120e
CC
192 const char *title;
193 int len = find_commit_subject(commit->buffer, &title);
194 if (len)
195 printf("%.*s\n", len, title);
9047ebbc
MV
196 }
197 }
198}
199
200static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
201 const char *path, int stage, int refresh, int options)
202{
203 struct cache_entry *ce;
25762726 204 ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage,
6e2068ae
BK
205 (refresh ? (CE_MATCH_REFRESH |
206 CE_MATCH_IGNORE_MISSING) : 0 ));
9047ebbc 207 if (!ce)
55653a68 208 return error(_("addinfo_cache failed for path '%s'"), path);
9047ebbc
MV
209 return add_cache_entry(ce, options);
210}
211
9047ebbc
MV
212static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
213{
214 parse_tree(tree);
215 init_tree_desc(desc, tree->buffer, tree->size);
216}
217
218static int git_merge_trees(int index_only,
219 struct tree *common,
220 struct tree *head,
221 struct tree *merge)
222{
223 int rc;
224 struct tree_desc t[3];
225 struct unpack_trees_options opts;
226
227 memset(&opts, 0, sizeof(opts));
228 if (index_only)
229 opts.index_only = 1;
230 else
231 opts.update = 1;
232 opts.merge = 1;
233 opts.head_idx = 2;
234 opts.fn = threeway_merge;
235 opts.src_index = &the_index;
236 opts.dst_index = &the_index;
e294030f 237 setup_unpack_trees_porcelain(&opts, "merge");
9047ebbc
MV
238
239 init_tree_desc_from_tree(t+0, common);
240 init_tree_desc_from_tree(t+1, head);
241 init_tree_desc_from_tree(t+2, merge);
242
243 rc = unpack_trees(3, t, &opts);
244 cache_tree_free(&active_cache_tree);
245 return rc;
246}
247
8a2fce18 248struct tree *write_tree_from_memory(struct merge_options *o)
9047ebbc
MV
249{
250 struct tree *result = NULL;
251
252 if (unmerged_cache()) {
253 int i;
19c6a4f8 254 fprintf(stderr, "BUG: There are unmerged index entries:\n");
9047ebbc 255 for (i = 0; i < active_nr; i++) {
9c5e6c80 256 const struct cache_entry *ce = active_cache[i];
9047ebbc 257 if (ce_stage(ce))
c43ba42e 258 fprintf(stderr, "BUG: %d %.*s\n", ce_stage(ce),
19c6a4f8 259 (int)ce_namelen(ce), ce->name);
9047ebbc 260 }
19c6a4f8 261 die("Bug in merge-recursive.c");
9047ebbc
MV
262 }
263
264 if (!active_cache_tree)
265 active_cache_tree = cache_tree();
266
267 if (!cache_tree_fully_valid(active_cache_tree) &&
268 cache_tree_update(active_cache_tree,
9c5e6c80
NTND
269 (const struct cache_entry * const *)active_cache,
270 active_nr, 0) < 0)
55653a68 271 die(_("error building trees"));
9047ebbc
MV
272
273 result = lookup_tree(active_cache_tree->sha1);
274
275 return result;
276}
277
278static int save_files_dirs(const unsigned char *sha1,
279 const char *base, int baselen, const char *path,
280 unsigned int mode, int stage, void *context)
281{
282 int len = strlen(path);
283 char *newpath = xmalloc(baselen + len + 1);
696ee23c
MV
284 struct merge_options *o = context;
285
9047ebbc
MV
286 memcpy(newpath, base, baselen);
287 memcpy(newpath + baselen, path, len);
288 newpath[baselen + len] = '\0';
289
290 if (S_ISDIR(mode))
78a395d3 291 string_list_insert(&o->current_directory_set, newpath);
9047ebbc 292 else
78a395d3 293 string_list_insert(&o->current_file_set, newpath);
9047ebbc
MV
294 free(newpath);
295
d3bee161 296 return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
9047ebbc
MV
297}
298
696ee23c 299static int get_files_dirs(struct merge_options *o, struct tree *tree)
9047ebbc
MV
300{
301 int n;
f0096c06 302 struct pathspec match_all;
9a087274 303 memset(&match_all, 0, sizeof(match_all));
f0096c06 304 if (read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o))
9047ebbc 305 return 0;
696ee23c 306 n = o->current_file_set.nr + o->current_directory_set.nr;
9047ebbc
MV
307 return n;
308}
309
310/*
311 * Returns an index_entry instance which doesn't have to correspond to
312 * a real cache entry in Git's index.
313 */
314static struct stage_data *insert_stage_data(const char *path,
315 struct tree *o, struct tree *a, struct tree *b,
316 struct string_list *entries)
317{
318 struct string_list_item *item;
319 struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
320 get_tree_entry(o->object.sha1, path,
321 e->stages[1].sha, &e->stages[1].mode);
322 get_tree_entry(a->object.sha1, path,
323 e->stages[2].sha, &e->stages[2].mode);
324 get_tree_entry(b->object.sha1, path,
325 e->stages[3].sha, &e->stages[3].mode);
78a395d3 326 item = string_list_insert(entries, path);
9047ebbc
MV
327 item->util = e;
328 return e;
329}
330
331/*
332 * Create a dictionary mapping file names to stage_data objects. The
333 * dictionary contains one entry for every path with a non-zero stage entry.
334 */
335static struct string_list *get_unmerged(void)
336{
337 struct string_list *unmerged = xcalloc(1, sizeof(struct string_list));
338 int i;
339
340 unmerged->strdup_strings = 1;
341
342 for (i = 0; i < active_nr; i++) {
343 struct string_list_item *item;
344 struct stage_data *e;
9c5e6c80 345 const struct cache_entry *ce = active_cache[i];
9047ebbc
MV
346 if (!ce_stage(ce))
347 continue;
348
e8c8b713 349 item = string_list_lookup(unmerged, ce->name);
9047ebbc 350 if (!item) {
78a395d3 351 item = string_list_insert(unmerged, ce->name);
9047ebbc
MV
352 item->util = xcalloc(1, sizeof(struct stage_data));
353 }
354 e = item->util;
355 e->stages[ce_stage(ce)].mode = ce->ce_mode;
356 hashcpy(e->stages[ce_stage(ce)].sha, ce->sha1);
357 }
358
359 return unmerged;
360}
361
f0fd4d05 362static int string_list_df_name_compare(const void *a, const void *b)
ef02b317 363{
f0fd4d05
EN
364 const struct string_list_item *one = a;
365 const struct string_list_item *two = b;
366 int onelen = strlen(one->string);
367 int twolen = strlen(two->string);
368 /*
369 * Here we only care that entries for D/F conflicts are
370 * adjacent, in particular with the file of the D/F conflict
371 * appearing before files below the corresponding directory.
372 * The order of the rest of the list is irrelevant for us.
ef02b317 373 *
f0fd4d05
EN
374 * To achieve this, we sort with df_name_compare and provide
375 * the mode S_IFDIR so that D/F conflicts will sort correctly.
376 * We use the mode S_IFDIR for everything else for simplicity,
377 * since in other cases any changes in their order due to
378 * sorting cause no problems for us.
379 */
380 int cmp = df_name_compare(one->string, onelen, S_IFDIR,
381 two->string, twolen, S_IFDIR);
382 /*
383 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
384 * that 'foo' comes before 'foo/bar'.
ef02b317 385 */
f0fd4d05
EN
386 if (cmp)
387 return cmp;
388 return onelen - twolen;
389}
390
70cc3d36
EN
391static void record_df_conflict_files(struct merge_options *o,
392 struct string_list *entries)
ef02b317 393{
70cc3d36 394 /* If there is a D/F conflict and the file for such a conflict
f7d650c0 395 * currently exist in the working tree, we want to allow it to be
edd2faf5
EN
396 * removed to make room for the corresponding directory if needed.
397 * The files underneath the directories of such D/F conflicts will
398 * be processed before the corresponding file involved in the D/F
399 * conflict. If the D/F directory ends up being removed by the
400 * merge, then we won't have to touch the D/F file. If the D/F
401 * directory needs to be written to the working copy, then the D/F
402 * file will simply be removed (in make_room_for_path()) to make
403 * room for the necessary paths. Note that if both the directory
404 * and the file need to be present, then the D/F file will be
405 * reinstated with a new unique name at the time it is processed.
ef02b317 406 */
f701aae0 407 struct string_list df_sorted_entries;
ef02b317 408 const char *last_file = NULL;
c8516500 409 int last_len = 0;
ef02b317
EN
410 int i;
411
0b30e812
EN
412 /*
413 * If we're merging merge-bases, we don't want to bother with
414 * any working directory changes.
415 */
416 if (o->call_depth)
417 return;
418
f0fd4d05 419 /* Ensure D/F conflicts are adjacent in the entries list. */
f701aae0 420 memset(&df_sorted_entries, 0, sizeof(struct string_list));
ef02b317 421 for (i = 0; i < entries->nr; i++) {
f701aae0
EN
422 struct string_list_item *next = &entries->items[i];
423 string_list_append(&df_sorted_entries, next->string)->util =
424 next->util;
425 }
426 qsort(df_sorted_entries.items, entries->nr, sizeof(*entries->items),
f0fd4d05
EN
427 string_list_df_name_compare);
428
70cc3d36 429 string_list_clear(&o->df_conflict_file_set, 1);
f701aae0
EN
430 for (i = 0; i < df_sorted_entries.nr; i++) {
431 const char *path = df_sorted_entries.items[i].string;
ef02b317 432 int len = strlen(path);
f701aae0 433 struct stage_data *e = df_sorted_entries.items[i].util;
ef02b317
EN
434
435 /*
436 * Check if last_file & path correspond to a D/F conflict;
437 * i.e. whether path is last_file+'/'+<something>.
70cc3d36
EN
438 * If so, record that it's okay to remove last_file to make
439 * room for path and friends if needed.
ef02b317
EN
440 */
441 if (last_file &&
442 len > last_len &&
443 memcmp(path, last_file, last_len) == 0 &&
444 path[last_len] == '/') {
70cc3d36 445 string_list_insert(&o->df_conflict_file_set, last_file);
ef02b317
EN
446 }
447
448 /*
449 * Determine whether path could exist as a file in the
450 * working directory as a possible D/F conflict. This
451 * will only occur when it exists in stage 2 as a
452 * file.
453 */
454 if (S_ISREG(e->stages[2].mode) || S_ISLNK(e->stages[2].mode)) {
455 last_file = path;
456 last_len = len;
ef02b317
EN
457 } else {
458 last_file = NULL;
459 }
460 }
f701aae0 461 string_list_clear(&df_sorted_entries, 0);
ef02b317
EN
462}
463
9cba13ca 464struct rename {
9047ebbc
MV
465 struct diff_filepair *pair;
466 struct stage_data *src_entry;
467 struct stage_data *dst_entry;
468 unsigned processed:1;
469};
470
471/*
472 * Get information of all renames which occurred between 'o_tree' and
473 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
474 * 'b_tree') to be able to associate the correct cache entries with
475 * the rename information. 'tree' is always equal to either a_tree or b_tree.
476 */
8a2fce18
MV
477static struct string_list *get_renames(struct merge_options *o,
478 struct tree *tree,
479 struct tree *o_tree,
480 struct tree *a_tree,
481 struct tree *b_tree,
482 struct string_list *entries)
9047ebbc
MV
483{
484 int i;
485 struct string_list *renames;
486 struct diff_options opts;
487
488 renames = xcalloc(1, sizeof(struct string_list));
489 diff_setup(&opts);
490 DIFF_OPT_SET(&opts, RECURSIVE);
4f7cb99a 491 DIFF_OPT_CLR(&opts, RENAME_EMPTY);
9047ebbc 492 opts.detect_rename = DIFF_DETECT_RENAME;
8a2fce18
MV
493 opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
494 o->diff_rename_limit >= 0 ? o->diff_rename_limit :
92c57e5c 495 1000;
10ae7526 496 opts.rename_score = o->rename_score;
99bfc669 497 opts.show_rename_progress = o->show_rename_progress;
9047ebbc 498 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
28452655 499 diff_setup_done(&opts);
9047ebbc
MV
500 diff_tree_sha1(o_tree->object.sha1, tree->object.sha1, "", &opts);
501 diffcore_std(&opts);
bf0ab10f
JK
502 if (opts.needed_rename_limit > o->needed_rename_limit)
503 o->needed_rename_limit = opts.needed_rename_limit;
9047ebbc
MV
504 for (i = 0; i < diff_queued_diff.nr; ++i) {
505 struct string_list_item *item;
506 struct rename *re;
507 struct diff_filepair *pair = diff_queued_diff.queue[i];
508 if (pair->status != 'R') {
509 diff_free_filepair(pair);
510 continue;
511 }
512 re = xmalloc(sizeof(*re));
513 re->processed = 0;
514 re->pair = pair;
e8c8b713 515 item = string_list_lookup(entries, re->pair->one->path);
9047ebbc
MV
516 if (!item)
517 re->src_entry = insert_stage_data(re->pair->one->path,
518 o_tree, a_tree, b_tree, entries);
519 else
520 re->src_entry = item->util;
521
e8c8b713 522 item = string_list_lookup(entries, re->pair->two->path);
9047ebbc
MV
523 if (!item)
524 re->dst_entry = insert_stage_data(re->pair->two->path,
525 o_tree, a_tree, b_tree, entries);
526 else
527 re->dst_entry = item->util;
78a395d3 528 item = string_list_insert(renames, pair->one->path);
9047ebbc
MV
529 item->util = re;
530 }
531 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
532 diff_queued_diff.nr = 0;
533 diff_flush(&opts);
534 return renames;
535}
536
650467cf
EN
537static int update_stages(const char *path, const struct diff_filespec *o,
538 const struct diff_filespec *a,
539 const struct diff_filespec *b)
9047ebbc 540{
f53d3977
EN
541
542 /*
543 * NOTE: It is usually a bad idea to call update_stages on a path
544 * before calling update_file on that same path, since it can
545 * sometimes lead to spurious "refusing to lose untracked file..."
546 * messages from update_file (via make_room_for path via
547 * would_lose_untracked). Instead, reverse the order of the calls
548 * (executing update_file first and then update_stages).
549 */
650467cf
EN
550 int clear = 1;
551 int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_SKIP_DFCHECK;
9047ebbc
MV
552 if (clear)
553 if (remove_file_from_cache(path))
554 return -1;
555 if (o)
556 if (add_cacheinfo(o->mode, o->sha1, path, 1, 0, options))
557 return -1;
558 if (a)
559 if (add_cacheinfo(a->mode, a->sha1, path, 2, 0, options))
560 return -1;
561 if (b)
562 if (add_cacheinfo(b->mode, b->sha1, path, 3, 0, options))
563 return -1;
564 return 0;
565}
566
b8ddf164
EN
567static void update_entry(struct stage_data *entry,
568 struct diff_filespec *o,
569 struct diff_filespec *a,
570 struct diff_filespec *b)
2ff739f9 571{
2ff739f9
EN
572 entry->processed = 0;
573 entry->stages[1].mode = o->mode;
574 entry->stages[2].mode = a->mode;
575 entry->stages[3].mode = b->mode;
576 hashcpy(entry->stages[1].sha, o->sha1);
577 hashcpy(entry->stages[2].sha, a->sha1);
578 hashcpy(entry->stages[3].sha, b->sha1);
2ff739f9
EN
579}
580
b7fa51da
MV
581static int remove_file(struct merge_options *o, int clean,
582 const char *path, int no_wd)
9047ebbc 583{
b7fa51da
MV
584 int update_cache = o->call_depth || clean;
585 int update_working_directory = !o->call_depth && !no_wd;
9047ebbc
MV
586
587 if (update_cache) {
588 if (remove_file_from_cache(path))
589 return -1;
590 }
591 if (update_working_directory) {
25755e84 592 if (remove_path(path))
9047ebbc 593 return -1;
9047ebbc
MV
594 }
595 return 0;
596}
597
696ee23c 598static char *unique_path(struct merge_options *o, const char *path, const char *branch)
9047ebbc
MV
599{
600 char *newpath = xmalloc(strlen(path) + 1 + strlen(branch) + 8 + 1);
601 int suffix = 0;
602 struct stat st;
603 char *p = newpath + strlen(path);
604 strcpy(newpath, path);
605 *(p++) = '~';
606 strcpy(p, branch);
607 for (; *p; ++p)
608 if ('/' == *p)
609 *p = '_';
696ee23c
MV
610 while (string_list_has_string(&o->current_file_set, newpath) ||
611 string_list_has_string(&o->current_directory_set, newpath) ||
9047ebbc
MV
612 lstat(newpath, &st) == 0)
613 sprintf(p, "_%d", suffix++);
614
78a395d3 615 string_list_insert(&o->current_file_set, newpath);
9047ebbc
MV
616 return newpath;
617}
618
f2507b4e
EN
619static int dir_in_way(const char *path, int check_working_copy)
620{
621 int pos, pathlen = strlen(path);
622 char *dirpath = xmalloc(pathlen + 2);
623 struct stat st;
624
625 strcpy(dirpath, path);
626 dirpath[pathlen] = '/';
627 dirpath[pathlen+1] = '\0';
628
629 pos = cache_name_pos(dirpath, pathlen+1);
630
631 if (pos < 0)
632 pos = -1 - pos;
633 if (pos < active_nr &&
634 !strncmp(dirpath, active_cache[pos]->name, pathlen+1)) {
635 free(dirpath);
636 return 1;
637 }
638
639 free(dirpath);
640 return check_working_copy && !lstat(path, &st) && S_ISDIR(st.st_mode);
641}
642
aacb82de 643static int was_tracked(const char *path)
60c91181
JH
644{
645 int pos = cache_name_pos(path, strlen(path));
646
647 if (pos < 0)
648 pos = -1 - pos;
649 while (pos < active_nr &&
650 !strcmp(path, active_cache[pos]->name)) {
651 /*
652 * If stage #0, it is definitely tracked.
653 * If it has stage #2 then it was tracked
654 * before this merge started. All other
655 * cases the path was not tracked.
656 */
657 switch (ce_stage(active_cache[pos])) {
658 case 0:
659 case 2:
aacb82de 660 return 1;
60c91181
JH
661 }
662 pos++;
663 }
aacb82de 664 return 0;
60c91181
JH
665}
666
aacb82de 667static int would_lose_untracked(const char *path)
9047ebbc 668{
aacb82de 669 return !was_tracked(path) && file_exists(path);
60c91181
JH
670}
671
ed0148a5 672static int make_room_for_path(struct merge_options *o, const char *path)
9047ebbc 673{
ed0148a5 674 int status, i;
55653a68 675 const char *msg = _("failed to create path '%s'%s");
9047ebbc 676
ed0148a5
EN
677 /* Unlink any D/F conflict files that are in the way */
678 for (i = 0; i < o->df_conflict_file_set.nr; i++) {
679 const char *df_path = o->df_conflict_file_set.items[i].string;
680 size_t pathlen = strlen(path);
681 size_t df_pathlen = strlen(df_path);
682 if (df_pathlen < pathlen &&
683 path[df_pathlen] == '/' &&
684 strncmp(path, df_path, df_pathlen) == 0) {
685 output(o, 3,
55653a68 686 _("Removing %s to make room for subdirectory\n"),
ed0148a5
EN
687 df_path);
688 unlink(df_path);
689 unsorted_string_list_delete_item(&o->df_conflict_file_set,
690 i, 0);
691 break;
692 }
693 }
694
695 /* Make sure leading directories are created */
9047ebbc
MV
696 status = safe_create_leading_directories_const(path);
697 if (status) {
0be0521b 698 if (status == SCLD_EXISTS) {
9047ebbc 699 /* something else exists */
55653a68 700 error(msg, path, _(": perhaps a D/F conflict?"));
9047ebbc
MV
701 return -1;
702 }
703 die(msg, path, "");
704 }
705
60c91181
JH
706 /*
707 * Do not unlink a file in the work tree if we are not
708 * tracking it.
709 */
710 if (would_lose_untracked(path))
55653a68 711 return error(_("refusing to lose untracked file at '%s'"),
60c91181
JH
712 path);
713
9047ebbc
MV
714 /* Successful unlink is good.. */
715 if (!unlink(path))
716 return 0;
717 /* .. and so is no existing file */
718 if (errno == ENOENT)
719 return 0;
720 /* .. but not some other error (who really cares what?) */
55653a68 721 return error(msg, path, _(": perhaps a D/F conflict?"));
9047ebbc
MV
722}
723
b7fa51da
MV
724static void update_file_flags(struct merge_options *o,
725 const unsigned char *sha,
9047ebbc
MV
726 unsigned mode,
727 const char *path,
728 int update_cache,
729 int update_wd)
730{
b7fa51da 731 if (o->call_depth)
9047ebbc
MV
732 update_wd = 0;
733
734 if (update_wd) {
735 enum object_type type;
736 void *buf;
737 unsigned long size;
738
68d03e4a 739 if (S_ISGITLINK(mode)) {
0c44c943
JH
740 /*
741 * We may later decide to recursively descend into
742 * the submodule directory and update its index
743 * and/or work tree, but we do not do that now.
744 */
68d03e4a 745 update_wd = 0;
0c44c943 746 goto update_index;
68d03e4a 747 }
9047ebbc
MV
748
749 buf = read_sha1_file(sha, &type, &size);
750 if (!buf)
55653a68 751 die(_("cannot read object %s '%s'"), sha1_to_hex(sha), path);
9047ebbc 752 if (type != OBJ_BLOB)
55653a68 753 die(_("blob expected for %s '%s'"), sha1_to_hex(sha), path);
9047ebbc 754 if (S_ISREG(mode)) {
f285a2d7 755 struct strbuf strbuf = STRBUF_INIT;
9047ebbc
MV
756 if (convert_to_working_tree(path, buf, size, &strbuf)) {
757 free(buf);
758 size = strbuf.len;
759 buf = strbuf_detach(&strbuf, NULL);
760 }
761 }
762
ed0148a5 763 if (make_room_for_path(o, path) < 0) {
9047ebbc
MV
764 update_wd = 0;
765 free(buf);
766 goto update_index;
767 }
768 if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) {
769 int fd;
770 if (mode & 0100)
771 mode = 0777;
772 else
773 mode = 0666;
774 fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
775 if (fd < 0)
55653a68 776 die_errno(_("failed to open '%s'"), path);
f633ea2c 777 write_in_full(fd, buf, size);
9047ebbc
MV
778 close(fd);
779 } else if (S_ISLNK(mode)) {
780 char *lnk = xmemdupz(buf, size);
781 safe_create_leading_directories_const(path);
782 unlink(path);
304dcf26 783 if (symlink(lnk, path))
55653a68 784 die_errno(_("failed to symlink '%s'"), path);
9047ebbc
MV
785 free(lnk);
786 } else
55653a68 787 die(_("do not know what to do with %06o %s '%s'"),
9047ebbc
MV
788 mode, sha1_to_hex(sha), path);
789 free(buf);
790 }
791 update_index:
792 if (update_cache)
793 add_cacheinfo(mode, sha, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
794}
795
b7fa51da
MV
796static void update_file(struct merge_options *o,
797 int clean,
9047ebbc
MV
798 const unsigned char *sha,
799 unsigned mode,
800 const char *path)
801{
b7fa51da 802 update_file_flags(o, sha, mode, path, o->call_depth || clean, !o->call_depth);
9047ebbc
MV
803}
804
805/* Low level file merging, update and removal */
806
9cba13ca 807struct merge_file_info {
9047ebbc
MV
808 unsigned char sha[20];
809 unsigned mode;
810 unsigned clean:1,
811 merge:1;
812};
813
b7fa51da
MV
814static int merge_3way(struct merge_options *o,
815 mmbuffer_t *result_buf,
0c059420
EN
816 const struct diff_filespec *one,
817 const struct diff_filespec *a,
818 const struct diff_filespec *b,
9047ebbc
MV
819 const char *branch1,
820 const char *branch2)
821{
822 mmfile_t orig, src1, src2;
712516bc 823 struct ll_merge_options ll_opts = {0};
4c5868f4 824 char *base_name, *name1, *name2;
9047ebbc 825 int merge_status;
8cc5b290 826
712516bc 827 ll_opts.renormalize = o->renormalize;
58a1ece4 828 ll_opts.xdl_opts = o->xdl_opts;
712516bc
JN
829
830 if (o->call_depth) {
831 ll_opts.virtual_ancestor = 1;
832 ll_opts.variant = 0;
833 } else {
8cc5b290
AP
834 switch (o->recursive_variant) {
835 case MERGE_RECURSIVE_OURS:
712516bc 836 ll_opts.variant = XDL_MERGE_FAVOR_OURS;
8cc5b290
AP
837 break;
838 case MERGE_RECURSIVE_THEIRS:
712516bc 839 ll_opts.variant = XDL_MERGE_FAVOR_THEIRS;
8cc5b290
AP
840 break;
841 default:
712516bc 842 ll_opts.variant = 0;
8cc5b290
AP
843 break;
844 }
845 }
9047ebbc 846
4c5868f4
JN
847 if (strcmp(a->path, b->path) ||
848 (o->ancestor != NULL && strcmp(a->path, one->path) != 0)) {
849 base_name = o->ancestor == NULL ? NULL :
4e2d094d
RJ
850 mkpathdup("%s:%s", o->ancestor, one->path);
851 name1 = mkpathdup("%s:%s", branch1, a->path);
852 name2 = mkpathdup("%s:%s", branch2, b->path);
606475f3 853 } else {
4c5868f4 854 base_name = o->ancestor == NULL ? NULL :
4e2d094d
RJ
855 mkpathdup("%s", o->ancestor);
856 name1 = mkpathdup("%s", branch1);
857 name2 = mkpathdup("%s", branch2);
606475f3 858 }
9047ebbc 859
06b65939
ML
860 read_mmblob(&orig, one->sha1);
861 read_mmblob(&src1, a->sha1);
862 read_mmblob(&src2, b->sha1);
9047ebbc 863
4c5868f4 864 merge_status = ll_merge(result_buf, a->path, &orig, base_name,
712516bc 865 &src1, name1, &src2, name2, &ll_opts);
9047ebbc 866
4e2d094d 867 free(base_name);
9047ebbc
MV
868 free(name1);
869 free(name2);
870 free(orig.ptr);
871 free(src1.ptr);
872 free(src2.ptr);
873 return merge_status;
874}
875
6bdaead1
EN
876static struct merge_file_info merge_file_1(struct merge_options *o,
877 const struct diff_filespec *one,
878 const struct diff_filespec *a,
879 const struct diff_filespec *b,
880 const char *branch1,
881 const char *branch2)
9047ebbc
MV
882{
883 struct merge_file_info result;
884 result.merge = 0;
885 result.clean = 1;
886
887 if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
888 result.clean = 0;
889 if (S_ISREG(a->mode)) {
890 result.mode = a->mode;
891 hashcpy(result.sha, a->sha1);
892 } else {
893 result.mode = b->mode;
894 hashcpy(result.sha, b->sha1);
895 }
896 } else {
b7fa51da 897 if (!sha_eq(a->sha1, one->sha1) && !sha_eq(b->sha1, one->sha1))
9047ebbc
MV
898 result.merge = 1;
899
900 /*
901 * Merge modes
902 */
b7fa51da 903 if (a->mode == b->mode || a->mode == one->mode)
9047ebbc
MV
904 result.mode = b->mode;
905 else {
906 result.mode = a->mode;
b7fa51da 907 if (b->mode != one->mode) {
9047ebbc
MV
908 result.clean = 0;
909 result.merge = 1;
910 }
911 }
912
b7fa51da 913 if (sha_eq(a->sha1, b->sha1) || sha_eq(a->sha1, one->sha1))
9047ebbc 914 hashcpy(result.sha, b->sha1);
b7fa51da 915 else if (sha_eq(b->sha1, one->sha1))
9047ebbc
MV
916 hashcpy(result.sha, a->sha1);
917 else if (S_ISREG(a->mode)) {
918 mmbuffer_t result_buf;
919 int merge_status;
920
b7fa51da 921 merge_status = merge_3way(o, &result_buf, one, a, b,
9047ebbc
MV
922 branch1, branch2);
923
924 if ((merge_status < 0) || !result_buf.ptr)
55653a68 925 die(_("Failed to execute internal merge"));
9047ebbc
MV
926
927 if (write_sha1_file(result_buf.ptr, result_buf.size,
928 blob_type, result.sha))
55653a68 929 die(_("Unable to add %s to database"),
9047ebbc
MV
930 a->path);
931
932 free(result_buf.ptr);
933 result.clean = (merge_status == 0);
934 } else if (S_ISGITLINK(a->mode)) {
80988783
BK
935 result.clean = merge_submodule(result.sha,
936 one->path, one->sha1,
937 a->sha1, b->sha1,
938 !o->call_depth);
9047ebbc
MV
939 } else if (S_ISLNK(a->mode)) {
940 hashcpy(result.sha, a->sha1);
941
942 if (!sha_eq(a->sha1, b->sha1))
943 result.clean = 0;
944 } else {
55653a68 945 die(_("unsupported object type in the tree"));
9047ebbc
MV
946 }
947 }
948
949 return result;
950}
951
dac47415
EN
952static struct merge_file_info
953merge_file_special_markers(struct merge_options *o,
954 const struct diff_filespec *one,
955 const struct diff_filespec *a,
956 const struct diff_filespec *b,
957 const char *branch1,
958 const char *filename1,
959 const char *branch2,
960 const char *filename2)
961{
962 char *side1 = NULL;
963 char *side2 = NULL;
964 struct merge_file_info mfi;
965
966 if (filename1) {
967 side1 = xmalloc(strlen(branch1) + strlen(filename1) + 2);
968 sprintf(side1, "%s:%s", branch1, filename1);
969 }
970 if (filename2) {
971 side2 = xmalloc(strlen(branch2) + strlen(filename2) + 2);
972 sprintf(side2, "%s:%s", branch2, filename2);
973 }
974
975 mfi = merge_file_1(o, one, a, b,
976 side1 ? side1 : branch1, side2 ? side2 : branch2);
977 free(side1);
978 free(side2);
979 return mfi;
980}
981
fa2364ec 982static struct merge_file_info merge_file_one(struct merge_options *o,
6bdaead1
EN
983 const char *path,
984 const unsigned char *o_sha, int o_mode,
985 const unsigned char *a_sha, int a_mode,
986 const unsigned char *b_sha, int b_mode,
987 const char *branch1,
988 const char *branch2)
989{
990 struct diff_filespec one, a, b;
991
992 one.path = a.path = b.path = (char *)path;
993 hashcpy(one.sha1, o_sha);
994 one.mode = o_mode;
995 hashcpy(a.sha1, a_sha);
996 a.mode = a_mode;
997 hashcpy(b.sha1, b_sha);
998 b.mode = b_mode;
999 return merge_file_1(o, &one, &a, &b, branch1, branch2);
1000}
1001
b7033252
EN
1002static void handle_change_delete(struct merge_options *o,
1003 const char *path,
1004 const unsigned char *o_sha, int o_mode,
1005 const unsigned char *a_sha, int a_mode,
1006 const unsigned char *b_sha, int b_mode,
1007 const char *change, const char *change_past)
1008{
1009 char *renamed = NULL;
1010 if (dir_in_way(path, !o->call_depth)) {
1011 renamed = unique_path(o, path, a_sha ? o->branch1 : o->branch2);
1012 }
1013
1014 if (o->call_depth) {
1015 /*
1016 * We cannot arbitrarily accept either a_sha or b_sha as
1017 * correct; since there is no true "middle point" between
1018 * them, simply reuse the base version for virtual merge base.
1019 */
1020 remove_file_from_cache(path);
1021 update_file(o, 0, o_sha, o_mode, renamed ? renamed : path);
1022 } else if (!a_sha) {
55653a68
JX
1023 if (!renamed) {
1024 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1025 "and %s in %s. Version %s of %s left in tree."),
1026 change, path, o->branch1, change_past,
1027 o->branch2, o->branch2, path);
1028 update_file(o, 0, b_sha, b_mode, path);
1029 } else {
1030 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1031 "and %s in %s. Version %s of %s left in tree at %s."),
1032 change, path, o->branch1, change_past,
1033 o->branch2, o->branch2, path, renamed);
1034 update_file(o, 0, b_sha, b_mode, renamed);
1035 }
b7033252 1036 } else {
55653a68
JX
1037 if (!renamed) {
1038 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1039 "and %s in %s. Version %s of %s left in tree."),
1040 change, path, o->branch2, change_past,
1041 o->branch1, o->branch1, path);
1042 } else {
1043 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1044 "and %s in %s. Version %s of %s left in tree at %s."),
1045 change, path, o->branch2, change_past,
1046 o->branch1, o->branch1, path, renamed);
35a74abf 1047 update_file(o, 0, a_sha, a_mode, renamed);
55653a68 1048 }
35a74abf
EN
1049 /*
1050 * No need to call update_file() on path when !renamed, since
1051 * that would needlessly touch path. We could call
1052 * update_file_flags() with update_cache=0 and update_wd=0,
1053 * but that's a no-op.
1054 */
b7033252
EN
1055 }
1056 free(renamed);
1057}
1058
6ef2cb00
EN
1059static void conflict_rename_delete(struct merge_options *o,
1060 struct diff_filepair *pair,
1061 const char *rename_branch,
1062 const char *other_branch)
9047ebbc 1063{
e03acb8b
EN
1064 const struct diff_filespec *orig = pair->one;
1065 const struct diff_filespec *dest = pair->two;
e03acb8b
EN
1066 const unsigned char *a_sha = NULL;
1067 const unsigned char *b_sha = NULL;
1068 int a_mode = 0;
1069 int b_mode = 0;
1070
1071 if (rename_branch == o->branch1) {
1072 a_sha = dest->sha1;
1073 a_mode = dest->mode;
1074 } else {
1075 b_sha = dest->sha1;
1076 b_mode = dest->mode;
1077 }
6ef2cb00 1078
f53d3977
EN
1079 handle_change_delete(o,
1080 o->call_depth ? orig->path : dest->path,
1081 orig->sha1, orig->mode,
1082 a_sha, a_mode,
1083 b_sha, b_mode,
55653a68 1084 _("rename"), _("renamed"));
f53d3977 1085
e03acb8b
EN
1086 if (o->call_depth) {
1087 remove_file_from_cache(dest->path);
e03acb8b 1088 } else {
e03acb8b
EN
1089 update_stages(dest->path, NULL,
1090 rename_branch == o->branch1 ? dest : NULL,
1091 rename_branch == o->branch1 ? NULL : dest);
a0de2f6b 1092 }
e03acb8b 1093
6ef2cb00
EN
1094}
1095
1ac91b32
EN
1096static struct diff_filespec *filespec_from_entry(struct diff_filespec *target,
1097 struct stage_data *entry,
1098 int stage)
9047ebbc 1099{
1ac91b32
EN
1100 unsigned char *sha = entry->stages[stage].sha;
1101 unsigned mode = entry->stages[stage].mode;
1102 if (mode == 0 || is_null_sha1(sha))
1103 return NULL;
1104 hashcpy(target->sha1, sha);
1105 target->mode = mode;
1106 return target;
1107}
1108
3672c971
EN
1109static void handle_file(struct merge_options *o,
1110 struct diff_filespec *rename,
1111 int stage,
1112 struct rename_conflict_info *ci)
1113{
1114 char *dst_name = rename->path;
1115 struct stage_data *dst_entry;
1116 const char *cur_branch, *other_branch;
1117 struct diff_filespec other;
1118 struct diff_filespec *add;
1119
1120 if (stage == 2) {
1121 dst_entry = ci->dst_entry1;
1122 cur_branch = ci->branch1;
1123 other_branch = ci->branch2;
1124 } else {
1125 dst_entry = ci->dst_entry2;
1126 cur_branch = ci->branch2;
1127 other_branch = ci->branch1;
9047ebbc 1128 }
3672c971
EN
1129
1130 add = filespec_from_entry(&other, dst_entry, stage ^ 1);
3672c971
EN
1131 if (add) {
1132 char *add_name = unique_path(o, rename->path, other_branch);
1133 update_file(o, 0, add->sha1, add->mode, add_name);
1134
1135 remove_file(o, 0, rename->path, 0);
1136 dst_name = unique_path(o, rename->path, cur_branch);
1137 } else {
1138 if (dir_in_way(rename->path, !o->call_depth)) {
1139 dst_name = unique_path(o, rename->path, cur_branch);
55653a68 1140 output(o, 1, _("%s is a directory in %s adding as %s instead"),
3672c971
EN
1141 rename->path, other_branch, dst_name);
1142 }
9047ebbc 1143 }
3672c971 1144 update_file(o, 0, rename->sha1, rename->mode, dst_name);
f53d3977
EN
1145 if (stage == 2)
1146 update_stages(rename->path, NULL, rename, add);
1147 else
1148 update_stages(rename->path, NULL, add, rename);
3672c971
EN
1149
1150 if (dst_name != rename->path)
1151 free(dst_name);
1152}
1153
09c01f85 1154static void conflict_rename_rename_1to2(struct merge_options *o,
a99b7f22 1155 struct rename_conflict_info *ci)
9047ebbc 1156{
09c01f85 1157 /* One file was renamed in both branches, but to different names. */
a99b7f22
EN
1158 struct diff_filespec *one = ci->pair1->one;
1159 struct diff_filespec *a = ci->pair1->two;
1160 struct diff_filespec *b = ci->pair2->two;
4f66dade 1161
55653a68 1162 output(o, 1, _("CONFLICT (rename/rename): "
4f66dade 1163 "Rename \"%s\"->\"%s\" in branch \"%s\" "
55653a68 1164 "rename \"%s\"->\"%s\" in \"%s\"%s"),
a99b7f22
EN
1165 one->path, a->path, ci->branch1,
1166 one->path, b->path, ci->branch2,
55653a68 1167 o->call_depth ? _(" (left unresolved)") : "");
b7fa51da 1168 if (o->call_depth) {
c52ff85d 1169 struct merge_file_info mfi;
6d63070c
EN
1170 struct diff_filespec other;
1171 struct diff_filespec *add;
fa2364ec 1172 mfi = merge_file_one(o, one->path,
a99b7f22
EN
1173 one->sha1, one->mode,
1174 a->sha1, a->mode,
1175 b->sha1, b->mode,
1176 ci->branch1, ci->branch2);
9047ebbc 1177 /*
c52ff85d
EN
1178 * FIXME: For rename/add-source conflicts (if we could detect
1179 * such), this is wrong. We should instead find a unique
1180 * pathname and then either rename the add-source file to that
1181 * unique path, or use that unique path instead of src here.
9047ebbc 1182 */
a99b7f22 1183 update_file(o, 0, mfi.sha, mfi.mode, one->path);
07413c5a 1184
6d63070c
EN
1185 /*
1186 * Above, we put the merged content at the merge-base's
1187 * path. Now we usually need to delete both a->path and
1188 * b->path. However, the rename on each side of the merge
1189 * could also be involved in a rename/add conflict. In
1190 * such cases, we should keep the added file around,
1191 * resolving the conflict at that path in its favor.
1192 */
1193 add = filespec_from_entry(&other, ci->dst_entry1, 2 ^ 1);
1194 if (add)
1195 update_file(o, 0, add->sha1, add->mode, a->path);
1196 else
1197 remove_file_from_cache(a->path);
1198 add = filespec_from_entry(&other, ci->dst_entry2, 3 ^ 1);
1199 if (add)
1200 update_file(o, 0, add->sha1, add->mode, b->path);
1201 else
1202 remove_file_from_cache(b->path);
9047ebbc 1203 } else {
3672c971
EN
1204 handle_file(o, a, 2, ci);
1205 handle_file(o, b, 3, ci);
9047ebbc 1206 }
9047ebbc
MV
1207}
1208
09c01f85 1209static void conflict_rename_rename_2to1(struct merge_options *o,
461f5041 1210 struct rename_conflict_info *ci)
9047ebbc 1211{
461f5041
EN
1212 /* Two files, a & b, were renamed to the same thing, c. */
1213 struct diff_filespec *a = ci->pair1->one;
1214 struct diff_filespec *b = ci->pair2->one;
1215 struct diff_filespec *c1 = ci->pair1->two;
1216 struct diff_filespec *c2 = ci->pair2->two;
1217 char *path = c1->path; /* == c2->path */
434b8525
EN
1218 struct merge_file_info mfi_c1;
1219 struct merge_file_info mfi_c2;
461f5041 1220
55653a68 1221 output(o, 1, _("CONFLICT (rename/rename): "
461f5041 1222 "Rename %s->%s in %s. "
55653a68 1223 "Rename %s->%s in %s"),
461f5041
EN
1224 a->path, c1->path, ci->branch1,
1225 b->path, c2->path, ci->branch2);
1226
1227 remove_file(o, 1, a->path, would_lose_untracked(a->path));
1228 remove_file(o, 1, b->path, would_lose_untracked(b->path));
1229
434b8525
EN
1230 mfi_c1 = merge_file_special_markers(o, a, c1, &ci->ren1_other,
1231 o->branch1, c1->path,
1232 o->branch2, ci->ren1_other.path);
1233 mfi_c2 = merge_file_special_markers(o, b, &ci->ren2_other, c2,
1234 o->branch1, ci->ren2_other.path,
1235 o->branch2, c2->path);
1236
0a6b8712 1237 if (o->call_depth) {
434b8525
EN
1238 /*
1239 * If mfi_c1.clean && mfi_c2.clean, then it might make
1240 * sense to do a two-way merge of those results. But, I
1241 * think in all cases, it makes sense to have the virtual
1242 * merge base just undo the renames; they can be detected
1243 * again later for the non-recursive merge.
1244 */
1245 remove_file(o, 0, path, 0);
1246 update_file(o, 0, mfi_c1.sha, mfi_c1.mode, a->path);
1247 update_file(o, 0, mfi_c2.sha, mfi_c2.mode, b->path);
0a6b8712 1248 } else {
461f5041
EN
1249 char *new_path1 = unique_path(o, path, ci->branch1);
1250 char *new_path2 = unique_path(o, path, ci->branch2);
55653a68 1251 output(o, 1, _("Renaming %s to %s and %s to %s instead"),
461f5041 1252 a->path, new_path1, b->path, new_path2);
0a6b8712 1253 remove_file(o, 0, path, 0);
434b8525
EN
1254 update_file(o, 0, mfi_c1.sha, mfi_c1.mode, new_path1);
1255 update_file(o, 0, mfi_c2.sha, mfi_c2.mode, new_path2);
0a6b8712
EN
1256 free(new_path2);
1257 free(new_path1);
1258 }
9047ebbc
MV
1259}
1260
8a2fce18
MV
1261static int process_renames(struct merge_options *o,
1262 struct string_list *a_renames,
1263 struct string_list *b_renames)
9047ebbc
MV
1264{
1265 int clean_merge = 1, i, j;
183113a5
TF
1266 struct string_list a_by_dst = STRING_LIST_INIT_NODUP;
1267 struct string_list b_by_dst = STRING_LIST_INIT_NODUP;
9047ebbc
MV
1268 const struct rename *sre;
1269
1270 for (i = 0; i < a_renames->nr; i++) {
1271 sre = a_renames->items[i].util;
78a395d3 1272 string_list_insert(&a_by_dst, sre->pair->two->path)->util
0a6b8712 1273 = (void *)sre;
9047ebbc
MV
1274 }
1275 for (i = 0; i < b_renames->nr; i++) {
1276 sre = b_renames->items[i].util;
78a395d3 1277 string_list_insert(&b_by_dst, sre->pair->two->path)->util
0a6b8712 1278 = (void *)sre;
9047ebbc
MV
1279 }
1280
1281 for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
8e24cbae 1282 struct string_list *renames1, *renames2Dst;
9047ebbc
MV
1283 struct rename *ren1 = NULL, *ren2 = NULL;
1284 const char *branch1, *branch2;
1285 const char *ren1_src, *ren1_dst;
461f5041 1286 struct string_list_item *lookup;
9047ebbc
MV
1287
1288 if (i >= a_renames->nr) {
9047ebbc
MV
1289 ren2 = b_renames->items[j++].util;
1290 } else if (j >= b_renames->nr) {
9047ebbc
MV
1291 ren1 = a_renames->items[i++].util;
1292 } else {
8e24cbae
BK
1293 int compare = strcmp(a_renames->items[i].string,
1294 b_renames->items[j].string);
9047ebbc
MV
1295 if (compare <= 0)
1296 ren1 = a_renames->items[i++].util;
1297 if (compare >= 0)
1298 ren2 = b_renames->items[j++].util;
1299 }
1300
1301 /* TODO: refactor, so that 1/2 are not needed */
1302 if (ren1) {
1303 renames1 = a_renames;
9047ebbc 1304 renames2Dst = &b_by_dst;
8a2fce18
MV
1305 branch1 = o->branch1;
1306 branch2 = o->branch2;
9047ebbc
MV
1307 } else {
1308 struct rename *tmp;
1309 renames1 = b_renames;
9047ebbc 1310 renames2Dst = &a_by_dst;
8a2fce18
MV
1311 branch1 = o->branch2;
1312 branch2 = o->branch1;
9047ebbc
MV
1313 tmp = ren2;
1314 ren2 = ren1;
1315 ren1 = tmp;
1316 }
9047ebbc 1317
9047ebbc
MV
1318 if (ren1->processed)
1319 continue;
1320 ren1->processed = 1;
9047ebbc 1321 ren1->dst_entry->processed = 1;
7769a75e
EN
1322 /* BUG: We should only mark src_entry as processed if we
1323 * are not dealing with a rename + add-source case.
1324 */
9047ebbc 1325 ren1->src_entry->processed = 1;
9047ebbc
MV
1326
1327 ren1_src = ren1->pair->one->path;
1328 ren1_dst = ren1->pair->two->path;
1329
1330 if (ren2) {
461f5041 1331 /* One file renamed on both sides */
9047ebbc
MV
1332 const char *ren2_src = ren2->pair->one->path;
1333 const char *ren2_dst = ren2->pair->two->path;
4f66dade 1334 enum rename_type rename_type;
9047ebbc 1335 if (strcmp(ren1_src, ren2_src) != 0)
461f5041 1336 die("ren1_src != ren2_src");
9047ebbc
MV
1337 ren2->dst_entry->processed = 1;
1338 ren2->processed = 1;
1339 if (strcmp(ren1_dst, ren2_dst) != 0) {
4f66dade 1340 rename_type = RENAME_ONE_FILE_TO_TWO;
461f5041 1341 clean_merge = 0;
9047ebbc 1342 } else {
4f66dade 1343 rename_type = RENAME_ONE_FILE_TO_ONE;
7769a75e
EN
1344 /* BUG: We should only remove ren1_src in
1345 * the base stage (think of rename +
1346 * add-source cases).
1347 */
b7fa51da 1348 remove_file(o, 1, ren1_src, 1);
b8ddf164
EN
1349 update_entry(ren1->dst_entry,
1350 ren1->pair->one,
1351 ren1->pair->two,
1352 ren2->pair->two);
9047ebbc 1353 }
4f66dade
EN
1354 setup_rename_conflict_info(rename_type,
1355 ren1->pair,
1356 ren2->pair,
1357 branch1,
1358 branch2,
1359 ren1->dst_entry,
232c635f
EN
1360 ren2->dst_entry,
1361 o,
1362 NULL,
1363 NULL);
461f5041
EN
1364 } else if ((lookup = string_list_lookup(renames2Dst, ren1_dst))) {
1365 /* Two different files renamed to the same thing */
1366 char *ren2_dst;
1367 ren2 = lookup->util;
1368 ren2_dst = ren2->pair->two->path;
1369 if (strcmp(ren1_dst, ren2_dst) != 0)
1370 die("ren1_dst != ren2_dst");
1371
1372 clean_merge = 0;
1373 ren2->processed = 1;
1374 /*
1375 * BUG: We should only mark src_entry as processed
1376 * if we are not dealing with a rename + add-source
1377 * case.
1378 */
1379 ren2->src_entry->processed = 1;
1380
1381 setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE,
1382 ren1->pair,
1383 ren2->pair,
1384 branch1,
1385 branch2,
1386 ren1->dst_entry,
232c635f
EN
1387 ren2->dst_entry,
1388 o,
1389 ren1->src_entry,
1390 ren2->src_entry);
1391
9047ebbc
MV
1392 } else {
1393 /* Renamed in 1, maybe changed in 2 */
9047ebbc
MV
1394 /* we only use sha1 and mode of these */
1395 struct diff_filespec src_other, dst_other;
41d70bd6 1396 int try_merge;
9047ebbc 1397
41d70bd6
EN
1398 /*
1399 * unpack_trees loads entries from common-commit
1400 * into stage 1, from head-commit into stage 2, and
1401 * from merge-commit into stage 3. We keep track
1402 * of which side corresponds to the rename.
1403 */
1404 int renamed_stage = a_renames == renames1 ? 2 : 3;
1405 int other_stage = a_renames == renames1 ? 3 : 2;
9047ebbc 1406
7769a75e
EN
1407 /* BUG: We should only remove ren1_src in the base
1408 * stage and in other_stage (think of rename +
1409 * add-source case).
1410 */
531357a4
EN
1411 remove_file(o, 1, ren1_src,
1412 renamed_stage == 2 || !was_tracked(ren1_src));
9047ebbc 1413
41d70bd6
EN
1414 hashcpy(src_other.sha1, ren1->src_entry->stages[other_stage].sha);
1415 src_other.mode = ren1->src_entry->stages[other_stage].mode;
1416 hashcpy(dst_other.sha1, ren1->dst_entry->stages[other_stage].sha);
1417 dst_other.mode = ren1->dst_entry->stages[other_stage].mode;
9047ebbc
MV
1418 try_merge = 0;
1419
86273e57 1420 if (sha_eq(src_other.sha1, null_sha1)) {
4f66dade
EN
1421 setup_rename_conflict_info(RENAME_DELETE,
1422 ren1->pair,
1423 NULL,
1424 branch1,
1425 branch2,
1426 ren1->dst_entry,
232c635f
EN
1427 NULL,
1428 o,
1429 NULL,
4f66dade 1430 NULL);
d5af5105
SK
1431 } else if ((dst_other.mode == ren1->pair->two->mode) &&
1432 sha_eq(dst_other.sha1, ren1->pair->two->sha1)) {
35a74abf
EN
1433 /*
1434 * Added file on the other side identical to
1435 * the file being renamed: clean merge.
1436 * Also, there is no need to overwrite the
1437 * file already in the working copy, so call
1438 * update_file_flags() instead of
1439 * update_file().
1440 */
1441 update_file_flags(o,
1442 ren1->pair->two->sha1,
1443 ren1->pair->two->mode,
1444 ren1_dst,
1445 1, /* update_cache */
1446 0 /* update_wd */);
9047ebbc 1447 } else if (!sha_eq(dst_other.sha1, null_sha1)) {
9047ebbc
MV
1448 clean_merge = 0;
1449 try_merge = 1;
55653a68
JX
1450 output(o, 1, _("CONFLICT (rename/add): Rename %s->%s in %s. "
1451 "%s added in %s"),
9047ebbc
MV
1452 ren1_src, ren1_dst, branch1,
1453 ren1_dst, branch2);
c94736a2
JH
1454 if (o->call_depth) {
1455 struct merge_file_info mfi;
fa2364ec 1456 mfi = merge_file_one(o, ren1_dst, null_sha1, 0,
6bdaead1
EN
1457 ren1->pair->two->sha1, ren1->pair->two->mode,
1458 dst_other.sha1, dst_other.mode,
1459 branch1, branch2);
55653a68 1460 output(o, 1, _("Adding merged %s"), ren1_dst);
6bdaead1 1461 update_file(o, 0, mfi.sha, mfi.mode, ren1_dst);
2a669c34 1462 try_merge = 0;
c94736a2 1463 } else {
3d6b8e88 1464 char *new_path = unique_path(o, ren1_dst, branch2);
55653a68 1465 output(o, 1, _("Adding as %s instead"), new_path);
c94736a2 1466 update_file(o, 0, dst_other.sha1, dst_other.mode, new_path);
3d6b8e88 1467 free(new_path);
c94736a2 1468 }
9047ebbc
MV
1469 } else
1470 try_merge = 1;
1471
1472 if (try_merge) {
8a2fce18 1473 struct diff_filespec *one, *a, *b;
9047ebbc
MV
1474 src_other.path = (char *)ren1_src;
1475
8a2fce18 1476 one = ren1->pair->one;
9047ebbc
MV
1477 if (a_renames == renames1) {
1478 a = ren1->pair->two;
1479 b = &src_other;
1480 } else {
1481 b = ren1->pair->two;
1482 a = &src_other;
1483 }
b8ddf164 1484 update_entry(ren1->dst_entry, one, a, b);
4f66dade
EN
1485 setup_rename_conflict_info(RENAME_NORMAL,
1486 ren1->pair,
1487 NULL,
1488 branch1,
1489 NULL,
1490 ren1->dst_entry,
232c635f
EN
1491 NULL,
1492 o,
1493 NULL,
4f66dade 1494 NULL);
9047ebbc
MV
1495 }
1496 }
1497 }
1498 string_list_clear(&a_by_dst, 0);
1499 string_list_clear(&b_by_dst, 0);
1500
1501 return clean_merge;
1502}
1503
1504static unsigned char *stage_sha(const unsigned char *sha, unsigned mode)
1505{
1506 return (is_null_sha1(sha) || mode == 0) ? NULL: (unsigned char *)sha;
1507}
1508
331a1838
EB
1509static int read_sha1_strbuf(const unsigned char *sha1, struct strbuf *dst)
1510{
1511 void *buf;
1512 enum object_type type;
1513 unsigned long size;
1514 buf = read_sha1_file(sha1, &type, &size);
1515 if (!buf)
55653a68 1516 return error(_("cannot read object %s"), sha1_to_hex(sha1));
331a1838
EB
1517 if (type != OBJ_BLOB) {
1518 free(buf);
55653a68 1519 return error(_("object %s is not a blob"), sha1_to_hex(sha1));
331a1838
EB
1520 }
1521 strbuf_attach(dst, buf, size, size + 1);
1522 return 0;
1523}
1524
1525static int blob_unchanged(const unsigned char *o_sha,
1526 const unsigned char *a_sha,
3e7589b7 1527 int renormalize, const char *path)
331a1838
EB
1528{
1529 struct strbuf o = STRBUF_INIT;
1530 struct strbuf a = STRBUF_INIT;
1531 int ret = 0; /* assume changed for safety */
1532
1533 if (sha_eq(o_sha, a_sha))
1534 return 1;
3e7589b7 1535 if (!renormalize)
331a1838
EB
1536 return 0;
1537
1538 assert(o_sha && a_sha);
1539 if (read_sha1_strbuf(o_sha, &o) || read_sha1_strbuf(a_sha, &a))
1540 goto error_return;
1541 /*
1542 * Note: binary | is used so that both renormalizations are
1543 * performed. Comparison can be skipped if both files are
1544 * unchanged since their sha1s have already been compared.
1545 */
1546 if (renormalize_buffer(path, o.buf, o.len, &o) |
1547 renormalize_buffer(path, a.buf, o.len, &a))
1548 ret = (o.len == a.len && !memcmp(o.buf, a.buf, o.len));
1549
1550error_return:
1551 strbuf_release(&o);
1552 strbuf_release(&a);
1553 return ret;
1554}
1555
b7033252 1556static void handle_modify_delete(struct merge_options *o,
5e3ce663 1557 const char *path,
ec61d149 1558 unsigned char *o_sha, int o_mode,
5e3ce663
EN
1559 unsigned char *a_sha, int a_mode,
1560 unsigned char *b_sha, int b_mode)
1561{
b7033252
EN
1562 handle_change_delete(o,
1563 path,
1564 o_sha, o_mode,
1565 a_sha, a_mode,
1566 b_sha, b_mode,
55653a68 1567 _("modify"), _("modified"));
5e3ce663
EN
1568}
1569
0c4918d1
EN
1570static int merge_content(struct merge_options *o,
1571 const char *path,
1572 unsigned char *o_sha, int o_mode,
1573 unsigned char *a_sha, int a_mode,
61b8bcae 1574 unsigned char *b_sha, int b_mode,
4f66dade 1575 struct rename_conflict_info *rename_conflict_info)
0c4918d1 1576{
55653a68 1577 const char *reason = _("content");
5b448b85 1578 const char *path1 = NULL, *path2 = NULL;
0c4918d1
EN
1579 struct merge_file_info mfi;
1580 struct diff_filespec one, a, b;
4ab9a157 1581 unsigned df_conflict_remains = 0;
0c4918d1
EN
1582
1583 if (!o_sha) {
55653a68 1584 reason = _("add/add");
0c4918d1
EN
1585 o_sha = (unsigned char *)null_sha1;
1586 }
1587 one.path = a.path = b.path = (char *)path;
1588 hashcpy(one.sha1, o_sha);
1589 one.mode = o_mode;
1590 hashcpy(a.sha1, a_sha);
1591 a.mode = a_mode;
1592 hashcpy(b.sha1, b_sha);
1593 b.mode = b_mode;
1594
3c217c07 1595 if (rename_conflict_info) {
3c217c07
EN
1596 struct diff_filepair *pair1 = rename_conflict_info->pair1;
1597
1598 path1 = (o->branch1 == rename_conflict_info->branch1) ?
1599 pair1->two->path : pair1->one->path;
1600 /* If rename_conflict_info->pair2 != NULL, we are in
1601 * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
1602 * normal rename.
1603 */
1604 path2 = (rename_conflict_info->pair2 ||
1605 o->branch2 == rename_conflict_info->branch1) ?
1606 pair1->two->path : pair1->one->path;
3c217c07
EN
1607
1608 if (dir_in_way(path, !o->call_depth))
1609 df_conflict_remains = 1;
4ab9a157 1610 }
dac47415
EN
1611 mfi = merge_file_special_markers(o, &one, &a, &b,
1612 o->branch1, path1,
1613 o->branch2, path2);
4ab9a157
EN
1614
1615 if (mfi.clean && !df_conflict_remains &&
5b448b85
EN
1616 sha_eq(mfi.sha, a_sha) && mfi.mode == a_mode) {
1617 int path_renamed_outside_HEAD;
55653a68 1618 output(o, 3, _("Skipped %s (merged same as existing)"), path);
5b448b85
EN
1619 /*
1620 * The content merge resulted in the same file contents we
1621 * already had. We can return early if those file contents
1622 * are recorded at the correct path (which may not be true
1623 * if the merge involves a rename).
1624 */
1625 path_renamed_outside_HEAD = !path2 || !strcmp(path, path2);
1626 if (!path_renamed_outside_HEAD) {
1627 add_cacheinfo(mfi.mode, mfi.sha, path,
d45b7f40 1628 0, (!o->call_depth), 0);
5b448b85
EN
1629 return mfi.clean;
1630 }
1631 } else
55653a68 1632 output(o, 2, _("Auto-merging %s"), path);
0c4918d1
EN
1633
1634 if (!mfi.clean) {
1635 if (S_ISGITLINK(mfi.mode))
55653a68
JX
1636 reason = _("submodule");
1637 output(o, 1, _("CONFLICT (%s): Merge conflict in %s"),
0c4918d1 1638 reason, path);
4f66dade 1639 if (rename_conflict_info && !df_conflict_remains)
b8ddf164 1640 update_stages(path, &one, &a, &b);
0c4918d1
EN
1641 }
1642
4ab9a157 1643 if (df_conflict_remains) {
3d6b8e88 1644 char *new_path;
51931bf0
EN
1645 if (o->call_depth) {
1646 remove_file_from_cache(path);
1647 } else {
1648 if (!mfi.clean)
1649 update_stages(path, &one, &a, &b);
1650 else {
1651 int file_from_stage2 = was_tracked(path);
1652 struct diff_filespec merged;
1653 hashcpy(merged.sha1, mfi.sha);
1654 merged.mode = mfi.mode;
1655
1656 update_stages(path, NULL,
1657 file_from_stage2 ? &merged : NULL,
1658 file_from_stage2 ? NULL : &merged);
1659 }
1660
1661 }
4f66dade 1662 new_path = unique_path(o, path, rename_conflict_info->branch1);
55653a68 1663 output(o, 1, _("Adding as %s instead"), new_path);
51931bf0 1664 update_file(o, 0, mfi.sha, mfi.mode, new_path);
3d6b8e88 1665 free(new_path);
51931bf0 1666 mfi.clean = 0;
4ab9a157
EN
1667 } else {
1668 update_file(o, mfi.clean, mfi.sha, mfi.mode, path);
1669 }
0c4918d1
EN
1670 return mfi.clean;
1671
1672}
1673
9047ebbc 1674/* Per entry merge function */
8a2fce18
MV
1675static int process_entry(struct merge_options *o,
1676 const char *path, struct stage_data *entry)
9047ebbc
MV
1677{
1678 /*
1679 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1680 print_index_entry("\tpath: ", entry);
1681 */
1682 int clean_merge = 1;
1bc0ab7c 1683 int normalize = o->renormalize;
9047ebbc
MV
1684 unsigned o_mode = entry->stages[1].mode;
1685 unsigned a_mode = entry->stages[2].mode;
1686 unsigned b_mode = entry->stages[3].mode;
1687 unsigned char *o_sha = stage_sha(entry->stages[1].sha, o_mode);
1688 unsigned char *a_sha = stage_sha(entry->stages[2].sha, a_mode);
1689 unsigned char *b_sha = stage_sha(entry->stages[3].sha, b_mode);
1690
37348937 1691 entry->processed = 1;
4f66dade
EN
1692 if (entry->rename_conflict_info) {
1693 struct rename_conflict_info *conflict_info = entry->rename_conflict_info;
07413c5a 1694 switch (conflict_info->rename_type) {
882fd11a 1695 case RENAME_NORMAL:
4f66dade 1696 case RENAME_ONE_FILE_TO_ONE:
882fd11a
EN
1697 clean_merge = merge_content(o, path,
1698 o_sha, o_mode, a_sha, a_mode, b_sha, b_mode,
4f66dade 1699 conflict_info);
882fd11a 1700 break;
3b130adf
EN
1701 case RENAME_DELETE:
1702 clean_merge = 0;
1703 conflict_rename_delete(o, conflict_info->pair1,
1704 conflict_info->branch1,
1705 conflict_info->branch2);
1706 break;
07413c5a 1707 case RENAME_ONE_FILE_TO_TWO:
07413c5a 1708 clean_merge = 0;
a99b7f22 1709 conflict_rename_rename_1to2(o, conflict_info);
07413c5a 1710 break;
461f5041
EN
1711 case RENAME_TWO_FILES_TO_ONE:
1712 clean_merge = 0;
1713 conflict_rename_rename_2to1(o, conflict_info);
07413c5a
EN
1714 break;
1715 default:
1716 entry->processed = 0;
1717 break;
1718 }
71f7ffcc 1719 } else if (o_sha && (!a_sha || !b_sha)) {
edd2faf5
EN
1720 /* Case A: Deleted in one */
1721 if ((!a_sha && !b_sha) ||
1722 (!b_sha && blob_unchanged(o_sha, a_sha, normalize, path)) ||
1723 (!a_sha && blob_unchanged(o_sha, b_sha, normalize, path))) {
1724 /* Deleted in both or deleted in one and
1725 * unchanged in the other */
1726 if (a_sha)
55653a68 1727 output(o, 2, _("Removing %s"), path);
edd2faf5
EN
1728 /* do not touch working file if it did not exist */
1729 remove_file(o, 1, path, !a_sha);
1730 } else {
1731 /* Modify/delete; deleted side may have put a directory in the way */
edd2faf5 1732 clean_merge = 0;
b7033252 1733 handle_modify_delete(o, path, o_sha, o_mode,
edd2faf5 1734 a_sha, a_mode, b_sha, b_mode);
3d6b8e88 1735 }
edd2faf5
EN
1736 } else if ((!o_sha && a_sha && !b_sha) ||
1737 (!o_sha && !a_sha && b_sha)) {
1738 /* Case B: Added in one. */
1739 /* [nothing|directory] -> ([nothing|directory], file) */
1740
9c0bbb50
EN
1741 const char *add_branch;
1742 const char *other_branch;
1743 unsigned mode;
1744 const unsigned char *sha;
1745 const char *conf;
37348937 1746
9c0bbb50
EN
1747 if (a_sha) {
1748 add_branch = o->branch1;
1749 other_branch = o->branch2;
1750 mode = a_mode;
1751 sha = a_sha;
55653a68 1752 conf = _("file/directory");
9c0bbb50
EN
1753 } else {
1754 add_branch = o->branch2;
1755 other_branch = o->branch1;
1756 mode = b_mode;
1757 sha = b_sha;
55653a68 1758 conf = _("directory/file");
9c0bbb50 1759 }
f2507b4e 1760 if (dir_in_way(path, !o->call_depth)) {
3d6b8e88 1761 char *new_path = unique_path(o, path, add_branch);
9c0bbb50 1762 clean_merge = 0;
55653a68
JX
1763 output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
1764 "Adding %s as %s"),
9c0bbb50 1765 conf, path, other_branch, path, new_path);
51931bf0
EN
1766 if (o->call_depth)
1767 remove_file_from_cache(path);
9c0bbb50 1768 update_file(o, 0, sha, mode, new_path);
7b1c610f
EN
1769 if (o->call_depth)
1770 remove_file_from_cache(path);
3d6b8e88 1771 free(new_path);
9c0bbb50 1772 } else {
55653a68 1773 output(o, 2, _("Adding %s"), path);
35a74abf
EN
1774 /* do not overwrite file if already present */
1775 update_file_flags(o, sha, mode, path, 1, !a_sha);
9c0bbb50 1776 }
edd2faf5
EN
1777 } else if (a_sha && b_sha) {
1778 /* Case C: Added in both (check for same permissions) and */
1779 /* case D: Modified in both, but differently. */
4f66dade 1780 clean_merge = merge_content(o, path,
edd2faf5
EN
1781 o_sha, o_mode, a_sha, a_mode, b_sha, b_mode,
1782 NULL);
1783 } else if (!o_sha && !a_sha && !b_sha) {
1784 /*
1785 * this entry was deleted altogether. a_mode == 0 means
1786 * we had that path and want to actively remove it.
1787 */
1788 remove_file(o, 1, path, !a_mode);
1789 } else
55653a68 1790 die(_("Fatal merge failure, shouldn't happen."));
37348937
EN
1791
1792 return clean_merge;
1793}
1794
8a2fce18
MV
1795int merge_trees(struct merge_options *o,
1796 struct tree *head,
9047ebbc
MV
1797 struct tree *merge,
1798 struct tree *common,
9047ebbc
MV
1799 struct tree **result)
1800{
1801 int code, clean;
1802
85e51b78
JH
1803 if (o->subtree_shift) {
1804 merge = shift_tree_object(head, merge, o->subtree_shift);
1805 common = shift_tree_object(head, common, o->subtree_shift);
9047ebbc
MV
1806 }
1807
1808 if (sha_eq(common->object.sha1, merge->object.sha1)) {
55653a68 1809 output(o, 0, _("Already up-to-date!"));
9047ebbc
MV
1810 *result = head;
1811 return 1;
1812 }
1813
b7fa51da 1814 code = git_merge_trees(o->call_depth, common, head, merge);
9047ebbc 1815
fadd069d
JH
1816 if (code != 0) {
1817 if (show(o, 4) || o->call_depth)
55653a68 1818 die(_("merging of trees %s and %s failed"),
fadd069d
JH
1819 sha1_to_hex(head->object.sha1),
1820 sha1_to_hex(merge->object.sha1));
1821 else
1822 exit(128);
1823 }
9047ebbc
MV
1824
1825 if (unmerged_cache()) {
1826 struct string_list *entries, *re_head, *re_merge;
1827 int i;
696ee23c
MV
1828 string_list_clear(&o->current_file_set, 1);
1829 string_list_clear(&o->current_directory_set, 1);
1830 get_files_dirs(o, head);
1831 get_files_dirs(o, merge);
9047ebbc
MV
1832
1833 entries = get_unmerged();
70cc3d36 1834 record_df_conflict_files(o, entries);
8a2fce18
MV
1835 re_head = get_renames(o, head, common, head, merge, entries);
1836 re_merge = get_renames(o, merge, common, head, merge, entries);
1837 clean = process_renames(o, re_head, re_merge);
edd2faf5 1838 for (i = entries->nr-1; 0 <= i; i--) {
9047ebbc
MV
1839 const char *path = entries->items[i].string;
1840 struct stage_data *e = entries->items[i].util;
1841 if (!e->processed
8a2fce18 1842 && !process_entry(o, path, e))
9047ebbc
MV
1843 clean = 0;
1844 }
7edba4c4
JH
1845 for (i = 0; i < entries->nr; i++) {
1846 struct stage_data *e = entries->items[i].util;
1847 if (!e->processed)
55653a68 1848 die(_("Unprocessed path??? %s"),
7edba4c4
JH
1849 entries->items[i].string);
1850 }
9047ebbc
MV
1851
1852 string_list_clear(re_merge, 0);
1853 string_list_clear(re_head, 0);
1854 string_list_clear(entries, 1);
1855
1856 }
1857 else
1858 clean = 1;
1859
b7fa51da 1860 if (o->call_depth)
8a2fce18 1861 *result = write_tree_from_memory(o);
9047ebbc
MV
1862
1863 return clean;
1864}
1865
1866static struct commit_list *reverse_commit_list(struct commit_list *list)
1867{
1868 struct commit_list *next = NULL, *current, *backup;
1869 for (current = list; current; current = backup) {
1870 backup = current->next;
1871 current->next = next;
1872 next = current;
1873 }
1874 return next;
1875}
1876
1877/*
1878 * Merge the commits h1 and h2, return the resulting virtual
1879 * commit object and a flag indicating the cleanness of the merge.
1880 */
8a2fce18
MV
1881int merge_recursive(struct merge_options *o,
1882 struct commit *h1,
9047ebbc 1883 struct commit *h2,
9047ebbc
MV
1884 struct commit_list *ca,
1885 struct commit **result)
1886{
1887 struct commit_list *iter;
1888 struct commit *merged_common_ancestors;
1889 struct tree *mrtree = mrtree;
1890 int clean;
1891
8a2fce18 1892 if (show(o, 4)) {
55653a68 1893 output(o, 4, _("Merging:"));
5033639c
MV
1894 output_commit_title(o, h1);
1895 output_commit_title(o, h2);
9047ebbc
MV
1896 }
1897
1898 if (!ca) {
1899 ca = get_merge_bases(h1, h2, 1);
1900 ca = reverse_commit_list(ca);
1901 }
1902
8a2fce18 1903 if (show(o, 5)) {
e0453cd8
RT
1904 unsigned cnt = commit_list_count(ca);
1905
1906 output(o, 5, Q_("found %u common ancestor:",
1907 "found %u common ancestors:", cnt), cnt);
9047ebbc 1908 for (iter = ca; iter; iter = iter->next)
5033639c 1909 output_commit_title(o, iter->item);
9047ebbc
MV
1910 }
1911
1912 merged_common_ancestors = pop_commit(&ca);
1913 if (merged_common_ancestors == NULL) {
03f622c8
JN
1914 /* if there is no common ancestor, use an empty tree */
1915 struct tree *tree;
9047ebbc 1916
cba595bd 1917 tree = lookup_tree(EMPTY_TREE_SHA1_BIN);
9047ebbc
MV
1918 merged_common_ancestors = make_virtual_commit(tree, "ancestor");
1919 }
1920
1921 for (iter = ca; iter; iter = iter->next) {
8a2fce18 1922 const char *saved_b1, *saved_b2;
5033639c 1923 o->call_depth++;
9047ebbc
MV
1924 /*
1925 * When the merge fails, the result contains files
1926 * with conflict markers. The cleanness flag is
1927 * ignored, it was never actually used, as result of
1928 * merge_trees has always overwritten it: the committed
1929 * "conflicts" were already resolved.
1930 */
1931 discard_cache();
8a2fce18
MV
1932 saved_b1 = o->branch1;
1933 saved_b2 = o->branch2;
1934 o->branch1 = "Temporary merge branch 1";
1935 o->branch2 = "Temporary merge branch 2";
1936 merge_recursive(o, merged_common_ancestors, iter->item,
1937 NULL, &merged_common_ancestors);
1938 o->branch1 = saved_b1;
1939 o->branch2 = saved_b2;
5033639c 1940 o->call_depth--;
9047ebbc
MV
1941
1942 if (!merged_common_ancestors)
55653a68 1943 die(_("merge returned no commit"));
9047ebbc
MV
1944 }
1945
1946 discard_cache();
b7fa51da 1947 if (!o->call_depth)
9047ebbc 1948 read_cache();
9047ebbc 1949
7ca56aa0 1950 o->ancestor = "merged common ancestors";
8a2fce18
MV
1951 clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree,
1952 &mrtree);
9047ebbc 1953
b7fa51da 1954 if (o->call_depth) {
9047ebbc
MV
1955 *result = make_virtual_commit(mrtree, "merged tree");
1956 commit_list_insert(h1, &(*result)->parents);
1957 commit_list_insert(h2, &(*result)->parents->next);
1958 }
c7d84924 1959 flush_output(o);
f31027c9
JH
1960 if (show(o, 2))
1961 diff_warn_rename_limit("merge.renamelimit",
1962 o->needed_rename_limit, 0);
9047ebbc
MV
1963 return clean;
1964}
1965
73118f89
SB
1966static struct commit *get_ref(const unsigned char *sha1, const char *name)
1967{
1968 struct object *object;
1969
1970 object = deref_tag(parse_object(sha1), name, strlen(name));
1971 if (!object)
1972 return NULL;
1973 if (object->type == OBJ_TREE)
1974 return make_virtual_commit((struct tree*)object, name);
1975 if (object->type != OBJ_COMMIT)
1976 return NULL;
1977 if (parse_commit((struct commit *)object))
1978 return NULL;
1979 return (struct commit *)object;
1980}
1981
8a2fce18
MV
1982int merge_recursive_generic(struct merge_options *o,
1983 const unsigned char *head,
1984 const unsigned char *merge,
1985 int num_base_list,
1986 const unsigned char **base_list,
1987 struct commit **result)
73118f89
SB
1988{
1989 int clean, index_fd;
1990 struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
8a2fce18
MV
1991 struct commit *head_commit = get_ref(head, o->branch1);
1992 struct commit *next_commit = get_ref(merge, o->branch2);
73118f89
SB
1993 struct commit_list *ca = NULL;
1994
1995 if (base_list) {
1996 int i;
8a2fce18 1997 for (i = 0; i < num_base_list; ++i) {
73118f89 1998 struct commit *base;
8a2fce18 1999 if (!(base = get_ref(base_list[i], sha1_to_hex(base_list[i]))))
55653a68 2000 return error(_("Could not parse object '%s'"),
8a2fce18 2001 sha1_to_hex(base_list[i]));
73118f89
SB
2002 commit_list_insert(base, &ca);
2003 }
2004 }
2005
2006 index_fd = hold_locked_index(lock, 1);
8a2fce18
MV
2007 clean = merge_recursive(o, head_commit, next_commit, ca,
2008 result);
73118f89
SB
2009 if (active_cache_changed &&
2010 (write_cache(index_fd, active_cache, active_nr) ||
2011 commit_locked_index(lock)))
55653a68 2012 return error(_("Unable to write index."));
73118f89
SB
2013
2014 return clean ? 0 : 1;
2015}
2016
8a2fce18 2017static int merge_recursive_config(const char *var, const char *value, void *cb)
9047ebbc 2018{
8a2fce18 2019 struct merge_options *o = cb;
8c2be75f 2020 if (!strcmp(var, "merge.verbosity")) {
8a2fce18 2021 o->verbosity = git_config_int(var, value);
9047ebbc
MV
2022 return 0;
2023 }
8c2be75f 2024 if (!strcmp(var, "diff.renamelimit")) {
8a2fce18 2025 o->diff_rename_limit = git_config_int(var, value);
9047ebbc
MV
2026 return 0;
2027 }
8c2be75f 2028 if (!strcmp(var, "merge.renamelimit")) {
8a2fce18 2029 o->merge_rename_limit = git_config_int(var, value);
9047ebbc
MV
2030 return 0;
2031 }
e137a892 2032 return git_xmerge_config(var, value, cb);
9047ebbc
MV
2033}
2034
8a2fce18 2035void init_merge_options(struct merge_options *o)
9047ebbc 2036{
8a2fce18
MV
2037 memset(o, 0, sizeof(struct merge_options));
2038 o->verbosity = 2;
2039 o->buffer_output = 1;
2040 o->diff_rename_limit = -1;
2041 o->merge_rename_limit = -1;
7610fa57 2042 o->renormalize = 0;
8a2fce18 2043 git_config(merge_recursive_config, o);
9047ebbc 2044 if (getenv("GIT_MERGE_VERBOSITY"))
8a2fce18 2045 o->verbosity =
9047ebbc 2046 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL, 10);
8a2fce18
MV
2047 if (o->verbosity >= 5)
2048 o->buffer_output = 0;
c7d84924 2049 strbuf_init(&o->obuf, 0);
696ee23c
MV
2050 memset(&o->current_file_set, 0, sizeof(struct string_list));
2051 o->current_file_set.strdup_strings = 1;
2052 memset(&o->current_directory_set, 0, sizeof(struct string_list));
2053 o->current_directory_set.strdup_strings = 1;
70cc3d36
EN
2054 memset(&o->df_conflict_file_set, 0, sizeof(struct string_list));
2055 o->df_conflict_file_set.strdup_strings = 1;
9047ebbc 2056}
635a7bb1
JN
2057
2058int parse_merge_opt(struct merge_options *o, const char *s)
2059{
2060 if (!s || !*s)
2061 return -1;
2062 if (!strcmp(s, "ours"))
2063 o->recursive_variant = MERGE_RECURSIVE_OURS;
2064 else if (!strcmp(s, "theirs"))
2065 o->recursive_variant = MERGE_RECURSIVE_THEIRS;
2066 else if (!strcmp(s, "subtree"))
2067 o->subtree_shift = "";
59556548 2068 else if (starts_with(s, "subtree="))
635a7bb1 2069 o->subtree_shift = s + strlen("subtree=");
58a1ece4 2070 else if (!strcmp(s, "patience"))
307ab20b 2071 o->xdl_opts = DIFF_WITH_ALG(o, PATIENCE_DIFF);
8c912eea 2072 else if (!strcmp(s, "histogram"))
307ab20b 2073 o->xdl_opts = DIFF_WITH_ALG(o, HISTOGRAM_DIFF);
59556548 2074 else if (starts_with(s, "diff-algorithm=")) {
6562928a 2075 long value = parse_algorithm_value(s + strlen("diff-algorithm="));
07924d4d
MP
2076 if (value < 0)
2077 return -1;
2078 /* clear out previous settings */
2079 DIFF_XDL_CLR(o, NEED_MINIMAL);
2080 o->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
2081 o->xdl_opts |= value;
2082 }
4e5dd044
JF
2083 else if (!strcmp(s, "ignore-space-change"))
2084 o->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE;
2085 else if (!strcmp(s, "ignore-all-space"))
2086 o->xdl_opts |= XDF_IGNORE_WHITESPACE;
2087 else if (!strcmp(s, "ignore-space-at-eol"))
2088 o->xdl_opts |= XDF_IGNORE_WHITESPACE_AT_EOL;
635a7bb1
JN
2089 else if (!strcmp(s, "renormalize"))
2090 o->renormalize = 1;
2091 else if (!strcmp(s, "no-renormalize"))
2092 o->renormalize = 0;
59556548 2093 else if (starts_with(s, "rename-threshold=")) {
10ae7526
KB
2094 const char *score = s + strlen("rename-threshold=");
2095 if ((o->rename_score = parse_rename_score(&score)) == -1 || *score != 0)
2096 return -1;
2097 }
635a7bb1
JN
2098 else
2099 return -1;
2100 return 0;
2101}