mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recursive: use xdl_merge().

Browse Source 
This seem to pass the existing tests already.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2006-11-29 12:07:37 -08:00
parent 53a7085a10
commit c2b4faea45
1 changed files with 35 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
merge-recursive.c
View File

@ -21,6 +21,7 @@
#include "tag.h" #include "tag.h"
#include "unpack-trees.h" #include "unpack-trees.h"
#include "path-list.h" #include "path-list.h"
#include "xdiff-interface.h"
/* /*
* A virtual commit has * A virtual commit has
@ -604,24 +605,15 @@ struct merge_file_info
merge:1; merge:1;
}; };
static char *git_unpack_file(const unsigned char *sha1, char *path) static void fill_mm(const unsigned char *sha1, mmfile_t *mm)
{ {
void *buf;
char type[20];
unsigned long size; unsigned long size;
int fd; char type[20];
buf = read_sha1_file(sha1, type, &size); mm->ptr = read_sha1_file(sha1, type, &size);
if (!buf || strcmp(type, blob_type)) if (!mm->ptr || strcmp(type, blob_type))
die("unable to read blob object %s", sha1_to_hex(sha1)); die("unable to read blob object %s", sha1_to_hex(sha1));
mm->size = size;
strcpy(path, ".merge_file_XXXXXX");
fd = mkstemp(path);
if (fd < 0)
die("unable to create temp-file");
flush_buffer(fd, buf, size);
close(fd);
return path;
} }
static struct merge_file_info merge_file(struct diff_filespec *o, static struct merge_file_info merge_file(struct diff_filespec *o,
@ -652,49 +644,41 @@ static struct merge_file_info merge_file(struct diff_filespec *o,
else if (sha_eq(b->sha1, o->sha1)) else if (sha_eq(b->sha1, o->sha1))
hashcpy(result.sha, a->sha1); hashcpy(result.sha, a->sha1);
else if (S_ISREG(a->mode)) { else if (S_ISREG(a->mode)) {
int code = 1, fd; mmfile_t orig, src1, src2;
struct stat st; mmbuffer_t result_buf;
char orig[PATH_MAX]; xpparam_t xpp;
char src1[PATH_MAX]; char *name1, *name2;
char src2[PATH_MAX]; int merge_status;
const char *argv[] = {
"merge", "-L", NULL, "-L", NULL, "-L", NULL,
NULL, NULL, NULL,
NULL
};
char *la, *lb, *lo;
git_unpack_file(o->sha1, orig); name1 = xstrdup(mkpath("%s/%s", branch1, a->path));
git_unpack_file(a->sha1, src1); name2 = xstrdup(mkpath("%s/%s", branch2, b->path));
git_unpack_file(b->sha1, src2);
argv[2] = la = xstrdup(mkpath("%s/%s", branch1, a->path)); fill_mm(o->sha1, &orig);
argv[6] = lb = xstrdup(mkpath("%s/%s", branch2, b->path)); fill_mm(a->sha1, &src1);
argv[4] = lo = xstrdup(mkpath("orig/%s", o->path)); fill_mm(b->sha1, &src2);
argv[7] = src1;
argv[8] = orig;
argv[9] = src2,
code = run_command_v(10, argv); memset(&xpp, 0, sizeof(xpp));
merge_status = xdl_merge(&orig,
&src1, name1,
&src2, name2,
&xpp, XDL_MERGE_ZEALOUS,
&result_buf);
free(name1);
free(name2);
free(orig.ptr);
free(src1.ptr);
free(src2.ptr);
free(la); if ((merge_status < 0) || !result_buf.ptr)
free(lb); die("Failed to execute internal merge");
free(lo);
if (code && code < -256) {
die("Failed to execute 'merge'. merge(1) is used as the "
"file-level merge tool. Is 'merge' in your path?");
}
fd = open(src1, O_RDONLY);
if (fd < 0 || fstat(fd, &st) < 0 ||
index_fd(result.sha, fd, &st, 1,
"blob"))
die("Unable to add %s to database", src1);
unlink(orig); if (write_sha1_file(result_buf.ptr, result_buf.size,
unlink(src1); blob_type, result.sha))
unlink(src2); die("Unable to add %s to database",
a->path);
result.clean = WEXITSTATUS(code) == 0; free(result_buf.ptr);
result.clean = (merge_status == 0);
} else { } else {
if (!(S_ISLNK(a->mode) || S_ISLNK(b->mode))) if (!(S_ISLNK(a->mode) || S_ISLNK(b->mode)))
die("cannot merge modes?"); die("cannot merge modes?");