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