72d8503d89ec99a278e9307090a440c8279cd266
1/*
2 * Copyright (C) 2005 Junio C Hamano
3 */
4#include "cache.h"
5#include "quote.h"
6#include "diff.h"
7#include "diffcore.h"
8#include "delta.h"
9#include "xdiff-interface.h"
10#include "color.h"
11#include "attr.h"
12#include "run-command.h"
13#include "utf8.h"
14#include "userdiff.h"
15#include "sigchain.h"
16#include "submodule.h"
17#ifdef NO_FAST_WORKING_DIRECTORY
19#define FAST_WORKING_DIRECTORY 0
20#else
21#define FAST_WORKING_DIRECTORY 1
22#endif
23static int diff_detect_rename_default;
25static int diff_rename_limit_default = 200;
26static int diff_suppress_blank_empty;
27int diff_use_color_default = -1;
28static const char *diff_word_regex_cfg;
29static const char *external_diff_cmd_cfg;
30int diff_auto_refresh_index = 1;
31static int diff_mnemonic_prefix;
32static char diff_colors[][COLOR_MAXLEN] = {
34 GIT_COLOR_RESET,
35 GIT_COLOR_NORMAL, /* PLAIN */
36 GIT_COLOR_BOLD, /* METAINFO */
37 GIT_COLOR_CYAN, /* FRAGINFO */
38 GIT_COLOR_RED, /* OLD */
39 GIT_COLOR_GREEN, /* NEW */
40 GIT_COLOR_YELLOW, /* COMMIT */
41 GIT_COLOR_BG_RED, /* WHITESPACE */
42 GIT_COLOR_NORMAL, /* FUNCINFO */
43};
44static void diff_filespec_load_driver(struct diff_filespec *one);
46static size_t fill_textconv(struct userdiff_driver *driver,
47 struct diff_filespec *df, char **outbuf);
48static int parse_diff_color_slot(const char *var, int ofs)
50{
51 if (!strcasecmp(var+ofs, "plain"))
52 return DIFF_PLAIN;
53 if (!strcasecmp(var+ofs, "meta"))
54 return DIFF_METAINFO;
55 if (!strcasecmp(var+ofs, "frag"))
56 return DIFF_FRAGINFO;
57 if (!strcasecmp(var+ofs, "old"))
58 return DIFF_FILE_OLD;
59 if (!strcasecmp(var+ofs, "new"))
60 return DIFF_FILE_NEW;
61 if (!strcasecmp(var+ofs, "commit"))
62 return DIFF_COMMIT;
63 if (!strcasecmp(var+ofs, "whitespace"))
64 return DIFF_WHITESPACE;
65 if (!strcasecmp(var+ofs, "func"))
66 return DIFF_FUNCINFO;
67 return -1;
68}
69static int git_config_rename(const char *var, const char *value)
71{
72 if (!value)
73 return DIFF_DETECT_RENAME;
74 if (!strcasecmp(value, "copies") || !strcasecmp(value, "copy"))
75 return DIFF_DETECT_COPY;
76 return git_config_bool(var,value) ? DIFF_DETECT_RENAME : 0;
77}
78/*
80 * These are to give UI layer defaults.
81 * The core-level commands such as git-diff-files should
82 * never be affected by the setting of diff.renames
83 * the user happens to have in the configuration file.
84 */
85int git_diff_ui_config(const char *var, const char *value, void *cb)
86{
87 if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
88 diff_use_color_default = git_config_colorbool(var, value, -1);
89 return 0;
90 }
91 if (!strcmp(var, "diff.renames")) {
92 diff_detect_rename_default = git_config_rename(var, value);
93 return 0;
94 }
95 if (!strcmp(var, "diff.autorefreshindex")) {
96 diff_auto_refresh_index = git_config_bool(var, value);
97 return 0;
98 }
99 if (!strcmp(var, "diff.mnemonicprefix")) {
100 diff_mnemonic_prefix = git_config_bool(var, value);
101 return 0;
102 }
103 if (!strcmp(var, "diff.external"))
104 return git_config_string(&external_diff_cmd_cfg, var, value);
105 if (!strcmp(var, "diff.wordregex"))
106 return git_config_string(&diff_word_regex_cfg, var, value);
107 return git_diff_basic_config(var, value, cb);
109}
110int git_diff_basic_config(const char *var, const char *value, void *cb)
112{
113 if (!strcmp(var, "diff.renamelimit")) {
114 diff_rename_limit_default = git_config_int(var, value);
115 return 0;
116 }
117 switch (userdiff_config(var, value)) {
119 case 0: break;
120 case -1: return -1;
121 default: return 0;
122 }
123 if (!prefixcmp(var, "diff.color.") || !prefixcmp(var, "color.diff.")) {
125 int slot = parse_diff_color_slot(var, 11);
126 if (slot < 0)
127 return 0;
128 if (!value)
129 return config_error_nonbool(var);
130 color_parse(value, var, diff_colors[slot]);
131 return 0;
132 }
133 /* like GNU diff's --suppress-blank-empty option */
135 if (!strcmp(var, "diff.suppressblankempty") ||
136 /* for backwards compatibility */
137 !strcmp(var, "diff.suppress-blank-empty")) {
138 diff_suppress_blank_empty = git_config_bool(var, value);
139 return 0;
140 }
141 return git_color_default_config(var, value, cb);
143}
144static char *quote_two(const char *one, const char *two)
146{
147 int need_one = quote_c_style(one, NULL, NULL, 1);
148 int need_two = quote_c_style(two, NULL, NULL, 1);
149 struct strbuf res = STRBUF_INIT;
150 if (need_one + need_two) {
152 strbuf_addch(&res, '"');
153 quote_c_style(one, &res, NULL, 1);
154 quote_c_style(two, &res, NULL, 1);
155 strbuf_addch(&res, '"');
156 } else {
157 strbuf_addstr(&res, one);
158 strbuf_addstr(&res, two);
159 }
160 return strbuf_detach(&res, NULL);
161}
162static const char *external_diff(void)
164{
165 static const char *external_diff_cmd = NULL;
166 static int done_preparing = 0;
167 if (done_preparing)
169 return external_diff_cmd;
170 external_diff_cmd = getenv("GIT_EXTERNAL_DIFF");
171 if (!external_diff_cmd)
172 external_diff_cmd = external_diff_cmd_cfg;
173 done_preparing = 1;
174 return external_diff_cmd;
175}
176static struct diff_tempfile {
178 const char *name; /* filename external diff should read from */
179 char hex[41];
180 char mode[10];
181 char tmp_path[PATH_MAX];
182} diff_temp[2];
183typedef unsigned long (*sane_truncate_fn)(char *line, unsigned long len);
185struct emit_callback {
187 int color_diff;
188 unsigned ws_rule;
189 int blank_at_eof_in_preimage;
190 int blank_at_eof_in_postimage;
191 int lno_in_preimage;
192 int lno_in_postimage;
193 sane_truncate_fn truncate;
194 const char **label_path;
195 struct diff_words_data *diff_words;
196 int *found_changesp;
197 FILE *file;
198 struct strbuf *header;
199};
200static int count_lines(const char *data, int size)
202{
203 int count, ch, completely_empty = 1, nl_just_seen = 0;
204 count = 0;
205 while (0 < size--) {
206 ch = *data++;
207 if (ch == '\n') {
208 count++;
209 nl_just_seen = 1;
210 completely_empty = 0;
211 }
212 else {
213 nl_just_seen = 0;
214 completely_empty = 0;
215 }
216 }
217 if (completely_empty)
218 return 0;
219 if (!nl_just_seen)
220 count++; /* no trailing newline */
221 return count;
222}
223static int fill_mmfile(mmfile_t *mf, struct diff_filespec *one)
225{
226 if (!DIFF_FILE_VALID(one)) {
227 mf->ptr = (char *)""; /* does not matter */
228 mf->size = 0;
229 return 0;
230 }
231 else if (diff_populate_filespec(one, 0))
232 return -1;
233 mf->ptr = one->data;
235 mf->size = one->size;
236 return 0;
237}
238static int count_trailing_blank(mmfile_t *mf, unsigned ws_rule)
240{
241 char *ptr = mf->ptr;
242 long size = mf->size;
243 int cnt = 0;
244 if (!size)
246 return cnt;
247 ptr += size - 1; /* pointing at the very end */
248 if (*ptr != '\n')
249 ; /* incomplete line */
250 else
251 ptr--; /* skip the last LF */
252 while (mf->ptr < ptr) {
253 char *prev_eol;
254 for (prev_eol = ptr; mf->ptr <= prev_eol; prev_eol--)
255 if (*prev_eol == '\n')
256 break;
257 if (!ws_blank_line(prev_eol + 1, ptr - prev_eol, ws_rule))
258 break;
259 cnt++;
260 ptr = prev_eol - 1;
261 }
262 return cnt;
263}
264static void check_blank_at_eof(mmfile_t *mf1, mmfile_t *mf2,
266 struct emit_callback *ecbdata)
267{
268 int l1, l2, at;
269 unsigned ws_rule = ecbdata->ws_rule;
270 l1 = count_trailing_blank(mf1, ws_rule);
271 l2 = count_trailing_blank(mf2, ws_rule);
272 if (l2 <= l1) {
273 ecbdata->blank_at_eof_in_preimage = 0;
274 ecbdata->blank_at_eof_in_postimage = 0;
275 return;
276 }
277 at = count_lines(mf1->ptr, mf1->size);
278 ecbdata->blank_at_eof_in_preimage = (at - l1) + 1;
279 at = count_lines(mf2->ptr, mf2->size);
281 ecbdata->blank_at_eof_in_postimage = (at - l2) + 1;
282}
283static void emit_line_0(FILE *file, const char *set, const char *reset,
285 int first, const char *line, int len)
286{
287 int has_trailing_newline, has_trailing_carriage_return;
288 int nofirst;
289 if (len == 0) {
291 has_trailing_newline = (first == '\n');
292 has_trailing_carriage_return = (!has_trailing_newline &&
293 (first == '\r'));
294 nofirst = has_trailing_newline || has_trailing_carriage_return;
295 } else {
296 has_trailing_newline = (len > 0 && line[len-1] == '\n');
297 if (has_trailing_newline)
298 len--;
299 has_trailing_carriage_return = (len > 0 && line[len-1] == '\r');
300 if (has_trailing_carriage_return)
301 len--;
302 nofirst = 0;
303 }
304 if (len || !nofirst) {
306 fputs(set, file);
307 if (!nofirst)
308 fputc(first, file);
309 fwrite(line, len, 1, file);
310 fputs(reset, file);
311 }
312 if (has_trailing_carriage_return)
313 fputc('\r', file);
314 if (has_trailing_newline)
315 fputc('\n', file);
316}
317static void emit_line(FILE *file, const char *set, const char *reset,
319 const char *line, int len)
320{
321 emit_line_0(file, set, reset, line[0], line+1, len-1);
322}
323static int new_blank_line_at_eof(struct emit_callback *ecbdata, const char *line, int len)
325{
326 if (!((ecbdata->ws_rule & WS_BLANK_AT_EOF) &&
327 ecbdata->blank_at_eof_in_preimage &&
328 ecbdata->blank_at_eof_in_postimage &&
329 ecbdata->blank_at_eof_in_preimage <= ecbdata->lno_in_preimage &&
330 ecbdata->blank_at_eof_in_postimage <= ecbdata->lno_in_postimage))
331 return 0;
332 return ws_blank_line(line, len, ecbdata->ws_rule);
333}
334static void emit_add_line(const char *reset,
336 struct emit_callback *ecbdata,
337 const char *line, int len)
338{
339 const char *ws = diff_get_color(ecbdata->color_diff, DIFF_WHITESPACE);
340 const char *set = diff_get_color(ecbdata->color_diff, DIFF_FILE_NEW);
341 if (!*ws)
343 emit_line_0(ecbdata->file, set, reset, '+', line, len);
344 else if (new_blank_line_at_eof(ecbdata, line, len))
345 /* Blank line at EOF - paint '+' as well */
346 emit_line_0(ecbdata->file, ws, reset, '+', line, len);
347 else {
348 /* Emit just the prefix, then the rest. */
349 emit_line_0(ecbdata->file, set, reset, '+', "", 0);
350 ws_check_emit(line, len, ecbdata->ws_rule,
351 ecbdata->file, set, reset, ws);
352 }
353}
354static void emit_hunk_header(struct emit_callback *ecbdata,
356 const char *line, int len)
357{
358 const char *plain = diff_get_color(ecbdata->color_diff, DIFF_PLAIN);
359 const char *frag = diff_get_color(ecbdata->color_diff, DIFF_FRAGINFO);
360 const char *func = diff_get_color(ecbdata->color_diff, DIFF_FUNCINFO);
361 const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
362 static const char atat[2] = { '@', '@' };
363 const char *cp, *ep;
364 /*
366 * As a hunk header must begin with "@@ -<old>, +<new> @@",
367 * it always is at least 10 bytes long.
368 */
369 if (len < 10 ||
370 memcmp(line, atat, 2) ||
371 !(ep = memmem(line + 2, len - 2, atat, 2))) {
372 emit_line(ecbdata->file, plain, reset, line, len);
373 return;
374 }
375 ep += 2; /* skip over @@ */
376 /* The hunk header in fraginfo color */
378 emit_line(ecbdata->file, frag, reset, line, ep - line);
379 /* blank before the func header */
381 for (cp = ep; ep - line < len; ep++)
382 if (*ep != ' ' && *ep != '\t')
383 break;
384 if (ep != cp)
385 emit_line(ecbdata->file, plain, reset, cp, ep - cp);
386 if (ep < line + len)
388 emit_line(ecbdata->file, func, reset, ep, line + len - ep);
389}
390static struct diff_tempfile *claim_diff_tempfile(void) {
392 int i;
393 for (i = 0; i < ARRAY_SIZE(diff_temp); i++)
394 if (!diff_temp[i].name)
395 return diff_temp + i;
396 die("BUG: diff is failing to clean up its tempfiles");
397}
398static int remove_tempfile_installed;
400static void remove_tempfile(void)
402{
403 int i;
404 for (i = 0; i < ARRAY_SIZE(diff_temp); i++) {
405 if (diff_temp[i].name == diff_temp[i].tmp_path)
406 unlink_or_warn(diff_temp[i].name);
407 diff_temp[i].name = NULL;
408 }
409}
410static void remove_tempfile_on_signal(int signo)
412{
413 remove_tempfile();
414 sigchain_pop(signo);
415 raise(signo);
416}
417static void print_line_count(FILE *file, int count)
419{
420 switch (count) {
421 case 0:
422 fprintf(file, "0,0");
423 break;
424 case 1:
425 fprintf(file, "1");
426 break;
427 default:
428 fprintf(file, "1,%d", count);
429 break;
430 }
431}
432static void emit_rewrite_lines(struct emit_callback *ecb,
434 int prefix, const char *data, int size)
435{
436 const char *endp = NULL;
437 static const char *nneof = " No newline at end of file\n";
438 const char *old = diff_get_color(ecb->color_diff, DIFF_FILE_OLD);
439 const char *reset = diff_get_color(ecb->color_diff, DIFF_RESET);
440 while (0 < size) {
442 int len;
443 endp = memchr(data, '\n', size);
445 len = endp ? (endp - data + 1) : size;
446 if (prefix != '+') {
447 ecb->lno_in_preimage++;
448 emit_line_0(ecb->file, old, reset, '-',
449 data, len);
450 } else {
451 ecb->lno_in_postimage++;
452 emit_add_line(reset, ecb, data, len);
453 }
454 size -= len;
455 data += len;
456 }
457 if (!endp) {
458 const char *plain = diff_get_color(ecb->color_diff,
459 DIFF_PLAIN);
460 emit_line_0(ecb->file, plain, reset, '\\',
461 nneof, strlen(nneof));
462 }
463}
464static void emit_rewrite_diff(const char *name_a,
466 const char *name_b,
467 struct diff_filespec *one,
468 struct diff_filespec *two,
469 struct userdiff_driver *textconv_one,
470 struct userdiff_driver *textconv_two,
471 struct diff_options *o)
472{
473 int lc_a, lc_b;
474 int color_diff = DIFF_OPT_TST(o, COLOR_DIFF);
475 const char *name_a_tab, *name_b_tab;
476 const char *metainfo = diff_get_color(color_diff, DIFF_METAINFO);
477 const char *fraginfo = diff_get_color(color_diff, DIFF_FRAGINFO);
478 const char *reset = diff_get_color(color_diff, DIFF_RESET);
479 static struct strbuf a_name = STRBUF_INIT, b_name = STRBUF_INIT;
480 const char *a_prefix, *b_prefix;
481 char *data_one, *data_two;
482 size_t size_one, size_two;
483 struct emit_callback ecbdata;
484 if (diff_mnemonic_prefix && DIFF_OPT_TST(o, REVERSE_DIFF)) {
486 a_prefix = o->b_prefix;
487 b_prefix = o->a_prefix;
488 } else {
489 a_prefix = o->a_prefix;
490 b_prefix = o->b_prefix;
491 }
492 name_a += (*name_a == '/');
494 name_b += (*name_b == '/');
495 name_a_tab = strchr(name_a, ' ') ? "\t" : "";
496 name_b_tab = strchr(name_b, ' ') ? "\t" : "";
497 strbuf_reset(&a_name);
499 strbuf_reset(&b_name);
500 quote_two_c_style(&a_name, a_prefix, name_a, 0);
501 quote_two_c_style(&b_name, b_prefix, name_b, 0);
502 size_one = fill_textconv(textconv_one, one, &data_one);
504 size_two = fill_textconv(textconv_two, two, &data_two);
505 memset(&ecbdata, 0, sizeof(ecbdata));
507 ecbdata.color_diff = color_diff;
508 ecbdata.found_changesp = &o->found_changes;
509 ecbdata.ws_rule = whitespace_rule(name_b ? name_b : name_a);
510 ecbdata.file = o->file;
511 if (ecbdata.ws_rule & WS_BLANK_AT_EOF) {
512 mmfile_t mf1, mf2;
513 mf1.ptr = (char *)data_one;
514 mf2.ptr = (char *)data_two;
515 mf1.size = size_one;
516 mf2.size = size_two;
517 check_blank_at_eof(&mf1, &mf2, &ecbdata);
518 }
519 ecbdata.lno_in_preimage = 1;
520 ecbdata.lno_in_postimage = 1;
521 lc_a = count_lines(data_one, size_one);
523 lc_b = count_lines(data_two, size_two);
524 fprintf(o->file,
525 "%s--- %s%s%s\n%s+++ %s%s%s\n%s@@ -",
526 metainfo, a_name.buf, name_a_tab, reset,
527 metainfo, b_name.buf, name_b_tab, reset, fraginfo);
528 print_line_count(o->file, lc_a);
529 fprintf(o->file, " +");
530 print_line_count(o->file, lc_b);
531 fprintf(o->file, " @@%s\n", reset);
532 if (lc_a)
533 emit_rewrite_lines(&ecbdata, '-', data_one, size_one);
534 if (lc_b)
535 emit_rewrite_lines(&ecbdata, '+', data_two, size_two);
536 if (textconv_one)
537 free(data_one);
538 if (textconv_two)
539 free(data_two);
540}
541struct diff_words_buffer {
543 mmfile_t text;
544 long alloc;
545 struct diff_words_orig {
546 const char *begin, *end;
547 } *orig;
548 int orig_nr, orig_alloc;
549};
550static void diff_words_append(char *line, unsigned long len,
552 struct diff_words_buffer *buffer)
553{
554 ALLOC_GROW(buffer->text.ptr, buffer->text.size + len, buffer->alloc);
555 line++;
556 len--;
557 memcpy(buffer->text.ptr + buffer->text.size, line, len);
558 buffer->text.size += len;
559 buffer->text.ptr[buffer->text.size] = '\0';
560}
561struct diff_words_data {
563 struct diff_words_buffer minus, plus;
564 const char *current_plus;
565 FILE *file;
566 regex_t *word_regex;
567};
568static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len)
570{
571 struct diff_words_data *diff_words = priv;
572 int minus_first, minus_len, plus_first, plus_len;
573 const char *minus_begin, *minus_end, *plus_begin, *plus_end;
574 if (line[0] != '@' || parse_hunk_header(line, len,
576 &minus_first, &minus_len, &plus_first, &plus_len))
577 return;
578 /* POSIX requires that first be decremented by one if len == 0... */
580 if (minus_len) {
581 minus_begin = diff_words->minus.orig[minus_first].begin;
582 minus_end =
583 diff_words->minus.orig[minus_first + minus_len - 1].end;
584 } else
585 minus_begin = minus_end =
586 diff_words->minus.orig[minus_first].end;
587 if (plus_len) {
589 plus_begin = diff_words->plus.orig[plus_first].begin;
590 plus_end = diff_words->plus.orig[plus_first + plus_len - 1].end;
591 } else
592 plus_begin = plus_end = diff_words->plus.orig[plus_first].end;
593 if (diff_words->current_plus != plus_begin)
595 fwrite(diff_words->current_plus,
596 plus_begin - diff_words->current_plus, 1,
597 diff_words->file);
598 if (minus_begin != minus_end)
599 color_fwrite_lines(diff_words->file,
600 diff_get_color(1, DIFF_FILE_OLD),
601 minus_end - minus_begin, minus_begin);
602 if (plus_begin != plus_end)
603 color_fwrite_lines(diff_words->file,
604 diff_get_color(1, DIFF_FILE_NEW),
605 plus_end - plus_begin, plus_begin);
606 diff_words->current_plus = plus_end;
608}
609/* This function starts looking at *begin, and returns 0 iff a word was found. */
611static int find_word_boundaries(mmfile_t *buffer, regex_t *word_regex,
612 int *begin, int *end)
613{
614 if (word_regex && *begin < buffer->size) {
615 regmatch_t match[1];
616 if (!regexec(word_regex, buffer->ptr + *begin, 1, match, 0)) {
617 char *p = memchr(buffer->ptr + *begin + match[0].rm_so,
618 '\n', match[0].rm_eo - match[0].rm_so);
619 *end = p ? p - buffer->ptr : match[0].rm_eo + *begin;
620 *begin += match[0].rm_so;
621 return *begin >= *end;
622 }
623 return -1;
624 }
625 /* find the next word */
627 while (*begin < buffer->size && isspace(buffer->ptr[*begin]))
628 (*begin)++;
629 if (*begin >= buffer->size)
630 return -1;
631 /* find the end of the word */
633 *end = *begin + 1;
634 while (*end < buffer->size && !isspace(buffer->ptr[*end]))
635 (*end)++;
636 return 0;
638}
639/*
641 * This function splits the words in buffer->text, stores the list with
642 * newline separator into out, and saves the offsets of the original words
643 * in buffer->orig.
644 */
645static void diff_words_fill(struct diff_words_buffer *buffer, mmfile_t *out,
646 regex_t *word_regex)
647{
648 int i, j;
649 long alloc = 0;
650 out->size = 0;
652 out->ptr = NULL;
653 /* fake an empty "0th" word */
655 ALLOC_GROW(buffer->orig, 1, buffer->orig_alloc);
656 buffer->orig[0].begin = buffer->orig[0].end = buffer->text.ptr;
657 buffer->orig_nr = 1;
658 for (i = 0; i < buffer->text.size; i++) {
660 if (find_word_boundaries(&buffer->text, word_regex, &i, &j))
661 return;
662 /* store original boundaries */
664 ALLOC_GROW(buffer->orig, buffer->orig_nr + 1,
665 buffer->orig_alloc);
666 buffer->orig[buffer->orig_nr].begin = buffer->text.ptr + i;
667 buffer->orig[buffer->orig_nr].end = buffer->text.ptr + j;
668 buffer->orig_nr++;
669 /* store one word */
671 ALLOC_GROW(out->ptr, out->size + j - i + 1, alloc);
672 memcpy(out->ptr + out->size, buffer->text.ptr + i, j - i);
673 out->ptr[out->size + j - i] = '\n';
674 out->size += j - i + 1;
675 i = j - 1;
677 }
678}
679/* this executes the word diff on the accumulated buffers */
681static void diff_words_show(struct diff_words_data *diff_words)
682{
683 xpparam_t xpp;
684 xdemitconf_t xecfg;
685 xdemitcb_t ecb;
686 mmfile_t minus, plus;
687 /* special case: only removal */
689 if (!diff_words->plus.text.size) {
690 color_fwrite_lines(diff_words->file,
691 diff_get_color(1, DIFF_FILE_OLD),
692 diff_words->minus.text.size, diff_words->minus.text.ptr);
693 diff_words->minus.text.size = 0;
694 return;
695 }
696 diff_words->current_plus = diff_words->plus.text.ptr;
698 memset(&xpp, 0, sizeof(xpp));
700 memset(&xecfg, 0, sizeof(xecfg));
701 diff_words_fill(&diff_words->minus, &minus, diff_words->word_regex);
702 diff_words_fill(&diff_words->plus, &plus, diff_words->word_regex);
703 xpp.flags = XDF_NEED_MINIMAL;
704 /* as only the hunk header will be parsed, we need a 0-context */
705 xecfg.ctxlen = 0;
706 xdi_diff_outf(&minus, &plus, fn_out_diff_words_aux, diff_words,
707 &xpp, &xecfg, &ecb);
708 free(minus.ptr);
709 free(plus.ptr);
710 if (diff_words->current_plus != diff_words->plus.text.ptr +
711 diff_words->plus.text.size)
712 fwrite(diff_words->current_plus,
713 diff_words->plus.text.ptr + diff_words->plus.text.size
714 - diff_words->current_plus, 1,
715 diff_words->file);
716 diff_words->minus.text.size = diff_words->plus.text.size = 0;
717}
718/* In "color-words" mode, show word-diff of words accumulated in the buffer */
720static void diff_words_flush(struct emit_callback *ecbdata)
721{
722 if (ecbdata->diff_words->minus.text.size ||
723 ecbdata->diff_words->plus.text.size)
724 diff_words_show(ecbdata->diff_words);
725}
726static void free_diff_words_data(struct emit_callback *ecbdata)
728{
729 if (ecbdata->diff_words) {
730 diff_words_flush(ecbdata);
731 free (ecbdata->diff_words->minus.text.ptr);
732 free (ecbdata->diff_words->minus.orig);
733 free (ecbdata->diff_words->plus.text.ptr);
734 free (ecbdata->diff_words->plus.orig);
735 free(ecbdata->diff_words->word_regex);
736 free(ecbdata->diff_words);
737 ecbdata->diff_words = NULL;
738 }
739}
740const char *diff_get_color(int diff_use_color, enum color_diff ix)
742{
743 if (diff_use_color)
744 return diff_colors[ix];
745 return "";
746}
747static unsigned long sane_truncate_line(struct emit_callback *ecb, char *line, unsigned long len)
749{
750 const char *cp;
751 unsigned long allot;
752 size_t l = len;
753 if (ecb->truncate)
755 return ecb->truncate(line, len);
756 cp = line;
757 allot = l;
758 while (0 < l) {
759 (void) utf8_width(&cp, &l);
760 if (!cp)
761 break; /* truncated in the middle? */
762 }
763 return allot - l;
764}
765static void find_lno(const char *line, struct emit_callback *ecbdata)
767{
768 const char *p;
769 ecbdata->lno_in_preimage = 0;
770 ecbdata->lno_in_postimage = 0;
771 p = strchr(line, '-');
772 if (!p)
773 return; /* cannot happen */
774 ecbdata->lno_in_preimage = strtol(p + 1, NULL, 10);
775 p = strchr(p, '+');
776 if (!p)
777 return; /* cannot happen */
778 ecbdata->lno_in_postimage = strtol(p + 1, NULL, 10);
779}
780static void fn_out_consume(void *priv, char *line, unsigned long len)
782{
783 struct emit_callback *ecbdata = priv;
784 const char *meta = diff_get_color(ecbdata->color_diff, DIFF_METAINFO);
785 const char *plain = diff_get_color(ecbdata->color_diff, DIFF_PLAIN);
786 const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
787 if (ecbdata->header) {
789 fprintf(ecbdata->file, "%s", ecbdata->header->buf);
790 strbuf_reset(ecbdata->header);
791 ecbdata->header = NULL;
792 }
793 *(ecbdata->found_changesp) = 1;
794 if (ecbdata->label_path[0]) {
796 const char *name_a_tab, *name_b_tab;
797 name_a_tab = strchr(ecbdata->label_path[0], ' ') ? "\t" : "";
799 name_b_tab = strchr(ecbdata->label_path[1], ' ') ? "\t" : "";
800 fprintf(ecbdata->file, "%s--- %s%s%s\n",
802 meta, ecbdata->label_path[0], reset, name_a_tab);
803 fprintf(ecbdata->file, "%s+++ %s%s%s\n",
804 meta, ecbdata->label_path[1], reset, name_b_tab);
805 ecbdata->label_path[0] = ecbdata->label_path[1] = NULL;
806 }
807 if (diff_suppress_blank_empty
809 && len == 2 && line[0] == ' ' && line[1] == '\n') {
810 line[0] = '\n';
811 len = 1;
812 }
813 if (line[0] == '@') {
815 if (ecbdata->diff_words)
816 diff_words_flush(ecbdata);
817 len = sane_truncate_line(ecbdata, line, len);
818 find_lno(line, ecbdata);
819 emit_hunk_header(ecbdata, line, len);
820 if (line[len-1] != '\n')
821 putc('\n', ecbdata->file);
822 return;
823 }
824 if (len < 1) {
826 emit_line(ecbdata->file, reset, reset, line, len);
827 return;
828 }
829 if (ecbdata->diff_words) {
831 if (line[0] == '-') {
832 diff_words_append(line, len,
833 &ecbdata->diff_words->minus);
834 return;
835 } else if (line[0] == '+') {
836 diff_words_append(line, len,
837 &ecbdata->diff_words->plus);
838 return;
839 }
840 diff_words_flush(ecbdata);
841 line++;
842 len--;
843 emit_line(ecbdata->file, plain, reset, line, len);
844 return;
845 }
846 if (line[0] != '+') {
848 const char *color =
849 diff_get_color(ecbdata->color_diff,
850 line[0] == '-' ? DIFF_FILE_OLD : DIFF_PLAIN);
851 ecbdata->lno_in_preimage++;
852 if (line[0] == ' ')
853 ecbdata->lno_in_postimage++;
854 emit_line(ecbdata->file, color, reset, line, len);
855 } else {
856 ecbdata->lno_in_postimage++;
857 emit_add_line(reset, ecbdata, line + 1, len - 1);
858 }
859}
860static char *pprint_rename(const char *a, const char *b)
862{
863 const char *old = a;
864 const char *new = b;
865 struct strbuf name = STRBUF_INIT;
866 int pfx_length, sfx_length;
867 int len_a = strlen(a);
868 int len_b = strlen(b);
869 int a_midlen, b_midlen;
870 int qlen_a = quote_c_style(a, NULL, NULL, 0);
871 int qlen_b = quote_c_style(b, NULL, NULL, 0);
872 if (qlen_a || qlen_b) {
874 quote_c_style(a, &name, NULL, 0);
875 strbuf_addstr(&name, " => ");
876 quote_c_style(b, &name, NULL, 0);
877 return strbuf_detach(&name, NULL);
878 }
879 /* Find common prefix */
881 pfx_length = 0;
882 while (*old && *new && *old == *new) {
883 if (*old == '/')
884 pfx_length = old - a + 1;
885 old++;
886 new++;
887 }
888 /* Find common suffix */
890 old = a + len_a;
891 new = b + len_b;
892 sfx_length = 0;
893 while (a <= old && b <= new && *old == *new) {
894 if (*old == '/')
895 sfx_length = len_a - (old - a);
896 old--;
897 new--;
898 }
899 /*
901 * pfx{mid-a => mid-b}sfx
902 * {pfx-a => pfx-b}sfx
903 * pfx{sfx-a => sfx-b}
904 * name-a => name-b
905 */
906 a_midlen = len_a - pfx_length - sfx_length;
907 b_midlen = len_b - pfx_length - sfx_length;
908 if (a_midlen < 0)
909 a_midlen = 0;
910 if (b_midlen < 0)
911 b_midlen = 0;
912 strbuf_grow(&name, pfx_length + a_midlen + b_midlen + sfx_length + 7);
914 if (pfx_length + sfx_length) {
915 strbuf_add(&name, a, pfx_length);
916 strbuf_addch(&name, '{');
917 }
918 strbuf_add(&name, a + pfx_length, a_midlen);
919 strbuf_addstr(&name, " => ");
920 strbuf_add(&name, b + pfx_length, b_midlen);
921 if (pfx_length + sfx_length) {
922 strbuf_addch(&name, '}');
923 strbuf_add(&name, a + len_a - sfx_length, sfx_length);
924 }
925 return strbuf_detach(&name, NULL);
926}
927struct diffstat_t {
929 int nr;
930 int alloc;
931 struct diffstat_file {
932 char *from_name;
933 char *name;
934 char *print_name;
935 unsigned is_unmerged:1;
936 unsigned is_binary:1;
937 unsigned is_renamed:1;
938 unsigned int added, deleted;
939 } **files;
940};
941static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat,
943 const char *name_a,
944 const char *name_b)
945{
946 struct diffstat_file *x;
947 x = xcalloc(sizeof (*x), 1);
948 if (diffstat->nr == diffstat->alloc) {
949 diffstat->alloc = alloc_nr(diffstat->alloc);
950 diffstat->files = xrealloc(diffstat->files,
951 diffstat->alloc * sizeof(x));
952 }
953 diffstat->files[diffstat->nr++] = x;
954 if (name_b) {
955 x->from_name = xstrdup(name_a);
956 x->name = xstrdup(name_b);
957 x->is_renamed = 1;
958 }
959 else {
960 x->from_name = NULL;
961 x->name = xstrdup(name_a);
962 }
963 return x;
964}
965static void diffstat_consume(void *priv, char *line, unsigned long len)
967{
968 struct diffstat_t *diffstat = priv;
969 struct diffstat_file *x = diffstat->files[diffstat->nr - 1];
970 if (line[0] == '+')
972 x->added++;
973 else if (line[0] == '-')
974 x->deleted++;
975}
976const char mime_boundary_leader[] = "------------";
978static int scale_linear(int it, int width, int max_change)
980{
981 /*
982 * make sure that at least one '-' is printed if there were deletions,
983 * and likewise for '+'.
984 */
985 if (max_change < 2)
986 return it;
987 return ((it - 1) * (width - 1) + max_change - 1) / (max_change - 1);
988}
989static void show_name(FILE *file,
991 const char *prefix, const char *name, int len)
992{
993 fprintf(file, " %s%-*s |", prefix, len, name);
994}
995static void show_graph(FILE *file, char ch, int cnt, const char *set, const char *reset)
997{
998 if (cnt <= 0)
999 return;
1000 fprintf(file, "%s", set);
1001 while (cnt--)
1002 putc(ch, file);
1003 fprintf(file, "%s", reset);
1004}
1005static void fill_print_name(struct diffstat_file *file)
1007{
1008 char *pname;
1009 if (file->print_name)
1011 return;
1012 if (!file->is_renamed) {
1014 struct strbuf buf = STRBUF_INIT;
1015 if (quote_c_style(file->name, &buf, NULL, 0)) {
1016 pname = strbuf_detach(&buf, NULL);
1017 } else {
1018 pname = file->name;
1019 strbuf_release(&buf);
1020 }
1021 } else {
1022 pname = pprint_rename(file->from_name, file->name);
1023 }
1024 file->print_name = pname;
1025}
1026static void show_stats(struct diffstat_t *data, struct diff_options *options)
1028{
1029 int i, len, add, del, adds = 0, dels = 0;
1030 int max_change = 0, max_len = 0;
1031 int total_files = data->nr;
1032 int width, name_width;
1033 const char *reset, *set, *add_c, *del_c;
1034 if (data->nr == 0)
1036 return;
1037 width = options->stat_width ? options->stat_width : 80;
1039 name_width = options->stat_name_width ? options->stat_name_width : 50;
1040 /* Sanity: give at least 5 columns to the graph,
1042 * but leave at least 10 columns for the name.
1043 */
1044 if (width < 25)
1045 width = 25;
1046 if (name_width < 10)
1047 name_width = 10;
1048 else if (width < name_width + 15)
1049 name_width = width - 15;
1050 /* Find the longest filename and max number of changes */
1052 reset = diff_get_color_opt(options, DIFF_RESET);
1053 set = diff_get_color_opt(options, DIFF_PLAIN);
1054 add_c = diff_get_color_opt(options, DIFF_FILE_NEW);
1055 del_c = diff_get_color_opt(options, DIFF_FILE_OLD);
1056 for (i = 0; i < data->nr; i++) {
1058 struct diffstat_file *file = data->files[i];
1059 int change = file->added + file->deleted;
1060 fill_print_name(file);
1061 len = strlen(file->print_name);
1062 if (max_len < len)
1063 max_len = len;
1064 if (file->is_binary || file->is_unmerged)
1066 continue;
1067 if (max_change < change)
1068 max_change = change;
1069 }
1070 /* Compute the width of the graph part;
1072 * 10 is for one blank at the beginning of the line plus
1073 * " | count " between the name and the graph.
1074 *
1075 * From here on, name_width is the width of the name area,
1076 * and width is the width of the graph area.
1077 */
1078 name_width = (name_width < max_len) ? name_width : max_len;
1079 if (width < (name_width + 10) + max_change)
1080 width = width - (name_width + 10);
1081 else
1082 width = max_change;
1083 for (i = 0; i < data->nr; i++) {
1085 const char *prefix = "";
1086 char *name = data->files[i]->print_name;
1087 int added = data->files[i]->added;
1088 int deleted = data->files[i]->deleted;
1089 int name_len;
1090 /*
1092 * "scale" the filename
1093 */
1094 len = name_width;
1095 name_len = strlen(name);
1096 if (name_width < name_len) {
1097 char *slash;
1098 prefix = "...";
1099 len -= 3;
1100 name += name_len - len;
1101 slash = strchr(name, '/');
1102 if (slash)
1103 name = slash;
1104 }
1105 if (data->files[i]->is_binary) {
1107 show_name(options->file, prefix, name, len);
1108 fprintf(options->file, " Bin ");
1109 fprintf(options->file, "%s%d%s", del_c, deleted, reset);
1110 fprintf(options->file, " -> ");
1111 fprintf(options->file, "%s%d%s", add_c, added, reset);
1112 fprintf(options->file, " bytes");
1113 fprintf(options->file, "\n");
1114 continue;
1115 }
1116 else if (data->files[i]->is_unmerged) {
1117 show_name(options->file, prefix, name, len);
1118 fprintf(options->file, " Unmerged\n");
1119 continue;
1120 }
1121 else if (!data->files[i]->is_renamed &&
1122 (added + deleted == 0)) {
1123 total_files--;
1124 continue;
1125 }
1126 /*
1128 * scale the add/delete
1129 */
1130 add = added;
1131 del = deleted;
1132 adds += add;
1133 dels += del;
1134 if (width <= max_change) {
1136 add = scale_linear(add, width, max_change);
1137 del = scale_linear(del, width, max_change);
1138 }
1139 show_name(options->file, prefix, name, len);
1140 fprintf(options->file, "%5d%s", added + deleted,
1141 added + deleted ? " " : "");
1142 show_graph(options->file, '+', add, add_c, reset);
1143 show_graph(options->file, '-', del, del_c, reset);
1144 fprintf(options->file, "\n");
1145 }
1146 fprintf(options->file,
1147 " %d files changed, %d insertions(+), %d deletions(-)\n",
1148 total_files, adds, dels);
1149}
1150static void show_shortstats(struct diffstat_t *data, struct diff_options *options)
1152{
1153 int i, adds = 0, dels = 0, total_files = data->nr;
1154 if (data->nr == 0)
1156 return;
1157 for (i = 0; i < data->nr; i++) {
1159 if (!data->files[i]->is_binary &&
1160 !data->files[i]->is_unmerged) {
1161 int added = data->files[i]->added;
1162 int deleted= data->files[i]->deleted;
1163 if (!data->files[i]->is_renamed &&
1164 (added + deleted == 0)) {
1165 total_files--;
1166 } else {
1167 adds += added;
1168 dels += deleted;
1169 }
1170 }
1171 }
1172 fprintf(options->file, " %d files changed, %d insertions(+), %d deletions(-)\n",
1173 total_files, adds, dels);
1174}
1175static void show_numstat(struct diffstat_t *data, struct diff_options *options)
1177{
1178 int i;
1179 if (data->nr == 0)
1181 return;
1182 for (i = 0; i < data->nr; i++) {
1184 struct diffstat_file *file = data->files[i];
1185 if (file->is_binary)
1187 fprintf(options->file, "-\t-\t");
1188 else
1189 fprintf(options->file,
1190 "%d\t%d\t", file->added, file->deleted);
1191 if (options->line_termination) {
1192 fill_print_name(file);
1193 if (!file->is_renamed)
1194 write_name_quoted(file->name, options->file,
1195 options->line_termination);
1196 else {
1197 fputs(file->print_name, options->file);
1198 putc(options->line_termination, options->file);
1199 }
1200 } else {
1201 if (file->is_renamed) {
1202 putc('\0', options->file);
1203 write_name_quoted(file->from_name, options->file, '\0');
1204 }
1205 write_name_quoted(file->name, options->file, '\0');
1206 }
1207 }
1208}
1209struct dirstat_file {
1211 const char *name;
1212 unsigned long changed;
1213};
1214struct dirstat_dir {
1216 struct dirstat_file *files;
1217 int alloc, nr, percent, cumulative;
1218};
1219static long gather_dirstat(FILE *file, struct dirstat_dir *dir, unsigned long changed, const char *base, int baselen)
1221{
1222 unsigned long this_dir = 0;
1223 unsigned int sources = 0;
1224 while (dir->nr) {
1226 struct dirstat_file *f = dir->files;
1227 int namelen = strlen(f->name);
1228 unsigned long this;
1229 char *slash;
1230 if (namelen < baselen)
1232 break;
1233 if (memcmp(f->name, base, baselen))
1234 break;
1235 slash = strchr(f->name + baselen, '/');
1236 if (slash) {
1237 int newbaselen = slash + 1 - f->name;
1238 this = gather_dirstat(file, dir, changed, f->name, newbaselen);
1239 sources++;
1240 } else {
1241 this = f->changed;
1242 dir->files++;
1243 dir->nr--;
1244 sources += 2;
1245 }
1246 this_dir += this;
1247 }
1248 /*
1250 * We don't report dirstat's for
1251 * - the top level
1252 * - or cases where everything came from a single directory
1253 * under this directory (sources == 1).
1254 */
1255 if (baselen && sources != 1) {
1256 int permille = this_dir * 1000 / changed;
1257 if (permille) {
1258 int percent = permille / 10;
1259 if (percent >= dir->percent) {
1260 fprintf(file, "%4d.%01d%% %.*s\n", percent, permille % 10, baselen, base);
1261 if (!dir->cumulative)
1262 return 0;
1263 }
1264 }
1265 }
1266 return this_dir;
1267}
1268static int dirstat_compare(const void *_a, const void *_b)
1270{
1271 const struct dirstat_file *a = _a;
1272 const struct dirstat_file *b = _b;
1273 return strcmp(a->name, b->name);
1274}
1275static void show_dirstat(struct diff_options *options)
1277{
1278 int i;
1279 unsigned long changed;
1280 struct dirstat_dir dir;
1281 struct diff_queue_struct *q = &diff_queued_diff;
1282 dir.files = NULL;
1284 dir.alloc = 0;
1285 dir.nr = 0;
1286 dir.percent = options->dirstat_percent;
1287 dir.cumulative = DIFF_OPT_TST(options, DIRSTAT_CUMULATIVE);
1288 changed = 0;
1290 for (i = 0; i < q->nr; i++) {
1291 struct diff_filepair *p = q->queue[i];
1292 const char *name;
1293 unsigned long copied, added, damage;
1294 name = p->one->path ? p->one->path : p->two->path;
1296 if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
1298 diff_populate_filespec(p->one, 0);
1299 diff_populate_filespec(p->two, 0);
1300 diffcore_count_changes(p->one, p->two, NULL, NULL, 0,
1301 &copied, &added);
1302 diff_free_filespec_data(p->one);
1303 diff_free_filespec_data(p->two);
1304 } else if (DIFF_FILE_VALID(p->one)) {
1305 diff_populate_filespec(p->one, 1);
1306 copied = added = 0;
1307 diff_free_filespec_data(p->one);
1308 } else if (DIFF_FILE_VALID(p->two)) {
1309 diff_populate_filespec(p->two, 1);
1310 copied = 0;
1311 added = p->two->size;
1312 diff_free_filespec_data(p->two);
1313 } else
1314 continue;
1315 /*
1317 * Original minus copied is the removed material,
1318 * added is the new material. They are both damages
1319 * made to the preimage. In --dirstat-by-file mode, count
1320 * damaged files, not damaged lines. This is done by
1321 * counting only a single damaged line per file.
1322 */
1323 damage = (p->one->size - copied) + added;
1324 if (DIFF_OPT_TST(options, DIRSTAT_BY_FILE) && damage > 0)
1325 damage = 1;
1326 ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
1328 dir.files[dir.nr].name = name;
1329 dir.files[dir.nr].changed = damage;
1330 changed += damage;
1331 dir.nr++;
1332 }
1333 /* This can happen even with many files, if everything was renames */
1335 if (!changed)
1336 return;
1337 /* Show all directories with more than x% of the changes */
1339 qsort(dir.files, dir.nr, sizeof(dir.files[0]), dirstat_compare);
1340 gather_dirstat(options->file, &dir, changed, "", 0);
1341}
1342static void free_diffstat_info(struct diffstat_t *diffstat)
1344{
1345 int i;
1346 for (i = 0; i < diffstat->nr; i++) {
1347 struct diffstat_file *f = diffstat->files[i];
1348 if (f->name != f->print_name)
1349 free(f->print_name);
1350 free(f->name);
1351 free(f->from_name);
1352 free(f);
1353 }
1354 free(diffstat->files);
1355}
1356struct checkdiff_t {
1358 const char *filename;
1359 int lineno;
1360 struct diff_options *o;
1361 unsigned ws_rule;
1362 unsigned status;
1363};
1364static int is_conflict_marker(const char *line, unsigned long len)
1366{
1367 char firstchar;
1368 int cnt;
1369 if (len < 8)
1371 return 0;
1372 firstchar = line[0];
1373 switch (firstchar) {
1374 case '=': case '>': case '<':
1375 break;
1376 default:
1377 return 0;
1378 }
1379 for (cnt = 1; cnt < 7; cnt++)
1380 if (line[cnt] != firstchar)
1381 return 0;
1382 /* line[0] thru line[6] are same as firstchar */
1383 if (firstchar == '=') {
1384 /* divider between ours and theirs? */
1385 if (len != 8 || line[7] != '\n')
1386 return 0;
1387 } else if (len < 8 || !isspace(line[7])) {
1388 /* not divider before ours nor after theirs */
1389 return 0;
1390 }
1391 return 1;
1392}
1393static void checkdiff_consume(void *priv, char *line, unsigned long len)
1395{
1396 struct checkdiff_t *data = priv;
1397 int color_diff = DIFF_OPT_TST(data->o, COLOR_DIFF);
1398 const char *ws = diff_get_color(color_diff, DIFF_WHITESPACE);
1399 const char *reset = diff_get_color(color_diff, DIFF_RESET);
1400 const char *set = diff_get_color(color_diff, DIFF_FILE_NEW);
1401 char *err;
1402 if (line[0] == '+') {
1404 unsigned bad;
1405 data->lineno++;
1406 if (is_conflict_marker(line + 1, len - 1)) {
1407 data->status |= 1;
1408 fprintf(data->o->file,
1409 "%s:%d: leftover conflict marker\n",
1410 data->filename, data->lineno);
1411 }
1412 bad = ws_check(line + 1, len - 1, data->ws_rule);
1413 if (!bad)
1414 return;
1415 data->status |= bad;
1416 err = whitespace_error_string(bad);
1417 fprintf(data->o->file, "%s:%d: %s.\n",
1418 data->filename, data->lineno, err);
1419 free(err);
1420 emit_line(data->o->file, set, reset, line, 1);
1421 ws_check_emit(line + 1, len - 1, data->ws_rule,
1422 data->o->file, set, reset, ws);
1423 } else if (line[0] == ' ') {
1424 data->lineno++;
1425 } else if (line[0] == '@') {
1426 char *plus = strchr(line, '+');
1427 if (plus)
1428 data->lineno = strtol(plus, NULL, 10) - 1;
1429 else
1430 die("invalid diff");
1431 }
1432}
1433static unsigned char *deflate_it(char *data,
1435 unsigned long size,
1436 unsigned long *result_size)
1437{
1438 int bound;
1439 unsigned char *deflated;
1440 z_stream stream;
1441 memset(&stream, 0, sizeof(stream));
1443 deflateInit(&stream, zlib_compression_level);
1444 bound = deflateBound(&stream, size);
1445 deflated = xmalloc(bound);
1446 stream.next_out = deflated;
1447 stream.avail_out = bound;
1448 stream.next_in = (unsigned char *)data;
1450 stream.avail_in = size;
1451 while (deflate(&stream, Z_FINISH) == Z_OK)
1452 ; /* nothing */
1453 deflateEnd(&stream);
1454 *result_size = stream.total_out;
1455 return deflated;
1456}
1457static void emit_binary_diff_body(FILE *file, mmfile_t *one, mmfile_t *two)
1459{
1460 void *cp;
1461 void *delta;
1462 void *deflated;
1463 void *data;
1464 unsigned long orig_size;
1465 unsigned long delta_size;
1466 unsigned long deflate_size;
1467 unsigned long data_size;
1468 /* We could do deflated delta, or we could do just deflated two,
1470 * whichever is smaller.
1471 */
1472 delta = NULL;
1473 deflated = deflate_it(two->ptr, two->size, &deflate_size);
1474 if (one->size && two->size) {
1475 delta = diff_delta(one->ptr, one->size,
1476 two->ptr, two->size,
1477 &delta_size, deflate_size);
1478 if (delta) {
1479 void *to_free = delta;
1480 orig_size = delta_size;
1481 delta = deflate_it(delta, delta_size, &delta_size);
1482 free(to_free);
1483 }
1484 }
1485 if (delta && delta_size < deflate_size) {
1487 fprintf(file, "delta %lu\n", orig_size);
1488 free(deflated);
1489 data = delta;
1490 data_size = delta_size;
1491 }
1492 else {
1493 fprintf(file, "literal %lu\n", two->size);
1494 free(delta);
1495 data = deflated;
1496 data_size = deflate_size;
1497 }
1498 /* emit data encoded in base85 */
1500 cp = data;
1501 while (data_size) {
1502 int bytes = (52 < data_size) ? 52 : data_size;
1503 char line[70];
1504 data_size -= bytes;
1505 if (bytes <= 26)
1506 line[0] = bytes + 'A' - 1;
1507 else
1508 line[0] = bytes - 26 + 'a' - 1;
1509 encode_85(line + 1, cp, bytes);
1510 cp = (char *) cp + bytes;
1511 fputs(line, file);
1512 fputc('\n', file);
1513 }
1514 fprintf(file, "\n");
1515 free(data);
1516}
1517static void emit_binary_diff(FILE *file, mmfile_t *one, mmfile_t *two)
1519{
1520 fprintf(file, "GIT binary patch\n");
1521 emit_binary_diff_body(file, one, two);
1522 emit_binary_diff_body(file, two, one);
1523}
1524static void diff_filespec_load_driver(struct diff_filespec *one)
1526{
1527 if (!one->driver)
1528 one->driver = userdiff_find_by_path(one->path);
1529 if (!one->driver)
1530 one->driver = userdiff_find_by_name("default");
1531}
1532int diff_filespec_is_binary(struct diff_filespec *one)
1534{
1535 if (one->is_binary == -1) {
1536 diff_filespec_load_driver(one);
1537 if (one->driver->binary != -1)
1538 one->is_binary = one->driver->binary;
1539 else {
1540 if (!one->data && DIFF_FILE_VALID(one))
1541 diff_populate_filespec(one, 0);
1542 if (one->data)
1543 one->is_binary = buffer_is_binary(one->data,
1544 one->size);
1545 if (one->is_binary == -1)
1546 one->is_binary = 0;
1547 }
1548 }
1549 return one->is_binary;
1550}
1551static const struct userdiff_funcname *diff_funcname_pattern(struct diff_filespec *one)
1553{
1554 diff_filespec_load_driver(one);
1555 return one->driver->funcname.pattern ? &one->driver->funcname : NULL;
1556}
1557static const char *userdiff_word_regex(struct diff_filespec *one)
1559{
1560 diff_filespec_load_driver(one);
1561 return one->driver->word_regex;
1562}
1563void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b)
1565{
1566 if (!options->a_prefix)
1567 options->a_prefix = a;
1568 if (!options->b_prefix)
1569 options->b_prefix = b;
1570}
1571static struct userdiff_driver *get_textconv(struct diff_filespec *one)
1573{
1574 if (!DIFF_FILE_VALID(one))
1575 return NULL;
1576 if (!S_ISREG(one->mode))
1577 return NULL;
1578 diff_filespec_load_driver(one);
1579 if (!one->driver->textconv)
1580 return NULL;
1581 if (one->driver->textconv_want_cache && !one->driver->textconv_cache) {
1583 struct notes_cache *c = xmalloc(sizeof(*c));
1584 struct strbuf name = STRBUF_INIT;
1585 strbuf_addf(&name, "textconv/%s", one->driver->name);
1587 notes_cache_init(c, name.buf, one->driver->textconv);
1588 one->driver->textconv_cache = c;
1589 }
1590 return one->driver;
1592}
1593static void builtin_diff(const char *name_a,
1595 const char *name_b,
1596 struct diff_filespec *one,
1597 struct diff_filespec *two,
1598 const char *xfrm_msg,
1599 struct diff_options *o,
1600 int complete_rewrite)
1601{
1602 mmfile_t mf1, mf2;
1603 const char *lbl[2];
1604 char *a_one, *b_two;
1605 const char *set = diff_get_color_opt(o, DIFF_METAINFO);
1606 const char *reset = diff_get_color_opt(o, DIFF_RESET);
1607 const char *a_prefix, *b_prefix;
1608 struct userdiff_driver *textconv_one = NULL;
1609 struct userdiff_driver *textconv_two = NULL;
1610 struct strbuf header = STRBUF_INIT;
1611 if (DIFF_OPT_TST(o, SUBMODULE_LOG) &&
1613 (!one->mode || S_ISGITLINK(one->mode)) &&
1614 (!two->mode || S_ISGITLINK(two->mode))) {
1615 const char *del = diff_get_color_opt(o, DIFF_FILE_OLD);
1616 const char *add = diff_get_color_opt(o, DIFF_FILE_NEW);
1617 show_submodule_summary(o->file, one ? one->path : two->path,
1618 one->sha1, two->sha1, two->dirty_submodule,
1619 del, add, reset);
1620 return;
1621 }
1622 if (DIFF_OPT_TST(o, ALLOW_TEXTCONV)) {
1624 textconv_one = get_textconv(one);
1625 textconv_two = get_textconv(two);
1626 }
1627 diff_set_mnemonic_prefix(o, "a/", "b/");
1629 if (DIFF_OPT_TST(o, REVERSE_DIFF)) {
1630 a_prefix = o->b_prefix;
1631 b_prefix = o->a_prefix;
1632 } else {
1633 a_prefix = o->a_prefix;
1634 b_prefix = o->b_prefix;
1635 }
1636 /* Never use a non-valid filename anywhere if at all possible */
1638 name_a = DIFF_FILE_VALID(one) ? name_a : name_b;
1639 name_b = DIFF_FILE_VALID(two) ? name_b : name_a;
1640 a_one = quote_two(a_prefix, name_a + (*name_a == '/'));
1642 b_two = quote_two(b_prefix, name_b + (*name_b == '/'));
1643 lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
1644 lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
1645 strbuf_addf(&header, "%sdiff --git %s %s%s\n", set, a_one, b_two, reset);
1646 if (lbl[0][0] == '/') {
1647 /* /dev/null */
1648 strbuf_addf(&header, "%snew file mode %06o%s\n", set, two->mode, reset);
1649 if (xfrm_msg && xfrm_msg[0])
1650 strbuf_addf(&header, "%s%s%s\n", set, xfrm_msg, reset);
1651 }
1652 else if (lbl[1][0] == '/') {
1653 strbuf_addf(&header, "%sdeleted file mode %06o%s\n", set, one->mode, reset);
1654 if (xfrm_msg && xfrm_msg[0])
1655 strbuf_addf(&header, "%s%s%s\n", set, xfrm_msg, reset);
1656 }
1657 else {
1658 if (one->mode != two->mode) {
1659 strbuf_addf(&header, "%sold mode %06o%s\n", set, one->mode, reset);
1660 strbuf_addf(&header, "%snew mode %06o%s\n", set, two->mode, reset);
1661 }
1662 if (xfrm_msg && xfrm_msg[0])
1663 strbuf_addf(&header, "%s%s%s\n", set, xfrm_msg, reset);
1664 /*
1666 * we do not run diff between different kind
1667 * of objects.
1668 */
1669 if ((one->mode ^ two->mode) & S_IFMT)
1670 goto free_ab_and_return;
1671 if (complete_rewrite &&
1672 (textconv_one || !diff_filespec_is_binary(one)) &&
1673 (textconv_two || !diff_filespec_is_binary(two))) {
1674 fprintf(o->file, "%s", header.buf);
1675 strbuf_reset(&header);
1676 emit_rewrite_diff(name_a, name_b, one, two,
1677 textconv_one, textconv_two, o);
1678 o->found_changes = 1;
1679 goto free_ab_and_return;
1680 }
1681 }
1682 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
1684 die("unable to read files to diff");
1685 if (!DIFF_OPT_TST(o, TEXT) &&
1687 ( (diff_filespec_is_binary(one) && !textconv_one) ||
1688 (diff_filespec_is_binary(two) && !textconv_two) )) {
1689 /* Quite common confusing case */
1690 if (mf1.size == mf2.size &&
1691 !memcmp(mf1.ptr, mf2.ptr, mf1.size))
1692 goto free_ab_and_return;
1693 fprintf(o->file, "%s", header.buf);
1694 strbuf_reset(&header);
1695 if (DIFF_OPT_TST(o, BINARY))
1696 emit_binary_diff(o->file, &mf1, &mf2);
1697 else
1698 fprintf(o->file, "Binary files %s and %s differ\n",
1699 lbl[0], lbl[1]);
1700 o->found_changes = 1;
1701 }
1702 else {
1703 /* Crazy xdl interfaces.. */
1704 const char *diffopts = getenv("GIT_DIFF_OPTS");
1705 xpparam_t xpp;
1706 xdemitconf_t xecfg;
1707 xdemitcb_t ecb;
1708 struct emit_callback ecbdata;
1709 const struct userdiff_funcname *pe;
1710 if (!DIFF_XDL_TST(o, WHITESPACE_FLAGS)) {
1712 fprintf(o->file, "%s", header.buf);
1713 strbuf_reset(&header);
1714 }
1715 mf1.size = fill_textconv(textconv_one, one, &mf1.ptr);
1717 mf2.size = fill_textconv(textconv_two, two, &mf2.ptr);
1718 pe = diff_funcname_pattern(one);
1720 if (!pe)
1721 pe = diff_funcname_pattern(two);
1722 memset(&xpp, 0, sizeof(xpp));
1724 memset(&xecfg, 0, sizeof(xecfg));
1725 memset(&ecbdata, 0, sizeof(ecbdata));
1726 ecbdata.label_path = lbl;
1727 ecbdata.color_diff = DIFF_OPT_TST(o, COLOR_DIFF);
1728 ecbdata.found_changesp = &o->found_changes;
1729 ecbdata.ws_rule = whitespace_rule(name_b ? name_b : name_a);
1730 if (ecbdata.ws_rule & WS_BLANK_AT_EOF)
1731 check_blank_at_eof(&mf1, &mf2, &ecbdata);
1732 ecbdata.file = o->file;
1733 ecbdata.header = header.len ? &header : NULL;
1734 xpp.flags = XDF_NEED_MINIMAL | o->xdl_opts;
1735 xecfg.ctxlen = o->context;
1736 xecfg.interhunkctxlen = o->interhunkcontext;
1737 xecfg.flags = XDL_EMIT_FUNCNAMES;
1738 if (pe)
1739 xdiff_set_find_func(&xecfg, pe->pattern, pe->cflags);
1740 if (!diffopts)
1741 ;
1742 else if (!prefixcmp(diffopts, "--unified="))
1743 xecfg.ctxlen = strtoul(diffopts + 10, NULL, 10);
1744 else if (!prefixcmp(diffopts, "-u"))
1745 xecfg.ctxlen = strtoul(diffopts + 2, NULL, 10);
1746 if (DIFF_OPT_TST(o, COLOR_DIFF_WORDS)) {
1747 ecbdata.diff_words =
1748 xcalloc(1, sizeof(struct diff_words_data));
1749 ecbdata.diff_words->file = o->file;
1750 if (!o->word_regex)
1751 o->word_regex = userdiff_word_regex(one);
1752 if (!o->word_regex)
1753 o->word_regex = userdiff_word_regex(two);
1754 if (!o->word_regex)
1755 o->word_regex = diff_word_regex_cfg;
1756 if (o->word_regex) {
1757 ecbdata.diff_words->word_regex = (regex_t *)
1758 xmalloc(sizeof(regex_t));
1759 if (regcomp(ecbdata.diff_words->word_regex,
1760 o->word_regex,
1761 REG_EXTENDED | REG_NEWLINE))
1762 die ("Invalid regular expression: %s",
1763 o->word_regex);
1764 }
1765 }
1766 xdi_diff_outf(&mf1, &mf2, fn_out_consume, &ecbdata,
1767 &xpp, &xecfg, &ecb);
1768 if (DIFF_OPT_TST(o, COLOR_DIFF_WORDS))
1769 free_diff_words_data(&ecbdata);
1770 if (textconv_one)
1771 free(mf1.ptr);
1772 if (textconv_two)
1773 free(mf2.ptr);
1774 xdiff_clear_find_func(&xecfg);
1775 }
1776 free_ab_and_return:
1778 strbuf_release(&header);
1779 diff_free_filespec_data(one);
1780 diff_free_filespec_data(two);
1781 free(a_one);
1782 free(b_two);
1783 return;
1784}
1785static void builtin_diffstat(const char *name_a, const char *name_b,
1787 struct diff_filespec *one,
1788 struct diff_filespec *two,
1789 struct diffstat_t *diffstat,
1790 struct diff_options *o,
1791 int complete_rewrite)
1792{
1793 mmfile_t mf1, mf2;
1794 struct diffstat_file *data;
1795 data = diffstat_add(diffstat, name_a, name_b);
1797 if (!one || !two) {
1799 data->is_unmerged = 1;
1800 return;
1801 }
1802 if (complete_rewrite) {
1803 diff_populate_filespec(one, 0);
1804 diff_populate_filespec(two, 0);
1805 data->deleted = count_lines(one->data, one->size);
1806 data->added = count_lines(two->data, two->size);
1807 goto free_and_return;
1808 }
1809 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
1810 die("unable to read files to diff");
1811 if (diff_filespec_is_binary(one) || diff_filespec_is_binary(two)) {
1813 data->is_binary = 1;
1814 data->added = mf2.size;
1815 data->deleted = mf1.size;
1816 } else {
1817 /* Crazy xdl interfaces.. */
1818 xpparam_t xpp;
1819 xdemitconf_t xecfg;
1820 xdemitcb_t ecb;
1821 memset(&xpp, 0, sizeof(xpp));
1823 memset(&xecfg, 0, sizeof(xecfg));
1824 xpp.flags = XDF_NEED_MINIMAL | o->xdl_opts;
1825 xdi_diff_outf(&mf1, &mf2, diffstat_consume, diffstat,
1826 &xpp, &xecfg, &ecb);
1827 }
1828 free_and_return:
1830 diff_free_filespec_data(one);
1831 diff_free_filespec_data(two);
1832}
1833static void builtin_checkdiff(const char *name_a, const char *name_b,
1835 const char *attr_path,
1836 struct diff_filespec *one,
1837 struct diff_filespec *two,
1838 struct diff_options *o)
1839{
1840 mmfile_t mf1, mf2;
1841 struct checkdiff_t data;
1842 if (!two)
1844 return;
1845 memset(&data, 0, sizeof(data));
1847 data.filename = name_b ? name_b : name_a;
1848 data.lineno = 0;
1849 data.o = o;
1850 data.ws_rule = whitespace_rule(attr_path);
1851 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
1853 die("unable to read files to diff");
1854 /*
1856 * All the other codepaths check both sides, but not checking
1857 * the "old" side here is deliberate. We are checking the newly
1858 * introduced changes, and as long as the "new" side is text, we
1859 * can and should check what it introduces.
1860 */
1861 if (diff_filespec_is_binary(two))
1862 goto free_and_return;
1863 else {
1864 /* Crazy xdl interfaces.. */
1865 xpparam_t xpp;
1866 xdemitconf_t xecfg;
1867 xdemitcb_t ecb;
1868 memset(&xpp, 0, sizeof(xpp));
1870 memset(&xecfg, 0, sizeof(xecfg));
1871 xecfg.ctxlen = 1; /* at least one context line */
1872 xpp.flags = XDF_NEED_MINIMAL;
1873 xdi_diff_outf(&mf1, &mf2, checkdiff_consume, &data,
1874 &xpp, &xecfg, &ecb);
1875 if (data.ws_rule & WS_BLANK_AT_EOF) {
1877 struct emit_callback ecbdata;
1878 int blank_at_eof;
1879 ecbdata.ws_rule = data.ws_rule;
1881 check_blank_at_eof(&mf1, &mf2, &ecbdata);
1882 blank_at_eof = ecbdata.blank_at_eof_in_preimage;
1883 if (blank_at_eof) {
1885 static char *err;
1886 if (!err)
1887 err = whitespace_error_string(WS_BLANK_AT_EOF);
1888 fprintf(o->file, "%s:%d: %s.\n",
1889 data.filename, blank_at_eof, err);
1890 data.status = 1; /* report errors */
1891 }
1892 }
1893 }
1894 free_and_return:
1895 diff_free_filespec_data(one);
1896 diff_free_filespec_data(two);
1897 if (data.status)
1898 DIFF_OPT_SET(o, CHECK_FAILED);
1899}
1900struct diff_filespec *alloc_filespec(const char *path)
1902{
1903 int namelen = strlen(path);
1904 struct diff_filespec *spec = xmalloc(sizeof(*spec) + namelen + 1);
1905 memset(spec, 0, sizeof(*spec));
1907 spec->path = (char *)(spec + 1);
1908 memcpy(spec->path, path, namelen+1);
1909 spec->count = 1;
1910 spec->is_binary = -1;
1911 return spec;
1912}
1913void free_filespec(struct diff_filespec *spec)
1915{
1916 if (!--spec->count) {
1917 diff_free_filespec_data(spec);
1918 free(spec);
1919 }
1920}
1921void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1,
1923 unsigned short mode)
1924{
1925 if (mode) {
1926 spec->mode = canon_mode(mode);
1927 hashcpy(spec->sha1, sha1);
1928 spec->sha1_valid = !is_null_sha1(sha1);
1929 }
1930}
1931/*
1933 * Given a name and sha1 pair, if the index tells us the file in
1934 * the work tree has that object contents, return true, so that
1935 * prepare_temp_file() does not have to inflate and extract.
1936 */
1937static int reuse_worktree_file(const char *name, const unsigned char *sha1, int want_file)
1938{
1939 struct cache_entry *ce;
1940 struct stat st;
1941 int pos, len;
1942 /*
1944 * We do not read the cache ourselves here, because the
1945 * benchmark with my previous version that always reads cache
1946 * shows that it makes things worse for diff-tree comparing
1947 * two linux-2.6 kernel trees in an already checked out work
1948 * tree. This is because most diff-tree comparisons deal with
1949 * only a small number of files, while reading the cache is
1950 * expensive for a large project, and its cost outweighs the
1951 * savings we get by not inflating the object to a temporary
1952 * file. Practically, this code only helps when we are used
1953 * by diff-cache --cached, which does read the cache before
1954 * calling us.
1955 */
1956 if (!active_cache)
1957 return 0;
1958 /* We want to avoid the working directory if our caller
1960 * doesn't need the data in a normal file, this system
1961 * is rather slow with its stat/open/mmap/close syscalls,
1962 * and the object is contained in a pack file. The pack
1963 * is probably already open and will be faster to obtain
1964 * the data through than the working directory. Loose
1965 * objects however would tend to be slower as they need
1966 * to be individually opened and inflated.
1967 */
1968 if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1))
1969 return 0;
1970 len = strlen(name);
1972 pos = cache_name_pos(name, len);
1973 if (pos < 0)
1974 return 0;
1975 ce = active_cache[pos];
1976 /*
1978 * This is not the sha1 we are looking for, or
1979 * unreusable because it is not a regular file.
1980 */
1981 if (hashcmp(sha1, ce->sha1) || !S_ISREG(ce->ce_mode))
1982 return 0;
1983 /*
1985 * If ce is marked as "assume unchanged", there is no
1986 * guarantee that work tree matches what we are looking for.
1987 */
1988 if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce))
1989 return 0;
1990 /*
1992 * If ce matches the file in the work tree, we can reuse it.
1993 */
1994 if (ce_uptodate(ce) ||
1995 (!lstat(name, &st) && !ce_match_stat(ce, &st, 0)))
1996 return 1;
1997 return 0;
1999}
2000static int populate_from_stdin(struct diff_filespec *s)
2002{
2003 struct strbuf buf = STRBUF_INIT;
2004 size_t size = 0;
2005 if (strbuf_read(&buf, 0, 0) < 0)
2007 return error("error while reading from stdin %s",
2008 strerror(errno));
2009 s->should_munmap = 0;
2011 s->data = strbuf_detach(&buf, &size);
2012 s->size = size;
2013 s->should_free = 1;
2014 return 0;
2015}
2016static int diff_populate_gitlink(struct diff_filespec *s, int size_only)
2018{
2019 int len;
2020 char *data = xmalloc(100), *dirty = "";
2021 /* Are we looking at the work tree? */
2023 if (s->dirty_submodule)
2024 dirty = "-dirty";
2025 len = snprintf(data, 100,
2027 "Subproject commit %s%s\n", sha1_to_hex(s->sha1), dirty);
2028 s->data = data;
2029 s->size = len;
2030 s->should_free = 1;
2031 if (size_only) {
2032 s->data = NULL;
2033 free(data);
2034 }
2035 return 0;
2036}
2037/*
2039 * While doing rename detection and pickaxe operation, we may need to
2040 * grab the data for the blob (or file) for our own in-core comparison.
2041 * diff_filespec has data and size fields for this purpose.
2042 */
2043int diff_populate_filespec(struct diff_filespec *s, int size_only)
2044{
2045 int err = 0;
2046 if (!DIFF_FILE_VALID(s))
2047 die("internal error: asking to populate invalid file.");
2048 if (S_ISDIR(s->mode))
2049 return -1;
2050 if (s->data)
2052 return 0;
2053 if (size_only && 0 < s->size)
2055 return 0;
2056 if (S_ISGITLINK(s->mode))
2058 return diff_populate_gitlink(s, size_only);
2059 if (!s->sha1_valid ||
2061 reuse_worktree_file(s->path, s->sha1, 0)) {
2062 struct strbuf buf = STRBUF_INIT;
2063 struct stat st;
2064 int fd;
2065 if (!strcmp(s->path, "-"))
2067 return populate_from_stdin(s);
2068 if (lstat(s->path, &st) < 0) {
2070 if (errno == ENOENT) {
2071 err_empty:
2072 err = -1;
2073 empty:
2074 s->data = (char *)"";
2075 s->size = 0;
2076 return err;
2077 }
2078 }
2079 s->size = xsize_t(st.st_size);
2080 if (!s->size)
2081 goto empty;
2082 if (S_ISLNK(st.st_mode)) {
2083 struct strbuf sb = STRBUF_INIT;
2084 if (strbuf_readlink(&sb, s->path, s->size))
2086 goto err_empty;
2087 s->size = sb.len;
2088 s->data = strbuf_detach(&sb, NULL);
2089 s->should_free = 1;
2090 return 0;
2091 }
2092 if (size_only)
2093 return 0;
2094 fd = open(s->path, O_RDONLY);
2095 if (fd < 0)
2096 goto err_empty;
2097 s->data = xmmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0);
2098 close(fd);
2099 s->should_munmap = 1;
2100 /*
2102 * Convert from working tree format to canonical git format
2103 */
2104 if (convert_to_git(s->path, s->data, s->size, &buf, safe_crlf)) {
2105 size_t size = 0;
2106 munmap(s->data, s->size);
2107 s->should_munmap = 0;
2108 s->data = strbuf_detach(&buf, &size);
2109 s->size = size;
2110 s->should_free = 1;
2111 }
2112 }
2113 else {
2114 enum object_type type;
2115 if (size_only)
2116 type = sha1_object_info(s->sha1, &s->size);
2117 else {
2118 s->data = read_sha1_file(s->sha1, &type, &s->size);
2119 s->should_free = 1;
2120 }
2121 }
2122 return 0;
2123}
2124void diff_free_filespec_blob(struct diff_filespec *s)
2126{
2127 if (s->should_free)
2128 free(s->data);
2129 else if (s->should_munmap)
2130 munmap(s->data, s->size);
2131 if (s->should_free || s->should_munmap) {
2133 s->should_free = s->should_munmap = 0;
2134 s->data = NULL;
2135 }
2136}
2137void diff_free_filespec_data(struct diff_filespec *s)
2139{
2140 diff_free_filespec_blob(s);
2141 free(s->cnt_data);
2142 s->cnt_data = NULL;
2143}
2144static void prep_temp_blob(const char *path, struct diff_tempfile *temp,
2146 void *blob,
2147 unsigned long size,
2148 const unsigned char *sha1,
2149 int mode)
2150{
2151 int fd;
2152 struct strbuf buf = STRBUF_INIT;
2153 struct strbuf template = STRBUF_INIT;
2154 char *path_dup = xstrdup(path);
2155 const char *base = basename(path_dup);
2156 /* Generate "XXXXXX_basename.ext" */
2158 strbuf_addstr(&template, "XXXXXX_");
2159 strbuf_addstr(&template, base);
2160 fd = git_mkstemps(temp->tmp_path, PATH_MAX, template.buf,
2162 strlen(base) + 1);
2163 if (fd < 0)
2164 die_errno("unable to create temp-file");
2165 if (convert_to_working_tree(path,
2166 (const char *)blob, (size_t)size, &buf)) {
2167 blob = buf.buf;
2168 size = buf.len;
2169 }
2170 if (write_in_full(fd, blob, size) != size)
2171 die_errno("unable to write temp-file");
2172 close(fd);
2173 temp->name = temp->tmp_path;
2174 strcpy(temp->hex, sha1_to_hex(sha1));
2175 temp->hex[40] = 0;
2176 sprintf(temp->mode, "%06o", mode);
2177 strbuf_release(&buf);
2178 strbuf_release(&template);
2179 free(path_dup);
2180}
2181static struct diff_tempfile *prepare_temp_file(const char *name,
2183 struct diff_filespec *one)
2184{
2185 struct diff_tempfile *temp = claim_diff_tempfile();
2186 if (!DIFF_FILE_VALID(one)) {
2188 not_a_valid_file:
2189 /* A '-' entry produces this for file-2, and
2190 * a '+' entry produces this for file-1.
2191 */
2192 temp->name = "/dev/null";
2193 strcpy(temp->hex, ".");
2194 strcpy(temp->mode, ".");
2195 return temp;
2196 }
2197 if (!remove_tempfile_installed) {
2199 atexit(remove_tempfile);
2200 sigchain_push_common(remove_tempfile_on_signal);
2201 remove_tempfile_installed = 1;
2202 }
2203 if (!one->sha1_valid ||
2205 reuse_worktree_file(name, one->sha1, 1)) {
2206 struct stat st;
2207 if (lstat(name, &st) < 0) {
2208 if (errno == ENOENT)
2209 goto not_a_valid_file;
2210 die_errno("stat(%s)", name);
2211 }
2212 if (S_ISLNK(st.st_mode)) {
2213 struct strbuf sb = STRBUF_INIT;
2214 if (strbuf_readlink(&sb, name, st.st_size) < 0)
2215 die_errno("readlink(%s)", name);
2216 prep_temp_blob(name, temp, sb.buf, sb.len,
2217 (one->sha1_valid ?
2218 one->sha1 : null_sha1),
2219 (one->sha1_valid ?
2220 one->mode : S_IFLNK));
2221 strbuf_release(&sb);
2222 }
2223 else {
2224 /* we can borrow from the file in the work tree */
2225 temp->name = name;
2226 if (!one->sha1_valid)
2227 strcpy(temp->hex, sha1_to_hex(null_sha1));
2228 else
2229 strcpy(temp->hex, sha1_to_hex(one->sha1));
2230 /* Even though we may sometimes borrow the
2231 * contents from the work tree, we always want
2232 * one->mode. mode is trustworthy even when
2233 * !(one->sha1_valid), as long as
2234 * DIFF_FILE_VALID(one).
2235 */
2236 sprintf(temp->mode, "%06o", one->mode);
2237 }
2238 return temp;
2239 }
2240 else {
2241 if (diff_populate_filespec(one, 0))
2242 die("cannot read data blob for %s", one->path);
2243 prep_temp_blob(name, temp, one->data, one->size,
2244 one->sha1, one->mode);
2245 }
2246 return temp;
2247}
2248/* An external diff command takes:
2250 *
2251 * diff-cmd name infile1 infile1-sha1 infile1-mode \
2252 * infile2 infile2-sha1 infile2-mode [ rename-to ]
2253 *
2254 */
2255static void run_external_diff(const char *pgm,
2256 const char *name,
2257 const char *other,
2258 struct diff_filespec *one,
2259 struct diff_filespec *two,
2260 const char *xfrm_msg,
2261 int complete_rewrite)
2262{
2263 const char *spawn_arg[10];
2264 int retval;
2265 const char **arg = &spawn_arg[0];
2266 if (one && two) {
2268 struct diff_tempfile *temp_one, *temp_two;
2269 const char *othername = (other ? other : name);
2270 temp_one = prepare_temp_file(name, one);
2271 temp_two = prepare_temp_file(othername, two);
2272 *arg++ = pgm;
2273 *arg++ = name;
2274 *arg++ = temp_one->name;
2275 *arg++ = temp_one->hex;
2276 *arg++ = temp_one->mode;
2277 *arg++ = temp_two->name;
2278 *arg++ = temp_two->hex;
2279 *arg++ = temp_two->mode;
2280 if (other) {
2281 *arg++ = other;
2282 *arg++ = xfrm_msg;
2283 }
2284 } else {
2285 *arg++ = pgm;
2286 *arg++ = name;
2287 }
2288 *arg = NULL;
2289 fflush(NULL);
2290 retval = run_command_v_opt(spawn_arg, RUN_USING_SHELL);
2291 remove_tempfile();
2292 if (retval) {
2293 fprintf(stderr, "external diff died, stopping at %s.\n", name);
2294 exit(1);
2295 }
2296}
2297static int similarity_index(struct diff_filepair *p)
2299{
2300 return p->score * 100 / MAX_SCORE;
2301}
2302static void fill_metainfo(struct strbuf *msg,
2304 const char *name,
2305 const char *other,
2306 struct diff_filespec *one,
2307 struct diff_filespec *two,
2308 struct diff_options *o,
2309 struct diff_filepair *p)
2310{
2311 strbuf_init(msg, PATH_MAX * 2 + 300);
2312 switch (p->status) {
2313 case DIFF_STATUS_COPIED:
2314 strbuf_addf(msg, "similarity index %d%%", similarity_index(p));
2315 strbuf_addstr(msg, "\ncopy from ");
2316 quote_c_style(name, msg, NULL, 0);
2317 strbuf_addstr(msg, "\ncopy to ");
2318 quote_c_style(other, msg, NULL, 0);
2319 strbuf_addch(msg, '\n');
2320 break;
2321 case DIFF_STATUS_RENAMED:
2322 strbuf_addf(msg, "similarity index %d%%", similarity_index(p));
2323 strbuf_addstr(msg, "\nrename from ");
2324 quote_c_style(name, msg, NULL, 0);
2325 strbuf_addstr(msg, "\nrename to ");
2326 quote_c_style(other, msg, NULL, 0);
2327 strbuf_addch(msg, '\n');
2328 break;
2329 case DIFF_STATUS_MODIFIED:
2330 if (p->score) {
2331 strbuf_addf(msg, "dissimilarity index %d%%\n",
2332 similarity_index(p));
2333 break;
2334 }
2335 /* fallthru */
2336 default:
2337 /* nothing */
2338 ;
2339 }
2340 if (one && two && hashcmp(one->sha1, two->sha1)) {
2341 int abbrev = DIFF_OPT_TST(o, FULL_INDEX) ? 40 : DEFAULT_ABBREV;
2342 if (DIFF_OPT_TST(o, BINARY)) {
2344 mmfile_t mf;
2345 if ((!fill_mmfile(&mf, one) && diff_filespec_is_binary(one)) ||
2346 (!fill_mmfile(&mf, two) && diff_filespec_is_binary(two)))
2347 abbrev = 40;
2348 }
2349 strbuf_addf(msg, "index %.*s..%.*s",
2350 abbrev, sha1_to_hex(one->sha1),
2351 abbrev, sha1_to_hex(two->sha1));
2352 if (one->mode == two->mode)
2353 strbuf_addf(msg, " %06o", one->mode);
2354 strbuf_addch(msg, '\n');
2355 }
2356 if (msg->len)
2357 strbuf_setlen(msg, msg->len - 1);
2358}
2359static void run_diff_cmd(const char *pgm,
2361 const char *name,
2362 const char *other,
2363 const char *attr_path,
2364 struct diff_filespec *one,
2365 struct diff_filespec *two,
2366 struct strbuf *msg,
2367 struct diff_options *o,
2368 struct diff_filepair *p)
2369{
2370 const char *xfrm_msg = NULL;
2371 int complete_rewrite = (p->status == DIFF_STATUS_MODIFIED) && p->score;
2372 if (msg) {
2374 fill_metainfo(msg, name, other, one, two, o, p);
2375 xfrm_msg = msg->len ? msg->buf : NULL;
2376 }
2377 if (!DIFF_OPT_TST(o, ALLOW_EXTERNAL))
2379 pgm = NULL;
2380 else {
2381 struct userdiff_driver *drv = userdiff_find_by_path(attr_path);
2382 if (drv && drv->external)
2383 pgm = drv->external;
2384 }
2385 if (pgm) {
2387 run_external_diff(pgm, name, other, one, two, xfrm_msg,
2388 complete_rewrite);
2389 return;
2390 }
2391 if (one && two)
2392 builtin_diff(name, other ? other : name,
2393 one, two, xfrm_msg, o, complete_rewrite);
2394 else
2395 fprintf(o->file, "* Unmerged path %s\n", name);
2396}
2397static void diff_fill_sha1_info(struct diff_filespec *one)
2399{
2400 if (DIFF_FILE_VALID(one)) {
2401 if (!one->sha1_valid) {
2402 struct stat st;
2403 if (!strcmp(one->path, "-")) {
2404 hashcpy(one->sha1, null_sha1);
2405 return;
2406 }
2407 if (lstat(one->path, &st) < 0)
2408 die_errno("stat '%s'", one->path);
2409 if (index_path(one->sha1, one->path, &st, 0))
2410 die("cannot hash %s", one->path);
2411 }
2412 }
2413 else
2414 hashclr(one->sha1);
2415}
2416static void strip_prefix(int prefix_length, const char **namep, const char **otherp)
2418{
2419 /* Strip the prefix but do not molest /dev/null and absolute paths */
2420 if (*namep && **namep != '/')
2421 *namep += prefix_length;
2422 if (*otherp && **otherp != '/')
2423 *otherp += prefix_length;
2424}
2425static void run_diff(struct diff_filepair *p, struct diff_options *o)
2427{
2428 const char *pgm = external_diff();
2429 struct strbuf msg;
2430 struct diff_filespec *one = p->one;
2431 struct diff_filespec *two = p->two;
2432 const char *name;
2433 const char *other;
2434 const char *attr_path;
2435 name = p->one->path;
2437 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
2438 attr_path = name;
2439 if (o->prefix_length)
2440 strip_prefix(o->prefix_length, &name, &other);
2441 if (DIFF_PAIR_UNMERGED(p)) {
2443 run_diff_cmd(pgm, name, NULL, attr_path,
2444 NULL, NULL, NULL, o, p);
2445 return;
2446 }
2447 diff_fill_sha1_info(one);
2449 diff_fill_sha1_info(two);
2450 if (!pgm &&
2452 DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) &&
2453 (S_IFMT & one->mode) != (S_IFMT & two->mode)) {
2454 /*
2455 * a filepair that changes between file and symlink
2456 * needs to be split into deletion and creation.
2457 */
2458 struct diff_filespec *null = alloc_filespec(two->path);
2459 run_diff_cmd(NULL, name, other, attr_path,
2460 one, null, &msg, o, p);
2461 free(null);
2462 strbuf_release(&msg);
2463 null = alloc_filespec(one->path);
2465 run_diff_cmd(NULL, name, other, attr_path,
2466 null, two, &msg, o, p);
2467 free(null);
2468 }
2469 else
2470 run_diff_cmd(pgm, name, other, attr_path,
2471 one, two, &msg, o, p);
2472 strbuf_release(&msg);
2474}
2475static void run_diffstat(struct diff_filepair *p, struct diff_options *o,
2477 struct diffstat_t *diffstat)
2478{
2479 const char *name;
2480 const char *other;
2481 int complete_rewrite = 0;
2482 if (DIFF_PAIR_UNMERGED(p)) {
2484 /* unmerged */
2485 builtin_diffstat(p->one->path, NULL, NULL, NULL, diffstat, o, 0);
2486 return;
2487 }
2488 name = p->one->path;
2490 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
2491 if (o->prefix_length)
2493 strip_prefix(o->prefix_length, &name, &other);
2494 diff_fill_sha1_info(p->one);
2496 diff_fill_sha1_info(p->two);
2497 if (p->status == DIFF_STATUS_MODIFIED && p->score)
2499 complete_rewrite = 1;
2500 builtin_diffstat(name, other, p->one, p->two, diffstat, o, complete_rewrite);
2501}
2502static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
2504{
2505 const char *name;
2506 const char *other;
2507 const char *attr_path;
2508 if (DIFF_PAIR_UNMERGED(p)) {
2510 /* unmerged */
2511 return;
2512 }
2513 name = p->one->path;
2515 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
2516 attr_path = other ? other : name;
2517 if (o->prefix_length)
2519 strip_prefix(o->prefix_length, &name, &other);
2520 diff_fill_sha1_info(p->one);
2522 diff_fill_sha1_info(p->two);
2523 builtin_checkdiff(name, other, attr_path, p->one, p->two, o);
2525}
2526void diff_setup(struct diff_options *options)
2528{
2529 memset(options, 0, sizeof(*options));
2530 options->file = stdout;
2532 options->line_termination = '\n';
2534 options->break_opt = -1;
2535 options->rename_limit = -1;
2536 options->dirstat_percent = 3;
2537 options->context = 3;
2538 options->change = diff_change;
2540 options->add_remove = diff_addremove;
2541 if (diff_use_color_default > 0)
2542 DIFF_OPT_SET(options, COLOR_DIFF);
2543 options->detect_rename = diff_detect_rename_default;
2544 if (!diff_mnemonic_prefix) {
2546 options->a_prefix = "a/";
2547 options->b_prefix = "b/";
2548 }
2549}
2550int diff_setup_done(struct diff_options *options)
2552{
2553 int count = 0;
2554 if (options->output_format & DIFF_FORMAT_NAME)
2556 count++;
2557 if (options->output_format & DIFF_FORMAT_NAME_STATUS)
2558 count++;
2559 if (options->output_format & DIFF_FORMAT_CHECKDIFF)
2560 count++;
2561 if (options->output_format & DIFF_FORMAT_NO_OUTPUT)
2562 count++;
2563 if (count > 1)
2564 die("--name-only, --name-status, --check and -s are mutually exclusive");
2565 /*
2567 * Most of the time we can say "there are changes"
2568 * only by checking if there are changed paths, but
2569 * --ignore-whitespace* options force us to look
2570 * inside contents.
2571 */
2572 if (DIFF_XDL_TST(options, IGNORE_WHITESPACE) ||
2574 DIFF_XDL_TST(options, IGNORE_WHITESPACE_CHANGE) ||
2575 DIFF_XDL_TST(options, IGNORE_WHITESPACE_AT_EOL))
2576 DIFF_OPT_SET(options, DIFF_FROM_CONTENTS);
2577 else
2578 DIFF_OPT_CLR(options, DIFF_FROM_CONTENTS);
2579 if (DIFF_OPT_TST(options, FIND_COPIES_HARDER))
2581 options->detect_rename = DIFF_DETECT_COPY;
2582 if (!DIFF_OPT_TST(options, RELATIVE_NAME))
2584 options->prefix = NULL;
2585 if (options->prefix)
2586 options->prefix_length = strlen(options->prefix);
2587 else
2588 options->prefix_length = 0;
2589 if (options->output_format & (DIFF_FORMAT_NAME |
2591 DIFF_FORMAT_NAME_STATUS |
2592 DIFF_FORMAT_CHECKDIFF |
2593 DIFF_FORMAT_NO_OUTPUT))
2594 options->output_format &= ~(DIFF_FORMAT_RAW |
2595 DIFF_FORMAT_NUMSTAT |
2596 DIFF_FORMAT_DIFFSTAT |
2597 DIFF_FORMAT_SHORTSTAT |
2598 DIFF_FORMAT_DIRSTAT |
2599 DIFF_FORMAT_SUMMARY |
2600 DIFF_FORMAT_PATCH);
2601 /*
2603 * These cases always need recursive; we do not drop caller-supplied
2604 * recursive bits for other formats here.
2605 */
2606 if (options->output_format & (DIFF_FORMAT_PATCH |
2607 DIFF_FORMAT_NUMSTAT |
2608 DIFF_FORMAT_DIFFSTAT |
2609 DIFF_FORMAT_SHORTSTAT |
2610 DIFF_FORMAT_DIRSTAT |
2611 DIFF_FORMAT_SUMMARY |
2612 DIFF_FORMAT_CHECKDIFF))
2613 DIFF_OPT_SET(options, RECURSIVE);
2614 /*
2615 * Also pickaxe would not work very well if you do not say recursive
2616 */
2617 if (options->pickaxe)
2618 DIFF_OPT_SET(options, RECURSIVE);
2619 /*
2620 * When patches are generated, submodules diffed against the work tree
2621 * must be checked for dirtiness too so it can be shown in the output
2622 */
2623 if (options->output_format & DIFF_FORMAT_PATCH)
2624 DIFF_OPT_SET(options, DIRTY_SUBMODULES);
2625 if (options->detect_rename && options->rename_limit < 0)
2627 options->rename_limit = diff_rename_limit_default;
2628 if (options->setup & DIFF_SETUP_USE_CACHE) {
2629 if (!active_cache)
2630 /* read-cache does not die even when it fails
2631 * so it is safe for us to do this here. Also
2632 * it does not smudge active_cache or active_nr
2633 * when it fails, so we do not have to worry about
2634 * cleaning it up ourselves either.
2635 */
2636 read_cache();
2637 }
2638 if (options->abbrev <= 0 || 40 < options->abbrev)
2639 options->abbrev = 40; /* full */
2640 /*
2642 * It does not make sense to show the first hit we happened
2643 * to have found. It does not make sense not to return with
2644 * exit code in such a case either.
2645 */
2646 if (DIFF_OPT_TST(options, QUICK)) {
2647 options->output_format = DIFF_FORMAT_NO_OUTPUT;
2648 DIFF_OPT_SET(options, EXIT_WITH_STATUS);
2649 }
2650 return 0;
2652}
2653static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)
2655{
2656 char c, *eq;
2657 int len;
2658 if (*arg != '-')
2660 return 0;
2661 c = *++arg;
2662 if (!c)
2663 return 0;
2664 if (c == arg_short) {
2665 c = *++arg;
2666 if (!c)
2667 return 1;
2668 if (val && isdigit(c)) {
2669 char *end;
2670 int n = strtoul(arg, &end, 10);
2671 if (*end)
2672 return 0;
2673 *val = n;
2674 return 1;
2675 }
2676 return 0;
2677 }
2678 if (c != '-')
2679 return 0;
2680 arg++;
2681 eq = strchr(arg, '=');
2682 if (eq)
2683 len = eq - arg;
2684 else
2685 len = strlen(arg);
2686 if (!len || strncmp(arg, arg_long, len))
2687 return 0;
2688 if (eq) {
2689 int n;
2690 char *end;
2691 if (!isdigit(*++eq))
2692 return 0;
2693 n = strtoul(eq, &end, 10);
2694 if (*end)
2695 return 0;
2696 *val = n;
2697 }
2698 return 1;
2699}
2700static int diff_scoreopt_parse(const char *opt);
2702int diff_opt_parse(struct diff_options *options, const char **av, int ac)
2704{
2705 const char *arg = av[0];
2706 /* Output format options */
2708 if (!strcmp(arg, "-p") || !strcmp(arg, "-u"))
2709 options->output_format |= DIFF_FORMAT_PATCH;
2710 else if (opt_arg(arg, 'U', "unified", &options->context))
2711 options->output_format |= DIFF_FORMAT_PATCH;
2712 else if (!strcmp(arg, "--raw"))
2713 options->output_format |= DIFF_FORMAT_RAW;
2714 else if (!strcmp(arg, "--patch-with-raw"))
2715 options->output_format |= DIFF_FORMAT_PATCH | DIFF_FORMAT_RAW;
2716 else if (!strcmp(arg, "--numstat"))
2717 options->output_format |= DIFF_FORMAT_NUMSTAT;
2718 else if (!strcmp(arg, "--shortstat"))
2719 options->output_format |= DIFF_FORMAT_SHORTSTAT;
2720 else if (opt_arg(arg, 'X', "dirstat", &options->dirstat_percent))
2721 options->output_format |= DIFF_FORMAT_DIRSTAT;
2722 else if (!strcmp(arg, "--cumulative")) {
2723 options->output_format |= DIFF_FORMAT_DIRSTAT;
2724 DIFF_OPT_SET(options, DIRSTAT_CUMULATIVE);
2725 } else if (opt_arg(arg, 0, "dirstat-by-file",
2726 &options->dirstat_percent)) {
2727 options->output_format |= DIFF_FORMAT_DIRSTAT;
2728 DIFF_OPT_SET(options, DIRSTAT_BY_FILE);
2729 }
2730 else if (!strcmp(arg, "--check"))
2731 options->output_format |= DIFF_FORMAT_CHECKDIFF;
2732 else if (!strcmp(arg, "--summary"))
2733 options->output_format |= DIFF_FORMAT_SUMMARY;
2734 else if (!strcmp(arg, "--patch-with-stat"))
2735 options->output_format |= DIFF_FORMAT_PATCH | DIFF_FORMAT_DIFFSTAT;
2736 else if (!strcmp(arg, "--name-only"))
2737 options->output_format |= DIFF_FORMAT_NAME;
2738 else if (!strcmp(arg, "--name-status"))
2739 options->output_format |= DIFF_FORMAT_NAME_STATUS;
2740 else if (!strcmp(arg, "-s"))
2741 options->output_format |= DIFF_FORMAT_NO_OUTPUT;
2742 else if (!prefixcmp(arg, "--stat")) {
2743 char *end;
2744 int width = options->stat_width;
2745 int name_width = options->stat_name_width;
2746 arg += 6;
2747 end = (char *)arg;
2748 switch (*arg) {
2750 case '-':
2751 if (!prefixcmp(arg, "-width="))
2752 width = strtoul(arg + 7, &end, 10);
2753 else if (!prefixcmp(arg, "-name-width="))
2754 name_width = strtoul(arg + 12, &end, 10);
2755 break;
2756 case '=':
2757 width = strtoul(arg+1, &end, 10);
2758 if (*end == ',')
2759 name_width = strtoul(end+1, &end, 10);
2760 }
2761 /* Important! This checks all the error cases! */
2763 if (*end)
2764 return 0;
2765 options->output_format |= DIFF_FORMAT_DIFFSTAT;
2766 options->stat_name_width = name_width;
2767 options->stat_width = width;
2768 }
2769 /* renames options */
2771 else if (!prefixcmp(arg, "-B")) {
2772 if ((options->break_opt = diff_scoreopt_parse(arg)) == -1)
2773 return -1;
2774 }
2775 else if (!prefixcmp(arg, "-M")) {
2776 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
2777 return -1;
2778 options->detect_rename = DIFF_DETECT_RENAME;
2779 }
2780 else if (!prefixcmp(arg, "-C")) {
2781 if (options->detect_rename == DIFF_DETECT_COPY)
2782 DIFF_OPT_SET(options, FIND_COPIES_HARDER);
2783 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
2784 return -1;
2785 options->detect_rename = DIFF_DETECT_COPY;
2786 }
2787 else if (!strcmp(arg, "--no-renames"))
2788 options->detect_rename = 0;
2789 else if (!strcmp(arg, "--relative"))
2790 DIFF_OPT_SET(options, RELATIVE_NAME);
2791 else if (!prefixcmp(arg, "--relative=")) {
2792 DIFF_OPT_SET(options, RELATIVE_NAME);
2793 options->prefix = arg + 11;
2794 }
2795 /* xdiff options */
2797 else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space"))
2798 DIFF_XDL_SET(options, IGNORE_WHITESPACE);
2799 else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change"))
2800 DIFF_XDL_SET(options, IGNORE_WHITESPACE_CHANGE);
2801 else if (!strcmp(arg, "--ignore-space-at-eol"))
2802 DIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL);
2803 else if (!strcmp(arg, "--patience"))
2804 DIFF_XDL_SET(options, PATIENCE_DIFF);
2805 /* flags options */
2807 else if (!strcmp(arg, "--binary")) {
2808 options->output_format |= DIFF_FORMAT_PATCH;
2809 DIFF_OPT_SET(options, BINARY);
2810 }
2811 else if (!strcmp(arg, "--full-index"))
2812 DIFF_OPT_SET(options, FULL_INDEX);
2813 else if (!strcmp(arg, "-a") || !strcmp(arg, "--text"))
2814 DIFF_OPT_SET(options, TEXT);
2815 else if (!strcmp(arg, "-R"))
2816 DIFF_OPT_SET(options, REVERSE_DIFF);
2817 else if (!strcmp(arg, "--find-copies-harder"))
2818 DIFF_OPT_SET(options, FIND_COPIES_HARDER);
2819 else if (!strcmp(arg, "--follow"))
2820 DIFF_OPT_SET(options, FOLLOW_RENAMES);
2821 else if (!strcmp(arg, "--color"))
2822 DIFF_OPT_SET(options, COLOR_DIFF);
2823 else if (!prefixcmp(arg, "--color=")) {
2824 int value = git_config_colorbool(NULL, arg+8, -1);
2825 if (value == 0)
2826 DIFF_OPT_CLR(options, COLOR_DIFF);
2827 else if (value > 0)
2828 DIFF_OPT_SET(options, COLOR_DIFF);
2829 else
2830 return error("option `color' expects \"always\", \"auto\", or \"never\"");
2831 }
2832 else if (!strcmp(arg, "--no-color"))
2833 DIFF_OPT_CLR(options, COLOR_DIFF);
2834 else if (!strcmp(arg, "--color-words")) {
2835 DIFF_OPT_SET(options, COLOR_DIFF);
2836 DIFF_OPT_SET(options, COLOR_DIFF_WORDS);
2837 }
2838 else if (!prefixcmp(arg, "--color-words=")) {
2839 DIFF_OPT_SET(options, COLOR_DIFF);
2840 DIFF_OPT_SET(options, COLOR_DIFF_WORDS);
2841 options->word_regex = arg + 14;
2842 }
2843 else if (!strcmp(arg, "--exit-code"))
2844 DIFF_OPT_SET(options, EXIT_WITH_STATUS);
2845 else if (!strcmp(arg, "--quiet"))
2846 DIFF_OPT_SET(options, QUICK);
2847 else if (!strcmp(arg, "--ext-diff"))
2848 DIFF_OPT_SET(options, ALLOW_EXTERNAL);
2849 else if (!strcmp(arg, "--no-ext-diff"))
2850 DIFF_OPT_CLR(options, ALLOW_EXTERNAL);
2851 else if (!strcmp(arg, "--textconv"))
2852 DIFF_OPT_SET(options, ALLOW_TEXTCONV);
2853 else if (!strcmp(arg, "--no-textconv"))
2854 DIFF_OPT_CLR(options, ALLOW_TEXTCONV);
2855 else if (!strcmp(arg, "--ignore-submodules"))
2856 DIFF_OPT_SET(options, IGNORE_SUBMODULES);
2857 else if (!strcmp(arg, "--submodule"))
2858 DIFF_OPT_SET(options, SUBMODULE_LOG);
2859 else if (!prefixcmp(arg, "--submodule=")) {
2860 if (!strcmp(arg + 12, "log"))
2861 DIFF_OPT_SET(options, SUBMODULE_LOG);
2862 }
2863 /* misc options */
2865 else if (!strcmp(arg, "-z"))
2866 options->line_termination = 0;
2867 else if (!prefixcmp(arg, "-l"))
2868 options->rename_limit = strtoul(arg+2, NULL, 10);
2869 else if (!prefixcmp(arg, "-S"))
2870 options->pickaxe = arg + 2;
2871 else if (!strcmp(arg, "--pickaxe-all"))
2872 options->pickaxe_opts = DIFF_PICKAXE_ALL;
2873 else if (!strcmp(arg, "--pickaxe-regex"))
2874 options->pickaxe_opts = DIFF_PICKAXE_REGEX;
2875 else if (!prefixcmp(arg, "-O"))
2876 options->orderfile = arg + 2;
2877 else if (!prefixcmp(arg, "--diff-filter="))
2878 options->filter = arg + 14;
2879 else if (!strcmp(arg, "--abbrev"))
2880 options->abbrev = DEFAULT_ABBREV;
2881 else if (!prefixcmp(arg, "--abbrev=")) {
2882 options->abbrev = strtoul(arg + 9, NULL, 10);
2883 if (options->abbrev < MINIMUM_ABBREV)
2884 options->abbrev = MINIMUM_ABBREV;
2885 else if (40 < options->abbrev)
2886 options->abbrev = 40;
2887 }
2888 else if (!prefixcmp(arg, "--src-prefix="))
2889 options->a_prefix = arg + 13;
2890 else if (!prefixcmp(arg, "--dst-prefix="))
2891 options->b_prefix = arg + 13;
2892 else if (!strcmp(arg, "--no-prefix"))
2893 options->a_prefix = options->b_prefix = "";
2894 else if (opt_arg(arg, '\0', "inter-hunk-context",
2895 &options->interhunkcontext))
2896 ;
2897 else if (!prefixcmp(arg, "--output=")) {
2898 options->file = fopen(arg + strlen("--output="), "w");
2899 if (!options->file)
2900 die_errno("Could not open '%s'", arg + strlen("--output="));
2901 options->close_file = 1;
2902 } else
2903 return 0;
2904 return 1;
2905}
2906static int parse_num(const char **cp_p)
2908{
2909 unsigned long num, scale;
2910 int ch, dot;
2911 const char *cp = *cp_p;
2912 num = 0;
2914 scale = 1;
2915 dot = 0;
2916 for (;;) {
2917 ch = *cp;
2918 if ( !dot && ch == '.' ) {
2919 scale = 1;
2920 dot = 1;
2921 } else if ( ch == '%' ) {
2922 scale = dot ? scale*100 : 100;
2923 cp++; /* % is always at the end */
2924 break;
2925 } else if ( ch >= '0' && ch <= '9' ) {
2926 if ( scale < 100000 ) {
2927 scale *= 10;
2928 num = (num*10) + (ch-'0');
2929 }
2930 } else {
2931 break;
2932 }
2933 cp++;
2934 }
2935 *cp_p = cp;
2936 /* user says num divided by scale and we say internally that
2938 * is MAX_SCORE * num / scale.
2939 */
2940 return (int)((num >= scale) ? MAX_SCORE : (MAX_SCORE * num / scale));
2941}
2942static int diff_scoreopt_parse(const char *opt)
2944{
2945 int opt1, opt2, cmd;
2946 if (*opt++ != '-')
2948 return -1;
2949 cmd = *opt++;
2950 if (cmd != 'M' && cmd != 'C' && cmd != 'B')
2951 return -1; /* that is not a -M, -C nor -B option */
2952 opt1 = parse_num(&opt);
2954 if (cmd != 'B')
2955 opt2 = 0;
2956 else {
2957 if (*opt == 0)
2958 opt2 = 0;
2959 else if (*opt != '/')
2960 return -1; /* we expect -B80/99 or -B80 */
2961 else {
2962 opt++;
2963 opt2 = parse_num(&opt);
2964 }
2965 }
2966 if (*opt != 0)
2967 return -1;
2968 return opt1 | (opt2 << 16);
2969}
2970struct diff_queue_struct diff_queued_diff;
2972void diff_q(struct diff_queue_struct *queue, struct diff_filepair *dp)
2974{
2975 if (queue->alloc <= queue->nr) {
2976 queue->alloc = alloc_nr(queue->alloc);
2977 queue->queue = xrealloc(queue->queue,
2978 sizeof(dp) * queue->alloc);
2979 }
2980 queue->queue[queue->nr++] = dp;
2981}
2982struct diff_filepair *diff_queue(struct diff_queue_struct *queue,
2984 struct diff_filespec *one,
2985 struct diff_filespec *two)
2986{
2987 struct diff_filepair *dp = xcalloc(1, sizeof(*dp));
2988 dp->one = one;
2989 dp->two = two;
2990 if (queue)
2991 diff_q(queue, dp);
2992 return dp;
2993}
2994void diff_free_filepair(struct diff_filepair *p)
2996{
2997 free_filespec(p->one);
2998 free_filespec(p->two);
2999 free(p);
3000}
3001/* This is different from find_unique_abbrev() in that
3003 * it stuffs the result with dots for alignment.
3004 */
3005const char *diff_unique_abbrev(const unsigned char *sha1, int len)
3006{
3007 int abblen;
3008 const char *abbrev;
3009 if (len == 40)
3010 return sha1_to_hex(sha1);
3011 abbrev = find_unique_abbrev(sha1, len);
3013 abblen = strlen(abbrev);
3014 if (abblen < 37) {
3015 static char hex[41];
3016 if (len < abblen && abblen <= len + 2)
3017 sprintf(hex, "%s%.*s", abbrev, len+3-abblen, "..");
3018 else
3019 sprintf(hex, "%s...", abbrev);
3020 return hex;
3021 }
3022 return sha1_to_hex(sha1);
3023}
3024static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt)
3026{
3027 int line_termination = opt->line_termination;
3028 int inter_name_termination = line_termination ? '\t' : '\0';
3029 if (!(opt->output_format & DIFF_FORMAT_NAME_STATUS)) {
3031 fprintf(opt->file, ":%06o %06o %s ", p->one->mode, p->two->mode,
3032 diff_unique_abbrev(p->one->sha1, opt->abbrev));
3033 fprintf(opt->file, "%s ", diff_unique_abbrev(p->two->sha1, opt->abbrev));
3034 }
3035 if (p->score) {
3036 fprintf(opt->file, "%c%03d%c", p->status, similarity_index(p),
3037 inter_name_termination);
3038 } else {
3039 fprintf(opt->file, "%c%c", p->status, inter_name_termination);
3040 }
3041 if (p->status == DIFF_STATUS_COPIED ||
3043 p->status == DIFF_STATUS_RENAMED) {
3044 const char *name_a, *name_b;
3045 name_a = p->one->path;
3046 name_b = p->two->path;
3047 strip_prefix(opt->prefix_length, &name_a, &name_b);
3048 write_name_quoted(name_a, opt->file, inter_name_termination);
3049 write_name_quoted(name_b, opt->file, line_termination);
3050 } else {
3051 const char *name_a, *name_b;
3052 name_a = p->one->mode ? p->one->path : p->two->path;
3053 name_b = NULL;
3054 strip_prefix(opt->prefix_length, &name_a, &name_b);
3055 write_name_quoted(name_a, opt->file, line_termination);
3056 }
3057}
3058int diff_unmodified_pair(struct diff_filepair *p)
3060{
3061 /* This function is written stricter than necessary to support
3062 * the currently implemented transformers, but the idea is to
3063 * let transformers to produce diff_filepairs any way they want,
3064 * and filter and clean them up here before producing the output.
3065 */
3066 struct diff_filespec *one = p->one, *two = p->two;
3067 if (DIFF_PAIR_UNMERGED(p))
3069 return 0; /* unmerged is interesting */
3070 /* deletion, addition, mode or type change
3072 * and rename are all interesting.
3073 */
3074 if (DIFF_FILE_VALID(one) != DIFF_FILE_VALID(two) ||
3075 DIFF_PAIR_MODE_CHANGED(p) ||
3076 strcmp(one->path, two->path))
3077 return 0;
3078 /* both are valid and point at the same path. that is, we are
3080 * dealing with a change.
3081 */
3082 if (one->sha1_valid && two->sha1_valid &&
3083 !hashcmp(one->sha1, two->sha1) &&
3084 !one->dirty_submodule && !two->dirty_submodule)
3085 return 1; /* no change */
3086 if (!one->sha1_valid && !two->sha1_valid)
3087 return 1; /* both look at the same file on the filesystem. */
3088 return 0;
3089}
3090static void diff_flush_patch(struct diff_filepair *p, struct diff_options *o)
3092{
3093 if (diff_unmodified_pair(p))
3094 return;
3095 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
3097 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
3098 return; /* no tree diffs in patch format */
3099 run_diff(p, o);
3101}
3102static void diff_flush_stat(struct diff_filepair *p, struct diff_options *o,
3104 struct diffstat_t *diffstat)
3105{
3106 if (diff_unmodified_pair(p))
3107 return;
3108 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
3110 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
3111 return; /* no tree diffs in patch format */
3112 run_diffstat(p, o, diffstat);
3114}
3115static void diff_flush_checkdiff(struct diff_filepair *p,
3117 struct diff_options *o)
3118{
3119 if (diff_unmodified_pair(p))
3120 return;
3121 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
3123 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
3124 return; /* no tree diffs in patch format */
3125 run_checkdiff(p, o);
3127}
3128int diff_queue_is_empty(void)
3130{
3131 struct diff_queue_struct *q = &diff_queued_diff;
3132 int i;
3133 for (i = 0; i < q->nr; i++)
3134 if (!diff_unmodified_pair(q->queue[i]))
3135 return 0;
3136 return 1;
3137}
3138#if DIFF_DEBUG
3140void diff_debug_filespec(struct diff_filespec *s, int x, const char *one)
3141{
3142 fprintf(stderr, "queue[%d] %s (%s) %s %06o %s\n",
3143 x, one ? one : "",
3144 s->path,
3145 DIFF_FILE_VALID(s) ? "valid" : "invalid",
3146 s->mode,
3147 s->sha1_valid ? sha1_to_hex(s->sha1) : "");
3148 fprintf(stderr, "queue[%d] %s size %lu flags %d\n",
3149 x, one ? one : "",
3150 s->size, s->xfrm_flags);
3151}
3152void diff_debug_filepair(const struct diff_filepair *p, int i)
3154{
3155 diff_debug_filespec(p->one, i, "one");
3156 diff_debug_filespec(p->two, i, "two");
3157 fprintf(stderr, "score %d, status %c rename_used %d broken %d\n",
3158 p->score, p->status ? p->status : '?',
3159 p->one->rename_used, p->broken_pair);
3160}
3161void diff_debug_queue(const char *msg, struct diff_queue_struct *q)
3163{
3164 int i;
3165 if (msg)
3166 fprintf(stderr, "%s\n", msg);
3167 fprintf(stderr, "q->nr = %d\n", q->nr);
3168 for (i = 0; i < q->nr; i++) {
3169 struct diff_filepair *p = q->queue[i];
3170 diff_debug_filepair(p, i);
3171 }
3172}
3173#endif
3174static void diff_resolve_rename_copy(void)
3176{
3177 int i;
3178 struct diff_filepair *p;
3179 struct diff_queue_struct *q = &diff_queued_diff;
3180 diff_debug_queue("resolve-rename-copy", q);
3182 for (i = 0; i < q->nr; i++) {
3184 p = q->queue[i];
3185 p->status = 0; /* undecided */
3186 if (DIFF_PAIR_UNMERGED(p))
3187 p->status = DIFF_STATUS_UNMERGED;
3188 else if (!DIFF_FILE_VALID(p->one))
3189 p->status = DIFF_STATUS_ADDED;
3190 else if (!DIFF_FILE_VALID(p->two))
3191 p->status = DIFF_STATUS_DELETED;
3192 else if (DIFF_PAIR_TYPE_CHANGED(p))
3193 p->status = DIFF_STATUS_TYPE_CHANGED;
3194 /* from this point on, we are dealing with a pair
3196 * whose both sides are valid and of the same type, i.e.
3197 * either in-place edit or rename/copy edit.
3198 */
3199 else if (DIFF_PAIR_RENAME(p)) {
3200 /*
3201 * A rename might have re-connected a broken
3202 * pair up, causing the pathnames to be the
3203 * same again. If so, that's not a rename at
3204 * all, just a modification..
3205 *
3206 * Otherwise, see if this source was used for
3207 * multiple renames, in which case we decrement
3208 * the count, and call it a copy.
3209 */
3210 if (!strcmp(p->one->path, p->two->path))
3211 p->status = DIFF_STATUS_MODIFIED;
3212 else if (--p->one->rename_used > 0)
3213 p->status = DIFF_STATUS_COPIED;
3214 else
3215 p->status = DIFF_STATUS_RENAMED;
3216 }
3217 else if (hashcmp(p->one->sha1, p->two->sha1) ||
3218 p->one->mode != p->two->mode ||
3219 p->one->dirty_submodule ||
3220 p->two->dirty_submodule ||
3221 is_null_sha1(p->one->sha1))
3222 p->status = DIFF_STATUS_MODIFIED;
3223 else {
3224 /* This is a "no-change" entry and should not
3225 * happen anymore, but prepare for broken callers.
3226 */
3227 error("feeding unmodified %s to diffcore",
3228 p->one->path);
3229 p->status = DIFF_STATUS_UNKNOWN;
3230 }
3231 }
3232 diff_debug_queue("resolve-rename-copy done", q);
3233}
3234static int check_pair_status(struct diff_filepair *p)
3236{
3237 switch (p->status) {
3238 case DIFF_STATUS_UNKNOWN:
3239 return 0;
3240 case 0:
3241 die("internal error in diff-resolve-rename-copy");
3242 default:
3243 return 1;
3244 }
3245}
3246static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt)
3248{
3249 int fmt = opt->output_format;
3250 if (fmt & DIFF_FORMAT_CHECKDIFF)
3252 diff_flush_checkdiff(p, opt);
3253 else if (fmt & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS))
3254 diff_flush_raw(p, opt);
3255 else if (fmt & DIFF_FORMAT_NAME) {
3256 const char *name_a, *name_b;
3257 name_a = p->two->path;
3258 name_b = NULL;
3259 strip_prefix(opt->prefix_length, &name_a, &name_b);
3260 write_name_quoted(name_a, opt->file, opt->line_termination);
3261 }
3262}
3263static void show_file_mode_name(FILE *file, const char *newdelete, struct diff_filespec *fs)
3265{
3266 if (fs->mode)
3267 fprintf(file, " %s mode %06o ", newdelete, fs->mode);
3268 else
3269 fprintf(file, " %s ", newdelete);
3270 write_name_quoted(fs->path, file, '\n');
3271}
3272static void show_mode_change(FILE *file, struct diff_filepair *p, int show_name)
3275{
3276 if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) {
3277 fprintf(file, " mode change %06o => %06o%c", p->one->mode, p->two->mode,
3278 show_name ? ' ' : '\n');
3279 if (show_name) {
3280 write_name_quoted(p->two->path, file, '\n');
3281 }
3282 }
3283}
3284static void show_rename_copy(FILE *file, const char *renamecopy, struct diff_filepair *p)
3286{
3287 char *names = pprint_rename(p->one->path, p->two->path);
3288 fprintf(file, " %s %s (%d%%)\n", renamecopy, names, similarity_index(p));
3290 free(names);
3291 show_mode_change(file, p, 0);
3292}
3293static void diff_summary(FILE *file, struct diff_filepair *p)
3295{
3296 switch(p->status) {
3297 case DIFF_STATUS_DELETED:
3298 show_file_mode_name(file, "delete", p->one);
3299 break;
3300 case DIFF_STATUS_ADDED:
3301 show_file_mode_name(file, "create", p->two);
3302 break;
3303 case DIFF_STATUS_COPIED:
3304 show_rename_copy(file, "copy", p);
3305 break;
3306 case DIFF_STATUS_RENAMED:
3307 show_rename_copy(file, "rename", p);
3308 break;
3309 default:
3310 if (p->score) {
3311 fputs(" rewrite ", file);
3312 write_name_quoted(p->two->path, file, ' ');
3313 fprintf(file, "(%d%%)\n", similarity_index(p));
3314 }
3315 show_mode_change(file, p, !p->score);
3316 break;
3317 }
3318}
3319struct patch_id_t {
3321 git_SHA_CTX *ctx;
3322 int patchlen;
3323};
3324static int remove_space(char *line, int len)
3326{
3327 int i;
3328 char *dst = line;
3329 unsigned char c;
3330 for (i = 0; i < len; i++)
3332 if (!isspace((c = line[i])))
3333 *dst++ = c;
3334 return dst - line;
3336}
3337static void patch_id_consume(void *priv, char *line, unsigned long len)
3339{
3340 struct patch_id_t *data = priv;
3341 int new_len;
3342 /* Ignore line numbers when computing the SHA1 of the patch */
3344 if (!prefixcmp(line, "@@ -"))
3345 return;
3346 new_len = remove_space(line, len);
3348 git_SHA1_Update(data->ctx, line, new_len);
3350 data->patchlen += new_len;
3351}
3352/* returns 0 upon success, and writes result into sha1 */
3354static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
3355{
3356 struct diff_queue_struct *q = &diff_queued_diff;
3357 int i;
3358 git_SHA_CTX ctx;
3359 struct patch_id_t data;
3360 char buffer[PATH_MAX * 4 + 20];
3361 git_SHA1_Init(&ctx);
3363 memset(&data, 0, sizeof(struct patch_id_t));
3364 data.ctx = &ctx;
3365 for (i = 0; i < q->nr; i++) {
3367 xpparam_t xpp;
3368 xdemitconf_t xecfg;
3369 xdemitcb_t ecb;
3370 mmfile_t mf1, mf2;
3371 struct diff_filepair *p = q->queue[i];
3372 int len1, len2;
3373 memset(&xpp, 0, sizeof(xpp));
3375 memset(&xecfg, 0, sizeof(xecfg));
3376 if (p->status == 0)
3377 return error("internal diff status error");
3378 if (p->status == DIFF_STATUS_UNKNOWN)
3379 continue;
3380 if (diff_unmodified_pair(p))
3381 continue;
3382 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
3383 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
3384 continue;
3385 if (DIFF_PAIR_UNMERGED(p))
3386 continue;
3387 diff_fill_sha1_info(p->one);
3389 diff_fill_sha1_info(p->two);
3390 if (fill_mmfile(&mf1, p->one) < 0 ||
3391 fill_mmfile(&mf2, p->two) < 0)
3392 return error("unable to read files to diff");
3393 len1 = remove_space(p->one->path, strlen(p->one->path));
3395 len2 = remove_space(p->two->path, strlen(p->two->path));
3396 if (p->one->mode == 0)
3397 len1 = snprintf(buffer, sizeof(buffer),
3398 "diff--gita/%.*sb/%.*s"
3399 "newfilemode%06o"
3400 "---/dev/null"
3401 "+++b/%.*s",
3402 len1, p->one->path,
3403 len2, p->two->path,
3404 p->two->mode,
3405 len2, p->two->path);
3406 else if (p->two->mode == 0)
3407 len1 = snprintf(buffer, sizeof(buffer),
3408 "diff--gita/%.*sb/%.*s"
3409 "deletedfilemode%06o"
3410 "---a/%.*s"
3411 "+++/dev/null",
3412 len1, p->one->path,
3413 len2, p->two->path,
3414 p->one->mode,
3415 len1, p->one->path);
3416 else
3417 len1 = snprintf(buffer, sizeof(buffer),
3418 "diff--gita/%.*sb/%.*s"
3419 "---a/%.*s"
3420 "+++b/%.*s",
3421 len1, p->one->path,
3422 len2, p->two->path,
3423 len1, p->one->path,
3424 len2, p->two->path);
3425 git_SHA1_Update(&ctx, buffer, len1);
3426 xpp.flags = XDF_NEED_MINIMAL;
3428 xecfg.ctxlen = 3;
3429 xecfg.flags = XDL_EMIT_FUNCNAMES;
3430 xdi_diff_outf(&mf1, &mf2, patch_id_consume, &data,
3431 &xpp, &xecfg, &ecb);
3432 }
3433 git_SHA1_Final(sha1, &ctx);
3435 return 0;
3436}
3437int diff_flush_patch_id(struct diff_options *options, unsigned char *sha1)
3439{
3440 struct diff_queue_struct *q = &diff_queued_diff;
3441 int i;
3442 int result = diff_get_patch_id(options, sha1);
3443 for (i = 0; i < q->nr; i++)
3445 diff_free_filepair(q->queue[i]);
3446 free(q->queue);
3448 q->queue = NULL;
3449 q->nr = q->alloc = 0;
3450 return result;
3452}
3453static int is_summary_empty(const struct diff_queue_struct *q)
3455{
3456 int i;
3457 for (i = 0; i < q->nr; i++) {
3459 const struct diff_filepair *p = q->queue[i];
3460 switch (p->status) {
3462 case DIFF_STATUS_DELETED:
3463 case DIFF_STATUS_ADDED:
3464 case DIFF_STATUS_COPIED:
3465 case DIFF_STATUS_RENAMED:
3466 return 0;
3467 default:
3468 if (p->score)
3469 return 0;
3470 if (p->one->mode && p->two->mode &&
3471 p->one->mode != p->two->mode)
3472 return 0;
3473 break;
3474 }
3475 }
3476 return 1;
3477}
3478void diff_flush(struct diff_options *options)
3480{
3481 struct diff_queue_struct *q = &diff_queued_diff;
3482 int i, output_format = options->output_format;
3483 int separator = 0;
3484 /*
3486 * Order: raw, stat, summary, patch
3487 * or: name/name-status/checkdiff (other bits clear)
3488 */
3489 if (!q->nr)
3490 goto free_queue;
3491 if (output_format & (DIFF_FORMAT_RAW |
3493 DIFF_FORMAT_NAME |
3494 DIFF_FORMAT_NAME_STATUS |
3495 DIFF_FORMAT_CHECKDIFF)) {
3496 for (i = 0; i < q->nr; i++) {
3497 struct diff_filepair *p = q->queue[i];
3498 if (check_pair_status(p))
3499 flush_one_pair(p, options);
3500 }
3501 separator++;
3502 }
3503 if (output_format & (DIFF_FORMAT_DIFFSTAT|DIFF_FORMAT_SHORTSTAT|DIFF_FORMAT_NUMSTAT)) {
3505 struct diffstat_t diffstat;
3506 memset(&diffstat, 0, sizeof(struct diffstat_t));
3508 for (i = 0; i < q->nr; i++) {
3509 struct diff_filepair *p = q->queue[i];
3510 if (check_pair_status(p))
3511 diff_flush_stat(p, options, &diffstat);
3512 }
3513 if (output_format & DIFF_FORMAT_NUMSTAT)
3514 show_numstat(&diffstat, options);
3515 if (output_format & DIFF_FORMAT_DIFFSTAT)
3516 show_stats(&diffstat, options);
3517 if (output_format & DIFF_FORMAT_SHORTSTAT)
3518 show_shortstats(&diffstat, options);
3519 free_diffstat_info(&diffstat);
3520 separator++;
3521 }
3522 if (output_format & DIFF_FORMAT_DIRSTAT)
3523 show_dirstat(options);
3524 if (output_format & DIFF_FORMAT_SUMMARY && !is_summary_empty(q)) {
3526 for (i = 0; i < q->nr; i++)
3527 diff_summary(options->file, q->queue[i]);
3528 separator++;
3529 }
3530 if (output_format & DIFF_FORMAT_NO_OUTPUT &&
3532 DIFF_OPT_TST(options, EXIT_WITH_STATUS) &&
3533 DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) {
3534 /*
3535 * run diff_flush_patch for the exit status. setting
3536 * options->file to /dev/null should be safe, becaue we
3537 * aren't supposed to produce any output anyway.
3538 */
3539 if (options->close_file)
3540 fclose(options->file);
3541 options->file = fopen("/dev/null", "w");
3542 if (!options->file)
3543 die_errno("Could not open /dev/null");
3544 options->close_file = 1;
3545 for (i = 0; i < q->nr; i++) {
3546 struct diff_filepair *p = q->queue[i];
3547 if (check_pair_status(p))
3548 diff_flush_patch(p, options);
3549 if (options->found_changes)
3550 break;
3551 }
3552 }
3553 if (output_format & DIFF_FORMAT_PATCH) {
3555 if (separator) {
3556 putc(options->line_termination, options->file);
3557 if (options->stat_sep) {
3558 /* attach patch instead of inline */
3559 fputs(options->stat_sep, options->file);
3560 }
3561 }
3562 for (i = 0; i < q->nr; i++) {
3564 struct diff_filepair *p = q->queue[i];
3565 if (check_pair_status(p))
3566 diff_flush_patch(p, options);
3567 }
3568 }
3569 if (output_format & DIFF_FORMAT_CALLBACK)
3571 options->format_callback(q, options, options->format_callback_data);
3572 for (i = 0; i < q->nr; i++)
3574 diff_free_filepair(q->queue[i]);
3575free_queue:
3576 free(q->queue);
3577 q->queue = NULL;
3578 q->nr = q->alloc = 0;
3579 if (options->close_file)
3580 fclose(options->file);
3581 /*
3583 * Report the content-level differences with HAS_CHANGES;
3584 * diff_addremove/diff_change does not set the bit when
3585 * DIFF_FROM_CONTENTS is in effect (e.g. with -w).
3586 */
3587 if (DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) {
3588 if (options->found_changes)
3589 DIFF_OPT_SET(options, HAS_CHANGES);
3590 else
3591 DIFF_OPT_CLR(options, HAS_CHANGES);
3592 }
3593}
3594static void diffcore_apply_filter(const char *filter)
3596{
3597 int i;
3598 struct diff_queue_struct *q = &diff_queued_diff;
3599 struct diff_queue_struct outq;
3600 outq.queue = NULL;
3601 outq.nr = outq.alloc = 0;
3602 if (!filter)
3604 return;
3605 if (strchr(filter, DIFF_STATUS_FILTER_AON)) {
3607 int found;
3608 for (i = found = 0; !found && i < q->nr; i++) {
3609 struct diff_filepair *p = q->queue[i];
3610 if (((p->status == DIFF_STATUS_MODIFIED) &&
3611 ((p->score &&
3612 strchr(filter, DIFF_STATUS_FILTER_BROKEN)) ||
3613 (!p->score &&
3614 strchr(filter, DIFF_STATUS_MODIFIED)))) ||
3615 ((p->status != DIFF_STATUS_MODIFIED) &&
3616 strchr(filter, p->status)))
3617 found++;
3618 }
3619 if (found)
3620 return;
3621 /* otherwise we will clear the whole queue
3623 * by copying the empty outq at the end of this
3624 * function, but first clear the current entries
3625 * in the queue.
3626 */
3627 for (i = 0; i < q->nr; i++)
3628 diff_free_filepair(q->queue[i]);
3629 }
3630 else {
3631 /* Only the matching ones */
3632 for (i = 0; i < q->nr; i++) {
3633 struct diff_filepair *p = q->queue[i];
3634 if (((p->status == DIFF_STATUS_MODIFIED) &&
3636 ((p->score &&
3637 strchr(filter, DIFF_STATUS_FILTER_BROKEN)) ||
3638 (!p->score &&
3639 strchr(filter, DIFF_STATUS_MODIFIED)))) ||
3640 ((p->status != DIFF_STATUS_MODIFIED) &&
3641 strchr(filter, p->status)))
3642 diff_q(&outq, p);
3643 else
3644 diff_free_filepair(p);
3645 }
3646 }
3647 free(q->queue);
3648 *q = outq;
3649}
3650/* Check whether two filespecs with the same mode and size are identical */
3652static int diff_filespec_is_identical(struct diff_filespec *one,
3653 struct diff_filespec *two)
3654{
3655 if (S_ISGITLINK(one->mode))
3656 return 0;
3657 if (diff_populate_filespec(one, 0))
3658 return 0;
3659 if (diff_populate_filespec(two, 0))
3660 return 0;
3661 return !memcmp(one->data, two->data, one->size);
3662}
3663static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
3665{
3666 int i;
3667 struct diff_queue_struct *q = &diff_queued_diff;
3668 struct diff_queue_struct outq;
3669 outq.queue = NULL;
3670 outq.nr = outq.alloc = 0;
3671 for (i = 0; i < q->nr; i++) {
3673 struct diff_filepair *p = q->queue[i];
3674 /*
3676 * 1. Entries that come from stat info dirtiness
3677 * always have both sides (iow, not create/delete),
3678 * one side of the object name is unknown, with
3679 * the same mode and size. Keep the ones that
3680 * do not match these criteria. They have real
3681 * differences.
3682 *
3683 * 2. At this point, the file is known to be modified,
3684 * with the same mode and size, and the object
3685 * name of one side is unknown. Need to inspect
3686 * the identical contents.
3687 */
3688 if (!DIFF_FILE_VALID(p->one) || /* (1) */
3689 !DIFF_FILE_VALID(p->two) ||
3690 (p->one->sha1_valid && p->two->sha1_valid) ||
3691 (p->one->mode != p->two->mode) ||
3692 diff_populate_filespec(p->one, 1) ||
3693 diff_populate_filespec(p->two, 1) ||
3694 (p->one->size != p->two->size) ||
3695 !diff_filespec_is_identical(p->one, p->two)) /* (2) */
3696 diff_q(&outq, p);
3697 else {
3698 /*
3699 * The caller can subtract 1 from skip_stat_unmatch
3700 * to determine how many paths were dirty only
3701 * due to stat info mismatch.
3702 */
3703 if (!DIFF_OPT_TST(diffopt, NO_INDEX))
3704 diffopt->skip_stat_unmatch++;
3705 diff_free_filepair(p);
3706 }
3707 }
3708 free(q->queue);
3709 *q = outq;
3710}
3711static int diffnamecmp(const void *a_, const void *b_)
3713{
3714 const struct diff_filepair *a = *((const struct diff_filepair **)a_);
3715 const struct diff_filepair *b = *((const struct diff_filepair **)b_);
3716 const char *name_a, *name_b;
3717 name_a = a->one ? a->one->path : a->two->path;
3719 name_b = b->one ? b->one->path : b->two->path;
3720 return strcmp(name_a, name_b);
3721}
3722void diffcore_fix_diff_index(struct diff_options *options)
3724{
3725 struct diff_queue_struct *q = &diff_queued_diff;
3726 qsort(q->queue, q->nr, sizeof(q->queue[0]), diffnamecmp);
3727}
3728void diffcore_std(struct diff_options *options)
3730{
3731 if (options->skip_stat_unmatch)
3732 diffcore_skip_stat_unmatch(options);
3733 if (options->break_opt != -1)
3734 diffcore_break(options->break_opt);
3735 if (options->detect_rename)
3736 diffcore_rename(options);
3737 if (options->break_opt != -1)
3738 diffcore_merge_broken();
3739 if (options->pickaxe)
3740 diffcore_pickaxe(options->pickaxe, options->pickaxe_opts);
3741 if (options->orderfile)
3742 diffcore_order(options->orderfile);
3743 diff_resolve_rename_copy();
3744 diffcore_apply_filter(options->filter);
3745 if (diff_queued_diff.nr && !DIFF_OPT_TST(options, DIFF_FROM_CONTENTS))
3747 DIFF_OPT_SET(options, HAS_CHANGES);
3748 else
3749 DIFF_OPT_CLR(options, HAS_CHANGES);
3750}
3751int diff_result_code(struct diff_options *opt, int status)
3753{
3754 int result = 0;
3755 if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
3756 !(opt->output_format & DIFF_FORMAT_CHECKDIFF))
3757 return status;
3758 if (DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
3759 DIFF_OPT_TST(opt, HAS_CHANGES))
3760 result |= 01;
3761 if ((opt->output_format & DIFF_FORMAT_CHECKDIFF) &&
3762 DIFF_OPT_TST(opt, CHECK_FAILED))
3763 result |= 02;
3764 return result;
3765}
3766void diff_addremove(struct diff_options *options,
3768 int addremove, unsigned mode,
3769 const unsigned char *sha1,
3770 const char *concatpath, unsigned dirty_submodule)
3771{
3772 struct diff_filespec *one, *two;
3773 if (DIFF_OPT_TST(options, IGNORE_SUBMODULES) && S_ISGITLINK(mode))
3775 return;
3776 /* This may look odd, but it is a preparation for
3778 * feeding "there are unchanged files which should
3779 * not produce diffs, but when you are doing copy
3780 * detection you would need them, so here they are"
3781 * entries to the diff-core. They will be prefixed
3782 * with something like '=' or '*' (I haven't decided
3783 * which but should not make any difference).
3784 * Feeding the same new and old to diff_change()
3785 * also has the same effect.
3786 * Before the final output happens, they are pruned after
3787 * merged into rename/copy pairs as appropriate.
3788 */
3789 if (DIFF_OPT_TST(options, REVERSE_DIFF))
3790 addremove = (addremove == '+' ? '-' :
3791 addremove == '-' ? '+' : addremove);
3792 if (options->prefix &&
3794 strncmp(concatpath, options->prefix, options->prefix_length))
3795 return;
3796 one = alloc_filespec(concatpath);
3798 two = alloc_filespec(concatpath);
3799 if (addremove != '+')
3801 fill_filespec(one, sha1, mode);
3802 if (addremove != '-') {
3803 fill_filespec(two, sha1, mode);
3804 two->dirty_submodule = dirty_submodule;
3805 }
3806 diff_queue(&diff_queued_diff, one, two);
3808 if (!DIFF_OPT_TST(options, DIFF_FROM_CONTENTS))
3809 DIFF_OPT_SET(options, HAS_CHANGES);
3810}
3811void diff_change(struct diff_options *options,
3813 unsigned old_mode, unsigned new_mode,
3814 const unsigned char *old_sha1,
3815 const unsigned char *new_sha1,
3816 const char *concatpath,
3817 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
3818{
3819 struct diff_filespec *one, *two;
3820 if (DIFF_OPT_TST(options, IGNORE_SUBMODULES) && S_ISGITLINK(old_mode)
3822 && S_ISGITLINK(new_mode))
3823 return;
3824 if (DIFF_OPT_TST(options, REVERSE_DIFF)) {
3826 unsigned tmp;
3827 const unsigned char *tmp_c;
3828 tmp = old_mode; old_mode = new_mode; new_mode = tmp;
3829 tmp_c = old_sha1; old_sha1 = new_sha1; new_sha1 = tmp_c;
3830 tmp = old_dirty_submodule; old_dirty_submodule = new_dirty_submodule;
3831 new_dirty_submodule = tmp;
3832 }
3833 if (options->prefix &&
3835 strncmp(concatpath, options->prefix, options->prefix_length))
3836 return;
3837 one = alloc_filespec(concatpath);
3839 two = alloc_filespec(concatpath);
3840 fill_filespec(one, old_sha1, old_mode);
3841 fill_filespec(two, new_sha1, new_mode);
3842 one->dirty_submodule = old_dirty_submodule;
3843 two->dirty_submodule = new_dirty_submodule;
3844 diff_queue(&diff_queued_diff, one, two);
3846 if (!DIFF_OPT_TST(options, DIFF_FROM_CONTENTS))
3847 DIFF_OPT_SET(options, HAS_CHANGES);
3848}
3849void diff_unmerge(struct diff_options *options,
3851 const char *path,
3852 unsigned mode, const unsigned char *sha1)
3853{
3854 struct diff_filespec *one, *two;
3855 if (options->prefix &&
3857 strncmp(path, options->prefix, options->prefix_length))
3858 return;
3859 one = alloc_filespec(path);
3861 two = alloc_filespec(path);
3862 fill_filespec(one, sha1, mode);
3863 diff_queue(&diff_queued_diff, one, two)->is_unmerged = 1;
3864}
3865static char *run_textconv(const char *pgm, struct diff_filespec *spec,
3867 size_t *outsize)
3868{
3869 struct diff_tempfile *temp;
3870 const char *argv[3];
3871 const char **arg = argv;
3872 struct child_process child;
3873 struct strbuf buf = STRBUF_INIT;
3874 int err = 0;
3875 temp = prepare_temp_file(spec->path, spec);
3877 *arg++ = pgm;
3878 *arg++ = temp->name;
3879 *arg = NULL;
3880 memset(&child, 0, sizeof(child));
3882 child.use_shell = 1;
3883 child.argv = argv;
3884 child.out = -1;
3885 if (start_command(&child)) {
3886 remove_tempfile();
3887 return NULL;
3888 }
3889 if (strbuf_read(&buf, child.out, 0) < 0)
3891 err = error("error reading from textconv command '%s'", pgm);
3892 close(child.out);
3893 if (finish_command(&child) || err) {
3895 strbuf_release(&buf);
3896 remove_tempfile();
3897 return NULL;
3898 }
3899 remove_tempfile();
3900 return strbuf_detach(&buf, outsize);
3902}
3903static size_t fill_textconv(struct userdiff_driver *driver,
3905 struct diff_filespec *df,
3906 char **outbuf)
3907{
3908 size_t size;
3909 if (!driver || !driver->textconv) {
3911 if (!DIFF_FILE_VALID(df)) {
3912 *outbuf = "";
3913 return 0;
3914 }
3915 if (diff_populate_filespec(df, 0))
3916 die("unable to read files to diff");
3917 *outbuf = df->data;
3918 return df->size;
3919 }
3920 if (driver->textconv_cache) {
3922 *outbuf = notes_cache_get(driver->textconv_cache, df->sha1,
3923 &size);
3924 if (*outbuf)
3925 return size;
3926 }
3927 *outbuf = run_textconv(driver->textconv, df, &size);
3929 if (!*outbuf)
3930 die("unable to read files to diff");
3931 if (driver->textconv_cache) {
3933 /* ignore errors, as we might be in a readonly repository */
3934 notes_cache_put(driver->textconv_cache, df->sha1, *outbuf,
3935 size);
3936 /*
3937 * we could save up changes and flush them all at the end,
3938 * but we would need an extra call after all diffing is done.
3939 * Since generating a cache entry is the slow path anyway,
3940 * this extra overhead probably isn't a big deal.
3941 */
3942 notes_cache_write(driver->textconv_cache);
3943 }
3944 return size;
3946}