2 * Recursive Merge algorithm stolen from git-merge-recursive.py by
4 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
10 #include <sys/types.h>
14 #include "cache-tree.h"
17 #include "tree-walk.h"
20 #include "run-command.h"
23 #include "path-list.h"
26 * A virtual commit has
27 * - (const char *)commit->util set to the name, and
28 * - *(int *)commit->object.sha1 set to the virtual id.
31 static unsigned commit_list_count(const struct commit_list
*l
)
34 for (; l
; l
= l
->next
)
39 static struct commit
*make_virtual_commit(struct tree
*tree
, const char *comment
)
41 struct commit
*commit
= xcalloc(1, sizeof(struct commit
));
42 static unsigned virtual_id
= 1;
44 commit
->util
= (void*)comment
;
45 *(int*)commit
->object
.sha1
= virtual_id
++;
50 * TODO: we should not have to copy the SHA1s around, but rather reference
51 * them. That way, sha_eq() is just sha1 == sha2.
53 static int sha_eq(const unsigned char *a
, const unsigned char *b
)
57 return a
&& b
&& memcmp(a
, b
, 20) == 0;
61 * TODO: check if we can just reuse the active_cache structure: it is already
62 * sorted (by name, stage).
63 * Only problem: do not write it when flushing the cache.
70 unsigned char sha
[20];
75 static struct path_list current_file_set
= {NULL
, 0, 0, 1};
76 static struct path_list current_directory_set
= {NULL
, 0, 0, 1};
78 static int output_indent
= 0;
80 static void output(const char *fmt
, ...)
84 for (i
= output_indent
; i
--;)
87 vfprintf(stdout
, fmt
, args
);
92 static void output_commit_title(struct commit
*commit
)
95 for (i
= output_indent
; i
--;)
98 printf("virtual %s\n", (char *)commit
->util
);
100 printf("%s ", sha1_to_hex(commit
->object
.sha1
));
101 if (parse_commit(commit
) != 0)
102 printf("(bad commit)\n");
106 for (s
= commit
->buffer
; *s
; s
++)
107 if (*s
== '\n' && s
[1] == '\n') {
111 for (len
= 0; s
[len
] && '\n' != s
[len
]; len
++)
113 printf("%.*s\n", len
, s
);
118 static const char *original_index_file
;
119 static const char *temporary_index_file
;
120 static int cache_dirty
= 0;
122 static int flush_cache(void)
124 /* flush temporary index */
125 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
126 int fd
= hold_lock_file_for_update(lock
, getenv("GIT_INDEX_FILE"));
128 die("could not lock %s", temporary_index_file
);
129 if (write_cache(fd
, active_cache
, active_nr
) ||
130 close(fd
) || commit_lock_file(lock
))
131 die ("unable to write %s", getenv("GIT_INDEX_FILE"));
137 static void setup_index(int temp
)
139 const char *idx
= temp
? temporary_index_file
: original_index_file
;
141 die("fatal: cache changed flush_cache();");
142 unlink(temporary_index_file
);
143 setenv("GIT_INDEX_FILE", idx
, 1);
147 static struct cache_entry
*make_cache_entry(unsigned int mode
,
148 const unsigned char *sha1
, const char *path
, int stage
, int refresh
)
151 struct cache_entry
*ce
;
153 if (!verify_path(path
))
157 size
= cache_entry_size(len
);
158 ce
= xcalloc(1, size
);
160 memcpy(ce
->sha1
, sha1
, 20);
161 memcpy(ce
->name
, path
, len
);
162 ce
->ce_flags
= create_ce_flags(len
, stage
);
163 ce
->ce_mode
= create_ce_mode(mode
);
166 return refresh_cache_entry(ce
, 0);
171 static int add_cacheinfo(unsigned int mode
, const unsigned char *sha1
,
172 const char *path
, int stage
, int refresh
, int options
)
174 struct cache_entry
*ce
;
176 read_cache_from(getenv("GIT_INDEX_FILE"));
178 ce
= make_cache_entry(mode
, sha1
? sha1
: null_sha1
, path
, stage
, refresh
);
180 return error("cache_addinfo failed: %s", strerror(cache_errno
));
181 return add_cache_entry(ce
, options
);
185 * This is a global variable which is used in a number of places but
186 * only written to in the 'merge' function.
188 * index_only == 1 => Don't leave any non-stage 0 entries in the cache and
189 * don't update the working directory.
190 * 0 => Leave unmerged entries in the cache and update
191 * the working directory.
193 static int index_only
= 0;
196 * TODO: this can be streamlined by refactoring builtin-read-tree.c
198 static int git_read_tree(const struct tree
*tree
)
201 fprintf(stderr
, "GIT_INDEX_FILE='%s' git-read-tree %s\n",
202 getenv("GIT_INDEX_FILE"),
203 sha1_to_hex(tree
->object
.sha1
));
206 const char *argv
[] = { "git-read-tree", NULL
, NULL
, };
208 die("read-tree with dirty cache");
209 argv
[1] = sha1_to_hex(tree
->object
.sha1
);
210 rc
= run_command_v(2, argv
);
211 return rc
< 0 ? -1: rc
;
215 * TODO: this can be streamlined by refactoring builtin-read-tree.c
217 static int git_merge_trees(const char *update_arg
,
223 fprintf(stderr
, "GIT_INDEX_FILE='%s' git-read-tree %s -m %s %s %s\n",
224 getenv("GIT_INDEX_FILE"),
226 sha1_to_hex(common
->object
.sha1
),
227 sha1_to_hex(head
->object
.sha1
),
228 sha1_to_hex(merge
->object
.sha1
));
231 const char *argv
[] = {
232 "git-read-tree", NULL
, "-m", NULL
, NULL
, NULL
,
237 argv
[1] = update_arg
;
238 argv
[3] = sha1_to_hex(common
->object
.sha1
);
239 argv
[4] = sha1_to_hex(head
->object
.sha1
);
240 argv
[5] = sha1_to_hex(merge
->object
.sha1
);
241 rc
= run_command_v(6, argv
);
242 return rc
< 0 ? -1: rc
;
246 * TODO: this can be streamlined by refactoring builtin-write-tree.c
248 static struct tree
*git_write_tree(void)
251 fprintf(stderr
, "GIT_INDEX_FILE='%s' git-write-tree\n",
252 getenv("GIT_INDEX_FILE"));
257 unsigned char sha1
[20];
262 fp
= popen("git-write-tree 2>/dev/null", "r");
263 while ((ch
= fgetc(fp
)) != EOF
)
264 if (i
< sizeof(buf
)-1 && ch
>= '0' && ch
<= 'f')
269 if (rc
== -1 || WEXITSTATUS(rc
))
272 if (get_sha1(buf
, sha1
) != 0)
274 return lookup_tree(sha1
);
277 static int save_files_dirs(const unsigned char *sha1
,
278 const char *base
, int baselen
, const char *path
,
279 unsigned int mode
, int stage
)
281 int len
= strlen(path
);
282 char *newpath
= malloc(baselen
+ len
+ 1);
283 memcpy(newpath
, base
, baselen
);
284 memcpy(newpath
+ baselen
, path
, len
);
285 newpath
[baselen
+ len
] = '\0';
288 path_list_insert(newpath
, ¤t_directory_set
);
290 path_list_insert(newpath
, ¤t_file_set
);
293 return READ_TREE_RECURSIVE
;
296 static int get_files_dirs(struct tree
*tree
)
299 if (read_tree_recursive(tree
, "", 0, 0, NULL
, save_files_dirs
) != 0)
301 n
= current_file_set
.nr
+ current_directory_set
.nr
;
306 * Returns a index_entry instance which doesn't have to correspond to
307 * a real cache entry in Git's index.
309 static struct stage_data
*insert_stage_data(const char *path
,
310 struct tree
*o
, struct tree
*a
, struct tree
*b
,
311 struct path_list
*entries
)
313 struct path_list_item
*item
;
314 struct stage_data
*e
= xcalloc(1, sizeof(struct stage_data
));
315 get_tree_entry(o
->object
.sha1
, path
,
316 e
->stages
[1].sha
, &e
->stages
[1].mode
);
317 get_tree_entry(a
->object
.sha1
, path
,
318 e
->stages
[2].sha
, &e
->stages
[2].mode
);
319 get_tree_entry(b
->object
.sha1
, path
,
320 e
->stages
[3].sha
, &e
->stages
[3].mode
);
321 item
= path_list_insert(path
, entries
);
327 * Create a dictionary mapping file names to stage_data objects. The
328 * dictionary contains one entry for every path with a non-zero stage entry.
330 static struct path_list
*get_unmerged(void)
332 struct path_list
*unmerged
= xcalloc(1, sizeof(struct path_list
));
335 unmerged
->strdup_paths
= 1;
337 read_cache_from(getenv("GIT_INDEX_FILE"));
340 for (i
= 0; i
< active_nr
; i
++) {
341 struct path_list_item
*item
;
342 struct stage_data
*e
;
343 struct cache_entry
*ce
= active_cache
[i
];
347 item
= path_list_lookup(ce
->name
, unmerged
);
349 item
= path_list_insert(ce
->name
, unmerged
);
350 item
->util
= xcalloc(1, sizeof(struct stage_data
));
353 e
->stages
[ce_stage(ce
)].mode
= ntohl(ce
->ce_mode
);
354 memcpy(e
->stages
[ce_stage(ce
)].sha
, ce
->sha1
, 20);
362 struct diff_filepair
*pair
;
363 struct stage_data
*src_entry
;
364 struct stage_data
*dst_entry
;
365 unsigned processed
:1;
369 * Get information of all renames which occured between 'o_tree' and
370 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
371 * 'b_tree') to be able to associate the correct cache entries with
372 * the rename information. 'tree' is always equal to either a_tree or b_tree.
374 static struct path_list
*get_renames(struct tree
*tree
,
378 struct path_list
*entries
)
381 struct path_list
*renames
;
382 struct diff_options opts
;
384 renames
= xcalloc(1, sizeof(struct path_list
));
387 opts
.detect_rename
= DIFF_DETECT_RENAME
;
388 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
389 if (diff_setup_done(&opts
) < 0)
390 die("diff setup failed");
391 diff_tree_sha1(o_tree
->object
.sha1
, tree
->object
.sha1
, "", &opts
);
393 for (i
= 0; i
< diff_queued_diff
.nr
; ++i
) {
394 struct path_list_item
*item
;
396 struct diff_filepair
*pair
= diff_queued_diff
.queue
[i
];
397 if (pair
->status
!= 'R') {
398 diff_free_filepair(pair
);
401 re
= xmalloc(sizeof(*re
));
404 item
= path_list_lookup(re
->pair
->one
->path
, entries
);
406 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
407 o_tree
, a_tree
, b_tree
, entries
);
409 re
->src_entry
= item
->util
;
411 item
= path_list_lookup(re
->pair
->two
->path
, entries
);
413 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
414 o_tree
, a_tree
, b_tree
, entries
);
416 re
->dst_entry
= item
->util
;
417 item
= path_list_insert(pair
->one
->path
, renames
);
420 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
421 diff_queued_diff
.nr
= 0;
426 int update_stages(const char *path
, struct diff_filespec
*o
,
427 struct diff_filespec
*a
, struct diff_filespec
*b
, int clear
)
429 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
;
431 if (remove_file_from_cache(path
))
434 if (add_cacheinfo(o
->mode
, o
->sha1
, path
, 1, 0, options
))
437 if (add_cacheinfo(a
->mode
, a
->sha1
, path
, 2, 0, options
))
440 if (add_cacheinfo(b
->mode
, b
->sha1
, path
, 3, 0, options
))
445 static int remove_path(const char *name
)
454 dirs
= malloc(len
+1);
455 memcpy(dirs
, name
, len
);
457 while ((slash
= strrchr(name
, '/'))) {
460 if (rmdir(name
) != 0)
468 * TODO: once we no longer call external programs, we'd probably be better off
469 * not setting / getting the environment variable GIT_INDEX_FILE all the time.
471 int remove_file(int clean
, const char *path
)
473 int update_cache
= index_only
|| clean
;
474 int update_working_directory
= !index_only
;
478 read_cache_from(getenv("GIT_INDEX_FILE"));
480 if (remove_file_from_cache(path
))
483 if (update_working_directory
)
486 if (errno
!= ENOENT
|| errno
!= EISDIR
)
493 static char *unique_path(const char *path
, const char *branch
)
495 char *newpath
= xmalloc(strlen(path
) + 1 + strlen(branch
) + 8 + 1);
498 char *p
= newpath
+ strlen(newpath
);
499 strcpy(newpath
, path
);
500 strcat(newpath
, "~");
505 while (path_list_has_path(¤t_file_set
, newpath
) ||
506 path_list_has_path(¤t_directory_set
, newpath
) ||
507 lstat(newpath
, &st
) == 0)
508 sprintf(p
, "_%d", suffix
++);
510 path_list_insert(newpath
, ¤t_file_set
);
514 static int mkdir_p(const char *path
, unsigned long mode
)
516 /* path points to cache entries, so strdup before messing with it */
517 char *buf
= strdup(path
);
518 int result
= safe_create_leading_directories(buf
);
523 static void flush_buffer(int fd
, const char *buf
, unsigned long size
)
526 long ret
= xwrite(fd
, buf
, size
);
531 die("merge-recursive: %s", strerror(errno
));
533 die("merge-recursive: disk full?");
540 void update_file_flags(const unsigned char *sha
,
554 buf
= read_sha1_file(sha
, type
, &size
);
556 die("cannot read object %s '%s'", sha1_to_hex(sha
), path
);
557 if (strcmp(type
, blob_type
) != 0)
558 die("blob expected for %s '%s'", sha1_to_hex(sha
), path
);
562 if (mkdir_p(path
, 0777))
563 die("failed to create path %s: %s", path
, strerror(errno
));
569 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
571 die("failed to open %s: %s", path
, strerror(errno
));
572 flush_buffer(fd
, buf
, size
);
574 } else if (S_ISLNK(mode
)) {
575 char *lnk
= malloc(size
+ 1);
576 memcpy(lnk
, buf
, size
);
582 die("do not know what to do with %06o %s '%s'",
583 mode
, sha1_to_hex(sha
), path
);
586 add_cacheinfo(mode
, sha
, path
, 0, update_wd
, ADD_CACHE_OK_TO_ADD
);
589 void update_file(int clean
,
590 const unsigned char *sha
,
594 update_file_flags(sha
, mode
, path
, index_only
|| clean
, !index_only
);
597 /* Low level file merging, update and removal */
599 struct merge_file_info
601 unsigned char sha
[20];
607 static char *git_unpack_file(const unsigned char *sha1
, char *path
)
614 buf
= read_sha1_file(sha1
, type
, &size
);
615 if (!buf
|| strcmp(type
, blob_type
))
616 die("unable to read blob object %s", sha1_to_hex(sha1
));
618 strcpy(path
, ".merge_file_XXXXXX");
621 die("unable to create temp-file");
622 flush_buffer(fd
, buf
, size
);
627 static struct merge_file_info
merge_file(struct diff_filespec
*o
,
628 struct diff_filespec
*a
, struct diff_filespec
*b
,
629 const char *branch1Name
, const char *branch2Name
)
631 struct merge_file_info result
;
635 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
637 if (S_ISREG(a
->mode
)) {
638 result
.mode
= a
->mode
;
639 memcpy(result
.sha
, a
->sha1
, 20);
641 result
.mode
= b
->mode
;
642 memcpy(result
.sha
, b
->sha1
, 20);
645 if (!sha_eq(a
->sha1
, o
->sha1
) && !sha_eq(b
->sha1
, o
->sha1
))
648 result
.mode
= a
->mode
== o
->mode
? b
->mode
: a
->mode
;
650 if (sha_eq(a
->sha1
, o
->sha1
))
651 memcpy(result
.sha
, b
->sha1
, 20);
652 else if (sha_eq(b
->sha1
, o
->sha1
))
653 memcpy(result
.sha
, a
->sha1
, 20);
654 else if (S_ISREG(a
->mode
)) {
660 const char *argv
[] = {
661 "merge", "-L", NULL
, "-L", NULL
, "-L", NULL
,
667 git_unpack_file(o
->sha1
, orig
);
668 git_unpack_file(a
->sha1
, src1
);
669 git_unpack_file(b
->sha1
, src2
);
671 argv
[2] = la
= strdup(mkpath("%s/%s", branch1Name
, a
->path
));
672 argv
[6] = lb
= strdup(mkpath("%s/%s", branch2Name
, b
->path
));
673 argv
[4] = lo
= strdup(mkpath("orig/%s", o
->path
));
676 printf("%s %s %s %s %s %s %s %s %s %s\n",
677 argv
[0], argv
[1], argv
[2], argv
[3], argv
[4],
678 argv
[5], argv
[6], argv
[7], argv
[8], argv
[9]);
680 code
= run_command_v(10, argv
);
685 if (code
&& code
< -256) {
686 die("Failed to execute 'merge'. merge(1) is used as the "
687 "file-level merge tool. Is 'merge' in your path?");
689 fd
= open(src1
, O_RDONLY
);
690 if (fd
< 0 || fstat(fd
, &st
) < 0 ||
691 index_fd(result
.sha
, fd
, &st
, 1,
693 die("Unable to add %s to database", src1
);
699 result
.clean
= WEXITSTATUS(code
) == 0;
701 if (!(S_ISLNK(a
->mode
) || S_ISLNK(b
->mode
)))
702 die("cannot merge modes?");
704 memcpy(result
.sha
, a
->sha1
, 20);
706 if (!sha_eq(a
->sha1
, b
->sha1
))
714 static void conflict_rename_rename(struct rename
*ren1
,
721 const char *ren1_dst
= ren1
->pair
->two
->path
;
722 const char *ren2_dst
= ren2
->pair
->two
->path
;
723 const char *dst_name1
= ren1_dst
;
724 const char *dst_name2
= ren2_dst
;
725 if (path_list_has_path(¤t_directory_set
, ren1_dst
)) {
726 dst_name1
= del
[delp
++] = unique_path(ren1_dst
, branch1
);
727 output("%s is a directory in %s adding as %s instead",
728 ren1_dst
, branch2
, dst_name1
);
729 remove_file(0, ren1_dst
);
731 if (path_list_has_path(¤t_directory_set
, ren2_dst
)) {
732 dst_name2
= del
[delp
++] = unique_path(ren2_dst
, branch2
);
733 output("%s is a directory in %s adding as %s instead",
734 ren2_dst
, branch1
, dst_name2
);
735 remove_file(0, ren2_dst
);
737 update_stages(dst_name1
, NULL
, ren1
->pair
->two
, NULL
, 1);
738 update_stages(dst_name2
, NULL
, NULL
, ren2
->pair
->two
, 1);
743 static void conflict_rename_dir(struct rename
*ren1
,
746 char *new_path
= unique_path(ren1
->pair
->two
->path
, branch1
);
747 output("Renaming %s to %s instead", ren1
->pair
->one
->path
, new_path
);
748 remove_file(0, ren1
->pair
->two
->path
);
749 update_file(0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path
);
753 static void conflict_rename_rename_2(struct rename
*ren1
,
758 char *new_path1
= unique_path(ren1
->pair
->two
->path
, branch1
);
759 char *new_path2
= unique_path(ren2
->pair
->two
->path
, branch2
);
760 output("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(0, ren1
->pair
->two
->path
);
764 update_file(0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path1
);
765 update_file(0, ren2
->pair
->two
->sha1
, ren2
->pair
->two
->mode
, new_path2
);
770 static int process_renames(struct path_list
*a_renames
,
771 struct path_list
*b_renames
,
772 const char *a_branch
,
773 const char *b_branch
)
775 int clean_merge
= 1, i
, j
;
776 struct path_list a_by_dst
= {NULL
, 0, 0, 0}, b_by_dst
= {NULL
, 0, 0, 0};
777 const struct rename
*sre
;
779 for (i
= 0; i
< a_renames
->nr
; i
++) {
780 sre
= a_renames
->items
[i
].util
;
781 path_list_insert(sre
->pair
->two
->path
, &a_by_dst
)->util
784 for (i
= 0; i
< b_renames
->nr
; i
++) {
785 sre
= b_renames
->items
[i
].util
;
786 path_list_insert(sre
->pair
->two
->path
, &b_by_dst
)->util
790 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
793 struct path_list
*renames1
, *renames2
, *renames2Dst
;
794 struct rename
*ren1
= NULL
, *ren2
= NULL
;
795 const char *branch1
, *branch2
;
796 const char *ren1_src
, *ren1_dst
;
798 if (i
>= a_renames
->nr
) {
800 ren2
= b_renames
->items
[j
++].util
;
801 } else if (j
>= b_renames
->nr
) {
803 ren1
= a_renames
->items
[i
++].util
;
805 compare
= strcmp(a_renames
->items
[i
].path
,
806 b_renames
->items
[j
].path
);
807 ren1
= a_renames
->items
[i
++].util
;
808 ren2
= b_renames
->items
[j
++].util
;
811 /* TODO: refactor, so that 1/2 are not needed */
813 renames1
= a_renames
;
814 renames2
= b_renames
;
815 renames2Dst
= &b_by_dst
;
820 renames1
= b_renames
;
821 renames2
= a_renames
;
822 renames2Dst
= &a_by_dst
;
829 src
= ren1
->pair
->one
->path
;
831 ren1
->dst_entry
->processed
= 1;
832 ren1
->src_entry
->processed
= 1;
838 ren1_src
= ren1
->pair
->one
->path
;
839 ren1_dst
= ren1
->pair
->two
->path
;
842 const char *ren2_src
= ren2
->pair
->one
->path
;
843 const char *ren2_dst
= ren2
->pair
->two
->path
;
844 /* Renamed in 1 and renamed in 2 */
845 if (strcmp(ren1_src
, ren2_src
) != 0)
846 die("ren1.src != ren2.src");
847 ren2
->dst_entry
->processed
= 1;
849 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
851 output("CONFLICT (rename/rename): "
852 "Rename %s->%s in branch %s "
853 "rename %s->%s in %s",
854 src
, ren1_dst
, branch1
,
855 src
, ren2_dst
, branch2
);
856 conflict_rename_rename(ren1
, branch1
, ren2
, branch2
);
858 struct merge_file_info mfi
;
859 remove_file(1, ren1_src
);
860 mfi
= merge_file(ren1
->pair
->one
,
865 if (mfi
.merge
|| !mfi
.clean
)
866 output("Renaming %s->%s", src
, ren1_dst
);
869 output("Auto-merging %s", ren1_dst
);
872 output("CONFLICT (content): merge conflict in %s",
877 update_stages(ren1_dst
,
883 update_file(mfi
.clean
, mfi
.sha
, mfi
.mode
, ren1_dst
);
886 /* Renamed in 1, maybe changed in 2 */
887 struct path_list_item
*item
;
888 /* we only use sha1 and mode of these */
889 struct diff_filespec src_other
, dst_other
;
890 int try_merge
, stage
= a_renames
== renames1
? 3: 2;
892 remove_file(1, ren1_src
);
894 memcpy(src_other
.sha1
,
895 ren1
->src_entry
->stages
[stage
].sha
, 20);
896 src_other
.mode
= ren1
->src_entry
->stages
[stage
].mode
;
897 memcpy(dst_other
.sha1
,
898 ren1
->dst_entry
->stages
[stage
].sha
, 20);
899 dst_other
.mode
= ren1
->dst_entry
->stages
[stage
].mode
;
903 if (path_list_has_path(¤t_directory_set
, ren1_dst
)) {
905 output("CONFLICT (rename/directory): Rename %s->%s in %s "
906 " directory %s added in %s",
907 ren1_src
, ren1_dst
, branch1
,
909 conflict_rename_dir(ren1
, branch1
);
910 } else if (sha_eq(src_other
.sha1
, null_sha1
)) {
912 output("CONFLICT (rename/delete): Rename %s->%s in %s "
914 ren1_src
, ren1_dst
, branch1
,
916 update_file(0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, ren1_dst
);
917 } else if (!sha_eq(dst_other
.sha1
, null_sha1
)) {
918 const char *new_path
;
921 output("CONFLICT (rename/add): Rename %s->%s in %s. "
923 ren1_src
, ren1_dst
, branch1
,
925 new_path
= unique_path(ren1_dst
, branch2
);
926 output("Adding as %s instead", new_path
);
927 update_file(0, dst_other
.sha1
, dst_other
.mode
, new_path
);
928 } else if ((item
= path_list_lookup(ren1_dst
, renames2Dst
))) {
932 output("CONFLICT (rename/rename): Rename %s->%s in %s. "
933 "Rename %s->%s in %s",
934 ren1_src
, ren1_dst
, branch1
,
935 ren2
->pair
->one
->path
, ren2
->pair
->two
->path
, branch2
);
936 conflict_rename_rename_2(ren1
, branch1
, ren2
, branch2
);
941 struct diff_filespec
*o
, *a
, *b
;
942 struct merge_file_info mfi
;
943 src_other
.path
= (char *)ren1_src
;
946 if (a_renames
== renames1
) {
953 mfi
= merge_file(o
, a
, b
,
956 if (mfi
.merge
|| !mfi
.clean
)
957 output("Renaming %s => %s", ren1_src
, ren1_dst
);
959 output("Auto-merging %s", ren1_dst
);
961 output("CONFLICT (rename/modify): Merge conflict in %s",
966 update_stages(ren1_dst
,
969 update_file(mfi
.clean
, mfi
.sha
, mfi
.mode
, ren1_dst
);
973 path_list_clear(&a_by_dst
, 0);
974 path_list_clear(&b_by_dst
, 0);
981 static unsigned char *has_sha(const unsigned char *sha
)
983 return memcmp(sha
, null_sha1
, 20) == 0 ? NULL
: (unsigned char *)sha
;
986 /* Per entry merge function */
987 static int process_entry(const char *path
, struct stage_data
*entry
,
988 const char *branch1Name
,
989 const char *branch2Name
)
992 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
993 print_index_entry("\tpath: ", entry);
996 unsigned char *o_sha
= has_sha(entry
->stages
[1].sha
);
997 unsigned char *a_sha
= has_sha(entry
->stages
[2].sha
);
998 unsigned char *b_sha
= has_sha(entry
->stages
[3].sha
);
999 unsigned o_mode
= entry
->stages
[1].mode
;
1000 unsigned a_mode
= entry
->stages
[2].mode
;
1001 unsigned b_mode
= entry
->stages
[3].mode
;
1003 if (o_sha
&& (!a_sha
|| !b_sha
)) {
1004 /* Case A: Deleted in one */
1005 if ((!a_sha
&& !b_sha
) ||
1006 (sha_eq(a_sha
, o_sha
) && !b_sha
) ||
1007 (!a_sha
&& sha_eq(b_sha
, o_sha
))) {
1008 /* Deleted in both or deleted in one and
1009 * unchanged in the other */
1011 output("Removing %s", path
);
1012 remove_file(1, path
);
1014 /* Deleted in one and changed in the other */
1017 output("CONFLICT (delete/modify): %s deleted in %s "
1018 "and modified in %s. Version %s of %s left in tree.",
1020 branch2Name
, branch2Name
, path
);
1021 update_file(0, b_sha
, b_mode
, path
);
1023 output("CONFLICT (delete/modify): %s deleted in %s "
1024 "and modified in %s. Version %s of %s left in tree.",
1026 branch1Name
, branch1Name
, path
);
1027 update_file(0, a_sha
, a_mode
, path
);
1031 } else if ((!o_sha
&& a_sha
&& !b_sha
) ||
1032 (!o_sha
&& !a_sha
&& b_sha
)) {
1033 /* Case B: Added in one. */
1034 const char *add_branch
;
1035 const char *other_branch
;
1037 const unsigned char *sha
;
1041 add_branch
= branch1Name
;
1042 other_branch
= branch2Name
;
1045 conf
= "file/directory";
1047 add_branch
= branch2Name
;
1048 other_branch
= branch1Name
;
1051 conf
= "directory/file";
1053 if (path_list_has_path(¤t_directory_set
, path
)) {
1054 const char *new_path
= unique_path(path
, add_branch
);
1056 output("CONFLICT (%s): There is a directory with name %s in %s. "
1058 conf
, path
, other_branch
, path
, new_path
);
1059 remove_file(0, path
);
1060 update_file(0, sha
, mode
, new_path
);
1062 output("Adding %s", path
);
1063 update_file(1, sha
, mode
, path
);
1065 } else if (!o_sha
&& a_sha
&& b_sha
) {
1066 /* Case C: Added in both (check for same permissions). */
1067 if (sha_eq(a_sha
, b_sha
)) {
1068 if (a_mode
!= b_mode
) {
1070 output("CONFLICT: File %s added identically in both branches, "
1071 "but permissions conflict %06o->%06o",
1072 path
, a_mode
, b_mode
);
1073 output("CONFLICT: adding with permission: %06o", a_mode
);
1074 update_file(0, a_sha
, a_mode
, path
);
1076 /* This case is handled by git-read-tree */
1077 assert(0 && "This case must be handled by git-read-tree");
1080 const char *new_path1
, *new_path2
;
1082 new_path1
= unique_path(path
, branch1Name
);
1083 new_path2
= unique_path(path
, branch2Name
);
1084 output("CONFLICT (add/add): File %s added non-identically "
1085 "in both branches. Adding as %s and %s instead.",
1086 path
, new_path1
, new_path2
);
1087 remove_file(0, path
);
1088 update_file(0, a_sha
, a_mode
, new_path1
);
1089 update_file(0, b_sha
, b_mode
, new_path2
);
1092 } else if (o_sha
&& a_sha
&& b_sha
) {
1093 /* case D: Modified in both, but differently. */
1094 struct merge_file_info mfi
;
1095 struct diff_filespec o
, a
, b
;
1097 output("Auto-merging %s", path
);
1098 o
.path
= a
.path
= b
.path
= (char *)path
;
1099 memcpy(o
.sha1
, o_sha
, 20);
1101 memcpy(a
.sha1
, a_sha
, 20);
1103 memcpy(b
.sha1
, b_sha
, 20);
1106 mfi
= merge_file(&o
, &a
, &b
,
1107 branch1Name
, branch2Name
);
1110 update_file(1, mfi
.sha
, mfi
.mode
, path
);
1113 output("CONFLICT (content): Merge conflict in %s", path
);
1116 update_file(0, mfi
.sha
, mfi
.mode
, path
);
1118 update_file_flags(mfi
.sha
, mfi
.mode
, path
,
1119 0 /* update_cache */, 1 /* update_working_directory */);
1122 die("Fatal merge failure, shouldn't happen.");
1130 static int merge_trees(struct tree
*head
,
1132 struct tree
*common
,
1133 const char *branch1Name
,
1134 const char *branch2Name
,
1135 struct tree
**result
)
1138 if (sha_eq(common
->object
.sha1
, merge
->object
.sha1
)) {
1139 output("Already uptodate!");
1144 code
= git_merge_trees(index_only
? "-i": "-u", common
, head
, merge
);
1147 die("merging of trees %s and %s failed",
1148 sha1_to_hex(head
->object
.sha1
),
1149 sha1_to_hex(merge
->object
.sha1
));
1151 *result
= git_write_tree();
1154 struct path_list
*entries
, *re_head
, *re_merge
;
1156 path_list_clear(¤t_file_set
, 1);
1157 path_list_clear(¤t_directory_set
, 1);
1158 get_files_dirs(head
);
1159 get_files_dirs(merge
);
1161 entries
= get_unmerged();
1162 re_head
= get_renames(head
, common
, head
, merge
, entries
);
1163 re_merge
= get_renames(merge
, common
, head
, merge
, entries
);
1164 clean
= process_renames(re_head
, re_merge
,
1165 branch1Name
, branch2Name
);
1166 for (i
= 0; i
< entries
->nr
; i
++) {
1167 const char *path
= entries
->items
[i
].path
;
1168 struct stage_data
*e
= entries
->items
[i
].util
;
1171 if (!process_entry(path
, e
, branch1Name
, branch2Name
))
1175 path_list_clear(re_merge
, 0);
1176 path_list_clear(re_head
, 0);
1177 path_list_clear(entries
, 1);
1179 if (clean
|| index_only
)
1180 *result
= git_write_tree();
1185 printf("merging of trees %s and %s resulted in %s\n",
1186 sha1_to_hex(head
->object
.sha1
),
1187 sha1_to_hex(merge
->object
.sha1
),
1188 sha1_to_hex((*result
)->object
.sha1
));
1195 * Merge the commits h1 and h2, return the resulting virtual
1196 * commit object and a flag indicating the cleaness of the merge.
1199 int merge(struct commit
*h1
,
1201 const char *branch1Name
,
1202 const char *branch2Name
,
1203 int call_depth
/* =0 */,
1204 struct commit
*ancestor
/* =None */,
1205 struct commit
**result
)
1207 struct commit_list
*ca
= NULL
, *iter
;
1208 struct commit
*merged_common_ancestors
;
1209 struct tree
*mrtree
;
1213 output_commit_title(h1
);
1214 output_commit_title(h2
);
1217 commit_list_insert(ancestor
, &ca
);
1219 ca
= get_merge_bases(h1
, h2
, 1);
1221 output("found %u common ancestor(s):", commit_list_count(ca
));
1222 for (iter
= ca
; iter
; iter
= iter
->next
)
1223 output_commit_title(iter
->item
);
1225 merged_common_ancestors
= pop_commit(&ca
);
1227 for (iter
= ca
; iter
; iter
= iter
->next
) {
1228 output_indent
= call_depth
+ 1;
1230 * When the merge fails, the result contains files
1231 * with conflict markers. The cleanness flag is
1232 * ignored, it was never acutally used, as result of
1233 * merge_trees has always overwritten it: the commited
1234 * "conflicts" were already resolved.
1236 merge(merged_common_ancestors
, iter
->item
,
1237 "Temporary merge branch 1",
1238 "Temporary merge branch 2",
1241 &merged_common_ancestors
);
1242 output_indent
= call_depth
;
1244 if (!merged_common_ancestors
)
1245 die("merge returned no commit");
1248 if (call_depth
== 0) {
1249 setup_index(0 /* $GIT_DIR/index */);
1252 setup_index(1 /* temporary index */);
1253 git_read_tree(h1
->tree
);
1257 clean
= merge_trees(h1
->tree
, h2
->tree
, merged_common_ancestors
->tree
,
1258 branch1Name
, branch2Name
, &mrtree
);
1260 if (!ancestor
&& (clean
|| index_only
)) {
1261 *result
= make_virtual_commit(mrtree
, "merged tree");
1262 commit_list_insert(h1
, &(*result
)->parents
);
1263 commit_list_insert(h2
, &(*result
)->parents
->next
);
1270 static struct commit
*get_ref(const char *ref
)
1272 unsigned char sha1
[20];
1273 struct object
*object
;
1275 if (get_sha1(ref
, sha1
))
1276 die("Could not resolve ref '%s'", ref
);
1277 object
= deref_tag(parse_object(sha1
), ref
, strlen(ref
));
1278 if (object
->type
!= OBJ_COMMIT
)
1280 if (parse_commit((struct commit
*)object
))
1281 die("Could not parse commit '%s'", sha1_to_hex(object
->sha1
));
1282 return (struct commit
*)object
;
1285 int main(int argc
, char *argv
[])
1287 static const char *bases
[2];
1288 static unsigned bases_count
= 0;
1290 const char *branch1
, *branch2
;
1291 struct commit
*result
, *h1
, *h2
;
1293 original_index_file
= getenv("GIT_INDEX_FILE");
1295 if (!original_index_file
)
1296 original_index_file
= strdup(git_path("index"));
1298 temporary_index_file
= strdup(git_path("mrg-rcrsv-tmp-idx"));
1301 die("Usage: %s <base>... -- <head> <remote> ...\n", argv
[0]);
1303 for (i
= 1; i
< argc
; ++i
) {
1304 if (!strcmp(argv
[i
], "--"))
1306 if (bases_count
< sizeof(bases
)/sizeof(*bases
))
1307 bases
[bases_count
++] = argv
[i
];
1309 if (argc
- i
!= 3) /* "--" "<head>" "<remote>" */
1310 die("Not handling anything other than two heads merge.");
1312 branch1
= argv
[++i
];
1313 branch2
= argv
[++i
];
1314 printf("Merging %s with %s\n", branch1
, branch2
);
1316 h1
= get_ref(branch1
);
1317 h2
= get_ref(branch2
);
1319 if (bases_count
== 1) {
1320 struct commit
*ancestor
= get_ref(bases
[0]);
1321 clean
= merge(h1
, h2
, branch1
, branch2
, 0, ancestor
, &result
);
1323 clean
= merge(h1
, h2
, branch1
, branch2
, 0, NULL
, &result
);
1328 return clean
? 0: 1;