]>
Commit | Line | Data |
---|---|---|
6973dcae JH |
1 | /* |
2 | * Copyright (C) 2005 Junio C Hamano | |
3 | */ | |
6973dcae | 4 | #include "cache.h" |
284098f1 | 5 | #include "tempfile.h" |
6973dcae JH |
6 | #include "quote.h" |
7 | #include "diff.h" | |
8 | #include "diffcore.h" | |
051308f6 | 9 | #include "delta.h" |
6973dcae | 10 | #include "xdiff-interface.h" |
7c92fe0e | 11 | #include "color.h" |
8c701249 | 12 | #include "attr.h" |
d5535ec7 | 13 | #include "run-command.h" |
23707811 | 14 | #include "utf8.h" |
be58e70d | 15 | #include "userdiff.h" |
851e18c3 | 16 | #include "submodule-config.h" |
752c0c24 | 17 | #include "submodule.h" |
a757c646 | 18 | #include "ll-merge.h" |
02e8ca0e | 19 | #include "string-list.h" |
82fbf269 | 20 | #include "argv-array.h" |
6973dcae | 21 | |
1510fea7 SP |
22 | #ifdef NO_FAST_WORKING_DIRECTORY |
23 | #define FAST_WORKING_DIRECTORY 0 | |
24 | #else | |
25 | #define FAST_WORKING_DIRECTORY 1 | |
26 | #endif | |
27 | ||
96f1e58f | 28 | static int diff_detect_rename_default; |
92c57e5c | 29 | static int diff_rename_limit_default = 400; |
a624eaa7 | 30 | static int diff_suppress_blank_empty; |
d2aea137 | 31 | static int diff_use_color_default = -1; |
6468a4e5 | 32 | static int diff_context_default = 3; |
98a4d87b | 33 | static const char *diff_word_regex_cfg; |
cbe02100 | 34 | static const char *external_diff_cmd_cfg; |
6d8940b5 | 35 | static const char *diff_order_file_cfg; |
aecbf914 | 36 | int diff_auto_refresh_index = 1; |
a5a818ee | 37 | static int diff_mnemonic_prefix; |
f89504dd | 38 | static int diff_no_prefix; |
df44483a | 39 | static int diff_stat_graph_width; |
712d2c7d | 40 | static int diff_dirstat_permille_default = 30; |
be4f2b40 | 41 | static struct diff_options default_diff_options; |
07ab4dec | 42 | static long diff_algorithm; |
6973dcae | 43 | |
7c92fe0e | 44 | static char diff_colors[][COLOR_MAXLEN] = { |
dc6ebd4c | 45 | GIT_COLOR_RESET, |
8dbf3eb6 | 46 | GIT_COLOR_NORMAL, /* CONTEXT */ |
dc6ebd4c AL |
47 | GIT_COLOR_BOLD, /* METAINFO */ |
48 | GIT_COLOR_CYAN, /* FRAGINFO */ | |
49 | GIT_COLOR_RED, /* OLD */ | |
50 | GIT_COLOR_GREEN, /* NEW */ | |
51 | GIT_COLOR_YELLOW, /* COMMIT */ | |
52 | GIT_COLOR_BG_RED, /* WHITESPACE */ | |
89cb73a1 | 53 | GIT_COLOR_NORMAL, /* FUNCINFO */ |
cd112cef JS |
54 | }; |
55 | ||
9e1a5ebe | 56 | static int parse_diff_color_slot(const char *var) |
801235c5 | 57 | { |
74b15bfb | 58 | if (!strcasecmp(var, "context") || !strcasecmp(var, "plain")) |
8dbf3eb6 | 59 | return DIFF_CONTEXT; |
9e1a5ebe | 60 | if (!strcasecmp(var, "meta")) |
801235c5 | 61 | return DIFF_METAINFO; |
9e1a5ebe | 62 | if (!strcasecmp(var, "frag")) |
801235c5 | 63 | return DIFF_FRAGINFO; |
9e1a5ebe | 64 | if (!strcasecmp(var, "old")) |
801235c5 | 65 | return DIFF_FILE_OLD; |
9e1a5ebe | 66 | if (!strcasecmp(var, "new")) |
801235c5 | 67 | return DIFF_FILE_NEW; |
9e1a5ebe | 68 | if (!strcasecmp(var, "commit")) |
ce436973 | 69 | return DIFF_COMMIT; |
9e1a5ebe | 70 | if (!strcasecmp(var, "whitespace")) |
448c3ef1 | 71 | return DIFF_WHITESPACE; |
9e1a5ebe | 72 | if (!strcasecmp(var, "func")) |
89cb73a1 | 73 | return DIFF_FUNCINFO; |
8b8e8624 | 74 | return -1; |
801235c5 JH |
75 | } |
76 | ||
02e8ca0e | 77 | static int parse_dirstat_params(struct diff_options *options, const char *params_string, |
51670fc8 | 78 | struct strbuf *errmsg) |
333f3fb0 | 79 | { |
02e8ca0e MH |
80 | char *params_copy = xstrdup(params_string); |
81 | struct string_list params = STRING_LIST_INIT_NODUP; | |
82 | int ret = 0; | |
83 | int i; | |
51670fc8 | 84 | |
02e8ca0e MH |
85 | if (*params_copy) |
86 | string_list_split_in_place(¶ms, params_copy, ',', -1); | |
87 | for (i = 0; i < params.nr; i++) { | |
88 | const char *p = params.items[i].string; | |
89 | if (!strcmp(p, "changes")) { | |
1c57a627 JH |
90 | DIFF_OPT_CLR(options, DIRSTAT_BY_LINE); |
91 | DIFF_OPT_CLR(options, DIRSTAT_BY_FILE); | |
02e8ca0e | 92 | } else if (!strcmp(p, "lines")) { |
1c57a627 | 93 | DIFF_OPT_SET(options, DIRSTAT_BY_LINE); |
333f3fb0 | 94 | DIFF_OPT_CLR(options, DIRSTAT_BY_FILE); |
02e8ca0e | 95 | } else if (!strcmp(p, "files")) { |
1c57a627 | 96 | DIFF_OPT_CLR(options, DIRSTAT_BY_LINE); |
333f3fb0 | 97 | DIFF_OPT_SET(options, DIRSTAT_BY_FILE); |
02e8ca0e | 98 | } else if (!strcmp(p, "noncumulative")) { |
333f3fb0 | 99 | DIFF_OPT_CLR(options, DIRSTAT_CUMULATIVE); |
02e8ca0e | 100 | } else if (!strcmp(p, "cumulative")) { |
333f3fb0 JH |
101 | DIFF_OPT_SET(options, DIRSTAT_CUMULATIVE); |
102 | } else if (isdigit(*p)) { | |
103 | char *end; | |
51670fc8 JH |
104 | int permille = strtoul(p, &end, 10) * 10; |
105 | if (*end == '.' && isdigit(*++end)) { | |
712d2c7d | 106 | /* only use first digit */ |
51670fc8 | 107 | permille += *end - '0'; |
712d2c7d | 108 | /* .. and ignore any further digits */ |
51670fc8 | 109 | while (isdigit(*++end)) |
712d2c7d JH |
110 | ; /* nothing */ |
111 | } | |
02e8ca0e | 112 | if (!*end) |
51670fc8 JH |
113 | options->dirstat_permille = permille; |
114 | else { | |
02e8ca0e MH |
115 | strbuf_addf(errmsg, _(" Failed to parse dirstat cut-off percentage '%s'\n"), |
116 | p); | |
51670fc8 JH |
117 | ret++; |
118 | } | |
119 | } else { | |
02e8ca0e | 120 | strbuf_addf(errmsg, _(" Unknown dirstat parameter '%s'\n"), p); |
51670fc8 | 121 | ret++; |
333f3fb0 | 122 | } |
51670fc8 | 123 | |
333f3fb0 | 124 | } |
02e8ca0e MH |
125 | string_list_clear(¶ms, 0); |
126 | free(params_copy); | |
51670fc8 | 127 | return ret; |
333f3fb0 JH |
128 | } |
129 | ||
c47ef57c RR |
130 | static int parse_submodule_params(struct diff_options *options, const char *value) |
131 | { | |
132 | if (!strcmp(value, "log")) | |
133 | DIFF_OPT_SET(options, SUBMODULE_LOG); | |
134 | else if (!strcmp(value, "short")) | |
135 | DIFF_OPT_CLR(options, SUBMODULE_LOG); | |
136 | else | |
137 | return -1; | |
138 | return 0; | |
139 | } | |
140 | ||
cced5fbc LT |
141 | static int git_config_rename(const char *var, const char *value) |
142 | { | |
143 | if (!value) | |
144 | return DIFF_DETECT_RENAME; | |
145 | if (!strcasecmp(value, "copies") || !strcasecmp(value, "copy")) | |
146 | return DIFF_DETECT_COPY; | |
147 | return git_config_bool(var,value) ? DIFF_DETECT_RENAME : 0; | |
148 | } | |
149 | ||
07924d4d | 150 | long parse_algorithm_value(const char *value) |
07ab4dec MP |
151 | { |
152 | if (!value) | |
153 | return -1; | |
154 | else if (!strcasecmp(value, "myers") || !strcasecmp(value, "default")) | |
155 | return 0; | |
156 | else if (!strcasecmp(value, "minimal")) | |
157 | return XDF_NEED_MINIMAL; | |
158 | else if (!strcasecmp(value, "patience")) | |
159 | return XDF_PATIENCE_DIFF; | |
160 | else if (!strcasecmp(value, "histogram")) | |
161 | return XDF_HISTOGRAM_DIFF; | |
162 | return -1; | |
163 | } | |
164 | ||
83ad63cf JH |
165 | /* |
166 | * These are to give UI layer defaults. | |
167 | * The core-level commands such as git-diff-files should | |
168 | * never be affected by the setting of diff.renames | |
169 | * the user happens to have in the configuration file. | |
170 | */ | |
5404c116 MM |
171 | void init_diff_ui_defaults(void) |
172 | { | |
173 | diff_detect_rename_default = 1; | |
174 | } | |
175 | ||
ef90d6d4 | 176 | int git_diff_ui_config(const char *var, const char *value, void *cb) |
801235c5 | 177 | { |
a159ca0c | 178 | if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) { |
e269eb79 | 179 | diff_use_color_default = git_config_colorbool(var, value); |
801235c5 JH |
180 | return 0; |
181 | } | |
6468a4e5 JM |
182 | if (!strcmp(var, "diff.context")) { |
183 | diff_context_default = git_config_int(var, value); | |
184 | if (diff_context_default < 0) | |
185 | return -1; | |
186 | return 0; | |
187 | } | |
b68ea12e | 188 | if (!strcmp(var, "diff.renames")) { |
cced5fbc | 189 | diff_detect_rename_default = git_config_rename(var, value); |
b68ea12e EW |
190 | return 0; |
191 | } | |
aecbf914 JH |
192 | if (!strcmp(var, "diff.autorefreshindex")) { |
193 | diff_auto_refresh_index = git_config_bool(var, value); | |
194 | return 0; | |
195 | } | |
a5a818ee JH |
196 | if (!strcmp(var, "diff.mnemonicprefix")) { |
197 | diff_mnemonic_prefix = git_config_bool(var, value); | |
198 | return 0; | |
199 | } | |
f89504dd EC |
200 | if (!strcmp(var, "diff.noprefix")) { |
201 | diff_no_prefix = git_config_bool(var, value); | |
202 | return 0; | |
203 | } | |
df44483a ZJS |
204 | if (!strcmp(var, "diff.statgraphwidth")) { |
205 | diff_stat_graph_width = git_config_int(var, value); | |
206 | return 0; | |
207 | } | |
daec808c BH |
208 | if (!strcmp(var, "diff.external")) |
209 | return git_config_string(&external_diff_cmd_cfg, var, value); | |
98a4d87b BSSJ |
210 | if (!strcmp(var, "diff.wordregex")) |
211 | return git_config_string(&diff_word_regex_cfg, var, value); | |
6d8940b5 SB |
212 | if (!strcmp(var, "diff.orderfile")) |
213 | return git_config_pathname(&diff_order_file_cfg, var, value); | |
f1af60bd | 214 | |
be4f2b40 JS |
215 | if (!strcmp(var, "diff.ignoresubmodules")) |
216 | handle_ignore_submodules_arg(&default_diff_options, value); | |
217 | ||
c47ef57c RR |
218 | if (!strcmp(var, "diff.submodule")) { |
219 | if (parse_submodule_params(&default_diff_options, value)) | |
220 | warning(_("Unknown value for 'diff.submodule' config variable: '%s'"), | |
221 | value); | |
222 | return 0; | |
223 | } | |
224 | ||
07ab4dec MP |
225 | if (!strcmp(var, "diff.algorithm")) { |
226 | diff_algorithm = parse_algorithm_value(value); | |
227 | if (diff_algorithm < 0) | |
228 | return -1; | |
229 | return 0; | |
230 | } | |
231 | ||
3e1dd17a JK |
232 | if (git_color_config(var, value, cb) < 0) |
233 | return -1; | |
234 | ||
ef90d6d4 | 235 | return git_diff_basic_config(var, value, cb); |
9a1805a8 JK |
236 | } |
237 | ||
ef90d6d4 | 238 | int git_diff_basic_config(const char *var, const char *value, void *cb) |
9a1805a8 | 239 | { |
ae021d87 JK |
240 | const char *name; |
241 | ||
2b6ca6df LT |
242 | if (!strcmp(var, "diff.renamelimit")) { |
243 | diff_rename_limit_default = git_config_int(var, value); | |
244 | return 0; | |
245 | } | |
246 | ||
6680a087 JK |
247 | if (userdiff_config(var, value) < 0) |
248 | return -1; | |
c7534ef4 | 249 | |
ae021d87 JK |
250 | if (skip_prefix(var, "diff.color.", &name) || |
251 | skip_prefix(var, "color.diff.", &name)) { | |
252 | int slot = parse_diff_color_slot(name); | |
8b8e8624 JK |
253 | if (slot < 0) |
254 | return 0; | |
64f30e94 JH |
255 | if (!value) |
256 | return config_error_nonbool(var); | |
f6c5a296 | 257 | return color_parse(value, diff_colors[slot]); |
801235c5 | 258 | } |
f1af60bd | 259 | |
a624eaa7 | 260 | /* like GNU diff's --suppress-blank-empty option */ |
950db879 JS |
261 | if (!strcmp(var, "diff.suppressblankempty") || |
262 | /* for backwards compatibility */ | |
263 | !strcmp(var, "diff.suppress-blank-empty")) { | |
a624eaa7 JM |
264 | diff_suppress_blank_empty = git_config_bool(var, value); |
265 | return 0; | |
266 | } | |
267 | ||
2d174951 | 268 | if (!strcmp(var, "diff.dirstat")) { |
51670fc8 | 269 | struct strbuf errmsg = STRBUF_INIT; |
712d2c7d | 270 | default_diff_options.dirstat_permille = diff_dirstat_permille_default; |
51670fc8 | 271 | if (parse_dirstat_params(&default_diff_options, value, &errmsg)) |
7478ac57 | 272 | warning(_("Found errors in 'diff.dirstat' config variable:\n%s"), |
51670fc8 JH |
273 | errmsg.buf); |
274 | strbuf_release(&errmsg); | |
712d2c7d | 275 | diff_dirstat_permille_default = default_diff_options.dirstat_permille; |
2d174951 JH |
276 | return 0; |
277 | } | |
278 | ||
59556548 | 279 | if (starts_with(var, "submodule.")) |
aee9c7d6 JL |
280 | return parse_submodule_config_option(var, value); |
281 | ||
3e1dd17a | 282 | return git_default_config(var, value, cb); |
801235c5 JH |
283 | } |
284 | ||
6973dcae JH |
285 | static char *quote_two(const char *one, const char *two) |
286 | { | |
287 | int need_one = quote_c_style(one, NULL, NULL, 1); | |
288 | int need_two = quote_c_style(two, NULL, NULL, 1); | |
f285a2d7 | 289 | struct strbuf res = STRBUF_INIT; |
6973dcae JH |
290 | |
291 | if (need_one + need_two) { | |
663af342 PH |
292 | strbuf_addch(&res, '"'); |
293 | quote_c_style(one, &res, NULL, 1); | |
294 | quote_c_style(two, &res, NULL, 1); | |
295 | strbuf_addch(&res, '"'); | |
296 | } else { | |
297 | strbuf_addstr(&res, one); | |
298 | strbuf_addstr(&res, two); | |
6973dcae | 299 | } |
b315c5c0 | 300 | return strbuf_detach(&res, NULL); |
6973dcae JH |
301 | } |
302 | ||
303 | static const char *external_diff(void) | |
304 | { | |
305 | static const char *external_diff_cmd = NULL; | |
306 | static int done_preparing = 0; | |
307 | ||
308 | if (done_preparing) | |
309 | return external_diff_cmd; | |
310 | external_diff_cmd = getenv("GIT_EXTERNAL_DIFF"); | |
cbe02100 JS |
311 | if (!external_diff_cmd) |
312 | external_diff_cmd = external_diff_cmd_cfg; | |
6973dcae JH |
313 | done_preparing = 1; |
314 | return external_diff_cmd; | |
315 | } | |
316 | ||
284098f1 MH |
317 | /* |
318 | * Keep track of files used for diffing. Sometimes such an entry | |
319 | * refers to a temporary file, sometimes to an existing file, and | |
320 | * sometimes to "/dev/null". | |
321 | */ | |
6973dcae | 322 | static struct diff_tempfile { |
284098f1 MH |
323 | /* |
324 | * filename external diff should read from, or NULL if this | |
325 | * entry is currently not in use: | |
326 | */ | |
327 | const char *name; | |
328 | ||
d59f765a | 329 | char hex[GIT_SHA1_HEXSZ + 1]; |
6973dcae | 330 | char mode[10]; |
284098f1 MH |
331 | |
332 | /* | |
333 | * If this diff_tempfile instance refers to a temporary file, | |
334 | * this tempfile object is used to manage its lifetime. | |
335 | */ | |
336 | struct tempfile tempfile; | |
6973dcae JH |
337 | } diff_temp[2]; |
338 | ||
6957eb9a JH |
339 | typedef unsigned long (*sane_truncate_fn)(char *line, unsigned long len); |
340 | ||
341 | struct emit_callback { | |
6957eb9a JH |
342 | int color_diff; |
343 | unsigned ws_rule; | |
344 | int blank_at_eof_in_preimage; | |
345 | int blank_at_eof_in_postimage; | |
346 | int lno_in_preimage; | |
347 | int lno_in_postimage; | |
348 | sane_truncate_fn truncate; | |
349 | const char **label_path; | |
350 | struct diff_words_data *diff_words; | |
a3c158d4 | 351 | struct diff_options *opt; |
6957eb9a | 352 | int *found_changesp; |
3e97c7c6 | 353 | struct strbuf *header; |
6957eb9a JH |
354 | }; |
355 | ||
6973dcae JH |
356 | static int count_lines(const char *data, int size) |
357 | { | |
358 | int count, ch, completely_empty = 1, nl_just_seen = 0; | |
359 | count = 0; | |
360 | while (0 < size--) { | |
361 | ch = *data++; | |
362 | if (ch == '\n') { | |
363 | count++; | |
364 | nl_just_seen = 1; | |
365 | completely_empty = 0; | |
366 | } | |
367 | else { | |
368 | nl_just_seen = 0; | |
369 | completely_empty = 0; | |
370 | } | |
371 | } | |
372 | if (completely_empty) | |
373 | return 0; | |
374 | if (!nl_just_seen) | |
375 | count++; /* no trailing newline */ | |
376 | return count; | |
377 | } | |
378 | ||
6957eb9a JH |
379 | static int fill_mmfile(mmfile_t *mf, struct diff_filespec *one) |
380 | { | |
381 | if (!DIFF_FILE_VALID(one)) { | |
382 | mf->ptr = (char *)""; /* does not matter */ | |
383 | mf->size = 0; | |
384 | return 0; | |
385 | } | |
386 | else if (diff_populate_filespec(one, 0)) | |
387 | return -1; | |
bb35fefb | 388 | |
6957eb9a JH |
389 | mf->ptr = one->data; |
390 | mf->size = one->size; | |
391 | return 0; | |
392 | } | |
393 | ||
abb371a1 JK |
394 | /* like fill_mmfile, but only for size, so we can avoid retrieving blob */ |
395 | static unsigned long diff_filespec_size(struct diff_filespec *one) | |
396 | { | |
397 | if (!DIFF_FILE_VALID(one)) | |
398 | return 0; | |
8e5dd3d6 | 399 | diff_populate_filespec(one, CHECK_SIZE_ONLY); |
abb371a1 JK |
400 | return one->size; |
401 | } | |
402 | ||
6957eb9a JH |
403 | static int count_trailing_blank(mmfile_t *mf, unsigned ws_rule) |
404 | { | |
405 | char *ptr = mf->ptr; | |
406 | long size = mf->size; | |
407 | int cnt = 0; | |
408 | ||
409 | if (!size) | |
410 | return cnt; | |
411 | ptr += size - 1; /* pointing at the very end */ | |
412 | if (*ptr != '\n') | |
413 | ; /* incomplete line */ | |
414 | else | |
415 | ptr--; /* skip the last LF */ | |
416 | while (mf->ptr < ptr) { | |
417 | char *prev_eol; | |
418 | for (prev_eol = ptr; mf->ptr <= prev_eol; prev_eol--) | |
419 | if (*prev_eol == '\n') | |
420 | break; | |
421 | if (!ws_blank_line(prev_eol + 1, ptr - prev_eol, ws_rule)) | |
422 | break; | |
423 | cnt++; | |
424 | ptr = prev_eol - 1; | |
425 | } | |
426 | return cnt; | |
427 | } | |
428 | ||
429 | static void check_blank_at_eof(mmfile_t *mf1, mmfile_t *mf2, | |
430 | struct emit_callback *ecbdata) | |
431 | { | |
432 | int l1, l2, at; | |
433 | unsigned ws_rule = ecbdata->ws_rule; | |
434 | l1 = count_trailing_blank(mf1, ws_rule); | |
435 | l2 = count_trailing_blank(mf2, ws_rule); | |
436 | if (l2 <= l1) { | |
437 | ecbdata->blank_at_eof_in_preimage = 0; | |
438 | ecbdata->blank_at_eof_in_postimage = 0; | |
439 | return; | |
440 | } | |
441 | at = count_lines(mf1->ptr, mf1->size); | |
442 | ecbdata->blank_at_eof_in_preimage = (at - l1) + 1; | |
443 | ||
444 | at = count_lines(mf2->ptr, mf2->size); | |
445 | ecbdata->blank_at_eof_in_postimage = (at - l2) + 1; | |
446 | } | |
447 | ||
a3c158d4 | 448 | static void emit_line_0(struct diff_options *o, const char *set, const char *reset, |
250f7993 | 449 | int first, const char *line, int len) |
6957eb9a JH |
450 | { |
451 | int has_trailing_newline, has_trailing_carriage_return; | |
250f7993 | 452 | int nofirst; |
a3c158d4 BY |
453 | FILE *file = o->file; |
454 | ||
30997bb8 | 455 | fputs(diff_line_prefix(o), file); |
6957eb9a | 456 | |
250f7993 JH |
457 | if (len == 0) { |
458 | has_trailing_newline = (first == '\n'); | |
459 | has_trailing_carriage_return = (!has_trailing_newline && | |
460 | (first == '\r')); | |
461 | nofirst = has_trailing_newline || has_trailing_carriage_return; | |
462 | } else { | |
463 | has_trailing_newline = (len > 0 && line[len-1] == '\n'); | |
464 | if (has_trailing_newline) | |
465 | len--; | |
466 | has_trailing_carriage_return = (len > 0 && line[len-1] == '\r'); | |
467 | if (has_trailing_carriage_return) | |
468 | len--; | |
469 | nofirst = 0; | |
470 | } | |
6957eb9a | 471 | |
06a47552 JH |
472 | if (len || !nofirst) { |
473 | fputs(set, file); | |
474 | if (!nofirst) | |
475 | fputc(first, file); | |
476 | fwrite(line, len, 1, file); | |
477 | fputs(reset, file); | |
478 | } | |
6957eb9a JH |
479 | if (has_trailing_carriage_return) |
480 | fputc('\r', file); | |
481 | if (has_trailing_newline) | |
482 | fputc('\n', file); | |
483 | } | |
484 | ||
a3c158d4 | 485 | static void emit_line(struct diff_options *o, const char *set, const char *reset, |
250f7993 JH |
486 | const char *line, int len) |
487 | { | |
a3c158d4 | 488 | emit_line_0(o, set, reset, line[0], line+1, len-1); |
250f7993 JH |
489 | } |
490 | ||
6957eb9a JH |
491 | static int new_blank_line_at_eof(struct emit_callback *ecbdata, const char *line, int len) |
492 | { | |
493 | if (!((ecbdata->ws_rule & WS_BLANK_AT_EOF) && | |
494 | ecbdata->blank_at_eof_in_preimage && | |
495 | ecbdata->blank_at_eof_in_postimage && | |
496 | ecbdata->blank_at_eof_in_preimage <= ecbdata->lno_in_preimage && | |
497 | ecbdata->blank_at_eof_in_postimage <= ecbdata->lno_in_postimage)) | |
498 | return 0; | |
018cff70 | 499 | return ws_blank_line(line, len, ecbdata->ws_rule); |
6957eb9a JH |
500 | } |
501 | ||
b8767f79 JH |
502 | static void emit_line_checked(const char *reset, |
503 | struct emit_callback *ecbdata, | |
504 | const char *line, int len, | |
505 | enum color_diff color, | |
506 | unsigned ws_error_highlight, | |
507 | char sign) | |
6957eb9a | 508 | { |
b8767f79 JH |
509 | const char *set = diff_get_color(ecbdata->color_diff, color); |
510 | const char *ws = NULL; | |
6957eb9a | 511 | |
b8767f79 JH |
512 | if (ecbdata->opt->ws_error_highlight & ws_error_highlight) { |
513 | ws = diff_get_color(ecbdata->color_diff, DIFF_WHITESPACE); | |
514 | if (!*ws) | |
515 | ws = NULL; | |
516 | } | |
517 | ||
518 | if (!ws) | |
519 | emit_line_0(ecbdata->opt, set, reset, sign, line, len); | |
520 | else if (sign == '+' && new_blank_line_at_eof(ecbdata, line, len)) | |
6957eb9a | 521 | /* Blank line at EOF - paint '+' as well */ |
b8767f79 | 522 | emit_line_0(ecbdata->opt, ws, reset, sign, line, len); |
6957eb9a JH |
523 | else { |
524 | /* Emit just the prefix, then the rest. */ | |
b8767f79 | 525 | emit_line_0(ecbdata->opt, set, reset, sign, "", 0); |
018cff70 | 526 | ws_check_emit(line, len, ecbdata->ws_rule, |
a3c158d4 | 527 | ecbdata->opt->file, set, reset, ws); |
6957eb9a JH |
528 | } |
529 | } | |
530 | ||
b8767f79 | 531 | static void emit_add_line(const char *reset, |
0e383e18 JH |
532 | struct emit_callback *ecbdata, |
533 | const char *line, int len) | |
534 | { | |
b8767f79 JH |
535 | emit_line_checked(reset, ecbdata, line, len, |
536 | DIFF_FILE_NEW, WSEH_NEW, '+'); | |
537 | } | |
0e383e18 | 538 | |
b8767f79 JH |
539 | static void emit_del_line(const char *reset, |
540 | struct emit_callback *ecbdata, | |
541 | const char *line, int len) | |
542 | { | |
543 | emit_line_checked(reset, ecbdata, line, len, | |
544 | DIFF_FILE_OLD, WSEH_OLD, '-'); | |
0e383e18 JH |
545 | } |
546 | ||
547 | static void emit_context_line(const char *reset, | |
548 | struct emit_callback *ecbdata, | |
549 | const char *line, int len) | |
550 | { | |
b8767f79 | 551 | emit_line_checked(reset, ecbdata, line, len, |
db65170e | 552 | DIFF_CONTEXT, WSEH_CONTEXT, ' '); |
0e383e18 JH |
553 | } |
554 | ||
89cb73a1 BW |
555 | static void emit_hunk_header(struct emit_callback *ecbdata, |
556 | const char *line, int len) | |
557 | { | |
8dbf3eb6 | 558 | const char *context = diff_get_color(ecbdata->color_diff, DIFF_CONTEXT); |
89cb73a1 BW |
559 | const char *frag = diff_get_color(ecbdata->color_diff, DIFF_FRAGINFO); |
560 | const char *func = diff_get_color(ecbdata->color_diff, DIFF_FUNCINFO); | |
561 | const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET); | |
562 | static const char atat[2] = { '@', '@' }; | |
563 | const char *cp, *ep; | |
2efcc977 BY |
564 | struct strbuf msgbuf = STRBUF_INIT; |
565 | int org_len = len; | |
566 | int i = 1; | |
89cb73a1 BW |
567 | |
568 | /* | |
569 | * As a hunk header must begin with "@@ -<old>, +<new> @@", | |
570 | * it always is at least 10 bytes long. | |
571 | */ | |
572 | if (len < 10 || | |
573 | memcmp(line, atat, 2) || | |
574 | !(ep = memmem(line + 2, len - 2, atat, 2))) { | |
8dbf3eb6 | 575 | emit_line(ecbdata->opt, context, reset, line, len); |
89cb73a1 BW |
576 | return; |
577 | } | |
578 | ep += 2; /* skip over @@ */ | |
579 | ||
580 | /* The hunk header in fraginfo color */ | |
cedc61a9 | 581 | strbuf_addstr(&msgbuf, frag); |
2efcc977 | 582 | strbuf_add(&msgbuf, line, ep - line); |
cedc61a9 | 583 | strbuf_addstr(&msgbuf, reset); |
2efcc977 BY |
584 | |
585 | /* | |
586 | * trailing "\r\n" | |
587 | */ | |
588 | for ( ; i < 3; i++) | |
589 | if (line[len - i] == '\r' || line[len - i] == '\n') | |
590 | len--; | |
89cb73a1 BW |
591 | |
592 | /* blank before the func header */ | |
593 | for (cp = ep; ep - line < len; ep++) | |
594 | if (*ep != ' ' && *ep != '\t') | |
595 | break; | |
2efcc977 | 596 | if (ep != cp) { |
8dbf3eb6 | 597 | strbuf_addstr(&msgbuf, context); |
2efcc977 | 598 | strbuf_add(&msgbuf, cp, ep - cp); |
cedc61a9 | 599 | strbuf_addstr(&msgbuf, reset); |
2efcc977 BY |
600 | } |
601 | ||
602 | if (ep < line + len) { | |
cedc61a9 | 603 | strbuf_addstr(&msgbuf, func); |
2efcc977 | 604 | strbuf_add(&msgbuf, ep, line + len - ep); |
cedc61a9 | 605 | strbuf_addstr(&msgbuf, reset); |
2efcc977 | 606 | } |
89cb73a1 | 607 | |
2efcc977 BY |
608 | strbuf_add(&msgbuf, line + len, org_len - len); |
609 | emit_line(ecbdata->opt, "", "", msgbuf.buf, msgbuf.len); | |
610 | strbuf_release(&msgbuf); | |
89cb73a1 BW |
611 | } |
612 | ||
479b0ae8 JK |
613 | static struct diff_tempfile *claim_diff_tempfile(void) { |
614 | int i; | |
615 | for (i = 0; i < ARRAY_SIZE(diff_temp); i++) | |
616 | if (!diff_temp[i].name) | |
617 | return diff_temp + i; | |
618 | die("BUG: diff is failing to clean up its tempfiles"); | |
619 | } | |
620 | ||
479b0ae8 JK |
621 | static void remove_tempfile(void) |
622 | { | |
623 | int i; | |
a8344abe | 624 | for (i = 0; i < ARRAY_SIZE(diff_temp); i++) { |
284098f1 MH |
625 | if (is_tempfile_active(&diff_temp[i].tempfile)) |
626 | delete_tempfile(&diff_temp[i].tempfile); | |
a8344abe NR |
627 | diff_temp[i].name = NULL; |
628 | } | |
479b0ae8 JK |
629 | } |
630 | ||
c0c77734 | 631 | static void print_line_count(FILE *file, int count) |
6973dcae JH |
632 | { |
633 | switch (count) { | |
634 | case 0: | |
c0c77734 | 635 | fprintf(file, "0,0"); |
6973dcae JH |
636 | break; |
637 | case 1: | |
c0c77734 | 638 | fprintf(file, "1"); |
6973dcae JH |
639 | break; |
640 | default: | |
c0c77734 | 641 | fprintf(file, "1,%d", count); |
6973dcae JH |
642 | break; |
643 | } | |
644 | } | |
645 | ||
7f7ee2ff JH |
646 | static void emit_rewrite_lines(struct emit_callback *ecb, |
647 | int prefix, const char *data, int size) | |
6973dcae | 648 | { |
7f7ee2ff JH |
649 | const char *endp = NULL; |
650 | static const char *nneof = " No newline at end of file\n"; | |
7f7ee2ff JH |
651 | const char *reset = diff_get_color(ecb->color_diff, DIFF_RESET); |
652 | ||
653 | while (0 < size) { | |
654 | int len; | |
655 | ||
656 | endp = memchr(data, '\n', size); | |
657 | len = endp ? (endp - data + 1) : size; | |
658 | if (prefix != '+') { | |
659 | ecb->lno_in_preimage++; | |
0e383e18 | 660 | emit_del_line(reset, ecb, data, len); |
7f7ee2ff JH |
661 | } else { |
662 | ecb->lno_in_postimage++; | |
663 | emit_add_line(reset, ecb, data, len); | |
13e36ec5 | 664 | } |
7f7ee2ff JH |
665 | size -= len; |
666 | data += len; | |
667 | } | |
668 | if (!endp) { | |
8dbf3eb6 JK |
669 | const char *context = diff_get_color(ecb->color_diff, |
670 | DIFF_CONTEXT); | |
35e2d03c | 671 | putc('\n', ecb->opt->file); |
8dbf3eb6 | 672 | emit_line_0(ecb->opt, context, reset, '\\', |
7f7ee2ff | 673 | nneof, strlen(nneof)); |
6973dcae | 674 | } |
6973dcae JH |
675 | } |
676 | ||
677 | static void emit_rewrite_diff(const char *name_a, | |
678 | const char *name_b, | |
679 | struct diff_filespec *one, | |
13e36ec5 | 680 | struct diff_filespec *two, |
d9bae1a1 JK |
681 | struct userdiff_driver *textconv_one, |
682 | struct userdiff_driver *textconv_two, | |
eab9a40b | 683 | struct diff_options *o) |
6973dcae JH |
684 | { |
685 | int lc_a, lc_b; | |
1a9eb3b9 | 686 | const char *name_a_tab, *name_b_tab; |
f1c96261 JK |
687 | const char *metainfo = diff_get_color(o->use_color, DIFF_METAINFO); |
688 | const char *fraginfo = diff_get_color(o->use_color, DIFF_FRAGINFO); | |
689 | const char *reset = diff_get_color(o->use_color, DIFF_RESET); | |
d5625091 | 690 | static struct strbuf a_name = STRBUF_INIT, b_name = STRBUF_INIT; |
a5a818ee | 691 | const char *a_prefix, *b_prefix; |
840383b2 | 692 | char *data_one, *data_two; |
3aa1f7ca | 693 | size_t size_one, size_two; |
7f7ee2ff | 694 | struct emit_callback ecbdata; |
30997bb8 | 695 | const char *line_prefix = diff_line_prefix(o); |
a5a818ee JH |
696 | |
697 | if (diff_mnemonic_prefix && DIFF_OPT_TST(o, REVERSE_DIFF)) { | |
698 | a_prefix = o->b_prefix; | |
699 | b_prefix = o->a_prefix; | |
700 | } else { | |
701 | a_prefix = o->a_prefix; | |
702 | b_prefix = o->b_prefix; | |
703 | } | |
1a9eb3b9 | 704 | |
8a13becc JH |
705 | name_a += (*name_a == '/'); |
706 | name_b += (*name_b == '/'); | |
1a9eb3b9 JH |
707 | name_a_tab = strchr(name_a, ' ') ? "\t" : ""; |
708 | name_b_tab = strchr(name_b, ' ') ? "\t" : ""; | |
709 | ||
d5625091 JH |
710 | strbuf_reset(&a_name); |
711 | strbuf_reset(&b_name); | |
a5a818ee JH |
712 | quote_two_c_style(&a_name, a_prefix, name_a, 0); |
713 | quote_two_c_style(&b_name, b_prefix, name_b, 0); | |
d5625091 | 714 | |
840383b2 JK |
715 | size_one = fill_textconv(textconv_one, one, &data_one); |
716 | size_two = fill_textconv(textconv_two, two, &data_two); | |
3aa1f7ca | 717 | |
d91ba8fa | 718 | memset(&ecbdata, 0, sizeof(ecbdata)); |
daa0c3d9 | 719 | ecbdata.color_diff = want_color(o->use_color); |
d91ba8fa | 720 | ecbdata.found_changesp = &o->found_changes; |
c189c4f2 | 721 | ecbdata.ws_rule = whitespace_rule(name_b); |
a3c158d4 | 722 | ecbdata.opt = o; |
d91ba8fa JH |
723 | if (ecbdata.ws_rule & WS_BLANK_AT_EOF) { |
724 | mmfile_t mf1, mf2; | |
725 | mf1.ptr = (char *)data_one; | |
726 | mf2.ptr = (char *)data_two; | |
727 | mf1.size = size_one; | |
728 | mf2.size = size_two; | |
729 | check_blank_at_eof(&mf1, &mf2, &ecbdata); | |
730 | } | |
731 | ecbdata.lno_in_preimage = 1; | |
732 | ecbdata.lno_in_postimage = 1; | |
733 | ||
3aa1f7ca JK |
734 | lc_a = count_lines(data_one, size_one); |
735 | lc_b = count_lines(data_two, size_two); | |
c0c77734 | 736 | fprintf(o->file, |
7be57610 BY |
737 | "%s%s--- %s%s%s\n%s%s+++ %s%s%s\n%s%s@@ -", |
738 | line_prefix, metainfo, a_name.buf, name_a_tab, reset, | |
739 | line_prefix, metainfo, b_name.buf, name_b_tab, reset, | |
740 | line_prefix, fraginfo); | |
467ddc14 JH |
741 | if (!o->irreversible_delete) |
742 | print_line_count(o->file, lc_a); | |
743 | else | |
744 | fprintf(o->file, "?,?"); | |
c0c77734 DB |
745 | fprintf(o->file, " +"); |
746 | print_line_count(o->file, lc_b); | |
747 | fprintf(o->file, " @@%s\n", reset); | |
467ddc14 | 748 | if (lc_a && !o->irreversible_delete) |
d91ba8fa | 749 | emit_rewrite_lines(&ecbdata, '-', data_one, size_one); |
6973dcae | 750 | if (lc_b) |
d91ba8fa | 751 | emit_rewrite_lines(&ecbdata, '+', data_two, size_two); |
b76c056b | 752 | if (textconv_one) |
aed6ca52 | 753 | free((char *)data_one); |
b76c056b | 754 | if (textconv_two) |
aed6ca52 | 755 | free((char *)data_two); |
6973dcae JH |
756 | } |
757 | ||
f59a59e2 JS |
758 | struct diff_words_buffer { |
759 | mmfile_t text; | |
760 | long alloc; | |
2e5d2003 JS |
761 | struct diff_words_orig { |
762 | const char *begin, *end; | |
763 | } *orig; | |
764 | int orig_nr, orig_alloc; | |
f59a59e2 JS |
765 | }; |
766 | ||
767 | static void diff_words_append(char *line, unsigned long len, | |
768 | struct diff_words_buffer *buffer) | |
769 | { | |
23c1575f | 770 | ALLOC_GROW(buffer->text.ptr, buffer->text.size + len, buffer->alloc); |
f59a59e2 JS |
771 | line++; |
772 | len--; | |
773 | memcpy(buffer->text.ptr + buffer->text.size, line, len); | |
774 | buffer->text.size += len; | |
2b6a5417 | 775 | buffer->text.ptr[buffer->text.size] = '\0'; |
f59a59e2 JS |
776 | } |
777 | ||
9cba13ca | 778 | struct diff_words_style_elem { |
882749a0 TR |
779 | const char *prefix; |
780 | const char *suffix; | |
781 | const char *color; /* NULL; filled in by the setup code if | |
782 | * color is enabled */ | |
783 | }; | |
784 | ||
9cba13ca | 785 | struct diff_words_style { |
882749a0 TR |
786 | enum diff_words_type type; |
787 | struct diff_words_style_elem new, old, ctx; | |
788 | const char *newline; | |
789 | }; | |
790 | ||
c2e86add | 791 | static struct diff_words_style diff_words_styles[] = { |
882749a0 TR |
792 | { DIFF_WORDS_PORCELAIN, {"+", "\n"}, {"-", "\n"}, {" ", "\n"}, "~\n" }, |
793 | { DIFF_WORDS_PLAIN, {"{+", "+}"}, {"[-", "-]"}, {"", ""}, "\n" }, | |
794 | { DIFF_WORDS_COLOR, {"", ""}, {"", ""}, {"", ""}, "\n" } | |
795 | }; | |
796 | ||
f59a59e2 | 797 | struct diff_words_data { |
f59a59e2 | 798 | struct diff_words_buffer minus, plus; |
2e5d2003 | 799 | const char *current_plus; |
4297c0ae BY |
800 | int last_minus; |
801 | struct diff_options *opt; | |
2b6a5417 | 802 | regex_t *word_regex; |
882749a0 TR |
803 | enum diff_words_type type; |
804 | struct diff_words_style *style; | |
f59a59e2 JS |
805 | }; |
806 | ||
882749a0 TR |
807 | static int fn_out_diff_words_write_helper(FILE *fp, |
808 | struct diff_words_style_elem *st_el, | |
809 | const char *newline, | |
4297c0ae BY |
810 | size_t count, const char *buf, |
811 | const char *line_prefix) | |
882749a0 | 812 | { |
4297c0ae BY |
813 | int print = 0; |
814 | ||
882749a0 TR |
815 | while (count) { |
816 | char *p = memchr(buf, '\n', count); | |
4297c0ae BY |
817 | if (print) |
818 | fputs(line_prefix, fp); | |
882749a0 TR |
819 | if (p != buf) { |
820 | if (st_el->color && fputs(st_el->color, fp) < 0) | |
821 | return -1; | |
822 | if (fputs(st_el->prefix, fp) < 0 || | |
823 | fwrite(buf, p ? p - buf : count, 1, fp) != 1 || | |
824 | fputs(st_el->suffix, fp) < 0) | |
825 | return -1; | |
826 | if (st_el->color && *st_el->color | |
827 | && fputs(GIT_COLOR_RESET, fp) < 0) | |
828 | return -1; | |
829 | } | |
830 | if (!p) | |
831 | return 0; | |
832 | if (fputs(newline, fp) < 0) | |
833 | return -1; | |
834 | count -= p + 1 - buf; | |
835 | buf = p + 1; | |
4297c0ae | 836 | print = 1; |
882749a0 TR |
837 | } |
838 | return 0; | |
839 | } | |
840 | ||
4297c0ae BY |
841 | /* |
842 | * '--color-words' algorithm can be described as: | |
843 | * | |
844 | * 1. collect a the minus/plus lines of a diff hunk, divided into | |
845 | * minus-lines and plus-lines; | |
846 | * | |
847 | * 2. break both minus-lines and plus-lines into words and | |
848 | * place them into two mmfile_t with one word for each line; | |
849 | * | |
850 | * 3. use xdiff to run diff on the two mmfile_t to get the words level diff; | |
851 | * | |
852 | * And for the common parts of the both file, we output the plus side text. | |
853 | * diff_words->current_plus is used to trace the current position of the plus file | |
854 | * which printed. diff_words->last_minus is used to trace the last minus word | |
855 | * printed. | |
856 | * | |
857 | * For '--graph' to work with '--color-words', we need to output the graph prefix | |
858 | * on each line of color words output. Generally, there are two conditions on | |
859 | * which we should output the prefix. | |
860 | * | |
861 | * 1. diff_words->last_minus == 0 && | |
862 | * diff_words->current_plus == diff_words->plus.text.ptr | |
863 | * | |
864 | * that is: the plus text must start as a new line, and if there is no minus | |
865 | * word printed, a graph prefix must be printed. | |
866 | * | |
867 | * 2. diff_words->current_plus > diff_words->plus.text.ptr && | |
868 | * *(diff_words->current_plus - 1) == '\n' | |
869 | * | |
870 | * that is: a graph prefix must be printed following a '\n' | |
871 | */ | |
872 | static int color_words_output_graph_prefix(struct diff_words_data *diff_words) | |
873 | { | |
874 | if ((diff_words->last_minus == 0 && | |
875 | diff_words->current_plus == diff_words->plus.text.ptr) || | |
876 | (diff_words->current_plus > diff_words->plus.text.ptr && | |
877 | *(diff_words->current_plus - 1) == '\n')) { | |
878 | return 1; | |
879 | } else { | |
880 | return 0; | |
881 | } | |
882 | } | |
883 | ||
f59a59e2 | 884 | static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len) |
f59a59e2 | 885 | { |
f59a59e2 | 886 | struct diff_words_data *diff_words = priv; |
882749a0 | 887 | struct diff_words_style *style = diff_words->style; |
2e5d2003 JS |
888 | int minus_first, minus_len, plus_first, plus_len; |
889 | const char *minus_begin, *minus_end, *plus_begin, *plus_end; | |
4297c0ae | 890 | struct diff_options *opt = diff_words->opt; |
30997bb8 | 891 | const char *line_prefix; |
f59a59e2 | 892 | |
2e5d2003 JS |
893 | if (line[0] != '@' || parse_hunk_header(line, len, |
894 | &minus_first, &minus_len, &plus_first, &plus_len)) | |
f59a59e2 JS |
895 | return; |
896 | ||
4297c0ae | 897 | assert(opt); |
30997bb8 | 898 | line_prefix = diff_line_prefix(opt); |
4297c0ae | 899 | |
2e5d2003 JS |
900 | /* POSIX requires that first be decremented by one if len == 0... */ |
901 | if (minus_len) { | |
902 | minus_begin = diff_words->minus.orig[minus_first].begin; | |
903 | minus_end = | |
904 | diff_words->minus.orig[minus_first + minus_len - 1].end; | |
905 | } else | |
906 | minus_begin = minus_end = | |
907 | diff_words->minus.orig[minus_first].end; | |
908 | ||
909 | if (plus_len) { | |
910 | plus_begin = diff_words->plus.orig[plus_first].begin; | |
911 | plus_end = diff_words->plus.orig[plus_first + plus_len - 1].end; | |
912 | } else | |
913 | plus_begin = plus_end = diff_words->plus.orig[plus_first].end; | |
914 | ||
4297c0ae BY |
915 | if (color_words_output_graph_prefix(diff_words)) { |
916 | fputs(line_prefix, diff_words->opt->file); | |
917 | } | |
918 | if (diff_words->current_plus != plus_begin) { | |
919 | fn_out_diff_words_write_helper(diff_words->opt->file, | |
882749a0 TR |
920 | &style->ctx, style->newline, |
921 | plus_begin - diff_words->current_plus, | |
4297c0ae BY |
922 | diff_words->current_plus, line_prefix); |
923 | if (*(plus_begin - 1) == '\n') | |
924 | fputs(line_prefix, diff_words->opt->file); | |
925 | } | |
926 | if (minus_begin != minus_end) { | |
927 | fn_out_diff_words_write_helper(diff_words->opt->file, | |
882749a0 | 928 | &style->old, style->newline, |
4297c0ae BY |
929 | minus_end - minus_begin, minus_begin, |
930 | line_prefix); | |
931 | } | |
932 | if (plus_begin != plus_end) { | |
933 | fn_out_diff_words_write_helper(diff_words->opt->file, | |
882749a0 | 934 | &style->new, style->newline, |
4297c0ae BY |
935 | plus_end - plus_begin, plus_begin, |
936 | line_prefix); | |
937 | } | |
2e5d2003 JS |
938 | |
939 | diff_words->current_plus = plus_end; | |
4297c0ae | 940 | diff_words->last_minus = minus_first; |
f59a59e2 JS |
941 | } |
942 | ||
2b6a5417 JS |
943 | /* This function starts looking at *begin, and returns 0 iff a word was found. */ |
944 | static int find_word_boundaries(mmfile_t *buffer, regex_t *word_regex, | |
945 | int *begin, int *end) | |
946 | { | |
947 | if (word_regex && *begin < buffer->size) { | |
948 | regmatch_t match[1]; | |
949 | if (!regexec(word_regex, buffer->ptr + *begin, 1, match, 0)) { | |
950 | char *p = memchr(buffer->ptr + *begin + match[0].rm_so, | |
951 | '\n', match[0].rm_eo - match[0].rm_so); | |
952 | *end = p ? p - buffer->ptr : match[0].rm_eo + *begin; | |
953 | *begin += match[0].rm_so; | |
954 | return *begin >= *end; | |
955 | } | |
956 | return -1; | |
f59a59e2 JS |
957 | } |
958 | ||
2b6a5417 JS |
959 | /* find the next word */ |
960 | while (*begin < buffer->size && isspace(buffer->ptr[*begin])) | |
961 | (*begin)++; | |
962 | if (*begin >= buffer->size) | |
963 | return -1; | |
f59a59e2 | 964 | |
2b6a5417 JS |
965 | /* find the end of the word */ |
966 | *end = *begin + 1; | |
967 | while (*end < buffer->size && !isspace(buffer->ptr[*end])) | |
968 | (*end)++; | |
969 | ||
970 | return 0; | |
f59a59e2 JS |
971 | } |
972 | ||
23c1575f | 973 | /* |
2e5d2003 JS |
974 | * This function splits the words in buffer->text, stores the list with |
975 | * newline separator into out, and saves the offsets of the original words | |
976 | * in buffer->orig. | |
23c1575f | 977 | */ |
2b6a5417 JS |
978 | static void diff_words_fill(struct diff_words_buffer *buffer, mmfile_t *out, |
979 | regex_t *word_regex) | |
f59a59e2 | 980 | { |
2e5d2003 | 981 | int i, j; |
2b6a5417 | 982 | long alloc = 0; |
f59a59e2 | 983 | |
2e5d2003 | 984 | out->size = 0; |
2b6a5417 | 985 | out->ptr = NULL; |
f59a59e2 | 986 | |
2e5d2003 JS |
987 | /* fake an empty "0th" word */ |
988 | ALLOC_GROW(buffer->orig, 1, buffer->orig_alloc); | |
989 | buffer->orig[0].begin = buffer->orig[0].end = buffer->text.ptr; | |
990 | buffer->orig_nr = 1; | |
991 | ||
992 | for (i = 0; i < buffer->text.size; i++) { | |
2b6a5417 JS |
993 | if (find_word_boundaries(&buffer->text, word_regex, &i, &j)) |
994 | return; | |
2e5d2003 JS |
995 | |
996 | /* store original boundaries */ | |
997 | ALLOC_GROW(buffer->orig, buffer->orig_nr + 1, | |
998 | buffer->orig_alloc); | |
999 | buffer->orig[buffer->orig_nr].begin = buffer->text.ptr + i; | |
1000 | buffer->orig[buffer->orig_nr].end = buffer->text.ptr + j; | |
1001 | buffer->orig_nr++; | |
1002 | ||
1003 | /* store one word */ | |
2b6a5417 | 1004 | ALLOC_GROW(out->ptr, out->size + j - i + 1, alloc); |
2e5d2003 JS |
1005 | memcpy(out->ptr + out->size, buffer->text.ptr + i, j - i); |
1006 | out->ptr[out->size + j - i] = '\n'; | |
1007 | out->size += j - i + 1; | |
1008 | ||
1009 | i = j - 1; | |
f59a59e2 JS |
1010 | } |
1011 | } | |
1012 | ||
1013 | /* this executes the word diff on the accumulated buffers */ | |
1014 | static void diff_words_show(struct diff_words_data *diff_words) | |
1015 | { | |
1016 | xpparam_t xpp; | |
1017 | xdemitconf_t xecfg; | |
f59a59e2 | 1018 | mmfile_t minus, plus; |
882749a0 | 1019 | struct diff_words_style *style = diff_words->style; |
f59a59e2 | 1020 | |
4297c0ae | 1021 | struct diff_options *opt = diff_words->opt; |
30997bb8 | 1022 | const char *line_prefix; |
4297c0ae BY |
1023 | |
1024 | assert(opt); | |
30997bb8 | 1025 | line_prefix = diff_line_prefix(opt); |
4297c0ae | 1026 | |
2e5d2003 JS |
1027 | /* special case: only removal */ |
1028 | if (!diff_words->plus.text.size) { | |
4297c0ae BY |
1029 | fputs(line_prefix, diff_words->opt->file); |
1030 | fn_out_diff_words_write_helper(diff_words->opt->file, | |
882749a0 | 1031 | &style->old, style->newline, |
4297c0ae BY |
1032 | diff_words->minus.text.size, |
1033 | diff_words->minus.text.ptr, line_prefix); | |
2e5d2003 JS |
1034 | diff_words->minus.text.size = 0; |
1035 | return; | |
1036 | } | |
1037 | ||
1038 | diff_words->current_plus = diff_words->plus.text.ptr; | |
4297c0ae | 1039 | diff_words->last_minus = 0; |
f59a59e2 | 1040 | |
9ccd0a88 | 1041 | memset(&xpp, 0, sizeof(xpp)); |
30b25010 | 1042 | memset(&xecfg, 0, sizeof(xecfg)); |
2b6a5417 JS |
1043 | diff_words_fill(&diff_words->minus, &minus, diff_words->word_regex); |
1044 | diff_words_fill(&diff_words->plus, &plus, diff_words->word_regex); | |
582aa00b | 1045 | xpp.flags = 0; |
2b6a5417 | 1046 | /* as only the hunk header will be parsed, we need a 0-context */ |
2e5d2003 | 1047 | xecfg.ctxlen = 0; |
3efb9880 JK |
1048 | if (xdi_diff_outf(&minus, &plus, fn_out_diff_words_aux, diff_words, |
1049 | &xpp, &xecfg)) | |
1050 | die("unable to generate word diff"); | |
f59a59e2 JS |
1051 | free(minus.ptr); |
1052 | free(plus.ptr); | |
2e5d2003 | 1053 | if (diff_words->current_plus != diff_words->plus.text.ptr + |
4297c0ae BY |
1054 | diff_words->plus.text.size) { |
1055 | if (color_words_output_graph_prefix(diff_words)) | |
1056 | fputs(line_prefix, diff_words->opt->file); | |
1057 | fn_out_diff_words_write_helper(diff_words->opt->file, | |
882749a0 | 1058 | &style->ctx, style->newline, |
2e5d2003 | 1059 | diff_words->plus.text.ptr + diff_words->plus.text.size |
4297c0ae BY |
1060 | - diff_words->current_plus, diff_words->current_plus, |
1061 | line_prefix); | |
1062 | } | |
f59a59e2 | 1063 | diff_words->minus.text.size = diff_words->plus.text.size = 0; |
f59a59e2 JS |
1064 | } |
1065 | ||
76fd2828 JH |
1066 | /* In "color-words" mode, show word-diff of words accumulated in the buffer */ |
1067 | static void diff_words_flush(struct emit_callback *ecbdata) | |
1068 | { | |
1069 | if (ecbdata->diff_words->minus.text.size || | |
1070 | ecbdata->diff_words->plus.text.size) | |
1071 | diff_words_show(ecbdata->diff_words); | |
1072 | } | |
1073 | ||
77d1a520 TR |
1074 | static void diff_filespec_load_driver(struct diff_filespec *one) |
1075 | { | |
1076 | /* Use already-loaded driver */ | |
1077 | if (one->driver) | |
1078 | return; | |
1079 | ||
1080 | if (S_ISREG(one->mode)) | |
1081 | one->driver = userdiff_find_by_path(one->path); | |
1082 | ||
1083 | /* Fallback to default settings */ | |
1084 | if (!one->driver) | |
1085 | one->driver = userdiff_find_by_name("default"); | |
1086 | } | |
1087 | ||
1088 | static const char *userdiff_word_regex(struct diff_filespec *one) | |
1089 | { | |
1090 | diff_filespec_load_driver(one); | |
1091 | return one->driver->word_regex; | |
1092 | } | |
1093 | ||
1094 | static void init_diff_words_data(struct emit_callback *ecbdata, | |
6440d341 | 1095 | struct diff_options *orig_opts, |
77d1a520 TR |
1096 | struct diff_filespec *one, |
1097 | struct diff_filespec *two) | |
1098 | { | |
1099 | int i; | |
6440d341 TR |
1100 | struct diff_options *o = xmalloc(sizeof(struct diff_options)); |
1101 | memcpy(o, orig_opts, sizeof(struct diff_options)); | |
77d1a520 TR |
1102 | |
1103 | ecbdata->diff_words = | |
1104 | xcalloc(1, sizeof(struct diff_words_data)); | |
1105 | ecbdata->diff_words->type = o->word_diff; | |
1106 | ecbdata->diff_words->opt = o; | |
1107 | if (!o->word_regex) | |
1108 | o->word_regex = userdiff_word_regex(one); | |
1109 | if (!o->word_regex) | |
1110 | o->word_regex = userdiff_word_regex(two); | |
1111 | if (!o->word_regex) | |
1112 | o->word_regex = diff_word_regex_cfg; | |
1113 | if (o->word_regex) { | |
1114 | ecbdata->diff_words->word_regex = (regex_t *) | |
1115 | xmalloc(sizeof(regex_t)); | |
1116 | if (regcomp(ecbdata->diff_words->word_regex, | |
1117 | o->word_regex, | |
1118 | REG_EXTENDED | REG_NEWLINE)) | |
1119 | die ("Invalid regular expression: %s", | |
1120 | o->word_regex); | |
1121 | } | |
1122 | for (i = 0; i < ARRAY_SIZE(diff_words_styles); i++) { | |
1123 | if (o->word_diff == diff_words_styles[i].type) { | |
1124 | ecbdata->diff_words->style = | |
1125 | &diff_words_styles[i]; | |
1126 | break; | |
1127 | } | |
1128 | } | |
1129 | if (want_color(o->use_color)) { | |
1130 | struct diff_words_style *st = ecbdata->diff_words->style; | |
1131 | st->old.color = diff_get_color_opt(o, DIFF_FILE_OLD); | |
1132 | st->new.color = diff_get_color_opt(o, DIFF_FILE_NEW); | |
8dbf3eb6 | 1133 | st->ctx.color = diff_get_color_opt(o, DIFF_CONTEXT); |
77d1a520 TR |
1134 | } |
1135 | } | |
1136 | ||
f59a59e2 JS |
1137 | static void free_diff_words_data(struct emit_callback *ecbdata) |
1138 | { | |
1139 | if (ecbdata->diff_words) { | |
76fd2828 | 1140 | diff_words_flush(ecbdata); |
6440d341 | 1141 | free (ecbdata->diff_words->opt); |
8e0f7003 | 1142 | free (ecbdata->diff_words->minus.text.ptr); |
2e5d2003 | 1143 | free (ecbdata->diff_words->minus.orig); |
8e0f7003 | 1144 | free (ecbdata->diff_words->plus.text.ptr); |
2e5d2003 | 1145 | free (ecbdata->diff_words->plus.orig); |
ef5644ea BC |
1146 | if (ecbdata->diff_words->word_regex) { |
1147 | regfree(ecbdata->diff_words->word_regex); | |
1148 | free(ecbdata->diff_words->word_regex); | |
1149 | } | |
f59a59e2 JS |
1150 | free(ecbdata->diff_words); |
1151 | ecbdata->diff_words = NULL; | |
1152 | } | |
1153 | } | |
1154 | ||
ce436973 | 1155 | const char *diff_get_color(int diff_use_color, enum color_diff ix) |
cd112cef | 1156 | { |
daa0c3d9 | 1157 | if (want_color(diff_use_color)) |
50f575fc LT |
1158 | return diff_colors[ix]; |
1159 | return ""; | |
cd112cef JS |
1160 | } |
1161 | ||
f1922234 JK |
1162 | const char *diff_line_prefix(struct diff_options *opt) |
1163 | { | |
1164 | struct strbuf *msgbuf; | |
1165 | if (!opt->output_prefix) | |
1166 | return ""; | |
1167 | ||
1168 | msgbuf = opt->output_prefix(opt, opt->output_prefix_data); | |
1169 | return msgbuf->buf; | |
1170 | } | |
1171 | ||
23707811 JH |
1172 | static unsigned long sane_truncate_line(struct emit_callback *ecb, char *line, unsigned long len) |
1173 | { | |
1174 | const char *cp; | |
1175 | unsigned long allot; | |
1176 | size_t l = len; | |
1177 | ||
1178 | if (ecb->truncate) | |
1179 | return ecb->truncate(line, len); | |
1180 | cp = line; | |
1181 | allot = l; | |
1182 | while (0 < l) { | |
1183 | (void) utf8_width(&cp, &l); | |
1184 | if (!cp) | |
1185 | break; /* truncated in the middle? */ | |
1186 | } | |
1187 | return allot - l; | |
1188 | } | |
1189 | ||
d68fe26f | 1190 | static void find_lno(const char *line, struct emit_callback *ecbdata) |
690ed843 | 1191 | { |
d68fe26f JH |
1192 | const char *p; |
1193 | ecbdata->lno_in_preimage = 0; | |
1194 | ecbdata->lno_in_postimage = 0; | |
1195 | p = strchr(line, '-'); | |
690ed843 | 1196 | if (!p) |
d68fe26f JH |
1197 | return; /* cannot happen */ |
1198 | ecbdata->lno_in_preimage = strtol(p + 1, NULL, 10); | |
1199 | p = strchr(p, '+'); | |
1200 | if (!p) | |
1201 | return; /* cannot happen */ | |
1202 | ecbdata->lno_in_postimage = strtol(p + 1, NULL, 10); | |
690ed843 JH |
1203 | } |
1204 | ||
cd112cef | 1205 | static void fn_out_consume(void *priv, char *line, unsigned long len) |
6973dcae | 1206 | { |
6973dcae | 1207 | struct emit_callback *ecbdata = priv; |
472ca780 | 1208 | const char *meta = diff_get_color(ecbdata->color_diff, DIFF_METAINFO); |
8dbf3eb6 | 1209 | const char *context = diff_get_color(ecbdata->color_diff, DIFF_CONTEXT); |
ce436973 | 1210 | const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET); |
7be57610 | 1211 | struct diff_options *o = ecbdata->opt; |
30997bb8 | 1212 | const char *line_prefix = diff_line_prefix(o); |
6973dcae | 1213 | |
3e97c7c6 | 1214 | if (ecbdata->header) { |
a3c158d4 | 1215 | fprintf(ecbdata->opt->file, "%s", ecbdata->header->buf); |
3e97c7c6 GB |
1216 | strbuf_reset(ecbdata->header); |
1217 | ecbdata->header = NULL; | |
1218 | } | |
34a5e1a2 JS |
1219 | *(ecbdata->found_changesp) = 1; |
1220 | ||
6973dcae | 1221 | if (ecbdata->label_path[0]) { |
1a9eb3b9 JH |
1222 | const char *name_a_tab, *name_b_tab; |
1223 | ||
1224 | name_a_tab = strchr(ecbdata->label_path[0], ' ') ? "\t" : ""; | |
1225 | name_b_tab = strchr(ecbdata->label_path[1], ' ') ? "\t" : ""; | |
1226 | ||
7be57610 BY |
1227 | fprintf(ecbdata->opt->file, "%s%s--- %s%s%s\n", |
1228 | line_prefix, meta, ecbdata->label_path[0], reset, name_a_tab); | |
1229 | fprintf(ecbdata->opt->file, "%s%s+++ %s%s%s\n", | |
1230 | line_prefix, meta, ecbdata->label_path[1], reset, name_b_tab); | |
6973dcae JH |
1231 | ecbdata->label_path[0] = ecbdata->label_path[1] = NULL; |
1232 | } | |
cd112cef | 1233 | |
a624eaa7 JM |
1234 | if (diff_suppress_blank_empty |
1235 | && len == 2 && line[0] == ' ' && line[1] == '\n') { | |
1236 | line[0] = '\n'; | |
1237 | len = 1; | |
1238 | } | |
1239 | ||
b8d9c1a6 | 1240 | if (line[0] == '@') { |
76fd2828 JH |
1241 | if (ecbdata->diff_words) |
1242 | diff_words_flush(ecbdata); | |
23707811 | 1243 | len = sane_truncate_line(ecbdata, line, len); |
d68fe26f | 1244 | find_lno(line, ecbdata); |
89cb73a1 | 1245 | emit_hunk_header(ecbdata, line, len); |
23707811 | 1246 | if (line[len-1] != '\n') |
a3c158d4 | 1247 | putc('\n', ecbdata->opt->file); |
448c3ef1 | 1248 | return; |
cd112cef | 1249 | } |
448c3ef1 | 1250 | |
b8d9c1a6 | 1251 | if (len < 1) { |
a3c158d4 | 1252 | emit_line(ecbdata->opt, reset, reset, line, len); |
882749a0 TR |
1253 | if (ecbdata->diff_words |
1254 | && ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN) | |
a3c158d4 | 1255 | fputs("~\n", ecbdata->opt->file); |
448c3ef1 | 1256 | return; |
cd112cef | 1257 | } |
448c3ef1 | 1258 | |
448c3ef1 JH |
1259 | if (ecbdata->diff_words) { |
1260 | if (line[0] == '-') { | |
1261 | diff_words_append(line, len, | |
1262 | &ecbdata->diff_words->minus); | |
1263 | return; | |
1264 | } else if (line[0] == '+') { | |
1265 | diff_words_append(line, len, | |
1266 | &ecbdata->diff_words->plus); | |
1267 | return; | |
59556548 | 1268 | } else if (starts_with(line, "\\ ")) { |
c7c2bc0a TR |
1269 | /* |
1270 | * Eat the "no newline at eof" marker as if we | |
1271 | * saw a "+" or "-" line with nothing on it, | |
1272 | * and return without diff_words_flush() to | |
1273 | * defer processing. If this is the end of | |
1274 | * preimage, more "+" lines may come after it. | |
1275 | */ | |
1276 | return; | |
448c3ef1 | 1277 | } |
76fd2828 | 1278 | diff_words_flush(ecbdata); |
882749a0 | 1279 | if (ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN) { |
8dbf3eb6 | 1280 | emit_line(ecbdata->opt, context, reset, line, len); |
a3c158d4 | 1281 | fputs("~\n", ecbdata->opt->file); |
882749a0 | 1282 | } else { |
42536dd9 JM |
1283 | /* |
1284 | * Skip the prefix character, if any. With | |
1285 | * diff_suppress_blank_empty, there may be | |
1286 | * none. | |
1287 | */ | |
1288 | if (line[0] != '\n') { | |
1289 | line++; | |
1290 | len--; | |
1291 | } | |
8dbf3eb6 | 1292 | emit_line(ecbdata->opt, context, reset, line, len); |
882749a0 | 1293 | } |
448c3ef1 JH |
1294 | return; |
1295 | } | |
448c3ef1 | 1296 | |
0e383e18 JH |
1297 | switch (line[0]) { |
1298 | case '+': | |
d68fe26f | 1299 | ecbdata->lno_in_postimage++; |
018cff70 | 1300 | emit_add_line(reset, ecbdata, line + 1, len - 1); |
0e383e18 JH |
1301 | break; |
1302 | case '-': | |
1303 | ecbdata->lno_in_preimage++; | |
1304 | emit_del_line(reset, ecbdata, line + 1, len - 1); | |
1305 | break; | |
1306 | case ' ': | |
1307 | ecbdata->lno_in_postimage++; | |
1308 | ecbdata->lno_in_preimage++; | |
1309 | emit_context_line(reset, ecbdata, line + 1, len - 1); | |
1310 | break; | |
1311 | default: | |
1312 | /* incomplete line at the end */ | |
1313 | ecbdata->lno_in_preimage++; | |
1314 | emit_line(ecbdata->opt, | |
db65170e | 1315 | diff_get_color(ecbdata->color_diff, DIFF_CONTEXT), |
0e383e18 JH |
1316 | reset, line, len); |
1317 | break; | |
448c3ef1 | 1318 | } |
6973dcae JH |
1319 | } |
1320 | ||
1321 | static char *pprint_rename(const char *a, const char *b) | |
1322 | { | |
1323 | const char *old = a; | |
1324 | const char *new = b; | |
f285a2d7 | 1325 | struct strbuf name = STRBUF_INIT; |
6973dcae | 1326 | int pfx_length, sfx_length; |
dd281f09 | 1327 | int pfx_adjust_for_slash; |
6973dcae JH |
1328 | int len_a = strlen(a); |
1329 | int len_b = strlen(b); | |
663af342 | 1330 | int a_midlen, b_midlen; |
e5bfbf9b AJ |
1331 | int qlen_a = quote_c_style(a, NULL, NULL, 0); |
1332 | int qlen_b = quote_c_style(b, NULL, NULL, 0); | |
1333 | ||
1334 | if (qlen_a || qlen_b) { | |
663af342 PH |
1335 | quote_c_style(a, &name, NULL, 0); |
1336 | strbuf_addstr(&name, " => "); | |
1337 | quote_c_style(b, &name, NULL, 0); | |
b315c5c0 | 1338 | return strbuf_detach(&name, NULL); |
e5bfbf9b | 1339 | } |
6973dcae JH |
1340 | |
1341 | /* Find common prefix */ | |
1342 | pfx_length = 0; | |
1343 | while (*old && *new && *old == *new) { | |
1344 | if (*old == '/') | |
1345 | pfx_length = old - a + 1; | |
1346 | old++; | |
1347 | new++; | |
1348 | } | |
1349 | ||
1350 | /* Find common suffix */ | |
1351 | old = a + len_a; | |
1352 | new = b + len_b; | |
1353 | sfx_length = 0; | |
d020e27f | 1354 | /* |
dd281f09 TR |
1355 | * If there is a common prefix, it must end in a slash. In |
1356 | * that case we let this loop run 1 into the prefix to see the | |
1357 | * same slash. | |
1358 | * | |
1359 | * If there is no common prefix, we cannot do this as it would | |
1360 | * underrun the input strings. | |
d020e27f | 1361 | */ |
dd281f09 TR |
1362 | pfx_adjust_for_slash = (pfx_length ? 1 : 0); |
1363 | while (a + pfx_length - pfx_adjust_for_slash <= old && | |
1364 | b + pfx_length - pfx_adjust_for_slash <= new && | |
d020e27f | 1365 | *old == *new) { |
6973dcae JH |
1366 | if (*old == '/') |
1367 | sfx_length = len_a - (old - a); | |
1368 | old--; | |
1369 | new--; | |
1370 | } | |
1371 | ||
1372 | /* | |
1373 | * pfx{mid-a => mid-b}sfx | |
1374 | * {pfx-a => pfx-b}sfx | |
1375 | * pfx{sfx-a => sfx-b} | |
1376 | * name-a => name-b | |
1377 | */ | |
663af342 PH |
1378 | a_midlen = len_a - pfx_length - sfx_length; |
1379 | b_midlen = len_b - pfx_length - sfx_length; | |
1380 | if (a_midlen < 0) | |
1381 | a_midlen = 0; | |
1382 | if (b_midlen < 0) | |
1383 | b_midlen = 0; | |
1384 | ||
1385 | strbuf_grow(&name, pfx_length + a_midlen + b_midlen + sfx_length + 7); | |
6973dcae | 1386 | if (pfx_length + sfx_length) { |
663af342 PH |
1387 | strbuf_add(&name, a, pfx_length); |
1388 | strbuf_addch(&name, '{'); | |
6973dcae | 1389 | } |
663af342 PH |
1390 | strbuf_add(&name, a + pfx_length, a_midlen); |
1391 | strbuf_addstr(&name, " => "); | |
1392 | strbuf_add(&name, b + pfx_length, b_midlen); | |
1393 | if (pfx_length + sfx_length) { | |
1394 | strbuf_addch(&name, '}'); | |
1395 | strbuf_add(&name, a + len_a - sfx_length, sfx_length); | |
6973dcae | 1396 | } |
b315c5c0 | 1397 | return strbuf_detach(&name, NULL); |
6973dcae JH |
1398 | } |
1399 | ||
1400 | struct diffstat_t { | |
6973dcae JH |
1401 | int nr; |
1402 | int alloc; | |
1403 | struct diffstat_file { | |
f604652e | 1404 | char *from_name; |
6973dcae | 1405 | char *name; |
f604652e | 1406 | char *print_name; |
6973dcae JH |
1407 | unsigned is_unmerged:1; |
1408 | unsigned is_binary:1; | |
1409 | unsigned is_renamed:1; | |
74faaa16 | 1410 | unsigned is_interesting:1; |
0974c117 | 1411 | uintmax_t added, deleted; |
6973dcae JH |
1412 | } **files; |
1413 | }; | |
1414 | ||
1415 | static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat, | |
1416 | const char *name_a, | |
1417 | const char *name_b) | |
1418 | { | |
1419 | struct diffstat_file *x; | |
1a4927c5 | 1420 | x = xcalloc(1, sizeof(*x)); |
4c960a43 | 1421 | ALLOC_GROW(diffstat->files, diffstat->nr + 1, diffstat->alloc); |
6973dcae JH |
1422 | diffstat->files[diffstat->nr++] = x; |
1423 | if (name_b) { | |
f604652e JH |
1424 | x->from_name = xstrdup(name_a); |
1425 | x->name = xstrdup(name_b); | |
6973dcae JH |
1426 | x->is_renamed = 1; |
1427 | } | |
f604652e JH |
1428 | else { |
1429 | x->from_name = NULL; | |
9befac47 | 1430 | x->name = xstrdup(name_a); |
f604652e | 1431 | } |
6973dcae JH |
1432 | return x; |
1433 | } | |
1434 | ||
1435 | static void diffstat_consume(void *priv, char *line, unsigned long len) | |
1436 | { | |
1437 | struct diffstat_t *diffstat = priv; | |
1438 | struct diffstat_file *x = diffstat->files[diffstat->nr - 1]; | |
1439 | ||
1440 | if (line[0] == '+') | |
1441 | x->added++; | |
1442 | else if (line[0] == '-') | |
1443 | x->deleted++; | |
1444 | } | |
1445 | ||
698ce6f8 | 1446 | const char mime_boundary_leader[] = "------------"; |
6973dcae | 1447 | |
a2540023 JH |
1448 | static int scale_linear(int it, int width, int max_change) |
1449 | { | |
2eeeef24 JH |
1450 | if (!it) |
1451 | return 0; | |
a2540023 | 1452 | /* |
2eeeef24 JH |
1453 | * make sure that at least one '-' or '+' is printed if |
1454 | * there is any change to this path. The easiest way is to | |
1455 | * scale linearly as if the alloted width is one column shorter | |
1456 | * than it is, and then add 1 to the result. | |
a2540023 | 1457 | */ |
2eeeef24 | 1458 | return 1 + (it * (width - 1) / max_change); |
a2540023 JH |
1459 | } |
1460 | ||
c0c77734 | 1461 | static void show_name(FILE *file, |
a408e0e6 | 1462 | const char *prefix, const char *name, int len) |
a2540023 | 1463 | { |
a408e0e6 | 1464 | fprintf(file, " %s%-*s |", prefix, len, name); |
a2540023 JH |
1465 | } |
1466 | ||
c0c77734 | 1467 | static void show_graph(FILE *file, char ch, int cnt, const char *set, const char *reset) |
a2540023 JH |
1468 | { |
1469 | if (cnt <= 0) | |
1470 | return; | |
c0c77734 | 1471 | fprintf(file, "%s", set); |
a2540023 | 1472 | while (cnt--) |
c0c77734 DB |
1473 | putc(ch, file); |
1474 | fprintf(file, "%s", reset); | |
a2540023 JH |
1475 | } |
1476 | ||
f604652e JH |
1477 | static void fill_print_name(struct diffstat_file *file) |
1478 | { | |
1479 | char *pname; | |
1480 | ||
1481 | if (file->print_name) | |
1482 | return; | |
1483 | ||
1484 | if (!file->is_renamed) { | |
f285a2d7 | 1485 | struct strbuf buf = STRBUF_INIT; |
f604652e JH |
1486 | if (quote_c_style(file->name, &buf, NULL, 0)) { |
1487 | pname = strbuf_detach(&buf, NULL); | |
1488 | } else { | |
1489 | pname = file->name; | |
1490 | strbuf_release(&buf); | |
1491 | } | |
1492 | } else { | |
1493 | pname = pprint_rename(file->from_name, file->name); | |
1494 | } | |
1495 | file->print_name = pname; | |
1496 | } | |
1497 | ||
7f814632 NTND |
1498 | int print_stat_summary(FILE *fp, int files, int insertions, int deletions) |
1499 | { | |
1500 | struct strbuf sb = STRBUF_INIT; | |
1501 | int ret; | |
1502 | ||
1503 | if (!files) { | |
1504 | assert(insertions == 0 && deletions == 0); | |
218adaaa | 1505 | return fprintf(fp, "%s\n", " 0 files changed"); |
7f814632 NTND |
1506 | } |
1507 | ||
1508 | strbuf_addf(&sb, | |
218adaaa | 1509 | (files == 1) ? " %d file changed" : " %d files changed", |
7f814632 NTND |
1510 | files); |
1511 | ||
1512 | /* | |
1513 | * For binary diff, the caller may want to print "x files | |
1514 | * changed" with insertions == 0 && deletions == 0. | |
1515 | * | |
1516 | * Not omitting "0 insertions(+), 0 deletions(-)" in this case | |
1517 | * is probably less confusing (i.e skip over "2 files changed | |
1518 | * but nothing about added/removed lines? Is this a bug in Git?"). | |
1519 | */ | |
1520 | if (insertions || deletions == 0) { | |
7f814632 | 1521 | strbuf_addf(&sb, |
218adaaa | 1522 | (insertions == 1) ? ", %d insertion(+)" : ", %d insertions(+)", |
7f814632 NTND |
1523 | insertions); |
1524 | } | |
1525 | ||
1526 | if (deletions || insertions == 0) { | |
7f814632 | 1527 | strbuf_addf(&sb, |
218adaaa | 1528 | (deletions == 1) ? ", %d deletion(-)" : ", %d deletions(-)", |
7f814632 NTND |
1529 | deletions); |
1530 | } | |
1531 | strbuf_addch(&sb, '\n'); | |
1532 | ret = fputs(sb.buf, fp); | |
1533 | strbuf_release(&sb); | |
1534 | return ret; | |
1535 | } | |
1536 | ||
4b25d091 | 1537 | static void show_stats(struct diffstat_t *data, struct diff_options *options) |
6973dcae | 1538 | { |
eb3a9dd3 | 1539 | int i, len, add, del, adds = 0, dels = 0; |
0974c117 | 1540 | uintmax_t max_change = 0, max_len = 0; |
dc801e71 ZJS |
1541 | int total_files = data->nr, count; |
1542 | int width, name_width, graph_width, number_width = 0, bin_width = 0; | |
c0aa335c | 1543 | const char *reset, *add_c, *del_c; |
7be57610 | 1544 | const char *line_prefix = ""; |
e5f85df8 | 1545 | int extra_shown = 0; |
6973dcae JH |
1546 | |
1547 | if (data->nr == 0) | |
1548 | return; | |
1549 | ||
30997bb8 | 1550 | line_prefix = diff_line_prefix(options); |
808e1db2 | 1551 | count = options->stat_count ? options->stat_count : data->nr; |
a2540023 | 1552 | |
8f67f8ae | 1553 | reset = diff_get_color_opt(options, DIFF_RESET); |
8f67f8ae PH |
1554 | add_c = diff_get_color_opt(options, DIFF_FILE_NEW); |
1555 | del_c = diff_get_color_opt(options, DIFF_FILE_OLD); | |
785f7432 | 1556 | |
1b058bc3 ZJS |
1557 | /* |
1558 | * Find the longest filename and max number of changes | |
1559 | */ | |
808e1db2 | 1560 | for (i = 0; (i < count) && (i < data->nr); i++) { |
6973dcae | 1561 | struct diffstat_file *file = data->files[i]; |
0974c117 | 1562 | uintmax_t change = file->added + file->deleted; |
af0ed819 JH |
1563 | |
1564 | if (!file->is_interesting && (change == 0)) { | |
808e1db2 | 1565 | count++; /* not shown == room for one more */ |
358e460e MG |
1566 | continue; |
1567 | } | |
f604652e JH |
1568 | fill_print_name(file); |
1569 | len = strlen(file->print_name); | |
6973dcae JH |
1570 | if (max_len < len) |
1571 | max_len = len; | |
1572 | ||
dc801e71 ZJS |
1573 | if (file->is_unmerged) { |
1574 | /* "Unmerged" is 8 characters */ | |
1575 | bin_width = bin_width < 8 ? 8 : bin_width; | |
6973dcae | 1576 | continue; |
dc801e71 ZJS |
1577 | } |
1578 | if (file->is_binary) { | |
1579 | /* "Bin XXX -> YYY bytes" */ | |
1580 | int w = 14 + decimal_width(file->added) | |
1581 | + decimal_width(file->deleted); | |
1582 | bin_width = bin_width < w ? w : bin_width; | |
1583 | /* Display change counts aligned with "Bin" */ | |
1584 | number_width = 3; | |
1585 | continue; | |
1586 | } | |
1587 | ||
a2540023 JH |
1588 | if (max_change < change) |
1589 | max_change = change; | |
6973dcae | 1590 | } |
a20d3c0d | 1591 | count = i; /* where we can stop scanning in data->files[] */ |
6973dcae | 1592 | |
1b058bc3 ZJS |
1593 | /* |
1594 | * We have width = stat_width or term_columns() columns total. | |
1595 | * We want a maximum of min(max_len, stat_name_width) for the name part. | |
969fe57b | 1596 | * We want a maximum of min(max_change, stat_graph_width) for the +- part. |
1b058bc3 ZJS |
1597 | * We also need 1 for " " and 4 + decimal_width(max_change) |
1598 | * for " | NNNN " and one the empty column at the end, altogether | |
1599 | * 6 + decimal_width(max_change). | |
1600 | * | |
1601 | * If there's not enough space, we will use the smaller of | |
1602 | * stat_name_width (if set) and 5/8*width for the filename, | |
969fe57b ZJS |
1603 | * and the rest for constant elements + graph part, but no more |
1604 | * than stat_graph_width for the graph part. | |
1b058bc3 ZJS |
1605 | * (5/8 gives 50 for filename and 30 for the constant parts + graph |
1606 | * for the standard terminal size). | |
a2540023 | 1607 | * |
1b058bc3 ZJS |
1608 | * In other words: stat_width limits the maximum width, and |
1609 | * stat_name_width fixes the maximum width of the filename, | |
1610 | * and is also used to divide available columns if there | |
1611 | * aren't enough. | |
dc801e71 ZJS |
1612 | * |
1613 | * Binary files are displayed with "Bin XXX -> YYY bytes" | |
1614 | * instead of the change count and graph. This part is treated | |
1615 | * similarly to the graph part, except that it is not | |
41ccfdd9 | 1616 | * "scaled". If total width is too small to accommodate the |
dc801e71 ZJS |
1617 | * guaranteed minimum width of the filename part and the |
1618 | * separators and this message, this message will "overflow" | |
1619 | * making the line longer than the maximum width. | |
a2540023 | 1620 | */ |
1b058bc3 ZJS |
1621 | |
1622 | if (options->stat_width == -1) | |
3f145132 | 1623 | width = term_columns() - options->output_prefix_length; |
a2540023 | 1624 | else |
1b058bc3 | 1625 | width = options->stat_width ? options->stat_width : 80; |
dc801e71 ZJS |
1626 | number_width = decimal_width(max_change) > number_width ? |
1627 | decimal_width(max_change) : number_width; | |
a2540023 | 1628 | |
df44483a ZJS |
1629 | if (options->stat_graph_width == -1) |
1630 | options->stat_graph_width = diff_stat_graph_width; | |
a2540023 | 1631 | |
1b058bc3 ZJS |
1632 | /* |
1633 | * Guarantee 3/8*16==6 for the graph part | |
1634 | * and 5/8*16==10 for the filename part | |
1635 | */ | |
1636 | if (width < 16 + 6 + number_width) | |
1637 | width = 16 + 6 + number_width; | |
1638 | ||
1639 | /* | |
1640 | * First assign sizes that are wanted, ignoring available width. | |
dc801e71 ZJS |
1641 | * strlen("Bin XXX -> YYY bytes") == bin_width, and the part |
1642 | * starting from "XXX" should fit in graph_width. | |
1b058bc3 | 1643 | */ |
dc801e71 ZJS |
1644 | graph_width = max_change + 4 > bin_width ? max_change : bin_width - 4; |
1645 | if (options->stat_graph_width && | |
1646 | options->stat_graph_width < graph_width) | |
1647 | graph_width = options->stat_graph_width; | |
1648 | ||
1b058bc3 ZJS |
1649 | name_width = (options->stat_name_width > 0 && |
1650 | options->stat_name_width < max_len) ? | |
1651 | options->stat_name_width : max_len; | |
1652 | ||
1653 | /* | |
1654 | * Adjust adjustable widths not to exceed maximum width | |
1655 | */ | |
1656 | if (name_width + number_width + 6 + graph_width > width) { | |
678c5741 | 1657 | if (graph_width > width * 3/8 - number_width - 6) { |
1b058bc3 | 1658 | graph_width = width * 3/8 - number_width - 6; |
678c5741 LP |
1659 | if (graph_width < 6) |
1660 | graph_width = 6; | |
1661 | } | |
1662 | ||
969fe57b ZJS |
1663 | if (options->stat_graph_width && |
1664 | graph_width > options->stat_graph_width) | |
1665 | graph_width = options->stat_graph_width; | |
1b058bc3 ZJS |
1666 | if (name_width > width - number_width - 6 - graph_width) |
1667 | name_width = width - number_width - 6 - graph_width; | |
1668 | else | |
1669 | graph_width = width - number_width - 6 - name_width; | |
1670 | } | |
1671 | ||
1672 | /* | |
1673 | * From here name_width is the width of the name area, | |
1674 | * and graph_width is the width of the graph area. | |
1675 | * max_change is used to scale graph properly. | |
1676 | */ | |
808e1db2 | 1677 | for (i = 0; i < count; i++) { |
d2543b8e | 1678 | const char *prefix = ""; |
af0ed819 JH |
1679 | struct diffstat_file *file = data->files[i]; |
1680 | char *name = file->print_name; | |
1681 | uintmax_t added = file->added; | |
1682 | uintmax_t deleted = file->deleted; | |
a2540023 | 1683 | int name_len; |
6973dcae | 1684 | |
a20d3c0d | 1685 | if (!file->is_interesting && (added + deleted == 0)) |
358e460e | 1686 | continue; |
a20d3c0d | 1687 | |
6973dcae JH |
1688 | /* |
1689 | * "scale" the filename | |
1690 | */ | |
a2540023 JH |
1691 | len = name_width; |
1692 | name_len = strlen(name); | |
1693 | if (name_width < name_len) { | |
6973dcae JH |
1694 | char *slash; |
1695 | prefix = "..."; | |
a2540023 JH |
1696 | len -= 3; |
1697 | name += name_len - len; | |
6973dcae JH |
1698 | slash = strchr(name, '/'); |
1699 | if (slash) | |
1700 | name = slash; | |
1701 | } | |
6973dcae | 1702 | |
af0ed819 | 1703 | if (file->is_binary) { |
7be57610 | 1704 | fprintf(options->file, "%s", line_prefix); |
a408e0e6 | 1705 | show_name(options->file, prefix, name, len); |
fc1320bf | 1706 | fprintf(options->file, " %*s", number_width, "Bin"); |
e18872b2 ZJS |
1707 | if (!added && !deleted) { |
1708 | putc('\n', options->file); | |
1709 | continue; | |
1710 | } | |
1711 | fprintf(options->file, " %s%"PRIuMAX"%s", | |
0974c117 | 1712 | del_c, deleted, reset); |
c0c77734 | 1713 | fprintf(options->file, " -> "); |
0974c117 JK |
1714 | fprintf(options->file, "%s%"PRIuMAX"%s", |
1715 | add_c, added, reset); | |
c0c77734 DB |
1716 | fprintf(options->file, " bytes"); |
1717 | fprintf(options->file, "\n"); | |
f604652e | 1718 | continue; |
6973dcae | 1719 | } |
af0ed819 | 1720 | else if (file->is_unmerged) { |
7be57610 | 1721 | fprintf(options->file, "%s", line_prefix); |
a408e0e6 | 1722 | show_name(options->file, prefix, name, len); |
dc801e71 | 1723 | fprintf(options->file, " Unmerged\n"); |
f604652e | 1724 | continue; |
6973dcae | 1725 | } |
6973dcae | 1726 | |
a2540023 JH |
1727 | /* |
1728 | * scale the add/delete | |
1729 | */ | |
6973dcae JH |
1730 | add = added; |
1731 | del = deleted; | |
6973dcae | 1732 | |
1b058bc3 | 1733 | if (graph_width <= max_change) { |
d3c9cf32 | 1734 | int total = scale_linear(add + del, graph_width, max_change); |
2eeeef24 JH |
1735 | if (total < 2 && add && del) |
1736 | /* width >= 2 due to the sanity check */ | |
1737 | total = 2; | |
1738 | if (add < del) { | |
1b058bc3 | 1739 | add = scale_linear(add, graph_width, max_change); |
2eeeef24 JH |
1740 | del = total - add; |
1741 | } else { | |
1b058bc3 | 1742 | del = scale_linear(del, graph_width, max_change); |
2eeeef24 JH |
1743 | add = total - del; |
1744 | } | |
6973dcae | 1745 | } |
7be57610 | 1746 | fprintf(options->file, "%s", line_prefix); |
a408e0e6 | 1747 | show_name(options->file, prefix, name, len); |
dc801e71 ZJS |
1748 | fprintf(options->file, " %*"PRIuMAX"%s", |
1749 | number_width, added + deleted, | |
1750 | added + deleted ? " " : ""); | |
c0c77734 DB |
1751 | show_graph(options->file, '+', add, add_c, reset); |
1752 | show_graph(options->file, '-', del, del_c, reset); | |
1753 | fprintf(options->file, "\n"); | |
1754 | } | |
a20d3c0d JH |
1755 | |
1756 | for (i = 0; i < data->nr; i++) { | |
af0ed819 JH |
1757 | struct diffstat_file *file = data->files[i]; |
1758 | uintmax_t added = file->added; | |
1759 | uintmax_t deleted = file->deleted; | |
82dfc2c4 JH |
1760 | |
1761 | if (file->is_unmerged || | |
1762 | (!file->is_interesting && (added + deleted == 0))) { | |
808e1db2 MG |
1763 | total_files--; |
1764 | continue; | |
1765 | } | |
a20d3c0d | 1766 | |
82dfc2c4 | 1767 | if (!file->is_binary) { |
a20d3c0d JH |
1768 | adds += added; |
1769 | dels += deleted; | |
1770 | } | |
1771 | if (i < count) | |
1772 | continue; | |
e5f85df8 JH |
1773 | if (!extra_shown) |
1774 | fprintf(options->file, "%s ...\n", line_prefix); | |
1775 | extra_shown = 1; | |
808e1db2 | 1776 | } |
7be57610 | 1777 | fprintf(options->file, "%s", line_prefix); |
7f814632 | 1778 | print_stat_summary(options->file, total_files, adds, dels); |
6973dcae JH |
1779 | } |
1780 | ||
2775d92c | 1781 | static void show_shortstats(struct diffstat_t *data, struct diff_options *options) |
ebd124c6 NP |
1782 | { |
1783 | int i, adds = 0, dels = 0, total_files = data->nr; | |
1784 | ||
1785 | if (data->nr == 0) | |
1786 | return; | |
1787 | ||
1788 | for (i = 0; i < data->nr; i++) { | |
e18872b2 ZJS |
1789 | int added = data->files[i]->added; |
1790 | int deleted= data->files[i]->deleted; | |
1791 | ||
20c8cde4 JH |
1792 | if (data->files[i]->is_unmerged || |
1793 | (!data->files[i]->is_interesting && (added + deleted == 0))) { | |
e18872b2 | 1794 | total_files--; |
de9658b5 | 1795 | } else if (!data->files[i]->is_binary) { /* don't count bytes */ |
e18872b2 ZJS |
1796 | adds += added; |
1797 | dels += deleted; | |
ebd124c6 | 1798 | } |
ebd124c6 | 1799 | } |
30997bb8 | 1800 | fprintf(options->file, "%s", diff_line_prefix(options)); |
7f814632 | 1801 | print_stat_summary(options->file, total_files, adds, dels); |
ebd124c6 NP |
1802 | } |
1803 | ||
4b25d091 | 1804 | static void show_numstat(struct diffstat_t *data, struct diff_options *options) |
74e2abe5 JH |
1805 | { |
1806 | int i; | |
1807 | ||
f604652e JH |
1808 | if (data->nr == 0) |
1809 | return; | |
1810 | ||
74e2abe5 JH |
1811 | for (i = 0; i < data->nr; i++) { |
1812 | struct diffstat_file *file = data->files[i]; | |
1813 | ||
30997bb8 | 1814 | fprintf(options->file, "%s", diff_line_prefix(options)); |
7be57610 | 1815 | |
bfddbc5e | 1816 | if (file->is_binary) |
c0c77734 | 1817 | fprintf(options->file, "-\t-\t"); |
bfddbc5e | 1818 | else |
c0c77734 | 1819 | fprintf(options->file, |
0974c117 JK |
1820 | "%"PRIuMAX"\t%"PRIuMAX"\t", |
1821 | file->added, file->deleted); | |
f604652e JH |
1822 | if (options->line_termination) { |
1823 | fill_print_name(file); | |
1824 | if (!file->is_renamed) | |
c0c77734 | 1825 | write_name_quoted(file->name, options->file, |
f604652e JH |
1826 | options->line_termination); |
1827 | else { | |
c0c77734 DB |
1828 | fputs(file->print_name, options->file); |
1829 | putc(options->line_termination, options->file); | |
f604652e | 1830 | } |
663af342 | 1831 | } else { |
f604652e | 1832 | if (file->is_renamed) { |
c0c77734 DB |
1833 | putc('\0', options->file); |
1834 | write_name_quoted(file->from_name, options->file, '\0'); | |
f604652e | 1835 | } |
c0c77734 | 1836 | write_name_quoted(file->name, options->file, '\0'); |
663af342 | 1837 | } |
74e2abe5 JH |
1838 | } |
1839 | } | |
1840 | ||
c04a7155 JH |
1841 | struct dirstat_file { |
1842 | const char *name; | |
1843 | unsigned long changed; | |
7df7c019 LT |
1844 | }; |
1845 | ||
c04a7155 JH |
1846 | struct dirstat_dir { |
1847 | struct dirstat_file *files; | |
712d2c7d | 1848 | int alloc, nr, permille, cumulative; |
c04a7155 JH |
1849 | }; |
1850 | ||
7be57610 BY |
1851 | static long gather_dirstat(struct diff_options *opt, struct dirstat_dir *dir, |
1852 | unsigned long changed, const char *base, int baselen) | |
7df7c019 LT |
1853 | { |
1854 | unsigned long this_dir = 0; | |
1855 | unsigned int sources = 0; | |
30997bb8 | 1856 | const char *line_prefix = diff_line_prefix(opt); |
7df7c019 LT |
1857 | |
1858 | while (dir->nr) { | |
c04a7155 | 1859 | struct dirstat_file *f = dir->files; |
7df7c019 LT |
1860 | int namelen = strlen(f->name); |
1861 | unsigned long this; | |
1862 | char *slash; | |
1863 | ||
1864 | if (namelen < baselen) | |
1865 | break; | |
1866 | if (memcmp(f->name, base, baselen)) | |
1867 | break; | |
1868 | slash = strchr(f->name + baselen, '/'); | |
1869 | if (slash) { | |
1870 | int newbaselen = slash + 1 - f->name; | |
7be57610 | 1871 | this = gather_dirstat(opt, dir, changed, f->name, newbaselen); |
7df7c019 LT |
1872 | sources++; |
1873 | } else { | |
c04a7155 | 1874 | this = f->changed; |
7df7c019 LT |
1875 | dir->files++; |
1876 | dir->nr--; | |
1877 | sources += 2; | |
1878 | } | |
1879 | this_dir += this; | |
1880 | } | |
1881 | ||
1882 | /* | |
1883 | * We don't report dirstat's for | |
1884 | * - the top level | |
1885 | * - or cases where everything came from a single directory | |
1886 | * under this directory (sources == 1). | |
1887 | */ | |
1888 | if (baselen && sources != 1) { | |
58a8756a JH |
1889 | if (this_dir) { |
1890 | int permille = this_dir * 1000 / changed; | |
712d2c7d | 1891 | if (permille >= dir->permille) { |
7be57610 | 1892 | fprintf(opt->file, "%s%4d.%01d%% %.*s\n", line_prefix, |
712d2c7d | 1893 | permille / 10, permille % 10, baselen, base); |
7df7c019 LT |
1894 | if (!dir->cumulative) |
1895 | return 0; | |
1896 | } | |
1897 | } | |
1898 | } | |
1899 | return this_dir; | |
1900 | } | |
1901 | ||
441bca0b LT |
1902 | static int dirstat_compare(const void *_a, const void *_b) |
1903 | { | |
1904 | const struct dirstat_file *a = _a; | |
1905 | const struct dirstat_file *b = _b; | |
1906 | return strcmp(a->name, b->name); | |
1907 | } | |
1908 | ||
c04a7155 | 1909 | static void show_dirstat(struct diff_options *options) |
7df7c019 LT |
1910 | { |
1911 | int i; | |
1912 | unsigned long changed; | |
c04a7155 JH |
1913 | struct dirstat_dir dir; |
1914 | struct diff_queue_struct *q = &diff_queued_diff; | |
1915 | ||
1916 | dir.files = NULL; | |
1917 | dir.alloc = 0; | |
1918 | dir.nr = 0; | |
712d2c7d | 1919 | dir.permille = options->dirstat_permille; |
f88d225f | 1920 | dir.cumulative = DIFF_OPT_TST(options, DIRSTAT_CUMULATIVE); |
7df7c019 | 1921 | |
7df7c019 | 1922 | changed = 0; |
c04a7155 JH |
1923 | for (i = 0; i < q->nr; i++) { |
1924 | struct diff_filepair *p = q->queue[i]; | |
1925 | const char *name; | |
1926 | unsigned long copied, added, damage; | |
0133dab7 | 1927 | int content_changed; |
c04a7155 | 1928 | |
2ca86714 | 1929 | name = p->two->path ? p->two->path : p->one->path; |
c04a7155 | 1930 | |
0133dab7 JH |
1931 | if (p->one->sha1_valid && p->two->sha1_valid) |
1932 | content_changed = hashcmp(p->one->sha1, p->two->sha1); | |
1933 | else | |
1934 | content_changed = 1; | |
1935 | ||
2ff3a803 JH |
1936 | if (!content_changed) { |
1937 | /* | |
1938 | * The SHA1 has not changed, so pre-/post-content is | |
1939 | * identical. We can therefore skip looking at the | |
1940 | * file contents altogether. | |
1941 | */ | |
1942 | damage = 0; | |
1943 | goto found_damage; | |
1944 | } | |
1945 | ||
0133dab7 JH |
1946 | if (DIFF_OPT_TST(options, DIRSTAT_BY_FILE)) { |
1947 | /* | |
1948 | * In --dirstat-by-file mode, we don't really need to | |
1949 | * look at the actual file contents at all. | |
1950 | * The fact that the SHA1 changed is enough for us to | |
1951 | * add this file to the list of results | |
1952 | * (with each file contributing equal damage). | |
1953 | */ | |
2ff3a803 | 1954 | damage = 1; |
0133dab7 JH |
1955 | goto found_damage; |
1956 | } | |
c04a7155 JH |
1957 | |
1958 | if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) { | |
1959 | diff_populate_filespec(p->one, 0); | |
1960 | diff_populate_filespec(p->two, 0); | |
1961 | diffcore_count_changes(p->one, p->two, NULL, NULL, 0, | |
1962 | &copied, &added); | |
1963 | diff_free_filespec_data(p->one); | |
1964 | diff_free_filespec_data(p->two); | |
1965 | } else if (DIFF_FILE_VALID(p->one)) { | |
8e5dd3d6 | 1966 | diff_populate_filespec(p->one, CHECK_SIZE_ONLY); |
c04a7155 JH |
1967 | copied = added = 0; |
1968 | diff_free_filespec_data(p->one); | |
1969 | } else if (DIFF_FILE_VALID(p->two)) { | |
8e5dd3d6 | 1970 | diff_populate_filespec(p->two, CHECK_SIZE_ONLY); |
c04a7155 JH |
1971 | copied = 0; |
1972 | added = p->two->size; | |
1973 | diff_free_filespec_data(p->two); | |
1974 | } else | |
2b0b551d | 1975 | continue; |
c04a7155 JH |
1976 | |
1977 | /* | |
1978 | * Original minus copied is the removed material, | |
1979 | * added is the new material. They are both damages | |
0133dab7 | 1980 | * made to the preimage. |
2ff3a803 JH |
1981 | * If the resulting damage is zero, we know that |
1982 | * diffcore_count_changes() considers the two entries to | |
1983 | * be identical, but since content_changed is true, we | |
1984 | * know that there must have been _some_ kind of change, | |
1985 | * so we force all entries to have damage > 0. | |
c04a7155 JH |
1986 | */ |
1987 | damage = (p->one->size - copied) + added; | |
2ff3a803 | 1988 | if (!damage) |
fd33777b | 1989 | damage = 1; |
c04a7155 | 1990 | |
0133dab7 | 1991 | found_damage: |
c04a7155 JH |
1992 | ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc); |
1993 | dir.files[dir.nr].name = name; | |
1994 | dir.files[dir.nr].changed = damage; | |
1995 | changed += damage; | |
1996 | dir.nr++; | |
7df7c019 LT |
1997 | } |
1998 | ||
1999 | /* This can happen even with many files, if everything was renames */ | |
2000 | if (!changed) | |
2001 | return; | |
2002 | ||
2003 | /* Show all directories with more than x% of the changes */ | |
441bca0b | 2004 | qsort(dir.files, dir.nr, sizeof(dir.files[0]), dirstat_compare); |
7be57610 | 2005 | gather_dirstat(options, &dir, changed, "", 0); |
7df7c019 LT |
2006 | } |
2007 | ||
1c57a627 JH |
2008 | static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *options) |
2009 | { | |
2010 | int i; | |
2011 | unsigned long changed; | |
2012 | struct dirstat_dir dir; | |
2013 | ||
2014 | if (data->nr == 0) | |
2015 | return; | |
2016 | ||
2017 | dir.files = NULL; | |
2018 | dir.alloc = 0; | |
2019 | dir.nr = 0; | |
2020 | dir.permille = options->dirstat_permille; | |
2021 | dir.cumulative = DIFF_OPT_TST(options, DIRSTAT_CUMULATIVE); | |
2022 | ||
2023 | changed = 0; | |
2024 | for (i = 0; i < data->nr; i++) { | |
2025 | struct diffstat_file *file = data->files[i]; | |
2026 | unsigned long damage = file->added + file->deleted; | |
2027 | if (file->is_binary) | |
2028 | /* | |
2029 | * binary files counts bytes, not lines. Must find some | |
2030 | * way to normalize binary bytes vs. textual lines. | |
2031 | * The following heuristic assumes that there are 64 | |
2032 | * bytes per "line". | |
2033 | * This is stupid and ugly, but very cheap... | |
2034 | */ | |
2035 | damage = (damage + 63) / 64; | |
2036 | ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc); | |
2037 | dir.files[dir.nr].name = file->name; | |
2038 | dir.files[dir.nr].changed = damage; | |
2039 | changed += damage; | |
2040 | dir.nr++; | |
2041 | } | |
2042 | ||
2043 | /* This can happen even with many files, if everything was renames */ | |
2044 | if (!changed) | |
2045 | return; | |
2046 | ||
2047 | /* Show all directories with more than x% of the changes */ | |
2048 | qsort(dir.files, dir.nr, sizeof(dir.files[0]), dirstat_compare); | |
2049 | gather_dirstat(options, &dir, changed, "", 0); | |
2050 | } | |
2051 | ||
f604652e JH |
2052 | static void free_diffstat_info(struct diffstat_t *diffstat) |
2053 | { | |
2054 | int i; | |
2055 | for (i = 0; i < diffstat->nr; i++) { | |
2056 | struct diffstat_file *f = diffstat->files[i]; | |
2057 | if (f->name != f->print_name) | |
2058 | free(f->print_name); | |
2059 | free(f->name); | |
2060 | free(f->from_name); | |
2061 | free(f); | |
2062 | } | |
2063 | free(diffstat->files); | |
2064 | } | |
2065 | ||
88246898 | 2066 | struct checkdiff_t { |
88246898 | 2067 | const char *filename; |
1ba111d1 | 2068 | int lineno; |
a757c646 | 2069 | int conflict_marker_size; |
1ba111d1 | 2070 | struct diff_options *o; |
cf1b7869 | 2071 | unsigned ws_rule; |
62c64895 | 2072 | unsigned status; |
88246898 JS |
2073 | }; |
2074 | ||
a757c646 | 2075 | static int is_conflict_marker(const char *line, int marker_size, unsigned long len) |
04954043 JH |
2076 | { |
2077 | char firstchar; | |
2078 | int cnt; | |
2079 | ||
a757c646 | 2080 | if (len < marker_size + 1) |
04954043 JH |
2081 | return 0; |
2082 | firstchar = line[0]; | |
2083 | switch (firstchar) { | |
a757c646 | 2084 | case '=': case '>': case '<': case '|': |
04954043 JH |
2085 | break; |
2086 | default: | |
2087 | return 0; | |
2088 | } | |
a757c646 | 2089 | for (cnt = 1; cnt < marker_size; cnt++) |
04954043 JH |
2090 | if (line[cnt] != firstchar) |
2091 | return 0; | |
a757c646 JH |
2092 | /* line[1] thru line[marker_size-1] are same as firstchar */ |
2093 | if (len < marker_size + 1 || !isspace(line[marker_size])) | |
04954043 | 2094 | return 0; |
04954043 JH |
2095 | return 1; |
2096 | } | |
2097 | ||
88246898 JS |
2098 | static void checkdiff_consume(void *priv, char *line, unsigned long len) |
2099 | { | |
2100 | struct checkdiff_t *data = priv; | |
a757c646 | 2101 | int marker_size = data->conflict_marker_size; |
f1c96261 JK |
2102 | const char *ws = diff_get_color(data->o->use_color, DIFF_WHITESPACE); |
2103 | const char *reset = diff_get_color(data->o->use_color, DIFF_RESET); | |
2104 | const char *set = diff_get_color(data->o->use_color, DIFF_FILE_NEW); | |
c1795bb0 | 2105 | char *err; |
30997bb8 | 2106 | const char *line_prefix; |
7be57610 BY |
2107 | |
2108 | assert(data->o); | |
30997bb8 | 2109 | line_prefix = diff_line_prefix(data->o); |
88246898 JS |
2110 | |
2111 | if (line[0] == '+') { | |
18374e58 | 2112 | unsigned bad; |
0ef617f4 | 2113 | data->lineno++; |
a757c646 | 2114 | if (is_conflict_marker(line + 1, marker_size, len - 1)) { |
04954043 JH |
2115 | data->status |= 1; |
2116 | fprintf(data->o->file, | |
7be57610 BY |
2117 | "%s%s:%d: leftover conflict marker\n", |
2118 | line_prefix, data->filename, data->lineno); | |
04954043 | 2119 | } |
8f8841e9 | 2120 | bad = ws_check(line + 1, len - 1, data->ws_rule); |
18374e58 | 2121 | if (!bad) |
c1795bb0 | 2122 | return; |
18374e58 JH |
2123 | data->status |= bad; |
2124 | err = whitespace_error_string(bad); | |
7be57610 BY |
2125 | fprintf(data->o->file, "%s%s:%d: %s.\n", |
2126 | line_prefix, data->filename, data->lineno, err); | |
c1795bb0 | 2127 | free(err); |
a3c158d4 | 2128 | emit_line(data->o, set, reset, line, 1); |
8f8841e9 | 2129 | ws_check_emit(line + 1, len - 1, data->ws_rule, |
1ba111d1 | 2130 | data->o->file, set, reset, ws); |
877f23cc | 2131 | } else if (line[0] == ' ') { |
88246898 | 2132 | data->lineno++; |
877f23cc | 2133 | } else if (line[0] == '@') { |
88246898 JS |
2134 | char *plus = strchr(line, '+'); |
2135 | if (plus) | |
0ef617f4 | 2136 | data->lineno = strtol(plus, NULL, 10) - 1; |
88246898 JS |
2137 | else |
2138 | die("invalid diff"); | |
2139 | } | |
2140 | } | |
2141 | ||
0660626c JH |
2142 | static unsigned char *deflate_it(char *data, |
2143 | unsigned long size, | |
2144 | unsigned long *result_size) | |
051308f6 | 2145 | { |
0660626c JH |
2146 | int bound; |
2147 | unsigned char *deflated; | |
ef49a7a0 | 2148 | git_zstream stream; |
0660626c | 2149 | |
55bb5c91 | 2150 | git_deflate_init(&stream, zlib_compression_level); |
225a6f10 | 2151 | bound = git_deflate_bound(&stream, size); |
0660626c JH |
2152 | deflated = xmalloc(bound); |
2153 | stream.next_out = deflated; | |
2154 | stream.avail_out = bound; | |
2155 | ||
2156 | stream.next_in = (unsigned char *)data; | |
2157 | stream.avail_in = size; | |
55bb5c91 | 2158 | while (git_deflate(&stream, Z_FINISH) == Z_OK) |
0660626c | 2159 | ; /* nothing */ |
55bb5c91 | 2160 | git_deflate_end(&stream); |
0660626c JH |
2161 | *result_size = stream.total_out; |
2162 | return deflated; | |
051308f6 JH |
2163 | } |
2164 | ||
32b367e4 JK |
2165 | static void emit_binary_diff_body(FILE *file, mmfile_t *one, mmfile_t *two, |
2166 | const char *prefix) | |
051308f6 | 2167 | { |
0660626c JH |
2168 | void *cp; |
2169 | void *delta; | |
2170 | void *deflated; | |
2171 | void *data; | |
2172 | unsigned long orig_size; | |
2173 | unsigned long delta_size; | |
2174 | unsigned long deflate_size; | |
2175 | unsigned long data_size; | |
051308f6 | 2176 | |
0660626c JH |
2177 | /* We could do deflated delta, or we could do just deflated two, |
2178 | * whichever is smaller. | |
051308f6 | 2179 | */ |
0660626c JH |
2180 | delta = NULL; |
2181 | deflated = deflate_it(two->ptr, two->size, &deflate_size); | |
2182 | if (one->size && two->size) { | |
2183 | delta = diff_delta(one->ptr, one->size, | |
2184 | two->ptr, two->size, | |
2185 | &delta_size, deflate_size); | |
2186 | if (delta) { | |
2187 | void *to_free = delta; | |
2188 | orig_size = delta_size; | |
2189 | delta = deflate_it(delta, delta_size, &delta_size); | |
2190 | free(to_free); | |
051308f6 JH |
2191 | } |
2192 | } | |
051308f6 | 2193 | |
0660626c | 2194 | if (delta && delta_size < deflate_size) { |
7be57610 | 2195 | fprintf(file, "%sdelta %lu\n", prefix, orig_size); |
0660626c JH |
2196 | free(deflated); |
2197 | data = delta; | |
2198 | data_size = delta_size; | |
2199 | } | |
2200 | else { | |
7be57610 | 2201 | fprintf(file, "%sliteral %lu\n", prefix, two->size); |
0660626c JH |
2202 | free(delta); |
2203 | data = deflated; | |
2204 | data_size = deflate_size; | |
2205 | } | |
051308f6 | 2206 | |
0660626c JH |
2207 | /* emit data encoded in base85 */ |
2208 | cp = data; | |
2209 | while (data_size) { | |
2210 | int bytes = (52 < data_size) ? 52 : data_size; | |
051308f6 | 2211 | char line[70]; |
0660626c | 2212 | data_size -= bytes; |
051308f6 JH |
2213 | if (bytes <= 26) |
2214 | line[0] = bytes + 'A' - 1; | |
2215 | else | |
2216 | line[0] = bytes - 26 + 'a' - 1; | |
2217 | encode_85(line + 1, cp, bytes); | |
1d7f171c | 2218 | cp = (char *) cp + bytes; |
7be57610 | 2219 | fprintf(file, "%s", prefix); |
c0c77734 DB |
2220 | fputs(line, file); |
2221 | fputc('\n', file); | |
051308f6 | 2222 | } |
7be57610 | 2223 | fprintf(file, "%s\n", prefix); |
0660626c | 2224 | free(data); |
051308f6 JH |
2225 | } |
2226 | ||
32b367e4 JK |
2227 | static void emit_binary_diff(FILE *file, mmfile_t *one, mmfile_t *two, |
2228 | const char *prefix) | |
d4c452f0 | 2229 | { |
7be57610 BY |
2230 | fprintf(file, "%sGIT binary patch\n", prefix); |
2231 | emit_binary_diff_body(file, one, two, prefix); | |
2232 | emit_binary_diff_body(file, two, one, prefix); | |
d4c452f0 JH |
2233 | } |
2234 | ||
29a3eefd JH |
2235 | int diff_filespec_is_binary(struct diff_filespec *one) |
2236 | { | |
122aa6f9 JK |
2237 | if (one->is_binary == -1) { |
2238 | diff_filespec_load_driver(one); | |
2239 | if (one->driver->binary != -1) | |
2240 | one->is_binary = one->driver->binary; | |
2241 | else { | |
2242 | if (!one->data && DIFF_FILE_VALID(one)) | |
6bf3b813 NTND |
2243 | diff_populate_filespec(one, CHECK_BINARY); |
2244 | if (one->is_binary == -1 && one->data) | |
122aa6f9 JK |
2245 | one->is_binary = buffer_is_binary(one->data, |
2246 | one->size); | |
2247 | if (one->is_binary == -1) | |
2248 | one->is_binary = 0; | |
2249 | } | |
2250 | } | |
29a3eefd | 2251 | return one->is_binary; |
6973dcae JH |
2252 | } |
2253 | ||
be58e70d | 2254 | static const struct userdiff_funcname *diff_funcname_pattern(struct diff_filespec *one) |
f258475a | 2255 | { |
122aa6f9 JK |
2256 | diff_filespec_load_driver(one); |
2257 | return one->driver->funcname.pattern ? &one->driver->funcname : NULL; | |
f258475a JH |
2258 | } |
2259 | ||
a5a818ee JH |
2260 | void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b) |
2261 | { | |
2262 | if (!options->a_prefix) | |
2263 | options->a_prefix = a; | |
2264 | if (!options->b_prefix) | |
2265 | options->b_prefix = b; | |
2266 | } | |
2267 | ||
a788d7d5 | 2268 | struct userdiff_driver *get_textconv(struct diff_filespec *one) |
04427ac8 JK |
2269 | { |
2270 | if (!DIFF_FILE_VALID(one)) | |
2271 | return NULL; | |
d391c0ff | 2272 | |
04427ac8 | 2273 | diff_filespec_load_driver(one); |
3813e690 | 2274 | return userdiff_get_textconv(one->driver); |
04427ac8 JK |
2275 | } |
2276 | ||
6973dcae JH |
2277 | static void builtin_diff(const char *name_a, |
2278 | const char *name_b, | |
2279 | struct diff_filespec *one, | |
2280 | struct diff_filespec *two, | |
2281 | const char *xfrm_msg, | |
296c6bb2 | 2282 | int must_show_header, |
051308f6 | 2283 | struct diff_options *o, |
6973dcae JH |
2284 | int complete_rewrite) |
2285 | { | |
2286 | mmfile_t mf1, mf2; | |
2287 | const char *lbl[2]; | |
2288 | char *a_one, *b_two; | |
d9c552f1 | 2289 | const char *meta = diff_get_color_opt(o, DIFF_METAINFO); |
8f67f8ae | 2290 | const char *reset = diff_get_color_opt(o, DIFF_RESET); |
a5a818ee | 2291 | const char *a_prefix, *b_prefix; |
d9bae1a1 JK |
2292 | struct userdiff_driver *textconv_one = NULL; |
2293 | struct userdiff_driver *textconv_two = NULL; | |
3e97c7c6 | 2294 | struct strbuf header = STRBUF_INIT; |
30997bb8 | 2295 | const char *line_prefix = diff_line_prefix(o); |
a5a818ee | 2296 | |
752c0c24 JS |
2297 | if (DIFF_OPT_TST(o, SUBMODULE_LOG) && |
2298 | (!one->mode || S_ISGITLINK(one->mode)) && | |
2299 | (!two->mode || S_ISGITLINK(two->mode))) { | |
2300 | const char *del = diff_get_color_opt(o, DIFF_FILE_OLD); | |
2301 | const char *add = diff_get_color_opt(o, DIFF_FILE_NEW); | |
3b0c18af | 2302 | show_submodule_summary(o->file, one->path ? one->path : two->path, |
0f33a067 | 2303 | line_prefix, |
721ceec1 | 2304 | one->sha1, two->sha1, two->dirty_submodule, |
4e215131 | 2305 | meta, del, add, reset); |
752c0c24 JS |
2306 | return; |
2307 | } | |
2308 | ||
3aa1f7ca JK |
2309 | if (DIFF_OPT_TST(o, ALLOW_TEXTCONV)) { |
2310 | textconv_one = get_textconv(one); | |
2311 | textconv_two = get_textconv(two); | |
2312 | } | |
2313 | ||
a5a818ee JH |
2314 | diff_set_mnemonic_prefix(o, "a/", "b/"); |
2315 | if (DIFF_OPT_TST(o, REVERSE_DIFF)) { | |
2316 | a_prefix = o->b_prefix; | |
2317 | b_prefix = o->a_prefix; | |
2318 | } else { | |
2319 | a_prefix = o->a_prefix; | |
2320 | b_prefix = o->b_prefix; | |
2321 | } | |
6973dcae | 2322 | |
71b989e7 LT |
2323 | /* Never use a non-valid filename anywhere if at all possible */ |
2324 | name_a = DIFF_FILE_VALID(one) ? name_a : name_b; | |
2325 | name_b = DIFF_FILE_VALID(two) ? name_b : name_a; | |
2326 | ||
a5a818ee JH |
2327 | a_one = quote_two(a_prefix, name_a + (*name_a == '/')); |
2328 | b_two = quote_two(b_prefix, name_b + (*name_b == '/')); | |
6973dcae JH |
2329 | lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null"; |
2330 | lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null"; | |
d9c552f1 | 2331 | strbuf_addf(&header, "%s%sdiff --git %s %s%s\n", line_prefix, meta, a_one, b_two, reset); |
6973dcae JH |
2332 | if (lbl[0][0] == '/') { |
2333 | /* /dev/null */ | |
d9c552f1 | 2334 | strbuf_addf(&header, "%s%snew file mode %06o%s\n", line_prefix, meta, two->mode, reset); |
37466447 BW |
2335 | if (xfrm_msg) |
2336 | strbuf_addstr(&header, xfrm_msg); | |
296c6bb2 | 2337 | must_show_header = 1; |
6973dcae JH |
2338 | } |
2339 | else if (lbl[1][0] == '/') { | |
d9c552f1 | 2340 | strbuf_addf(&header, "%s%sdeleted file mode %06o%s\n", line_prefix, meta, one->mode, reset); |
37466447 BW |
2341 | if (xfrm_msg) |
2342 | strbuf_addstr(&header, xfrm_msg); | |
296c6bb2 | 2343 | must_show_header = 1; |
6973dcae JH |
2344 | } |
2345 | else { | |
2346 | if (one->mode != two->mode) { | |
d9c552f1 JK |
2347 | strbuf_addf(&header, "%s%sold mode %06o%s\n", line_prefix, meta, one->mode, reset); |
2348 | strbuf_addf(&header, "%s%snew mode %06o%s\n", line_prefix, meta, two->mode, reset); | |
296c6bb2 | 2349 | must_show_header = 1; |
cd112cef | 2350 | } |
37466447 BW |
2351 | if (xfrm_msg) |
2352 | strbuf_addstr(&header, xfrm_msg); | |
3e97c7c6 | 2353 | |
6973dcae JH |
2354 | /* |
2355 | * we do not run diff between different kind | |
2356 | * of objects. | |
2357 | */ | |
2358 | if ((one->mode ^ two->mode) & S_IFMT) | |
2359 | goto free_ab_and_return; | |
0c01857d | 2360 | if (complete_rewrite && |
3aa1f7ca JK |
2361 | (textconv_one || !diff_filespec_is_binary(one)) && |
2362 | (textconv_two || !diff_filespec_is_binary(two))) { | |
3e97c7c6 GB |
2363 | fprintf(o->file, "%s", header.buf); |
2364 | strbuf_reset(&header); | |
3aa1f7ca JK |
2365 | emit_rewrite_diff(name_a, name_b, one, two, |
2366 | textconv_one, textconv_two, o); | |
34a5e1a2 | 2367 | o->found_changes = 1; |
6973dcae JH |
2368 | goto free_ab_and_return; |
2369 | } | |
2370 | } | |
2371 | ||
467ddc14 JH |
2372 | if (o->irreversible_delete && lbl[1][0] == '/') { |
2373 | fprintf(o->file, "%s", header.buf); | |
2374 | strbuf_reset(&header); | |
2375 | goto free_ab_and_return; | |
2376 | } else if (!DIFF_OPT_TST(o, TEXT) && | |
b3373982 JK |
2377 | ( (!textconv_one && diff_filespec_is_binary(one)) || |
2378 | (!textconv_two && diff_filespec_is_binary(two)) )) { | |
1aaf69e6 NTND |
2379 | if (!one->data && !two->data && |
2380 | S_ISREG(one->mode) && S_ISREG(two->mode) && | |
2381 | !DIFF_OPT_TST(o, BINARY)) { | |
2382 | if (!hashcmp(one->sha1, two->sha1)) { | |
2383 | if (must_show_header) | |
2384 | fprintf(o->file, "%s", header.buf); | |
2385 | goto free_ab_and_return; | |
2386 | } | |
2387 | fprintf(o->file, "%s", header.buf); | |
2388 | fprintf(o->file, "%sBinary files %s and %s differ\n", | |
2389 | line_prefix, lbl[0], lbl[1]); | |
2390 | goto free_ab_and_return; | |
2391 | } | |
b3373982 JK |
2392 | if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0) |
2393 | die("unable to read files to diff"); | |
0660626c JH |
2394 | /* Quite common confusing case */ |
2395 | if (mf1.size == mf2.size && | |
296c6bb2 CC |
2396 | !memcmp(mf1.ptr, mf2.ptr, mf1.size)) { |
2397 | if (must_show_header) | |
2398 | fprintf(o->file, "%s", header.buf); | |
0660626c | 2399 | goto free_ab_and_return; |
296c6bb2 | 2400 | } |
3e97c7c6 GB |
2401 | fprintf(o->file, "%s", header.buf); |
2402 | strbuf_reset(&header); | |
8f67f8ae | 2403 | if (DIFF_OPT_TST(o, BINARY)) |
7be57610 | 2404 | emit_binary_diff(o->file, &mf1, &mf2, line_prefix); |
051308f6 | 2405 | else |
7be57610 BY |
2406 | fprintf(o->file, "%sBinary files %s and %s differ\n", |
2407 | line_prefix, lbl[0], lbl[1]); | |
34a5e1a2 | 2408 | o->found_changes = 1; |
467ddc14 | 2409 | } else { |
6973dcae JH |
2410 | /* Crazy xdl interfaces.. */ |
2411 | const char *diffopts = getenv("GIT_DIFF_OPTS"); | |
ae021d87 | 2412 | const char *v; |
6973dcae JH |
2413 | xpparam_t xpp; |
2414 | xdemitconf_t xecfg; | |
6973dcae | 2415 | struct emit_callback ecbdata; |
be58e70d | 2416 | const struct userdiff_funcname *pe; |
f258475a | 2417 | |
b3f01ff2 | 2418 | if (must_show_header) { |
3e97c7c6 GB |
2419 | fprintf(o->file, "%s", header.buf); |
2420 | strbuf_reset(&header); | |
2421 | } | |
2422 | ||
840383b2 JK |
2423 | mf1.size = fill_textconv(textconv_one, one, &mf1.ptr); |
2424 | mf2.size = fill_textconv(textconv_two, two, &mf2.ptr); | |
04427ac8 | 2425 | |
45e7ca0f BC |
2426 | pe = diff_funcname_pattern(one); |
2427 | if (!pe) | |
2428 | pe = diff_funcname_pattern(two); | |
6973dcae | 2429 | |
9ccd0a88 | 2430 | memset(&xpp, 0, sizeof(xpp)); |
30b25010 | 2431 | memset(&xecfg, 0, sizeof(xecfg)); |
cd112cef | 2432 | memset(&ecbdata, 0, sizeof(ecbdata)); |
6973dcae | 2433 | ecbdata.label_path = lbl; |
daa0c3d9 | 2434 | ecbdata.color_diff = want_color(o->use_color); |
34a5e1a2 | 2435 | ecbdata.found_changesp = &o->found_changes; |
c189c4f2 | 2436 | ecbdata.ws_rule = whitespace_rule(name_b); |
690ed843 | 2437 | if (ecbdata.ws_rule & WS_BLANK_AT_EOF) |
d68fe26f | 2438 | check_blank_at_eof(&mf1, &mf2, &ecbdata); |
a3c158d4 | 2439 | ecbdata.opt = o; |
3e97c7c6 | 2440 | ecbdata.header = header.len ? &header : NULL; |
582aa00b | 2441 | xpp.flags = o->xdl_opts; |
ee1e5412 | 2442 | xecfg.ctxlen = o->context; |
6d0e674a | 2443 | xecfg.interhunkctxlen = o->interhunkcontext; |
6973dcae | 2444 | xecfg.flags = XDL_EMIT_FUNCNAMES; |
14937c2c RS |
2445 | if (DIFF_OPT_TST(o, FUNCCONTEXT)) |
2446 | xecfg.flags |= XDL_EMIT_FUNCCONTEXT; | |
45e7ca0f | 2447 | if (pe) |
a013585b | 2448 | xdiff_set_find_func(&xecfg, pe->pattern, pe->cflags); |
6973dcae JH |
2449 | if (!diffopts) |
2450 | ; | |
ae021d87 JK |
2451 | else if (skip_prefix(diffopts, "--unified=", &v)) |
2452 | xecfg.ctxlen = strtoul(v, NULL, 10); | |
2453 | else if (skip_prefix(diffopts, "-u", &v)) | |
2454 | xecfg.ctxlen = strtoul(v, NULL, 10); | |
77d1a520 TR |
2455 | if (o->word_diff) |
2456 | init_diff_words_data(&ecbdata, o, one, two); | |
3efb9880 JK |
2457 | if (xdi_diff_outf(&mf1, &mf2, fn_out_consume, &ecbdata, |
2458 | &xpp, &xecfg)) | |
2459 | die("unable to generate diff for %s", one->path); | |
882749a0 | 2460 | if (o->word_diff) |
f59a59e2 | 2461 | free_diff_words_data(&ecbdata); |
04427ac8 JK |
2462 | if (textconv_one) |
2463 | free(mf1.ptr); | |
2464 | if (textconv_two) | |
2465 | free(mf2.ptr); | |
8cfe5f1c | 2466 | xdiff_clear_find_func(&xecfg); |
6973dcae JH |
2467 | } |
2468 | ||
2469 | free_ab_and_return: | |
3e97c7c6 | 2470 | strbuf_release(&header); |
fc3abdf5 JH |
2471 | diff_free_filespec_data(one); |
2472 | diff_free_filespec_data(two); | |
6973dcae JH |
2473 | free(a_one); |
2474 | free(b_two); | |
2475 | return; | |
2476 | } | |
2477 | ||
2478 | static void builtin_diffstat(const char *name_a, const char *name_b, | |
2479 | struct diff_filespec *one, | |
2480 | struct diff_filespec *two, | |
710158e3 | 2481 | struct diffstat_t *diffstat, |
0d21efa5 | 2482 | struct diff_options *o, |
74faaa16 | 2483 | struct diff_filepair *p) |
6973dcae JH |
2484 | { |
2485 | mmfile_t mf1, mf2; | |
2486 | struct diffstat_file *data; | |
352ca4e1 | 2487 | int same_contents; |
74faaa16 LT |
2488 | int complete_rewrite = 0; |
2489 | ||
2490 | if (!DIFF_PAIR_UNMERGED(p)) { | |
2491 | if (p->status == DIFF_STATUS_MODIFIED && p->score) | |
2492 | complete_rewrite = 1; | |
2493 | } | |
6973dcae JH |
2494 | |
2495 | data = diffstat_add(diffstat, name_a, name_b); | |
99bfd407 | 2496 | data->is_interesting = p->status != DIFF_STATUS_UNKNOWN; |
6973dcae JH |
2497 | |
2498 | if (!one || !two) { | |
2499 | data->is_unmerged = 1; | |
2500 | return; | |
2501 | } | |
ded0abc7 | 2502 | |
352ca4e1 ZJS |
2503 | same_contents = !hashcmp(one->sha1, two->sha1); |
2504 | ||
ded0abc7 | 2505 | if (diff_filespec_is_binary(one) || diff_filespec_is_binary(two)) { |
ded0abc7 | 2506 | data->is_binary = 1; |
352ca4e1 | 2507 | if (same_contents) { |
e18872b2 ZJS |
2508 | data->added = 0; |
2509 | data->deleted = 0; | |
2510 | } else { | |
2511 | data->added = diff_filespec_size(two); | |
2512 | data->deleted = diff_filespec_size(one); | |
2513 | } | |
ded0abc7 JK |
2514 | } |
2515 | ||
2516 | else if (complete_rewrite) { | |
710158e3 JH |
2517 | diff_populate_filespec(one, 0); |
2518 | diff_populate_filespec(two, 0); | |
2519 | data->deleted = count_lines(one->data, one->size); | |
2520 | data->added = count_lines(two->data, two->size); | |
710158e3 | 2521 | } |
6973dcae | 2522 | |
352ca4e1 | 2523 | else if (!same_contents) { |
6973dcae JH |
2524 | /* Crazy xdl interfaces.. */ |
2525 | xpparam_t xpp; | |
2526 | xdemitconf_t xecfg; | |
6973dcae | 2527 | |
ded0abc7 JK |
2528 | if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0) |
2529 | die("unable to read files to diff"); | |
2530 | ||
9ccd0a88 | 2531 | memset(&xpp, 0, sizeof(xpp)); |
30b25010 | 2532 | memset(&xecfg, 0, sizeof(xecfg)); |
582aa00b | 2533 | xpp.flags = o->xdl_opts; |
f01cae91 JH |
2534 | xecfg.ctxlen = o->context; |
2535 | xecfg.interhunkctxlen = o->interhunkcontext; | |
3efb9880 JK |
2536 | if (xdi_diff_outf(&mf1, &mf2, diffstat_consume, diffstat, |
2537 | &xpp, &xecfg)) | |
2538 | die("unable to generate diffstat for %s", one->path); | |
6973dcae | 2539 | } |
fc3abdf5 | 2540 | |
fc3abdf5 JH |
2541 | diff_free_filespec_data(one); |
2542 | diff_free_filespec_data(two); | |
6973dcae JH |
2543 | } |
2544 | ||
88246898 | 2545 | static void builtin_checkdiff(const char *name_a, const char *name_b, |
cd676a51 | 2546 | const char *attr_path, |
5ff10dd6 JH |
2547 | struct diff_filespec *one, |
2548 | struct diff_filespec *two, | |
2549 | struct diff_options *o) | |
88246898 JS |
2550 | { |
2551 | mmfile_t mf1, mf2; | |
2552 | struct checkdiff_t data; | |
2553 | ||
2554 | if (!two) | |
2555 | return; | |
2556 | ||
2557 | memset(&data, 0, sizeof(data)); | |
88246898 JS |
2558 | data.filename = name_b ? name_b : name_a; |
2559 | data.lineno = 0; | |
1ba111d1 | 2560 | data.o = o; |
cd676a51 | 2561 | data.ws_rule = whitespace_rule(attr_path); |
a757c646 | 2562 | data.conflict_marker_size = ll_merge_marker_size(attr_path); |
88246898 JS |
2563 | |
2564 | if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0) | |
2565 | die("unable to read files to diff"); | |
2566 | ||
5ff10dd6 JH |
2567 | /* |
2568 | * All the other codepaths check both sides, but not checking | |
2569 | * the "old" side here is deliberate. We are checking the newly | |
2570 | * introduced changes, and as long as the "new" side is text, we | |
2571 | * can and should check what it introduces. | |
2572 | */ | |
29a3eefd | 2573 | if (diff_filespec_is_binary(two)) |
fc3abdf5 | 2574 | goto free_and_return; |
88246898 JS |
2575 | else { |
2576 | /* Crazy xdl interfaces.. */ | |
2577 | xpparam_t xpp; | |
2578 | xdemitconf_t xecfg; | |
88246898 | 2579 | |
9ccd0a88 | 2580 | memset(&xpp, 0, sizeof(xpp)); |
30b25010 | 2581 | memset(&xecfg, 0, sizeof(xecfg)); |
c35539eb | 2582 | xecfg.ctxlen = 1; /* at least one context line */ |
582aa00b | 2583 | xpp.flags = 0; |
3efb9880 JK |
2584 | if (xdi_diff_outf(&mf1, &mf2, checkdiff_consume, &data, |
2585 | &xpp, &xecfg)) | |
2586 | die("unable to generate checkdiff for %s", one->path); | |
877f23cc | 2587 | |
467babf8 | 2588 | if (data.ws_rule & WS_BLANK_AT_EOF) { |
d68fe26f JH |
2589 | struct emit_callback ecbdata; |
2590 | int blank_at_eof; | |
2591 | ||
2592 | ecbdata.ws_rule = data.ws_rule; | |
2593 | check_blank_at_eof(&mf1, &mf2, &ecbdata); | |
8837d335 | 2594 | blank_at_eof = ecbdata.blank_at_eof_in_postimage; |
d68fe26f | 2595 | |
467babf8 JH |
2596 | if (blank_at_eof) { |
2597 | static char *err; | |
2598 | if (!err) | |
2599 | err = whitespace_error_string(WS_BLANK_AT_EOF); | |
2600 | fprintf(o->file, "%s:%d: %s.\n", | |
2601 | data.filename, blank_at_eof, err); | |
2602 | data.status = 1; /* report errors */ | |
2603 | } | |
877f23cc | 2604 | } |
88246898 | 2605 | } |
fc3abdf5 JH |
2606 | free_and_return: |
2607 | diff_free_filespec_data(one); | |
2608 | diff_free_filespec_data(two); | |
62c64895 WC |
2609 | if (data.status) |
2610 | DIFF_OPT_SET(o, CHECK_FAILED); | |
88246898 JS |
2611 | } |
2612 | ||
6973dcae JH |
2613 | struct diff_filespec *alloc_filespec(const char *path) |
2614 | { | |
96ffc06f | 2615 | struct diff_filespec *spec; |
6973dcae | 2616 | |
96ffc06f | 2617 | FLEXPTR_ALLOC_STR(spec, path, path); |
9fb88419 | 2618 | spec->count = 1; |
122aa6f9 | 2619 | spec->is_binary = -1; |
6973dcae JH |
2620 | return spec; |
2621 | } | |
2622 | ||
9fb88419 LT |
2623 | void free_filespec(struct diff_filespec *spec) |
2624 | { | |
2625 | if (!--spec->count) { | |
2626 | diff_free_filespec_data(spec); | |
2627 | free(spec); | |
2628 | } | |
2629 | } | |
2630 | ||
6973dcae | 2631 | void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1, |
e5450100 | 2632 | int sha1_valid, unsigned short mode) |
6973dcae JH |
2633 | { |
2634 | if (mode) { | |
2635 | spec->mode = canon_mode(mode); | |
e702496e | 2636 | hashcpy(spec->sha1, sha1); |
e5450100 | 2637 | spec->sha1_valid = sha1_valid; |
6973dcae JH |
2638 | } |
2639 | } | |
2640 | ||
2641 | /* | |
5adf317b | 2642 | * Given a name and sha1 pair, if the index tells us the file in |
6973dcae JH |
2643 | * the work tree has that object contents, return true, so that |
2644 | * prepare_temp_file() does not have to inflate and extract. | |
2645 | */ | |
1510fea7 | 2646 | static int reuse_worktree_file(const char *name, const unsigned char *sha1, int want_file) |
6973dcae | 2647 | { |
9c5e6c80 | 2648 | const struct cache_entry *ce; |
6973dcae JH |
2649 | struct stat st; |
2650 | int pos, len; | |
2651 | ||
150115ad JH |
2652 | /* |
2653 | * We do not read the cache ourselves here, because the | |
6973dcae JH |
2654 | * benchmark with my previous version that always reads cache |
2655 | * shows that it makes things worse for diff-tree comparing | |
2656 | * two linux-2.6 kernel trees in an already checked out work | |
2657 | * tree. This is because most diff-tree comparisons deal with | |
2658 | * only a small number of files, while reading the cache is | |
2659 | * expensive for a large project, and its cost outweighs the | |
2660 | * savings we get by not inflating the object to a temporary | |
2661 | * file. Practically, this code only helps when we are used | |
2662 | * by diff-cache --cached, which does read the cache before | |
2663 | * calling us. | |
2664 | */ | |
2665 | if (!active_cache) | |
2666 | return 0; | |
2667 | ||
1510fea7 SP |
2668 | /* We want to avoid the working directory if our caller |
2669 | * doesn't need the data in a normal file, this system | |
2670 | * is rather slow with its stat/open/mmap/close syscalls, | |
2671 | * and the object is contained in a pack file. The pack | |
2672 | * is probably already open and will be faster to obtain | |
2673 | * the data through than the working directory. Loose | |
2674 | * objects however would tend to be slower as they need | |
2675 | * to be individually opened and inflated. | |
2676 | */ | |
cd673c1f | 2677 | if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1)) |
1510fea7 SP |
2678 | return 0; |
2679 | ||
6973dcae JH |
2680 | len = strlen(name); |
2681 | pos = cache_name_pos(name, len); | |
2682 | if (pos < 0) | |
2683 | return 0; | |
2684 | ce = active_cache[pos]; | |
eadb5831 JH |
2685 | |
2686 | /* | |
2687 | * This is not the sha1 we are looking for, or | |
2688 | * unreusable because it is not a regular file. | |
2689 | */ | |
2690 | if (hashcmp(sha1, ce->sha1) || !S_ISREG(ce->ce_mode)) | |
6973dcae | 2691 | return 0; |
eadb5831 | 2692 | |
150115ad JH |
2693 | /* |
2694 | * If ce is marked as "assume unchanged", there is no | |
2695 | * guarantee that work tree matches what we are looking for. | |
2696 | */ | |
b4d1690d | 2697 | if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce)) |
150115ad JH |
2698 | return 0; |
2699 | ||
eadb5831 JH |
2700 | /* |
2701 | * If ce matches the file in the work tree, we can reuse it. | |
6973dcae | 2702 | */ |
eadb5831 JH |
2703 | if (ce_uptodate(ce) || |
2704 | (!lstat(name, &st) && !ce_match_stat(ce, &st, 0))) | |
2705 | return 1; | |
2706 | ||
2707 | return 0; | |
6973dcae JH |
2708 | } |
2709 | ||
04786756 LT |
2710 | static int diff_populate_gitlink(struct diff_filespec *s, int size_only) |
2711 | { | |
b1ddfb91 JK |
2712 | struct strbuf buf = STRBUF_INIT; |
2713 | char *dirty = ""; | |
8e08b419 JH |
2714 | |
2715 | /* Are we looking at the work tree? */ | |
85adbf2f | 2716 | if (s->dirty_submodule) |
8e08b419 JH |
2717 | dirty = "-dirty"; |
2718 | ||
b1ddfb91 JK |
2719 | strbuf_addf(&buf, "Subproject commit %s%s\n", sha1_to_hex(s->sha1), dirty); |
2720 | s->size = buf.len; | |
04786756 LT |
2721 | if (size_only) { |
2722 | s->data = NULL; | |
b1ddfb91 JK |
2723 | strbuf_release(&buf); |
2724 | } else { | |
2725 | s->data = strbuf_detach(&buf, NULL); | |
2726 | s->should_free = 1; | |
04786756 LT |
2727 | } |
2728 | return 0; | |
2729 | } | |
2730 | ||
6973dcae JH |
2731 | /* |
2732 | * While doing rename detection and pickaxe operation, we may need to | |
2733 | * grab the data for the blob (or file) for our own in-core comparison. | |
2734 | * diff_filespec has data and size fields for this purpose. | |
2735 | */ | |
8e5dd3d6 | 2736 | int diff_populate_filespec(struct diff_filespec *s, unsigned int flags) |
6973dcae | 2737 | { |
8e5dd3d6 | 2738 | int size_only = flags & CHECK_SIZE_ONLY; |
6973dcae | 2739 | int err = 0; |
5430bb28 JH |
2740 | /* |
2741 | * demote FAIL to WARN to allow inspecting the situation | |
2742 | * instead of refusing. | |
2743 | */ | |
2744 | enum safe_crlf crlf_warn = (safe_crlf == SAFE_CRLF_FAIL | |
2745 | ? SAFE_CRLF_WARN | |
2746 | : safe_crlf); | |
2747 | ||
6973dcae JH |
2748 | if (!DIFF_FILE_VALID(s)) |
2749 | die("internal error: asking to populate invalid file."); | |
2750 | if (S_ISDIR(s->mode)) | |
2751 | return -1; | |
2752 | ||
6973dcae | 2753 | if (s->data) |
fc3abdf5 | 2754 | return 0; |
04786756 | 2755 | |
6e0b8ed6 JH |
2756 | if (size_only && 0 < s->size) |
2757 | return 0; | |
2758 | ||
302b9282 | 2759 | if (S_ISGITLINK(s->mode)) |
04786756 LT |
2760 | return diff_populate_gitlink(s, size_only); |
2761 | ||
6973dcae | 2762 | if (!s->sha1_valid || |
1510fea7 | 2763 | reuse_worktree_file(s->path, s->sha1, 0)) { |
f285a2d7 | 2764 | struct strbuf buf = STRBUF_INIT; |
6973dcae JH |
2765 | struct stat st; |
2766 | int fd; | |
6c510bee | 2767 | |
6973dcae JH |
2768 | if (lstat(s->path, &st) < 0) { |
2769 | if (errno == ENOENT) { | |
2770 | err_empty: | |
2771 | err = -1; | |
2772 | empty: | |
d2543b8e | 2773 | s->data = (char *)""; |
6973dcae JH |
2774 | s->size = 0; |
2775 | return err; | |
2776 | } | |
2777 | } | |
dc49cd76 | 2778 | s->size = xsize_t(st.st_size); |
6973dcae JH |
2779 | if (!s->size) |
2780 | goto empty; | |
6973dcae | 2781 | if (S_ISLNK(st.st_mode)) { |
cf219d8c LT |
2782 | struct strbuf sb = STRBUF_INIT; |
2783 | ||
2784 | if (strbuf_readlink(&sb, s->path, s->size)) | |
6973dcae | 2785 | goto err_empty; |
0956a6db RS |
2786 | s->size = sb.len; |
2787 | s->data = strbuf_detach(&sb, NULL); | |
cf219d8c | 2788 | s->should_free = 1; |
6973dcae JH |
2789 | return 0; |
2790 | } | |
cf219d8c LT |
2791 | if (size_only) |
2792 | return 0; | |
6bf3b813 NTND |
2793 | if ((flags & CHECK_BINARY) && |
2794 | s->size > big_file_threshold && s->is_binary == -1) { | |
2795 | s->is_binary = 1; | |
2796 | return 0; | |
2797 | } | |
6973dcae JH |
2798 | fd = open(s->path, O_RDONLY); |
2799 | if (fd < 0) | |
2800 | goto err_empty; | |
c4712e45 | 2801 | s->data = xmmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0); |
6973dcae | 2802 | close(fd); |
6973dcae | 2803 | s->should_munmap = 1; |
6c510bee LT |
2804 | |
2805 | /* | |
2806 | * Convert from working tree format to canonical git format | |
2807 | */ | |
5430bb28 | 2808 | if (convert_to_git(s->path, s->data, s->size, &buf, crlf_warn)) { |
c32f749f | 2809 | size_t size = 0; |
6c510bee LT |
2810 | munmap(s->data, s->size); |
2811 | s->should_munmap = 0; | |
c32f749f RS |
2812 | s->data = strbuf_detach(&buf, &size); |
2813 | s->size = size; | |
6c510bee LT |
2814 | s->should_free = 1; |
2815 | } | |
6973dcae JH |
2816 | } |
2817 | else { | |
21666f1a | 2818 | enum object_type type; |
6bf3b813 | 2819 | if (size_only || (flags & CHECK_BINARY)) { |
21666f1a | 2820 | type = sha1_object_info(s->sha1, &s->size); |
c50c4316 NP |
2821 | if (type < 0) |
2822 | die("unable to read %s", sha1_to_hex(s->sha1)); | |
6bf3b813 NTND |
2823 | if (size_only) |
2824 | return 0; | |
2825 | if (s->size > big_file_threshold && s->is_binary == -1) { | |
2826 | s->is_binary = 1; | |
2827 | return 0; | |
2828 | } | |
6973dcae | 2829 | } |
6bf3b813 NTND |
2830 | s->data = read_sha1_file(s->sha1, &type, &s->size); |
2831 | if (!s->data) | |
2832 | die("unable to read %s", sha1_to_hex(s->sha1)); | |
2833 | s->should_free = 1; | |
6973dcae JH |
2834 | } |
2835 | return 0; | |
2836 | } | |
2837 | ||
8ae92e63 | 2838 | void diff_free_filespec_blob(struct diff_filespec *s) |
6973dcae JH |
2839 | { |
2840 | if (s->should_free) | |
2841 | free(s->data); | |
2842 | else if (s->should_munmap) | |
2843 | munmap(s->data, s->size); | |
fc3abdf5 JH |
2844 | |
2845 | if (s->should_free || s->should_munmap) { | |
2846 | s->should_free = s->should_munmap = 0; | |
2847 | s->data = NULL; | |
2848 | } | |
eede7b7d JK |
2849 | } |
2850 | ||
2851 | void diff_free_filespec_data(struct diff_filespec *s) | |
2852 | { | |
8ae92e63 | 2853 | diff_free_filespec_blob(s); |
6973dcae JH |
2854 | free(s->cnt_data); |
2855 | s->cnt_data = NULL; | |
2856 | } | |
2857 | ||
4e218f54 | 2858 | static void prep_temp_blob(const char *path, struct diff_tempfile *temp, |
6973dcae JH |
2859 | void *blob, |
2860 | unsigned long size, | |
2861 | const unsigned char *sha1, | |
2862 | int mode) | |
2863 | { | |
2864 | int fd; | |
4e218f54 | 2865 | struct strbuf buf = STRBUF_INIT; |
003b33a8 DA |
2866 | struct strbuf template = STRBUF_INIT; |
2867 | char *path_dup = xstrdup(path); | |
2868 | const char *base = basename(path_dup); | |
6973dcae | 2869 | |
003b33a8 DA |
2870 | /* Generate "XXXXXX_basename.ext" */ |
2871 | strbuf_addstr(&template, "XXXXXX_"); | |
2872 | strbuf_addstr(&template, base); | |
2873 | ||
284098f1 | 2874 | fd = mks_tempfile_ts(&temp->tempfile, template.buf, strlen(base) + 1); |
6973dcae | 2875 | if (fd < 0) |
d824cbba | 2876 | die_errno("unable to create temp-file"); |
4e218f54 JS |
2877 | if (convert_to_working_tree(path, |
2878 | (const char *)blob, (size_t)size, &buf)) { | |
2879 | blob = buf.buf; | |
2880 | size = buf.len; | |
2881 | } | |
93822c22 | 2882 | if (write_in_full(fd, blob, size) != size) |
0721c314 | 2883 | die_errno("unable to write temp-file"); |
284098f1 MH |
2884 | close_tempfile(&temp->tempfile); |
2885 | temp->name = get_tempfile_path(&temp->tempfile); | |
d59f765a | 2886 | sha1_to_hex_r(temp->hex, sha1); |
5096d490 | 2887 | xsnprintf(temp->mode, sizeof(temp->mode), "%06o", mode); |
4e218f54 | 2888 | strbuf_release(&buf); |
003b33a8 DA |
2889 | strbuf_release(&template); |
2890 | free(path_dup); | |
6973dcae JH |
2891 | } |
2892 | ||
479b0ae8 JK |
2893 | static struct diff_tempfile *prepare_temp_file(const char *name, |
2894 | struct diff_filespec *one) | |
6973dcae | 2895 | { |
479b0ae8 JK |
2896 | struct diff_tempfile *temp = claim_diff_tempfile(); |
2897 | ||
6973dcae JH |
2898 | if (!DIFF_FILE_VALID(one)) { |
2899 | not_a_valid_file: | |
2900 | /* A '-' entry produces this for file-2, and | |
2901 | * a '+' entry produces this for file-1. | |
2902 | */ | |
2903 | temp->name = "/dev/null"; | |
5096d490 JK |
2904 | xsnprintf(temp->hex, sizeof(temp->hex), "."); |
2905 | xsnprintf(temp->mode, sizeof(temp->mode), "."); | |
479b0ae8 JK |
2906 | return temp; |
2907 | } | |
2908 | ||
aba47272 TR |
2909 | if (!S_ISGITLINK(one->mode) && |
2910 | (!one->sha1_valid || | |
2911 | reuse_worktree_file(name, one->sha1, 1))) { | |
6973dcae JH |
2912 | struct stat st; |
2913 | if (lstat(name, &st) < 0) { | |
2914 | if (errno == ENOENT) | |
2915 | goto not_a_valid_file; | |
d824cbba | 2916 | die_errno("stat(%s)", name); |
6973dcae JH |
2917 | } |
2918 | if (S_ISLNK(st.st_mode)) { | |
3cd7388d JK |
2919 | struct strbuf sb = STRBUF_INIT; |
2920 | if (strbuf_readlink(&sb, name, st.st_size) < 0) | |
0721c314 | 2921 | die_errno("readlink(%s)", name); |
3cd7388d | 2922 | prep_temp_blob(name, temp, sb.buf, sb.len, |
6973dcae JH |
2923 | (one->sha1_valid ? |
2924 | one->sha1 : null_sha1), | |
2925 | (one->sha1_valid ? | |
2926 | one->mode : S_IFLNK)); | |
3cd7388d | 2927 | strbuf_release(&sb); |
6973dcae JH |
2928 | } |
2929 | else { | |
2930 | /* we can borrow from the file in the work tree */ | |
2931 | temp->name = name; | |
2932 | if (!one->sha1_valid) | |
d59f765a | 2933 | sha1_to_hex_r(temp->hex, null_sha1); |
6973dcae | 2934 | else |
d59f765a | 2935 | sha1_to_hex_r(temp->hex, one->sha1); |
6973dcae JH |
2936 | /* Even though we may sometimes borrow the |
2937 | * contents from the work tree, we always want | |
2938 | * one->mode. mode is trustworthy even when | |
2939 | * !(one->sha1_valid), as long as | |
2940 | * DIFF_FILE_VALID(one). | |
2941 | */ | |
5096d490 | 2942 | xsnprintf(temp->mode, sizeof(temp->mode), "%06o", one->mode); |
6973dcae | 2943 | } |
479b0ae8 | 2944 | return temp; |
6973dcae JH |
2945 | } |
2946 | else { | |
2947 | if (diff_populate_filespec(one, 0)) | |
2948 | die("cannot read data blob for %s", one->path); | |
4e218f54 | 2949 | prep_temp_blob(name, temp, one->data, one->size, |
6973dcae JH |
2950 | one->sha1, one->mode); |
2951 | } | |
479b0ae8 | 2952 | return temp; |
6973dcae JH |
2953 | } |
2954 | ||
f3efe787 JK |
2955 | static void add_external_diff_name(struct argv_array *argv, |
2956 | const char *name, | |
2957 | struct diff_filespec *df) | |
2958 | { | |
2959 | struct diff_tempfile *temp = prepare_temp_file(name, df); | |
2960 | argv_array_push(argv, temp->name); | |
2961 | argv_array_push(argv, temp->hex); | |
2962 | argv_array_push(argv, temp->mode); | |
2963 | } | |
2964 | ||
6973dcae JH |
2965 | /* An external diff command takes: |
2966 | * | |
2967 | * diff-cmd name infile1 infile1-sha1 infile1-mode \ | |
2968 | * infile2 infile2-sha1 infile2-mode [ rename-to ] | |
2969 | * | |
2970 | */ | |
2971 | static void run_external_diff(const char *pgm, | |
2972 | const char *name, | |
2973 | const char *other, | |
2974 | struct diff_filespec *one, | |
2975 | struct diff_filespec *two, | |
2976 | const char *xfrm_msg, | |
ee7fb0b1 ZK |
2977 | int complete_rewrite, |
2978 | struct diff_options *o) | |
6973dcae | 2979 | { |
82fbf269 | 2980 | struct argv_array argv = ARGV_ARRAY_INIT; |
ae049c95 | 2981 | struct argv_array env = ARGV_ARRAY_INIT; |
ee7fb0b1 | 2982 | struct diff_queue_struct *q = &diff_queued_diff; |
6973dcae | 2983 | |
0d4217d9 JK |
2984 | argv_array_push(&argv, pgm); |
2985 | argv_array_push(&argv, name); | |
6973dcae | 2986 | |
6973dcae | 2987 | if (one && two) { |
f3efe787 JK |
2988 | add_external_diff_name(&argv, name, one); |
2989 | if (!other) | |
2990 | add_external_diff_name(&argv, name, two); | |
2991 | else { | |
2992 | add_external_diff_name(&argv, other, two); | |
82fbf269 JK |
2993 | argv_array_push(&argv, other); |
2994 | argv_array_push(&argv, xfrm_msg); | |
6973dcae | 2995 | } |
6973dcae | 2996 | } |
ee7fb0b1 | 2997 | |
ae049c95 JK |
2998 | argv_array_pushf(&env, "GIT_DIFF_PATH_COUNTER=%d", ++o->diff_path_counter); |
2999 | argv_array_pushf(&env, "GIT_DIFF_PATH_TOTAL=%d", q->nr); | |
ee7fb0b1 | 3000 | |
89294d14 JK |
3001 | if (run_command_v_opt_cd_env(argv.argv, RUN_USING_SHELL, NULL, env.argv)) |
3002 | die(_("external diff died, stopping at %s"), name); | |
ee7fb0b1 | 3003 | |
6973dcae | 3004 | remove_tempfile(); |
82fbf269 | 3005 | argv_array_clear(&argv); |
ae049c95 | 3006 | argv_array_clear(&env); |
6973dcae JH |
3007 | } |
3008 | ||
b67b9612 JH |
3009 | static int similarity_index(struct diff_filepair *p) |
3010 | { | |
3011 | return p->score * 100 / MAX_SCORE; | |
3012 | } | |
3013 | ||
3014 | static void fill_metainfo(struct strbuf *msg, | |
3015 | const char *name, | |
3016 | const char *other, | |
3017 | struct diff_filespec *one, | |
3018 | struct diff_filespec *two, | |
3019 | struct diff_options *o, | |
37466447 | 3020 | struct diff_filepair *p, |
5977744d | 3021 | int *must_show_header, |
37466447 | 3022 | int use_color) |
b67b9612 | 3023 | { |
37466447 BW |
3024 | const char *set = diff_get_color(use_color, DIFF_METAINFO); |
3025 | const char *reset = diff_get_color(use_color, DIFF_RESET); | |
30997bb8 | 3026 | const char *line_prefix = diff_line_prefix(o); |
7be57610 | 3027 | |
296c6bb2 | 3028 | *must_show_header = 1; |
b67b9612 JH |
3029 | strbuf_init(msg, PATH_MAX * 2 + 300); |
3030 | switch (p->status) { | |
3031 | case DIFF_STATUS_COPIED: | |
98ad90fb JH |
3032 | strbuf_addf(msg, "%s%ssimilarity index %d%%", |
3033 | line_prefix, set, similarity_index(p)); | |
3034 | strbuf_addf(msg, "%s\n%s%scopy from ", | |
3035 | reset, line_prefix, set); | |
b67b9612 | 3036 | quote_c_style(name, msg, NULL, 0); |
98ad90fb | 3037 | strbuf_addf(msg, "%s\n%s%scopy to ", reset, line_prefix, set); |
b67b9612 | 3038 | quote_c_style(other, msg, NULL, 0); |
37466447 | 3039 | strbuf_addf(msg, "%s\n", reset); |
b67b9612 JH |
3040 | break; |
3041 | case DIFF_STATUS_RENAMED: | |
98ad90fb JH |
3042 | strbuf_addf(msg, "%s%ssimilarity index %d%%", |
3043 | line_prefix, set, similarity_index(p)); | |
3044 | strbuf_addf(msg, "%s\n%s%srename from ", | |
3045 | reset, line_prefix, set); | |
b67b9612 | 3046 | quote_c_style(name, msg, NULL, 0); |
98ad90fb JH |
3047 | strbuf_addf(msg, "%s\n%s%srename to ", |
3048 | reset, line_prefix, set); | |
b67b9612 | 3049 | quote_c_style(other, msg, NULL, 0); |
37466447 | 3050 | strbuf_addf(msg, "%s\n", reset); |
b67b9612 JH |
3051 | break; |
3052 | case DIFF_STATUS_MODIFIED: | |
3053 | if (p->score) { | |
98ad90fb JH |
3054 | strbuf_addf(msg, "%s%sdissimilarity index %d%%%s\n", |
3055 | line_prefix, | |
37466447 | 3056 | set, similarity_index(p), reset); |
b67b9612 JH |
3057 | break; |
3058 | } | |
3059 | /* fallthru */ | |
3060 | default: | |
296c6bb2 | 3061 | *must_show_header = 0; |
b67b9612 JH |
3062 | } |
3063 | if (one && two && hashcmp(one->sha1, two->sha1)) { | |
3064 | int abbrev = DIFF_OPT_TST(o, FULL_INDEX) ? 40 : DEFAULT_ABBREV; | |
3065 | ||
3066 | if (DIFF_OPT_TST(o, BINARY)) { | |
3067 | mmfile_t mf; | |
3068 | if ((!fill_mmfile(&mf, one) && diff_filespec_is_binary(one)) || | |
3069 | (!fill_mmfile(&mf, two) && diff_filespec_is_binary(two))) | |
3070 | abbrev = 40; | |
3071 | } | |
e13f38a3 | 3072 | strbuf_addf(msg, "%s%sindex %s..", line_prefix, set, |
3e5a188f JH |
3073 | find_unique_abbrev(one->sha1, abbrev)); |
3074 | strbuf_addstr(msg, find_unique_abbrev(two->sha1, abbrev)); | |
b67b9612 JH |
3075 | if (one->mode == two->mode) |
3076 | strbuf_addf(msg, " %06o", one->mode); | |
37466447 | 3077 | strbuf_addf(msg, "%s\n", reset); |
b67b9612 | 3078 | } |
b67b9612 JH |
3079 | } |
3080 | ||
6973dcae JH |
3081 | static void run_diff_cmd(const char *pgm, |
3082 | const char *name, | |
3083 | const char *other, | |
cd676a51 | 3084 | const char *attr_path, |
6973dcae JH |
3085 | struct diff_filespec *one, |
3086 | struct diff_filespec *two, | |
b67b9612 | 3087 | struct strbuf *msg, |
051308f6 | 3088 | struct diff_options *o, |
b67b9612 | 3089 | struct diff_filepair *p) |
6973dcae | 3090 | { |
b67b9612 JH |
3091 | const char *xfrm_msg = NULL; |
3092 | int complete_rewrite = (p->status == DIFF_STATUS_MODIFIED) && p->score; | |
296c6bb2 | 3093 | int must_show_header = 0; |
b67b9612 | 3094 | |
bd8c1a9b JH |
3095 | |
3096 | if (DIFF_OPT_TST(o, ALLOW_EXTERNAL)) { | |
be58e70d JK |
3097 | struct userdiff_driver *drv = userdiff_find_by_path(attr_path); |
3098 | if (drv && drv->external) | |
3099 | pgm = drv->external; | |
f1af60bd JH |
3100 | } |
3101 | ||
37466447 BW |
3102 | if (msg) { |
3103 | /* | |
3104 | * don't use colors when the header is intended for an | |
3105 | * external diff driver | |
3106 | */ | |
3107 | fill_metainfo(msg, name, other, one, two, o, p, | |
5977744d | 3108 | &must_show_header, |
daa0c3d9 | 3109 | want_color(o->use_color) && !pgm); |
37466447 BW |
3110 | xfrm_msg = msg->len ? msg->buf : NULL; |
3111 | } | |
3112 | ||
6973dcae JH |
3113 | if (pgm) { |
3114 | run_external_diff(pgm, name, other, one, two, xfrm_msg, | |
ee7fb0b1 | 3115 | complete_rewrite, o); |
6973dcae JH |
3116 | return; |
3117 | } | |
3118 | if (one && two) | |
3119 | builtin_diff(name, other ? other : name, | |
296c6bb2 CC |
3120 | one, two, xfrm_msg, must_show_header, |
3121 | o, complete_rewrite); | |
6973dcae | 3122 | else |
c0c77734 | 3123 | fprintf(o->file, "* Unmerged path %s\n", name); |
6973dcae JH |
3124 | } |
3125 | ||
3126 | static void diff_fill_sha1_info(struct diff_filespec *one) | |
3127 | { | |
3128 | if (DIFF_FILE_VALID(one)) { | |
3129 | if (!one->sha1_valid) { | |
3130 | struct stat st; | |
4682d852 | 3131 | if (one->is_stdin) { |
5332b2af JS |
3132 | hashcpy(one->sha1, null_sha1); |
3133 | return; | |
3134 | } | |
6973dcae | 3135 | if (lstat(one->path, &st) < 0) |
0721c314 | 3136 | die_errno("stat '%s'", one->path); |
6973dcae | 3137 | if (index_path(one->sha1, one->path, &st, 0)) |
d7530708 | 3138 | die("cannot hash %s", one->path); |
6973dcae JH |
3139 | } |
3140 | } | |
3141 | else | |
e702496e | 3142 | hashclr(one->sha1); |
6973dcae JH |
3143 | } |
3144 | ||
cd676a51 JH |
3145 | static void strip_prefix(int prefix_length, const char **namep, const char **otherp) |
3146 | { | |
3147 | /* Strip the prefix but do not molest /dev/null and absolute paths */ | |
d8faea9d | 3148 | if (*namep && **namep != '/') { |
cd676a51 | 3149 | *namep += prefix_length; |
d8faea9d JN |
3150 | if (**namep == '/') |
3151 | ++*namep; | |
3152 | } | |
3153 | if (*otherp && **otherp != '/') { | |
cd676a51 | 3154 | *otherp += prefix_length; |
d8faea9d JN |
3155 | if (**otherp == '/') |
3156 | ++*otherp; | |
3157 | } | |
cd676a51 JH |
3158 | } |
3159 | ||
6973dcae JH |
3160 | static void run_diff(struct diff_filepair *p, struct diff_options *o) |
3161 | { | |
3162 | const char *pgm = external_diff(); | |
663af342 | 3163 | struct strbuf msg; |
663af342 PH |
3164 | struct diff_filespec *one = p->one; |
3165 | struct diff_filespec *two = p->two; | |
6973dcae JH |
3166 | const char *name; |
3167 | const char *other; | |
cd676a51 | 3168 | const char *attr_path; |
663af342 | 3169 | |
cd676a51 JH |
3170 | name = p->one->path; |
3171 | other = (strcmp(name, p->two->path) ? p->two->path : NULL); | |
3172 | attr_path = name; | |
3173 | if (o->prefix_length) | |
3174 | strip_prefix(o->prefix_length, &name, &other); | |
6973dcae | 3175 | |
bd8c1a9b JH |
3176 | if (!DIFF_OPT_TST(o, ALLOW_EXTERNAL)) |
3177 | pgm = NULL; | |
3178 | ||
6973dcae | 3179 | if (DIFF_PAIR_UNMERGED(p)) { |
cd676a51 | 3180 | run_diff_cmd(pgm, name, NULL, attr_path, |
b67b9612 | 3181 | NULL, NULL, NULL, o, p); |
6973dcae JH |
3182 | return; |
3183 | } | |
3184 | ||
6973dcae JH |
3185 | diff_fill_sha1_info(one); |
3186 | diff_fill_sha1_info(two); | |
3187 | ||
6973dcae JH |
3188 | if (!pgm && |
3189 | DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) && | |
3190 | (S_IFMT & one->mode) != (S_IFMT & two->mode)) { | |
b67b9612 JH |
3191 | /* |
3192 | * a filepair that changes between file and symlink | |
6973dcae JH |
3193 | * needs to be split into deletion and creation. |
3194 | */ | |
3195 | struct diff_filespec *null = alloc_filespec(two->path); | |
cd676a51 | 3196 | run_diff_cmd(NULL, name, other, attr_path, |
b67b9612 | 3197 | one, null, &msg, o, p); |
6973dcae | 3198 | free(null); |
b67b9612 JH |
3199 | strbuf_release(&msg); |
3200 | ||
6973dcae | 3201 | null = alloc_filespec(one->path); |
cd676a51 | 3202 | run_diff_cmd(NULL, name, other, attr_path, |
b67b9612 | 3203 | null, two, &msg, o, p); |
6973dcae JH |
3204 | free(null); |
3205 | } | |
3206 | else | |
cd676a51 | 3207 | run_diff_cmd(pgm, name, other, attr_path, |
b67b9612 | 3208 | one, two, &msg, o, p); |
6973dcae | 3209 | |
663af342 | 3210 | strbuf_release(&msg); |
6973dcae JH |
3211 | } |
3212 | ||
3213 | static void run_diffstat(struct diff_filepair *p, struct diff_options *o, | |
3214 | struct diffstat_t *diffstat) | |
3215 | { | |
3216 | const char *name; | |
3217 | const char *other; | |
3218 | ||
3219 | if (DIFF_PAIR_UNMERGED(p)) { | |
3220 | /* unmerged */ | |
74faaa16 | 3221 | builtin_diffstat(p->one->path, NULL, NULL, NULL, diffstat, o, p); |
6973dcae JH |
3222 | return; |
3223 | } | |
3224 | ||
3225 | name = p->one->path; | |
3226 | other = (strcmp(name, p->two->path) ? p->two->path : NULL); | |
3227 | ||
cd676a51 JH |
3228 | if (o->prefix_length) |
3229 | strip_prefix(o->prefix_length, &name, &other); | |
3230 | ||
6973dcae JH |
3231 | diff_fill_sha1_info(p->one); |
3232 | diff_fill_sha1_info(p->two); | |
3233 | ||
74faaa16 | 3234 | builtin_diffstat(name, other, p->one, p->two, diffstat, o, p); |
6973dcae JH |
3235 | } |
3236 | ||
88246898 JS |
3237 | static void run_checkdiff(struct diff_filepair *p, struct diff_options *o) |
3238 | { | |
3239 | const char *name; | |
3240 | const char *other; | |
cd676a51 | 3241 | const char *attr_path; |
88246898 JS |
3242 | |
3243 | if (DIFF_PAIR_UNMERGED(p)) { | |
3244 | /* unmerged */ | |
3245 | return; | |
3246 | } | |
3247 | ||
3248 | name = p->one->path; | |
3249 | other = (strcmp(name, p->two->path) ? p->two->path : NULL); | |
cd676a51 JH |
3250 | attr_path = other ? other : name; |
3251 | ||
3252 | if (o->prefix_length) | |
3253 | strip_prefix(o->prefix_length, &name, &other); | |
88246898 JS |
3254 | |
3255 | diff_fill_sha1_info(p->one); | |
3256 | diff_fill_sha1_info(p->two); | |
3257 | ||
cd676a51 | 3258 | builtin_checkdiff(name, other, attr_path, p->one, p->two, o); |
88246898 JS |
3259 | } |
3260 | ||
6973dcae JH |
3261 | void diff_setup(struct diff_options *options) |
3262 | { | |
be4f2b40 | 3263 | memcpy(options, &default_diff_options, sizeof(*options)); |
c0c77734 DB |
3264 | |
3265 | options->file = stdout; | |
3266 | ||
6973dcae JH |
3267 | options->line_termination = '\n'; |
3268 | options->break_opt = -1; | |
3269 | options->rename_limit = -1; | |
712d2c7d | 3270 | options->dirstat_permille = diff_dirstat_permille_default; |
6468a4e5 | 3271 | options->context = diff_context_default; |
b8767f79 | 3272 | options->ws_error_highlight = WSEH_NEW; |
90d43b07 | 3273 | DIFF_OPT_SET(options, RENAME_EMPTY); |
6973dcae | 3274 | |
72441af7 | 3275 | /* pathchange left =NULL by default */ |
6973dcae JH |
3276 | options->change = diff_change; |
3277 | options->add_remove = diff_addremove; | |
f1c96261 | 3278 | options->use_color = diff_use_color_default; |
b68ea12e | 3279 | options->detect_rename = diff_detect_rename_default; |
07ab4dec | 3280 | options->xdl_opts |= diff_algorithm; |
eab9a40b | 3281 | |
6d8940b5 SB |
3282 | options->orderfile = diff_order_file_cfg; |
3283 | ||
f89504dd EC |
3284 | if (diff_no_prefix) { |
3285 | options->a_prefix = options->b_prefix = ""; | |
3286 | } else if (!diff_mnemonic_prefix) { | |
a5a818ee JH |
3287 | options->a_prefix = "a/"; |
3288 | options->b_prefix = "b/"; | |
3289 | } | |
6973dcae JH |
3290 | } |
3291 | ||
28452655 | 3292 | void diff_setup_done(struct diff_options *options) |
6973dcae | 3293 | { |
d7de00f7 TH |
3294 | int count = 0; |
3295 | ||
6c374008 JH |
3296 | if (options->set_default) |
3297 | options->set_default(options); | |
3298 | ||
d7de00f7 TH |
3299 | if (options->output_format & DIFF_FORMAT_NAME) |
3300 | count++; | |
3301 | if (options->output_format & DIFF_FORMAT_NAME_STATUS) | |
3302 | count++; | |
3303 | if (options->output_format & DIFF_FORMAT_CHECKDIFF) | |
3304 | count++; | |
3305 | if (options->output_format & DIFF_FORMAT_NO_OUTPUT) | |
3306 | count++; | |
3307 | if (count > 1) | |
3308 | die("--name-only, --name-status, --check and -s are mutually exclusive"); | |
3309 | ||
f245194f JH |
3310 | /* |
3311 | * Most of the time we can say "there are changes" | |
3312 | * only by checking if there are changed paths, but | |
3313 | * --ignore-whitespace* options force us to look | |
97bf2a08 | 3314 | * inside contents. |
f245194f JH |
3315 | */ |
3316 | ||
3317 | if (DIFF_XDL_TST(options, IGNORE_WHITESPACE) || | |
3318 | DIFF_XDL_TST(options, IGNORE_WHITESPACE_CHANGE) || | |
3319 | DIFF_XDL_TST(options, IGNORE_WHITESPACE_AT_EOL)) | |
3320 | DIFF_OPT_SET(options, DIFF_FROM_CONTENTS); | |
3321 | else | |
3322 | DIFF_OPT_CLR(options, DIFF_FROM_CONTENTS); | |
3323 | ||
8f67f8ae | 3324 | if (DIFF_OPT_TST(options, FIND_COPIES_HARDER)) |
03b9d560 JH |
3325 | options->detect_rename = DIFF_DETECT_COPY; |
3326 | ||
cd676a51 JH |
3327 | if (!DIFF_OPT_TST(options, RELATIVE_NAME)) |
3328 | options->prefix = NULL; | |
3329 | if (options->prefix) | |
3330 | options->prefix_length = strlen(options->prefix); | |
3331 | else | |
3332 | options->prefix_length = 0; | |
3333 | ||
c6744349 TH |
3334 | if (options->output_format & (DIFF_FORMAT_NAME | |
3335 | DIFF_FORMAT_NAME_STATUS | | |
3336 | DIFF_FORMAT_CHECKDIFF | | |
3337 | DIFF_FORMAT_NO_OUTPUT)) | |
3338 | options->output_format &= ~(DIFF_FORMAT_RAW | | |
74e2abe5 | 3339 | DIFF_FORMAT_NUMSTAT | |
c6744349 | 3340 | DIFF_FORMAT_DIFFSTAT | |
ebd124c6 | 3341 | DIFF_FORMAT_SHORTSTAT | |
7df7c019 | 3342 | DIFF_FORMAT_DIRSTAT | |
c6744349 TH |
3343 | DIFF_FORMAT_SUMMARY | |
3344 | DIFF_FORMAT_PATCH); | |
3345 | ||
6973dcae JH |
3346 | /* |
3347 | * These cases always need recursive; we do not drop caller-supplied | |
3348 | * recursive bits for other formats here. | |
3349 | */ | |
c6744349 | 3350 | if (options->output_format & (DIFF_FORMAT_PATCH | |
74e2abe5 | 3351 | DIFF_FORMAT_NUMSTAT | |
c6744349 | 3352 | DIFF_FORMAT_DIFFSTAT | |
ebd124c6 | 3353 | DIFF_FORMAT_SHORTSTAT | |
7df7c019 | 3354 | DIFF_FORMAT_DIRSTAT | |
d7014dc0 | 3355 | DIFF_FORMAT_SUMMARY | |
c6744349 | 3356 | DIFF_FORMAT_CHECKDIFF)) |
8f67f8ae | 3357 | DIFF_OPT_SET(options, RECURSIVE); |
5e363541 | 3358 | /* |
3969cf7d | 3359 | * Also pickaxe would not work very well if you do not say recursive |
5e363541 | 3360 | */ |
3969cf7d | 3361 | if (options->pickaxe) |
8f67f8ae | 3362 | DIFF_OPT_SET(options, RECURSIVE); |
ae6d5c1b JL |
3363 | /* |
3364 | * When patches are generated, submodules diffed against the work tree | |
3365 | * must be checked for dirtiness too so it can be shown in the output | |
3366 | */ | |
3367 | if (options->output_format & DIFF_FORMAT_PATCH) | |
3368 | DIFF_OPT_SET(options, DIRTY_SUBMODULES); | |
5e363541 | 3369 | |
6973dcae JH |
3370 | if (options->detect_rename && options->rename_limit < 0) |
3371 | options->rename_limit = diff_rename_limit_default; | |
3372 | if (options->setup & DIFF_SETUP_USE_CACHE) { | |
3373 | if (!active_cache) | |
3374 | /* read-cache does not die even when it fails | |
3375 | * so it is safe for us to do this here. Also | |
3376 | * it does not smudge active_cache or active_nr | |
3377 | * when it fails, so we do not have to worry about | |
3378 | * cleaning it up ourselves either. | |
3379 | */ | |
3380 | read_cache(); | |
3381 | } | |
6973dcae JH |
3382 | if (options->abbrev <= 0 || 40 < options->abbrev) |
3383 | options->abbrev = 40; /* full */ | |
3384 | ||
68aacb2f JH |
3385 | /* |
3386 | * It does not make sense to show the first hit we happened | |
3387 | * to have found. It does not make sense not to return with | |
3388 | * exit code in such a case either. | |
3389 | */ | |
90b19941 | 3390 | if (DIFF_OPT_TST(options, QUICK)) { |
68aacb2f | 3391 | options->output_format = DIFF_FORMAT_NO_OUTPUT; |
8f67f8ae | 3392 | DIFF_OPT_SET(options, EXIT_WITH_STATUS); |
68aacb2f | 3393 | } |
ee7fb0b1 | 3394 | |
0ea7d5b6 | 3395 | options->diff_path_counter = 0; |
b0e2c999 | 3396 | |
dd63f169 JK |
3397 | if (DIFF_OPT_TST(options, FOLLOW_RENAMES) && options->pathspec.nr != 1) |
3398 | die(_("--follow requires exactly one pathspec")); | |
6973dcae JH |
3399 | } |
3400 | ||
d2543b8e | 3401 | static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val) |
ee1e5412 LT |
3402 | { |
3403 | char c, *eq; | |
3404 | int len; | |
3405 | ||
3406 | if (*arg != '-') | |
3407 | return 0; | |
3408 | c = *++arg; | |
3409 | if (!c) | |
3410 | return 0; | |
3411 | if (c == arg_short) { | |
3412 | c = *++arg; | |
3413 | if (!c) | |
3414 | return 1; | |
3415 | if (val && isdigit(c)) { | |
3416 | char *end; | |
3417 | int n = strtoul(arg, &end, 10); | |
3418 | if (*end) | |
3419 | return 0; | |
3420 | *val = n; | |
3421 | return 1; | |
3422 | } | |
3423 | return 0; | |
3424 | } | |
3425 | if (c != '-') | |
3426 | return 0; | |
3427 | arg++; | |
2c5495f7 RM |
3428 | eq = strchrnul(arg, '='); |
3429 | len = eq - arg; | |
ee1e5412 LT |
3430 | if (!len || strncmp(arg, arg_long, len)) |
3431 | return 0; | |
2c5495f7 | 3432 | if (*eq) { |
ee1e5412 LT |
3433 | int n; |
3434 | char *end; | |
3435 | if (!isdigit(*++eq)) | |
3436 | return 0; | |
3437 | n = strtoul(eq, &end, 10); | |
3438 | if (*end) | |
3439 | return 0; | |
3440 | *val = n; | |
3441 | } | |
3442 | return 1; | |
3443 | } | |
3444 | ||
16befb8b JH |
3445 | static int diff_scoreopt_parse(const char *opt); |
3446 | ||
dea007fb MM |
3447 | static inline int short_opt(char opt, const char **argv, |
3448 | const char **optarg) | |
3449 | { | |
3450 | const char *arg = argv[0]; | |
3451 | if (arg[0] != '-' || arg[1] != opt) | |
3452 | return 0; | |
3453 | if (arg[2] != '\0') { | |
3454 | *optarg = arg + 2; | |
3455 | return 1; | |
3456 | } | |
3457 | if (!argv[1]) | |
3458 | die("Option '%c' requires a value", opt); | |
3459 | *optarg = argv[1]; | |
3460 | return 2; | |
3461 | } | |
3462 | ||
3463 | int parse_long_opt(const char *opt, const char **argv, | |
3464 | const char **optarg) | |
3465 | { | |
3466 | const char *arg = argv[0]; | |
95b567c7 | 3467 | if (!skip_prefix(arg, "--", &arg)) |
dea007fb | 3468 | return 0; |
95b567c7 | 3469 | if (!skip_prefix(arg, opt, &arg)) |
dea007fb | 3470 | return 0; |
b0d12fc9 | 3471 | if (*arg == '=') { /* stuck form: --option=value */ |
dea007fb MM |
3472 | *optarg = arg + 1; |
3473 | return 1; | |
3474 | } | |
3475 | if (*arg != '\0') | |
3476 | return 0; | |
3477 | /* separate form: --option value */ | |
3478 | if (!argv[1]) | |
3479 | die("Option '--%s' requires a value", opt); | |
3480 | *optarg = argv[1]; | |
3481 | return 2; | |
3482 | } | |
3483 | ||
4d7f7a4a JN |
3484 | static int stat_opt(struct diff_options *options, const char **av) |
3485 | { | |
3486 | const char *arg = av[0]; | |
3487 | char *end; | |
3488 | int width = options->stat_width; | |
3489 | int name_width = options->stat_name_width; | |
969fe57b | 3490 | int graph_width = options->stat_graph_width; |
808e1db2 | 3491 | int count = options->stat_count; |
1e57208e | 3492 | int argcount = 1; |
4d7f7a4a | 3493 | |
0539cc00 JK |
3494 | if (!skip_prefix(arg, "--stat", &arg)) |
3495 | die("BUG: stat option does not begin with --stat: %s", arg); | |
4d7f7a4a JN |
3496 | end = (char *)arg; |
3497 | ||
3498 | switch (*arg) { | |
3499 | case '-': | |
95b567c7 | 3500 | if (skip_prefix(arg, "-width", &arg)) { |
1e57208e MM |
3501 | if (*arg == '=') |
3502 | width = strtoul(arg + 1, &end, 10); | |
3503 | else if (!*arg && !av[1]) | |
3504 | die("Option '--stat-width' requires a value"); | |
3505 | else if (!*arg) { | |
3506 | width = strtoul(av[1], &end, 10); | |
3507 | argcount = 2; | |
3508 | } | |
95b567c7 | 3509 | } else if (skip_prefix(arg, "-name-width", &arg)) { |
1e57208e MM |
3510 | if (*arg == '=') |
3511 | name_width = strtoul(arg + 1, &end, 10); | |
3512 | else if (!*arg && !av[1]) | |
3513 | die("Option '--stat-name-width' requires a value"); | |
3514 | else if (!*arg) { | |
3515 | name_width = strtoul(av[1], &end, 10); | |
3516 | argcount = 2; | |
3517 | } | |
95b567c7 | 3518 | } else if (skip_prefix(arg, "-graph-width", &arg)) { |
969fe57b ZJS |
3519 | if (*arg == '=') |
3520 | graph_width = strtoul(arg + 1, &end, 10); | |
3521 | else if (!*arg && !av[1]) | |
3522 | die("Option '--stat-graph-width' requires a value"); | |
3523 | else if (!*arg) { | |
3524 | graph_width = strtoul(av[1], &end, 10); | |
3525 | argcount = 2; | |
3526 | } | |
95b567c7 | 3527 | } else if (skip_prefix(arg, "-count", &arg)) { |
808e1db2 MG |
3528 | if (*arg == '=') |
3529 | count = strtoul(arg + 1, &end, 10); | |
3530 | else if (!*arg && !av[1]) | |
3531 | die("Option '--stat-count' requires a value"); | |
3532 | else if (!*arg) { | |
3533 | count = strtoul(av[1], &end, 10); | |
3534 | argcount = 2; | |
3535 | } | |
1e57208e | 3536 | } |
4d7f7a4a JN |
3537 | break; |
3538 | case '=': | |
3539 | width = strtoul(arg+1, &end, 10); | |
3540 | if (*end == ',') | |
3541 | name_width = strtoul(end+1, &end, 10); | |
808e1db2 MG |
3542 | if (*end == ',') |
3543 | count = strtoul(end+1, &end, 10); | |
4d7f7a4a JN |
3544 | } |
3545 | ||
3546 | /* Important! This checks all the error cases! */ | |
3547 | if (*end) | |
3548 | return 0; | |
3549 | options->output_format |= DIFF_FORMAT_DIFFSTAT; | |
3550 | options->stat_name_width = name_width; | |
969fe57b | 3551 | options->stat_graph_width = graph_width; |
4d7f7a4a | 3552 | options->stat_width = width; |
808e1db2 | 3553 | options->stat_count = count; |
1e57208e | 3554 | return argcount; |
4d7f7a4a JN |
3555 | } |
3556 | ||
333f3fb0 JH |
3557 | static int parse_dirstat_opt(struct diff_options *options, const char *params) |
3558 | { | |
51670fc8 JH |
3559 | struct strbuf errmsg = STRBUF_INIT; |
3560 | if (parse_dirstat_params(options, params, &errmsg)) | |
7478ac57 | 3561 | die(_("Failed to parse --dirstat/-X option parameter:\n%s"), |
51670fc8 JH |
3562 | errmsg.buf); |
3563 | strbuf_release(&errmsg); | |
333f3fb0 JH |
3564 | /* |
3565 | * The caller knows a dirstat-related option is given from the command | |
3566 | * line; allow it to say "return this_function();" | |
3567 | */ | |
3568 | options->output_format |= DIFF_FORMAT_DIRSTAT; | |
3569 | return 1; | |
3570 | } | |
3571 | ||
c47ef57c RR |
3572 | static int parse_submodule_opt(struct diff_options *options, const char *value) |
3573 | { | |
3574 | if (parse_submodule_params(options, value)) | |
3575 | die(_("Failed to parse --submodule option parameter: '%s'"), | |
3576 | value); | |
3577 | return 1; | |
3578 | } | |
3579 | ||
1ecc1cbd JH |
3580 | static const char diff_status_letters[] = { |
3581 | DIFF_STATUS_ADDED, | |
3582 | DIFF_STATUS_COPIED, | |
3583 | DIFF_STATUS_DELETED, | |
3584 | DIFF_STATUS_MODIFIED, | |
3585 | DIFF_STATUS_RENAMED, | |
3586 | DIFF_STATUS_TYPE_CHANGED, | |
3587 | DIFF_STATUS_UNKNOWN, | |
3588 | DIFF_STATUS_UNMERGED, | |
3589 | DIFF_STATUS_FILTER_AON, | |
3590 | DIFF_STATUS_FILTER_BROKEN, | |
3591 | '\0', | |
3592 | }; | |
3593 | ||
3594 | static unsigned int filter_bit['Z' + 1]; | |
3595 | ||
3596 | static void prepare_filter_bits(void) | |
3597 | { | |
3598 | int i; | |
3599 | ||
3600 | if (!filter_bit[DIFF_STATUS_ADDED]) { | |
3601 | for (i = 0; diff_status_letters[i]; i++) | |
3602 | filter_bit[(int) diff_status_letters[i]] = (1 << i); | |
3603 | } | |
3604 | } | |
3605 | ||
3606 | static unsigned filter_bit_tst(char status, const struct diff_options *opt) | |
3607 | { | |
3608 | return opt->filter & filter_bit[(int) status]; | |
3609 | } | |
3610 | ||
3611 | static int parse_diff_filter_opt(const char *optarg, struct diff_options *opt) | |
3612 | { | |
3613 | int i, optch; | |
3614 | ||
3615 | prepare_filter_bits(); | |
7f2ea5f0 JH |
3616 | |
3617 | /* | |
3618 | * If there is a negation e.g. 'd' in the input, and we haven't | |
3619 | * initialized the filter field with another --diff-filter, start | |
3620 | * from full set of bits, except for AON. | |
3621 | */ | |
3622 | if (!opt->filter) { | |
3623 | for (i = 0; (optch = optarg[i]) != '\0'; i++) { | |
3624 | if (optch < 'a' || 'z' < optch) | |
3625 | continue; | |
3626 | opt->filter = (1 << (ARRAY_SIZE(diff_status_letters) - 1)) - 1; | |
3627 | opt->filter &= ~filter_bit[DIFF_STATUS_FILTER_AON]; | |
3628 | break; | |
3629 | } | |
3630 | } | |
3631 | ||
1ecc1cbd JH |
3632 | for (i = 0; (optch = optarg[i]) != '\0'; i++) { |
3633 | unsigned int bit; | |
7f2ea5f0 JH |
3634 | int negate; |
3635 | ||
3636 | if ('a' <= optch && optch <= 'z') { | |
3637 | negate = 1; | |
3638 | optch = toupper(optch); | |
3639 | } else { | |
3640 | negate = 0; | |
3641 | } | |
1ecc1cbd JH |
3642 | |
3643 | bit = (0 <= optch && optch <= 'Z') ? filter_bit[optch] : 0; | |
3644 | if (!bit) | |
bf142ec4 | 3645 | return optarg[i]; |
7f2ea5f0 JH |
3646 | if (negate) |
3647 | opt->filter &= ~bit; | |
3648 | else | |
3649 | opt->filter |= bit; | |
1ecc1cbd JH |
3650 | } |
3651 | return 0; | |
3652 | } | |
3653 | ||
71482d38 MM |
3654 | static void enable_patch_output(int *fmt) { |
3655 | *fmt &= ~DIFF_FORMAT_NO_OUTPUT; | |
3656 | *fmt |= DIFF_FORMAT_PATCH; | |
3657 | } | |
3658 | ||
b8767f79 JH |
3659 | static int parse_one_token(const char **arg, const char *token) |
3660 | { | |
3f4f17b5 RS |
3661 | const char *rest; |
3662 | if (skip_prefix(*arg, token, &rest) && (!*rest || *rest == ',')) { | |
3663 | *arg = rest; | |
3664 | return 1; | |
3665 | } | |
3666 | return 0; | |
b8767f79 JH |
3667 | } |
3668 | ||
3669 | static int parse_ws_error_highlight(struct diff_options *opt, const char *arg) | |
3670 | { | |
3671 | const char *orig_arg = arg; | |
3672 | unsigned val = 0; | |
3673 | while (*arg) { | |
3674 | if (parse_one_token(&arg, "none")) | |
3675 | val = 0; | |
3676 | else if (parse_one_token(&arg, "default")) | |
3677 | val = WSEH_NEW; | |
3678 | else if (parse_one_token(&arg, "all")) | |
3679 | val = WSEH_NEW | WSEH_OLD | WSEH_CONTEXT; | |
3680 | else if (parse_one_token(&arg, "new")) | |
3681 | val |= WSEH_NEW; | |
3682 | else if (parse_one_token(&arg, "old")) | |
3683 | val |= WSEH_OLD; | |
3684 | else if (parse_one_token(&arg, "context")) | |
3685 | val |= WSEH_CONTEXT; | |
3686 | else { | |
3687 | error("unknown value after ws-error-highlight=%.*s", | |
3688 | (int)(arg - orig_arg), orig_arg); | |
3689 | return 0; | |
3690 | } | |
3691 | if (*arg) | |
3692 | arg++; | |
3693 | } | |
3694 | opt->ws_error_highlight = val; | |
3695 | return 1; | |
3696 | } | |
3697 | ||
a97262c6 NTND |
3698 | int diff_opt_parse(struct diff_options *options, |
3699 | const char **av, int ac, const char *prefix) | |
6973dcae JH |
3700 | { |
3701 | const char *arg = av[0]; | |
dea007fb MM |
3702 | const char *optarg; |
3703 | int argcount; | |
d054680c | 3704 | |
a97262c6 NTND |
3705 | if (!prefix) |
3706 | prefix = ""; | |
3707 | ||
d054680c | 3708 | /* Output format options */ |
71482d38 MM |
3709 | if (!strcmp(arg, "-p") || !strcmp(arg, "-u") || !strcmp(arg, "--patch") |
3710 | || opt_arg(arg, 'U', "unified", &options->context)) | |
3711 | enable_patch_output(&options->output_format); | |
a610786f TH |
3712 | else if (!strcmp(arg, "--raw")) |
3713 | options->output_format |= DIFF_FORMAT_RAW; | |
71482d38 MM |
3714 | else if (!strcmp(arg, "--patch-with-raw")) { |
3715 | enable_patch_output(&options->output_format); | |
3716 | options->output_format |= DIFF_FORMAT_RAW; | |
3717 | } else if (!strcmp(arg, "--numstat")) | |
74e2abe5 | 3718 | options->output_format |= DIFF_FORMAT_NUMSTAT; |
8f67f8ae | 3719 | else if (!strcmp(arg, "--shortstat")) |
ebd124c6 | 3720 | options->output_format |= DIFF_FORMAT_SHORTSTAT; |
333f3fb0 JH |
3721 | else if (!strcmp(arg, "-X") || !strcmp(arg, "--dirstat")) |
3722 | return parse_dirstat_opt(options, ""); | |
ae021d87 JK |
3723 | else if (skip_prefix(arg, "-X", &arg)) |
3724 | return parse_dirstat_opt(options, arg); | |
3725 | else if (skip_prefix(arg, "--dirstat=", &arg)) | |
3726 | return parse_dirstat_opt(options, arg); | |
333f3fb0 JH |
3727 | else if (!strcmp(arg, "--cumulative")) |
3728 | return parse_dirstat_opt(options, "cumulative"); | |
3729 | else if (!strcmp(arg, "--dirstat-by-file")) | |
3730 | return parse_dirstat_opt(options, "files"); | |
ae021d87 | 3731 | else if (skip_prefix(arg, "--dirstat-by-file=", &arg)) { |
333f3fb0 | 3732 | parse_dirstat_opt(options, "files"); |
ae021d87 | 3733 | return parse_dirstat_opt(options, arg); |
f88d225f | 3734 | } |
d054680c PH |
3735 | else if (!strcmp(arg, "--check")) |
3736 | options->output_format |= DIFF_FORMAT_CHECKDIFF; | |
3737 | else if (!strcmp(arg, "--summary")) | |
3738 | options->output_format |= DIFF_FORMAT_SUMMARY; | |
71482d38 MM |
3739 | else if (!strcmp(arg, "--patch-with-stat")) { |
3740 | enable_patch_output(&options->output_format); | |
3741 | options->output_format |= DIFF_FORMAT_DIFFSTAT; | |
3742 | } else if (!strcmp(arg, "--name-only")) | |
d054680c PH |
3743 | options->output_format |= DIFF_FORMAT_NAME; |
3744 | else if (!strcmp(arg, "--name-status")) | |
3745 | options->output_format |= DIFF_FORMAT_NAME_STATUS; | |
d09cd15d | 3746 | else if (!strcmp(arg, "-s") || !strcmp(arg, "--no-patch")) |
d054680c | 3747 | options->output_format |= DIFF_FORMAT_NO_OUTPUT; |
59556548 | 3748 | else if (starts_with(arg, "--stat")) |
808e1db2 | 3749 | /* --stat, --stat-width, --stat-name-width, or --stat-count */ |
4d7f7a4a | 3750 | return stat_opt(options, av); |
d054680c PH |
3751 | |
3752 | /* renames options */ | |
59556548 | 3753 | else if (starts_with(arg, "-B") || starts_with(arg, "--break-rewrites=") || |
37ab5156 | 3754 | !strcmp(arg, "--break-rewrites")) { |
8f67f8ae | 3755 | if ((options->break_opt = diff_scoreopt_parse(arg)) == -1) |
07cd7265 | 3756 | return error("invalid argument to -B: %s", arg+2); |
6973dcae | 3757 | } |
59556548 | 3758 | else if (starts_with(arg, "-M") || starts_with(arg, "--find-renames=") || |
f611ddc7 | 3759 | !strcmp(arg, "--find-renames")) { |
8f67f8ae | 3760 | if ((options->rename_score = diff_scoreopt_parse(arg)) == -1) |
07cd7265 | 3761 | return error("invalid argument to -M: %s", arg+2); |
6973dcae JH |
3762 | options->detect_rename = DIFF_DETECT_RENAME; |
3763 | } | |
467ddc14 JH |
3764 | else if (!strcmp(arg, "-D") || !strcmp(arg, "--irreversible-delete")) { |
3765 | options->irreversible_delete = 1; | |
3766 | } | |
59556548 | 3767 | else if (starts_with(arg, "-C") || starts_with(arg, "--find-copies=") || |
f611ddc7 | 3768 | !strcmp(arg, "--find-copies")) { |
ca6c0970 | 3769 | if (options->detect_rename == DIFF_DETECT_COPY) |
8f67f8ae PH |
3770 | DIFF_OPT_SET(options, FIND_COPIES_HARDER); |
3771 | if ((options->rename_score = diff_scoreopt_parse(arg)) == -1) | |
07cd7265 | 3772 | return error("invalid argument to -C: %s", arg+2); |
6973dcae JH |
3773 | options->detect_rename = DIFF_DETECT_COPY; |
3774 | } | |
d054680c PH |
3775 | else if (!strcmp(arg, "--no-renames")) |
3776 | options->detect_rename = 0; | |
90d43b07 JK |
3777 | else if (!strcmp(arg, "--rename-empty")) |
3778 | DIFF_OPT_SET(options, RENAME_EMPTY); | |
3779 | else if (!strcmp(arg, "--no-rename-empty")) | |
3780 | DIFF_OPT_CLR(options, RENAME_EMPTY); | |
cd676a51 JH |
3781 | else if (!strcmp(arg, "--relative")) |
3782 | DIFF_OPT_SET(options, RELATIVE_NAME); | |
ae021d87 | 3783 | else if (skip_prefix(arg, "--relative=", &arg)) { |
c0cb4a06 | 3784 | DIFF_OPT_SET(options, RELATIVE_NAME); |
ae021d87 | 3785 | options->prefix = arg; |
c0cb4a06 | 3786 | } |
d054680c PH |
3787 | |
3788 | /* xdiff options */ | |
81b568c8 JH |
3789 | else if (!strcmp(arg, "--minimal")) |
3790 | DIFF_XDL_SET(options, NEED_MINIMAL); | |
3791 | else if (!strcmp(arg, "--no-minimal")) | |
3792 | DIFF_XDL_CLR(options, NEED_MINIMAL); | |
d054680c | 3793 | else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space")) |
628d5c2b | 3794 | DIFF_XDL_SET(options, IGNORE_WHITESPACE); |
d054680c | 3795 | else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change")) |
628d5c2b | 3796 | DIFF_XDL_SET(options, IGNORE_WHITESPACE_CHANGE); |
d054680c | 3797 | else if (!strcmp(arg, "--ignore-space-at-eol")) |
628d5c2b | 3798 | DIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL); |
36617af7 AP |
3799 | else if (!strcmp(arg, "--ignore-blank-lines")) |
3800 | DIFF_XDL_SET(options, IGNORE_BLANK_LINES); | |
34292bdd | 3801 | else if (!strcmp(arg, "--patience")) |
307ab20b | 3802 | options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF); |
8c912eea | 3803 | else if (!strcmp(arg, "--histogram")) |
307ab20b | 3804 | options->xdl_opts = DIFF_WITH_ALG(options, HISTOGRAM_DIFF); |
0895c6d4 JK |
3805 | else if ((argcount = parse_long_opt("diff-algorithm", av, &optarg))) { |
3806 | long value = parse_algorithm_value(optarg); | |
07924d4d MP |
3807 | if (value < 0) |
3808 | return error("option diff-algorithm accepts \"myers\", " | |
3809 | "\"minimal\", \"patience\" and \"histogram\""); | |
3810 | /* clear out previous settings */ | |
3811 | DIFF_XDL_CLR(options, NEED_MINIMAL); | |
3812 | options->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK; | |
3813 | options->xdl_opts |= value; | |
0895c6d4 | 3814 | return argcount; |
07924d4d | 3815 | } |
d054680c PH |
3816 | |
3817 | /* flags options */ | |
3818 | else if (!strcmp(arg, "--binary")) { | |
71482d38 | 3819 | enable_patch_output(&options->output_format); |
d054680c PH |
3820 | DIFF_OPT_SET(options, BINARY); |
3821 | } | |
3822 | else if (!strcmp(arg, "--full-index")) | |
3823 | DIFF_OPT_SET(options, FULL_INDEX); | |
3824 | else if (!strcmp(arg, "-a") || !strcmp(arg, "--text")) | |
3825 | DIFF_OPT_SET(options, TEXT); | |
3826 | else if (!strcmp(arg, "-R")) | |
3827 | DIFF_OPT_SET(options, REVERSE_DIFF); | |
6973dcae | 3828 | else if (!strcmp(arg, "--find-copies-harder")) |
8f67f8ae | 3829 | DIFF_OPT_SET(options, FIND_COPIES_HARDER); |
750f7b66 | 3830 | else if (!strcmp(arg, "--follow")) |
8f67f8ae | 3831 | DIFF_OPT_SET(options, FOLLOW_RENAMES); |
076c9837 | 3832 | else if (!strcmp(arg, "--no-follow")) { |
aebbcf57 | 3833 | DIFF_OPT_CLR(options, FOLLOW_RENAMES); |
076c9837 DT |
3834 | DIFF_OPT_CLR(options, DEFAULT_FOLLOW_RENAMES); |
3835 | } else if (!strcmp(arg, "--color")) | |
f1c96261 | 3836 | options->use_color = 1; |
ae021d87 JK |
3837 | else if (skip_prefix(arg, "--color=", &arg)) { |
3838 | int value = git_config_colorbool(NULL, arg); | |
daa0c3d9 | 3839 | if (value < 0) |
73e9da01 | 3840 | return error("option `color' expects \"always\", \"auto\", or \"never\""); |
daa0c3d9 | 3841 | options->use_color = value; |
73e9da01 | 3842 | } |
fef88bb0 | 3843 | else if (!strcmp(arg, "--no-color")) |
f1c96261 | 3844 | options->use_color = 0; |
628d5c2b | 3845 | else if (!strcmp(arg, "--color-words")) { |
f1c96261 | 3846 | options->use_color = 1; |
882749a0 | 3847 | options->word_diff = DIFF_WORDS_COLOR; |
628d5c2b | 3848 | } |
ae021d87 | 3849 | else if (skip_prefix(arg, "--color-words=", &arg)) { |
f1c96261 | 3850 | options->use_color = 1; |
882749a0 | 3851 | options->word_diff = DIFF_WORDS_COLOR; |
ae021d87 | 3852 | options->word_regex = arg; |
2b6a5417 | 3853 | } |
882749a0 TR |
3854 | else if (!strcmp(arg, "--word-diff")) { |
3855 | if (options->word_diff == DIFF_WORDS_NONE) | |
3856 | options->word_diff = DIFF_WORDS_PLAIN; | |
3857 | } | |
ae021d87 JK |
3858 | else if (skip_prefix(arg, "--word-diff=", &arg)) { |
3859 | if (!strcmp(arg, "plain")) | |
882749a0 | 3860 | options->word_diff = DIFF_WORDS_PLAIN; |
ae021d87 | 3861 | else if (!strcmp(arg, "color")) { |
f1c96261 | 3862 | options->use_color = 1; |
882749a0 TR |
3863 | options->word_diff = DIFF_WORDS_COLOR; |
3864 | } | |
ae021d87 | 3865 | else if (!strcmp(arg, "porcelain")) |
882749a0 | 3866 | options->word_diff = DIFF_WORDS_PORCELAIN; |
ae021d87 | 3867 | else if (!strcmp(arg, "none")) |
882749a0 TR |
3868 | options->word_diff = DIFF_WORDS_NONE; |
3869 | else | |
ae021d87 | 3870 | die("bad --word-diff argument: %s", arg); |
882749a0 | 3871 | } |
dea007fb | 3872 | else if ((argcount = parse_long_opt("word-diff-regex", av, &optarg))) { |
882749a0 TR |
3873 | if (options->word_diff == DIFF_WORDS_NONE) |
3874 | options->word_diff = DIFF_WORDS_PLAIN; | |
dea007fb MM |
3875 | options->word_regex = optarg; |
3876 | return argcount; | |
882749a0 | 3877 | } |
41bbf9d5 | 3878 | else if (!strcmp(arg, "--exit-code")) |
8f67f8ae | 3879 | DIFF_OPT_SET(options, EXIT_WITH_STATUS); |
68aacb2f | 3880 | else if (!strcmp(arg, "--quiet")) |
90b19941 | 3881 | DIFF_OPT_SET(options, QUICK); |
72909bef | 3882 | else if (!strcmp(arg, "--ext-diff")) |
8f67f8ae | 3883 | DIFF_OPT_SET(options, ALLOW_EXTERNAL); |
72909bef | 3884 | else if (!strcmp(arg, "--no-ext-diff")) |
8f67f8ae | 3885 | DIFF_OPT_CLR(options, ALLOW_EXTERNAL); |
e10ea812 JK |
3886 | else if (!strcmp(arg, "--textconv")) |
3887 | DIFF_OPT_SET(options, ALLOW_TEXTCONV); | |
3888 | else if (!strcmp(arg, "--no-textconv")) | |
3889 | DIFF_OPT_CLR(options, ALLOW_TEXTCONV); | |
aee9c7d6 JL |
3890 | else if (!strcmp(arg, "--ignore-submodules")) { |
3891 | DIFF_OPT_SET(options, OVERRIDE_SUBMODULE_CONFIG); | |
46a958b3 | 3892 | handle_ignore_submodules_arg(options, "all"); |
ae021d87 | 3893 | } else if (skip_prefix(arg, "--ignore-submodules=", &arg)) { |
aee9c7d6 | 3894 | DIFF_OPT_SET(options, OVERRIDE_SUBMODULE_CONFIG); |
ae021d87 | 3895 | handle_ignore_submodules_arg(options, arg); |
aee9c7d6 | 3896 | } else if (!strcmp(arg, "--submodule")) |
752c0c24 | 3897 | DIFF_OPT_SET(options, SUBMODULE_LOG); |
ae021d87 JK |
3898 | else if (skip_prefix(arg, "--submodule=", &arg)) |
3899 | return parse_submodule_opt(options, arg); | |
b8767f79 JH |
3900 | else if (skip_prefix(arg, "--ws-error-highlight=", &arg)) |
3901 | return parse_ws_error_highlight(options, arg); | |
d054680c PH |
3902 | |
3903 | /* misc options */ | |
3904 | else if (!strcmp(arg, "-z")) | |
3905 | options->line_termination = 0; | |
dea007fb MM |
3906 | else if ((argcount = short_opt('l', av, &optarg))) { |
3907 | options->rename_limit = strtoul(optarg, NULL, 10); | |
3908 | return argcount; | |
3909 | } | |
3910 | else if ((argcount = short_opt('S', av, &optarg))) { | |
3911 | options->pickaxe = optarg; | |
f506b8e8 JH |
3912 | options->pickaxe_opts |= DIFF_PICKAXE_KIND_S; |
3913 | return argcount; | |
3914 | } else if ((argcount = short_opt('G', av, &optarg))) { | |
3915 | options->pickaxe = optarg; | |
3916 | options->pickaxe_opts |= DIFF_PICKAXE_KIND_G; | |
dea007fb MM |
3917 | return argcount; |
3918 | } | |
d054680c | 3919 | else if (!strcmp(arg, "--pickaxe-all")) |
f506b8e8 | 3920 | options->pickaxe_opts |= DIFF_PICKAXE_ALL; |
d054680c | 3921 | else if (!strcmp(arg, "--pickaxe-regex")) |
f506b8e8 | 3922 | options->pickaxe_opts |= DIFF_PICKAXE_REGEX; |
dea007fb | 3923 | else if ((argcount = short_opt('O', av, &optarg))) { |
a97262c6 NTND |
3924 | const char *path = prefix_filename(prefix, strlen(prefix), optarg); |
3925 | options->orderfile = xstrdup(path); | |
dea007fb MM |
3926 | return argcount; |
3927 | } | |
3928 | else if ((argcount = parse_long_opt("diff-filter", av, &optarg))) { | |
1ecc1cbd JH |
3929 | int offending = parse_diff_filter_opt(optarg, options); |
3930 | if (offending) | |
3931 | die("unknown change class '%c' in --diff-filter=%s", | |
3932 | offending, optarg); | |
dea007fb MM |
3933 | return argcount; |
3934 | } | |
d054680c PH |
3935 | else if (!strcmp(arg, "--abbrev")) |
3936 | options->abbrev = DEFAULT_ABBREV; | |
ae021d87 JK |
3937 | else if (skip_prefix(arg, "--abbrev=", &arg)) { |
3938 | options->abbrev = strtoul(arg, NULL, 10); | |
d054680c PH |
3939 | if (options->abbrev < MINIMUM_ABBREV) |
3940 | options->abbrev = MINIMUM_ABBREV; | |
3941 | else if (40 < options->abbrev) | |
3942 | options->abbrev = 40; | |
3943 | } | |
dea007fb MM |
3944 | else if ((argcount = parse_long_opt("src-prefix", av, &optarg))) { |
3945 | options->a_prefix = optarg; | |
3946 | return argcount; | |
3947 | } | |
3948 | else if ((argcount = parse_long_opt("dst-prefix", av, &optarg))) { | |
3949 | options->b_prefix = optarg; | |
3950 | return argcount; | |
3951 | } | |
eab9a40b JS |
3952 | else if (!strcmp(arg, "--no-prefix")) |
3953 | options->a_prefix = options->b_prefix = ""; | |
6d0e674a RS |
3954 | else if (opt_arg(arg, '\0', "inter-hunk-context", |
3955 | &options->interhunkcontext)) | |
3956 | ; | |
14937c2c RS |
3957 | else if (!strcmp(arg, "-W")) |
3958 | DIFF_OPT_SET(options, FUNCCONTEXT); | |
3959 | else if (!strcmp(arg, "--function-context")) | |
3960 | DIFF_OPT_SET(options, FUNCCONTEXT); | |
3961 | else if (!strcmp(arg, "--no-function-context")) | |
3962 | DIFF_OPT_CLR(options, FUNCCONTEXT); | |
dea007fb | 3963 | else if ((argcount = parse_long_opt("output", av, &optarg))) { |
a97262c6 NTND |
3964 | const char *path = prefix_filename(prefix, strlen(prefix), optarg); |
3965 | options->file = fopen(path, "w"); | |
8324b977 | 3966 | if (!options->file) |
a97262c6 | 3967 | die_errno("Could not open '%s'", path); |
c0c77734 | 3968 | options->close_file = 1; |
dea007fb | 3969 | return argcount; |
c0c77734 | 3970 | } else |
6973dcae JH |
3971 | return 0; |
3972 | return 1; | |
3973 | } | |
3974 | ||
10ae7526 | 3975 | int parse_rename_score(const char **cp_p) |
6973dcae JH |
3976 | { |
3977 | unsigned long num, scale; | |
3978 | int ch, dot; | |
3979 | const char *cp = *cp_p; | |
3980 | ||
3981 | num = 0; | |
3982 | scale = 1; | |
3983 | dot = 0; | |
eeefa7c9 | 3984 | for (;;) { |
6973dcae JH |
3985 | ch = *cp; |
3986 | if ( !dot && ch == '.' ) { | |
3987 | scale = 1; | |
3988 | dot = 1; | |
3989 | } else if ( ch == '%' ) { | |
3990 | scale = dot ? scale*100 : 100; | |
3991 | cp++; /* % is always at the end */ | |
3992 | break; | |
3993 | } else if ( ch >= '0' && ch <= '9' ) { | |
3994 | if ( scale < 100000 ) { | |
3995 | scale *= 10; | |
3996 | num = (num*10) + (ch-'0'); | |
3997 | } | |
3998 | } else { | |
3999 | break; | |
4000 | } | |
4001 | cp++; | |
4002 | } | |
4003 | *cp_p = cp; | |
4004 | ||
4005 | /* user says num divided by scale and we say internally that | |
4006 | * is MAX_SCORE * num / scale. | |
4007 | */ | |
dc49cd76 | 4008 | return (int)((num >= scale) ? MAX_SCORE : (MAX_SCORE * num / scale)); |
6973dcae JH |
4009 | } |
4010 | ||
16befb8b | 4011 | static int diff_scoreopt_parse(const char *opt) |
6973dcae JH |
4012 | { |
4013 | int opt1, opt2, cmd; | |
4014 | ||
4015 | if (*opt++ != '-') | |
4016 | return -1; | |
4017 | cmd = *opt++; | |
37ab5156 KB |
4018 | if (cmd == '-') { |
4019 | /* convert the long-form arguments into short-form versions */ | |
95b567c7 | 4020 | if (skip_prefix(opt, "break-rewrites", &opt)) { |
37ab5156 KB |
4021 | if (*opt == 0 || *opt++ == '=') |
4022 | cmd = 'B'; | |
95b567c7 | 4023 | } else if (skip_prefix(opt, "find-copies", &opt)) { |
37ab5156 KB |
4024 | if (*opt == 0 || *opt++ == '=') |
4025 | cmd = 'C'; | |
95b567c7 | 4026 | } else if (skip_prefix(opt, "find-renames", &opt)) { |
37ab5156 KB |
4027 | if (*opt == 0 || *opt++ == '=') |
4028 | cmd = 'M'; | |
4029 | } | |
4030 | } | |
6973dcae | 4031 | if (cmd != 'M' && cmd != 'C' && cmd != 'B') |
01689909 | 4032 | return -1; /* that is not a -M, -C, or -B option */ |
6973dcae | 4033 | |
10ae7526 | 4034 | opt1 = parse_rename_score(&opt); |
6973dcae JH |
4035 | if (cmd != 'B') |
4036 | opt2 = 0; | |
4037 | else { | |
4038 | if (*opt == 0) | |
4039 | opt2 = 0; | |
4040 | else if (*opt != '/') | |
4041 | return -1; /* we expect -B80/99 or -B80 */ | |
4042 | else { | |
4043 | opt++; | |
10ae7526 | 4044 | opt2 = parse_rename_score(&opt); |
6973dcae JH |
4045 | } |
4046 | } | |
4047 | if (*opt != 0) | |
4048 | return -1; | |
4049 | return opt1 | (opt2 << 16); | |
4050 | } | |
4051 | ||
4052 | struct diff_queue_struct diff_queued_diff; | |
4053 | ||
4054 | void diff_q(struct diff_queue_struct *queue, struct diff_filepair *dp) | |
4055 | { | |
4c960a43 | 4056 | ALLOC_GROW(queue->queue, queue->nr + 1, queue->alloc); |
6973dcae JH |
4057 | queue->queue[queue->nr++] = dp; |
4058 | } | |
4059 | ||
4060 | struct diff_filepair *diff_queue(struct diff_queue_struct *queue, | |
4061 | struct diff_filespec *one, | |
4062 | struct diff_filespec *two) | |
4063 | { | |
ef677686 | 4064 | struct diff_filepair *dp = xcalloc(1, sizeof(*dp)); |
6973dcae JH |
4065 | dp->one = one; |
4066 | dp->two = two; | |
6973dcae JH |
4067 | if (queue) |
4068 | diff_q(queue, dp); | |
4069 | return dp; | |
4070 | } | |
4071 | ||
4072 | void diff_free_filepair(struct diff_filepair *p) | |
4073 | { | |
9fb88419 LT |
4074 | free_filespec(p->one); |
4075 | free_filespec(p->two); | |
6973dcae JH |
4076 | free(p); |
4077 | } | |
4078 | ||
4079 | /* This is different from find_unique_abbrev() in that | |
4080 | * it stuffs the result with dots for alignment. | |
4081 | */ | |
4082 | const char *diff_unique_abbrev(const unsigned char *sha1, int len) | |
4083 | { | |
4084 | int abblen; | |
4085 | const char *abbrev; | |
4086 | if (len == 40) | |
4087 | return sha1_to_hex(sha1); | |
4088 | ||
4089 | abbrev = find_unique_abbrev(sha1, len); | |
6973dcae JH |
4090 | abblen = strlen(abbrev); |
4091 | if (abblen < 37) { | |
4092 | static char hex[41]; | |
4093 | if (len < abblen && abblen <= len + 2) | |
5096d490 | 4094 | xsnprintf(hex, sizeof(hex), "%s%.*s", abbrev, len+3-abblen, ".."); |
6973dcae | 4095 | else |
5096d490 | 4096 | xsnprintf(hex, sizeof(hex), "%s...", abbrev); |
6973dcae JH |
4097 | return hex; |
4098 | } | |
4099 | return sha1_to_hex(sha1); | |
4100 | } | |
4101 | ||
663af342 | 4102 | static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt) |
6973dcae | 4103 | { |
663af342 PH |
4104 | int line_termination = opt->line_termination; |
4105 | int inter_name_termination = line_termination ? '\t' : '\0'; | |
6973dcae | 4106 | |
30997bb8 | 4107 | fprintf(opt->file, "%s", diff_line_prefix(opt)); |
663af342 | 4108 | if (!(opt->output_format & DIFF_FORMAT_NAME_STATUS)) { |
c0c77734 DB |
4109 | fprintf(opt->file, ":%06o %06o %s ", p->one->mode, p->two->mode, |
4110 | diff_unique_abbrev(p->one->sha1, opt->abbrev)); | |
4111 | fprintf(opt->file, "%s ", diff_unique_abbrev(p->two->sha1, opt->abbrev)); | |
6973dcae | 4112 | } |
663af342 | 4113 | if (p->score) { |
c0c77734 DB |
4114 | fprintf(opt->file, "%c%03d%c", p->status, similarity_index(p), |
4115 | inter_name_termination); | |
663af342 | 4116 | } else { |
c0c77734 | 4117 | fprintf(opt->file, "%c%c", p->status, inter_name_termination); |
6973dcae | 4118 | } |
6973dcae | 4119 | |
cd676a51 JH |
4120 | if (p->status == DIFF_STATUS_COPIED || |
4121 | p->status == DIFF_STATUS_RENAMED) { | |
4122 | const char *name_a, *name_b; | |
4123 | name_a = p->one->path; | |
4124 | name_b = p->two->path; | |
4125 | strip_prefix(opt->prefix_length, &name_a, &name_b); | |
c0c77734 DB |
4126 | write_name_quoted(name_a, opt->file, inter_name_termination); |
4127 | write_name_quoted(name_b, opt->file, line_termination); | |
663af342 | 4128 | } else { |
cd676a51 JH |
4129 | const char *name_a, *name_b; |
4130 | name_a = p->one->mode ? p->one->path : p->two->path; | |
4131 | name_b = NULL; | |
4132 | strip_prefix(opt->prefix_length, &name_a, &name_b); | |
c0c77734 | 4133 | write_name_quoted(name_a, opt->file, line_termination); |
663af342 | 4134 | } |
6973dcae JH |
4135 | } |
4136 | ||
4137 | int diff_unmodified_pair(struct diff_filepair *p) | |
4138 | { | |
4139 | /* This function is written stricter than necessary to support | |
4140 | * the currently implemented transformers, but the idea is to | |
4141 | * let transformers to produce diff_filepairs any way they want, | |
4142 | * and filter and clean them up here before producing the output. | |
4143 | */ | |
663af342 | 4144 | struct diff_filespec *one = p->one, *two = p->two; |
6973dcae JH |
4145 | |
4146 | if (DIFF_PAIR_UNMERGED(p)) | |
4147 | return 0; /* unmerged is interesting */ | |
4148 | ||
6973dcae JH |
4149 | /* deletion, addition, mode or type change |
4150 | * and rename are all interesting. | |
4151 | */ | |
4152 | if (DIFF_FILE_VALID(one) != DIFF_FILE_VALID(two) || | |
4153 | DIFF_PAIR_MODE_CHANGED(p) || | |
4154 | strcmp(one->path, two->path)) | |
4155 | return 0; | |
4156 | ||
4157 | /* both are valid and point at the same path. that is, we are | |
4158 | * dealing with a change. | |
4159 | */ | |
4160 | if (one->sha1_valid && two->sha1_valid && | |
85adbf2f JL |
4161 | !hashcmp(one->sha1, two->sha1) && |
4162 | !one->dirty_submodule && !two->dirty_submodule) | |
6973dcae JH |
4163 | return 1; /* no change */ |
4164 | if (!one->sha1_valid && !two->sha1_valid) | |
4165 | return 1; /* both look at the same file on the filesystem. */ | |
4166 | return 0; | |
4167 | } | |
4168 | ||
4169 | static void diff_flush_patch(struct diff_filepair *p, struct diff_options *o) | |
4170 | { | |
4171 | if (diff_unmodified_pair(p)) | |
4172 | return; | |
4173 | ||
4174 | if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) || | |
4175 | (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode))) | |
4176 | return; /* no tree diffs in patch format */ | |
4177 | ||
4178 | run_diff(p, o); | |
4179 | } | |
4180 | ||
4181 | static void diff_flush_stat(struct diff_filepair *p, struct diff_options *o, | |
4182 | struct diffstat_t *diffstat) | |
4183 | { | |
4184 | if (diff_unmodified_pair(p)) | |
4185 | return; | |
4186 | ||
4187 | if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) || | |
4188 | (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode))) | |
c3fced64 | 4189 | return; /* no useful stat for tree diffs */ |
6973dcae JH |
4190 | |
4191 | run_diffstat(p, o, diffstat); | |
4192 | } | |
4193 | ||
88246898 JS |
4194 | static void diff_flush_checkdiff(struct diff_filepair *p, |
4195 | struct diff_options *o) | |
4196 | { | |
4197 | if (diff_unmodified_pair(p)) | |
4198 | return; | |
4199 | ||
4200 | if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) || | |
4201 | (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode))) | |
c3fced64 | 4202 | return; /* nothing to check in tree diffs */ |
88246898 JS |
4203 | |
4204 | run_checkdiff(p, o); | |
4205 | } | |
4206 | ||
6973dcae JH |
4207 | int diff_queue_is_empty(void) |
4208 | { | |
4209 | struct diff_queue_struct *q = &diff_queued_diff; | |
4210 | int i; | |
4211 | for (i = 0; i < q->nr; i++) | |
4212 | if (!diff_unmodified_pair(q->queue[i])) | |
4213 | return 0; | |
4214 | return 1; | |
4215 | } | |
4216 | ||
4217 | #if DIFF_DEBUG | |
4218 | void diff_debug_filespec(struct diff_filespec *s, int x, const char *one) | |
4219 | { | |
4220 | fprintf(stderr, "queue[%d] %s (%s) %s %06o %s\n", | |
4221 | x, one ? one : "", | |
4222 | s->path, | |
4223 | DIFF_FILE_VALID(s) ? "valid" : "invalid", | |
4224 | s->mode, | |
4225 | s->sha1_valid ? sha1_to_hex(s->sha1) : ""); | |
428d52a5 | 4226 | fprintf(stderr, "queue[%d] %s size %lu\n", |
6973dcae | 4227 | x, one ? one : "", |
428d52a5 | 4228 | s->size); |
6973dcae JH |
4229 | } |
4230 | ||
4231 | void diff_debug_filepair(const struct diff_filepair *p, int i) | |
4232 | { | |
4233 | diff_debug_filespec(p->one, i, "one"); | |
4234 | diff_debug_filespec(p->two, i, "two"); | |
64479711 | 4235 | fprintf(stderr, "score %d, status %c rename_used %d broken %d\n", |
6973dcae | 4236 | p->score, p->status ? p->status : '?', |
64479711 | 4237 | p->one->rename_used, p->broken_pair); |
6973dcae JH |
4238 | } |
4239 | ||
4240 | void diff_debug_queue(const char *msg, struct diff_queue_struct *q) | |
4241 | { | |
4242 | int i; | |
4243 | if (msg) | |
4244 | fprintf(stderr, "%s\n", msg); | |
4245 | fprintf(stderr, "q->nr = %d\n", q->nr); | |
4246 | for (i = 0; i < q->nr; i++) { | |
4247 | struct diff_filepair *p = q->queue[i]; | |
4248 | diff_debug_filepair(p, i); | |
4249 | } | |
4250 | } | |
4251 | #endif | |
4252 | ||
4253 | static void diff_resolve_rename_copy(void) | |
4254 | { | |
64479711 LT |
4255 | int i; |
4256 | struct diff_filepair *p; | |
6973dcae JH |
4257 | struct diff_queue_struct *q = &diff_queued_diff; |
4258 | ||
4259 | diff_debug_queue("resolve-rename-copy", q); | |
4260 | ||
4261 | for (i = 0; i < q->nr; i++) { | |
4262 | p = q->queue[i]; | |
4263 | p->status = 0; /* undecided */ | |
4264 | if (DIFF_PAIR_UNMERGED(p)) | |
4265 | p->status = DIFF_STATUS_UNMERGED; | |
4266 | else if (!DIFF_FILE_VALID(p->one)) | |
4267 | p->status = DIFF_STATUS_ADDED; | |
4268 | else if (!DIFF_FILE_VALID(p->two)) | |
4269 | p->status = DIFF_STATUS_DELETED; | |
4270 | else if (DIFF_PAIR_TYPE_CHANGED(p)) | |
4271 | p->status = DIFF_STATUS_TYPE_CHANGED; | |
4272 | ||
4273 | /* from this point on, we are dealing with a pair | |
4274 | * whose both sides are valid and of the same type, i.e. | |
4275 | * either in-place edit or rename/copy edit. | |
4276 | */ | |
4277 | else if (DIFF_PAIR_RENAME(p)) { | |
64479711 LT |
4278 | /* |
4279 | * A rename might have re-connected a broken | |
4280 | * pair up, causing the pathnames to be the | |
4281 | * same again. If so, that's not a rename at | |
4282 | * all, just a modification.. | |
4283 | * | |
4284 | * Otherwise, see if this source was used for | |
4285 | * multiple renames, in which case we decrement | |
4286 | * the count, and call it a copy. | |
6973dcae | 4287 | */ |
64479711 LT |
4288 | if (!strcmp(p->one->path, p->two->path)) |
4289 | p->status = DIFF_STATUS_MODIFIED; | |
4290 | else if (--p->one->rename_used > 0) | |
6973dcae | 4291 | p->status = DIFF_STATUS_COPIED; |
64479711 | 4292 | else |
6973dcae JH |
4293 | p->status = DIFF_STATUS_RENAMED; |
4294 | } | |
a89fccd2 | 4295 | else if (hashcmp(p->one->sha1, p->two->sha1) || |
d516c2d1 | 4296 | p->one->mode != p->two->mode || |
85adbf2f JL |
4297 | p->one->dirty_submodule || |
4298 | p->two->dirty_submodule || | |
d516c2d1 | 4299 | is_null_sha1(p->one->sha1)) |
6973dcae JH |
4300 | p->status = DIFF_STATUS_MODIFIED; |
4301 | else { | |
4302 | /* This is a "no-change" entry and should not | |
4303 | * happen anymore, but prepare for broken callers. | |
4304 | */ | |
4305 | error("feeding unmodified %s to diffcore", | |
4306 | p->one->path); | |
4307 | p->status = DIFF_STATUS_UNKNOWN; | |
4308 | } | |
4309 | } | |
4310 | diff_debug_queue("resolve-rename-copy done", q); | |
4311 | } | |
4312 | ||
c6744349 | 4313 | static int check_pair_status(struct diff_filepair *p) |
6973dcae | 4314 | { |
6973dcae JH |
4315 | switch (p->status) { |
4316 | case DIFF_STATUS_UNKNOWN: | |
c6744349 | 4317 | return 0; |
6973dcae JH |
4318 | case 0: |
4319 | die("internal error in diff-resolve-rename-copy"); | |
6973dcae | 4320 | default: |
c6744349 | 4321 | return 1; |
6973dcae JH |
4322 | } |
4323 | } | |
4324 | ||
c6744349 TH |
4325 | static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt) |
4326 | { | |
4327 | int fmt = opt->output_format; | |
4328 | ||
4329 | if (fmt & DIFF_FORMAT_CHECKDIFF) | |
4330 | diff_flush_checkdiff(p, opt); | |
4331 | else if (fmt & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS)) | |
4332 | diff_flush_raw(p, opt); | |
cd676a51 JH |
4333 | else if (fmt & DIFF_FORMAT_NAME) { |
4334 | const char *name_a, *name_b; | |
4335 | name_a = p->two->path; | |
4336 | name_b = NULL; | |
4337 | strip_prefix(opt->prefix_length, &name_a, &name_b); | |
c0c77734 | 4338 | write_name_quoted(name_a, opt->file, opt->line_termination); |
cd676a51 | 4339 | } |
c6744349 TH |
4340 | } |
4341 | ||
c0c77734 | 4342 | static void show_file_mode_name(FILE *file, const char *newdelete, struct diff_filespec *fs) |
4bbd261b SE |
4343 | { |
4344 | if (fs->mode) | |
c0c77734 | 4345 | fprintf(file, " %s mode %06o ", newdelete, fs->mode); |
4bbd261b | 4346 | else |
c0c77734 DB |
4347 | fprintf(file, " %s ", newdelete); |
4348 | write_name_quoted(fs->path, file, '\n'); | |
4bbd261b SE |
4349 | } |
4350 | ||
4351 | ||
7be57610 BY |
4352 | static void show_mode_change(FILE *file, struct diff_filepair *p, int show_name, |
4353 | const char *line_prefix) | |
4bbd261b SE |
4354 | { |
4355 | if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) { | |
7be57610 BY |
4356 | fprintf(file, "%s mode change %06o => %06o%c", line_prefix, p->one->mode, |
4357 | p->two->mode, show_name ? ' ' : '\n'); | |
0d26a64e | 4358 | if (show_name) { |
c0c77734 | 4359 | write_name_quoted(p->two->path, file, '\n'); |
0d26a64e | 4360 | } |
4bbd261b SE |
4361 | } |
4362 | } | |
4363 | ||
7be57610 BY |
4364 | static void show_rename_copy(FILE *file, const char *renamecopy, struct diff_filepair *p, |
4365 | const char *line_prefix) | |
4bbd261b | 4366 | { |
b9f44164 | 4367 | char *names = pprint_rename(p->one->path, p->two->path); |
4bbd261b | 4368 | |
c0c77734 | 4369 | fprintf(file, " %s %s (%d%%)\n", renamecopy, names, similarity_index(p)); |
b9f44164 | 4370 | free(names); |
7be57610 | 4371 | show_mode_change(file, p, 0, line_prefix); |
4bbd261b SE |
4372 | } |
4373 | ||
7be57610 | 4374 | static void diff_summary(struct diff_options *opt, struct diff_filepair *p) |
4bbd261b | 4375 | { |
7be57610 | 4376 | FILE *file = opt->file; |
30997bb8 | 4377 | const char *line_prefix = diff_line_prefix(opt); |
7be57610 | 4378 | |
4bbd261b SE |
4379 | switch(p->status) { |
4380 | case DIFF_STATUS_DELETED: | |
7be57610 | 4381 | fputs(line_prefix, file); |
c0c77734 | 4382 | show_file_mode_name(file, "delete", p->one); |
4bbd261b SE |
4383 | break; |
4384 | case DIFF_STATUS_ADDED: | |
7be57610 | 4385 | fputs(line_prefix, file); |
c0c77734 | 4386 | show_file_mode_name(file, "create", p->two); |
4bbd261b SE |
4387 | break; |
4388 | case DIFF_STATUS_COPIED: | |
7be57610 BY |
4389 | fputs(line_prefix, file); |
4390 | show_rename_copy(file, "copy", p, line_prefix); | |
4bbd261b SE |
4391 | break; |
4392 | case DIFF_STATUS_RENAMED: | |
7be57610 BY |
4393 | fputs(line_prefix, file); |
4394 | show_rename_copy(file, "rename", p, line_prefix); | |
4bbd261b SE |
4395 | break; |
4396 | default: | |
4397 | if (p->score) { | |
7be57610 | 4398 | fprintf(file, "%s rewrite ", line_prefix); |
c0c77734 DB |
4399 | write_name_quoted(p->two->path, file, ' '); |
4400 | fprintf(file, "(%d%%)\n", similarity_index(p)); | |
663af342 | 4401 | } |
7be57610 | 4402 | show_mode_change(file, p, !p->score, line_prefix); |
4bbd261b SE |
4403 | break; |
4404 | } | |
4405 | } | |
4406 | ||
fcb3d0ad | 4407 | struct patch_id_t { |
9126f009 | 4408 | git_SHA_CTX *ctx; |
fcb3d0ad JS |
4409 | int patchlen; |
4410 | }; | |
4411 | ||
4412 | static int remove_space(char *line, int len) | |
4413 | { | |
4414 | int i; | |
663af342 PH |
4415 | char *dst = line; |
4416 | unsigned char c; | |
fcb3d0ad | 4417 | |
663af342 PH |
4418 | for (i = 0; i < len; i++) |
4419 | if (!isspace((c = line[i]))) | |
4420 | *dst++ = c; | |
fcb3d0ad | 4421 | |
663af342 | 4422 | return dst - line; |
fcb3d0ad JS |
4423 | } |
4424 | ||
4425 | static void patch_id_consume(void *priv, char *line, unsigned long len) | |
4426 | { | |
4427 | struct patch_id_t *data = priv; | |
4428 | int new_len; | |
4429 | ||
4430 | /* Ignore line numbers when computing the SHA1 of the patch */ | |
59556548 | 4431 | if (starts_with(line, "@@ -")) |
fcb3d0ad JS |
4432 | return; |
4433 | ||
4434 | new_len = remove_space(line, len); | |
4435 | ||
9126f009 | 4436 | git_SHA1_Update(data->ctx, line, new_len); |
fcb3d0ad JS |
4437 | data->patchlen += new_len; |
4438 | } | |
4439 | ||
4440 | /* returns 0 upon success, and writes result into sha1 */ | |
4441 | static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1) | |
4442 | { | |
4443 | struct diff_queue_struct *q = &diff_queued_diff; | |
4444 | int i; | |
9126f009 | 4445 | git_SHA_CTX ctx; |
fcb3d0ad JS |
4446 | struct patch_id_t data; |
4447 | char buffer[PATH_MAX * 4 + 20]; | |
4448 | ||
9126f009 | 4449 | git_SHA1_Init(&ctx); |
fcb3d0ad JS |
4450 | memset(&data, 0, sizeof(struct patch_id_t)); |
4451 | data.ctx = &ctx; | |
fcb3d0ad JS |
4452 | |
4453 | for (i = 0; i < q->nr; i++) { | |
4454 | xpparam_t xpp; | |
4455 | xdemitconf_t xecfg; | |
fcb3d0ad JS |
4456 | mmfile_t mf1, mf2; |
4457 | struct diff_filepair *p = q->queue[i]; | |
4458 | int len1, len2; | |
4459 | ||
9ccd0a88 | 4460 | memset(&xpp, 0, sizeof(xpp)); |
30b25010 | 4461 | memset(&xecfg, 0, sizeof(xecfg)); |
fcb3d0ad JS |
4462 | if (p->status == 0) |
4463 | return error("internal diff status error"); | |
4464 | if (p->status == DIFF_STATUS_UNKNOWN) | |
4465 | continue; | |
4466 | if (diff_unmodified_pair(p)) | |
4467 | continue; | |
4468 | if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) || | |
4469 | (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode))) | |
4470 | continue; | |
4471 | if (DIFF_PAIR_UNMERGED(p)) | |
4472 | continue; | |
4473 | ||
4474 | diff_fill_sha1_info(p->one); | |
4475 | diff_fill_sha1_info(p->two); | |
4476 | if (fill_mmfile(&mf1, p->one) < 0 || | |
4477 | fill_mmfile(&mf2, p->two) < 0) | |
4478 | return error("unable to read files to diff"); | |
4479 | ||
fcb3d0ad JS |
4480 | len1 = remove_space(p->one->path, strlen(p->one->path)); |
4481 | len2 = remove_space(p->two->path, strlen(p->two->path)); | |
4482 | if (p->one->mode == 0) | |
4483 | len1 = snprintf(buffer, sizeof(buffer), | |
4484 | "diff--gita/%.*sb/%.*s" | |
4485 | "newfilemode%06o" | |
4486 | "---/dev/null" | |
4487 | "+++b/%.*s", | |
4488 | len1, p->one->path, | |
4489 | len2, p->two->path, | |
4490 | p->two->mode, | |
4491 | len2, p->two->path); | |
4492 | else if (p->two->mode == 0) | |
4493 | len1 = snprintf(buffer, sizeof(buffer), | |
4494 | "diff--gita/%.*sb/%.*s" | |
4495 | "deletedfilemode%06o" | |
4496 | "---a/%.*s" | |
4497 | "+++/dev/null", | |
4498 | len1, p->one->path, | |
4499 | len2, p->two->path, | |
4500 | p->one->mode, | |
4501 | len1, p->one->path); | |
4502 | else | |
4503 | len1 = snprintf(buffer, sizeof(buffer), | |
4504 | "diff--gita/%.*sb/%.*s" | |
4505 | "---a/%.*s" | |
4506 | "+++b/%.*s", | |
4507 | len1, p->one->path, | |
4508 | len2, p->two->path, | |
4509 | len1, p->one->path, | |
4510 | len2, p->two->path); | |
9126f009 | 4511 | git_SHA1_Update(&ctx, buffer, len1); |
fcb3d0ad | 4512 | |
34597c1f CB |
4513 | if (diff_filespec_is_binary(p->one) || |
4514 | diff_filespec_is_binary(p->two)) { | |
4515 | git_SHA1_Update(&ctx, sha1_to_hex(p->one->sha1), 40); | |
4516 | git_SHA1_Update(&ctx, sha1_to_hex(p->two->sha1), 40); | |
4517 | continue; | |
4518 | } | |
4519 | ||
582aa00b | 4520 | xpp.flags = 0; |
fcb3d0ad | 4521 | xecfg.ctxlen = 3; |
ad14b450 | 4522 | xecfg.flags = 0; |
3efb9880 JK |
4523 | if (xdi_diff_outf(&mf1, &mf2, patch_id_consume, &data, |
4524 | &xpp, &xecfg)) | |
4525 | return error("unable to generate patch-id diff for %s", | |
4526 | p->one->path); | |
fcb3d0ad JS |
4527 | } |
4528 | ||
9126f009 | 4529 | git_SHA1_Final(sha1, &ctx); |
fcb3d0ad JS |
4530 | return 0; |
4531 | } | |
4532 | ||
4533 | int diff_flush_patch_id(struct diff_options *options, unsigned char *sha1) | |
4534 | { | |
4535 | struct diff_queue_struct *q = &diff_queued_diff; | |
4536 | int i; | |
4537 | int result = diff_get_patch_id(options, sha1); | |
4538 | ||
4539 | for (i = 0; i < q->nr; i++) | |
4540 | diff_free_filepair(q->queue[i]); | |
4541 | ||
4542 | free(q->queue); | |
9ca5df90 | 4543 | DIFF_QUEUE_CLEAR(q); |
fcb3d0ad JS |
4544 | |
4545 | return result; | |
4546 | } | |
4547 | ||
946c3784 | 4548 | static int is_summary_empty(const struct diff_queue_struct *q) |
6973dcae | 4549 | { |
6973dcae | 4550 | int i; |
6973dcae | 4551 | |
946c3784 TH |
4552 | for (i = 0; i < q->nr; i++) { |
4553 | const struct diff_filepair *p = q->queue[i]; | |
4554 | ||
4555 | switch (p->status) { | |
4556 | case DIFF_STATUS_DELETED: | |
4557 | case DIFF_STATUS_ADDED: | |
4558 | case DIFF_STATUS_COPIED: | |
4559 | case DIFF_STATUS_RENAMED: | |
4560 | return 0; | |
4561 | default: | |
4562 | if (p->score) | |
4563 | return 0; | |
4564 | if (p->one->mode && p->two->mode && | |
4565 | p->one->mode != p->two->mode) | |
4566 | return 0; | |
4567 | break; | |
4568 | } | |
6973dcae | 4569 | } |
946c3784 TH |
4570 | return 1; |
4571 | } | |
4572 | ||
f31027c9 JH |
4573 | static const char rename_limit_warning[] = |
4574 | "inexact rename detection was skipped due to too many files."; | |
4575 | ||
4576 | static const char degrade_cc_to_c_warning[] = | |
4577 | "only found copies from modified paths due to too many files."; | |
4578 | ||
4579 | static const char rename_limit_advice[] = | |
4580 | "you may want to set your %s variable to at least " | |
4581 | "%d and retry the command."; | |
4582 | ||
4583 | void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc) | |
4584 | { | |
4585 | if (degraded_cc) | |
4586 | warning(degrade_cc_to_c_warning); | |
4587 | else if (needed) | |
4588 | warning(rename_limit_warning); | |
4589 | else | |
4590 | return; | |
4591 | if (0 < needed && needed < 32767) | |
4592 | warning(rename_limit_advice, varname, needed); | |
4593 | } | |
4594 | ||
6973dcae JH |
4595 | void diff_flush(struct diff_options *options) |
4596 | { | |
4597 | struct diff_queue_struct *q = &diff_queued_diff; | |
c6744349 | 4598 | int i, output_format = options->output_format; |
946c3784 | 4599 | int separator = 0; |
1c57a627 | 4600 | int dirstat_by_line = 0; |
6973dcae | 4601 | |
c6744349 TH |
4602 | /* |
4603 | * Order: raw, stat, summary, patch | |
4604 | * or: name/name-status/checkdiff (other bits clear) | |
4605 | */ | |
946c3784 TH |
4606 | if (!q->nr) |
4607 | goto free_queue; | |
6973dcae | 4608 | |
c6744349 TH |
4609 | if (output_format & (DIFF_FORMAT_RAW | |
4610 | DIFF_FORMAT_NAME | | |
4611 | DIFF_FORMAT_NAME_STATUS | | |
4612 | DIFF_FORMAT_CHECKDIFF)) { | |
6973dcae JH |
4613 | for (i = 0; i < q->nr; i++) { |
4614 | struct diff_filepair *p = q->queue[i]; | |
c6744349 TH |
4615 | if (check_pair_status(p)) |
4616 | flush_one_pair(p, options); | |
6973dcae | 4617 | } |
946c3784 | 4618 | separator++; |
6973dcae | 4619 | } |
c6744349 | 4620 | |
1c57a627 JH |
4621 | if (output_format & DIFF_FORMAT_DIRSTAT && DIFF_OPT_TST(options, DIRSTAT_BY_LINE)) |
4622 | dirstat_by_line = 1; | |
4623 | ||
4624 | if (output_format & (DIFF_FORMAT_DIFFSTAT|DIFF_FORMAT_SHORTSTAT|DIFF_FORMAT_NUMSTAT) || | |
4625 | dirstat_by_line) { | |
5e2b0636 | 4626 | struct diffstat_t diffstat; |
c6744349 | 4627 | |
5e2b0636 | 4628 | memset(&diffstat, 0, sizeof(struct diffstat_t)); |
6973dcae JH |
4629 | for (i = 0; i < q->nr; i++) { |
4630 | struct diff_filepair *p = q->queue[i]; | |
c6744349 | 4631 | if (check_pair_status(p)) |
5e2b0636 | 4632 | diff_flush_stat(p, options, &diffstat); |
6973dcae | 4633 | } |
74e2abe5 JH |
4634 | if (output_format & DIFF_FORMAT_NUMSTAT) |
4635 | show_numstat(&diffstat, options); | |
4636 | if (output_format & DIFF_FORMAT_DIFFSTAT) | |
4637 | show_stats(&diffstat, options); | |
f604652e | 4638 | if (output_format & DIFF_FORMAT_SHORTSTAT) |
c0c77734 | 4639 | show_shortstats(&diffstat, options); |
ab27389a | 4640 | if (output_format & DIFF_FORMAT_DIRSTAT && dirstat_by_line) |
1c57a627 | 4641 | show_dirstat_by_line(&diffstat, options); |
f604652e | 4642 | free_diffstat_info(&diffstat); |
3969cf7d | 4643 | separator++; |
6973dcae | 4644 | } |
1c57a627 | 4645 | if ((output_format & DIFF_FORMAT_DIRSTAT) && !dirstat_by_line) |
c04a7155 | 4646 | show_dirstat(options); |
6973dcae | 4647 | |
946c3784 | 4648 | if (output_format & DIFF_FORMAT_SUMMARY && !is_summary_empty(q)) { |
7be57610 BY |
4649 | for (i = 0; i < q->nr; i++) { |
4650 | diff_summary(options, q->queue[i]); | |
4651 | } | |
3969cf7d | 4652 | separator++; |
6973dcae JH |
4653 | } |
4654 | ||
6977c250 LA |
4655 | if (output_format & DIFF_FORMAT_NO_OUTPUT && |
4656 | DIFF_OPT_TST(options, EXIT_WITH_STATUS) && | |
4657 | DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) { | |
4658 | /* | |
4659 | * run diff_flush_patch for the exit status. setting | |
749f763d | 4660 | * options->file to /dev/null should be safe, because we |
6977c250 LA |
4661 | * aren't supposed to produce any output anyway. |
4662 | */ | |
4663 | if (options->close_file) | |
4664 | fclose(options->file); | |
4665 | options->file = fopen("/dev/null", "w"); | |
4666 | if (!options->file) | |
4667 | die_errno("Could not open /dev/null"); | |
4668 | options->close_file = 1; | |
4669 | for (i = 0; i < q->nr; i++) { | |
4670 | struct diff_filepair *p = q->queue[i]; | |
4671 | if (check_pair_status(p)) | |
4672 | diff_flush_patch(p, options); | |
4673 | if (options->found_changes) | |
4674 | break; | |
4675 | } | |
4676 | } | |
4677 | ||
c6744349 | 4678 | if (output_format & DIFF_FORMAT_PATCH) { |
946c3784 | 4679 | if (separator) { |
30997bb8 JK |
4680 | fprintf(options->file, "%s%c", |
4681 | diff_line_prefix(options), | |
4682 | options->line_termination); | |
946c3784 TH |
4683 | if (options->stat_sep) { |
4684 | /* attach patch instead of inline */ | |
c0c77734 | 4685 | fputs(options->stat_sep, options->file); |
946c3784 | 4686 | } |
c6744349 TH |
4687 | } |
4688 | ||
4689 | for (i = 0; i < q->nr; i++) { | |
4690 | struct diff_filepair *p = q->queue[i]; | |
4691 | if (check_pair_status(p)) | |
4692 | diff_flush_patch(p, options); | |
4693 | } | |
4bbd261b SE |
4694 | } |
4695 | ||
04245581 JK |
4696 | if (output_format & DIFF_FORMAT_CALLBACK) |
4697 | options->format_callback(q, options, options->format_callback_data); | |
4698 | ||
c6744349 TH |
4699 | for (i = 0; i < q->nr; i++) |
4700 | diff_free_filepair(q->queue[i]); | |
946c3784 | 4701 | free_queue: |
6973dcae | 4702 | free(q->queue); |
9ca5df90 | 4703 | DIFF_QUEUE_CLEAR(q); |
c0c77734 DB |
4704 | if (options->close_file) |
4705 | fclose(options->file); | |
f245194f JH |
4706 | |
4707 | /* | |
97bf2a08 | 4708 | * Report the content-level differences with HAS_CHANGES; |
f245194f JH |
4709 | * diff_addremove/diff_change does not set the bit when |
4710 | * DIFF_FROM_CONTENTS is in effect (e.g. with -w). | |
4711 | */ | |
4712 | if (DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) { | |
4713 | if (options->found_changes) | |
4714 | DIFF_OPT_SET(options, HAS_CHANGES); | |
4715 | else | |
4716 | DIFF_OPT_CLR(options, HAS_CHANGES); | |
4717 | } | |
6973dcae JH |
4718 | } |
4719 | ||
08578fa1 JH |
4720 | static int match_filter(const struct diff_options *options, const struct diff_filepair *p) |
4721 | { | |
4722 | return (((p->status == DIFF_STATUS_MODIFIED) && | |
4723 | ((p->score && | |
1ecc1cbd | 4724 | filter_bit_tst(DIFF_STATUS_FILTER_BROKEN, options)) || |
08578fa1 | 4725 | (!p->score && |
1ecc1cbd | 4726 | filter_bit_tst(DIFF_STATUS_MODIFIED, options)))) || |
08578fa1 | 4727 | ((p->status != DIFF_STATUS_MODIFIED) && |
1ecc1cbd | 4728 | filter_bit_tst(p->status, options))); |
08578fa1 JH |
4729 | } |
4730 | ||
949226fe | 4731 | static void diffcore_apply_filter(struct diff_options *options) |
6973dcae JH |
4732 | { |
4733 | int i; | |
4734 | struct diff_queue_struct *q = &diff_queued_diff; | |
4735 | struct diff_queue_struct outq; | |
949226fe | 4736 | |
9ca5df90 | 4737 | DIFF_QUEUE_CLEAR(&outq); |
6973dcae | 4738 | |
1ecc1cbd | 4739 | if (!options->filter) |
6973dcae JH |
4740 | return; |
4741 | ||
1ecc1cbd | 4742 | if (filter_bit_tst(DIFF_STATUS_FILTER_AON, options)) { |
6973dcae JH |
4743 | int found; |
4744 | for (i = found = 0; !found && i < q->nr; i++) { | |
08578fa1 | 4745 | if (match_filter(options, q->queue[i])) |
6973dcae JH |
4746 | found++; |
4747 | } | |
4748 | if (found) | |
4749 | return; | |
4750 | ||
4751 | /* otherwise we will clear the whole queue | |
4752 | * by copying the empty outq at the end of this | |
4753 | * function, but first clear the current entries | |
4754 | * in the queue. | |
4755 | */ | |
4756 | for (i = 0; i < q->nr; i++) | |
4757 | diff_free_filepair(q->queue[i]); | |
4758 | } | |
4759 | else { | |
4760 | /* Only the matching ones */ | |
4761 | for (i = 0; i < q->nr; i++) { | |
4762 | struct diff_filepair *p = q->queue[i]; | |
08578fa1 | 4763 | if (match_filter(options, p)) |
6973dcae JH |
4764 | diff_q(&outq, p); |
4765 | else | |
4766 | diff_free_filepair(p); | |
4767 | } | |
4768 | } | |
4769 | free(q->queue); | |
4770 | *q = outq; | |
4771 | } | |
4772 | ||
5701115a SV |
4773 | /* Check whether two filespecs with the same mode and size are identical */ |
4774 | static int diff_filespec_is_identical(struct diff_filespec *one, | |
4775 | struct diff_filespec *two) | |
4776 | { | |
2b459b48 JH |
4777 | if (S_ISGITLINK(one->mode)) |
4778 | return 0; | |
5701115a SV |
4779 | if (diff_populate_filespec(one, 0)) |
4780 | return 0; | |
4781 | if (diff_populate_filespec(two, 0)) | |
4782 | return 0; | |
4783 | return !memcmp(one->data, two->data, one->size); | |
4784 | } | |
4785 | ||
fceb9072 NTND |
4786 | static int diff_filespec_check_stat_unmatch(struct diff_filepair *p) |
4787 | { | |
f34b205f NTND |
4788 | if (p->done_skip_stat_unmatch) |
4789 | return p->skip_stat_unmatch_result; | |
4790 | ||
4791 | p->done_skip_stat_unmatch = 1; | |
4792 | p->skip_stat_unmatch_result = 0; | |
fceb9072 NTND |
4793 | /* |
4794 | * 1. Entries that come from stat info dirtiness | |
4795 | * always have both sides (iow, not create/delete), | |
4796 | * one side of the object name is unknown, with | |
4797 | * the same mode and size. Keep the ones that | |
4798 | * do not match these criteria. They have real | |
4799 | * differences. | |
4800 | * | |
4801 | * 2. At this point, the file is known to be modified, | |
4802 | * with the same mode and size, and the object | |
4803 | * name of one side is unknown. Need to inspect | |
4804 | * the identical contents. | |
4805 | */ | |
4806 | if (!DIFF_FILE_VALID(p->one) || /* (1) */ | |
4807 | !DIFF_FILE_VALID(p->two) || | |
4808 | (p->one->sha1_valid && p->two->sha1_valid) || | |
4809 | (p->one->mode != p->two->mode) || | |
8e5dd3d6 NTND |
4810 | diff_populate_filespec(p->one, CHECK_SIZE_ONLY) || |
4811 | diff_populate_filespec(p->two, CHECK_SIZE_ONLY) || | |
fceb9072 NTND |
4812 | (p->one->size != p->two->size) || |
4813 | !diff_filespec_is_identical(p->one, p->two)) /* (2) */ | |
f34b205f NTND |
4814 | p->skip_stat_unmatch_result = 1; |
4815 | return p->skip_stat_unmatch_result; | |
fceb9072 NTND |
4816 | } |
4817 | ||
fb13227e JH |
4818 | static void diffcore_skip_stat_unmatch(struct diff_options *diffopt) |
4819 | { | |
4820 | int i; | |
4821 | struct diff_queue_struct *q = &diff_queued_diff; | |
4822 | struct diff_queue_struct outq; | |
9ca5df90 | 4823 | DIFF_QUEUE_CLEAR(&outq); |
fb13227e JH |
4824 | |
4825 | for (i = 0; i < q->nr; i++) { | |
4826 | struct diff_filepair *p = q->queue[i]; | |
4827 | ||
fceb9072 | 4828 | if (diff_filespec_check_stat_unmatch(p)) |
fb13227e JH |
4829 | diff_q(&outq, p); |
4830 | else { | |
4831 | /* | |
4832 | * The caller can subtract 1 from skip_stat_unmatch | |
4833 | * to determine how many paths were dirty only | |
4834 | * due to stat info mismatch. | |
4835 | */ | |
8f67f8ae | 4836 | if (!DIFF_OPT_TST(diffopt, NO_INDEX)) |
6d2d9e86 | 4837 | diffopt->skip_stat_unmatch++; |
fb13227e JH |
4838 | diff_free_filepair(p); |
4839 | } | |
4840 | } | |
4841 | free(q->queue); | |
4842 | *q = outq; | |
4843 | } | |
4844 | ||
730f7284 JH |
4845 | static int diffnamecmp(const void *a_, const void *b_) |
4846 | { | |
4847 | const struct diff_filepair *a = *((const struct diff_filepair **)a_); | |
4848 | const struct diff_filepair *b = *((const struct diff_filepair **)b_); | |
4849 | const char *name_a, *name_b; | |
4850 | ||
4851 | name_a = a->one ? a->one->path : a->two->path; | |
4852 | name_b = b->one ? b->one->path : b->two->path; | |
4853 | return strcmp(name_a, name_b); | |
4854 | } | |
4855 | ||
4856 | void diffcore_fix_diff_index(struct diff_options *options) | |
4857 | { | |
4858 | struct diff_queue_struct *q = &diff_queued_diff; | |
4859 | qsort(q->queue, q->nr, sizeof(q->queue[0]), diffnamecmp); | |
4860 | } | |
4861 | ||
6973dcae JH |
4862 | void diffcore_std(struct diff_options *options) |
4863 | { | |
7195fbfa | 4864 | /* NOTE please keep the following in sync with diff_tree_combined() */ |
9d865356 | 4865 | if (options->skip_stat_unmatch) |
fb13227e | 4866 | diffcore_skip_stat_unmatch(options); |
44c48a90 JH |
4867 | if (!options->found_follow) { |
4868 | /* See try_to_follow_renames() in tree-diff.c */ | |
4869 | if (options->break_opt != -1) | |
4870 | diffcore_break(options->break_opt); | |
4871 | if (options->detect_rename) | |
4872 | diffcore_rename(options); | |
4873 | if (options->break_opt != -1) | |
4874 | diffcore_merge_broken(); | |
4875 | } | |
6973dcae | 4876 | if (options->pickaxe) |
382f013b | 4877 | diffcore_pickaxe(options); |
6973dcae JH |
4878 | if (options->orderfile) |
4879 | diffcore_order(options->orderfile); | |
44c48a90 JH |
4880 | if (!options->found_follow) |
4881 | /* See try_to_follow_renames() in tree-diff.c */ | |
4882 | diff_resolve_rename_copy(); | |
949226fe | 4883 | diffcore_apply_filter(options); |
68aacb2f | 4884 | |
f245194f | 4885 | if (diff_queued_diff.nr && !DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) |
8f67f8ae PH |
4886 | DIFF_OPT_SET(options, HAS_CHANGES); |
4887 | else | |
4888 | DIFF_OPT_CLR(options, HAS_CHANGES); | |
1da6175d | 4889 | |
44c48a90 | 4890 | options->found_follow = 0; |
6973dcae JH |
4891 | } |
4892 | ||
da31b358 JH |
4893 | int diff_result_code(struct diff_options *opt, int status) |
4894 | { | |
4895 | int result = 0; | |
f31027c9 | 4896 | |
c9fc4415 | 4897 | diff_warn_rename_limit("diff.renameLimit", |
f31027c9 JH |
4898 | opt->needed_rename_limit, |
4899 | opt->degraded_cc_to_c); | |
da31b358 JH |
4900 | if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) && |
4901 | !(opt->output_format & DIFF_FORMAT_CHECKDIFF)) | |
4902 | return status; | |
4903 | if (DIFF_OPT_TST(opt, EXIT_WITH_STATUS) && | |
4904 | DIFF_OPT_TST(opt, HAS_CHANGES)) | |
4905 | result |= 01; | |
4906 | if ((opt->output_format & DIFF_FORMAT_CHECKDIFF) && | |
4907 | DIFF_OPT_TST(opt, CHECK_FAILED)) | |
4908 | result |= 02; | |
4909 | return result; | |
4910 | } | |
6973dcae | 4911 | |
28b9264d JH |
4912 | int diff_can_quit_early(struct diff_options *opt) |
4913 | { | |
4914 | return (DIFF_OPT_TST(opt, QUICK) && | |
4915 | !opt->filter && | |
4916 | DIFF_OPT_TST(opt, HAS_CHANGES)); | |
4917 | } | |
4918 | ||
aee9c7d6 JL |
4919 | /* |
4920 | * Shall changes to this submodule be ignored? | |
4921 | * | |
4922 | * Submodule changes can be configured to be ignored separately for each path, | |
4923 | * but that configuration can be overridden from the command line. | |
4924 | */ | |
4925 | static int is_submodule_ignored(const char *path, struct diff_options *options) | |
4926 | { | |
4927 | int ignored = 0; | |
4928 | unsigned orig_flags = options->flags; | |
4929 | if (!DIFF_OPT_TST(options, OVERRIDE_SUBMODULE_CONFIG)) | |
4930 | set_diffopt_flags_from_submodule_config(options, path); | |
4931 | if (DIFF_OPT_TST(options, IGNORE_SUBMODULES)) | |
4932 | ignored = 1; | |
4933 | options->flags = orig_flags; | |
4934 | return ignored; | |
4935 | } | |
4936 | ||
6973dcae JH |
4937 | void diff_addremove(struct diff_options *options, |
4938 | int addremove, unsigned mode, | |
4939 | const unsigned char *sha1, | |
e5450100 | 4940 | int sha1_valid, |
e3d42c47 | 4941 | const char *concatpath, unsigned dirty_submodule) |
6973dcae | 4942 | { |
6973dcae JH |
4943 | struct diff_filespec *one, *two; |
4944 | ||
aee9c7d6 | 4945 | if (S_ISGITLINK(mode) && is_submodule_ignored(concatpath, options)) |
50fd9bd8 JS |
4946 | return; |
4947 | ||
6973dcae JH |
4948 | /* This may look odd, but it is a preparation for |
4949 | * feeding "there are unchanged files which should | |
4950 | * not produce diffs, but when you are doing copy | |
4951 | * detection you would need them, so here they are" | |
4952 | * entries to the diff-core. They will be prefixed | |
4953 | * with something like '=' or '*' (I haven't decided | |
4954 | * which but should not make any difference). | |
a6080a0a | 4955 | * Feeding the same new and old to diff_change() |
6973dcae JH |
4956 | * also has the same effect. |
4957 | * Before the final output happens, they are pruned after | |
4958 | * merged into rename/copy pairs as appropriate. | |
4959 | */ | |
8f67f8ae | 4960 | if (DIFF_OPT_TST(options, REVERSE_DIFF)) |
6973dcae JH |
4961 | addremove = (addremove == '+' ? '-' : |
4962 | addremove == '-' ? '+' : addremove); | |
4963 | ||
cd676a51 JH |
4964 | if (options->prefix && |
4965 | strncmp(concatpath, options->prefix, options->prefix_length)) | |
4966 | return; | |
4967 | ||
6973dcae JH |
4968 | one = alloc_filespec(concatpath); |
4969 | two = alloc_filespec(concatpath); | |
4970 | ||
4971 | if (addremove != '+') | |
e5450100 | 4972 | fill_filespec(one, sha1, sha1_valid, mode); |
e3d42c47 | 4973 | if (addremove != '-') { |
e5450100 | 4974 | fill_filespec(two, sha1, sha1_valid, mode); |
e3d42c47 JL |
4975 | two->dirty_submodule = dirty_submodule; |
4976 | } | |
6973dcae JH |
4977 | |
4978 | diff_queue(&diff_queued_diff, one, two); | |
f245194f JH |
4979 | if (!DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) |
4980 | DIFF_OPT_SET(options, HAS_CHANGES); | |
6973dcae JH |
4981 | } |
4982 | ||
4983 | void diff_change(struct diff_options *options, | |
4984 | unsigned old_mode, unsigned new_mode, | |
4985 | const unsigned char *old_sha1, | |
4986 | const unsigned char *new_sha1, | |
e5450100 | 4987 | int old_sha1_valid, int new_sha1_valid, |
e3d42c47 JL |
4988 | const char *concatpath, |
4989 | unsigned old_dirty_submodule, unsigned new_dirty_submodule) | |
6973dcae | 4990 | { |
6973dcae | 4991 | struct diff_filespec *one, *two; |
f34b205f | 4992 | struct diff_filepair *p; |
6973dcae | 4993 | |
aee9c7d6 JL |
4994 | if (S_ISGITLINK(old_mode) && S_ISGITLINK(new_mode) && |
4995 | is_submodule_ignored(concatpath, options)) | |
50fd9bd8 JS |
4996 | return; |
4997 | ||
8f67f8ae | 4998 | if (DIFF_OPT_TST(options, REVERSE_DIFF)) { |
6973dcae JH |
4999 | unsigned tmp; |
5000 | const unsigned char *tmp_c; | |
5001 | tmp = old_mode; old_mode = new_mode; new_mode = tmp; | |
5002 | tmp_c = old_sha1; old_sha1 = new_sha1; new_sha1 = tmp_c; | |
e5450100 JK |
5003 | tmp = old_sha1_valid; old_sha1_valid = new_sha1_valid; |
5004 | new_sha1_valid = tmp; | |
e3d42c47 JL |
5005 | tmp = old_dirty_submodule; old_dirty_submodule = new_dirty_submodule; |
5006 | new_dirty_submodule = tmp; | |
6973dcae | 5007 | } |
cd676a51 JH |
5008 | |
5009 | if (options->prefix && | |
5010 | strncmp(concatpath, options->prefix, options->prefix_length)) | |
5011 | return; | |
5012 | ||
6973dcae JH |
5013 | one = alloc_filespec(concatpath); |
5014 | two = alloc_filespec(concatpath); | |
e5450100 JK |
5015 | fill_filespec(one, old_sha1, old_sha1_valid, old_mode); |
5016 | fill_filespec(two, new_sha1, new_sha1_valid, new_mode); | |
e3d42c47 JL |
5017 | one->dirty_submodule = old_dirty_submodule; |
5018 | two->dirty_submodule = new_dirty_submodule; | |
f34b205f | 5019 | p = diff_queue(&diff_queued_diff, one, two); |
6973dcae | 5020 | |
f34b205f NTND |
5021 | if (DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) |
5022 | return; | |
5023 | ||
5024 | if (DIFF_OPT_TST(options, QUICK) && options->skip_stat_unmatch && | |
5025 | !diff_filespec_check_stat_unmatch(p)) | |
5026 | return; | |
5027 | ||
5028 | DIFF_OPT_SET(options, HAS_CHANGES); | |
6973dcae JH |
5029 | } |
5030 | ||
fa7b2908 | 5031 | struct diff_filepair *diff_unmerge(struct diff_options *options, const char *path) |
6973dcae | 5032 | { |
76399c01 | 5033 | struct diff_filepair *pair; |
6973dcae | 5034 | struct diff_filespec *one, *two; |
cd676a51 JH |
5035 | |
5036 | if (options->prefix && | |
5037 | strncmp(path, options->prefix, options->prefix_length)) | |
76399c01 | 5038 | return NULL; |
cd676a51 | 5039 | |
6973dcae JH |
5040 | one = alloc_filespec(path); |
5041 | two = alloc_filespec(path); | |
76399c01 JH |
5042 | pair = diff_queue(&diff_queued_diff, one, two); |
5043 | pair->is_unmerged = 1; | |
5044 | return pair; | |
6973dcae | 5045 | } |
9cb92c39 JK |
5046 | |
5047 | static char *run_textconv(const char *pgm, struct diff_filespec *spec, | |
5048 | size_t *outsize) | |
5049 | { | |
479b0ae8 | 5050 | struct diff_tempfile *temp; |
9cb92c39 JK |
5051 | const char *argv[3]; |
5052 | const char **arg = argv; | |
d3180279 | 5053 | struct child_process child = CHILD_PROCESS_INIT; |
9cb92c39 | 5054 | struct strbuf buf = STRBUF_INIT; |
da1fbed3 | 5055 | int err = 0; |
9cb92c39 | 5056 | |
479b0ae8 | 5057 | temp = prepare_temp_file(spec->path, spec); |
9cb92c39 | 5058 | *arg++ = pgm; |
479b0ae8 | 5059 | *arg++ = temp->name; |
9cb92c39 JK |
5060 | *arg = NULL; |
5061 | ||
41a457e4 | 5062 | child.use_shell = 1; |
9cb92c39 JK |
5063 | child.argv = argv; |
5064 | child.out = -1; | |
da1fbed3 | 5065 | if (start_command(&child)) { |
479b0ae8 | 5066 | remove_tempfile(); |
9cb92c39 JK |
5067 | return NULL; |
5068 | } | |
da1fbed3 JS |
5069 | |
5070 | if (strbuf_read(&buf, child.out, 0) < 0) | |
5071 | err = error("error reading from textconv command '%s'", pgm); | |
70d70999 | 5072 | close(child.out); |
da1fbed3 JS |
5073 | |
5074 | if (finish_command(&child) || err) { | |
5075 | strbuf_release(&buf); | |
5076 | remove_tempfile(); | |
5077 | return NULL; | |
5078 | } | |
479b0ae8 | 5079 | remove_tempfile(); |
9cb92c39 JK |
5080 | |
5081 | return strbuf_detach(&buf, outsize); | |
5082 | } | |
840383b2 | 5083 | |
a788d7d5 AB |
5084 | size_t fill_textconv(struct userdiff_driver *driver, |
5085 | struct diff_filespec *df, | |
5086 | char **outbuf) | |
840383b2 JK |
5087 | { |
5088 | size_t size; | |
5089 | ||
a64e6a44 | 5090 | if (!driver) { |
840383b2 JK |
5091 | if (!DIFF_FILE_VALID(df)) { |
5092 | *outbuf = ""; | |
5093 | return 0; | |
5094 | } | |
5095 | if (diff_populate_filespec(df, 0)) | |
5096 | die("unable to read files to diff"); | |
5097 | *outbuf = df->data; | |
5098 | return df->size; | |
5099 | } | |
5100 | ||
a64e6a44 JK |
5101 | if (!driver->textconv) |
5102 | die("BUG: fill_textconv called with non-textconv driver"); | |
5103 | ||
9ec09b04 | 5104 | if (driver->textconv_cache && df->sha1_valid) { |
d9bae1a1 JK |
5105 | *outbuf = notes_cache_get(driver->textconv_cache, df->sha1, |
5106 | &size); | |
5107 | if (*outbuf) | |
5108 | return size; | |
5109 | } | |
5110 | ||
5111 | *outbuf = run_textconv(driver->textconv, df, &size); | |
840383b2 JK |
5112 | if (!*outbuf) |
5113 | die("unable to read files to diff"); | |
d9bae1a1 | 5114 | |
9ec09b04 | 5115 | if (driver->textconv_cache && df->sha1_valid) { |
d9bae1a1 JK |
5116 | /* ignore errors, as we might be in a readonly repository */ |
5117 | notes_cache_put(driver->textconv_cache, df->sha1, *outbuf, | |
5118 | size); | |
5119 | /* | |
5120 | * we could save up changes and flush them all at the end, | |
5121 | * but we would need an extra call after all diffing is done. | |
5122 | * Since generating a cache entry is the slow path anyway, | |
5123 | * this extra overhead probably isn't a big deal. | |
5124 | */ | |
5125 | notes_cache_write(driver->textconv_cache); | |
5126 | } | |
5127 | ||
840383b2 JK |
5128 | return size; |
5129 | } | |
4914c962 NTND |
5130 | |
5131 | void setup_diff_pager(struct diff_options *opt) | |
5132 | { | |
5133 | /* | |
5134 | * If the user asked for our exit code, then either they want --quiet | |
5135 | * or --exit-code. We should definitely not bother with a pager in the | |
5136 | * former case, as we will generate no output. Since we still properly | |
5137 | * report our exit code even when a pager is run, we _could_ run a | |
5138 | * pager with --exit-code. But since we have not done so historically, | |
5139 | * and because it is easy to find people oneline advising "git diff | |
5140 | * --exit-code" in hooks and other scripts, we do not do so. | |
5141 | */ | |
5142 | if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) && | |
5143 | check_pager_config("diff") != 0) | |
5144 | setup_pager(); | |
5145 | } |