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