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