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