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