builtin/merge-file.c

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