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