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