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