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