commit: convert commit->buffer to a slab
[git/mingw.git] / merge-recursive.c
blob78908aaacc6676913b369e80c54d9e11444395bd
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 "advice.h"
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"
20 #include "attr.h"
21 #include "merge-recursive.h"
22 #include "dir.h"
23 #include "submodule.h"
25 static struct tree *shift_tree_object(struct tree *one, struct tree *two,
26 const char *subtree_shift)
28 unsigned char shifted[20];
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);
36 if (!hashcmp(two->object.sha1, shifted))
37 return two;
38 return lookup_tree(shifted);
41 static struct commit *make_virtual_commit(struct tree *tree, const char *comment)
43 struct commit *commit = alloc_commit_node();
44 struct merge_remote_desc *desc = xmalloc(sizeof(*desc));
46 desc->name = comment;
47 desc->obj = (struct object *)commit;
48 commit->tree = tree;
49 commit->util = desc;
50 commit->object.parsed = 1;
51 return commit;
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.
58 static int sha_eq(const unsigned char *a, const unsigned char *b)
60 if (!a && !b)
61 return 2;
62 return a && b && hashcmp(a, b) == 0;
65 enum rename_type {
66 RENAME_NORMAL = 0,
67 RENAME_DELETE,
68 RENAME_ONE_FILE_TO_ONE,
69 RENAME_ONE_FILE_TO_TWO,
70 RENAME_TWO_FILES_TO_ONE
73 struct rename_conflict_info {
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;
81 struct diff_filespec ren1_other;
82 struct diff_filespec ren2_other;
86 * Since we want to write the index eventually, we cannot reuse the index
87 * for these (temporary) data.
89 struct stage_data {
90 struct {
91 unsigned mode;
92 unsigned char sha[20];
93 } stages[4];
94 struct rename_conflict_info *rename_conflict_info;
95 unsigned processed:1;
98 static 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,
104 struct stage_data *dst_entry2,
105 struct merge_options *o,
106 struct stage_data *src_entry1,
107 struct stage_data *src_entry2)
109 struct rename_conflict_info *ci = xcalloc(1, sizeof(struct rename_conflict_info));
110 ci->rename_type = rename_type;
111 ci->pair1 = pair1;
112 ci->branch1 = branch1;
113 ci->branch2 = branch2;
115 ci->dst_entry1 = dst_entry1;
116 dst_entry1->rename_conflict_info = ci;
117 dst_entry1->processed = 0;
119 assert(!pair2 == !dst_entry2);
120 if (dst_entry2) {
121 ci->dst_entry2 = dst_entry2;
122 ci->pair2 = pair2;
123 dst_entry2->rename_conflict_info = ci;
126 if (rename_type == RENAME_TWO_FILES_TO_ONE) {
128 * For each rename, there could have been
129 * modifications on the side of history where that
130 * file was not renamed.
132 int ostage1 = o->branch1 == branch1 ? 3 : 2;
133 int ostage2 = ostage1 ^ 1;
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;
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;
145 static int show(struct merge_options *o, int v)
147 return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5;
150 static void flush_output(struct merge_options *o)
152 if (o->obuf.len) {
153 fputs(o->obuf.buf, stdout);
154 strbuf_reset(&o->obuf);
158 __attribute__((format (printf, 3, 4)))
159 static void output(struct merge_options *o, int v, const char *fmt, ...)
161 va_list ap;
163 if (!show(o, v))
164 return;
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);
170 va_start(ap, fmt);
171 strbuf_vaddf(&o->obuf, fmt, ap);
172 va_end(ap);
174 strbuf_add(&o->obuf, "\n", 1);
175 if (!o->buffer_output)
176 flush_output(o);
179 static void output_commit_title(struct merge_options *o, struct commit *commit)
181 int i;
182 flush_output(o);
183 for (i = o->call_depth; i--;)
184 fputs(" ", stdout);
185 if (commit->util)
186 printf("virtual %s\n", merge_remote_util(commit)->name);
187 else {
188 printf("%s ", find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
189 if (parse_commit(commit) != 0)
190 printf(_("(bad commit)\n"));
191 else {
192 const char *title;
193 const char *msg = get_commit_buffer(commit);
194 int len = find_commit_subject(msg, &title);
195 if (len)
196 printf("%.*s\n", len, title);
197 unuse_commit_buffer(commit, msg);
202 static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
203 const char *path, int stage, int refresh, int options)
205 struct cache_entry *ce;
206 ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage,
207 (refresh ? (CE_MATCH_REFRESH |
208 CE_MATCH_IGNORE_MISSING) : 0 ));
209 if (!ce)
210 return error(_("addinfo_cache failed for path '%s'"), path);
211 return add_cache_entry(ce, options);
214 static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
216 parse_tree(tree);
217 init_tree_desc(desc, tree->buffer, tree->size);
220 static int git_merge_trees(int index_only,
221 struct tree *common,
222 struct tree *head,
223 struct tree *merge)
225 int rc;
226 struct tree_desc t[3];
227 struct unpack_trees_options opts;
229 memset(&opts, 0, sizeof(opts));
230 if (index_only)
231 opts.index_only = 1;
232 else
233 opts.update = 1;
234 opts.merge = 1;
235 opts.head_idx = 2;
236 opts.fn = threeway_merge;
237 opts.src_index = &the_index;
238 opts.dst_index = &the_index;
239 setup_unpack_trees_porcelain(&opts, "merge");
241 init_tree_desc_from_tree(t+0, common);
242 init_tree_desc_from_tree(t+1, head);
243 init_tree_desc_from_tree(t+2, merge);
245 rc = unpack_trees(3, t, &opts);
246 cache_tree_free(&active_cache_tree);
247 return rc;
250 struct tree *write_tree_from_memory(struct merge_options *o)
252 struct tree *result = NULL;
254 if (unmerged_cache()) {
255 int i;
256 fprintf(stderr, "BUG: There are unmerged index entries:\n");
257 for (i = 0; i < active_nr; i++) {
258 const struct cache_entry *ce = active_cache[i];
259 if (ce_stage(ce))
260 fprintf(stderr, "BUG: %d %.*s\n", ce_stage(ce),
261 (int)ce_namelen(ce), ce->name);
263 die("Bug in merge-recursive.c");
266 if (!active_cache_tree)
267 active_cache_tree = cache_tree();
269 if (!cache_tree_fully_valid(active_cache_tree) &&
270 cache_tree_update(active_cache_tree,
271 (const struct cache_entry * const *)active_cache,
272 active_nr, 0) < 0)
273 die(_("error building trees"));
275 result = lookup_tree(active_cache_tree->sha1);
277 return result;
280 static int save_files_dirs(const unsigned char *sha1,
281 const char *base, int baselen, const char *path,
282 unsigned int mode, int stage, void *context)
284 int len = strlen(path);
285 char *newpath = xmalloc(baselen + len + 1);
286 struct merge_options *o = context;
288 memcpy(newpath, base, baselen);
289 memcpy(newpath + baselen, path, len);
290 newpath[baselen + len] = '\0';
292 if (S_ISDIR(mode))
293 string_list_insert(&o->current_directory_set, newpath);
294 else
295 string_list_insert(&o->current_file_set, newpath);
296 free(newpath);
298 return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
301 static int get_files_dirs(struct merge_options *o, struct tree *tree)
303 int n;
304 struct pathspec match_all;
305 memset(&match_all, 0, sizeof(match_all));
306 if (read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o))
307 return 0;
308 n = o->current_file_set.nr + o->current_directory_set.nr;
309 return n;
313 * Returns an index_entry instance which doesn't have to correspond to
314 * a real cache entry in Git's index.
316 static struct stage_data *insert_stage_data(const char *path,
317 struct tree *o, struct tree *a, struct tree *b,
318 struct string_list *entries)
320 struct string_list_item *item;
321 struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
322 get_tree_entry(o->object.sha1, path,
323 e->stages[1].sha, &e->stages[1].mode);
324 get_tree_entry(a->object.sha1, path,
325 e->stages[2].sha, &e->stages[2].mode);
326 get_tree_entry(b->object.sha1, path,
327 e->stages[3].sha, &e->stages[3].mode);
328 item = string_list_insert(entries, path);
329 item->util = e;
330 return e;
334 * Create a dictionary mapping file names to stage_data objects. The
335 * dictionary contains one entry for every path with a non-zero stage entry.
337 static struct string_list *get_unmerged(void)
339 struct string_list *unmerged = xcalloc(1, sizeof(struct string_list));
340 int i;
342 unmerged->strdup_strings = 1;
344 for (i = 0; i < active_nr; i++) {
345 struct string_list_item *item;
346 struct stage_data *e;
347 const struct cache_entry *ce = active_cache[i];
348 if (!ce_stage(ce))
349 continue;
351 item = string_list_lookup(unmerged, ce->name);
352 if (!item) {
353 item = string_list_insert(unmerged, ce->name);
354 item->util = xcalloc(1, sizeof(struct stage_data));
356 e = item->util;
357 e->stages[ce_stage(ce)].mode = ce->ce_mode;
358 hashcpy(e->stages[ce_stage(ce)].sha, ce->sha1);
361 return unmerged;
364 static int string_list_df_name_compare(const void *a, const void *b)
366 const struct string_list_item *one = a;
367 const struct string_list_item *two = b;
368 int onelen = strlen(one->string);
369 int twolen = strlen(two->string);
371 * Here we only care that entries for D/F conflicts are
372 * adjacent, in particular with the file of the D/F conflict
373 * appearing before files below the corresponding directory.
374 * The order of the rest of the list is irrelevant for us.
376 * To achieve this, we sort with df_name_compare and provide
377 * the mode S_IFDIR so that D/F conflicts will sort correctly.
378 * We use the mode S_IFDIR for everything else for simplicity,
379 * since in other cases any changes in their order due to
380 * sorting cause no problems for us.
382 int cmp = df_name_compare(one->string, onelen, S_IFDIR,
383 two->string, twolen, S_IFDIR);
385 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
386 * that 'foo' comes before 'foo/bar'.
388 if (cmp)
389 return cmp;
390 return onelen - twolen;
393 static void record_df_conflict_files(struct merge_options *o,
394 struct string_list *entries)
396 /* If there is a D/F conflict and the file for such a conflict
397 * currently exist in the working tree, we want to allow it to be
398 * removed to make room for the corresponding directory if needed.
399 * The files underneath the directories of such D/F conflicts will
400 * be processed before the corresponding file involved in the D/F
401 * conflict. If the D/F directory ends up being removed by the
402 * merge, then we won't have to touch the D/F file. If the D/F
403 * directory needs to be written to the working copy, then the D/F
404 * file will simply be removed (in make_room_for_path()) to make
405 * room for the necessary paths. Note that if both the directory
406 * and the file need to be present, then the D/F file will be
407 * reinstated with a new unique name at the time it is processed.
409 struct string_list df_sorted_entries;
410 const char *last_file = NULL;
411 int last_len = 0;
412 int i;
415 * If we're merging merge-bases, we don't want to bother with
416 * any working directory changes.
418 if (o->call_depth)
419 return;
421 /* Ensure D/F conflicts are adjacent in the entries list. */
422 memset(&df_sorted_entries, 0, sizeof(struct string_list));
423 for (i = 0; i < entries->nr; i++) {
424 struct string_list_item *next = &entries->items[i];
425 string_list_append(&df_sorted_entries, next->string)->util =
426 next->util;
428 qsort(df_sorted_entries.items, entries->nr, sizeof(*entries->items),
429 string_list_df_name_compare);
431 string_list_clear(&o->df_conflict_file_set, 1);
432 for (i = 0; i < df_sorted_entries.nr; i++) {
433 const char *path = df_sorted_entries.items[i].string;
434 int len = strlen(path);
435 struct stage_data *e = df_sorted_entries.items[i].util;
438 * Check if last_file & path correspond to a D/F conflict;
439 * i.e. whether path is last_file+'/'+<something>.
440 * If so, record that it's okay to remove last_file to make
441 * room for path and friends if needed.
443 if (last_file &&
444 len > last_len &&
445 memcmp(path, last_file, last_len) == 0 &&
446 path[last_len] == '/') {
447 string_list_insert(&o->df_conflict_file_set, last_file);
451 * Determine whether path could exist as a file in the
452 * working directory as a possible D/F conflict. This
453 * will only occur when it exists in stage 2 as a
454 * file.
456 if (S_ISREG(e->stages[2].mode) || S_ISLNK(e->stages[2].mode)) {
457 last_file = path;
458 last_len = len;
459 } else {
460 last_file = NULL;
463 string_list_clear(&df_sorted_entries, 0);
466 struct rename {
467 struct diff_filepair *pair;
468 struct stage_data *src_entry;
469 struct stage_data *dst_entry;
470 unsigned processed:1;
474 * Get information of all renames which occurred between 'o_tree' and
475 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
476 * 'b_tree') to be able to associate the correct cache entries with
477 * the rename information. 'tree' is always equal to either a_tree or b_tree.
479 static struct string_list *get_renames(struct merge_options *o,
480 struct tree *tree,
481 struct tree *o_tree,
482 struct tree *a_tree,
483 struct tree *b_tree,
484 struct string_list *entries)
486 int i;
487 struct string_list *renames;
488 struct diff_options opts;
490 renames = xcalloc(1, sizeof(struct string_list));
491 diff_setup(&opts);
492 DIFF_OPT_SET(&opts, RECURSIVE);
493 DIFF_OPT_CLR(&opts, RENAME_EMPTY);
494 opts.detect_rename = DIFF_DETECT_RENAME;
495 opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
496 o->diff_rename_limit >= 0 ? o->diff_rename_limit :
497 1000;
498 opts.rename_score = o->rename_score;
499 opts.show_rename_progress = o->show_rename_progress;
500 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
501 diff_setup_done(&opts);
502 diff_tree_sha1(o_tree->object.sha1, tree->object.sha1, "", &opts);
503 diffcore_std(&opts);
504 if (opts.needed_rename_limit > o->needed_rename_limit)
505 o->needed_rename_limit = opts.needed_rename_limit;
506 for (i = 0; i < diff_queued_diff.nr; ++i) {
507 struct string_list_item *item;
508 struct rename *re;
509 struct diff_filepair *pair = diff_queued_diff.queue[i];
510 if (pair->status != 'R') {
511 diff_free_filepair(pair);
512 continue;
514 re = xmalloc(sizeof(*re));
515 re->processed = 0;
516 re->pair = pair;
517 item = string_list_lookup(entries, re->pair->one->path);
518 if (!item)
519 re->src_entry = insert_stage_data(re->pair->one->path,
520 o_tree, a_tree, b_tree, entries);
521 else
522 re->src_entry = item->util;
524 item = string_list_lookup(entries, re->pair->two->path);
525 if (!item)
526 re->dst_entry = insert_stage_data(re->pair->two->path,
527 o_tree, a_tree, b_tree, entries);
528 else
529 re->dst_entry = item->util;
530 item = string_list_insert(renames, pair->one->path);
531 item->util = re;
533 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
534 diff_queued_diff.nr = 0;
535 diff_flush(&opts);
536 return renames;
539 static int update_stages(const char *path, const struct diff_filespec *o,
540 const struct diff_filespec *a,
541 const struct diff_filespec *b)
545 * NOTE: It is usually a bad idea to call update_stages on a path
546 * before calling update_file on that same path, since it can
547 * sometimes lead to spurious "refusing to lose untracked file..."
548 * messages from update_file (via make_room_for path via
549 * would_lose_untracked). Instead, reverse the order of the calls
550 * (executing update_file first and then update_stages).
552 int clear = 1;
553 int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_SKIP_DFCHECK;
554 if (clear)
555 if (remove_file_from_cache(path))
556 return -1;
557 if (o)
558 if (add_cacheinfo(o->mode, o->sha1, path, 1, 0, options))
559 return -1;
560 if (a)
561 if (add_cacheinfo(a->mode, a->sha1, path, 2, 0, options))
562 return -1;
563 if (b)
564 if (add_cacheinfo(b->mode, b->sha1, path, 3, 0, options))
565 return -1;
566 return 0;
569 static void update_entry(struct stage_data *entry,
570 struct diff_filespec *o,
571 struct diff_filespec *a,
572 struct diff_filespec *b)
574 entry->processed = 0;
575 entry->stages[1].mode = o->mode;
576 entry->stages[2].mode = a->mode;
577 entry->stages[3].mode = b->mode;
578 hashcpy(entry->stages[1].sha, o->sha1);
579 hashcpy(entry->stages[2].sha, a->sha1);
580 hashcpy(entry->stages[3].sha, b->sha1);
583 static int remove_file(struct merge_options *o, int clean,
584 const char *path, int no_wd)
586 int update_cache = o->call_depth || clean;
587 int update_working_directory = !o->call_depth && !no_wd;
589 if (update_cache) {
590 if (remove_file_from_cache(path))
591 return -1;
593 if (update_working_directory) {
594 if (remove_path(path))
595 return -1;
597 return 0;
600 static char *unique_path(struct merge_options *o, const char *path, const char *branch)
602 char *newpath = xmalloc(strlen(path) + 1 + strlen(branch) + 8 + 1);
603 int suffix = 0;
604 struct stat st;
605 char *p = newpath + strlen(path);
606 strcpy(newpath, path);
607 *(p++) = '~';
608 strcpy(p, branch);
609 for (; *p; ++p)
610 if ('/' == *p)
611 *p = '_';
612 while (string_list_has_string(&o->current_file_set, newpath) ||
613 string_list_has_string(&o->current_directory_set, newpath) ||
614 lstat(newpath, &st) == 0)
615 sprintf(p, "_%d", suffix++);
617 string_list_insert(&o->current_file_set, newpath);
618 return newpath;
621 static int dir_in_way(const char *path, int check_working_copy)
623 int pos, pathlen = strlen(path);
624 char *dirpath = xmalloc(pathlen + 2);
625 struct stat st;
627 strcpy(dirpath, path);
628 dirpath[pathlen] = '/';
629 dirpath[pathlen+1] = '\0';
631 pos = cache_name_pos(dirpath, pathlen+1);
633 if (pos < 0)
634 pos = -1 - pos;
635 if (pos < active_nr &&
636 !strncmp(dirpath, active_cache[pos]->name, pathlen+1)) {
637 free(dirpath);
638 return 1;
641 free(dirpath);
642 return check_working_copy && !lstat(path, &st) && S_ISDIR(st.st_mode);
645 static int was_tracked(const char *path)
647 int pos = cache_name_pos(path, strlen(path));
649 if (pos < 0)
650 pos = -1 - pos;
651 while (pos < active_nr &&
652 !strcmp(path, active_cache[pos]->name)) {
654 * If stage #0, it is definitely tracked.
655 * If it has stage #2 then it was tracked
656 * before this merge started. All other
657 * cases the path was not tracked.
659 switch (ce_stage(active_cache[pos])) {
660 case 0:
661 case 2:
662 return 1;
664 pos++;
666 return 0;
669 static int would_lose_untracked(const char *path)
671 return !was_tracked(path) && file_exists(path);
674 static int make_room_for_path(struct merge_options *o, const char *path)
676 int status, i;
677 const char *msg = _("failed to create path '%s'%s");
679 /* Unlink any D/F conflict files that are in the way */
680 for (i = 0; i < o->df_conflict_file_set.nr; i++) {
681 const char *df_path = o->df_conflict_file_set.items[i].string;
682 size_t pathlen = strlen(path);
683 size_t df_pathlen = strlen(df_path);
684 if (df_pathlen < pathlen &&
685 path[df_pathlen] == '/' &&
686 strncmp(path, df_path, df_pathlen) == 0) {
687 output(o, 3,
688 _("Removing %s to make room for subdirectory\n"),
689 df_path);
690 unlink(df_path);
691 unsorted_string_list_delete_item(&o->df_conflict_file_set,
692 i, 0);
693 break;
697 /* Make sure leading directories are created */
698 status = safe_create_leading_directories_const(path);
699 if (status) {
700 if (status == SCLD_EXISTS) {
701 /* something else exists */
702 error(msg, path, _(": perhaps a D/F conflict?"));
703 return -1;
705 die(msg, path, "");
709 * Do not unlink a file in the work tree if we are not
710 * tracking it.
712 if (would_lose_untracked(path))
713 return error(_("refusing to lose untracked file at '%s'"),
714 path);
716 /* Successful unlink is good.. */
717 if (!unlink(path))
718 return 0;
719 /* .. and so is no existing file */
720 if (errno == ENOENT)
721 return 0;
722 /* .. but not some other error (who really cares what?) */
723 return error(msg, path, _(": perhaps a D/F conflict?"));
726 static void update_file_flags(struct merge_options *o,
727 const unsigned char *sha,
728 unsigned mode,
729 const char *path,
730 int update_cache,
731 int update_wd)
733 if (o->call_depth)
734 update_wd = 0;
736 if (update_wd) {
737 enum object_type type;
738 void *buf;
739 unsigned long size;
741 if (S_ISGITLINK(mode)) {
743 * We may later decide to recursively descend into
744 * the submodule directory and update its index
745 * and/or work tree, but we do not do that now.
747 update_wd = 0;
748 goto update_index;
751 buf = read_sha1_file(sha, &type, &size);
752 if (!buf)
753 die(_("cannot read object %s '%s'"), sha1_to_hex(sha), path);
754 if (type != OBJ_BLOB)
755 die(_("blob expected for %s '%s'"), sha1_to_hex(sha), path);
756 if (S_ISREG(mode)) {
757 struct strbuf strbuf = STRBUF_INIT;
758 if (convert_to_working_tree(path, buf, size, &strbuf)) {
759 free(buf);
760 size = strbuf.len;
761 buf = strbuf_detach(&strbuf, NULL);
765 if (make_room_for_path(o, path) < 0) {
766 update_wd = 0;
767 free(buf);
768 goto update_index;
770 if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) {
771 int fd;
772 if (mode & 0100)
773 mode = 0777;
774 else
775 mode = 0666;
776 fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
777 if (fd < 0)
778 die_errno(_("failed to open '%s'"), path);
779 write_in_full(fd, buf, size);
780 close(fd);
781 } else if (S_ISLNK(mode)) {
782 char *lnk = xmemdupz(buf, size);
783 safe_create_leading_directories_const(path);
784 unlink(path);
785 if (symlink(lnk, path))
786 die_errno(_("failed to symlink '%s'"), path);
787 free(lnk);
788 } else
789 die(_("do not know what to do with %06o %s '%s'"),
790 mode, sha1_to_hex(sha), path);
791 free(buf);
793 update_index:
794 if (update_cache)
795 add_cacheinfo(mode, sha, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
798 static void update_file(struct merge_options *o,
799 int clean,
800 const unsigned char *sha,
801 unsigned mode,
802 const char *path)
804 update_file_flags(o, sha, mode, path, o->call_depth || clean, !o->call_depth);
807 /* Low level file merging, update and removal */
809 struct merge_file_info {
810 unsigned char sha[20];
811 unsigned mode;
812 unsigned clean:1,
813 merge:1;
816 static int merge_3way(struct merge_options *o,
817 mmbuffer_t *result_buf,
818 const struct diff_filespec *one,
819 const struct diff_filespec *a,
820 const struct diff_filespec *b,
821 const char *branch1,
822 const char *branch2)
824 mmfile_t orig, src1, src2;
825 struct ll_merge_options ll_opts = {0};
826 char *base_name, *name1, *name2;
827 int merge_status;
829 ll_opts.renormalize = o->renormalize;
830 ll_opts.xdl_opts = o->xdl_opts;
832 if (o->call_depth) {
833 ll_opts.virtual_ancestor = 1;
834 ll_opts.variant = 0;
835 } else {
836 switch (o->recursive_variant) {
837 case MERGE_RECURSIVE_OURS:
838 ll_opts.variant = XDL_MERGE_FAVOR_OURS;
839 break;
840 case MERGE_RECURSIVE_THEIRS:
841 ll_opts.variant = XDL_MERGE_FAVOR_THEIRS;
842 break;
843 default:
844 ll_opts.variant = 0;
845 break;
849 if (strcmp(a->path, b->path) ||
850 (o->ancestor != NULL && strcmp(a->path, one->path) != 0)) {
851 base_name = o->ancestor == NULL ? NULL :
852 mkpathdup("%s:%s", o->ancestor, one->path);
853 name1 = mkpathdup("%s:%s", branch1, a->path);
854 name2 = mkpathdup("%s:%s", branch2, b->path);
855 } else {
856 base_name = o->ancestor == NULL ? NULL :
857 mkpathdup("%s", o->ancestor);
858 name1 = mkpathdup("%s", branch1);
859 name2 = mkpathdup("%s", branch2);
862 read_mmblob(&orig, one->sha1);
863 read_mmblob(&src1, a->sha1);
864 read_mmblob(&src2, b->sha1);
866 merge_status = ll_merge(result_buf, a->path, &orig, base_name,
867 &src1, name1, &src2, name2, &ll_opts);
869 free(base_name);
870 free(name1);
871 free(name2);
872 free(orig.ptr);
873 free(src1.ptr);
874 free(src2.ptr);
875 return merge_status;
878 static struct merge_file_info merge_file_1(struct merge_options *o,
879 const struct diff_filespec *one,
880 const struct diff_filespec *a,
881 const struct diff_filespec *b,
882 const char *branch1,
883 const char *branch2)
885 struct merge_file_info result;
886 result.merge = 0;
887 result.clean = 1;
889 if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
890 result.clean = 0;
891 if (S_ISREG(a->mode)) {
892 result.mode = a->mode;
893 hashcpy(result.sha, a->sha1);
894 } else {
895 result.mode = b->mode;
896 hashcpy(result.sha, b->sha1);
898 } else {
899 if (!sha_eq(a->sha1, one->sha1) && !sha_eq(b->sha1, one->sha1))
900 result.merge = 1;
903 * Merge modes
905 if (a->mode == b->mode || a->mode == one->mode)
906 result.mode = b->mode;
907 else {
908 result.mode = a->mode;
909 if (b->mode != one->mode) {
910 result.clean = 0;
911 result.merge = 1;
915 if (sha_eq(a->sha1, b->sha1) || sha_eq(a->sha1, one->sha1))
916 hashcpy(result.sha, b->sha1);
917 else if (sha_eq(b->sha1, one->sha1))
918 hashcpy(result.sha, a->sha1);
919 else if (S_ISREG(a->mode)) {
920 mmbuffer_t result_buf;
921 int merge_status;
923 merge_status = merge_3way(o, &result_buf, one, a, b,
924 branch1, branch2);
926 if ((merge_status < 0) || !result_buf.ptr)
927 die(_("Failed to execute internal merge"));
929 if (write_sha1_file(result_buf.ptr, result_buf.size,
930 blob_type, result.sha))
931 die(_("Unable to add %s to database"),
932 a->path);
934 free(result_buf.ptr);
935 result.clean = (merge_status == 0);
936 } else if (S_ISGITLINK(a->mode)) {
937 result.clean = merge_submodule(result.sha,
938 one->path, one->sha1,
939 a->sha1, b->sha1,
940 !o->call_depth);
941 } else if (S_ISLNK(a->mode)) {
942 hashcpy(result.sha, a->sha1);
944 if (!sha_eq(a->sha1, b->sha1))
945 result.clean = 0;
946 } else {
947 die(_("unsupported object type in the tree"));
951 return result;
954 static struct merge_file_info
955 merge_file_special_markers(struct merge_options *o,
956 const struct diff_filespec *one,
957 const struct diff_filespec *a,
958 const struct diff_filespec *b,
959 const char *branch1,
960 const char *filename1,
961 const char *branch2,
962 const char *filename2)
964 char *side1 = NULL;
965 char *side2 = NULL;
966 struct merge_file_info mfi;
968 if (filename1) {
969 side1 = xmalloc(strlen(branch1) + strlen(filename1) + 2);
970 sprintf(side1, "%s:%s", branch1, filename1);
972 if (filename2) {
973 side2 = xmalloc(strlen(branch2) + strlen(filename2) + 2);
974 sprintf(side2, "%s:%s", branch2, filename2);
977 mfi = merge_file_1(o, one, a, b,
978 side1 ? side1 : branch1, side2 ? side2 : branch2);
979 free(side1);
980 free(side2);
981 return mfi;
984 static struct merge_file_info merge_file_one(struct merge_options *o,
985 const char *path,
986 const unsigned char *o_sha, int o_mode,
987 const unsigned char *a_sha, int a_mode,
988 const unsigned char *b_sha, int b_mode,
989 const char *branch1,
990 const char *branch2)
992 struct diff_filespec one, a, b;
994 one.path = a.path = b.path = (char *)path;
995 hashcpy(one.sha1, o_sha);
996 one.mode = o_mode;
997 hashcpy(a.sha1, a_sha);
998 a.mode = a_mode;
999 hashcpy(b.sha1, b_sha);
1000 b.mode = b_mode;
1001 return merge_file_1(o, &one, &a, &b, branch1, branch2);
1004 static void handle_change_delete(struct merge_options *o,
1005 const char *path,
1006 const unsigned char *o_sha, int o_mode,
1007 const unsigned char *a_sha, int a_mode,
1008 const unsigned char *b_sha, int b_mode,
1009 const char *change, const char *change_past)
1011 char *renamed = NULL;
1012 if (dir_in_way(path, !o->call_depth)) {
1013 renamed = unique_path(o, path, a_sha ? o->branch1 : o->branch2);
1016 if (o->call_depth) {
1018 * We cannot arbitrarily accept either a_sha or b_sha as
1019 * correct; since there is no true "middle point" between
1020 * them, simply reuse the base version for virtual merge base.
1022 remove_file_from_cache(path);
1023 update_file(o, 0, o_sha, o_mode, renamed ? renamed : path);
1024 } else if (!a_sha) {
1025 if (!renamed) {
1026 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1027 "and %s in %s. Version %s of %s left in tree."),
1028 change, path, o->branch1, change_past,
1029 o->branch2, o->branch2, path);
1030 update_file(o, 0, b_sha, b_mode, path);
1031 } else {
1032 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1033 "and %s in %s. Version %s of %s left in tree at %s."),
1034 change, path, o->branch1, change_past,
1035 o->branch2, o->branch2, path, renamed);
1036 update_file(o, 0, b_sha, b_mode, renamed);
1038 } else {
1039 if (!renamed) {
1040 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1041 "and %s in %s. Version %s of %s left in tree."),
1042 change, path, o->branch2, change_past,
1043 o->branch1, o->branch1, path);
1044 } else {
1045 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1046 "and %s in %s. Version %s of %s left in tree at %s."),
1047 change, path, o->branch2, change_past,
1048 o->branch1, o->branch1, path, renamed);
1049 update_file(o, 0, a_sha, a_mode, renamed);
1052 * No need to call update_file() on path when !renamed, since
1053 * that would needlessly touch path. We could call
1054 * update_file_flags() with update_cache=0 and update_wd=0,
1055 * but that's a no-op.
1058 free(renamed);
1061 static void conflict_rename_delete(struct merge_options *o,
1062 struct diff_filepair *pair,
1063 const char *rename_branch,
1064 const char *other_branch)
1066 const struct diff_filespec *orig = pair->one;
1067 const struct diff_filespec *dest = pair->two;
1068 const unsigned char *a_sha = NULL;
1069 const unsigned char *b_sha = NULL;
1070 int a_mode = 0;
1071 int b_mode = 0;
1073 if (rename_branch == o->branch1) {
1074 a_sha = dest->sha1;
1075 a_mode = dest->mode;
1076 } else {
1077 b_sha = dest->sha1;
1078 b_mode = dest->mode;
1081 handle_change_delete(o,
1082 o->call_depth ? orig->path : dest->path,
1083 orig->sha1, orig->mode,
1084 a_sha, a_mode,
1085 b_sha, b_mode,
1086 _("rename"), _("renamed"));
1088 if (o->call_depth) {
1089 remove_file_from_cache(dest->path);
1090 } else {
1091 update_stages(dest->path, NULL,
1092 rename_branch == o->branch1 ? dest : NULL,
1093 rename_branch == o->branch1 ? NULL : dest);
1098 static struct diff_filespec *filespec_from_entry(struct diff_filespec *target,
1099 struct stage_data *entry,
1100 int stage)
1102 unsigned char *sha = entry->stages[stage].sha;
1103 unsigned mode = entry->stages[stage].mode;
1104 if (mode == 0 || is_null_sha1(sha))
1105 return NULL;
1106 hashcpy(target->sha1, sha);
1107 target->mode = mode;
1108 return target;
1111 static void handle_file(struct merge_options *o,
1112 struct diff_filespec *rename,
1113 int stage,
1114 struct rename_conflict_info *ci)
1116 char *dst_name = rename->path;
1117 struct stage_data *dst_entry;
1118 const char *cur_branch, *other_branch;
1119 struct diff_filespec other;
1120 struct diff_filespec *add;
1122 if (stage == 2) {
1123 dst_entry = ci->dst_entry1;
1124 cur_branch = ci->branch1;
1125 other_branch = ci->branch2;
1126 } else {
1127 dst_entry = ci->dst_entry2;
1128 cur_branch = ci->branch2;
1129 other_branch = ci->branch1;
1132 add = filespec_from_entry(&other, dst_entry, stage ^ 1);
1133 if (add) {
1134 char *add_name = unique_path(o, rename->path, other_branch);
1135 update_file(o, 0, add->sha1, add->mode, add_name);
1137 remove_file(o, 0, rename->path, 0);
1138 dst_name = unique_path(o, rename->path, cur_branch);
1139 } else {
1140 if (dir_in_way(rename->path, !o->call_depth)) {
1141 dst_name = unique_path(o, rename->path, cur_branch);
1142 output(o, 1, _("%s is a directory in %s adding as %s instead"),
1143 rename->path, other_branch, dst_name);
1146 update_file(o, 0, rename->sha1, rename->mode, dst_name);
1147 if (stage == 2)
1148 update_stages(rename->path, NULL, rename, add);
1149 else
1150 update_stages(rename->path, NULL, add, rename);
1152 if (dst_name != rename->path)
1153 free(dst_name);
1156 static void conflict_rename_rename_1to2(struct merge_options *o,
1157 struct rename_conflict_info *ci)
1159 /* One file was renamed in both branches, but to different names. */
1160 struct diff_filespec *one = ci->pair1->one;
1161 struct diff_filespec *a = ci->pair1->two;
1162 struct diff_filespec *b = ci->pair2->two;
1164 output(o, 1, _("CONFLICT (rename/rename): "
1165 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1166 "rename \"%s\"->\"%s\" in \"%s\"%s"),
1167 one->path, a->path, ci->branch1,
1168 one->path, b->path, ci->branch2,
1169 o->call_depth ? _(" (left unresolved)") : "");
1170 if (o->call_depth) {
1171 struct merge_file_info mfi;
1172 struct diff_filespec other;
1173 struct diff_filespec *add;
1174 mfi = merge_file_one(o, one->path,
1175 one->sha1, one->mode,
1176 a->sha1, a->mode,
1177 b->sha1, b->mode,
1178 ci->branch1, ci->branch2);
1180 * FIXME: For rename/add-source conflicts (if we could detect
1181 * such), this is wrong. We should instead find a unique
1182 * pathname and then either rename the add-source file to that
1183 * unique path, or use that unique path instead of src here.
1185 update_file(o, 0, mfi.sha, mfi.mode, one->path);
1188 * Above, we put the merged content at the merge-base's
1189 * path. Now we usually need to delete both a->path and
1190 * b->path. However, the rename on each side of the merge
1191 * could also be involved in a rename/add conflict. In
1192 * such cases, we should keep the added file around,
1193 * resolving the conflict at that path in its favor.
1195 add = filespec_from_entry(&other, ci->dst_entry1, 2 ^ 1);
1196 if (add)
1197 update_file(o, 0, add->sha1, add->mode, a->path);
1198 else
1199 remove_file_from_cache(a->path);
1200 add = filespec_from_entry(&other, ci->dst_entry2, 3 ^ 1);
1201 if (add)
1202 update_file(o, 0, add->sha1, add->mode, b->path);
1203 else
1204 remove_file_from_cache(b->path);
1205 } else {
1206 handle_file(o, a, 2, ci);
1207 handle_file(o, b, 3, ci);
1211 static void conflict_rename_rename_2to1(struct merge_options *o,
1212 struct rename_conflict_info *ci)
1214 /* Two files, a & b, were renamed to the same thing, c. */
1215 struct diff_filespec *a = ci->pair1->one;
1216 struct diff_filespec *b = ci->pair2->one;
1217 struct diff_filespec *c1 = ci->pair1->two;
1218 struct diff_filespec *c2 = ci->pair2->two;
1219 char *path = c1->path; /* == c2->path */
1220 struct merge_file_info mfi_c1;
1221 struct merge_file_info mfi_c2;
1223 output(o, 1, _("CONFLICT (rename/rename): "
1224 "Rename %s->%s in %s. "
1225 "Rename %s->%s in %s"),
1226 a->path, c1->path, ci->branch1,
1227 b->path, c2->path, ci->branch2);
1229 remove_file(o, 1, a->path, would_lose_untracked(a->path));
1230 remove_file(o, 1, b->path, would_lose_untracked(b->path));
1232 mfi_c1 = merge_file_special_markers(o, a, c1, &ci->ren1_other,
1233 o->branch1, c1->path,
1234 o->branch2, ci->ren1_other.path);
1235 mfi_c2 = merge_file_special_markers(o, b, &ci->ren2_other, c2,
1236 o->branch1, ci->ren2_other.path,
1237 o->branch2, c2->path);
1239 if (o->call_depth) {
1241 * If mfi_c1.clean && mfi_c2.clean, then it might make
1242 * sense to do a two-way merge of those results. But, I
1243 * think in all cases, it makes sense to have the virtual
1244 * merge base just undo the renames; they can be detected
1245 * again later for the non-recursive merge.
1247 remove_file(o, 0, path, 0);
1248 update_file(o, 0, mfi_c1.sha, mfi_c1.mode, a->path);
1249 update_file(o, 0, mfi_c2.sha, mfi_c2.mode, b->path);
1250 } else {
1251 char *new_path1 = unique_path(o, path, ci->branch1);
1252 char *new_path2 = unique_path(o, path, ci->branch2);
1253 output(o, 1, _("Renaming %s to %s and %s to %s instead"),
1254 a->path, new_path1, b->path, new_path2);
1255 remove_file(o, 0, path, 0);
1256 update_file(o, 0, mfi_c1.sha, mfi_c1.mode, new_path1);
1257 update_file(o, 0, mfi_c2.sha, mfi_c2.mode, new_path2);
1258 free(new_path2);
1259 free(new_path1);
1263 static int process_renames(struct merge_options *o,
1264 struct string_list *a_renames,
1265 struct string_list *b_renames)
1267 int clean_merge = 1, i, j;
1268 struct string_list a_by_dst = STRING_LIST_INIT_NODUP;
1269 struct string_list b_by_dst = STRING_LIST_INIT_NODUP;
1270 const struct rename *sre;
1272 for (i = 0; i < a_renames->nr; i++) {
1273 sre = a_renames->items[i].util;
1274 string_list_insert(&a_by_dst, sre->pair->two->path)->util
1275 = (void *)sre;
1277 for (i = 0; i < b_renames->nr; i++) {
1278 sre = b_renames->items[i].util;
1279 string_list_insert(&b_by_dst, sre->pair->two->path)->util
1280 = (void *)sre;
1283 for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
1284 struct string_list *renames1, *renames2Dst;
1285 struct rename *ren1 = NULL, *ren2 = NULL;
1286 const char *branch1, *branch2;
1287 const char *ren1_src, *ren1_dst;
1288 struct string_list_item *lookup;
1290 if (i >= a_renames->nr) {
1291 ren2 = b_renames->items[j++].util;
1292 } else if (j >= b_renames->nr) {
1293 ren1 = a_renames->items[i++].util;
1294 } else {
1295 int compare = strcmp(a_renames->items[i].string,
1296 b_renames->items[j].string);
1297 if (compare <= 0)
1298 ren1 = a_renames->items[i++].util;
1299 if (compare >= 0)
1300 ren2 = b_renames->items[j++].util;
1303 /* TODO: refactor, so that 1/2 are not needed */
1304 if (ren1) {
1305 renames1 = a_renames;
1306 renames2Dst = &b_by_dst;
1307 branch1 = o->branch1;
1308 branch2 = o->branch2;
1309 } else {
1310 struct rename *tmp;
1311 renames1 = b_renames;
1312 renames2Dst = &a_by_dst;
1313 branch1 = o->branch2;
1314 branch2 = o->branch1;
1315 tmp = ren2;
1316 ren2 = ren1;
1317 ren1 = tmp;
1320 if (ren1->processed)
1321 continue;
1322 ren1->processed = 1;
1323 ren1->dst_entry->processed = 1;
1324 /* BUG: We should only mark src_entry as processed if we
1325 * are not dealing with a rename + add-source case.
1327 ren1->src_entry->processed = 1;
1329 ren1_src = ren1->pair->one->path;
1330 ren1_dst = ren1->pair->two->path;
1332 if (ren2) {
1333 /* One file renamed on both sides */
1334 const char *ren2_src = ren2->pair->one->path;
1335 const char *ren2_dst = ren2->pair->two->path;
1336 enum rename_type rename_type;
1337 if (strcmp(ren1_src, ren2_src) != 0)
1338 die("ren1_src != ren2_src");
1339 ren2->dst_entry->processed = 1;
1340 ren2->processed = 1;
1341 if (strcmp(ren1_dst, ren2_dst) != 0) {
1342 rename_type = RENAME_ONE_FILE_TO_TWO;
1343 clean_merge = 0;
1344 } else {
1345 rename_type = RENAME_ONE_FILE_TO_ONE;
1346 /* BUG: We should only remove ren1_src in
1347 * the base stage (think of rename +
1348 * add-source cases).
1350 remove_file(o, 1, ren1_src, 1);
1351 update_entry(ren1->dst_entry,
1352 ren1->pair->one,
1353 ren1->pair->two,
1354 ren2->pair->two);
1356 setup_rename_conflict_info(rename_type,
1357 ren1->pair,
1358 ren2->pair,
1359 branch1,
1360 branch2,
1361 ren1->dst_entry,
1362 ren2->dst_entry,
1364 NULL,
1365 NULL);
1366 } else if ((lookup = string_list_lookup(renames2Dst, ren1_dst))) {
1367 /* Two different files renamed to the same thing */
1368 char *ren2_dst;
1369 ren2 = lookup->util;
1370 ren2_dst = ren2->pair->two->path;
1371 if (strcmp(ren1_dst, ren2_dst) != 0)
1372 die("ren1_dst != ren2_dst");
1374 clean_merge = 0;
1375 ren2->processed = 1;
1377 * BUG: We should only mark src_entry as processed
1378 * if we are not dealing with a rename + add-source
1379 * case.
1381 ren2->src_entry->processed = 1;
1383 setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE,
1384 ren1->pair,
1385 ren2->pair,
1386 branch1,
1387 branch2,
1388 ren1->dst_entry,
1389 ren2->dst_entry,
1391 ren1->src_entry,
1392 ren2->src_entry);
1394 } else {
1395 /* Renamed in 1, maybe changed in 2 */
1396 /* we only use sha1 and mode of these */
1397 struct diff_filespec src_other, dst_other;
1398 int try_merge;
1401 * unpack_trees loads entries from common-commit
1402 * into stage 1, from head-commit into stage 2, and
1403 * from merge-commit into stage 3. We keep track
1404 * of which side corresponds to the rename.
1406 int renamed_stage = a_renames == renames1 ? 2 : 3;
1407 int other_stage = a_renames == renames1 ? 3 : 2;
1409 /* BUG: We should only remove ren1_src in the base
1410 * stage and in other_stage (think of rename +
1411 * add-source case).
1413 remove_file(o, 1, ren1_src,
1414 renamed_stage == 2 || !was_tracked(ren1_src));
1416 hashcpy(src_other.sha1, ren1->src_entry->stages[other_stage].sha);
1417 src_other.mode = ren1->src_entry->stages[other_stage].mode;
1418 hashcpy(dst_other.sha1, ren1->dst_entry->stages[other_stage].sha);
1419 dst_other.mode = ren1->dst_entry->stages[other_stage].mode;
1420 try_merge = 0;
1422 if (sha_eq(src_other.sha1, null_sha1)) {
1423 setup_rename_conflict_info(RENAME_DELETE,
1424 ren1->pair,
1425 NULL,
1426 branch1,
1427 branch2,
1428 ren1->dst_entry,
1429 NULL,
1431 NULL,
1432 NULL);
1433 } else if ((dst_other.mode == ren1->pair->two->mode) &&
1434 sha_eq(dst_other.sha1, ren1->pair->two->sha1)) {
1436 * Added file on the other side identical to
1437 * the file being renamed: clean merge.
1438 * Also, there is no need to overwrite the
1439 * file already in the working copy, so call
1440 * update_file_flags() instead of
1441 * update_file().
1443 update_file_flags(o,
1444 ren1->pair->two->sha1,
1445 ren1->pair->two->mode,
1446 ren1_dst,
1447 1, /* update_cache */
1448 0 /* update_wd */);
1449 } else if (!sha_eq(dst_other.sha1, null_sha1)) {
1450 clean_merge = 0;
1451 try_merge = 1;
1452 output(o, 1, _("CONFLICT (rename/add): Rename %s->%s in %s. "
1453 "%s added in %s"),
1454 ren1_src, ren1_dst, branch1,
1455 ren1_dst, branch2);
1456 if (o->call_depth) {
1457 struct merge_file_info mfi;
1458 mfi = merge_file_one(o, ren1_dst, null_sha1, 0,
1459 ren1->pair->two->sha1, ren1->pair->two->mode,
1460 dst_other.sha1, dst_other.mode,
1461 branch1, branch2);
1462 output(o, 1, _("Adding merged %s"), ren1_dst);
1463 update_file(o, 0, mfi.sha, mfi.mode, ren1_dst);
1464 try_merge = 0;
1465 } else {
1466 char *new_path = unique_path(o, ren1_dst, branch2);
1467 output(o, 1, _("Adding as %s instead"), new_path);
1468 update_file(o, 0, dst_other.sha1, dst_other.mode, new_path);
1469 free(new_path);
1471 } else
1472 try_merge = 1;
1474 if (try_merge) {
1475 struct diff_filespec *one, *a, *b;
1476 src_other.path = (char *)ren1_src;
1478 one = ren1->pair->one;
1479 if (a_renames == renames1) {
1480 a = ren1->pair->two;
1481 b = &src_other;
1482 } else {
1483 b = ren1->pair->two;
1484 a = &src_other;
1486 update_entry(ren1->dst_entry, one, a, b);
1487 setup_rename_conflict_info(RENAME_NORMAL,
1488 ren1->pair,
1489 NULL,
1490 branch1,
1491 NULL,
1492 ren1->dst_entry,
1493 NULL,
1495 NULL,
1496 NULL);
1500 string_list_clear(&a_by_dst, 0);
1501 string_list_clear(&b_by_dst, 0);
1503 return clean_merge;
1506 static unsigned char *stage_sha(const unsigned char *sha, unsigned mode)
1508 return (is_null_sha1(sha) || mode == 0) ? NULL: (unsigned char *)sha;
1511 static int read_sha1_strbuf(const unsigned char *sha1, struct strbuf *dst)
1513 void *buf;
1514 enum object_type type;
1515 unsigned long size;
1516 buf = read_sha1_file(sha1, &type, &size);
1517 if (!buf)
1518 return error(_("cannot read object %s"), sha1_to_hex(sha1));
1519 if (type != OBJ_BLOB) {
1520 free(buf);
1521 return error(_("object %s is not a blob"), sha1_to_hex(sha1));
1523 strbuf_attach(dst, buf, size, size + 1);
1524 return 0;
1527 static int blob_unchanged(const unsigned char *o_sha,
1528 const unsigned char *a_sha,
1529 int renormalize, const char *path)
1531 struct strbuf o = STRBUF_INIT;
1532 struct strbuf a = STRBUF_INIT;
1533 int ret = 0; /* assume changed for safety */
1535 if (sha_eq(o_sha, a_sha))
1536 return 1;
1537 if (!renormalize)
1538 return 0;
1540 assert(o_sha && a_sha);
1541 if (read_sha1_strbuf(o_sha, &o) || read_sha1_strbuf(a_sha, &a))
1542 goto error_return;
1544 * Note: binary | is used so that both renormalizations are
1545 * performed. Comparison can be skipped if both files are
1546 * unchanged since their sha1s have already been compared.
1548 if (renormalize_buffer(path, o.buf, o.len, &o) |
1549 renormalize_buffer(path, a.buf, o.len, &a))
1550 ret = (o.len == a.len && !memcmp(o.buf, a.buf, o.len));
1552 error_return:
1553 strbuf_release(&o);
1554 strbuf_release(&a);
1555 return ret;
1558 static void handle_modify_delete(struct merge_options *o,
1559 const char *path,
1560 unsigned char *o_sha, int o_mode,
1561 unsigned char *a_sha, int a_mode,
1562 unsigned char *b_sha, int b_mode)
1564 handle_change_delete(o,
1565 path,
1566 o_sha, o_mode,
1567 a_sha, a_mode,
1568 b_sha, b_mode,
1569 _("modify"), _("modified"));
1572 static int merge_content(struct merge_options *o,
1573 const char *path,
1574 unsigned char *o_sha, int o_mode,
1575 unsigned char *a_sha, int a_mode,
1576 unsigned char *b_sha, int b_mode,
1577 struct rename_conflict_info *rename_conflict_info)
1579 const char *reason = _("content");
1580 const char *path1 = NULL, *path2 = NULL;
1581 struct merge_file_info mfi;
1582 struct diff_filespec one, a, b;
1583 unsigned df_conflict_remains = 0;
1585 if (!o_sha) {
1586 reason = _("add/add");
1587 o_sha = (unsigned char *)null_sha1;
1589 one.path = a.path = b.path = (char *)path;
1590 hashcpy(one.sha1, o_sha);
1591 one.mode = o_mode;
1592 hashcpy(a.sha1, a_sha);
1593 a.mode = a_mode;
1594 hashcpy(b.sha1, b_sha);
1595 b.mode = b_mode;
1597 if (rename_conflict_info) {
1598 struct diff_filepair *pair1 = rename_conflict_info->pair1;
1600 path1 = (o->branch1 == rename_conflict_info->branch1) ?
1601 pair1->two->path : pair1->one->path;
1602 /* If rename_conflict_info->pair2 != NULL, we are in
1603 * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
1604 * normal rename.
1606 path2 = (rename_conflict_info->pair2 ||
1607 o->branch2 == rename_conflict_info->branch1) ?
1608 pair1->two->path : pair1->one->path;
1610 if (dir_in_way(path, !o->call_depth))
1611 df_conflict_remains = 1;
1613 mfi = merge_file_special_markers(o, &one, &a, &b,
1614 o->branch1, path1,
1615 o->branch2, path2);
1617 if (mfi.clean && !df_conflict_remains &&
1618 sha_eq(mfi.sha, a_sha) && mfi.mode == a_mode) {
1619 int path_renamed_outside_HEAD;
1620 output(o, 3, _("Skipped %s (merged same as existing)"), path);
1622 * The content merge resulted in the same file contents we
1623 * already had. We can return early if those file contents
1624 * are recorded at the correct path (which may not be true
1625 * if the merge involves a rename).
1627 path_renamed_outside_HEAD = !path2 || !strcmp(path, path2);
1628 if (!path_renamed_outside_HEAD) {
1629 add_cacheinfo(mfi.mode, mfi.sha, path,
1630 0, (!o->call_depth), 0);
1631 return mfi.clean;
1633 } else
1634 output(o, 2, _("Auto-merging %s"), path);
1636 if (!mfi.clean) {
1637 if (S_ISGITLINK(mfi.mode))
1638 reason = _("submodule");
1639 output(o, 1, _("CONFLICT (%s): Merge conflict in %s"),
1640 reason, path);
1641 if (rename_conflict_info && !df_conflict_remains)
1642 update_stages(path, &one, &a, &b);
1645 if (df_conflict_remains) {
1646 char *new_path;
1647 if (o->call_depth) {
1648 remove_file_from_cache(path);
1649 } else {
1650 if (!mfi.clean)
1651 update_stages(path, &one, &a, &b);
1652 else {
1653 int file_from_stage2 = was_tracked(path);
1654 struct diff_filespec merged;
1655 hashcpy(merged.sha1, mfi.sha);
1656 merged.mode = mfi.mode;
1658 update_stages(path, NULL,
1659 file_from_stage2 ? &merged : NULL,
1660 file_from_stage2 ? NULL : &merged);
1664 new_path = unique_path(o, path, rename_conflict_info->branch1);
1665 output(o, 1, _("Adding as %s instead"), new_path);
1666 update_file(o, 0, mfi.sha, mfi.mode, new_path);
1667 free(new_path);
1668 mfi.clean = 0;
1669 } else {
1670 update_file(o, mfi.clean, mfi.sha, mfi.mode, path);
1672 return mfi.clean;
1676 /* Per entry merge function */
1677 static int process_entry(struct merge_options *o,
1678 const char *path, struct stage_data *entry)
1681 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1682 print_index_entry("\tpath: ", entry);
1684 int clean_merge = 1;
1685 int normalize = o->renormalize;
1686 unsigned o_mode = entry->stages[1].mode;
1687 unsigned a_mode = entry->stages[2].mode;
1688 unsigned b_mode = entry->stages[3].mode;
1689 unsigned char *o_sha = stage_sha(entry->stages[1].sha, o_mode);
1690 unsigned char *a_sha = stage_sha(entry->stages[2].sha, a_mode);
1691 unsigned char *b_sha = stage_sha(entry->stages[3].sha, b_mode);
1693 entry->processed = 1;
1694 if (entry->rename_conflict_info) {
1695 struct rename_conflict_info *conflict_info = entry->rename_conflict_info;
1696 switch (conflict_info->rename_type) {
1697 case RENAME_NORMAL:
1698 case RENAME_ONE_FILE_TO_ONE:
1699 clean_merge = merge_content(o, path,
1700 o_sha, o_mode, a_sha, a_mode, b_sha, b_mode,
1701 conflict_info);
1702 break;
1703 case RENAME_DELETE:
1704 clean_merge = 0;
1705 conflict_rename_delete(o, conflict_info->pair1,
1706 conflict_info->branch1,
1707 conflict_info->branch2);
1708 break;
1709 case RENAME_ONE_FILE_TO_TWO:
1710 clean_merge = 0;
1711 conflict_rename_rename_1to2(o, conflict_info);
1712 break;
1713 case RENAME_TWO_FILES_TO_ONE:
1714 clean_merge = 0;
1715 conflict_rename_rename_2to1(o, conflict_info);
1716 break;
1717 default:
1718 entry->processed = 0;
1719 break;
1721 } else if (o_sha && (!a_sha || !b_sha)) {
1722 /* Case A: Deleted in one */
1723 if ((!a_sha && !b_sha) ||
1724 (!b_sha && blob_unchanged(o_sha, a_sha, normalize, path)) ||
1725 (!a_sha && blob_unchanged(o_sha, b_sha, normalize, path))) {
1726 /* Deleted in both or deleted in one and
1727 * unchanged in the other */
1728 if (a_sha)
1729 output(o, 2, _("Removing %s"), path);
1730 /* do not touch working file if it did not exist */
1731 remove_file(o, 1, path, !a_sha);
1732 } else {
1733 /* Modify/delete; deleted side may have put a directory in the way */
1734 clean_merge = 0;
1735 handle_modify_delete(o, path, o_sha, o_mode,
1736 a_sha, a_mode, b_sha, b_mode);
1738 } else if ((!o_sha && a_sha && !b_sha) ||
1739 (!o_sha && !a_sha && b_sha)) {
1740 /* Case B: Added in one. */
1741 /* [nothing|directory] -> ([nothing|directory], file) */
1743 const char *add_branch;
1744 const char *other_branch;
1745 unsigned mode;
1746 const unsigned char *sha;
1747 const char *conf;
1749 if (a_sha) {
1750 add_branch = o->branch1;
1751 other_branch = o->branch2;
1752 mode = a_mode;
1753 sha = a_sha;
1754 conf = _("file/directory");
1755 } else {
1756 add_branch = o->branch2;
1757 other_branch = o->branch1;
1758 mode = b_mode;
1759 sha = b_sha;
1760 conf = _("directory/file");
1762 if (dir_in_way(path, !o->call_depth)) {
1763 char *new_path = unique_path(o, path, add_branch);
1764 clean_merge = 0;
1765 output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
1766 "Adding %s as %s"),
1767 conf, path, other_branch, path, new_path);
1768 if (o->call_depth)
1769 remove_file_from_cache(path);
1770 update_file(o, 0, sha, mode, new_path);
1771 if (o->call_depth)
1772 remove_file_from_cache(path);
1773 free(new_path);
1774 } else {
1775 output(o, 2, _("Adding %s"), path);
1776 /* do not overwrite file if already present */
1777 update_file_flags(o, sha, mode, path, 1, !a_sha);
1779 } else if (a_sha && b_sha) {
1780 /* Case C: Added in both (check for same permissions) and */
1781 /* case D: Modified in both, but differently. */
1782 clean_merge = merge_content(o, path,
1783 o_sha, o_mode, a_sha, a_mode, b_sha, b_mode,
1784 NULL);
1785 } else if (!o_sha && !a_sha && !b_sha) {
1787 * this entry was deleted altogether. a_mode == 0 means
1788 * we had that path and want to actively remove it.
1790 remove_file(o, 1, path, !a_mode);
1791 } else
1792 die(_("Fatal merge failure, shouldn't happen."));
1794 return clean_merge;
1797 int merge_trees(struct merge_options *o,
1798 struct tree *head,
1799 struct tree *merge,
1800 struct tree *common,
1801 struct tree **result)
1803 int code, clean;
1805 if (o->subtree_shift) {
1806 merge = shift_tree_object(head, merge, o->subtree_shift);
1807 common = shift_tree_object(head, common, o->subtree_shift);
1810 if (sha_eq(common->object.sha1, merge->object.sha1)) {
1811 output(o, 0, _("Already up-to-date!"));
1812 *result = head;
1813 return 1;
1816 code = git_merge_trees(o->call_depth, common, head, merge);
1818 if (code != 0) {
1819 if (show(o, 4) || o->call_depth)
1820 die(_("merging of trees %s and %s failed"),
1821 sha1_to_hex(head->object.sha1),
1822 sha1_to_hex(merge->object.sha1));
1823 else
1824 exit(128);
1827 if (unmerged_cache()) {
1828 struct string_list *entries, *re_head, *re_merge;
1829 int i;
1830 string_list_clear(&o->current_file_set, 1);
1831 string_list_clear(&o->current_directory_set, 1);
1832 get_files_dirs(o, head);
1833 get_files_dirs(o, merge);
1835 entries = get_unmerged();
1836 record_df_conflict_files(o, entries);
1837 re_head = get_renames(o, head, common, head, merge, entries);
1838 re_merge = get_renames(o, merge, common, head, merge, entries);
1839 clean = process_renames(o, re_head, re_merge);
1840 for (i = entries->nr-1; 0 <= i; i--) {
1841 const char *path = entries->items[i].string;
1842 struct stage_data *e = entries->items[i].util;
1843 if (!e->processed
1844 && !process_entry(o, path, e))
1845 clean = 0;
1847 for (i = 0; i < entries->nr; i++) {
1848 struct stage_data *e = entries->items[i].util;
1849 if (!e->processed)
1850 die(_("Unprocessed path??? %s"),
1851 entries->items[i].string);
1854 string_list_clear(re_merge, 0);
1855 string_list_clear(re_head, 0);
1856 string_list_clear(entries, 1);
1859 else
1860 clean = 1;
1862 if (o->call_depth)
1863 *result = write_tree_from_memory(o);
1865 return clean;
1868 static struct commit_list *reverse_commit_list(struct commit_list *list)
1870 struct commit_list *next = NULL, *current, *backup;
1871 for (current = list; current; current = backup) {
1872 backup = current->next;
1873 current->next = next;
1874 next = current;
1876 return next;
1880 * Merge the commits h1 and h2, return the resulting virtual
1881 * commit object and a flag indicating the cleanness of the merge.
1883 int merge_recursive(struct merge_options *o,
1884 struct commit *h1,
1885 struct commit *h2,
1886 struct commit_list *ca,
1887 struct commit **result)
1889 struct commit_list *iter;
1890 struct commit *merged_common_ancestors;
1891 struct tree *mrtree = mrtree;
1892 int clean;
1894 if (show(o, 4)) {
1895 output(o, 4, _("Merging:"));
1896 output_commit_title(o, h1);
1897 output_commit_title(o, h2);
1900 if (!ca) {
1901 ca = get_merge_bases(h1, h2, 1);
1902 ca = reverse_commit_list(ca);
1905 if (show(o, 5)) {
1906 unsigned cnt = commit_list_count(ca);
1908 output(o, 5, Q_("found %u common ancestor:",
1909 "found %u common ancestors:", cnt), cnt);
1910 for (iter = ca; iter; iter = iter->next)
1911 output_commit_title(o, iter->item);
1914 merged_common_ancestors = pop_commit(&ca);
1915 if (merged_common_ancestors == NULL) {
1916 /* if there is no common ancestor, use an empty tree */
1917 struct tree *tree;
1919 tree = lookup_tree(EMPTY_TREE_SHA1_BIN);
1920 merged_common_ancestors = make_virtual_commit(tree, "ancestor");
1923 for (iter = ca; iter; iter = iter->next) {
1924 const char *saved_b1, *saved_b2;
1925 o->call_depth++;
1927 * When the merge fails, the result contains files
1928 * with conflict markers. The cleanness flag is
1929 * ignored, it was never actually used, as result of
1930 * merge_trees has always overwritten it: the committed
1931 * "conflicts" were already resolved.
1933 discard_cache();
1934 saved_b1 = o->branch1;
1935 saved_b2 = o->branch2;
1936 o->branch1 = "Temporary merge branch 1";
1937 o->branch2 = "Temporary merge branch 2";
1938 merge_recursive(o, merged_common_ancestors, iter->item,
1939 NULL, &merged_common_ancestors);
1940 o->branch1 = saved_b1;
1941 o->branch2 = saved_b2;
1942 o->call_depth--;
1944 if (!merged_common_ancestors)
1945 die(_("merge returned no commit"));
1948 discard_cache();
1949 if (!o->call_depth)
1950 read_cache();
1952 o->ancestor = "merged common ancestors";
1953 clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree,
1954 &mrtree);
1956 if (o->call_depth) {
1957 *result = make_virtual_commit(mrtree, "merged tree");
1958 commit_list_insert(h1, &(*result)->parents);
1959 commit_list_insert(h2, &(*result)->parents->next);
1961 flush_output(o);
1962 if (show(o, 2))
1963 diff_warn_rename_limit("merge.renamelimit",
1964 o->needed_rename_limit, 0);
1965 return clean;
1968 static struct commit *get_ref(const unsigned char *sha1, const char *name)
1970 struct object *object;
1972 object = deref_tag(parse_object(sha1), name, strlen(name));
1973 if (!object)
1974 return NULL;
1975 if (object->type == OBJ_TREE)
1976 return make_virtual_commit((struct tree*)object, name);
1977 if (object->type != OBJ_COMMIT)
1978 return NULL;
1979 if (parse_commit((struct commit *)object))
1980 return NULL;
1981 return (struct commit *)object;
1984 int merge_recursive_generic(struct merge_options *o,
1985 const unsigned char *head,
1986 const unsigned char *merge,
1987 int num_base_list,
1988 const unsigned char **base_list,
1989 struct commit **result)
1991 int clean, index_fd;
1992 struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
1993 struct commit *head_commit = get_ref(head, o->branch1);
1994 struct commit *next_commit = get_ref(merge, o->branch2);
1995 struct commit_list *ca = NULL;
1997 if (base_list) {
1998 int i;
1999 for (i = 0; i < num_base_list; ++i) {
2000 struct commit *base;
2001 if (!(base = get_ref(base_list[i], sha1_to_hex(base_list[i]))))
2002 return error(_("Could not parse object '%s'"),
2003 sha1_to_hex(base_list[i]));
2004 commit_list_insert(base, &ca);
2008 index_fd = hold_locked_index(lock, 1);
2009 clean = merge_recursive(o, head_commit, next_commit, ca,
2010 result);
2011 if (active_cache_changed &&
2012 (write_cache(index_fd, active_cache, active_nr) ||
2013 commit_locked_index(lock)))
2014 return error(_("Unable to write index."));
2016 return clean ? 0 : 1;
2019 static int merge_recursive_config(const char *var, const char *value, void *cb)
2021 struct merge_options *o = cb;
2022 if (!strcmp(var, "merge.verbosity")) {
2023 o->verbosity = git_config_int(var, value);
2024 return 0;
2026 if (!strcmp(var, "diff.renamelimit")) {
2027 o->diff_rename_limit = git_config_int(var, value);
2028 return 0;
2030 if (!strcmp(var, "merge.renamelimit")) {
2031 o->merge_rename_limit = git_config_int(var, value);
2032 return 0;
2034 return git_xmerge_config(var, value, cb);
2037 void init_merge_options(struct merge_options *o)
2039 memset(o, 0, sizeof(struct merge_options));
2040 o->verbosity = 2;
2041 o->buffer_output = 1;
2042 o->diff_rename_limit = -1;
2043 o->merge_rename_limit = -1;
2044 o->renormalize = 0;
2045 git_config(merge_recursive_config, o);
2046 if (getenv("GIT_MERGE_VERBOSITY"))
2047 o->verbosity =
2048 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL, 10);
2049 if (o->verbosity >= 5)
2050 o->buffer_output = 0;
2051 strbuf_init(&o->obuf, 0);
2052 memset(&o->current_file_set, 0, sizeof(struct string_list));
2053 o->current_file_set.strdup_strings = 1;
2054 memset(&o->current_directory_set, 0, sizeof(struct string_list));
2055 o->current_directory_set.strdup_strings = 1;
2056 memset(&o->df_conflict_file_set, 0, sizeof(struct string_list));
2057 o->df_conflict_file_set.strdup_strings = 1;
2060 int parse_merge_opt(struct merge_options *o, const char *s)
2062 if (!s || !*s)
2063 return -1;
2064 if (!strcmp(s, "ours"))
2065 o->recursive_variant = MERGE_RECURSIVE_OURS;
2066 else if (!strcmp(s, "theirs"))
2067 o->recursive_variant = MERGE_RECURSIVE_THEIRS;
2068 else if (!strcmp(s, "subtree"))
2069 o->subtree_shift = "";
2070 else if (starts_with(s, "subtree="))
2071 o->subtree_shift = s + strlen("subtree=");
2072 else if (!strcmp(s, "patience"))
2073 o->xdl_opts = DIFF_WITH_ALG(o, PATIENCE_DIFF);
2074 else if (!strcmp(s, "histogram"))
2075 o->xdl_opts = DIFF_WITH_ALG(o, HISTOGRAM_DIFF);
2076 else if (starts_with(s, "diff-algorithm=")) {
2077 long value = parse_algorithm_value(s + strlen("diff-algorithm="));
2078 if (value < 0)
2079 return -1;
2080 /* clear out previous settings */
2081 DIFF_XDL_CLR(o, NEED_MINIMAL);
2082 o->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
2083 o->xdl_opts |= value;
2085 else if (!strcmp(s, "ignore-space-change"))
2086 o->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE;
2087 else if (!strcmp(s, "ignore-all-space"))
2088 o->xdl_opts |= XDF_IGNORE_WHITESPACE;
2089 else if (!strcmp(s, "ignore-space-at-eol"))
2090 o->xdl_opts |= XDF_IGNORE_WHITESPACE_AT_EOL;
2091 else if (!strcmp(s, "renormalize"))
2092 o->renormalize = 1;
2093 else if (!strcmp(s, "no-renormalize"))
2094 o->renormalize = 0;
2095 else if (starts_with(s, "rename-threshold=")) {
2096 const char *score = s + strlen("rename-threshold=");
2097 if ((o->rename_score = parse_rename_score(&score)) == -1 || *score != 0)
2098 return -1;
2100 else
2101 return -1;
2102 return 0;