?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Cleanup remove_path
[git/dscho.git] / merge-recursive.c
blobac90fd9e2719a0084e45c195a446ee0571acb8e3
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
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_path(const char *name)
396 {
397 char *slash, *dirs;
398
399 if (unlink(name))
400 return -1;
401 dirs = xstrdup(name);
402 while ((slash = strrchr(name, '/'))) {
403 *slash = '\0';
404 if (rmdir(name) != 0)
405 break;
406 }
407 free(dirs);
408 return 0;
409 }
410
411 static int remove_file(struct merge_options *o, int clean,
412 const char *path, int no_wd)
413 {
414 int update_cache = o->call_depth || clean;
415 int update_working_directory = !o->call_depth && !no_wd;
416
417 if (update_cache) {
418 if (remove_file_from_cache(path))
419 return -1;
420 }
421 if (update_working_directory) {
422 unlink(path);
423 if (errno != ENOENT || errno != EISDIR)
424 return -1;
425 remove_path(path);
426 }
427 return 0;
428 }
429
430 static char *unique_path(struct merge_options *o, const char *path, const char *branch)
431 {
432 char *newpath = xmalloc(strlen(path) + 1 + strlen(branch) + 8 + 1);
433 int suffix = 0;
434 struct stat st;
435 char *p = newpath + strlen(path);
436 strcpy(newpath, path);
437 *(p++) = '~';
438 strcpy(p, branch);
439 for (; *p; ++p)
440 if ('/' == *p)
441 *p = '_';
442 while (string_list_has_string(&o->current_file_set, newpath) ||
443 string_list_has_string(&o->current_directory_set, newpath) ||
444 lstat(newpath, &st) == 0)
445 sprintf(p, "_%d", suffix++);
446
447 string_list_insert(newpath, &o->current_file_set);
448 return newpath;
449 }
450
451 static void flush_buffer(int fd, const char *buf, unsigned long size)
452 {
453 while (size > 0) {
454 long ret = write_in_full(fd, buf, size);
455 if (ret < 0) {
456 /* Ignore epipe */
457 if (errno == EPIPE)
458 break;
459 die("merge-recursive: %s", strerror(errno));
460 } else if (!ret) {
461 die("merge-recursive: disk full?");
462 }
463 size -= ret;
464 buf += ret;
465 }
466 }
467
468 static int make_room_for_path(const char *path)
469 {
470 int status;
471 const char *msg = "failed to create path '%s'%s";
472
473 status = safe_create_leading_directories_const(path);
474 if (status) {
475 if (status == -3) {
476 /* something else exists */
477 error(msg, path, ": perhaps a D/F conflict?");
478 return -1;
479 }
480 die(msg, path, "");
481 }
482
483 /* Successful unlink is good.. */
484 if (!unlink(path))
485 return 0;
486 /* .. and so is no existing file */
487 if (errno == ENOENT)
488 return 0;
489 /* .. but not some other error (who really cares what?) */
490 return error(msg, path, ": perhaps a D/F conflict?");
491 }
492
493 static void update_file_flags(struct merge_options *o,
494 const unsigned char *sha,
495 unsigned mode,
496 const char *path,
497 int update_cache,
498 int update_wd)
499 {
500 if (o->call_depth)
501 update_wd = 0;
502
503 if (update_wd) {
504 enum object_type type;
505 void *buf;
506 unsigned long size;
507
508 if (S_ISGITLINK(mode))
509 die("cannot read object %s '%s': It is a submodule!",
510 sha1_to_hex(sha), path);
511
512 buf = read_sha1_file(sha, &type, &size);
513 if (!buf)
514 die("cannot read object %s '%s'", sha1_to_hex(sha), path);
515 if (type != OBJ_BLOB)
516 die("blob expected for %s '%s'", sha1_to_hex(sha), path);
517 if (S_ISREG(mode)) {
518 struct strbuf strbuf;
519 strbuf_init(&strbuf, 0);
520 if (convert_to_working_tree(path, buf, size, &strbuf)) {
521 free(buf);
522 size = strbuf.len;
523 buf = strbuf_detach(&strbuf, NULL);
524 }
525 }
526
527 if (make_room_for_path(path) < 0) {
528 update_wd = 0;
529 free(buf);
530 goto update_index;
531 }
532 if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) {
533 int fd;
534 if (mode & 0100)
535 mode = 0777;
536 else
537 mode = 0666;
538 fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
539 if (fd < 0)
540 die("failed to open %s: %s", path, strerror(errno));
541 flush_buffer(fd, buf, size);
542 close(fd);
543 } else if (S_ISLNK(mode)) {
544 char *lnk = xmemdupz(buf, size);
545 safe_create_leading_directories_const(path);
546 unlink(path);
547 symlink(lnk, path);
548 free(lnk);
549 } else
550 die("do not know what to do with %06o %s '%s'",
551 mode, sha1_to_hex(sha), path);
552 free(buf);
553 }
554 update_index:
555 if (update_cache)
556 add_cacheinfo(mode, sha, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
557 }
558
559 static void update_file(struct merge_options *o,
560 int clean,
561 const unsigned char *sha,
562 unsigned mode,
563 const char *path)
564 {
565 update_file_flags(o, sha, mode, path, o->call_depth || clean, !o->call_depth);
566 }
567
568 /* Low level file merging, update and removal */
569
570 struct merge_file_info
571 {
572 unsigned char sha[20];
573 unsigned mode;
574 unsigned clean:1,
575 merge:1;
576 };
577
578 static void fill_mm(const unsigned char *sha1, mmfile_t *mm)
579 {
580 unsigned long size;
581 enum object_type type;
582
583 if (!hashcmp(sha1, null_sha1)) {
584 mm->ptr = xstrdup("");
585 mm->size = 0;
586 return;
587 }
588
589 mm->ptr = read_sha1_file(sha1, &type, &size);
590 if (!mm->ptr || type != OBJ_BLOB)
591 die("unable to read blob object %s", sha1_to_hex(sha1));
592 mm->size = size;
593 }
594
595 static int merge_3way(struct merge_options *o,
596 mmbuffer_t *result_buf,
597 struct diff_filespec *one,
598 struct diff_filespec *a,
599 struct diff_filespec *b,
600 const char *branch1,
601 const char *branch2)
602 {
603 mmfile_t orig, src1, src2;
604 char *name1, *name2;
605 int merge_status;
606
607 name1 = xstrdup(mkpath("%s:%s", branch1, a->path));
608 name2 = xstrdup(mkpath("%s:%s", branch2, b->path));
609
610 fill_mm(one->sha1, &orig);
611 fill_mm(a->sha1, &src1);
612 fill_mm(b->sha1, &src2);
613
614 merge_status = ll_merge(result_buf, a->path, &orig,
615 &src1, name1, &src2, name2,
616 o->call_depth);
617
618 free(name1);
619 free(name2);
620 free(orig.ptr);
621 free(src1.ptr);
622 free(src2.ptr);
623 return merge_status;
624 }
625
626 static struct merge_file_info merge_file(struct merge_options *o,
627 struct diff_filespec *one,
628 struct diff_filespec *a,
629 struct diff_filespec *b,
630 const char *branch1,
631 const char *branch2)
632 {
633 struct merge_file_info result;
634 result.merge = 0;
635 result.clean = 1;
636
637 if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
638 result.clean = 0;
639 if (S_ISREG(a->mode)) {
640 result.mode = a->mode;
641 hashcpy(result.sha, a->sha1);
642 } else {
643 result.mode = b->mode;
644 hashcpy(result.sha, b->sha1);
645 }
646 } else {
647 if (!sha_eq(a->sha1, one->sha1) && !sha_eq(b->sha1, one->sha1))
648 result.merge = 1;
649
650 /*
651 * Merge modes
652 */
653 if (a->mode == b->mode || a->mode == one->mode)
654 result.mode = b->mode;
655 else {
656 result.mode = a->mode;
657 if (b->mode != one->mode) {
658 result.clean = 0;
659 result.merge = 1;
660 }
661 }
662
663 if (sha_eq(a->sha1, b->sha1) || sha_eq(a->sha1, one->sha1))
664 hashcpy(result.sha, b->sha1);
665 else if (sha_eq(b->sha1, one->sha1))
666 hashcpy(result.sha, a->sha1);
667 else if (S_ISREG(a->mode)) {
668 mmbuffer_t result_buf;
669 int merge_status;
670
671 merge_status = merge_3way(o, &result_buf, one, a, b,
672 branch1, branch2);
673
674 if ((merge_status < 0) || !result_buf.ptr)
675 die("Failed to execute internal merge");
676
677 if (write_sha1_file(result_buf.ptr, result_buf.size,
678 blob_type, result.sha))
679 die("Unable to add %s to database",
680 a->path);
681
682 free(result_buf.ptr);
683 result.clean = (merge_status == 0);
684 } else if (S_ISGITLINK(a->mode)) {
685 result.clean = 0;
686 hashcpy(result.sha, a->sha1);
687 } else if (S_ISLNK(a->mode)) {
688 hashcpy(result.sha, a->sha1);
689
690 if (!sha_eq(a->sha1, b->sha1))
691 result.clean = 0;
692 } else {
693 die("unsupported object type in the tree");
694 }
695 }
696
697 return result;
698 }
699
700 static void conflict_rename_rename(struct merge_options *o,
701 struct rename *ren1,
702 const char *branch1,
703 struct rename *ren2,
704 const char *branch2)
705 {
706 char *del[2];
707 int delp = 0;
708 const char *ren1_dst = ren1->pair->two->path;
709 const char *ren2_dst = ren2->pair->two->path;
710 const char *dst_name1 = ren1_dst;
711 const char *dst_name2 = ren2_dst;
712 if (string_list_has_string(&o->current_directory_set, ren1_dst)) {
713 dst_name1 = del[delp++] = unique_path(o, ren1_dst, branch1);
714 output(o, 1, "%s is a directory in %s adding as %s instead",
715 ren1_dst, branch2, dst_name1);
716 remove_file(o, 0, ren1_dst, 0);
717 }
718 if (string_list_has_string(&o->current_directory_set, ren2_dst)) {
719 dst_name2 = del[delp++] = unique_path(o, ren2_dst, branch2);
720 output(o, 1, "%s is a directory in %s adding as %s instead",
721 ren2_dst, branch1, dst_name2);
722 remove_file(o, 0, ren2_dst, 0);
723 }
724 if (o->call_depth) {
725 remove_file_from_cache(dst_name1);
726 remove_file_from_cache(dst_name2);
727 /*
728 * Uncomment to leave the conflicting names in the resulting tree
729 *
730 * update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, dst_name1);
731 * update_file(o, 0, ren2->pair->two->sha1, ren2->pair->two->mode, dst_name2);
732 */
733 } else {
734 update_stages(dst_name1, NULL, ren1->pair->two, NULL, 1);
735 update_stages(dst_name2, NULL, NULL, ren2->pair->two, 1);
736 }
737 while (delp--)
738 free(del[delp]);
739 }
740
741 static void conflict_rename_dir(struct merge_options *o,
742 struct rename *ren1,
743 const char *branch1)
744 {
745 char *new_path = unique_path(o, ren1->pair->two->path, branch1);
746 output(o, 1, "Renaming %s to %s instead", ren1->pair->one->path, new_path);
747 remove_file(o, 0, ren1->pair->two->path, 0);
748 update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path);
749 free(new_path);
750 }
751
752 static void conflict_rename_rename_2(struct merge_options *o,
753 struct rename *ren1,
754 const char *branch1,
755 struct rename *ren2,
756 const char *branch2)
757 {
758 char *new_path1 = unique_path(o, ren1->pair->two->path, branch1);
759 char *new_path2 = unique_path(o, ren2->pair->two->path, branch2);
760 output(o, 1, "Renaming %s to %s and %s to %s instead",
761 ren1->pair->one->path, new_path1,
762 ren2->pair->one->path, new_path2);
763 remove_file(o, 0, ren1->pair->two->path, 0);
764 update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path1);
765 update_file(o, 0, ren2->pair->two->sha1, ren2->pair->two->mode, new_path2);
766 free(new_path2);
767 free(new_path1);
768 }
769
770 static int process_renames(struct merge_options *o,
771 struct string_list *a_renames,
772 struct string_list *b_renames)
773 {
774 int clean_merge = 1, i, j;
775 struct string_list a_by_dst = {NULL, 0, 0, 0}, b_by_dst = {NULL, 0, 0, 0};
776 const struct rename *sre;
777
778 for (i = 0; i < a_renames->nr; i++) {
779 sre = a_renames->items[i].util;
780 string_list_insert(sre->pair->two->path, &a_by_dst)->util
781 = sre->dst_entry;
782 }
783 for (i = 0; i < b_renames->nr; i++) {
784 sre = b_renames->items[i].util;
785 string_list_insert(sre->pair->two->path, &b_by_dst)->util
786 = sre->dst_entry;
787 }
788
789 for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
790 int compare;
791 char *src;
792 struct string_list *renames1, *renames2, *renames2Dst;
793 struct rename *ren1 = NULL, *ren2 = NULL;
794 const char *branch1, *branch2;
795 const char *ren1_src, *ren1_dst;
796
797 if (i >= a_renames->nr) {
798 compare = 1;
799 ren2 = b_renames->items[j++].util;
800 } else if (j >= b_renames->nr) {
801 compare = -1;
802 ren1 = a_renames->items[i++].util;
803 } else {
804 compare = strcmp(a_renames->items[i].string,
805 b_renames->items[j].string);
806 if (compare <= 0)
807 ren1 = a_renames->items[i++].util;
808 if (compare >= 0)
809 ren2 = b_renames->items[j++].util;
810 }
811
812 /* TODO: refactor, so that 1/2 are not needed */
813 if (ren1) {
814 renames1 = a_renames;
815 renames2 = b_renames;
816 renames2Dst = &b_by_dst;
817 branch1 = o->branch1;
818 branch2 = o->branch2;
819 } else {
820 struct rename *tmp;
821 renames1 = b_renames;
822 renames2 = a_renames;
823 renames2Dst = &a_by_dst;
824 branch1 = o->branch2;
825 branch2 = o->branch1;
826 tmp = ren2;
827 ren2 = ren1;
828 ren1 = tmp;
829 }
830 src = ren1->pair->one->path;
831
832 ren1->dst_entry->processed = 1;
833 ren1->src_entry->processed = 1;
834
835 if (ren1->processed)
836 continue;
837 ren1->processed = 1;
838
839 ren1_src = ren1->pair->one->path;
840 ren1_dst = ren1->pair->two->path;
841
842 if (ren2) {
843 const char *ren2_src = ren2->pair->one->path;
844 const char *ren2_dst = ren2->pair->two->path;
845 /* Renamed in 1 and renamed in 2 */
846 if (strcmp(ren1_src, ren2_src) != 0)
847 die("ren1.src != ren2.src");
848 ren2->dst_entry->processed = 1;
849 ren2->processed = 1;
850 if (strcmp(ren1_dst, ren2_dst) != 0) {
851 clean_merge = 0;
852 output(o, 1, "CONFLICT (rename/rename): "
853 "Rename \"%s\"->\"%s\" in branch \"%s\" "
854 "rename \"%s\"->\"%s\" in \"%s\"%s",
855 src, ren1_dst, branch1,
856 src, ren2_dst, branch2,
857 o->call_depth ? " (left unresolved)": "");
858 if (o->call_depth) {
859 remove_file_from_cache(src);
860 update_file(o, 0, ren1->pair->one->sha1,
861 ren1->pair->one->mode, src);
862 }
863 conflict_rename_rename(o, ren1, branch1, ren2, branch2);
864 } else {
865 struct merge_file_info mfi;
866 remove_file(o, 1, ren1_src, 1);
867 mfi = merge_file(o,
868 ren1->pair->one,
869 ren1->pair->two,
870 ren2->pair->two,
871 branch1,
872 branch2);
873 if (mfi.merge || !mfi.clean)
874 output(o, 1, "Renaming %s->%s", src, ren1_dst);
875
876 if (mfi.merge)
877 output(o, 2, "Auto-merging %s", ren1_dst);
878
879 if (!mfi.clean) {
880 output(o, 1, "CONFLICT (content): merge conflict in %s",
881 ren1_dst);
882 clean_merge = 0;
883
884 if (!o->call_depth)
885 update_stages(ren1_dst,
886 ren1->pair->one,
887 ren1->pair->two,
888 ren2->pair->two,
889 1 /* clear */);
890 }
891 update_file(o, mfi.clean, mfi.sha, mfi.mode, ren1_dst);
892 }
893 } else {
894 /* Renamed in 1, maybe changed in 2 */
895 struct string_list_item *item;
896 /* we only use sha1 and mode of these */
897 struct diff_filespec src_other, dst_other;
898 int try_merge, stage = a_renames == renames1 ? 3: 2;
899
900 remove_file(o, 1, ren1_src, o->call_depth || stage == 3);
901
902 hashcpy(src_other.sha1, ren1->src_entry->stages[stage].sha);
903 src_other.mode = ren1->src_entry->stages[stage].mode;
904 hashcpy(dst_other.sha1, ren1->dst_entry->stages[stage].sha);
905 dst_other.mode = ren1->dst_entry->stages[stage].mode;
906
907 try_merge = 0;
908
909 if (string_list_has_string(&o->current_directory_set, ren1_dst)) {
910 clean_merge = 0;
911 output(o, 1, "CONFLICT (rename/directory): Rename %s->%s in %s "
912 " directory %s added in %s",
913 ren1_src, ren1_dst, branch1,
914 ren1_dst, branch2);
915 conflict_rename_dir(o, ren1, branch1);
916 } else if (sha_eq(src_other.sha1, null_sha1)) {
917 clean_merge = 0;
918 output(o, 1, "CONFLICT (rename/delete): Rename %s->%s in %s "
919 "and deleted in %s",
920 ren1_src, ren1_dst, branch1,
921 branch2);
922 update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, ren1_dst);
923 } else if (!sha_eq(dst_other.sha1, null_sha1)) {
924 const char *new_path;
925 clean_merge = 0;
926 try_merge = 1;
927 output(o, 1, "CONFLICT (rename/add): Rename %s->%s in %s. "
928 "%s added in %s",
929 ren1_src, ren1_dst, branch1,
930 ren1_dst, branch2);
931 new_path = unique_path(o, ren1_dst, branch2);
932 output(o, 1, "Adding as %s instead", new_path);
933 update_file(o, 0, dst_other.sha1, dst_other.mode, new_path);
934 } else if ((item = string_list_lookup(ren1_dst, renames2Dst))) {
935 ren2 = item->util;
936 clean_merge = 0;
937 ren2->processed = 1;
938 output(o, 1, "CONFLICT (rename/rename): "
939 "Rename %s->%s in %s. "
940 "Rename %s->%s in %s",
941 ren1_src, ren1_dst, branch1,
942 ren2->pair->one->path, ren2->pair->two->path, branch2);
943 conflict_rename_rename_2(o, ren1, branch1, ren2, branch2);
944 } else
945 try_merge = 1;
946
947 if (try_merge) {
948 struct diff_filespec *one, *a, *b;
949 struct merge_file_info mfi;
950 src_other.path = (char *)ren1_src;
951
952 one = ren1->pair->one;
953 if (a_renames == renames1) {
954 a = ren1->pair->two;
955 b = &src_other;
956 } else {
957 b = ren1->pair->two;
958 a = &src_other;
959 }
960 mfi = merge_file(o, one, a, b,
961 o->branch1, o->branch2);
962
963 if (mfi.clean &&
964 sha_eq(mfi.sha, ren1->pair->two->sha1) &&
965 mfi.mode == ren1->pair->two->mode)
966 /*
967 * This messaged is part of
968 * t6022 test. If you change
969 * it update the test too.
970 */
971 output(o, 3, "Skipped %s (merged same as existing)", ren1_dst);
972 else {
973 if (mfi.merge || !mfi.clean)
974 output(o, 1, "Renaming %s => %s", ren1_src, ren1_dst);
975 if (mfi.merge)
976 output(o, 2, "Auto-merging %s", ren1_dst);
977 if (!mfi.clean) {
978 output(o, 1, "CONFLICT (rename/modify): Merge conflict in %s",
979 ren1_dst);
980 clean_merge = 0;
981
982 if (!o->call_depth)
983 update_stages(ren1_dst,
984 one, a, b, 1);
985 }
986 update_file(o, mfi.clean, mfi.sha, mfi.mode, ren1_dst);
987 }
988 }
989 }
990 }
991 string_list_clear(&a_by_dst, 0);
992 string_list_clear(&b_by_dst, 0);
993
994 return clean_merge;
995 }
996
997 static unsigned char *stage_sha(const unsigned char *sha, unsigned mode)
998 {
999 return (is_null_sha1(sha) || mode == 0) ? NULL: (unsigned char *)sha;
1000 }
1001
1002 /* Per entry merge function */
1003 static int process_entry(struct merge_options *o,
1004 const char *path, struct stage_data *entry)
1005 {
1006 /*
1007 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1008 print_index_entry("\tpath: ", entry);
1009 */
1010 int clean_merge = 1;
1011 unsigned o_mode = entry->stages[1].mode;
1012 unsigned a_mode = entry->stages[2].mode;
1013 unsigned b_mode = entry->stages[3].mode;
1014 unsigned char *o_sha = stage_sha(entry->stages[1].sha, o_mode);
1015 unsigned char *a_sha = stage_sha(entry->stages[2].sha, a_mode);
1016 unsigned char *b_sha = stage_sha(entry->stages[3].sha, b_mode);
1017
1018 if (o_sha && (!a_sha || !b_sha)) {
1019 /* Case A: Deleted in one */
1020 if ((!a_sha && !b_sha) ||
1021 (sha_eq(a_sha, o_sha) && !b_sha) ||
1022 (!a_sha && sha_eq(b_sha, o_sha))) {
1023 /* Deleted in both or deleted in one and
1024 * unchanged in the other */
1025 if (a_sha)
1026 output(o, 2, "Removing %s", path);
1027 /* do not touch working file if it did not exist */
1028 remove_file(o, 1, path, !a_sha);
1029 } else {
1030 /* Deleted in one and changed in the other */
1031 clean_merge = 0;
1032 if (!a_sha) {
1033 output(o, 1, "CONFLICT (delete/modify): %s deleted in %s "
1034 "and modified in %s. Version %s of %s left in tree.",
1035 path, o->branch1,
1036 o->branch2, o->branch2, path);
1037 update_file(o, 0, b_sha, b_mode, path);
1038 } else {
1039 output(o, 1, "CONFLICT (delete/modify): %s deleted in %s "
1040 "and modified in %s. Version %s of %s left in tree.",
1041 path, o->branch2,
1042 o->branch1, o->branch1, path);
1043 update_file(o, 0, a_sha, a_mode, path);
1044 }
1045 }
1046
1047 } else if ((!o_sha && a_sha && !b_sha) ||
1048 (!o_sha && !a_sha && b_sha)) {
1049 /* Case B: Added in one. */
1050 const char *add_branch;
1051 const char *other_branch;
1052 unsigned mode;
1053 const unsigned char *sha;
1054 const char *conf;
1055
1056 if (a_sha) {
1057 add_branch = o->branch1;
1058 other_branch = o->branch2;
1059 mode = a_mode;
1060 sha = a_sha;
1061 conf = "file/directory";
1062 } else {
1063 add_branch = o->branch2;
1064 other_branch = o->branch1;
1065 mode = b_mode;
1066 sha = b_sha;
1067 conf = "directory/file";
1068 }
1069 if (string_list_has_string(&o->current_directory_set, path)) {
1070 const char *new_path = unique_path(o, path, add_branch);
1071 clean_merge = 0;
1072 output(o, 1, "CONFLICT (%s): There is a directory with name %s in %s. "
1073 "Adding %s as %s",
1074 conf, path, other_branch, path, new_path);
1075 remove_file(o, 0, path, 0);
1076 update_file(o, 0, sha, mode, new_path);
1077 } else {
1078 output(o, 2, "Adding %s", path);
1079 update_file(o, 1, sha, mode, path);
1080 }
1081 } else if (a_sha && b_sha) {
1082 /* Case C: Added in both (check for same permissions) and */
1083 /* case D: Modified in both, but differently. */
1084 const char *reason = "content";
1085 struct merge_file_info mfi;
1086 struct diff_filespec one, a, b;
1087
1088 if (!o_sha) {
1089 reason = "add/add";
1090 o_sha = (unsigned char *)null_sha1;
1091 }
1092 output(o, 2, "Auto-merging %s", path);
1093 one.path = a.path = b.path = (char *)path;
1094 hashcpy(one.sha1, o_sha);
1095 one.mode = o_mode;
1096 hashcpy(a.sha1, a_sha);
1097 a.mode = a_mode;
1098 hashcpy(b.sha1, b_sha);
1099 b.mode = b_mode;
1100
1101 mfi = merge_file(o, &one, &a, &b,
1102 o->branch1, o->branch2);
1103
1104 clean_merge = mfi.clean;
1105 if (mfi.clean)
1106 update_file(o, 1, mfi.sha, mfi.mode, path);
1107 else if (S_ISGITLINK(mfi.mode))
1108 output(o, 1, "CONFLICT (submodule): Merge conflict in %s "
1109 "- needs %s", path, sha1_to_hex(b.sha1));
1110 else {
1111 output(o, 1, "CONFLICT (%s): Merge conflict in %s",
1112 reason, path);
1113
1114 if (o->call_depth)
1115 update_file(o, 0, mfi.sha, mfi.mode, path);
1116 else
1117 update_file_flags(o, mfi.sha, mfi.mode, path,
1118 0 /* update_cache */, 1 /* update_working_directory */);
1119 }
1120 } else if (!o_sha && !a_sha && !b_sha) {
1121 /*
1122 * this entry was deleted altogether. a_mode == 0 means
1123 * we had that path and want to actively remove it.
1124 */
1125 remove_file(o, 1, path, !a_mode);
1126 } else
1127 die("Fatal merge failure, shouldn't happen.");
1128
1129 return clean_merge;
1130 }
1131
1132 int merge_trees(struct merge_options *o,
1133 struct tree *head,
1134 struct tree *merge,
1135 struct tree *common,
1136 struct tree **result)
1137 {
1138 int code, clean;
1139
1140 if (o->subtree_merge) {
1141 merge = shift_tree_object(head, merge);
1142 common = shift_tree_object(head, common);
1143 }
1144
1145 if (sha_eq(common->object.sha1, merge->object.sha1)) {
1146 output(o, 0, "Already uptodate!");
1147 *result = head;
1148 return 1;
1149 }
1150
1151 code = git_merge_trees(o->call_depth, common, head, merge);
1152
1153 if (code != 0)
1154 die("merging of trees %s and %s failed",
1155 sha1_to_hex(head->object.sha1),
1156 sha1_to_hex(merge->object.sha1));
1157
1158 if (unmerged_cache()) {
1159 struct string_list *entries, *re_head, *re_merge;
1160 int i;
1161 string_list_clear(&o->current_file_set, 1);
1162 string_list_clear(&o->current_directory_set, 1);
1163 get_files_dirs(o, head);
1164 get_files_dirs(o, merge);
1165
1166 entries = get_unmerged();
1167 re_head = get_renames(o, head, common, head, merge, entries);
1168 re_merge = get_renames(o, merge, common, head, merge, entries);
1169 clean = process_renames(o, re_head, re_merge);
1170 for (i = 0; i < entries->nr; i++) {
1171 const char *path = entries->items[i].string;
1172 struct stage_data *e = entries->items[i].util;
1173 if (!e->processed
1174 && !process_entry(o, path, e))
1175 clean = 0;
1176 }
1177
1178 string_list_clear(re_merge, 0);
1179 string_list_clear(re_head, 0);
1180 string_list_clear(entries, 1);
1181
1182 }
1183 else
1184 clean = 1;
1185
1186 if (o->call_depth)
1187 *result = write_tree_from_memory(o);
1188
1189 return clean;
1190 }
1191
1192 static struct commit_list *reverse_commit_list(struct commit_list *list)
1193 {
1194 struct commit_list *next = NULL, *current, *backup;
1195 for (current = list; current; current = backup) {
1196 backup = current->next;
1197 current->next = next;
1198 next = current;
1199 }
1200 return next;
1201 }
1202
1203 /*
1204 * Merge the commits h1 and h2, return the resulting virtual
1205 * commit object and a flag indicating the cleanness of the merge.
1206 */
1207 int merge_recursive(struct merge_options *o,
1208 struct commit *h1,
1209 struct commit *h2,
1210 struct commit_list *ca,
1211 struct commit **result)
1212 {
1213 struct commit_list *iter;
1214 struct commit *merged_common_ancestors;
1215 struct tree *mrtree = mrtree;
1216 int clean;
1217
1218 if (show(o, 4)) {
1219 output(o, 4, "Merging:");
1220 output_commit_title(o, h1);
1221 output_commit_title(o, h2);
1222 }
1223
1224 if (!ca) {
1225 ca = get_merge_bases(h1, h2, 1);
1226 ca = reverse_commit_list(ca);
1227 }
1228
1229 if (show(o, 5)) {
1230 output(o, 5, "found %u common ancestor(s):", commit_list_count(ca));
1231 for (iter = ca; iter; iter = iter->next)
1232 output_commit_title(o, iter->item);
1233 }
1234
1235 merged_common_ancestors = pop_commit(&ca);
1236 if (merged_common_ancestors == NULL) {
1237 /* if there is no common ancestor, make an empty tree */
1238 struct tree *tree = xcalloc(1, sizeof(struct tree));
1239
1240 tree->object.parsed = 1;
1241 tree->object.type = OBJ_TREE;
1242 pretend_sha1_file(NULL, 0, OBJ_TREE, tree->object.sha1);
1243 merged_common_ancestors = make_virtual_commit(tree, "ancestor");
1244 }
1245
1246 for (iter = ca; iter; iter = iter->next) {
1247 const char *saved_b1, *saved_b2;
1248 o->call_depth++;
1249 /*
1250 * When the merge fails, the result contains files
1251 * with conflict markers. The cleanness flag is
1252 * ignored, it was never actually used, as result of
1253 * merge_trees has always overwritten it: the committed
1254 * "conflicts" were already resolved.
1255 */
1256 discard_cache();
1257 saved_b1 = o->branch1;
1258 saved_b2 = o->branch2;
1259 o->branch1 = "Temporary merge branch 1";
1260 o->branch2 = "Temporary merge branch 2";
1261 merge_recursive(o, merged_common_ancestors, iter->item,
1262 NULL, &merged_common_ancestors);
1263 o->branch1 = saved_b1;
1264 o->branch2 = saved_b2;
1265 o->call_depth--;
1266
1267 if (!merged_common_ancestors)
1268 die("merge returned no commit");
1269 }
1270
1271 discard_cache();
1272 if (!o->call_depth)
1273 read_cache();
1274
1275 clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree,
1276 &mrtree);
1277
1278 if (o->call_depth) {
1279 *result = make_virtual_commit(mrtree, "merged tree");
1280 commit_list_insert(h1, &(*result)->parents);
1281 commit_list_insert(h2, &(*result)->parents->next);
1282 }
1283 flush_output(o);
1284 return clean;
1285 }
1286
1287 static struct commit *get_ref(const unsigned char *sha1, const char *name)
1288 {
1289 struct object *object;
1290
1291 object = deref_tag(parse_object(sha1), name, strlen(name));
1292 if (!object)
1293 return NULL;
1294 if (object->type == OBJ_TREE)
1295 return make_virtual_commit((struct tree*)object, name);
1296 if (object->type != OBJ_COMMIT)
1297 return NULL;
1298 if (parse_commit((struct commit *)object))
1299 return NULL;
1300 return (struct commit *)object;
1301 }
1302
1303 int merge_recursive_generic(struct merge_options *o,
1304 const unsigned char *head,
1305 const unsigned char *merge,
1306 int num_base_list,
1307 const unsigned char **base_list,
1308 struct commit **result)
1309 {
1310 int clean, index_fd;
1311 struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
1312 struct commit *head_commit = get_ref(head, o->branch1);
1313 struct commit *next_commit = get_ref(merge, o->branch2);
1314 struct commit_list *ca = NULL;
1315
1316 if (base_list) {
1317 int i;
1318 for (i = 0; i < num_base_list; ++i) {
1319 struct commit *base;
1320 if (!(base = get_ref(base_list[i], sha1_to_hex(base_list[i]))))
1321 return error("Could not parse object '%s'",
1322 sha1_to_hex(base_list[i]));
1323 commit_list_insert(base, &ca);
1324 }
1325 }
1326
1327 index_fd = hold_locked_index(lock, 1);
1328 clean = merge_recursive(o, head_commit, next_commit, ca,
1329 result);
1330 if (active_cache_changed &&
1331 (write_cache(index_fd, active_cache, active_nr) ||
1332 commit_locked_index(lock)))
1333 return error("Unable to write index.");
1334
1335 return clean ? 0 : 1;
1336 }
1337
1338 static int merge_recursive_config(const char *var, const char *value, void *cb)
1339 {
1340 struct merge_options *o = cb;
1341 if (!strcasecmp(var, "merge.verbosity")) {
1342 o->verbosity = git_config_int(var, value);
1343 return 0;
1344 }
1345 if (!strcasecmp(var, "diff.renamelimit")) {
1346 o->diff_rename_limit = git_config_int(var, value);
1347 return 0;
1348 }
1349 if (!strcasecmp(var, "merge.renamelimit")) {
1350 o->merge_rename_limit = git_config_int(var, value);
1351 return 0;
1352 }
1353 return git_default_config(var, value, cb);
1354 }
1355
1356 void init_merge_options(struct merge_options *o)
1357 {
1358 memset(o, 0, sizeof(struct merge_options));
1359 o->verbosity = 2;
1360 o->buffer_output = 1;
1361 o->diff_rename_limit = -1;
1362 o->merge_rename_limit = -1;
1363 git_config(merge_recursive_config, o);
1364 if (getenv("GIT_MERGE_VERBOSITY"))
1365 o->verbosity =
1366 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL, 10);
1367 if (o->verbosity >= 5)
1368 o->buffer_output = 0;
1369 strbuf_init(&o->obuf, 0);
1370 memset(&o->current_file_set, 0, sizeof(struct string_list));
1371 o->current_file_set.strdup_strings = 1;
1372 memset(&o->current_directory_set, 0, sizeof(struct string_list));
1373 o->current_directory_set.strdup_strings = 1;
1374 }
Dscho's miscellaneous git branches