?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Add merge-subtree back
[git/jnareb-git.git] / builtin-merge-recursive.c
blob558a58e4d3aaff6e66f25220b30ea9749b50be08
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 "run-command.h"
15 #include "tag.h"
16 #include "unpack-trees.h"
17 #include "path-list.h"
18 #include "xdiff-interface.h"
19 #include "interpolate.h"
20 #include "attr.h"
21 #include "merge-recursive.h"
22
23 static int subtree_merge;
24
25 static struct tree *shift_tree_object(struct tree *one, struct tree *two)
26 {
27 unsigned char shifted[20];
28
29 /*
30 * NEEDSWORK: this limits the recursion depth to hardcoded
31 * value '2' to avoid excessive overhead.
32 */
33 shift_tree(one->object.sha1, two->object.sha1, shifted, 2);
34 if (!hashcmp(two->object.sha1, shifted))
35 return two;
36 return lookup_tree(shifted);
37 }
38
39 /*
40 * A virtual commit has
41 * - (const char *)commit->util set to the name, and
42 * - *(int *)commit->object.sha1 set to the virtual id.
43 */
44
45 static unsigned commit_list_count(const struct commit_list *l)
46 {
47 unsigned c = 0;
48 for (; l; l = l->next )
49 c++;
50 return c;
51 }
52
53 static struct commit *make_virtual_commit(struct tree *tree, const char *comment)
54 {
55 struct commit *commit = xcalloc(1, sizeof(struct commit));
56 static unsigned virtual_id = 1;
57 commit->tree = tree;
58 commit->util = (void*)comment;
59 *(int*)commit->object.sha1 = virtual_id++;
60 /* avoid warnings */
61 commit->object.parsed = 1;
62 return commit;
63 }
64
65 /*
66 * Since we use get_tree_entry(), which does not put the read object into
67 * the object pool, we cannot rely on a == b.
68 */
69 static int sha_eq(const unsigned char *a, const unsigned char *b)
70 {
71 if (!a && !b)
72 return 2;
73 return a && b && hashcmp(a, b) == 0;
74 }
75
76 /*
77 * Since we want to write the index eventually, we cannot reuse the index
78 * for these (temporary) data.
79 */
80 struct stage_data
81 {
82 struct
83 {
84 unsigned mode;
85 unsigned char sha[20];
86 } stages[4];
87 unsigned processed:1;
88 };
89
90 static struct path_list current_file_set = {NULL, 0, 0, 1};
91 static struct path_list current_directory_set = {NULL, 0, 0, 1};
92
93 static int call_depth = 0;
94 static int verbosity = 2;
95 static int rename_limit = -1;
96 static int buffer_output = 1;
97 static struct strbuf obuf = STRBUF_INIT;
98
99 static int show(int v)
100 {
101 return (!call_depth && verbosity >= v) || verbosity >= 5;
102 }
103
104 static void flush_output(void)
105 {
106 if (obuf.len) {
107 fputs(obuf.buf, stdout);
108 strbuf_reset(&obuf);
109 }
110 }
111
112 static void output(int v, const char *fmt, ...)
113 {
114 int len;
115 va_list ap;
116
117 if (!show(v))
118 return;
119
120 strbuf_grow(&obuf, call_depth * 2 + 2);
121 memset(obuf.buf + obuf.len, ' ', call_depth * 2);
122 strbuf_setlen(&obuf, obuf.len + call_depth * 2);
123
124 va_start(ap, fmt);
125 len = vsnprintf(obuf.buf + obuf.len, strbuf_avail(&obuf), fmt, ap);
126 va_end(ap);
127
128 if (len < 0)
129 len = 0;
130 if (len >= strbuf_avail(&obuf)) {
131 strbuf_grow(&obuf, len + 2);
132 va_start(ap, fmt);
133 len = vsnprintf(obuf.buf + obuf.len, strbuf_avail(&obuf), fmt, ap);
134 va_end(ap);
135 if (len >= strbuf_avail(&obuf)) {
136 die("this should not happen, your snprintf is broken");
137 }
138 }
139 strbuf_setlen(&obuf, obuf.len + len);
140 strbuf_add(&obuf, "\n", 1);
141 if (!buffer_output)
142 flush_output();
143 }
144
145 static void output_commit_title(struct commit *commit)
146 {
147 int i;
148 flush_output();
149 for (i = call_depth; i--;)
150 fputs(" ", stdout);
151 if (commit->util)
152 printf("virtual %s\n", (char *)commit->util);
153 else {
154 printf("%s ", find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
155 if (parse_commit(commit) != 0)
156 printf("(bad commit)\n");
157 else {
158 const char *s;
159 int len;
160 for (s = commit->buffer; *s; s++)
161 if (*s == '\n' && s[1] == '\n') {
162 s += 2;
163 break;
164 }
165 for (len = 0; s[len] && '\n' != s[len]; len++)
166 ; /* do nothing */
167 printf("%.*s\n", len, s);
168 }
169 }
170 }
171
172 static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
173 const char *path, int stage, int refresh, int options)
174 {
175 struct cache_entry *ce;
176 ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage, refresh);
177 if (!ce)
178 return error("addinfo_cache failed for path '%s'", path);
179 return add_cache_entry(ce, options);
180 }
181
182 /*
183 * This is a global variable which is used in a number of places but
184 * only written to in the 'merge' function.
185 *
186 * index_only == 1 => Don't leave any non-stage 0 entries in the cache and
187 * don't update the working directory.
188 * 0 => Leave unmerged entries in the cache and update
189 * the working directory.
190 */
191 static int index_only = 0;
192
193 static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
194 {
195 parse_tree(tree);
196 init_tree_desc(desc, tree->buffer, tree->size);
197 }
198
199 static int git_merge_trees(int index_only,
200 struct tree *common,
201 struct tree *head,
202 struct tree *merge)
203 {
204 int rc;
205 struct tree_desc t[3];
206 struct unpack_trees_options opts;
207
208 memset(&opts, 0, sizeof(opts));
209 if (index_only)
210 opts.index_only = 1;
211 else
212 opts.update = 1;
213 opts.merge = 1;
214 opts.head_idx = 2;
215 opts.fn = threeway_merge;
216
217 init_tree_desc_from_tree(t+0, common);
218 init_tree_desc_from_tree(t+1, head);
219 init_tree_desc_from_tree(t+2, merge);
220
221 rc = unpack_trees(3, t, &opts);
222 cache_tree_free(&active_cache_tree);
223 return rc;
224 }
225
226 struct tree *write_tree_from_memory(void)
227 {
228 struct tree *result = NULL;
229
230 if (unmerged_cache()) {
231 int i;
232 output(0, "There are unmerged index entries:");
233 for (i = 0; i < active_nr; i++) {
234 struct cache_entry *ce = active_cache[i];
235 if (ce_stage(ce))
236 output(0, "%d %.*s", ce_stage(ce), ce_namelen(ce), ce->name);
237 }
238 return NULL;
239 }
240
241 if (!active_cache_tree)
242 active_cache_tree = cache_tree();
243
244 if (!cache_tree_fully_valid(active_cache_tree) &&
245 cache_tree_update(active_cache_tree,
246 active_cache, active_nr, 0, 0) < 0)
247 die("error building trees");
248
249 result = lookup_tree(active_cache_tree->sha1);
250
251 return result;
252 }
253
254 static int save_files_dirs(const unsigned char *sha1,
255 const char *base, int baselen, const char *path,
256 unsigned int mode, int stage)
257 {
258 int len = strlen(path);
259 char *newpath = xmalloc(baselen + len + 1);
260 memcpy(newpath, base, baselen);
261 memcpy(newpath + baselen, path, len);
262 newpath[baselen + len] = '\0';
263
264 if (S_ISDIR(mode))
265 path_list_insert(newpath, &current_directory_set);
266 else
267 path_list_insert(newpath, &current_file_set);
268 free(newpath);
269
270 return READ_TREE_RECURSIVE;
271 }
272
273 static int get_files_dirs(struct tree *tree)
274 {
275 int n;
276 if (read_tree_recursive(tree, "", 0, 0, NULL, save_files_dirs) != 0)
277 return 0;
278 n = current_file_set.nr + current_directory_set.nr;
279 return n;
280 }
281
282 /*
283 * Returns an index_entry instance which doesn't have to correspond to
284 * a real cache entry in Git's index.
285 */
286 static struct stage_data *insert_stage_data(const char *path,
287 struct tree *o, struct tree *a, struct tree *b,
288 struct path_list *entries)
289 {
290 struct path_list_item *item;
291 struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
292 get_tree_entry(o->object.sha1, path,
293 e->stages[1].sha, &e->stages[1].mode);
294 get_tree_entry(a->object.sha1, path,
295 e->stages[2].sha, &e->stages[2].mode);
296 get_tree_entry(b->object.sha1, path,
297 e->stages[3].sha, &e->stages[3].mode);
298 item = path_list_insert(path, entries);
299 item->util = e;
300 return e;
301 }
302
303 /*
304 * Create a dictionary mapping file names to stage_data objects. The
305 * dictionary contains one entry for every path with a non-zero stage entry.
306 */
307 static struct path_list *get_unmerged(void)
308 {
309 struct path_list *unmerged = xcalloc(1, sizeof(struct path_list));
310 int i;
311
312 unmerged->strdup_paths = 1;
313
314 for (i = 0; i < active_nr; i++) {
315 struct path_list_item *item;
316 struct stage_data *e;
317 struct cache_entry *ce = active_cache[i];
318 if (!ce_stage(ce))
319 continue;
320
321 item = path_list_lookup(ce->name, unmerged);
322 if (!item) {
323 item = path_list_insert(ce->name, unmerged);
324 item->util = xcalloc(1, sizeof(struct stage_data));
325 }
326 e = item->util;
327 e->stages[ce_stage(ce)].mode = ce->ce_mode;
328 hashcpy(e->stages[ce_stage(ce)].sha, ce->sha1);
329 }
330
331 return unmerged;
332 }
333
334 struct rename
335 {
336 struct diff_filepair *pair;
337 struct stage_data *src_entry;
338 struct stage_data *dst_entry;
339 unsigned processed:1;
340 };
341
342 /*
343 * Get information of all renames which occurred between 'o_tree' and
344 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
345 * 'b_tree') to be able to associate the correct cache entries with
346 * the rename information. 'tree' is always equal to either a_tree or b_tree.
347 */
348 static struct path_list *get_renames(struct tree *tree,
349 struct tree *o_tree,
350 struct tree *a_tree,
351 struct tree *b_tree,
352 struct path_list *entries)
353 {
354 int i;
355 struct path_list *renames;
356 struct diff_options opts;
357
358 renames = xcalloc(1, sizeof(struct path_list));
359 diff_setup(&opts);
360 DIFF_OPT_SET(&opts, RECURSIVE);
361 opts.detect_rename = DIFF_DETECT_RENAME;
362 opts.rename_limit = rename_limit;
363 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
364 if (diff_setup_done(&opts) < 0)
365 die("diff setup failed");
366 diff_tree_sha1(o_tree->object.sha1, tree->object.sha1, "", &opts);
367 diffcore_std(&opts);
368 for (i = 0; i < diff_queued_diff.nr; ++i) {
369 struct path_list_item *item;
370 struct rename *re;
371 struct diff_filepair *pair = diff_queued_diff.queue[i];
372 if (pair->status != 'R') {
373 diff_free_filepair(pair);
374 continue;
375 }
376 re = xmalloc(sizeof(*re));
377 re->processed = 0;
378 re->pair = pair;
379 item = path_list_lookup(re->pair->one->path, entries);
380 if (!item)
381 re->src_entry = insert_stage_data(re->pair->one->path,
382 o_tree, a_tree, b_tree, entries);
383 else
384 re->src_entry = item->util;
385
386 item = path_list_lookup(re->pair->two->path, entries);
387 if (!item)
388 re->dst_entry = insert_stage_data(re->pair->two->path,
389 o_tree, a_tree, b_tree, entries);
390 else
391 re->dst_entry = item->util;
392 item = path_list_insert(pair->one->path, renames);
393 item->util = re;
394 }
395 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
396 diff_queued_diff.nr = 0;
397 diff_flush(&opts);
398 return renames;
399 }
400
401 static int update_stages(const char *path, struct diff_filespec *o,
402 struct diff_filespec *a, struct diff_filespec *b,
403 int clear)
404 {
405 int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE;
406 if (clear)
407 if (remove_file_from_cache(path))
408 return -1;
409 if (o)
410 if (add_cacheinfo(o->mode, o->sha1, path, 1, 0, options))
411 return -1;
412 if (a)
413 if (add_cacheinfo(a->mode, a->sha1, path, 2, 0, options))
414 return -1;
415 if (b)
416 if (add_cacheinfo(b->mode, b->sha1, path, 3, 0, options))
417 return -1;
418 return 0;
419 }
420
421 static int remove_path(const char *name)
422 {
423 int ret;
424 char *slash, *dirs;
425
426 ret = unlink(name);
427 if (ret)
428 return ret;
429 dirs = xstrdup(name);
430 while ((slash = strrchr(name, '/'))) {
431 *slash = '\0';
432 if (rmdir(name) != 0)
433 break;
434 }
435 free(dirs);
436 return ret;
437 }
438
439 static int remove_file(int clean, const char *path, int no_wd)
440 {
441 int update_cache = index_only || clean;
442 int update_working_directory = !index_only && !no_wd;
443
444 if (update_cache) {
445 if (remove_file_from_cache(path))
446 return -1;
447 }
448 if (update_working_directory) {
449 unlink(path);
450 if (errno != ENOENT || errno != EISDIR)
451 return -1;
452 remove_path(path);
453 }
454 return 0;
455 }
456
457 static char *unique_path(const char *path, const char *branch)
458 {
459 char *newpath = xmalloc(strlen(path) + 1 + strlen(branch) + 8 + 1);
460 int suffix = 0;
461 struct stat st;
462 char *p = newpath + strlen(path);
463 strcpy(newpath, path);
464 *(p++) = '~';
465 strcpy(p, branch);
466 for (; *p; ++p)
467 if ('/' == *p)
468 *p = '_';
469 while (path_list_has_path(&current_file_set, newpath) ||
470 path_list_has_path(&current_directory_set, newpath) ||
471 lstat(newpath, &st) == 0)
472 sprintf(p, "_%d", suffix++);
473
474 path_list_insert(newpath, &current_file_set);
475 return newpath;
476 }
477
478 static int mkdir_p(const char *path, unsigned long mode)
479 {
480 /* path points to cache entries, so xstrdup before messing with it */
481 char *buf = xstrdup(path);
482 int result = safe_create_leading_directories(buf);
483 free(buf);
484 return result;
485 }
486
487 static void flush_buffer(int fd, const char *buf, unsigned long size)
488 {
489 while (size > 0) {
490 long ret = write_in_full(fd, buf, size);
491 if (ret < 0) {
492 /* Ignore epipe */
493 if (errno == EPIPE)
494 break;
495 die("merge-recursive: %s", strerror(errno));
496 } else if (!ret) {
497 die("merge-recursive: disk full?");
498 }
499 size -= ret;
500 buf += ret;
501 }
502 }
503
504 static int make_room_for_path(const char *path)
505 {
506 int status;
507 const char *msg = "failed to create path '%s'%s";
508
509 status = mkdir_p(path, 0777);
510 if (status) {
511 if (status == -3) {
512 /* something else exists */
513 error(msg, path, ": perhaps a D/F conflict?");
514 return -1;
515 }
516 die(msg, path, "");
517 }
518
519 /* Successful unlink is good.. */
520 if (!unlink(path))
521 return 0;
522 /* .. and so is no existing file */
523 if (errno == ENOENT)
524 return 0;
525 /* .. but not some other error (who really cares what?) */
526 return error(msg, path, ": perhaps a D/F conflict?");
527 }
528
529 static void update_file_flags(const unsigned char *sha,
530 unsigned mode,
531 const char *path,
532 int update_cache,
533 int update_wd)
534 {
535 if (index_only)
536 update_wd = 0;
537
538 if (update_wd) {
539 enum object_type type;
540 void *buf;
541 unsigned long size;
542
543 if (S_ISGITLINK(mode))
544 die("cannot read object %s '%s': It is a submodule!",
545 sha1_to_hex(sha), path);
546
547 buf = read_sha1_file(sha, &type, &size);
548 if (!buf)
549 die("cannot read object %s '%s'", sha1_to_hex(sha), path);
550 if (type != OBJ_BLOB)
551 die("blob expected for %s '%s'", sha1_to_hex(sha), path);
552
553 if (make_room_for_path(path) < 0) {
554 update_wd = 0;
555 goto update_index;
556 }
557 if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) {
558 int fd;
559 if (mode & 0100)
560 mode = 0777;
561 else
562 mode = 0666;
563 fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
564 if (fd < 0)
565 die("failed to open %s: %s", path, strerror(errno));
566 flush_buffer(fd, buf, size);
567 close(fd);
568 } else if (S_ISLNK(mode)) {
569 char *lnk = xmemdupz(buf, size);
570 mkdir_p(path, 0777);
571 unlink(path);
572 symlink(lnk, path);
573 free(lnk);
574 } else
575 die("do not know what to do with %06o %s '%s'",
576 mode, sha1_to_hex(sha), path);
577 }
578 update_index:
579 if (update_cache)
580 add_cacheinfo(mode, sha, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
581 }
582
583 static void update_file(int clean,
584 const unsigned char *sha,
585 unsigned mode,
586 const char *path)
587 {
588 update_file_flags(sha, mode, path, index_only || clean, !index_only);
589 }
590
591 /* Low level file merging, update and removal */
592
593 struct merge_file_info
594 {
595 unsigned char sha[20];
596 unsigned mode;
597 unsigned clean:1,
598 merge:1;
599 };
600
601 static void fill_mm(const unsigned char *sha1, mmfile_t *mm)
602 {
603 unsigned long size;
604 enum object_type type;
605
606 if (!hashcmp(sha1, null_sha1)) {
607 mm->ptr = xstrdup("");
608 mm->size = 0;
609 return;
610 }
611
612 mm->ptr = read_sha1_file(sha1, &type, &size);
613 if (!mm->ptr || type != OBJ_BLOB)
614 die("unable to read blob object %s", sha1_to_hex(sha1));
615 mm->size = size;
616 }
617
618 /*
619 * Customizable low-level merge drivers support.
620 */
621
622 struct ll_merge_driver;
623 typedef int (*ll_merge_fn)(const struct ll_merge_driver *,
624 const char *path,
625 mmfile_t *orig,
626 mmfile_t *src1, const char *name1,
627 mmfile_t *src2, const char *name2,
628 mmbuffer_t *result);
629
630 struct ll_merge_driver {
631 const char *name;
632 const char *description;
633 ll_merge_fn fn;
634 const char *recursive;
635 struct ll_merge_driver *next;
636 char *cmdline;
637 };
638
639 /*
640 * Built-in low-levels
641 */
642 static int ll_binary_merge(const struct ll_merge_driver *drv_unused,
643 const char *path_unused,
644 mmfile_t *orig,
645 mmfile_t *src1, const char *name1,
646 mmfile_t *src2, const char *name2,
647 mmbuffer_t *result)
648 {
649 /*
650 * The tentative merge result is "ours" for the final round,
651 * or common ancestor for an internal merge. Still return
652 * "conflicted merge" status.
653 */
654 mmfile_t *stolen = index_only ? orig : src1;
655
656 result->ptr = stolen->ptr;
657 result->size = stolen->size;
658 stolen->ptr = NULL;
659 return 1;
660 }
661
662 static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
663 const char *path_unused,
664 mmfile_t *orig,
665 mmfile_t *src1, const char *name1,
666 mmfile_t *src2, const char *name2,
667 mmbuffer_t *result)
668 {
669 xpparam_t xpp;
670
671 if (buffer_is_binary(orig->ptr, orig->size) ||
672 buffer_is_binary(src1->ptr, src1->size) ||
673 buffer_is_binary(src2->ptr, src2->size)) {
674 warning("Cannot merge binary files: %s vs. %s\n",
675 name1, name2);
676 return ll_binary_merge(drv_unused, path_unused,
677 orig, src1, name1,
678 src2, name2,
679 result);
680 }
681
682 memset(&xpp, 0, sizeof(xpp));
683 return xdl_merge(orig,
684 src1, name1,
685 src2, name2,
686 &xpp, XDL_MERGE_ZEALOUS,
687 result);
688 }
689
690 static int ll_union_merge(const struct ll_merge_driver *drv_unused,
691 const char *path_unused,
692 mmfile_t *orig,
693 mmfile_t *src1, const char *name1,
694 mmfile_t *src2, const char *name2,
695 mmbuffer_t *result)
696 {
697 char *src, *dst;
698 long size;
699 const int marker_size = 7;
700
701 int status = ll_xdl_merge(drv_unused, path_unused,
702 orig, src1, NULL, src2, NULL, result);
703 if (status <= 0)
704 return status;
705 size = result->size;
706 src = dst = result->ptr;
707 while (size) {
708 char ch;
709 if ((marker_size < size) &&
710 (*src == '<' || *src == '=' || *src == '>')) {
711 int i;
712 ch = *src;
713 for (i = 0; i < marker_size; i++)
714 if (src[i] != ch)
715 goto not_a_marker;
716 if (src[marker_size] != '\n')
717 goto not_a_marker;
718 src += marker_size + 1;
719 size -= marker_size + 1;
720 continue;
721 }
722 not_a_marker:
723 do {
724 ch = *src++;
725 *dst++ = ch;
726 size--;
727 } while (ch != '\n' && size);
728 }
729 result->size = dst - result->ptr;
730 return 0;
731 }
732
733 #define LL_BINARY_MERGE 0
734 #define LL_TEXT_MERGE 1
735 #define LL_UNION_MERGE 2
736 static struct ll_merge_driver ll_merge_drv[] = {
737 { "binary", "built-in binary merge", ll_binary_merge },
738 { "text", "built-in 3-way text merge", ll_xdl_merge },
739 { "union", "built-in union merge", ll_union_merge },
740 };
741
742 static void create_temp(mmfile_t *src, char *path)
743 {
744 int fd;
745
746 strcpy(path, ".merge_file_XXXXXX");
747 fd = xmkstemp(path);
748 if (write_in_full(fd, src->ptr, src->size) != src->size)
749 die("unable to write temp-file");
750 close(fd);
751 }
752
753 /*
754 * User defined low-level merge driver support.
755 */
756 static int ll_ext_merge(const struct ll_merge_driver *fn,
757 const char *path,
758 mmfile_t *orig,
759 mmfile_t *src1, const char *name1,
760 mmfile_t *src2, const char *name2,
761 mmbuffer_t *result)
762 {
763 char temp[3][50];
764 char cmdbuf[2048];
765 struct interp table[] = {
766 { "%O" },
767 { "%A" },
768 { "%B" },
769 };
770 struct child_process child;
771 const char *args[20];
772 int status, fd, i;
773 struct stat st;
774
775 if (fn->cmdline == NULL)
776 die("custom merge driver %s lacks command line.", fn->name);
777
778 result->ptr = NULL;
779 result->size = 0;
780 create_temp(orig, temp[0]);
781 create_temp(src1, temp[1]);
782 create_temp(src2, temp[2]);
783
784 interp_set_entry(table, 0, temp[0]);
785 interp_set_entry(table, 1, temp[1]);
786 interp_set_entry(table, 2, temp[2]);
787
788 output(1, "merging %s using %s", path,
789 fn->description ? fn->description : fn->name);
790
791 interpolate(cmdbuf, sizeof(cmdbuf), fn->cmdline, table, 3);
792
793 memset(&child, 0, sizeof(child));
794 child.argv = args;
795 args[0] = "sh";
796 args[1] = "-c";
797 args[2] = cmdbuf;
798 args[3] = NULL;
799
800 status = run_command(&child);
801 if (status < -ERR_RUN_COMMAND_FORK)
802 ; /* failure in run-command */
803 else
804 status = -status;
805 fd = open(temp[1], O_RDONLY);
806 if (fd < 0)
807 goto bad;
808 if (fstat(fd, &st))
809 goto close_bad;
810 result->size = st.st_size;
811 result->ptr = xmalloc(result->size + 1);
812 if (read_in_full(fd, result->ptr, result->size) != result->size) {
813 free(result->ptr);
814 result->ptr = NULL;
815 result->size = 0;
816 }
817 close_bad:
818 close(fd);
819 bad:
820 for (i = 0; i < 3; i++)
821 unlink(temp[i]);
822 return status;
823 }
824
825 /*
826 * merge.default and merge.driver configuration items
827 */
828 static struct ll_merge_driver *ll_user_merge, **ll_user_merge_tail;
829 static const char *default_ll_merge;
830
831 static int read_merge_config(const char *var, const char *value)
832 {
833 struct ll_merge_driver *fn;
834 const char *ep, *name;
835 int namelen;
836
837 if (!strcmp(var, "merge.default")) {
838 if (value)
839 default_ll_merge = strdup(value);
840 return 0;
841 }
842
843 /*
844 * We are not interested in anything but "merge.<name>.variable";
845 * especially, we do not want to look at variables such as
846 * "merge.summary", "merge.tool", and "merge.verbosity".
847 */
848 if (prefixcmp(var, "merge.") || (ep = strrchr(var, '.')) == var + 5)
849 return 0;
850
851 /*
852 * Find existing one as we might be processing merge.<name>.var2
853 * after seeing merge.<name>.var1.
854 */
855 name = var + 6;
856 namelen = ep - name;
857 for (fn = ll_user_merge; fn; fn = fn->next)
858 if (!strncmp(fn->name, name, namelen) && !fn->name[namelen])
859 break;
860 if (!fn) {
861 fn = xcalloc(1, sizeof(struct ll_merge_driver));
862 fn->name = xmemdupz(name, namelen);
863 fn->fn = ll_ext_merge;
864 *ll_user_merge_tail = fn;
865 ll_user_merge_tail = &(fn->next);
866 }
867
868 ep++;
869
870 if (!strcmp("name", ep)) {
871 if (!value)
872 return error("%s: lacks value", var);
873 fn->description = strdup(value);
874 return 0;
875 }
876
877 if (!strcmp("driver", ep)) {
878 if (!value)
879 return error("%s: lacks value", var);
880 /*
881 * merge.<name>.driver specifies the command line:
882 *
883 * command-line
884 *
885 * The command-line will be interpolated with the following
886 * tokens and is given to the shell:
887 *
888 * %O - temporary file name for the merge base.
889 * %A - temporary file name for our version.
890 * %B - temporary file name for the other branches' version.
891 *
892 * The external merge driver should write the results in the
893 * file named by %A, and signal that it has done with zero exit
894 * status.
895 */
896 fn->cmdline = strdup(value);
897 return 0;
898 }
899
900 if (!strcmp("recursive", ep)) {
901 if (!value)
902 return error("%s: lacks value", var);
903 fn->recursive = strdup(value);
904 return 0;
905 }
906
907 return 0;
908 }
909
910 static void initialize_ll_merge(void)
911 {
912 if (ll_user_merge_tail)
913 return;
914 ll_user_merge_tail = &ll_user_merge;
915 git_config(read_merge_config);
916 }
917
918 static const struct ll_merge_driver *find_ll_merge_driver(const char *merge_attr)
919 {
920 struct ll_merge_driver *fn;
921 const char *name;
922 int i;
923
924 initialize_ll_merge();
925
926 if (ATTR_TRUE(merge_attr))
927 return &ll_merge_drv[LL_TEXT_MERGE];
928 else if (ATTR_FALSE(merge_attr))
929 return &ll_merge_drv[LL_BINARY_MERGE];
930 else if (ATTR_UNSET(merge_attr)) {
931 if (!default_ll_merge)
932 return &ll_merge_drv[LL_TEXT_MERGE];
933 else
934 name = default_ll_merge;
935 }
936 else
937 name = merge_attr;
938
939 for (fn = ll_user_merge; fn; fn = fn->next)
940 if (!strcmp(fn->name, name))
941 return fn;
942
943 for (i = 0; i < ARRAY_SIZE(ll_merge_drv); i++)
944 if (!strcmp(ll_merge_drv[i].name, name))
945 return &ll_merge_drv[i];
946
947 /* default to the 3-way */
948 return &ll_merge_drv[LL_TEXT_MERGE];
949 }
950
951 static const char *git_path_check_merge(const char *path)
952 {
953 static struct git_attr_check attr_merge_check;
954
955 if (!attr_merge_check.attr)
956 attr_merge_check.attr = git_attr("merge", 5);
957
958 if (git_checkattr(path, 1, &attr_merge_check))
959 return NULL;
960 return attr_merge_check.value;
961 }
962
963 static int ll_merge(mmbuffer_t *result_buf,
964 struct diff_filespec *o,
965 struct diff_filespec *a,
966 struct diff_filespec *b,
967 const char *branch1,
968 const char *branch2)
969 {
970 mmfile_t orig, src1, src2;
971 char *name1, *name2;
972 int merge_status;
973 const char *ll_driver_name;
974 const struct ll_merge_driver *driver;
975
976 name1 = xstrdup(mkpath("%s:%s", branch1, a->path));
977 name2 = xstrdup(mkpath("%s:%s", branch2, b->path));
978
979 fill_mm(o->sha1, &orig);
980 fill_mm(a->sha1, &src1);
981 fill_mm(b->sha1, &src2);
982
983 ll_driver_name = git_path_check_merge(a->path);
984 driver = find_ll_merge_driver(ll_driver_name);
985
986 if (index_only && driver->recursive)
987 driver = find_ll_merge_driver(driver->recursive);
988 merge_status = driver->fn(driver, a->path,
989 &orig, &src1, name1, &src2, name2,
990 result_buf);
991
992 free(name1);
993 free(name2);
994 free(orig.ptr);
995 free(src1.ptr);
996 free(src2.ptr);
997 return merge_status;
998 }
999
1000 static struct merge_file_info merge_file(struct diff_filespec *o,
1001 struct diff_filespec *a, struct diff_filespec *b,
1002 const char *branch1, const char *branch2)
1003 {
1004 struct merge_file_info result;
1005 result.merge = 0;
1006 result.clean = 1;
1007
1008 if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
1009 result.clean = 0;
1010 if (S_ISREG(a->mode)) {
1011 result.mode = a->mode;
1012 hashcpy(result.sha, a->sha1);
1013 } else {
1014 result.mode = b->mode;
1015 hashcpy(result.sha, b->sha1);
1016 }
1017 } else {
1018 if (!sha_eq(a->sha1, o->sha1) && !sha_eq(b->sha1, o->sha1))
1019 result.merge = 1;
1020
1021 result.mode = a->mode == o->mode ? b->mode: a->mode;
1022
1023 if (sha_eq(a->sha1, o->sha1))
1024 hashcpy(result.sha, b->sha1);
1025 else if (sha_eq(b->sha1, o->sha1))
1026 hashcpy(result.sha, a->sha1);
1027 else if (S_ISREG(a->mode)) {
1028 mmbuffer_t result_buf;
1029 int merge_status;
1030
1031 merge_status = ll_merge(&result_buf, o, a, b,
1032 branch1, branch2);
1033
1034 if ((merge_status < 0) || !result_buf.ptr)
1035 die("Failed to execute internal merge");
1036
1037 if (write_sha1_file(result_buf.ptr, result_buf.size,
1038 blob_type, result.sha))
1039 die("Unable to add %s to database",
1040 a->path);
1041
1042 free(result_buf.ptr);
1043 result.clean = (merge_status == 0);
1044 } else if (S_ISGITLINK(a->mode)) {
1045 result.clean = 0;
1046 hashcpy(result.sha, a->sha1);
1047 } else if (S_ISLNK(a->mode)) {
1048 hashcpy(result.sha, a->sha1);
1049
1050 if (!sha_eq(a->sha1, b->sha1))
1051 result.clean = 0;
1052 } else {
1053 die("unsupported object type in the tree");
1054 }
1055 }
1056
1057 return result;
1058 }
1059
1060 static void conflict_rename_rename(struct rename *ren1,
1061 const char *branch1,
1062 struct rename *ren2,
1063 const char *branch2)
1064 {
1065 char *del[2];
1066 int delp = 0;
1067 const char *ren1_dst = ren1->pair->two->path;
1068 const char *ren2_dst = ren2->pair->two->path;
1069 const char *dst_name1 = ren1_dst;
1070 const char *dst_name2 = ren2_dst;
1071 if (path_list_has_path(&current_directory_set, ren1_dst)) {
1072 dst_name1 = del[delp++] = unique_path(ren1_dst, branch1);
1073 output(1, "%s is a directory in %s added as %s instead",
1074 ren1_dst, branch2, dst_name1);
1075 remove_file(0, ren1_dst, 0);
1076 }
1077 if (path_list_has_path(&current_directory_set, ren2_dst)) {
1078 dst_name2 = del[delp++] = unique_path(ren2_dst, branch2);
1079 output(1, "%s is a directory in %s added as %s instead",
1080 ren2_dst, branch1, dst_name2);
1081 remove_file(0, ren2_dst, 0);
1082 }
1083 if (index_only) {
1084 remove_file_from_cache(dst_name1);
1085 remove_file_from_cache(dst_name2);
1086 /*
1087 * Uncomment to leave the conflicting names in the resulting tree
1088 *
1089 * update_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, dst_name1);
1090 * update_file(0, ren2->pair->two->sha1, ren2->pair->two->mode, dst_name2);
1091 */
1092 } else {
1093 update_stages(dst_name1, NULL, ren1->pair->two, NULL, 1);
1094 update_stages(dst_name2, NULL, NULL, ren2->pair->two, 1);
1095 }
1096 while (delp--)
1097 free(del[delp]);
1098 }
1099
1100 static void conflict_rename_dir(struct rename *ren1,
1101 const char *branch1)
1102 {
1103 char *new_path = unique_path(ren1->pair->two->path, branch1);
1104 output(1, "Renamed %s to %s instead", ren1->pair->one->path, new_path);
1105 remove_file(0, ren1->pair->two->path, 0);
1106 update_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path);
1107 free(new_path);
1108 }
1109
1110 static void conflict_rename_rename_2(struct rename *ren1,
1111 const char *branch1,
1112 struct rename *ren2,
1113 const char *branch2)
1114 {
1115 char *new_path1 = unique_path(ren1->pair->two->path, branch1);
1116 char *new_path2 = unique_path(ren2->pair->two->path, branch2);
1117 output(1, "Renamed %s to %s and %s to %s instead",
1118 ren1->pair->one->path, new_path1,
1119 ren2->pair->one->path, new_path2);
1120 remove_file(0, ren1->pair->two->path, 0);
1121 update_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path1);
1122 update_file(0, ren2->pair->two->sha1, ren2->pair->two->mode, new_path2);
1123 free(new_path2);
1124 free(new_path1);
1125 }
1126
1127 static int process_renames(struct path_list *a_renames,
1128 struct path_list *b_renames,
1129 const char *a_branch,
1130 const char *b_branch)
1131 {
1132 int clean_merge = 1, i, j;
1133 struct path_list a_by_dst = {NULL, 0, 0, 0}, b_by_dst = {NULL, 0, 0, 0};
1134 const struct rename *sre;
1135
1136 for (i = 0; i < a_renames->nr; i++) {
1137 sre = a_renames->items[i].util;
1138 path_list_insert(sre->pair->two->path, &a_by_dst)->util
1139 = sre->dst_entry;
1140 }
1141 for (i = 0; i < b_renames->nr; i++) {
1142 sre = b_renames->items[i].util;
1143 path_list_insert(sre->pair->two->path, &b_by_dst)->util
1144 = sre->dst_entry;
1145 }
1146
1147 for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
1148 int compare;
1149 char *src;
1150 struct path_list *renames1, *renames2, *renames2Dst;
1151 struct rename *ren1 = NULL, *ren2 = NULL;
1152 const char *branch1, *branch2;
1153 const char *ren1_src, *ren1_dst;
1154
1155 if (i >= a_renames->nr) {
1156 compare = 1;
1157 ren2 = b_renames->items[j++].util;
1158 } else if (j >= b_renames->nr) {
1159 compare = -1;
1160 ren1 = a_renames->items[i++].util;
1161 } else {
1162 compare = strcmp(a_renames->items[i].path,
1163 b_renames->items[j].path);
1164 if (compare <= 0)
1165 ren1 = a_renames->items[i++].util;
1166 if (compare >= 0)
1167 ren2 = b_renames->items[j++].util;
1168 }
1169
1170 /* TODO: refactor, so that 1/2 are not needed */
1171 if (ren1) {
1172 renames1 = a_renames;
1173 renames2 = b_renames;
1174 renames2Dst = &b_by_dst;
1175 branch1 = a_branch;
1176 branch2 = b_branch;
1177 } else {
1178 struct rename *tmp;
1179 renames1 = b_renames;
1180 renames2 = a_renames;
1181 renames2Dst = &a_by_dst;
1182 branch1 = b_branch;
1183 branch2 = a_branch;
1184 tmp = ren2;
1185 ren2 = ren1;
1186 ren1 = tmp;
1187 }
1188 src = ren1->pair->one->path;
1189
1190 ren1->dst_entry->processed = 1;
1191 ren1->src_entry->processed = 1;
1192
1193 if (ren1->processed)
1194 continue;
1195 ren1->processed = 1;
1196
1197 ren1_src = ren1->pair->one->path;
1198 ren1_dst = ren1->pair->two->path;
1199
1200 if (ren2) {
1201 const char *ren2_src = ren2->pair->one->path;
1202 const char *ren2_dst = ren2->pair->two->path;
1203 /* Renamed in 1 and renamed in 2 */
1204 if (strcmp(ren1_src, ren2_src) != 0)
1205 die("ren1.src != ren2.src");
1206 ren2->dst_entry->processed = 1;
1207 ren2->processed = 1;
1208 if (strcmp(ren1_dst, ren2_dst) != 0) {
1209 clean_merge = 0;
1210 output(1, "CONFLICT (rename/rename): "
1211 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1212 "rename \"%s\"->\"%s\" in \"%s\"%s",
1213 src, ren1_dst, branch1,
1214 src, ren2_dst, branch2,
1215 index_only ? " (left unresolved)": "");
1216 if (index_only) {
1217 remove_file_from_cache(src);
1218 update_file(0, ren1->pair->one->sha1,
1219 ren1->pair->one->mode, src);
1220 }
1221 conflict_rename_rename(ren1, branch1, ren2, branch2);
1222 } else {
1223 struct merge_file_info mfi;
1224 remove_file(1, ren1_src, 1);
1225 mfi = merge_file(ren1->pair->one,
1226 ren1->pair->two,
1227 ren2->pair->two,
1228 branch1,
1229 branch2);
1230 if (mfi.merge || !mfi.clean)
1231 output(1, "Renamed %s->%s", src, ren1_dst);
1232
1233 if (mfi.merge)
1234 output(2, "Auto-merged %s", ren1_dst);
1235
1236 if (!mfi.clean) {
1237 output(1, "CONFLICT (content): merge conflict in %s",
1238 ren1_dst);
1239 clean_merge = 0;
1240
1241 if (!index_only)
1242 update_stages(ren1_dst,
1243 ren1->pair->one,
1244 ren1->pair->two,
1245 ren2->pair->two,
1246 1 /* clear */);
1247 }
1248 update_file(mfi.clean, mfi.sha, mfi.mode, ren1_dst);
1249 }
1250 } else {
1251 /* Renamed in 1, maybe changed in 2 */
1252 struct path_list_item *item;
1253 /* we only use sha1 and mode of these */
1254 struct diff_filespec src_other, dst_other;
1255 int try_merge, stage = a_renames == renames1 ? 3: 2;
1256
1257 remove_file(1, ren1_src, index_only || stage == 3);
1258
1259 hashcpy(src_other.sha1, ren1->src_entry->stages[stage].sha);
1260 src_other.mode = ren1->src_entry->stages[stage].mode;
1261 hashcpy(dst_other.sha1, ren1->dst_entry->stages[stage].sha);
1262 dst_other.mode = ren1->dst_entry->stages[stage].mode;
1263
1264 try_merge = 0;
1265
1266 if (path_list_has_path(&current_directory_set, ren1_dst)) {
1267 clean_merge = 0;
1268 output(1, "CONFLICT (rename/directory): Renamed %s->%s in %s "
1269 " directory %s added in %s",
1270 ren1_src, ren1_dst, branch1,
1271 ren1_dst, branch2);
1272 conflict_rename_dir(ren1, branch1);
1273 } else if (sha_eq(src_other.sha1, null_sha1)) {
1274 clean_merge = 0;
1275 output(1, "CONFLICT (rename/delete): Renamed %s->%s in %s "
1276 "and deleted in %s",
1277 ren1_src, ren1_dst, branch1,
1278 branch2);
1279 update_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, ren1_dst);
1280 } else if (!sha_eq(dst_other.sha1, null_sha1)) {
1281 const char *new_path;
1282 clean_merge = 0;
1283 try_merge = 1;
1284 output(1, "CONFLICT (rename/add): Renamed %s->%s in %s. "
1285 "%s added in %s",
1286 ren1_src, ren1_dst, branch1,
1287 ren1_dst, branch2);
1288 new_path = unique_path(ren1_dst, branch2);
1289 output(1, "Added as %s instead", new_path);
1290 update_file(0, dst_other.sha1, dst_other.mode, new_path);
1291 } else if ((item = path_list_lookup(ren1_dst, renames2Dst))) {
1292 ren2 = item->util;
1293 clean_merge = 0;
1294 ren2->processed = 1;
1295 output(1, "CONFLICT (rename/rename): Renamed %s->%s in %s. "
1296 "Renamed %s->%s in %s",
1297 ren1_src, ren1_dst, branch1,
1298 ren2->pair->one->path, ren2->pair->two->path, branch2);
1299 conflict_rename_rename_2(ren1, branch1, ren2, branch2);
1300 } else
1301 try_merge = 1;
1302
1303 if (try_merge) {
1304 struct diff_filespec *o, *a, *b;
1305 struct merge_file_info mfi;
1306 src_other.path = (char *)ren1_src;
1307
1308 o = ren1->pair->one;
1309 if (a_renames == renames1) {
1310 a = ren1->pair->two;
1311 b = &src_other;
1312 } else {
1313 b = ren1->pair->two;
1314 a = &src_other;
1315 }
1316 mfi = merge_file(o, a, b,
1317 a_branch, b_branch);
1318
1319 if (mfi.clean &&
1320 sha_eq(mfi.sha, ren1->pair->two->sha1) &&
1321 mfi.mode == ren1->pair->two->mode)
1322 /*
1323 * This messaged is part of
1324 * t6022 test. If you change
1325 * it update the test too.
1326 */
1327 output(3, "Skipped %s (merged same as existing)", ren1_dst);
1328 else {
1329 if (mfi.merge || !mfi.clean)
1330 output(1, "Renamed %s => %s", ren1_src, ren1_dst);
1331 if (mfi.merge)
1332 output(2, "Auto-merged %s", ren1_dst);
1333 if (!mfi.clean) {
1334 output(1, "CONFLICT (rename/modify): Merge conflict in %s",
1335 ren1_dst);
1336 clean_merge = 0;
1337
1338 if (!index_only)
1339 update_stages(ren1_dst,
1340 o, a, b, 1);
1341 }
1342 update_file(mfi.clean, mfi.sha, mfi.mode, ren1_dst);
1343 }
1344 }
1345 }
1346 }
1347 path_list_clear(&a_by_dst, 0);
1348 path_list_clear(&b_by_dst, 0);
1349
1350 return clean_merge;
1351 }
1352
1353 static unsigned char *stage_sha(const unsigned char *sha, unsigned mode)
1354 {
1355 return (is_null_sha1(sha) || mode == 0) ? NULL: (unsigned char *)sha;
1356 }
1357
1358 /* Per entry merge function */
1359 static int process_entry(const char *path, struct stage_data *entry,
1360 const char *branch1,
1361 const char *branch2)
1362 {
1363 /*
1364 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1365 print_index_entry("\tpath: ", entry);
1366 */
1367 int clean_merge = 1;
1368 unsigned o_mode = entry->stages[1].mode;
1369 unsigned a_mode = entry->stages[2].mode;
1370 unsigned b_mode = entry->stages[3].mode;
1371 unsigned char *o_sha = stage_sha(entry->stages[1].sha, o_mode);
1372 unsigned char *a_sha = stage_sha(entry->stages[2].sha, a_mode);
1373 unsigned char *b_sha = stage_sha(entry->stages[3].sha, b_mode);
1374
1375 if (o_sha && (!a_sha || !b_sha)) {
1376 /* Case A: Deleted in one */
1377 if ((!a_sha && !b_sha) ||
1378 (sha_eq(a_sha, o_sha) && !b_sha) ||
1379 (!a_sha && sha_eq(b_sha, o_sha))) {
1380 /* Deleted in both or deleted in one and
1381 * unchanged in the other */
1382 if (a_sha)
1383 output(2, "Removed %s", path);
1384 /* do not touch working file if it did not exist */
1385 remove_file(1, path, !a_sha);
1386 } else {
1387 /* Deleted in one and changed in the other */
1388 clean_merge = 0;
1389 if (!a_sha) {
1390 output(1, "CONFLICT (delete/modify): %s deleted in %s "
1391 "and modified in %s. Version %s of %s left in tree.",
1392 path, branch1,
1393 branch2, branch2, path);
1394 update_file(0, b_sha, b_mode, path);
1395 } else {
1396 output(1, "CONFLICT (delete/modify): %s deleted in %s "
1397 "and modified in %s. Version %s of %s left in tree.",
1398 path, branch2,
1399 branch1, branch1, path);
1400 update_file(0, a_sha, a_mode, path);
1401 }
1402 }
1403
1404 } else if ((!o_sha && a_sha && !b_sha) ||
1405 (!o_sha && !a_sha && b_sha)) {
1406 /* Case B: Added in one. */
1407 const char *add_branch;
1408 const char *other_branch;
1409 unsigned mode;
1410 const unsigned char *sha;
1411 const char *conf;
1412
1413 if (a_sha) {
1414 add_branch = branch1;
1415 other_branch = branch2;
1416 mode = a_mode;
1417 sha = a_sha;
1418 conf = "file/directory";
1419 } else {
1420 add_branch = branch2;
1421 other_branch = branch1;
1422 mode = b_mode;
1423 sha = b_sha;
1424 conf = "directory/file";
1425 }
1426 if (path_list_has_path(&current_directory_set, path)) {
1427 const char *new_path = unique_path(path, add_branch);
1428 clean_merge = 0;
1429 output(1, "CONFLICT (%s): There is a directory with name %s in %s. "
1430 "Added %s as %s",
1431 conf, path, other_branch, path, new_path);
1432 remove_file(0, path, 0);
1433 update_file(0, sha, mode, new_path);
1434 } else {
1435 output(2, "Added %s", path);
1436 update_file(1, sha, mode, path);
1437 }
1438 } else if (a_sha && b_sha) {
1439 /* Case C: Added in both (check for same permissions) and */
1440 /* case D: Modified in both, but differently. */
1441 const char *reason = "content";
1442 struct merge_file_info mfi;
1443 struct diff_filespec o, a, b;
1444
1445 if (!o_sha) {
1446 reason = "add/add";
1447 o_sha = (unsigned char *)null_sha1;
1448 }
1449 output(2, "Auto-merged %s", path);
1450 o.path = a.path = b.path = (char *)path;
1451 hashcpy(o.sha1, o_sha);
1452 o.mode = o_mode;
1453 hashcpy(a.sha1, a_sha);
1454 a.mode = a_mode;
1455 hashcpy(b.sha1, b_sha);
1456 b.mode = b_mode;
1457
1458 mfi = merge_file(&o, &a, &b,
1459 branch1, branch2);
1460
1461 clean_merge = mfi.clean;
1462 if (mfi.clean)
1463 update_file(1, mfi.sha, mfi.mode, path);
1464 else if (S_ISGITLINK(mfi.mode))
1465 output(1, "CONFLICT (submodule): Merge conflict in %s "
1466 "- needs %s", path, sha1_to_hex(b.sha1));
1467 else {
1468 output(1, "CONFLICT (%s): Merge conflict in %s",
1469 reason, path);
1470
1471 if (index_only)
1472 update_file(0, mfi.sha, mfi.mode, path);
1473 else
1474 update_file_flags(mfi.sha, mfi.mode, path,
1475 0 /* update_cache */, 1 /* update_working_directory */);
1476 }
1477 } else if (!o_sha && !a_sha && !b_sha) {
1478 /*
1479 * this entry was deleted altogether. a_mode == 0 means
1480 * we had that path and want to actively remove it.
1481 */
1482 remove_file(1, path, !a_mode);
1483 } else
1484 die("Fatal merge failure, shouldn't happen.");
1485
1486 return clean_merge;
1487 }
1488
1489 int merge_trees(struct tree *head,
1490 struct tree *merge,
1491 struct tree *common,
1492 const char *branch1,
1493 const char *branch2,
1494 struct tree **result)
1495 {
1496 int code, clean;
1497
1498 if (subtree_merge) {
1499 merge = shift_tree_object(head, merge);
1500 common = shift_tree_object(head, common);
1501 }
1502
1503 if (sha_eq(common->object.sha1, merge->object.sha1)) {
1504 output(0, "Already uptodate!");
1505 *result = head;
1506 return 1;
1507 }
1508
1509 code = git_merge_trees(index_only, common, head, merge);
1510
1511 if (code != 0)
1512 die("merging of trees %s and %s failed",
1513 sha1_to_hex(head->object.sha1),
1514 sha1_to_hex(merge->object.sha1));
1515
1516 if (unmerged_cache()) {
1517 struct path_list *entries, *re_head, *re_merge;
1518 int i;
1519 path_list_clear(&current_file_set, 1);
1520 path_list_clear(&current_directory_set, 1);
1521 get_files_dirs(head);
1522 get_files_dirs(merge);
1523
1524 entries = get_unmerged();
1525 re_head = get_renames(head, common, head, merge, entries);
1526 re_merge = get_renames(merge, common, head, merge, entries);
1527 clean = process_renames(re_head, re_merge,
1528 branch1, branch2);
1529 for (i = 0; i < entries->nr; i++) {
1530 const char *path = entries->items[i].path;
1531 struct stage_data *e = entries->items[i].util;
1532 if (!e->processed
1533 && !process_entry(path, e, branch1, branch2))
1534 clean = 0;
1535 }
1536
1537 path_list_clear(re_merge, 0);
1538 path_list_clear(re_head, 0);
1539 path_list_clear(entries, 1);
1540
1541 }
1542 else
1543 clean = 1;
1544
1545 if (index_only)
1546 *result = write_tree_from_memory();
1547
1548 return clean;
1549 }
1550
1551 static struct commit_list *reverse_commit_list(struct commit_list *list)
1552 {
1553 struct commit_list *next = NULL, *current, *backup;
1554 for (current = list; current; current = backup) {
1555 backup = current->next;
1556 current->next = next;
1557 next = current;
1558 }
1559 return next;
1560 }
1561
1562 /*
1563 * Merge the commits h1 and h2, return the resulting virtual
1564 * commit object and a flag indicating the cleanness of the merge.
1565 */
1566 int merge_recursive(struct commit *h1,
1567 struct commit *h2,
1568 const char *branch1,
1569 const char *branch2,
1570 struct commit_list *ca,
1571 struct commit **result)
1572 {
1573 struct commit_list *iter;
1574 struct commit *merged_common_ancestors;
1575 struct tree *mrtree = mrtree;
1576 int clean;
1577
1578 if (show(4)) {
1579 output(4, "Merging:");
1580 output_commit_title(h1);
1581 output_commit_title(h2);
1582 }
1583
1584 if (!ca) {
1585 ca = get_merge_bases(h1, h2, 1);
1586 ca = reverse_commit_list(ca);
1587 }
1588
1589 if (show(5)) {
1590 output(5, "found %u common ancestor(s):", commit_list_count(ca));
1591 for (iter = ca; iter; iter = iter->next)
1592 output_commit_title(iter->item);
1593 }
1594
1595 merged_common_ancestors = pop_commit(&ca);
1596 if (merged_common_ancestors == NULL) {
1597 /* if there is no common ancestor, make an empty tree */
1598 struct tree *tree = xcalloc(1, sizeof(struct tree));
1599
1600 tree->object.parsed = 1;
1601 tree->object.type = OBJ_TREE;
1602 pretend_sha1_file(NULL, 0, OBJ_TREE, tree->object.sha1);
1603 merged_common_ancestors = make_virtual_commit(tree, "ancestor");
1604 }
1605
1606 for (iter = ca; iter; iter = iter->next) {
1607 call_depth++;
1608 /*
1609 * When the merge fails, the result contains files
1610 * with conflict markers. The cleanness flag is
1611 * ignored, it was never actually used, as result of
1612 * merge_trees has always overwritten it: the committed
1613 * "conflicts" were already resolved.
1614 */
1615 discard_cache();
1616 merge_recursive(merged_common_ancestors, iter->item,
1617 "Temporary merge branch 1",
1618 "Temporary merge branch 2",
1619 NULL,
1620 &merged_common_ancestors);
1621 call_depth--;
1622
1623 if (!merged_common_ancestors)
1624 die("merge returned no commit");
1625 }
1626
1627 discard_cache();
1628 if (!call_depth) {
1629 read_cache();
1630 index_only = 0;
1631 } else
1632 index_only = 1;
1633
1634 clean = merge_trees(h1->tree, h2->tree, merged_common_ancestors->tree,
1635 branch1, branch2, &mrtree);
1636
1637 if (index_only) {
1638 *result = make_virtual_commit(mrtree, "merged tree");
1639 commit_list_insert(h1, &(*result)->parents);
1640 commit_list_insert(h2, &(*result)->parents->next);
1641 }
1642 flush_output();
1643 return clean;
1644 }
1645
1646 static const char *better_branch_name(const char *branch)
1647 {
1648 static char githead_env[8 + 40 + 1];
1649 char *name;
1650
1651 if (strlen(branch) != 40)
1652 return branch;
1653 sprintf(githead_env, "GITHEAD_%s", branch);
1654 name = getenv(githead_env);
1655 return name ? name : branch;
1656 }
1657
1658 static struct commit *get_ref(const char *ref)
1659 {
1660 unsigned char sha1[20];
1661 struct object *object;
1662
1663 if (get_sha1(ref, sha1))
1664 die("Could not resolve ref '%s'", ref);
1665 object = deref_tag(parse_object(sha1), ref, strlen(ref));
1666 if (object->type == OBJ_TREE)
1667 return make_virtual_commit((struct tree*)object,
1668 better_branch_name(ref));
1669 if (object->type != OBJ_COMMIT)
1670 return NULL;
1671 if (parse_commit((struct commit *)object))
1672 die("Could not parse commit '%s'", sha1_to_hex(object->sha1));
1673 return (struct commit *)object;
1674 }
1675
1676 static int merge_config(const char *var, const char *value)
1677 {
1678 if (!strcasecmp(var, "merge.verbosity")) {
1679 verbosity = git_config_int(var, value);
1680 return 0;
1681 }
1682 if (!strcasecmp(var, "diff.renamelimit")) {
1683 rename_limit = git_config_int(var, value);
1684 return 0;
1685 }
1686 return git_default_config(var, value);
1687 }
1688
1689 int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
1690 {
1691 static const char *bases[20];
1692 static unsigned bases_count = 0;
1693 int i, clean;
1694 const char *branch1, *branch2;
1695 struct commit *result, *h1, *h2;
1696 struct commit_list *ca = NULL;
1697 struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
1698 int index_fd;
1699
1700 if (argv[0]) {
1701 int namelen = strlen(argv[0]);
1702 if (8 < namelen &&
1703 !strcmp(argv[0] + namelen - 8, "-subtree"))
1704 subtree_merge = 1;
1705 }
1706
1707 git_config(merge_config);
1708 if (getenv("GIT_MERGE_VERBOSITY"))
1709 verbosity = strtol(getenv("GIT_MERGE_VERBOSITY"), NULL, 10);
1710
1711 if (argc < 4)
1712 die("Usage: %s <base>... -- <head> <remote> ...\n", argv[0]);
1713
1714 for (i = 1; i < argc; ++i) {
1715 if (!strcmp(argv[i], "--"))
1716 break;
1717 if (bases_count < sizeof(bases)/sizeof(*bases))
1718 bases[bases_count++] = argv[i];
1719 }
1720 if (argc - i != 3) /* "--" "<head>" "<remote>" */
1721 die("Not handling anything other than two heads merge.");
1722 if (verbosity >= 5)
1723 buffer_output = 0;
1724
1725 branch1 = argv[++i];
1726 branch2 = argv[++i];
1727
1728 h1 = get_ref(branch1);
1729 h2 = get_ref(branch2);
1730
1731 branch1 = better_branch_name(branch1);
1732 branch2 = better_branch_name(branch2);
1733
1734 if (show(3))
1735 printf("Merging %s with %s\n", branch1, branch2);
1736
1737 index_fd = hold_locked_index(lock, 1);
1738
1739 for (i = 0; i < bases_count; i++) {
1740 struct commit *ancestor = get_ref(bases[i]);
1741 ca = commit_list_insert(ancestor, &ca);
1742 }
1743 clean = merge_recursive(h1, h2, branch1, branch2, ca, &result);
1744
1745 if (active_cache_changed &&
1746 (write_cache(index_fd, active_cache, active_nr) ||
1747 commit_locked_index(lock)))
1748 die ("unable to write %s", get_index_file());
1749
1750 return clean ? 0: 1;
1751 }
git with Jakub Narębski modifications