]>
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 | { |
480a0e30 ÆAB |
28 | const char *names[3] = { 0 }; |
29 | mmfile_t mmfs[3] = { 0 }; | |
30 | mmbuffer_t result = { 0 }; | |
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 | 36 | OPT_SET_INT(0, "diff3", &xmp.style, N_("use a diff3 based merge"), XDL_MERGE_DIFF3), |
4496526f PW |
37 | OPT_SET_INT(0, "zdiff3", &xmp.style, N_("use a zealous diff3 based merge"), |
38 | XDL_MERGE_ZEALOUS_DIFF3), | |
c7d93da3 | 39 | OPT_SET_INT(0, "ours", &xmp.favor, N_("for conflicts, use our version"), |
73eb40ee | 40 | XDL_MERGE_FAVOR_OURS), |
c7d93da3 | 41 | OPT_SET_INT(0, "theirs", &xmp.favor, N_("for conflicts, use their version"), |
73eb40ee | 42 | XDL_MERGE_FAVOR_THEIRS), |
c7d93da3 | 43 | OPT_SET_INT(0, "union", &xmp.favor, N_("for conflicts, use a union version"), |
3a15048d | 44 | XDL_MERGE_FAVOR_UNION), |
11f3aa23 | 45 | OPT_INTEGER(0, "marker-size", &xmp.marker_size, |
c7d93da3 NTND |
46 | N_("for conflicts, use this marker size")), |
47 | OPT__QUIET(&quiet, N_("do not warn about conflicts")), | |
48 | OPT_CALLBACK('L', NULL, names, N_("name"), | |
9c9b4f2f | 49 | N_("set labels for file1/orig-file/file2"), &label_cb), |
d2496107 PH |
50 | OPT_END(), |
51 | }; | |
52 | ||
560119b9 BW |
53 | xmp.level = XDL_MERGE_ZEALOUS_ALNUM; |
54 | xmp.style = 0; | |
55 | xmp.favor = 0; | |
56 | ||
3668d423 | 57 | if (startup_info->have_repository) { |
b5412484 JH |
58 | /* Read the configuration file */ |
59 | git_config(git_xmerge_config, NULL); | |
60 | if (0 <= git_xmerge_style) | |
560119b9 | 61 | xmp.style = git_xmerge_style; |
b5412484 | 62 | } |
ba1f5f35 | 63 | |
37782920 | 64 | argc = parse_options(argc, argv, prefix, options, merge_file_usage, 0); |
d2496107 PH |
65 | if (argc != 3) |
66 | usage_with_options(merge_file_usage, options); | |
4deba8b7 RS |
67 | if (quiet) { |
68 | if (!freopen("/dev/null", "w", stderr)) | |
62f94d54 | 69 | return error_errno("failed to redirect stderr to /dev/null"); |
4deba8b7 | 70 | } |
ba1f5f35 | 71 | |
5771907a | 72 | for (i = 0; i < 3; i++) { |
e4da43b1 | 73 | char *fname; |
480a0e30 | 74 | mmfile_t *mmf = mmfs + i; |
e4da43b1 | 75 | |
d2496107 PH |
76 | if (!names[i]) |
77 | names[i] = argv[i]; | |
e4da43b1 JK |
78 | |
79 | fname = prefix_filename(prefix, argv[i]); | |
480a0e30 ÆAB |
80 | |
81 | if (read_mmfile(mmf, fname)) | |
82 | ret = -1; | |
83 | else if (mmf->size > MAX_XDIFF_SIZE || | |
84 | buffer_is_binary(mmf->ptr, mmf->size)) | |
85 | ret = error("Cannot merge binary files: %s", | |
86 | argv[i]); | |
87 | ||
e4da43b1 JK |
88 | free(fname); |
89 | if (ret) | |
e72e12cc ÆAB |
90 | goto cleanup; |
91 | ||
5771907a | 92 | } |
ba1f5f35 | 93 | |
4bb09362 | 94 | xmp.ancestor = names[1]; |
a4b5e91c JN |
95 | xmp.file1 = names[0]; |
96 | xmp.file2 = names[2]; | |
97 | ret = xdl_merge(mmfs + 1, mmfs + 0, mmfs + 2, &xmp, &result); | |
ba1f5f35 | 98 | |
ba1f5f35 | 99 | if (ret >= 0) { |
d2496107 | 100 | const char *filename = argv[0]; |
e4da43b1 | 101 | char *fpath = prefix_filename(prefix, argv[0]); |
204a8ffe | 102 | FILE *f = to_stdout ? stdout : fopen(fpath, "wb"); |
ba1f5f35 JS |
103 | |
104 | if (!f) | |
62f94d54 NTND |
105 | ret = error_errno("Could not open %s for writing", |
106 | filename); | |
381b851c JS |
107 | else if (result.size && |
108 | fwrite(result.ptr, result.size, 1, f) != 1) | |
62f94d54 | 109 | ret = error_errno("Could not write to %s", filename); |
ba1f5f35 | 110 | else if (fclose(f)) |
62f94d54 | 111 | ret = error_errno("Could not close %s", filename); |
ba1f5f35 | 112 | free(result.ptr); |
e4da43b1 | 113 | free(fpath); |
ba1f5f35 JS |
114 | } |
115 | ||
e34f8027 JK |
116 | if (ret > 127) |
117 | ret = 127; | |
118 | ||
e72e12cc ÆAB |
119 | cleanup: |
120 | for (i = 0; i < 3; i++) | |
121 | free(mmfs[i].ptr); | |
122 | ||
ba1f5f35 JS |
123 | return ret; |
124 | } |