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