?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
merge-recursive: mark rename/delete conflict as unmerged
[git/trast.git] / merge-recursive.c
blob69e71522048a3eeb70a093ae3c17a225168e932b
1 /*
2 * Recursive Merge algorithm stolen from git-merge-recursive.py by
3 * Fredrik Kuivinen.
4 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
5 */
6 #include "cache.h"
7 #include "cache-tree.h"
8 #include "commit.h"
9 #include "blob.h"
10 #include "builtin.h"
11 #include "tree-walk.h"
12 #include "diff.h"
13 #include "diffcore.h"
14 #include "tag.h"
15 #include "unpack-trees.h"
16 #include "string-list.h"
17 #include "xdiff-interface.h"
18 #include "ll-merge.h"
19 #include "attr.h"
20 #include "merge-recursive.h"
21 #include "dir.h"
22
23 static struct tree *shift_tree_object(struct tree *one, struct tree *two)
24 {
25 unsigned char shifted[20];
26
27 /*
28 * NEEDSWORK: this limits the recursion depth to hardcoded
29 * value '2' to avoid excessive overhead.
30 */
31 shift_tree(one->object.sha1, two->object.sha1, shifted, 2);
32 if (!hashcmp(two->object.sha1, shifted))
33 return two;
34 return lookup_tree(shifted);
35 }
36
37 /*
38 * A virtual commit has (const char *)commit->util set to the name.
39 */
40
41 struct commit *make_virtual_commit(struct tree *tree, const char *comment)
42 {
43 struct commit *commit = xcalloc(1, sizeof(struct commit));
44 commit->tree = tree;
45 commit->util = (void*)comment;
46 /* avoid warnings */
47 commit->object.parsed = 1;
48 return commit;
49 }
50
51 /*
52 * Since we use get_tree_entry(), which does not put the read object into
53 * the object pool, we cannot rely on a == b.
54 */
55 static int sha_eq(const unsigned char *a, const unsigned char *b)
56 {
57 if (!a && !b)
58 return 2;
59 return a && b && hashcmp(a, b) == 0;
60 }
61
62 /*
63 * Since we want to write the index eventually, we cannot reuse the index
64 * for these (temporary) data.
65 */
66 struct stage_data
67 {
68 struct
69 {
70 unsigned mode;
71 unsigned char sha[20];
72 } stages[4];
73 unsigned processed:1;
74 };
75
76 static int show(struct merge_options *o, int v)
77 {
78 return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5;
79 }
80
81 static void flush_output(struct merge_options *o)
82 {
83 if (o->obuf.len) {
84 fputs(o->obuf.buf, stdout);
85 strbuf_reset(&o->obuf);
86 }
87 }
88
89 static void output(struct merge_options *o, int v, const char *fmt, ...)
90 {
91 int len;
92 va_list ap;
93
94 if (!show(o, v))
95 return;
96
97 strbuf_grow(&o->obuf, o->call_depth * 2 + 2);
98 memset(o->obuf.buf + o->obuf.len, ' ', o->call_depth * 2);
99 strbuf_setlen(&o->obuf, o->obuf.len + o->call_depth * 2);
100
101 va_start(ap, fmt);
102 len = vsnprintf(o->obuf.buf + o->obuf.len, strbuf_avail(&o->obuf), fmt, ap);
103 va_end(ap);
104
105 if (len < 0)
106 len = 0;
107 if (len >= strbuf_avail(&o->obuf)) {
108 strbuf_grow(&o->obuf, len + 2);
109 va_start(ap, fmt);
110 len = vsnprintf(o->obuf.buf + o->obuf.len, strbuf_avail(&o->obuf), fmt, ap);
111 va_end(ap);
112 if (len >= strbuf_avail(&o->obuf)) {
113 die("this should not happen, your snprintf is broken");
114 }
115 }
116 strbuf_setlen(&o->obuf, o->obuf.len + len);
117 strbuf_add(&o->obuf, "\n", 1);
118 if (!o->buffer_output)
119 flush_output(o);
120 }
121
122 static void output_commit_title(struct merge_options *o, struct commit *commit)
123 {
124 int i;
125 flush_output(o);
126 for (i = o->call_depth; i--;)
127 fputs(" ", stdout);
128 if (commit->util)
129 printf("virtual %s\n", (char *)commit->util);
130 else {
131 printf("%s ", find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
132 if (parse_commit(commit) != 0)
133 printf("(bad commit)\n");
134 else {
135 const char *s;
136 int len;
137 for (s = commit->buffer; *s; s++)
138 if (*s == '\n' && s[1] == '\n') {
139 s += 2;
140 break;
141 }
142 for (len = 0; s[len] && '\n' != s[len]; len++)
143 ; /* do nothing */
144 printf("%.*s\n", len, s);
145 }
146 }
147 }
148
149 static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
150 const char *path, int stage, int refresh, int options)
151 {
152 struct cache_entry *ce;
153 ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage, refresh);
154 if (!ce)
155 return error("addinfo_cache failed for path '%s'", path);
156 return add_cache_entry(ce, options);
157 }
158
159 static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
160 {
161 parse_tree(tree);
162 init_tree_desc(desc, tree->buffer, tree->size);
163 }
164
165 static int git_merge_trees(int index_only,
166 struct tree *common,
167 struct tree *head,
168 struct tree *merge)
169 {
170 int rc;
171 struct tree_desc t[3];
172 struct unpack_trees_options opts;
173
174 memset(&opts, 0, sizeof(opts));
175 if (index_only)
176 opts.index_only = 1;
177 else
178 opts.update = 1;
179 opts.merge = 1;
180 opts.head_idx = 2;
181 opts.fn = threeway_merge;
182 opts.src_index = &the_index;
183 opts.dst_index = &the_index;
184
185 init_tree_desc_from_tree(t+0, common);
186 init_tree_desc_from_tree(t+1, head);
187 init_tree_desc_from_tree(t+2, merge);
188
189 rc = unpack_trees(3, t, &opts);
190 cache_tree_free(&active_cache_tree);
191 return rc;
192 }
193
194 struct tree *write_tree_from_memory(struct merge_options *o)
195 {
196 struct tree *result = NULL;
197
198 if (unmerged_cache()) {
199 int i;
200 output(o, 0, "There are unmerged index entries:");
201 for (i = 0; i < active_nr; i++) {
202 struct cache_entry *ce = active_cache[i];
203 if (ce_stage(ce))
204 output(o, 0, "%d %.*s", ce_stage(ce), ce_namelen(ce), ce->name);
205 }
206 return NULL;
207 }
208
209 if (!active_cache_tree)
210 active_cache_tree = cache_tree();
211
212 if (!cache_tree_fully_valid(active_cache_tree) &&
213 cache_tree_update(active_cache_tree,
214 active_cache, active_nr, 0, 0) < 0)
215 die("error building trees");
216
217 result = lookup_tree(active_cache_tree->sha1);
218
219 return result;
220 }
221
222 static int save_files_dirs(const unsigned char *sha1,
223 const char *base, int baselen, const char *path,
224 unsigned int mode, int stage, void *context)
225 {
226 int len = strlen(path);
227 char *newpath = xmalloc(baselen + len + 1);
228 struct merge_options *o = context;
229
230 memcpy(newpath, base, baselen);
231 memcpy(newpath + baselen, path, len);
232 newpath[baselen + len] = '\0';
233
234 if (S_ISDIR(mode))
235 string_list_insert(newpath, &o->current_directory_set);
236 else
237 string_list_insert(newpath, &o->current_file_set);
238 free(newpath);
239
240 return READ_TREE_RECURSIVE;
241 }
242
243 static int get_files_dirs(struct merge_options *o, struct tree *tree)
244 {
245 int n;
246 if (read_tree_recursive(tree, "", 0, 0, NULL, save_files_dirs, o))
247 return 0;
248 n = o->current_file_set.nr + o->current_directory_set.nr;
249 return n;
250 }
251
252 /*
253 * Returns an index_entry instance which doesn't have to correspond to
254 * a real cache entry in Git's index.
255 */
256 static struct stage_data *insert_stage_data(const char *path,
257 struct tree *o, struct tree *a, struct tree *b,
258 struct string_list *entries)
259 {
260 struct string_list_item *item;
261 struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
262 get_tree_entry(o->object.sha1, path,
263 e->stages[1].sha, &e->stages[1].mode);
264 get_tree_entry(a->object.sha1, path,
265 e->stages[2].sha, &e->stages[2].mode);
266 get_tree_entry(b->object.sha1, path,
267 e->stages[3].sha, &e->stages[3].mode);
268 item = string_list_insert(path, entries);
269 item->util = e;
270 return e;
271 }
272
273 /*
274 * Create a dictionary mapping file names to stage_data objects. The
275 * dictionary contains one entry for every path with a non-zero stage entry.
276 */
277 static struct string_list *get_unmerged(void)
278 {
279 struct string_list *unmerged = xcalloc(1, sizeof(struct string_list));
280 int i;
281
282 unmerged->strdup_strings = 1;
283
284 for (i = 0; i < active_nr; i++) {
285 struct string_list_item *item;
286 struct stage_data *e;
287 struct cache_entry *ce = active_cache[i];
288 if (!ce_stage(ce))
289 continue;
290
291 item = string_list_lookup(ce->name, unmerged);
292 if (!item) {
293 item = string_list_insert(ce->name, unmerged);
294 item->util = xcalloc(1, sizeof(struct stage_data));
295 }
296 e = item->util;
297 e->stages[ce_stage(ce)].mode = ce->ce_mode;
298 hashcpy(e->stages[ce_stage(ce)].sha, ce->sha1);
299 }
300
301 return unmerged;
302 }
303
304 struct rename
305 {
306 struct diff_filepair *pair;
307 struct stage_data *src_entry;
308 struct stage_data *dst_entry;
309 unsigned processed:1;
310 };
311
312 /*
313 * Get information of all renames which occurred between 'o_tree' and
314 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
315 * 'b_tree') to be able to associate the correct cache entries with
316 * the rename information. 'tree' is always equal to either a_tree or b_tree.
317 */
318 static struct string_list *get_renames(struct merge_options *o,
319 struct tree *tree,
320 struct tree *o_tree,
321 struct tree *a_tree,
322 struct tree *b_tree,
323 struct string_list *entries)
324 {
325 int i;
326 struct string_list *renames;
327 struct diff_options opts;
328
329 renames = xcalloc(1, sizeof(struct string_list));
330 diff_setup(&opts);
331 DIFF_OPT_SET(&opts, RECURSIVE);
332 opts.detect_rename = DIFF_DETECT_RENAME;
333 opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
334 o->diff_rename_limit >= 0 ? o->diff_rename_limit :
335 500;
336 opts.warn_on_too_large_rename = 1;
337 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
338 if (diff_setup_done(&opts) < 0)
339 die("diff setup failed");
340 diff_tree_sha1(o_tree->object.sha1, tree->object.sha1, "", &opts);
341 diffcore_std(&opts);
342 for (i = 0; i < diff_queued_diff.nr; ++i) {
343 struct string_list_item *item;
344 struct rename *re;
345 struct diff_filepair *pair = diff_queued_diff.queue[i];
346 if (pair->status != 'R') {
347 diff_free_filepair(pair);
348 continue;
349 }
350 re = xmalloc(sizeof(*re));
351 re->processed = 0;
352 re->pair = pair;
353 item = string_list_lookup(re->pair->one->path, entries);
354 if (!item)
355 re->src_entry = insert_stage_data(re->pair->one->path,
356 o_tree, a_tree, b_tree, entries);
357 else
358 re->src_entry = item->util;
359
360 item = string_list_lookup(re->pair->two->path, entries);
361 if (!item)
362 re->dst_entry = insert_stage_data(re->pair->two->path,
363 o_tree, a_tree, b_tree, entries);
364 else
365 re->dst_entry = item->util;
366 item = string_list_insert(pair->one->path, renames);
367 item->util = re;
368 }
369 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
370 diff_queued_diff.nr = 0;
371 diff_flush(&opts);
372 return renames;
373 }
374
375 static int update_stages(const char *path, struct diff_filespec *o,
376 struct diff_filespec *a, struct diff_filespec *b,
377 int clear)
378 {
379 int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE;
380 if (clear)
381 if (remove_file_from_cache(path))
382 return -1;
383 if (o)
384 if (add_cacheinfo(o->mode, o->sha1, path, 1, 0, options))
385 return -1;
386 if (a)
387 if (add_cacheinfo(a->mode, a->sha1, path, 2, 0, options))
388 return -1;
389 if (b)
390 if (add_cacheinfo(b->mode, b->sha1, path, 3, 0, options))
391 return -1;
392 return 0;
393 }
394
395 static int remove_file(struct merge_options *o, int clean,
396 const char *path, int no_wd)
397 {
398 int update_cache = o->call_depth || clean;
399 int update_working_directory = !o->call_depth && !no_wd;
400
401 if (update_cache) {
402 if (remove_file_from_cache(path))
403 return -1;
404 }
405 if (update_working_directory) {
406 if (remove_path(path) && errno != ENOENT)
407 return -1;
408 }
409 return 0;
410 }
411
412 static char *unique_path(struct merge_options *o, const char *path, const char *branch)
413 {
414 char *newpath = xmalloc(strlen(path) + 1 + strlen(branch) + 8 + 1);
415 int suffix = 0;
416 struct stat st;
417 char *p = newpath + strlen(path);
418 strcpy(newpath, path);
419 *(p++) = '~';
420 strcpy(p, branch);
421 for (; *p; ++p)
422 if ('/' == *p)
423 *p = '_';
424 while (string_list_has_string(&o->current_file_set, newpath) ||
425 string_list_has_string(&o->current_directory_set, newpath) ||
426 lstat(newpath, &st) == 0)
427 sprintf(p, "_%d", suffix++);
428
429 string_list_insert(newpath, &o->current_file_set);
430 return newpath;
431 }
432
433 static void flush_buffer(int fd, const char *buf, unsigned long size)
434 {
435 while (size > 0) {
436 long ret = write_in_full(fd, buf, size);
437 if (ret < 0) {
438 /* Ignore epipe */
439 if (errno == EPIPE)
440 break;
441 die("merge-recursive: %s", strerror(errno));
442 } else if (!ret) {
443 die("merge-recursive: disk full?");
444 }
445 size -= ret;
446 buf += ret;
447 }
448 }
449
450 static int make_room_for_path(const char *path)
451 {
452 int status;
453 const char *msg = "failed to create path '%s'%s";
454
455 status = safe_create_leading_directories_const(path);
456 if (status) {
457 if (status == -3) {
458 /* something else exists */
459 error(msg, path, ": perhaps a D/F conflict?");
460 return -1;
461 }
462 die(msg, path, "");
463 }
464
465 /* Successful unlink is good.. */
466 if (!unlink(path))
467 return 0;
468 /* .. and so is no existing file */
469 if (errno == ENOENT)
470 return 0;
471 /* .. but not some other error (who really cares what?) */
472 return error(msg, path, ": perhaps a D/F conflict?");
473 }
474
475 static void update_file_flags(struct merge_options *o,
476 const unsigned char *sha,
477 unsigned mode,
478 const char *path,
479 int update_cache,
480 int update_wd)
481 {
482 if (o->call_depth)
483 update_wd = 0;
484
485 if (update_wd) {
486 enum object_type type;
487 void *buf;
488 unsigned long size;
489
490 if (S_ISGITLINK(mode))
491 die("cannot read object %s '%s': It is a submodule!",
492 sha1_to_hex(sha), path);
493
494 buf = read_sha1_file(sha, &type, &size);
495 if (!buf)
496 die("cannot read object %s '%s'", sha1_to_hex(sha), path);
497 if (type != OBJ_BLOB)
498 die("blob expected for %s '%s'", sha1_to_hex(sha), path);
499 if (S_ISREG(mode)) {
500 struct strbuf strbuf = STRBUF_INIT;
501 if (convert_to_working_tree(path, buf, size, &strbuf)) {
502 free(buf);
503 size = strbuf.len;
504 buf = strbuf_detach(&strbuf, NULL);
505 }
506 }
507
508 if (make_room_for_path(path) < 0) {
509 update_wd = 0;
510 free(buf);
511 goto update_index;
512 }
513 if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) {
514 int fd;
515 if (mode & 0100)
516 mode = 0777;
517 else
518 mode = 0666;
519 fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
520 if (fd < 0)
521 die("failed to open %s: %s", path, strerror(errno));
522 flush_buffer(fd, buf, size);
523 close(fd);
524 } else if (S_ISLNK(mode)) {
525 char *lnk = xmemdupz(buf, size);
526 safe_create_leading_directories_const(path);
527 unlink(path);
528 if (symlink(lnk, path))
529 die("failed to symlink %s: %s", path, strerror(errno));
530 free(lnk);
531 } else
532 die("do not know what to do with %06o %s '%s'",
533 mode, sha1_to_hex(sha), path);
534 free(buf);
535 }
536 update_index:
537 if (update_cache)
538 add_cacheinfo(mode, sha, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
539 }
540
541 static void update_file(struct merge_options *o,
542 int clean,
543 const unsigned char *sha,
544 unsigned mode,
545 const char *path)
546 {
547 update_file_flags(o, sha, mode, path, o->call_depth || clean, !o->call_depth);
548 }
549
550 /* Low level file merging, update and removal */
551
552 struct merge_file_info
553 {
554 unsigned char sha[20];
555 unsigned mode;
556 unsigned clean:1,
557 merge:1;
558 };
559
560 static void fill_mm(const unsigned char *sha1, mmfile_t *mm)
561 {
562 unsigned long size;
563 enum object_type type;
564
565 if (!hashcmp(sha1, null_sha1)) {
566 mm->ptr = xstrdup("");
567 mm->size = 0;
568 return;
569 }
570
571 mm->ptr = read_sha1_file(sha1, &type, &size);
572 if (!mm->ptr || type != OBJ_BLOB)
573 die("unable to read blob object %s", sha1_to_hex(sha1));
574 mm->size = size;
575 }
576
577 static int merge_3way(struct merge_options *o,
578 mmbuffer_t *result_buf,
579 struct diff_filespec *one,
580 struct diff_filespec *a,
581 struct diff_filespec *b,
582 const char *branch1,
583 const char *branch2)
584 {
585 mmfile_t orig, src1, src2;
586 char *name1, *name2;
587 int merge_status;
588
589 name1 = xstrdup(mkpath("%s:%s", branch1, a->path));
590 name2 = xstrdup(mkpath("%s:%s", branch2, b->path));
591
592 fill_mm(one->sha1, &orig);
593 fill_mm(a->sha1, &src1);
594 fill_mm(b->sha1, &src2);
595
596 merge_status = ll_merge(result_buf, a->path, &orig,
597 &src1, name1, &src2, name2,
598 o->call_depth);
599
600 free(name1);
601 free(name2);
602 free(orig.ptr);
603 free(src1.ptr);
604 free(src2.ptr);
605 return merge_status;
606 }
607
608 static struct merge_file_info merge_file(struct merge_options *o,
609 struct diff_filespec *one,
610 struct diff_filespec *a,
611 struct diff_filespec *b,
612 const char *branch1,
613 const char *branch2)
614 {
615 struct merge_file_info result;
616 result.merge = 0;
617 result.clean = 1;
618
619 if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
620 result.clean = 0;
621 if (S_ISREG(a->mode)) {
622 result.mode = a->mode;
623 hashcpy(result.sha, a->sha1);
624 } else {
625 result.mode = b->mode;
626 hashcpy(result.sha, b->sha1);
627 }
628 } else {
629 if (!sha_eq(a->sha1, one->sha1) && !sha_eq(b->sha1, one->sha1))
630 result.merge = 1;
631
632 /*
633 * Merge modes
634 */
635 if (a->mode == b->mode || a->mode == one->mode)
636 result.mode = b->mode;
637 else {
638 result.mode = a->mode;
639 if (b->mode != one->mode) {
640 result.clean = 0;
641 result.merge = 1;
642 }
643 }
644
645 if (sha_eq(a->sha1, b->sha1) || sha_eq(a->sha1, one->sha1))
646 hashcpy(result.sha, b->sha1);
647 else if (sha_eq(b->sha1, one->sha1))
648 hashcpy(result.sha, a->sha1);
649 else if (S_ISREG(a->mode)) {
650 mmbuffer_t result_buf;
651 int merge_status;
652
653 merge_status = merge_3way(o, &result_buf, one, a, b,
654 branch1, branch2);
655
656 if ((merge_status < 0) || !result_buf.ptr)
657 die("Failed to execute internal merge");
658
659 if (write_sha1_file(result_buf.ptr, result_buf.size,
660 blob_type, result.sha))
661 die("Unable to add %s to database",
662 a->path);
663
664 free(result_buf.ptr);
665 result.clean = (merge_status == 0);
666 } else if (S_ISGITLINK(a->mode)) {
667 result.clean = 0;
668 hashcpy(result.sha, a->sha1);
669 } else if (S_ISLNK(a->mode)) {
670 hashcpy(result.sha, a->sha1);
671
672 if (!sha_eq(a->sha1, b->sha1))
673 result.clean = 0;
674 } else {
675 die("unsupported object type in the tree");
676 }
677 }
678
679 return result;
680 }
681
682 static void conflict_rename_rename(struct merge_options *o,
683 struct rename *ren1,
684 const char *branch1,
685 struct rename *ren2,
686 const char *branch2)
687 {
688 char *del[2];
689 int delp = 0;
690 const char *ren1_dst = ren1->pair->two->path;
691 const char *ren2_dst = ren2->pair->two->path;
692 const char *dst_name1 = ren1_dst;
693 const char *dst_name2 = ren2_dst;
694 if (string_list_has_string(&o->current_directory_set, ren1_dst)) {
695 dst_name1 = del[delp++] = unique_path(o, ren1_dst, branch1);
696 output(o, 1, "%s is a directory in %s adding as %s instead",
697 ren1_dst, branch2, dst_name1);
698 remove_file(o, 0, ren1_dst, 0);
699 }
700 if (string_list_has_string(&o->current_directory_set, ren2_dst)) {
701 dst_name2 = del[delp++] = unique_path(o, ren2_dst, branch2);
702 output(o, 1, "%s is a directory in %s adding as %s instead",
703 ren2_dst, branch1, dst_name2);
704 remove_file(o, 0, ren2_dst, 0);
705 }
706 if (o->call_depth) {
707 remove_file_from_cache(dst_name1);
708 remove_file_from_cache(dst_name2);
709 /*
710 * Uncomment to leave the conflicting names in the resulting tree
711 *
712 * update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, dst_name1);
713 * update_file(o, 0, ren2->pair->two->sha1, ren2->pair->two->mode, dst_name2);
714 */
715 } else {
716 update_stages(dst_name1, NULL, ren1->pair->two, NULL, 1);
717 update_stages(dst_name2, NULL, NULL, ren2->pair->two, 1);
718 }
719 while (delp--)
720 free(del[delp]);
721 }
722
723 static void conflict_rename_dir(struct merge_options *o,
724 struct rename *ren1,
725 const char *branch1)
726 {
727 char *new_path = unique_path(o, ren1->pair->two->path, branch1);
728 output(o, 1, "Renaming %s to %s instead", ren1->pair->one->path, new_path);
729 remove_file(o, 0, ren1->pair->two->path, 0);
730 update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path);
731 free(new_path);
732 }
733
734 static void conflict_rename_rename_2(struct merge_options *o,
735 struct rename *ren1,
736 const char *branch1,
737 struct rename *ren2,
738 const char *branch2)
739 {
740 char *new_path1 = unique_path(o, ren1->pair->two->path, branch1);
741 char *new_path2 = unique_path(o, ren2->pair->two->path, branch2);
742 output(o, 1, "Renaming %s to %s and %s to %s instead",
743 ren1->pair->one->path, new_path1,
744 ren2->pair->one->path, new_path2);
745 remove_file(o, 0, ren1->pair->two->path, 0);
746 update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path1);
747 update_file(o, 0, ren2->pair->two->sha1, ren2->pair->two->mode, new_path2);
748 free(new_path2);
749 free(new_path1);
750 }
751
752 static int process_renames(struct merge_options *o,
753 struct string_list *a_renames,
754 struct string_list *b_renames)
755 {
756 int clean_merge = 1, i, j;
757 struct string_list a_by_dst = {NULL, 0, 0, 0}, b_by_dst = {NULL, 0, 0, 0};
758 const struct rename *sre;
759
760 for (i = 0; i < a_renames->nr; i++) {
761 sre = a_renames->items[i].util;
762 string_list_insert(sre->pair->two->path, &a_by_dst)->util
763 = sre->dst_entry;
764 }
765 for (i = 0; i < b_renames->nr; i++) {
766 sre = b_renames->items[i].util;
767 string_list_insert(sre->pair->two->path, &b_by_dst)->util
768 = sre->dst_entry;
769 }
770
771 for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
772 int compare;
773 char *src;
774 struct string_list *renames1, *renames2, *renames2Dst;
775 struct rename *ren1 = NULL, *ren2 = NULL;
776 const char *branch1, *branch2;
777 const char *ren1_src, *ren1_dst;
778
779 if (i >= a_renames->nr) {
780 compare = 1;
781 ren2 = b_renames->items[j++].util;
782 } else if (j >= b_renames->nr) {
783 compare = -1;
784 ren1 = a_renames->items[i++].util;
785 } else {
786 compare = strcmp(a_renames->items[i].string,
787 b_renames->items[j].string);
788 if (compare <= 0)
789 ren1 = a_renames->items[i++].util;
790 if (compare >= 0)
791 ren2 = b_renames->items[j++].util;
792 }
793
794 /* TODO: refactor, so that 1/2 are not needed */
795 if (ren1) {
796 renames1 = a_renames;
797 renames2 = b_renames;
798 renames2Dst = &b_by_dst;
799 branch1 = o->branch1;
800 branch2 = o->branch2;
801 } else {
802 struct rename *tmp;
803 renames1 = b_renames;
804 renames2 = a_renames;
805 renames2Dst = &a_by_dst;
806 branch1 = o->branch2;
807 branch2 = o->branch1;
808 tmp = ren2;
809 ren2 = ren1;
810 ren1 = tmp;
811 }
812 src = ren1->pair->one->path;
813
814 ren1->dst_entry->processed = 1;
815 ren1->src_entry->processed = 1;
816
817 if (ren1->processed)
818 continue;
819 ren1->processed = 1;
820
821 ren1_src = ren1->pair->one->path;
822 ren1_dst = ren1->pair->two->path;
823
824 if (ren2) {
825 const char *ren2_src = ren2->pair->one->path;
826 const char *ren2_dst = ren2->pair->two->path;
827 /* Renamed in 1 and renamed in 2 */
828 if (strcmp(ren1_src, ren2_src) != 0)
829 die("ren1.src != ren2.src");
830 ren2->dst_entry->processed = 1;
831 ren2->processed = 1;
832 if (strcmp(ren1_dst, ren2_dst) != 0) {
833 clean_merge = 0;
834 output(o, 1, "CONFLICT (rename/rename): "
835 "Rename \"%s\"->\"%s\" in branch \"%s\" "
836 "rename \"%s\"->\"%s\" in \"%s\"%s",
837 src, ren1_dst, branch1,
838 src, ren2_dst, branch2,
839 o->call_depth ? " (left unresolved)": "");
840 if (o->call_depth) {
841 remove_file_from_cache(src);
842 update_file(o, 0, ren1->pair->one->sha1,
843 ren1->pair->one->mode, src);
844 }
845 conflict_rename_rename(o, ren1, branch1, ren2, branch2);
846 } else {
847 struct merge_file_info mfi;
848 remove_file(o, 1, ren1_src, 1);
849 mfi = merge_file(o,
850 ren1->pair->one,
851 ren1->pair->two,
852 ren2->pair->two,
853 branch1,
854 branch2);
855 if (mfi.merge || !mfi.clean)
856 output(o, 1, "Renaming %s->%s", src, ren1_dst);
857
858 if (mfi.merge)
859 output(o, 2, "Auto-merging %s", ren1_dst);
860
861 if (!mfi.clean) {
862 output(o, 1, "CONFLICT (content): merge conflict in %s",
863 ren1_dst);
864 clean_merge = 0;
865
866 if (!o->call_depth)
867 update_stages(ren1_dst,
868 ren1->pair->one,
869 ren1->pair->two,
870 ren2->pair->two,
871 1 /* clear */);
872 }
873 update_file(o, mfi.clean, mfi.sha, mfi.mode, ren1_dst);
874 }
875 } else {
876 /* Renamed in 1, maybe changed in 2 */
877 struct string_list_item *item;
878 /* we only use sha1 and mode of these */
879 struct diff_filespec src_other, dst_other;
880 int try_merge, stage = a_renames == renames1 ? 3: 2;
881
882 remove_file(o, 1, ren1_src, o->call_depth || stage == 3);
883
884 hashcpy(src_other.sha1, ren1->src_entry->stages[stage].sha);
885 src_other.mode = ren1->src_entry->stages[stage].mode;
886 hashcpy(dst_other.sha1, ren1->dst_entry->stages[stage].sha);
887 dst_other.mode = ren1->dst_entry->stages[stage].mode;
888
889 try_merge = 0;
890
891 if (string_list_has_string(&o->current_directory_set, ren1_dst)) {
892 clean_merge = 0;
893 output(o, 1, "CONFLICT (rename/directory): Rename %s->%s in %s "
894 " directory %s added in %s",
895 ren1_src, ren1_dst, branch1,
896 ren1_dst, branch2);
897 conflict_rename_dir(o, ren1, branch1);
898 } else if (sha_eq(src_other.sha1, null_sha1)) {
899 clean_merge = 0;
900 output(o, 1, "CONFLICT (rename/delete): Rename %s->%s in %s "
901 "and deleted in %s",
902 ren1_src, ren1_dst, branch1,
903 branch2);
904 update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, ren1_dst);
905 update_stages(ren1_dst, NULL,
906 branch1 == o->branch1 ?
907 ren1->pair->two : NULL,
908 branch1 == o->branch1 ?
909 NULL : ren1->pair->two, 1);
910 } else if (!sha_eq(dst_other.sha1, null_sha1)) {
911 const char *new_path;
912 clean_merge = 0;
913 try_merge = 1;
914 output(o, 1, "CONFLICT (rename/add): Rename %s->%s in %s. "
915 "%s added in %s",
916 ren1_src, ren1_dst, branch1,
917 ren1_dst, branch2);
918 new_path = unique_path(o, ren1_dst, branch2);
919 output(o, 1, "Adding as %s instead", new_path);
920 update_file(o, 0, dst_other.sha1, dst_other.mode, new_path);
921 } else if ((item = string_list_lookup(ren1_dst, renames2Dst))) {
922 ren2 = item->util;
923 clean_merge = 0;
924 ren2->processed = 1;
925 output(o, 1, "CONFLICT (rename/rename): "
926 "Rename %s->%s in %s. "
927 "Rename %s->%s in %s",
928 ren1_src, ren1_dst, branch1,
929 ren2->pair->one->path, ren2->pair->two->path, branch2);
930 conflict_rename_rename_2(o, ren1, branch1, ren2, branch2);
931 } else
932 try_merge = 1;
933
934 if (try_merge) {
935 struct diff_filespec *one, *a, *b;
936 struct merge_file_info mfi;
937 src_other.path = (char *)ren1_src;
938
939 one = ren1->pair->one;
940 if (a_renames == renames1) {
941 a = ren1->pair->two;
942 b = &src_other;
943 } else {
944 b = ren1->pair->two;
945 a = &src_other;
946 }
947 mfi = merge_file(o, one, a, b,
948 o->branch1, o->branch2);
949
950 if (mfi.clean &&
951 sha_eq(mfi.sha, ren1->pair->two->sha1) &&
952 mfi.mode == ren1->pair->two->mode)
953 /*
954 * This messaged is part of
955 * t6022 test. If you change
956 * it update the test too.
957 */
958 output(o, 3, "Skipped %s (merged same as existing)", ren1_dst);
959 else {
960 if (mfi.merge || !mfi.clean)
961 output(o, 1, "Renaming %s => %s", ren1_src, ren1_dst);
962 if (mfi.merge)
963 output(o, 2, "Auto-merging %s", ren1_dst);
964 if (!mfi.clean) {
965 output(o, 1, "CONFLICT (rename/modify): Merge conflict in %s",
966 ren1_dst);
967 clean_merge = 0;
968
969 if (!o->call_depth)
970 update_stages(ren1_dst,
971 one, a, b, 1);
972 }
973 update_file(o, mfi.clean, mfi.sha, mfi.mode, ren1_dst);
974 }
975 }
976 }
977 }
978 string_list_clear(&a_by_dst, 0);
979 string_list_clear(&b_by_dst, 0);
980
981 return clean_merge;
982 }
983
984 static unsigned char *stage_sha(const unsigned char *sha, unsigned mode)
985 {
986 return (is_null_sha1(sha) || mode == 0) ? NULL: (unsigned char *)sha;
987 }
988
989 /* Per entry merge function */
990 static int process_entry(struct merge_options *o,
991 const char *path, struct stage_data *entry)
992 {
993 /*
994 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
995 print_index_entry("\tpath: ", entry);
996 */
997 int clean_merge = 1;
998 unsigned o_mode = entry->stages[1].mode;
999 unsigned a_mode = entry->stages[2].mode;
1000 unsigned b_mode = entry->stages[3].mode;
1001 unsigned char *o_sha = stage_sha(entry->stages[1].sha, o_mode);
1002 unsigned char *a_sha = stage_sha(entry->stages[2].sha, a_mode);
1003 unsigned char *b_sha = stage_sha(entry->stages[3].sha, b_mode);
1004
1005 if (o_sha && (!a_sha || !b_sha)) {
1006 /* Case A: Deleted in one */
1007 if ((!a_sha && !b_sha) ||
1008 (sha_eq(a_sha, o_sha) && !b_sha) ||
1009 (!a_sha && sha_eq(b_sha, o_sha))) {
1010 /* Deleted in both or deleted in one and
1011 * unchanged in the other */
1012 if (a_sha)
1013 output(o, 2, "Removing %s", path);
1014 /* do not touch working file if it did not exist */
1015 remove_file(o, 1, path, !a_sha);
1016 } else {
1017 /* Deleted in one and changed in the other */
1018 clean_merge = 0;
1019 if (!a_sha) {
1020 output(o, 1, "CONFLICT (delete/modify): %s deleted in %s "
1021 "and modified in %s. Version %s of %s left in tree.",
1022 path, o->branch1,
1023 o->branch2, o->branch2, path);
1024 update_file(o, 0, b_sha, b_mode, path);
1025 } else {
1026 output(o, 1, "CONFLICT (delete/modify): %s deleted in %s "
1027 "and modified in %s. Version %s of %s left in tree.",
1028 path, o->branch2,
1029 o->branch1, o->branch1, path);
1030 update_file(o, 0, a_sha, a_mode, path);
1031 }
1032 }
1033
1034 } else if ((!o_sha && a_sha && !b_sha) ||
1035 (!o_sha && !a_sha && b_sha)) {
1036 /* Case B: Added in one. */
1037 const char *add_branch;
1038 const char *other_branch;
1039 unsigned mode;
1040 const unsigned char *sha;
1041 const char *conf;
1042
1043 if (a_sha) {
1044 add_branch = o->branch1;
1045 other_branch = o->branch2;
1046 mode = a_mode;
1047 sha = a_sha;
1048 conf = "file/directory";
1049 } else {
1050 add_branch = o->branch2;
1051 other_branch = o->branch1;
1052 mode = b_mode;
1053 sha = b_sha;
1054 conf = "directory/file";
1055 }
1056 if (string_list_has_string(&o->current_directory_set, path)) {
1057 const char *new_path = unique_path(o, path, add_branch);
1058 clean_merge = 0;
1059 output(o, 1, "CONFLICT (%s): There is a directory with name %s in %s. "
1060 "Adding %s as %s",
1061 conf, path, other_branch, path, new_path);
1062 remove_file(o, 0, path, 0);
1063 update_file(o, 0, sha, mode, new_path);
1064 } else {
1065 output(o, 2, "Adding %s", path);
1066 update_file(o, 1, sha, mode, path);
1067 }
1068 } else if (a_sha && b_sha) {
1069 /* Case C: Added in both (check for same permissions) and */
1070 /* case D: Modified in both, but differently. */
1071 const char *reason = "content";
1072 struct merge_file_info mfi;
1073 struct diff_filespec one, a, b;
1074
1075 if (!o_sha) {
1076 reason = "add/add";
1077 o_sha = (unsigned char *)null_sha1;
1078 }
1079 output(o, 2, "Auto-merging %s", path);
1080 one.path = a.path = b.path = (char *)path;
1081 hashcpy(one.sha1, o_sha);
1082 one.mode = o_mode;
1083 hashcpy(a.sha1, a_sha);
1084 a.mode = a_mode;
1085 hashcpy(b.sha1, b_sha);
1086 b.mode = b_mode;
1087
1088 mfi = merge_file(o, &one, &a, &b,
1089 o->branch1, o->branch2);
1090
1091 clean_merge = mfi.clean;
1092 if (mfi.clean)
1093 update_file(o, 1, mfi.sha, mfi.mode, path);
1094 else if (S_ISGITLINK(mfi.mode))
1095 output(o, 1, "CONFLICT (submodule): Merge conflict in %s "
1096 "- needs %s", path, sha1_to_hex(b.sha1));
1097 else {
1098 output(o, 1, "CONFLICT (%s): Merge conflict in %s",
1099 reason, path);
1100
1101 if (o->call_depth)
1102 update_file(o, 0, mfi.sha, mfi.mode, path);
1103 else
1104 update_file_flags(o, mfi.sha, mfi.mode, path,
1105 0 /* update_cache */, 1 /* update_working_directory */);
1106 }
1107 } else if (!o_sha && !a_sha && !b_sha) {
1108 /*
1109 * this entry was deleted altogether. a_mode == 0 means
1110 * we had that path and want to actively remove it.
1111 */
1112 remove_file(o, 1, path, !a_mode);
1113 } else
1114 die("Fatal merge failure, shouldn't happen.");
1115
1116 return clean_merge;
1117 }
1118
1119 int merge_trees(struct merge_options *o,
1120 struct tree *head,
1121 struct tree *merge,
1122 struct tree *common,
1123 struct tree **result)
1124 {
1125 int code, clean;
1126
1127 if (o->subtree_merge) {
1128 merge = shift_tree_object(head, merge);
1129 common = shift_tree_object(head, common);
1130 }
1131
1132 if (sha_eq(common->object.sha1, merge->object.sha1)) {
1133 output(o, 0, "Already uptodate!");
1134 *result = head;
1135 return 1;
1136 }
1137
1138 code = git_merge_trees(o->call_depth, common, head, merge);
1139
1140 if (code != 0)
1141 die("merging of trees %s and %s failed",
1142 sha1_to_hex(head->object.sha1),
1143 sha1_to_hex(merge->object.sha1));
1144
1145 if (unmerged_cache()) {
1146 struct string_list *entries, *re_head, *re_merge;
1147 int i;
1148 string_list_clear(&o->current_file_set, 1);
1149 string_list_clear(&o->current_directory_set, 1);
1150 get_files_dirs(o, head);
1151 get_files_dirs(o, merge);
1152
1153 entries = get_unmerged();
1154 re_head = get_renames(o, head, common, head, merge, entries);
1155 re_merge = get_renames(o, merge, common, head, merge, entries);
1156 clean = process_renames(o, re_head, re_merge);
1157 for (i = 0; i < entries->nr; i++) {
1158 const char *path = entries->items[i].string;
1159 struct stage_data *e = entries->items[i].util;
1160 if (!e->processed
1161 && !process_entry(o, path, e))
1162 clean = 0;
1163 }
1164
1165 string_list_clear(re_merge, 0);
1166 string_list_clear(re_head, 0);
1167 string_list_clear(entries, 1);
1168
1169 }
1170 else
1171 clean = 1;
1172
1173 if (o->call_depth)
1174 *result = write_tree_from_memory(o);
1175
1176 return clean;
1177 }
1178
1179 static struct commit_list *reverse_commit_list(struct commit_list *list)
1180 {
1181 struct commit_list *next = NULL, *current, *backup;
1182 for (current = list; current; current = backup) {
1183 backup = current->next;
1184 current->next = next;
1185 next = current;
1186 }
1187 return next;
1188 }
1189
1190 /*
1191 * Merge the commits h1 and h2, return the resulting virtual
1192 * commit object and a flag indicating the cleanness of the merge.
1193 */
1194 int merge_recursive(struct merge_options *o,
1195 struct commit *h1,
1196 struct commit *h2,
1197 struct commit_list *ca,
1198 struct commit **result)
1199 {
1200 struct commit_list *iter;
1201 struct commit *merged_common_ancestors;
1202 struct tree *mrtree = mrtree;
1203 int clean;
1204
1205 if (show(o, 4)) {
1206 output(o, 4, "Merging:");
1207 output_commit_title(o, h1);
1208 output_commit_title(o, h2);
1209 }
1210
1211 if (!ca) {
1212 ca = get_merge_bases(h1, h2, 1);
1213 ca = reverse_commit_list(ca);
1214 }
1215
1216 if (show(o, 5)) {
1217 output(o, 5, "found %u common ancestor(s):", commit_list_count(ca));
1218 for (iter = ca; iter; iter = iter->next)
1219 output_commit_title(o, iter->item);
1220 }
1221
1222 merged_common_ancestors = pop_commit(&ca);
1223 if (merged_common_ancestors == NULL) {
1224 /* if there is no common ancestor, make an empty tree */
1225 struct tree *tree = xcalloc(1, sizeof(struct tree));
1226
1227 tree->object.parsed = 1;
1228 tree->object.type = OBJ_TREE;
1229 pretend_sha1_file(NULL, 0, OBJ_TREE, tree->object.sha1);
1230 merged_common_ancestors = make_virtual_commit(tree, "ancestor");
1231 }
1232
1233 for (iter = ca; iter; iter = iter->next) {
1234 const char *saved_b1, *saved_b2;
1235 o->call_depth++;
1236 /*
1237 * When the merge fails, the result contains files
1238 * with conflict markers. The cleanness flag is
1239 * ignored, it was never actually used, as result of
1240 * merge_trees has always overwritten it: the committed
1241 * "conflicts" were already resolved.
1242 */
1243 discard_cache();
1244 saved_b1 = o->branch1;
1245 saved_b2 = o->branch2;
1246 o->branch1 = "Temporary merge branch 1";
1247 o->branch2 = "Temporary merge branch 2";
1248 merge_recursive(o, merged_common_ancestors, iter->item,
1249 NULL, &merged_common_ancestors);
1250 o->branch1 = saved_b1;
1251 o->branch2 = saved_b2;
1252 o->call_depth--;
1253
1254 if (!merged_common_ancestors)
1255 die("merge returned no commit");
1256 }
1257
1258 discard_cache();
1259 if (!o->call_depth)
1260 read_cache();
1261
1262 clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree,
1263 &mrtree);
1264
1265 if (o->call_depth) {
1266 *result = make_virtual_commit(mrtree, "merged tree");
1267 commit_list_insert(h1, &(*result)->parents);
1268 commit_list_insert(h2, &(*result)->parents->next);
1269 }
1270 flush_output(o);
1271 return clean;
1272 }
1273
1274 static struct commit *get_ref(const unsigned char *sha1, const char *name)
1275 {
1276 struct object *object;
1277
1278 object = deref_tag(parse_object(sha1), name, strlen(name));
1279 if (!object)
1280 return NULL;
1281 if (object->type == OBJ_TREE)
1282 return make_virtual_commit((struct tree*)object, name);
1283 if (object->type != OBJ_COMMIT)
1284 return NULL;
1285 if (parse_commit((struct commit *)object))
1286 return NULL;
1287 return (struct commit *)object;
1288 }
1289
1290 int merge_recursive_generic(struct merge_options *o,
1291 const unsigned char *head,
1292 const unsigned char *merge,
1293 int num_base_list,
1294 const unsigned char **base_list,
1295 struct commit **result)
1296 {
1297 int clean, index_fd;
1298 struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
1299 struct commit *head_commit = get_ref(head, o->branch1);
1300 struct commit *next_commit = get_ref(merge, o->branch2);
1301 struct commit_list *ca = NULL;
1302
1303 if (base_list) {
1304 int i;
1305 for (i = 0; i < num_base_list; ++i) {
1306 struct commit *base;
1307 if (!(base = get_ref(base_list[i], sha1_to_hex(base_list[i]))))
1308 return error("Could not parse object '%s'",
1309 sha1_to_hex(base_list[i]));
1310 commit_list_insert(base, &ca);
1311 }
1312 }
1313
1314 index_fd = hold_locked_index(lock, 1);
1315 clean = merge_recursive(o, head_commit, next_commit, ca,
1316 result);
1317 if (active_cache_changed &&
1318 (write_cache(index_fd, active_cache, active_nr) ||
1319 commit_locked_index(lock)))
1320 return error("Unable to write index.");
1321
1322 return clean ? 0 : 1;
1323 }
1324
1325 static int merge_recursive_config(const char *var, const char *value, void *cb)
1326 {
1327 struct merge_options *o = cb;
1328 if (!strcasecmp(var, "merge.verbosity")) {
1329 o->verbosity = git_config_int(var, value);
1330 return 0;
1331 }
1332 if (!strcasecmp(var, "diff.renamelimit")) {
1333 o->diff_rename_limit = git_config_int(var, value);
1334 return 0;
1335 }
1336 if (!strcasecmp(var, "merge.renamelimit")) {
1337 o->merge_rename_limit = git_config_int(var, value);
1338 return 0;
1339 }
1340 return git_xmerge_config(var, value, cb);
1341 }
1342
1343 void init_merge_options(struct merge_options *o)
1344 {
1345 memset(o, 0, sizeof(struct merge_options));
1346 o->verbosity = 2;
1347 o->buffer_output = 1;
1348 o->diff_rename_limit = -1;
1349 o->merge_rename_limit = -1;
1350 git_config(merge_recursive_config, o);
1351 if (getenv("GIT_MERGE_VERBOSITY"))
1352 o->verbosity =
1353 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL, 10);
1354 if (o->verbosity >= 5)
1355 o->buffer_output = 0;
1356 strbuf_init(&o->obuf, 0);
1357 memset(&o->current_file_set, 0, sizeof(struct string_list));
1358 o->current_file_set.strdup_strings = 1;
1359 memset(&o->current_directory_set, 0, sizeof(struct string_list));
1360 o->current_directory_set.strdup_strings = 1;
1361 }
Thomas Rast's git repo