Andrew's git - gitweb.git/blob

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