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