builtin/merge-file.c

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