2007-07-14 23:14:45 +00:00
|
|
|
#include "builtin.h"
|
2006-12-06 15:26:06 +00:00
|
|
|
#include "cache.h"
|
|
|
|
#include "xdiff/xdiff.h"
|
2006-12-20 16:37:07 +00:00
|
|
|
#include "xdiff-interface.h"
|
2008-10-02 12:59:20 +00:00
|
|
|
#include "parse-options.h"
|
2006-12-06 15:26:06 +00:00
|
|
|
|
2008-10-02 12:59:20 +00:00
|
|
|
static const char *const merge_file_usage[] = {
|
|
|
|
"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file file2",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
static int label_cb(const struct option *opt, const char *arg, int unset)
|
|
|
|
{
|
|
|
|
static int label_count = 0;
|
|
|
|
const char **names = (const char **)opt->value;
|
|
|
|
|
|
|
|
if (label_count >= 3)
|
|
|
|
return error("too many labels on the command line");
|
|
|
|
names[label_count++] = arg;
|
|
|
|
return 0;
|
|
|
|
}
|
2006-12-06 15:26:06 +00:00
|
|
|
|
2007-07-14 23:14:45 +00:00
|
|
|
int cmd_merge_file(int argc, const char **argv, const char *prefix)
|
2006-12-06 15:26:06 +00:00
|
|
|
{
|
2008-10-02 12:59:20 +00:00
|
|
|
const char *names[3] = { NULL, NULL, NULL };
|
2006-12-06 15:26:06 +00:00
|
|
|
mmfile_t mmfs[3];
|
|
|
|
mmbuffer_t result = {NULL, 0};
|
2010-05-02 13:04:41 +00:00
|
|
|
xmparam_t xmp = {{0}};
|
2006-12-06 15:45:42 +00:00
|
|
|
int ret = 0, i = 0, to_stdout = 0;
|
2010-03-01 21:46:26 +00:00
|
|
|
int quiet = 0;
|
2010-10-17 19:23:22 +00:00
|
|
|
int prefixlen = 0;
|
2008-10-02 12:59:20 +00:00
|
|
|
struct option options[] = {
|
|
|
|
OPT_BOOLEAN('p', "stdout", &to_stdout, "send results to standard output"),
|
2010-03-01 21:46:26 +00:00
|
|
|
OPT_SET_INT(0, "diff3", &xmp.style, "use a diff3 based merge", XDL_MERGE_DIFF3),
|
|
|
|
OPT_SET_INT(0, "ours", &xmp.favor, "for conflicts, use our version",
|
2008-06-20 07:17:27 +00:00
|
|
|
XDL_MERGE_FAVOR_OURS),
|
2010-03-01 21:46:26 +00:00
|
|
|
OPT_SET_INT(0, "theirs", &xmp.favor, "for conflicts, use their version",
|
2008-06-20 07:17:27 +00:00
|
|
|
XDL_MERGE_FAVOR_THEIRS),
|
2010-03-01 21:46:28 +00:00
|
|
|
OPT_SET_INT(0, "union", &xmp.favor, "for conflicts, use a union version",
|
|
|
|
XDL_MERGE_FAVOR_UNION),
|
2010-03-01 21:46:27 +00:00
|
|
|
OPT_INTEGER(0, "marker-size", &xmp.marker_size,
|
|
|
|
"for conflicts, use this marker size"),
|
2010-11-08 19:54:48 +00:00
|
|
|
OPT__QUIET(&quiet, "do not warn about conflicts"),
|
2008-10-02 12:59:20 +00:00
|
|
|
OPT_CALLBACK('L', NULL, names, "name",
|
|
|
|
"set labels for file1/orig_file/file2", &label_cb),
|
|
|
|
OPT_END(),
|
|
|
|
};
|
|
|
|
|
2010-03-01 21:46:26 +00:00
|
|
|
xmp.level = XDL_MERGE_ZEALOUS_ALNUM;
|
|
|
|
xmp.style = 0;
|
|
|
|
xmp.favor = 0;
|
|
|
|
|
2010-08-06 03:27:43 +00:00
|
|
|
if (startup_info->have_repository) {
|
2008-08-29 17:49:56 +00:00
|
|
|
/* Read the configuration file */
|
|
|
|
git_config(git_xmerge_config, NULL);
|
|
|
|
if (0 <= git_xmerge_style)
|
2010-03-01 21:46:26 +00:00
|
|
|
xmp.style = git_xmerge_style;
|
2008-08-29 17:49:56 +00:00
|
|
|
}
|
2006-12-06 15:26:06 +00:00
|
|
|
|
2009-05-23 18:53:12 +00:00
|
|
|
argc = parse_options(argc, argv, prefix, options, merge_file_usage, 0);
|
2008-10-02 12:59:20 +00:00
|
|
|
if (argc != 3)
|
|
|
|
usage_with_options(merge_file_usage, options);
|
2008-12-26 10:17:04 +00:00
|
|
|
if (quiet) {
|
|
|
|
if (!freopen("/dev/null", "w", stderr))
|
|
|
|
return error("failed to redirect stderr to /dev/null: "
|
2012-04-30 00:28:45 +00:00
|
|
|
"%s", strerror(errno));
|
2008-12-26 10:17:04 +00:00
|
|
|
}
|
2006-12-06 15:26:06 +00:00
|
|
|
|
2010-10-17 19:23:22 +00:00
|
|
|
if (prefix)
|
|
|
|
prefixlen = strlen(prefix);
|
|
|
|
|
2007-06-05 02:37:13 +00:00
|
|
|
for (i = 0; i < 3; i++) {
|
2010-10-17 19:23:22 +00:00
|
|
|
const char *fname = prefix_filename(prefix, prefixlen, argv[i]);
|
2008-10-02 12:59:20 +00:00
|
|
|
if (!names[i])
|
|
|
|
names[i] = argv[i];
|
2010-10-17 19:23:22 +00:00
|
|
|
if (read_mmfile(mmfs + i, fname))
|
2006-12-06 15:26:06 +00:00
|
|
|
return -1;
|
2007-06-05 02:37:13 +00:00
|
|
|
if (buffer_is_binary(mmfs[i].ptr, mmfs[i].size))
|
2012-04-30 00:28:45 +00:00
|
|
|
return error("Cannot merge binary files: %s",
|
2008-10-02 12:59:20 +00:00
|
|
|
argv[i]);
|
2007-06-05 02:37:13 +00:00
|
|
|
}
|
2006-12-06 15:26:06 +00:00
|
|
|
|
2010-03-21 00:37:33 +00:00
|
|
|
xmp.ancestor = names[1];
|
2010-03-21 00:35:18 +00:00
|
|
|
xmp.file1 = names[0];
|
|
|
|
xmp.file2 = names[2];
|
|
|
|
ret = xdl_merge(mmfs + 1, mmfs + 0, mmfs + 2, &xmp, &result);
|
2006-12-06 15:26:06 +00:00
|
|
|
|
|
|
|
for (i = 0; i < 3; i++)
|
|
|
|
free(mmfs[i].ptr);
|
|
|
|
|
|
|
|
if (ret >= 0) {
|
2008-10-02 12:59:20 +00:00
|
|
|
const char *filename = argv[0];
|
2006-12-06 15:45:42 +00:00
|
|
|
FILE *f = to_stdout ? stdout : fopen(filename, "wb");
|
2006-12-06 15:26:06 +00:00
|
|
|
|
|
|
|
if (!f)
|
|
|
|
ret = error("Could not open %s for writing", filename);
|
2008-03-13 15:19:35 +00:00
|
|
|
else if (result.size &&
|
|
|
|
fwrite(result.ptr, result.size, 1, f) != 1)
|
2006-12-06 15:26:06 +00:00
|
|
|
ret = error("Could not write to %s", filename);
|
|
|
|
else if (fclose(f))
|
|
|
|
ret = error("Could not close %s", filename);
|
|
|
|
free(result.ptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|