2 * Recursive Merge algorithm stolen from git-merge-recursive.py by
4 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
7 #include "cache-tree.h"
10 #include "tree-walk.h"
13 #include "run-command.h"
15 #include "unpack-trees.h"
16 #include "path-list.h"
17 #include "xdiff-interface.h"
18 #include "interpolate.h"
21 static int subtree_merge
;
23 static struct tree
*shift_tree_object(struct tree
*one
, struct tree
*two
)
25 unsigned char shifted
[20];
28 * NEEDSWORK: this limits the recursion depth to hardcoded
29 * value '2' to avoid excessive overhead.
31 shift_tree(one
->object
.sha1
, two
->object
.sha1
, shifted
, 2);
32 if (!hashcmp(two
->object
.sha1
, shifted
))
34 return lookup_tree(shifted
);
38 * A virtual commit has
39 * - (const char *)commit->util set to the name, and
40 * - *(int *)commit->object.sha1 set to the virtual id.
43 static unsigned commit_list_count(const struct commit_list
*l
)
46 for (; l
; l
= l
->next
)
51 static struct commit
*make_virtual_commit(struct tree
*tree
, const char *comment
)
53 struct commit
*commit
= xcalloc(1, sizeof(struct commit
));
54 static unsigned virtual_id
= 1;
56 commit
->util
= (void*)comment
;
57 *(int*)commit
->object
.sha1
= virtual_id
++;
59 commit
->object
.parsed
= 1;
64 * Since we use get_tree_entry(), which does not put the read object into
65 * the object pool, we cannot rely on a == b.
67 static int sha_eq(const unsigned char *a
, const unsigned char *b
)
71 return a
&& b
&& hashcmp(a
, b
) == 0;
75 * Since we want to write the index eventually, we cannot reuse the index
76 * for these (temporary) data.
83 unsigned char sha
[20];
90 struct output_buffer
*next
;
94 static struct path_list current_file_set
= {NULL
, 0, 0, 1};
95 static struct path_list current_directory_set
= {NULL
, 0, 0, 1};
97 static int call_depth
= 0;
98 static int verbosity
= 2;
99 static int buffer_output
= 1;
100 static int do_progress
= 1;
101 static unsigned last_percent
;
102 static unsigned merged_cnt
;
103 static unsigned total_cnt
;
104 static volatile sig_atomic_t progress_update
;
105 static struct output_buffer
*output_list
, *output_end
;
107 static int show (int v
)
109 return (!call_depth
&& verbosity
>= v
) || verbosity
>= 5;
112 static void output(int v
, const char *fmt
, ...)
116 if (buffer_output
&& show(v
)) {
117 struct output_buffer
*b
= xmalloc(sizeof(*b
));
118 nfvasprintf(&b
->str
, fmt
, args
);
121 output_end
->next
= b
;
125 } else if (show(v
)) {
127 for (i
= call_depth
; i
--;)
129 vfprintf(stdout
, fmt
, args
);
135 static void flush_output()
137 struct output_buffer
*b
, *n
;
138 for (b
= output_list
; b
; b
= n
) {
140 for (i
= call_depth
; i
--;)
142 fputs(b
->str
, stdout
);
152 static void output_commit_title(struct commit
*commit
)
156 for (i
= call_depth
; i
--;)
159 printf("virtual %s\n", (char *)commit
->util
);
161 printf("%s ", find_unique_abbrev(commit
->object
.sha1
, DEFAULT_ABBREV
));
162 if (parse_commit(commit
) != 0)
163 printf("(bad commit)\n");
167 for (s
= commit
->buffer
; *s
; s
++)
168 if (*s
== '\n' && s
[1] == '\n') {
172 for (len
= 0; s
[len
] && '\n' != s
[len
]; len
++)
174 printf("%.*s\n", len
, s
);
179 static void progress_interval(int signum
)
184 static void setup_progress_signal(void)
189 memset(&sa
, 0, sizeof(sa
));
190 sa
.sa_handler
= progress_interval
;
191 sigemptyset(&sa
.sa_mask
);
192 sa
.sa_flags
= SA_RESTART
;
193 sigaction(SIGALRM
, &sa
, NULL
);
195 v
.it_interval
.tv_sec
= 1;
196 v
.it_interval
.tv_usec
= 0;
197 v
.it_value
= v
.it_interval
;
198 setitimer(ITIMER_REAL
, &v
, NULL
);
201 static void display_progress()
203 unsigned percent
= total_cnt
? merged_cnt
* 100 / total_cnt
: 0;
204 if (progress_update
|| percent
!= last_percent
) {
205 fprintf(stderr
, "%4u%% (%u/%u) done\r",
206 percent
, merged_cnt
, total_cnt
);
208 last_percent
= percent
;
212 static struct cache_entry
*make_cache_entry(unsigned int mode
,
213 const unsigned char *sha1
, const char *path
, int stage
, int refresh
)
216 struct cache_entry
*ce
;
218 if (!verify_path(path
))
222 size
= cache_entry_size(len
);
223 ce
= xcalloc(1, size
);
225 hashcpy(ce
->sha1
, sha1
);
226 memcpy(ce
->name
, path
, len
);
227 ce
->ce_flags
= create_ce_flags(len
, stage
);
228 ce
->ce_mode
= create_ce_mode(mode
);
231 return refresh_cache_entry(ce
, 0);
236 static int add_cacheinfo(unsigned int mode
, const unsigned char *sha1
,
237 const char *path
, int stage
, int refresh
, int options
)
239 struct cache_entry
*ce
;
240 ce
= make_cache_entry(mode
, sha1
? sha1
: null_sha1
, path
, stage
, refresh
);
242 return error("addinfo_cache failed for path '%s'", path
);
243 return add_cache_entry(ce
, options
);
247 * This is a global variable which is used in a number of places but
248 * only written to in the 'merge' function.
250 * index_only == 1 => Don't leave any non-stage 0 entries in the cache and
251 * don't update the working directory.
252 * 0 => Leave unmerged entries in the cache and update
253 * the working directory.
255 static int index_only
= 0;
257 static int git_merge_trees(int index_only
,
263 struct object_list
*trees
= NULL
;
264 struct unpack_trees_options opts
;
266 memset(&opts
, 0, sizeof(opts
));
273 opts
.fn
= threeway_merge
;
275 object_list_append(&common
->object
, &trees
);
276 object_list_append(&head
->object
, &trees
);
277 object_list_append(&merge
->object
, &trees
);
279 rc
= unpack_trees(trees
, &opts
);
280 cache_tree_free(&active_cache_tree
);
284 static int unmerged_index(void)
287 for (i
= 0; i
< active_nr
; i
++) {
288 struct cache_entry
*ce
= active_cache
[i
];
295 static struct tree
*git_write_tree(void)
297 struct tree
*result
= NULL
;
299 if (unmerged_index()) {
301 output(0, "There are unmerged index entries:");
302 for (i
= 0; i
< active_nr
; i
++) {
303 struct cache_entry
*ce
= active_cache
[i
];
305 output(0, "%d %.*s", ce_stage(ce
), ce_namelen(ce
), ce
->name
);
310 if (!active_cache_tree
)
311 active_cache_tree
= cache_tree();
313 if (!cache_tree_fully_valid(active_cache_tree
) &&
314 cache_tree_update(active_cache_tree
,
315 active_cache
, active_nr
, 0, 0) < 0)
316 die("error building trees");
318 result
= lookup_tree(active_cache_tree
->sha1
);
323 static int save_files_dirs(const unsigned char *sha1
,
324 const char *base
, int baselen
, const char *path
,
325 unsigned int mode
, int stage
)
327 int len
= strlen(path
);
328 char *newpath
= xmalloc(baselen
+ len
+ 1);
329 memcpy(newpath
, base
, baselen
);
330 memcpy(newpath
+ baselen
, path
, len
);
331 newpath
[baselen
+ len
] = '\0';
334 path_list_insert(newpath
, ¤t_directory_set
);
336 path_list_insert(newpath
, ¤t_file_set
);
339 return READ_TREE_RECURSIVE
;
342 static int get_files_dirs(struct tree
*tree
)
345 if (read_tree_recursive(tree
, "", 0, 0, NULL
, save_files_dirs
) != 0)
347 n
= current_file_set
.nr
+ current_directory_set
.nr
;
352 * Returns a index_entry instance which doesn't have to correspond to
353 * a real cache entry in Git's index.
355 static struct stage_data
*insert_stage_data(const char *path
,
356 struct tree
*o
, struct tree
*a
, struct tree
*b
,
357 struct path_list
*entries
)
359 struct path_list_item
*item
;
360 struct stage_data
*e
= xcalloc(1, sizeof(struct stage_data
));
361 get_tree_entry(o
->object
.sha1
, path
,
362 e
->stages
[1].sha
, &e
->stages
[1].mode
);
363 get_tree_entry(a
->object
.sha1
, path
,
364 e
->stages
[2].sha
, &e
->stages
[2].mode
);
365 get_tree_entry(b
->object
.sha1
, path
,
366 e
->stages
[3].sha
, &e
->stages
[3].mode
);
367 item
= path_list_insert(path
, entries
);
373 * Create a dictionary mapping file names to stage_data objects. The
374 * dictionary contains one entry for every path with a non-zero stage entry.
376 static struct path_list
*get_unmerged(void)
378 struct path_list
*unmerged
= xcalloc(1, sizeof(struct path_list
));
381 unmerged
->strdup_paths
= 1;
382 total_cnt
+= active_nr
;
384 for (i
= 0; i
< active_nr
; i
++, merged_cnt
++) {
385 struct path_list_item
*item
;
386 struct stage_data
*e
;
387 struct cache_entry
*ce
= active_cache
[i
];
393 item
= path_list_lookup(ce
->name
, unmerged
);
395 item
= path_list_insert(ce
->name
, unmerged
);
396 item
->util
= xcalloc(1, sizeof(struct stage_data
));
399 e
->stages
[ce_stage(ce
)].mode
= ntohl(ce
->ce_mode
);
400 hashcpy(e
->stages
[ce_stage(ce
)].sha
, ce
->sha1
);
408 struct diff_filepair
*pair
;
409 struct stage_data
*src_entry
;
410 struct stage_data
*dst_entry
;
411 unsigned processed
:1;
415 * Get information of all renames which occurred between 'o_tree' and
416 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
417 * 'b_tree') to be able to associate the correct cache entries with
418 * the rename information. 'tree' is always equal to either a_tree or b_tree.
420 static struct path_list
*get_renames(struct tree
*tree
,
424 struct path_list
*entries
)
427 struct path_list
*renames
;
428 struct diff_options opts
;
430 renames
= xcalloc(1, sizeof(struct path_list
));
433 opts
.detect_rename
= DIFF_DETECT_RENAME
;
434 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
435 if (diff_setup_done(&opts
) < 0)
436 die("diff setup failed");
437 diff_tree_sha1(o_tree
->object
.sha1
, tree
->object
.sha1
, "", &opts
);
439 for (i
= 0; i
< diff_queued_diff
.nr
; ++i
) {
440 struct path_list_item
*item
;
442 struct diff_filepair
*pair
= diff_queued_diff
.queue
[i
];
443 if (pair
->status
!= 'R') {
444 diff_free_filepair(pair
);
447 re
= xmalloc(sizeof(*re
));
450 item
= path_list_lookup(re
->pair
->one
->path
, entries
);
452 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
453 o_tree
, a_tree
, b_tree
, entries
);
455 re
->src_entry
= item
->util
;
457 item
= path_list_lookup(re
->pair
->two
->path
, entries
);
459 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
460 o_tree
, a_tree
, b_tree
, entries
);
462 re
->dst_entry
= item
->util
;
463 item
= path_list_insert(pair
->one
->path
, renames
);
466 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
467 diff_queued_diff
.nr
= 0;
472 static int update_stages(const char *path
, struct diff_filespec
*o
,
473 struct diff_filespec
*a
, struct diff_filespec
*b
,
476 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
;
478 if (remove_file_from_cache(path
))
481 if (add_cacheinfo(o
->mode
, o
->sha1
, path
, 1, 0, options
))
484 if (add_cacheinfo(a
->mode
, a
->sha1
, path
, 2, 0, options
))
487 if (add_cacheinfo(b
->mode
, b
->sha1
, path
, 3, 0, options
))
492 static int remove_path(const char *name
)
501 dirs
= xmalloc(len
+1);
502 memcpy(dirs
, name
, len
);
504 while ((slash
= strrchr(name
, '/'))) {
507 if (rmdir(name
) != 0)
514 static int remove_file(int clean
, const char *path
, int no_wd
)
516 int update_cache
= index_only
|| clean
;
517 int update_working_directory
= !index_only
&& !no_wd
;
520 if (remove_file_from_cache(path
))
523 if (update_working_directory
) {
525 if (errno
!= ENOENT
|| errno
!= EISDIR
)
532 static char *unique_path(const char *path
, const char *branch
)
534 char *newpath
= xmalloc(strlen(path
) + 1 + strlen(branch
) + 8 + 1);
537 char *p
= newpath
+ strlen(path
);
538 strcpy(newpath
, path
);
544 while (path_list_has_path(¤t_file_set
, newpath
) ||
545 path_list_has_path(¤t_directory_set
, newpath
) ||
546 lstat(newpath
, &st
) == 0)
547 sprintf(p
, "_%d", suffix
++);
549 path_list_insert(newpath
, ¤t_file_set
);
553 static int mkdir_p(const char *path
, unsigned long mode
)
555 /* path points to cache entries, so xstrdup before messing with it */
556 char *buf
= xstrdup(path
);
557 int result
= safe_create_leading_directories(buf
);
562 static void flush_buffer(int fd
, const char *buf
, unsigned long size
)
565 long ret
= write_in_full(fd
, buf
, size
);
570 die("merge-recursive: %s", strerror(errno
));
572 die("merge-recursive: disk full?");
579 static void update_file_flags(const unsigned char *sha
,
589 enum object_type type
;
593 buf
= read_sha1_file(sha
, &type
, &size
);
595 die("cannot read object %s '%s'", sha1_to_hex(sha
), path
);
596 if (type
!= OBJ_BLOB
)
597 die("blob expected for %s '%s'", sha1_to_hex(sha
), path
);
599 if (S_ISREG(mode
) || (!has_symlinks
&& S_ISLNK(mode
))) {
601 if (mkdir_p(path
, 0777))
602 die("failed to create path %s: %s", path
, strerror(errno
));
608 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
610 die("failed to open %s: %s", path
, strerror(errno
));
611 flush_buffer(fd
, buf
, size
);
613 } else if (S_ISLNK(mode
)) {
614 char *lnk
= xmalloc(size
+ 1);
615 memcpy(lnk
, buf
, size
);
622 die("do not know what to do with %06o %s '%s'",
623 mode
, sha1_to_hex(sha
), path
);
626 add_cacheinfo(mode
, sha
, path
, 0, update_wd
, ADD_CACHE_OK_TO_ADD
);
629 static void update_file(int clean
,
630 const unsigned char *sha
,
634 update_file_flags(sha
, mode
, path
, index_only
|| clean
, !index_only
);
637 /* Low level file merging, update and removal */
639 struct merge_file_info
641 unsigned char sha
[20];
647 static void fill_mm(const unsigned char *sha1
, mmfile_t
*mm
)
650 enum object_type type
;
652 if (!hashcmp(sha1
, null_sha1
)) {
653 mm
->ptr
= xstrdup("");
658 mm
->ptr
= read_sha1_file(sha1
, &type
, &size
);
659 if (!mm
->ptr
|| type
!= OBJ_BLOB
)
660 die("unable to read blob object %s", sha1_to_hex(sha1
));
664 /* Low-level merge functions */
665 typedef int (*ll_merge_fn
)(const char *cmd
,
667 mmfile_t
*src1
, const char *name1
,
668 mmfile_t
*src2
, const char *name2
,
671 static int ll_xdl_merge(const char *cmd__unused
,
673 mmfile_t
*src1
, const char *name1
,
674 mmfile_t
*src2
, const char *name2
,
679 memset(&xpp
, 0, sizeof(xpp
));
680 return xdl_merge(orig
,
683 &xpp
, XDL_MERGE_ZEALOUS
,
687 static int ll_union_merge(const char *cmd__unused
,
689 mmfile_t
*src1
, const char *name1
,
690 mmfile_t
*src2
, const char *name2
,
695 const int marker_size
= 7;
697 int status
= ll_xdl_merge(cmd__unused
, orig
,
698 src1
, NULL
, src2
, NULL
, result
);
702 src
= dst
= result
->ptr
;
705 if ((marker_size
< size
) &&
706 (*src
== '<' || *src
== '=' || *src
== '>')) {
709 for (i
= 0; i
< marker_size
; i
++)
712 if (src
[marker_size
] != '\n')
714 src
+= marker_size
+ 1;
715 size
-= marker_size
+ 1;
723 } while (ch
!= '\n' && size
);
725 result
->size
= dst
- result
->ptr
;
729 static int ll_binary_merge(const char *cmd__unused
,
731 mmfile_t
*src1
, const char *name1
,
732 mmfile_t
*src2
, const char *name2
,
736 * The tentative merge result is "ours" for the final round,
737 * or common ancestor for an internal merge. Still return
738 * "conflicted merge" status.
740 mmfile_t
*stolen
= index_only
? orig
: src1
;
742 result
->ptr
= stolen
->ptr
;
743 result
->size
= stolen
->size
;
752 { "binary", ll_binary_merge
},
753 { "text", ll_xdl_merge
},
754 { "union", ll_union_merge
},
758 static void create_temp(mmfile_t
*src
, char *path
)
762 strcpy(path
, ".merge_file_XXXXXX");
765 die("unable to create temp-file");
766 if (write_in_full(fd
, src
->ptr
, src
->size
) != src
->size
)
767 die("unable to write temp-file");
771 static int ll_ext_merge(const char *cmd
,
773 mmfile_t
*src1
, const char *name1
,
774 mmfile_t
*src2
, const char *name2
,
779 struct interp table
[] = {
784 struct child_process child
;
785 const char *args
[20];
791 create_temp(orig
, temp
[0]);
792 create_temp(src1
, temp
[1]);
793 create_temp(src2
, temp
[2]);
795 interp_set_entry(table
, 0, temp
[0]);
796 interp_set_entry(table
, 1, temp
[1]);
797 interp_set_entry(table
, 2, temp
[2]);
799 interpolate(cmdbuf
, sizeof(cmdbuf
), cmd
, table
, 3);
801 memset(&child
, 0, sizeof(child
));
808 status
= run_command(&child
);
809 if (status
< -ERR_RUN_COMMAND_FORK
)
810 ; /* failure in run-command */
813 fd
= open(temp
[1], O_RDONLY
);
818 result
->size
= st
.st_size
;
819 result
->ptr
= xmalloc(result
->size
+ 1);
820 if (read_in_full(fd
, result
->ptr
, result
->size
) != result
->size
) {
828 for (i
= 0; i
< 3; i
++)
834 * merge.default and merge.driver configuration items
836 static struct user_merge_fn
{
837 struct user_merge_fn
*next
;
841 } *ll_user_merge_fns
, **ll_user_merge_fns_tail
;
842 static const char *default_ll_merge
;
844 static int read_merge_config(const char *var
, const char *value
)
846 struct user_merge_fn
*fn
;
849 if (!strcmp(var
, "merge.default")) {
850 default_ll_merge
= strdup(value
);
854 if (strcmp(var
, "merge.driver"))
857 return error("%s: lacks value", var
);
859 * merge.driver is a multi-valued configuration, whose value is
864 * The command-line will be interpolated with the following
865 * tokens and is given to the shell:
867 * %O - temporary file name for the merge base.
868 * %A - temporary file name for our version.
869 * %B - temporary file name for the other branches' version.
871 * The external merge driver should write the results in the file
872 * named by %A, and signal that it has done with exit status 0.
874 for (nlen
= -1, blen
= 0; value
[blen
]; blen
++)
875 if (nlen
< 0 && isspace(value
[blen
]))
878 return error("%s '%s': lacks command line", var
, value
);
879 fn
= xcalloc(1, sizeof(struct user_merge_fn
) + blen
+ 1);
880 memcpy(fn
->b_
, value
, blen
+ 1);
883 fn
->cmdline
= fn
->b_
+ nlen
+ 1;
884 fn
->next
= *ll_user_merge_fns_tail
;
885 *ll_user_merge_fns_tail
= fn
;
889 static void initialize_ll_merge(void)
891 if (ll_user_merge_fns_tail
)
893 ll_user_merge_fns_tail
= &ll_user_merge_fns
;
894 git_config(read_merge_config
);
897 static ll_merge_fn
find_ll_merge_fn(void *merge_attr
, const char **cmdline
)
899 struct user_merge_fn
*fn
;
903 initialize_ll_merge();
905 if (ATTR_TRUE(merge_attr
))
907 else if (ATTR_FALSE(merge_attr
))
908 return ll_binary_merge
;
909 else if (ATTR_UNSET(merge_attr
)) {
910 if (!default_ll_merge
)
913 name
= default_ll_merge
;
918 for (fn
= ll_user_merge_fns
; fn
; fn
= fn
->next
) {
919 if (!strcmp(fn
->name
, name
)) {
920 *cmdline
= fn
->cmdline
;
925 for (i
= 0; ll_merge_fns
[i
].name
; i
++)
926 if (!strcmp(ll_merge_fns
[i
].name
, name
))
927 return ll_merge_fns
[i
].fn
;
929 /* default to the 3-way */
933 static void *git_path_check_merge(const char *path
)
935 static struct git_attr_check attr_merge_check
;
937 if (!attr_merge_check
.attr
)
938 attr_merge_check
.attr
= git_attr("merge", 5);
940 if (git_checkattr(path
, 1, &attr_merge_check
))
942 return attr_merge_check
.value
;
945 static int ll_merge(mmbuffer_t
*result_buf
,
946 struct diff_filespec
*o
,
947 struct diff_filespec
*a
,
948 struct diff_filespec
*b
,
952 mmfile_t orig
, src1
, src2
;
957 const char *driver
= NULL
;
959 name1
= xstrdup(mkpath("%s:%s", branch1
, a
->path
));
960 name2
= xstrdup(mkpath("%s:%s", branch2
, b
->path
));
962 fill_mm(o
->sha1
, &orig
);
963 fill_mm(a
->sha1
, &src1
);
964 fill_mm(b
->sha1
, &src2
);
966 merge_attr
= git_path_check_merge(a
->path
);
967 fn
= find_ll_merge_fn(merge_attr
, &driver
);
969 merge_status
= fn(driver
, &orig
,
970 &src1
, name1
, &src2
, name2
, result_buf
);
980 static struct merge_file_info
merge_file(struct diff_filespec
*o
,
981 struct diff_filespec
*a
, struct diff_filespec
*b
,
982 const char *branch1
, const char *branch2
)
984 struct merge_file_info result
;
988 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
990 if (S_ISREG(a
->mode
)) {
991 result
.mode
= a
->mode
;
992 hashcpy(result
.sha
, a
->sha1
);
994 result
.mode
= b
->mode
;
995 hashcpy(result
.sha
, b
->sha1
);
998 if (!sha_eq(a
->sha1
, o
->sha1
) && !sha_eq(b
->sha1
, o
->sha1
))
1001 result
.mode
= a
->mode
== o
->mode
? b
->mode
: a
->mode
;
1003 if (sha_eq(a
->sha1
, o
->sha1
))
1004 hashcpy(result
.sha
, b
->sha1
);
1005 else if (sha_eq(b
->sha1
, o
->sha1
))
1006 hashcpy(result
.sha
, a
->sha1
);
1007 else if (S_ISREG(a
->mode
)) {
1008 mmbuffer_t result_buf
;
1011 merge_status
= ll_merge(&result_buf
, o
, a
, b
,
1014 if ((merge_status
< 0) || !result_buf
.ptr
)
1015 die("Failed to execute internal merge");
1017 if (write_sha1_file(result_buf
.ptr
, result_buf
.size
,
1018 blob_type
, result
.sha
))
1019 die("Unable to add %s to database",
1022 free(result_buf
.ptr
);
1023 result
.clean
= (merge_status
== 0);
1025 if (!(S_ISLNK(a
->mode
) || S_ISLNK(b
->mode
)))
1026 die("cannot merge modes?");
1028 hashcpy(result
.sha
, a
->sha1
);
1030 if (!sha_eq(a
->sha1
, b
->sha1
))
1038 static void conflict_rename_rename(struct rename
*ren1
,
1039 const char *branch1
,
1040 struct rename
*ren2
,
1041 const char *branch2
)
1045 const char *ren1_dst
= ren1
->pair
->two
->path
;
1046 const char *ren2_dst
= ren2
->pair
->two
->path
;
1047 const char *dst_name1
= ren1_dst
;
1048 const char *dst_name2
= ren2_dst
;
1049 if (path_list_has_path(¤t_directory_set
, ren1_dst
)) {
1050 dst_name1
= del
[delp
++] = unique_path(ren1_dst
, branch1
);
1051 output(1, "%s is a directory in %s added as %s instead",
1052 ren1_dst
, branch2
, dst_name1
);
1053 remove_file(0, ren1_dst
, 0);
1055 if (path_list_has_path(¤t_directory_set
, ren2_dst
)) {
1056 dst_name2
= del
[delp
++] = unique_path(ren2_dst
, branch2
);
1057 output(1, "%s is a directory in %s added as %s instead",
1058 ren2_dst
, branch1
, dst_name2
);
1059 remove_file(0, ren2_dst
, 0);
1062 remove_file_from_cache(dst_name1
);
1063 remove_file_from_cache(dst_name2
);
1065 * Uncomment to leave the conflicting names in the resulting tree
1067 * update_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, dst_name1);
1068 * update_file(0, ren2->pair->two->sha1, ren2->pair->two->mode, dst_name2);
1071 update_stages(dst_name1
, NULL
, ren1
->pair
->two
, NULL
, 1);
1072 update_stages(dst_name2
, NULL
, NULL
, ren2
->pair
->two
, 1);
1078 static void conflict_rename_dir(struct rename
*ren1
,
1079 const char *branch1
)
1081 char *new_path
= unique_path(ren1
->pair
->two
->path
, branch1
);
1082 output(1, "Renamed %s to %s instead", ren1
->pair
->one
->path
, new_path
);
1083 remove_file(0, ren1
->pair
->two
->path
, 0);
1084 update_file(0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path
);
1088 static void conflict_rename_rename_2(struct rename
*ren1
,
1089 const char *branch1
,
1090 struct rename
*ren2
,
1091 const char *branch2
)
1093 char *new_path1
= unique_path(ren1
->pair
->two
->path
, branch1
);
1094 char *new_path2
= unique_path(ren2
->pair
->two
->path
, branch2
);
1095 output(1, "Renamed %s to %s and %s to %s instead",
1096 ren1
->pair
->one
->path
, new_path1
,
1097 ren2
->pair
->one
->path
, new_path2
);
1098 remove_file(0, ren1
->pair
->two
->path
, 0);
1099 update_file(0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path1
);
1100 update_file(0, ren2
->pair
->two
->sha1
, ren2
->pair
->two
->mode
, new_path2
);
1105 static int process_renames(struct path_list
*a_renames
,
1106 struct path_list
*b_renames
,
1107 const char *a_branch
,
1108 const char *b_branch
)
1110 int clean_merge
= 1, i
, j
;
1111 struct path_list a_by_dst
= {NULL
, 0, 0, 0}, b_by_dst
= {NULL
, 0, 0, 0};
1112 const struct rename
*sre
;
1114 for (i
= 0; i
< a_renames
->nr
; i
++) {
1115 sre
= a_renames
->items
[i
].util
;
1116 path_list_insert(sre
->pair
->two
->path
, &a_by_dst
)->util
1119 for (i
= 0; i
< b_renames
->nr
; i
++) {
1120 sre
= b_renames
->items
[i
].util
;
1121 path_list_insert(sre
->pair
->two
->path
, &b_by_dst
)->util
1125 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
1128 struct path_list
*renames1
, *renames2
, *renames2Dst
;
1129 struct rename
*ren1
= NULL
, *ren2
= NULL
;
1130 const char *branch1
, *branch2
;
1131 const char *ren1_src
, *ren1_dst
;
1133 if (i
>= a_renames
->nr
) {
1135 ren2
= b_renames
->items
[j
++].util
;
1136 } else if (j
>= b_renames
->nr
) {
1138 ren1
= a_renames
->items
[i
++].util
;
1140 compare
= strcmp(a_renames
->items
[i
].path
,
1141 b_renames
->items
[j
].path
);
1143 ren1
= a_renames
->items
[i
++].util
;
1145 ren2
= b_renames
->items
[j
++].util
;
1148 /* TODO: refactor, so that 1/2 are not needed */
1150 renames1
= a_renames
;
1151 renames2
= b_renames
;
1152 renames2Dst
= &b_by_dst
;
1157 renames1
= b_renames
;
1158 renames2
= a_renames
;
1159 renames2Dst
= &a_by_dst
;
1166 src
= ren1
->pair
->one
->path
;
1168 ren1
->dst_entry
->processed
= 1;
1169 ren1
->src_entry
->processed
= 1;
1171 if (ren1
->processed
)
1173 ren1
->processed
= 1;
1175 ren1_src
= ren1
->pair
->one
->path
;
1176 ren1_dst
= ren1
->pair
->two
->path
;
1179 const char *ren2_src
= ren2
->pair
->one
->path
;
1180 const char *ren2_dst
= ren2
->pair
->two
->path
;
1181 /* Renamed in 1 and renamed in 2 */
1182 if (strcmp(ren1_src
, ren2_src
) != 0)
1183 die("ren1.src != ren2.src");
1184 ren2
->dst_entry
->processed
= 1;
1185 ren2
->processed
= 1;
1186 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
1188 output(1, "CONFLICT (rename/rename): "
1189 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1190 "rename \"%s\"->\"%s\" in \"%s\"%s",
1191 src
, ren1_dst
, branch1
,
1192 src
, ren2_dst
, branch2
,
1193 index_only
? " (left unresolved)": "");
1195 remove_file_from_cache(src
);
1196 update_file(0, ren1
->pair
->one
->sha1
,
1197 ren1
->pair
->one
->mode
, src
);
1199 conflict_rename_rename(ren1
, branch1
, ren2
, branch2
);
1201 struct merge_file_info mfi
;
1202 remove_file(1, ren1_src
, 1);
1203 mfi
= merge_file(ren1
->pair
->one
,
1208 if (mfi
.merge
|| !mfi
.clean
)
1209 output(1, "Renamed %s->%s", src
, ren1_dst
);
1212 output(2, "Auto-merged %s", ren1_dst
);
1215 output(1, "CONFLICT (content): merge conflict in %s",
1220 update_stages(ren1_dst
,
1226 update_file(mfi
.clean
, mfi
.sha
, mfi
.mode
, ren1_dst
);
1229 /* Renamed in 1, maybe changed in 2 */
1230 struct path_list_item
*item
;
1231 /* we only use sha1 and mode of these */
1232 struct diff_filespec src_other
, dst_other
;
1233 int try_merge
, stage
= a_renames
== renames1
? 3: 2;
1235 remove_file(1, ren1_src
, index_only
|| stage
== 3);
1237 hashcpy(src_other
.sha1
, ren1
->src_entry
->stages
[stage
].sha
);
1238 src_other
.mode
= ren1
->src_entry
->stages
[stage
].mode
;
1239 hashcpy(dst_other
.sha1
, ren1
->dst_entry
->stages
[stage
].sha
);
1240 dst_other
.mode
= ren1
->dst_entry
->stages
[stage
].mode
;
1244 if (path_list_has_path(¤t_directory_set
, ren1_dst
)) {
1246 output(1, "CONFLICT (rename/directory): Renamed %s->%s in %s "
1247 " directory %s added in %s",
1248 ren1_src
, ren1_dst
, branch1
,
1250 conflict_rename_dir(ren1
, branch1
);
1251 } else if (sha_eq(src_other
.sha1
, null_sha1
)) {
1253 output(1, "CONFLICT (rename/delete): Renamed %s->%s in %s "
1254 "and deleted in %s",
1255 ren1_src
, ren1_dst
, branch1
,
1257 update_file(0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, ren1_dst
);
1258 } else if (!sha_eq(dst_other
.sha1
, null_sha1
)) {
1259 const char *new_path
;
1262 output(1, "CONFLICT (rename/add): Renamed %s->%s in %s. "
1264 ren1_src
, ren1_dst
, branch1
,
1266 new_path
= unique_path(ren1_dst
, branch2
);
1267 output(1, "Added as %s instead", new_path
);
1268 update_file(0, dst_other
.sha1
, dst_other
.mode
, new_path
);
1269 } else if ((item
= path_list_lookup(ren1_dst
, renames2Dst
))) {
1272 ren2
->processed
= 1;
1273 output(1, "CONFLICT (rename/rename): Renamed %s->%s in %s. "
1274 "Renamed %s->%s in %s",
1275 ren1_src
, ren1_dst
, branch1
,
1276 ren2
->pair
->one
->path
, ren2
->pair
->two
->path
, branch2
);
1277 conflict_rename_rename_2(ren1
, branch1
, ren2
, branch2
);
1282 struct diff_filespec
*o
, *a
, *b
;
1283 struct merge_file_info mfi
;
1284 src_other
.path
= (char *)ren1_src
;
1286 o
= ren1
->pair
->one
;
1287 if (a_renames
== renames1
) {
1288 a
= ren1
->pair
->two
;
1291 b
= ren1
->pair
->two
;
1294 mfi
= merge_file(o
, a
, b
,
1295 a_branch
, b_branch
);
1297 if (mfi
.merge
|| !mfi
.clean
)
1298 output(1, "Renamed %s => %s", ren1_src
, ren1_dst
);
1300 output(2, "Auto-merged %s", ren1_dst
);
1302 output(1, "CONFLICT (rename/modify): Merge conflict in %s",
1307 update_stages(ren1_dst
,
1310 update_file(mfi
.clean
, mfi
.sha
, mfi
.mode
, ren1_dst
);
1314 path_list_clear(&a_by_dst
, 0);
1315 path_list_clear(&b_by_dst
, 0);
1320 static unsigned char *has_sha(const unsigned char *sha
)
1322 return is_null_sha1(sha
) ? NULL
: (unsigned char *)sha
;
1325 /* Per entry merge function */
1326 static int process_entry(const char *path
, struct stage_data
*entry
,
1327 const char *branch1
,
1328 const char *branch2
)
1331 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1332 print_index_entry("\tpath: ", entry);
1334 int clean_merge
= 1;
1335 unsigned char *o_sha
= has_sha(entry
->stages
[1].sha
);
1336 unsigned char *a_sha
= has_sha(entry
->stages
[2].sha
);
1337 unsigned char *b_sha
= has_sha(entry
->stages
[3].sha
);
1338 unsigned o_mode
= entry
->stages
[1].mode
;
1339 unsigned a_mode
= entry
->stages
[2].mode
;
1340 unsigned b_mode
= entry
->stages
[3].mode
;
1342 if (o_sha
&& (!a_sha
|| !b_sha
)) {
1343 /* Case A: Deleted in one */
1344 if ((!a_sha
&& !b_sha
) ||
1345 (sha_eq(a_sha
, o_sha
) && !b_sha
) ||
1346 (!a_sha
&& sha_eq(b_sha
, o_sha
))) {
1347 /* Deleted in both or deleted in one and
1348 * unchanged in the other */
1350 output(2, "Removed %s", path
);
1351 /* do not touch working file if it did not exist */
1352 remove_file(1, path
, !a_sha
);
1354 /* Deleted in one and changed in the other */
1357 output(1, "CONFLICT (delete/modify): %s deleted in %s "
1358 "and modified in %s. Version %s of %s left in tree.",
1360 branch2
, branch2
, path
);
1361 update_file(0, b_sha
, b_mode
, path
);
1363 output(1, "CONFLICT (delete/modify): %s deleted in %s "
1364 "and modified in %s. Version %s of %s left in tree.",
1366 branch1
, branch1
, path
);
1367 update_file(0, a_sha
, a_mode
, path
);
1371 } else if ((!o_sha
&& a_sha
&& !b_sha
) ||
1372 (!o_sha
&& !a_sha
&& b_sha
)) {
1373 /* Case B: Added in one. */
1374 const char *add_branch
;
1375 const char *other_branch
;
1377 const unsigned char *sha
;
1381 add_branch
= branch1
;
1382 other_branch
= branch2
;
1385 conf
= "file/directory";
1387 add_branch
= branch2
;
1388 other_branch
= branch1
;
1391 conf
= "directory/file";
1393 if (path_list_has_path(¤t_directory_set
, path
)) {
1394 const char *new_path
= unique_path(path
, add_branch
);
1396 output(1, "CONFLICT (%s): There is a directory with name %s in %s. "
1398 conf
, path
, other_branch
, path
, new_path
);
1399 remove_file(0, path
, 0);
1400 update_file(0, sha
, mode
, new_path
);
1402 output(2, "Added %s", path
);
1403 update_file(1, sha
, mode
, path
);
1405 } else if (a_sha
&& b_sha
) {
1406 /* Case C: Added in both (check for same permissions) and */
1407 /* case D: Modified in both, but differently. */
1408 const char *reason
= "content";
1409 struct merge_file_info mfi
;
1410 struct diff_filespec o
, a
, b
;
1414 o_sha
= (unsigned char *)null_sha1
;
1416 output(2, "Auto-merged %s", path
);
1417 o
.path
= a
.path
= b
.path
= (char *)path
;
1418 hashcpy(o
.sha1
, o_sha
);
1420 hashcpy(a
.sha1
, a_sha
);
1422 hashcpy(b
.sha1
, b_sha
);
1425 mfi
= merge_file(&o
, &a
, &b
,
1429 update_file(1, mfi
.sha
, mfi
.mode
, path
);
1432 output(1, "CONFLICT (%s): Merge conflict in %s",
1436 update_file(0, mfi
.sha
, mfi
.mode
, path
);
1438 update_file_flags(mfi
.sha
, mfi
.mode
, path
,
1439 0 /* update_cache */, 1 /* update_working_directory */);
1442 die("Fatal merge failure, shouldn't happen.");
1447 static int merge_trees(struct tree
*head
,
1449 struct tree
*common
,
1450 const char *branch1
,
1451 const char *branch2
,
1452 struct tree
**result
)
1456 if (subtree_merge
) {
1457 merge
= shift_tree_object(head
, merge
);
1458 common
= shift_tree_object(head
, common
);
1461 if (sha_eq(common
->object
.sha1
, merge
->object
.sha1
)) {
1462 output(0, "Already uptodate!");
1467 code
= git_merge_trees(index_only
, common
, head
, merge
);
1470 die("merging of trees %s and %s failed",
1471 sha1_to_hex(head
->object
.sha1
),
1472 sha1_to_hex(merge
->object
.sha1
));
1474 if (unmerged_index()) {
1475 struct path_list
*entries
, *re_head
, *re_merge
;
1477 path_list_clear(¤t_file_set
, 1);
1478 path_list_clear(¤t_directory_set
, 1);
1479 get_files_dirs(head
);
1480 get_files_dirs(merge
);
1482 entries
= get_unmerged();
1483 re_head
= get_renames(head
, common
, head
, merge
, entries
);
1484 re_merge
= get_renames(merge
, common
, head
, merge
, entries
);
1485 clean
= process_renames(re_head
, re_merge
,
1487 total_cnt
+= entries
->nr
;
1488 for (i
= 0; i
< entries
->nr
; i
++, merged_cnt
++) {
1489 const char *path
= entries
->items
[i
].path
;
1490 struct stage_data
*e
= entries
->items
[i
].util
;
1492 && !process_entry(path
, e
, branch1
, branch2
))
1498 path_list_clear(re_merge
, 0);
1499 path_list_clear(re_head
, 0);
1500 path_list_clear(entries
, 1);
1507 *result
= git_write_tree();
1512 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
1514 struct commit_list
*next
= NULL
, *current
, *backup
;
1515 for (current
= list
; current
; current
= backup
) {
1516 backup
= current
->next
;
1517 current
->next
= next
;
1524 * Merge the commits h1 and h2, return the resulting virtual
1525 * commit object and a flag indicating the cleanness of the merge.
1527 static int merge(struct commit
*h1
,
1529 const char *branch1
,
1530 const char *branch2
,
1531 struct commit_list
*ca
,
1532 struct commit
**result
)
1534 struct commit_list
*iter
;
1535 struct commit
*merged_common_ancestors
;
1536 struct tree
*mrtree
;
1540 output(4, "Merging:");
1541 output_commit_title(h1
);
1542 output_commit_title(h2
);
1546 ca
= get_merge_bases(h1
, h2
, 1);
1547 ca
= reverse_commit_list(ca
);
1551 output(5, "found %u common ancestor(s):", commit_list_count(ca
));
1552 for (iter
= ca
; iter
; iter
= iter
->next
)
1553 output_commit_title(iter
->item
);
1556 merged_common_ancestors
= pop_commit(&ca
);
1557 if (merged_common_ancestors
== NULL
) {
1558 /* if there is no common ancestor, make an empty tree */
1559 struct tree
*tree
= xcalloc(1, sizeof(struct tree
));
1561 tree
->object
.parsed
= 1;
1562 tree
->object
.type
= OBJ_TREE
;
1563 pretend_sha1_file(NULL
, 0, OBJ_TREE
, tree
->object
.sha1
);
1564 merged_common_ancestors
= make_virtual_commit(tree
, "ancestor");
1567 for (iter
= ca
; iter
; iter
= iter
->next
) {
1570 * When the merge fails, the result contains files
1571 * with conflict markers. The cleanness flag is
1572 * ignored, it was never actually used, as result of
1573 * merge_trees has always overwritten it: the committed
1574 * "conflicts" were already resolved.
1577 merge(merged_common_ancestors
, iter
->item
,
1578 "Temporary merge branch 1",
1579 "Temporary merge branch 2",
1581 &merged_common_ancestors
);
1584 if (!merged_common_ancestors
)
1585 die("merge returned no commit");
1595 clean
= merge_trees(h1
->tree
, h2
->tree
, merged_common_ancestors
->tree
,
1596 branch1
, branch2
, &mrtree
);
1599 *result
= make_virtual_commit(mrtree
, "merged tree");
1600 commit_list_insert(h1
, &(*result
)->parents
);
1601 commit_list_insert(h2
, &(*result
)->parents
->next
);
1603 if (!call_depth
&& do_progress
) {
1604 /* Make sure we end at 100% */
1607 merged_cnt
= total_cnt
;
1608 progress_update
= 1;
1610 fputc('\n', stderr
);
1616 static const char *better_branch_name(const char *branch
)
1618 static char githead_env
[8 + 40 + 1];
1621 if (strlen(branch
) != 40)
1623 sprintf(githead_env
, "GITHEAD_%s", branch
);
1624 name
= getenv(githead_env
);
1625 return name
? name
: branch
;
1628 static struct commit
*get_ref(const char *ref
)
1630 unsigned char sha1
[20];
1631 struct object
*object
;
1633 if (get_sha1(ref
, sha1
))
1634 die("Could not resolve ref '%s'", ref
);
1635 object
= deref_tag(parse_object(sha1
), ref
, strlen(ref
));
1636 if (object
->type
== OBJ_TREE
)
1637 return make_virtual_commit((struct tree
*)object
,
1638 better_branch_name(ref
));
1639 if (object
->type
!= OBJ_COMMIT
)
1641 if (parse_commit((struct commit
*)object
))
1642 die("Could not parse commit '%s'", sha1_to_hex(object
->sha1
));
1643 return (struct commit
*)object
;
1646 static int merge_config(const char *var
, const char *value
)
1648 if (!strcasecmp(var
, "merge.verbosity")) {
1649 verbosity
= git_config_int(var
, value
);
1652 return git_default_config(var
, value
);
1655 int main(int argc
, char *argv
[])
1657 static const char *bases
[20];
1658 static unsigned bases_count
= 0;
1660 const char *branch1
, *branch2
;
1661 struct commit
*result
, *h1
, *h2
;
1662 struct commit_list
*ca
= NULL
;
1663 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
1667 int namelen
= strlen(argv
[0]);
1669 !strcmp(argv
[0] + namelen
- 8, "-subtree"))
1673 git_config(merge_config
);
1674 if (getenv("GIT_MERGE_VERBOSITY"))
1675 verbosity
= strtol(getenv("GIT_MERGE_VERBOSITY"), NULL
, 10);
1678 die("Usage: %s <base>... -- <head> <remote> ...\n", argv
[0]);
1680 for (i
= 1; i
< argc
; ++i
) {
1681 if (!strcmp(argv
[i
], "--"))
1683 if (bases_count
< sizeof(bases
)/sizeof(*bases
))
1684 bases
[bases_count
++] = argv
[i
];
1686 if (argc
- i
!= 3) /* "--" "<head>" "<remote>" */
1687 die("Not handling anything other than two heads merge.");
1688 if (verbosity
>= 5) {
1693 do_progress
= isatty(1);
1695 branch1
= argv
[++i
];
1696 branch2
= argv
[++i
];
1698 h1
= get_ref(branch1
);
1699 h2
= get_ref(branch2
);
1701 branch1
= better_branch_name(branch1
);
1702 branch2
= better_branch_name(branch2
);
1705 setup_progress_signal();
1707 printf("Merging %s with %s\n", branch1
, branch2
);
1709 index_fd
= hold_locked_index(lock
, 1);
1711 for (i
= 0; i
< bases_count
; i
++) {
1712 struct commit
*ancestor
= get_ref(bases
[i
]);
1713 ca
= commit_list_insert(ancestor
, &ca
);
1715 clean
= merge(h1
, h2
, branch1
, branch2
, ca
, &result
);
1717 if (active_cache_changed
&&
1718 (write_cache(index_fd
, active_cache
, active_nr
) ||
1719 close(index_fd
) || commit_locked_index(lock
)))
1720 die ("unable to write %s", get_index_file());
1722 return clean
? 0: 1;