diff.con commit grep: recurse in-process using 'struct repository' (f9ee2fc)
   1/*
   2 * Copyright (C) 2005 Junio C Hamano
   3 */
   4#include "cache.h"
   5#include "config.h"
   6#include "tempfile.h"
   7#include "quote.h"
   8#include "diff.h"
   9#include "diffcore.h"
  10#include "delta.h"
  11#include "xdiff-interface.h"
  12#include "color.h"
  13#include "attr.h"
  14#include "run-command.h"
  15#include "utf8.h"
  16#include "userdiff.h"
  17#include "submodule-config.h"
  18#include "submodule.h"
  19#include "ll-merge.h"
  20#include "string-list.h"
  21#include "argv-array.h"
  22#include "graph.h"
  23
  24#ifdef NO_FAST_WORKING_DIRECTORY
  25#define FAST_WORKING_DIRECTORY 0
  26#else
  27#define FAST_WORKING_DIRECTORY 1
  28#endif
  29
  30static int diff_detect_rename_default;
  31static int diff_indent_heuristic = 1;
  32static int diff_rename_limit_default = 400;
  33static int diff_suppress_blank_empty;
  34static int diff_use_color_default = -1;
  35static int diff_context_default = 3;
  36static int diff_interhunk_context_default;
  37static const char *diff_word_regex_cfg;
  38static const char *external_diff_cmd_cfg;
  39static const char *diff_order_file_cfg;
  40int diff_auto_refresh_index = 1;
  41static int diff_mnemonic_prefix;
  42static int diff_no_prefix;
  43static int diff_stat_graph_width;
  44static int diff_dirstat_permille_default = 30;
  45static struct diff_options default_diff_options;
  46static long diff_algorithm;
  47static unsigned ws_error_highlight_default = WSEH_NEW;
  48
  49static char diff_colors[][COLOR_MAXLEN] = {
  50        GIT_COLOR_RESET,
  51        GIT_COLOR_NORMAL,       /* CONTEXT */
  52        GIT_COLOR_BOLD,         /* METAINFO */
  53        GIT_COLOR_CYAN,         /* FRAGINFO */
  54        GIT_COLOR_RED,          /* OLD */
  55        GIT_COLOR_GREEN,        /* NEW */
  56        GIT_COLOR_YELLOW,       /* COMMIT */
  57        GIT_COLOR_BG_RED,       /* WHITESPACE */
  58        GIT_COLOR_NORMAL,       /* FUNCINFO */
  59};
  60
  61static NORETURN void die_want_option(const char *option_name)
  62{
  63        die(_("option '%s' requires a value"), option_name);
  64}
  65
  66static int parse_diff_color_slot(const char *var)
  67{
  68        if (!strcasecmp(var, "context") || !strcasecmp(var, "plain"))
  69                return DIFF_CONTEXT;
  70        if (!strcasecmp(var, "meta"))
  71                return DIFF_METAINFO;
  72        if (!strcasecmp(var, "frag"))
  73                return DIFF_FRAGINFO;
  74        if (!strcasecmp(var, "old"))
  75                return DIFF_FILE_OLD;
  76        if (!strcasecmp(var, "new"))
  77                return DIFF_FILE_NEW;
  78        if (!strcasecmp(var, "commit"))
  79                return DIFF_COMMIT;
  80        if (!strcasecmp(var, "whitespace"))
  81                return DIFF_WHITESPACE;
  82        if (!strcasecmp(var, "func"))
  83                return DIFF_FUNCINFO;
  84        return -1;
  85}
  86
  87static int parse_dirstat_params(struct diff_options *options, const char *params_string,
  88                                struct strbuf *errmsg)
  89{
  90        char *params_copy = xstrdup(params_string);
  91        struct string_list params = STRING_LIST_INIT_NODUP;
  92        int ret = 0;
  93        int i;
  94
  95        if (*params_copy)
  96                string_list_split_in_place(&params, params_copy, ',', -1);
  97        for (i = 0; i < params.nr; i++) {
  98                const char *p = params.items[i].string;
  99                if (!strcmp(p, "changes")) {
 100                        DIFF_OPT_CLR(options, DIRSTAT_BY_LINE);
 101                        DIFF_OPT_CLR(options, DIRSTAT_BY_FILE);
 102                } else if (!strcmp(p, "lines")) {
 103                        DIFF_OPT_SET(options, DIRSTAT_BY_LINE);
 104                        DIFF_OPT_CLR(options, DIRSTAT_BY_FILE);
 105                } else if (!strcmp(p, "files")) {
 106                        DIFF_OPT_CLR(options, DIRSTAT_BY_LINE);
 107                        DIFF_OPT_SET(options, DIRSTAT_BY_FILE);
 108                } else if (!strcmp(p, "noncumulative")) {
 109                        DIFF_OPT_CLR(options, DIRSTAT_CUMULATIVE);
 110                } else if (!strcmp(p, "cumulative")) {
 111                        DIFF_OPT_SET(options, DIRSTAT_CUMULATIVE);
 112                } else if (isdigit(*p)) {
 113                        char *end;
 114                        int permille = strtoul(p, &end, 10) * 10;
 115                        if (*end == '.' && isdigit(*++end)) {
 116                                /* only use first digit */
 117                                permille += *end - '0';
 118                                /* .. and ignore any further digits */
 119                                while (isdigit(*++end))
 120                                        ; /* nothing */
 121                        }
 122                        if (!*end)
 123                                options->dirstat_permille = permille;
 124                        else {
 125                                strbuf_addf(errmsg, _("  Failed to parse dirstat cut-off percentage '%s'\n"),
 126                                            p);
 127                                ret++;
 128                        }
 129                } else {
 130                        strbuf_addf(errmsg, _("  Unknown dirstat parameter '%s'\n"), p);
 131                        ret++;
 132                }
 133
 134        }
 135        string_list_clear(&params, 0);
 136        free(params_copy);
 137        return ret;
 138}
 139
 140static int parse_submodule_params(struct diff_options *options, const char *value)
 141{
 142        if (!strcmp(value, "log"))
 143                options->submodule_format = DIFF_SUBMODULE_LOG;
 144        else if (!strcmp(value, "short"))
 145                options->submodule_format = DIFF_SUBMODULE_SHORT;
 146        else if (!strcmp(value, "diff"))
 147                options->submodule_format = DIFF_SUBMODULE_INLINE_DIFF;
 148        else
 149                return -1;
 150        return 0;
 151}
 152
 153static int git_config_rename(const char *var, const char *value)
 154{
 155        if (!value)
 156                return DIFF_DETECT_RENAME;
 157        if (!strcasecmp(value, "copies") || !strcasecmp(value, "copy"))
 158                return  DIFF_DETECT_COPY;
 159        return git_config_bool(var,value) ? DIFF_DETECT_RENAME : 0;
 160}
 161
 162long parse_algorithm_value(const char *value)
 163{
 164        if (!value)
 165                return -1;
 166        else if (!strcasecmp(value, "myers") || !strcasecmp(value, "default"))
 167                return 0;
 168        else if (!strcasecmp(value, "minimal"))
 169                return XDF_NEED_MINIMAL;
 170        else if (!strcasecmp(value, "patience"))
 171                return XDF_PATIENCE_DIFF;
 172        else if (!strcasecmp(value, "histogram"))
 173                return XDF_HISTOGRAM_DIFF;
 174        return -1;
 175}
 176
 177static int parse_one_token(const char **arg, const char *token)
 178{
 179        const char *rest;
 180        if (skip_prefix(*arg, token, &rest) && (!*rest || *rest == ',')) {
 181                *arg = rest;
 182                return 1;
 183        }
 184        return 0;
 185}
 186
 187static int parse_ws_error_highlight(const char *arg)
 188{
 189        const char *orig_arg = arg;
 190        unsigned val = 0;
 191
 192        while (*arg) {
 193                if (parse_one_token(&arg, "none"))
 194                        val = 0;
 195                else if (parse_one_token(&arg, "default"))
 196                        val = WSEH_NEW;
 197                else if (parse_one_token(&arg, "all"))
 198                        val = WSEH_NEW | WSEH_OLD | WSEH_CONTEXT;
 199                else if (parse_one_token(&arg, "new"))
 200                        val |= WSEH_NEW;
 201                else if (parse_one_token(&arg, "old"))
 202                        val |= WSEH_OLD;
 203                else if (parse_one_token(&arg, "context"))
 204                        val |= WSEH_CONTEXT;
 205                else {
 206                        return -1 - (int)(arg - orig_arg);
 207                }
 208                if (*arg)
 209                        arg++;
 210        }
 211        return val;
 212}
 213
 214/*
 215 * These are to give UI layer defaults.
 216 * The core-level commands such as git-diff-files should
 217 * never be affected by the setting of diff.renames
 218 * the user happens to have in the configuration file.
 219 */
 220void init_diff_ui_defaults(void)
 221{
 222        diff_detect_rename_default = 1;
 223}
 224
 225int git_diff_heuristic_config(const char *var, const char *value, void *cb)
 226{
 227        if (!strcmp(var, "diff.indentheuristic"))
 228                diff_indent_heuristic = git_config_bool(var, value);
 229        return 0;
 230}
 231
 232int git_diff_ui_config(const char *var, const char *value, void *cb)
 233{
 234        if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
 235                diff_use_color_default = git_config_colorbool(var, value);
 236                return 0;
 237        }
 238        if (!strcmp(var, "diff.context")) {
 239                diff_context_default = git_config_int(var, value);
 240                if (diff_context_default < 0)
 241                        return -1;
 242                return 0;
 243        }
 244        if (!strcmp(var, "diff.interhunkcontext")) {
 245                diff_interhunk_context_default = git_config_int(var, value);
 246                if (diff_interhunk_context_default < 0)
 247                        return -1;
 248                return 0;
 249        }
 250        if (!strcmp(var, "diff.renames")) {
 251                diff_detect_rename_default = git_config_rename(var, value);
 252                return 0;
 253        }
 254        if (!strcmp(var, "diff.autorefreshindex")) {
 255                diff_auto_refresh_index = git_config_bool(var, value);
 256                return 0;
 257        }
 258        if (!strcmp(var, "diff.mnemonicprefix")) {
 259                diff_mnemonic_prefix = git_config_bool(var, value);
 260                return 0;
 261        }
 262        if (!strcmp(var, "diff.noprefix")) {
 263                diff_no_prefix = git_config_bool(var, value);
 264                return 0;
 265        }
 266        if (!strcmp(var, "diff.statgraphwidth")) {
 267                diff_stat_graph_width = git_config_int(var, value);
 268                return 0;
 269        }
 270        if (!strcmp(var, "diff.external"))
 271                return git_config_string(&external_diff_cmd_cfg, var, value);
 272        if (!strcmp(var, "diff.wordregex"))
 273                return git_config_string(&diff_word_regex_cfg, var, value);
 274        if (!strcmp(var, "diff.orderfile"))
 275                return git_config_pathname(&diff_order_file_cfg, var, value);
 276
 277        if (!strcmp(var, "diff.ignoresubmodules"))
 278                handle_ignore_submodules_arg(&default_diff_options, value);
 279
 280        if (!strcmp(var, "diff.submodule")) {
 281                if (parse_submodule_params(&default_diff_options, value))
 282                        warning(_("Unknown value for 'diff.submodule' config variable: '%s'"),
 283                                value);
 284                return 0;
 285        }
 286
 287        if (!strcmp(var, "diff.algorithm")) {
 288                diff_algorithm = parse_algorithm_value(value);
 289                if (diff_algorithm < 0)
 290                        return -1;
 291                return 0;
 292        }
 293
 294        if (!strcmp(var, "diff.wserrorhighlight")) {
 295                int val = parse_ws_error_highlight(value);
 296                if (val < 0)
 297                        return -1;
 298                ws_error_highlight_default = val;
 299                return 0;
 300        }
 301
 302        if (git_color_config(var, value, cb) < 0)
 303                return -1;
 304
 305        return git_diff_basic_config(var, value, cb);
 306}
 307
 308int git_diff_basic_config(const char *var, const char *value, void *cb)
 309{
 310        const char *name;
 311
 312        if (!strcmp(var, "diff.renamelimit")) {
 313                diff_rename_limit_default = git_config_int(var, value);
 314                return 0;
 315        }
 316
 317        if (userdiff_config(var, value) < 0)
 318                return -1;
 319
 320        if (skip_prefix(var, "diff.color.", &name) ||
 321            skip_prefix(var, "color.diff.", &name)) {
 322                int slot = parse_diff_color_slot(name);
 323                if (slot < 0)
 324                        return 0;
 325                if (!value)
 326                        return config_error_nonbool(var);
 327                return color_parse(value, diff_colors[slot]);
 328        }
 329
 330        /* like GNU diff's --suppress-blank-empty option  */
 331        if (!strcmp(var, "diff.suppressblankempty") ||
 332                        /* for backwards compatibility */
 333                        !strcmp(var, "diff.suppress-blank-empty")) {
 334                diff_suppress_blank_empty = git_config_bool(var, value);
 335                return 0;
 336        }
 337
 338        if (!strcmp(var, "diff.dirstat")) {
 339                struct strbuf errmsg = STRBUF_INIT;
 340                default_diff_options.dirstat_permille = diff_dirstat_permille_default;
 341                if (parse_dirstat_params(&default_diff_options, value, &errmsg))
 342                        warning(_("Found errors in 'diff.dirstat' config variable:\n%s"),
 343                                errmsg.buf);
 344                strbuf_release(&errmsg);
 345                diff_dirstat_permille_default = default_diff_options.dirstat_permille;
 346                return 0;
 347        }
 348
 349        if (starts_with(var, "submodule."))
 350                return parse_submodule_config_option(var, value);
 351
 352        if (git_diff_heuristic_config(var, value, cb) < 0)
 353                return -1;
 354
 355        return git_default_config(var, value, cb);
 356}
 357
 358static char *quote_two(const char *one, const char *two)
 359{
 360        int need_one = quote_c_style(one, NULL, NULL, 1);
 361        int need_two = quote_c_style(two, NULL, NULL, 1);
 362        struct strbuf res = STRBUF_INIT;
 363
 364        if (need_one + need_two) {
 365                strbuf_addch(&res, '"');
 366                quote_c_style(one, &res, NULL, 1);
 367                quote_c_style(two, &res, NULL, 1);
 368                strbuf_addch(&res, '"');
 369        } else {
 370                strbuf_addstr(&res, one);
 371                strbuf_addstr(&res, two);
 372        }
 373        return strbuf_detach(&res, NULL);
 374}
 375
 376static const char *external_diff(void)
 377{
 378        static const char *external_diff_cmd = NULL;
 379        static int done_preparing = 0;
 380
 381        if (done_preparing)
 382                return external_diff_cmd;
 383        external_diff_cmd = getenv("GIT_EXTERNAL_DIFF");
 384        if (!external_diff_cmd)
 385                external_diff_cmd = external_diff_cmd_cfg;
 386        done_preparing = 1;
 387        return external_diff_cmd;
 388}
 389
 390/*
 391 * Keep track of files used for diffing. Sometimes such an entry
 392 * refers to a temporary file, sometimes to an existing file, and
 393 * sometimes to "/dev/null".
 394 */
 395static struct diff_tempfile {
 396        /*
 397         * filename external diff should read from, or NULL if this
 398         * entry is currently not in use:
 399         */
 400        const char *name;
 401
 402        char hex[GIT_MAX_HEXSZ + 1];
 403        char mode[10];
 404
 405        /*
 406         * If this diff_tempfile instance refers to a temporary file,
 407         * this tempfile object is used to manage its lifetime.
 408         */
 409        struct tempfile tempfile;
 410} diff_temp[2];
 411
 412typedef unsigned long (*sane_truncate_fn)(char *line, unsigned long len);
 413
 414struct emit_callback {
 415        int color_diff;
 416        unsigned ws_rule;
 417        int blank_at_eof_in_preimage;
 418        int blank_at_eof_in_postimage;
 419        int lno_in_preimage;
 420        int lno_in_postimage;
 421        sane_truncate_fn truncate;
 422        const char **label_path;
 423        struct diff_words_data *diff_words;
 424        struct diff_options *opt;
 425        struct strbuf *header;
 426};
 427
 428static int count_lines(const char *data, int size)
 429{
 430        int count, ch, completely_empty = 1, nl_just_seen = 0;
 431        count = 0;
 432        while (0 < size--) {
 433                ch = *data++;
 434                if (ch == '\n') {
 435                        count++;
 436                        nl_just_seen = 1;
 437                        completely_empty = 0;
 438                }
 439                else {
 440                        nl_just_seen = 0;
 441                        completely_empty = 0;
 442                }
 443        }
 444        if (completely_empty)
 445                return 0;
 446        if (!nl_just_seen)
 447                count++; /* no trailing newline */
 448        return count;
 449}
 450
 451static int fill_mmfile(mmfile_t *mf, struct diff_filespec *one)
 452{
 453        if (!DIFF_FILE_VALID(one)) {
 454                mf->ptr = (char *)""; /* does not matter */
 455                mf->size = 0;
 456                return 0;
 457        }
 458        else if (diff_populate_filespec(one, 0))
 459                return -1;
 460
 461        mf->ptr = one->data;
 462        mf->size = one->size;
 463        return 0;
 464}
 465
 466/* like fill_mmfile, but only for size, so we can avoid retrieving blob */
 467static unsigned long diff_filespec_size(struct diff_filespec *one)
 468{
 469        if (!DIFF_FILE_VALID(one))
 470                return 0;
 471        diff_populate_filespec(one, CHECK_SIZE_ONLY);
 472        return one->size;
 473}
 474
 475static int count_trailing_blank(mmfile_t *mf, unsigned ws_rule)
 476{
 477        char *ptr = mf->ptr;
 478        long size = mf->size;
 479        int cnt = 0;
 480
 481        if (!size)
 482                return cnt;
 483        ptr += size - 1; /* pointing at the very end */
 484        if (*ptr != '\n')
 485                ; /* incomplete line */
 486        else
 487                ptr--; /* skip the last LF */
 488        while (mf->ptr < ptr) {
 489                char *prev_eol;
 490                for (prev_eol = ptr; mf->ptr <= prev_eol; prev_eol--)
 491                        if (*prev_eol == '\n')
 492                                break;
 493                if (!ws_blank_line(prev_eol + 1, ptr - prev_eol, ws_rule))
 494                        break;
 495                cnt++;
 496                ptr = prev_eol - 1;
 497        }
 498        return cnt;
 499}
 500
 501static void check_blank_at_eof(mmfile_t *mf1, mmfile_t *mf2,
 502                               struct emit_callback *ecbdata)
 503{
 504        int l1, l2, at;
 505        unsigned ws_rule = ecbdata->ws_rule;
 506        l1 = count_trailing_blank(mf1, ws_rule);
 507        l2 = count_trailing_blank(mf2, ws_rule);
 508        if (l2 <= l1) {
 509                ecbdata->blank_at_eof_in_preimage = 0;
 510                ecbdata->blank_at_eof_in_postimage = 0;
 511                return;
 512        }
 513        at = count_lines(mf1->ptr, mf1->size);
 514        ecbdata->blank_at_eof_in_preimage = (at - l1) + 1;
 515
 516        at = count_lines(mf2->ptr, mf2->size);
 517        ecbdata->blank_at_eof_in_postimage = (at - l2) + 1;
 518}
 519
 520static void emit_line_0(struct diff_options *o, const char *set, const char *reset,
 521                        int first, const char *line, int len)
 522{
 523        int has_trailing_newline, has_trailing_carriage_return;
 524        int nofirst;
 525        FILE *file = o->file;
 526
 527        fputs(diff_line_prefix(o), file);
 528
 529        if (len == 0) {
 530                has_trailing_newline = (first == '\n');
 531                has_trailing_carriage_return = (!has_trailing_newline &&
 532                                                (first == '\r'));
 533                nofirst = has_trailing_newline || has_trailing_carriage_return;
 534        } else {
 535                has_trailing_newline = (len > 0 && line[len-1] == '\n');
 536                if (has_trailing_newline)
 537                        len--;
 538                has_trailing_carriage_return = (len > 0 && line[len-1] == '\r');
 539                if (has_trailing_carriage_return)
 540                        len--;
 541                nofirst = 0;
 542        }
 543
 544        if (len || !nofirst) {
 545                fputs(set, file);
 546                if (!nofirst)
 547                        fputc(first, file);
 548                fwrite(line, len, 1, file);
 549                fputs(reset, file);
 550        }
 551        if (has_trailing_carriage_return)
 552                fputc('\r', file);
 553        if (has_trailing_newline)
 554                fputc('\n', file);
 555}
 556
 557static void emit_line(struct diff_options *o, const char *set, const char *reset,
 558                      const char *line, int len)
 559{
 560        emit_line_0(o, set, reset, line[0], line+1, len-1);
 561}
 562
 563static int new_blank_line_at_eof(struct emit_callback *ecbdata, const char *line, int len)
 564{
 565        if (!((ecbdata->ws_rule & WS_BLANK_AT_EOF) &&
 566              ecbdata->blank_at_eof_in_preimage &&
 567              ecbdata->blank_at_eof_in_postimage &&
 568              ecbdata->blank_at_eof_in_preimage <= ecbdata->lno_in_preimage &&
 569              ecbdata->blank_at_eof_in_postimage <= ecbdata->lno_in_postimage))
 570                return 0;
 571        return ws_blank_line(line, len, ecbdata->ws_rule);
 572}
 573
 574static void emit_line_checked(const char *reset,
 575                              struct emit_callback *ecbdata,
 576                              const char *line, int len,
 577                              enum color_diff color,
 578                              unsigned ws_error_highlight,
 579                              char sign)
 580{
 581        const char *set = diff_get_color(ecbdata->color_diff, color);
 582        const char *ws = NULL;
 583
 584        if (ecbdata->opt->ws_error_highlight & ws_error_highlight) {
 585                ws = diff_get_color(ecbdata->color_diff, DIFF_WHITESPACE);
 586                if (!*ws)
 587                        ws = NULL;
 588        }
 589
 590        if (!ws)
 591                emit_line_0(ecbdata->opt, set, reset, sign, line, len);
 592        else if (sign == '+' && new_blank_line_at_eof(ecbdata, line, len))
 593                /* Blank line at EOF - paint '+' as well */
 594                emit_line_0(ecbdata->opt, ws, reset, sign, line, len);
 595        else {
 596                /* Emit just the prefix, then the rest. */
 597                emit_line_0(ecbdata->opt, set, reset, sign, "", 0);
 598                ws_check_emit(line, len, ecbdata->ws_rule,
 599                              ecbdata->opt->file, set, reset, ws);
 600        }
 601}
 602
 603static void emit_add_line(const char *reset,
 604                          struct emit_callback *ecbdata,
 605                          const char *line, int len)
 606{
 607        emit_line_checked(reset, ecbdata, line, len,
 608                          DIFF_FILE_NEW, WSEH_NEW, '+');
 609}
 610
 611static void emit_del_line(const char *reset,
 612                          struct emit_callback *ecbdata,
 613                          const char *line, int len)
 614{
 615        emit_line_checked(reset, ecbdata, line, len,
 616                          DIFF_FILE_OLD, WSEH_OLD, '-');
 617}
 618
 619static void emit_context_line(const char *reset,
 620                              struct emit_callback *ecbdata,
 621                              const char *line, int len)
 622{
 623        emit_line_checked(reset, ecbdata, line, len,
 624                          DIFF_CONTEXT, WSEH_CONTEXT, ' ');
 625}
 626
 627static void emit_hunk_header(struct emit_callback *ecbdata,
 628                             const char *line, int len)
 629{
 630        const char *context = diff_get_color(ecbdata->color_diff, DIFF_CONTEXT);
 631        const char *frag = diff_get_color(ecbdata->color_diff, DIFF_FRAGINFO);
 632        const char *func = diff_get_color(ecbdata->color_diff, DIFF_FUNCINFO);
 633        const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
 634        static const char atat[2] = { '@', '@' };
 635        const char *cp, *ep;
 636        struct strbuf msgbuf = STRBUF_INIT;
 637        int org_len = len;
 638        int i = 1;
 639
 640        /*
 641         * As a hunk header must begin with "@@ -<old>, +<new> @@",
 642         * it always is at least 10 bytes long.
 643         */
 644        if (len < 10 ||
 645            memcmp(line, atat, 2) ||
 646            !(ep = memmem(line + 2, len - 2, atat, 2))) {
 647                emit_line(ecbdata->opt, context, reset, line, len);
 648                return;
 649        }
 650        ep += 2; /* skip over @@ */
 651
 652        /* The hunk header in fraginfo color */
 653        strbuf_addstr(&msgbuf, frag);
 654        strbuf_add(&msgbuf, line, ep - line);
 655        strbuf_addstr(&msgbuf, reset);
 656
 657        /*
 658         * trailing "\r\n"
 659         */
 660        for ( ; i < 3; i++)
 661                if (line[len - i] == '\r' || line[len - i] == '\n')
 662                        len--;
 663
 664        /* blank before the func header */
 665        for (cp = ep; ep - line < len; ep++)
 666                if (*ep != ' ' && *ep != '\t')
 667                        break;
 668        if (ep != cp) {
 669                strbuf_addstr(&msgbuf, context);
 670                strbuf_add(&msgbuf, cp, ep - cp);
 671                strbuf_addstr(&msgbuf, reset);
 672        }
 673
 674        if (ep < line + len) {
 675                strbuf_addstr(&msgbuf, func);
 676                strbuf_add(&msgbuf, ep, line + len - ep);
 677                strbuf_addstr(&msgbuf, reset);
 678        }
 679
 680        strbuf_add(&msgbuf, line + len, org_len - len);
 681        emit_line(ecbdata->opt, "", "", msgbuf.buf, msgbuf.len);
 682        strbuf_release(&msgbuf);
 683}
 684
 685static struct diff_tempfile *claim_diff_tempfile(void) {
 686        int i;
 687        for (i = 0; i < ARRAY_SIZE(diff_temp); i++)
 688                if (!diff_temp[i].name)
 689                        return diff_temp + i;
 690        die("BUG: diff is failing to clean up its tempfiles");
 691}
 692
 693static void remove_tempfile(void)
 694{
 695        int i;
 696        for (i = 0; i < ARRAY_SIZE(diff_temp); i++) {
 697                if (is_tempfile_active(&diff_temp[i].tempfile))
 698                        delete_tempfile(&diff_temp[i].tempfile);
 699                diff_temp[i].name = NULL;
 700        }
 701}
 702
 703static void print_line_count(FILE *file, int count)
 704{
 705        switch (count) {
 706        case 0:
 707                fprintf(file, "0,0");
 708                break;
 709        case 1:
 710                fprintf(file, "1");
 711                break;
 712        default:
 713                fprintf(file, "1,%d", count);
 714                break;
 715        }
 716}
 717
 718static void emit_rewrite_lines(struct emit_callback *ecb,
 719                               int prefix, const char *data, int size)
 720{
 721        const char *endp = NULL;
 722        static const char *nneof = " No newline at end of file\n";
 723        const char *reset = diff_get_color(ecb->color_diff, DIFF_RESET);
 724
 725        while (0 < size) {
 726                int len;
 727
 728                endp = memchr(data, '\n', size);
 729                len = endp ? (endp - data + 1) : size;
 730                if (prefix != '+') {
 731                        ecb->lno_in_preimage++;
 732                        emit_del_line(reset, ecb, data, len);
 733                } else {
 734                        ecb->lno_in_postimage++;
 735                        emit_add_line(reset, ecb, data, len);
 736                }
 737                size -= len;
 738                data += len;
 739        }
 740        if (!endp) {
 741                const char *context = diff_get_color(ecb->color_diff,
 742                                                     DIFF_CONTEXT);
 743                putc('\n', ecb->opt->file);
 744                emit_line_0(ecb->opt, context, reset, '\\',
 745                            nneof, strlen(nneof));
 746        }
 747}
 748
 749static void emit_rewrite_diff(const char *name_a,
 750                              const char *name_b,
 751                              struct diff_filespec *one,
 752                              struct diff_filespec *two,
 753                              struct userdiff_driver *textconv_one,
 754                              struct userdiff_driver *textconv_two,
 755                              struct diff_options *o)
 756{
 757        int lc_a, lc_b;
 758        const char *name_a_tab, *name_b_tab;
 759        const char *metainfo = diff_get_color(o->use_color, DIFF_METAINFO);
 760        const char *fraginfo = diff_get_color(o->use_color, DIFF_FRAGINFO);
 761        const char *reset = diff_get_color(o->use_color, DIFF_RESET);
 762        static struct strbuf a_name = STRBUF_INIT, b_name = STRBUF_INIT;
 763        const char *a_prefix, *b_prefix;
 764        char *data_one, *data_two;
 765        size_t size_one, size_two;
 766        struct emit_callback ecbdata;
 767        const char *line_prefix = diff_line_prefix(o);
 768
 769        if (diff_mnemonic_prefix && DIFF_OPT_TST(o, REVERSE_DIFF)) {
 770                a_prefix = o->b_prefix;
 771                b_prefix = o->a_prefix;
 772        } else {
 773                a_prefix = o->a_prefix;
 774                b_prefix = o->b_prefix;
 775        }
 776
 777        name_a += (*name_a == '/');
 778        name_b += (*name_b == '/');
 779        name_a_tab = strchr(name_a, ' ') ? "\t" : "";
 780        name_b_tab = strchr(name_b, ' ') ? "\t" : "";
 781
 782        strbuf_reset(&a_name);
 783        strbuf_reset(&b_name);
 784        quote_two_c_style(&a_name, a_prefix, name_a, 0);
 785        quote_two_c_style(&b_name, b_prefix, name_b, 0);
 786
 787        size_one = fill_textconv(textconv_one, one, &data_one);
 788        size_two = fill_textconv(textconv_two, two, &data_two);
 789
 790        memset(&ecbdata, 0, sizeof(ecbdata));
 791        ecbdata.color_diff = want_color(o->use_color);
 792        ecbdata.ws_rule = whitespace_rule(name_b);
 793        ecbdata.opt = o;
 794        if (ecbdata.ws_rule & WS_BLANK_AT_EOF) {
 795                mmfile_t mf1, mf2;
 796                mf1.ptr = (char *)data_one;
 797                mf2.ptr = (char *)data_two;
 798                mf1.size = size_one;
 799                mf2.size = size_two;
 800                check_blank_at_eof(&mf1, &mf2, &ecbdata);
 801        }
 802        ecbdata.lno_in_preimage = 1;
 803        ecbdata.lno_in_postimage = 1;
 804
 805        lc_a = count_lines(data_one, size_one);
 806        lc_b = count_lines(data_two, size_two);
 807        fprintf(o->file,
 808                "%s%s--- %s%s%s\n%s%s+++ %s%s%s\n%s%s@@ -",
 809                line_prefix, metainfo, a_name.buf, name_a_tab, reset,
 810                line_prefix, metainfo, b_name.buf, name_b_tab, reset,
 811                line_prefix, fraginfo);
 812        if (!o->irreversible_delete)
 813                print_line_count(o->file, lc_a);
 814        else
 815                fprintf(o->file, "?,?");
 816        fprintf(o->file, " +");
 817        print_line_count(o->file, lc_b);
 818        fprintf(o->file, " @@%s\n", reset);
 819        if (lc_a && !o->irreversible_delete)
 820                emit_rewrite_lines(&ecbdata, '-', data_one, size_one);
 821        if (lc_b)
 822                emit_rewrite_lines(&ecbdata, '+', data_two, size_two);
 823        if (textconv_one)
 824                free((char *)data_one);
 825        if (textconv_two)
 826                free((char *)data_two);
 827}
 828
 829struct diff_words_buffer {
 830        mmfile_t text;
 831        long alloc;
 832        struct diff_words_orig {
 833                const char *begin, *end;
 834        } *orig;
 835        int orig_nr, orig_alloc;
 836};
 837
 838static void diff_words_append(char *line, unsigned long len,
 839                struct diff_words_buffer *buffer)
 840{
 841        ALLOC_GROW(buffer->text.ptr, buffer->text.size + len, buffer->alloc);
 842        line++;
 843        len--;
 844        memcpy(buffer->text.ptr + buffer->text.size, line, len);
 845        buffer->text.size += len;
 846        buffer->text.ptr[buffer->text.size] = '\0';
 847}
 848
 849struct diff_words_style_elem {
 850        const char *prefix;
 851        const char *suffix;
 852        const char *color; /* NULL; filled in by the setup code if
 853                            * color is enabled */
 854};
 855
 856struct diff_words_style {
 857        enum diff_words_type type;
 858        struct diff_words_style_elem new, old, ctx;
 859        const char *newline;
 860};
 861
 862static struct diff_words_style diff_words_styles[] = {
 863        { DIFF_WORDS_PORCELAIN, {"+", "\n"}, {"-", "\n"}, {" ", "\n"}, "~\n" },
 864        { DIFF_WORDS_PLAIN, {"{+", "+}"}, {"[-", "-]"}, {"", ""}, "\n" },
 865        { DIFF_WORDS_COLOR, {"", ""}, {"", ""}, {"", ""}, "\n" }
 866};
 867
 868struct diff_words_data {
 869        struct diff_words_buffer minus, plus;
 870        const char *current_plus;
 871        int last_minus;
 872        struct diff_options *opt;
 873        regex_t *word_regex;
 874        enum diff_words_type type;
 875        struct diff_words_style *style;
 876};
 877
 878static int fn_out_diff_words_write_helper(FILE *fp,
 879                                          struct diff_words_style_elem *st_el,
 880                                          const char *newline,
 881                                          size_t count, const char *buf,
 882                                          const char *line_prefix)
 883{
 884        int print = 0;
 885
 886        while (count) {
 887                char *p = memchr(buf, '\n', count);
 888                if (print)
 889                        fputs(line_prefix, fp);
 890                if (p != buf) {
 891                        if (st_el->color && fputs(st_el->color, fp) < 0)
 892                                return -1;
 893                        if (fputs(st_el->prefix, fp) < 0 ||
 894                            fwrite(buf, p ? p - buf : count, 1, fp) != 1 ||
 895                            fputs(st_el->suffix, fp) < 0)
 896                                return -1;
 897                        if (st_el->color && *st_el->color
 898                            && fputs(GIT_COLOR_RESET, fp) < 0)
 899                                return -1;
 900                }
 901                if (!p)
 902                        return 0;
 903                if (fputs(newline, fp) < 0)
 904                        return -1;
 905                count -= p + 1 - buf;
 906                buf = p + 1;
 907                print = 1;
 908        }
 909        return 0;
 910}
 911
 912/*
 913 * '--color-words' algorithm can be described as:
 914 *
 915 *   1. collect the minus/plus lines of a diff hunk, divided into
 916 *      minus-lines and plus-lines;
 917 *
 918 *   2. break both minus-lines and plus-lines into words and
 919 *      place them into two mmfile_t with one word for each line;
 920 *
 921 *   3. use xdiff to run diff on the two mmfile_t to get the words level diff;
 922 *
 923 * And for the common parts of the both file, we output the plus side text.
 924 * diff_words->current_plus is used to trace the current position of the plus file
 925 * which printed. diff_words->last_minus is used to trace the last minus word
 926 * printed.
 927 *
 928 * For '--graph' to work with '--color-words', we need to output the graph prefix
 929 * on each line of color words output. Generally, there are two conditions on
 930 * which we should output the prefix.
 931 *
 932 *   1. diff_words->last_minus == 0 &&
 933 *      diff_words->current_plus == diff_words->plus.text.ptr
 934 *
 935 *      that is: the plus text must start as a new line, and if there is no minus
 936 *      word printed, a graph prefix must be printed.
 937 *
 938 *   2. diff_words->current_plus > diff_words->plus.text.ptr &&
 939 *      *(diff_words->current_plus - 1) == '\n'
 940 *
 941 *      that is: a graph prefix must be printed following a '\n'
 942 */
 943static int color_words_output_graph_prefix(struct diff_words_data *diff_words)
 944{
 945        if ((diff_words->last_minus == 0 &&
 946                diff_words->current_plus == diff_words->plus.text.ptr) ||
 947                (diff_words->current_plus > diff_words->plus.text.ptr &&
 948                *(diff_words->current_plus - 1) == '\n')) {
 949                return 1;
 950        } else {
 951                return 0;
 952        }
 953}
 954
 955static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len)
 956{
 957        struct diff_words_data *diff_words = priv;
 958        struct diff_words_style *style = diff_words->style;
 959        int minus_first, minus_len, plus_first, plus_len;
 960        const char *minus_begin, *minus_end, *plus_begin, *plus_end;
 961        struct diff_options *opt = diff_words->opt;
 962        const char *line_prefix;
 963
 964        if (line[0] != '@' || parse_hunk_header(line, len,
 965                        &minus_first, &minus_len, &plus_first, &plus_len))
 966                return;
 967
 968        assert(opt);
 969        line_prefix = diff_line_prefix(opt);
 970
 971        /* POSIX requires that first be decremented by one if len == 0... */
 972        if (minus_len) {
 973                minus_begin = diff_words->minus.orig[minus_first].begin;
 974                minus_end =
 975                        diff_words->minus.orig[minus_first + minus_len - 1].end;
 976        } else
 977                minus_begin = minus_end =
 978                        diff_words->minus.orig[minus_first].end;
 979
 980        if (plus_len) {
 981                plus_begin = diff_words->plus.orig[plus_first].begin;
 982                plus_end = diff_words->plus.orig[plus_first + plus_len - 1].end;
 983        } else
 984                plus_begin = plus_end = diff_words->plus.orig[plus_first].end;
 985
 986        if (color_words_output_graph_prefix(diff_words)) {
 987                fputs(line_prefix, diff_words->opt->file);
 988        }
 989        if (diff_words->current_plus != plus_begin) {
 990                fn_out_diff_words_write_helper(diff_words->opt->file,
 991                                &style->ctx, style->newline,
 992                                plus_begin - diff_words->current_plus,
 993                                diff_words->current_plus, line_prefix);
 994                if (*(plus_begin - 1) == '\n')
 995                        fputs(line_prefix, diff_words->opt->file);
 996        }
 997        if (minus_begin != minus_end) {
 998                fn_out_diff_words_write_helper(diff_words->opt->file,
 999                                &style->old, style->newline,
1000                                minus_end - minus_begin, minus_begin,
1001                                line_prefix);
1002        }
1003        if (plus_begin != plus_end) {
1004                fn_out_diff_words_write_helper(diff_words->opt->file,
1005                                &style->new, style->newline,
1006                                plus_end - plus_begin, plus_begin,
1007                                line_prefix);
1008        }
1009
1010        diff_words->current_plus = plus_end;
1011        diff_words->last_minus = minus_first;
1012}
1013
1014/* This function starts looking at *begin, and returns 0 iff a word was found. */
1015static int find_word_boundaries(mmfile_t *buffer, regex_t *word_regex,
1016                int *begin, int *end)
1017{
1018        if (word_regex && *begin < buffer->size) {
1019                regmatch_t match[1];
1020                if (!regexec_buf(word_regex, buffer->ptr + *begin,
1021                                 buffer->size - *begin, 1, match, 0)) {
1022                        char *p = memchr(buffer->ptr + *begin + match[0].rm_so,
1023                                        '\n', match[0].rm_eo - match[0].rm_so);
1024                        *end = p ? p - buffer->ptr : match[0].rm_eo + *begin;
1025                        *begin += match[0].rm_so;
1026                        return *begin >= *end;
1027                }
1028                return -1;
1029        }
1030
1031        /* find the next word */
1032        while (*begin < buffer->size && isspace(buffer->ptr[*begin]))
1033                (*begin)++;
1034        if (*begin >= buffer->size)
1035                return -1;
1036
1037        /* find the end of the word */
1038        *end = *begin + 1;
1039        while (*end < buffer->size && !isspace(buffer->ptr[*end]))
1040                (*end)++;
1041
1042        return 0;
1043}
1044
1045/*
1046 * This function splits the words in buffer->text, stores the list with
1047 * newline separator into out, and saves the offsets of the original words
1048 * in buffer->orig.
1049 */
1050static void diff_words_fill(struct diff_words_buffer *buffer, mmfile_t *out,
1051                regex_t *word_regex)
1052{
1053        int i, j;
1054        long alloc = 0;
1055
1056        out->size = 0;
1057        out->ptr = NULL;
1058
1059        /* fake an empty "0th" word */
1060        ALLOC_GROW(buffer->orig, 1, buffer->orig_alloc);
1061        buffer->orig[0].begin = buffer->orig[0].end = buffer->text.ptr;
1062        buffer->orig_nr = 1;
1063
1064        for (i = 0; i < buffer->text.size; i++) {
1065                if (find_word_boundaries(&buffer->text, word_regex, &i, &j))
1066                        return;
1067
1068                /* store original boundaries */
1069                ALLOC_GROW(buffer->orig, buffer->orig_nr + 1,
1070                                buffer->orig_alloc);
1071                buffer->orig[buffer->orig_nr].begin = buffer->text.ptr + i;
1072                buffer->orig[buffer->orig_nr].end = buffer->text.ptr + j;
1073                buffer->orig_nr++;
1074
1075                /* store one word */
1076                ALLOC_GROW(out->ptr, out->size + j - i + 1, alloc);
1077                memcpy(out->ptr + out->size, buffer->text.ptr + i, j - i);
1078                out->ptr[out->size + j - i] = '\n';
1079                out->size += j - i + 1;
1080
1081                i = j - 1;
1082        }
1083}
1084
1085/* this executes the word diff on the accumulated buffers */
1086static void diff_words_show(struct diff_words_data *diff_words)
1087{
1088        xpparam_t xpp;
1089        xdemitconf_t xecfg;
1090        mmfile_t minus, plus;
1091        struct diff_words_style *style = diff_words->style;
1092
1093        struct diff_options *opt = diff_words->opt;
1094        const char *line_prefix;
1095
1096        assert(opt);
1097        line_prefix = diff_line_prefix(opt);
1098
1099        /* special case: only removal */
1100        if (!diff_words->plus.text.size) {
1101                fputs(line_prefix, diff_words->opt->file);
1102                fn_out_diff_words_write_helper(diff_words->opt->file,
1103                        &style->old, style->newline,
1104                        diff_words->minus.text.size,
1105                        diff_words->minus.text.ptr, line_prefix);
1106                diff_words->minus.text.size = 0;
1107                return;
1108        }
1109
1110        diff_words->current_plus = diff_words->plus.text.ptr;
1111        diff_words->last_minus = 0;
1112
1113        memset(&xpp, 0, sizeof(xpp));
1114        memset(&xecfg, 0, sizeof(xecfg));
1115        diff_words_fill(&diff_words->minus, &minus, diff_words->word_regex);
1116        diff_words_fill(&diff_words->plus, &plus, diff_words->word_regex);
1117        xpp.flags = 0;
1118        /* as only the hunk header will be parsed, we need a 0-context */
1119        xecfg.ctxlen = 0;
1120        if (xdi_diff_outf(&minus, &plus, fn_out_diff_words_aux, diff_words,
1121                          &xpp, &xecfg))
1122                die("unable to generate word diff");
1123        free(minus.ptr);
1124        free(plus.ptr);
1125        if (diff_words->current_plus != diff_words->plus.text.ptr +
1126                        diff_words->plus.text.size) {
1127                if (color_words_output_graph_prefix(diff_words))
1128                        fputs(line_prefix, diff_words->opt->file);
1129                fn_out_diff_words_write_helper(diff_words->opt->file,
1130                        &style->ctx, style->newline,
1131                        diff_words->plus.text.ptr + diff_words->plus.text.size
1132                        - diff_words->current_plus, diff_words->current_plus,
1133                        line_prefix);
1134        }
1135        diff_words->minus.text.size = diff_words->plus.text.size = 0;
1136}
1137
1138/* In "color-words" mode, show word-diff of words accumulated in the buffer */
1139static void diff_words_flush(struct emit_callback *ecbdata)
1140{
1141        if (ecbdata->diff_words->minus.text.size ||
1142            ecbdata->diff_words->plus.text.size)
1143                diff_words_show(ecbdata->diff_words);
1144}
1145
1146static void diff_filespec_load_driver(struct diff_filespec *one)
1147{
1148        /* Use already-loaded driver */
1149        if (one->driver)
1150                return;
1151
1152        if (S_ISREG(one->mode))
1153                one->driver = userdiff_find_by_path(one->path);
1154
1155        /* Fallback to default settings */
1156        if (!one->driver)
1157                one->driver = userdiff_find_by_name("default");
1158}
1159
1160static const char *userdiff_word_regex(struct diff_filespec *one)
1161{
1162        diff_filespec_load_driver(one);
1163        return one->driver->word_regex;
1164}
1165
1166static void init_diff_words_data(struct emit_callback *ecbdata,
1167                                 struct diff_options *orig_opts,
1168                                 struct diff_filespec *one,
1169                                 struct diff_filespec *two)
1170{
1171        int i;
1172        struct diff_options *o = xmalloc(sizeof(struct diff_options));
1173        memcpy(o, orig_opts, sizeof(struct diff_options));
1174
1175        ecbdata->diff_words =
1176                xcalloc(1, sizeof(struct diff_words_data));
1177        ecbdata->diff_words->type = o->word_diff;
1178        ecbdata->diff_words->opt = o;
1179        if (!o->word_regex)
1180                o->word_regex = userdiff_word_regex(one);
1181        if (!o->word_regex)
1182                o->word_regex = userdiff_word_regex(two);
1183        if (!o->word_regex)
1184                o->word_regex = diff_word_regex_cfg;
1185        if (o->word_regex) {
1186                ecbdata->diff_words->word_regex = (regex_t *)
1187                        xmalloc(sizeof(regex_t));
1188                if (regcomp(ecbdata->diff_words->word_regex,
1189                            o->word_regex,
1190                            REG_EXTENDED | REG_NEWLINE))
1191                        die ("Invalid regular expression: %s",
1192                             o->word_regex);
1193        }
1194        for (i = 0; i < ARRAY_SIZE(diff_words_styles); i++) {
1195                if (o->word_diff == diff_words_styles[i].type) {
1196                        ecbdata->diff_words->style =
1197                                &diff_words_styles[i];
1198                        break;
1199                }
1200        }
1201        if (want_color(o->use_color)) {
1202                struct diff_words_style *st = ecbdata->diff_words->style;
1203                st->old.color = diff_get_color_opt(o, DIFF_FILE_OLD);
1204                st->new.color = diff_get_color_opt(o, DIFF_FILE_NEW);
1205                st->ctx.color = diff_get_color_opt(o, DIFF_CONTEXT);
1206        }
1207}
1208
1209static void free_diff_words_data(struct emit_callback *ecbdata)
1210{
1211        if (ecbdata->diff_words) {
1212                diff_words_flush(ecbdata);
1213                free (ecbdata->diff_words->opt);
1214                free (ecbdata->diff_words->minus.text.ptr);
1215                free (ecbdata->diff_words->minus.orig);
1216                free (ecbdata->diff_words->plus.text.ptr);
1217                free (ecbdata->diff_words->plus.orig);
1218                if (ecbdata->diff_words->word_regex) {
1219                        regfree(ecbdata->diff_words->word_regex);
1220                        free(ecbdata->diff_words->word_regex);
1221                }
1222                FREE_AND_NULL(ecbdata->diff_words);
1223        }
1224}
1225
1226const char *diff_get_color(int diff_use_color, enum color_diff ix)
1227{
1228        if (want_color(diff_use_color))
1229                return diff_colors[ix];
1230        return "";
1231}
1232
1233const char *diff_line_prefix(struct diff_options *opt)
1234{
1235        struct strbuf *msgbuf;
1236        if (!opt->output_prefix)
1237                return "";
1238
1239        msgbuf = opt->output_prefix(opt, opt->output_prefix_data);
1240        return msgbuf->buf;
1241}
1242
1243static unsigned long sane_truncate_line(struct emit_callback *ecb, char *line, unsigned long len)
1244{
1245        const char *cp;
1246        unsigned long allot;
1247        size_t l = len;
1248
1249        if (ecb->truncate)
1250                return ecb->truncate(line, len);
1251        cp = line;
1252        allot = l;
1253        while (0 < l) {
1254                (void) utf8_width(&cp, &l);
1255                if (!cp)
1256                        break; /* truncated in the middle? */
1257        }
1258        return allot - l;
1259}
1260
1261static void find_lno(const char *line, struct emit_callback *ecbdata)
1262{
1263        const char *p;
1264        ecbdata->lno_in_preimage = 0;
1265        ecbdata->lno_in_postimage = 0;
1266        p = strchr(line, '-');
1267        if (!p)
1268                return; /* cannot happen */
1269        ecbdata->lno_in_preimage = strtol(p + 1, NULL, 10);
1270        p = strchr(p, '+');
1271        if (!p)
1272                return; /* cannot happen */
1273        ecbdata->lno_in_postimage = strtol(p + 1, NULL, 10);
1274}
1275
1276static void fn_out_consume(void *priv, char *line, unsigned long len)
1277{
1278        struct emit_callback *ecbdata = priv;
1279        const char *meta = diff_get_color(ecbdata->color_diff, DIFF_METAINFO);
1280        const char *context = diff_get_color(ecbdata->color_diff, DIFF_CONTEXT);
1281        const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
1282        struct diff_options *o = ecbdata->opt;
1283        const char *line_prefix = diff_line_prefix(o);
1284
1285        o->found_changes = 1;
1286
1287        if (ecbdata->header) {
1288                fprintf(o->file, "%s", ecbdata->header->buf);
1289                strbuf_reset(ecbdata->header);
1290                ecbdata->header = NULL;
1291        }
1292
1293        if (ecbdata->label_path[0]) {
1294                const char *name_a_tab, *name_b_tab;
1295
1296                name_a_tab = strchr(ecbdata->label_path[0], ' ') ? "\t" : "";
1297                name_b_tab = strchr(ecbdata->label_path[1], ' ') ? "\t" : "";
1298
1299                fprintf(o->file, "%s%s--- %s%s%s\n",
1300                        line_prefix, meta, ecbdata->label_path[0], reset, name_a_tab);
1301                fprintf(o->file, "%s%s+++ %s%s%s\n",
1302                        line_prefix, meta, ecbdata->label_path[1], reset, name_b_tab);
1303                ecbdata->label_path[0] = ecbdata->label_path[1] = NULL;
1304        }
1305
1306        if (diff_suppress_blank_empty
1307            && len == 2 && line[0] == ' ' && line[1] == '\n') {
1308                line[0] = '\n';
1309                len = 1;
1310        }
1311
1312        if (line[0] == '@') {
1313                if (ecbdata->diff_words)
1314                        diff_words_flush(ecbdata);
1315                len = sane_truncate_line(ecbdata, line, len);
1316                find_lno(line, ecbdata);
1317                emit_hunk_header(ecbdata, line, len);
1318                if (line[len-1] != '\n')
1319                        putc('\n', o->file);
1320                return;
1321        }
1322
1323        if (ecbdata->diff_words) {
1324                if (line[0] == '-') {
1325                        diff_words_append(line, len,
1326                                          &ecbdata->diff_words->minus);
1327                        return;
1328                } else if (line[0] == '+') {
1329                        diff_words_append(line, len,
1330                                          &ecbdata->diff_words->plus);
1331                        return;
1332                } else if (starts_with(line, "\\ ")) {
1333                        /*
1334                         * Eat the "no newline at eof" marker as if we
1335                         * saw a "+" or "-" line with nothing on it,
1336                         * and return without diff_words_flush() to
1337                         * defer processing. If this is the end of
1338                         * preimage, more "+" lines may come after it.
1339                         */
1340                        return;
1341                }
1342                diff_words_flush(ecbdata);
1343                if (ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN) {
1344                        emit_line(o, context, reset, line, len);
1345                        fputs("~\n", o->file);
1346                } else {
1347                        /*
1348                         * Skip the prefix character, if any.  With
1349                         * diff_suppress_blank_empty, there may be
1350                         * none.
1351                         */
1352                        if (line[0] != '\n') {
1353                              line++;
1354                              len--;
1355                        }
1356                        emit_line(o, context, reset, line, len);
1357                }
1358                return;
1359        }
1360
1361        switch (line[0]) {
1362        case '+':
1363                ecbdata->lno_in_postimage++;
1364                emit_add_line(reset, ecbdata, line + 1, len - 1);
1365                break;
1366        case '-':
1367                ecbdata->lno_in_preimage++;
1368                emit_del_line(reset, ecbdata, line + 1, len - 1);
1369                break;
1370        case ' ':
1371                ecbdata->lno_in_postimage++;
1372                ecbdata->lno_in_preimage++;
1373                emit_context_line(reset, ecbdata, line + 1, len - 1);
1374                break;
1375        default:
1376                /* incomplete line at the end */
1377                ecbdata->lno_in_preimage++;
1378                emit_line(o, diff_get_color(ecbdata->color_diff, DIFF_CONTEXT),
1379                          reset, line, len);
1380                break;
1381        }
1382}
1383
1384static char *pprint_rename(const char *a, const char *b)
1385{
1386        const char *old = a;
1387        const char *new = b;
1388        struct strbuf name = STRBUF_INIT;
1389        int pfx_length, sfx_length;
1390        int pfx_adjust_for_slash;
1391        int len_a = strlen(a);
1392        int len_b = strlen(b);
1393        int a_midlen, b_midlen;
1394        int qlen_a = quote_c_style(a, NULL, NULL, 0);
1395        int qlen_b = quote_c_style(b, NULL, NULL, 0);
1396
1397        if (qlen_a || qlen_b) {
1398                quote_c_style(a, &name, NULL, 0);
1399                strbuf_addstr(&name, " => ");
1400                quote_c_style(b, &name, NULL, 0);
1401                return strbuf_detach(&name, NULL);
1402        }
1403
1404        /* Find common prefix */
1405        pfx_length = 0;
1406        while (*old && *new && *old == *new) {
1407                if (*old == '/')
1408                        pfx_length = old - a + 1;
1409                old++;
1410                new++;
1411        }
1412
1413        /* Find common suffix */
1414        old = a + len_a;
1415        new = b + len_b;
1416        sfx_length = 0;
1417        /*
1418         * If there is a common prefix, it must end in a slash.  In
1419         * that case we let this loop run 1 into the prefix to see the
1420         * same slash.
1421         *
1422         * If there is no common prefix, we cannot do this as it would
1423         * underrun the input strings.
1424         */
1425        pfx_adjust_for_slash = (pfx_length ? 1 : 0);
1426        while (a + pfx_length - pfx_adjust_for_slash <= old &&
1427               b + pfx_length - pfx_adjust_for_slash <= new &&
1428               *old == *new) {
1429                if (*old == '/')
1430                        sfx_length = len_a - (old - a);
1431                old--;
1432                new--;
1433        }
1434
1435        /*
1436         * pfx{mid-a => mid-b}sfx
1437         * {pfx-a => pfx-b}sfx
1438         * pfx{sfx-a => sfx-b}
1439         * name-a => name-b
1440         */
1441        a_midlen = len_a - pfx_length - sfx_length;
1442        b_midlen = len_b - pfx_length - sfx_length;
1443        if (a_midlen < 0)
1444                a_midlen = 0;
1445        if (b_midlen < 0)
1446                b_midlen = 0;
1447
1448        strbuf_grow(&name, pfx_length + a_midlen + b_midlen + sfx_length + 7);
1449        if (pfx_length + sfx_length) {
1450                strbuf_add(&name, a, pfx_length);
1451                strbuf_addch(&name, '{');
1452        }
1453        strbuf_add(&name, a + pfx_length, a_midlen);
1454        strbuf_addstr(&name, " => ");
1455        strbuf_add(&name, b + pfx_length, b_midlen);
1456        if (pfx_length + sfx_length) {
1457                strbuf_addch(&name, '}');
1458                strbuf_add(&name, a + len_a - sfx_length, sfx_length);
1459        }
1460        return strbuf_detach(&name, NULL);
1461}
1462
1463struct diffstat_t {
1464        int nr;
1465        int alloc;
1466        struct diffstat_file {
1467                char *from_name;
1468                char *name;
1469                char *print_name;
1470                unsigned is_unmerged:1;
1471                unsigned is_binary:1;
1472                unsigned is_renamed:1;
1473                unsigned is_interesting:1;
1474                uintmax_t added, deleted;
1475        } **files;
1476};
1477
1478static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat,
1479                                          const char *name_a,
1480                                          const char *name_b)
1481{
1482        struct diffstat_file *x;
1483        x = xcalloc(1, sizeof(*x));
1484        ALLOC_GROW(diffstat->files, diffstat->nr + 1, diffstat->alloc);
1485        diffstat->files[diffstat->nr++] = x;
1486        if (name_b) {
1487                x->from_name = xstrdup(name_a);
1488                x->name = xstrdup(name_b);
1489                x->is_renamed = 1;
1490        }
1491        else {
1492                x->from_name = NULL;
1493                x->name = xstrdup(name_a);
1494        }
1495        return x;
1496}
1497
1498static void diffstat_consume(void *priv, char *line, unsigned long len)
1499{
1500        struct diffstat_t *diffstat = priv;
1501        struct diffstat_file *x = diffstat->files[diffstat->nr - 1];
1502
1503        if (line[0] == '+')
1504                x->added++;
1505        else if (line[0] == '-')
1506                x->deleted++;
1507}
1508
1509const char mime_boundary_leader[] = "------------";
1510
1511static int scale_linear(int it, int width, int max_change)
1512{
1513        if (!it)
1514                return 0;
1515        /*
1516         * make sure that at least one '-' or '+' is printed if
1517         * there is any change to this path. The easiest way is to
1518         * scale linearly as if the alloted width is one column shorter
1519         * than it is, and then add 1 to the result.
1520         */
1521        return 1 + (it * (width - 1) / max_change);
1522}
1523
1524static void show_name(FILE *file,
1525                      const char *prefix, const char *name, int len)
1526{
1527        fprintf(file, " %s%-*s |", prefix, len, name);
1528}
1529
1530static void show_graph(FILE *file, char ch, int cnt, const char *set, const char *reset)
1531{
1532        if (cnt <= 0)
1533                return;
1534        fprintf(file, "%s", set);
1535        while (cnt--)
1536                putc(ch, file);
1537        fprintf(file, "%s", reset);
1538}
1539
1540static void fill_print_name(struct diffstat_file *file)
1541{
1542        char *pname;
1543
1544        if (file->print_name)
1545                return;
1546
1547        if (!file->is_renamed) {
1548                struct strbuf buf = STRBUF_INIT;
1549                if (quote_c_style(file->name, &buf, NULL, 0)) {
1550                        pname = strbuf_detach(&buf, NULL);
1551                } else {
1552                        pname = file->name;
1553                        strbuf_release(&buf);
1554                }
1555        } else {
1556                pname = pprint_rename(file->from_name, file->name);
1557        }
1558        file->print_name = pname;
1559}
1560
1561int print_stat_summary(FILE *fp, int files, int insertions, int deletions)
1562{
1563        struct strbuf sb = STRBUF_INIT;
1564        int ret;
1565
1566        if (!files) {
1567                assert(insertions == 0 && deletions == 0);
1568                return fprintf(fp, "%s\n", " 0 files changed");
1569        }
1570
1571        strbuf_addf(&sb,
1572                    (files == 1) ? " %d file changed" : " %d files changed",
1573                    files);
1574
1575        /*
1576         * For binary diff, the caller may want to print "x files
1577         * changed" with insertions == 0 && deletions == 0.
1578         *
1579         * Not omitting "0 insertions(+), 0 deletions(-)" in this case
1580         * is probably less confusing (i.e skip over "2 files changed
1581         * but nothing about added/removed lines? Is this a bug in Git?").
1582         */
1583        if (insertions || deletions == 0) {
1584                strbuf_addf(&sb,
1585                            (insertions == 1) ? ", %d insertion(+)" : ", %d insertions(+)",
1586                            insertions);
1587        }
1588
1589        if (deletions || insertions == 0) {
1590                strbuf_addf(&sb,
1591                            (deletions == 1) ? ", %d deletion(-)" : ", %d deletions(-)",
1592                            deletions);
1593        }
1594        strbuf_addch(&sb, '\n');
1595        ret = fputs(sb.buf, fp);
1596        strbuf_release(&sb);
1597        return ret;
1598}
1599
1600static void show_stats(struct diffstat_t *data, struct diff_options *options)
1601{
1602        int i, len, add, del, adds = 0, dels = 0;
1603        uintmax_t max_change = 0, max_len = 0;
1604        int total_files = data->nr, count;
1605        int width, name_width, graph_width, number_width = 0, bin_width = 0;
1606        const char *reset, *add_c, *del_c;
1607        const char *line_prefix = "";
1608        int extra_shown = 0;
1609
1610        if (data->nr == 0)
1611                return;
1612
1613        line_prefix = diff_line_prefix(options);
1614        count = options->stat_count ? options->stat_count : data->nr;
1615
1616        reset = diff_get_color_opt(options, DIFF_RESET);
1617        add_c = diff_get_color_opt(options, DIFF_FILE_NEW);
1618        del_c = diff_get_color_opt(options, DIFF_FILE_OLD);
1619
1620        /*
1621         * Find the longest filename and max number of changes
1622         */
1623        for (i = 0; (i < count) && (i < data->nr); i++) {
1624                struct diffstat_file *file = data->files[i];
1625                uintmax_t change = file->added + file->deleted;
1626
1627                if (!file->is_interesting && (change == 0)) {
1628                        count++; /* not shown == room for one more */
1629                        continue;
1630                }
1631                fill_print_name(file);
1632                len = strlen(file->print_name);
1633                if (max_len < len)
1634                        max_len = len;
1635
1636                if (file->is_unmerged) {
1637                        /* "Unmerged" is 8 characters */
1638                        bin_width = bin_width < 8 ? 8 : bin_width;
1639                        continue;
1640                }
1641                if (file->is_binary) {
1642                        /* "Bin XXX -> YYY bytes" */
1643                        int w = 14 + decimal_width(file->added)
1644                                + decimal_width(file->deleted);
1645                        bin_width = bin_width < w ? w : bin_width;
1646                        /* Display change counts aligned with "Bin" */
1647                        number_width = 3;
1648                        continue;
1649                }
1650
1651                if (max_change < change)
1652                        max_change = change;
1653        }
1654        count = i; /* where we can stop scanning in data->files[] */
1655
1656        /*
1657         * We have width = stat_width or term_columns() columns total.
1658         * We want a maximum of min(max_len, stat_name_width) for the name part.
1659         * We want a maximum of min(max_change, stat_graph_width) for the +- part.
1660         * We also need 1 for " " and 4 + decimal_width(max_change)
1661         * for " | NNNN " and one the empty column at the end, altogether
1662         * 6 + decimal_width(max_change).
1663         *
1664         * If there's not enough space, we will use the smaller of
1665         * stat_name_width (if set) and 5/8*width for the filename,
1666         * and the rest for constant elements + graph part, but no more
1667         * than stat_graph_width for the graph part.
1668         * (5/8 gives 50 for filename and 30 for the constant parts + graph
1669         * for the standard terminal size).
1670         *
1671         * In other words: stat_width limits the maximum width, and
1672         * stat_name_width fixes the maximum width of the filename,
1673         * and is also used to divide available columns if there
1674         * aren't enough.
1675         *
1676         * Binary files are displayed with "Bin XXX -> YYY bytes"
1677         * instead of the change count and graph. This part is treated
1678         * similarly to the graph part, except that it is not
1679         * "scaled". If total width is too small to accommodate the
1680         * guaranteed minimum width of the filename part and the
1681         * separators and this message, this message will "overflow"
1682         * making the line longer than the maximum width.
1683         */
1684
1685        if (options->stat_width == -1)
1686                width = term_columns() - strlen(line_prefix);
1687        else
1688                width = options->stat_width ? options->stat_width : 80;
1689        number_width = decimal_width(max_change) > number_width ?
1690                decimal_width(max_change) : number_width;
1691
1692        if (options->stat_graph_width == -1)
1693                options->stat_graph_width = diff_stat_graph_width;
1694
1695        /*
1696         * Guarantee 3/8*16==6 for the graph part
1697         * and 5/8*16==10 for the filename part
1698         */
1699        if (width < 16 + 6 + number_width)
1700                width = 16 + 6 + number_width;
1701
1702        /*
1703         * First assign sizes that are wanted, ignoring available width.
1704         * strlen("Bin XXX -> YYY bytes") == bin_width, and the part
1705         * starting from "XXX" should fit in graph_width.
1706         */
1707        graph_width = max_change + 4 > bin_width ? max_change : bin_width - 4;
1708        if (options->stat_graph_width &&
1709            options->stat_graph_width < graph_width)
1710                graph_width = options->stat_graph_width;
1711
1712        name_width = (options->stat_name_width > 0 &&
1713                      options->stat_name_width < max_len) ?
1714                options->stat_name_width : max_len;
1715
1716        /*
1717         * Adjust adjustable widths not to exceed maximum width
1718         */
1719        if (name_width + number_width + 6 + graph_width > width) {
1720                if (graph_width > width * 3/8 - number_width - 6) {
1721                        graph_width = width * 3/8 - number_width - 6;
1722                        if (graph_width < 6)
1723                                graph_width = 6;
1724                }
1725
1726                if (options->stat_graph_width &&
1727                    graph_width > options->stat_graph_width)
1728                        graph_width = options->stat_graph_width;
1729                if (name_width > width - number_width - 6 - graph_width)
1730                        name_width = width - number_width - 6 - graph_width;
1731                else
1732                        graph_width = width - number_width - 6 - name_width;
1733        }
1734
1735        /*
1736         * From here name_width is the width of the name area,
1737         * and graph_width is the width of the graph area.
1738         * max_change is used to scale graph properly.
1739         */
1740        for (i = 0; i < count; i++) {
1741                const char *prefix = "";
1742                struct diffstat_file *file = data->files[i];
1743                char *name = file->print_name;
1744                uintmax_t added = file->added;
1745                uintmax_t deleted = file->deleted;
1746                int name_len;
1747
1748                if (!file->is_interesting && (added + deleted == 0))
1749                        continue;
1750
1751                /*
1752                 * "scale" the filename
1753                 */
1754                len = name_width;
1755                name_len = strlen(name);
1756                if (name_width < name_len) {
1757                        char *slash;
1758                        prefix = "...";
1759                        len -= 3;
1760                        name += name_len - len;
1761                        slash = strchr(name, '/');
1762                        if (slash)
1763                                name = slash;
1764                }
1765
1766                if (file->is_binary) {
1767                        fprintf(options->file, "%s", line_prefix);
1768                        show_name(options->file, prefix, name, len);
1769                        fprintf(options->file, " %*s", number_width, "Bin");
1770                        if (!added && !deleted) {
1771                                putc('\n', options->file);
1772                                continue;
1773                        }
1774                        fprintf(options->file, " %s%"PRIuMAX"%s",
1775                                del_c, deleted, reset);
1776                        fprintf(options->file, " -> ");
1777                        fprintf(options->file, "%s%"PRIuMAX"%s",
1778                                add_c, added, reset);
1779                        fprintf(options->file, " bytes");
1780                        fprintf(options->file, "\n");
1781                        continue;
1782                }
1783                else if (file->is_unmerged) {
1784                        fprintf(options->file, "%s", line_prefix);
1785                        show_name(options->file, prefix, name, len);
1786                        fprintf(options->file, " Unmerged\n");
1787                        continue;
1788                }
1789
1790                /*
1791                 * scale the add/delete
1792                 */
1793                add = added;
1794                del = deleted;
1795
1796                if (graph_width <= max_change) {
1797                        int total = scale_linear(add + del, graph_width, max_change);
1798                        if (total < 2 && add && del)
1799                                /* width >= 2 due to the sanity check */
1800                                total = 2;
1801                        if (add < del) {
1802                                add = scale_linear(add, graph_width, max_change);
1803                                del = total - add;
1804                        } else {
1805                                del = scale_linear(del, graph_width, max_change);
1806                                add = total - del;
1807                        }
1808                }
1809                fprintf(options->file, "%s", line_prefix);
1810                show_name(options->file, prefix, name, len);
1811                fprintf(options->file, " %*"PRIuMAX"%s",
1812                        number_width, added + deleted,
1813                        added + deleted ? " " : "");
1814                show_graph(options->file, '+', add, add_c, reset);
1815                show_graph(options->file, '-', del, del_c, reset);
1816                fprintf(options->file, "\n");
1817        }
1818
1819        for (i = 0; i < data->nr; i++) {
1820                struct diffstat_file *file = data->files[i];
1821                uintmax_t added = file->added;
1822                uintmax_t deleted = file->deleted;
1823
1824                if (file->is_unmerged ||
1825                    (!file->is_interesting && (added + deleted == 0))) {
1826                        total_files--;
1827                        continue;
1828                }
1829
1830                if (!file->is_binary) {
1831                        adds += added;
1832                        dels += deleted;
1833                }
1834                if (i < count)
1835                        continue;
1836                if (!extra_shown)
1837                        fprintf(options->file, "%s ...\n", line_prefix);
1838                extra_shown = 1;
1839        }
1840        fprintf(options->file, "%s", line_prefix);
1841        print_stat_summary(options->file, total_files, adds, dels);
1842}
1843
1844static void show_shortstats(struct diffstat_t *data, struct diff_options *options)
1845{
1846        int i, adds = 0, dels = 0, total_files = data->nr;
1847
1848        if (data->nr == 0)
1849                return;
1850
1851        for (i = 0; i < data->nr; i++) {
1852                int added = data->files[i]->added;
1853                int deleted= data->files[i]->deleted;
1854
1855                if (data->files[i]->is_unmerged ||
1856                    (!data->files[i]->is_interesting && (added + deleted == 0))) {
1857                        total_files--;
1858                } else if (!data->files[i]->is_binary) { /* don't count bytes */
1859                        adds += added;
1860                        dels += deleted;
1861                }
1862        }
1863        fprintf(options->file, "%s", diff_line_prefix(options));
1864        print_stat_summary(options->file, total_files, adds, dels);
1865}
1866
1867static void show_numstat(struct diffstat_t *data, struct diff_options *options)
1868{
1869        int i;
1870
1871        if (data->nr == 0)
1872                return;
1873
1874        for (i = 0; i < data->nr; i++) {
1875                struct diffstat_file *file = data->files[i];
1876
1877                fprintf(options->file, "%s", diff_line_prefix(options));
1878
1879                if (file->is_binary)
1880                        fprintf(options->file, "-\t-\t");
1881                else
1882                        fprintf(options->file,
1883                                "%"PRIuMAX"\t%"PRIuMAX"\t",
1884                                file->added, file->deleted);
1885                if (options->line_termination) {
1886                        fill_print_name(file);
1887                        if (!file->is_renamed)
1888                                write_name_quoted(file->name, options->file,
1889                                                  options->line_termination);
1890                        else {
1891                                fputs(file->print_name, options->file);
1892                                putc(options->line_termination, options->file);
1893                        }
1894                } else {
1895                        if (file->is_renamed) {
1896                                putc('\0', options->file);
1897                                write_name_quoted(file->from_name, options->file, '\0');
1898                        }
1899                        write_name_quoted(file->name, options->file, '\0');
1900                }
1901        }
1902}
1903
1904struct dirstat_file {
1905        const char *name;
1906        unsigned long changed;
1907};
1908
1909struct dirstat_dir {
1910        struct dirstat_file *files;
1911        int alloc, nr, permille, cumulative;
1912};
1913
1914static long gather_dirstat(struct diff_options *opt, struct dirstat_dir *dir,
1915                unsigned long changed, const char *base, int baselen)
1916{
1917        unsigned long this_dir = 0;
1918        unsigned int sources = 0;
1919        const char *line_prefix = diff_line_prefix(opt);
1920
1921        while (dir->nr) {
1922                struct dirstat_file *f = dir->files;
1923                int namelen = strlen(f->name);
1924                unsigned long this;
1925                char *slash;
1926
1927                if (namelen < baselen)
1928                        break;
1929                if (memcmp(f->name, base, baselen))
1930                        break;
1931                slash = strchr(f->name + baselen, '/');
1932                if (slash) {
1933                        int newbaselen = slash + 1 - f->name;
1934                        this = gather_dirstat(opt, dir, changed, f->name, newbaselen);
1935                        sources++;
1936                } else {
1937                        this = f->changed;
1938                        dir->files++;
1939                        dir->nr--;
1940                        sources += 2;
1941                }
1942                this_dir += this;
1943        }
1944
1945        /*
1946         * We don't report dirstat's for
1947         *  - the top level
1948         *  - or cases where everything came from a single directory
1949         *    under this directory (sources == 1).
1950         */
1951        if (baselen && sources != 1) {
1952                if (this_dir) {
1953                        int permille = this_dir * 1000 / changed;
1954                        if (permille >= dir->permille) {
1955                                fprintf(opt->file, "%s%4d.%01d%% %.*s\n", line_prefix,
1956                                        permille / 10, permille % 10, baselen, base);
1957                                if (!dir->cumulative)
1958                                        return 0;
1959                        }
1960                }
1961        }
1962        return this_dir;
1963}
1964
1965static int dirstat_compare(const void *_a, const void *_b)
1966{
1967        const struct dirstat_file *a = _a;
1968        const struct dirstat_file *b = _b;
1969        return strcmp(a->name, b->name);
1970}
1971
1972static void show_dirstat(struct diff_options *options)
1973{
1974        int i;
1975        unsigned long changed;
1976        struct dirstat_dir dir;
1977        struct diff_queue_struct *q = &diff_queued_diff;
1978
1979        dir.files = NULL;
1980        dir.alloc = 0;
1981        dir.nr = 0;
1982        dir.permille = options->dirstat_permille;
1983        dir.cumulative = DIFF_OPT_TST(options, DIRSTAT_CUMULATIVE);
1984
1985        changed = 0;
1986        for (i = 0; i < q->nr; i++) {
1987                struct diff_filepair *p = q->queue[i];
1988                const char *name;
1989                unsigned long copied, added, damage;
1990                int content_changed;
1991
1992                name = p->two->path ? p->two->path : p->one->path;
1993
1994                if (p->one->oid_valid && p->two->oid_valid)
1995                        content_changed = oidcmp(&p->one->oid, &p->two->oid);
1996                else
1997                        content_changed = 1;
1998
1999                if (!content_changed) {
2000                        /*
2001                         * The SHA1 has not changed, so pre-/post-content is
2002                         * identical. We can therefore skip looking at the
2003                         * file contents altogether.
2004                         */
2005                        damage = 0;
2006                        goto found_damage;
2007                }
2008
2009                if (DIFF_OPT_TST(options, DIRSTAT_BY_FILE)) {
2010                        /*
2011                         * In --dirstat-by-file mode, we don't really need to
2012                         * look at the actual file contents at all.
2013                         * The fact that the SHA1 changed is enough for us to
2014                         * add this file to the list of results
2015                         * (with each file contributing equal damage).
2016                         */
2017                        damage = 1;
2018                        goto found_damage;
2019                }
2020
2021                if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
2022                        diff_populate_filespec(p->one, 0);
2023                        diff_populate_filespec(p->two, 0);
2024                        diffcore_count_changes(p->one, p->two, NULL, NULL,
2025                                               &copied, &added);
2026                        diff_free_filespec_data(p->one);
2027                        diff_free_filespec_data(p->two);
2028                } else if (DIFF_FILE_VALID(p->one)) {
2029                        diff_populate_filespec(p->one, CHECK_SIZE_ONLY);
2030                        copied = added = 0;
2031                        diff_free_filespec_data(p->one);
2032                } else if (DIFF_FILE_VALID(p->two)) {
2033                        diff_populate_filespec(p->two, CHECK_SIZE_ONLY);
2034                        copied = 0;
2035                        added = p->two->size;
2036                        diff_free_filespec_data(p->two);
2037                } else
2038                        continue;
2039
2040                /*
2041                 * Original minus copied is the removed material,
2042                 * added is the new material.  They are both damages
2043                 * made to the preimage.
2044                 * If the resulting damage is zero, we know that
2045                 * diffcore_count_changes() considers the two entries to
2046                 * be identical, but since content_changed is true, we
2047                 * know that there must have been _some_ kind of change,
2048                 * so we force all entries to have damage > 0.
2049                 */
2050                damage = (p->one->size - copied) + added;
2051                if (!damage)
2052                        damage = 1;
2053
2054found_damage:
2055                ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
2056                dir.files[dir.nr].name = name;
2057                dir.files[dir.nr].changed = damage;
2058                changed += damage;
2059                dir.nr++;
2060        }
2061
2062        /* This can happen even with many files, if everything was renames */
2063        if (!changed)
2064                return;
2065
2066        /* Show all directories with more than x% of the changes */
2067        QSORT(dir.files, dir.nr, dirstat_compare);
2068        gather_dirstat(options, &dir, changed, "", 0);
2069}
2070
2071static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *options)
2072{
2073        int i;
2074        unsigned long changed;
2075        struct dirstat_dir dir;
2076
2077        if (data->nr == 0)
2078                return;
2079
2080        dir.files = NULL;
2081        dir.alloc = 0;
2082        dir.nr = 0;
2083        dir.permille = options->dirstat_permille;
2084        dir.cumulative = DIFF_OPT_TST(options, DIRSTAT_CUMULATIVE);
2085
2086        changed = 0;
2087        for (i = 0; i < data->nr; i++) {
2088                struct diffstat_file *file = data->files[i];
2089                unsigned long damage = file->added + file->deleted;
2090                if (file->is_binary)
2091                        /*
2092                         * binary files counts bytes, not lines. Must find some
2093                         * way to normalize binary bytes vs. textual lines.
2094                         * The following heuristic assumes that there are 64
2095                         * bytes per "line".
2096                         * This is stupid and ugly, but very cheap...
2097                         */
2098                        damage = DIV_ROUND_UP(damage, 64);
2099                ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
2100                dir.files[dir.nr].name = file->name;
2101                dir.files[dir.nr].changed = damage;
2102                changed += damage;
2103                dir.nr++;
2104        }
2105
2106        /* This can happen even with many files, if everything was renames */
2107        if (!changed)
2108                return;
2109
2110        /* Show all directories with more than x% of the changes */
2111        QSORT(dir.files, dir.nr, dirstat_compare);
2112        gather_dirstat(options, &dir, changed, "", 0);
2113}
2114
2115static void free_diffstat_info(struct diffstat_t *diffstat)
2116{
2117        int i;
2118        for (i = 0; i < diffstat->nr; i++) {
2119                struct diffstat_file *f = diffstat->files[i];
2120                if (f->name != f->print_name)
2121                        free(f->print_name);
2122                free(f->name);
2123                free(f->from_name);
2124                free(f);
2125        }
2126        free(diffstat->files);
2127}
2128
2129struct checkdiff_t {
2130        const char *filename;
2131        int lineno;
2132        int conflict_marker_size;
2133        struct diff_options *o;
2134        unsigned ws_rule;
2135        unsigned status;
2136};
2137
2138static int is_conflict_marker(const char *line, int marker_size, unsigned long len)
2139{
2140        char firstchar;
2141        int cnt;
2142
2143        if (len < marker_size + 1)
2144                return 0;
2145        firstchar = line[0];
2146        switch (firstchar) {
2147        case '=': case '>': case '<': case '|':
2148                break;
2149        default:
2150                return 0;
2151        }
2152        for (cnt = 1; cnt < marker_size; cnt++)
2153                if (line[cnt] != firstchar)
2154                        return 0;
2155        /* line[1] thru line[marker_size-1] are same as firstchar */
2156        if (len < marker_size + 1 || !isspace(line[marker_size]))
2157                return 0;
2158        return 1;
2159}
2160
2161static void checkdiff_consume(void *priv, char *line, unsigned long len)
2162{
2163        struct checkdiff_t *data = priv;
2164        int marker_size = data->conflict_marker_size;
2165        const char *ws = diff_get_color(data->o->use_color, DIFF_WHITESPACE);
2166        const char *reset = diff_get_color(data->o->use_color, DIFF_RESET);
2167        const char *set = diff_get_color(data->o->use_color, DIFF_FILE_NEW);
2168        char *err;
2169        const char *line_prefix;
2170
2171        assert(data->o);
2172        line_prefix = diff_line_prefix(data->o);
2173
2174        if (line[0] == '+') {
2175                unsigned bad;
2176                data->lineno++;
2177                if (is_conflict_marker(line + 1, marker_size, len - 1)) {
2178                        data->status |= 1;
2179                        fprintf(data->o->file,
2180                                "%s%s:%d: leftover conflict marker\n",
2181                                line_prefix, data->filename, data->lineno);
2182                }
2183                bad = ws_check(line + 1, len - 1, data->ws_rule);
2184                if (!bad)
2185                        return;
2186                data->status |= bad;
2187                err = whitespace_error_string(bad);
2188                fprintf(data->o->file, "%s%s:%d: %s.\n",
2189                        line_prefix, data->filename, data->lineno, err);
2190                free(err);
2191                emit_line(data->o, set, reset, line, 1);
2192                ws_check_emit(line + 1, len - 1, data->ws_rule,
2193                              data->o->file, set, reset, ws);
2194        } else if (line[0] == ' ') {
2195                data->lineno++;
2196        } else if (line[0] == '@') {
2197                char *plus = strchr(line, '+');
2198                if (plus)
2199                        data->lineno = strtol(plus, NULL, 10) - 1;
2200                else
2201                        die("invalid diff");
2202        }
2203}
2204
2205static unsigned char *deflate_it(char *data,
2206                                 unsigned long size,
2207                                 unsigned long *result_size)
2208{
2209        int bound;
2210        unsigned char *deflated;
2211        git_zstream stream;
2212
2213        git_deflate_init(&stream, zlib_compression_level);
2214        bound = git_deflate_bound(&stream, size);
2215        deflated = xmalloc(bound);
2216        stream.next_out = deflated;
2217        stream.avail_out = bound;
2218
2219        stream.next_in = (unsigned char *)data;
2220        stream.avail_in = size;
2221        while (git_deflate(&stream, Z_FINISH) == Z_OK)
2222                ; /* nothing */
2223        git_deflate_end(&stream);
2224        *result_size = stream.total_out;
2225        return deflated;
2226}
2227
2228static void emit_binary_diff_body(FILE *file, mmfile_t *one, mmfile_t *two,
2229                                  const char *prefix)
2230{
2231        void *cp;
2232        void *delta;
2233        void *deflated;
2234        void *data;
2235        unsigned long orig_size;
2236        unsigned long delta_size;
2237        unsigned long deflate_size;
2238        unsigned long data_size;
2239
2240        /* We could do deflated delta, or we could do just deflated two,
2241         * whichever is smaller.
2242         */
2243        delta = NULL;
2244        deflated = deflate_it(two->ptr, two->size, &deflate_size);
2245        if (one->size && two->size) {
2246                delta = diff_delta(one->ptr, one->size,
2247                                   two->ptr, two->size,
2248                                   &delta_size, deflate_size);
2249                if (delta) {
2250                        void *to_free = delta;
2251                        orig_size = delta_size;
2252                        delta = deflate_it(delta, delta_size, &delta_size);
2253                        free(to_free);
2254                }
2255        }
2256
2257        if (delta && delta_size < deflate_size) {
2258                fprintf(file, "%sdelta %lu\n", prefix, orig_size);
2259                free(deflated);
2260                data = delta;
2261                data_size = delta_size;
2262        }
2263        else {
2264                fprintf(file, "%sliteral %lu\n", prefix, two->size);
2265                free(delta);
2266                data = deflated;
2267                data_size = deflate_size;
2268        }
2269
2270        /* emit data encoded in base85 */
2271        cp = data;
2272        while (data_size) {
2273                int bytes = (52 < data_size) ? 52 : data_size;
2274                char line[70];
2275                data_size -= bytes;
2276                if (bytes <= 26)
2277                        line[0] = bytes + 'A' - 1;
2278                else
2279                        line[0] = bytes - 26 + 'a' - 1;
2280                encode_85(line + 1, cp, bytes);
2281                cp = (char *) cp + bytes;
2282                fprintf(file, "%s", prefix);
2283                fputs(line, file);
2284                fputc('\n', file);
2285        }
2286        fprintf(file, "%s\n", prefix);
2287        free(data);
2288}
2289
2290static void emit_binary_diff(FILE *file, mmfile_t *one, mmfile_t *two,
2291                             const char *prefix)
2292{
2293        fprintf(file, "%sGIT binary patch\n", prefix);
2294        emit_binary_diff_body(file, one, two, prefix);
2295        emit_binary_diff_body(file, two, one, prefix);
2296}
2297
2298int diff_filespec_is_binary(struct diff_filespec *one)
2299{
2300        if (one->is_binary == -1) {
2301                diff_filespec_load_driver(one);
2302                if (one->driver->binary != -1)
2303                        one->is_binary = one->driver->binary;
2304                else {
2305                        if (!one->data && DIFF_FILE_VALID(one))
2306                                diff_populate_filespec(one, CHECK_BINARY);
2307                        if (one->is_binary == -1 && one->data)
2308                                one->is_binary = buffer_is_binary(one->data,
2309                                                one->size);
2310                        if (one->is_binary == -1)
2311                                one->is_binary = 0;
2312                }
2313        }
2314        return one->is_binary;
2315}
2316
2317static const struct userdiff_funcname *diff_funcname_pattern(struct diff_filespec *one)
2318{
2319        diff_filespec_load_driver(one);
2320        return one->driver->funcname.pattern ? &one->driver->funcname : NULL;
2321}
2322
2323void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b)
2324{
2325        if (!options->a_prefix)
2326                options->a_prefix = a;
2327        if (!options->b_prefix)
2328                options->b_prefix = b;
2329}
2330
2331struct userdiff_driver *get_textconv(struct diff_filespec *one)
2332{
2333        if (!DIFF_FILE_VALID(one))
2334                return NULL;
2335
2336        diff_filespec_load_driver(one);
2337        return userdiff_get_textconv(one->driver);
2338}
2339
2340static void builtin_diff(const char *name_a,
2341                         const char *name_b,
2342                         struct diff_filespec *one,
2343                         struct diff_filespec *two,
2344                         const char *xfrm_msg,
2345                         int must_show_header,
2346                         struct diff_options *o,
2347                         int complete_rewrite)
2348{
2349        mmfile_t mf1, mf2;
2350        const char *lbl[2];
2351        char *a_one, *b_two;
2352        const char *meta = diff_get_color_opt(o, DIFF_METAINFO);
2353        const char *reset = diff_get_color_opt(o, DIFF_RESET);
2354        const char *a_prefix, *b_prefix;
2355        struct userdiff_driver *textconv_one = NULL;
2356        struct userdiff_driver *textconv_two = NULL;
2357        struct strbuf header = STRBUF_INIT;
2358        const char *line_prefix = diff_line_prefix(o);
2359
2360        diff_set_mnemonic_prefix(o, "a/", "b/");
2361        if (DIFF_OPT_TST(o, REVERSE_DIFF)) {
2362                a_prefix = o->b_prefix;
2363                b_prefix = o->a_prefix;
2364        } else {
2365                a_prefix = o->a_prefix;
2366                b_prefix = o->b_prefix;
2367        }
2368
2369        if (o->submodule_format == DIFF_SUBMODULE_LOG &&
2370            (!one->mode || S_ISGITLINK(one->mode)) &&
2371            (!two->mode || S_ISGITLINK(two->mode))) {
2372                const char *del = diff_get_color_opt(o, DIFF_FILE_OLD);
2373                const char *add = diff_get_color_opt(o, DIFF_FILE_NEW);
2374                show_submodule_summary(o->file, one->path ? one->path : two->path,
2375                                line_prefix,
2376                                &one->oid, &two->oid,
2377                                two->dirty_submodule,
2378                                meta, del, add, reset);
2379                return;
2380        } else if (o->submodule_format == DIFF_SUBMODULE_INLINE_DIFF &&
2381                   (!one->mode || S_ISGITLINK(one->mode)) &&
2382                   (!two->mode || S_ISGITLINK(two->mode))) {
2383                const char *del = diff_get_color_opt(o, DIFF_FILE_OLD);
2384                const char *add = diff_get_color_opt(o, DIFF_FILE_NEW);
2385                show_submodule_inline_diff(o->file, one->path ? one->path : two->path,
2386                                line_prefix,
2387                                &one->oid, &two->oid,
2388                                two->dirty_submodule,
2389                                meta, del, add, reset, o);
2390                return;
2391        }
2392
2393        if (DIFF_OPT_TST(o, ALLOW_TEXTCONV)) {
2394                textconv_one = get_textconv(one);
2395                textconv_two = get_textconv(two);
2396        }
2397
2398        /* Never use a non-valid filename anywhere if at all possible */
2399        name_a = DIFF_FILE_VALID(one) ? name_a : name_b;
2400        name_b = DIFF_FILE_VALID(two) ? name_b : name_a;
2401
2402        a_one = quote_two(a_prefix, name_a + (*name_a == '/'));
2403        b_two = quote_two(b_prefix, name_b + (*name_b == '/'));
2404        lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
2405        lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
2406        strbuf_addf(&header, "%s%sdiff --git %s %s%s\n", line_prefix, meta, a_one, b_two, reset);
2407        if (lbl[0][0] == '/') {
2408                /* /dev/null */
2409                strbuf_addf(&header, "%s%snew file mode %06o%s\n", line_prefix, meta, two->mode, reset);
2410                if (xfrm_msg)
2411                        strbuf_addstr(&header, xfrm_msg);
2412                must_show_header = 1;
2413        }
2414        else if (lbl[1][0] == '/') {
2415                strbuf_addf(&header, "%s%sdeleted file mode %06o%s\n", line_prefix, meta, one->mode, reset);
2416                if (xfrm_msg)
2417                        strbuf_addstr(&header, xfrm_msg);
2418                must_show_header = 1;
2419        }
2420        else {
2421                if (one->mode != two->mode) {
2422                        strbuf_addf(&header, "%s%sold mode %06o%s\n", line_prefix, meta, one->mode, reset);
2423                        strbuf_addf(&header, "%s%snew mode %06o%s\n", line_prefix, meta, two->mode, reset);
2424                        must_show_header = 1;
2425                }
2426                if (xfrm_msg)
2427                        strbuf_addstr(&header, xfrm_msg);
2428
2429                /*
2430                 * we do not run diff between different kind
2431                 * of objects.
2432                 */
2433                if ((one->mode ^ two->mode) & S_IFMT)
2434                        goto free_ab_and_return;
2435                if (complete_rewrite &&
2436                    (textconv_one || !diff_filespec_is_binary(one)) &&
2437                    (textconv_two || !diff_filespec_is_binary(two))) {
2438                        fprintf(o->file, "%s", header.buf);
2439                        strbuf_reset(&header);
2440                        emit_rewrite_diff(name_a, name_b, one, two,
2441                                                textconv_one, textconv_two, o);
2442                        o->found_changes = 1;
2443                        goto free_ab_and_return;
2444                }
2445        }
2446
2447        if (o->irreversible_delete && lbl[1][0] == '/') {
2448                fprintf(o->file, "%s", header.buf);
2449                strbuf_reset(&header);
2450                goto free_ab_and_return;
2451        } else if (!DIFF_OPT_TST(o, TEXT) &&
2452            ( (!textconv_one && diff_filespec_is_binary(one)) ||
2453              (!textconv_two && diff_filespec_is_binary(two)) )) {
2454                if (!one->data && !two->data &&
2455                    S_ISREG(one->mode) && S_ISREG(two->mode) &&
2456                    !DIFF_OPT_TST(o, BINARY)) {
2457                        if (!oidcmp(&one->oid, &two->oid)) {
2458                                if (must_show_header)
2459                                        fprintf(o->file, "%s", header.buf);
2460                                goto free_ab_and_return;
2461                        }
2462                        fprintf(o->file, "%s", header.buf);
2463                        fprintf(o->file, "%sBinary files %s and %s differ\n",
2464                                line_prefix, lbl[0], lbl[1]);
2465                        goto free_ab_and_return;
2466                }
2467                if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
2468                        die("unable to read files to diff");
2469                /* Quite common confusing case */
2470                if (mf1.size == mf2.size &&
2471                    !memcmp(mf1.ptr, mf2.ptr, mf1.size)) {
2472                        if (must_show_header)
2473                                fprintf(o->file, "%s", header.buf);
2474                        goto free_ab_and_return;
2475                }
2476                fprintf(o->file, "%s", header.buf);
2477                strbuf_reset(&header);
2478                if (DIFF_OPT_TST(o, BINARY))
2479                        emit_binary_diff(o->file, &mf1, &mf2, line_prefix);
2480                else
2481                        fprintf(o->file, "%sBinary files %s and %s differ\n",
2482                                line_prefix, lbl[0], lbl[1]);
2483                o->found_changes = 1;
2484        } else {
2485                /* Crazy xdl interfaces.. */
2486                const char *diffopts = getenv("GIT_DIFF_OPTS");
2487                const char *v;
2488                xpparam_t xpp;
2489                xdemitconf_t xecfg;
2490                struct emit_callback ecbdata;
2491                const struct userdiff_funcname *pe;
2492
2493                if (must_show_header) {
2494                        fprintf(o->file, "%s", header.buf);
2495                        strbuf_reset(&header);
2496                }
2497
2498                mf1.size = fill_textconv(textconv_one, one, &mf1.ptr);
2499                mf2.size = fill_textconv(textconv_two, two, &mf2.ptr);
2500
2501                pe = diff_funcname_pattern(one);
2502                if (!pe)
2503                        pe = diff_funcname_pattern(two);
2504
2505                memset(&xpp, 0, sizeof(xpp));
2506                memset(&xecfg, 0, sizeof(xecfg));
2507                memset(&ecbdata, 0, sizeof(ecbdata));
2508                ecbdata.label_path = lbl;
2509                ecbdata.color_diff = want_color(o->use_color);
2510                ecbdata.ws_rule = whitespace_rule(name_b);
2511                if (ecbdata.ws_rule & WS_BLANK_AT_EOF)
2512                        check_blank_at_eof(&mf1, &mf2, &ecbdata);
2513                ecbdata.opt = o;
2514                ecbdata.header = header.len ? &header : NULL;
2515                xpp.flags = o->xdl_opts;
2516                xecfg.ctxlen = o->context;
2517                xecfg.interhunkctxlen = o->interhunkcontext;
2518                xecfg.flags = XDL_EMIT_FUNCNAMES;
2519                if (DIFF_OPT_TST(o, FUNCCONTEXT))
2520                        xecfg.flags |= XDL_EMIT_FUNCCONTEXT;
2521                if (pe)
2522                        xdiff_set_find_func(&xecfg, pe->pattern, pe->cflags);
2523                if (!diffopts)
2524                        ;
2525                else if (skip_prefix(diffopts, "--unified=", &v))
2526                        xecfg.ctxlen = strtoul(v, NULL, 10);
2527                else if (skip_prefix(diffopts, "-u", &v))
2528                        xecfg.ctxlen = strtoul(v, NULL, 10);
2529                if (o->word_diff)
2530                        init_diff_words_data(&ecbdata, o, one, two);
2531                if (xdi_diff_outf(&mf1, &mf2, fn_out_consume, &ecbdata,
2532                                  &xpp, &xecfg))
2533                        die("unable to generate diff for %s", one->path);
2534                if (o->word_diff)
2535                        free_diff_words_data(&ecbdata);
2536                if (textconv_one)
2537                        free(mf1.ptr);
2538                if (textconv_two)
2539                        free(mf2.ptr);
2540                xdiff_clear_find_func(&xecfg);
2541        }
2542
2543 free_ab_and_return:
2544        strbuf_release(&header);
2545        diff_free_filespec_data(one);
2546        diff_free_filespec_data(two);
2547        free(a_one);
2548        free(b_two);
2549        return;
2550}
2551
2552static void builtin_diffstat(const char *name_a, const char *name_b,
2553                             struct diff_filespec *one,
2554                             struct diff_filespec *two,
2555                             struct diffstat_t *diffstat,
2556                             struct diff_options *o,
2557                             struct diff_filepair *p)
2558{
2559        mmfile_t mf1, mf2;
2560        struct diffstat_file *data;
2561        int same_contents;
2562        int complete_rewrite = 0;
2563
2564        if (!DIFF_PAIR_UNMERGED(p)) {
2565                if (p->status == DIFF_STATUS_MODIFIED && p->score)
2566                        complete_rewrite = 1;
2567        }
2568
2569        data = diffstat_add(diffstat, name_a, name_b);
2570        data->is_interesting = p->status != DIFF_STATUS_UNKNOWN;
2571
2572        if (!one || !two) {
2573                data->is_unmerged = 1;
2574                return;
2575        }
2576
2577        same_contents = !oidcmp(&one->oid, &two->oid);
2578
2579        if (diff_filespec_is_binary(one) || diff_filespec_is_binary(two)) {
2580                data->is_binary = 1;
2581                if (same_contents) {
2582                        data->added = 0;
2583                        data->deleted = 0;
2584                } else {
2585                        data->added = diff_filespec_size(two);
2586                        data->deleted = diff_filespec_size(one);
2587                }
2588        }
2589
2590        else if (complete_rewrite) {
2591                diff_populate_filespec(one, 0);
2592                diff_populate_filespec(two, 0);
2593                data->deleted = count_lines(one->data, one->size);
2594                data->added = count_lines(two->data, two->size);
2595        }
2596
2597        else if (!same_contents) {
2598                /* Crazy xdl interfaces.. */
2599                xpparam_t xpp;
2600                xdemitconf_t xecfg;
2601
2602                if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
2603                        die("unable to read files to diff");
2604
2605                memset(&xpp, 0, sizeof(xpp));
2606                memset(&xecfg, 0, sizeof(xecfg));
2607                xpp.flags = o->xdl_opts;
2608                xecfg.ctxlen = o->context;
2609                xecfg.interhunkctxlen = o->interhunkcontext;
2610                if (xdi_diff_outf(&mf1, &mf2, diffstat_consume, diffstat,
2611                                  &xpp, &xecfg))
2612                        die("unable to generate diffstat for %s", one->path);
2613        }
2614
2615        diff_free_filespec_data(one);
2616        diff_free_filespec_data(two);
2617}
2618
2619static void builtin_checkdiff(const char *name_a, const char *name_b,
2620                              const char *attr_path,
2621                              struct diff_filespec *one,
2622                              struct diff_filespec *two,
2623                              struct diff_options *o)
2624{
2625        mmfile_t mf1, mf2;
2626        struct checkdiff_t data;
2627
2628        if (!two)
2629                return;
2630
2631        memset(&data, 0, sizeof(data));
2632        data.filename = name_b ? name_b : name_a;
2633        data.lineno = 0;
2634        data.o = o;
2635        data.ws_rule = whitespace_rule(attr_path);
2636        data.conflict_marker_size = ll_merge_marker_size(attr_path);
2637
2638        if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
2639                die("unable to read files to diff");
2640
2641        /*
2642         * All the other codepaths check both sides, but not checking
2643         * the "old" side here is deliberate.  We are checking the newly
2644         * introduced changes, and as long as the "new" side is text, we
2645         * can and should check what it introduces.
2646         */
2647        if (diff_filespec_is_binary(two))
2648                goto free_and_return;
2649        else {
2650                /* Crazy xdl interfaces.. */
2651                xpparam_t xpp;
2652                xdemitconf_t xecfg;
2653
2654                memset(&xpp, 0, sizeof(xpp));
2655                memset(&xecfg, 0, sizeof(xecfg));
2656                xecfg.ctxlen = 1; /* at least one context line */
2657                xpp.flags = 0;
2658                if (xdi_diff_outf(&mf1, &mf2, checkdiff_consume, &data,
2659                                  &xpp, &xecfg))
2660                        die("unable to generate checkdiff for %s", one->path);
2661
2662                if (data.ws_rule & WS_BLANK_AT_EOF) {
2663                        struct emit_callback ecbdata;
2664                        int blank_at_eof;
2665
2666                        ecbdata.ws_rule = data.ws_rule;
2667                        check_blank_at_eof(&mf1, &mf2, &ecbdata);
2668                        blank_at_eof = ecbdata.blank_at_eof_in_postimage;
2669
2670                        if (blank_at_eof) {
2671                                static char *err;
2672                                if (!err)
2673                                        err = whitespace_error_string(WS_BLANK_AT_EOF);
2674                                fprintf(o->file, "%s:%d: %s.\n",
2675                                        data.filename, blank_at_eof, err);
2676                                data.status = 1; /* report errors */
2677                        }
2678                }
2679        }
2680 free_and_return:
2681        diff_free_filespec_data(one);
2682        diff_free_filespec_data(two);
2683        if (data.status)
2684                DIFF_OPT_SET(o, CHECK_FAILED);
2685}
2686
2687struct diff_filespec *alloc_filespec(const char *path)
2688{
2689        struct diff_filespec *spec;
2690
2691        FLEXPTR_ALLOC_STR(spec, path, path);
2692        spec->count = 1;
2693        spec->is_binary = -1;
2694        return spec;
2695}
2696
2697void free_filespec(struct diff_filespec *spec)
2698{
2699        if (!--spec->count) {
2700                diff_free_filespec_data(spec);
2701                free(spec);
2702        }
2703}
2704
2705void fill_filespec(struct diff_filespec *spec, const struct object_id *oid,
2706                   int oid_valid, unsigned short mode)
2707{
2708        if (mode) {
2709                spec->mode = canon_mode(mode);
2710                oidcpy(&spec->oid, oid);
2711                spec->oid_valid = oid_valid;
2712        }
2713}
2714
2715/*
2716 * Given a name and sha1 pair, if the index tells us the file in
2717 * the work tree has that object contents, return true, so that
2718 * prepare_temp_file() does not have to inflate and extract.
2719 */
2720static int reuse_worktree_file(const char *name, const struct object_id *oid, int want_file)
2721{
2722        const struct cache_entry *ce;
2723        struct stat st;
2724        int pos, len;
2725
2726        /*
2727         * We do not read the cache ourselves here, because the
2728         * benchmark with my previous version that always reads cache
2729         * shows that it makes things worse for diff-tree comparing
2730         * two linux-2.6 kernel trees in an already checked out work
2731         * tree.  This is because most diff-tree comparisons deal with
2732         * only a small number of files, while reading the cache is
2733         * expensive for a large project, and its cost outweighs the
2734         * savings we get by not inflating the object to a temporary
2735         * file.  Practically, this code only helps when we are used
2736         * by diff-cache --cached, which does read the cache before
2737         * calling us.
2738         */
2739        if (!active_cache)
2740                return 0;
2741
2742        /* We want to avoid the working directory if our caller
2743         * doesn't need the data in a normal file, this system
2744         * is rather slow with its stat/open/mmap/close syscalls,
2745         * and the object is contained in a pack file.  The pack
2746         * is probably already open and will be faster to obtain
2747         * the data through than the working directory.  Loose
2748         * objects however would tend to be slower as they need
2749         * to be individually opened and inflated.
2750         */
2751        if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(oid->hash))
2752                return 0;
2753
2754        /*
2755         * Similarly, if we'd have to convert the file contents anyway, that
2756         * makes the optimization not worthwhile.
2757         */
2758        if (!want_file && would_convert_to_git(&the_index, name))
2759                return 0;
2760
2761        len = strlen(name);
2762        pos = cache_name_pos(name, len);
2763        if (pos < 0)
2764                return 0;
2765        ce = active_cache[pos];
2766
2767        /*
2768         * This is not the sha1 we are looking for, or
2769         * unreusable because it is not a regular file.
2770         */
2771        if (oidcmp(oid, &ce->oid) || !S_ISREG(ce->ce_mode))
2772                return 0;
2773
2774        /*
2775         * If ce is marked as "assume unchanged", there is no
2776         * guarantee that work tree matches what we are looking for.
2777         */
2778        if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce))
2779                return 0;
2780
2781        /*
2782         * If ce matches the file in the work tree, we can reuse it.
2783         */
2784        if (ce_uptodate(ce) ||
2785            (!lstat(name, &st) && !ce_match_stat(ce, &st, 0)))
2786                return 1;
2787
2788        return 0;
2789}
2790
2791static int diff_populate_gitlink(struct diff_filespec *s, int size_only)
2792{
2793        struct strbuf buf = STRBUF_INIT;
2794        char *dirty = "";
2795
2796        /* Are we looking at the work tree? */
2797        if (s->dirty_submodule)
2798                dirty = "-dirty";
2799
2800        strbuf_addf(&buf, "Subproject commit %s%s\n",
2801                    oid_to_hex(&s->oid), dirty);
2802        s->size = buf.len;
2803        if (size_only) {
2804                s->data = NULL;
2805                strbuf_release(&buf);
2806        } else {
2807                s->data = strbuf_detach(&buf, NULL);
2808                s->should_free = 1;
2809        }
2810        return 0;
2811}
2812
2813/*
2814 * While doing rename detection and pickaxe operation, we may need to
2815 * grab the data for the blob (or file) for our own in-core comparison.
2816 * diff_filespec has data and size fields for this purpose.
2817 */
2818int diff_populate_filespec(struct diff_filespec *s, unsigned int flags)
2819{
2820        int size_only = flags & CHECK_SIZE_ONLY;
2821        int err = 0;
2822        /*
2823         * demote FAIL to WARN to allow inspecting the situation
2824         * instead of refusing.
2825         */
2826        enum safe_crlf crlf_warn = (safe_crlf == SAFE_CRLF_FAIL
2827                                    ? SAFE_CRLF_WARN
2828                                    : safe_crlf);
2829
2830        if (!DIFF_FILE_VALID(s))
2831                die("internal error: asking to populate invalid file.");
2832        if (S_ISDIR(s->mode))
2833                return -1;
2834
2835        if (s->data)
2836                return 0;
2837
2838        if (size_only && 0 < s->size)
2839                return 0;
2840
2841        if (S_ISGITLINK(s->mode))
2842                return diff_populate_gitlink(s, size_only);
2843
2844        if (!s->oid_valid ||
2845            reuse_worktree_file(s->path, &s->oid, 0)) {
2846                struct strbuf buf = STRBUF_INIT;
2847                struct stat st;
2848                int fd;
2849
2850                if (lstat(s->path, &st) < 0) {
2851                        if (errno == ENOENT) {
2852                        err_empty:
2853                                err = -1;
2854                        empty:
2855                                s->data = (char *)"";
2856                                s->size = 0;
2857                                return err;
2858                        }
2859                }
2860                s->size = xsize_t(st.st_size);
2861                if (!s->size)
2862                        goto empty;
2863                if (S_ISLNK(st.st_mode)) {
2864                        struct strbuf sb = STRBUF_INIT;
2865
2866                        if (strbuf_readlink(&sb, s->path, s->size))
2867                                goto err_empty;
2868                        s->size = sb.len;
2869                        s->data = strbuf_detach(&sb, NULL);
2870                        s->should_free = 1;
2871                        return 0;
2872                }
2873
2874                /*
2875                 * Even if the caller would be happy with getting
2876                 * only the size, we cannot return early at this
2877                 * point if the path requires us to run the content
2878                 * conversion.
2879                 */
2880                if (size_only && !would_convert_to_git(&the_index, s->path))
2881                        return 0;
2882
2883                /*
2884                 * Note: this check uses xsize_t(st.st_size) that may
2885                 * not be the true size of the blob after it goes
2886                 * through convert_to_git().  This may not strictly be
2887                 * correct, but the whole point of big_file_threshold
2888                 * and is_binary check being that we want to avoid
2889                 * opening the file and inspecting the contents, this
2890                 * is probably fine.
2891                 */
2892                if ((flags & CHECK_BINARY) &&
2893                    s->size > big_file_threshold && s->is_binary == -1) {
2894                        s->is_binary = 1;
2895                        return 0;
2896                }
2897                fd = open(s->path, O_RDONLY);
2898                if (fd < 0)
2899                        goto err_empty;
2900                s->data = xmmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0);
2901                close(fd);
2902                s->should_munmap = 1;
2903
2904                /*
2905                 * Convert from working tree format to canonical git format
2906                 */
2907                if (convert_to_git(&the_index, s->path, s->data, s->size, &buf, crlf_warn)) {
2908                        size_t size = 0;
2909                        munmap(s->data, s->size);
2910                        s->should_munmap = 0;
2911                        s->data = strbuf_detach(&buf, &size);
2912                        s->size = size;
2913                        s->should_free = 1;
2914                }
2915        }
2916        else {
2917                enum object_type type;
2918                if (size_only || (flags & CHECK_BINARY)) {
2919                        type = sha1_object_info(s->oid.hash, &s->size);
2920                        if (type < 0)
2921                                die("unable to read %s",
2922                                    oid_to_hex(&s->oid));
2923                        if (size_only)
2924                                return 0;
2925                        if (s->size > big_file_threshold && s->is_binary == -1) {
2926                                s->is_binary = 1;
2927                                return 0;
2928                        }
2929                }
2930                s->data = read_sha1_file(s->oid.hash, &type, &s->size);
2931                if (!s->data)
2932                        die("unable to read %s", oid_to_hex(&s->oid));
2933                s->should_free = 1;
2934        }
2935        return 0;
2936}
2937
2938void diff_free_filespec_blob(struct diff_filespec *s)
2939{
2940        if (s->should_free)
2941                free(s->data);
2942        else if (s->should_munmap)
2943                munmap(s->data, s->size);
2944
2945        if (s->should_free || s->should_munmap) {
2946                s->should_free = s->should_munmap = 0;
2947                s->data = NULL;
2948        }
2949}
2950
2951void diff_free_filespec_data(struct diff_filespec *s)
2952{
2953        diff_free_filespec_blob(s);
2954        FREE_AND_NULL(s->cnt_data);
2955}
2956
2957static void prep_temp_blob(const char *path, struct diff_tempfile *temp,
2958                           void *blob,
2959                           unsigned long size,
2960                           const struct object_id *oid,
2961                           int mode)
2962{
2963        int fd;
2964        struct strbuf buf = STRBUF_INIT;
2965        struct strbuf template = STRBUF_INIT;
2966        char *path_dup = xstrdup(path);
2967        const char *base = basename(path_dup);
2968
2969        /* Generate "XXXXXX_basename.ext" */
2970        strbuf_addstr(&template, "XXXXXX_");
2971        strbuf_addstr(&template, base);
2972
2973        fd = mks_tempfile_ts(&temp->tempfile, template.buf, strlen(base) + 1);
2974        if (fd < 0)
2975                die_errno("unable to create temp-file");
2976        if (convert_to_working_tree(path,
2977                        (const char *)blob, (size_t)size, &buf)) {
2978                blob = buf.buf;
2979                size = buf.len;
2980        }
2981        if (write_in_full(fd, blob, size) != size)
2982                die_errno("unable to write temp-file");
2983        close_tempfile(&temp->tempfile);
2984        temp->name = get_tempfile_path(&temp->tempfile);
2985        oid_to_hex_r(temp->hex, oid);
2986        xsnprintf(temp->mode, sizeof(temp->mode), "%06o", mode);
2987        strbuf_release(&buf);
2988        strbuf_release(&template);
2989        free(path_dup);
2990}
2991
2992static struct diff_tempfile *prepare_temp_file(const char *name,
2993                struct diff_filespec *one)
2994{
2995        struct diff_tempfile *temp = claim_diff_tempfile();
2996
2997        if (!DIFF_FILE_VALID(one)) {
2998        not_a_valid_file:
2999                /* A '-' entry produces this for file-2, and
3000                 * a '+' entry produces this for file-1.
3001                 */
3002                temp->name = "/dev/null";
3003                xsnprintf(temp->hex, sizeof(temp->hex), ".");
3004                xsnprintf(temp->mode, sizeof(temp->mode), ".");
3005                return temp;
3006        }
3007
3008        if (!S_ISGITLINK(one->mode) &&
3009            (!one->oid_valid ||
3010             reuse_worktree_file(name, &one->oid, 1))) {
3011                struct stat st;
3012                if (lstat(name, &st) < 0) {
3013                        if (errno == ENOENT)
3014                                goto not_a_valid_file;
3015                        die_errno("stat(%s)", name);
3016                }
3017                if (S_ISLNK(st.st_mode)) {
3018                        struct strbuf sb = STRBUF_INIT;
3019                        if (strbuf_readlink(&sb, name, st.st_size) < 0)
3020                                die_errno("readlink(%s)", name);
3021                        prep_temp_blob(name, temp, sb.buf, sb.len,
3022                                       (one->oid_valid ?
3023                                        &one->oid : &null_oid),
3024                                       (one->oid_valid ?
3025                                        one->mode : S_IFLNK));
3026                        strbuf_release(&sb);
3027                }
3028                else {
3029                        /* we can borrow from the file in the work tree */
3030                        temp->name = name;
3031                        if (!one->oid_valid)
3032                                oid_to_hex_r(temp->hex, &null_oid);
3033                        else
3034                                oid_to_hex_r(temp->hex, &one->oid);
3035                        /* Even though we may sometimes borrow the
3036                         * contents from the work tree, we always want
3037                         * one->mode.  mode is trustworthy even when
3038                         * !(one->oid_valid), as long as
3039                         * DIFF_FILE_VALID(one).
3040                         */
3041                        xsnprintf(temp->mode, sizeof(temp->mode), "%06o", one->mode);
3042                }
3043                return temp;
3044        }
3045        else {
3046                if (diff_populate_filespec(one, 0))
3047                        die("cannot read data blob for %s", one->path);
3048                prep_temp_blob(name, temp, one->data, one->size,
3049                               &one->oid, one->mode);
3050        }
3051        return temp;
3052}
3053
3054static void add_external_diff_name(struct argv_array *argv,
3055                                   const char *name,
3056                                   struct diff_filespec *df)
3057{
3058        struct diff_tempfile *temp = prepare_temp_file(name, df);
3059        argv_array_push(argv, temp->name);
3060        argv_array_push(argv, temp->hex);
3061        argv_array_push(argv, temp->mode);
3062}
3063
3064/* An external diff command takes:
3065 *
3066 * diff-cmd name infile1 infile1-sha1 infile1-mode \
3067 *               infile2 infile2-sha1 infile2-mode [ rename-to ]
3068 *
3069 */
3070static void run_external_diff(const char *pgm,
3071                              const char *name,
3072                              const char *other,
3073                              struct diff_filespec *one,
3074                              struct diff_filespec *two,
3075                              const char *xfrm_msg,
3076                              int complete_rewrite,
3077                              struct diff_options *o)
3078{
3079        struct argv_array argv = ARGV_ARRAY_INIT;
3080        struct argv_array env = ARGV_ARRAY_INIT;
3081        struct diff_queue_struct *q = &diff_queued_diff;
3082
3083        argv_array_push(&argv, pgm);
3084        argv_array_push(&argv, name);
3085
3086        if (one && two) {
3087                add_external_diff_name(&argv, name, one);
3088                if (!other)
3089                        add_external_diff_name(&argv, name, two);
3090                else {
3091                        add_external_diff_name(&argv, other, two);
3092                        argv_array_push(&argv, other);
3093                        argv_array_push(&argv, xfrm_msg);
3094                }
3095        }
3096
3097        argv_array_pushf(&env, "GIT_DIFF_PATH_COUNTER=%d", ++o->diff_path_counter);
3098        argv_array_pushf(&env, "GIT_DIFF_PATH_TOTAL=%d", q->nr);
3099
3100        if (run_command_v_opt_cd_env(argv.argv, RUN_USING_SHELL, NULL, env.argv))
3101                die(_("external diff died, stopping at %s"), name);
3102
3103        remove_tempfile();
3104        argv_array_clear(&argv);
3105        argv_array_clear(&env);
3106}
3107
3108static int similarity_index(struct diff_filepair *p)
3109{
3110        return p->score * 100 / MAX_SCORE;
3111}
3112
3113static const char *diff_abbrev_oid(const struct object_id *oid, int abbrev)
3114{
3115        if (startup_info->have_repository)
3116                return find_unique_abbrev(oid->hash, abbrev);
3117        else {
3118                char *hex = oid_to_hex(oid);
3119                if (abbrev < 0)
3120                        abbrev = FALLBACK_DEFAULT_ABBREV;
3121                if (abbrev > GIT_SHA1_HEXSZ)
3122                        die("BUG: oid abbreviation out of range: %d", abbrev);
3123                if (abbrev)
3124                        hex[abbrev] = '\0';
3125                return hex;
3126        }
3127}
3128
3129static void fill_metainfo(struct strbuf *msg,
3130                          const char *name,
3131                          const char *other,
3132                          struct diff_filespec *one,
3133                          struct diff_filespec *two,
3134                          struct diff_options *o,
3135                          struct diff_filepair *p,
3136                          int *must_show_header,
3137                          int use_color)
3138{
3139        const char *set = diff_get_color(use_color, DIFF_METAINFO);
3140        const char *reset = diff_get_color(use_color, DIFF_RESET);
3141        const char *line_prefix = diff_line_prefix(o);
3142
3143        *must_show_header = 1;
3144        strbuf_init(msg, PATH_MAX * 2 + 300);
3145        switch (p->status) {
3146        case DIFF_STATUS_COPIED:
3147                strbuf_addf(msg, "%s%ssimilarity index %d%%",
3148                            line_prefix, set, similarity_index(p));
3149                strbuf_addf(msg, "%s\n%s%scopy from ",
3150                            reset,  line_prefix, set);
3151                quote_c_style(name, msg, NULL, 0);
3152                strbuf_addf(msg, "%s\n%s%scopy to ", reset, line_prefix, set);
3153                quote_c_style(other, msg, NULL, 0);
3154                strbuf_addf(msg, "%s\n", reset);
3155                break;
3156        case DIFF_STATUS_RENAMED:
3157                strbuf_addf(msg, "%s%ssimilarity index %d%%",
3158                            line_prefix, set, similarity_index(p));
3159                strbuf_addf(msg, "%s\n%s%srename from ",
3160                            reset, line_prefix, set);
3161                quote_c_style(name, msg, NULL, 0);
3162                strbuf_addf(msg, "%s\n%s%srename to ",
3163                            reset, line_prefix, set);
3164                quote_c_style(other, msg, NULL, 0);
3165                strbuf_addf(msg, "%s\n", reset);
3166                break;
3167        case DIFF_STATUS_MODIFIED:
3168                if (p->score) {
3169                        strbuf_addf(msg, "%s%sdissimilarity index %d%%%s\n",
3170                                    line_prefix,
3171                                    set, similarity_index(p), reset);
3172                        break;
3173                }
3174                /* fallthru */
3175        default:
3176                *must_show_header = 0;
3177        }
3178        if (one && two && oidcmp(&one->oid, &two->oid)) {
3179                int abbrev = DIFF_OPT_TST(o, FULL_INDEX) ? 40 : DEFAULT_ABBREV;
3180
3181                if (DIFF_OPT_TST(o, BINARY)) {
3182                        mmfile_t mf;
3183                        if ((!fill_mmfile(&mf, one) && diff_filespec_is_binary(one)) ||
3184                            (!fill_mmfile(&mf, two) && diff_filespec_is_binary(two)))
3185                                abbrev = 40;
3186                }
3187                strbuf_addf(msg, "%s%sindex %s..%s", line_prefix, set,
3188                            diff_abbrev_oid(&one->oid, abbrev),
3189                            diff_abbrev_oid(&two->oid, abbrev));
3190                if (one->mode == two->mode)
3191                        strbuf_addf(msg, " %06o", one->mode);
3192                strbuf_addf(msg, "%s\n", reset);
3193        }
3194}
3195
3196static void run_diff_cmd(const char *pgm,
3197                         const char *name,
3198                         const char *other,
3199                         const char *attr_path,
3200                         struct diff_filespec *one,
3201                         struct diff_filespec *two,
3202                         struct strbuf *msg,
3203                         struct diff_options *o,
3204                         struct diff_filepair *p)
3205{
3206        const char *xfrm_msg = NULL;
3207        int complete_rewrite = (p->status == DIFF_STATUS_MODIFIED) && p->score;
3208        int must_show_header = 0;
3209
3210
3211        if (DIFF_OPT_TST(o, ALLOW_EXTERNAL)) {
3212                struct userdiff_driver *drv = userdiff_find_by_path(attr_path);
3213                if (drv && drv->external)
3214                        pgm = drv->external;
3215        }
3216
3217        if (msg) {
3218                /*
3219                 * don't use colors when the header is intended for an
3220                 * external diff driver
3221                 */
3222                fill_metainfo(msg, name, other, one, two, o, p,
3223                              &must_show_header,
3224                              want_color(o->use_color) && !pgm);
3225                xfrm_msg = msg->len ? msg->buf : NULL;
3226        }
3227
3228        if (pgm) {
3229                run_external_diff(pgm, name, other, one, two, xfrm_msg,
3230                                  complete_rewrite, o);
3231                return;
3232        }
3233        if (one && two)
3234                builtin_diff(name, other ? other : name,
3235                             one, two, xfrm_msg, must_show_header,
3236                             o, complete_rewrite);
3237        else
3238                fprintf(o->file, "* Unmerged path %s\n", name);
3239}
3240
3241static void diff_fill_oid_info(struct diff_filespec *one)
3242{
3243        if (DIFF_FILE_VALID(one)) {
3244                if (!one->oid_valid) {
3245                        struct stat st;
3246                        if (one->is_stdin) {
3247                                oidclr(&one->oid);
3248                                return;
3249                        }
3250                        if (lstat(one->path, &st) < 0)
3251                                die_errno("stat '%s'", one->path);
3252                        if (index_path(one->oid.hash, one->path, &st, 0))
3253                                die("cannot hash %s", one->path);
3254                }
3255        }
3256        else
3257                oidclr(&one->oid);
3258}
3259
3260static void strip_prefix(int prefix_length, const char **namep, const char **otherp)
3261{
3262        /* Strip the prefix but do not molest /dev/null and absolute paths */
3263        if (*namep && **namep != '/') {
3264                *namep += prefix_length;
3265                if (**namep == '/')
3266                        ++*namep;
3267        }
3268        if (*otherp && **otherp != '/') {
3269                *otherp += prefix_length;
3270                if (**otherp == '/')
3271                        ++*otherp;
3272        }
3273}
3274
3275static void run_diff(struct diff_filepair *p, struct diff_options *o)
3276{
3277        const char *pgm = external_diff();
3278        struct strbuf msg;
3279        struct diff_filespec *one = p->one;
3280        struct diff_filespec *two = p->two;
3281        const char *name;
3282        const char *other;
3283        const char *attr_path;
3284
3285        name  = p->one->path;
3286        other = (strcmp(name, p->two->path) ? p->two->path : NULL);
3287        attr_path = name;
3288        if (o->prefix_length)
3289                strip_prefix(o->prefix_length, &name, &other);
3290
3291        if (!DIFF_OPT_TST(o, ALLOW_EXTERNAL))
3292                pgm = NULL;
3293
3294        if (DIFF_PAIR_UNMERGED(p)) {
3295                run_diff_cmd(pgm, name, NULL, attr_path,
3296                             NULL, NULL, NULL, o, p);
3297                return;
3298        }
3299
3300        diff_fill_oid_info(one);
3301        diff_fill_oid_info(two);
3302
3303        if (!pgm &&
3304            DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) &&
3305            (S_IFMT & one->mode) != (S_IFMT & two->mode)) {
3306                /*
3307                 * a filepair that changes between file and symlink
3308                 * needs to be split into deletion and creation.
3309                 */
3310                struct diff_filespec *null = alloc_filespec(two->path);
3311                run_diff_cmd(NULL, name, other, attr_path,
3312                             one, null, &msg, o, p);
3313                free(null);
3314                strbuf_release(&msg);
3315
3316                null = alloc_filespec(one->path);
3317                run_diff_cmd(NULL, name, other, attr_path,
3318                             null, two, &msg, o, p);
3319                free(null);
3320        }
3321        else
3322                run_diff_cmd(pgm, name, other, attr_path,
3323                             one, two, &msg, o, p);
3324
3325        strbuf_release(&msg);
3326}
3327
3328static void run_diffstat(struct diff_filepair *p, struct diff_options *o,
3329                         struct diffstat_t *diffstat)
3330{
3331        const char *name;
3332        const char *other;
3333
3334        if (DIFF_PAIR_UNMERGED(p)) {
3335                /* unmerged */
3336                builtin_diffstat(p->one->path, NULL, NULL, NULL, diffstat, o, p);
3337                return;
3338        }
3339
3340        name = p->one->path;
3341        other = (strcmp(name, p->two->path) ? p->two->path : NULL);
3342
3343        if (o->prefix_length)
3344                strip_prefix(o->prefix_length, &name, &other);
3345
3346        diff_fill_oid_info(p->one);
3347        diff_fill_oid_info(p->two);
3348
3349        builtin_diffstat(name, other, p->one, p->two, diffstat, o, p);
3350}
3351
3352static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
3353{
3354        const char *name;
3355        const char *other;
3356        const char *attr_path;
3357
3358        if (DIFF_PAIR_UNMERGED(p)) {
3359                /* unmerged */
3360                return;
3361        }
3362
3363        name = p->one->path;
3364        other = (strcmp(name, p->two->path) ? p->two->path : NULL);
3365        attr_path = other ? other : name;
3366
3367        if (o->prefix_length)
3368                strip_prefix(o->prefix_length, &name, &other);
3369
3370        diff_fill_oid_info(p->one);
3371        diff_fill_oid_info(p->two);
3372
3373        builtin_checkdiff(name, other, attr_path, p->one, p->two, o);
3374}
3375
3376void diff_setup(struct diff_options *options)
3377{
3378        memcpy(options, &default_diff_options, sizeof(*options));
3379
3380        options->file = stdout;
3381
3382        options->abbrev = DEFAULT_ABBREV;
3383        options->line_termination = '\n';
3384        options->break_opt = -1;
3385        options->rename_limit = -1;
3386        options->dirstat_permille = diff_dirstat_permille_default;
3387        options->context = diff_context_default;
3388        options->interhunkcontext = diff_interhunk_context_default;
3389        options->ws_error_highlight = ws_error_highlight_default;
3390        DIFF_OPT_SET(options, RENAME_EMPTY);
3391
3392        /* pathchange left =NULL by default */
3393        options->change = diff_change;
3394        options->add_remove = diff_addremove;
3395        options->use_color = diff_use_color_default;
3396        options->detect_rename = diff_detect_rename_default;
3397        options->xdl_opts |= diff_algorithm;
3398        if (diff_indent_heuristic)
3399                DIFF_XDL_SET(options, INDENT_HEURISTIC);
3400
3401        options->orderfile = diff_order_file_cfg;
3402
3403        if (diff_no_prefix) {
3404                options->a_prefix = options->b_prefix = "";
3405        } else if (!diff_mnemonic_prefix) {
3406                options->a_prefix = "a/";
3407                options->b_prefix = "b/";
3408        }
3409}
3410
3411void diff_setup_done(struct diff_options *options)
3412{
3413        int count = 0;
3414
3415        if (options->set_default)
3416                options->set_default(options);
3417
3418        if (options->output_format & DIFF_FORMAT_NAME)
3419                count++;
3420        if (options->output_format & DIFF_FORMAT_NAME_STATUS)
3421                count++;
3422        if (options->output_format & DIFF_FORMAT_CHECKDIFF)
3423                count++;
3424        if (options->output_format & DIFF_FORMAT_NO_OUTPUT)
3425                count++;
3426        if (count > 1)
3427                die(_("--name-only, --name-status, --check and -s are mutually exclusive"));
3428
3429        /*
3430         * Most of the time we can say "there are changes"
3431         * only by checking if there are changed paths, but
3432         * --ignore-whitespace* options force us to look
3433         * inside contents.
3434         */
3435
3436        if (DIFF_XDL_TST(options, IGNORE_WHITESPACE) ||
3437            DIFF_XDL_TST(options, IGNORE_WHITESPACE_CHANGE) ||
3438            DIFF_XDL_TST(options, IGNORE_WHITESPACE_AT_EOL))
3439                DIFF_OPT_SET(options, DIFF_FROM_CONTENTS);
3440        else
3441                DIFF_OPT_CLR(options, DIFF_FROM_CONTENTS);
3442
3443        if (DIFF_OPT_TST(options, FIND_COPIES_HARDER))
3444                options->detect_rename = DIFF_DETECT_COPY;
3445
3446        if (!DIFF_OPT_TST(options, RELATIVE_NAME))
3447                options->prefix = NULL;
3448        if (options->prefix)
3449                options->prefix_length = strlen(options->prefix);
3450        else
3451                options->prefix_length = 0;
3452
3453        if (options->output_format & (DIFF_FORMAT_NAME |
3454                                      DIFF_FORMAT_NAME_STATUS |
3455                                      DIFF_FORMAT_CHECKDIFF |
3456                                      DIFF_FORMAT_NO_OUTPUT))
3457                options->output_format &= ~(DIFF_FORMAT_RAW |
3458                                            DIFF_FORMAT_NUMSTAT |
3459                                            DIFF_FORMAT_DIFFSTAT |
3460                                            DIFF_FORMAT_SHORTSTAT |
3461                                            DIFF_FORMAT_DIRSTAT |
3462                                            DIFF_FORMAT_SUMMARY |
3463                                            DIFF_FORMAT_PATCH);
3464
3465        /*
3466         * These cases always need recursive; we do not drop caller-supplied
3467         * recursive bits for other formats here.
3468         */
3469        if (options->output_format & (DIFF_FORMAT_PATCH |
3470                                      DIFF_FORMAT_NUMSTAT |
3471                                      DIFF_FORMAT_DIFFSTAT |
3472                                      DIFF_FORMAT_SHORTSTAT |
3473                                      DIFF_FORMAT_DIRSTAT |
3474                                      DIFF_FORMAT_SUMMARY |
3475                                      DIFF_FORMAT_CHECKDIFF))
3476                DIFF_OPT_SET(options, RECURSIVE);
3477        /*
3478         * Also pickaxe would not work very well if you do not say recursive
3479         */
3480        if (options->pickaxe)
3481                DIFF_OPT_SET(options, RECURSIVE);
3482        /*
3483         * When patches are generated, submodules diffed against the work tree
3484         * must be checked for dirtiness too so it can be shown in the output
3485         */
3486        if (options->output_format & DIFF_FORMAT_PATCH)
3487                DIFF_OPT_SET(options, DIRTY_SUBMODULES);
3488
3489        if (options->detect_rename && options->rename_limit < 0)
3490                options->rename_limit = diff_rename_limit_default;
3491        if (options->setup & DIFF_SETUP_USE_CACHE) {
3492                if (!active_cache)
3493                        /* read-cache does not die even when it fails
3494                         * so it is safe for us to do this here.  Also
3495                         * it does not smudge active_cache or active_nr
3496                         * when it fails, so we do not have to worry about
3497                         * cleaning it up ourselves either.
3498                         */
3499                        read_cache();
3500        }
3501        if (40 < options->abbrev)
3502                options->abbrev = 40; /* full */
3503
3504        /*
3505         * It does not make sense to show the first hit we happened
3506         * to have found.  It does not make sense not to return with
3507         * exit code in such a case either.
3508         */
3509        if (DIFF_OPT_TST(options, QUICK)) {
3510                options->output_format = DIFF_FORMAT_NO_OUTPUT;
3511                DIFF_OPT_SET(options, EXIT_WITH_STATUS);
3512        }
3513
3514        options->diff_path_counter = 0;
3515
3516        if (DIFF_OPT_TST(options, FOLLOW_RENAMES) && options->pathspec.nr != 1)
3517                die(_("--follow requires exactly one pathspec"));
3518}
3519
3520static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)
3521{
3522        char c, *eq;
3523        int len;
3524
3525        if (*arg != '-')
3526                return 0;
3527        c = *++arg;
3528        if (!c)
3529                return 0;
3530        if (c == arg_short) {
3531                c = *++arg;
3532                if (!c)
3533                        return 1;
3534                if (val && isdigit(c)) {
3535                        char *end;
3536                        int n = strtoul(arg, &end, 10);
3537                        if (*end)
3538                                return 0;
3539                        *val = n;
3540                        return 1;
3541                }
3542                return 0;
3543        }
3544        if (c != '-')
3545                return 0;
3546        arg++;
3547        eq = strchrnul(arg, '=');
3548        len = eq - arg;
3549        if (!len || strncmp(arg, arg_long, len))
3550                return 0;
3551        if (*eq) {
3552                int n;
3553                char *end;
3554                if (!isdigit(*++eq))
3555                        return 0;
3556                n = strtoul(eq, &end, 10);
3557                if (*end)
3558                        return 0;
3559                *val = n;
3560        }
3561        return 1;
3562}
3563
3564static int diff_scoreopt_parse(const char *opt);
3565
3566static inline int short_opt(char opt, const char **argv,
3567                            const char **optarg)
3568{
3569        const char *arg = argv[0];
3570        if (arg[0] != '-' || arg[1] != opt)
3571                return 0;
3572        if (arg[2] != '\0') {
3573                *optarg = arg + 2;
3574                return 1;
3575        }
3576        if (!argv[1])
3577                die("Option '%c' requires a value", opt);
3578        *optarg = argv[1];
3579        return 2;
3580}
3581
3582int parse_long_opt(const char *opt, const char **argv,
3583                   const char **optarg)
3584{
3585        const char *arg = argv[0];
3586        if (!skip_prefix(arg, "--", &arg))
3587                return 0;
3588        if (!skip_prefix(arg, opt, &arg))
3589                return 0;
3590        if (*arg == '=') { /* stuck form: --option=value */
3591                *optarg = arg + 1;
3592                return 1;
3593        }
3594        if (*arg != '\0')
3595                return 0;
3596        /* separate form: --option value */
3597        if (!argv[1])
3598                die("Option '--%s' requires a value", opt);
3599        *optarg = argv[1];
3600        return 2;
3601}
3602
3603static int stat_opt(struct diff_options *options, const char **av)
3604{
3605        const char *arg = av[0];
3606        char *end;
3607        int width = options->stat_width;
3608        int name_width = options->stat_name_width;
3609        int graph_width = options->stat_graph_width;
3610        int count = options->stat_count;
3611        int argcount = 1;
3612
3613        if (!skip_prefix(arg, "--stat", &arg))
3614                die("BUG: stat option does not begin with --stat: %s", arg);
3615        end = (char *)arg;
3616
3617        switch (*arg) {
3618        case '-':
3619                if (skip_prefix(arg, "-width", &arg)) {
3620                        if (*arg == '=')
3621                                width = strtoul(arg + 1, &end, 10);
3622                        else if (!*arg && !av[1])
3623                                die_want_option("--stat-width");
3624                        else if (!*arg) {
3625                                width = strtoul(av[1], &end, 10);
3626                                argcount = 2;
3627                        }
3628                } else if (skip_prefix(arg, "-name-width", &arg)) {
3629                        if (*arg == '=')
3630                                name_width = strtoul(arg + 1, &end, 10);
3631                        else if (!*arg && !av[1])
3632                                die_want_option("--stat-name-width");
3633                        else if (!*arg) {
3634                                name_width = strtoul(av[1], &end, 10);
3635                                argcount = 2;
3636                        }
3637                } else if (skip_prefix(arg, "-graph-width", &arg)) {
3638                        if (*arg == '=')
3639                                graph_width = strtoul(arg + 1, &end, 10);
3640                        else if (!*arg && !av[1])
3641                                die_want_option("--stat-graph-width");
3642                        else if (!*arg) {
3643                                graph_width = strtoul(av[1], &end, 10);
3644                                argcount = 2;
3645                        }
3646                } else if (skip_prefix(arg, "-count", &arg)) {
3647                        if (*arg == '=')
3648                                count = strtoul(arg + 1, &end, 10);
3649                        else if (!*arg && !av[1])
3650                                die_want_option("--stat-count");
3651                        else if (!*arg) {
3652                                count = strtoul(av[1], &end, 10);
3653                                argcount = 2;
3654                        }
3655                }
3656                break;
3657        case '=':
3658                width = strtoul(arg+1, &end, 10);
3659                if (*end == ',')
3660                        name_width = strtoul(end+1, &end, 10);
3661                if (*end == ',')
3662                        count = strtoul(end+1, &end, 10);
3663        }
3664
3665        /* Important! This checks all the error cases! */
3666        if (*end)
3667                return 0;
3668        options->output_format |= DIFF_FORMAT_DIFFSTAT;
3669        options->stat_name_width = name_width;
3670        options->stat_graph_width = graph_width;
3671        options->stat_width = width;
3672        options->stat_count = count;
3673        return argcount;
3674}
3675
3676static int parse_dirstat_opt(struct diff_options *options, const char *params)
3677{
3678        struct strbuf errmsg = STRBUF_INIT;
3679        if (parse_dirstat_params(options, params, &errmsg))
3680                die(_("Failed to parse --dirstat/-X option parameter:\n%s"),
3681                    errmsg.buf);
3682        strbuf_release(&errmsg);
3683        /*
3684         * The caller knows a dirstat-related option is given from the command
3685         * line; allow it to say "return this_function();"
3686         */
3687        options->output_format |= DIFF_FORMAT_DIRSTAT;
3688        return 1;
3689}
3690
3691static int parse_submodule_opt(struct diff_options *options, const char *value)
3692{
3693        if (parse_submodule_params(options, value))
3694                die(_("Failed to parse --submodule option parameter: '%s'"),
3695                        value);
3696        return 1;
3697}
3698
3699static const char diff_status_letters[] = {
3700        DIFF_STATUS_ADDED,
3701        DIFF_STATUS_COPIED,
3702        DIFF_STATUS_DELETED,
3703        DIFF_STATUS_MODIFIED,
3704        DIFF_STATUS_RENAMED,
3705        DIFF_STATUS_TYPE_CHANGED,
3706        DIFF_STATUS_UNKNOWN,
3707        DIFF_STATUS_UNMERGED,
3708        DIFF_STATUS_FILTER_AON,
3709        DIFF_STATUS_FILTER_BROKEN,
3710        '\0',
3711};
3712
3713static unsigned int filter_bit['Z' + 1];
3714
3715static void prepare_filter_bits(void)
3716{
3717        int i;
3718
3719        if (!filter_bit[DIFF_STATUS_ADDED]) {
3720                for (i = 0; diff_status_letters[i]; i++)
3721                        filter_bit[(int) diff_status_letters[i]] = (1 << i);
3722        }
3723}
3724
3725static unsigned filter_bit_tst(char status, const struct diff_options *opt)
3726{
3727        return opt->filter & filter_bit[(int) status];
3728}
3729
3730static int parse_diff_filter_opt(const char *optarg, struct diff_options *opt)
3731{
3732        int i, optch;
3733
3734        prepare_filter_bits();
3735
3736        /*
3737         * If there is a negation e.g. 'd' in the input, and we haven't
3738         * initialized the filter field with another --diff-filter, start
3739         * from full set of bits, except for AON.
3740         */
3741        if (!opt->filter) {
3742                for (i = 0; (optch = optarg[i]) != '\0'; i++) {
3743                        if (optch < 'a' || 'z' < optch)
3744                                continue;
3745                        opt->filter = (1 << (ARRAY_SIZE(diff_status_letters) - 1)) - 1;
3746                        opt->filter &= ~filter_bit[DIFF_STATUS_FILTER_AON];
3747                        break;
3748                }
3749        }
3750
3751        for (i = 0; (optch = optarg[i]) != '\0'; i++) {
3752                unsigned int bit;
3753                int negate;
3754
3755                if ('a' <= optch && optch <= 'z') {
3756                        negate = 1;
3757                        optch = toupper(optch);
3758                } else {
3759                        negate = 0;
3760                }
3761
3762                bit = (0 <= optch && optch <= 'Z') ? filter_bit[optch] : 0;
3763                if (!bit)
3764                        return optarg[i];
3765                if (negate)
3766                        opt->filter &= ~bit;
3767                else
3768                        opt->filter |= bit;
3769        }
3770        return 0;
3771}
3772
3773static void enable_patch_output(int *fmt) {
3774        *fmt &= ~DIFF_FORMAT_NO_OUTPUT;
3775        *fmt |= DIFF_FORMAT_PATCH;
3776}
3777
3778static int parse_ws_error_highlight_opt(struct diff_options *opt, const char *arg)
3779{
3780        int val = parse_ws_error_highlight(arg);
3781
3782        if (val < 0) {
3783                error("unknown value after ws-error-highlight=%.*s",
3784                      -1 - val, arg);
3785                return 0;
3786        }
3787        opt->ws_error_highlight = val;
3788        return 1;
3789}
3790
3791int diff_opt_parse(struct diff_options *options,
3792                   const char **av, int ac, const char *prefix)
3793{
3794        const char *arg = av[0];
3795        const char *optarg;
3796        int argcount;
3797
3798        if (!prefix)
3799                prefix = "";
3800
3801        /* Output format options */
3802        if (!strcmp(arg, "-p") || !strcmp(arg, "-u") || !strcmp(arg, "--patch")
3803            || opt_arg(arg, 'U', "unified", &options->context))
3804                enable_patch_output(&options->output_format);
3805        else if (!strcmp(arg, "--raw"))
3806                options->output_format |= DIFF_FORMAT_RAW;
3807        else if (!strcmp(arg, "--patch-with-raw")) {
3808                enable_patch_output(&options->output_format);
3809                options->output_format |= DIFF_FORMAT_RAW;
3810        } else if (!strcmp(arg, "--numstat"))
3811                options->output_format |= DIFF_FORMAT_NUMSTAT;
3812        else if (!strcmp(arg, "--shortstat"))
3813                options->output_format |= DIFF_FORMAT_SHORTSTAT;
3814        else if (!strcmp(arg, "-X") || !strcmp(arg, "--dirstat"))
3815                return parse_dirstat_opt(options, "");
3816        else if (skip_prefix(arg, "-X", &arg))
3817                return parse_dirstat_opt(options, arg);
3818        else if (skip_prefix(arg, "--dirstat=", &arg))
3819                return parse_dirstat_opt(options, arg);
3820        else if (!strcmp(arg, "--cumulative"))
3821                return parse_dirstat_opt(options, "cumulative");
3822        else if (!strcmp(arg, "--dirstat-by-file"))
3823                return parse_dirstat_opt(options, "files");
3824        else if (skip_prefix(arg, "--dirstat-by-file=", &arg)) {
3825                parse_dirstat_opt(options, "files");
3826                return parse_dirstat_opt(options, arg);
3827        }
3828        else if (!strcmp(arg, "--check"))
3829                options->output_format |= DIFF_FORMAT_CHECKDIFF;
3830        else if (!strcmp(arg, "--summary"))
3831                options->output_format |= DIFF_FORMAT_SUMMARY;
3832        else if (!strcmp(arg, "--patch-with-stat")) {
3833                enable_patch_output(&options->output_format);
3834                options->output_format |= DIFF_FORMAT_DIFFSTAT;
3835        } else if (!strcmp(arg, "--name-only"))
3836                options->output_format |= DIFF_FORMAT_NAME;
3837        else if (!strcmp(arg, "--name-status"))
3838                options->output_format |= DIFF_FORMAT_NAME_STATUS;
3839        else if (!strcmp(arg, "-s") || !strcmp(arg, "--no-patch"))
3840                options->output_format |= DIFF_FORMAT_NO_OUTPUT;
3841        else if (starts_with(arg, "--stat"))
3842                /* --stat, --stat-width, --stat-name-width, or --stat-count */
3843                return stat_opt(options, av);
3844
3845        /* renames options */
3846        else if (starts_with(arg, "-B") || starts_with(arg, "--break-rewrites=") ||
3847                 !strcmp(arg, "--break-rewrites")) {
3848                if ((options->break_opt = diff_scoreopt_parse(arg)) == -1)
3849                        return error("invalid argument to -B: %s", arg+2);
3850        }
3851        else if (starts_with(arg, "-M") || starts_with(arg, "--find-renames=") ||
3852                 !strcmp(arg, "--find-renames")) {
3853                if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
3854                        return error("invalid argument to -M: %s", arg+2);
3855                options->detect_rename = DIFF_DETECT_RENAME;
3856        }
3857        else if (!strcmp(arg, "-D") || !strcmp(arg, "--irreversible-delete")) {
3858                options->irreversible_delete = 1;
3859        }
3860        else if (starts_with(arg, "-C") || starts_with(arg, "--find-copies=") ||
3861                 !strcmp(arg, "--find-copies")) {
3862                if (options->detect_rename == DIFF_DETECT_COPY)
3863                        DIFF_OPT_SET(options, FIND_COPIES_HARDER);
3864                if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
3865                        return error("invalid argument to -C: %s", arg+2);
3866                options->detect_rename = DIFF_DETECT_COPY;
3867        }
3868        else if (!strcmp(arg, "--no-renames"))
3869                options->detect_rename = 0;
3870        else if (!strcmp(arg, "--rename-empty"))
3871                DIFF_OPT_SET(options, RENAME_EMPTY);
3872        else if (!strcmp(arg, "--no-rename-empty"))
3873                DIFF_OPT_CLR(options, RENAME_EMPTY);
3874        else if (!strcmp(arg, "--relative"))
3875                DIFF_OPT_SET(options, RELATIVE_NAME);
3876        else if (skip_prefix(arg, "--relative=", &arg)) {
3877                DIFF_OPT_SET(options, RELATIVE_NAME);
3878                options->prefix = arg;
3879        }
3880
3881        /* xdiff options */
3882        else if (!strcmp(arg, "--minimal"))
3883                DIFF_XDL_SET(options, NEED_MINIMAL);
3884        else if (!strcmp(arg, "--no-minimal"))
3885                DIFF_XDL_CLR(options, NEED_MINIMAL);
3886        else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space"))
3887                DIFF_XDL_SET(options, IGNORE_WHITESPACE);
3888        else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change"))
3889                DIFF_XDL_SET(options, IGNORE_WHITESPACE_CHANGE);
3890        else if (!strcmp(arg, "--ignore-space-at-eol"))
3891                DIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL);
3892        else if (!strcmp(arg, "--ignore-blank-lines"))
3893                DIFF_XDL_SET(options, IGNORE_BLANK_LINES);
3894        else if (!strcmp(arg, "--indent-heuristic"))
3895                DIFF_XDL_SET(options, INDENT_HEURISTIC);
3896        else if (!strcmp(arg, "--no-indent-heuristic"))
3897                DIFF_XDL_CLR(options, INDENT_HEURISTIC);
3898        else if (!strcmp(arg, "--patience"))
3899                options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
3900        else if (!strcmp(arg, "--histogram"))
3901                options->xdl_opts = DIFF_WITH_ALG(options, HISTOGRAM_DIFF);
3902        else if ((argcount = parse_long_opt("diff-algorithm", av, &optarg))) {
3903                long value = parse_algorithm_value(optarg);
3904                if (value < 0)
3905                        return error("option diff-algorithm accepts \"myers\", "
3906                                     "\"minimal\", \"patience\" and \"histogram\"");
3907                /* clear out previous settings */
3908                DIFF_XDL_CLR(options, NEED_MINIMAL);
3909                options->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
3910                options->xdl_opts |= value;
3911                return argcount;
3912        }
3913
3914        /* flags options */
3915        else if (!strcmp(arg, "--binary")) {
3916                enable_patch_output(&options->output_format);
3917                DIFF_OPT_SET(options, BINARY);
3918        }
3919        else if (!strcmp(arg, "--full-index"))
3920                DIFF_OPT_SET(options, FULL_INDEX);
3921        else if (!strcmp(arg, "-a") || !strcmp(arg, "--text"))
3922                DIFF_OPT_SET(options, TEXT);
3923        else if (!strcmp(arg, "-R"))
3924                DIFF_OPT_SET(options, REVERSE_DIFF);
3925        else if (!strcmp(arg, "--find-copies-harder"))
3926                DIFF_OPT_SET(options, FIND_COPIES_HARDER);
3927        else if (!strcmp(arg, "--follow"))
3928                DIFF_OPT_SET(options, FOLLOW_RENAMES);
3929        else if (!strcmp(arg, "--no-follow")) {
3930                DIFF_OPT_CLR(options, FOLLOW_RENAMES);
3931                DIFF_OPT_CLR(options, DEFAULT_FOLLOW_RENAMES);
3932        } else if (!strcmp(arg, "--color"))
3933                options->use_color = 1;
3934        else if (skip_prefix(arg, "--color=", &arg)) {
3935                int value = git_config_colorbool(NULL, arg);
3936                if (value < 0)
3937                        return error("option `color' expects \"always\", \"auto\", or \"never\"");
3938                options->use_color = value;
3939        }
3940        else if (!strcmp(arg, "--no-color"))
3941                options->use_color = 0;
3942        else if (!strcmp(arg, "--color-words")) {
3943                options->use_color = 1;
3944                options->word_diff = DIFF_WORDS_COLOR;
3945        }
3946        else if (skip_prefix(arg, "--color-words=", &arg)) {
3947                options->use_color = 1;
3948                options->word_diff = DIFF_WORDS_COLOR;
3949                options->word_regex = arg;
3950        }
3951        else if (!strcmp(arg, "--word-diff")) {
3952                if (options->word_diff == DIFF_WORDS_NONE)
3953                        options->word_diff = DIFF_WORDS_PLAIN;
3954        }
3955        else if (skip_prefix(arg, "--word-diff=", &arg)) {
3956                if (!strcmp(arg, "plain"))
3957                        options->word_diff = DIFF_WORDS_PLAIN;
3958                else if (!strcmp(arg, "color")) {
3959                        options->use_color = 1;
3960                        options->word_diff = DIFF_WORDS_COLOR;
3961                }
3962                else if (!strcmp(arg, "porcelain"))
3963                        options->word_diff = DIFF_WORDS_PORCELAIN;
3964                else if (!strcmp(arg, "none"))
3965                        options->word_diff = DIFF_WORDS_NONE;
3966                else
3967                        die("bad --word-diff argument: %s", arg);
3968        }
3969        else if ((argcount = parse_long_opt("word-diff-regex", av, &optarg))) {
3970                if (options->word_diff == DIFF_WORDS_NONE)
3971                        options->word_diff = DIFF_WORDS_PLAIN;
3972                options->word_regex = optarg;
3973                return argcount;
3974        }
3975        else if (!strcmp(arg, "--exit-code"))
3976                DIFF_OPT_SET(options, EXIT_WITH_STATUS);
3977        else if (!strcmp(arg, "--quiet"))
3978                DIFF_OPT_SET(options, QUICK);
3979        else if (!strcmp(arg, "--ext-diff"))
3980                DIFF_OPT_SET(options, ALLOW_EXTERNAL);
3981        else if (!strcmp(arg, "--no-ext-diff"))
3982                DIFF_OPT_CLR(options, ALLOW_EXTERNAL);
3983        else if (!strcmp(arg, "--textconv"))
3984                DIFF_OPT_SET(options, ALLOW_TEXTCONV);
3985        else if (!strcmp(arg, "--no-textconv"))
3986                DIFF_OPT_CLR(options, ALLOW_TEXTCONV);
3987        else if (!strcmp(arg, "--ignore-submodules")) {
3988                DIFF_OPT_SET(options, OVERRIDE_SUBMODULE_CONFIG);
3989                handle_ignore_submodules_arg(options, "all");
3990        } else if (skip_prefix(arg, "--ignore-submodules=", &arg)) {
3991                DIFF_OPT_SET(options, OVERRIDE_SUBMODULE_CONFIG);
3992                handle_ignore_submodules_arg(options, arg);
3993        } else if (!strcmp(arg, "--submodule"))
3994                options->submodule_format = DIFF_SUBMODULE_LOG;
3995        else if (skip_prefix(arg, "--submodule=", &arg))
3996                return parse_submodule_opt(options, arg);
3997        else if (skip_prefix(arg, "--ws-error-highlight=", &arg))
3998                return parse_ws_error_highlight_opt(options, arg);
3999        else if (!strcmp(arg, "--ita-invisible-in-index"))
4000                options->ita_invisible_in_index = 1;
4001        else if (!strcmp(arg, "--ita-visible-in-index"))
4002                options->ita_invisible_in_index = 0;
4003
4004        /* misc options */
4005        else if (!strcmp(arg, "-z"))
4006                options->line_termination = 0;
4007        else if ((argcount = short_opt('l', av, &optarg))) {
4008                options->rename_limit = strtoul(optarg, NULL, 10);
4009                return argcount;
4010        }
4011        else if ((argcount = short_opt('S', av, &optarg))) {
4012                options->pickaxe = optarg;
4013                options->pickaxe_opts |= DIFF_PICKAXE_KIND_S;
4014                return argcount;
4015        } else if ((argcount = short_opt('G', av, &optarg))) {
4016                options->pickaxe = optarg;
4017                options->pickaxe_opts |= DIFF_PICKAXE_KIND_G;
4018                return argcount;
4019        }
4020        else if (!strcmp(arg, "--pickaxe-all"))
4021                options->pickaxe_opts |= DIFF_PICKAXE_ALL;
4022        else if (!strcmp(arg, "--pickaxe-regex"))
4023                options->pickaxe_opts |= DIFF_PICKAXE_REGEX;
4024        else if ((argcount = short_opt('O', av, &optarg))) {
4025                options->orderfile = prefix_filename(prefix, optarg);
4026                return argcount;
4027        }
4028        else if ((argcount = parse_long_opt("diff-filter", av, &optarg))) {
4029                int offending = parse_diff_filter_opt(optarg, options);
4030                if (offending)
4031                        die("unknown change class '%c' in --diff-filter=%s",
4032                            offending, optarg);
4033                return argcount;
4034        }
4035        else if (!strcmp(arg, "--no-abbrev"))
4036                options->abbrev = 0;
4037        else if (!strcmp(arg, "--abbrev"))
4038                options->abbrev = DEFAULT_ABBREV;
4039        else if (skip_prefix(arg, "--abbrev=", &arg)) {
4040                options->abbrev = strtoul(arg, NULL, 10);
4041                if (options->abbrev < MINIMUM_ABBREV)
4042                        options->abbrev = MINIMUM_ABBREV;
4043                else if (40 < options->abbrev)
4044                        options->abbrev = 40;
4045        }
4046        else if ((argcount = parse_long_opt("src-prefix", av, &optarg))) {
4047                options->a_prefix = optarg;
4048                return argcount;
4049        }
4050        else if ((argcount = parse_long_opt("line-prefix", av, &optarg))) {
4051                options->line_prefix = optarg;
4052                options->line_prefix_length = strlen(options->line_prefix);
4053                graph_setup_line_prefix(options);
4054                return argcount;
4055        }
4056        else if ((argcount = parse_long_opt("dst-prefix", av, &optarg))) {
4057                options->b_prefix = optarg;
4058                return argcount;
4059        }
4060        else if (!strcmp(arg, "--no-prefix"))
4061                options->a_prefix = options->b_prefix = "";
4062        else if (opt_arg(arg, '\0', "inter-hunk-context",
4063                         &options->interhunkcontext))
4064                ;
4065        else if (!strcmp(arg, "-W"))
4066                DIFF_OPT_SET(options, FUNCCONTEXT);
4067        else if (!strcmp(arg, "--function-context"))
4068                DIFF_OPT_SET(options, FUNCCONTEXT);
4069        else if (!strcmp(arg, "--no-function-context"))
4070                DIFF_OPT_CLR(options, FUNCCONTEXT);
4071        else if ((argcount = parse_long_opt("output", av, &optarg))) {
4072                char *path = prefix_filename(prefix, optarg);
4073                options->file = xfopen(path, "w");
4074                options->close_file = 1;
4075                if (options->use_color != GIT_COLOR_ALWAYS)
4076                        options->use_color = GIT_COLOR_NEVER;
4077                free(path);
4078                return argcount;
4079        } else
4080                return 0;
4081        return 1;
4082}
4083
4084int parse_rename_score(const char **cp_p)
4085{
4086        unsigned long num, scale;
4087        int ch, dot;
4088        const char *cp = *cp_p;
4089
4090        num = 0;
4091        scale = 1;
4092        dot = 0;
4093        for (;;) {
4094                ch = *cp;
4095                if ( !dot && ch == '.' ) {
4096                        scale = 1;
4097                        dot = 1;
4098                } else if ( ch == '%' ) {
4099                        scale = dot ? scale*100 : 100;
4100                        cp++;   /* % is always at the end */
4101                        break;
4102                } else if ( ch >= '0' && ch <= '9' ) {
4103                        if ( scale < 100000 ) {
4104                                scale *= 10;
4105                                num = (num*10) + (ch-'0');
4106                        }
4107                } else {
4108                        break;
4109                }
4110                cp++;
4111        }
4112        *cp_p = cp;
4113
4114        /* user says num divided by scale and we say internally that
4115         * is MAX_SCORE * num / scale.
4116         */
4117        return (int)((num >= scale) ? MAX_SCORE : (MAX_SCORE * num / scale));
4118}
4119
4120static int diff_scoreopt_parse(const char *opt)
4121{
4122        int opt1, opt2, cmd;
4123
4124        if (*opt++ != '-')
4125                return -1;
4126        cmd = *opt++;
4127        if (cmd == '-') {
4128                /* convert the long-form arguments into short-form versions */
4129                if (skip_prefix(opt, "break-rewrites", &opt)) {
4130                        if (*opt == 0 || *opt++ == '=')
4131                                cmd = 'B';
4132                } else if (skip_prefix(opt, "find-copies", &opt)) {
4133                        if (*opt == 0 || *opt++ == '=')
4134                                cmd = 'C';
4135                } else if (skip_prefix(opt, "find-renames", &opt)) {
4136                        if (*opt == 0 || *opt++ == '=')
4137                                cmd = 'M';
4138                }
4139        }
4140        if (cmd != 'M' && cmd != 'C' && cmd != 'B')
4141                return -1; /* that is not a -M, -C, or -B option */
4142
4143        opt1 = parse_rename_score(&opt);
4144        if (cmd != 'B')
4145                opt2 = 0;
4146        else {
4147                if (*opt == 0)
4148                        opt2 = 0;
4149                else if (*opt != '/')
4150                        return -1; /* we expect -B80/99 or -B80 */
4151                else {
4152                        opt++;
4153                        opt2 = parse_rename_score(&opt);
4154                }
4155        }
4156        if (*opt != 0)
4157                return -1;
4158        return opt1 | (opt2 << 16);
4159}
4160
4161struct diff_queue_struct diff_queued_diff;
4162
4163void diff_q(struct diff_queue_struct *queue, struct diff_filepair *dp)
4164{
4165        ALLOC_GROW(queue->queue, queue->nr + 1, queue->alloc);
4166        queue->queue[queue->nr++] = dp;
4167}
4168
4169struct diff_filepair *diff_queue(struct diff_queue_struct *queue,
4170                                 struct diff_filespec *one,
4171                                 struct diff_filespec *two)
4172{
4173        struct diff_filepair *dp = xcalloc(1, sizeof(*dp));
4174        dp->one = one;
4175        dp->two = two;
4176        if (queue)
4177                diff_q(queue, dp);
4178        return dp;
4179}
4180
4181void diff_free_filepair(struct diff_filepair *p)
4182{
4183        free_filespec(p->one);
4184        free_filespec(p->two);
4185        free(p);
4186}
4187
4188const char *diff_aligned_abbrev(const struct object_id *oid, int len)
4189{
4190        int abblen;
4191        const char *abbrev;
4192
4193        if (len == GIT_SHA1_HEXSZ)
4194                return oid_to_hex(oid);
4195
4196        abbrev = diff_abbrev_oid(oid, len);
4197        abblen = strlen(abbrev);
4198
4199        /*
4200         * In well-behaved cases, where the abbbreviated result is the
4201         * same as the requested length, append three dots after the
4202         * abbreviation (hence the whole logic is limited to the case
4203         * where abblen < 37); when the actual abbreviated result is a
4204         * bit longer than the requested length, we reduce the number
4205         * of dots so that they match the well-behaved ones.  However,
4206         * if the actual abbreviation is longer than the requested
4207         * length by more than three, we give up on aligning, and add
4208         * three dots anyway, to indicate that the output is not the
4209         * full object name.  Yes, this may be suboptimal, but this
4210         * appears only in "diff --raw --abbrev" output and it is not
4211         * worth the effort to change it now.  Note that this would
4212         * likely to work fine when the automatic sizing of default
4213         * abbreviation length is used--we would be fed -1 in "len" in
4214         * that case, and will end up always appending three-dots, but
4215         * the automatic sizing is supposed to give abblen that ensures
4216         * uniqueness across all objects (statistically speaking).
4217         */
4218        if (abblen < GIT_SHA1_HEXSZ - 3) {
4219                static char hex[GIT_MAX_HEXSZ + 1];
4220                if (len < abblen && abblen <= len + 2)
4221                        xsnprintf(hex, sizeof(hex), "%s%.*s", abbrev, len+3-abblen, "..");
4222                else
4223                        xsnprintf(hex, sizeof(hex), "%s...", abbrev);
4224                return hex;
4225        }
4226
4227        return oid_to_hex(oid);
4228}
4229
4230static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt)
4231{
4232        int line_termination = opt->line_termination;
4233        int inter_name_termination = line_termination ? '\t' : '\0';
4234
4235        fprintf(opt->file, "%s", diff_line_prefix(opt));
4236        if (!(opt->output_format & DIFF_FORMAT_NAME_STATUS)) {
4237                fprintf(opt->file, ":%06o %06o %s ", p->one->mode, p->two->mode,
4238                        diff_aligned_abbrev(&p->one->oid, opt->abbrev));
4239                fprintf(opt->file, "%s ",
4240                        diff_aligned_abbrev(&p->two->oid, opt->abbrev));
4241        }
4242        if (p->score) {
4243                fprintf(opt->file, "%c%03d%c", p->status, similarity_index(p),
4244                        inter_name_termination);
4245        } else {
4246                fprintf(opt->file, "%c%c", p->status, inter_name_termination);
4247        }
4248
4249        if (p->status == DIFF_STATUS_COPIED ||
4250            p->status == DIFF_STATUS_RENAMED) {
4251                const char *name_a, *name_b;
4252                name_a = p->one->path;
4253                name_b = p->two->path;
4254                strip_prefix(opt->prefix_length, &name_a, &name_b);
4255                write_name_quoted(name_a, opt->file, inter_name_termination);
4256                write_name_quoted(name_b, opt->file, line_termination);
4257        } else {
4258                const char *name_a, *name_b;
4259                name_a = p->one->mode ? p->one->path : p->two->path;
4260                name_b = NULL;
4261                strip_prefix(opt->prefix_length, &name_a, &name_b);
4262                write_name_quoted(name_a, opt->file, line_termination);
4263        }
4264}
4265
4266int diff_unmodified_pair(struct diff_filepair *p)
4267{
4268        /* This function is written stricter than necessary to support
4269         * the currently implemented transformers, but the idea is to
4270         * let transformers to produce diff_filepairs any way they want,
4271         * and filter and clean them up here before producing the output.
4272         */
4273        struct diff_filespec *one = p->one, *two = p->two;
4274
4275        if (DIFF_PAIR_UNMERGED(p))
4276                return 0; /* unmerged is interesting */
4277
4278        /* deletion, addition, mode or type change
4279         * and rename are all interesting.
4280         */
4281        if (DIFF_FILE_VALID(one) != DIFF_FILE_VALID(two) ||
4282            DIFF_PAIR_MODE_CHANGED(p) ||
4283            strcmp(one->path, two->path))
4284                return 0;
4285
4286        /* both are valid and point at the same path.  that is, we are
4287         * dealing with a change.
4288         */
4289        if (one->oid_valid && two->oid_valid &&
4290            !oidcmp(&one->oid, &two->oid) &&
4291            !one->dirty_submodule && !two->dirty_submodule)
4292                return 1; /* no change */
4293        if (!one->oid_valid && !two->oid_valid)
4294                return 1; /* both look at the same file on the filesystem. */
4295        return 0;
4296}
4297
4298static void diff_flush_patch(struct diff_filepair *p, struct diff_options *o)
4299{
4300        if (diff_unmodified_pair(p))
4301                return;
4302
4303        if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
4304            (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
4305                return; /* no tree diffs in patch format */
4306
4307        run_diff(p, o);
4308}
4309
4310static void diff_flush_stat(struct diff_filepair *p, struct diff_options *o,
4311                            struct diffstat_t *diffstat)
4312{
4313        if (diff_unmodified_pair(p))
4314                return;
4315
4316        if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
4317            (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
4318                return; /* no useful stat for tree diffs */
4319
4320        run_diffstat(p, o, diffstat);
4321}
4322
4323static void diff_flush_checkdiff(struct diff_filepair *p,
4324                struct diff_options *o)
4325{
4326        if (diff_unmodified_pair(p))
4327                return;
4328
4329        if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
4330            (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
4331                return; /* nothing to check in tree diffs */
4332
4333        run_checkdiff(p, o);
4334}
4335
4336int diff_queue_is_empty(void)
4337{
4338        struct diff_queue_struct *q = &diff_queued_diff;
4339        int i;
4340        for (i = 0; i < q->nr; i++)
4341                if (!diff_unmodified_pair(q->queue[i]))
4342                        return 0;
4343        return 1;
4344}
4345
4346#if DIFF_DEBUG
4347void diff_debug_filespec(struct diff_filespec *s, int x, const char *one)
4348{
4349        fprintf(stderr, "queue[%d] %s (%s) %s %06o %s\n",
4350                x, one ? one : "",
4351                s->path,
4352                DIFF_FILE_VALID(s) ? "valid" : "invalid",
4353                s->mode,
4354                s->oid_valid ? oid_to_hex(&s->oid) : "");
4355        fprintf(stderr, "queue[%d] %s size %lu\n",
4356                x, one ? one : "",
4357                s->size);
4358}
4359
4360void diff_debug_filepair(const struct diff_filepair *p, int i)
4361{
4362        diff_debug_filespec(p->one, i, "one");
4363        diff_debug_filespec(p->two, i, "two");
4364        fprintf(stderr, "score %d, status %c rename_used %d broken %d\n",
4365                p->score, p->status ? p->status : '?',
4366                p->one->rename_used, p->broken_pair);
4367}
4368
4369void diff_debug_queue(const char *msg, struct diff_queue_struct *q)
4370{
4371        int i;
4372        if (msg)
4373                fprintf(stderr, "%s\n", msg);
4374        fprintf(stderr, "q->nr = %d\n", q->nr);
4375        for (i = 0; i < q->nr; i++) {
4376                struct diff_filepair *p = q->queue[i];
4377                diff_debug_filepair(p, i);
4378        }
4379}
4380#endif
4381
4382static void diff_resolve_rename_copy(void)
4383{
4384        int i;
4385        struct diff_filepair *p;
4386        struct diff_queue_struct *q = &diff_queued_diff;
4387
4388        diff_debug_queue("resolve-rename-copy", q);
4389
4390        for (i = 0; i < q->nr; i++) {
4391                p = q->queue[i];
4392                p->status = 0; /* undecided */
4393                if (DIFF_PAIR_UNMERGED(p))
4394                        p->status = DIFF_STATUS_UNMERGED;
4395                else if (!DIFF_FILE_VALID(p->one))
4396                        p->status = DIFF_STATUS_ADDED;
4397                else if (!DIFF_FILE_VALID(p->two))
4398                        p->status = DIFF_STATUS_DELETED;
4399                else if (DIFF_PAIR_TYPE_CHANGED(p))
4400                        p->status = DIFF_STATUS_TYPE_CHANGED;
4401
4402                /* from this point on, we are dealing with a pair
4403                 * whose both sides are valid and of the same type, i.e.
4404                 * either in-place edit or rename/copy edit.
4405                 */
4406                else if (DIFF_PAIR_RENAME(p)) {
4407                        /*
4408                         * A rename might have re-connected a broken
4409                         * pair up, causing the pathnames to be the
4410                         * same again. If so, that's not a rename at
4411                         * all, just a modification..
4412                         *
4413                         * Otherwise, see if this source was used for
4414                         * multiple renames, in which case we decrement
4415                         * the count, and call it a copy.
4416                         */
4417                        if (!strcmp(p->one->path, p->two->path))
4418                                p->status = DIFF_STATUS_MODIFIED;
4419                        else if (--p->one->rename_used > 0)
4420                                p->status = DIFF_STATUS_COPIED;
4421                        else
4422                                p->status = DIFF_STATUS_RENAMED;
4423                }
4424                else if (oidcmp(&p->one->oid, &p->two->oid) ||
4425                         p->one->mode != p->two->mode ||
4426                         p->one->dirty_submodule ||
4427                         p->two->dirty_submodule ||
4428                         is_null_oid(&p->one->oid))
4429                        p->status = DIFF_STATUS_MODIFIED;
4430                else {
4431                        /* This is a "no-change" entry and should not
4432                         * happen anymore, but prepare for broken callers.
4433                         */
4434                        error("feeding unmodified %s to diffcore",
4435                              p->one->path);
4436                        p->status = DIFF_STATUS_UNKNOWN;
4437                }
4438        }
4439        diff_debug_queue("resolve-rename-copy done", q);
4440}
4441
4442static int check_pair_status(struct diff_filepair *p)
4443{
4444        switch (p->status) {
4445        case DIFF_STATUS_UNKNOWN:
4446                return 0;
4447        case 0:
4448                die("internal error in diff-resolve-rename-copy");
4449        default:
4450                return 1;
4451        }
4452}
4453
4454static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt)
4455{
4456        int fmt = opt->output_format;
4457
4458        if (fmt & DIFF_FORMAT_CHECKDIFF)
4459                diff_flush_checkdiff(p, opt);
4460        else if (fmt & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS))
4461                diff_flush_raw(p, opt);
4462        else if (fmt & DIFF_FORMAT_NAME) {
4463                const char *name_a, *name_b;
4464                name_a = p->two->path;
4465                name_b = NULL;
4466                strip_prefix(opt->prefix_length, &name_a, &name_b);
4467                fprintf(opt->file, "%s", diff_line_prefix(opt));
4468                write_name_quoted(name_a, opt->file, opt->line_termination);
4469        }
4470}
4471
4472static void show_file_mode_name(FILE *file, const char *newdelete, struct diff_filespec *fs)
4473{
4474        if (fs->mode)
4475                fprintf(file, " %s mode %06o ", newdelete, fs->mode);
4476        else
4477                fprintf(file, " %s ", newdelete);
4478        write_name_quoted(fs->path, file, '\n');
4479}
4480
4481
4482static void show_mode_change(FILE *file, struct diff_filepair *p, int show_name,
4483                const char *line_prefix)
4484{
4485        if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) {
4486                fprintf(file, "%s mode change %06o => %06o%c", line_prefix, p->one->mode,
4487                        p->two->mode, show_name ? ' ' : '\n');
4488                if (show_name) {
4489                        write_name_quoted(p->two->path, file, '\n');
4490                }
4491        }
4492}
4493
4494static void show_rename_copy(FILE *file, const char *renamecopy, struct diff_filepair *p,
4495                        const char *line_prefix)
4496{
4497        char *names = pprint_rename(p->one->path, p->two->path);
4498
4499        fprintf(file, " %s %s (%d%%)\n", renamecopy, names, similarity_index(p));
4500        free(names);
4501        show_mode_change(file, p, 0, line_prefix);
4502}
4503
4504static void diff_summary(struct diff_options *opt, struct diff_filepair *p)
4505{
4506        FILE *file = opt->file;
4507        const char *line_prefix = diff_line_prefix(opt);
4508
4509        switch(p->status) {
4510        case DIFF_STATUS_DELETED:
4511                fputs(line_prefix, file);
4512                show_file_mode_name(file, "delete", p->one);
4513                break;
4514        case DIFF_STATUS_ADDED:
4515                fputs(line_prefix, file);
4516                show_file_mode_name(file, "create", p->two);
4517                break;
4518        case DIFF_STATUS_COPIED:
4519                fputs(line_prefix, file);
4520                show_rename_copy(file, "copy", p, line_prefix);
4521                break;
4522        case DIFF_STATUS_RENAMED:
4523                fputs(line_prefix, file);
4524                show_rename_copy(file, "rename", p, line_prefix);
4525                break;
4526        default:
4527                if (p->score) {
4528                        fprintf(file, "%s rewrite ", line_prefix);
4529                        write_name_quoted(p->two->path, file, ' ');
4530                        fprintf(file, "(%d%%)\n", similarity_index(p));
4531                }
4532                show_mode_change(file, p, !p->score, line_prefix);
4533                break;
4534        }
4535}
4536
4537struct patch_id_t {
4538        git_SHA_CTX *ctx;
4539        int patchlen;
4540};
4541
4542static int remove_space(char *line, int len)
4543{
4544        int i;
4545        char *dst = line;
4546        unsigned char c;
4547
4548        for (i = 0; i < len; i++)
4549                if (!isspace((c = line[i])))
4550                        *dst++ = c;
4551
4552        return dst - line;
4553}
4554
4555static void patch_id_consume(void *priv, char *line, unsigned long len)
4556{
4557        struct patch_id_t *data = priv;
4558        int new_len;
4559
4560        /* Ignore line numbers when computing the SHA1 of the patch */
4561        if (starts_with(line, "@@ -"))
4562                return;
4563
4564        new_len = remove_space(line, len);
4565
4566        git_SHA1_Update(data->ctx, line, new_len);
4567        data->patchlen += new_len;
4568}
4569
4570static void patch_id_add_string(git_SHA_CTX *ctx, const char *str)
4571{
4572        git_SHA1_Update(ctx, str, strlen(str));
4573}
4574
4575static void patch_id_add_mode(git_SHA_CTX *ctx, unsigned mode)
4576{
4577        /* large enough for 2^32 in octal */
4578        char buf[12];
4579        int len = xsnprintf(buf, sizeof(buf), "%06o", mode);
4580        git_SHA1_Update(ctx, buf, len);
4581}
4582
4583/* returns 0 upon success, and writes result into sha1 */
4584static int diff_get_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only)
4585{
4586        struct diff_queue_struct *q = &diff_queued_diff;
4587        int i;
4588        git_SHA_CTX ctx;
4589        struct patch_id_t data;
4590
4591        git_SHA1_Init(&ctx);
4592        memset(&data, 0, sizeof(struct patch_id_t));
4593        data.ctx = &ctx;
4594
4595        for (i = 0; i < q->nr; i++) {
4596                xpparam_t xpp;
4597                xdemitconf_t xecfg;
4598                mmfile_t mf1, mf2;
4599                struct diff_filepair *p = q->queue[i];
4600                int len1, len2;
4601
4602                memset(&xpp, 0, sizeof(xpp));
4603                memset(&xecfg, 0, sizeof(xecfg));
4604                if (p->status == 0)
4605                        return error("internal diff status error");
4606                if (p->status == DIFF_STATUS_UNKNOWN)
4607                        continue;
4608                if (diff_unmodified_pair(p))
4609                        continue;
4610                if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
4611                    (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
4612                        continue;
4613                if (DIFF_PAIR_UNMERGED(p))
4614                        continue;
4615
4616                diff_fill_oid_info(p->one);
4617                diff_fill_oid_info(p->two);
4618
4619                len1 = remove_space(p->one->path, strlen(p->one->path));
4620                len2 = remove_space(p->two->path, strlen(p->two->path));
4621                patch_id_add_string(&ctx, "diff--git");
4622                patch_id_add_string(&ctx, "a/");
4623                git_SHA1_Update(&ctx, p->one->path, len1);
4624                patch_id_add_string(&ctx, "b/");
4625                git_SHA1_Update(&ctx, p->two->path, len2);
4626
4627                if (p->one->mode == 0) {
4628                        patch_id_add_string(&ctx, "newfilemode");
4629                        patch_id_add_mode(&ctx, p->two->mode);
4630                        patch_id_add_string(&ctx, "---/dev/null");
4631                        patch_id_add_string(&ctx, "+++b/");
4632                        git_SHA1_Update(&ctx, p->two->path, len2);
4633                } else if (p->two->mode == 0) {
4634                        patch_id_add_string(&ctx, "deletedfilemode");
4635                        patch_id_add_mode(&ctx, p->one->mode);
4636                        patch_id_add_string(&ctx, "---a/");
4637                        git_SHA1_Update(&ctx, p->one->path, len1);
4638                        patch_id_add_string(&ctx, "+++/dev/null");
4639                } else {
4640                        patch_id_add_string(&ctx, "---a/");
4641                        git_SHA1_Update(&ctx, p->one->path, len1);
4642                        patch_id_add_string(&ctx, "+++b/");
4643                        git_SHA1_Update(&ctx, p->two->path, len2);
4644                }
4645
4646                if (diff_header_only)
4647                        continue;
4648
4649                if (fill_mmfile(&mf1, p->one) < 0 ||
4650                    fill_mmfile(&mf2, p->two) < 0)
4651                        return error("unable to read files to diff");
4652
4653                if (diff_filespec_is_binary(p->one) ||
4654                    diff_filespec_is_binary(p->two)) {
4655                        git_SHA1_Update(&ctx, oid_to_hex(&p->one->oid),
4656                                        GIT_SHA1_HEXSZ);
4657                        git_SHA1_Update(&ctx, oid_to_hex(&p->two->oid),
4658                                        GIT_SHA1_HEXSZ);
4659                        continue;
4660                }
4661
4662                xpp.flags = 0;
4663                xecfg.ctxlen = 3;
4664                xecfg.flags = 0;
4665                if (xdi_diff_outf(&mf1, &mf2, patch_id_consume, &data,
4666                                  &xpp, &xecfg))
4667                        return error("unable to generate patch-id diff for %s",
4668                                     p->one->path);
4669        }
4670
4671        git_SHA1_Final(oid->hash, &ctx);
4672        return 0;
4673}
4674
4675int diff_flush_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only)
4676{
4677        struct diff_queue_struct *q = &diff_queued_diff;
4678        int i;
4679        int result = diff_get_patch_id(options, oid, diff_header_only);
4680
4681        for (i = 0; i < q->nr; i++)
4682                diff_free_filepair(q->queue[i]);
4683
4684        free(q->queue);
4685        DIFF_QUEUE_CLEAR(q);
4686
4687        return result;
4688}
4689
4690static int is_summary_empty(const struct diff_queue_struct *q)
4691{
4692        int i;
4693
4694        for (i = 0; i < q->nr; i++) {
4695                const struct diff_filepair *p = q->queue[i];
4696
4697                switch (p->status) {
4698                case DIFF_STATUS_DELETED:
4699                case DIFF_STATUS_ADDED:
4700                case DIFF_STATUS_COPIED:
4701                case DIFF_STATUS_RENAMED:
4702                        return 0;
4703                default:
4704                        if (p->score)
4705                                return 0;
4706                        if (p->one->mode && p->two->mode &&
4707                            p->one->mode != p->two->mode)
4708                                return 0;
4709                        break;
4710                }
4711        }
4712        return 1;
4713}
4714
4715static const char rename_limit_warning[] =
4716N_("inexact rename detection was skipped due to too many files.");
4717
4718static const char degrade_cc_to_c_warning[] =
4719N_("only found copies from modified paths due to too many files.");
4720
4721static const char rename_limit_advice[] =
4722N_("you may want to set your %s variable to at least "
4723   "%d and retry the command.");
4724
4725void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc)
4726{
4727        if (degraded_cc)
4728                warning(_(degrade_cc_to_c_warning));
4729        else if (needed)
4730                warning(_(rename_limit_warning));
4731        else
4732                return;
4733        if (0 < needed && needed < 32767)
4734                warning(_(rename_limit_advice), varname, needed);
4735}
4736
4737void diff_flush(struct diff_options *options)
4738{
4739        struct diff_queue_struct *q = &diff_queued_diff;
4740        int i, output_format = options->output_format;
4741        int separator = 0;
4742        int dirstat_by_line = 0;
4743
4744        /*
4745         * Order: raw, stat, summary, patch
4746         * or:    name/name-status/checkdiff (other bits clear)
4747         */
4748        if (!q->nr)
4749                goto free_queue;
4750
4751        if (output_format & (DIFF_FORMAT_RAW |
4752                             DIFF_FORMAT_NAME |
4753                             DIFF_FORMAT_NAME_STATUS |
4754                             DIFF_FORMAT_CHECKDIFF)) {
4755                for (i = 0; i < q->nr; i++) {
4756                        struct diff_filepair *p = q->queue[i];
4757                        if (check_pair_status(p))
4758                                flush_one_pair(p, options);
4759                }
4760                separator++;
4761        }
4762
4763        if (output_format & DIFF_FORMAT_DIRSTAT && DIFF_OPT_TST(options, DIRSTAT_BY_LINE))
4764                dirstat_by_line = 1;
4765
4766        if (output_format & (DIFF_FORMAT_DIFFSTAT|DIFF_FORMAT_SHORTSTAT|DIFF_FORMAT_NUMSTAT) ||
4767            dirstat_by_line) {
4768                struct diffstat_t diffstat;
4769
4770                memset(&diffstat, 0, sizeof(struct diffstat_t));
4771                for (i = 0; i < q->nr; i++) {
4772                        struct diff_filepair *p = q->queue[i];
4773                        if (check_pair_status(p))
4774                                diff_flush_stat(p, options, &diffstat);
4775                }
4776                if (output_format & DIFF_FORMAT_NUMSTAT)
4777                        show_numstat(&diffstat, options);
4778                if (output_format & DIFF_FORMAT_DIFFSTAT)
4779                        show_stats(&diffstat, options);
4780                if (output_format & DIFF_FORMAT_SHORTSTAT)
4781                        show_shortstats(&diffstat, options);
4782                if (output_format & DIFF_FORMAT_DIRSTAT && dirstat_by_line)
4783                        show_dirstat_by_line(&diffstat, options);
4784                free_diffstat_info(&diffstat);
4785                separator++;
4786        }
4787        if ((output_format & DIFF_FORMAT_DIRSTAT) && !dirstat_by_line)
4788                show_dirstat(options);
4789
4790        if (output_format & DIFF_FORMAT_SUMMARY && !is_summary_empty(q)) {
4791                for (i = 0; i < q->nr; i++) {
4792                        diff_summary(options, q->queue[i]);
4793                }
4794                separator++;
4795        }
4796
4797        if (output_format & DIFF_FORMAT_NO_OUTPUT &&
4798            DIFF_OPT_TST(options, EXIT_WITH_STATUS) &&
4799            DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) {
4800                /*
4801                 * run diff_flush_patch for the exit status. setting
4802                 * options->file to /dev/null should be safe, because we
4803                 * aren't supposed to produce any output anyway.
4804                 */
4805                if (options->close_file)
4806                        fclose(options->file);
4807                options->file = xfopen("/dev/null", "w");
4808                options->close_file = 1;
4809                for (i = 0; i < q->nr; i++) {
4810                        struct diff_filepair *p = q->queue[i];
4811                        if (check_pair_status(p))
4812                                diff_flush_patch(p, options);
4813                        if (options->found_changes)
4814                                break;
4815                }
4816        }
4817
4818        if (output_format & DIFF_FORMAT_PATCH) {
4819                if (separator) {
4820                        fprintf(options->file, "%s%c",
4821                                diff_line_prefix(options),
4822                                options->line_termination);
4823                        if (options->stat_sep) {
4824                                /* attach patch instead of inline */
4825                                fputs(options->stat_sep, options->file);
4826                        }
4827                }
4828
4829                for (i = 0; i < q->nr; i++) {
4830                        struct diff_filepair *p = q->queue[i];
4831                        if (check_pair_status(p))
4832                                diff_flush_patch(p, options);
4833                }
4834        }
4835
4836        if (output_format & DIFF_FORMAT_CALLBACK)
4837                options->format_callback(q, options, options->format_callback_data);
4838
4839        for (i = 0; i < q->nr; i++)
4840                diff_free_filepair(q->queue[i]);
4841free_queue:
4842        free(q->queue);
4843        DIFF_QUEUE_CLEAR(q);
4844        if (options->close_file)
4845                fclose(options->file);
4846
4847        /*
4848         * Report the content-level differences with HAS_CHANGES;
4849         * diff_addremove/diff_change does not set the bit when
4850         * DIFF_FROM_CONTENTS is in effect (e.g. with -w).
4851         */
4852        if (DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) {
4853                if (options->found_changes)
4854                        DIFF_OPT_SET(options, HAS_CHANGES);
4855                else
4856                        DIFF_OPT_CLR(options, HAS_CHANGES);
4857        }
4858}
4859
4860static int match_filter(const struct diff_options *options, const struct diff_filepair *p)
4861{
4862        return (((p->status == DIFF_STATUS_MODIFIED) &&
4863                 ((p->score &&
4864                   filter_bit_tst(DIFF_STATUS_FILTER_BROKEN, options)) ||
4865                  (!p->score &&
4866                   filter_bit_tst(DIFF_STATUS_MODIFIED, options)))) ||
4867                ((p->status != DIFF_STATUS_MODIFIED) &&
4868                 filter_bit_tst(p->status, options)));
4869}
4870
4871static void diffcore_apply_filter(struct diff_options *options)
4872{
4873        int i;
4874        struct diff_queue_struct *q = &diff_queued_diff;
4875        struct diff_queue_struct outq;
4876
4877        DIFF_QUEUE_CLEAR(&outq);
4878
4879        if (!options->filter)
4880                return;
4881
4882        if (filter_bit_tst(DIFF_STATUS_FILTER_AON, options)) {
4883                int found;
4884                for (i = found = 0; !found && i < q->nr; i++) {
4885                        if (match_filter(options, q->queue[i]))
4886                                found++;
4887                }
4888                if (found)
4889                        return;
4890
4891                /* otherwise we will clear the whole queue
4892                 * by copying the empty outq at the end of this
4893                 * function, but first clear the current entries
4894                 * in the queue.
4895                 */
4896                for (i = 0; i < q->nr; i++)
4897                        diff_free_filepair(q->queue[i]);
4898        }
4899        else {
4900                /* Only the matching ones */
4901                for (i = 0; i < q->nr; i++) {
4902                        struct diff_filepair *p = q->queue[i];
4903                        if (match_filter(options, p))
4904                                diff_q(&outq, p);
4905                        else
4906                                diff_free_filepair(p);
4907                }
4908        }
4909        free(q->queue);
4910        *q = outq;
4911}
4912
4913/* Check whether two filespecs with the same mode and size are identical */
4914static int diff_filespec_is_identical(struct diff_filespec *one,
4915                                      struct diff_filespec *two)
4916{
4917        if (S_ISGITLINK(one->mode))
4918                return 0;
4919        if (diff_populate_filespec(one, 0))
4920                return 0;
4921        if (diff_populate_filespec(two, 0))
4922                return 0;
4923        return !memcmp(one->data, two->data, one->size);
4924}
4925
4926static int diff_filespec_check_stat_unmatch(struct diff_filepair *p)
4927{
4928        if (p->done_skip_stat_unmatch)
4929                return p->skip_stat_unmatch_result;
4930
4931        p->done_skip_stat_unmatch = 1;
4932        p->skip_stat_unmatch_result = 0;
4933        /*
4934         * 1. Entries that come from stat info dirtiness
4935         *    always have both sides (iow, not create/delete),
4936         *    one side of the object name is unknown, with
4937         *    the same mode and size.  Keep the ones that
4938         *    do not match these criteria.  They have real
4939         *    differences.
4940         *
4941         * 2. At this point, the file is known to be modified,
4942         *    with the same mode and size, and the object
4943         *    name of one side is unknown.  Need to inspect
4944         *    the identical contents.
4945         */
4946        if (!DIFF_FILE_VALID(p->one) || /* (1) */
4947            !DIFF_FILE_VALID(p->two) ||
4948            (p->one->oid_valid && p->two->oid_valid) ||
4949            (p->one->mode != p->two->mode) ||
4950            diff_populate_filespec(p->one, CHECK_SIZE_ONLY) ||
4951            diff_populate_filespec(p->two, CHECK_SIZE_ONLY) ||
4952            (p->one->size != p->two->size) ||
4953            !diff_filespec_is_identical(p->one, p->two)) /* (2) */
4954                p->skip_stat_unmatch_result = 1;
4955        return p->skip_stat_unmatch_result;
4956}
4957
4958static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
4959{
4960        int i;
4961        struct diff_queue_struct *q = &diff_queued_diff;
4962        struct diff_queue_struct outq;
4963        DIFF_QUEUE_CLEAR(&outq);
4964
4965        for (i = 0; i < q->nr; i++) {
4966                struct diff_filepair *p = q->queue[i];
4967
4968                if (diff_filespec_check_stat_unmatch(p))
4969                        diff_q(&outq, p);
4970                else {
4971                        /*
4972                         * The caller can subtract 1 from skip_stat_unmatch
4973                         * to determine how many paths were dirty only
4974                         * due to stat info mismatch.
4975                         */
4976                        if (!DIFF_OPT_TST(diffopt, NO_INDEX))
4977                                diffopt->skip_stat_unmatch++;
4978                        diff_free_filepair(p);
4979                }
4980        }
4981        free(q->queue);
4982        *q = outq;
4983}
4984
4985static int diffnamecmp(const void *a_, const void *b_)
4986{
4987        const struct diff_filepair *a = *((const struct diff_filepair **)a_);
4988        const struct diff_filepair *b = *((const struct diff_filepair **)b_);
4989        const char *name_a, *name_b;
4990
4991        name_a = a->one ? a->one->path : a->two->path;
4992        name_b = b->one ? b->one->path : b->two->path;
4993        return strcmp(name_a, name_b);
4994}
4995
4996void diffcore_fix_diff_index(struct diff_options *options)
4997{
4998        struct diff_queue_struct *q = &diff_queued_diff;
4999        QSORT(q->queue, q->nr, diffnamecmp);
5000}
5001
5002void diffcore_std(struct diff_options *options)
5003{
5004        /* NOTE please keep the following in sync with diff_tree_combined() */
5005        if (options->skip_stat_unmatch)
5006                diffcore_skip_stat_unmatch(options);
5007        if (!options->found_follow) {
5008                /* See try_to_follow_renames() in tree-diff.c */
5009                if (options->break_opt != -1)
5010                        diffcore_break(options->break_opt);
5011                if (options->detect_rename)
5012                        diffcore_rename(options);
5013                if (options->break_opt != -1)
5014                        diffcore_merge_broken();
5015        }
5016        if (options->pickaxe)
5017                diffcore_pickaxe(options);
5018        if (options->orderfile)
5019                diffcore_order(options->orderfile);
5020        if (!options->found_follow)
5021                /* See try_to_follow_renames() in tree-diff.c */
5022                diff_resolve_rename_copy();
5023        diffcore_apply_filter(options);
5024
5025        if (diff_queued_diff.nr && !DIFF_OPT_TST(options, DIFF_FROM_CONTENTS))
5026                DIFF_OPT_SET(options, HAS_CHANGES);
5027        else
5028                DIFF_OPT_CLR(options, HAS_CHANGES);
5029
5030        options->found_follow = 0;
5031}
5032
5033int diff_result_code(struct diff_options *opt, int status)
5034{
5035        int result = 0;
5036
5037        diff_warn_rename_limit("diff.renameLimit",
5038                               opt->needed_rename_limit,
5039                               opt->degraded_cc_to_c);
5040        if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
5041            !(opt->output_format & DIFF_FORMAT_CHECKDIFF))
5042                return status;
5043        if (DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
5044            DIFF_OPT_TST(opt, HAS_CHANGES))
5045                result |= 01;
5046        if ((opt->output_format & DIFF_FORMAT_CHECKDIFF) &&
5047            DIFF_OPT_TST(opt, CHECK_FAILED))
5048                result |= 02;
5049        return result;
5050}
5051
5052int diff_can_quit_early(struct diff_options *opt)
5053{
5054        return (DIFF_OPT_TST(opt, QUICK) &&
5055                !opt->filter &&
5056                DIFF_OPT_TST(opt, HAS_CHANGES));
5057}
5058
5059/*
5060 * Shall changes to this submodule be ignored?
5061 *
5062 * Submodule changes can be configured to be ignored separately for each path,
5063 * but that configuration can be overridden from the command line.
5064 */
5065static int is_submodule_ignored(const char *path, struct diff_options *options)
5066{
5067        int ignored = 0;
5068        unsigned orig_flags = options->flags;
5069        if (!DIFF_OPT_TST(options, OVERRIDE_SUBMODULE_CONFIG))
5070                set_diffopt_flags_from_submodule_config(options, path);
5071        if (DIFF_OPT_TST(options, IGNORE_SUBMODULES))
5072                ignored = 1;
5073        options->flags = orig_flags;
5074        return ignored;
5075}
5076
5077void diff_addremove(struct diff_options *options,
5078                    int addremove, unsigned mode,
5079                    const struct object_id *oid,
5080                    int oid_valid,
5081                    const char *concatpath, unsigned dirty_submodule)
5082{
5083        struct diff_filespec *one, *two;
5084
5085        if (S_ISGITLINK(mode) && is_submodule_ignored(concatpath, options))
5086                return;
5087
5088        /* This may look odd, but it is a preparation for
5089         * feeding "there are unchanged files which should
5090         * not produce diffs, but when you are doing copy
5091         * detection you would need them, so here they are"
5092         * entries to the diff-core.  They will be prefixed
5093         * with something like '=' or '*' (I haven't decided
5094         * which but should not make any difference).
5095         * Feeding the same new and old to diff_change()
5096         * also has the same effect.
5097         * Before the final output happens, they are pruned after
5098         * merged into rename/copy pairs as appropriate.
5099         */
5100        if (DIFF_OPT_TST(options, REVERSE_DIFF))
5101                addremove = (addremove == '+' ? '-' :
5102                             addremove == '-' ? '+' : addremove);
5103
5104        if (options->prefix &&
5105            strncmp(concatpath, options->prefix, options->prefix_length))
5106                return;
5107
5108        one = alloc_filespec(concatpath);
5109        two = alloc_filespec(concatpath);
5110
5111        if (addremove != '+')
5112                fill_filespec(one, oid, oid_valid, mode);
5113        if (addremove != '-') {
5114                fill_filespec(two, oid, oid_valid, mode);
5115                two->dirty_submodule = dirty_submodule;
5116        }
5117
5118        diff_queue(&diff_queued_diff, one, two);
5119        if (!DIFF_OPT_TST(options, DIFF_FROM_CONTENTS))
5120                DIFF_OPT_SET(options, HAS_CHANGES);
5121}
5122
5123void diff_change(struct diff_options *options,
5124                 unsigned old_mode, unsigned new_mode,
5125                 const struct object_id *old_oid,
5126                 const struct object_id *new_oid,
5127                 int old_oid_valid, int new_oid_valid,
5128                 const char *concatpath,
5129                 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
5130{
5131        struct diff_filespec *one, *two;
5132        struct diff_filepair *p;
5133
5134        if (S_ISGITLINK(old_mode) && S_ISGITLINK(new_mode) &&
5135            is_submodule_ignored(concatpath, options))
5136                return;
5137
5138        if (DIFF_OPT_TST(options, REVERSE_DIFF)) {
5139                SWAP(old_mode, new_mode);
5140                SWAP(old_oid, new_oid);
5141                SWAP(old_oid_valid, new_oid_valid);
5142                SWAP(old_dirty_submodule, new_dirty_submodule);
5143        }
5144
5145        if (options->prefix &&
5146            strncmp(concatpath, options->prefix, options->prefix_length))
5147                return;
5148
5149        one = alloc_filespec(concatpath);
5150        two = alloc_filespec(concatpath);
5151        fill_filespec(one, old_oid, old_oid_valid, old_mode);
5152        fill_filespec(two, new_oid, new_oid_valid, new_mode);
5153        one->dirty_submodule = old_dirty_submodule;
5154        two->dirty_submodule = new_dirty_submodule;
5155        p = diff_queue(&diff_queued_diff, one, two);
5156
5157        if (DIFF_OPT_TST(options, DIFF_FROM_CONTENTS))
5158                return;
5159
5160        if (DIFF_OPT_TST(options, QUICK) && options->skip_stat_unmatch &&
5161            !diff_filespec_check_stat_unmatch(p))
5162                return;
5163
5164        DIFF_OPT_SET(options, HAS_CHANGES);
5165}
5166
5167struct diff_filepair *diff_unmerge(struct diff_options *options, const char *path)
5168{
5169        struct diff_filepair *pair;
5170        struct diff_filespec *one, *two;
5171
5172        if (options->prefix &&
5173            strncmp(path, options->prefix, options->prefix_length))
5174                return NULL;
5175
5176        one = alloc_filespec(path);
5177        two = alloc_filespec(path);
5178        pair = diff_queue(&diff_queued_diff, one, two);
5179        pair->is_unmerged = 1;
5180        return pair;
5181}
5182
5183static char *run_textconv(const char *pgm, struct diff_filespec *spec,
5184                size_t *outsize)
5185{
5186        struct diff_tempfile *temp;
5187        const char *argv[3];
5188        const char **arg = argv;
5189        struct child_process child = CHILD_PROCESS_INIT;
5190        struct strbuf buf = STRBUF_INIT;
5191        int err = 0;
5192
5193        temp = prepare_temp_file(spec->path, spec);
5194        *arg++ = pgm;
5195        *arg++ = temp->name;
5196        *arg = NULL;
5197
5198        child.use_shell = 1;
5199        child.argv = argv;
5200        child.out = -1;
5201        if (start_command(&child)) {
5202                remove_tempfile();
5203                return NULL;
5204        }
5205
5206        if (strbuf_read(&buf, child.out, 0) < 0)
5207                err = error("error reading from textconv command '%s'", pgm);
5208        close(child.out);
5209
5210        if (finish_command(&child) || err) {
5211                strbuf_release(&buf);
5212                remove_tempfile();
5213                return NULL;
5214        }
5215        remove_tempfile();
5216
5217        return strbuf_detach(&buf, outsize);
5218}
5219
5220size_t fill_textconv(struct userdiff_driver *driver,
5221                     struct diff_filespec *df,
5222                     char **outbuf)
5223{
5224        size_t size;
5225
5226        if (!driver) {
5227                if (!DIFF_FILE_VALID(df)) {
5228                        *outbuf = "";
5229                        return 0;
5230                }
5231                if (diff_populate_filespec(df, 0))
5232                        die("unable to read files to diff");
5233                *outbuf = df->data;
5234                return df->size;
5235        }
5236
5237        if (!driver->textconv)
5238                die("BUG: fill_textconv called with non-textconv driver");
5239
5240        if (driver->textconv_cache && df->oid_valid) {
5241                *outbuf = notes_cache_get(driver->textconv_cache,
5242                                          &df->oid,
5243                                          &size);
5244                if (*outbuf)
5245                        return size;
5246        }
5247
5248        *outbuf = run_textconv(driver->textconv, df, &size);
5249        if (!*outbuf)
5250                die("unable to read files to diff");
5251
5252        if (driver->textconv_cache && df->oid_valid) {
5253                /* ignore errors, as we might be in a readonly repository */
5254                notes_cache_put(driver->textconv_cache, &df->oid, *outbuf,
5255                                size);
5256                /*
5257                 * we could save up changes and flush them all at the end,
5258                 * but we would need an extra call after all diffing is done.
5259                 * Since generating a cache entry is the slow path anyway,
5260                 * this extra overhead probably isn't a big deal.
5261                 */
5262                notes_cache_write(driver->textconv_cache);
5263        }
5264
5265        return size;
5266}
5267
5268int textconv_object(const char *path,
5269                    unsigned mode,
5270                    const struct object_id *oid,
5271                    int oid_valid,
5272                    char **buf,
5273                    unsigned long *buf_size)
5274{
5275        struct diff_filespec *df;
5276        struct userdiff_driver *textconv;
5277
5278        df = alloc_filespec(path);
5279        fill_filespec(df, oid, oid_valid, mode);
5280        textconv = get_textconv(df);
5281        if (!textconv) {
5282                free_filespec(df);
5283                return 0;
5284        }
5285
5286        *buf_size = fill_textconv(textconv, df, buf);
5287        free_filespec(df);
5288        return 1;
5289}
5290
5291void setup_diff_pager(struct diff_options *opt)
5292{
5293        /*
5294         * If the user asked for our exit code, then either they want --quiet
5295         * or --exit-code. We should definitely not bother with a pager in the
5296         * former case, as we will generate no output. Since we still properly
5297         * report our exit code even when a pager is run, we _could_ run a
5298         * pager with --exit-code. But since we have not done so historically,
5299         * and because it is easy to find people oneline advising "git diff
5300         * --exit-code" in hooks and other scripts, we do not do so.
5301         */
5302        if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
5303            check_pager_config("diff") != 0)
5304                setup_pager();
5305}