]>
Commit | Line | Data |
---|---|---|
baffc0e7 | 1 | #include "builtin.h" |
ba1f5f35 JS |
2 | #include "cache.h" |
3 | #include "xdiff/xdiff.h" | |
7cab5883 | 4 | #include "xdiff-interface.h" |
d2496107 | 5 | #include "parse-options.h" |
ba1f5f35 | 6 | |
d2496107 PH |
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 | |
10 | }; | |
11 | ||
12 | static int label_cb(const struct option *opt, const char *arg, int unset) | |
13 | { | |
14 | static int label_count = 0; | |
15 | const char **names = (const char **)opt->value; | |
16 | ||
17 | if (label_count >= 3) | |
18 | return error("too many labels on the command line"); | |
19 | names[label_count++] = arg; | |
20 | return 0; | |
21 | } | |
ba1f5f35 | 22 | |
baffc0e7 | 23 | int cmd_merge_file(int argc, const char **argv, const char *prefix) |
ba1f5f35 | 24 | { |
d2496107 | 25 | const char *names[3] = { NULL, NULL, NULL }; |
ba1f5f35 JS |
26 | mmfile_t mmfs[3]; |
27 | mmbuffer_t result = {NULL, 0}; | |
00f8f97d | 28 | xmparam_t xmp = {{XDF_NEED_MINIMAL}}; |
fbe0b24c | 29 | int ret = 0, i = 0, to_stdout = 0; |
560119b9 | 30 | int quiet = 0; |
b5412484 | 31 | int nongit; |
d2496107 PH |
32 | struct option options[] = { |
33 | OPT_BOOLEAN('p', "stdout", &to_stdout, "send results to standard output"), | |
560119b9 BW |
34 | OPT_SET_INT(0, "diff3", &xmp.style, "use a diff3 based merge", XDL_MERGE_DIFF3), |
35 | OPT_SET_INT(0, "ours", &xmp.favor, "for conflicts, use our version", | |
73eb40ee | 36 | XDL_MERGE_FAVOR_OURS), |
560119b9 | 37 | OPT_SET_INT(0, "theirs", &xmp.favor, "for conflicts, use their version", |
73eb40ee | 38 | XDL_MERGE_FAVOR_THEIRS), |
11f3aa23 BW |
39 | OPT_INTEGER(0, "marker-size", &xmp.marker_size, |
40 | "for conflicts, use this marker size"), | |
d2496107 PH |
41 | OPT__QUIET(&quiet), |
42 | OPT_CALLBACK('L', NULL, names, "name", | |
43 | "set labels for file1/orig_file/file2", &label_cb), | |
44 | OPT_END(), | |
45 | }; | |
46 | ||
560119b9 BW |
47 | xmp.level = XDL_MERGE_ZEALOUS_ALNUM; |
48 | xmp.style = 0; | |
49 | xmp.favor = 0; | |
50 | ||
b5412484 JH |
51 | prefix = setup_git_directory_gently(&nongit); |
52 | if (!nongit) { | |
53 | /* Read the configuration file */ | |
54 | git_config(git_xmerge_config, NULL); | |
55 | if (0 <= git_xmerge_style) | |
560119b9 | 56 | xmp.style = git_xmerge_style; |
b5412484 | 57 | } |
ba1f5f35 | 58 | |
37782920 | 59 | argc = parse_options(argc, argv, prefix, options, merge_file_usage, 0); |
d2496107 PH |
60 | if (argc != 3) |
61 | usage_with_options(merge_file_usage, options); | |
4deba8b7 RS |
62 | if (quiet) { |
63 | if (!freopen("/dev/null", "w", stderr)) | |
64 | return error("failed to redirect stderr to /dev/null: " | |
65 | "%s\n", strerror(errno)); | |
66 | } | |
ba1f5f35 | 67 | |
5771907a | 68 | for (i = 0; i < 3; i++) { |
d2496107 PH |
69 | if (!names[i]) |
70 | names[i] = argv[i]; | |
71 | if (read_mmfile(mmfs + i, argv[i])) | |
ba1f5f35 | 72 | return -1; |
5771907a JS |
73 | if (buffer_is_binary(mmfs[i].ptr, mmfs[i].size)) |
74 | return error("Cannot merge binary files: %s\n", | |
d2496107 | 75 | argv[i]); |
5771907a | 76 | } |
ba1f5f35 JS |
77 | |
78 | ret = xdl_merge(mmfs + 1, mmfs + 0, names[0], mmfs + 2, names[2], | |
560119b9 | 79 | &xmp, &result); |
ba1f5f35 JS |
80 | |
81 | for (i = 0; i < 3; i++) | |
82 | free(mmfs[i].ptr); | |
83 | ||
84 | if (ret >= 0) { | |
d2496107 | 85 | const char *filename = argv[0]; |
fbe0b24c | 86 | FILE *f = to_stdout ? stdout : fopen(filename, "wb"); |
ba1f5f35 JS |
87 | |
88 | if (!f) | |
89 | ret = error("Could not open %s for writing", filename); | |
381b851c JS |
90 | else if (result.size && |
91 | fwrite(result.ptr, result.size, 1, f) != 1) | |
ba1f5f35 JS |
92 | ret = error("Could not write to %s", filename); |
93 | else if (fclose(f)) | |
94 | ret = error("Could not close %s", filename); | |
95 | free(result.ptr); | |
96 | } | |
97 | ||
98 | return ret; | |
99 | } |