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