]>
Commit | Line | Data |
---|---|---|
baffc0e7 | 1 | #include "builtin.h" |
ba1f5f35 | 2 | #include "cache.h" |
b2141fc1 | 3 | #include "config.h" |
ba1f5f35 | 4 | #include "xdiff/xdiff.h" |
7cab5883 | 5 | #include "xdiff-interface.h" |
d2496107 | 6 | #include "parse-options.h" |
ba1f5f35 | 7 | |
d2496107 | 8 | static const char *const merge_file_usage[] = { |
9c9b4f2f | 9 | N_("git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> <orig-file> <file2>"), |
d2496107 PH |
10 | NULL |
11 | }; | |
12 | ||
13 | static int label_cb(const struct option *opt, const char *arg, int unset) | |
14 | { | |
15 | static int label_count = 0; | |
16 | const char **names = (const char **)opt->value; | |
17 | ||
517fe807 JK |
18 | BUG_ON_OPT_NEG(unset); |
19 | ||
d2496107 PH |
20 | if (label_count >= 3) |
21 | return error("too many labels on the command line"); | |
22 | names[label_count++] = arg; | |
23 | return 0; | |
24 | } | |
ba1f5f35 | 25 | |
baffc0e7 | 26 | int cmd_merge_file(int argc, const char **argv, const char *prefix) |
ba1f5f35 | 27 | { |
d2496107 | 28 | const char *names[3] = { NULL, NULL, NULL }; |
ba1f5f35 JS |
29 | mmfile_t mmfs[3]; |
30 | mmbuffer_t result = {NULL, 0}; | |
582aa00b | 31 | xmparam_t xmp = {{0}}; |
fbe0b24c | 32 | int ret = 0, i = 0, to_stdout = 0; |
560119b9 | 33 | int quiet = 0; |
d2496107 | 34 | struct option options[] = { |
d5d09d47 | 35 | OPT_BOOL('p', "stdout", &to_stdout, N_("send results to standard output")), |
c7d93da3 NTND |
36 | OPT_SET_INT(0, "diff3", &xmp.style, N_("use a diff3 based merge"), XDL_MERGE_DIFF3), |
37 | OPT_SET_INT(0, "ours", &xmp.favor, N_("for conflicts, use our version"), | |
73eb40ee | 38 | XDL_MERGE_FAVOR_OURS), |
c7d93da3 | 39 | OPT_SET_INT(0, "theirs", &xmp.favor, N_("for conflicts, use their version"), |
73eb40ee | 40 | XDL_MERGE_FAVOR_THEIRS), |
c7d93da3 | 41 | OPT_SET_INT(0, "union", &xmp.favor, N_("for conflicts, use a union version"), |
3a15048d | 42 | XDL_MERGE_FAVOR_UNION), |
11f3aa23 | 43 | OPT_INTEGER(0, "marker-size", &xmp.marker_size, |
c7d93da3 NTND |
44 | N_("for conflicts, use this marker size")), |
45 | OPT__QUIET(&quiet, N_("do not warn about conflicts")), | |
46 | OPT_CALLBACK('L', NULL, names, N_("name"), | |
9c9b4f2f | 47 | N_("set labels for file1/orig-file/file2"), &label_cb), |
d2496107 PH |
48 | OPT_END(), |
49 | }; | |
50 | ||
560119b9 BW |
51 | xmp.level = XDL_MERGE_ZEALOUS_ALNUM; |
52 | xmp.style = 0; | |
53 | xmp.favor = 0; | |
54 | ||
3668d423 | 55 | if (startup_info->have_repository) { |
b5412484 JH |
56 | /* Read the configuration file */ |
57 | git_config(git_xmerge_config, NULL); | |
58 | if (0 <= git_xmerge_style) | |
560119b9 | 59 | xmp.style = git_xmerge_style; |
b5412484 | 60 | } |
ba1f5f35 | 61 | |
37782920 | 62 | argc = parse_options(argc, argv, prefix, options, merge_file_usage, 0); |
d2496107 PH |
63 | if (argc != 3) |
64 | usage_with_options(merge_file_usage, options); | |
4deba8b7 RS |
65 | if (quiet) { |
66 | if (!freopen("/dev/null", "w", stderr)) | |
62f94d54 | 67 | return error_errno("failed to redirect stderr to /dev/null"); |
4deba8b7 | 68 | } |
ba1f5f35 | 69 | |
5771907a | 70 | for (i = 0; i < 3; i++) { |
e4da43b1 JK |
71 | char *fname; |
72 | int ret; | |
73 | ||
d2496107 PH |
74 | if (!names[i]) |
75 | names[i] = argv[i]; | |
e4da43b1 JK |
76 | |
77 | fname = prefix_filename(prefix, argv[i]); | |
78 | ret = read_mmfile(mmfs + i, fname); | |
79 | free(fname); | |
80 | if (ret) | |
ba1f5f35 | 81 | return -1; |
e4da43b1 | 82 | |
83c4d380 JK |
83 | if (mmfs[i].size > MAX_XDIFF_SIZE || |
84 | buffer_is_binary(mmfs[i].ptr, mmfs[i].size)) | |
82247e9b | 85 | return error("Cannot merge binary files: %s", |
d2496107 | 86 | argv[i]); |
5771907a | 87 | } |
ba1f5f35 | 88 | |
4bb09362 | 89 | xmp.ancestor = names[1]; |
a4b5e91c JN |
90 | xmp.file1 = names[0]; |
91 | xmp.file2 = names[2]; | |
92 | ret = xdl_merge(mmfs + 1, mmfs + 0, mmfs + 2, &xmp, &result); | |
ba1f5f35 JS |
93 | |
94 | for (i = 0; i < 3; i++) | |
95 | free(mmfs[i].ptr); | |
96 | ||
97 | if (ret >= 0) { | |
d2496107 | 98 | const char *filename = argv[0]; |
e4da43b1 | 99 | char *fpath = prefix_filename(prefix, argv[0]); |
204a8ffe | 100 | FILE *f = to_stdout ? stdout : fopen(fpath, "wb"); |
ba1f5f35 JS |
101 | |
102 | if (!f) | |
62f94d54 NTND |
103 | ret = error_errno("Could not open %s for writing", |
104 | filename); | |
381b851c JS |
105 | else if (result.size && |
106 | fwrite(result.ptr, result.size, 1, f) != 1) | |
62f94d54 | 107 | ret = error_errno("Could not write to %s", filename); |
ba1f5f35 | 108 | else if (fclose(f)) |
62f94d54 | 109 | ret = error_errno("Could not close %s", filename); |
ba1f5f35 | 110 | free(result.ptr); |
e4da43b1 | 111 | free(fpath); |
ba1f5f35 JS |
112 | } |
113 | ||
e34f8027 JK |
114 | if (ret > 127) |
115 | ret = 127; | |
116 | ||
ba1f5f35 JS |
117 | return ret; |
118 | } |