Andrew's git - gitweb.git/blob

cca81c2dde3be92341df7f98eecde2df0299686e
   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        "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 = {{XDF_NEED_MINIMAL}};
  29        int ret = 0, i = 0, to_stdout = 0;
  30        int quiet = 0;
  31        int nongit;
  32        struct option options[] = {
  33                OPT_BOOLEAN('p', "stdout", &to_stdout, "send results to standard output"),
  34                OPT_SET_INT(0, "diff3", &xmp.style, "use a diff3 based merge", XDL_MERGE_DIFF3),
  35                OPT_SET_INT(0, "ours", &xmp.favor, "for conflicts, use our version",
  36                            XDL_MERGE_FAVOR_OURS),
  37                OPT_SET_INT(0, "theirs", &xmp.favor, "for conflicts, use their version",
  38                            XDL_MERGE_FAVOR_THEIRS),
  39                OPT__QUIET(&quiet),
  40                OPT_CALLBACK('L', NULL, names, "name",
  41                             "set labels for file1/orig_file/file2", &label_cb),
  42                OPT_END(),
  43        };
  44
  45        xmp.level = XDL_MERGE_ZEALOUS_ALNUM;
  46        xmp.style = 0;
  47        xmp.favor = 0;
  48
  49        prefix = setup_git_directory_gently(&nongit);
  50        if (!nongit) {
  51                /* Read the configuration file */
  52                git_config(git_xmerge_config, NULL);
  53                if (0 <= git_xmerge_style)
  54                        xmp.style = git_xmerge_style;
  55        }
  56
  57        argc = parse_options(argc, argv, prefix, options, merge_file_usage, 0);
  58        if (argc != 3)
  59                usage_with_options(merge_file_usage, options);
  60        if (quiet) {
  61                if (!freopen("/dev/null", "w", stderr))
  62                        return error("failed to redirect stderr to /dev/null: "
  63                                     "%s\n", strerror(errno));
  64        }
  65
  66        for (i = 0; i < 3; i++) {
  67                if (!names[i])
  68                        names[i] = argv[i];
  69                if (read_mmfile(mmfs + i, argv[i]))
  70                        return -1;
  71                if (buffer_is_binary(mmfs[i].ptr, mmfs[i].size))
  72                        return error("Cannot merge binary files: %s\n",
  73                                        argv[i]);
  74        }
  75
  76        ret = xdl_merge(mmfs + 1, mmfs + 0, names[0], mmfs + 2, names[2],
  77                        &xmp, &result);
  78
  79        for (i = 0; i < 3; i++)
  80                free(mmfs[i].ptr);
  81
  82        if (ret >= 0) {
  83                const char *filename = argv[0];
  84                FILE *f = to_stdout ? stdout : fopen(filename, "wb");
  85
  86                if (!f)
  87                        ret = error("Could not open %s for writing", filename);
  88                else if (result.size &&
  89                         fwrite(result.ptr, result.size, 1, f) != 1)
  90                        ret = error("Could not write to %s", filename);
  91                else if (fclose(f))
  92                        ret = error("Could not close %s", filename);
  93                free(result.ptr);
  94        }
  95
  96        return ret;
  97}