blob: 832c93d8d54cc50b8581102be4db7c92d80e738a [file] [log] [blame]
Peter Hagervallbaffc0e2007-07-15 01:14:45 +02001#include "builtin.h"
Elijah Newren0b027f62023-03-21 06:25:58 +00002#include "abspath.h"
brian m. carlsone1068f02023-11-01 19:24:19 +00003#include "hex.h"
4#include "object-name.h"
5#include "object-store.h"
Brandon Williamsb2141fc2017-06-14 11:07:36 -07006#include "config.h"
Elijah Newrenf394e092023-03-21 06:25:54 +00007#include "gettext.h"
Elijah Newrene38da482023-03-21 06:26:05 +00008#include "setup.h"
Johannes Schindelinba1f5f32006-12-06 16:26:06 +01009#include "xdiff/xdiff.h"
Johannes Schindelin7cab5882006-12-20 17:37:07 +010010#include "xdiff-interface.h"
Pierre Habouzitd2496102008-10-02 14:59:20 +020011#include "parse-options.h"
Johannes Schindelinba1f5f32006-12-06 16:26:06 +010012
Pierre Habouzitd2496102008-10-02 14:59:20 +020013static const char *const merge_file_usage[] = {
Alex Henrie9c9b4f22015-01-13 00:44:47 -070014 N_("git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> <orig-file> <file2>"),
Pierre Habouzitd2496102008-10-02 14:59:20 +020015 NULL
16};
17
18static int label_cb(const struct option *opt, const char *arg, int unset)
19{
20 static int label_count = 0;
21 const char **names = (const char **)opt->value;
22
Jeff King517fe802018-11-05 01:45:42 -050023 BUG_ON_OPT_NEG(unset);
24
Pierre Habouzitd2496102008-10-02 14:59:20 +020025 if (label_count >= 3)
26 return error("too many labels on the command line");
27 names[label_count++] = arg;
28 return 0;
29}
Johannes Schindelinba1f5f32006-12-06 16:26:06 +010030
Peter Hagervallbaffc0e2007-07-15 01:14:45 +020031int cmd_merge_file(int argc, const char **argv, const char *prefix)
Johannes Schindelinba1f5f32006-12-06 16:26:06 +010032{
Ævar Arnfjörð Bjarmason480a0e32022-07-01 12:42:55 +020033 const char *names[3] = { 0 };
34 mmfile_t mmfs[3] = { 0 };
35 mmbuffer_t result = { 0 };
36 xmparam_t xmp = { 0 };
brian m. carlsone1068f02023-11-01 19:24:19 +000037 int ret = 0, i = 0, to_stdout = 0, object_id = 0;
Bert Wesarg560119b2010-03-01 22:46:26 +010038 int quiet = 0;
Pierre Habouzitd2496102008-10-02 14:59:20 +020039 struct option options[] = {
Stefan Bellerd5d09d42013-08-03 13:51:19 +020040 OPT_BOOL('p', "stdout", &to_stdout, N_("send results to standard output")),
brian m. carlsone1068f02023-11-01 19:24:19 +000041 OPT_BOOL(0, "object-id", &object_id, N_("use object IDs instead of filenames")),
Nguyễn Thái Ngọc Duyc7d93da2012-08-20 19:32:23 +070042 OPT_SET_INT(0, "diff3", &xmp.style, N_("use a diff3 based merge"), XDL_MERGE_DIFF3),
Phillip Wood44965262021-12-01 00:05:06 +000043 OPT_SET_INT(0, "zdiff3", &xmp.style, N_("use a zealous diff3 based merge"),
44 XDL_MERGE_ZEALOUS_DIFF3),
Nguyễn Thái Ngọc Duyc7d93da2012-08-20 19:32:23 +070045 OPT_SET_INT(0, "ours", &xmp.favor, N_("for conflicts, use our version"),
Junio C Hamano73eb40e2008-06-20 00:17:27 -070046 XDL_MERGE_FAVOR_OURS),
Nguyễn Thái Ngọc Duyc7d93da2012-08-20 19:32:23 +070047 OPT_SET_INT(0, "theirs", &xmp.favor, N_("for conflicts, use their version"),
Junio C Hamano73eb40e2008-06-20 00:17:27 -070048 XDL_MERGE_FAVOR_THEIRS),
Nguyễn Thái Ngọc Duyc7d93da2012-08-20 19:32:23 +070049 OPT_SET_INT(0, "union", &xmp.favor, N_("for conflicts, use a union version"),
Bert Wesarg3a150482010-03-01 22:46:28 +010050 XDL_MERGE_FAVOR_UNION),
Bert Wesarg11f3aa22010-03-01 22:46:27 +010051 OPT_INTEGER(0, "marker-size", &xmp.marker_size,
Nguyễn Thái Ngọc Duyc7d93da2012-08-20 19:32:23 +070052 N_("for conflicts, use this marker size")),
53 OPT__QUIET(&quiet, N_("do not warn about conflicts")),
54 OPT_CALLBACK('L', NULL, names, N_("name"),
Alex Henrie9c9b4f22015-01-13 00:44:47 -070055 N_("set labels for file1/orig-file/file2"), &label_cb),
Pierre Habouzitd2496102008-10-02 14:59:20 +020056 OPT_END(),
57 };
58
Bert Wesarg560119b2010-03-01 22:46:26 +010059 xmp.level = XDL_MERGE_ZEALOUS_ALNUM;
60 xmp.style = 0;
61 xmp.favor = 0;
62
Nguyễn Thái Ngọc Duy3668d422010-08-05 22:27:43 -050063 if (startup_info->have_repository) {
Junio C Hamanob5412482008-08-29 10:49:56 -070064 /* Read the configuration file */
65 git_config(git_xmerge_config, NULL);
66 if (0 <= git_xmerge_style)
Bert Wesarg560119b2010-03-01 22:46:26 +010067 xmp.style = git_xmerge_style;
Junio C Hamanob5412482008-08-29 10:49:56 -070068 }
Johannes Schindelinba1f5f32006-12-06 16:26:06 +010069
Stephen Boyd37782922009-05-23 11:53:12 -070070 argc = parse_options(argc, argv, prefix, options, merge_file_usage, 0);
Pierre Habouzitd2496102008-10-02 14:59:20 +020071 if (argc != 3)
72 usage_with_options(merge_file_usage, options);
René Scharfe4deba8b2008-12-26 11:17:04 +010073 if (quiet) {
74 if (!freopen("/dev/null", "w", stderr))
Nguyễn Thái Ngọc Duy62f94d52016-05-08 16:47:29 +070075 return error_errno("failed to redirect stderr to /dev/null");
René Scharfe4deba8b2008-12-26 11:17:04 +010076 }
Johannes Schindelinba1f5f32006-12-06 16:26:06 +010077
brian m. carlsone1068f02023-11-01 19:24:19 +000078 if (object_id)
79 setup_git_directory();
80
Johannes Schindelin57719072007-06-05 03:37:13 +010081 for (i = 0; i < 3; i++) {
Jeff Kinge4da43b2017-03-20 21:28:49 -040082 char *fname;
brian m. carlsone1068f02023-11-01 19:24:19 +000083 struct object_id oid;
Ævar Arnfjörð Bjarmason480a0e32022-07-01 12:42:55 +020084 mmfile_t *mmf = mmfs + i;
Jeff Kinge4da43b2017-03-20 21:28:49 -040085
Pierre Habouzitd2496102008-10-02 14:59:20 +020086 if (!names[i])
87 names[i] = argv[i];
Jeff Kinge4da43b2017-03-20 21:28:49 -040088
89 fname = prefix_filename(prefix, argv[i]);
Ævar Arnfjörð Bjarmason480a0e32022-07-01 12:42:55 +020090
brian m. carlsone1068f02023-11-01 19:24:19 +000091 if (object_id) {
92 if (repo_get_oid(the_repository, argv[i], &oid))
93 ret = error(_("object '%s' does not exist"),
94 argv[i]);
95 else if (!oideq(&oid, the_hash_algo->empty_blob))
96 read_mmblob(mmf, &oid);
97 else
98 read_mmfile(mmf, "/dev/null");
99 } else if (read_mmfile(mmf, fname)) {
Ævar Arnfjörð Bjarmason480a0e32022-07-01 12:42:55 +0200100 ret = -1;
brian m. carlsone1068f02023-11-01 19:24:19 +0000101 }
102 if (ret != -1 && (mmf->size > MAX_XDIFF_SIZE ||
103 buffer_is_binary(mmf->ptr, mmf->size))) {
Ævar Arnfjörð Bjarmason480a0e32022-07-01 12:42:55 +0200104 ret = error("Cannot merge binary files: %s",
105 argv[i]);
brian m. carlsone1068f02023-11-01 19:24:19 +0000106 }
Ævar Arnfjörð Bjarmason480a0e32022-07-01 12:42:55 +0200107
Jeff Kinge4da43b2017-03-20 21:28:49 -0400108 free(fname);
109 if (ret)
Ævar Arnfjörð Bjarmasone72e12c2022-07-01 12:42:56 +0200110 goto cleanup;
111
Johannes Schindelin57719072007-06-05 03:37:13 +0100112 }
Johannes Schindelinba1f5f32006-12-06 16:26:06 +0100113
Jonathan Nieder4bb09362010-03-20 19:37:33 -0500114 xmp.ancestor = names[1];
Jonathan Niedera4b5e912010-03-20 19:35:18 -0500115 xmp.file1 = names[0];
116 xmp.file2 = names[2];
117 ret = xdl_merge(mmfs + 1, mmfs + 0, mmfs + 2, &xmp, &result);
Johannes Schindelinba1f5f32006-12-06 16:26:06 +0100118
Johannes Schindelinba1f5f32006-12-06 16:26:06 +0100119 if (ret >= 0) {
brian m. carlsone1068f02023-11-01 19:24:19 +0000120 if (object_id && !to_stdout) {
121 struct object_id oid;
122 if (result.size) {
123 if (write_object_file(result.ptr, result.size, OBJ_BLOB, &oid) < 0)
124 ret = error(_("Could not write object file"));
125 } else {
126 oidcpy(&oid, the_hash_algo->empty_blob);
127 }
128 if (ret >= 0)
129 printf("%s\n", oid_to_hex(&oid));
130 } else {
131 const char *filename = argv[0];
132 char *fpath = prefix_filename(prefix, argv[0]);
133 FILE *f = to_stdout ? stdout : fopen(fpath, "wb");
Johannes Schindelinba1f5f32006-12-06 16:26:06 +0100134
brian m. carlsone1068f02023-11-01 19:24:19 +0000135 if (!f)
136 ret = error_errno("Could not open %s for writing",
137 filename);
138 else if (result.size &&
139 fwrite(result.ptr, result.size, 1, f) != 1)
140 ret = error_errno("Could not write to %s", filename);
141 else if (fclose(f))
142 ret = error_errno("Could not close %s", filename);
143 free(fpath);
144 }
Johannes Schindelinba1f5f32006-12-06 16:26:06 +0100145 free(result.ptr);
146 }
147
Jeff Kinge34f8022015-10-28 18:44:21 -0400148 if (ret > 127)
149 ret = 127;
150
Ævar Arnfjörð Bjarmasone72e12c2022-07-01 12:42:56 +0200151cleanup:
152 for (i = 0; i < 3; i++)
153 free(mmfs[i].ptr);
154
Johannes Schindelinba1f5f32006-12-06 16:26:06 +0100155 return ret;
156}