ll-merge.c

   1 /*
   2  * Low level 3-way in-core file merge.
   3  *
   4  * Copyright (c) 2007 Junio C Hamano
   5  */
   6
   7 #include "git-compat-util.h"
   8 #include "config.h"
   9 #include "convert.h"
  10 #include "attr.h"
  11 #include "xdiff-interface.h"
  12 #include "run-command.h"
  13 #include "ll-merge.h"
  14 #include "quote.h"
  15 #include "strbuf.h"
  16 #include "wrapper.h"
  17
  18 struct ll_merge_driver;
  19
  20 typedef enum ll_merge_result (*ll_merge_fn)(const struct ll_merge_driver *,
  21                            mmbuffer_t *result,
  22                            const char *path,
  23                            mmfile_t *orig, const char *orig_name,
  24                            mmfile_t *src1, const char *name1,
  25                            mmfile_t *src2, const char *name2,
  26                            const struct ll_merge_options *opts,
  27                            int marker_size);
  28
  29 struct ll_merge_driver {
  30         const char *name;
  31         const char *description;
  32         ll_merge_fn fn;
  33         const char *recursive;
  34         struct ll_merge_driver *next;
  35         char *cmdline;
  36 };
  37
  38 static struct attr_check *merge_attributes;
  39 static struct attr_check *load_merge_attributes(void)
  40 {
  41         if (!merge_attributes)
  42                 merge_attributes = attr_check_initl("merge", "conflict-marker-size", NULL);
  43         return merge_attributes;
  44 }
  45
  46 void reset_merge_attributes(void)
  47 {
  48         attr_check_free(merge_attributes);
  49         merge_attributes = NULL;
  50 }
  51
  52 /*
  53  * Built-in low-levels
  54  */
  55 static enum ll_merge_result ll_binary_merge(const struct ll_merge_driver *drv UNUSED,
  56                            mmbuffer_t *result,
  57                            const char *path UNUSED,
  58                            mmfile_t *orig, const char *orig_name UNUSED,
  59                            mmfile_t *src1, const char *name1 UNUSED,
  60                            mmfile_t *src2, const char *name2 UNUSED,
  61                            const struct ll_merge_options *opts,
  62                            int marker_size UNUSED)
  63 {
  64         enum ll_merge_result ret;
  65         mmfile_t *stolen;
  66         assert(opts);
  67
  68         /*
  69          * The tentative merge result is the common ancestor for an
  70          * internal merge.  For the final merge, it is "ours" by
  71          * default but -Xours/-Xtheirs can tweak the choice.
  72          */
  73         if (opts->virtual_ancestor) {
  74                 stolen = orig;
  75                 ret = LL_MERGE_OK;
  76         } else {
  77                 switch (opts->variant) {
  78                 default:
  79                         ret = LL_MERGE_BINARY_CONFLICT;
  80                         stolen = src1;
  81                         break;
  82                 case XDL_MERGE_FAVOR_OURS:
  83                         ret = LL_MERGE_OK;
  84                         stolen = src1;
  85                         break;
  86                 case XDL_MERGE_FAVOR_THEIRS:
  87                         ret = LL_MERGE_OK;
  88                         stolen = src2;
  89                         break;
  90                 }
  91         }
  92
  93         result->ptr = stolen->ptr;
  94         result->size = stolen->size;
  95         stolen->ptr = NULL;
  96
  97         return ret;
  98 }
  99
 100 static enum ll_merge_result ll_xdl_merge(const struct ll_merge_driver *drv_unused,
 101                         mmbuffer_t *result,
 102                         const char *path,
 103                         mmfile_t *orig, const char *orig_name,
 104                         mmfile_t *src1, const char *name1,
 105                         mmfile_t *src2, const char *name2,
 106                         const struct ll_merge_options *opts,
 107                         int marker_size)
 108 {
 109         enum ll_merge_result ret;
 110         xmparam_t xmp;
 111         int status;
 112         assert(opts);
 113
 114         if (orig->size > MAX_XDIFF_SIZE ||
 115             src1->size > MAX_XDIFF_SIZE ||
 116             src2->size > MAX_XDIFF_SIZE ||
 117             buffer_is_binary(orig->ptr, orig->size) ||
 118             buffer_is_binary(src1->ptr, src1->size) ||
 119             buffer_is_binary(src2->ptr, src2->size)) {
 120                 return ll_binary_merge(drv_unused, result,
 121                                        path,
 122                                        orig, orig_name,
 123                                        src1, name1,
 124                                        src2, name2,
 125                                        opts, marker_size);
 126         }
 127
 128         memset(&xmp, 0, sizeof(xmp));
 129         xmp.level = XDL_MERGE_ZEALOUS;
 130         xmp.favor = opts->variant;
 131         xmp.xpp.flags = opts->xdl_opts;
 132         if (git_xmerge_style >= 0)
 133                 xmp.style = git_xmerge_style;
 134         if (marker_size > 0)
 135                 xmp.marker_size = marker_size;
 136         xmp.ancestor = orig_name;
 137         xmp.file1 = name1;
 138         xmp.file2 = name2;
 139         status = xdl_merge(orig, src1, src2, &xmp, result);
 140         ret = (status > 0) ? LL_MERGE_CONFLICT : status;
 141         return ret;
 142 }
 143
 144 static enum ll_merge_result ll_union_merge(const struct ll_merge_driver *drv_unused,
 145                           mmbuffer_t *result,
 146                           const char *path,
 147                           mmfile_t *orig, const char *orig_name,
 148                           mmfile_t *src1, const char *name1,
 149                           mmfile_t *src2, const char *name2,
 150                           const struct ll_merge_options *opts,
 151                           int marker_size)
 152 {
 153         /* Use union favor */
 154         struct ll_merge_options o;
 155         assert(opts);
 156         o = *opts;
 157         o.variant = XDL_MERGE_FAVOR_UNION;
 158         return ll_xdl_merge(drv_unused, result, path,
 159                             orig, orig_name, src1, name1, src2, name2,
 160                             &o, marker_size);
 161 }
 162
 163 #define LL_BINARY_MERGE 0
 164 #define LL_TEXT_MERGE 1
 165 #define LL_UNION_MERGE 2
 166 static struct ll_merge_driver ll_merge_drv[] = {
 167         { "binary", "built-in binary merge", ll_binary_merge },
 168         { "text", "built-in 3-way text merge", ll_xdl_merge },
 169         { "union", "built-in union merge", ll_union_merge },
 170 };
 171
 172 static void create_temp(mmfile_t *src, char *path, size_t len)
 173 {
 174         int fd;
 175
 176         xsnprintf(path, len, ".merge_file_XXXXXX");
 177         fd = xmkstemp(path);
 178         if (write_in_full(fd, src->ptr, src->size) < 0)
 179                 die_errno("unable to write temp-file");
 180         close(fd);
 181 }
 182
 183 /*
 184  * User defined low-level merge driver support.
 185  */
 186 static enum ll_merge_result ll_ext_merge(const struct ll_merge_driver *fn,
 187                         mmbuffer_t *result,
 188                         const char *path,
 189                         mmfile_t *orig, const char *orig_name UNUSED,
 190                         mmfile_t *src1, const char *name1 UNUSED,
 191                         mmfile_t *src2, const char *name2 UNUSED,
 192                         const struct ll_merge_options *opts,
 193                         int marker_size)
 194 {
 195         char temp[3][50];
 196         struct strbuf cmd = STRBUF_INIT;
 197         const char *format = fn->cmdline;
 198         struct child_process child = CHILD_PROCESS_INIT;
 199         int status, fd, i;
 200         struct stat st;
 201         enum ll_merge_result ret;
 202         assert(opts);
 203
 204         if (!fn->cmdline)
 205                 die("custom merge driver %s lacks command line.", fn->name);
 206
 207         result->ptr = NULL;
 208         result->size = 0;
 209         create_temp(orig, temp[0], sizeof(temp[0]));
 210         create_temp(src1, temp[1], sizeof(temp[1]));
 211         create_temp(src2, temp[2], sizeof(temp[2]));
 212
 213         while (strbuf_expand_step(&cmd, &format)) {
 214                 if (skip_prefix(format, "%", &format))
 215                         strbuf_addch(&cmd, '%');
 216                 else if (skip_prefix(format, "O", &format))
 217                         strbuf_addstr(&cmd, temp[0]);
 218                 else if (skip_prefix(format, "A", &format))
 219                         strbuf_addstr(&cmd, temp[1]);
 220                 else if (skip_prefix(format, "B", &format))
 221                         strbuf_addstr(&cmd, temp[2]);
 222                 else if (skip_prefix(format, "L", &format))
 223                         strbuf_addf(&cmd, "%d", marker_size);
 224                 else if (skip_prefix(format, "P", &format))
 225                         sq_quote_buf(&cmd, path);
 226                 else
 227                         strbuf_addch(&cmd, '%');
 228         }
 229
 230         child.use_shell = 1;
 231         strvec_push(&child.args, cmd.buf);
 232         status = run_command(&child);
 233         fd = open(temp[1], O_RDONLY);
 234         if (fd < 0)
 235                 goto bad;
 236         if (fstat(fd, &st))
 237                 goto close_bad;
 238         result->size = st.st_size;
 239         result->ptr = xmallocz(result->size);
 240         if (read_in_full(fd, result->ptr, result->size) != result->size) {
 241                 FREE_AND_NULL(result->ptr);
 242                 result->size = 0;
 243         }
 244  close_bad:
 245         close(fd);
 246  bad:
 247         for (i = 0; i < 3; i++)
 248                 unlink_or_warn(temp[i]);
 249         strbuf_release(&cmd);
 250         ret = (status > 0) ? LL_MERGE_CONFLICT : status;
 251         return ret;
 252 }
 253
 254 /*
 255  * merge.default and merge.driver configuration items
 256  */
 257 static struct ll_merge_driver *ll_user_merge, **ll_user_merge_tail;
 258 static const char *default_ll_merge;
 259
 260 static int read_merge_config(const char *var, const char *value,
 261                              void *cb UNUSED)
 262 {
 263         struct ll_merge_driver *fn;
 264         const char *key, *name;
 265         size_t namelen;
 266
 267         if (!strcmp(var, "merge.default"))
 268                 return git_config_string(&default_ll_merge, var, value);
 269
 270         /*
 271          * We are not interested in anything but "merge.<name>.variable";
 272          * especially, we do not want to look at variables such as
 273          * "merge.summary", "merge.tool", and "merge.verbosity".
 274          */
 275         if (parse_config_key(var, "merge", &name, &namelen, &key) < 0 || !name)
 276                 return 0;
 277
 278         /*
 279          * Find existing one as we might be processing merge.<name>.var2
 280          * after seeing merge.<name>.var1.
 281          */
 282         for (fn = ll_user_merge; fn; fn = fn->next)
 283                 if (!strncmp(fn->name, name, namelen) && !fn->name[namelen])
 284                         break;
 285         if (!fn) {
 286                 CALLOC_ARRAY(fn, 1);
 287                 fn->name = xmemdupz(name, namelen);
 288                 fn->fn = ll_ext_merge;
 289                 *ll_user_merge_tail = fn;
 290                 ll_user_merge_tail = &(fn->next);
 291         }
 292
 293         if (!strcmp("name", key))
 294                 return git_config_string(&fn->description, var, value);
 295
 296         if (!strcmp("driver", key)) {
 297                 if (!value)
 298                         return error("%s: lacks value", var);
 299                 /*
 300                  * merge.<name>.driver specifies the command line:
 301                  *
 302                  *      command-line
 303                  *
 304                  * The command-line will be interpolated with the following
 305                  * tokens and is given to the shell:
 306                  *
 307                  *    %O - temporary file name for the merge base.
 308                  *    %A - temporary file name for our version.
 309                  *    %B - temporary file name for the other branches' version.
 310                  *    %L - conflict marker length
 311                  *    %P - the original path (safely quoted for the shell)
 312                  *
 313                  * The external merge driver should write the results in the
 314                  * file named by %A, and signal that it has done with zero exit
 315                  * status.
 316                  */
 317                 fn->cmdline = xstrdup(value);
 318                 return 0;
 319         }
 320
 321         if (!strcmp("recursive", key))
 322                 return git_config_string(&fn->recursive, var, value);
 323
 324         return 0;
 325 }
 326
 327 static void initialize_ll_merge(void)
 328 {
 329         if (ll_user_merge_tail)
 330                 return;
 331         ll_user_merge_tail = &ll_user_merge;
 332         git_config(read_merge_config, NULL);
 333 }
 334
 335 static const struct ll_merge_driver *find_ll_merge_driver(const char *merge_attr)
 336 {
 337         struct ll_merge_driver *fn;
 338         const char *name;
 339         int i;
 340
 341         initialize_ll_merge();
 342
 343         if (ATTR_TRUE(merge_attr))
 344                 return &ll_merge_drv[LL_TEXT_MERGE];
 345         else if (ATTR_FALSE(merge_attr))
 346                 return &ll_merge_drv[LL_BINARY_MERGE];
 347         else if (ATTR_UNSET(merge_attr)) {
 348                 if (!default_ll_merge)
 349                         return &ll_merge_drv[LL_TEXT_MERGE];
 350                 else
 351                         name = default_ll_merge;
 352         }
 353         else
 354                 name = merge_attr;
 355
 356         for (fn = ll_user_merge; fn; fn = fn->next)
 357                 if (!strcmp(fn->name, name))
 358                         return fn;
 359
 360         for (i = 0; i < ARRAY_SIZE(ll_merge_drv); i++)
 361                 if (!strcmp(ll_merge_drv[i].name, name))
 362                         return &ll_merge_drv[i];
 363
 364         /* default to the 3-way */
 365         return &ll_merge_drv[LL_TEXT_MERGE];
 366 }
 367
 368 static void normalize_file(mmfile_t *mm, const char *path, struct index_state *istate)
 369 {
 370         struct strbuf strbuf = STRBUF_INIT;
 371         if (renormalize_buffer(istate, path, mm->ptr, mm->size, &strbuf)) {
 372                 free(mm->ptr);
 373                 mm->size = strbuf.len;
 374                 mm->ptr = strbuf_detach(&strbuf, NULL);
 375         }
 376 }
 377
 378 enum ll_merge_result ll_merge(mmbuffer_t *result_buf,
 379              const char *path,
 380              mmfile_t *ancestor, const char *ancestor_label,
 381              mmfile_t *ours, const char *our_label,
 382              mmfile_t *theirs, const char *their_label,
 383              struct index_state *istate,
 384              const struct ll_merge_options *opts)
 385 {
 386         struct attr_check *check = load_merge_attributes();
 387         static const struct ll_merge_options default_opts;
 388         const char *ll_driver_name = NULL;
 389         int marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
 390         const struct ll_merge_driver *driver;
 391
 392         if (!opts)
 393                 opts = &default_opts;
 394
 395         if (opts->renormalize) {
 396                 normalize_file(ancestor, path, istate);
 397                 normalize_file(ours, path, istate);
 398                 normalize_file(theirs, path, istate);
 399         }
 400
 401         git_check_attr(istate, path, check);
 402         ll_driver_name = check->items[0].value;
 403         if (check->items[1].value) {
 404                 marker_size = atoi(check->items[1].value);
 405                 if (marker_size <= 0)
 406                         marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
 407         }
 408         driver = find_ll_merge_driver(ll_driver_name);
 409
 410         if (opts->virtual_ancestor) {
 411                 if (driver->recursive)
 412                         driver = find_ll_merge_driver(driver->recursive);
 413         }
 414         if (opts->extra_marker_size) {
 415                 marker_size += opts->extra_marker_size;
 416         }
 417         return driver->fn(driver, result_buf, path, ancestor, ancestor_label,
 418                           ours, our_label, theirs, their_label,
 419                           opts, marker_size);
 420 }
 421
 422 int ll_merge_marker_size(struct index_state *istate, const char *path)
 423 {
 424         static struct attr_check *check;
 425         int marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
 426
 427         if (!check)
 428                 check = attr_check_initl("conflict-marker-size", NULL);
 429         git_check_attr(istate, path, check);
 430         if (check->items[0].value) {
 431                 marker_size = atoi(check->items[0].value);
 432                 if (marker_size <= 0)
 433                         marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
 434         }
 435         return marker_size;
 436 }