Peter Hagervall | baffc0e | 2007-07-15 01:14:45 +0200 | [diff] [blame] | 1 | #include "builtin.h" |
Elijah Newren | 0b027f6 | 2023-03-21 06:25:58 +0000 | [diff] [blame] | 2 | #include "abspath.h" |
brian m. carlson | e1068f0 | 2023-11-01 19:24:19 +0000 | [diff] [blame] | 3 | #include "hex.h" |
| 4 | #include "object-name.h" |
| 5 | #include "object-store.h" |
Brandon Williams | b2141fc | 2017-06-14 11:07:36 -0700 | [diff] [blame] | 6 | #include "config.h" |
Elijah Newren | f394e09 | 2023-03-21 06:25:54 +0000 | [diff] [blame] | 7 | #include "gettext.h" |
Elijah Newren | e38da48 | 2023-03-21 06:26:05 +0000 | [diff] [blame] | 8 | #include "setup.h" |
Johannes Schindelin | ba1f5f3 | 2006-12-06 16:26:06 +0100 | [diff] [blame] | 9 | #include "xdiff/xdiff.h" |
Johannes Schindelin | 7cab588 | 2006-12-20 17:37:07 +0100 | [diff] [blame] | 10 | #include "xdiff-interface.h" |
Pierre Habouzit | d249610 | 2008-10-02 14:59:20 +0200 | [diff] [blame] | 11 | #include "parse-options.h" |
Johannes Schindelin | ba1f5f3 | 2006-12-06 16:26:06 +0100 | [diff] [blame] | 12 | |
Pierre Habouzit | d249610 | 2008-10-02 14:59:20 +0200 | [diff] [blame] | 13 | static const char *const merge_file_usage[] = { |
Alex Henrie | 9c9b4f2 | 2015-01-13 00:44:47 -0700 | [diff] [blame] | 14 | N_("git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> <orig-file> <file2>"), |
Pierre Habouzit | d249610 | 2008-10-02 14:59:20 +0200 | [diff] [blame] | 15 | NULL |
| 16 | }; |
| 17 | |
| 18 | static 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 King | 517fe80 | 2018-11-05 01:45:42 -0500 | [diff] [blame] | 23 | BUG_ON_OPT_NEG(unset); |
| 24 | |
Pierre Habouzit | d249610 | 2008-10-02 14:59:20 +0200 | [diff] [blame] | 25 | if (label_count >= 3) |
| 26 | return error("too many labels on the command line"); |
| 27 | names[label_count++] = arg; |
| 28 | return 0; |
| 29 | } |
Johannes Schindelin | ba1f5f3 | 2006-12-06 16:26:06 +0100 | [diff] [blame] | 30 | |
Peter Hagervall | baffc0e | 2007-07-15 01:14:45 +0200 | [diff] [blame] | 31 | int cmd_merge_file(int argc, const char **argv, const char *prefix) |
Johannes Schindelin | ba1f5f3 | 2006-12-06 16:26:06 +0100 | [diff] [blame] | 32 | { |
Ævar Arnfjörð Bjarmason | 480a0e3 | 2022-07-01 12:42:55 +0200 | [diff] [blame] | 33 | const char *names[3] = { 0 }; |
| 34 | mmfile_t mmfs[3] = { 0 }; |
| 35 | mmbuffer_t result = { 0 }; |
| 36 | xmparam_t xmp = { 0 }; |
brian m. carlson | e1068f0 | 2023-11-01 19:24:19 +0000 | [diff] [blame] | 37 | int ret = 0, i = 0, to_stdout = 0, object_id = 0; |
Bert Wesarg | 560119b | 2010-03-01 22:46:26 +0100 | [diff] [blame] | 38 | int quiet = 0; |
Pierre Habouzit | d249610 | 2008-10-02 14:59:20 +0200 | [diff] [blame] | 39 | struct option options[] = { |
Stefan Beller | d5d09d4 | 2013-08-03 13:51:19 +0200 | [diff] [blame] | 40 | OPT_BOOL('p', "stdout", &to_stdout, N_("send results to standard output")), |
brian m. carlson | e1068f0 | 2023-11-01 19:24:19 +0000 | [diff] [blame] | 41 | OPT_BOOL(0, "object-id", &object_id, N_("use object IDs instead of filenames")), |
Nguyễn Thái Ngọc Duy | c7d93da | 2012-08-20 19:32:23 +0700 | [diff] [blame] | 42 | OPT_SET_INT(0, "diff3", &xmp.style, N_("use a diff3 based merge"), XDL_MERGE_DIFF3), |
Phillip Wood | 4496526 | 2021-12-01 00:05:06 +0000 | [diff] [blame] | 43 | 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 Duy | c7d93da | 2012-08-20 19:32:23 +0700 | [diff] [blame] | 45 | OPT_SET_INT(0, "ours", &xmp.favor, N_("for conflicts, use our version"), |
Junio C Hamano | 73eb40e | 2008-06-20 00:17:27 -0700 | [diff] [blame] | 46 | XDL_MERGE_FAVOR_OURS), |
Nguyễn Thái Ngọc Duy | c7d93da | 2012-08-20 19:32:23 +0700 | [diff] [blame] | 47 | OPT_SET_INT(0, "theirs", &xmp.favor, N_("for conflicts, use their version"), |
Junio C Hamano | 73eb40e | 2008-06-20 00:17:27 -0700 | [diff] [blame] | 48 | XDL_MERGE_FAVOR_THEIRS), |
Nguyễn Thái Ngọc Duy | c7d93da | 2012-08-20 19:32:23 +0700 | [diff] [blame] | 49 | OPT_SET_INT(0, "union", &xmp.favor, N_("for conflicts, use a union version"), |
Bert Wesarg | 3a15048 | 2010-03-01 22:46:28 +0100 | [diff] [blame] | 50 | XDL_MERGE_FAVOR_UNION), |
Bert Wesarg | 11f3aa2 | 2010-03-01 22:46:27 +0100 | [diff] [blame] | 51 | OPT_INTEGER(0, "marker-size", &xmp.marker_size, |
Nguyễn Thái Ngọc Duy | c7d93da | 2012-08-20 19:32:23 +0700 | [diff] [blame] | 52 | 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 Henrie | 9c9b4f2 | 2015-01-13 00:44:47 -0700 | [diff] [blame] | 55 | N_("set labels for file1/orig-file/file2"), &label_cb), |
Pierre Habouzit | d249610 | 2008-10-02 14:59:20 +0200 | [diff] [blame] | 56 | OPT_END(), |
| 57 | }; |
| 58 | |
Bert Wesarg | 560119b | 2010-03-01 22:46:26 +0100 | [diff] [blame] | 59 | xmp.level = XDL_MERGE_ZEALOUS_ALNUM; |
| 60 | xmp.style = 0; |
| 61 | xmp.favor = 0; |
| 62 | |
Nguyễn Thái Ngọc Duy | 3668d42 | 2010-08-05 22:27:43 -0500 | [diff] [blame] | 63 | if (startup_info->have_repository) { |
Junio C Hamano | b541248 | 2008-08-29 10:49:56 -0700 | [diff] [blame] | 64 | /* Read the configuration file */ |
| 65 | git_config(git_xmerge_config, NULL); |
| 66 | if (0 <= git_xmerge_style) |
Bert Wesarg | 560119b | 2010-03-01 22:46:26 +0100 | [diff] [blame] | 67 | xmp.style = git_xmerge_style; |
Junio C Hamano | b541248 | 2008-08-29 10:49:56 -0700 | [diff] [blame] | 68 | } |
Johannes Schindelin | ba1f5f3 | 2006-12-06 16:26:06 +0100 | [diff] [blame] | 69 | |
Stephen Boyd | 3778292 | 2009-05-23 11:53:12 -0700 | [diff] [blame] | 70 | argc = parse_options(argc, argv, prefix, options, merge_file_usage, 0); |
Pierre Habouzit | d249610 | 2008-10-02 14:59:20 +0200 | [diff] [blame] | 71 | if (argc != 3) |
| 72 | usage_with_options(merge_file_usage, options); |
René Scharfe | 4deba8b | 2008-12-26 11:17:04 +0100 | [diff] [blame] | 73 | if (quiet) { |
| 74 | if (!freopen("/dev/null", "w", stderr)) |
Nguyễn Thái Ngọc Duy | 62f94d5 | 2016-05-08 16:47:29 +0700 | [diff] [blame] | 75 | return error_errno("failed to redirect stderr to /dev/null"); |
René Scharfe | 4deba8b | 2008-12-26 11:17:04 +0100 | [diff] [blame] | 76 | } |
Johannes Schindelin | ba1f5f3 | 2006-12-06 16:26:06 +0100 | [diff] [blame] | 77 | |
brian m. carlson | e1068f0 | 2023-11-01 19:24:19 +0000 | [diff] [blame] | 78 | if (object_id) |
| 79 | setup_git_directory(); |
| 80 | |
Johannes Schindelin | 5771907 | 2007-06-05 03:37:13 +0100 | [diff] [blame] | 81 | for (i = 0; i < 3; i++) { |
Jeff King | e4da43b | 2017-03-20 21:28:49 -0400 | [diff] [blame] | 82 | char *fname; |
brian m. carlson | e1068f0 | 2023-11-01 19:24:19 +0000 | [diff] [blame] | 83 | struct object_id oid; |
Ævar Arnfjörð Bjarmason | 480a0e3 | 2022-07-01 12:42:55 +0200 | [diff] [blame] | 84 | mmfile_t *mmf = mmfs + i; |
Jeff King | e4da43b | 2017-03-20 21:28:49 -0400 | [diff] [blame] | 85 | |
Pierre Habouzit | d249610 | 2008-10-02 14:59:20 +0200 | [diff] [blame] | 86 | if (!names[i]) |
| 87 | names[i] = argv[i]; |
Jeff King | e4da43b | 2017-03-20 21:28:49 -0400 | [diff] [blame] | 88 | |
| 89 | fname = prefix_filename(prefix, argv[i]); |
Ævar Arnfjörð Bjarmason | 480a0e3 | 2022-07-01 12:42:55 +0200 | [diff] [blame] | 90 | |
brian m. carlson | e1068f0 | 2023-11-01 19:24:19 +0000 | [diff] [blame] | 91 | 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ð Bjarmason | 480a0e3 | 2022-07-01 12:42:55 +0200 | [diff] [blame] | 100 | ret = -1; |
brian m. carlson | e1068f0 | 2023-11-01 19:24:19 +0000 | [diff] [blame] | 101 | } |
| 102 | if (ret != -1 && (mmf->size > MAX_XDIFF_SIZE || |
| 103 | buffer_is_binary(mmf->ptr, mmf->size))) { |
Ævar Arnfjörð Bjarmason | 480a0e3 | 2022-07-01 12:42:55 +0200 | [diff] [blame] | 104 | ret = error("Cannot merge binary files: %s", |
| 105 | argv[i]); |
brian m. carlson | e1068f0 | 2023-11-01 19:24:19 +0000 | [diff] [blame] | 106 | } |
Ævar Arnfjörð Bjarmason | 480a0e3 | 2022-07-01 12:42:55 +0200 | [diff] [blame] | 107 | |
Jeff King | e4da43b | 2017-03-20 21:28:49 -0400 | [diff] [blame] | 108 | free(fname); |
| 109 | if (ret) |
Ævar Arnfjörð Bjarmason | e72e12c | 2022-07-01 12:42:56 +0200 | [diff] [blame] | 110 | goto cleanup; |
| 111 | |
Johannes Schindelin | 5771907 | 2007-06-05 03:37:13 +0100 | [diff] [blame] | 112 | } |
Johannes Schindelin | ba1f5f3 | 2006-12-06 16:26:06 +0100 | [diff] [blame] | 113 | |
Jonathan Nieder | 4bb0936 | 2010-03-20 19:37:33 -0500 | [diff] [blame] | 114 | xmp.ancestor = names[1]; |
Jonathan Nieder | a4b5e91 | 2010-03-20 19:35:18 -0500 | [diff] [blame] | 115 | xmp.file1 = names[0]; |
| 116 | xmp.file2 = names[2]; |
| 117 | ret = xdl_merge(mmfs + 1, mmfs + 0, mmfs + 2, &xmp, &result); |
Johannes Schindelin | ba1f5f3 | 2006-12-06 16:26:06 +0100 | [diff] [blame] | 118 | |
Johannes Schindelin | ba1f5f3 | 2006-12-06 16:26:06 +0100 | [diff] [blame] | 119 | if (ret >= 0) { |
brian m. carlson | e1068f0 | 2023-11-01 19:24:19 +0000 | [diff] [blame] | 120 | 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 Schindelin | ba1f5f3 | 2006-12-06 16:26:06 +0100 | [diff] [blame] | 134 | |
brian m. carlson | e1068f0 | 2023-11-01 19:24:19 +0000 | [diff] [blame] | 135 | 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 Schindelin | ba1f5f3 | 2006-12-06 16:26:06 +0100 | [diff] [blame] | 145 | free(result.ptr); |
| 146 | } |
| 147 | |
Jeff King | e34f802 | 2015-10-28 18:44:21 -0400 | [diff] [blame] | 148 | if (ret > 127) |
| 149 | ret = 127; |
| 150 | |
Ævar Arnfjörð Bjarmason | e72e12c | 2022-07-01 12:42:56 +0200 | [diff] [blame] | 151 | cleanup: |
| 152 | for (i = 0; i < 3; i++) |
| 153 | free(mmfs[i].ptr); |
| 154 | |
Johannes Schindelin | ba1f5f3 | 2006-12-06 16:26:06 +0100 | [diff] [blame] | 155 | return ret; |
| 156 | } |