diff.con commit Merge branch 'mv/merge-custom' (a1184d8)
   1/*
   2 * Copyright (C) 2005 Junio C Hamano
   3 */
   4#include "cache.h"
   5#include "quote.h"
   6#include "diff.h"
   7#include "diffcore.h"
   8#include "delta.h"
   9#include "xdiff-interface.h"
  10#include "color.h"
  11#include "attr.h"
  12#include "run-command.h"
  13#include "utf8.h"
  14
  15#ifdef NO_FAST_WORKING_DIRECTORY
  16#define FAST_WORKING_DIRECTORY 0
  17#else
  18#define FAST_WORKING_DIRECTORY 1
  19#endif
  20
  21static int diff_detect_rename_default;
  22static int diff_rename_limit_default = 200;
  23static int diff_suppress_blank_empty;
  24int diff_use_color_default = -1;
  25static const char *external_diff_cmd_cfg;
  26int diff_auto_refresh_index = 1;
  27
  28static char diff_colors[][COLOR_MAXLEN] = {
  29        "\033[m",       /* reset */
  30        "",             /* PLAIN (normal) */
  31        "\033[1m",      /* METAINFO (bold) */
  32        "\033[36m",     /* FRAGINFO (cyan) */
  33        "\033[31m",     /* OLD (red) */
  34        "\033[32m",     /* NEW (green) */
  35        "\033[33m",     /* COMMIT (yellow) */
  36        "\033[41m",     /* WHITESPACE (red background) */
  37};
  38
  39static int parse_diff_color_slot(const char *var, int ofs)
  40{
  41        if (!strcasecmp(var+ofs, "plain"))
  42                return DIFF_PLAIN;
  43        if (!strcasecmp(var+ofs, "meta"))
  44                return DIFF_METAINFO;
  45        if (!strcasecmp(var+ofs, "frag"))
  46                return DIFF_FRAGINFO;
  47        if (!strcasecmp(var+ofs, "old"))
  48                return DIFF_FILE_OLD;
  49        if (!strcasecmp(var+ofs, "new"))
  50                return DIFF_FILE_NEW;
  51        if (!strcasecmp(var+ofs, "commit"))
  52                return DIFF_COMMIT;
  53        if (!strcasecmp(var+ofs, "whitespace"))
  54                return DIFF_WHITESPACE;
  55        die("bad config variable '%s'", var);
  56}
  57
  58static struct ll_diff_driver {
  59        const char *name;
  60        struct ll_diff_driver *next;
  61        const char *cmd;
  62} *user_diff, **user_diff_tail;
  63
  64/*
  65 * Currently there is only "diff.<drivername>.command" variable;
  66 * because there are "diff.color.<slot>" variables, we are parsing
  67 * this in a bit convoluted way to allow low level diff driver
  68 * called "color".
  69 */
  70static int parse_lldiff_command(const char *var, const char *ep, const char *value)
  71{
  72        const char *name;
  73        int namelen;
  74        struct ll_diff_driver *drv;
  75
  76        name = var + 5;
  77        namelen = ep - name;
  78        for (drv = user_diff; drv; drv = drv->next)
  79                if (!strncmp(drv->name, name, namelen) && !drv->name[namelen])
  80                        break;
  81        if (!drv) {
  82                drv = xcalloc(1, sizeof(struct ll_diff_driver));
  83                drv->name = xmemdupz(name, namelen);
  84                if (!user_diff_tail)
  85                        user_diff_tail = &user_diff;
  86                *user_diff_tail = drv;
  87                user_diff_tail = &(drv->next);
  88        }
  89
  90        return git_config_string(&(drv->cmd), var, value);
  91}
  92
  93/*
  94 * 'diff.<what>.funcname' attribute can be specified in the configuration
  95 * to define a customized regexp to find the beginning of a function to
  96 * be used for hunk header lines of "diff -p" style output.
  97 */
  98static struct funcname_pattern {
  99        char *name;
 100        char *pattern;
 101        struct funcname_pattern *next;
 102} *funcname_pattern_list;
 103
 104static int parse_funcname_pattern(const char *var, const char *ep, const char *value)
 105{
 106        const char *name;
 107        int namelen;
 108        struct funcname_pattern *pp;
 109
 110        name = var + 5; /* "diff." */
 111        namelen = ep - name;
 112
 113        for (pp = funcname_pattern_list; pp; pp = pp->next)
 114                if (!strncmp(pp->name, name, namelen) && !pp->name[namelen])
 115                        break;
 116        if (!pp) {
 117                pp = xcalloc(1, sizeof(*pp));
 118                pp->name = xmemdupz(name, namelen);
 119                pp->next = funcname_pattern_list;
 120                funcname_pattern_list = pp;
 121        }
 122        free(pp->pattern);
 123        pp->pattern = xstrdup(value);
 124        return 0;
 125}
 126
 127/*
 128 * These are to give UI layer defaults.
 129 * The core-level commands such as git-diff-files should
 130 * never be affected by the setting of diff.renames
 131 * the user happens to have in the configuration file.
 132 */
 133int git_diff_ui_config(const char *var, const char *value, void *cb)
 134{
 135        if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
 136                diff_use_color_default = git_config_colorbool(var, value, -1);
 137                return 0;
 138        }
 139        if (!strcmp(var, "diff.renames")) {
 140                if (!value)
 141                        diff_detect_rename_default = DIFF_DETECT_RENAME;
 142                else if (!strcasecmp(value, "copies") ||
 143                         !strcasecmp(value, "copy"))
 144                        diff_detect_rename_default = DIFF_DETECT_COPY;
 145                else if (git_config_bool(var,value))
 146                        diff_detect_rename_default = DIFF_DETECT_RENAME;
 147                return 0;
 148        }
 149        if (!strcmp(var, "diff.autorefreshindex")) {
 150                diff_auto_refresh_index = git_config_bool(var, value);
 151                return 0;
 152        }
 153        if (!strcmp(var, "diff.external"))
 154                return git_config_string(&external_diff_cmd_cfg, var, value);
 155        if (!prefixcmp(var, "diff.")) {
 156                const char *ep = strrchr(var, '.');
 157
 158                if (ep != var + 4 && !strcmp(ep, ".command"))
 159                        return parse_lldiff_command(var, ep, value);
 160        }
 161
 162        return git_diff_basic_config(var, value, cb);
 163}
 164
 165int git_diff_basic_config(const char *var, const char *value, void *cb)
 166{
 167        if (!strcmp(var, "diff.renamelimit")) {
 168                diff_rename_limit_default = git_config_int(var, value);
 169                return 0;
 170        }
 171
 172        if (!prefixcmp(var, "diff.color.") || !prefixcmp(var, "color.diff.")) {
 173                int slot = parse_diff_color_slot(var, 11);
 174                if (!value)
 175                        return config_error_nonbool(var);
 176                color_parse(value, var, diff_colors[slot]);
 177                return 0;
 178        }
 179
 180        /* like GNU diff's --suppress-blank-empty option  */
 181        if (!strcmp(var, "diff.suppress-blank-empty")) {
 182                diff_suppress_blank_empty = git_config_bool(var, value);
 183                return 0;
 184        }
 185
 186        if (!prefixcmp(var, "diff.")) {
 187                const char *ep = strrchr(var, '.');
 188                if (ep != var + 4) {
 189                        if (!strcmp(ep, ".funcname")) {
 190                                if (!value)
 191                                        return config_error_nonbool(var);
 192                                return parse_funcname_pattern(var, ep, value);
 193                        }
 194                }
 195        }
 196
 197        return git_color_default_config(var, value, cb);
 198}
 199
 200static char *quote_two(const char *one, const char *two)
 201{
 202        int need_one = quote_c_style(one, NULL, NULL, 1);
 203        int need_two = quote_c_style(two, NULL, NULL, 1);
 204        struct strbuf res;
 205
 206        strbuf_init(&res, 0);
 207        if (need_one + need_two) {
 208                strbuf_addch(&res, '"');
 209                quote_c_style(one, &res, NULL, 1);
 210                quote_c_style(two, &res, NULL, 1);
 211                strbuf_addch(&res, '"');
 212        } else {
 213                strbuf_addstr(&res, one);
 214                strbuf_addstr(&res, two);
 215        }
 216        return strbuf_detach(&res, NULL);
 217}
 218
 219static const char *external_diff(void)
 220{
 221        static const char *external_diff_cmd = NULL;
 222        static int done_preparing = 0;
 223
 224        if (done_preparing)
 225                return external_diff_cmd;
 226        external_diff_cmd = getenv("GIT_EXTERNAL_DIFF");
 227        if (!external_diff_cmd)
 228                external_diff_cmd = external_diff_cmd_cfg;
 229        done_preparing = 1;
 230        return external_diff_cmd;
 231}
 232
 233static struct diff_tempfile {
 234        const char *name; /* filename external diff should read from */
 235        char hex[41];
 236        char mode[10];
 237        char tmp_path[PATH_MAX];
 238} diff_temp[2];
 239
 240static int count_lines(const char *data, int size)
 241{
 242        int count, ch, completely_empty = 1, nl_just_seen = 0;
 243        count = 0;
 244        while (0 < size--) {
 245                ch = *data++;
 246                if (ch == '\n') {
 247                        count++;
 248                        nl_just_seen = 1;
 249                        completely_empty = 0;
 250                }
 251                else {
 252                        nl_just_seen = 0;
 253                        completely_empty = 0;
 254                }
 255        }
 256        if (completely_empty)
 257                return 0;
 258        if (!nl_just_seen)
 259                count++; /* no trailing newline */
 260        return count;
 261}
 262
 263static void print_line_count(FILE *file, int count)
 264{
 265        switch (count) {
 266        case 0:
 267                fprintf(file, "0,0");
 268                break;
 269        case 1:
 270                fprintf(file, "1");
 271                break;
 272        default:
 273                fprintf(file, "1,%d", count);
 274                break;
 275        }
 276}
 277
 278static void copy_file_with_prefix(FILE *file,
 279                                  int prefix, const char *data, int size,
 280                                  const char *set, const char *reset)
 281{
 282        int ch, nl_just_seen = 1;
 283        while (0 < size--) {
 284                ch = *data++;
 285                if (nl_just_seen) {
 286                        fputs(set, file);
 287                        putc(prefix, file);
 288                }
 289                if (ch == '\n') {
 290                        nl_just_seen = 1;
 291                        fputs(reset, file);
 292                } else
 293                        nl_just_seen = 0;
 294                putc(ch, file);
 295        }
 296        if (!nl_just_seen)
 297                fprintf(file, "%s\n\\ No newline at end of file\n", reset);
 298}
 299
 300static void emit_rewrite_diff(const char *name_a,
 301                              const char *name_b,
 302                              struct diff_filespec *one,
 303                              struct diff_filespec *two,
 304                              struct diff_options *o)
 305{
 306        int lc_a, lc_b;
 307        int color_diff = DIFF_OPT_TST(o, COLOR_DIFF);
 308        const char *name_a_tab, *name_b_tab;
 309        const char *metainfo = diff_get_color(color_diff, DIFF_METAINFO);
 310        const char *fraginfo = diff_get_color(color_diff, DIFF_FRAGINFO);
 311        const char *old = diff_get_color(color_diff, DIFF_FILE_OLD);
 312        const char *new = diff_get_color(color_diff, DIFF_FILE_NEW);
 313        const char *reset = diff_get_color(color_diff, DIFF_RESET);
 314        static struct strbuf a_name = STRBUF_INIT, b_name = STRBUF_INIT;
 315
 316        name_a += (*name_a == '/');
 317        name_b += (*name_b == '/');
 318        name_a_tab = strchr(name_a, ' ') ? "\t" : "";
 319        name_b_tab = strchr(name_b, ' ') ? "\t" : "";
 320
 321        strbuf_reset(&a_name);
 322        strbuf_reset(&b_name);
 323        quote_two_c_style(&a_name, o->a_prefix, name_a, 0);
 324        quote_two_c_style(&b_name, o->b_prefix, name_b, 0);
 325
 326        diff_populate_filespec(one, 0);
 327        diff_populate_filespec(two, 0);
 328        lc_a = count_lines(one->data, one->size);
 329        lc_b = count_lines(two->data, two->size);
 330        fprintf(o->file,
 331                "%s--- %s%s%s\n%s+++ %s%s%s\n%s@@ -",
 332                metainfo, a_name.buf, name_a_tab, reset,
 333                metainfo, b_name.buf, name_b_tab, reset, fraginfo);
 334        print_line_count(o->file, lc_a);
 335        fprintf(o->file, " +");
 336        print_line_count(o->file, lc_b);
 337        fprintf(o->file, " @@%s\n", reset);
 338        if (lc_a)
 339                copy_file_with_prefix(o->file, '-', one->data, one->size, old, reset);
 340        if (lc_b)
 341                copy_file_with_prefix(o->file, '+', two->data, two->size, new, reset);
 342}
 343
 344static int fill_mmfile(mmfile_t *mf, struct diff_filespec *one)
 345{
 346        if (!DIFF_FILE_VALID(one)) {
 347                mf->ptr = (char *)""; /* does not matter */
 348                mf->size = 0;
 349                return 0;
 350        }
 351        else if (diff_populate_filespec(one, 0))
 352                return -1;
 353        mf->ptr = one->data;
 354        mf->size = one->size;
 355        return 0;
 356}
 357
 358struct diff_words_buffer {
 359        mmfile_t text;
 360        long alloc;
 361        long current; /* output pointer */
 362        int suppressed_newline;
 363};
 364
 365static void diff_words_append(char *line, unsigned long len,
 366                struct diff_words_buffer *buffer)
 367{
 368        if (buffer->text.size + len > buffer->alloc) {
 369                buffer->alloc = (buffer->text.size + len) * 3 / 2;
 370                buffer->text.ptr = xrealloc(buffer->text.ptr, buffer->alloc);
 371        }
 372        line++;
 373        len--;
 374        memcpy(buffer->text.ptr + buffer->text.size, line, len);
 375        buffer->text.size += len;
 376}
 377
 378struct diff_words_data {
 379        struct diff_words_buffer minus, plus;
 380        FILE *file;
 381};
 382
 383static void print_word(FILE *file, struct diff_words_buffer *buffer, int len, int color,
 384                int suppress_newline)
 385{
 386        const char *ptr;
 387        int eol = 0;
 388
 389        if (len == 0)
 390                return;
 391
 392        ptr  = buffer->text.ptr + buffer->current;
 393        buffer->current += len;
 394
 395        if (ptr[len - 1] == '\n') {
 396                eol = 1;
 397                len--;
 398        }
 399
 400        fputs(diff_get_color(1, color), file);
 401        fwrite(ptr, len, 1, file);
 402        fputs(diff_get_color(1, DIFF_RESET), file);
 403
 404        if (eol) {
 405                if (suppress_newline)
 406                        buffer->suppressed_newline = 1;
 407                else
 408                        putc('\n', file);
 409        }
 410}
 411
 412static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len)
 413{
 414        struct diff_words_data *diff_words = priv;
 415
 416        if (diff_words->minus.suppressed_newline) {
 417                if (line[0] != '+')
 418                        putc('\n', diff_words->file);
 419                diff_words->minus.suppressed_newline = 0;
 420        }
 421
 422        len--;
 423        switch (line[0]) {
 424                case '-':
 425                        print_word(diff_words->file,
 426                                   &diff_words->minus, len, DIFF_FILE_OLD, 1);
 427                        break;
 428                case '+':
 429                        print_word(diff_words->file,
 430                                   &diff_words->plus, len, DIFF_FILE_NEW, 0);
 431                        break;
 432                case ' ':
 433                        print_word(diff_words->file,
 434                                   &diff_words->plus, len, DIFF_PLAIN, 0);
 435                        diff_words->minus.current += len;
 436                        break;
 437        }
 438}
 439
 440/* this executes the word diff on the accumulated buffers */
 441static void diff_words_show(struct diff_words_data *diff_words)
 442{
 443        xpparam_t xpp;
 444        xdemitconf_t xecfg;
 445        xdemitcb_t ecb;
 446        mmfile_t minus, plus;
 447        int i;
 448
 449        memset(&xecfg, 0, sizeof(xecfg));
 450        minus.size = diff_words->minus.text.size;
 451        minus.ptr = xmalloc(minus.size);
 452        memcpy(minus.ptr, diff_words->minus.text.ptr, minus.size);
 453        for (i = 0; i < minus.size; i++)
 454                if (isspace(minus.ptr[i]))
 455                        minus.ptr[i] = '\n';
 456        diff_words->minus.current = 0;
 457
 458        plus.size = diff_words->plus.text.size;
 459        plus.ptr = xmalloc(plus.size);
 460        memcpy(plus.ptr, diff_words->plus.text.ptr, plus.size);
 461        for (i = 0; i < plus.size; i++)
 462                if (isspace(plus.ptr[i]))
 463                        plus.ptr[i] = '\n';
 464        diff_words->plus.current = 0;
 465
 466        xpp.flags = XDF_NEED_MINIMAL;
 467        xecfg.ctxlen = diff_words->minus.alloc + diff_words->plus.alloc;
 468        xdi_diff_outf(&minus, &plus, fn_out_diff_words_aux, diff_words,
 469                      &xpp, &xecfg, &ecb);
 470        free(minus.ptr);
 471        free(plus.ptr);
 472        diff_words->minus.text.size = diff_words->plus.text.size = 0;
 473
 474        if (diff_words->minus.suppressed_newline) {
 475                putc('\n', diff_words->file);
 476                diff_words->minus.suppressed_newline = 0;
 477        }
 478}
 479
 480typedef unsigned long (*sane_truncate_fn)(char *line, unsigned long len);
 481
 482struct emit_callback {
 483        int nparents, color_diff;
 484        unsigned ws_rule;
 485        sane_truncate_fn truncate;
 486        const char **label_path;
 487        struct diff_words_data *diff_words;
 488        int *found_changesp;
 489        FILE *file;
 490};
 491
 492static void free_diff_words_data(struct emit_callback *ecbdata)
 493{
 494        if (ecbdata->diff_words) {
 495                /* flush buffers */
 496                if (ecbdata->diff_words->minus.text.size ||
 497                                ecbdata->diff_words->plus.text.size)
 498                        diff_words_show(ecbdata->diff_words);
 499
 500                free (ecbdata->diff_words->minus.text.ptr);
 501                free (ecbdata->diff_words->plus.text.ptr);
 502                free(ecbdata->diff_words);
 503                ecbdata->diff_words = NULL;
 504        }
 505}
 506
 507const char *diff_get_color(int diff_use_color, enum color_diff ix)
 508{
 509        if (diff_use_color)
 510                return diff_colors[ix];
 511        return "";
 512}
 513
 514static void emit_line(FILE *file, const char *set, const char *reset, const char *line, int len)
 515{
 516        int has_trailing_newline = (len > 0 && line[len-1] == '\n');
 517        if (has_trailing_newline)
 518                len--;
 519
 520        fputs(set, file);
 521        fwrite(line, len, 1, file);
 522        fputs(reset, file);
 523        if (has_trailing_newline)
 524                fputc('\n', file);
 525}
 526
 527static void emit_add_line(const char *reset, struct emit_callback *ecbdata, const char *line, int len)
 528{
 529        const char *ws = diff_get_color(ecbdata->color_diff, DIFF_WHITESPACE);
 530        const char *set = diff_get_color(ecbdata->color_diff, DIFF_FILE_NEW);
 531
 532        if (!*ws)
 533                emit_line(ecbdata->file, set, reset, line, len);
 534        else {
 535                /* Emit just the prefix, then the rest. */
 536                emit_line(ecbdata->file, set, reset, line, ecbdata->nparents);
 537                ws_check_emit(line + ecbdata->nparents,
 538                              len - ecbdata->nparents, ecbdata->ws_rule,
 539                              ecbdata->file, set, reset, ws);
 540        }
 541}
 542
 543static unsigned long sane_truncate_line(struct emit_callback *ecb, char *line, unsigned long len)
 544{
 545        const char *cp;
 546        unsigned long allot;
 547        size_t l = len;
 548
 549        if (ecb->truncate)
 550                return ecb->truncate(line, len);
 551        cp = line;
 552        allot = l;
 553        while (0 < l) {
 554                (void) utf8_width(&cp, &l);
 555                if (!cp)
 556                        break; /* truncated in the middle? */
 557        }
 558        return allot - l;
 559}
 560
 561static void fn_out_consume(void *priv, char *line, unsigned long len)
 562{
 563        int i;
 564        int color;
 565        struct emit_callback *ecbdata = priv;
 566        const char *meta = diff_get_color(ecbdata->color_diff, DIFF_METAINFO);
 567        const char *plain = diff_get_color(ecbdata->color_diff, DIFF_PLAIN);
 568        const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
 569
 570        *(ecbdata->found_changesp) = 1;
 571
 572        if (ecbdata->label_path[0]) {
 573                const char *name_a_tab, *name_b_tab;
 574
 575                name_a_tab = strchr(ecbdata->label_path[0], ' ') ? "\t" : "";
 576                name_b_tab = strchr(ecbdata->label_path[1], ' ') ? "\t" : "";
 577
 578                fprintf(ecbdata->file, "%s--- %s%s%s\n",
 579                        meta, ecbdata->label_path[0], reset, name_a_tab);
 580                fprintf(ecbdata->file, "%s+++ %s%s%s\n",
 581                        meta, ecbdata->label_path[1], reset, name_b_tab);
 582                ecbdata->label_path[0] = ecbdata->label_path[1] = NULL;
 583        }
 584
 585        if (diff_suppress_blank_empty
 586            && len == 2 && line[0] == ' ' && line[1] == '\n') {
 587                line[0] = '\n';
 588                len = 1;
 589        }
 590
 591        /* This is not really necessary for now because
 592         * this codepath only deals with two-way diffs.
 593         */
 594        for (i = 0; i < len && line[i] == '@'; i++)
 595                ;
 596        if (2 <= i && i < len && line[i] == ' ') {
 597                ecbdata->nparents = i - 1;
 598                len = sane_truncate_line(ecbdata, line, len);
 599                emit_line(ecbdata->file,
 600                          diff_get_color(ecbdata->color_diff, DIFF_FRAGINFO),
 601                          reset, line, len);
 602                if (line[len-1] != '\n')
 603                        putc('\n', ecbdata->file);
 604                return;
 605        }
 606
 607        if (len < ecbdata->nparents) {
 608                emit_line(ecbdata->file, reset, reset, line, len);
 609                return;
 610        }
 611
 612        color = DIFF_PLAIN;
 613        if (ecbdata->diff_words && ecbdata->nparents != 1)
 614                /* fall back to normal diff */
 615                free_diff_words_data(ecbdata);
 616        if (ecbdata->diff_words) {
 617                if (line[0] == '-') {
 618                        diff_words_append(line, len,
 619                                          &ecbdata->diff_words->minus);
 620                        return;
 621                } else if (line[0] == '+') {
 622                        diff_words_append(line, len,
 623                                          &ecbdata->diff_words->plus);
 624                        return;
 625                }
 626                if (ecbdata->diff_words->minus.text.size ||
 627                    ecbdata->diff_words->plus.text.size)
 628                        diff_words_show(ecbdata->diff_words);
 629                line++;
 630                len--;
 631                emit_line(ecbdata->file, plain, reset, line, len);
 632                return;
 633        }
 634        for (i = 0; i < ecbdata->nparents && len; i++) {
 635                if (line[i] == '-')
 636                        color = DIFF_FILE_OLD;
 637                else if (line[i] == '+')
 638                        color = DIFF_FILE_NEW;
 639        }
 640
 641        if (color != DIFF_FILE_NEW) {
 642                emit_line(ecbdata->file,
 643                          diff_get_color(ecbdata->color_diff, color),
 644                          reset, line, len);
 645                return;
 646        }
 647        emit_add_line(reset, ecbdata, line, len);
 648}
 649
 650static char *pprint_rename(const char *a, const char *b)
 651{
 652        const char *old = a;
 653        const char *new = b;
 654        struct strbuf name;
 655        int pfx_length, sfx_length;
 656        int len_a = strlen(a);
 657        int len_b = strlen(b);
 658        int a_midlen, b_midlen;
 659        int qlen_a = quote_c_style(a, NULL, NULL, 0);
 660        int qlen_b = quote_c_style(b, NULL, NULL, 0);
 661
 662        strbuf_init(&name, 0);
 663        if (qlen_a || qlen_b) {
 664                quote_c_style(a, &name, NULL, 0);
 665                strbuf_addstr(&name, " => ");
 666                quote_c_style(b, &name, NULL, 0);
 667                return strbuf_detach(&name, NULL);
 668        }
 669
 670        /* Find common prefix */
 671        pfx_length = 0;
 672        while (*old && *new && *old == *new) {
 673                if (*old == '/')
 674                        pfx_length = old - a + 1;
 675                old++;
 676                new++;
 677        }
 678
 679        /* Find common suffix */
 680        old = a + len_a;
 681        new = b + len_b;
 682        sfx_length = 0;
 683        while (a <= old && b <= new && *old == *new) {
 684                if (*old == '/')
 685                        sfx_length = len_a - (old - a);
 686                old--;
 687                new--;
 688        }
 689
 690        /*
 691         * pfx{mid-a => mid-b}sfx
 692         * {pfx-a => pfx-b}sfx
 693         * pfx{sfx-a => sfx-b}
 694         * name-a => name-b
 695         */
 696        a_midlen = len_a - pfx_length - sfx_length;
 697        b_midlen = len_b - pfx_length - sfx_length;
 698        if (a_midlen < 0)
 699                a_midlen = 0;
 700        if (b_midlen < 0)
 701                b_midlen = 0;
 702
 703        strbuf_grow(&name, pfx_length + a_midlen + b_midlen + sfx_length + 7);
 704        if (pfx_length + sfx_length) {
 705                strbuf_add(&name, a, pfx_length);
 706                strbuf_addch(&name, '{');
 707        }
 708        strbuf_add(&name, a + pfx_length, a_midlen);
 709        strbuf_addstr(&name, " => ");
 710        strbuf_add(&name, b + pfx_length, b_midlen);
 711        if (pfx_length + sfx_length) {
 712                strbuf_addch(&name, '}');
 713                strbuf_add(&name, a + len_a - sfx_length, sfx_length);
 714        }
 715        return strbuf_detach(&name, NULL);
 716}
 717
 718struct diffstat_t {
 719        int nr;
 720        int alloc;
 721        struct diffstat_file {
 722                char *from_name;
 723                char *name;
 724                char *print_name;
 725                unsigned is_unmerged:1;
 726                unsigned is_binary:1;
 727                unsigned is_renamed:1;
 728                unsigned int added, deleted;
 729        } **files;
 730};
 731
 732static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat,
 733                                          const char *name_a,
 734                                          const char *name_b)
 735{
 736        struct diffstat_file *x;
 737        x = xcalloc(sizeof (*x), 1);
 738        if (diffstat->nr == diffstat->alloc) {
 739                diffstat->alloc = alloc_nr(diffstat->alloc);
 740                diffstat->files = xrealloc(diffstat->files,
 741                                diffstat->alloc * sizeof(x));
 742        }
 743        diffstat->files[diffstat->nr++] = x;
 744        if (name_b) {
 745                x->from_name = xstrdup(name_a);
 746                x->name = xstrdup(name_b);
 747                x->is_renamed = 1;
 748        }
 749        else {
 750                x->from_name = NULL;
 751                x->name = xstrdup(name_a);
 752        }
 753        return x;
 754}
 755
 756static void diffstat_consume(void *priv, char *line, unsigned long len)
 757{
 758        struct diffstat_t *diffstat = priv;
 759        struct diffstat_file *x = diffstat->files[diffstat->nr - 1];
 760
 761        if (line[0] == '+')
 762                x->added++;
 763        else if (line[0] == '-')
 764                x->deleted++;
 765}
 766
 767const char mime_boundary_leader[] = "------------";
 768
 769static int scale_linear(int it, int width, int max_change)
 770{
 771        /*
 772         * make sure that at least one '-' is printed if there were deletions,
 773         * and likewise for '+'.
 774         */
 775        if (max_change < 2)
 776                return it;
 777        return ((it - 1) * (width - 1) + max_change - 1) / (max_change - 1);
 778}
 779
 780static void show_name(FILE *file,
 781                      const char *prefix, const char *name, int len,
 782                      const char *reset, const char *set)
 783{
 784        fprintf(file, " %s%s%-*s%s |", set, prefix, len, name, reset);
 785}
 786
 787static void show_graph(FILE *file, char ch, int cnt, const char *set, const char *reset)
 788{
 789        if (cnt <= 0)
 790                return;
 791        fprintf(file, "%s", set);
 792        while (cnt--)
 793                putc(ch, file);
 794        fprintf(file, "%s", reset);
 795}
 796
 797static void fill_print_name(struct diffstat_file *file)
 798{
 799        char *pname;
 800
 801        if (file->print_name)
 802                return;
 803
 804        if (!file->is_renamed) {
 805                struct strbuf buf;
 806                strbuf_init(&buf, 0);
 807                if (quote_c_style(file->name, &buf, NULL, 0)) {
 808                        pname = strbuf_detach(&buf, NULL);
 809                } else {
 810                        pname = file->name;
 811                        strbuf_release(&buf);
 812                }
 813        } else {
 814                pname = pprint_rename(file->from_name, file->name);
 815        }
 816        file->print_name = pname;
 817}
 818
 819static void show_stats(struct diffstat_t* data, struct diff_options *options)
 820{
 821        int i, len, add, del, total, adds = 0, dels = 0;
 822        int max_change = 0, max_len = 0;
 823        int total_files = data->nr;
 824        int width, name_width;
 825        const char *reset, *set, *add_c, *del_c;
 826
 827        if (data->nr == 0)
 828                return;
 829
 830        width = options->stat_width ? options->stat_width : 80;
 831        name_width = options->stat_name_width ? options->stat_name_width : 50;
 832
 833        /* Sanity: give at least 5 columns to the graph,
 834         * but leave at least 10 columns for the name.
 835         */
 836        if (width < 25)
 837                width = 25;
 838        if (name_width < 10)
 839                name_width = 10;
 840        else if (width < name_width + 15)
 841                name_width = width - 15;
 842
 843        /* Find the longest filename and max number of changes */
 844        reset = diff_get_color_opt(options, DIFF_RESET);
 845        set   = diff_get_color_opt(options, DIFF_PLAIN);
 846        add_c = diff_get_color_opt(options, DIFF_FILE_NEW);
 847        del_c = diff_get_color_opt(options, DIFF_FILE_OLD);
 848
 849        for (i = 0; i < data->nr; i++) {
 850                struct diffstat_file *file = data->files[i];
 851                int change = file->added + file->deleted;
 852                fill_print_name(file);
 853                len = strlen(file->print_name);
 854                if (max_len < len)
 855                        max_len = len;
 856
 857                if (file->is_binary || file->is_unmerged)
 858                        continue;
 859                if (max_change < change)
 860                        max_change = change;
 861        }
 862
 863        /* Compute the width of the graph part;
 864         * 10 is for one blank at the beginning of the line plus
 865         * " | count " between the name and the graph.
 866         *
 867         * From here on, name_width is the width of the name area,
 868         * and width is the width of the graph area.
 869         */
 870        name_width = (name_width < max_len) ? name_width : max_len;
 871        if (width < (name_width + 10) + max_change)
 872                width = width - (name_width + 10);
 873        else
 874                width = max_change;
 875
 876        for (i = 0; i < data->nr; i++) {
 877                const char *prefix = "";
 878                char *name = data->files[i]->print_name;
 879                int added = data->files[i]->added;
 880                int deleted = data->files[i]->deleted;
 881                int name_len;
 882
 883                /*
 884                 * "scale" the filename
 885                 */
 886                len = name_width;
 887                name_len = strlen(name);
 888                if (name_width < name_len) {
 889                        char *slash;
 890                        prefix = "...";
 891                        len -= 3;
 892                        name += name_len - len;
 893                        slash = strchr(name, '/');
 894                        if (slash)
 895                                name = slash;
 896                }
 897
 898                if (data->files[i]->is_binary) {
 899                        show_name(options->file, prefix, name, len, reset, set);
 900                        fprintf(options->file, "  Bin ");
 901                        fprintf(options->file, "%s%d%s", del_c, deleted, reset);
 902                        fprintf(options->file, " -> ");
 903                        fprintf(options->file, "%s%d%s", add_c, added, reset);
 904                        fprintf(options->file, " bytes");
 905                        fprintf(options->file, "\n");
 906                        continue;
 907                }
 908                else if (data->files[i]->is_unmerged) {
 909                        show_name(options->file, prefix, name, len, reset, set);
 910                        fprintf(options->file, "  Unmerged\n");
 911                        continue;
 912                }
 913                else if (!data->files[i]->is_renamed &&
 914                         (added + deleted == 0)) {
 915                        total_files--;
 916                        continue;
 917                }
 918
 919                /*
 920                 * scale the add/delete
 921                 */
 922                add = added;
 923                del = deleted;
 924                total = add + del;
 925                adds += add;
 926                dels += del;
 927
 928                if (width <= max_change) {
 929                        add = scale_linear(add, width, max_change);
 930                        del = scale_linear(del, width, max_change);
 931                        total = add + del;
 932                }
 933                show_name(options->file, prefix, name, len, reset, set);
 934                fprintf(options->file, "%5d%s", added + deleted,
 935                                added + deleted ? " " : "");
 936                show_graph(options->file, '+', add, add_c, reset);
 937                show_graph(options->file, '-', del, del_c, reset);
 938                fprintf(options->file, "\n");
 939        }
 940        fprintf(options->file,
 941               "%s %d files changed, %d insertions(+), %d deletions(-)%s\n",
 942               set, total_files, adds, dels, reset);
 943}
 944
 945static void show_shortstats(struct diffstat_t* data, struct diff_options *options)
 946{
 947        int i, adds = 0, dels = 0, total_files = data->nr;
 948
 949        if (data->nr == 0)
 950                return;
 951
 952        for (i = 0; i < data->nr; i++) {
 953                if (!data->files[i]->is_binary &&
 954                    !data->files[i]->is_unmerged) {
 955                        int added = data->files[i]->added;
 956                        int deleted= data->files[i]->deleted;
 957                        if (!data->files[i]->is_renamed &&
 958                            (added + deleted == 0)) {
 959                                total_files--;
 960                        } else {
 961                                adds += added;
 962                                dels += deleted;
 963                        }
 964                }
 965        }
 966        fprintf(options->file, " %d files changed, %d insertions(+), %d deletions(-)\n",
 967               total_files, adds, dels);
 968}
 969
 970static void show_numstat(struct diffstat_t* data, struct diff_options *options)
 971{
 972        int i;
 973
 974        if (data->nr == 0)
 975                return;
 976
 977        for (i = 0; i < data->nr; i++) {
 978                struct diffstat_file *file = data->files[i];
 979
 980                if (file->is_binary)
 981                        fprintf(options->file, "-\t-\t");
 982                else
 983                        fprintf(options->file,
 984                                "%d\t%d\t", file->added, file->deleted);
 985                if (options->line_termination) {
 986                        fill_print_name(file);
 987                        if (!file->is_renamed)
 988                                write_name_quoted(file->name, options->file,
 989                                                  options->line_termination);
 990                        else {
 991                                fputs(file->print_name, options->file);
 992                                putc(options->line_termination, options->file);
 993                        }
 994                } else {
 995                        if (file->is_renamed) {
 996                                putc('\0', options->file);
 997                                write_name_quoted(file->from_name, options->file, '\0');
 998                        }
 999                        write_name_quoted(file->name, options->file, '\0');
1000                }
1001        }
1002}
1003
1004struct dirstat_file {
1005        const char *name;
1006        unsigned long changed;
1007};
1008
1009struct dirstat_dir {
1010        struct dirstat_file *files;
1011        int alloc, nr, percent, cumulative;
1012};
1013
1014static long gather_dirstat(FILE *file, struct dirstat_dir *dir, unsigned long changed, const char *base, int baselen)
1015{
1016        unsigned long this_dir = 0;
1017        unsigned int sources = 0;
1018
1019        while (dir->nr) {
1020                struct dirstat_file *f = dir->files;
1021                int namelen = strlen(f->name);
1022                unsigned long this;
1023                char *slash;
1024
1025                if (namelen < baselen)
1026                        break;
1027                if (memcmp(f->name, base, baselen))
1028                        break;
1029                slash = strchr(f->name + baselen, '/');
1030                if (slash) {
1031                        int newbaselen = slash + 1 - f->name;
1032                        this = gather_dirstat(file, dir, changed, f->name, newbaselen);
1033                        sources++;
1034                } else {
1035                        this = f->changed;
1036                        dir->files++;
1037                        dir->nr--;
1038                        sources += 2;
1039                }
1040                this_dir += this;
1041        }
1042
1043        /*
1044         * We don't report dirstat's for
1045         *  - the top level
1046         *  - or cases where everything came from a single directory
1047         *    under this directory (sources == 1).
1048         */
1049        if (baselen && sources != 1) {
1050                int permille = this_dir * 1000 / changed;
1051                if (permille) {
1052                        int percent = permille / 10;
1053                        if (percent >= dir->percent) {
1054                                fprintf(file, "%4d.%01d%% %.*s\n", percent, permille % 10, baselen, base);
1055                                if (!dir->cumulative)
1056                                        return 0;
1057                        }
1058                }
1059        }
1060        return this_dir;
1061}
1062
1063static void show_dirstat(struct diff_options *options)
1064{
1065        int i;
1066        unsigned long changed;
1067        struct dirstat_dir dir;
1068        struct diff_queue_struct *q = &diff_queued_diff;
1069
1070        dir.files = NULL;
1071        dir.alloc = 0;
1072        dir.nr = 0;
1073        dir.percent = options->dirstat_percent;
1074        dir.cumulative = options->output_format & DIFF_FORMAT_CUMULATIVE;
1075
1076        changed = 0;
1077        for (i = 0; i < q->nr; i++) {
1078                struct diff_filepair *p = q->queue[i];
1079                const char *name;
1080                unsigned long copied, added, damage;
1081
1082                name = p->one->path ? p->one->path : p->two->path;
1083
1084                if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
1085                        diff_populate_filespec(p->one, 0);
1086                        diff_populate_filespec(p->two, 0);
1087                        diffcore_count_changes(p->one, p->two, NULL, NULL, 0,
1088                                               &copied, &added);
1089                        diff_free_filespec_data(p->one);
1090                        diff_free_filespec_data(p->two);
1091                } else if (DIFF_FILE_VALID(p->one)) {
1092                        diff_populate_filespec(p->one, 1);
1093                        copied = added = 0;
1094                        diff_free_filespec_data(p->one);
1095                } else if (DIFF_FILE_VALID(p->two)) {
1096                        diff_populate_filespec(p->two, 1);
1097                        copied = 0;
1098                        added = p->two->size;
1099                        diff_free_filespec_data(p->two);
1100                } else
1101                        continue;
1102
1103                /*
1104                 * Original minus copied is the removed material,
1105                 * added is the new material.  They are both damages
1106                 * made to the preimage.
1107                 */
1108                damage = (p->one->size - copied) + added;
1109
1110                ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
1111                dir.files[dir.nr].name = name;
1112                dir.files[dir.nr].changed = damage;
1113                changed += damage;
1114                dir.nr++;
1115        }
1116
1117        /* This can happen even with many files, if everything was renames */
1118        if (!changed)
1119                return;
1120
1121        /* Show all directories with more than x% of the changes */
1122        gather_dirstat(options->file, &dir, changed, "", 0);
1123}
1124
1125static void free_diffstat_info(struct diffstat_t *diffstat)
1126{
1127        int i;
1128        for (i = 0; i < diffstat->nr; i++) {
1129                struct diffstat_file *f = diffstat->files[i];
1130                if (f->name != f->print_name)
1131                        free(f->print_name);
1132                free(f->name);
1133                free(f->from_name);
1134                free(f);
1135        }
1136        free(diffstat->files);
1137}
1138
1139struct checkdiff_t {
1140        const char *filename;
1141        int lineno;
1142        struct diff_options *o;
1143        unsigned ws_rule;
1144        unsigned status;
1145        int trailing_blanks_start;
1146};
1147
1148static int is_conflict_marker(const char *line, unsigned long len)
1149{
1150        char firstchar;
1151        int cnt;
1152
1153        if (len < 8)
1154                return 0;
1155        firstchar = line[0];
1156        switch (firstchar) {
1157        case '=': case '>': case '<':
1158                break;
1159        default:
1160                return 0;
1161        }
1162        for (cnt = 1; cnt < 7; cnt++)
1163                if (line[cnt] != firstchar)
1164                        return 0;
1165        /* line[0] thru line[6] are same as firstchar */
1166        if (firstchar == '=') {
1167                /* divider between ours and theirs? */
1168                if (len != 8 || line[7] != '\n')
1169                        return 0;
1170        } else if (len < 8 || !isspace(line[7])) {
1171                /* not divider before ours nor after theirs */
1172                return 0;
1173        }
1174        return 1;
1175}
1176
1177static void checkdiff_consume(void *priv, char *line, unsigned long len)
1178{
1179        struct checkdiff_t *data = priv;
1180        int color_diff = DIFF_OPT_TST(data->o, COLOR_DIFF);
1181        const char *ws = diff_get_color(color_diff, DIFF_WHITESPACE);
1182        const char *reset = diff_get_color(color_diff, DIFF_RESET);
1183        const char *set = diff_get_color(color_diff, DIFF_FILE_NEW);
1184        char *err;
1185
1186        if (line[0] == '+') {
1187                unsigned bad;
1188                data->lineno++;
1189                if (!ws_blank_line(line + 1, len - 1, data->ws_rule))
1190                        data->trailing_blanks_start = 0;
1191                else if (!data->trailing_blanks_start)
1192                        data->trailing_blanks_start = data->lineno;
1193                if (is_conflict_marker(line + 1, len - 1)) {
1194                        data->status |= 1;
1195                        fprintf(data->o->file,
1196                                "%s:%d: leftover conflict marker\n",
1197                                data->filename, data->lineno);
1198                }
1199                bad = ws_check(line + 1, len - 1, data->ws_rule);
1200                if (!bad)
1201                        return;
1202                data->status |= bad;
1203                err = whitespace_error_string(bad);
1204                fprintf(data->o->file, "%s:%d: %s.\n",
1205                        data->filename, data->lineno, err);
1206                free(err);
1207                emit_line(data->o->file, set, reset, line, 1);
1208                ws_check_emit(line + 1, len - 1, data->ws_rule,
1209                              data->o->file, set, reset, ws);
1210        } else if (line[0] == ' ') {
1211                data->lineno++;
1212                data->trailing_blanks_start = 0;
1213        } else if (line[0] == '@') {
1214                char *plus = strchr(line, '+');
1215                if (plus)
1216                        data->lineno = strtol(plus, NULL, 10) - 1;
1217                else
1218                        die("invalid diff");
1219                data->trailing_blanks_start = 0;
1220        }
1221}
1222
1223static unsigned char *deflate_it(char *data,
1224                                 unsigned long size,
1225                                 unsigned long *result_size)
1226{
1227        int bound;
1228        unsigned char *deflated;
1229        z_stream stream;
1230
1231        memset(&stream, 0, sizeof(stream));
1232        deflateInit(&stream, zlib_compression_level);
1233        bound = deflateBound(&stream, size);
1234        deflated = xmalloc(bound);
1235        stream.next_out = deflated;
1236        stream.avail_out = bound;
1237
1238        stream.next_in = (unsigned char *)data;
1239        stream.avail_in = size;
1240        while (deflate(&stream, Z_FINISH) == Z_OK)
1241                ; /* nothing */
1242        deflateEnd(&stream);
1243        *result_size = stream.total_out;
1244        return deflated;
1245}
1246
1247static void emit_binary_diff_body(FILE *file, mmfile_t *one, mmfile_t *two)
1248{
1249        void *cp;
1250        void *delta;
1251        void *deflated;
1252        void *data;
1253        unsigned long orig_size;
1254        unsigned long delta_size;
1255        unsigned long deflate_size;
1256        unsigned long data_size;
1257
1258        /* We could do deflated delta, or we could do just deflated two,
1259         * whichever is smaller.
1260         */
1261        delta = NULL;
1262        deflated = deflate_it(two->ptr, two->size, &deflate_size);
1263        if (one->size && two->size) {
1264                delta = diff_delta(one->ptr, one->size,
1265                                   two->ptr, two->size,
1266                                   &delta_size, deflate_size);
1267                if (delta) {
1268                        void *to_free = delta;
1269                        orig_size = delta_size;
1270                        delta = deflate_it(delta, delta_size, &delta_size);
1271                        free(to_free);
1272                }
1273        }
1274
1275        if (delta && delta_size < deflate_size) {
1276                fprintf(file, "delta %lu\n", orig_size);
1277                free(deflated);
1278                data = delta;
1279                data_size = delta_size;
1280        }
1281        else {
1282                fprintf(file, "literal %lu\n", two->size);
1283                free(delta);
1284                data = deflated;
1285                data_size = deflate_size;
1286        }
1287
1288        /* emit data encoded in base85 */
1289        cp = data;
1290        while (data_size) {
1291                int bytes = (52 < data_size) ? 52 : data_size;
1292                char line[70];
1293                data_size -= bytes;
1294                if (bytes <= 26)
1295                        line[0] = bytes + 'A' - 1;
1296                else
1297                        line[0] = bytes - 26 + 'a' - 1;
1298                encode_85(line + 1, cp, bytes);
1299                cp = (char *) cp + bytes;
1300                fputs(line, file);
1301                fputc('\n', file);
1302        }
1303        fprintf(file, "\n");
1304        free(data);
1305}
1306
1307static void emit_binary_diff(FILE *file, mmfile_t *one, mmfile_t *two)
1308{
1309        fprintf(file, "GIT binary patch\n");
1310        emit_binary_diff_body(file, one, two);
1311        emit_binary_diff_body(file, two, one);
1312}
1313
1314static void setup_diff_attr_check(struct git_attr_check *check)
1315{
1316        static struct git_attr *attr_diff;
1317
1318        if (!attr_diff) {
1319                attr_diff = git_attr("diff", 4);
1320        }
1321        check[0].attr = attr_diff;
1322}
1323
1324static void diff_filespec_check_attr(struct diff_filespec *one)
1325{
1326        struct git_attr_check attr_diff_check;
1327        int check_from_data = 0;
1328
1329        if (one->checked_attr)
1330                return;
1331
1332        setup_diff_attr_check(&attr_diff_check);
1333        one->is_binary = 0;
1334        one->funcname_pattern_ident = NULL;
1335
1336        if (!git_checkattr(one->path, 1, &attr_diff_check)) {
1337                const char *value;
1338
1339                /* binaryness */
1340                value = attr_diff_check.value;
1341                if (ATTR_TRUE(value))
1342                        ;
1343                else if (ATTR_FALSE(value))
1344                        one->is_binary = 1;
1345                else
1346                        check_from_data = 1;
1347
1348                /* funcname pattern ident */
1349                if (ATTR_TRUE(value) || ATTR_FALSE(value) || ATTR_UNSET(value))
1350                        ;
1351                else
1352                        one->funcname_pattern_ident = value;
1353        }
1354
1355        if (check_from_data) {
1356                if (!one->data && DIFF_FILE_VALID(one))
1357                        diff_populate_filespec(one, 0);
1358
1359                if (one->data)
1360                        one->is_binary = buffer_is_binary(one->data, one->size);
1361        }
1362}
1363
1364int diff_filespec_is_binary(struct diff_filespec *one)
1365{
1366        diff_filespec_check_attr(one);
1367        return one->is_binary;
1368}
1369
1370static const char *funcname_pattern(const char *ident)
1371{
1372        struct funcname_pattern *pp;
1373
1374        for (pp = funcname_pattern_list; pp; pp = pp->next)
1375                if (!strcmp(ident, pp->name))
1376                        return pp->pattern;
1377        return NULL;
1378}
1379
1380static struct builtin_funcname_pattern {
1381        const char *name;
1382        const char *pattern;
1383} builtin_funcname_pattern[] = {
1384        { "bibtex", "\\(@[a-zA-Z]\\{1,\\}[ \t]*{\\{0,1\\}[ \t]*[^ \t\"@',\\#}{~%]*\\).*$" },
1385        { "html", "^\\s*\\(<[Hh][1-6]\\s.*>.*\\)$" },
1386        { "java", "!^[  ]*\\(catch\\|do\\|for\\|if\\|instanceof\\|"
1387                        "new\\|return\\|switch\\|throw\\|while\\)\n"
1388                        "^[     ]*\\(\\([       ]*"
1389                        "[A-Za-z_][A-Za-z_0-9]*\\)\\{2,\\}"
1390                        "[      ]*([^;]*\\)$" },
1391        { "pascal", "^\\(\\(procedure\\|function\\|constructor\\|"
1392                        "destructor\\|interface\\|implementation\\|"
1393                        "initialization\\|finalization\\)[ \t]*.*\\)$"
1394                        "\\|"
1395                        "^\\(.*=[ \t]*\\(class\\|record\\).*\\)$"
1396                        },
1397        { "python", "^\\s*\\(\\(class\\|def\\)\\s.*\\)$" },
1398        { "ruby", "^\\s*\\(\\(class\\|module\\|def\\)\\s.*\\)$" },
1399        { "tex", "^\\(\\\\\\(\\(sub\\)*section\\|chapter\\|part\\)\\*\\{0,1\\}{.*\\)$" },
1400};
1401
1402static const char *diff_funcname_pattern(struct diff_filespec *one)
1403{
1404        const char *ident, *pattern;
1405        int i;
1406
1407        diff_filespec_check_attr(one);
1408        ident = one->funcname_pattern_ident;
1409
1410        if (!ident)
1411                /*
1412                 * If the config file has "funcname.default" defined, that
1413                 * regexp is used; otherwise NULL is returned and xemit uses
1414                 * the built-in default.
1415                 */
1416                return funcname_pattern("default");
1417
1418        /* Look up custom "funcname.$ident" regexp from config. */
1419        pattern = funcname_pattern(ident);
1420        if (pattern)
1421                return pattern;
1422
1423        /*
1424         * And define built-in fallback patterns here.  Note that
1425         * these can be overridden by the user's config settings.
1426         */
1427        for (i = 0; i < ARRAY_SIZE(builtin_funcname_pattern); i++)
1428                if (!strcmp(ident, builtin_funcname_pattern[i].name))
1429                        return builtin_funcname_pattern[i].pattern;
1430
1431        return NULL;
1432}
1433
1434static void builtin_diff(const char *name_a,
1435                         const char *name_b,
1436                         struct diff_filespec *one,
1437                         struct diff_filespec *two,
1438                         const char *xfrm_msg,
1439                         struct diff_options *o,
1440                         int complete_rewrite)
1441{
1442        mmfile_t mf1, mf2;
1443        const char *lbl[2];
1444        char *a_one, *b_two;
1445        const char *set = diff_get_color_opt(o, DIFF_METAINFO);
1446        const char *reset = diff_get_color_opt(o, DIFF_RESET);
1447
1448        a_one = quote_two(o->a_prefix, name_a + (*name_a == '/'));
1449        b_two = quote_two(o->b_prefix, name_b + (*name_b == '/'));
1450        lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
1451        lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
1452        fprintf(o->file, "%sdiff --git %s %s%s\n", set, a_one, b_two, reset);
1453        if (lbl[0][0] == '/') {
1454                /* /dev/null */
1455                fprintf(o->file, "%snew file mode %06o%s\n", set, two->mode, reset);
1456                if (xfrm_msg && xfrm_msg[0])
1457                        fprintf(o->file, "%s%s%s\n", set, xfrm_msg, reset);
1458        }
1459        else if (lbl[1][0] == '/') {
1460                fprintf(o->file, "%sdeleted file mode %06o%s\n", set, one->mode, reset);
1461                if (xfrm_msg && xfrm_msg[0])
1462                        fprintf(o->file, "%s%s%s\n", set, xfrm_msg, reset);
1463        }
1464        else {
1465                if (one->mode != two->mode) {
1466                        fprintf(o->file, "%sold mode %06o%s\n", set, one->mode, reset);
1467                        fprintf(o->file, "%snew mode %06o%s\n", set, two->mode, reset);
1468                }
1469                if (xfrm_msg && xfrm_msg[0])
1470                        fprintf(o->file, "%s%s%s\n", set, xfrm_msg, reset);
1471                /*
1472                 * we do not run diff between different kind
1473                 * of objects.
1474                 */
1475                if ((one->mode ^ two->mode) & S_IFMT)
1476                        goto free_ab_and_return;
1477                if (complete_rewrite) {
1478                        emit_rewrite_diff(name_a, name_b, one, two, o);
1479                        o->found_changes = 1;
1480                        goto free_ab_and_return;
1481                }
1482        }
1483
1484        if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
1485                die("unable to read files to diff");
1486
1487        if (!DIFF_OPT_TST(o, TEXT) &&
1488            (diff_filespec_is_binary(one) || diff_filespec_is_binary(two))) {
1489                /* Quite common confusing case */
1490                if (mf1.size == mf2.size &&
1491                    !memcmp(mf1.ptr, mf2.ptr, mf1.size))
1492                        goto free_ab_and_return;
1493                if (DIFF_OPT_TST(o, BINARY))
1494                        emit_binary_diff(o->file, &mf1, &mf2);
1495                else
1496                        fprintf(o->file, "Binary files %s and %s differ\n",
1497                                lbl[0], lbl[1]);
1498                o->found_changes = 1;
1499        }
1500        else {
1501                /* Crazy xdl interfaces.. */
1502                const char *diffopts = getenv("GIT_DIFF_OPTS");
1503                xpparam_t xpp;
1504                xdemitconf_t xecfg;
1505                xdemitcb_t ecb;
1506                struct emit_callback ecbdata;
1507                const char *funcname_pattern;
1508
1509                funcname_pattern = diff_funcname_pattern(one);
1510                if (!funcname_pattern)
1511                        funcname_pattern = diff_funcname_pattern(two);
1512
1513                memset(&xecfg, 0, sizeof(xecfg));
1514                memset(&ecbdata, 0, sizeof(ecbdata));
1515                ecbdata.label_path = lbl;
1516                ecbdata.color_diff = DIFF_OPT_TST(o, COLOR_DIFF);
1517                ecbdata.found_changesp = &o->found_changes;
1518                ecbdata.ws_rule = whitespace_rule(name_b ? name_b : name_a);
1519                ecbdata.file = o->file;
1520                xpp.flags = XDF_NEED_MINIMAL | o->xdl_opts;
1521                xecfg.ctxlen = o->context;
1522                xecfg.flags = XDL_EMIT_FUNCNAMES;
1523                if (funcname_pattern)
1524                        xdiff_set_find_func(&xecfg, funcname_pattern);
1525                if (!diffopts)
1526                        ;
1527                else if (!prefixcmp(diffopts, "--unified="))
1528                        xecfg.ctxlen = strtoul(diffopts + 10, NULL, 10);
1529                else if (!prefixcmp(diffopts, "-u"))
1530                        xecfg.ctxlen = strtoul(diffopts + 2, NULL, 10);
1531                if (DIFF_OPT_TST(o, COLOR_DIFF_WORDS)) {
1532                        ecbdata.diff_words =
1533                                xcalloc(1, sizeof(struct diff_words_data));
1534                        ecbdata.diff_words->file = o->file;
1535                }
1536                xdi_diff_outf(&mf1, &mf2, fn_out_consume, &ecbdata,
1537                              &xpp, &xecfg, &ecb);
1538                if (DIFF_OPT_TST(o, COLOR_DIFF_WORDS))
1539                        free_diff_words_data(&ecbdata);
1540        }
1541
1542 free_ab_and_return:
1543        diff_free_filespec_data(one);
1544        diff_free_filespec_data(two);
1545        free(a_one);
1546        free(b_two);
1547        return;
1548}
1549
1550static void builtin_diffstat(const char *name_a, const char *name_b,
1551                             struct diff_filespec *one,
1552                             struct diff_filespec *two,
1553                             struct diffstat_t *diffstat,
1554                             struct diff_options *o,
1555                             int complete_rewrite)
1556{
1557        mmfile_t mf1, mf2;
1558        struct diffstat_file *data;
1559
1560        data = diffstat_add(diffstat, name_a, name_b);
1561
1562        if (!one || !two) {
1563                data->is_unmerged = 1;
1564                return;
1565        }
1566        if (complete_rewrite) {
1567                diff_populate_filespec(one, 0);
1568                diff_populate_filespec(two, 0);
1569                data->deleted = count_lines(one->data, one->size);
1570                data->added = count_lines(two->data, two->size);
1571                goto free_and_return;
1572        }
1573        if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
1574                die("unable to read files to diff");
1575
1576        if (diff_filespec_is_binary(one) || diff_filespec_is_binary(two)) {
1577                data->is_binary = 1;
1578                data->added = mf2.size;
1579                data->deleted = mf1.size;
1580        } else {
1581                /* Crazy xdl interfaces.. */
1582                xpparam_t xpp;
1583                xdemitconf_t xecfg;
1584                xdemitcb_t ecb;
1585
1586                memset(&xecfg, 0, sizeof(xecfg));
1587                xpp.flags = XDF_NEED_MINIMAL | o->xdl_opts;
1588                xdi_diff_outf(&mf1, &mf2, diffstat_consume, diffstat,
1589                              &xpp, &xecfg, &ecb);
1590        }
1591
1592 free_and_return:
1593        diff_free_filespec_data(one);
1594        diff_free_filespec_data(two);
1595}
1596
1597static void builtin_checkdiff(const char *name_a, const char *name_b,
1598                              const char *attr_path,
1599                              struct diff_filespec *one,
1600                              struct diff_filespec *two,
1601                              struct diff_options *o)
1602{
1603        mmfile_t mf1, mf2;
1604        struct checkdiff_t data;
1605
1606        if (!two)
1607                return;
1608
1609        memset(&data, 0, sizeof(data));
1610        data.filename = name_b ? name_b : name_a;
1611        data.lineno = 0;
1612        data.o = o;
1613        data.ws_rule = whitespace_rule(attr_path);
1614
1615        if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
1616                die("unable to read files to diff");
1617
1618        /*
1619         * All the other codepaths check both sides, but not checking
1620         * the "old" side here is deliberate.  We are checking the newly
1621         * introduced changes, and as long as the "new" side is text, we
1622         * can and should check what it introduces.
1623         */
1624        if (diff_filespec_is_binary(two))
1625                goto free_and_return;
1626        else {
1627                /* Crazy xdl interfaces.. */
1628                xpparam_t xpp;
1629                xdemitconf_t xecfg;
1630                xdemitcb_t ecb;
1631
1632                memset(&xecfg, 0, sizeof(xecfg));
1633                xecfg.ctxlen = 1; /* at least one context line */
1634                xpp.flags = XDF_NEED_MINIMAL;
1635                xdi_diff_outf(&mf1, &mf2, checkdiff_consume, &data,
1636                              &xpp, &xecfg, &ecb);
1637
1638                if ((data.ws_rule & WS_TRAILING_SPACE) &&
1639                    data.trailing_blanks_start) {
1640                        fprintf(o->file, "%s:%d: ends with blank lines.\n",
1641                                data.filename, data.trailing_blanks_start);
1642                        data.status = 1; /* report errors */
1643                }
1644        }
1645 free_and_return:
1646        diff_free_filespec_data(one);
1647        diff_free_filespec_data(two);
1648        if (data.status)
1649                DIFF_OPT_SET(o, CHECK_FAILED);
1650}
1651
1652struct diff_filespec *alloc_filespec(const char *path)
1653{
1654        int namelen = strlen(path);
1655        struct diff_filespec *spec = xmalloc(sizeof(*spec) + namelen + 1);
1656
1657        memset(spec, 0, sizeof(*spec));
1658        spec->path = (char *)(spec + 1);
1659        memcpy(spec->path, path, namelen+1);
1660        spec->count = 1;
1661        return spec;
1662}
1663
1664void free_filespec(struct diff_filespec *spec)
1665{
1666        if (!--spec->count) {
1667                diff_free_filespec_data(spec);
1668                free(spec);
1669        }
1670}
1671
1672void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1,
1673                   unsigned short mode)
1674{
1675        if (mode) {
1676                spec->mode = canon_mode(mode);
1677                hashcpy(spec->sha1, sha1);
1678                spec->sha1_valid = !is_null_sha1(sha1);
1679        }
1680}
1681
1682/*
1683 * Given a name and sha1 pair, if the index tells us the file in
1684 * the work tree has that object contents, return true, so that
1685 * prepare_temp_file() does not have to inflate and extract.
1686 */
1687static int reuse_worktree_file(const char *name, const unsigned char *sha1, int want_file)
1688{
1689        struct cache_entry *ce;
1690        struct stat st;
1691        int pos, len;
1692
1693        /* We do not read the cache ourselves here, because the
1694         * benchmark with my previous version that always reads cache
1695         * shows that it makes things worse for diff-tree comparing
1696         * two linux-2.6 kernel trees in an already checked out work
1697         * tree.  This is because most diff-tree comparisons deal with
1698         * only a small number of files, while reading the cache is
1699         * expensive for a large project, and its cost outweighs the
1700         * savings we get by not inflating the object to a temporary
1701         * file.  Practically, this code only helps when we are used
1702         * by diff-cache --cached, which does read the cache before
1703         * calling us.
1704         */
1705        if (!active_cache)
1706                return 0;
1707
1708        /* We want to avoid the working directory if our caller
1709         * doesn't need the data in a normal file, this system
1710         * is rather slow with its stat/open/mmap/close syscalls,
1711         * and the object is contained in a pack file.  The pack
1712         * is probably already open and will be faster to obtain
1713         * the data through than the working directory.  Loose
1714         * objects however would tend to be slower as they need
1715         * to be individually opened and inflated.
1716         */
1717        if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1, NULL))
1718                return 0;
1719
1720        len = strlen(name);
1721        pos = cache_name_pos(name, len);
1722        if (pos < 0)
1723                return 0;
1724        ce = active_cache[pos];
1725
1726        /*
1727         * This is not the sha1 we are looking for, or
1728         * unreusable because it is not a regular file.
1729         */
1730        if (hashcmp(sha1, ce->sha1) || !S_ISREG(ce->ce_mode))
1731                return 0;
1732
1733        /*
1734         * If ce matches the file in the work tree, we can reuse it.
1735         */
1736        if (ce_uptodate(ce) ||
1737            (!lstat(name, &st) && !ce_match_stat(ce, &st, 0)))
1738                return 1;
1739
1740        return 0;
1741}
1742
1743static int populate_from_stdin(struct diff_filespec *s)
1744{
1745        struct strbuf buf;
1746        size_t size = 0;
1747
1748        strbuf_init(&buf, 0);
1749        if (strbuf_read(&buf, 0, 0) < 0)
1750                return error("error while reading from stdin %s",
1751                                     strerror(errno));
1752
1753        s->should_munmap = 0;
1754        s->data = strbuf_detach(&buf, &size);
1755        s->size = size;
1756        s->should_free = 1;
1757        return 0;
1758}
1759
1760static int diff_populate_gitlink(struct diff_filespec *s, int size_only)
1761{
1762        int len;
1763        char *data = xmalloc(100);
1764        len = snprintf(data, 100,
1765                "Subproject commit %s\n", sha1_to_hex(s->sha1));
1766        s->data = data;
1767        s->size = len;
1768        s->should_free = 1;
1769        if (size_only) {
1770                s->data = NULL;
1771                free(data);
1772        }
1773        return 0;
1774}
1775
1776/*
1777 * While doing rename detection and pickaxe operation, we may need to
1778 * grab the data for the blob (or file) for our own in-core comparison.
1779 * diff_filespec has data and size fields for this purpose.
1780 */
1781int diff_populate_filespec(struct diff_filespec *s, int size_only)
1782{
1783        int err = 0;
1784        if (!DIFF_FILE_VALID(s))
1785                die("internal error: asking to populate invalid file.");
1786        if (S_ISDIR(s->mode))
1787                return -1;
1788
1789        if (s->data)
1790                return 0;
1791
1792        if (size_only && 0 < s->size)
1793                return 0;
1794
1795        if (S_ISGITLINK(s->mode))
1796                return diff_populate_gitlink(s, size_only);
1797
1798        if (!s->sha1_valid ||
1799            reuse_worktree_file(s->path, s->sha1, 0)) {
1800                struct strbuf buf;
1801                struct stat st;
1802                int fd;
1803
1804                if (!strcmp(s->path, "-"))
1805                        return populate_from_stdin(s);
1806
1807                if (lstat(s->path, &st) < 0) {
1808                        if (errno == ENOENT) {
1809                        err_empty:
1810                                err = -1;
1811                        empty:
1812                                s->data = (char *)"";
1813                                s->size = 0;
1814                                return err;
1815                        }
1816                }
1817                s->size = xsize_t(st.st_size);
1818                if (!s->size)
1819                        goto empty;
1820                if (size_only)
1821                        return 0;
1822                if (S_ISLNK(st.st_mode)) {
1823                        int ret;
1824                        s->data = xmalloc(s->size);
1825                        s->should_free = 1;
1826                        ret = readlink(s->path, s->data, s->size);
1827                        if (ret < 0) {
1828                                free(s->data);
1829                                goto err_empty;
1830                        }
1831                        return 0;
1832                }
1833                fd = open(s->path, O_RDONLY);
1834                if (fd < 0)
1835                        goto err_empty;
1836                s->data = xmmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0);
1837                close(fd);
1838                s->should_munmap = 1;
1839
1840                /*
1841                 * Convert from working tree format to canonical git format
1842                 */
1843                strbuf_init(&buf, 0);
1844                if (convert_to_git(s->path, s->data, s->size, &buf, safe_crlf)) {
1845                        size_t size = 0;
1846                        munmap(s->data, s->size);
1847                        s->should_munmap = 0;
1848                        s->data = strbuf_detach(&buf, &size);
1849                        s->size = size;
1850                        s->should_free = 1;
1851                }
1852        }
1853        else {
1854                enum object_type type;
1855                if (size_only)
1856                        type = sha1_object_info(s->sha1, &s->size);
1857                else {
1858                        s->data = read_sha1_file(s->sha1, &type, &s->size);
1859                        s->should_free = 1;
1860                }
1861        }
1862        return 0;
1863}
1864
1865void diff_free_filespec_blob(struct diff_filespec *s)
1866{
1867        if (s->should_free)
1868                free(s->data);
1869        else if (s->should_munmap)
1870                munmap(s->data, s->size);
1871
1872        if (s->should_free || s->should_munmap) {
1873                s->should_free = s->should_munmap = 0;
1874                s->data = NULL;
1875        }
1876}
1877
1878void diff_free_filespec_data(struct diff_filespec *s)
1879{
1880        diff_free_filespec_blob(s);
1881        free(s->cnt_data);
1882        s->cnt_data = NULL;
1883}
1884
1885static void prep_temp_blob(struct diff_tempfile *temp,
1886                           void *blob,
1887                           unsigned long size,
1888                           const unsigned char *sha1,
1889                           int mode)
1890{
1891        int fd;
1892
1893        fd = git_mkstemp(temp->tmp_path, PATH_MAX, ".diff_XXXXXX");
1894        if (fd < 0)
1895                die("unable to create temp-file: %s", strerror(errno));
1896        if (write_in_full(fd, blob, size) != size)
1897                die("unable to write temp-file");
1898        close(fd);
1899        temp->name = temp->tmp_path;
1900        strcpy(temp->hex, sha1_to_hex(sha1));
1901        temp->hex[40] = 0;
1902        sprintf(temp->mode, "%06o", mode);
1903}
1904
1905static void prepare_temp_file(const char *name,
1906                              struct diff_tempfile *temp,
1907                              struct diff_filespec *one)
1908{
1909        if (!DIFF_FILE_VALID(one)) {
1910        not_a_valid_file:
1911                /* A '-' entry produces this for file-2, and
1912                 * a '+' entry produces this for file-1.
1913                 */
1914                temp->name = "/dev/null";
1915                strcpy(temp->hex, ".");
1916                strcpy(temp->mode, ".");
1917                return;
1918        }
1919
1920        if (!one->sha1_valid ||
1921            reuse_worktree_file(name, one->sha1, 1)) {
1922                struct stat st;
1923                if (lstat(name, &st) < 0) {
1924                        if (errno == ENOENT)
1925                                goto not_a_valid_file;
1926                        die("stat(%s): %s", name, strerror(errno));
1927                }
1928                if (S_ISLNK(st.st_mode)) {
1929                        int ret;
1930                        char buf[PATH_MAX + 1]; /* ought to be SYMLINK_MAX */
1931                        size_t sz = xsize_t(st.st_size);
1932                        if (sizeof(buf) <= st.st_size)
1933                                die("symlink too long: %s", name);
1934                        ret = readlink(name, buf, sz);
1935                        if (ret < 0)
1936                                die("readlink(%s)", name);
1937                        prep_temp_blob(temp, buf, sz,
1938                                       (one->sha1_valid ?
1939                                        one->sha1 : null_sha1),
1940                                       (one->sha1_valid ?
1941                                        one->mode : S_IFLNK));
1942                }
1943                else {
1944                        /* we can borrow from the file in the work tree */
1945                        temp->name = name;
1946                        if (!one->sha1_valid)
1947                                strcpy(temp->hex, sha1_to_hex(null_sha1));
1948                        else
1949                                strcpy(temp->hex, sha1_to_hex(one->sha1));
1950                        /* Even though we may sometimes borrow the
1951                         * contents from the work tree, we always want
1952                         * one->mode.  mode is trustworthy even when
1953                         * !(one->sha1_valid), as long as
1954                         * DIFF_FILE_VALID(one).
1955                         */
1956                        sprintf(temp->mode, "%06o", one->mode);
1957                }
1958                return;
1959        }
1960        else {
1961                if (diff_populate_filespec(one, 0))
1962                        die("cannot read data blob for %s", one->path);
1963                prep_temp_blob(temp, one->data, one->size,
1964                               one->sha1, one->mode);
1965        }
1966}
1967
1968static void remove_tempfile(void)
1969{
1970        int i;
1971
1972        for (i = 0; i < 2; i++)
1973                if (diff_temp[i].name == diff_temp[i].tmp_path) {
1974                        unlink(diff_temp[i].name);
1975                        diff_temp[i].name = NULL;
1976                }
1977}
1978
1979static void remove_tempfile_on_signal(int signo)
1980{
1981        remove_tempfile();
1982        signal(SIGINT, SIG_DFL);
1983        raise(signo);
1984}
1985
1986/* An external diff command takes:
1987 *
1988 * diff-cmd name infile1 infile1-sha1 infile1-mode \
1989 *               infile2 infile2-sha1 infile2-mode [ rename-to ]
1990 *
1991 */
1992static void run_external_diff(const char *pgm,
1993                              const char *name,
1994                              const char *other,
1995                              struct diff_filespec *one,
1996                              struct diff_filespec *two,
1997                              const char *xfrm_msg,
1998                              int complete_rewrite)
1999{
2000        const char *spawn_arg[10];
2001        struct diff_tempfile *temp = diff_temp;
2002        int retval;
2003        static int atexit_asked = 0;
2004        const char *othername;
2005        const char **arg = &spawn_arg[0];
2006
2007        othername = (other? other : name);
2008        if (one && two) {
2009                prepare_temp_file(name, &temp[0], one);
2010                prepare_temp_file(othername, &temp[1], two);
2011                if (! atexit_asked &&
2012                    (temp[0].name == temp[0].tmp_path ||
2013                     temp[1].name == temp[1].tmp_path)) {
2014                        atexit_asked = 1;
2015                        atexit(remove_tempfile);
2016                }
2017                signal(SIGINT, remove_tempfile_on_signal);
2018        }
2019
2020        if (one && two) {
2021                *arg++ = pgm;
2022                *arg++ = name;
2023                *arg++ = temp[0].name;
2024                *arg++ = temp[0].hex;
2025                *arg++ = temp[0].mode;
2026                *arg++ = temp[1].name;
2027                *arg++ = temp[1].hex;
2028                *arg++ = temp[1].mode;
2029                if (other) {
2030                        *arg++ = other;
2031                        *arg++ = xfrm_msg;
2032                }
2033        } else {
2034                *arg++ = pgm;
2035                *arg++ = name;
2036        }
2037        *arg = NULL;
2038        fflush(NULL);
2039        retval = run_command_v_opt(spawn_arg, 0);
2040        remove_tempfile();
2041        if (retval) {
2042                fprintf(stderr, "external diff died, stopping at %s.\n", name);
2043                exit(1);
2044        }
2045}
2046
2047static const char *external_diff_attr(const char *name)
2048{
2049        struct git_attr_check attr_diff_check;
2050
2051        if (!name)
2052                return NULL;
2053
2054        setup_diff_attr_check(&attr_diff_check);
2055        if (!git_checkattr(name, 1, &attr_diff_check)) {
2056                const char *value = attr_diff_check.value;
2057                if (!ATTR_TRUE(value) &&
2058                    !ATTR_FALSE(value) &&
2059                    !ATTR_UNSET(value)) {
2060                        struct ll_diff_driver *drv;
2061
2062                        for (drv = user_diff; drv; drv = drv->next)
2063                                if (!strcmp(drv->name, value))
2064                                        return drv->cmd;
2065                }
2066        }
2067        return NULL;
2068}
2069
2070static void run_diff_cmd(const char *pgm,
2071                         const char *name,
2072                         const char *other,
2073                         const char *attr_path,
2074                         struct diff_filespec *one,
2075                         struct diff_filespec *two,
2076                         const char *xfrm_msg,
2077                         struct diff_options *o,
2078                         int complete_rewrite)
2079{
2080        if (!DIFF_OPT_TST(o, ALLOW_EXTERNAL))
2081                pgm = NULL;
2082        else {
2083                const char *cmd = external_diff_attr(attr_path);
2084                if (cmd)
2085                        pgm = cmd;
2086        }
2087
2088        if (pgm) {
2089                run_external_diff(pgm, name, other, one, two, xfrm_msg,
2090                                  complete_rewrite);
2091                return;
2092        }
2093        if (one && two)
2094                builtin_diff(name, other ? other : name,
2095                             one, two, xfrm_msg, o, complete_rewrite);
2096        else
2097                fprintf(o->file, "* Unmerged path %s\n", name);
2098}
2099
2100static void diff_fill_sha1_info(struct diff_filespec *one)
2101{
2102        if (DIFF_FILE_VALID(one)) {
2103                if (!one->sha1_valid) {
2104                        struct stat st;
2105                        if (!strcmp(one->path, "-")) {
2106                                hashcpy(one->sha1, null_sha1);
2107                                return;
2108                        }
2109                        if (lstat(one->path, &st) < 0)
2110                                die("stat %s", one->path);
2111                        if (index_path(one->sha1, one->path, &st, 0))
2112                                die("cannot hash %s\n", one->path);
2113                }
2114        }
2115        else
2116                hashclr(one->sha1);
2117}
2118
2119static int similarity_index(struct diff_filepair *p)
2120{
2121        return p->score * 100 / MAX_SCORE;
2122}
2123
2124static void strip_prefix(int prefix_length, const char **namep, const char **otherp)
2125{
2126        /* Strip the prefix but do not molest /dev/null and absolute paths */
2127        if (*namep && **namep != '/')
2128                *namep += prefix_length;
2129        if (*otherp && **otherp != '/')
2130                *otherp += prefix_length;
2131}
2132
2133static void run_diff(struct diff_filepair *p, struct diff_options *o)
2134{
2135        const char *pgm = external_diff();
2136        struct strbuf msg;
2137        char *xfrm_msg;
2138        struct diff_filespec *one = p->one;
2139        struct diff_filespec *two = p->two;
2140        const char *name;
2141        const char *other;
2142        const char *attr_path;
2143        int complete_rewrite = 0;
2144
2145        name  = p->one->path;
2146        other = (strcmp(name, p->two->path) ? p->two->path : NULL);
2147        attr_path = name;
2148        if (o->prefix_length)
2149                strip_prefix(o->prefix_length, &name, &other);
2150
2151        if (DIFF_PAIR_UNMERGED(p)) {
2152                run_diff_cmd(pgm, name, NULL, attr_path,
2153                             NULL, NULL, NULL, o, 0);
2154                return;
2155        }
2156
2157        diff_fill_sha1_info(one);
2158        diff_fill_sha1_info(two);
2159
2160        strbuf_init(&msg, PATH_MAX * 2 + 300);
2161        switch (p->status) {
2162        case DIFF_STATUS_COPIED:
2163                strbuf_addf(&msg, "similarity index %d%%", similarity_index(p));
2164                strbuf_addstr(&msg, "\ncopy from ");
2165                quote_c_style(name, &msg, NULL, 0);
2166                strbuf_addstr(&msg, "\ncopy to ");
2167                quote_c_style(other, &msg, NULL, 0);
2168                strbuf_addch(&msg, '\n');
2169                break;
2170        case DIFF_STATUS_RENAMED:
2171                strbuf_addf(&msg, "similarity index %d%%", similarity_index(p));
2172                strbuf_addstr(&msg, "\nrename from ");
2173                quote_c_style(name, &msg, NULL, 0);
2174                strbuf_addstr(&msg, "\nrename to ");
2175                quote_c_style(other, &msg, NULL, 0);
2176                strbuf_addch(&msg, '\n');
2177                break;
2178        case DIFF_STATUS_MODIFIED:
2179                if (p->score) {
2180                        strbuf_addf(&msg, "dissimilarity index %d%%\n",
2181                                        similarity_index(p));
2182                        complete_rewrite = 1;
2183                        break;
2184                }
2185                /* fallthru */
2186        default:
2187                /* nothing */
2188                ;
2189        }
2190
2191        if (hashcmp(one->sha1, two->sha1)) {
2192                int abbrev = DIFF_OPT_TST(o, FULL_INDEX) ? 40 : DEFAULT_ABBREV;
2193
2194                if (DIFF_OPT_TST(o, BINARY)) {
2195                        mmfile_t mf;
2196                        if ((!fill_mmfile(&mf, one) && diff_filespec_is_binary(one)) ||
2197                            (!fill_mmfile(&mf, two) && diff_filespec_is_binary(two)))
2198                                abbrev = 40;
2199                }
2200                strbuf_addf(&msg, "index %.*s..%.*s",
2201                                abbrev, sha1_to_hex(one->sha1),
2202                                abbrev, sha1_to_hex(two->sha1));
2203                if (one->mode == two->mode)
2204                        strbuf_addf(&msg, " %06o", one->mode);
2205                strbuf_addch(&msg, '\n');
2206        }
2207
2208        if (msg.len)
2209                strbuf_setlen(&msg, msg.len - 1);
2210        xfrm_msg = msg.len ? msg.buf : NULL;
2211
2212        if (!pgm &&
2213            DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) &&
2214            (S_IFMT & one->mode) != (S_IFMT & two->mode)) {
2215                /* a filepair that changes between file and symlink
2216                 * needs to be split into deletion and creation.
2217                 */
2218                struct diff_filespec *null = alloc_filespec(two->path);
2219                run_diff_cmd(NULL, name, other, attr_path,
2220                             one, null, xfrm_msg, o, 0);
2221                free(null);
2222                null = alloc_filespec(one->path);
2223                run_diff_cmd(NULL, name, other, attr_path,
2224                             null, two, xfrm_msg, o, 0);
2225                free(null);
2226        }
2227        else
2228                run_diff_cmd(pgm, name, other, attr_path,
2229                             one, two, xfrm_msg, o, complete_rewrite);
2230
2231        strbuf_release(&msg);
2232}
2233
2234static void run_diffstat(struct diff_filepair *p, struct diff_options *o,
2235                         struct diffstat_t *diffstat)
2236{
2237        const char *name;
2238        const char *other;
2239        int complete_rewrite = 0;
2240
2241        if (DIFF_PAIR_UNMERGED(p)) {
2242                /* unmerged */
2243                builtin_diffstat(p->one->path, NULL, NULL, NULL, diffstat, o, 0);
2244                return;
2245        }
2246
2247        name = p->one->path;
2248        other = (strcmp(name, p->two->path) ? p->two->path : NULL);
2249
2250        if (o->prefix_length)
2251                strip_prefix(o->prefix_length, &name, &other);
2252
2253        diff_fill_sha1_info(p->one);
2254        diff_fill_sha1_info(p->two);
2255
2256        if (p->status == DIFF_STATUS_MODIFIED && p->score)
2257                complete_rewrite = 1;
2258        builtin_diffstat(name, other, p->one, p->two, diffstat, o, complete_rewrite);
2259}
2260
2261static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
2262{
2263        const char *name;
2264        const char *other;
2265        const char *attr_path;
2266
2267        if (DIFF_PAIR_UNMERGED(p)) {
2268                /* unmerged */
2269                return;
2270        }
2271
2272        name = p->one->path;
2273        other = (strcmp(name, p->two->path) ? p->two->path : NULL);
2274        attr_path = other ? other : name;
2275
2276        if (o->prefix_length)
2277                strip_prefix(o->prefix_length, &name, &other);
2278
2279        diff_fill_sha1_info(p->one);
2280        diff_fill_sha1_info(p->two);
2281
2282        builtin_checkdiff(name, other, attr_path, p->one, p->two, o);
2283}
2284
2285void diff_setup(struct diff_options *options)
2286{
2287        memset(options, 0, sizeof(*options));
2288
2289        options->file = stdout;
2290
2291        options->line_termination = '\n';
2292        options->break_opt = -1;
2293        options->rename_limit = -1;
2294        options->dirstat_percent = 3;
2295        options->context = 3;
2296
2297        options->change = diff_change;
2298        options->add_remove = diff_addremove;
2299        if (diff_use_color_default > 0)
2300                DIFF_OPT_SET(options, COLOR_DIFF);
2301        else
2302                DIFF_OPT_CLR(options, COLOR_DIFF);
2303        options->detect_rename = diff_detect_rename_default;
2304
2305        options->a_prefix = "a/";
2306        options->b_prefix = "b/";
2307}
2308
2309int diff_setup_done(struct diff_options *options)
2310{
2311        int count = 0;
2312
2313        if (options->output_format & DIFF_FORMAT_NAME)
2314                count++;
2315        if (options->output_format & DIFF_FORMAT_NAME_STATUS)
2316                count++;
2317        if (options->output_format & DIFF_FORMAT_CHECKDIFF)
2318                count++;
2319        if (options->output_format & DIFF_FORMAT_NO_OUTPUT)
2320                count++;
2321        if (count > 1)
2322                die("--name-only, --name-status, --check and -s are mutually exclusive");
2323
2324        if (DIFF_OPT_TST(options, FIND_COPIES_HARDER))
2325                options->detect_rename = DIFF_DETECT_COPY;
2326
2327        if (!DIFF_OPT_TST(options, RELATIVE_NAME))
2328                options->prefix = NULL;
2329        if (options->prefix)
2330                options->prefix_length = strlen(options->prefix);
2331        else
2332                options->prefix_length = 0;
2333
2334        if (options->output_format & (DIFF_FORMAT_NAME |
2335                                      DIFF_FORMAT_NAME_STATUS |
2336                                      DIFF_FORMAT_CHECKDIFF |
2337                                      DIFF_FORMAT_NO_OUTPUT))
2338                options->output_format &= ~(DIFF_FORMAT_RAW |
2339                                            DIFF_FORMAT_NUMSTAT |
2340                                            DIFF_FORMAT_DIFFSTAT |
2341                                            DIFF_FORMAT_SHORTSTAT |
2342                                            DIFF_FORMAT_DIRSTAT |
2343                                            DIFF_FORMAT_SUMMARY |
2344                                            DIFF_FORMAT_PATCH);
2345
2346        /*
2347         * These cases always need recursive; we do not drop caller-supplied
2348         * recursive bits for other formats here.
2349         */
2350        if (options->output_format & (DIFF_FORMAT_PATCH |
2351                                      DIFF_FORMAT_NUMSTAT |
2352                                      DIFF_FORMAT_DIFFSTAT |
2353                                      DIFF_FORMAT_SHORTSTAT |
2354                                      DIFF_FORMAT_DIRSTAT |
2355                                      DIFF_FORMAT_SUMMARY |
2356                                      DIFF_FORMAT_CHECKDIFF))
2357                DIFF_OPT_SET(options, RECURSIVE);
2358        /*
2359         * Also pickaxe would not work very well if you do not say recursive
2360         */
2361        if (options->pickaxe)
2362                DIFF_OPT_SET(options, RECURSIVE);
2363
2364        if (options->detect_rename && options->rename_limit < 0)
2365                options->rename_limit = diff_rename_limit_default;
2366        if (options->setup & DIFF_SETUP_USE_CACHE) {
2367                if (!active_cache)
2368                        /* read-cache does not die even when it fails
2369                         * so it is safe for us to do this here.  Also
2370                         * it does not smudge active_cache or active_nr
2371                         * when it fails, so we do not have to worry about
2372                         * cleaning it up ourselves either.
2373                         */
2374                        read_cache();
2375        }
2376        if (options->abbrev <= 0 || 40 < options->abbrev)
2377                options->abbrev = 40; /* full */
2378
2379        /*
2380         * It does not make sense to show the first hit we happened
2381         * to have found.  It does not make sense not to return with
2382         * exit code in such a case either.
2383         */
2384        if (DIFF_OPT_TST(options, QUIET)) {
2385                options->output_format = DIFF_FORMAT_NO_OUTPUT;
2386                DIFF_OPT_SET(options, EXIT_WITH_STATUS);
2387        }
2388
2389        /*
2390         * If we postprocess in diffcore, we cannot simply return
2391         * upon the first hit.  We need to run diff as usual.
2392         */
2393        if (options->pickaxe || options->filter)
2394                DIFF_OPT_CLR(options, QUIET);
2395
2396        return 0;
2397}
2398
2399static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)
2400{
2401        char c, *eq;
2402        int len;
2403
2404        if (*arg != '-')
2405                return 0;
2406        c = *++arg;
2407        if (!c)
2408                return 0;
2409        if (c == arg_short) {
2410                c = *++arg;
2411                if (!c)
2412                        return 1;
2413                if (val && isdigit(c)) {
2414                        char *end;
2415                        int n = strtoul(arg, &end, 10);
2416                        if (*end)
2417                                return 0;
2418                        *val = n;
2419                        return 1;
2420                }
2421                return 0;
2422        }
2423        if (c != '-')
2424                return 0;
2425        arg++;
2426        eq = strchr(arg, '=');
2427        if (eq)
2428                len = eq - arg;
2429        else
2430                len = strlen(arg);
2431        if (!len || strncmp(arg, arg_long, len))
2432                return 0;
2433        if (eq) {
2434                int n;
2435                char *end;
2436                if (!isdigit(*++eq))
2437                        return 0;
2438                n = strtoul(eq, &end, 10);
2439                if (*end)
2440                        return 0;
2441                *val = n;
2442        }
2443        return 1;
2444}
2445
2446static int diff_scoreopt_parse(const char *opt);
2447
2448int diff_opt_parse(struct diff_options *options, const char **av, int ac)
2449{
2450        const char *arg = av[0];
2451
2452        /* Output format options */
2453        if (!strcmp(arg, "-p") || !strcmp(arg, "-u"))
2454                options->output_format |= DIFF_FORMAT_PATCH;
2455        else if (opt_arg(arg, 'U', "unified", &options->context))
2456                options->output_format |= DIFF_FORMAT_PATCH;
2457        else if (!strcmp(arg, "--raw"))
2458                options->output_format |= DIFF_FORMAT_RAW;
2459        else if (!strcmp(arg, "--patch-with-raw"))
2460                options->output_format |= DIFF_FORMAT_PATCH | DIFF_FORMAT_RAW;
2461        else if (!strcmp(arg, "--numstat"))
2462                options->output_format |= DIFF_FORMAT_NUMSTAT;
2463        else if (!strcmp(arg, "--shortstat"))
2464                options->output_format |= DIFF_FORMAT_SHORTSTAT;
2465        else if (opt_arg(arg, 'X', "dirstat", &options->dirstat_percent))
2466                options->output_format |= DIFF_FORMAT_DIRSTAT;
2467        else if (!strcmp(arg, "--cumulative"))
2468                options->output_format |= DIFF_FORMAT_CUMULATIVE;
2469        else if (!strcmp(arg, "--check"))
2470                options->output_format |= DIFF_FORMAT_CHECKDIFF;
2471        else if (!strcmp(arg, "--summary"))
2472                options->output_format |= DIFF_FORMAT_SUMMARY;
2473        else if (!strcmp(arg, "--patch-with-stat"))
2474                options->output_format |= DIFF_FORMAT_PATCH | DIFF_FORMAT_DIFFSTAT;
2475        else if (!strcmp(arg, "--name-only"))
2476                options->output_format |= DIFF_FORMAT_NAME;
2477        else if (!strcmp(arg, "--name-status"))
2478                options->output_format |= DIFF_FORMAT_NAME_STATUS;
2479        else if (!strcmp(arg, "-s"))
2480                options->output_format |= DIFF_FORMAT_NO_OUTPUT;
2481        else if (!prefixcmp(arg, "--stat")) {
2482                char *end;
2483                int width = options->stat_width;
2484                int name_width = options->stat_name_width;
2485                arg += 6;
2486                end = (char *)arg;
2487
2488                switch (*arg) {
2489                case '-':
2490                        if (!prefixcmp(arg, "-width="))
2491                                width = strtoul(arg + 7, &end, 10);
2492                        else if (!prefixcmp(arg, "-name-width="))
2493                                name_width = strtoul(arg + 12, &end, 10);
2494                        break;
2495                case '=':
2496                        width = strtoul(arg+1, &end, 10);
2497                        if (*end == ',')
2498                                name_width = strtoul(end+1, &end, 10);
2499                }
2500
2501                /* Important! This checks all the error cases! */
2502                if (*end)
2503                        return 0;
2504                options->output_format |= DIFF_FORMAT_DIFFSTAT;
2505                options->stat_name_width = name_width;
2506                options->stat_width = width;
2507        }
2508
2509        /* renames options */
2510        else if (!prefixcmp(arg, "-B")) {
2511                if ((options->break_opt = diff_scoreopt_parse(arg)) == -1)
2512                        return -1;
2513        }
2514        else if (!prefixcmp(arg, "-M")) {
2515                if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
2516                        return -1;
2517                options->detect_rename = DIFF_DETECT_RENAME;
2518        }
2519        else if (!prefixcmp(arg, "-C")) {
2520                if (options->detect_rename == DIFF_DETECT_COPY)
2521                        DIFF_OPT_SET(options, FIND_COPIES_HARDER);
2522                if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
2523                        return -1;
2524                options->detect_rename = DIFF_DETECT_COPY;
2525        }
2526        else if (!strcmp(arg, "--no-renames"))
2527                options->detect_rename = 0;
2528        else if (!strcmp(arg, "--relative"))
2529                DIFF_OPT_SET(options, RELATIVE_NAME);
2530        else if (!prefixcmp(arg, "--relative=")) {
2531                DIFF_OPT_SET(options, RELATIVE_NAME);
2532                options->prefix = arg + 11;
2533        }
2534
2535        /* xdiff options */
2536        else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space"))
2537                options->xdl_opts |= XDF_IGNORE_WHITESPACE;
2538        else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change"))
2539                options->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE;
2540        else if (!strcmp(arg, "--ignore-space-at-eol"))
2541                options->xdl_opts |= XDF_IGNORE_WHITESPACE_AT_EOL;
2542
2543        /* flags options */
2544        else if (!strcmp(arg, "--binary")) {
2545                options->output_format |= DIFF_FORMAT_PATCH;
2546                DIFF_OPT_SET(options, BINARY);
2547        }
2548        else if (!strcmp(arg, "--full-index"))
2549                DIFF_OPT_SET(options, FULL_INDEX);
2550        else if (!strcmp(arg, "-a") || !strcmp(arg, "--text"))
2551                DIFF_OPT_SET(options, TEXT);
2552        else if (!strcmp(arg, "-R"))
2553                DIFF_OPT_SET(options, REVERSE_DIFF);
2554        else if (!strcmp(arg, "--find-copies-harder"))
2555                DIFF_OPT_SET(options, FIND_COPIES_HARDER);
2556        else if (!strcmp(arg, "--follow"))
2557                DIFF_OPT_SET(options, FOLLOW_RENAMES);
2558        else if (!strcmp(arg, "--color"))
2559                DIFF_OPT_SET(options, COLOR_DIFF);
2560        else if (!strcmp(arg, "--no-color"))
2561                DIFF_OPT_CLR(options, COLOR_DIFF);
2562        else if (!strcmp(arg, "--color-words"))
2563                options->flags |= DIFF_OPT_COLOR_DIFF | DIFF_OPT_COLOR_DIFF_WORDS;
2564        else if (!strcmp(arg, "--exit-code"))
2565                DIFF_OPT_SET(options, EXIT_WITH_STATUS);
2566        else if (!strcmp(arg, "--quiet"))
2567                DIFF_OPT_SET(options, QUIET);
2568        else if (!strcmp(arg, "--ext-diff"))
2569                DIFF_OPT_SET(options, ALLOW_EXTERNAL);
2570        else if (!strcmp(arg, "--no-ext-diff"))
2571                DIFF_OPT_CLR(options, ALLOW_EXTERNAL);
2572        else if (!strcmp(arg, "--ignore-submodules"))
2573                DIFF_OPT_SET(options, IGNORE_SUBMODULES);
2574
2575        /* misc options */
2576        else if (!strcmp(arg, "-z"))
2577                options->line_termination = 0;
2578        else if (!prefixcmp(arg, "-l"))
2579                options->rename_limit = strtoul(arg+2, NULL, 10);
2580        else if (!prefixcmp(arg, "-S"))
2581                options->pickaxe = arg + 2;
2582        else if (!strcmp(arg, "--pickaxe-all"))
2583                options->pickaxe_opts = DIFF_PICKAXE_ALL;
2584        else if (!strcmp(arg, "--pickaxe-regex"))
2585                options->pickaxe_opts = DIFF_PICKAXE_REGEX;
2586        else if (!prefixcmp(arg, "-O"))
2587                options->orderfile = arg + 2;
2588        else if (!prefixcmp(arg, "--diff-filter="))
2589                options->filter = arg + 14;
2590        else if (!strcmp(arg, "--abbrev"))
2591                options->abbrev = DEFAULT_ABBREV;
2592        else if (!prefixcmp(arg, "--abbrev=")) {
2593                options->abbrev = strtoul(arg + 9, NULL, 10);
2594                if (options->abbrev < MINIMUM_ABBREV)
2595                        options->abbrev = MINIMUM_ABBREV;
2596                else if (40 < options->abbrev)
2597                        options->abbrev = 40;
2598        }
2599        else if (!prefixcmp(arg, "--src-prefix="))
2600                options->a_prefix = arg + 13;
2601        else if (!prefixcmp(arg, "--dst-prefix="))
2602                options->b_prefix = arg + 13;
2603        else if (!strcmp(arg, "--no-prefix"))
2604                options->a_prefix = options->b_prefix = "";
2605        else if (!prefixcmp(arg, "--output=")) {
2606                options->file = fopen(arg + strlen("--output="), "w");
2607                options->close_file = 1;
2608        } else
2609                return 0;
2610        return 1;
2611}
2612
2613static int parse_num(const char **cp_p)
2614{
2615        unsigned long num, scale;
2616        int ch, dot;
2617        const char *cp = *cp_p;
2618
2619        num = 0;
2620        scale = 1;
2621        dot = 0;
2622        for(;;) {
2623                ch = *cp;
2624                if ( !dot && ch == '.' ) {
2625                        scale = 1;
2626                        dot = 1;
2627                } else if ( ch == '%' ) {
2628                        scale = dot ? scale*100 : 100;
2629                        cp++;   /* % is always at the end */
2630                        break;
2631                } else if ( ch >= '0' && ch <= '9' ) {
2632                        if ( scale < 100000 ) {
2633                                scale *= 10;
2634                                num = (num*10) + (ch-'0');
2635                        }
2636                } else {
2637                        break;
2638                }
2639                cp++;
2640        }
2641        *cp_p = cp;
2642
2643        /* user says num divided by scale and we say internally that
2644         * is MAX_SCORE * num / scale.
2645         */
2646        return (int)((num >= scale) ? MAX_SCORE : (MAX_SCORE * num / scale));
2647}
2648
2649static int diff_scoreopt_parse(const char *opt)
2650{
2651        int opt1, opt2, cmd;
2652
2653        if (*opt++ != '-')
2654                return -1;
2655        cmd = *opt++;
2656        if (cmd != 'M' && cmd != 'C' && cmd != 'B')
2657                return -1; /* that is not a -M, -C nor -B option */
2658
2659        opt1 = parse_num(&opt);
2660        if (cmd != 'B')
2661                opt2 = 0;
2662        else {
2663                if (*opt == 0)
2664                        opt2 = 0;
2665                else if (*opt != '/')
2666                        return -1; /* we expect -B80/99 or -B80 */
2667                else {
2668                        opt++;
2669                        opt2 = parse_num(&opt);
2670                }
2671        }
2672        if (*opt != 0)
2673                return -1;
2674        return opt1 | (opt2 << 16);
2675}
2676
2677struct diff_queue_struct diff_queued_diff;
2678
2679void diff_q(struct diff_queue_struct *queue, struct diff_filepair *dp)
2680{
2681        if (queue->alloc <= queue->nr) {
2682                queue->alloc = alloc_nr(queue->alloc);
2683                queue->queue = xrealloc(queue->queue,
2684                                        sizeof(dp) * queue->alloc);
2685        }
2686        queue->queue[queue->nr++] = dp;
2687}
2688
2689struct diff_filepair *diff_queue(struct diff_queue_struct *queue,
2690                                 struct diff_filespec *one,
2691                                 struct diff_filespec *two)
2692{
2693        struct diff_filepair *dp = xcalloc(1, sizeof(*dp));
2694        dp->one = one;
2695        dp->two = two;
2696        if (queue)
2697                diff_q(queue, dp);
2698        return dp;
2699}
2700
2701void diff_free_filepair(struct diff_filepair *p)
2702{
2703        free_filespec(p->one);
2704        free_filespec(p->two);
2705        free(p);
2706}
2707
2708/* This is different from find_unique_abbrev() in that
2709 * it stuffs the result with dots for alignment.
2710 */
2711const char *diff_unique_abbrev(const unsigned char *sha1, int len)
2712{
2713        int abblen;
2714        const char *abbrev;
2715        if (len == 40)
2716                return sha1_to_hex(sha1);
2717
2718        abbrev = find_unique_abbrev(sha1, len);
2719        abblen = strlen(abbrev);
2720        if (abblen < 37) {
2721                static char hex[41];
2722                if (len < abblen && abblen <= len + 2)
2723                        sprintf(hex, "%s%.*s", abbrev, len+3-abblen, "..");
2724                else
2725                        sprintf(hex, "%s...", abbrev);
2726                return hex;
2727        }
2728        return sha1_to_hex(sha1);
2729}
2730
2731static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt)
2732{
2733        int line_termination = opt->line_termination;
2734        int inter_name_termination = line_termination ? '\t' : '\0';
2735
2736        if (!(opt->output_format & DIFF_FORMAT_NAME_STATUS)) {
2737                fprintf(opt->file, ":%06o %06o %s ", p->one->mode, p->two->mode,
2738                        diff_unique_abbrev(p->one->sha1, opt->abbrev));
2739                fprintf(opt->file, "%s ", diff_unique_abbrev(p->two->sha1, opt->abbrev));
2740        }
2741        if (p->score) {
2742                fprintf(opt->file, "%c%03d%c", p->status, similarity_index(p),
2743                        inter_name_termination);
2744        } else {
2745                fprintf(opt->file, "%c%c", p->status, inter_name_termination);
2746        }
2747
2748        if (p->status == DIFF_STATUS_COPIED ||
2749            p->status == DIFF_STATUS_RENAMED) {
2750                const char *name_a, *name_b;
2751                name_a = p->one->path;
2752                name_b = p->two->path;
2753                strip_prefix(opt->prefix_length, &name_a, &name_b);
2754                write_name_quoted(name_a, opt->file, inter_name_termination);
2755                write_name_quoted(name_b, opt->file, line_termination);
2756        } else {
2757                const char *name_a, *name_b;
2758                name_a = p->one->mode ? p->one->path : p->two->path;
2759                name_b = NULL;
2760                strip_prefix(opt->prefix_length, &name_a, &name_b);
2761                write_name_quoted(name_a, opt->file, line_termination);
2762        }
2763}
2764
2765int diff_unmodified_pair(struct diff_filepair *p)
2766{
2767        /* This function is written stricter than necessary to support
2768         * the currently implemented transformers, but the idea is to
2769         * let transformers to produce diff_filepairs any way they want,
2770         * and filter and clean them up here before producing the output.
2771         */
2772        struct diff_filespec *one = p->one, *two = p->two;
2773
2774        if (DIFF_PAIR_UNMERGED(p))
2775                return 0; /* unmerged is interesting */
2776
2777        /* deletion, addition, mode or type change
2778         * and rename are all interesting.
2779         */
2780        if (DIFF_FILE_VALID(one) != DIFF_FILE_VALID(two) ||
2781            DIFF_PAIR_MODE_CHANGED(p) ||
2782            strcmp(one->path, two->path))
2783                return 0;
2784
2785        /* both are valid and point at the same path.  that is, we are
2786         * dealing with a change.
2787         */
2788        if (one->sha1_valid && two->sha1_valid &&
2789            !hashcmp(one->sha1, two->sha1))
2790                return 1; /* no change */
2791        if (!one->sha1_valid && !two->sha1_valid)
2792                return 1; /* both look at the same file on the filesystem. */
2793        return 0;
2794}
2795
2796static void diff_flush_patch(struct diff_filepair *p, struct diff_options *o)
2797{
2798        if (diff_unmodified_pair(p))
2799                return;
2800
2801        if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
2802            (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
2803                return; /* no tree diffs in patch format */
2804
2805        run_diff(p, o);
2806}
2807
2808static void diff_flush_stat(struct diff_filepair *p, struct diff_options *o,
2809                            struct diffstat_t *diffstat)
2810{
2811        if (diff_unmodified_pair(p))
2812                return;
2813
2814        if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
2815            (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
2816                return; /* no tree diffs in patch format */
2817
2818        run_diffstat(p, o, diffstat);
2819}
2820
2821static void diff_flush_checkdiff(struct diff_filepair *p,
2822                struct diff_options *o)
2823{
2824        if (diff_unmodified_pair(p))
2825                return;
2826
2827        if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
2828            (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
2829                return; /* no tree diffs in patch format */
2830
2831        run_checkdiff(p, o);
2832}
2833
2834int diff_queue_is_empty(void)
2835{
2836        struct diff_queue_struct *q = &diff_queued_diff;
2837        int i;
2838        for (i = 0; i < q->nr; i++)
2839                if (!diff_unmodified_pair(q->queue[i]))
2840                        return 0;
2841        return 1;
2842}
2843
2844#if DIFF_DEBUG
2845void diff_debug_filespec(struct diff_filespec *s, int x, const char *one)
2846{
2847        fprintf(stderr, "queue[%d] %s (%s) %s %06o %s\n",
2848                x, one ? one : "",
2849                s->path,
2850                DIFF_FILE_VALID(s) ? "valid" : "invalid",
2851                s->mode,
2852                s->sha1_valid ? sha1_to_hex(s->sha1) : "");
2853        fprintf(stderr, "queue[%d] %s size %lu flags %d\n",
2854                x, one ? one : "",
2855                s->size, s->xfrm_flags);
2856}
2857
2858void diff_debug_filepair(const struct diff_filepair *p, int i)
2859{
2860        diff_debug_filespec(p->one, i, "one");
2861        diff_debug_filespec(p->two, i, "two");
2862        fprintf(stderr, "score %d, status %c rename_used %d broken %d\n",
2863                p->score, p->status ? p->status : '?',
2864                p->one->rename_used, p->broken_pair);
2865}
2866
2867void diff_debug_queue(const char *msg, struct diff_queue_struct *q)
2868{
2869        int i;
2870        if (msg)
2871                fprintf(stderr, "%s\n", msg);
2872        fprintf(stderr, "q->nr = %d\n", q->nr);
2873        for (i = 0; i < q->nr; i++) {
2874                struct diff_filepair *p = q->queue[i];
2875                diff_debug_filepair(p, i);
2876        }
2877}
2878#endif
2879
2880static void diff_resolve_rename_copy(void)
2881{
2882        int i;
2883        struct diff_filepair *p;
2884        struct diff_queue_struct *q = &diff_queued_diff;
2885
2886        diff_debug_queue("resolve-rename-copy", q);
2887
2888        for (i = 0; i < q->nr; i++) {
2889                p = q->queue[i];
2890                p->status = 0; /* undecided */
2891                if (DIFF_PAIR_UNMERGED(p))
2892                        p->status = DIFF_STATUS_UNMERGED;
2893                else if (!DIFF_FILE_VALID(p->one))
2894                        p->status = DIFF_STATUS_ADDED;
2895                else if (!DIFF_FILE_VALID(p->two))
2896                        p->status = DIFF_STATUS_DELETED;
2897                else if (DIFF_PAIR_TYPE_CHANGED(p))
2898                        p->status = DIFF_STATUS_TYPE_CHANGED;
2899
2900                /* from this point on, we are dealing with a pair
2901                 * whose both sides are valid and of the same type, i.e.
2902                 * either in-place edit or rename/copy edit.
2903                 */
2904                else if (DIFF_PAIR_RENAME(p)) {
2905                        /*
2906                         * A rename might have re-connected a broken
2907                         * pair up, causing the pathnames to be the
2908                         * same again. If so, that's not a rename at
2909                         * all, just a modification..
2910                         *
2911                         * Otherwise, see if this source was used for
2912                         * multiple renames, in which case we decrement
2913                         * the count, and call it a copy.
2914                         */
2915                        if (!strcmp(p->one->path, p->two->path))
2916                                p->status = DIFF_STATUS_MODIFIED;
2917                        else if (--p->one->rename_used > 0)
2918                                p->status = DIFF_STATUS_COPIED;
2919                        else
2920                                p->status = DIFF_STATUS_RENAMED;
2921                }
2922                else if (hashcmp(p->one->sha1, p->two->sha1) ||
2923                         p->one->mode != p->two->mode ||
2924                         is_null_sha1(p->one->sha1))
2925                        p->status = DIFF_STATUS_MODIFIED;
2926                else {
2927                        /* This is a "no-change" entry and should not
2928                         * happen anymore, but prepare for broken callers.
2929                         */
2930                        error("feeding unmodified %s to diffcore",
2931                              p->one->path);
2932                        p->status = DIFF_STATUS_UNKNOWN;
2933                }
2934        }
2935        diff_debug_queue("resolve-rename-copy done", q);
2936}
2937
2938static int check_pair_status(struct diff_filepair *p)
2939{
2940        switch (p->status) {
2941        case DIFF_STATUS_UNKNOWN:
2942                return 0;
2943        case 0:
2944                die("internal error in diff-resolve-rename-copy");
2945        default:
2946                return 1;
2947        }
2948}
2949
2950static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt)
2951{
2952        int fmt = opt->output_format;
2953
2954        if (fmt & DIFF_FORMAT_CHECKDIFF)
2955                diff_flush_checkdiff(p, opt);
2956        else if (fmt & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS))
2957                diff_flush_raw(p, opt);
2958        else if (fmt & DIFF_FORMAT_NAME) {
2959                const char *name_a, *name_b;
2960                name_a = p->two->path;
2961                name_b = NULL;
2962                strip_prefix(opt->prefix_length, &name_a, &name_b);
2963                write_name_quoted(name_a, opt->file, opt->line_termination);
2964        }
2965}
2966
2967static void show_file_mode_name(FILE *file, const char *newdelete, struct diff_filespec *fs)
2968{
2969        if (fs->mode)
2970                fprintf(file, " %s mode %06o ", newdelete, fs->mode);
2971        else
2972                fprintf(file, " %s ", newdelete);
2973        write_name_quoted(fs->path, file, '\n');
2974}
2975
2976
2977static void show_mode_change(FILE *file, struct diff_filepair *p, int show_name)
2978{
2979        if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) {
2980                fprintf(file, " mode change %06o => %06o%c", p->one->mode, p->two->mode,
2981                        show_name ? ' ' : '\n');
2982                if (show_name) {
2983                        write_name_quoted(p->two->path, file, '\n');
2984                }
2985        }
2986}
2987
2988static void show_rename_copy(FILE *file, const char *renamecopy, struct diff_filepair *p)
2989{
2990        char *names = pprint_rename(p->one->path, p->two->path);
2991
2992        fprintf(file, " %s %s (%d%%)\n", renamecopy, names, similarity_index(p));
2993        free(names);
2994        show_mode_change(file, p, 0);
2995}
2996
2997static void diff_summary(FILE *file, struct diff_filepair *p)
2998{
2999        switch(p->status) {
3000        case DIFF_STATUS_DELETED:
3001                show_file_mode_name(file, "delete", p->one);
3002                break;
3003        case DIFF_STATUS_ADDED:
3004                show_file_mode_name(file, "create", p->two);
3005                break;
3006        case DIFF_STATUS_COPIED:
3007                show_rename_copy(file, "copy", p);
3008                break;
3009        case DIFF_STATUS_RENAMED:
3010                show_rename_copy(file, "rename", p);
3011                break;
3012        default:
3013                if (p->score) {
3014                        fputs(" rewrite ", file);
3015                        write_name_quoted(p->two->path, file, ' ');
3016                        fprintf(file, "(%d%%)\n", similarity_index(p));
3017                }
3018                show_mode_change(file, p, !p->score);
3019                break;
3020        }
3021}
3022
3023struct patch_id_t {
3024        SHA_CTX *ctx;
3025        int patchlen;
3026};
3027
3028static int remove_space(char *line, int len)
3029{
3030        int i;
3031        char *dst = line;
3032        unsigned char c;
3033
3034        for (i = 0; i < len; i++)
3035                if (!isspace((c = line[i])))
3036                        *dst++ = c;
3037
3038        return dst - line;
3039}
3040
3041static void patch_id_consume(void *priv, char *line, unsigned long len)
3042{
3043        struct patch_id_t *data = priv;
3044        int new_len;
3045
3046        /* Ignore line numbers when computing the SHA1 of the patch */
3047        if (!prefixcmp(line, "@@ -"))
3048                return;
3049
3050        new_len = remove_space(line, len);
3051
3052        SHA1_Update(data->ctx, line, new_len);
3053        data->patchlen += new_len;
3054}
3055
3056/* returns 0 upon success, and writes result into sha1 */
3057static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
3058{
3059        struct diff_queue_struct *q = &diff_queued_diff;
3060        int i;
3061        SHA_CTX ctx;
3062        struct patch_id_t data;
3063        char buffer[PATH_MAX * 4 + 20];
3064
3065        SHA1_Init(&ctx);
3066        memset(&data, 0, sizeof(struct patch_id_t));
3067        data.ctx = &ctx;
3068
3069        for (i = 0; i < q->nr; i++) {
3070                xpparam_t xpp;
3071                xdemitconf_t xecfg;
3072                xdemitcb_t ecb;
3073                mmfile_t mf1, mf2;
3074                struct diff_filepair *p = q->queue[i];
3075                int len1, len2;
3076
3077                memset(&xecfg, 0, sizeof(xecfg));
3078                if (p->status == 0)
3079                        return error("internal diff status error");
3080                if (p->status == DIFF_STATUS_UNKNOWN)
3081                        continue;
3082                if (diff_unmodified_pair(p))
3083                        continue;
3084                if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
3085                    (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
3086                        continue;
3087                if (DIFF_PAIR_UNMERGED(p))
3088                        continue;
3089
3090                diff_fill_sha1_info(p->one);
3091                diff_fill_sha1_info(p->two);
3092                if (fill_mmfile(&mf1, p->one) < 0 ||
3093                                fill_mmfile(&mf2, p->two) < 0)
3094                        return error("unable to read files to diff");
3095
3096                len1 = remove_space(p->one->path, strlen(p->one->path));
3097                len2 = remove_space(p->two->path, strlen(p->two->path));
3098                if (p->one->mode == 0)
3099                        len1 = snprintf(buffer, sizeof(buffer),
3100                                        "diff--gita/%.*sb/%.*s"
3101                                        "newfilemode%06o"
3102                                        "---/dev/null"
3103                                        "+++b/%.*s",
3104                                        len1, p->one->path,
3105                                        len2, p->two->path,
3106                                        p->two->mode,
3107                                        len2, p->two->path);
3108                else if (p->two->mode == 0)
3109                        len1 = snprintf(buffer, sizeof(buffer),
3110                                        "diff--gita/%.*sb/%.*s"
3111                                        "deletedfilemode%06o"
3112                                        "---a/%.*s"
3113                                        "+++/dev/null",
3114                                        len1, p->one->path,
3115                                        len2, p->two->path,
3116                                        p->one->mode,
3117                                        len1, p->one->path);
3118                else
3119                        len1 = snprintf(buffer, sizeof(buffer),
3120                                        "diff--gita/%.*sb/%.*s"
3121                                        "---a/%.*s"
3122                                        "+++b/%.*s",
3123                                        len1, p->one->path,
3124                                        len2, p->two->path,
3125                                        len1, p->one->path,
3126                                        len2, p->two->path);
3127                SHA1_Update(&ctx, buffer, len1);
3128
3129                xpp.flags = XDF_NEED_MINIMAL;
3130                xecfg.ctxlen = 3;
3131                xecfg.flags = XDL_EMIT_FUNCNAMES;
3132                xdi_diff_outf(&mf1, &mf2, patch_id_consume, &data,
3133                              &xpp, &xecfg, &ecb);
3134        }
3135
3136        SHA1_Final(sha1, &ctx);
3137        return 0;
3138}
3139
3140int diff_flush_patch_id(struct diff_options *options, unsigned char *sha1)
3141{
3142        struct diff_queue_struct *q = &diff_queued_diff;
3143        int i;
3144        int result = diff_get_patch_id(options, sha1);
3145
3146        for (i = 0; i < q->nr; i++)
3147                diff_free_filepair(q->queue[i]);
3148
3149        free(q->queue);
3150        q->queue = NULL;
3151        q->nr = q->alloc = 0;
3152
3153        return result;
3154}
3155
3156static int is_summary_empty(const struct diff_queue_struct *q)
3157{
3158        int i;
3159
3160        for (i = 0; i < q->nr; i++) {
3161                const struct diff_filepair *p = q->queue[i];
3162
3163                switch (p->status) {
3164                case DIFF_STATUS_DELETED:
3165                case DIFF_STATUS_ADDED:
3166                case DIFF_STATUS_COPIED:
3167                case DIFF_STATUS_RENAMED:
3168                        return 0;
3169                default:
3170                        if (p->score)
3171                                return 0;
3172                        if (p->one->mode && p->two->mode &&
3173                            p->one->mode != p->two->mode)
3174                                return 0;
3175                        break;
3176                }
3177        }
3178        return 1;
3179}
3180
3181void diff_flush(struct diff_options *options)
3182{
3183        struct diff_queue_struct *q = &diff_queued_diff;
3184        int i, output_format = options->output_format;
3185        int separator = 0;
3186
3187        /*
3188         * Order: raw, stat, summary, patch
3189         * or:    name/name-status/checkdiff (other bits clear)
3190         */
3191        if (!q->nr)
3192                goto free_queue;
3193
3194        if (output_format & (DIFF_FORMAT_RAW |
3195                             DIFF_FORMAT_NAME |
3196                             DIFF_FORMAT_NAME_STATUS |
3197                             DIFF_FORMAT_CHECKDIFF)) {
3198                for (i = 0; i < q->nr; i++) {
3199                        struct diff_filepair *p = q->queue[i];
3200                        if (check_pair_status(p))
3201                                flush_one_pair(p, options);
3202                }
3203                separator++;
3204        }
3205
3206        if (output_format & (DIFF_FORMAT_DIFFSTAT|DIFF_FORMAT_SHORTSTAT|DIFF_FORMAT_NUMSTAT)) {
3207                struct diffstat_t diffstat;
3208
3209                memset(&diffstat, 0, sizeof(struct diffstat_t));
3210                for (i = 0; i < q->nr; i++) {
3211                        struct diff_filepair *p = q->queue[i];
3212                        if (check_pair_status(p))
3213                                diff_flush_stat(p, options, &diffstat);
3214                }
3215                if (output_format & DIFF_FORMAT_NUMSTAT)
3216                        show_numstat(&diffstat, options);
3217                if (output_format & DIFF_FORMAT_DIFFSTAT)
3218                        show_stats(&diffstat, options);
3219                if (output_format & DIFF_FORMAT_SHORTSTAT)
3220                        show_shortstats(&diffstat, options);
3221                free_diffstat_info(&diffstat);
3222                separator++;
3223        }
3224        if (output_format & DIFF_FORMAT_DIRSTAT)
3225                show_dirstat(options);
3226
3227        if (output_format & DIFF_FORMAT_SUMMARY && !is_summary_empty(q)) {
3228                for (i = 0; i < q->nr; i++)
3229                        diff_summary(options->file, q->queue[i]);
3230                separator++;
3231        }
3232
3233        if (output_format & DIFF_FORMAT_PATCH) {
3234                if (separator) {
3235                        putc(options->line_termination, options->file);
3236                        if (options->stat_sep) {
3237                                /* attach patch instead of inline */
3238                                fputs(options->stat_sep, options->file);
3239                        }
3240                }
3241
3242                for (i = 0; i < q->nr; i++) {
3243                        struct diff_filepair *p = q->queue[i];
3244                        if (check_pair_status(p))
3245                                diff_flush_patch(p, options);
3246                }
3247        }
3248
3249        if (output_format & DIFF_FORMAT_CALLBACK)
3250                options->format_callback(q, options, options->format_callback_data);
3251
3252        for (i = 0; i < q->nr; i++)
3253                diff_free_filepair(q->queue[i]);
3254free_queue:
3255        free(q->queue);
3256        q->queue = NULL;
3257        q->nr = q->alloc = 0;
3258        if (options->close_file)
3259                fclose(options->file);
3260}
3261
3262static void diffcore_apply_filter(const char *filter)
3263{
3264        int i;
3265        struct diff_queue_struct *q = &diff_queued_diff;
3266        struct diff_queue_struct outq;
3267        outq.queue = NULL;
3268        outq.nr = outq.alloc = 0;
3269
3270        if (!filter)
3271                return;
3272
3273        if (strchr(filter, DIFF_STATUS_FILTER_AON)) {
3274                int found;
3275                for (i = found = 0; !found && i < q->nr; i++) {
3276                        struct diff_filepair *p = q->queue[i];
3277                        if (((p->status == DIFF_STATUS_MODIFIED) &&
3278                             ((p->score &&
3279                               strchr(filter, DIFF_STATUS_FILTER_BROKEN)) ||
3280                              (!p->score &&
3281                               strchr(filter, DIFF_STATUS_MODIFIED)))) ||
3282                            ((p->status != DIFF_STATUS_MODIFIED) &&
3283                             strchr(filter, p->status)))
3284                                found++;
3285                }
3286                if (found)
3287                        return;
3288
3289                /* otherwise we will clear the whole queue
3290                 * by copying the empty outq at the end of this
3291                 * function, but first clear the current entries
3292                 * in the queue.
3293                 */
3294                for (i = 0; i < q->nr; i++)
3295                        diff_free_filepair(q->queue[i]);
3296        }
3297        else {
3298                /* Only the matching ones */
3299                for (i = 0; i < q->nr; i++) {
3300                        struct diff_filepair *p = q->queue[i];
3301
3302                        if (((p->status == DIFF_STATUS_MODIFIED) &&
3303                             ((p->score &&
3304                               strchr(filter, DIFF_STATUS_FILTER_BROKEN)) ||
3305                              (!p->score &&
3306                               strchr(filter, DIFF_STATUS_MODIFIED)))) ||
3307                            ((p->status != DIFF_STATUS_MODIFIED) &&
3308                             strchr(filter, p->status)))
3309                                diff_q(&outq, p);
3310                        else
3311                                diff_free_filepair(p);
3312                }
3313        }
3314        free(q->queue);
3315        *q = outq;
3316}
3317
3318/* Check whether two filespecs with the same mode and size are identical */
3319static int diff_filespec_is_identical(struct diff_filespec *one,
3320                                      struct diff_filespec *two)
3321{
3322        if (S_ISGITLINK(one->mode))
3323                return 0;
3324        if (diff_populate_filespec(one, 0))
3325                return 0;
3326        if (diff_populate_filespec(two, 0))
3327                return 0;
3328        return !memcmp(one->data, two->data, one->size);
3329}
3330
3331static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
3332{
3333        int i;
3334        struct diff_queue_struct *q = &diff_queued_diff;
3335        struct diff_queue_struct outq;
3336        outq.queue = NULL;
3337        outq.nr = outq.alloc = 0;
3338
3339        for (i = 0; i < q->nr; i++) {
3340                struct diff_filepair *p = q->queue[i];
3341
3342                /*
3343                 * 1. Entries that come from stat info dirtyness
3344                 *    always have both sides (iow, not create/delete),
3345                 *    one side of the object name is unknown, with
3346                 *    the same mode and size.  Keep the ones that
3347                 *    do not match these criteria.  They have real
3348                 *    differences.
3349                 *
3350                 * 2. At this point, the file is known to be modified,
3351                 *    with the same mode and size, and the object
3352                 *    name of one side is unknown.  Need to inspect
3353                 *    the identical contents.
3354                 */
3355                if (!DIFF_FILE_VALID(p->one) || /* (1) */
3356                    !DIFF_FILE_VALID(p->two) ||
3357                    (p->one->sha1_valid && p->two->sha1_valid) ||
3358                    (p->one->mode != p->two->mode) ||
3359                    diff_populate_filespec(p->one, 1) ||
3360                    diff_populate_filespec(p->two, 1) ||
3361                    (p->one->size != p->two->size) ||
3362                    !diff_filespec_is_identical(p->one, p->two)) /* (2) */
3363                        diff_q(&outq, p);
3364                else {
3365                        /*
3366                         * The caller can subtract 1 from skip_stat_unmatch
3367                         * to determine how many paths were dirty only
3368                         * due to stat info mismatch.
3369                         */
3370                        if (!DIFF_OPT_TST(diffopt, NO_INDEX))
3371                                diffopt->skip_stat_unmatch++;
3372                        diff_free_filepair(p);
3373                }
3374        }
3375        free(q->queue);
3376        *q = outq;
3377}
3378
3379void diffcore_std(struct diff_options *options)
3380{
3381        if (DIFF_OPT_TST(options, QUIET))
3382                return;
3383
3384        if (options->skip_stat_unmatch && !DIFF_OPT_TST(options, FIND_COPIES_HARDER))
3385                diffcore_skip_stat_unmatch(options);
3386        if (options->break_opt != -1)
3387                diffcore_break(options->break_opt);
3388        if (options->detect_rename)
3389                diffcore_rename(options);
3390        if (options->break_opt != -1)
3391                diffcore_merge_broken();
3392        if (options->pickaxe)
3393                diffcore_pickaxe(options->pickaxe, options->pickaxe_opts);
3394        if (options->orderfile)
3395                diffcore_order(options->orderfile);
3396        diff_resolve_rename_copy();
3397        diffcore_apply_filter(options->filter);
3398
3399        if (diff_queued_diff.nr)
3400                DIFF_OPT_SET(options, HAS_CHANGES);
3401        else
3402                DIFF_OPT_CLR(options, HAS_CHANGES);
3403}
3404
3405int diff_result_code(struct diff_options *opt, int status)
3406{
3407        int result = 0;
3408        if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
3409            !(opt->output_format & DIFF_FORMAT_CHECKDIFF))
3410                return status;
3411        if (DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
3412            DIFF_OPT_TST(opt, HAS_CHANGES))
3413                result |= 01;
3414        if ((opt->output_format & DIFF_FORMAT_CHECKDIFF) &&
3415            DIFF_OPT_TST(opt, CHECK_FAILED))
3416                result |= 02;
3417        return result;
3418}
3419
3420void diff_addremove(struct diff_options *options,
3421                    int addremove, unsigned mode,
3422                    const unsigned char *sha1,
3423                    const char *concatpath)
3424{
3425        struct diff_filespec *one, *two;
3426
3427        if (DIFF_OPT_TST(options, IGNORE_SUBMODULES) && S_ISGITLINK(mode))
3428                return;
3429
3430        /* This may look odd, but it is a preparation for
3431         * feeding "there are unchanged files which should
3432         * not produce diffs, but when you are doing copy
3433         * detection you would need them, so here they are"
3434         * entries to the diff-core.  They will be prefixed
3435         * with something like '=' or '*' (I haven't decided
3436         * which but should not make any difference).
3437         * Feeding the same new and old to diff_change()
3438         * also has the same effect.
3439         * Before the final output happens, they are pruned after
3440         * merged into rename/copy pairs as appropriate.
3441         */
3442        if (DIFF_OPT_TST(options, REVERSE_DIFF))
3443                addremove = (addremove == '+' ? '-' :
3444                             addremove == '-' ? '+' : addremove);
3445
3446        if (options->prefix &&
3447            strncmp(concatpath, options->prefix, options->prefix_length))
3448                return;
3449
3450        one = alloc_filespec(concatpath);
3451        two = alloc_filespec(concatpath);
3452
3453        if (addremove != '+')
3454                fill_filespec(one, sha1, mode);
3455        if (addremove != '-')
3456                fill_filespec(two, sha1, mode);
3457
3458        diff_queue(&diff_queued_diff, one, two);
3459        DIFF_OPT_SET(options, HAS_CHANGES);
3460}
3461
3462void diff_change(struct diff_options *options,
3463                 unsigned old_mode, unsigned new_mode,
3464                 const unsigned char *old_sha1,
3465                 const unsigned char *new_sha1,
3466                 const char *concatpath)
3467{
3468        struct diff_filespec *one, *two;
3469
3470        if (DIFF_OPT_TST(options, IGNORE_SUBMODULES) && S_ISGITLINK(old_mode)
3471                        && S_ISGITLINK(new_mode))
3472                return;
3473
3474        if (DIFF_OPT_TST(options, REVERSE_DIFF)) {
3475                unsigned tmp;
3476                const unsigned char *tmp_c;
3477                tmp = old_mode; old_mode = new_mode; new_mode = tmp;
3478                tmp_c = old_sha1; old_sha1 = new_sha1; new_sha1 = tmp_c;
3479        }
3480
3481        if (options->prefix &&
3482            strncmp(concatpath, options->prefix, options->prefix_length))
3483                return;
3484
3485        one = alloc_filespec(concatpath);
3486        two = alloc_filespec(concatpath);
3487        fill_filespec(one, old_sha1, old_mode);
3488        fill_filespec(two, new_sha1, new_mode);
3489
3490        diff_queue(&diff_queued_diff, one, two);
3491        DIFF_OPT_SET(options, HAS_CHANGES);
3492}
3493
3494void diff_unmerge(struct diff_options *options,
3495                  const char *path,
3496                  unsigned mode, const unsigned char *sha1)
3497{
3498        struct diff_filespec *one, *two;
3499
3500        if (options->prefix &&
3501            strncmp(path, options->prefix, options->prefix_length))
3502                return;
3503
3504        one = alloc_filespec(path);
3505        two = alloc_filespec(path);
3506        fill_filespec(one, sha1, mode);
3507        diff_queue(&diff_queued_diff, one, two)->is_unmerged = 1;
3508}