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