Make the MSVC projects use PDB/IDB files named after the project
[git/dscho.git] / builtin-merge-file.c
blobafd2ea7a732460c431328dbd4c0141a49d638244
1 #include "builtin.h"
2 #include "cache.h"
3 #include "xdiff/xdiff.h"
4 #include "xdiff-interface.h"
5 #include "parse-options.h"
7 static const char *const merge_file_usage[] = {
8 "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file file2",
9 NULL
12 static int label_cb(const struct option *opt, const char *arg, int unset)
14 static int label_count = 0;
15 const char **names = (const char **)opt->value;
17 if (label_count >= 3)
18 return error("too many labels on the command line");
19 names[label_count++] = arg;
20 return 0;
23 int cmd_merge_file(int argc, const char **argv, const char *prefix)
25 const char *names[3] = { NULL, NULL, NULL };
26 mmfile_t mmfs[3];
27 mmbuffer_t result = {NULL, 0};
28 xpparam_t xpp = {XDF_NEED_MINIMAL};
29 int ret = 0, i = 0, to_stdout = 0;
30 int merge_level = XDL_MERGE_ZEALOUS_ALNUM;
31 int merge_style = 0, quiet = 0;
32 int nongit;
34 struct option options[] = {
35 OPT_BOOLEAN('p', "stdout", &to_stdout, "send results to standard output"),
36 OPT_SET_INT(0, "diff3", &merge_style, "use a diff3 based merge", XDL_MERGE_DIFF3),
37 OPT__QUIET(&quiet),
38 OPT_CALLBACK('L', NULL, names, "name",
39 "set labels for file1/orig_file/file2", &label_cb),
40 OPT_END(),
43 prefix = setup_git_directory_gently(&nongit);
44 if (!nongit) {
45 /* Read the configuration file */
46 git_config(git_xmerge_config, NULL);
47 if (0 <= git_xmerge_style)
48 merge_style = git_xmerge_style;
51 argc = parse_options(argc, argv, prefix, options, merge_file_usage, 0);
52 if (argc != 3)
53 usage_with_options(merge_file_usage, options);
54 if (quiet) {
55 if (!freopen("/dev/null", "w", stderr))
56 return error("failed to redirect stderr to /dev/null: "
57 "%s\n", strerror(errno));
60 for (i = 0; i < 3; i++) {
61 if (!names[i])
62 names[i] = argv[i];
63 if (read_mmfile(mmfs + i, argv[i]))
64 return -1;
65 if (buffer_is_binary(mmfs[i].ptr, mmfs[i].size))
66 return error("Cannot merge binary files: %s\n",
67 argv[i]);
70 ret = xdl_merge(mmfs + 1, mmfs + 0, names[0], mmfs + 2, names[2],
71 &xpp, merge_level | merge_style, &result);
73 for (i = 0; i < 3; i++)
74 free(mmfs[i].ptr);
76 if (ret >= 0) {
77 const char *filename = argv[0];
78 FILE *f = to_stdout ? stdout : fopen(filename, "wb");
80 if (!f)
81 ret = error("Could not open %s for writing", filename);
82 else if (result.size &&
83 fwrite(result.ptr, result.size, 1, f) != 1)
84 ret = error("Could not write to %s", filename);
85 else if (fclose(f))
86 ret = error("Could not close %s", filename);
87 free(result.ptr);
90 return ret;