mirror of
https://github.com/git/git.git
synced 2024-11-05 16:52:59 +01:00
06dbc1ea57
* jc/conflict-marker-size: rerere: honor conflict-marker-size attribute rerere: prepare for customizable conflict marker length conflict-marker-size: new attribute rerere: use ll_merge() instead of using xdl_merge() merge-tree: use ll_merge() not xdl_merge() xdl_merge(): allow passing down marker_size in xmparam_t xdl_merge(): introduce xmparam_t for merge specific parameters git_attr(): fix function signature Conflicts: builtin-merge-file.c ll-merge.c xdiff/xdiff.h xdiff/xmerge.c
96 lines
2.7 KiB
C
96 lines
2.7 KiB
C
#include "builtin.h"
|
|
#include "cache.h"
|
|
#include "xdiff/xdiff.h"
|
|
#include "xdiff-interface.h"
|
|
#include "parse-options.h"
|
|
|
|
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;
|
|
}
|
|
|
|
int cmd_merge_file(int argc, const char **argv, const char *prefix)
|
|
{
|
|
const char *names[3] = { NULL, NULL, NULL };
|
|
mmfile_t mmfs[3];
|
|
mmbuffer_t result = {NULL, 0};
|
|
xmparam_t xmp = {{XDF_NEED_MINIMAL}};
|
|
int ret = 0, i = 0, to_stdout = 0;
|
|
int level = XDL_MERGE_ZEALOUS_ALNUM;
|
|
int style = 0, quiet = 0;
|
|
int favor = 0;
|
|
int nongit;
|
|
|
|
struct option options[] = {
|
|
OPT_BOOLEAN('p', "stdout", &to_stdout, "send results to standard output"),
|
|
OPT_SET_INT(0, "diff3", &style, "use a diff3 based merge", XDL_MERGE_DIFF3),
|
|
OPT_SET_INT(0, "ours", &favor, "for conflicts, use our version",
|
|
XDL_MERGE_FAVOR_OURS),
|
|
OPT_SET_INT(0, "theirs", &favor, "for conflicts, use their version",
|
|
XDL_MERGE_FAVOR_THEIRS),
|
|
OPT__QUIET(&quiet),
|
|
OPT_CALLBACK('L', NULL, names, "name",
|
|
"set labels for file1/orig_file/file2", &label_cb),
|
|
OPT_END(),
|
|
};
|
|
|
|
prefix = setup_git_directory_gently(&nongit);
|
|
if (!nongit) {
|
|
/* Read the configuration file */
|
|
git_config(git_xmerge_config, NULL);
|
|
if (0 <= git_xmerge_style)
|
|
style = git_xmerge_style;
|
|
}
|
|
|
|
argc = parse_options(argc, argv, prefix, options, merge_file_usage, 0);
|
|
if (argc != 3)
|
|
usage_with_options(merge_file_usage, options);
|
|
if (quiet) {
|
|
if (!freopen("/dev/null", "w", stderr))
|
|
return error("failed to redirect stderr to /dev/null: "
|
|
"%s\n", strerror(errno));
|
|
}
|
|
|
|
for (i = 0; i < 3; i++) {
|
|
if (!names[i])
|
|
names[i] = argv[i];
|
|
if (read_mmfile(mmfs + i, argv[i]))
|
|
return -1;
|
|
if (buffer_is_binary(mmfs[i].ptr, mmfs[i].size))
|
|
return error("Cannot merge binary files: %s\n",
|
|
argv[i]);
|
|
}
|
|
|
|
ret = xdl_merge(mmfs + 1, mmfs + 0, names[0], mmfs + 2, names[2],
|
|
&xmp, XDL_MERGE_FLAGS(level, style, favor), &result);
|
|
|
|
for (i = 0; i < 3; i++)
|
|
free(mmfs[i].ptr);
|
|
|
|
if (ret >= 0) {
|
|
const char *filename = argv[0];
|
|
FILE *f = to_stdout ? stdout : fopen(filename, "wb");
|
|
|
|
if (!f)
|
|
ret = error("Could not open %s for writing", filename);
|
|
else if (result.size &&
|
|
fwrite(result.ptr, result.size, 1, f) != 1)
|
|
ret = error("Could not write to %s", filename);
|
|
else if (fclose(f))
|
|
ret = error("Could not close %s", filename);
|
|
free(result.ptr);
|
|
}
|
|
|
|
return ret;
|
|
}
|