diff.c 165.3 KB
Newer Older
J
Junio C Hamano 已提交
1 2 3 4
/*
 * Copyright (C) 2005 Junio C Hamano
 */
#include "cache.h"
5
#include "config.h"
M
Michael Haggerty 已提交
6
#include "tempfile.h"
J
Junio C Hamano 已提交
7 8 9
#include "quote.h"
#include "diff.h"
#include "diffcore.h"
J
Junio C Hamano 已提交
10
#include "delta.h"
J
Junio C Hamano 已提交
11
#include "xdiff-interface.h"
12
#include "color.h"
13
#include "attr.h"
14
#include "run-command.h"
15
#include "utf8.h"
16
#include "userdiff.h"
17
#include "submodule-config.h"
18
#include "submodule.h"
19
#include "hashmap.h"
20
#include "ll-merge.h"
21
#include "string-list.h"
22
#include "argv-array.h"
23
#include "graph.h"
J
Jonathan Tan 已提交
24
#include "packfile.h"
J
Junio C Hamano 已提交
25

26 27 28 29 30 31
#ifdef NO_FAST_WORKING_DIRECTORY
#define FAST_WORKING_DIRECTORY 0
#else
#define FAST_WORKING_DIRECTORY 1
#endif

32
static int diff_detect_rename_default;
33
static int diff_indent_heuristic = 1;
J
Jeff King 已提交
34
static int diff_rename_limit_default = 400;
35
static int diff_suppress_blank_empty;
36
static int diff_use_color_default = -1;
37
static int diff_color_moved_default;
38
static int diff_context_default = 3;
39
static int diff_interhunk_context_default;
40
static const char *diff_word_regex_cfg;
41
static const char *external_diff_cmd_cfg;
42
static const char *diff_order_file_cfg;
43
int diff_auto_refresh_index = 1;
44
static int diff_mnemonic_prefix;
45
static int diff_no_prefix;
46
static int diff_stat_graph_width;
47
static int diff_dirstat_permille_default = 30;
48
static struct diff_options default_diff_options;
49
static long diff_algorithm;
50
static unsigned ws_error_highlight_default = WSEH_NEW;
J
Junio C Hamano 已提交
51

52
static char diff_colors[][COLOR_MAXLEN] = {
53
	GIT_COLOR_RESET,
54
	GIT_COLOR_NORMAL,	/* CONTEXT */
55 56 57 58 59 60
	GIT_COLOR_BOLD,		/* METAINFO */
	GIT_COLOR_CYAN,		/* FRAGINFO */
	GIT_COLOR_RED,		/* OLD */
	GIT_COLOR_GREEN,	/* NEW */
	GIT_COLOR_YELLOW,	/* COMMIT */
	GIT_COLOR_BG_RED,	/* WHITESPACE */
B
Bert Wesarg 已提交
61
	GIT_COLOR_NORMAL,	/* FUNCINFO */
62 63 64 65 66 67 68 69
	GIT_COLOR_BOLD_MAGENTA,	/* OLD_MOVED */
	GIT_COLOR_BOLD_BLUE,	/* OLD_MOVED ALTERNATIVE */
	GIT_COLOR_FAINT,	/* OLD_MOVED_DIM */
	GIT_COLOR_FAINT_ITALIC,	/* OLD_MOVED_ALTERNATIVE_DIM */
	GIT_COLOR_BOLD_CYAN,	/* NEW_MOVED */
	GIT_COLOR_BOLD_YELLOW,	/* NEW_MOVED ALTERNATIVE */
	GIT_COLOR_FAINT,	/* NEW_MOVED_DIM */
	GIT_COLOR_FAINT_ITALIC,	/* NEW_MOVED_ALTERNATIVE_DIM */
J
Johannes Schindelin 已提交
70 71
};

72 73 74 75 76
static NORETURN void die_want_option(const char *option_name)
{
	die(_("option '%s' requires a value"), option_name);
}

77
static int parse_diff_color_slot(const char *var)
78
{
79
	if (!strcasecmp(var, "context") || !strcasecmp(var, "plain"))
80
		return DIFF_CONTEXT;
81
	if (!strcasecmp(var, "meta"))
82
		return DIFF_METAINFO;
83
	if (!strcasecmp(var, "frag"))
84
		return DIFF_FRAGINFO;
85
	if (!strcasecmp(var, "old"))
86
		return DIFF_FILE_OLD;
87
	if (!strcasecmp(var, "new"))
88
		return DIFF_FILE_NEW;
89
	if (!strcasecmp(var, "commit"))
J
Jeff King 已提交
90
		return DIFF_COMMIT;
91
	if (!strcasecmp(var, "whitespace"))
92
		return DIFF_WHITESPACE;
93
	if (!strcasecmp(var, "func"))
B
Bert Wesarg 已提交
94
		return DIFF_FUNCINFO;
95 96 97 98
	if (!strcasecmp(var, "oldmoved"))
		return DIFF_FILE_OLD_MOVED;
	if (!strcasecmp(var, "oldmovedalternative"))
		return DIFF_FILE_OLD_MOVED_ALT;
99 100 101 102
	if (!strcasecmp(var, "oldmoveddimmed"))
		return DIFF_FILE_OLD_MOVED_DIM;
	if (!strcasecmp(var, "oldmovedalternativedimmed"))
		return DIFF_FILE_OLD_MOVED_ALT_DIM;
103 104 105 106
	if (!strcasecmp(var, "newmoved"))
		return DIFF_FILE_NEW_MOVED;
	if (!strcasecmp(var, "newmovedalternative"))
		return DIFF_FILE_NEW_MOVED_ALT;
107 108 109 110
	if (!strcasecmp(var, "newmoveddimmed"))
		return DIFF_FILE_NEW_MOVED_DIM;
	if (!strcasecmp(var, "newmovedalternativedimmed"))
		return DIFF_FILE_NEW_MOVED_ALT_DIM;
J
Jeff King 已提交
111
	return -1;
112 113
}

114
static int parse_dirstat_params(struct diff_options *options, const char *params_string,
115
				struct strbuf *errmsg)
116
{
117 118 119 120
	char *params_copy = xstrdup(params_string);
	struct string_list params = STRING_LIST_INIT_NODUP;
	int ret = 0;
	int i;
121

122 123 124 125 126
	if (*params_copy)
		string_list_split_in_place(&params, params_copy, ',', -1);
	for (i = 0; i < params.nr; i++) {
		const char *p = params.items[i].string;
		if (!strcmp(p, "changes")) {
127 128
			options->flags.dirstat_by_line = 0;
			options->flags.dirstat_by_file = 0;
129
		} else if (!strcmp(p, "lines")) {
130 131
			options->flags.dirstat_by_line = 1;
			options->flags.dirstat_by_file = 0;
132
		} else if (!strcmp(p, "files")) {
133 134
			options->flags.dirstat_by_line = 0;
			options->flags.dirstat_by_file = 1;
135
		} else if (!strcmp(p, "noncumulative")) {
136
			options->flags.dirstat_cumulative = 0;
137
		} else if (!strcmp(p, "cumulative")) {
138
			options->flags.dirstat_cumulative = 1;
139 140
		} else if (isdigit(*p)) {
			char *end;
141 142
			int permille = strtoul(p, &end, 10) * 10;
			if (*end == '.' && isdigit(*++end)) {
143
				/* only use first digit */
144
				permille += *end - '0';
145
				/* .. and ignore any further digits */
146
				while (isdigit(*++end))
147 148
					; /* nothing */
			}
149
			if (!*end)
150 151
				options->dirstat_permille = permille;
			else {
152 153
				strbuf_addf(errmsg, _("  Failed to parse dirstat cut-off percentage '%s'\n"),
					    p);
154 155 156
				ret++;
			}
		} else {
157
			strbuf_addf(errmsg, _("  Unknown dirstat parameter '%s'\n"), p);
158
			ret++;
159
		}
160

161
	}
162 163
	string_list_clear(&params, 0);
	free(params_copy);
164
	return ret;
165 166
}

167 168 169
static int parse_submodule_params(struct diff_options *options, const char *value)
{
	if (!strcmp(value, "log"))
170
		options->submodule_format = DIFF_SUBMODULE_LOG;
171
	else if (!strcmp(value, "short"))
172
		options->submodule_format = DIFF_SUBMODULE_SHORT;
173 174
	else if (!strcmp(value, "diff"))
		options->submodule_format = DIFF_SUBMODULE_INLINE_DIFF;
175 176 177 178 179
	else
		return -1;
	return 0;
}

180 181 182 183 184 185 186 187 188
static int git_config_rename(const char *var, const char *value)
{
	if (!value)
		return DIFF_DETECT_RENAME;
	if (!strcasecmp(value, "copies") || !strcasecmp(value, "copy"))
		return  DIFF_DETECT_COPY;
	return git_config_bool(var,value) ? DIFF_DETECT_RENAME : 0;
}

189
long parse_algorithm_value(const char *value)
190 191 192 193 194 195 196 197 198 199 200 201 202 203
{
	if (!value)
		return -1;
	else if (!strcasecmp(value, "myers") || !strcasecmp(value, "default"))
		return 0;
	else if (!strcasecmp(value, "minimal"))
		return XDF_NEED_MINIMAL;
	else if (!strcasecmp(value, "patience"))
		return XDF_PATIENCE_DIFF;
	else if (!strcasecmp(value, "histogram"))
		return XDF_HISTOGRAM_DIFF;
	return -1;
}

204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240
static int parse_one_token(const char **arg, const char *token)
{
	const char *rest;
	if (skip_prefix(*arg, token, &rest) && (!*rest || *rest == ',')) {
		*arg = rest;
		return 1;
	}
	return 0;
}

static int parse_ws_error_highlight(const char *arg)
{
	const char *orig_arg = arg;
	unsigned val = 0;

	while (*arg) {
		if (parse_one_token(&arg, "none"))
			val = 0;
		else if (parse_one_token(&arg, "default"))
			val = WSEH_NEW;
		else if (parse_one_token(&arg, "all"))
			val = WSEH_NEW | WSEH_OLD | WSEH_CONTEXT;
		else if (parse_one_token(&arg, "new"))
			val |= WSEH_NEW;
		else if (parse_one_token(&arg, "old"))
			val |= WSEH_OLD;
		else if (parse_one_token(&arg, "context"))
			val |= WSEH_CONTEXT;
		else {
			return -1 - (int)(arg - orig_arg);
		}
		if (*arg)
			arg++;
	}
	return val;
}

241 242 243 244 245 246
/*
 * These are to give UI layer defaults.
 * The core-level commands such as git-diff-files should
 * never be affected by the setting of diff.renames
 * the user happens to have in the configuration file.
 */
247 248
void init_diff_ui_defaults(void)
{
249
	diff_detect_rename_default = DIFF_DETECT_RENAME;
250 251
}

252 253
int git_diff_heuristic_config(const char *var, const char *value, void *cb)
{
254
	if (!strcmp(var, "diff.indentheuristic"))
255 256 257 258
		diff_indent_heuristic = git_config_bool(var, value);
	return 0;
}

259 260 261 262 263 264 265 266 267 268 269 270 271
static int parse_color_moved(const char *arg)
{
	switch (git_parse_maybe_bool(arg)) {
	case 0:
		return COLOR_MOVED_NO;
	case 1:
		return COLOR_MOVED_DEFAULT;
	default:
		break;
	}

	if (!strcmp(arg, "no"))
		return COLOR_MOVED_NO;
272 273
	else if (!strcmp(arg, "plain"))
		return COLOR_MOVED_PLAIN;
274 275 276 277
	else if (!strcmp(arg, "zebra"))
		return COLOR_MOVED_ZEBRA;
	else if (!strcmp(arg, "default"))
		return COLOR_MOVED_DEFAULT;
278 279
	else if (!strcmp(arg, "dimmed_zebra"))
		return COLOR_MOVED_ZEBRA_DIM;
280
	else
281
		return error(_("color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', 'plain'"));
282 283
}

284
int git_diff_ui_config(const char *var, const char *value, void *cb)
285
{
286
	if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
287
		diff_use_color_default = git_config_colorbool(var, value);
288 289
		return 0;
	}
290 291 292 293 294 295 296
	if (!strcmp(var, "diff.colormoved")) {
		int cm = parse_color_moved(value);
		if (cm < 0)
			return -1;
		diff_color_moved_default = cm;
		return 0;
	}
297 298 299 300 301 302
	if (!strcmp(var, "diff.context")) {
		diff_context_default = git_config_int(var, value);
		if (diff_context_default < 0)
			return -1;
		return 0;
	}
303 304 305 306 307 308
	if (!strcmp(var, "diff.interhunkcontext")) {
		diff_interhunk_context_default = git_config_int(var, value);
		if (diff_interhunk_context_default < 0)
			return -1;
		return 0;
	}
309
	if (!strcmp(var, "diff.renames")) {
310
		diff_detect_rename_default = git_config_rename(var, value);
311 312
		return 0;
	}
313 314 315 316
	if (!strcmp(var, "diff.autorefreshindex")) {
		diff_auto_refresh_index = git_config_bool(var, value);
		return 0;
	}
317 318 319 320
	if (!strcmp(var, "diff.mnemonicprefix")) {
		diff_mnemonic_prefix = git_config_bool(var, value);
		return 0;
	}
321 322 323 324
	if (!strcmp(var, "diff.noprefix")) {
		diff_no_prefix = git_config_bool(var, value);
		return 0;
	}
325 326 327 328
	if (!strcmp(var, "diff.statgraphwidth")) {
		diff_stat_graph_width = git_config_int(var, value);
		return 0;
	}
329 330
	if (!strcmp(var, "diff.external"))
		return git_config_string(&external_diff_cmd_cfg, var, value);
331 332
	if (!strcmp(var, "diff.wordregex"))
		return git_config_string(&diff_word_regex_cfg, var, value);
333 334
	if (!strcmp(var, "diff.orderfile"))
		return git_config_pathname(&diff_order_file_cfg, var, value);
J
Junio C Hamano 已提交
335

336 337 338
	if (!strcmp(var, "diff.ignoresubmodules"))
		handle_ignore_submodules_arg(&default_diff_options, value);

339 340 341 342 343 344 345
	if (!strcmp(var, "diff.submodule")) {
		if (parse_submodule_params(&default_diff_options, value))
			warning(_("Unknown value for 'diff.submodule' config variable: '%s'"),
				value);
		return 0;
	}

346 347 348 349 350 351 352
	if (!strcmp(var, "diff.algorithm")) {
		diff_algorithm = parse_algorithm_value(value);
		if (diff_algorithm < 0)
			return -1;
		return 0;
	}

353 354 355 356 357 358 359 360
	if (!strcmp(var, "diff.wserrorhighlight")) {
		int val = parse_ws_error_highlight(value);
		if (val < 0)
			return -1;
		ws_error_highlight_default = val;
		return 0;
	}

361 362 363
	if (git_color_config(var, value, cb) < 0)
		return -1;

364
	return git_diff_basic_config(var, value, cb);
J
Jeff King 已提交
365 366
}

367
int git_diff_basic_config(const char *var, const char *value, void *cb)
J
Jeff King 已提交
368
{
369 370
	const char *name;

371 372 373 374 375
	if (!strcmp(var, "diff.renamelimit")) {
		diff_rename_limit_default = git_config_int(var, value);
		return 0;
	}

376 377
	if (userdiff_config(var, value) < 0)
		return -1;
378

379 380 381
	if (skip_prefix(var, "diff.color.", &name) ||
	    skip_prefix(var, "color.diff.", &name)) {
		int slot = parse_diff_color_slot(name);
J
Jeff King 已提交
382 383
		if (slot < 0)
			return 0;
384 385
		if (!value)
			return config_error_nonbool(var);
386
		return color_parse(value, diff_colors[slot]);
387
	}
J
Junio C Hamano 已提交
388

389
	/* like GNU diff's --suppress-blank-empty option  */
390 391 392
	if (!strcmp(var, "diff.suppressblankempty") ||
			/* for backwards compatibility */
			!strcmp(var, "diff.suppress-blank-empty")) {
393 394 395 396
		diff_suppress_blank_empty = git_config_bool(var, value);
		return 0;
	}

397
	if (!strcmp(var, "diff.dirstat")) {
398
		struct strbuf errmsg = STRBUF_INIT;
399
		default_diff_options.dirstat_permille = diff_dirstat_permille_default;
400
		if (parse_dirstat_params(&default_diff_options, value, &errmsg))
401
			warning(_("Found errors in 'diff.dirstat' config variable:\n%s"),
402 403
				errmsg.buf);
		strbuf_release(&errmsg);
404
		diff_dirstat_permille_default = default_diff_options.dirstat_permille;
405 406 407
		return 0;
	}

408 409 410
	if (git_diff_heuristic_config(var, value, cb) < 0)
		return -1;

411
	return git_default_config(var, value, cb);
412 413
}

J
Junio C Hamano 已提交
414 415 416 417
static char *quote_two(const char *one, const char *two)
{
	int need_one = quote_c_style(one, NULL, NULL, 1);
	int need_two = quote_c_style(two, NULL, NULL, 1);
418
	struct strbuf res = STRBUF_INIT;
J
Junio C Hamano 已提交
419 420

	if (need_one + need_two) {
421 422 423 424 425 426 427
		strbuf_addch(&res, '"');
		quote_c_style(one, &res, NULL, 1);
		quote_c_style(two, &res, NULL, 1);
		strbuf_addch(&res, '"');
	} else {
		strbuf_addstr(&res, one);
		strbuf_addstr(&res, two);
J
Junio C Hamano 已提交
428
	}
429
	return strbuf_detach(&res, NULL);
J
Junio C Hamano 已提交
430 431 432 433 434 435 436 437 438 439
}

static const char *external_diff(void)
{
	static const char *external_diff_cmd = NULL;
	static int done_preparing = 0;

	if (done_preparing)
		return external_diff_cmd;
	external_diff_cmd = getenv("GIT_EXTERNAL_DIFF");
440 441
	if (!external_diff_cmd)
		external_diff_cmd = external_diff_cmd_cfg;
J
Junio C Hamano 已提交
442 443 444 445
	done_preparing = 1;
	return external_diff_cmd;
}

M
Michael Haggerty 已提交
446 447 448 449 450
/*
 * Keep track of files used for diffing. Sometimes such an entry
 * refers to a temporary file, sometimes to an existing file, and
 * sometimes to "/dev/null".
 */
J
Junio C Hamano 已提交
451
static struct diff_tempfile {
M
Michael Haggerty 已提交
452 453 454 455 456 457
	/*
	 * filename external diff should read from, or NULL if this
	 * entry is currently not in use:
	 */
	const char *name;

458
	char hex[GIT_MAX_HEXSZ + 1];
J
Junio C Hamano 已提交
459
	char mode[10];
M
Michael Haggerty 已提交
460 461 462 463 464

	/*
	 * If this diff_tempfile instance refers to a temporary file,
	 * this tempfile object is used to manage its lifetime.
	 */
465
	struct tempfile *tempfile;
J
Junio C Hamano 已提交
466 467
} diff_temp[2];

J
Junio C Hamano 已提交
468 469 470 471 472 473 474 475 476
struct emit_callback {
	int color_diff;
	unsigned ws_rule;
	int blank_at_eof_in_preimage;
	int blank_at_eof_in_postimage;
	int lno_in_preimage;
	int lno_in_postimage;
	const char **label_path;
	struct diff_words_data *diff_words;
477
	struct diff_options *opt;
478
	struct strbuf *header;
J
Junio C Hamano 已提交
479 480
};

J
Junio C Hamano 已提交
481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503
static int count_lines(const char *data, int size)
{
	int count, ch, completely_empty = 1, nl_just_seen = 0;
	count = 0;
	while (0 < size--) {
		ch = *data++;
		if (ch == '\n') {
			count++;
			nl_just_seen = 1;
			completely_empty = 0;
		}
		else {
			nl_just_seen = 0;
			completely_empty = 0;
		}
	}
	if (completely_empty)
		return 0;
	if (!nl_just_seen)
		count++; /* no trailing newline */
	return count;
}

J
Junio C Hamano 已提交
504 505 506 507 508 509 510 511 512
static int fill_mmfile(mmfile_t *mf, struct diff_filespec *one)
{
	if (!DIFF_FILE_VALID(one)) {
		mf->ptr = (char *)""; /* does not matter */
		mf->size = 0;
		return 0;
	}
	else if (diff_populate_filespec(one, 0))
		return -1;
513

J
Junio C Hamano 已提交
514 515 516 517 518
	mf->ptr = one->data;
	mf->size = one->size;
	return 0;
}

519 520 521 522 523
/* like fill_mmfile, but only for size, so we can avoid retrieving blob */
static unsigned long diff_filespec_size(struct diff_filespec *one)
{
	if (!DIFF_FILE_VALID(one))
		return 0;
524
	diff_populate_filespec(one, CHECK_SIZE_ONLY);
525 526 527
	return one->size;
}

J
Junio C Hamano 已提交
528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572
static int count_trailing_blank(mmfile_t *mf, unsigned ws_rule)
{
	char *ptr = mf->ptr;
	long size = mf->size;
	int cnt = 0;

	if (!size)
		return cnt;
	ptr += size - 1; /* pointing at the very end */
	if (*ptr != '\n')
		; /* incomplete line */
	else
		ptr--; /* skip the last LF */
	while (mf->ptr < ptr) {
		char *prev_eol;
		for (prev_eol = ptr; mf->ptr <= prev_eol; prev_eol--)
			if (*prev_eol == '\n')
				break;
		if (!ws_blank_line(prev_eol + 1, ptr - prev_eol, ws_rule))
			break;
		cnt++;
		ptr = prev_eol - 1;
	}
	return cnt;
}

static void check_blank_at_eof(mmfile_t *mf1, mmfile_t *mf2,
			       struct emit_callback *ecbdata)
{
	int l1, l2, at;
	unsigned ws_rule = ecbdata->ws_rule;
	l1 = count_trailing_blank(mf1, ws_rule);
	l2 = count_trailing_blank(mf2, ws_rule);
	if (l2 <= l1) {
		ecbdata->blank_at_eof_in_preimage = 0;
		ecbdata->blank_at_eof_in_postimage = 0;
		return;
	}
	at = count_lines(mf1->ptr, mf1->size);
	ecbdata->blank_at_eof_in_preimage = (at - l1) + 1;

	at = count_lines(mf2->ptr, mf2->size);
	ecbdata->blank_at_eof_in_postimage = (at - l2) + 1;
}

573
static void emit_line_0(struct diff_options *o, const char *set, const char *reset,
574
			int first, const char *line, int len)
J
Junio C Hamano 已提交
575 576
{
	int has_trailing_newline, has_trailing_carriage_return;
577
	int nofirst;
578 579
	FILE *file = o->file;

580
	fputs(diff_line_prefix(o), file);
J
Junio C Hamano 已提交
581

582 583 584 585 586 587 588 589 590 591 592 593 594 595
	if (len == 0) {
		has_trailing_newline = (first == '\n');
		has_trailing_carriage_return = (!has_trailing_newline &&
						(first == '\r'));
		nofirst = has_trailing_newline || has_trailing_carriage_return;
	} else {
		has_trailing_newline = (len > 0 && line[len-1] == '\n');
		if (has_trailing_newline)
			len--;
		has_trailing_carriage_return = (len > 0 && line[len-1] == '\r');
		if (has_trailing_carriage_return)
			len--;
		nofirst = 0;
	}
J
Junio C Hamano 已提交
596

597 598 599 600 601 602 603
	if (len || !nofirst) {
		fputs(set, file);
		if (!nofirst)
			fputc(first, file);
		fwrite(line, len, 1, file);
		fputs(reset, file);
	}
J
Junio C Hamano 已提交
604 605 606 607 608 609
	if (has_trailing_carriage_return)
		fputc('\r', file);
	if (has_trailing_newline)
		fputc('\n', file);
}

610
static void emit_line(struct diff_options *o, const char *set, const char *reset,
611 612
		      const char *line, int len)
{
613
	emit_line_0(o, set, reset, line[0], line+1, len-1);
614 615
}

616
enum diff_symbol {
617 618 619 620 621
	DIFF_SYMBOL_BINARY_DIFF_HEADER,
	DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA,
	DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL,
	DIFF_SYMBOL_BINARY_DIFF_BODY,
	DIFF_SYMBOL_BINARY_DIFF_FOOTER,
622 623 624 625
	DIFF_SYMBOL_STATS_SUMMARY_NO_FILES,
	DIFF_SYMBOL_STATS_SUMMARY_ABBREV,
	DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES,
	DIFF_SYMBOL_STATS_LINE,
626
	DIFF_SYMBOL_WORD_DIFF,
627
	DIFF_SYMBOL_STAT_SEP,
628
	DIFF_SYMBOL_SUMMARY,
629 630 631 632 633 634 635
	DIFF_SYMBOL_SUBMODULE_ADD,
	DIFF_SYMBOL_SUBMODULE_DEL,
	DIFF_SYMBOL_SUBMODULE_UNTRACKED,
	DIFF_SYMBOL_SUBMODULE_MODIFIED,
	DIFF_SYMBOL_SUBMODULE_HEADER,
	DIFF_SYMBOL_SUBMODULE_ERROR,
	DIFF_SYMBOL_SUBMODULE_PIPETHROUGH,
636
	DIFF_SYMBOL_REWRITE_DIFF,
637
	DIFF_SYMBOL_BINARY_FILES,
638
	DIFF_SYMBOL_HEADER,
639 640
	DIFF_SYMBOL_FILEPAIR_PLUS,
	DIFF_SYMBOL_FILEPAIR_MINUS,
641 642
	DIFF_SYMBOL_WORDS_PORCELAIN,
	DIFF_SYMBOL_WORDS,
643
	DIFF_SYMBOL_CONTEXT,
644
	DIFF_SYMBOL_CONTEXT_INCOMPLETE,
645 646
	DIFF_SYMBOL_PLUS,
	DIFF_SYMBOL_MINUS,
647
	DIFF_SYMBOL_NO_LF_EOF,
648
	DIFF_SYMBOL_CONTEXT_FRAGINFO,
649
	DIFF_SYMBOL_CONTEXT_MARKER,
650 651
	DIFF_SYMBOL_SEPARATOR
};
652 653 654 655 656 657
/*
 * Flags for content lines:
 * 0..12 are whitespace rules
 * 13-15 are WSEH_NEW | WSEH_OLD | WSEH_CONTEXT
 * 16 is marking if the line is blank at EOF
 */
658 659 660
#define DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF	(1<<16)
#define DIFF_SYMBOL_MOVED_LINE			(1<<17)
#define DIFF_SYMBOL_MOVED_LINE_ALT		(1<<18)
661
#define DIFF_SYMBOL_MOVED_LINE_UNINTERESTING	(1<<19)
662 663
#define DIFF_SYMBOL_CONTENT_WS_MASK (WSEH_NEW | WSEH_OLD | WSEH_CONTEXT | WS_RULE_MASK)

664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691
/*
 * This struct is used when we need to buffer the output of the diff output.
 *
 * NEEDSWORK: Instead of storing a copy of the line, add an offset pointer
 * into the pre/post image file. This pointer could be a union with the
 * line pointer. By storing an offset into the file instead of the literal line,
 * we can decrease the memory footprint for the buffered output. At first we
 * may want to only have indirection for the content lines, but we could also
 * enhance the state for emitting prefabricated lines, e.g. the similarity
 * score line or hunk/file headers would only need to store a number or path
 * and then the output can be constructed later on depending on state.
 */
struct emitted_diff_symbol {
	const char *line;
	int len;
	int flags;
	enum diff_symbol s;
};
#define EMITTED_DIFF_SYMBOL_INIT {NULL}

struct emitted_diff_symbols {
	struct emitted_diff_symbol *buf;
	int nr, alloc;
};
#define EMITTED_DIFF_SYMBOLS_INIT {NULL, 0, 0}

static void append_emitted_diff_symbol(struct diff_options *o,
				       struct emitted_diff_symbol *e)
J
Junio C Hamano 已提交
692
{
693 694 695 696 697 698 699 700 701
	struct emitted_diff_symbol *f;

	ALLOC_GROW(o->emitted_symbols->buf,
		   o->emitted_symbols->nr + 1,
		   o->emitted_symbols->alloc);
	f = &o->emitted_symbols->buf[o->emitted_symbols->nr++];

	memcpy(f, e, sizeof(struct emitted_diff_symbol));
	f->line = e->line ? xmemdupz(e->line, e->len) : NULL;
J
Junio C Hamano 已提交
702 703
}

704 705 706 707 708 709 710 711 712 713 714
struct moved_entry {
	struct hashmap_entry ent;
	const struct emitted_diff_symbol *es;
	struct moved_entry *next_line;
};

static int moved_entry_cmp(const struct diff_options *diffopt,
			   const struct moved_entry *a,
			   const struct moved_entry *b,
			   const void *keydata)
{
715 716 717
	return !xdiff_compare_lines(a->es->line, a->es->len,
				    b->es->line, b->es->len,
				    diffopt->xdl_opts);
718 719 720 721 722 723 724 725
}

static struct moved_entry *prepare_entry(struct diff_options *o,
					 int line_no)
{
	struct moved_entry *ret = xmalloc(sizeof(*ret));
	struct emitted_diff_symbol *l = &o->emitted_symbols->buf[line_no];

726
	ret->ent.hash = xdiff_hash_string(l->line, l->len, o->xdl_opts);
727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791
	ret->es = l;
	ret->next_line = NULL;

	return ret;
}

static void add_lines_to_move_detection(struct diff_options *o,
					struct hashmap *add_lines,
					struct hashmap *del_lines)
{
	struct moved_entry *prev_line = NULL;

	int n;
	for (n = 0; n < o->emitted_symbols->nr; n++) {
		struct hashmap *hm;
		struct moved_entry *key;

		switch (o->emitted_symbols->buf[n].s) {
		case DIFF_SYMBOL_PLUS:
			hm = add_lines;
			break;
		case DIFF_SYMBOL_MINUS:
			hm = del_lines;
			break;
		default:
			prev_line = NULL;
			continue;
		}

		key = prepare_entry(o, n);
		if (prev_line && prev_line->es->s == o->emitted_symbols->buf[n].s)
			prev_line->next_line = key;

		hashmap_add(hm, key);
		prev_line = key;
	}
}

static int shrink_potential_moved_blocks(struct moved_entry **pmb,
					 int pmb_nr)
{
	int lp, rp;

	/* Shrink the set of potential block to the remaining running */
	for (lp = 0, rp = pmb_nr - 1; lp <= rp;) {
		while (lp < pmb_nr && pmb[lp])
			lp++;
		/* lp points at the first NULL now */

		while (rp > -1 && !pmb[rp])
			rp--;
		/* rp points at the last non-NULL */

		if (lp < pmb_nr && rp > -1 && lp < rp) {
			pmb[lp] = pmb[rp];
			pmb[rp] = NULL;
			rp--;
			lp++;
		}
	}

	/* Remember the number of running sets */
	return rp + 1;
}

792 793 794
/*
 * If o->color_moved is COLOR_MOVED_PLAIN, this function does nothing.
 *
795 796
 * Otherwise, if the last block has fewer alphanumeric characters than
 * COLOR_MOVED_MIN_ALNUM_COUNT, unset DIFF_SYMBOL_MOVED_LINE on all lines in
797 798 799 800
 * that block.
 *
 * The last block consists of the (n - block_length)'th line up to but not
 * including the nth line.
801 802 803
 *
 * NEEDSWORK: This uses the same heuristic as blame_entry_score() in blame.c.
 * Think of a way to unify them.
804 805 806
 */
static void adjust_last_block(struct diff_options *o, int n, int block_length)
{
807 808
	int i, alnum_count = 0;
	if (o->color_moved == COLOR_MOVED_PLAIN)
809
		return;
810 811 812 813 814 815 816 817 818 819
	for (i = 1; i < block_length + 1; i++) {
		const char *c = o->emitted_symbols->buf[n - i].line;
		for (; *c; c++) {
			if (!isalnum(*c))
				continue;
			alnum_count++;
			if (alnum_count >= COLOR_MOVED_MIN_ALNUM_COUNT)
				return;
		}
	}
820 821 822 823
	for (i = 1; i < block_length + 1; i++)
		o->emitted_symbols->buf[n - i].flags &= ~DIFF_SYMBOL_MOVED_LINE;
}

824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844
/* Find blocks of moved code, delegate actual coloring decision to helper */
static void mark_color_as_moved(struct diff_options *o,
				struct hashmap *add_lines,
				struct hashmap *del_lines)
{
	struct moved_entry **pmb = NULL; /* potentially moved blocks */
	int pmb_nr = 0, pmb_alloc = 0;
	int n, flipped_block = 1, block_length = 0;


	for (n = 0; n < o->emitted_symbols->nr; n++) {
		struct hashmap *hm = NULL;
		struct moved_entry *key;
		struct moved_entry *match = NULL;
		struct emitted_diff_symbol *l = &o->emitted_symbols->buf[n];
		int i;

		switch (l->s) {
		case DIFF_SYMBOL_PLUS:
			hm = del_lines;
			key = prepare_entry(o, n);
845
			match = hashmap_get(hm, key, NULL);
846 847 848 849 850
			free(key);
			break;
		case DIFF_SYMBOL_MINUS:
			hm = add_lines;
			key = prepare_entry(o, n);
851
			match = hashmap_get(hm, key, NULL);
852 853 854 855 856 857 858
			free(key);
			break;
		default:
			flipped_block = 1;
		}

		if (!match) {
859
			adjust_last_block(o, n, block_length);
860 861 862 863 864 865 866
			pmb_nr = 0;
			block_length = 0;
			continue;
		}

		l->flags |= DIFF_SYMBOL_MOVED_LINE;

867 868 869
		if (o->color_moved == COLOR_MOVED_PLAIN)
			continue;

870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894
		/* Check any potential block runs, advance each or nullify */
		for (i = 0; i < pmb_nr; i++) {
			struct moved_entry *p = pmb[i];
			struct moved_entry *pnext = (p && p->next_line) ?
					p->next_line : NULL;
			if (pnext && !hm->cmpfn(o, pnext, match, NULL)) {
				pmb[i] = p->next_line;
			} else {
				pmb[i] = NULL;
			}
		}

		pmb_nr = shrink_potential_moved_blocks(pmb, pmb_nr);

		if (pmb_nr == 0) {
			/*
			 * The current line is the start of a new block.
			 * Setup the set of potential blocks.
			 */
			for (; match; match = hashmap_get_next(hm, match)) {
				ALLOC_GROW(pmb, pmb_nr + 1, pmb_alloc);
				pmb[pmb_nr++] = match;
			}

			flipped_block = (flipped_block + 1) % 2;
895 896 897

			adjust_last_block(o, n, block_length);
			block_length = 0;
898 899
		}

900 901
		block_length++;

902 903 904
		if (flipped_block)
			l->flags |= DIFF_SYMBOL_MOVED_LINE_ALT;
	}
905
	adjust_last_block(o, n, block_length);
906 907 908

	free(pmb);
}
909

910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970
#define DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK \
  (DIFF_SYMBOL_MOVED_LINE | DIFF_SYMBOL_MOVED_LINE_ALT)
static void dim_moved_lines(struct diff_options *o)
{
	int n;
	for (n = 0; n < o->emitted_symbols->nr; n++) {
		struct emitted_diff_symbol *prev = (n != 0) ?
				&o->emitted_symbols->buf[n - 1] : NULL;
		struct emitted_diff_symbol *l = &o->emitted_symbols->buf[n];
		struct emitted_diff_symbol *next =
				(n < o->emitted_symbols->nr - 1) ?
				&o->emitted_symbols->buf[n + 1] : NULL;

		/* Not a plus or minus line? */
		if (l->s != DIFF_SYMBOL_PLUS && l->s != DIFF_SYMBOL_MINUS)
			continue;

		/* Not a moved line? */
		if (!(l->flags & DIFF_SYMBOL_MOVED_LINE))
			continue;

		/*
		 * If prev or next are not a plus or minus line,
		 * pretend they don't exist
		 */
		if (prev && prev->s != DIFF_SYMBOL_PLUS &&
			    prev->s != DIFF_SYMBOL_MINUS)
			prev = NULL;
		if (next && next->s != DIFF_SYMBOL_PLUS &&
			    next->s != DIFF_SYMBOL_MINUS)
			next = NULL;

		/* Inside a block? */
		if ((prev &&
		    (prev->flags & DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK) ==
		    (l->flags & DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK)) &&
		    (next &&
		    (next->flags & DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK) ==
		    (l->flags & DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK))) {
			l->flags |= DIFF_SYMBOL_MOVED_LINE_UNINTERESTING;
			continue;
		}

		/* Check if we are at an interesting bound: */
		if (prev && (prev->flags & DIFF_SYMBOL_MOVED_LINE) &&
		    (prev->flags & DIFF_SYMBOL_MOVED_LINE_ALT) !=
		       (l->flags & DIFF_SYMBOL_MOVED_LINE_ALT))
			continue;
		if (next && (next->flags & DIFF_SYMBOL_MOVED_LINE) &&
		    (next->flags & DIFF_SYMBOL_MOVED_LINE_ALT) !=
		       (l->flags & DIFF_SYMBOL_MOVED_LINE_ALT))
			continue;

		/*
		 * The boundary to prev and next are not interesting,
		 * so this line is not interesting as a whole
		 */
		l->flags |= DIFF_SYMBOL_MOVED_LINE_UNINTERESTING;
	}
}

971 972 973 974
static void emit_line_ws_markup(struct diff_options *o,
				const char *set, const char *reset,
				const char *line, int len, char sign,
				unsigned ws_rule, int blank_at_eof)
J
Junio C Hamano 已提交
975
{
976
	const char *ws = NULL;
J
Junio C Hamano 已提交
977

978 979
	if (o->ws_error_highlight & ws_rule) {
		ws = diff_get_color_opt(o, DIFF_WHITESPACE);
980 981 982 983 984
		if (!*ws)
			ws = NULL;
	}

	if (!ws)
985 986
		emit_line_0(o, set, reset, sign, line, len);
	else if (blank_at_eof)
J
Junio C Hamano 已提交
987
		/* Blank line at EOF - paint '+' as well */
988
		emit_line_0(o, ws, reset, sign, line, len);
J
Junio C Hamano 已提交
989 990
	else {
		/* Emit just the prefix, then the rest. */
991 992 993
		emit_line_0(o, set, reset, sign, "", 0);
		ws_check_emit(line, len, ws_rule,
			      o->file, set, reset, ws);
J
Junio C Hamano 已提交
994 995 996
	}
}

997 998
static void emit_diff_symbol_from_struct(struct diff_options *o,
					 struct emitted_diff_symbol *eds)
999
{
1000
	static const char *nneof = " No newline at end of file\n";
1001
	const char *context, *reset, *set, *meta, *fraginfo;
1002
	struct strbuf sb = STRBUF_INIT;
1003 1004 1005 1006 1007 1008

	enum diff_symbol s = eds->s;
	const char *line = eds->line;
	int len = eds->len;
	unsigned flags = eds->flags;

1009
	switch (s) {
1010 1011 1012 1013 1014 1015 1016
	case DIFF_SYMBOL_NO_LF_EOF:
		context = diff_get_color_opt(o, DIFF_CONTEXT);
		reset = diff_get_color_opt(o, DIFF_RESET);
		putc('\n', o->file);
		emit_line_0(o, context, reset, '\\',
			    nneof, strlen(nneof));
		break;
1017 1018 1019
	case DIFF_SYMBOL_SUBMODULE_HEADER:
	case DIFF_SYMBOL_SUBMODULE_ERROR:
	case DIFF_SYMBOL_SUBMODULE_PIPETHROUGH:
1020
	case DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES:
1021
	case DIFF_SYMBOL_SUMMARY:
1022
	case DIFF_SYMBOL_STATS_LINE:
1023
	case DIFF_SYMBOL_BINARY_DIFF_BODY:
1024 1025 1026
	case DIFF_SYMBOL_CONTEXT_FRAGINFO:
		emit_line(o, "", "", line, len);
		break;
1027
	case DIFF_SYMBOL_CONTEXT_INCOMPLETE:
1028 1029 1030 1031 1032
	case DIFF_SYMBOL_CONTEXT_MARKER:
		context = diff_get_color_opt(o, DIFF_CONTEXT);
		reset = diff_get_color_opt(o, DIFF_RESET);
		emit_line(o, context, reset, line, len);
		break;
1033 1034 1035 1036 1037
	case DIFF_SYMBOL_SEPARATOR:
		fprintf(o->file, "%s%c",
			diff_line_prefix(o),
			o->line_termination);
		break;
1038 1039 1040 1041 1042 1043 1044
	case DIFF_SYMBOL_CONTEXT:
		set = diff_get_color_opt(o, DIFF_CONTEXT);
		reset = diff_get_color_opt(o, DIFF_RESET);
		emit_line_ws_markup(o, set, reset, line, len, ' ',
				    flags & (DIFF_SYMBOL_CONTENT_WS_MASK), 0);
		break;
	case DIFF_SYMBOL_PLUS:
1045 1046 1047 1048 1049 1050 1051 1052 1053 1054
		switch (flags & (DIFF_SYMBOL_MOVED_LINE |
				 DIFF_SYMBOL_MOVED_LINE_ALT |
				 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING)) {
		case DIFF_SYMBOL_MOVED_LINE |
		     DIFF_SYMBOL_MOVED_LINE_ALT |
		     DIFF_SYMBOL_MOVED_LINE_UNINTERESTING:
			set = diff_get_color_opt(o, DIFF_FILE_NEW_MOVED_ALT_DIM);
			break;
		case DIFF_SYMBOL_MOVED_LINE |
		     DIFF_SYMBOL_MOVED_LINE_ALT:
1055
			set = diff_get_color_opt(o, DIFF_FILE_NEW_MOVED_ALT);
1056 1057 1058 1059 1060 1061
			break;
		case DIFF_SYMBOL_MOVED_LINE |
		     DIFF_SYMBOL_MOVED_LINE_UNINTERESTING:
			set = diff_get_color_opt(o, DIFF_FILE_NEW_MOVED_DIM);
			break;
		case DIFF_SYMBOL_MOVED_LINE:
1062
			set = diff_get_color_opt(o, DIFF_FILE_NEW_MOVED);
1063 1064
			break;
		default:
1065
			set = diff_get_color_opt(o, DIFF_FILE_NEW);
1066
		}
1067 1068 1069 1070 1071 1072
		reset = diff_get_color_opt(o, DIFF_RESET);
		emit_line_ws_markup(o, set, reset, line, len, '+',
				    flags & DIFF_SYMBOL_CONTENT_WS_MASK,
				    flags & DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF);
		break;
	case DIFF_SYMBOL_MINUS:
1073 1074 1075 1076 1077 1078 1079 1080 1081 1082
		switch (flags & (DIFF_SYMBOL_MOVED_LINE |
				 DIFF_SYMBOL_MOVED_LINE_ALT |
				 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING)) {
		case DIFF_SYMBOL_MOVED_LINE |
		     DIFF_SYMBOL_MOVED_LINE_ALT |
		     DIFF_SYMBOL_MOVED_LINE_UNINTERESTING:
			set = diff_get_color_opt(o, DIFF_FILE_OLD_MOVED_ALT_DIM);
			break;
		case DIFF_SYMBOL_MOVED_LINE |
		     DIFF_SYMBOL_MOVED_LINE_ALT:
1083
			set = diff_get_color_opt(o, DIFF_FILE_OLD_MOVED_ALT);
1084 1085 1086 1087 1088 1089
			break;
		case DIFF_SYMBOL_MOVED_LINE |
		     DIFF_SYMBOL_MOVED_LINE_UNINTERESTING:
			set = diff_get_color_opt(o, DIFF_FILE_OLD_MOVED_DIM);
			break;
		case DIFF_SYMBOL_MOVED_LINE:
1090
			set = diff_get_color_opt(o, DIFF_FILE_OLD_MOVED);
1091 1092
			break;
		default:
1093
			set = diff_get_color_opt(o, DIFF_FILE_OLD);
1094
		}
1095 1096 1097 1098
		reset = diff_get_color_opt(o, DIFF_RESET);
		emit_line_ws_markup(o, set, reset, line, len, '-',
				    flags & DIFF_SYMBOL_CONTENT_WS_MASK, 0);
		break;
1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118
	case DIFF_SYMBOL_WORDS_PORCELAIN:
		context = diff_get_color_opt(o, DIFF_CONTEXT);
		reset = diff_get_color_opt(o, DIFF_RESET);
		emit_line(o, context, reset, line, len);
		fputs("~\n", o->file);
		break;
	case DIFF_SYMBOL_WORDS:
		context = diff_get_color_opt(o, DIFF_CONTEXT);
		reset = diff_get_color_opt(o, DIFF_RESET);
		/*
		 * Skip the prefix character, if any.  With
		 * diff_suppress_blank_empty, there may be
		 * none.
		 */
		if (line[0] != '\n') {
			line++;
			len--;
		}
		emit_line(o, context, reset, line, len);
		break;
1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132
	case DIFF_SYMBOL_FILEPAIR_PLUS:
		meta = diff_get_color_opt(o, DIFF_METAINFO);
		reset = diff_get_color_opt(o, DIFF_RESET);
		fprintf(o->file, "%s%s+++ %s%s%s\n", diff_line_prefix(o), meta,
			line, reset,
			strchr(line, ' ') ? "\t" : "");
		break;
	case DIFF_SYMBOL_FILEPAIR_MINUS:
		meta = diff_get_color_opt(o, DIFF_METAINFO);
		reset = diff_get_color_opt(o, DIFF_RESET);
		fprintf(o->file, "%s%s--- %s%s%s\n", diff_line_prefix(o), meta,
			line, reset,
			strchr(line, ' ') ? "\t" : "");
		break;
1133
	case DIFF_SYMBOL_BINARY_FILES:
1134 1135 1136
	case DIFF_SYMBOL_HEADER:
		fprintf(o->file, "%s", line);
		break;
1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149
	case DIFF_SYMBOL_BINARY_DIFF_HEADER:
		fprintf(o->file, "%sGIT binary patch\n", diff_line_prefix(o));
		break;
	case DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA:
		fprintf(o->file, "%sdelta %s\n", diff_line_prefix(o), line);
		break;
	case DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL:
		fprintf(o->file, "%sliteral %s\n", diff_line_prefix(o), line);
		break;
	case DIFF_SYMBOL_BINARY_DIFF_FOOTER:
		fputs(diff_line_prefix(o), o->file);
		fputc('\n', o->file);
		break;
1150 1151 1152 1153 1154
	case DIFF_SYMBOL_REWRITE_DIFF:
		fraginfo = diff_get_color(o->use_color, DIFF_FRAGINFO);
		reset = diff_get_color_opt(o, DIFF_RESET);
		emit_line(o, fraginfo, reset, line, len);
		break;
1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172
	case DIFF_SYMBOL_SUBMODULE_ADD:
		set = diff_get_color_opt(o, DIFF_FILE_NEW);
		reset = diff_get_color_opt(o, DIFF_RESET);
		emit_line(o, set, reset, line, len);
		break;
	case DIFF_SYMBOL_SUBMODULE_DEL:
		set = diff_get_color_opt(o, DIFF_FILE_OLD);
		reset = diff_get_color_opt(o, DIFF_RESET);
		emit_line(o, set, reset, line, len);
		break;
	case DIFF_SYMBOL_SUBMODULE_UNTRACKED:
		fprintf(o->file, "%sSubmodule %s contains untracked content\n",
			diff_line_prefix(o), line);
		break;
	case DIFF_SYMBOL_SUBMODULE_MODIFIED:
		fprintf(o->file, "%sSubmodule %s contains modified content\n",
			diff_line_prefix(o), line);
		break;
1173 1174 1175 1176 1177 1178 1179
	case DIFF_SYMBOL_STATS_SUMMARY_NO_FILES:
		emit_line(o, "", "", " 0 files changed\n",
			  strlen(" 0 files changed\n"));
		break;
	case DIFF_SYMBOL_STATS_SUMMARY_ABBREV:
		emit_line(o, "", "", " ...\n", strlen(" ...\n"));
		break;
1180 1181 1182
	case DIFF_SYMBOL_WORD_DIFF:
		fprintf(o->file, "%.*s", len, line);
		break;
1183 1184 1185
	case DIFF_SYMBOL_STAT_SEP:
		fputs(o->stat_sep, o->file);
		break;
1186 1187 1188
	default:
		die("BUG: unknown diff symbol");
	}
1189
	strbuf_release(&sb);
1190 1191
}

1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202
static void emit_diff_symbol(struct diff_options *o, enum diff_symbol s,
			     const char *line, int len, unsigned flags)
{
	struct emitted_diff_symbol e = {line, len, flags, s};

	if (o->emitted_symbols)
		append_emitted_diff_symbol(o, &e);
	else
		emit_diff_symbol_from_struct(o, &e);
}

1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241
void diff_emit_submodule_del(struct diff_options *o, const char *line)
{
	emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_DEL, line, strlen(line), 0);
}

void diff_emit_submodule_add(struct diff_options *o, const char *line)
{
	emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_ADD, line, strlen(line), 0);
}

void diff_emit_submodule_untracked(struct diff_options *o, const char *path)
{
	emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_UNTRACKED,
			 path, strlen(path), 0);
}

void diff_emit_submodule_modified(struct diff_options *o, const char *path)
{
	emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_MODIFIED,
			 path, strlen(path), 0);
}

void diff_emit_submodule_header(struct diff_options *o, const char *header)
{
	emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_HEADER,
			 header, strlen(header), 0);
}

void diff_emit_submodule_error(struct diff_options *o, const char *err)
{
	emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_ERROR, err, strlen(err), 0);
}

void diff_emit_submodule_pipethrough(struct diff_options *o,
				     const char *line, int len)
{
	emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_PIPETHROUGH, line, len, 0);
}

J
Junio C Hamano 已提交
1242 1243 1244 1245 1246 1247 1248 1249
static int new_blank_line_at_eof(struct emit_callback *ecbdata, const char *line, int len)
{
	if (!((ecbdata->ws_rule & WS_BLANK_AT_EOF) &&
	      ecbdata->blank_at_eof_in_preimage &&
	      ecbdata->blank_at_eof_in_postimage &&
	      ecbdata->blank_at_eof_in_preimage <= ecbdata->lno_in_preimage &&
	      ecbdata->blank_at_eof_in_postimage <= ecbdata->lno_in_postimage))
		return 0;
1250
	return ws_blank_line(line, len, ecbdata->ws_rule);
J
Junio C Hamano 已提交
1251 1252
}

1253
static void emit_add_line(const char *reset,
1254 1255 1256
			  struct emit_callback *ecbdata,
			  const char *line, int len)
{
1257 1258 1259 1260 1261
	unsigned flags = WSEH_NEW | ecbdata->ws_rule;
	if (new_blank_line_at_eof(ecbdata, line, len))
		flags |= DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF;

	emit_diff_symbol(ecbdata->opt, DIFF_SYMBOL_PLUS, line, len, flags);
1262
}
1263

1264 1265 1266 1267
static void emit_del_line(const char *reset,
			  struct emit_callback *ecbdata,
			  const char *line, int len)
{
1268 1269
	unsigned flags = WSEH_OLD | ecbdata->ws_rule;
	emit_diff_symbol(ecbdata->opt, DIFF_SYMBOL_MINUS, line, len, flags);
1270 1271 1272 1273 1274 1275
}

static void emit_context_line(const char *reset,
			      struct emit_callback *ecbdata,
			      const char *line, int len)
{
1276 1277
	unsigned flags = WSEH_CONTEXT | ecbdata->ws_rule;
	emit_diff_symbol(ecbdata->opt, DIFF_SYMBOL_CONTEXT, line, len, flags);
1278 1279
}

B
Bert Wesarg 已提交
1280 1281 1282
static void emit_hunk_header(struct emit_callback *ecbdata,
			     const char *line, int len)
{
1283
	const char *context = diff_get_color(ecbdata->color_diff, DIFF_CONTEXT);
B
Bert Wesarg 已提交
1284 1285 1286 1287 1288
	const char *frag = diff_get_color(ecbdata->color_diff, DIFF_FRAGINFO);
	const char *func = diff_get_color(ecbdata->color_diff, DIFF_FUNCINFO);
	const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
	static const char atat[2] = { '@', '@' };
	const char *cp, *ep;
B
Bo Yang 已提交
1289 1290 1291
	struct strbuf msgbuf = STRBUF_INIT;
	int org_len = len;
	int i = 1;
B
Bert Wesarg 已提交
1292 1293 1294 1295 1296 1297 1298 1299

	/*
	 * As a hunk header must begin with "@@ -<old>, +<new> @@",
	 * it always is at least 10 bytes long.
	 */
	if (len < 10 ||
	    memcmp(line, atat, 2) ||
	    !(ep = memmem(line + 2, len - 2, atat, 2))) {
1300
		emit_diff_symbol(ecbdata->opt,
1301
				 DIFF_SYMBOL_CONTEXT_MARKER, line, len, 0);
B
Bert Wesarg 已提交
1302 1303 1304 1305 1306
		return;
	}
	ep += 2; /* skip over @@ */

	/* The hunk header in fraginfo color */
1307
	strbuf_addstr(&msgbuf, frag);
B
Bo Yang 已提交
1308
	strbuf_add(&msgbuf, line, ep - line);
1309
	strbuf_addstr(&msgbuf, reset);
B
Bo Yang 已提交
1310 1311 1312 1313 1314 1315 1316

	/*
	 * trailing "\r\n"
	 */
	for ( ; i < 3; i++)
		if (line[len - i] == '\r' || line[len - i] == '\n')
			len--;
B
Bert Wesarg 已提交
1317 1318 1319 1320 1321

	/* blank before the func header */
	for (cp = ep; ep - line < len; ep++)
		if (*ep != ' ' && *ep != '\t')
			break;
B
Bo Yang 已提交
1322
	if (ep != cp) {
1323
		strbuf_addstr(&msgbuf, context);
B
Bo Yang 已提交
1324
		strbuf_add(&msgbuf, cp, ep - cp);
1325
		strbuf_addstr(&msgbuf, reset);
B
Bo Yang 已提交
1326 1327 1328
	}

	if (ep < line + len) {
1329
		strbuf_addstr(&msgbuf, func);
B
Bo Yang 已提交
1330
		strbuf_add(&msgbuf, ep, line + len - ep);
1331
		strbuf_addstr(&msgbuf, reset);
B
Bo Yang 已提交
1332
	}
B
Bert Wesarg 已提交
1333

B
Bo Yang 已提交
1334
	strbuf_add(&msgbuf, line + len, org_len - len);
1335
	strbuf_complete_line(&msgbuf);
1336
	emit_diff_symbol(ecbdata->opt,
1337
			 DIFF_SYMBOL_CONTEXT_FRAGINFO, msgbuf.buf, msgbuf.len, 0);
B
Bo Yang 已提交
1338
	strbuf_release(&msgbuf);
B
Bert Wesarg 已提交
1339 1340
}

1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351
static struct diff_tempfile *claim_diff_tempfile(void) {
	int i;
	for (i = 0; i < ARRAY_SIZE(diff_temp); i++)
		if (!diff_temp[i].name)
			return diff_temp + i;
	die("BUG: diff is failing to clean up its tempfiles");
}

static void remove_tempfile(void)
{
	int i;
1352
	for (i = 0; i < ARRAY_SIZE(diff_temp); i++) {
1353
		if (is_tempfile_active(diff_temp[i].tempfile))
M
Michael Haggerty 已提交
1354
			delete_tempfile(&diff_temp[i].tempfile);
1355 1356
		diff_temp[i].name = NULL;
	}
1357 1358
}

1359
static void add_line_count(struct strbuf *out, int count)
J
Junio C Hamano 已提交
1360 1361 1362
{
	switch (count) {
	case 0:
1363
		strbuf_addstr(out, "0,0");
J
Junio C Hamano 已提交
1364 1365
		break;
	case 1:
1366
		strbuf_addstr(out, "1");
J
Junio C Hamano 已提交
1367 1368
		break;
	default:
1369
		strbuf_addf(out, "1,%d", count);
J
Junio C Hamano 已提交
1370 1371 1372 1373
		break;
	}
}

1374 1375
static void emit_rewrite_lines(struct emit_callback *ecb,
			       int prefix, const char *data, int size)
J
Junio C Hamano 已提交
1376
{
1377 1378 1379 1380 1381 1382 1383 1384 1385 1386
	const char *endp = NULL;
	const char *reset = diff_get_color(ecb->color_diff, DIFF_RESET);

	while (0 < size) {
		int len;

		endp = memchr(data, '\n', size);
		len = endp ? (endp - data + 1) : size;
		if (prefix != '+') {
			ecb->lno_in_preimage++;
1387
			emit_del_line(reset, ecb, data, len);
1388 1389 1390
		} else {
			ecb->lno_in_postimage++;
			emit_add_line(reset, ecb, data, len);
1391
		}
1392 1393 1394
		size -= len;
		data += len;
	}
1395
	if (!endp)
1396
		emit_diff_symbol(ecb->opt, DIFF_SYMBOL_NO_LF_EOF, NULL, 0, 0);
J
Junio C Hamano 已提交
1397 1398 1399 1400 1401
}

static void emit_rewrite_diff(const char *name_a,
			      const char *name_b,
			      struct diff_filespec *one,
1402
			      struct diff_filespec *two,
J
Jeff King 已提交
1403 1404
			      struct userdiff_driver *textconv_one,
			      struct userdiff_driver *textconv_two,
1405
			      struct diff_options *o)
J
Junio C Hamano 已提交
1406 1407
{
	int lc_a, lc_b;
J
Junio C Hamano 已提交
1408
	static struct strbuf a_name = STRBUF_INIT, b_name = STRBUF_INIT;
1409
	const char *a_prefix, *b_prefix;
1410
	char *data_one, *data_two;
1411
	size_t size_one, size_two;
1412
	struct emit_callback ecbdata;
1413
	struct strbuf out = STRBUF_INIT;
1414

1415
	if (diff_mnemonic_prefix && o->flags.reverse_diff) {
1416 1417 1418 1419 1420 1421
		a_prefix = o->b_prefix;
		b_prefix = o->a_prefix;
	} else {
		a_prefix = o->a_prefix;
		b_prefix = o->b_prefix;
	}
1422

J
Junio C Hamano 已提交
1423 1424
	name_a += (*name_a == '/');
	name_b += (*name_b == '/');
1425

J
Junio C Hamano 已提交
1426 1427
	strbuf_reset(&a_name);
	strbuf_reset(&b_name);
1428 1429
	quote_two_c_style(&a_name, a_prefix, name_a, 0);
	quote_two_c_style(&b_name, b_prefix, name_b, 0);
J
Junio C Hamano 已提交
1430

1431 1432
	size_one = fill_textconv(textconv_one, one, &data_one);
	size_two = fill_textconv(textconv_two, two, &data_two);
1433

1434
	memset(&ecbdata, 0, sizeof(ecbdata));
1435
	ecbdata.color_diff = want_color(o->use_color);
1436
	ecbdata.ws_rule = whitespace_rule(name_b);
1437
	ecbdata.opt = o;
1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448
	if (ecbdata.ws_rule & WS_BLANK_AT_EOF) {
		mmfile_t mf1, mf2;
		mf1.ptr = (char *)data_one;
		mf2.ptr = (char *)data_two;
		mf1.size = size_one;
		mf2.size = size_two;
		check_blank_at_eof(&mf1, &mf2, &ecbdata);
	}
	ecbdata.lno_in_preimage = 1;
	ecbdata.lno_in_postimage = 1;

1449 1450
	lc_a = count_lines(data_one, size_one);
	lc_b = count_lines(data_two, size_two);
1451 1452 1453 1454 1455 1456

	emit_diff_symbol(o, DIFF_SYMBOL_FILEPAIR_MINUS,
			 a_name.buf, a_name.len, 0);
	emit_diff_symbol(o, DIFF_SYMBOL_FILEPAIR_PLUS,
			 b_name.buf, b_name.len, 0);

1457
	strbuf_addstr(&out, "@@ -");
1458
	if (!o->irreversible_delete)
1459
		add_line_count(&out, lc_a);
1460
	else
1461 1462 1463 1464 1465 1466 1467
		strbuf_addstr(&out, "?,?");
	strbuf_addstr(&out, " +");
	add_line_count(&out, lc_b);
	strbuf_addstr(&out, " @@\n");
	emit_diff_symbol(o, DIFF_SYMBOL_REWRITE_DIFF, out.buf, out.len, 0);
	strbuf_release(&out);

1468
	if (lc_a && !o->irreversible_delete)
1469
		emit_rewrite_lines(&ecbdata, '-', data_one, size_one);
J
Junio C Hamano 已提交
1470
	if (lc_b)
1471
		emit_rewrite_lines(&ecbdata, '+', data_two, size_two);
1472
	if (textconv_one)
1473
		free((char *)data_one);
1474
	if (textconv_two)
1475
		free((char *)data_two);
J
Junio C Hamano 已提交
1476 1477
}

1478 1479
struct diff_words_buffer {
	mmfile_t text;
1480
	unsigned long alloc;
1481 1482 1483 1484
	struct diff_words_orig {
		const char *begin, *end;
	} *orig;
	int orig_nr, orig_alloc;
1485 1486 1487 1488 1489
};

static void diff_words_append(char *line, unsigned long len,
		struct diff_words_buffer *buffer)
{
1490
	ALLOC_GROW(buffer->text.ptr, buffer->text.size + len, buffer->alloc);
1491 1492 1493 1494
	line++;
	len--;
	memcpy(buffer->text.ptr + buffer->text.size, line, len);
	buffer->text.size += len;
1495
	buffer->text.ptr[buffer->text.size] = '\0';
1496 1497
}

1498
struct diff_words_style_elem {
1499 1500 1501 1502 1503 1504
	const char *prefix;
	const char *suffix;
	const char *color; /* NULL; filled in by the setup code if
			    * color is enabled */
};

1505
struct diff_words_style {
1506
	enum diff_words_type type;
B
Brandon Williams 已提交
1507
	struct diff_words_style_elem new_word, old_word, ctx;
1508 1509 1510
	const char *newline;
};

S
Stephen Boyd 已提交
1511
static struct diff_words_style diff_words_styles[] = {
1512 1513 1514 1515 1516
	{ DIFF_WORDS_PORCELAIN, {"+", "\n"}, {"-", "\n"}, {" ", "\n"}, "~\n" },
	{ DIFF_WORDS_PLAIN, {"{+", "+}"}, {"[-", "-]"}, {"", ""}, "\n" },
	{ DIFF_WORDS_COLOR, {"", ""}, {"", ""}, {"", ""}, "\n" }
};

1517 1518
struct diff_words_data {
	struct diff_words_buffer minus, plus;
1519
	const char *current_plus;
1520 1521
	int last_minus;
	struct diff_options *opt;
1522
	regex_t *word_regex;
1523 1524
	enum diff_words_type type;
	struct diff_words_style *style;
1525 1526
};

1527
static int fn_out_diff_words_write_helper(struct diff_options *o,
1528 1529
					  struct diff_words_style_elem *st_el,
					  const char *newline,
1530
					  size_t count, const char *buf)
1531
{
1532
	int print = 0;
1533
	struct strbuf sb = STRBUF_INIT;
1534

1535 1536
	while (count) {
		char *p = memchr(buf, '\n', count);
1537
		if (print)
1538 1539
			strbuf_addstr(&sb, diff_line_prefix(o));

1540
		if (p != buf) {
1541 1542 1543 1544 1545 1546 1547 1548 1549
			const char *reset = st_el->color && *st_el->color ?
					    GIT_COLOR_RESET : NULL;
			if (st_el->color && *st_el->color)
				strbuf_addstr(&sb, st_el->color);
			strbuf_addstr(&sb, st_el->prefix);
			strbuf_add(&sb, buf, p ? p - buf : count);
			strbuf_addstr(&sb, st_el->suffix);
			if (reset)
				strbuf_addstr(&sb, reset);
1550 1551
		}
		if (!p)
1552 1553 1554
			goto out;

		strbuf_addstr(&sb, newline);
1555 1556
		count -= p + 1 - buf;
		buf = p + 1;
1557
		print = 1;
1558 1559 1560 1561 1562
		if (count) {
			emit_diff_symbol(o, DIFF_SYMBOL_WORD_DIFF,
					 sb.buf, sb.len, 0);
			strbuf_reset(&sb);
		}
1563
	}
1564 1565 1566 1567 1568 1569

out:
	if (sb.len)
		emit_diff_symbol(o, DIFF_SYMBOL_WORD_DIFF,
				 sb.buf, sb.len, 0);
	strbuf_release(&sb);
1570 1571 1572
	return 0;
}

1573 1574 1575
/*
 * '--color-words' algorithm can be described as:
 *
R
René Genz 已提交
1576
 *   1. collect the minus/plus lines of a diff hunk, divided into
1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615
 *      minus-lines and plus-lines;
 *
 *   2. break both minus-lines and plus-lines into words and
 *      place them into two mmfile_t with one word for each line;
 *
 *   3. use xdiff to run diff on the two mmfile_t to get the words level diff;
 *
 * And for the common parts of the both file, we output the plus side text.
 * diff_words->current_plus is used to trace the current position of the plus file
 * which printed. diff_words->last_minus is used to trace the last minus word
 * printed.
 *
 * For '--graph' to work with '--color-words', we need to output the graph prefix
 * on each line of color words output. Generally, there are two conditions on
 * which we should output the prefix.
 *
 *   1. diff_words->last_minus == 0 &&
 *      diff_words->current_plus == diff_words->plus.text.ptr
 *
 *      that is: the plus text must start as a new line, and if there is no minus
 *      word printed, a graph prefix must be printed.
 *
 *   2. diff_words->current_plus > diff_words->plus.text.ptr &&
 *      *(diff_words->current_plus - 1) == '\n'
 *
 *      that is: a graph prefix must be printed following a '\n'
 */
static int color_words_output_graph_prefix(struct diff_words_data *diff_words)
{
	if ((diff_words->last_minus == 0 &&
		diff_words->current_plus == diff_words->plus.text.ptr) ||
		(diff_words->current_plus > diff_words->plus.text.ptr &&
		*(diff_words->current_plus - 1) == '\n')) {
		return 1;
	} else {
		return 0;
	}
}

1616 1617 1618
static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len)
{
	struct diff_words_data *diff_words = priv;
1619
	struct diff_words_style *style = diff_words->style;
1620 1621
	int minus_first, minus_len, plus_first, plus_len;
	const char *minus_begin, *minus_end, *plus_begin, *plus_end;
1622
	struct diff_options *opt = diff_words->opt;
1623
	const char *line_prefix;
1624

1625 1626
	if (line[0] != '@' || parse_hunk_header(line, len,
			&minus_first, &minus_len, &plus_first, &plus_len))
1627 1628
		return;

1629
	assert(opt);
1630
	line_prefix = diff_line_prefix(opt);
1631

1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646
	/* POSIX requires that first be decremented by one if len == 0... */
	if (minus_len) {
		minus_begin = diff_words->minus.orig[minus_first].begin;
		minus_end =
			diff_words->minus.orig[minus_first + minus_len - 1].end;
	} else
		minus_begin = minus_end =
			diff_words->minus.orig[minus_first].end;

	if (plus_len) {
		plus_begin = diff_words->plus.orig[plus_first].begin;
		plus_end = diff_words->plus.orig[plus_first + plus_len - 1].end;
	} else
		plus_begin = plus_end = diff_words->plus.orig[plus_first].end;

1647 1648 1649 1650
	if (color_words_output_graph_prefix(diff_words)) {
		fputs(line_prefix, diff_words->opt->file);
	}
	if (diff_words->current_plus != plus_begin) {
1651
		fn_out_diff_words_write_helper(diff_words->opt,
1652 1653
				&style->ctx, style->newline,
				plus_begin - diff_words->current_plus,
1654
				diff_words->current_plus);
1655 1656
	}
	if (minus_begin != minus_end) {
1657
		fn_out_diff_words_write_helper(diff_words->opt,
B
Brandon Williams 已提交
1658
				&style->old_word, style->newline,
1659
				minus_end - minus_begin, minus_begin);
1660 1661
	}
	if (plus_begin != plus_end) {
1662
		fn_out_diff_words_write_helper(diff_words->opt,
B
Brandon Williams 已提交
1663
				&style->new_word, style->newline,
1664
				plus_end - plus_begin, plus_begin);
1665
	}
1666 1667

	diff_words->current_plus = plus_end;
1668
	diff_words->last_minus = minus_first;
1669 1670
}

1671 1672 1673 1674 1675 1676
/* This function starts looking at *begin, and returns 0 iff a word was found. */
static int find_word_boundaries(mmfile_t *buffer, regex_t *word_regex,
		int *begin, int *end)
{
	if (word_regex && *begin < buffer->size) {
		regmatch_t match[1];
J
Johannes Schindelin 已提交
1677 1678
		if (!regexec_buf(word_regex, buffer->ptr + *begin,
				 buffer->size - *begin, 1, match, 0)) {
1679 1680 1681 1682 1683 1684 1685
			char *p = memchr(buffer->ptr + *begin + match[0].rm_so,
					'\n', match[0].rm_eo - match[0].rm_so);
			*end = p ? p - buffer->ptr : match[0].rm_eo + *begin;
			*begin += match[0].rm_so;
			return *begin >= *end;
		}
		return -1;
1686 1687
	}

1688 1689 1690 1691 1692
	/* find the next word */
	while (*begin < buffer->size && isspace(buffer->ptr[*begin]))
		(*begin)++;
	if (*begin >= buffer->size)
		return -1;
1693

1694 1695 1696 1697 1698 1699
	/* find the end of the word */
	*end = *begin + 1;
	while (*end < buffer->size && !isspace(buffer->ptr[*end]))
		(*end)++;

	return 0;
1700 1701
}

1702
/*
1703 1704 1705
 * This function splits the words in buffer->text, stores the list with
 * newline separator into out, and saves the offsets of the original words
 * in buffer->orig.
1706
 */
1707 1708
static void diff_words_fill(struct diff_words_buffer *buffer, mmfile_t *out,
		regex_t *word_regex)
1709
{
1710
	int i, j;
1711
	long alloc = 0;
1712

1713
	out->size = 0;
1714
	out->ptr = NULL;
1715

1716 1717 1718 1719 1720 1721
	/* fake an empty "0th" word */
	ALLOC_GROW(buffer->orig, 1, buffer->orig_alloc);
	buffer->orig[0].begin = buffer->orig[0].end = buffer->text.ptr;
	buffer->orig_nr = 1;

	for (i = 0; i < buffer->text.size; i++) {
1722 1723
		if (find_word_boundaries(&buffer->text, word_regex, &i, &j))
			return;
1724 1725 1726 1727 1728 1729 1730 1731 1732

		/* store original boundaries */
		ALLOC_GROW(buffer->orig, buffer->orig_nr + 1,
				buffer->orig_alloc);
		buffer->orig[buffer->orig_nr].begin = buffer->text.ptr + i;
		buffer->orig[buffer->orig_nr].end = buffer->text.ptr + j;
		buffer->orig_nr++;

		/* store one word */
1733
		ALLOC_GROW(out->ptr, out->size + j - i + 1, alloc);
1734 1735 1736 1737 1738
		memcpy(out->ptr + out->size, buffer->text.ptr + i, j - i);
		out->ptr[out->size + j - i] = '\n';
		out->size += j - i + 1;

		i = j - 1;
1739 1740 1741 1742 1743 1744 1745 1746 1747
	}
}

/* this executes the word diff on the accumulated buffers */
static void diff_words_show(struct diff_words_data *diff_words)
{
	xpparam_t xpp;
	xdemitconf_t xecfg;
	mmfile_t minus, plus;
1748
	struct diff_words_style *style = diff_words->style;
1749

1750
	struct diff_options *opt = diff_words->opt;
1751
	const char *line_prefix;
1752 1753

	assert(opt);
1754
	line_prefix = diff_line_prefix(opt);
1755

1756 1757
	/* special case: only removal */
	if (!diff_words->plus.text.size) {
1758 1759 1760
		emit_diff_symbol(diff_words->opt, DIFF_SYMBOL_WORD_DIFF,
				 line_prefix, strlen(line_prefix), 0);
		fn_out_diff_words_write_helper(diff_words->opt,
B
Brandon Williams 已提交
1761
			&style->old_word, style->newline,
1762
			diff_words->minus.text.size,
1763
			diff_words->minus.text.ptr);
1764 1765 1766 1767 1768
		diff_words->minus.text.size = 0;
		return;
	}

	diff_words->current_plus = diff_words->plus.text.ptr;
1769
	diff_words->last_minus = 0;
1770

B
Brian Downing 已提交
1771
	memset(&xpp, 0, sizeof(xpp));
1772
	memset(&xecfg, 0, sizeof(xecfg));
1773 1774
	diff_words_fill(&diff_words->minus, &minus, diff_words->word_regex);
	diff_words_fill(&diff_words->plus, &plus, diff_words->word_regex);
R
René Scharfe 已提交
1775
	xpp.flags = 0;
1776
	/* as only the hunk header will be parsed, we need a 0-context */
1777
	xecfg.ctxlen = 0;
J
Jeff King 已提交
1778 1779 1780
	if (xdi_diff_outf(&minus, &plus, fn_out_diff_words_aux, diff_words,
			  &xpp, &xecfg))
		die("unable to generate word diff");
1781 1782
	free(minus.ptr);
	free(plus.ptr);
1783
	if (diff_words->current_plus != diff_words->plus.text.ptr +
1784 1785
			diff_words->plus.text.size) {
		if (color_words_output_graph_prefix(diff_words))
1786 1787 1788
			emit_diff_symbol(diff_words->opt, DIFF_SYMBOL_WORD_DIFF,
					 line_prefix, strlen(line_prefix), 0);
		fn_out_diff_words_write_helper(diff_words->opt,
1789
			&style->ctx, style->newline,
1790
			diff_words->plus.text.ptr + diff_words->plus.text.size
1791
			- diff_words->current_plus, diff_words->current_plus);
1792
	}
1793 1794 1795
	diff_words->minus.text.size = diff_words->plus.text.size = 0;
}

1796 1797 1798
/* In "color-words" mode, show word-diff of words accumulated in the buffer */
static void diff_words_flush(struct emit_callback *ecbdata)
{
1799 1800
	struct diff_options *wo = ecbdata->diff_words->opt;

1801 1802 1803
	if (ecbdata->diff_words->minus.text.size ||
	    ecbdata->diff_words->plus.text.size)
		diff_words_show(ecbdata->diff_words);
1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821

	if (wo->emitted_symbols) {
		struct diff_options *o = ecbdata->opt;
		struct emitted_diff_symbols *wol = wo->emitted_symbols;
		int i;

		/*
		 * NEEDSWORK:
		 * Instead of appending each, concat all words to a line?
		 */
		for (i = 0; i < wol->nr; i++)
			append_emitted_diff_symbol(o, &wol->buf[i]);

		for (i = 0; i < wol->nr; i++)
			free((void *)wol->buf[i].line);

		wol->nr = 0;
	}
1822 1823
}

1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844
static void diff_filespec_load_driver(struct diff_filespec *one)
{
	/* Use already-loaded driver */
	if (one->driver)
		return;

	if (S_ISREG(one->mode))
		one->driver = userdiff_find_by_path(one->path);

	/* Fallback to default settings */
	if (!one->driver)
		one->driver = userdiff_find_by_name("default");
}

static const char *userdiff_word_regex(struct diff_filespec *one)
{
	diff_filespec_load_driver(one);
	return one->driver->word_regex;
}

static void init_diff_words_data(struct emit_callback *ecbdata,
1845
				 struct diff_options *orig_opts,
1846 1847 1848 1849
				 struct diff_filespec *one,
				 struct diff_filespec *two)
{
	int i;
1850 1851
	struct diff_options *o = xmalloc(sizeof(struct diff_options));
	memcpy(o, orig_opts, sizeof(struct diff_options));
1852 1853 1854 1855 1856

	ecbdata->diff_words =
		xcalloc(1, sizeof(struct diff_words_data));
	ecbdata->diff_words->type = o->word_diff;
	ecbdata->diff_words->opt = o;
1857 1858 1859 1860 1861

	if (orig_opts->emitted_symbols)
		o->emitted_symbols =
			xcalloc(1, sizeof(struct emitted_diff_symbols));

1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885
	if (!o->word_regex)
		o->word_regex = userdiff_word_regex(one);
	if (!o->word_regex)
		o->word_regex = userdiff_word_regex(two);
	if (!o->word_regex)
		o->word_regex = diff_word_regex_cfg;
	if (o->word_regex) {
		ecbdata->diff_words->word_regex = (regex_t *)
			xmalloc(sizeof(regex_t));
		if (regcomp(ecbdata->diff_words->word_regex,
			    o->word_regex,
			    REG_EXTENDED | REG_NEWLINE))
			die ("Invalid regular expression: %s",
			     o->word_regex);
	}
	for (i = 0; i < ARRAY_SIZE(diff_words_styles); i++) {
		if (o->word_diff == diff_words_styles[i].type) {
			ecbdata->diff_words->style =
				&diff_words_styles[i];
			break;
		}
	}
	if (want_color(o->use_color)) {
		struct diff_words_style *st = ecbdata->diff_words->style;
B
Brandon Williams 已提交
1886 1887
		st->old_word.color = diff_get_color_opt(o, DIFF_FILE_OLD);
		st->new_word.color = diff_get_color_opt(o, DIFF_FILE_NEW);
1888
		st->ctx.color = diff_get_color_opt(o, DIFF_CONTEXT);
1889 1890 1891
	}
}

1892 1893 1894
static void free_diff_words_data(struct emit_callback *ecbdata)
{
	if (ecbdata->diff_words) {
1895
		diff_words_flush(ecbdata);
1896
		free (ecbdata->diff_words->opt->emitted_symbols);
1897
		free (ecbdata->diff_words->opt);
1898
		free (ecbdata->diff_words->minus.text.ptr);
1899
		free (ecbdata->diff_words->minus.orig);
1900
		free (ecbdata->diff_words->plus.text.ptr);
1901
		free (ecbdata->diff_words->plus.orig);
1902 1903 1904 1905
		if (ecbdata->diff_words->word_regex) {
			regfree(ecbdata->diff_words->word_regex);
			free(ecbdata->diff_words->word_regex);
		}
1906
		FREE_AND_NULL(ecbdata->diff_words);
1907 1908 1909
	}
}

J
Jeff King 已提交
1910
const char *diff_get_color(int diff_use_color, enum color_diff ix)
J
Johannes Schindelin 已提交
1911
{
1912
	if (want_color(diff_use_color))
L
Linus Torvalds 已提交
1913 1914
		return diff_colors[ix];
	return "";
J
Johannes Schindelin 已提交
1915 1916
}

1917 1918 1919 1920 1921 1922 1923 1924 1925 1926
const char *diff_line_prefix(struct diff_options *opt)
{
	struct strbuf *msgbuf;
	if (!opt->output_prefix)
		return "";

	msgbuf = opt->output_prefix(opt, opt->output_prefix_data);
	return msgbuf->buf;
}

1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942
static unsigned long sane_truncate_line(struct emit_callback *ecb, char *line, unsigned long len)
{
	const char *cp;
	unsigned long allot;
	size_t l = len;

	cp = line;
	allot = l;
	while (0 < l) {
		(void) utf8_width(&cp, &l);
		if (!cp)
			break; /* truncated in the middle? */
	}
	return allot - l;
}

1943
static void find_lno(const char *line, struct emit_callback *ecbdata)
1944
{
1945 1946 1947 1948
	const char *p;
	ecbdata->lno_in_preimage = 0;
	ecbdata->lno_in_postimage = 0;
	p = strchr(line, '-');
1949
	if (!p)
1950 1951 1952 1953 1954 1955
		return; /* cannot happen */
	ecbdata->lno_in_preimage = strtol(p + 1, NULL, 10);
	p = strchr(p, '+');
	if (!p)
		return; /* cannot happen */
	ecbdata->lno_in_postimage = strtol(p + 1, NULL, 10);
1956 1957
}

J
Johannes Schindelin 已提交
1958
static void fn_out_consume(void *priv, char *line, unsigned long len)
J
Junio C Hamano 已提交
1959 1960
{
	struct emit_callback *ecbdata = priv;
J
Jeff King 已提交
1961
	const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
1962
	struct diff_options *o = ecbdata->opt;
J
Junio C Hamano 已提交
1963

1964 1965
	o->found_changes = 1;

1966
	if (ecbdata->header) {
1967 1968
		emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
				 ecbdata->header->buf, ecbdata->header->len, 0);
1969 1970 1971
		strbuf_reset(ecbdata->header);
		ecbdata->header = NULL;
	}
1972

J
Junio C Hamano 已提交
1973
	if (ecbdata->label_path[0]) {
1974 1975 1976 1977 1978 1979
		emit_diff_symbol(o, DIFF_SYMBOL_FILEPAIR_MINUS,
				 ecbdata->label_path[0],
				 strlen(ecbdata->label_path[0]), 0);
		emit_diff_symbol(o, DIFF_SYMBOL_FILEPAIR_PLUS,
				 ecbdata->label_path[1],
				 strlen(ecbdata->label_path[1]), 0);
J
Junio C Hamano 已提交
1980 1981
		ecbdata->label_path[0] = ecbdata->label_path[1] = NULL;
	}
J
Johannes Schindelin 已提交
1982

1983 1984 1985 1986 1987 1988
	if (diff_suppress_blank_empty
	    && len == 2 && line[0] == ' ' && line[1] == '\n') {
		line[0] = '\n';
		len = 1;
	}

1989
	if (line[0] == '@') {
1990 1991
		if (ecbdata->diff_words)
			diff_words_flush(ecbdata);
1992
		len = sane_truncate_line(ecbdata, line, len);
1993
		find_lno(line, ecbdata);
B
Bert Wesarg 已提交
1994
		emit_hunk_header(ecbdata, line, len);
1995
		return;
J
Johannes Schindelin 已提交
1996
	}
1997 1998

	if (ecbdata->diff_words) {
1999 2000 2001
		enum diff_symbol s =
			ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN ?
			DIFF_SYMBOL_WORDS_PORCELAIN : DIFF_SYMBOL_WORDS;
2002 2003 2004 2005 2006 2007 2008 2009
		if (line[0] == '-') {
			diff_words_append(line, len,
					  &ecbdata->diff_words->minus);
			return;
		} else if (line[0] == '+') {
			diff_words_append(line, len,
					  &ecbdata->diff_words->plus);
			return;
2010
		} else if (starts_with(line, "\\ ")) {
2011 2012 2013 2014 2015 2016 2017 2018
			/*
			 * Eat the "no newline at eof" marker as if we
			 * saw a "+" or "-" line with nothing on it,
			 * and return without diff_words_flush() to
			 * defer processing. If this is the end of
			 * preimage, more "+" lines may come after it.
			 */
			return;
2019
		}
2020
		diff_words_flush(ecbdata);
2021
		emit_diff_symbol(o, s, line, len, 0);
2022 2023 2024
		return;
	}

2025 2026
	switch (line[0]) {
	case '+':
2027
		ecbdata->lno_in_postimage++;
2028
		emit_add_line(reset, ecbdata, line + 1, len - 1);
2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041
		break;
	case '-':
		ecbdata->lno_in_preimage++;
		emit_del_line(reset, ecbdata, line + 1, len - 1);
		break;
	case ' ':
		ecbdata->lno_in_postimage++;
		ecbdata->lno_in_preimage++;
		emit_context_line(reset, ecbdata, line + 1, len - 1);
		break;
	default:
		/* incomplete line at the end */
		ecbdata->lno_in_preimage++;
2042 2043
		emit_diff_symbol(o, DIFF_SYMBOL_CONTEXT_INCOMPLETE,
				 line, len, 0);
2044
		break;
2045
	}
J
Junio C Hamano 已提交
2046 2047
}

2048
static void pprint_rename(struct strbuf *name, const char *a, const char *b)
J
Junio C Hamano 已提交
2049
{
B
Brandon Williams 已提交
2050 2051
	const char *old_name = a;
	const char *new_name = b;
J
Junio C Hamano 已提交
2052
	int pfx_length, sfx_length;
2053
	int pfx_adjust_for_slash;
J
Junio C Hamano 已提交
2054 2055
	int len_a = strlen(a);
	int len_b = strlen(b);
2056
	int a_midlen, b_midlen;
2057 2058 2059 2060
	int qlen_a = quote_c_style(a, NULL, NULL, 0);
	int qlen_b = quote_c_style(b, NULL, NULL, 0);

	if (qlen_a || qlen_b) {
2061 2062 2063 2064
		quote_c_style(a, name, NULL, 0);
		strbuf_addstr(name, " => ");
		quote_c_style(b, name, NULL, 0);
		return;
2065
	}
J
Junio C Hamano 已提交
2066 2067 2068

	/* Find common prefix */
	pfx_length = 0;
B
Brandon Williams 已提交
2069 2070 2071 2072 2073
	while (*old_name && *new_name && *old_name == *new_name) {
		if (*old_name == '/')
			pfx_length = old_name - a + 1;
		old_name++;
		new_name++;
J
Junio C Hamano 已提交
2074 2075 2076
	}

	/* Find common suffix */
B
Brandon Williams 已提交
2077 2078
	old_name = a + len_a;
	new_name = b + len_b;
J
Junio C Hamano 已提交
2079
	sfx_length = 0;
2080
	/*
2081 2082 2083 2084 2085 2086
	 * If there is a common prefix, it must end in a slash.  In
	 * that case we let this loop run 1 into the prefix to see the
	 * same slash.
	 *
	 * If there is no common prefix, we cannot do this as it would
	 * underrun the input strings.
2087
	 */
2088
	pfx_adjust_for_slash = (pfx_length ? 1 : 0);
B
Brandon Williams 已提交
2089 2090 2091 2092 2093 2094 2095
	while (a + pfx_length - pfx_adjust_for_slash <= old_name &&
	       b + pfx_length - pfx_adjust_for_slash <= new_name &&
	       *old_name == *new_name) {
		if (*old_name == '/')
			sfx_length = len_a - (old_name - a);
		old_name--;
		new_name--;
J
Junio C Hamano 已提交
2096 2097 2098 2099 2100 2101 2102 2103
	}

	/*
	 * pfx{mid-a => mid-b}sfx
	 * {pfx-a => pfx-b}sfx
	 * pfx{sfx-a => sfx-b}
	 * name-a => name-b
	 */
2104 2105 2106 2107 2108 2109 2110
	a_midlen = len_a - pfx_length - sfx_length;
	b_midlen = len_b - pfx_length - sfx_length;
	if (a_midlen < 0)
		a_midlen = 0;
	if (b_midlen < 0)
		b_midlen = 0;

2111
	strbuf_grow(name, pfx_length + a_midlen + b_midlen + sfx_length + 7);
J
Junio C Hamano 已提交
2112
	if (pfx_length + sfx_length) {
2113 2114
		strbuf_add(name, a, pfx_length);
		strbuf_addch(name, '{');
J
Junio C Hamano 已提交
2115
	}
2116 2117 2118
	strbuf_add(name, a + pfx_length, a_midlen);
	strbuf_addstr(name, " => ");
	strbuf_add(name, b + pfx_length, b_midlen);
2119
	if (pfx_length + sfx_length) {
2120 2121
		strbuf_addch(name, '}');
		strbuf_add(name, a + len_a - sfx_length, sfx_length);
J
Junio C Hamano 已提交
2122 2123 2124 2125 2126 2127 2128
	}
}

struct diffstat_t {
	int nr;
	int alloc;
	struct diffstat_file {
2129
		char *from_name;
J
Junio C Hamano 已提交
2130
		char *name;
2131
		char *print_name;
2132
		const char *comments;
J
Junio C Hamano 已提交
2133 2134 2135
		unsigned is_unmerged:1;
		unsigned is_binary:1;
		unsigned is_renamed:1;
2136
		unsigned is_interesting:1;
2137
		uintmax_t added, deleted;
J
Junio C Hamano 已提交
2138 2139 2140 2141 2142 2143 2144 2145
	} **files;
};

static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat,
					  const char *name_a,
					  const char *name_b)
{
	struct diffstat_file *x;
2146
	x = xcalloc(1, sizeof(*x));
D
Dmitry S. Dolzhenko 已提交
2147
	ALLOC_GROW(diffstat->files, diffstat->nr + 1, diffstat->alloc);
J
Junio C Hamano 已提交
2148 2149
	diffstat->files[diffstat->nr++] = x;
	if (name_b) {
2150 2151
		x->from_name = xstrdup(name_a);
		x->name = xstrdup(name_b);
J
Junio C Hamano 已提交
2152 2153
		x->is_renamed = 1;
	}
2154 2155
	else {
		x->from_name = NULL;
2156
		x->name = xstrdup(name_a);
2157
	}
J
Junio C Hamano 已提交
2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171
	return x;
}

static void diffstat_consume(void *priv, char *line, unsigned long len)
{
	struct diffstat_t *diffstat = priv;
	struct diffstat_file *x = diffstat->files[diffstat->nr - 1];

	if (line[0] == '+')
		x->added++;
	else if (line[0] == '-')
		x->deleted++;
}

2172
const char mime_boundary_leader[] = "------------";
J
Junio C Hamano 已提交
2173

2174 2175
static int scale_linear(int it, int width, int max_change)
{
2176 2177
	if (!it)
		return 0;
2178
	/*
2179 2180 2181 2182
	 * make sure that at least one '-' or '+' is printed if
	 * there is any change to this path. The easiest way is to
	 * scale linearly as if the alloted width is one column shorter
	 * than it is, and then add 1 to the result.
2183
	 */
2184
	return 1 + (it * (width - 1) / max_change);
2185 2186
}

2187 2188
static void show_graph(struct strbuf *out, char ch, int cnt,
		       const char *set, const char *reset)
2189 2190 2191
{
	if (cnt <= 0)
		return;
2192 2193 2194
	strbuf_addstr(out, set);
	strbuf_addchars(out, ch, cnt);
	strbuf_addstr(out, reset);
2195 2196
}

2197 2198
static void fill_print_name(struct diffstat_file *file)
{
2199
	struct strbuf pname = STRBUF_INIT;
2200 2201 2202 2203

	if (file->print_name)
		return;

2204 2205 2206 2207 2208
	if (file->is_renamed)
		pprint_rename(&pname, file->from_name, file->name);
	else
		quote_c_style(file->name, &pname, NULL, 0);

2209 2210 2211
	if (file->comments)
		strbuf_addf(&pname, " (%s)", file->comments);

2212
	file->print_name = strbuf_detach(&pname, NULL);
2213 2214
}

2215 2216
static void print_stat_summary_inserts_deletes(struct diff_options *options,
		int files, int insertions, int deletions)
2217 2218 2219 2220 2221
{
	struct strbuf sb = STRBUF_INIT;

	if (!files) {
		assert(insertions == 0 && deletions == 0);
2222 2223 2224
		emit_diff_symbol(options, DIFF_SYMBOL_STATS_SUMMARY_NO_FILES,
				 NULL, 0, 0);
		return;
2225 2226 2227
	}

	strbuf_addf(&sb,
2228
		    (files == 1) ? " %d file changed" : " %d files changed",
2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240
		    files);

	/*
	 * For binary diff, the caller may want to print "x files
	 * changed" with insertions == 0 && deletions == 0.
	 *
	 * Not omitting "0 insertions(+), 0 deletions(-)" in this case
	 * is probably less confusing (i.e skip over "2 files changed
	 * but nothing about added/removed lines? Is this a bug in Git?").
	 */
	if (insertions || deletions == 0) {
		strbuf_addf(&sb,
2241
			    (insertions == 1) ? ", %d insertion(+)" : ", %d insertions(+)",
2242 2243 2244 2245 2246
			    insertions);
	}

	if (deletions || insertions == 0) {
		strbuf_addf(&sb,
2247
			    (deletions == 1) ? ", %d deletion(-)" : ", %d deletions(-)",
2248 2249 2250
			    deletions);
	}
	strbuf_addch(&sb, '\n');
2251 2252
	emit_diff_symbol(options, DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES,
			 sb.buf, sb.len, 0);
2253
	strbuf_release(&sb);
2254 2255 2256 2257 2258 2259 2260 2261 2262 2263
}

void print_stat_summary(FILE *fp, int files,
			int insertions, int deletions)
{
	struct diff_options o;
	memset(&o, 0, sizeof(o));
	o.file = fp;

	print_stat_summary_inserts_deletes(&o, files, insertions, deletions);
2264 2265
}

2266
static void show_stats(struct diffstat_t *data, struct diff_options *options)
J
Junio C Hamano 已提交
2267
{
2268
	int i, len, add, del, adds = 0, dels = 0;
2269
	uintmax_t max_change = 0, max_len = 0;
2270 2271
	int total_files = data->nr, count;
	int width, name_width, graph_width, number_width = 0, bin_width = 0;
J
Johannes Schindelin 已提交
2272
	const char *reset, *add_c, *del_c;
2273
	int extra_shown = 0;
2274 2275
	const char *line_prefix = diff_line_prefix(options);
	struct strbuf out = STRBUF_INIT;
J
Junio C Hamano 已提交
2276 2277 2278 2279

	if (data->nr == 0)
		return;

2280
	count = options->stat_count ? options->stat_count : data->nr;
2281

2282 2283 2284
	reset = diff_get_color_opt(options, DIFF_RESET);
	add_c = diff_get_color_opt(options, DIFF_FILE_NEW);
	del_c = diff_get_color_opt(options, DIFF_FILE_OLD);
J
Junio C Hamano 已提交
2285

2286 2287 2288
	/*
	 * Find the longest filename and max number of changes
	 */
2289
	for (i = 0; (i < count) && (i < data->nr); i++) {
J
Junio C Hamano 已提交
2290
		struct diffstat_file *file = data->files[i];
2291
		uintmax_t change = file->added + file->deleted;
2292 2293

		if (!file->is_interesting && (change == 0)) {
2294
			count++; /* not shown == room for one more */
2295 2296
			continue;
		}
2297 2298
		fill_print_name(file);
		len = strlen(file->print_name);
J
Junio C Hamano 已提交
2299 2300 2301
		if (max_len < len)
			max_len = len;

2302 2303 2304
		if (file->is_unmerged) {
			/* "Unmerged" is 8 characters */
			bin_width = bin_width < 8 ? 8 : bin_width;
J
Junio C Hamano 已提交
2305
			continue;
2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316
		}
		if (file->is_binary) {
			/* "Bin XXX -> YYY bytes" */
			int w = 14 + decimal_width(file->added)
				+ decimal_width(file->deleted);
			bin_width = bin_width < w ? w : bin_width;
			/* Display change counts aligned with "Bin" */
			number_width = 3;
			continue;
		}

2317 2318
		if (max_change < change)
			max_change = change;
J
Junio C Hamano 已提交
2319
	}
2320
	count = i; /* where we can stop scanning in data->files[] */
J
Junio C Hamano 已提交
2321

2322 2323 2324
	/*
	 * We have width = stat_width or term_columns() columns total.
	 * We want a maximum of min(max_len, stat_name_width) for the name part.
2325
	 * We want a maximum of min(max_change, stat_graph_width) for the +- part.
2326 2327 2328 2329 2330 2331
	 * We also need 1 for " " and 4 + decimal_width(max_change)
	 * for " | NNNN " and one the empty column at the end, altogether
	 * 6 + decimal_width(max_change).
	 *
	 * If there's not enough space, we will use the smaller of
	 * stat_name_width (if set) and 5/8*width for the filename,
2332 2333
	 * and the rest for constant elements + graph part, but no more
	 * than stat_graph_width for the graph part.
2334 2335
	 * (5/8 gives 50 for filename and 30 for the constant parts + graph
	 * for the standard terminal size).
2336
	 *
2337 2338 2339 2340
	 * In other words: stat_width limits the maximum width, and
	 * stat_name_width fixes the maximum width of the filename,
	 * and is also used to divide available columns if there
	 * aren't enough.
2341 2342 2343 2344
	 *
	 * Binary files are displayed with "Bin XXX -> YYY bytes"
	 * instead of the change count and graph. This part is treated
	 * similarly to the graph part, except that it is not
2345
	 * "scaled". If total width is too small to accommodate the
2346 2347 2348
	 * guaranteed minimum width of the filename part and the
	 * separators and this message, this message will "overflow"
	 * making the line longer than the maximum width.
2349
	 */
2350 2351

	if (options->stat_width == -1)
2352
		width = term_columns() - strlen(line_prefix);
2353
	else
2354
		width = options->stat_width ? options->stat_width : 80;
2355 2356
	number_width = decimal_width(max_change) > number_width ?
		decimal_width(max_change) : number_width;
2357

2358 2359
	if (options->stat_graph_width == -1)
		options->stat_graph_width = diff_stat_graph_width;
2360

2361 2362 2363 2364 2365 2366 2367 2368 2369
	/*
	 * Guarantee 3/8*16==6 for the graph part
	 * and 5/8*16==10 for the filename part
	 */
	if (width < 16 + 6 + number_width)
		width = 16 + 6 + number_width;

	/*
	 * First assign sizes that are wanted, ignoring available width.
2370 2371
	 * strlen("Bin XXX -> YYY bytes") == bin_width, and the part
	 * starting from "XXX" should fit in graph_width.
2372
	 */
2373 2374 2375 2376 2377
	graph_width = max_change + 4 > bin_width ? max_change : bin_width - 4;
	if (options->stat_graph_width &&
	    options->stat_graph_width < graph_width)
		graph_width = options->stat_graph_width;

2378 2379 2380 2381 2382 2383 2384 2385
	name_width = (options->stat_name_width > 0 &&
		      options->stat_name_width < max_len) ?
		options->stat_name_width : max_len;

	/*
	 * Adjust adjustable widths not to exceed maximum width
	 */
	if (name_width + number_width + 6 + graph_width > width) {
2386
		if (graph_width > width * 3/8 - number_width - 6) {
2387
			graph_width = width * 3/8 - number_width - 6;
2388 2389 2390 2391
			if (graph_width < 6)
				graph_width = 6;
		}

2392 2393 2394
		if (options->stat_graph_width &&
		    graph_width > options->stat_graph_width)
			graph_width = options->stat_graph_width;
2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405
		if (name_width > width - number_width - 6 - graph_width)
			name_width = width - number_width - 6 - graph_width;
		else
			graph_width = width - number_width - 6 - name_width;
	}

	/*
	 * From here name_width is the width of the name area,
	 * and graph_width is the width of the graph area.
	 * max_change is used to scale graph properly.
	 */
2406
	for (i = 0; i < count; i++) {
T
Timo Hirvonen 已提交
2407
		const char *prefix = "";
2408 2409 2410 2411
		struct diffstat_file *file = data->files[i];
		char *name = file->print_name;
		uintmax_t added = file->added;
		uintmax_t deleted = file->deleted;
2412
		int name_len;
J
Junio C Hamano 已提交
2413

2414
		if (!file->is_interesting && (added + deleted == 0))
2415
			continue;
2416

J
Junio C Hamano 已提交
2417 2418 2419
		/*
		 * "scale" the filename
		 */
2420 2421 2422
		len = name_width;
		name_len = strlen(name);
		if (name_width < name_len) {
J
Junio C Hamano 已提交
2423 2424
			char *slash;
			prefix = "...";
2425 2426
			len -= 3;
			name += name_len - len;
J
Junio C Hamano 已提交
2427 2428 2429 2430 2431
			slash = strchr(name, '/');
			if (slash)
				name = slash;
		}

2432
		if (file->is_binary) {
2433 2434
			strbuf_addf(&out, " %s%-*s |", prefix, len, name);
			strbuf_addf(&out, " %*s", number_width, "Bin");
2435
			if (!added && !deleted) {
2436 2437 2438 2439
				strbuf_addch(&out, '\n');
				emit_diff_symbol(options, DIFF_SYMBOL_STATS_LINE,
						 out.buf, out.len, 0);
				strbuf_reset(&out);
2440 2441
				continue;
			}
2442
			strbuf_addf(&out, " %s%"PRIuMAX"%s",
2443
				del_c, deleted, reset);
2444 2445
			strbuf_addstr(&out, " -> ");
			strbuf_addf(&out, "%s%"PRIuMAX"%s",
2446
				add_c, added, reset);
2447 2448 2449 2450
			strbuf_addstr(&out, " bytes\n");
			emit_diff_symbol(options, DIFF_SYMBOL_STATS_LINE,
					 out.buf, out.len, 0);
			strbuf_reset(&out);
2451
			continue;
J
Junio C Hamano 已提交
2452
		}
2453
		else if (file->is_unmerged) {
2454 2455 2456 2457 2458
			strbuf_addf(&out, " %s%-*s |", prefix, len, name);
			strbuf_addstr(&out, " Unmerged\n");
			emit_diff_symbol(options, DIFF_SYMBOL_STATS_LINE,
					 out.buf, out.len, 0);
			strbuf_reset(&out);
2459
			continue;
J
Junio C Hamano 已提交
2460 2461
		}

2462 2463 2464
		/*
		 * scale the add/delete
		 */
J
Junio C Hamano 已提交
2465 2466 2467
		add = added;
		del = deleted;

2468
		if (graph_width <= max_change) {
2469
			int total = scale_linear(add + del, graph_width, max_change);
2470 2471 2472 2473
			if (total < 2 && add && del)
				/* width >= 2 due to the sanity check */
				total = 2;
			if (add < del) {
2474
				add = scale_linear(add, graph_width, max_change);
2475 2476
				del = total - add;
			} else {
2477
				del = scale_linear(del, graph_width, max_change);
2478 2479
				add = total - del;
			}
J
Junio C Hamano 已提交
2480
		}
2481 2482
		strbuf_addf(&out, " %s%-*s |", prefix, len, name);
		strbuf_addf(&out, " %*"PRIuMAX"%s",
2483 2484
			number_width, added + deleted,
			added + deleted ? " " : "");
2485 2486 2487 2488 2489 2490
		show_graph(&out, '+', add, add_c, reset);
		show_graph(&out, '-', del, del_c, reset);
		strbuf_addch(&out, '\n');
		emit_diff_symbol(options, DIFF_SYMBOL_STATS_LINE,
				 out.buf, out.len, 0);
		strbuf_reset(&out);
2491
	}
2492 2493

	for (i = 0; i < data->nr; i++) {
2494 2495 2496
		struct diffstat_file *file = data->files[i];
		uintmax_t added = file->added;
		uintmax_t deleted = file->deleted;
2497 2498 2499

		if (file->is_unmerged ||
		    (!file->is_interesting && (added + deleted == 0))) {
2500 2501 2502
			total_files--;
			continue;
		}
2503

2504
		if (!file->is_binary) {
2505 2506 2507 2508 2509
			adds += added;
			dels += deleted;
		}
		if (i < count)
			continue;
2510
		if (!extra_shown)
2511 2512 2513
			emit_diff_symbol(options,
					 DIFF_SYMBOL_STATS_SUMMARY_ABBREV,
					 NULL, 0, 0);
2514
		extra_shown = 1;
2515
	}
2516 2517

	print_stat_summary_inserts_deletes(options, total_files, adds, dels);
2518
	strbuf_release(&out);
J
Junio C Hamano 已提交
2519 2520
}

F
Felipe Contreras 已提交
2521
static void show_shortstats(struct diffstat_t *data, struct diff_options *options)
2522 2523 2524 2525 2526 2527 2528
{
	int i, adds = 0, dels = 0, total_files = data->nr;

	if (data->nr == 0)
		return;

	for (i = 0; i < data->nr; i++) {
2529
		int added = data->files[i]->added;
2530
		int deleted = data->files[i]->deleted;
2531

2532 2533
		if (data->files[i]->is_unmerged ||
		    (!data->files[i]->is_interesting && (added + deleted == 0))) {
2534
			total_files--;
2535
		} else if (!data->files[i]->is_binary) { /* don't count bytes */
2536 2537
			adds += added;
			dels += deleted;
2538 2539
		}
	}
2540
	print_stat_summary_inserts_deletes(options, total_files, adds, dels);
2541 2542
}

2543
static void show_numstat(struct diffstat_t *data, struct diff_options *options)
J
Junio C Hamano 已提交
2544 2545 2546
{
	int i;

2547 2548 2549
	if (data->nr == 0)
		return;

J
Junio C Hamano 已提交
2550 2551 2552
	for (i = 0; i < data->nr; i++) {
		struct diffstat_file *file = data->files[i];

2553
		fprintf(options->file, "%s", diff_line_prefix(options));
2554

2555
		if (file->is_binary)
2556
			fprintf(options->file, "-\t-\t");
2557
		else
2558
			fprintf(options->file,
2559 2560
				"%"PRIuMAX"\t%"PRIuMAX"\t",
				file->added, file->deleted);
2561 2562 2563
		if (options->line_termination) {
			fill_print_name(file);
			if (!file->is_renamed)
2564
				write_name_quoted(file->name, options->file,
2565 2566
						  options->line_termination);
			else {
2567 2568
				fputs(file->print_name, options->file);
				putc(options->line_termination, options->file);
2569
			}
2570
		} else {
2571
			if (file->is_renamed) {
2572 2573
				putc('\0', options->file);
				write_name_quoted(file->from_name, options->file, '\0');
2574
			}
2575
			write_name_quoted(file->name, options->file, '\0');
2576
		}
J
Junio C Hamano 已提交
2577 2578 2579
	}
}

2580 2581 2582
struct dirstat_file {
	const char *name;
	unsigned long changed;
2583 2584
};

2585 2586
struct dirstat_dir {
	struct dirstat_file *files;
2587
	int alloc, nr, permille, cumulative;
2588 2589
};

2590 2591
static long gather_dirstat(struct diff_options *opt, struct dirstat_dir *dir,
		unsigned long changed, const char *base, int baselen)
2592
{
B
Brandon Williams 已提交
2593
	unsigned long sum_changes = 0;
2594
	unsigned int sources = 0;
2595
	const char *line_prefix = diff_line_prefix(opt);
2596 2597

	while (dir->nr) {
2598
		struct dirstat_file *f = dir->files;
2599
		int namelen = strlen(f->name);
B
Brandon Williams 已提交
2600
		unsigned long changes;
2601 2602 2603 2604 2605 2606 2607 2608 2609
		char *slash;

		if (namelen < baselen)
			break;
		if (memcmp(f->name, base, baselen))
			break;
		slash = strchr(f->name + baselen, '/');
		if (slash) {
			int newbaselen = slash + 1 - f->name;
B
Brandon Williams 已提交
2610
			changes = gather_dirstat(opt, dir, changed, f->name, newbaselen);
2611 2612
			sources++;
		} else {
B
Brandon Williams 已提交
2613
			changes = f->changed;
2614 2615 2616 2617
			dir->files++;
			dir->nr--;
			sources += 2;
		}
B
Brandon Williams 已提交
2618
		sum_changes += changes;
2619 2620 2621 2622 2623 2624 2625 2626 2627
	}

	/*
	 * We don't report dirstat's for
	 *  - the top level
	 *  - or cases where everything came from a single directory
	 *    under this directory (sources == 1).
	 */
	if (baselen && sources != 1) {
B
Brandon Williams 已提交
2628 2629
		if (sum_changes) {
			int permille = sum_changes * 1000 / changed;
2630
			if (permille >= dir->permille) {
2631
				fprintf(opt->file, "%s%4d.%01d%% %.*s\n", line_prefix,
2632
					permille / 10, permille % 10, baselen, base);
2633 2634 2635 2636 2637
				if (!dir->cumulative)
					return 0;
			}
		}
	}
B
Brandon Williams 已提交
2638
	return sum_changes;
2639 2640
}

2641 2642 2643 2644 2645 2646 2647
static int dirstat_compare(const void *_a, const void *_b)
{
	const struct dirstat_file *a = _a;
	const struct dirstat_file *b = _b;
	return strcmp(a->name, b->name);
}

2648
static void show_dirstat(struct diff_options *options)
2649 2650 2651
{
	int i;
	unsigned long changed;
2652 2653 2654 2655 2656 2657
	struct dirstat_dir dir;
	struct diff_queue_struct *q = &diff_queued_diff;

	dir.files = NULL;
	dir.alloc = 0;
	dir.nr = 0;
2658
	dir.permille = options->dirstat_permille;
2659
	dir.cumulative = options->flags.dirstat_cumulative;
2660 2661

	changed = 0;
2662 2663 2664 2665
	for (i = 0; i < q->nr; i++) {
		struct diff_filepair *p = q->queue[i];
		const char *name;
		unsigned long copied, added, damage;
2666
		int content_changed;
2667

2668
		name = p->two->path ? p->two->path : p->one->path;
2669

2670
		if (p->one->oid_valid && p->two->oid_valid)
2671
			content_changed = oidcmp(&p->one->oid, &p->two->oid);
2672 2673 2674
		else
			content_changed = 1;

2675 2676 2677 2678 2679 2680 2681 2682 2683 2684
		if (!content_changed) {
			/*
			 * The SHA1 has not changed, so pre-/post-content is
			 * identical. We can therefore skip looking at the
			 * file contents altogether.
			 */
			damage = 0;
			goto found_damage;
		}

2685
		if (options->flags.dirstat_by_file) {
2686 2687 2688 2689 2690 2691 2692
			/*
			 * In --dirstat-by-file mode, we don't really need to
			 * look at the actual file contents at all.
			 * The fact that the SHA1 changed is enough for us to
			 * add this file to the list of results
			 * (with each file contributing equal damage).
			 */
2693
			damage = 1;
2694 2695
			goto found_damage;
		}
2696 2697 2698 2699

		if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
			diff_populate_filespec(p->one, 0);
			diff_populate_filespec(p->two, 0);
2700
			diffcore_count_changes(p->one, p->two, NULL, NULL,
2701 2702 2703 2704
					       &copied, &added);
			diff_free_filespec_data(p->one);
			diff_free_filespec_data(p->two);
		} else if (DIFF_FILE_VALID(p->one)) {
2705
			diff_populate_filespec(p->one, CHECK_SIZE_ONLY);
2706 2707 2708
			copied = added = 0;
			diff_free_filespec_data(p->one);
		} else if (DIFF_FILE_VALID(p->two)) {
2709
			diff_populate_filespec(p->two, CHECK_SIZE_ONLY);
2710 2711 2712 2713
			copied = 0;
			added = p->two->size;
			diff_free_filespec_data(p->two);
		} else
2714
			continue;
2715 2716 2717 2718

		/*
		 * Original minus copied is the removed material,
		 * added is the new material.  They are both damages
2719
		 * made to the preimage.
2720 2721 2722 2723 2724
		 * If the resulting damage is zero, we know that
		 * diffcore_count_changes() considers the two entries to
		 * be identical, but since content_changed is true, we
		 * know that there must have been _some_ kind of change,
		 * so we force all entries to have damage > 0.
2725 2726
		 */
		damage = (p->one->size - copied) + added;
2727
		if (!damage)
2728
			damage = 1;
2729

2730
found_damage:
2731 2732 2733 2734 2735
		ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
		dir.files[dir.nr].name = name;
		dir.files[dir.nr].changed = damage;
		changed += damage;
		dir.nr++;
2736 2737 2738 2739 2740 2741 2742
	}

	/* This can happen even with many files, if everything was renames */
	if (!changed)
		return;

	/* Show all directories with more than x% of the changes */
R
René Scharfe 已提交
2743
	QSORT(dir.files, dir.nr, dirstat_compare);
2744
	gather_dirstat(options, &dir, changed, "", 0);
2745 2746
}

2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759
static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *options)
{
	int i;
	unsigned long changed;
	struct dirstat_dir dir;

	if (data->nr == 0)
		return;

	dir.files = NULL;
	dir.alloc = 0;
	dir.nr = 0;
	dir.permille = options->dirstat_permille;
2760
	dir.cumulative = options->flags.dirstat_cumulative;
2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773

	changed = 0;
	for (i = 0; i < data->nr; i++) {
		struct diffstat_file *file = data->files[i];
		unsigned long damage = file->added + file->deleted;
		if (file->is_binary)
			/*
			 * binary files counts bytes, not lines. Must find some
			 * way to normalize binary bytes vs. textual lines.
			 * The following heuristic assumes that there are 64
			 * bytes per "line".
			 * This is stupid and ugly, but very cheap...
			 */
R
René Scharfe 已提交
2774
			damage = DIV_ROUND_UP(damage, 64);
2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786
		ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
		dir.files[dir.nr].name = file->name;
		dir.files[dir.nr].changed = damage;
		changed += damage;
		dir.nr++;
	}

	/* This can happen even with many files, if everything was renames */
	if (!changed)
		return;

	/* Show all directories with more than x% of the changes */
R
René Scharfe 已提交
2787
	QSORT(dir.files, dir.nr, dirstat_compare);
2788 2789 2790
	gather_dirstat(options, &dir, changed, "", 0);
}

2791 2792 2793 2794 2795
static void free_diffstat_info(struct diffstat_t *diffstat)
{
	int i;
	for (i = 0; i < diffstat->nr; i++) {
		struct diffstat_file *f = diffstat->files[i];
2796
		free(f->print_name);
2797 2798 2799 2800 2801 2802 2803
		free(f->name);
		free(f->from_name);
		free(f);
	}
	free(diffstat->files);
}

2804 2805
struct checkdiff_t {
	const char *filename;
2806
	int lineno;
2807
	int conflict_marker_size;
2808
	struct diff_options *o;
2809
	unsigned ws_rule;
2810
	unsigned status;
2811 2812
};

2813
static int is_conflict_marker(const char *line, int marker_size, unsigned long len)
2814 2815 2816 2817
{
	char firstchar;
	int cnt;

2818
	if (len < marker_size + 1)
2819 2820 2821
		return 0;
	firstchar = line[0];
	switch (firstchar) {
2822
	case '=': case '>': case '<': case '|':
2823 2824 2825 2826
		break;
	default:
		return 0;
	}
2827
	for (cnt = 1; cnt < marker_size; cnt++)
2828 2829
		if (line[cnt] != firstchar)
			return 0;
2830 2831
	/* line[1] thru line[marker_size-1] are same as firstchar */
	if (len < marker_size + 1 || !isspace(line[marker_size]))
2832 2833 2834 2835
		return 0;
	return 1;
}

2836 2837 2838
static void checkdiff_consume(void *priv, char *line, unsigned long len)
{
	struct checkdiff_t *data = priv;
2839
	int marker_size = data->conflict_marker_size;
2840 2841 2842
	const char *ws = diff_get_color(data->o->use_color, DIFF_WHITESPACE);
	const char *reset = diff_get_color(data->o->use_color, DIFF_RESET);
	const char *set = diff_get_color(data->o->use_color, DIFF_FILE_NEW);
W
Wincent Colaiuta 已提交
2843
	char *err;
2844
	const char *line_prefix;
2845 2846

	assert(data->o);
2847
	line_prefix = diff_line_prefix(data->o);
2848 2849

	if (line[0] == '+') {
2850
		unsigned bad;
2851
		data->lineno++;
2852
		if (is_conflict_marker(line + 1, marker_size, len - 1)) {
2853 2854
			data->status |= 1;
			fprintf(data->o->file,
2855 2856
				"%s%s:%d: leftover conflict marker\n",
				line_prefix, data->filename, data->lineno);
2857
		}
2858
		bad = ws_check(line + 1, len - 1, data->ws_rule);
2859
		if (!bad)
W
Wincent Colaiuta 已提交
2860
			return;
2861 2862
		data->status |= bad;
		err = whitespace_error_string(bad);
2863 2864
		fprintf(data->o->file, "%s%s:%d: %s.\n",
			line_prefix, data->filename, data->lineno, err);
W
Wincent Colaiuta 已提交
2865
		free(err);
2866
		emit_line(data->o, set, reset, line, 1);
2867
		ws_check_emit(line + 1, len - 1, data->ws_rule,
2868
			      data->o->file, set, reset, ws);
2869
	} else if (line[0] == ' ') {
2870
		data->lineno++;
2871
	} else if (line[0] == '@') {
2872 2873
		char *plus = strchr(line, '+');
		if (plus)
2874
			data->lineno = strtol(plus, NULL, 10) - 1;
2875 2876 2877 2878 2879
		else
			die("invalid diff");
	}
}

J
Junio C Hamano 已提交
2880 2881 2882
static unsigned char *deflate_it(char *data,
				 unsigned long size,
				 unsigned long *result_size)
J
Junio C Hamano 已提交
2883
{
J
Junio C Hamano 已提交
2884 2885
	int bound;
	unsigned char *deflated;
2886
	git_zstream stream;
J
Junio C Hamano 已提交
2887

2888
	git_deflate_init(&stream, zlib_compression_level);
J
Junio C Hamano 已提交
2889
	bound = git_deflate_bound(&stream, size);
J
Junio C Hamano 已提交
2890 2891 2892 2893 2894 2895
	deflated = xmalloc(bound);
	stream.next_out = deflated;
	stream.avail_out = bound;

	stream.next_in = (unsigned char *)data;
	stream.avail_in = size;
2896
	while (git_deflate(&stream, Z_FINISH) == Z_OK)
J
Junio C Hamano 已提交
2897
		; /* nothing */
2898
	git_deflate_end(&stream);
J
Junio C Hamano 已提交
2899 2900
	*result_size = stream.total_out;
	return deflated;
J
Junio C Hamano 已提交
2901 2902
}

2903 2904
static void emit_binary_diff_body(struct diff_options *o,
				  mmfile_t *one, mmfile_t *two)
J
Junio C Hamano 已提交
2905
{
J
Junio C Hamano 已提交
2906 2907 2908 2909 2910 2911 2912 2913
	void *cp;
	void *delta;
	void *deflated;
	void *data;
	unsigned long orig_size;
	unsigned long delta_size;
	unsigned long deflate_size;
	unsigned long data_size;
J
Junio C Hamano 已提交
2914

J
Junio C Hamano 已提交
2915 2916
	/* We could do deflated delta, or we could do just deflated two,
	 * whichever is smaller.
J
Junio C Hamano 已提交
2917
	 */
J
Junio C Hamano 已提交
2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928
	delta = NULL;
	deflated = deflate_it(two->ptr, two->size, &deflate_size);
	if (one->size && two->size) {
		delta = diff_delta(one->ptr, one->size,
				   two->ptr, two->size,
				   &delta_size, deflate_size);
		if (delta) {
			void *to_free = delta;
			orig_size = delta_size;
			delta = deflate_it(delta, delta_size, &delta_size);
			free(to_free);
J
Junio C Hamano 已提交
2929 2930 2931
		}
	}

J
Junio C Hamano 已提交
2932
	if (delta && delta_size < deflate_size) {
2933 2934 2935 2936
		char *s = xstrfmt("%lu", orig_size);
		emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA,
				 s, strlen(s), 0);
		free(s);
J
Junio C Hamano 已提交
2937 2938 2939
		free(deflated);
		data = delta;
		data_size = delta_size;
2940 2941 2942 2943 2944
	} else {
		char *s = xstrfmt("%lu", two->size);
		emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL,
				 s, strlen(s), 0);
		free(s);
J
Junio C Hamano 已提交
2945 2946 2947 2948
		free(delta);
		data = deflated;
		data_size = deflate_size;
	}
J
Junio C Hamano 已提交
2949

J
Junio C Hamano 已提交
2950 2951 2952
	/* emit data encoded in base85 */
	cp = data;
	while (data_size) {
2953
		int len;
J
Junio C Hamano 已提交
2954
		int bytes = (52 < data_size) ? 52 : data_size;
2955
		char line[71];
J
Junio C Hamano 已提交
2956
		data_size -= bytes;
J
Junio C Hamano 已提交
2957 2958 2959 2960 2961
		if (bytes <= 26)
			line[0] = bytes + 'A' - 1;
		else
			line[0] = bytes - 26 + 'a' - 1;
		encode_85(line + 1, cp, bytes);
2962
		cp = (char *) cp + bytes;
2963 2964 2965 2966 2967 2968 2969

		len = strlen(line);
		line[len++] = '\n';
		line[len] = '\0';

		emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_BODY,
				 line, len, 0);
J
Junio C Hamano 已提交
2970
	}
2971
	emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_FOOTER, NULL, 0, 0);
J
Junio C Hamano 已提交
2972
	free(data);
J
Junio C Hamano 已提交
2973 2974
}

2975 2976
static void emit_binary_diff(struct diff_options *o,
			     mmfile_t *one, mmfile_t *two)
2977
{
2978 2979 2980
	emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_HEADER, NULL, 0, 0);
	emit_binary_diff_body(o, one, two);
	emit_binary_diff_body(o, two, one);
2981 2982
}

2983 2984
int diff_filespec_is_binary(struct diff_filespec *one)
{
J
Jeff King 已提交
2985 2986 2987 2988 2989 2990
	if (one->is_binary == -1) {
		diff_filespec_load_driver(one);
		if (one->driver->binary != -1)
			one->is_binary = one->driver->binary;
		else {
			if (!one->data && DIFF_FILE_VALID(one))
2991 2992
				diff_populate_filespec(one, CHECK_BINARY);
			if (one->is_binary == -1 && one->data)
J
Jeff King 已提交
2993 2994 2995 2996 2997 2998
				one->is_binary = buffer_is_binary(one->data,
						one->size);
			if (one->is_binary == -1)
				one->is_binary = 0;
		}
	}
2999
	return one->is_binary;
J
Junio C Hamano 已提交
3000 3001
}

3002
static const struct userdiff_funcname *diff_funcname_pattern(struct diff_filespec *one)
3003
{
J
Jeff King 已提交
3004 3005
	diff_filespec_load_driver(one);
	return one->driver->funcname.pattern ? &one->driver->funcname : NULL;
3006 3007
}

3008 3009 3010 3011 3012 3013 3014 3015
void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b)
{
	if (!options->a_prefix)
		options->a_prefix = a;
	if (!options->b_prefix)
		options->b_prefix = b;
}

A
Axel Bonnet 已提交
3016
struct userdiff_driver *get_textconv(struct diff_filespec *one)
J
Jeff King 已提交
3017 3018 3019
{
	if (!DIFF_FILE_VALID(one))
		return NULL;
3020

J
Jeff King 已提交
3021
	diff_filespec_load_driver(one);
3022
	return userdiff_get_textconv(one->driver);
J
Jeff King 已提交
3023 3024
}

J
Junio C Hamano 已提交
3025 3026 3027 3028 3029
static void builtin_diff(const char *name_a,
			 const char *name_b,
			 struct diff_filespec *one,
			 struct diff_filespec *two,
			 const char *xfrm_msg,
3030
			 int must_show_header,
J
Junio C Hamano 已提交
3031
			 struct diff_options *o,
J
Junio C Hamano 已提交
3032 3033 3034 3035 3036
			 int complete_rewrite)
{
	mmfile_t mf1, mf2;
	const char *lbl[2];
	char *a_one, *b_two;
J
Jeff King 已提交
3037
	const char *meta = diff_get_color_opt(o, DIFF_METAINFO);
3038
	const char *reset = diff_get_color_opt(o, DIFF_RESET);
3039
	const char *a_prefix, *b_prefix;
J
Jeff King 已提交
3040 3041
	struct userdiff_driver *textconv_one = NULL;
	struct userdiff_driver *textconv_two = NULL;
3042
	struct strbuf header = STRBUF_INIT;
3043
	const char *line_prefix = diff_line_prefix(o);
3044

3045
	diff_set_mnemonic_prefix(o, "a/", "b/");
3046
	if (o->flags.reverse_diff) {
3047 3048 3049 3050 3051 3052 3053
		a_prefix = o->b_prefix;
		b_prefix = o->a_prefix;
	} else {
		a_prefix = o->a_prefix;
		b_prefix = o->b_prefix;
	}

3054 3055 3056
	if (o->submodule_format == DIFF_SUBMODULE_LOG &&
	    (!one->mode || S_ISGITLINK(one->mode)) &&
	    (!two->mode || S_ISGITLINK(two->mode))) {
3057
		show_submodule_summary(o, one->path ? one->path : two->path,
3058
				&one->oid, &two->oid,
3059
				two->dirty_submodule);
3060
		return;
3061 3062 3063
	} else if (o->submodule_format == DIFF_SUBMODULE_INLINE_DIFF &&
		   (!one->mode || S_ISGITLINK(one->mode)) &&
		   (!two->mode || S_ISGITLINK(two->mode))) {
3064
		show_submodule_inline_diff(o, one->path ? one->path : two->path,
3065
				&one->oid, &two->oid,
3066
				two->dirty_submodule);
3067
		return;
3068 3069
	}

3070
	if (o->flags.allow_textconv) {
3071 3072 3073 3074
		textconv_one = get_textconv(one);
		textconv_two = get_textconv(two);
	}

3075 3076 3077 3078
	/* Never use a non-valid filename anywhere if at all possible */
	name_a = DIFF_FILE_VALID(one) ? name_a : name_b;
	name_b = DIFF_FILE_VALID(two) ? name_b : name_a;

3079 3080
	a_one = quote_two(a_prefix, name_a + (*name_a == '/'));
	b_two = quote_two(b_prefix, name_b + (*name_b == '/'));
J
Junio C Hamano 已提交
3081 3082
	lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
	lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
J
Jeff King 已提交
3083
	strbuf_addf(&header, "%s%sdiff --git %s %s%s\n", line_prefix, meta, a_one, b_two, reset);
J
Junio C Hamano 已提交
3084 3085
	if (lbl[0][0] == '/') {
		/* /dev/null */
J
Jeff King 已提交
3086
		strbuf_addf(&header, "%s%snew file mode %06o%s\n", line_prefix, meta, two->mode, reset);
3087 3088
		if (xfrm_msg)
			strbuf_addstr(&header, xfrm_msg);
3089
		must_show_header = 1;
J
Junio C Hamano 已提交
3090 3091
	}
	else if (lbl[1][0] == '/') {
J
Jeff King 已提交
3092
		strbuf_addf(&header, "%s%sdeleted file mode %06o%s\n", line_prefix, meta, one->mode, reset);
3093 3094
		if (xfrm_msg)
			strbuf_addstr(&header, xfrm_msg);
3095
		must_show_header = 1;
J
Junio C Hamano 已提交
3096 3097 3098
	}
	else {
		if (one->mode != two->mode) {
J
Jeff King 已提交
3099 3100
			strbuf_addf(&header, "%s%sold mode %06o%s\n", line_prefix, meta, one->mode, reset);
			strbuf_addf(&header, "%s%snew mode %06o%s\n", line_prefix, meta, two->mode, reset);
3101
			must_show_header = 1;
J
Johannes Schindelin 已提交
3102
		}
3103 3104
		if (xfrm_msg)
			strbuf_addstr(&header, xfrm_msg);
3105

J
Junio C Hamano 已提交
3106 3107 3108 3109 3110 3111
		/*
		 * we do not run diff between different kind
		 * of objects.
		 */
		if ((one->mode ^ two->mode) & S_IFMT)
			goto free_ab_and_return;
3112
		if (complete_rewrite &&
3113 3114
		    (textconv_one || !diff_filespec_is_binary(one)) &&
		    (textconv_two || !diff_filespec_is_binary(two))) {
3115 3116
			emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
					 header.buf, header.len, 0);
3117
			strbuf_reset(&header);
3118 3119
			emit_rewrite_diff(name_a, name_b, one, two,
						textconv_one, textconv_two, o);
3120
			o->found_changes = 1;
J
Junio C Hamano 已提交
3121 3122 3123 3124
			goto free_ab_and_return;
		}
	}

3125
	if (o->irreversible_delete && lbl[1][0] == '/') {
3126 3127
		emit_diff_symbol(o, DIFF_SYMBOL_HEADER, header.buf,
				 header.len, 0);
3128 3129
		strbuf_reset(&header);
		goto free_ab_and_return;
3130
	} else if (!o->flags.text &&
3131 3132
	    ( (!textconv_one && diff_filespec_is_binary(one)) ||
	      (!textconv_two && diff_filespec_is_binary(two)) )) {
3133
		struct strbuf sb = STRBUF_INIT;
3134 3135
		if (!one->data && !two->data &&
		    S_ISREG(one->mode) && S_ISREG(two->mode) &&
3136
		    !o->flags.binary) {
3137
			if (!oidcmp(&one->oid, &two->oid)) {
3138
				if (must_show_header)
3139 3140 3141
					emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
							 header.buf, header.len,
							 0);
3142 3143
				goto free_ab_and_return;
			}
3144 3145
			emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
					 header.buf, header.len, 0);
3146 3147 3148 3149 3150
			strbuf_addf(&sb, "%sBinary files %s and %s differ\n",
				    diff_line_prefix(o), lbl[0], lbl[1]);
			emit_diff_symbol(o, DIFF_SYMBOL_BINARY_FILES,
					 sb.buf, sb.len, 0);
			strbuf_release(&sb);
3151 3152
			goto free_ab_and_return;
		}
3153 3154
		if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
			die("unable to read files to diff");
J
Junio C Hamano 已提交
3155 3156
		/* Quite common confusing case */
		if (mf1.size == mf2.size &&
3157 3158
		    !memcmp(mf1.ptr, mf2.ptr, mf1.size)) {
			if (must_show_header)
3159 3160
				emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
						 header.buf, header.len, 0);
J
Junio C Hamano 已提交
3161
			goto free_ab_and_return;
3162
		}
3163
		emit_diff_symbol(o, DIFF_SYMBOL_HEADER, header.buf, header.len, 0);
3164
		strbuf_reset(&header);
3165
		if (o->flags.binary)
3166
			emit_binary_diff(o, &mf1, &mf2);
3167 3168 3169 3170 3171 3172 3173
		else {
			strbuf_addf(&sb, "%sBinary files %s and %s differ\n",
				    diff_line_prefix(o), lbl[0], lbl[1]);
			emit_diff_symbol(o, DIFF_SYMBOL_BINARY_FILES,
					 sb.buf, sb.len, 0);
			strbuf_release(&sb);
		}
3174
		o->found_changes = 1;
3175
	} else {
J
Junio C Hamano 已提交
3176 3177
		/* Crazy xdl interfaces.. */
		const char *diffopts = getenv("GIT_DIFF_OPTS");
3178
		const char *v;
J
Junio C Hamano 已提交
3179 3180 3181
		xpparam_t xpp;
		xdemitconf_t xecfg;
		struct emit_callback ecbdata;
3182
		const struct userdiff_funcname *pe;
3183

3184
		if (must_show_header) {
3185 3186
			emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
					 header.buf, header.len, 0);
3187 3188 3189
			strbuf_reset(&header);
		}

3190 3191
		mf1.size = fill_textconv(textconv_one, one, &mf1.ptr);
		mf2.size = fill_textconv(textconv_two, two, &mf2.ptr);
J
Jeff King 已提交
3192

3193 3194 3195
		pe = diff_funcname_pattern(one);
		if (!pe)
			pe = diff_funcname_pattern(two);
J
Junio C Hamano 已提交
3196

B
Brian Downing 已提交
3197
		memset(&xpp, 0, sizeof(xpp));
3198
		memset(&xecfg, 0, sizeof(xecfg));
J
Johannes Schindelin 已提交
3199
		memset(&ecbdata, 0, sizeof(ecbdata));
J
Junio C Hamano 已提交
3200
		ecbdata.label_path = lbl;
3201
		ecbdata.color_diff = want_color(o->use_color);
3202
		ecbdata.ws_rule = whitespace_rule(name_b);
3203
		if (ecbdata.ws_rule & WS_BLANK_AT_EOF)
3204
			check_blank_at_eof(&mf1, &mf2, &ecbdata);
3205
		ecbdata.opt = o;
3206
		ecbdata.header = header.len ? &header : NULL;
R
René Scharfe 已提交
3207
		xpp.flags = o->xdl_opts;
J
Jonathan Tan 已提交
3208 3209
		xpp.anchors = o->anchors;
		xpp.anchors_nr = o->anchors_nr;
3210
		xecfg.ctxlen = o->context;
3211
		xecfg.interhunkctxlen = o->interhunkcontext;
J
Junio C Hamano 已提交
3212
		xecfg.flags = XDL_EMIT_FUNCNAMES;
3213
		if (o->flags.funccontext)
3214
			xecfg.flags |= XDL_EMIT_FUNCCONTEXT;
3215
		if (pe)
3216
			xdiff_set_find_func(&xecfg, pe->pattern, pe->cflags);
J
Junio C Hamano 已提交
3217 3218
		if (!diffopts)
			;
3219 3220 3221 3222
		else if (skip_prefix(diffopts, "--unified=", &v))
			xecfg.ctxlen = strtoul(v, NULL, 10);
		else if (skip_prefix(diffopts, "-u", &v))
			xecfg.ctxlen = strtoul(v, NULL, 10);
3223 3224
		if (o->word_diff)
			init_diff_words_data(&ecbdata, o, one, two);
J
Jeff King 已提交
3225 3226 3227
		if (xdi_diff_outf(&mf1, &mf2, fn_out_consume, &ecbdata,
				  &xpp, &xecfg))
			die("unable to generate diff for %s", one->path);
3228
		if (o->word_diff)
3229
			free_diff_words_data(&ecbdata);
J
Jeff King 已提交
3230 3231 3232 3233
		if (textconv_one)
			free(mf1.ptr);
		if (textconv_two)
			free(mf2.ptr);
3234
		xdiff_clear_find_func(&xecfg);
J
Junio C Hamano 已提交
3235 3236 3237
	}

 free_ab_and_return:
3238
	strbuf_release(&header);
3239 3240
	diff_free_filespec_data(one);
	diff_free_filespec_data(two);
J
Junio C Hamano 已提交
3241 3242 3243 3244 3245
	free(a_one);
	free(b_two);
	return;
}

3246 3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271
static char *get_compact_summary(const struct diff_filepair *p, int is_renamed)
{
	if (!is_renamed) {
		if (p->status == DIFF_STATUS_ADDED) {
			if (S_ISLNK(p->two->mode))
				return "new +l";
			else if ((p->two->mode & 0777) == 0755)
				return "new +x";
			else
				return "new";
		} else if (p->status == DIFF_STATUS_DELETED)
			return "gone";
	}
	if (S_ISLNK(p->one->mode) && !S_ISLNK(p->two->mode))
		return "mode -l";
	else if (!S_ISLNK(p->one->mode) && S_ISLNK(p->two->mode))
		return "mode +l";
	else if ((p->one->mode & 0777) == 0644 &&
		 (p->two->mode & 0777) == 0755)
		return "mode +x";
	else if ((p->one->mode & 0777) == 0755 &&
		 (p->two->mode & 0777) == 0644)
		return "mode -x";
	return NULL;
}

J
Junio C Hamano 已提交
3272 3273 3274
static void builtin_diffstat(const char *name_a, const char *name_b,
			     struct diff_filespec *one,
			     struct diff_filespec *two,
3275
			     struct diffstat_t *diffstat,
3276
			     struct diff_options *o,
3277
			     struct diff_filepair *p)
J
Junio C Hamano 已提交
3278 3279 3280
{
	mmfile_t mf1, mf2;
	struct diffstat_file *data;
3281
	int same_contents;
3282 3283 3284 3285 3286 3287
	int complete_rewrite = 0;

	if (!DIFF_PAIR_UNMERGED(p)) {
		if (p->status == DIFF_STATUS_MODIFIED && p->score)
			complete_rewrite = 1;
	}
J
Junio C Hamano 已提交
3288 3289

	data = diffstat_add(diffstat, name_a, name_b);
3290
	data->is_interesting = p->status != DIFF_STATUS_UNKNOWN;
3291 3292
	if (o->flags.stat_with_summary)
		data->comments = get_compact_summary(p, data->is_renamed);
J
Junio C Hamano 已提交
3293 3294 3295 3296 3297

	if (!one || !two) {
		data->is_unmerged = 1;
		return;
	}
3298

3299
	same_contents = !oidcmp(&one->oid, &two->oid);
3300

3301 3302
	if (diff_filespec_is_binary(one) || diff_filespec_is_binary(two)) {
		data->is_binary = 1;
3303
		if (same_contents) {
3304 3305 3306 3307 3308 3309
			data->added = 0;
			data->deleted = 0;
		} else {
			data->added = diff_filespec_size(two);
			data->deleted = diff_filespec_size(one);
		}
3310 3311 3312
	}

	else if (complete_rewrite) {
3313 3314 3315 3316 3317
		diff_populate_filespec(one, 0);
		diff_populate_filespec(two, 0);
		data->deleted = count_lines(one->data, one->size);
		data->added = count_lines(two->data, two->size);
	}
J
Junio C Hamano 已提交
3318

3319
	else if (!same_contents) {
J
Junio C Hamano 已提交
3320 3321 3322 3323
		/* Crazy xdl interfaces.. */
		xpparam_t xpp;
		xdemitconf_t xecfg;

3324 3325 3326
		if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
			die("unable to read files to diff");

B
Brian Downing 已提交
3327
		memset(&xpp, 0, sizeof(xpp));
3328
		memset(&xecfg, 0, sizeof(xecfg));
R
René Scharfe 已提交
3329
		xpp.flags = o->xdl_opts;
J
Jonathan Tan 已提交
3330 3331
		xpp.anchors = o->anchors;
		xpp.anchors_nr = o->anchors_nr;
3332 3333
		xecfg.ctxlen = o->context;
		xecfg.interhunkctxlen = o->interhunkcontext;
J
Jeff King 已提交
3334 3335 3336
		if (xdi_diff_outf(&mf1, &mf2, diffstat_consume, diffstat,
				  &xpp, &xecfg))
			die("unable to generate diffstat for %s", one->path);
J
Junio C Hamano 已提交
3337
	}
3338 3339 3340

	diff_free_filespec_data(one);
	diff_free_filespec_data(two);
J
Junio C Hamano 已提交
3341 3342
}

3343
static void builtin_checkdiff(const char *name_a, const char *name_b,
3344
			      const char *attr_path,
3345 3346 3347
			      struct diff_filespec *one,
			      struct diff_filespec *two,
			      struct diff_options *o)
3348 3349 3350 3351 3352 3353 3354 3355 3356 3357
{
	mmfile_t mf1, mf2;
	struct checkdiff_t data;

	if (!two)
		return;

	memset(&data, 0, sizeof(data));
	data.filename = name_b ? name_b : name_a;
	data.lineno = 0;
3358
	data.o = o;
3359
	data.ws_rule = whitespace_rule(attr_path);
3360
	data.conflict_marker_size = ll_merge_marker_size(attr_path);
3361 3362 3363 3364

	if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
		die("unable to read files to diff");

3365 3366 3367 3368 3369 3370
	/*
	 * All the other codepaths check both sides, but not checking
	 * the "old" side here is deliberate.  We are checking the newly
	 * introduced changes, and as long as the "new" side is text, we
	 * can and should check what it introduces.
	 */
3371
	if (diff_filespec_is_binary(two))
3372
		goto free_and_return;
3373 3374 3375 3376 3377
	else {
		/* Crazy xdl interfaces.. */
		xpparam_t xpp;
		xdemitconf_t xecfg;

B
Brian Downing 已提交
3378
		memset(&xpp, 0, sizeof(xpp));
3379
		memset(&xecfg, 0, sizeof(xecfg));
3380
		xecfg.ctxlen = 1; /* at least one context line */
R
René Scharfe 已提交
3381
		xpp.flags = 0;
J
Jeff King 已提交
3382 3383 3384
		if (xdi_diff_outf(&mf1, &mf2, checkdiff_consume, &data,
				  &xpp, &xecfg))
			die("unable to generate checkdiff for %s", one->path);
3385

3386
		if (data.ws_rule & WS_BLANK_AT_EOF) {
3387 3388 3389 3390 3391
			struct emit_callback ecbdata;
			int blank_at_eof;

			ecbdata.ws_rule = data.ws_rule;
			check_blank_at_eof(&mf1, &mf2, &ecbdata);
3392
			blank_at_eof = ecbdata.blank_at_eof_in_postimage;
3393

3394 3395 3396 3397 3398 3399 3400 3401
			if (blank_at_eof) {
				static char *err;
				if (!err)
					err = whitespace_error_string(WS_BLANK_AT_EOF);
				fprintf(o->file, "%s:%d: %s.\n",
					data.filename, blank_at_eof, err);
				data.status = 1; /* report errors */
			}
3402
		}
3403
	}
3404 3405 3406
 free_and_return:
	diff_free_filespec_data(one);
	diff_free_filespec_data(two);
3407
	if (data.status)
3408
		o->flags.check_failed = 1;
3409 3410
}

J
Junio C Hamano 已提交
3411 3412
struct diff_filespec *alloc_filespec(const char *path)
{
3413
	struct diff_filespec *spec;
J
Junio C Hamano 已提交
3414

3415
	FLEXPTR_ALLOC_STR(spec, path, path);
3416
	spec->count = 1;
J
Jeff King 已提交
3417
	spec->is_binary = -1;
J
Junio C Hamano 已提交
3418 3419 3420
	return spec;
}

3421 3422 3423 3424 3425 3426 3427 3428
void free_filespec(struct diff_filespec *spec)
{
	if (!--spec->count) {
		diff_free_filespec_data(spec);
		free(spec);
	}
}

3429 3430
void fill_filespec(struct diff_filespec *spec, const struct object_id *oid,
		   int oid_valid, unsigned short mode)
J
Junio C Hamano 已提交
3431 3432 3433
{
	if (mode) {
		spec->mode = canon_mode(mode);
3434 3435
		oidcpy(&spec->oid, oid);
		spec->oid_valid = oid_valid;
J
Junio C Hamano 已提交
3436 3437 3438 3439
	}
}

/*
3440
 * Given a name and sha1 pair, if the index tells us the file in
J
Junio C Hamano 已提交
3441 3442 3443
 * the work tree has that object contents, return true, so that
 * prepare_temp_file() does not have to inflate and extract.
 */
3444
static int reuse_worktree_file(const char *name, const struct object_id *oid, int want_file)
J
Junio C Hamano 已提交
3445
{
3446
	const struct cache_entry *ce;
J
Junio C Hamano 已提交
3447 3448 3449
	struct stat st;
	int pos, len;

3450 3451
	/*
	 * We do not read the cache ourselves here, because the
J
Junio C Hamano 已提交
3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 3463 3464 3465
	 * benchmark with my previous version that always reads cache
	 * shows that it makes things worse for diff-tree comparing
	 * two linux-2.6 kernel trees in an already checked out work
	 * tree.  This is because most diff-tree comparisons deal with
	 * only a small number of files, while reading the cache is
	 * expensive for a large project, and its cost outweighs the
	 * savings we get by not inflating the object to a temporary
	 * file.  Practically, this code only helps when we are used
	 * by diff-cache --cached, which does read the cache before
	 * calling us.
	 */
	if (!active_cache)
		return 0;

3466 3467 3468 3469 3470 3471 3472 3473 3474
	/* We want to avoid the working directory if our caller
	 * doesn't need the data in a normal file, this system
	 * is rather slow with its stat/open/mmap/close syscalls,
	 * and the object is contained in a pack file.  The pack
	 * is probably already open and will be faster to obtain
	 * the data through than the working directory.  Loose
	 * objects however would tend to be slower as they need
	 * to be individually opened and inflated.
	 */
3475
	if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(oid->hash))
3476 3477
		return 0;

3478 3479 3480 3481
	/*
	 * Similarly, if we'd have to convert the file contents anyway, that
	 * makes the optimization not worthwhile.
	 */
3482
	if (!want_file && would_convert_to_git(&the_index, name))
3483 3484
		return 0;

J
Junio C Hamano 已提交
3485 3486 3487 3488 3489
	len = strlen(name);
	pos = cache_name_pos(name, len);
	if (pos < 0)
		return 0;
	ce = active_cache[pos];
3490 3491 3492 3493 3494

	/*
	 * This is not the sha1 we are looking for, or
	 * unreusable because it is not a regular file.
	 */
3495
	if (oidcmp(oid, &ce->oid) || !S_ISREG(ce->ce_mode))
J
Junio C Hamano 已提交
3496
		return 0;
3497

3498 3499 3500 3501
	/*
	 * If ce is marked as "assume unchanged", there is no
	 * guarantee that work tree matches what we are looking for.
	 */
3502
	if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce))
3503 3504
		return 0;

3505 3506
	/*
	 * If ce matches the file in the work tree, we can reuse it.
J
Junio C Hamano 已提交
3507
	 */
3508 3509 3510 3511 3512
	if (ce_uptodate(ce) ||
	    (!lstat(name, &st) && !ce_match_stat(ce, &st, 0)))
		return 1;

	return 0;
J
Junio C Hamano 已提交
3513 3514
}

3515 3516
static int diff_populate_gitlink(struct diff_filespec *s, int size_only)
{
J
Jeff King 已提交
3517 3518
	struct strbuf buf = STRBUF_INIT;
	char *dirty = "";
3519 3520

	/* Are we looking at the work tree? */
3521
	if (s->dirty_submodule)
3522 3523
		dirty = "-dirty";

3524 3525
	strbuf_addf(&buf, "Subproject commit %s%s\n",
		    oid_to_hex(&s->oid), dirty);
J
Jeff King 已提交
3526
	s->size = buf.len;
3527 3528
	if (size_only) {
		s->data = NULL;
J
Jeff King 已提交
3529 3530 3531 3532
		strbuf_release(&buf);
	} else {
		s->data = strbuf_detach(&buf, NULL);
		s->should_free = 1;
3533 3534 3535 3536
	}
	return 0;
}

J
Junio C Hamano 已提交
3537 3538 3539 3540 3541
/*
 * While doing rename detection and pickaxe operation, we may need to
 * grab the data for the blob (or file) for our own in-core comparison.
 * diff_filespec has data and size fields for this purpose.
 */
3542
int diff_populate_filespec(struct diff_filespec *s, unsigned int flags)
J
Junio C Hamano 已提交
3543
{
3544
	int size_only = flags & CHECK_SIZE_ONLY;
J
Junio C Hamano 已提交
3545
	int err = 0;
3546
	int conv_flags = global_conv_flags_eol;
3547 3548 3549 3550
	/*
	 * demote FAIL to WARN to allow inspecting the situation
	 * instead of refusing.
	 */
3551 3552
	if (conv_flags & CONV_EOL_RNDTRP_DIE)
		conv_flags = CONV_EOL_RNDTRP_WARN;
3553

J
Junio C Hamano 已提交
3554 3555 3556 3557 3558 3559
	if (!DIFF_FILE_VALID(s))
		die("internal error: asking to populate invalid file.");
	if (S_ISDIR(s->mode))
		return -1;

	if (s->data)
3560
		return 0;
3561

3562 3563 3564
	if (size_only && 0 < s->size)
		return 0;

M
Martin Waitz 已提交
3565
	if (S_ISGITLINK(s->mode))
3566 3567
		return diff_populate_gitlink(s, size_only);

3568
	if (!s->oid_valid ||
3569
	    reuse_worktree_file(s->path, &s->oid, 0)) {
3570
		struct strbuf buf = STRBUF_INIT;
J
Junio C Hamano 已提交
3571 3572
		struct stat st;
		int fd;
L
Linus Torvalds 已提交
3573

J
Junio C Hamano 已提交
3574
		if (lstat(s->path, &st) < 0) {
3575 3576 3577 3578 3579 3580
		err_empty:
			err = -1;
		empty:
			s->data = (char *)"";
			s->size = 0;
			return err;
J
Junio C Hamano 已提交
3581
		}
3582
		s->size = xsize_t(st.st_size);
J
Junio C Hamano 已提交
3583 3584 3585
		if (!s->size)
			goto empty;
		if (S_ISLNK(st.st_mode)) {
3586 3587 3588
			struct strbuf sb = STRBUF_INIT;

			if (strbuf_readlink(&sb, s->path, s->size))
J
Junio C Hamano 已提交
3589
				goto err_empty;
3590 3591
			s->size = sb.len;
			s->data = strbuf_detach(&sb, NULL);
3592
			s->should_free = 1;
J
Junio C Hamano 已提交
3593 3594
			return 0;
		}
3595 3596 3597 3598 3599 3600 3601

		/*
		 * Even if the caller would be happy with getting
		 * only the size, we cannot return early at this
		 * point if the path requires us to run the content
		 * conversion.
		 */
3602
		if (size_only && !would_convert_to_git(&the_index, s->path))
3603
			return 0;
3604 3605 3606 3607 3608 3609 3610 3611 3612 3613

		/*
		 * Note: this check uses xsize_t(st.st_size) that may
		 * not be the true size of the blob after it goes
		 * through convert_to_git().  This may not strictly be
		 * correct, but the whole point of big_file_threshold
		 * and is_binary check being that we want to avoid
		 * opening the file and inspecting the contents, this
		 * is probably fine.
		 */
3614 3615 3616 3617 3618
		if ((flags & CHECK_BINARY) &&
		    s->size > big_file_threshold && s->is_binary == -1) {
			s->is_binary = 1;
			return 0;
		}
J
Junio C Hamano 已提交
3619 3620 3621
		fd = open(s->path, O_RDONLY);
		if (fd < 0)
			goto err_empty;
3622
		s->data = xmmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0);
J
Junio C Hamano 已提交
3623 3624
		close(fd);
		s->should_munmap = 1;
L
Linus Torvalds 已提交
3625 3626 3627 3628

		/*
		 * Convert from working tree format to canonical git format
		 */
3629
		if (convert_to_git(&the_index, s->path, s->data, s->size, &buf, conv_flags)) {
3630
			size_t size = 0;
L
Linus Torvalds 已提交
3631 3632
			munmap(s->data, s->size);
			s->should_munmap = 0;
3633 3634
			s->data = strbuf_detach(&buf, &size);
			s->size = size;
L
Linus Torvalds 已提交
3635 3636
			s->should_free = 1;
		}
J
Junio C Hamano 已提交
3637 3638
	}
	else {
3639
		enum object_type type;
3640
		if (size_only || (flags & CHECK_BINARY)) {
3641
			type = oid_object_info(&s->oid, &s->size);
3642
			if (type < 0)
3643 3644
				die("unable to read %s",
				    oid_to_hex(&s->oid));
3645 3646 3647 3648 3649 3650
			if (size_only)
				return 0;
			if (s->size > big_file_threshold && s->is_binary == -1) {
				s->is_binary = 1;
				return 0;
			}
J
Junio C Hamano 已提交
3651
		}
3652
		s->data = read_object_file(&s->oid, &type, &s->size);
3653
		if (!s->data)
3654
			die("unable to read %s", oid_to_hex(&s->oid));
3655
		s->should_free = 1;
J
Junio C Hamano 已提交
3656 3657 3658 3659
	}
	return 0;
}

3660
void diff_free_filespec_blob(struct diff_filespec *s)
J
Junio C Hamano 已提交
3661 3662 3663 3664 3665
{
	if (s->should_free)
		free(s->data);
	else if (s->should_munmap)
		munmap(s->data, s->size);
3666 3667 3668 3669 3670

	if (s->should_free || s->should_munmap) {
		s->should_free = s->should_munmap = 0;
		s->data = NULL;
	}
J
Jeff King 已提交
3671 3672 3673 3674
}

void diff_free_filespec_data(struct diff_filespec *s)
{
3675
	diff_free_filespec_blob(s);
3676
	FREE_AND_NULL(s->cnt_data);
J
Junio C Hamano 已提交
3677 3678
}

3679
static void prep_temp_blob(const char *path, struct diff_tempfile *temp,
J
Junio C Hamano 已提交
3680 3681
			   void *blob,
			   unsigned long size,
3682
			   const struct object_id *oid,
J
Junio C Hamano 已提交
3683 3684
			   int mode)
{
3685
	struct strbuf buf = STRBUF_INIT;
3686
	struct strbuf tempfile = STRBUF_INIT;
3687 3688
	char *path_dup = xstrdup(path);
	const char *base = basename(path_dup);
J
Junio C Hamano 已提交
3689

3690
	/* Generate "XXXXXX_basename.ext" */
3691 3692
	strbuf_addstr(&tempfile, "XXXXXX_");
	strbuf_addstr(&tempfile, base);
3693

3694
	temp->tempfile = mks_tempfile_ts(tempfile.buf, strlen(base) + 1);
3695
	if (!temp->tempfile)
3696
		die_errno("unable to create temp-file");
3697 3698 3699 3700 3701
	if (convert_to_working_tree(path,
			(const char *)blob, (size_t)size, &buf)) {
		blob = buf.buf;
		size = buf.len;
	}
3702
	if (write_in_full(temp->tempfile->fd, blob, size) < 0 ||
3703
	    close_tempfile_gently(temp->tempfile))
3704
		die_errno("unable to write temp-file");
3705
	temp->name = get_tempfile_path(temp->tempfile);
3706
	oid_to_hex_r(temp->hex, oid);
3707
	xsnprintf(temp->mode, sizeof(temp->mode), "%06o", mode);
3708
	strbuf_release(&buf);
3709
	strbuf_release(&tempfile);
3710
	free(path_dup);
J
Junio C Hamano 已提交
3711 3712
}

3713 3714
static struct diff_tempfile *prepare_temp_file(const char *name,
		struct diff_filespec *one)
J
Junio C Hamano 已提交
3715
{
3716 3717
	struct diff_tempfile *temp = claim_diff_tempfile();

J
Junio C Hamano 已提交
3718 3719 3720 3721 3722 3723
	if (!DIFF_FILE_VALID(one)) {
	not_a_valid_file:
		/* A '-' entry produces this for file-2, and
		 * a '+' entry produces this for file-1.
		 */
		temp->name = "/dev/null";
3724 3725
		xsnprintf(temp->hex, sizeof(temp->hex), ".");
		xsnprintf(temp->mode, sizeof(temp->mode), ".");
3726 3727 3728
		return temp;
	}

3729
	if (!S_ISGITLINK(one->mode) &&
3730
	    (!one->oid_valid ||
3731
	     reuse_worktree_file(name, &one->oid, 1))) {
J
Junio C Hamano 已提交
3732 3733 3734 3735
		struct stat st;
		if (lstat(name, &st) < 0) {
			if (errno == ENOENT)
				goto not_a_valid_file;
3736
			die_errno("stat(%s)", name);
J
Junio C Hamano 已提交
3737 3738
		}
		if (S_ISLNK(st.st_mode)) {
3739 3740
			struct strbuf sb = STRBUF_INIT;
			if (strbuf_readlink(&sb, name, st.st_size) < 0)
3741
				die_errno("readlink(%s)", name);
3742
			prep_temp_blob(name, temp, sb.buf, sb.len,
3743
				       (one->oid_valid ?
3744
					&one->oid : &null_oid),
3745
				       (one->oid_valid ?
J
Junio C Hamano 已提交
3746
					one->mode : S_IFLNK));
3747
			strbuf_release(&sb);
J
Junio C Hamano 已提交
3748 3749 3750 3751
		}
		else {
			/* we can borrow from the file in the work tree */
			temp->name = name;
3752
			if (!one->oid_valid)
3753
				oid_to_hex_r(temp->hex, &null_oid);
J
Junio C Hamano 已提交
3754
			else
3755
				oid_to_hex_r(temp->hex, &one->oid);
J
Junio C Hamano 已提交
3756 3757 3758
			/* Even though we may sometimes borrow the
			 * contents from the work tree, we always want
			 * one->mode.  mode is trustworthy even when
3759
			 * !(one->oid_valid), as long as
J
Junio C Hamano 已提交
3760 3761
			 * DIFF_FILE_VALID(one).
			 */
3762
			xsnprintf(temp->mode, sizeof(temp->mode), "%06o", one->mode);
J
Junio C Hamano 已提交
3763
		}
3764
		return temp;
J
Junio C Hamano 已提交
3765 3766 3767 3768
	}
	else {
		if (diff_populate_filespec(one, 0))
			die("cannot read data blob for %s", one->path);
3769
		prep_temp_blob(name, temp, one->data, one->size,
3770
			       &one->oid, one->mode);
J
Junio C Hamano 已提交
3771
	}
3772
	return temp;
J
Junio C Hamano 已提交
3773 3774
}

3775 3776 3777 3778 3779 3780 3781 3782 3783 3784
static void add_external_diff_name(struct argv_array *argv,
				   const char *name,
				   struct diff_filespec *df)
{
	struct diff_tempfile *temp = prepare_temp_file(name, df);
	argv_array_push(argv, temp->name);
	argv_array_push(argv, temp->hex);
	argv_array_push(argv, temp->mode);
}

J
Junio C Hamano 已提交
3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796
/* An external diff command takes:
 *
 * diff-cmd name infile1 infile1-sha1 infile1-mode \
 *               infile2 infile2-sha1 infile2-mode [ rename-to ]
 *
 */
static void run_external_diff(const char *pgm,
			      const char *name,
			      const char *other,
			      struct diff_filespec *one,
			      struct diff_filespec *two,
			      const char *xfrm_msg,
3797 3798
			      int complete_rewrite,
			      struct diff_options *o)
J
Junio C Hamano 已提交
3799
{
3800
	struct argv_array argv = ARGV_ARRAY_INIT;
3801
	struct argv_array env = ARGV_ARRAY_INIT;
3802
	struct diff_queue_struct *q = &diff_queued_diff;
J
Junio C Hamano 已提交
3803

3804 3805
	argv_array_push(&argv, pgm);
	argv_array_push(&argv, name);
J
Junio C Hamano 已提交
3806 3807

	if (one && two) {
3808 3809 3810 3811 3812
		add_external_diff_name(&argv, name, one);
		if (!other)
			add_external_diff_name(&argv, name, two);
		else {
			add_external_diff_name(&argv, other, two);
3813 3814
			argv_array_push(&argv, other);
			argv_array_push(&argv, xfrm_msg);
J
Junio C Hamano 已提交
3815 3816
		}
	}
3817

3818 3819
	argv_array_pushf(&env, "GIT_DIFF_PATH_COUNTER=%d", ++o->diff_path_counter);
	argv_array_pushf(&env, "GIT_DIFF_PATH_TOTAL=%d", q->nr);
3820

3821 3822
	if (run_command_v_opt_cd_env(argv.argv, RUN_USING_SHELL, NULL, env.argv))
		die(_("external diff died, stopping at %s"), name);
3823

J
Junio C Hamano 已提交
3824
	remove_tempfile();
3825
	argv_array_clear(&argv);
3826
	argv_array_clear(&env);
J
Junio C Hamano 已提交
3827 3828
}

3829 3830 3831 3832 3833
static int similarity_index(struct diff_filepair *p)
{
	return p->score * 100 / MAX_SCORE;
}

3834 3835 3836
static const char *diff_abbrev_oid(const struct object_id *oid, int abbrev)
{
	if (startup_info->have_repository)
3837
		return find_unique_abbrev(oid, abbrev);
3838 3839
	else {
		char *hex = oid_to_hex(oid);
3840 3841 3842
		if (abbrev < 0)
			abbrev = FALLBACK_DEFAULT_ABBREV;
		if (abbrev > GIT_SHA1_HEXSZ)
3843
			die("BUG: oid abbreviation out of range: %d", abbrev);
3844 3845
		if (abbrev)
			hex[abbrev] = '\0';
3846 3847 3848 3849
		return hex;
	}
}

3850 3851 3852 3853 3854 3855
static void fill_metainfo(struct strbuf *msg,
			  const char *name,
			  const char *other,
			  struct diff_filespec *one,
			  struct diff_filespec *two,
			  struct diff_options *o,
3856
			  struct diff_filepair *p,
3857
			  int *must_show_header,
3858
			  int use_color)
3859
{
3860 3861
	const char *set = diff_get_color(use_color, DIFF_METAINFO);
	const char *reset = diff_get_color(use_color, DIFF_RESET);
3862
	const char *line_prefix = diff_line_prefix(o);
3863

3864
	*must_show_header = 1;
3865 3866 3867
	strbuf_init(msg, PATH_MAX * 2 + 300);
	switch (p->status) {
	case DIFF_STATUS_COPIED:
J
Junio C Hamano 已提交
3868 3869 3870 3871
		strbuf_addf(msg, "%s%ssimilarity index %d%%",
			    line_prefix, set, similarity_index(p));
		strbuf_addf(msg, "%s\n%s%scopy from ",
			    reset,  line_prefix, set);
3872
		quote_c_style(name, msg, NULL, 0);
J
Junio C Hamano 已提交
3873
		strbuf_addf(msg, "%s\n%s%scopy to ", reset, line_prefix, set);
3874
		quote_c_style(other, msg, NULL, 0);
3875
		strbuf_addf(msg, "%s\n", reset);
3876 3877
		break;
	case DIFF_STATUS_RENAMED:
J
Junio C Hamano 已提交
3878 3879 3880 3881
		strbuf_addf(msg, "%s%ssimilarity index %d%%",
			    line_prefix, set, similarity_index(p));
		strbuf_addf(msg, "%s\n%s%srename from ",
			    reset, line_prefix, set);
3882
		quote_c_style(name, msg, NULL, 0);
J
Junio C Hamano 已提交
3883 3884
		strbuf_addf(msg, "%s\n%s%srename to ",
			    reset, line_prefix, set);
3885
		quote_c_style(other, msg, NULL, 0);
3886
		strbuf_addf(msg, "%s\n", reset);
3887 3888 3889
		break;
	case DIFF_STATUS_MODIFIED:
		if (p->score) {
J
Junio C Hamano 已提交
3890 3891
			strbuf_addf(msg, "%s%sdissimilarity index %d%%%s\n",
				    line_prefix,
3892
				    set, similarity_index(p), reset);
3893 3894 3895 3896
			break;
		}
		/* fallthru */
	default:
3897
		*must_show_header = 0;
3898
	}
3899
	if (one && two && oidcmp(&one->oid, &two->oid)) {
3900
		int abbrev = o->flags.full_index ? 40 : DEFAULT_ABBREV;
3901

3902
		if (o->flags.binary) {
3903 3904 3905 3906 3907
			mmfile_t mf;
			if ((!fill_mmfile(&mf, one) && diff_filespec_is_binary(one)) ||
			    (!fill_mmfile(&mf, two) && diff_filespec_is_binary(two)))
				abbrev = 40;
		}
3908 3909 3910
		strbuf_addf(msg, "%s%sindex %s..%s", line_prefix, set,
			    diff_abbrev_oid(&one->oid, abbrev),
			    diff_abbrev_oid(&two->oid, abbrev));
3911 3912
		if (one->mode == two->mode)
			strbuf_addf(msg, " %06o", one->mode);
3913
		strbuf_addf(msg, "%s\n", reset);
3914 3915 3916
	}
}

J
Junio C Hamano 已提交
3917 3918 3919
static void run_diff_cmd(const char *pgm,
			 const char *name,
			 const char *other,
3920
			 const char *attr_path,
J
Junio C Hamano 已提交
3921 3922
			 struct diff_filespec *one,
			 struct diff_filespec *two,
3923
			 struct strbuf *msg,
J
Junio C Hamano 已提交
3924
			 struct diff_options *o,
3925
			 struct diff_filepair *p)
J
Junio C Hamano 已提交
3926
{
3927 3928
	const char *xfrm_msg = NULL;
	int complete_rewrite = (p->status == DIFF_STATUS_MODIFIED) && p->score;
3929
	int must_show_header = 0;
3930

3931

3932
	if (o->flags.allow_external) {
3933 3934 3935
		struct userdiff_driver *drv = userdiff_find_by_path(attr_path);
		if (drv && drv->external)
			pgm = drv->external;
J
Junio C Hamano 已提交
3936 3937
	}

3938 3939 3940 3941 3942 3943
	if (msg) {
		/*
		 * don't use colors when the header is intended for an
		 * external diff driver
		 */
		fill_metainfo(msg, name, other, one, two, o, p,
3944
			      &must_show_header,
3945
			      want_color(o->use_color) && !pgm);
3946 3947 3948
		xfrm_msg = msg->len ? msg->buf : NULL;
	}

J
Junio C Hamano 已提交
3949 3950
	if (pgm) {
		run_external_diff(pgm, name, other, one, two, xfrm_msg,
3951
				  complete_rewrite, o);
J
Junio C Hamano 已提交
3952 3953 3954 3955
		return;
	}
	if (one && two)
		builtin_diff(name, other ? other : name,
3956 3957
			     one, two, xfrm_msg, must_show_header,
			     o, complete_rewrite);
J
Junio C Hamano 已提交
3958
	else
3959
		fprintf(o->file, "* Unmerged path %s\n", name);
J
Junio C Hamano 已提交
3960 3961
}

3962
static void diff_fill_oid_info(struct diff_filespec *one)
J
Junio C Hamano 已提交
3963 3964
{
	if (DIFF_FILE_VALID(one)) {
3965
		if (!one->oid_valid) {
J
Junio C Hamano 已提交
3966
			struct stat st;
3967
			if (one->is_stdin) {
3968
				oidclr(&one->oid);
3969 3970
				return;
			}
J
Junio C Hamano 已提交
3971
			if (lstat(one->path, &st) < 0)
3972
				die_errno("stat '%s'", one->path);
3973
			if (index_path(&one->oid, one->path, &st, 0))
3974
				die("cannot hash %s", one->path);
J
Junio C Hamano 已提交
3975 3976 3977
		}
	}
	else
3978
		oidclr(&one->oid);
J
Junio C Hamano 已提交
3979 3980
}

3981 3982 3983
static void strip_prefix(int prefix_length, const char **namep, const char **otherp)
{
	/* Strip the prefix but do not molest /dev/null and absolute paths */
3984
	if (*namep && **namep != '/') {
3985
		*namep += prefix_length;
3986 3987 3988 3989
		if (**namep == '/')
			++*namep;
	}
	if (*otherp && **otherp != '/') {
3990
		*otherp += prefix_length;
3991 3992 3993
		if (**otherp == '/')
			++*otherp;
	}
3994 3995
}

J
Junio C Hamano 已提交
3996 3997 3998
static void run_diff(struct diff_filepair *p, struct diff_options *o)
{
	const char *pgm = external_diff();
3999 4000 4001
	struct strbuf msg;
	struct diff_filespec *one = p->one;
	struct diff_filespec *two = p->two;
J
Junio C Hamano 已提交
4002 4003
	const char *name;
	const char *other;
4004
	const char *attr_path;
4005

S
Stefan Beller 已提交
4006 4007
	name  = one->path;
	other = (strcmp(name, two->path) ? two->path : NULL);
4008 4009 4010
	attr_path = name;
	if (o->prefix_length)
		strip_prefix(o->prefix_length, &name, &other);
J
Junio C Hamano 已提交
4011

4012
	if (!o->flags.allow_external)
4013 4014
		pgm = NULL;

J
Junio C Hamano 已提交
4015
	if (DIFF_PAIR_UNMERGED(p)) {
4016
		run_diff_cmd(pgm, name, NULL, attr_path,
4017
			     NULL, NULL, NULL, o, p);
J
Junio C Hamano 已提交
4018 4019 4020
		return;
	}

4021 4022
	diff_fill_oid_info(one);
	diff_fill_oid_info(two);
J
Junio C Hamano 已提交
4023 4024 4025 4026

	if (!pgm &&
	    DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) &&
	    (S_IFMT & one->mode) != (S_IFMT & two->mode)) {
4027 4028
		/*
		 * a filepair that changes between file and symlink
J
Junio C Hamano 已提交
4029 4030 4031
		 * needs to be split into deletion and creation.
		 */
		struct diff_filespec *null = alloc_filespec(two->path);
4032
		run_diff_cmd(NULL, name, other, attr_path,
4033
			     one, null, &msg, o, p);
J
Junio C Hamano 已提交
4034
		free(null);
4035 4036
		strbuf_release(&msg);

J
Junio C Hamano 已提交
4037
		null = alloc_filespec(one->path);
4038
		run_diff_cmd(NULL, name, other, attr_path,
4039
			     null, two, &msg, o, p);
J
Junio C Hamano 已提交
4040 4041 4042
		free(null);
	}
	else
4043
		run_diff_cmd(pgm, name, other, attr_path,
4044
			     one, two, &msg, o, p);
J
Junio C Hamano 已提交
4045

4046
	strbuf_release(&msg);
J
Junio C Hamano 已提交
4047 4048 4049 4050 4051 4052 4053 4054 4055 4056
}

static void run_diffstat(struct diff_filepair *p, struct diff_options *o,
			 struct diffstat_t *diffstat)
{
	const char *name;
	const char *other;

	if (DIFF_PAIR_UNMERGED(p)) {
		/* unmerged */
4057
		builtin_diffstat(p->one->path, NULL, NULL, NULL, diffstat, o, p);
J
Junio C Hamano 已提交
4058 4059 4060 4061 4062 4063
		return;
	}

	name = p->one->path;
	other = (strcmp(name, p->two->path) ? p->two->path : NULL);

4064 4065 4066
	if (o->prefix_length)
		strip_prefix(o->prefix_length, &name, &other);

4067 4068
	diff_fill_oid_info(p->one);
	diff_fill_oid_info(p->two);
J
Junio C Hamano 已提交
4069

4070
	builtin_diffstat(name, other, p->one, p->two, diffstat, o, p);
J
Junio C Hamano 已提交
4071 4072
}

4073 4074 4075 4076
static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
{
	const char *name;
	const char *other;
4077
	const char *attr_path;
4078 4079 4080 4081 4082 4083 4084 4085

	if (DIFF_PAIR_UNMERGED(p)) {
		/* unmerged */
		return;
	}

	name = p->one->path;
	other = (strcmp(name, p->two->path) ? p->two->path : NULL);
4086 4087 4088 4089
	attr_path = other ? other : name;

	if (o->prefix_length)
		strip_prefix(o->prefix_length, &name, &other);
4090

4091 4092
	diff_fill_oid_info(p->one);
	diff_fill_oid_info(p->two);
4093

4094
	builtin_checkdiff(name, other, attr_path, p->one, p->two, o);
4095 4096
}

J
Junio C Hamano 已提交
4097 4098
void diff_setup(struct diff_options *options)
{
4099
	memcpy(options, &default_diff_options, sizeof(*options));
4100 4101 4102

	options->file = stdout;

4103
	options->abbrev = DEFAULT_ABBREV;
J
Junio C Hamano 已提交
4104 4105 4106
	options->line_termination = '\n';
	options->break_opt = -1;
	options->rename_limit = -1;
4107
	options->dirstat_permille = diff_dirstat_permille_default;
4108
	options->context = diff_context_default;
4109
	options->interhunkcontext = diff_interhunk_context_default;
4110
	options->ws_error_highlight = ws_error_highlight_default;
4111
	options->flags.rename_empty = 1;
4112
	options->objfind = NULL;
J
Junio C Hamano 已提交
4113

4114
	/* pathchange left =NULL by default */
J
Junio C Hamano 已提交
4115 4116
	options->change = diff_change;
	options->add_remove = diff_addremove;
4117
	options->use_color = diff_use_color_default;
4118
	options->detect_rename = diff_detect_rename_default;
4119
	options->xdl_opts |= diff_algorithm;
4120 4121
	if (diff_indent_heuristic)
		DIFF_XDL_SET(options, INDENT_HEURISTIC);
4122

4123 4124
	options->orderfile = diff_order_file_cfg;

4125 4126 4127
	if (diff_no_prefix) {
		options->a_prefix = options->b_prefix = "";
	} else if (!diff_mnemonic_prefix) {
4128 4129 4130
		options->a_prefix = "a/";
		options->b_prefix = "b/";
	}
4131 4132

	options->color_moved = diff_color_moved_default;
J
Junio C Hamano 已提交
4133 4134
}

T
Thomas Rast 已提交
4135
void diff_setup_done(struct diff_options *options)
J
Junio C Hamano 已提交
4136
{
4137 4138 4139 4140
	unsigned check_mask = DIFF_FORMAT_NAME |
			      DIFF_FORMAT_NAME_STATUS |
			      DIFF_FORMAT_CHECKDIFF |
			      DIFF_FORMAT_NO_OUTPUT;
4141

4142 4143 4144
	if (options->set_default)
		options->set_default(options);

4145
	if (HAS_MULTI_BITS(options->output_format & check_mask))
4146
		die(_("--name-only, --name-status, --check and -s are mutually exclusive"));
4147

4148 4149 4150
	if (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK))
		die(_("-G, -S and --find-object are mutually exclusive"));

4151 4152 4153 4154
	/*
	 * Most of the time we can say "there are changes"
	 * only by checking if there are changed paths, but
	 * --ignore-whitespace* options force us to look
J
Jim Meyering 已提交
4155
	 * inside contents.
4156 4157
	 */

4158
	if ((options->xdl_opts & XDF_WHITESPACE_FLAGS))
4159
		options->flags.diff_from_contents = 1;
4160
	else
4161
		options->flags.diff_from_contents = 0;
4162

4163
	if (options->flags.find_copies_harder)
4164 4165
		options->detect_rename = DIFF_DETECT_COPY;

4166
	if (!options->flags.relative_name)
4167 4168 4169 4170 4171 4172
		options->prefix = NULL;
	if (options->prefix)
		options->prefix_length = strlen(options->prefix);
	else
		options->prefix_length = 0;

4173 4174 4175 4176 4177
	if (options->output_format & (DIFF_FORMAT_NAME |
				      DIFF_FORMAT_NAME_STATUS |
				      DIFF_FORMAT_CHECKDIFF |
				      DIFF_FORMAT_NO_OUTPUT))
		options->output_format &= ~(DIFF_FORMAT_RAW |
J
Junio C Hamano 已提交
4178
					    DIFF_FORMAT_NUMSTAT |
4179
					    DIFF_FORMAT_DIFFSTAT |
4180
					    DIFF_FORMAT_SHORTSTAT |
4181
					    DIFF_FORMAT_DIRSTAT |
4182 4183 4184
					    DIFF_FORMAT_SUMMARY |
					    DIFF_FORMAT_PATCH);

J
Junio C Hamano 已提交
4185 4186 4187 4188
	/*
	 * These cases always need recursive; we do not drop caller-supplied
	 * recursive bits for other formats here.
	 */
4189
	if (options->output_format & (DIFF_FORMAT_PATCH |
J
Junio C Hamano 已提交
4190
				      DIFF_FORMAT_NUMSTAT |
4191
				      DIFF_FORMAT_DIFFSTAT |
4192
				      DIFF_FORMAT_SHORTSTAT |
4193
				      DIFF_FORMAT_DIRSTAT |
4194
				      DIFF_FORMAT_SUMMARY |
4195
				      DIFF_FORMAT_CHECKDIFF))
4196
		options->flags.recursive = 1;
4197
	/*
4198
	 * Also pickaxe would not work very well if you do not say recursive
4199
	 */
4200
	if (options->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK)
4201
		options->flags.recursive = 1;
4202 4203 4204 4205 4206
	/*
	 * When patches are generated, submodules diffed against the work tree
	 * must be checked for dirtiness too so it can be shown in the output
	 */
	if (options->output_format & DIFF_FORMAT_PATCH)
4207
		options->flags.dirty_submodules = 1;
4208

J
Junio C Hamano 已提交
4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220
	if (options->detect_rename && options->rename_limit < 0)
		options->rename_limit = diff_rename_limit_default;
	if (options->setup & DIFF_SETUP_USE_CACHE) {
		if (!active_cache)
			/* read-cache does not die even when it fails
			 * so it is safe for us to do this here.  Also
			 * it does not smudge active_cache or active_nr
			 * when it fails, so we do not have to worry about
			 * cleaning it up ourselves either.
			 */
			read_cache();
	}
4221
	if (40 < options->abbrev)
J
Junio C Hamano 已提交
4222 4223
		options->abbrev = 40; /* full */

J
Junio C Hamano 已提交
4224 4225 4226 4227 4228
	/*
	 * It does not make sense to show the first hit we happened
	 * to have found.  It does not make sense not to return with
	 * exit code in such a case either.
	 */
4229
	if (options->flags.quick) {
J
Junio C Hamano 已提交
4230
		options->output_format = DIFF_FORMAT_NO_OUTPUT;
4231
		options->flags.exit_with_status = 1;
J
Junio C Hamano 已提交
4232
	}
4233

4234
	options->diff_path_counter = 0;
4235

4236
	if (options->flags.follow_renames && options->pathspec.nr != 1)
4237
		die(_("--follow requires exactly one pathspec"));
4238 4239 4240

	if (!options->use_color || external_diff())
		options->color_moved = 0;
J
Junio C Hamano 已提交
4241 4242
}

T
Timo Hirvonen 已提交
4243
static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)
4244 4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269
{
	char c, *eq;
	int len;

	if (*arg != '-')
		return 0;
	c = *++arg;
	if (!c)
		return 0;
	if (c == arg_short) {
		c = *++arg;
		if (!c)
			return 1;
		if (val && isdigit(c)) {
			char *end;
			int n = strtoul(arg, &end, 10);
			if (*end)
				return 0;
			*val = n;
			return 1;
		}
		return 0;
	}
	if (c != '-')
		return 0;
	arg++;
4270 4271
	eq = strchrnul(arg, '=');
	len = eq - arg;
4272 4273
	if (!len || strncmp(arg, arg_long, len))
		return 0;
4274
	if (*eq) {
4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286
		int n;
		char *end;
		if (!isdigit(*++eq))
			return 0;
		n = strtoul(eq, &end, 10);
		if (*end)
			return 0;
		*val = n;
	}
	return 1;
}

J
Junio C Hamano 已提交
4287 4288
static int diff_scoreopt_parse(const char *opt);

4289 4290 4291 4292 4293 4294 4295 4296 4297 4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308
static inline int short_opt(char opt, const char **argv,
			    const char **optarg)
{
	const char *arg = argv[0];
	if (arg[0] != '-' || arg[1] != opt)
		return 0;
	if (arg[2] != '\0') {
		*optarg = arg + 2;
		return 1;
	}
	if (!argv[1])
		die("Option '%c' requires a value", opt);
	*optarg = argv[1];
	return 2;
}

int parse_long_opt(const char *opt, const char **argv,
		   const char **optarg)
{
	const char *arg = argv[0];
4309
	if (!skip_prefix(arg, "--", &arg))
4310
		return 0;
4311
	if (!skip_prefix(arg, opt, &arg))
4312
		return 0;
4313
	if (*arg == '=') { /* stuck form: --option=value */
4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325
		*optarg = arg + 1;
		return 1;
	}
	if (*arg != '\0')
		return 0;
	/* separate form: --option value */
	if (!argv[1])
		die("Option '--%s' requires a value", opt);
	*optarg = argv[1];
	return 2;
}

4326 4327 4328 4329 4330 4331
static int stat_opt(struct diff_options *options, const char **av)
{
	const char *arg = av[0];
	char *end;
	int width = options->stat_width;
	int name_width = options->stat_name_width;
4332
	int graph_width = options->stat_graph_width;
4333
	int count = options->stat_count;
4334
	int argcount = 1;
4335

J
Jeff King 已提交
4336 4337
	if (!skip_prefix(arg, "--stat", &arg))
		die("BUG: stat option does not begin with --stat: %s", arg);
4338 4339 4340 4341
	end = (char *)arg;

	switch (*arg) {
	case '-':
4342
		if (skip_prefix(arg, "-width", &arg)) {
4343 4344 4345
			if (*arg == '=')
				width = strtoul(arg + 1, &end, 10);
			else if (!*arg && !av[1])
4346
				die_want_option("--stat-width");
4347 4348 4349 4350
			else if (!*arg) {
				width = strtoul(av[1], &end, 10);
				argcount = 2;
			}
4351
		} else if (skip_prefix(arg, "-name-width", &arg)) {
4352 4353 4354
			if (*arg == '=')
				name_width = strtoul(arg + 1, &end, 10);
			else if (!*arg && !av[1])
4355
				die_want_option("--stat-name-width");
4356 4357 4358 4359
			else if (!*arg) {
				name_width = strtoul(av[1], &end, 10);
				argcount = 2;
			}
4360
		} else if (skip_prefix(arg, "-graph-width", &arg)) {
4361 4362 4363
			if (*arg == '=')
				graph_width = strtoul(arg + 1, &end, 10);
			else if (!*arg && !av[1])
4364
				die_want_option("--stat-graph-width");
4365 4366 4367 4368
			else if (!*arg) {
				graph_width = strtoul(av[1], &end, 10);
				argcount = 2;
			}
4369
		} else if (skip_prefix(arg, "-count", &arg)) {
4370 4371 4372
			if (*arg == '=')
				count = strtoul(arg + 1, &end, 10);
			else if (!*arg && !av[1])
4373
				die_want_option("--stat-count");
4374 4375 4376 4377
			else if (!*arg) {
				count = strtoul(av[1], &end, 10);
				argcount = 2;
			}
4378
		}
4379 4380 4381 4382 4383
		break;
	case '=':
		width = strtoul(arg+1, &end, 10);
		if (*end == ',')
			name_width = strtoul(end+1, &end, 10);
4384 4385
		if (*end == ',')
			count = strtoul(end+1, &end, 10);
4386 4387 4388 4389 4390 4391 4392
	}

	/* Important! This checks all the error cases! */
	if (*end)
		return 0;
	options->output_format |= DIFF_FORMAT_DIFFSTAT;
	options->stat_name_width = name_width;
4393
	options->stat_graph_width = graph_width;
4394
	options->stat_width = width;
4395
	options->stat_count = count;
4396
	return argcount;
4397 4398
}

4399 4400
static int parse_dirstat_opt(struct diff_options *options, const char *params)
{
4401 4402
	struct strbuf errmsg = STRBUF_INIT;
	if (parse_dirstat_params(options, params, &errmsg))
4403
		die(_("Failed to parse --dirstat/-X option parameter:\n%s"),
4404 4405
		    errmsg.buf);
	strbuf_release(&errmsg);
4406 4407 4408 4409 4410 4411 4412 4413
	/*
	 * The caller knows a dirstat-related option is given from the command
	 * line; allow it to say "return this_function();"
	 */
	options->output_format |= DIFF_FORMAT_DIRSTAT;
	return 1;
}

4414 4415 4416 4417 4418 4419 4420 4421
static int parse_submodule_opt(struct diff_options *options, const char *value)
{
	if (parse_submodule_params(options, value))
		die(_("Failed to parse --submodule option parameter: '%s'"),
			value);
	return 1;
}

4422 4423 4424 4425 4426 4427 4428 4429 4430 4431 4432 4433 4434 4435 4436 4437 4438 4439 4440 4441 4442 4443 4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 4457
static const char diff_status_letters[] = {
	DIFF_STATUS_ADDED,
	DIFF_STATUS_COPIED,
	DIFF_STATUS_DELETED,
	DIFF_STATUS_MODIFIED,
	DIFF_STATUS_RENAMED,
	DIFF_STATUS_TYPE_CHANGED,
	DIFF_STATUS_UNKNOWN,
	DIFF_STATUS_UNMERGED,
	DIFF_STATUS_FILTER_AON,
	DIFF_STATUS_FILTER_BROKEN,
	'\0',
};

static unsigned int filter_bit['Z' + 1];

static void prepare_filter_bits(void)
{
	int i;

	if (!filter_bit[DIFF_STATUS_ADDED]) {
		for (i = 0; diff_status_letters[i]; i++)
			filter_bit[(int) diff_status_letters[i]] = (1 << i);
	}
}

static unsigned filter_bit_tst(char status, const struct diff_options *opt)
{
	return opt->filter & filter_bit[(int) status];
}

static int parse_diff_filter_opt(const char *optarg, struct diff_options *opt)
{
	int i, optch;

	prepare_filter_bits();
4458 4459 4460 4461 4462 4463 4464 4465 4466 4467 4468 4469 4470 4471 4472 4473

	/*
	 * If there is a negation e.g. 'd' in the input, and we haven't
	 * initialized the filter field with another --diff-filter, start
	 * from full set of bits, except for AON.
	 */
	if (!opt->filter) {
		for (i = 0; (optch = optarg[i]) != '\0'; i++) {
			if (optch < 'a' || 'z' < optch)
				continue;
			opt->filter = (1 << (ARRAY_SIZE(diff_status_letters) - 1)) - 1;
			opt->filter &= ~filter_bit[DIFF_STATUS_FILTER_AON];
			break;
		}
	}

4474 4475
	for (i = 0; (optch = optarg[i]) != '\0'; i++) {
		unsigned int bit;
4476 4477 4478 4479 4480 4481 4482 4483
		int negate;

		if ('a' <= optch && optch <= 'z') {
			negate = 1;
			optch = toupper(optch);
		} else {
			negate = 0;
		}
4484 4485 4486

		bit = (0 <= optch && optch <= 'Z') ? filter_bit[optch] : 0;
		if (!bit)
4487
			return optarg[i];
4488 4489 4490 4491
		if (negate)
			opt->filter &= ~bit;
		else
			opt->filter |= bit;
4492 4493 4494 4495
	}
	return 0;
}

4496 4497 4498 4499 4500
static void enable_patch_output(int *fmt) {
	*fmt &= ~DIFF_FORMAT_NO_OUTPUT;
	*fmt |= DIFF_FORMAT_PATCH;
}

4501
static int parse_ws_error_highlight_opt(struct diff_options *opt, const char *arg)
4502
{
4503
	int val = parse_ws_error_highlight(arg);
4504

4505 4506 4507 4508
	if (val < 0) {
		error("unknown value after ws-error-highlight=%.*s",
		      -1 - val, arg);
		return 0;
4509 4510 4511 4512 4513
	}
	opt->ws_error_highlight = val;
	return 1;
}

4514 4515 4516 4517 4518 4519 4520 4521 4522 4523 4524 4525 4526 4527 4528 4529 4530
static int parse_objfind_opt(struct diff_options *opt, const char *arg)
{
	struct object_id oid;

	if (get_oid(arg, &oid))
		return error("unable to resolve '%s'", arg);

	if (!opt->objfind)
		opt->objfind = xcalloc(1, sizeof(*opt->objfind));

	opt->pickaxe_opts |= DIFF_PICKAXE_KIND_OBJFIND;
	opt->flags.recursive = 1;
	opt->flags.tree_in_recursive = 1;
	oidset_insert(opt->objfind, &oid);
	return 1;
}

4531 4532
int diff_opt_parse(struct diff_options *options,
		   const char **av, int ac, const char *prefix)
J
Junio C Hamano 已提交
4533 4534
{
	const char *arg = av[0];
4535 4536
	const char *optarg;
	int argcount;
4537

4538 4539 4540
	if (!prefix)
		prefix = "";

4541
	/* Output format options */
4542 4543 4544
	if (!strcmp(arg, "-p") || !strcmp(arg, "-u") || !strcmp(arg, "--patch")
	    || opt_arg(arg, 'U', "unified", &options->context))
		enable_patch_output(&options->output_format);
4545 4546
	else if (!strcmp(arg, "--raw"))
		options->output_format |= DIFF_FORMAT_RAW;
4547 4548 4549 4550
	else if (!strcmp(arg, "--patch-with-raw")) {
		enable_patch_output(&options->output_format);
		options->output_format |= DIFF_FORMAT_RAW;
	} else if (!strcmp(arg, "--numstat"))
J
Junio C Hamano 已提交
4551
		options->output_format |= DIFF_FORMAT_NUMSTAT;
4552
	else if (!strcmp(arg, "--shortstat"))
4553
		options->output_format |= DIFF_FORMAT_SHORTSTAT;
4554 4555
	else if (skip_prefix(arg, "-X", &arg) ||
		 skip_to_optional_arg(arg, "--dirstat", &arg))
4556
		return parse_dirstat_opt(options, arg);
4557 4558
	else if (!strcmp(arg, "--cumulative"))
		return parse_dirstat_opt(options, "cumulative");
4559
	else if (skip_to_optional_arg(arg, "--dirstat-by-file", &arg)) {
4560
		parse_dirstat_opt(options, "files");
4561
		return parse_dirstat_opt(options, arg);
4562
	}
4563 4564 4565 4566
	else if (!strcmp(arg, "--check"))
		options->output_format |= DIFF_FORMAT_CHECKDIFF;
	else if (!strcmp(arg, "--summary"))
		options->output_format |= DIFF_FORMAT_SUMMARY;
4567 4568 4569 4570
	else if (!strcmp(arg, "--patch-with-stat")) {
		enable_patch_output(&options->output_format);
		options->output_format |= DIFF_FORMAT_DIFFSTAT;
	} else if (!strcmp(arg, "--name-only"))
4571 4572 4573
		options->output_format |= DIFF_FORMAT_NAME;
	else if (!strcmp(arg, "--name-status"))
		options->output_format |= DIFF_FORMAT_NAME_STATUS;
4574
	else if (!strcmp(arg, "-s") || !strcmp(arg, "--no-patch"))
4575
		options->output_format |= DIFF_FORMAT_NO_OUTPUT;
4576
	else if (starts_with(arg, "--stat"))
4577
		/* --stat, --stat-width, --stat-name-width, or --stat-count */
4578
		return stat_opt(options, av);
4579 4580 4581 4582 4583
	else if (!strcmp(arg, "--compact-summary")) {
		 options->flags.stat_with_summary = 1;
		 options->output_format |= DIFF_FORMAT_DIFFSTAT;
	} else if (!strcmp(arg, "--no-compact-summary"))
		 options->flags.stat_with_summary = 0;
4584 4585

	/* renames options */
4586 4587
	else if (starts_with(arg, "-B") ||
		 skip_to_optional_arg(arg, "--break-rewrites", NULL)) {
4588
		if ((options->break_opt = diff_scoreopt_parse(arg)) == -1)
J
Jeff King 已提交
4589
			return error("invalid argument to -B: %s", arg+2);
J
Junio C Hamano 已提交
4590
	}
4591 4592
	else if (starts_with(arg, "-M") ||
		 skip_to_optional_arg(arg, "--find-renames", NULL)) {
4593
		if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
J
Jeff King 已提交
4594
			return error("invalid argument to -M: %s", arg+2);
J
Junio C Hamano 已提交
4595 4596
		options->detect_rename = DIFF_DETECT_RENAME;
	}
4597 4598 4599
	else if (!strcmp(arg, "-D") || !strcmp(arg, "--irreversible-delete")) {
		options->irreversible_delete = 1;
	}
4600 4601
	else if (starts_with(arg, "-C") ||
		 skip_to_optional_arg(arg, "--find-copies", NULL)) {
4602
		if (options->detect_rename == DIFF_DETECT_COPY)
4603
			options->flags.find_copies_harder = 1;
4604
		if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
J
Jeff King 已提交
4605
			return error("invalid argument to -C: %s", arg+2);
J
Junio C Hamano 已提交
4606 4607
		options->detect_rename = DIFF_DETECT_COPY;
	}
4608 4609
	else if (!strcmp(arg, "--no-renames"))
		options->detect_rename = 0;
4610
	else if (!strcmp(arg, "--rename-empty"))
4611
		options->flags.rename_empty = 1;
4612
	else if (!strcmp(arg, "--no-rename-empty"))
4613
		options->flags.rename_empty = 0;
4614
	else if (skip_to_optional_arg_default(arg, "--relative", &arg, NULL)) {
4615
		options->flags.relative_name = 1;
4616 4617
		if (arg)
			options->prefix = arg;
4618
	}
4619 4620

	/* xdiff options */
4621 4622 4623 4624
	else if (!strcmp(arg, "--minimal"))
		DIFF_XDL_SET(options, NEED_MINIMAL);
	else if (!strcmp(arg, "--no-minimal"))
		DIFF_XDL_CLR(options, NEED_MINIMAL);
4625
	else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space"))
4626
		DIFF_XDL_SET(options, IGNORE_WHITESPACE);
4627
	else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change"))
4628
		DIFF_XDL_SET(options, IGNORE_WHITESPACE_CHANGE);
4629
	else if (!strcmp(arg, "--ignore-space-at-eol"))
4630
		DIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL);
J
Junio C Hamano 已提交
4631 4632
	else if (!strcmp(arg, "--ignore-cr-at-eol"))
		DIFF_XDL_SET(options, IGNORE_CR_AT_EOL);
4633 4634
	else if (!strcmp(arg, "--ignore-blank-lines"))
		DIFF_XDL_SET(options, IGNORE_BLANK_LINES);
4635
	else if (!strcmp(arg, "--indent-heuristic"))
4636
		DIFF_XDL_SET(options, INDENT_HEURISTIC);
4637
	else if (!strcmp(arg, "--no-indent-heuristic"))
4638
		DIFF_XDL_CLR(options, INDENT_HEURISTIC);
J
Jonathan Tan 已提交
4639 4640
	else if (!strcmp(arg, "--patience")) {
		int i;
4641
		options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
J
Jonathan Tan 已提交
4642 4643 4644 4645 4646 4647 4648 4649 4650
		/*
		 * Both --patience and --anchored use PATIENCE_DIFF
		 * internally, so remove any anchors previously
		 * specified.
		 */
		for (i = 0; i < options->anchors_nr; i++)
			free(options->anchors[i]);
		options->anchors_nr = 0;
	} else if (!strcmp(arg, "--histogram"))
4651
		options->xdl_opts = DIFF_WITH_ALG(options, HISTOGRAM_DIFF);
4652 4653
	else if ((argcount = parse_long_opt("diff-algorithm", av, &optarg))) {
		long value = parse_algorithm_value(optarg);
4654 4655 4656 4657 4658 4659 4660
		if (value < 0)
			return error("option diff-algorithm accepts \"myers\", "
				     "\"minimal\", \"patience\" and \"histogram\"");
		/* clear out previous settings */
		DIFF_XDL_CLR(options, NEED_MINIMAL);
		options->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
		options->xdl_opts |= value;
4661
		return argcount;
J
Jonathan Tan 已提交
4662 4663 4664 4665 4666
	} else if (skip_prefix(arg, "--anchored=", &arg)) {
		options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
		ALLOC_GROW(options->anchors, options->anchors_nr + 1,
			   options->anchors_alloc);
		options->anchors[options->anchors_nr++] = xstrdup(arg);
4667
	}
4668 4669 4670

	/* flags options */
	else if (!strcmp(arg, "--binary")) {
4671
		enable_patch_output(&options->output_format);
4672
		options->flags.binary = 1;
4673 4674
	}
	else if (!strcmp(arg, "--full-index"))
4675
		options->flags.full_index = 1;
4676
	else if (!strcmp(arg, "-a") || !strcmp(arg, "--text"))
4677
		options->flags.text = 1;
4678
	else if (!strcmp(arg, "-R"))
4679
		options->flags.reverse_diff = 1;
J
Junio C Hamano 已提交
4680
	else if (!strcmp(arg, "--find-copies-harder"))
4681
		options->flags.find_copies_harder = 1;
4682
	else if (!strcmp(arg, "--follow"))
4683
		options->flags.follow_renames = 1;
4684
	else if (!strcmp(arg, "--no-follow")) {
4685 4686
		options->flags.follow_renames = 0;
		options->flags.default_follow_renames = 0;
4687
	} else if (skip_to_optional_arg_default(arg, "--color", &arg, "always")) {
4688
		int value = git_config_colorbool(NULL, arg);
4689
		if (value < 0)
4690
			return error("option `color' expects \"always\", \"auto\", or \"never\"");
4691
		options->use_color = value;
4692
	}
4693
	else if (!strcmp(arg, "--no-color"))
4694
		options->use_color = 0;
4695 4696 4697 4698 4699 4700 4701 4702 4703 4704 4705 4706
	else if (!strcmp(arg, "--color-moved")) {
		if (diff_color_moved_default)
			options->color_moved = diff_color_moved_default;
		if (options->color_moved == COLOR_MOVED_NO)
			options->color_moved = COLOR_MOVED_DEFAULT;
	} else if (!strcmp(arg, "--no-color-moved"))
		options->color_moved = COLOR_MOVED_NO;
	else if (skip_prefix(arg, "--color-moved=", &arg)) {
		int cm = parse_color_moved(arg);
		if (cm < 0)
			die("bad --color-moved argument: %s", arg);
		options->color_moved = cm;
4707
	} else if (skip_to_optional_arg_default(arg, "--color-words", &options->word_regex, NULL)) {
4708
		options->use_color = 1;
4709
		options->word_diff = DIFF_WORDS_COLOR;
4710
	}
4711 4712 4713 4714
	else if (!strcmp(arg, "--word-diff")) {
		if (options->word_diff == DIFF_WORDS_NONE)
			options->word_diff = DIFF_WORDS_PLAIN;
	}
4715 4716
	else if (skip_prefix(arg, "--word-diff=", &arg)) {
		if (!strcmp(arg, "plain"))
4717
			options->word_diff = DIFF_WORDS_PLAIN;
4718
		else if (!strcmp(arg, "color")) {
4719
			options->use_color = 1;
4720 4721
			options->word_diff = DIFF_WORDS_COLOR;
		}
4722
		else if (!strcmp(arg, "porcelain"))
4723
			options->word_diff = DIFF_WORDS_PORCELAIN;
4724
		else if (!strcmp(arg, "none"))
4725 4726
			options->word_diff = DIFF_WORDS_NONE;
		else
4727
			die("bad --word-diff argument: %s", arg);
4728
	}
4729
	else if ((argcount = parse_long_opt("word-diff-regex", av, &optarg))) {
4730 4731
		if (options->word_diff == DIFF_WORDS_NONE)
			options->word_diff = DIFF_WORDS_PLAIN;
4732 4733
		options->word_regex = optarg;
		return argcount;
4734
	}
4735
	else if (!strcmp(arg, "--exit-code"))
4736
		options->flags.exit_with_status = 1;
J
Junio C Hamano 已提交
4737
	else if (!strcmp(arg, "--quiet"))
4738
		options->flags.quick = 1;
J
Johannes Schindelin 已提交
4739
	else if (!strcmp(arg, "--ext-diff"))
4740
		options->flags.allow_external = 1;
J
Johannes Schindelin 已提交
4741
	else if (!strcmp(arg, "--no-ext-diff"))
4742
		options->flags.allow_external = 0;
4743
	else if (!strcmp(arg, "--textconv")) {
4744 4745
		options->flags.allow_textconv = 1;
		options->flags.textconv_set_via_cmdline = 1;
4746
	} else if (!strcmp(arg, "--no-textconv"))
4747
		options->flags.allow_textconv = 0;
4748
	else if (skip_to_optional_arg_default(arg, "--ignore-submodules", &arg, "all")) {
4749
		options->flags.override_submodule_config = 1;
4750
		handle_ignore_submodules_arg(options, arg);
4751
	} else if (skip_to_optional_arg_default(arg, "--submodule", &arg, "log"))
4752
		return parse_submodule_opt(options, arg);
4753
	else if (skip_prefix(arg, "--ws-error-highlight=", &arg))
4754
		return parse_ws_error_highlight_opt(options, arg);
4755 4756 4757 4758
	else if (!strcmp(arg, "--ita-invisible-in-index"))
		options->ita_invisible_in_index = 1;
	else if (!strcmp(arg, "--ita-visible-in-index"))
		options->ita_invisible_in_index = 0;
4759 4760 4761 4762

	/* misc options */
	else if (!strcmp(arg, "-z"))
		options->line_termination = 0;
4763 4764 4765 4766 4767 4768
	else if ((argcount = short_opt('l', av, &optarg))) {
		options->rename_limit = strtoul(optarg, NULL, 10);
		return argcount;
	}
	else if ((argcount = short_opt('S', av, &optarg))) {
		options->pickaxe = optarg;
4769 4770 4771 4772 4773
		options->pickaxe_opts |= DIFF_PICKAXE_KIND_S;
		return argcount;
	} else if ((argcount = short_opt('G', av, &optarg))) {
		options->pickaxe = optarg;
		options->pickaxe_opts |= DIFF_PICKAXE_KIND_G;
4774 4775
		return argcount;
	}
4776
	else if (!strcmp(arg, "--pickaxe-all"))
4777
		options->pickaxe_opts |= DIFF_PICKAXE_ALL;
4778
	else if (!strcmp(arg, "--pickaxe-regex"))
4779
		options->pickaxe_opts |= DIFF_PICKAXE_REGEX;
4780
	else if ((argcount = short_opt('O', av, &optarg))) {
4781
		options->orderfile = prefix_filename(prefix, optarg);
4782
		return argcount;
4783 4784
	} else if (skip_prefix(arg, "--find-object=", &arg))
		return parse_objfind_opt(options, arg);
4785
	else if ((argcount = parse_long_opt("diff-filter", av, &optarg))) {
4786 4787 4788 4789
		int offending = parse_diff_filter_opt(optarg, options);
		if (offending)
			die("unknown change class '%c' in --diff-filter=%s",
			    offending, optarg);
4790 4791
		return argcount;
	}
4792 4793
	else if (!strcmp(arg, "--no-abbrev"))
		options->abbrev = 0;
4794 4795
	else if (!strcmp(arg, "--abbrev"))
		options->abbrev = DEFAULT_ABBREV;
4796 4797
	else if (skip_prefix(arg, "--abbrev=", &arg)) {
		options->abbrev = strtoul(arg, NULL, 10);
4798 4799 4800 4801 4802
		if (options->abbrev < MINIMUM_ABBREV)
			options->abbrev = MINIMUM_ABBREV;
		else if (40 < options->abbrev)
			options->abbrev = 40;
	}
4803 4804 4805 4806
	else if ((argcount = parse_long_opt("src-prefix", av, &optarg))) {
		options->a_prefix = optarg;
		return argcount;
	}
4807 4808 4809 4810 4811 4812
	else if ((argcount = parse_long_opt("line-prefix", av, &optarg))) {
		options->line_prefix = optarg;
		options->line_prefix_length = strlen(options->line_prefix);
		graph_setup_line_prefix(options);
		return argcount;
	}
4813 4814 4815 4816
	else if ((argcount = parse_long_opt("dst-prefix", av, &optarg))) {
		options->b_prefix = optarg;
		return argcount;
	}
4817 4818
	else if (!strcmp(arg, "--no-prefix"))
		options->a_prefix = options->b_prefix = "";
4819 4820 4821
	else if (opt_arg(arg, '\0', "inter-hunk-context",
			 &options->interhunkcontext))
		;
4822
	else if (!strcmp(arg, "-W"))
4823
		options->flags.funccontext = 1;
4824
	else if (!strcmp(arg, "--function-context"))
4825
		options->flags.funccontext = 1;
4826
	else if (!strcmp(arg, "--no-function-context"))
4827
		options->flags.funccontext = 0;
4828
	else if ((argcount = parse_long_opt("output", av, &optarg))) {
4829
		char *path = prefix_filename(prefix, optarg);
4830
		options->file = xfopen(path, "w");
4831
		options->close_file = 1;
4832 4833
		if (options->use_color != GIT_COLOR_ALWAYS)
			options->use_color = GIT_COLOR_NEVER;
4834
		free(path);
4835
		return argcount;
4836
	} else
J
Junio C Hamano 已提交
4837 4838 4839 4840
		return 0;
	return 1;
}

4841
int parse_rename_score(const char **cp_p)
J
Junio C Hamano 已提交
4842 4843 4844 4845 4846 4847 4848 4849
{
	unsigned long num, scale;
	int ch, dot;
	const char *cp = *cp_p;

	num = 0;
	scale = 1;
	dot = 0;
4850
	for (;;) {
J
Junio C Hamano 已提交
4851 4852 4853 4854 4855 4856 4857 4858 4859 4860 4861 4862 4863 4864 4865 4866 4867 4868 4869 4870 4871 4872 4873
		ch = *cp;
		if ( !dot && ch == '.' ) {
			scale = 1;
			dot = 1;
		} else if ( ch == '%' ) {
			scale = dot ? scale*100 : 100;
			cp++;	/* % is always at the end */
			break;
		} else if ( ch >= '0' && ch <= '9' ) {
			if ( scale < 100000 ) {
				scale *= 10;
				num = (num*10) + (ch-'0');
			}
		} else {
			break;
		}
		cp++;
	}
	*cp_p = cp;

	/* user says num divided by scale and we say internally that
	 * is MAX_SCORE * num / scale.
	 */
4874
	return (int)((num >= scale) ? MAX_SCORE : (MAX_SCORE * num / scale));
J
Junio C Hamano 已提交
4875 4876
}

J
Junio C Hamano 已提交
4877
static int diff_scoreopt_parse(const char *opt)
J
Junio C Hamano 已提交
4878 4879 4880 4881 4882 4883
{
	int opt1, opt2, cmd;

	if (*opt++ != '-')
		return -1;
	cmd = *opt++;
4884 4885
	if (cmd == '-') {
		/* convert the long-form arguments into short-form versions */
4886
		if (skip_prefix(opt, "break-rewrites", &opt)) {
4887 4888
			if (*opt == 0 || *opt++ == '=')
				cmd = 'B';
4889
		} else if (skip_prefix(opt, "find-copies", &opt)) {
4890 4891
			if (*opt == 0 || *opt++ == '=')
				cmd = 'C';
4892
		} else if (skip_prefix(opt, "find-renames", &opt)) {
4893 4894 4895 4896
			if (*opt == 0 || *opt++ == '=')
				cmd = 'M';
		}
	}
J
Junio C Hamano 已提交
4897
	if (cmd != 'M' && cmd != 'C' && cmd != 'B')
J
Justin Lebar 已提交
4898
		return -1; /* that is not a -M, -C, or -B option */
J
Junio C Hamano 已提交
4899

4900
	opt1 = parse_rename_score(&opt);
J
Junio C Hamano 已提交
4901 4902 4903 4904 4905 4906 4907 4908 4909
	if (cmd != 'B')
		opt2 = 0;
	else {
		if (*opt == 0)
			opt2 = 0;
		else if (*opt != '/')
			return -1; /* we expect -B80/99 or -B80 */
		else {
			opt++;
4910
			opt2 = parse_rename_score(&opt);
J
Junio C Hamano 已提交
4911 4912 4913 4914 4915 4916 4917 4918 4919 4920 4921
		}
	}
	if (*opt != 0)
		return -1;
	return opt1 | (opt2 << 16);
}

struct diff_queue_struct diff_queued_diff;

void diff_q(struct diff_queue_struct *queue, struct diff_filepair *dp)
{
D
Dmitry S. Dolzhenko 已提交
4922
	ALLOC_GROW(queue->queue, queue->nr + 1, queue->alloc);
J
Junio C Hamano 已提交
4923 4924 4925 4926 4927 4928 4929
	queue->queue[queue->nr++] = dp;
}

struct diff_filepair *diff_queue(struct diff_queue_struct *queue,
				 struct diff_filespec *one,
				 struct diff_filespec *two)
{
4930
	struct diff_filepair *dp = xcalloc(1, sizeof(*dp));
J
Junio C Hamano 已提交
4931 4932 4933 4934 4935 4936 4937 4938 4939
	dp->one = one;
	dp->two = two;
	if (queue)
		diff_q(queue, dp);
	return dp;
}

void diff_free_filepair(struct diff_filepair *p)
{
4940 4941
	free_filespec(p->one);
	free_filespec(p->two);
J
Junio C Hamano 已提交
4942 4943 4944
	free(p);
}

J
Jeff King 已提交
4945
const char *diff_aligned_abbrev(const struct object_id *oid, int len)
J
Junio C Hamano 已提交
4946 4947 4948 4949
{
	int abblen;
	const char *abbrev;

4950
	/* Do we want all 40 hex characters? */
J
Jeff King 已提交
4951 4952 4953
	if (len == GIT_SHA1_HEXSZ)
		return oid_to_hex(oid);

4954
	/* An abbreviated value is fine, possibly followed by an ellipsis. */
4955
	abbrev = diff_abbrev_oid(oid, len);
4956 4957 4958 4959

	if (!print_sha1_ellipsis())
		return abbrev;

J
Junio C Hamano 已提交
4960
	abblen = strlen(abbrev);
4961 4962

	/*
4963
	 * In well-behaved cases, where the abbreviated result is the
4964 4965 4966 4967 4968 4969 4970 4971 4972 4973 4974 4975 4976 4977 4978 4979 4980
	 * same as the requested length, append three dots after the
	 * abbreviation (hence the whole logic is limited to the case
	 * where abblen < 37); when the actual abbreviated result is a
	 * bit longer than the requested length, we reduce the number
	 * of dots so that they match the well-behaved ones.  However,
	 * if the actual abbreviation is longer than the requested
	 * length by more than three, we give up on aligning, and add
	 * three dots anyway, to indicate that the output is not the
	 * full object name.  Yes, this may be suboptimal, but this
	 * appears only in "diff --raw --abbrev" output and it is not
	 * worth the effort to change it now.  Note that this would
	 * likely to work fine when the automatic sizing of default
	 * abbreviation length is used--we would be fed -1 in "len" in
	 * that case, and will end up always appending three-dots, but
	 * the automatic sizing is supposed to give abblen that ensures
	 * uniqueness across all objects (statistically speaking).
	 */
J
Jeff King 已提交
4981
	if (abblen < GIT_SHA1_HEXSZ - 3) {
4982
		static char hex[GIT_MAX_HEXSZ + 1];
J
Junio C Hamano 已提交
4983
		if (len < abblen && abblen <= len + 2)
4984
			xsnprintf(hex, sizeof(hex), "%s%.*s", abbrev, len+3-abblen, "..");
J
Junio C Hamano 已提交
4985
		else
4986
			xsnprintf(hex, sizeof(hex), "%s...", abbrev);
J
Junio C Hamano 已提交
4987 4988
		return hex;
	}
J
Jeff King 已提交
4989 4990

	return oid_to_hex(oid);
J
Junio C Hamano 已提交
4991 4992
}

4993
static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt)
J
Junio C Hamano 已提交
4994
{
4995 4996
	int line_termination = opt->line_termination;
	int inter_name_termination = line_termination ? '\t' : '\0';
J
Junio C Hamano 已提交
4997

4998
	fprintf(opt->file, "%s", diff_line_prefix(opt));
4999
	if (!(opt->output_format & DIFF_FORMAT_NAME_STATUS)) {
5000
		fprintf(opt->file, ":%06o %06o %s ", p->one->mode, p->two->mode,
J
Jeff King 已提交
5001
			diff_aligned_abbrev(&p->one->oid, opt->abbrev));
5002
		fprintf(opt->file, "%s ",
J
Jeff King 已提交
5003
			diff_aligned_abbrev(&p->two->oid, opt->abbrev));
J
Junio C Hamano 已提交
5004
	}
5005
	if (p->score) {
5006 5007
		fprintf(opt->file, "%c%03d%c", p->status, similarity_index(p),
			inter_name_termination);
5008
	} else {
5009
		fprintf(opt->file, "%c%c", p->status, inter_name_termination);
J
Junio C Hamano 已提交
5010 5011
	}

5012 5013 5014 5015 5016 5017
	if (p->status == DIFF_STATUS_COPIED ||
	    p->status == DIFF_STATUS_RENAMED) {
		const char *name_a, *name_b;
		name_a = p->one->path;
		name_b = p->two->path;
		strip_prefix(opt->prefix_length, &name_a, &name_b);
5018 5019
		write_name_quoted(name_a, opt->file, inter_name_termination);
		write_name_quoted(name_b, opt->file, line_termination);
5020
	} else {
5021 5022 5023 5024
		const char *name_a, *name_b;
		name_a = p->one->mode ? p->one->path : p->two->path;
		name_b = NULL;
		strip_prefix(opt->prefix_length, &name_a, &name_b);
5025
		write_name_quoted(name_a, opt->file, line_termination);
5026
	}
J
Junio C Hamano 已提交
5027 5028 5029 5030 5031 5032 5033 5034 5035
}

int diff_unmodified_pair(struct diff_filepair *p)
{
	/* This function is written stricter than necessary to support
	 * the currently implemented transformers, but the idea is to
	 * let transformers to produce diff_filepairs any way they want,
	 * and filter and clean them up here before producing the output.
	 */
5036
	struct diff_filespec *one = p->one, *two = p->two;
J
Junio C Hamano 已提交
5037 5038 5039 5040 5041 5042 5043 5044 5045 5046 5047 5048 5049 5050 5051

	if (DIFF_PAIR_UNMERGED(p))
		return 0; /* unmerged is interesting */

	/* deletion, addition, mode or type change
	 * and rename are all interesting.
	 */
	if (DIFF_FILE_VALID(one) != DIFF_FILE_VALID(two) ||
	    DIFF_PAIR_MODE_CHANGED(p) ||
	    strcmp(one->path, two->path))
		return 0;

	/* both are valid and point at the same path.  that is, we are
	 * dealing with a change.
	 */
5052
	if (one->oid_valid && two->oid_valid &&
5053
	    !oidcmp(&one->oid, &two->oid) &&
5054
	    !one->dirty_submodule && !two->dirty_submodule)
J
Junio C Hamano 已提交
5055
		return 1; /* no change */
5056
	if (!one->oid_valid && !two->oid_valid)
J
Junio C Hamano 已提交
5057 5058 5059 5060 5061 5062 5063 5064 5065 5066 5067 5068 5069 5070 5071 5072 5073 5074 5075 5076 5077 5078 5079 5080
		return 1; /* both look at the same file on the filesystem. */
	return 0;
}

static void diff_flush_patch(struct diff_filepair *p, struct diff_options *o)
{
	if (diff_unmodified_pair(p))
		return;

	if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
	    (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
		return; /* no tree diffs in patch format */

	run_diff(p, o);
}

static void diff_flush_stat(struct diff_filepair *p, struct diff_options *o,
			    struct diffstat_t *diffstat)
{
	if (diff_unmodified_pair(p))
		return;

	if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
	    (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
5081
		return; /* no useful stat for tree diffs */
J
Junio C Hamano 已提交
5082 5083 5084 5085

	run_diffstat(p, o, diffstat);
}

5086 5087 5088 5089 5090 5091 5092 5093
static void diff_flush_checkdiff(struct diff_filepair *p,
		struct diff_options *o)
{
	if (diff_unmodified_pair(p))
		return;

	if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
	    (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
5094
		return; /* nothing to check in tree diffs */
5095 5096 5097 5098

	run_checkdiff(p, o);
}

J
Junio C Hamano 已提交
5099 5100 5101 5102 5103 5104 5105 5106 5107 5108 5109 5110 5111 5112 5113 5114 5115 5116
int diff_queue_is_empty(void)
{
	struct diff_queue_struct *q = &diff_queued_diff;
	int i;
	for (i = 0; i < q->nr; i++)
		if (!diff_unmodified_pair(q->queue[i]))
			return 0;
	return 1;
}

#if DIFF_DEBUG
void diff_debug_filespec(struct diff_filespec *s, int x, const char *one)
{
	fprintf(stderr, "queue[%d] %s (%s) %s %06o %s\n",
		x, one ? one : "",
		s->path,
		DIFF_FILE_VALID(s) ? "valid" : "invalid",
		s->mode,
5117
		s->oid_valid ? oid_to_hex(&s->oid) : "");
J
Jeff King 已提交
5118
	fprintf(stderr, "queue[%d] %s size %lu\n",
J
Junio C Hamano 已提交
5119
		x, one ? one : "",
J
Jeff King 已提交
5120
		s->size);
J
Junio C Hamano 已提交
5121 5122 5123 5124 5125 5126
}

void diff_debug_filepair(const struct diff_filepair *p, int i)
{
	diff_debug_filespec(p->one, i, "one");
	diff_debug_filespec(p->two, i, "two");
5127
	fprintf(stderr, "score %d, status %c rename_used %d broken %d\n",
J
Junio C Hamano 已提交
5128
		p->score, p->status ? p->status : '?',
5129
		p->one->rename_used, p->broken_pair);
J
Junio C Hamano 已提交
5130 5131 5132 5133 5134 5135 5136 5137 5138 5139 5140 5141 5142 5143 5144 5145 5146
}

void diff_debug_queue(const char *msg, struct diff_queue_struct *q)
{
	int i;
	if (msg)
		fprintf(stderr, "%s\n", msg);
	fprintf(stderr, "q->nr = %d\n", q->nr);
	for (i = 0; i < q->nr; i++) {
		struct diff_filepair *p = q->queue[i];
		diff_debug_filepair(p, i);
	}
}
#endif

static void diff_resolve_rename_copy(void)
{
5147 5148
	int i;
	struct diff_filepair *p;
J
Junio C Hamano 已提交
5149 5150 5151 5152 5153 5154 5155 5156 5157 5158 5159 5160 5161 5162 5163 5164 5165 5166 5167 5168 5169
	struct diff_queue_struct *q = &diff_queued_diff;

	diff_debug_queue("resolve-rename-copy", q);

	for (i = 0; i < q->nr; i++) {
		p = q->queue[i];
		p->status = 0; /* undecided */
		if (DIFF_PAIR_UNMERGED(p))
			p->status = DIFF_STATUS_UNMERGED;
		else if (!DIFF_FILE_VALID(p->one))
			p->status = DIFF_STATUS_ADDED;
		else if (!DIFF_FILE_VALID(p->two))
			p->status = DIFF_STATUS_DELETED;
		else if (DIFF_PAIR_TYPE_CHANGED(p))
			p->status = DIFF_STATUS_TYPE_CHANGED;

		/* from this point on, we are dealing with a pair
		 * whose both sides are valid and of the same type, i.e.
		 * either in-place edit or rename/copy edit.
		 */
		else if (DIFF_PAIR_RENAME(p)) {
5170 5171 5172 5173 5174 5175 5176 5177 5178
			/*
			 * A rename might have re-connected a broken
			 * pair up, causing the pathnames to be the
			 * same again. If so, that's not a rename at
			 * all, just a modification..
			 *
			 * Otherwise, see if this source was used for
			 * multiple renames, in which case we decrement
			 * the count, and call it a copy.
J
Junio C Hamano 已提交
5179
			 */
5180 5181 5182
			if (!strcmp(p->one->path, p->two->path))
				p->status = DIFF_STATUS_MODIFIED;
			else if (--p->one->rename_used > 0)
J
Junio C Hamano 已提交
5183
				p->status = DIFF_STATUS_COPIED;
5184
			else
J
Junio C Hamano 已提交
5185 5186
				p->status = DIFF_STATUS_RENAMED;
		}
5187
		else if (oidcmp(&p->one->oid, &p->two->oid) ||
5188
			 p->one->mode != p->two->mode ||
5189 5190
			 p->one->dirty_submodule ||
			 p->two->dirty_submodule ||
5191
			 is_null_oid(&p->one->oid))
J
Junio C Hamano 已提交
5192 5193 5194 5195 5196 5197 5198 5199 5200 5201 5202 5203 5204
			p->status = DIFF_STATUS_MODIFIED;
		else {
			/* This is a "no-change" entry and should not
			 * happen anymore, but prepare for broken callers.
			 */
			error("feeding unmodified %s to diffcore",
			      p->one->path);
			p->status = DIFF_STATUS_UNKNOWN;
		}
	}
	diff_debug_queue("resolve-rename-copy done", q);
}

5205
static int check_pair_status(struct diff_filepair *p)
J
Junio C Hamano 已提交
5206 5207 5208
{
	switch (p->status) {
	case DIFF_STATUS_UNKNOWN:
5209
		return 0;
J
Junio C Hamano 已提交
5210 5211 5212
	case 0:
		die("internal error in diff-resolve-rename-copy");
	default:
5213
		return 1;
J
Junio C Hamano 已提交
5214 5215 5216
	}
}

5217 5218 5219 5220 5221 5222 5223 5224
static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt)
{
	int fmt = opt->output_format;

	if (fmt & DIFF_FORMAT_CHECKDIFF)
		diff_flush_checkdiff(p, opt);
	else if (fmt & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS))
		diff_flush_raw(p, opt);
5225 5226 5227 5228 5229
	else if (fmt & DIFF_FORMAT_NAME) {
		const char *name_a, *name_b;
		name_a = p->two->path;
		name_b = NULL;
		strip_prefix(opt->prefix_length, &name_a, &name_b);
5230
		fprintf(opt->file, "%s", diff_line_prefix(opt));
5231
		write_name_quoted(name_a, opt->file, opt->line_termination);
5232
	}
5233 5234
}

5235
static void show_file_mode_name(struct diff_options *opt, const char *newdelete, struct diff_filespec *fs)
S
Sean 已提交
5236
{
5237
	struct strbuf sb = STRBUF_INIT;
S
Sean 已提交
5238
	if (fs->mode)
5239
		strbuf_addf(&sb, " %s mode %06o ", newdelete, fs->mode);
S
Sean 已提交
5240
	else
5241
		strbuf_addf(&sb, " %s ", newdelete);
S
Sean 已提交
5242

5243 5244 5245 5246 5247 5248
	quote_c_style(fs->path, &sb, NULL, 0);
	strbuf_addch(&sb, '\n');
	emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
			 sb.buf, sb.len, 0);
	strbuf_release(&sb);
}
S
Sean 已提交
5249

5250 5251
static void show_mode_change(struct diff_options *opt, struct diff_filepair *p,
		int show_name)
S
Sean 已提交
5252 5253
{
	if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) {
5254 5255 5256
		struct strbuf sb = STRBUF_INIT;
		strbuf_addf(&sb, " mode change %06o => %06o",
			    p->one->mode, p->two->mode);
5257
		if (show_name) {
5258 5259
			strbuf_addch(&sb, ' ');
			quote_c_style(p->two->path, &sb, NULL, 0);
5260
		}
5261
		strbuf_addch(&sb, '\n');
5262 5263 5264
		emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
				 sb.buf, sb.len, 0);
		strbuf_release(&sb);
S
Sean 已提交
5265 5266 5267
	}
}

5268 5269
static void show_rename_copy(struct diff_options *opt, const char *renamecopy,
		struct diff_filepair *p)
S
Sean 已提交
5270
{
5271
	struct strbuf sb = STRBUF_INIT;
5272 5273 5274
	struct strbuf names = STRBUF_INIT;

	pprint_rename(&names, p->one->path, p->two->path);
5275
	strbuf_addf(&sb, " %s %s (%d%%)\n",
5276 5277
		    renamecopy, names.buf, similarity_index(p));
	strbuf_release(&names);
5278 5279 5280
	emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
				 sb.buf, sb.len, 0);
	show_mode_change(opt, p, 0);
5281
	strbuf_release(&sb);
S
Sean 已提交
5282 5283
}

5284
static void diff_summary(struct diff_options *opt, struct diff_filepair *p)
S
Sean 已提交
5285 5286 5287
{
	switch(p->status) {
	case DIFF_STATUS_DELETED:
5288
		show_file_mode_name(opt, "delete", p->one);
S
Sean 已提交
5289 5290
		break;
	case DIFF_STATUS_ADDED:
5291
		show_file_mode_name(opt, "create", p->two);
S
Sean 已提交
5292 5293
		break;
	case DIFF_STATUS_COPIED:
5294
		show_rename_copy(opt, "copy", p);
S
Sean 已提交
5295 5296
		break;
	case DIFF_STATUS_RENAMED:
5297
		show_rename_copy(opt, "rename", p);
S
Sean 已提交
5298 5299 5300
		break;
	default:
		if (p->score) {
5301 5302 5303 5304 5305 5306
			struct strbuf sb = STRBUF_INIT;
			strbuf_addstr(&sb, " rewrite ");
			quote_c_style(p->two->path, &sb, NULL, 0);
			strbuf_addf(&sb, " (%d%%)\n", similarity_index(p));
			emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
					 sb.buf, sb.len, 0);
5307
			strbuf_release(&sb);
5308
		}
5309
		show_mode_change(opt, p, !p->score);
S
Sean 已提交
5310 5311 5312 5313
		break;
	}
}

5314
struct patch_id_t {
5315
	git_SHA_CTX *ctx;
5316 5317 5318 5319 5320 5321
	int patchlen;
};

static int remove_space(char *line, int len)
{
	int i;
5322 5323
	char *dst = line;
	unsigned char c;
5324

5325 5326 5327
	for (i = 0; i < len; i++)
		if (!isspace((c = line[i])))
			*dst++ = c;
5328

5329
	return dst - line;
5330 5331 5332 5333 5334 5335 5336 5337
}

static void patch_id_consume(void *priv, char *line, unsigned long len)
{
	struct patch_id_t *data = priv;
	int new_len;

	/* Ignore line numbers when computing the SHA1 of the patch */
5338
	if (starts_with(line, "@@ -"))
5339 5340 5341 5342
		return;

	new_len = remove_space(line, len);

5343
	git_SHA1_Update(data->ctx, line, new_len);
5344 5345 5346
	data->patchlen += new_len;
}

5347 5348 5349 5350 5351 5352 5353 5354 5355 5356 5357 5358 5359
static void patch_id_add_string(git_SHA_CTX *ctx, const char *str)
{
	git_SHA1_Update(ctx, str, strlen(str));
}

static void patch_id_add_mode(git_SHA_CTX *ctx, unsigned mode)
{
	/* large enough for 2^32 in octal */
	char buf[12];
	int len = xsnprintf(buf, sizeof(buf), "%06o", mode);
	git_SHA1_Update(ctx, buf, len);
}

5360
/* returns 0 upon success, and writes result into sha1 */
5361
static int diff_get_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only)
5362 5363 5364
{
	struct diff_queue_struct *q = &diff_queued_diff;
	int i;
5365
	git_SHA_CTX ctx;
5366 5367
	struct patch_id_t data;

5368
	git_SHA1_Init(&ctx);
5369 5370 5371 5372 5373 5374 5375 5376 5377 5378
	memset(&data, 0, sizeof(struct patch_id_t));
	data.ctx = &ctx;

	for (i = 0; i < q->nr; i++) {
		xpparam_t xpp;
		xdemitconf_t xecfg;
		mmfile_t mf1, mf2;
		struct diff_filepair *p = q->queue[i];
		int len1, len2;

B
Brian Downing 已提交
5379
		memset(&xpp, 0, sizeof(xpp));
5380
		memset(&xecfg, 0, sizeof(xecfg));
5381 5382 5383 5384 5385 5386 5387 5388 5389 5390 5391 5392
		if (p->status == 0)
			return error("internal diff status error");
		if (p->status == DIFF_STATUS_UNKNOWN)
			continue;
		if (diff_unmodified_pair(p))
			continue;
		if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
		    (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
			continue;
		if (DIFF_PAIR_UNMERGED(p))
			continue;

5393 5394
		diff_fill_oid_info(p->one);
		diff_fill_oid_info(p->two);
5395 5396 5397

		len1 = remove_space(p->one->path, strlen(p->one->path));
		len2 = remove_space(p->two->path, strlen(p->two->path));
5398 5399 5400 5401 5402 5403 5404 5405 5406 5407 5408 5409 5410 5411 5412 5413 5414 5415 5416 5417 5418 5419 5420 5421
		patch_id_add_string(&ctx, "diff--git");
		patch_id_add_string(&ctx, "a/");
		git_SHA1_Update(&ctx, p->one->path, len1);
		patch_id_add_string(&ctx, "b/");
		git_SHA1_Update(&ctx, p->two->path, len2);

		if (p->one->mode == 0) {
			patch_id_add_string(&ctx, "newfilemode");
			patch_id_add_mode(&ctx, p->two->mode);
			patch_id_add_string(&ctx, "---/dev/null");
			patch_id_add_string(&ctx, "+++b/");
			git_SHA1_Update(&ctx, p->two->path, len2);
		} else if (p->two->mode == 0) {
			patch_id_add_string(&ctx, "deletedfilemode");
			patch_id_add_mode(&ctx, p->one->mode);
			patch_id_add_string(&ctx, "---a/");
			git_SHA1_Update(&ctx, p->one->path, len1);
			patch_id_add_string(&ctx, "+++/dev/null");
		} else {
			patch_id_add_string(&ctx, "---a/");
			git_SHA1_Update(&ctx, p->one->path, len1);
			patch_id_add_string(&ctx, "+++b/");
			git_SHA1_Update(&ctx, p->two->path, len2);
		}
5422

5423 5424 5425 5426 5427 5428 5429
		if (diff_header_only)
			continue;

		if (fill_mmfile(&mf1, p->one) < 0 ||
		    fill_mmfile(&mf2, p->two) < 0)
			return error("unable to read files to diff");

5430 5431
		if (diff_filespec_is_binary(p->one) ||
		    diff_filespec_is_binary(p->two)) {
5432
			git_SHA1_Update(&ctx, oid_to_hex(&p->one->oid),
5433
					GIT_SHA1_HEXSZ);
5434
			git_SHA1_Update(&ctx, oid_to_hex(&p->two->oid),
5435
					GIT_SHA1_HEXSZ);
5436 5437 5438
			continue;
		}

R
René Scharfe 已提交
5439
		xpp.flags = 0;
5440
		xecfg.ctxlen = 3;
5441
		xecfg.flags = 0;
J
Jeff King 已提交
5442 5443 5444 5445
		if (xdi_diff_outf(&mf1, &mf2, patch_id_consume, &data,
				  &xpp, &xecfg))
			return error("unable to generate patch-id diff for %s",
				     p->one->path);
5446 5447
	}

5448
	git_SHA1_Final(oid->hash, &ctx);
5449 5450 5451
	return 0;
}

5452
int diff_flush_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only)
5453 5454 5455
{
	struct diff_queue_struct *q = &diff_queued_diff;
	int i;
5456
	int result = diff_get_patch_id(options, oid, diff_header_only);
5457 5458 5459 5460 5461

	for (i = 0; i < q->nr; i++)
		diff_free_filepair(q->queue[i]);

	free(q->queue);
B
Bo Yang 已提交
5462
	DIFF_QUEUE_CLEAR(q);
5463 5464 5465 5466

	return result;
}

5467
static int is_summary_empty(const struct diff_queue_struct *q)
J
Junio C Hamano 已提交
5468 5469 5470
{
	int i;

5471 5472 5473 5474 5475 5476 5477 5478 5479 5480 5481 5482 5483 5484 5485 5486 5487
	for (i = 0; i < q->nr; i++) {
		const struct diff_filepair *p = q->queue[i];

		switch (p->status) {
		case DIFF_STATUS_DELETED:
		case DIFF_STATUS_ADDED:
		case DIFF_STATUS_COPIED:
		case DIFF_STATUS_RENAMED:
			return 0;
		default:
			if (p->score)
				return 0;
			if (p->one->mode && p->two->mode &&
			    p->one->mode != p->two->mode)
				return 0;
			break;
		}
J
Junio C Hamano 已提交
5488
	}
5489 5490 5491
	return 1;
}

5492
static const char rename_limit_warning[] =
5493
N_("inexact rename detection was skipped due to too many files.");
5494 5495

static const char degrade_cc_to_c_warning[] =
5496
N_("only found copies from modified paths due to too many files.");
5497 5498

static const char rename_limit_advice[] =
5499 5500
N_("you may want to set your %s variable to at least "
   "%d and retry the command.");
5501 5502 5503

void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc)
{
5504
	fflush(stdout);
5505
	if (degraded_cc)
5506
		warning(_(degrade_cc_to_c_warning));
5507
	else if (needed)
5508
		warning(_(rename_limit_warning));
5509 5510
	else
		return;
5511
	if (0 < needed)
5512
		warning(_(rename_limit_advice), varname, needed);
5513 5514
}

5515 5516 5517
static void diff_flush_patch_all_file_pairs(struct diff_options *o)
{
	int i;
5518
	static struct emitted_diff_symbols esm = EMITTED_DIFF_SYMBOLS_INIT;
5519
	struct diff_queue_struct *q = &diff_queued_diff;
5520 5521 5522 5523

	if (WSEH_NEW & WS_RULE_MASK)
		die("BUG: WS rules bit mask overlaps with diff symbol flags");

5524 5525
	if (o->color_moved)
		o->emitted_symbols = &esm;
5526

5527 5528 5529 5530 5531
	for (i = 0; i < q->nr; i++) {
		struct diff_filepair *p = q->queue[i];
		if (check_pair_status(p))
			diff_flush_patch(p, o);
	}
5532 5533

	if (o->emitted_symbols) {
5534 5535 5536 5537 5538 5539 5540 5541 5542 5543
		if (o->color_moved) {
			struct hashmap add_lines, del_lines;

			hashmap_init(&del_lines,
				     (hashmap_cmp_fn)moved_entry_cmp, o, 0);
			hashmap_init(&add_lines,
				     (hashmap_cmp_fn)moved_entry_cmp, o, 0);

			add_lines_to_move_detection(o, &add_lines, &del_lines);
			mark_color_as_moved(o, &add_lines, &del_lines);
5544 5545
			if (o->color_moved == COLOR_MOVED_ZEBRA_DIM)
				dim_moved_lines(o);
5546 5547 5548 5549 5550

			hashmap_free(&add_lines, 0);
			hashmap_free(&del_lines, 0);
		}

5551 5552 5553 5554 5555 5556 5557
		for (i = 0; i < esm.nr; i++)
			emit_diff_symbol_from_struct(o, &esm.buf[i]);

		for (i = 0; i < esm.nr; i++)
			free((void *)esm.buf[i].line);
	}
	esm.nr = 0;
5558 5559
}

J
Junio C Hamano 已提交
5560 5561 5562
void diff_flush(struct diff_options *options)
{
	struct diff_queue_struct *q = &diff_queued_diff;
5563
	int i, output_format = options->output_format;
5564
	int separator = 0;
5565
	int dirstat_by_line = 0;
J
Junio C Hamano 已提交
5566

5567 5568 5569 5570
	/*
	 * Order: raw, stat, summary, patch
	 * or:    name/name-status/checkdiff (other bits clear)
	 */
5571 5572
	if (!q->nr)
		goto free_queue;
J
Junio C Hamano 已提交
5573

5574 5575 5576 5577
	if (output_format & (DIFF_FORMAT_RAW |
			     DIFF_FORMAT_NAME |
			     DIFF_FORMAT_NAME_STATUS |
			     DIFF_FORMAT_CHECKDIFF)) {
J
Junio C Hamano 已提交
5578 5579
		for (i = 0; i < q->nr; i++) {
			struct diff_filepair *p = q->queue[i];
5580 5581
			if (check_pair_status(p))
				flush_one_pair(p, options);
J
Junio C Hamano 已提交
5582
		}
5583
		separator++;
J
Junio C Hamano 已提交
5584
	}
5585

5586
	if (output_format & DIFF_FORMAT_DIRSTAT && options->flags.dirstat_by_line)
5587 5588 5589 5590
		dirstat_by_line = 1;

	if (output_format & (DIFF_FORMAT_DIFFSTAT|DIFF_FORMAT_SHORTSTAT|DIFF_FORMAT_NUMSTAT) ||
	    dirstat_by_line) {
5591
		struct diffstat_t diffstat;
5592

5593
		memset(&diffstat, 0, sizeof(struct diffstat_t));
J
Junio C Hamano 已提交
5594 5595
		for (i = 0; i < q->nr; i++) {
			struct diff_filepair *p = q->queue[i];
5596
			if (check_pair_status(p))
5597
				diff_flush_stat(p, options, &diffstat);
J
Junio C Hamano 已提交
5598
		}
J
Junio C Hamano 已提交
5599 5600 5601 5602
		if (output_format & DIFF_FORMAT_NUMSTAT)
			show_numstat(&diffstat, options);
		if (output_format & DIFF_FORMAT_DIFFSTAT)
			show_stats(&diffstat, options);
5603
		if (output_format & DIFF_FORMAT_SHORTSTAT)
5604
			show_shortstats(&diffstat, options);
5605
		if (output_format & DIFF_FORMAT_DIRSTAT && dirstat_by_line)
5606
			show_dirstat_by_line(&diffstat, options);
5607
		free_diffstat_info(&diffstat);
5608
		separator++;
J
Junio C Hamano 已提交
5609
	}
5610
	if ((output_format & DIFF_FORMAT_DIRSTAT) && !dirstat_by_line)
5611
		show_dirstat(options);
J
Junio C Hamano 已提交
5612

5613
	if (output_format & DIFF_FORMAT_SUMMARY && !is_summary_empty(q)) {
5614 5615 5616
		for (i = 0; i < q->nr; i++) {
			diff_summary(options, q->queue[i]);
		}
5617
		separator++;
J
Junio C Hamano 已提交
5618 5619
	}

5620
	if (output_format & DIFF_FORMAT_NO_OUTPUT &&
5621 5622
	    options->flags.exit_with_status &&
	    options->flags.diff_from_contents) {
5623 5624
		/*
		 * run diff_flush_patch for the exit status. setting
O
Ondřej Bílka 已提交
5625
		 * options->file to /dev/null should be safe, because we
5626 5627 5628 5629
		 * aren't supposed to produce any output anyway.
		 */
		if (options->close_file)
			fclose(options->file);
5630
		options->file = xfopen("/dev/null", "w");
5631
		options->close_file = 1;
5632
		options->color_moved = 0;
5633 5634 5635 5636 5637 5638 5639 5640 5641
		for (i = 0; i < q->nr; i++) {
			struct diff_filepair *p = q->queue[i];
			if (check_pair_status(p))
				diff_flush_patch(p, options);
			if (options->found_changes)
				break;
		}
	}

5642
	if (output_format & DIFF_FORMAT_PATCH) {
5643
		if (separator) {
5644
			emit_diff_symbol(options, DIFF_SYMBOL_SEPARATOR, NULL, 0, 0);
5645
			if (options->stat_sep)
5646
				/* attach patch instead of inline */
5647 5648
				emit_diff_symbol(options, DIFF_SYMBOL_STAT_SEP,
						 NULL, 0, 0);
5649 5650
		}

5651
		diff_flush_patch_all_file_pairs(options);
S
Sean 已提交
5652 5653
	}

5654 5655 5656
	if (output_format & DIFF_FORMAT_CALLBACK)
		options->format_callback(q, options, options->format_callback_data);

5657 5658
	for (i = 0; i < q->nr; i++)
		diff_free_filepair(q->queue[i]);
5659
free_queue:
J
Junio C Hamano 已提交
5660
	free(q->queue);
B
Bo Yang 已提交
5661
	DIFF_QUEUE_CLEAR(q);
5662 5663
	if (options->close_file)
		fclose(options->file);
5664 5665

	/*
J
Jim Meyering 已提交
5666
	 * Report the content-level differences with HAS_CHANGES;
5667 5668 5669
	 * diff_addremove/diff_change does not set the bit when
	 * DIFF_FROM_CONTENTS is in effect (e.g. with -w).
	 */
5670
	if (options->flags.diff_from_contents) {
5671
		if (options->found_changes)
5672
			options->flags.has_changes = 1;
5673
		else
5674
			options->flags.has_changes = 0;
5675
	}
J
Junio C Hamano 已提交
5676 5677
}

J
Junio C Hamano 已提交
5678 5679 5680 5681
static int match_filter(const struct diff_options *options, const struct diff_filepair *p)
{
	return (((p->status == DIFF_STATUS_MODIFIED) &&
		 ((p->score &&
5682
		   filter_bit_tst(DIFF_STATUS_FILTER_BROKEN, options)) ||
J
Junio C Hamano 已提交
5683
		  (!p->score &&
5684
		   filter_bit_tst(DIFF_STATUS_MODIFIED, options)))) ||
J
Junio C Hamano 已提交
5685
		((p->status != DIFF_STATUS_MODIFIED) &&
5686
		 filter_bit_tst(p->status, options)));
J
Junio C Hamano 已提交
5687 5688
}

5689
static void diffcore_apply_filter(struct diff_options *options)
J
Junio C Hamano 已提交
5690 5691 5692 5693
{
	int i;
	struct diff_queue_struct *q = &diff_queued_diff;
	struct diff_queue_struct outq;
5694

B
Bo Yang 已提交
5695
	DIFF_QUEUE_CLEAR(&outq);
J
Junio C Hamano 已提交
5696

5697
	if (!options->filter)
J
Junio C Hamano 已提交
5698 5699
		return;

5700
	if (filter_bit_tst(DIFF_STATUS_FILTER_AON, options)) {
J
Junio C Hamano 已提交
5701 5702
		int found;
		for (i = found = 0; !found && i < q->nr; i++) {
J
Junio C Hamano 已提交
5703
			if (match_filter(options, q->queue[i]))
J
Junio C Hamano 已提交
5704 5705 5706 5707 5708 5709 5710 5711 5712 5713 5714 5715 5716 5717 5718 5719 5720
				found++;
		}
		if (found)
			return;

		/* otherwise we will clear the whole queue
		 * by copying the empty outq at the end of this
		 * function, but first clear the current entries
		 * in the queue.
		 */
		for (i = 0; i < q->nr; i++)
			diff_free_filepair(q->queue[i]);
	}
	else {
		/* Only the matching ones */
		for (i = 0; i < q->nr; i++) {
			struct diff_filepair *p = q->queue[i];
J
Junio C Hamano 已提交
5721
			if (match_filter(options, p))
J
Junio C Hamano 已提交
5722 5723 5724 5725 5726 5727 5728 5729 5730
				diff_q(&outq, p);
			else
				diff_free_filepair(p);
		}
	}
	free(q->queue);
	*q = outq;
}

5731 5732 5733 5734
/* Check whether two filespecs with the same mode and size are identical */
static int diff_filespec_is_identical(struct diff_filespec *one,
				      struct diff_filespec *two)
{
5735 5736
	if (S_ISGITLINK(one->mode))
		return 0;
5737 5738 5739 5740 5741 5742 5743
	if (diff_populate_filespec(one, 0))
		return 0;
	if (diff_populate_filespec(two, 0))
		return 0;
	return !memcmp(one->data, two->data, one->size);
}

5744 5745
static int diff_filespec_check_stat_unmatch(struct diff_filepair *p)
{
5746 5747 5748 5749 5750
	if (p->done_skip_stat_unmatch)
		return p->skip_stat_unmatch_result;

	p->done_skip_stat_unmatch = 1;
	p->skip_stat_unmatch_result = 0;
5751 5752 5753 5754 5755 5756 5757 5758 5759 5760 5761 5762 5763 5764 5765
	/*
	 * 1. Entries that come from stat info dirtiness
	 *    always have both sides (iow, not create/delete),
	 *    one side of the object name is unknown, with
	 *    the same mode and size.  Keep the ones that
	 *    do not match these criteria.  They have real
	 *    differences.
	 *
	 * 2. At this point, the file is known to be modified,
	 *    with the same mode and size, and the object
	 *    name of one side is unknown.  Need to inspect
	 *    the identical contents.
	 */
	if (!DIFF_FILE_VALID(p->one) || /* (1) */
	    !DIFF_FILE_VALID(p->two) ||
5766
	    (p->one->oid_valid && p->two->oid_valid) ||
5767
	    (p->one->mode != p->two->mode) ||
5768 5769
	    diff_populate_filespec(p->one, CHECK_SIZE_ONLY) ||
	    diff_populate_filespec(p->two, CHECK_SIZE_ONLY) ||
5770 5771
	    (p->one->size != p->two->size) ||
	    !diff_filespec_is_identical(p->one, p->two)) /* (2) */
5772 5773
		p->skip_stat_unmatch_result = 1;
	return p->skip_stat_unmatch_result;
5774 5775
}

J
Junio C Hamano 已提交
5776 5777 5778 5779 5780
static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
{
	int i;
	struct diff_queue_struct *q = &diff_queued_diff;
	struct diff_queue_struct outq;
B
Bo Yang 已提交
5781
	DIFF_QUEUE_CLEAR(&outq);
J
Junio C Hamano 已提交
5782 5783 5784 5785

	for (i = 0; i < q->nr; i++) {
		struct diff_filepair *p = q->queue[i];

5786
		if (diff_filespec_check_stat_unmatch(p))
J
Junio C Hamano 已提交
5787 5788 5789 5790 5791 5792 5793
			diff_q(&outq, p);
		else {
			/*
			 * The caller can subtract 1 from skip_stat_unmatch
			 * to determine how many paths were dirty only
			 * due to stat info mismatch.
			 */
5794
			if (!diffopt->flags.no_index)
5795
				diffopt->skip_stat_unmatch++;
J
Junio C Hamano 已提交
5796 5797 5798 5799 5800 5801 5802
			diff_free_filepair(p);
		}
	}
	free(q->queue);
	*q = outq;
}

5803 5804 5805 5806 5807 5808 5809 5810 5811 5812 5813 5814 5815 5816
static int diffnamecmp(const void *a_, const void *b_)
{
	const struct diff_filepair *a = *((const struct diff_filepair **)a_);
	const struct diff_filepair *b = *((const struct diff_filepair **)b_);
	const char *name_a, *name_b;

	name_a = a->one ? a->one->path : a->two->path;
	name_b = b->one ? b->one->path : b->two->path;
	return strcmp(name_a, name_b);
}

void diffcore_fix_diff_index(struct diff_options *options)
{
	struct diff_queue_struct *q = &diff_queued_diff;
R
René Scharfe 已提交
5817
	QSORT(q->queue, q->nr, diffnamecmp);
5818 5819
}

J
Junio C Hamano 已提交
5820 5821
void diffcore_std(struct diff_options *options)
{
5822
	/* NOTE please keep the following in sync with diff_tree_combined() */
5823
	if (options->skip_stat_unmatch)
J
Junio C Hamano 已提交
5824
		diffcore_skip_stat_unmatch(options);
5825 5826 5827 5828 5829 5830 5831 5832 5833
	if (!options->found_follow) {
		/* See try_to_follow_renames() in tree-diff.c */
		if (options->break_opt != -1)
			diffcore_break(options->break_opt);
		if (options->detect_rename)
			diffcore_rename(options);
		if (options->break_opt != -1)
			diffcore_merge_broken();
	}
5834
	if (options->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK)
5835
		diffcore_pickaxe(options);
J
Junio C Hamano 已提交
5836 5837
	if (options->orderfile)
		diffcore_order(options->orderfile);
5838 5839 5840
	if (!options->found_follow)
		/* See try_to_follow_renames() in tree-diff.c */
		diff_resolve_rename_copy();
5841
	diffcore_apply_filter(options);
J
Junio C Hamano 已提交
5842

5843 5844
	if (diff_queued_diff.nr && !options->flags.diff_from_contents)
		options->flags.has_changes = 1;
5845
	else
5846
		options->flags.has_changes = 0;
5847

5848
	options->found_follow = 0;
J
Junio C Hamano 已提交
5849 5850
}

J
Junio C Hamano 已提交
5851 5852 5853
int diff_result_code(struct diff_options *opt, int status)
{
	int result = 0;
5854

5855
	diff_warn_rename_limit("diff.renameLimit",
5856 5857
			       opt->needed_rename_limit,
			       opt->degraded_cc_to_c);
5858
	if (!opt->flags.exit_with_status &&
J
Junio C Hamano 已提交
5859 5860
	    !(opt->output_format & DIFF_FORMAT_CHECKDIFF))
		return status;
5861 5862
	if (opt->flags.exit_with_status &&
	    opt->flags.has_changes)
J
Junio C Hamano 已提交
5863 5864
		result |= 01;
	if ((opt->output_format & DIFF_FORMAT_CHECKDIFF) &&
5865
	    opt->flags.check_failed)
J
Junio C Hamano 已提交
5866 5867 5868
		result |= 02;
	return result;
}
J
Junio C Hamano 已提交
5869

5870 5871
int diff_can_quit_early(struct diff_options *opt)
{
5872
	return (opt->flags.quick &&
5873
		!opt->filter &&
5874
		opt->flags.has_changes);
5875 5876
}

5877 5878 5879 5880 5881 5882 5883 5884 5885
/*
 * Shall changes to this submodule be ignored?
 *
 * Submodule changes can be configured to be ignored separately for each path,
 * but that configuration can be overridden from the command line.
 */
static int is_submodule_ignored(const char *path, struct diff_options *options)
{
	int ignored = 0;
5886
	struct diff_flags orig_flags = options->flags;
5887
	if (!options->flags.override_submodule_config)
5888
		set_diffopt_flags_from_submodule_config(options, path);
5889
	if (options->flags.ignore_submodules)
5890 5891 5892 5893 5894
		ignored = 1;
	options->flags = orig_flags;
	return ignored;
}

J
Junio C Hamano 已提交
5895 5896
void diff_addremove(struct diff_options *options,
		    int addremove, unsigned mode,
5897 5898
		    const struct object_id *oid,
		    int oid_valid,
5899
		    const char *concatpath, unsigned dirty_submodule)
J
Junio C Hamano 已提交
5900 5901 5902
{
	struct diff_filespec *one, *two;

5903
	if (S_ISGITLINK(mode) && is_submodule_ignored(concatpath, options))
5904 5905
		return;

J
Junio C Hamano 已提交
5906 5907 5908 5909 5910 5911 5912
	/* This may look odd, but it is a preparation for
	 * feeding "there are unchanged files which should
	 * not produce diffs, but when you are doing copy
	 * detection you would need them, so here they are"
	 * entries to the diff-core.  They will be prefixed
	 * with something like '=' or '*' (I haven't decided
	 * which but should not make any difference).
J
Junio C Hamano 已提交
5913
	 * Feeding the same new and old to diff_change()
J
Junio C Hamano 已提交
5914 5915 5916 5917
	 * also has the same effect.
	 * Before the final output happens, they are pruned after
	 * merged into rename/copy pairs as appropriate.
	 */
5918
	if (options->flags.reverse_diff)
J
Junio C Hamano 已提交
5919 5920 5921
		addremove = (addremove == '+' ? '-' :
			     addremove == '-' ? '+' : addremove);

5922 5923 5924 5925
	if (options->prefix &&
	    strncmp(concatpath, options->prefix, options->prefix_length))
		return;

J
Junio C Hamano 已提交
5926 5927 5928 5929
	one = alloc_filespec(concatpath);
	two = alloc_filespec(concatpath);

	if (addremove != '+')
5930
		fill_filespec(one, oid, oid_valid, mode);
5931
	if (addremove != '-') {
5932
		fill_filespec(two, oid, oid_valid, mode);
5933 5934
		two->dirty_submodule = dirty_submodule;
	}
J
Junio C Hamano 已提交
5935 5936

	diff_queue(&diff_queued_diff, one, two);
5937 5938
	if (!options->flags.diff_from_contents)
		options->flags.has_changes = 1;
J
Junio C Hamano 已提交
5939 5940 5941 5942
}

void diff_change(struct diff_options *options,
		 unsigned old_mode, unsigned new_mode,
5943 5944 5945
		 const struct object_id *old_oid,
		 const struct object_id *new_oid,
		 int old_oid_valid, int new_oid_valid,
5946 5947
		 const char *concatpath,
		 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
J
Junio C Hamano 已提交
5948 5949
{
	struct diff_filespec *one, *two;
5950
	struct diff_filepair *p;
J
Junio C Hamano 已提交
5951

5952 5953
	if (S_ISGITLINK(old_mode) && S_ISGITLINK(new_mode) &&
	    is_submodule_ignored(concatpath, options))
5954 5955
		return;

5956
	if (options->flags.reverse_diff) {
R
René Scharfe 已提交
5957
		SWAP(old_mode, new_mode);
5958 5959
		SWAP(old_oid, new_oid);
		SWAP(old_oid_valid, new_oid_valid);
R
René Scharfe 已提交
5960
		SWAP(old_dirty_submodule, new_dirty_submodule);
J
Junio C Hamano 已提交
5961
	}
5962 5963 5964 5965 5966

	if (options->prefix &&
	    strncmp(concatpath, options->prefix, options->prefix_length))
		return;

J
Junio C Hamano 已提交
5967 5968
	one = alloc_filespec(concatpath);
	two = alloc_filespec(concatpath);
5969 5970
	fill_filespec(one, old_oid, old_oid_valid, old_mode);
	fill_filespec(two, new_oid, new_oid_valid, new_mode);
5971 5972
	one->dirty_submodule = old_dirty_submodule;
	two->dirty_submodule = new_dirty_submodule;
5973
	p = diff_queue(&diff_queued_diff, one, two);
J
Junio C Hamano 已提交
5974

5975
	if (options->flags.diff_from_contents)
5976 5977
		return;

5978
	if (options->flags.quick && options->skip_stat_unmatch &&
5979 5980 5981
	    !diff_filespec_check_stat_unmatch(p))
		return;

5982
	options->flags.has_changes = 1;
J
Junio C Hamano 已提交
5983 5984
}

5985
struct diff_filepair *diff_unmerge(struct diff_options *options, const char *path)
J
Junio C Hamano 已提交
5986
{
5987
	struct diff_filepair *pair;
J
Junio C Hamano 已提交
5988
	struct diff_filespec *one, *two;
5989 5990 5991

	if (options->prefix &&
	    strncmp(path, options->prefix, options->prefix_length))
5992
		return NULL;
5993

J
Junio C Hamano 已提交
5994 5995
	one = alloc_filespec(path);
	two = alloc_filespec(path);
5996 5997 5998
	pair = diff_queue(&diff_queued_diff, one, two);
	pair->is_unmerged = 1;
	return pair;
J
Junio C Hamano 已提交
5999
}
6000 6001 6002 6003

static char *run_textconv(const char *pgm, struct diff_filespec *spec,
		size_t *outsize)
{
6004
	struct diff_tempfile *temp;
6005 6006
	const char *argv[3];
	const char **arg = argv;
6007
	struct child_process child = CHILD_PROCESS_INIT;
6008
	struct strbuf buf = STRBUF_INIT;
J
Johannes Sixt 已提交
6009
	int err = 0;
6010

6011
	temp = prepare_temp_file(spec->path, spec);
6012
	*arg++ = pgm;
6013
	*arg++ = temp->name;
6014 6015
	*arg = NULL;

J
Jeff King 已提交
6016
	child.use_shell = 1;
6017 6018
	child.argv = argv;
	child.out = -1;
J
Johannes Sixt 已提交
6019
	if (start_command(&child)) {
6020
		remove_tempfile();
6021 6022
		return NULL;
	}
J
Johannes Sixt 已提交
6023 6024 6025

	if (strbuf_read(&buf, child.out, 0) < 0)
		err = error("error reading from textconv command '%s'", pgm);
6026
	close(child.out);
J
Johannes Sixt 已提交
6027 6028 6029 6030 6031 6032

	if (finish_command(&child) || err) {
		strbuf_release(&buf);
		remove_tempfile();
		return NULL;
	}
6033
	remove_tempfile();
6034 6035 6036

	return strbuf_detach(&buf, outsize);
}
6037

A
Axel Bonnet 已提交
6038 6039 6040
size_t fill_textconv(struct userdiff_driver *driver,
		     struct diff_filespec *df,
		     char **outbuf)
6041 6042 6043
{
	size_t size;

J
Jeff King 已提交
6044
	if (!driver) {
6045 6046 6047 6048 6049 6050 6051 6052 6053 6054
		if (!DIFF_FILE_VALID(df)) {
			*outbuf = "";
			return 0;
		}
		if (diff_populate_filespec(df, 0))
			die("unable to read files to diff");
		*outbuf = df->data;
		return df->size;
	}

J
Jeff King 已提交
6055 6056 6057
	if (!driver->textconv)
		die("BUG: fill_textconv called with non-textconv driver");

6058
	if (driver->textconv_cache && df->oid_valid) {
6059
		*outbuf = notes_cache_get(driver->textconv_cache,
6060
					  &df->oid,
J
Jeff King 已提交
6061 6062 6063 6064 6065 6066
					  &size);
		if (*outbuf)
			return size;
	}

	*outbuf = run_textconv(driver->textconv, df, &size);
6067 6068
	if (!*outbuf)
		die("unable to read files to diff");
J
Jeff King 已提交
6069

6070
	if (driver->textconv_cache && df->oid_valid) {
J
Jeff King 已提交
6071
		/* ignore errors, as we might be in a readonly repository */
6072
		notes_cache_put(driver->textconv_cache, &df->oid, *outbuf,
J
Jeff King 已提交
6073 6074 6075 6076 6077 6078 6079 6080 6081 6082
				size);
		/*
		 * we could save up changes and flush them all at the end,
		 * but we would need an extra call after all diffing is done.
		 * Since generating a cache entry is the slow path anyway,
		 * this extra overhead probably isn't a big deal.
		 */
		notes_cache_write(driver->textconv_cache);
	}

6083 6084
	return size;
}
6085

6086 6087 6088 6089 6090 6091 6092 6093 6094 6095 6096
int textconv_object(const char *path,
		    unsigned mode,
		    const struct object_id *oid,
		    int oid_valid,
		    char **buf,
		    unsigned long *buf_size)
{
	struct diff_filespec *df;
	struct userdiff_driver *textconv;

	df = alloc_filespec(path);
J
Junio C Hamano 已提交
6097
	fill_filespec(df, oid, oid_valid, mode);
6098 6099 6100 6101 6102 6103 6104 6105 6106 6107 6108
	textconv = get_textconv(df);
	if (!textconv) {
		free_filespec(df);
		return 0;
	}

	*buf_size = fill_textconv(textconv, df, buf);
	free_filespec(df);
	return 1;
}

6109 6110 6111 6112 6113 6114 6115 6116 6117 6118 6119
void setup_diff_pager(struct diff_options *opt)
{
	/*
	 * If the user asked for our exit code, then either they want --quiet
	 * or --exit-code. We should definitely not bother with a pager in the
	 * former case, as we will generate no output. Since we still properly
	 * report our exit code even when a pager is run, we _could_ run a
	 * pager with --exit-code. But since we have not done so historically,
	 * and because it is easy to find people oneline advising "git diff
	 * --exit-code" in hooks and other scripts, we do not do so.
	 */
6120
	if (!opt->flags.exit_with_status &&
6121 6122 6123
	    check_pager_config("diff") != 0)
		setup_pager();
}