]>
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 | 7 | static const char *const merge_file_usage[] = { |
c7d93da3 | 8 | N_("git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"), |
d2496107 PH |
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}; | |
582aa00b | 28 | xmparam_t xmp = {{0}}; |
fbe0b24c | 29 | int ret = 0, i = 0, to_stdout = 0; |
560119b9 | 30 | int quiet = 0; |
55846b9a | 31 | int prefixlen = 0; |
d2496107 | 32 | struct option options[] = { |
d5d09d47 | 33 | OPT_BOOL('p', "stdout", &to_stdout, N_("send results to standard output")), |
c7d93da3 NTND |
34 | OPT_SET_INT(0, "diff3", &xmp.style, N_("use a diff3 based merge"), XDL_MERGE_DIFF3), |
35 | OPT_SET_INT(0, "ours", &xmp.favor, N_("for conflicts, use our version"), | |
73eb40ee | 36 | XDL_MERGE_FAVOR_OURS), |
c7d93da3 | 37 | OPT_SET_INT(0, "theirs", &xmp.favor, N_("for conflicts, use their version"), |
73eb40ee | 38 | XDL_MERGE_FAVOR_THEIRS), |
c7d93da3 | 39 | OPT_SET_INT(0, "union", &xmp.favor, N_("for conflicts, use a union version"), |
3a15048d | 40 | XDL_MERGE_FAVOR_UNION), |
11f3aa23 | 41 | OPT_INTEGER(0, "marker-size", &xmp.marker_size, |
c7d93da3 NTND |
42 | N_("for conflicts, use this marker size")), |
43 | OPT__QUIET(&quiet, N_("do not warn about conflicts")), | |
44 | OPT_CALLBACK('L', NULL, names, N_("name"), | |
45 | N_("set labels for file1/orig_file/file2"), &label_cb), | |
d2496107 PH |
46 | OPT_END(), |
47 | }; | |
48 | ||
560119b9 BW |
49 | xmp.level = XDL_MERGE_ZEALOUS_ALNUM; |
50 | xmp.style = 0; | |
51 | xmp.favor = 0; | |
52 | ||
3668d423 | 53 | if (startup_info->have_repository) { |
b5412484 JH |
54 | /* Read the configuration file */ |
55 | git_config(git_xmerge_config, NULL); | |
56 | if (0 <= git_xmerge_style) | |
560119b9 | 57 | xmp.style = git_xmerge_style; |
b5412484 | 58 | } |
ba1f5f35 | 59 | |
37782920 | 60 | argc = parse_options(argc, argv, prefix, options, merge_file_usage, 0); |
d2496107 PH |
61 | if (argc != 3) |
62 | usage_with_options(merge_file_usage, options); | |
4deba8b7 RS |
63 | if (quiet) { |
64 | if (!freopen("/dev/null", "w", stderr)) | |
65 | return error("failed to redirect stderr to /dev/null: " | |
82247e9b | 66 | "%s", strerror(errno)); |
4deba8b7 | 67 | } |
ba1f5f35 | 68 | |
55846b9a TR |
69 | if (prefix) |
70 | prefixlen = strlen(prefix); | |
71 | ||
5771907a | 72 | for (i = 0; i < 3; i++) { |
55846b9a | 73 | const char *fname = prefix_filename(prefix, prefixlen, argv[i]); |
d2496107 PH |
74 | if (!names[i]) |
75 | names[i] = argv[i]; | |
55846b9a | 76 | if (read_mmfile(mmfs + i, fname)) |
ba1f5f35 | 77 | return -1; |
5771907a | 78 | if (buffer_is_binary(mmfs[i].ptr, mmfs[i].size)) |
82247e9b | 79 | return error("Cannot merge binary files: %s", |
d2496107 | 80 | argv[i]); |
5771907a | 81 | } |
ba1f5f35 | 82 | |
4bb09362 | 83 | xmp.ancestor = names[1]; |
a4b5e91c JN |
84 | xmp.file1 = names[0]; |
85 | xmp.file2 = names[2]; | |
86 | ret = xdl_merge(mmfs + 1, mmfs + 0, mmfs + 2, &xmp, &result); | |
ba1f5f35 JS |
87 | |
88 | for (i = 0; i < 3; i++) | |
89 | free(mmfs[i].ptr); | |
90 | ||
91 | if (ret >= 0) { | |
d2496107 | 92 | const char *filename = argv[0]; |
fbe0b24c | 93 | FILE *f = to_stdout ? stdout : fopen(filename, "wb"); |
ba1f5f35 JS |
94 | |
95 | if (!f) | |
96 | ret = error("Could not open %s for writing", filename); | |
381b851c JS |
97 | else if (result.size && |
98 | fwrite(result.ptr, result.size, 1, f) != 1) | |
ba1f5f35 JS |
99 | ret = error("Could not write to %s", filename); |
100 | else if (fclose(f)) | |
101 | ret = error("Could not close %s", filename); | |
102 | free(result.ptr); | |
103 | } | |
104 | ||
105 | return ret; | |
106 | } |