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