builtin/merge-file.c

   1 #include "builtin.h"
   2 #include "cache.h"
   3 #include "config.h"
   4 #include "xdiff/xdiff.h"
   5 #include "xdiff-interface.h"
   6 #include "parse-options.h"
   7
   8 static const char *const merge_file_usage[] = {
   9         N_("git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> <orig-file> <file2>"),
  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
  18         BUG_ON_OPT_NEG(unset);
  19
  20         if (label_count >= 3)
  21                 return error("too many labels on the command line");
  22         names[label_count++] = arg;
  23         return 0;
  24 }
  25
  26 int cmd_merge_file(int argc, const char **argv, const char *prefix)
  27 {
  28         const char *names[3] = { 0 };
  29         mmfile_t mmfs[3] = { 0 };
  30         mmbuffer_t result = { 0 };
  31         xmparam_t xmp = { 0 };
  32         int ret = 0, i = 0, to_stdout = 0;
  33         int quiet = 0;
  34         struct option options[] = {
  35                 OPT_BOOL('p', "stdout", &to_stdout, N_("send results to standard output")),
  36                 OPT_SET_INT(0, "diff3", &xmp.style, N_("use a diff3 based merge"), XDL_MERGE_DIFF3),
  37                 OPT_SET_INT(0, "zdiff3", &xmp.style, N_("use a zealous diff3 based merge"),
  38                                 XDL_MERGE_ZEALOUS_DIFF3),
  39                 OPT_SET_INT(0, "ours", &xmp.favor, N_("for conflicts, use our version"),
  40                             XDL_MERGE_FAVOR_OURS),
  41                 OPT_SET_INT(0, "theirs", &xmp.favor, N_("for conflicts, use their version"),
  42                             XDL_MERGE_FAVOR_THEIRS),
  43                 OPT_SET_INT(0, "union", &xmp.favor, N_("for conflicts, use a union version"),
  44                             XDL_MERGE_FAVOR_UNION),
  45                 OPT_INTEGER(0, "marker-size", &xmp.marker_size,
  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"),
  49                              N_("set labels for file1/orig-file/file2"), &label_cb),
  50                 OPT_END(),
  51         };
  52
  53         xmp.level = XDL_MERGE_ZEALOUS_ALNUM;
  54         xmp.style = 0;
  55         xmp.favor = 0;
  56
  57         if (startup_info->have_repository) {
  58                 /* Read the configuration file */
  59                 git_config(git_xmerge_config, NULL);
  60                 if (0 <= git_xmerge_style)
  61                         xmp.style = git_xmerge_style;
  62         }
  63
  64         argc = parse_options(argc, argv, prefix, options, merge_file_usage, 0);
  65         if (argc != 3)
  66                 usage_with_options(merge_file_usage, options);
  67         if (quiet) {
  68                 if (!freopen("/dev/null", "w", stderr))
  69                         return error_errno("failed to redirect stderr to /dev/null");
  70         }
  71
  72         for (i = 0; i < 3; i++) {
  73                 char *fname;
  74                 mmfile_t *mmf = mmfs + i;
  75
  76                 if (!names[i])
  77                         names[i] = argv[i];
  78
  79                 fname = prefix_filename(prefix, argv[i]);
  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
  88                 free(fname);
  89                 if (ret)
  90                         goto cleanup;
  91
  92         }
  93
  94         xmp.ancestor = names[1];
  95         xmp.file1 = names[0];
  96         xmp.file2 = names[2];
  97         ret = xdl_merge(mmfs + 1, mmfs + 0, mmfs + 2, &xmp, &result);
  98
  99         if (ret >= 0) {
 100                 const char *filename = argv[0];
 101                 char *fpath = prefix_filename(prefix, argv[0]);
 102                 FILE *f = to_stdout ? stdout : fopen(fpath, "wb");
 103
 104                 if (!f)
 105                         ret = error_errno("Could not open %s for writing",
 106                                           filename);
 107                 else if (result.size &&
 108                          fwrite(result.ptr, result.size, 1, f) != 1)
 109                         ret = error_errno("Could not write to %s", filename);
 110                 else if (fclose(f))
 111                         ret = error_errno("Could not close %s", filename);
 112                 free(result.ptr);
 113                 free(fpath);
 114         }
 115
 116         if (ret > 127)
 117                 ret = 127;
 118
 119 cleanup:
 120         for (i = 0; i < 3; i++)
 121                 free(mmfs[i].ptr);
 122
 123         return ret;
 124 }