log-tree.c 15.2 KB
Newer Older
1 2 3
#include "cache.h"
#include "diff.h"
#include "commit.h"
4
#include "tag.h"
5
#include "graph.h"
6
#include "log-tree.h"
7
#include "reflog-walk.h"
8
#include "refs.h"
9
#include "string-list.h"
10

11 12
struct decoration name_decoration = { "object names" };

13 14 15 16 17 18 19 20 21 22
enum decoration_type {
	DECORATION_NONE = 0,
	DECORATION_REF_LOCAL,
	DECORATION_REF_REMOTE,
	DECORATION_REF_TAG,
	DECORATION_REF_STASH,
	DECORATION_REF_HEAD,
};

static void add_name_decoration(enum decoration_type type, const char *name, struct object *obj)
23 24
{
	int nlen = strlen(name);
25 26 27
	struct name_decoration *res = xmalloc(sizeof(struct name_decoration) + nlen);
	memcpy(res->name, name, nlen + 1);
	res->type = type;
28 29 30 31 32 33
	res->next = add_decoration(&name_decoration, obj, res);
}

static int add_ref_decoration(const char *refname, const unsigned char *sha1, int flags, void *cb_data)
{
	struct object *obj = parse_object(sha1);
34
	enum decoration_type type = DECORATION_NONE;
35 36
	if (!obj)
		return 0;
37 38 39 40 41 42 43 44 45 46 47 48

	if (!prefixcmp(refname, "refs/heads"))
		type = DECORATION_REF_LOCAL;
	else if (!prefixcmp(refname, "refs/remotes"))
		type = DECORATION_REF_REMOTE;
	else if (!prefixcmp(refname, "refs/tags"))
		type = DECORATION_REF_TAG;
	else if (!prefixcmp(refname, "refs/stash"))
		type = DECORATION_REF_STASH;
	else if (!prefixcmp(refname, "HEAD"))
		type = DECORATION_REF_HEAD;

49 50
	if (!cb_data || *(int *)cb_data == DECORATE_SHORT_REFS)
		refname = prettify_refname(refname);
51
	add_name_decoration(type, refname, obj);
52 53 54 55
	while (obj->type == OBJ_TAG) {
		obj = ((struct tag *)obj)->tagged;
		if (!obj)
			break;
56
		add_name_decoration(DECORATION_REF_TAG, refname, obj);
57 58 59 60
	}
	return 0;
}

61
void load_ref_decorations(int flags)
62 63 64 65
{
	static int loaded;
	if (!loaded) {
		loaded = 1;
66
		for_each_ref(add_ref_decoration, &flags);
T
Thomas Rast 已提交
67
		head_ref(add_ref_decoration, &flags);
68 69 70
	}
}

71 72 73 74 75
static void show_parents(struct commit *commit, int abbrev)
{
	struct commit_list *p;
	for (p = commit->parents; p ; p = p->next) {
		struct commit *parent = p->item;
76
		printf(" %s", find_unique_abbrev(parent->object.sha1, abbrev));
77 78 79
	}
}

80
void show_decorations(struct rev_info *opt, struct commit *commit)
81 82 83 84
{
	const char *prefix;
	struct name_decoration *decoration;

85
	if (opt->show_source && commit->util)
86
		printf("\t%s", (char *) commit->util);
87 88
	if (!opt->show_decorations)
		return;
89 90 91 92 93
	decoration = lookup_decoration(&name_decoration, &commit->object);
	if (!decoration)
		return;
	prefix = " (";
	while (decoration) {
94 95 96 97
		printf("%s", prefix);
		if (decoration->type == DECORATION_REF_TAG)
			printf("tag: ");
		printf("%s", decoration->name);
98 99 100 101 102 103
		prefix = ", ";
		decoration = decoration->next;
	}
	putchar(')');
}

104 105 106 107 108 109
/*
 * Search for "^[-A-Za-z]+: [^@]+@" pattern. It usually matches
 * Signed-off-by: and Acked-by: lines.
 */
static int detect_any_signoff(char *letter, int size)
{
110
	char *cp;
111 112 113 114 115 116
	int seen_colon = 0;
	int seen_at = 0;
	int seen_name = 0;
	int seen_head = 0;

	cp = letter + size;
117
	while (letter <= --cp && *cp == '\n')
118 119 120
		continue;

	while (letter <= cp) {
121
		char ch = *cp--;
122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150
		if (ch == '\n')
			break;

		if (!seen_at) {
			if (ch == '@')
				seen_at = 1;
			continue;
		}
		if (!seen_colon) {
			if (ch == '@')
				return 0;
			else if (ch == ':')
				seen_colon = 1;
			else
				seen_name = 1;
			continue;
		}
		if (('A' <= ch && ch <= 'Z') ||
		    ('a' <= ch && ch <= 'z') ||
		    ch == '-') {
			seen_head = 1;
			continue;
		}
		/* no empty last line doesn't match */
		return 0;
	}
	return seen_head && seen_name;
}

151
static void append_signoff(struct strbuf *sb, const char *signoff)
J
Junio C Hamano 已提交
152 153
{
	static const char signed_off_by[] = "Signed-off-by: ";
154
	size_t signoff_len = strlen(signoff);
155
	int has_signoff = 0;
156
	char *cp;
J
Junio C Hamano 已提交
157

158
	cp = sb->buf;
J
Junio C Hamano 已提交
159 160

	/* First see if we already have the sign-off by the signer */
161 162 163 164
	while ((cp = strstr(cp, signed_off_by))) {

		has_signoff = 1;

J
Junio C Hamano 已提交
165
		cp += strlen(signed_off_by);
166
		if (cp + signoff_len >= sb->buf + sb->len)
167 168 169 170 171 172
			break;
		if (strncmp(cp, signoff, signoff_len))
			continue;
		if (!isspace(cp[signoff_len]))
			continue;
		/* we already have him */
173
		return;
J
Junio C Hamano 已提交
174 175
	}

176
	if (!has_signoff)
177
		has_signoff = detect_any_signoff(sb->buf, sb->len);
178 179

	if (!has_signoff)
180
		strbuf_addch(sb, '\n');
181

182 183 184
	strbuf_addstr(sb, signed_off_by);
	strbuf_add(sb, signoff, signoff_len);
	strbuf_addch(sb, '\n');
J
Junio C Hamano 已提交
185 186
}

187 188 189 190 191 192 193 194 195 196
static unsigned int digits_in_number(unsigned int number)
{
	unsigned int i = 10, result = 1;
	while (i <= number) {
		i *= 10;
		result++;
	}
	return result;
}

197 198 199 200 201 202 203 204
void get_patch_filename(struct commit *commit, int nr, const char *suffix,
			struct strbuf *buf)
{
	int suffix_len = strlen(suffix) + 1;
	int start_len = buf->len;

	strbuf_addf(buf, commit ? "%04d-" : "%d", nr);
	if (commit) {
205
		int max_len = start_len + FORMAT_PATCH_NAME_MAX - suffix_len;
206 207
		struct pretty_print_context ctx = {0};
		ctx.date_mode = DATE_NORMAL;
208

209
		format_commit_message(commit, "%f", buf, &ctx);
210 211 212
		if (max_len < buf->len)
			strbuf_setlen(buf, max_len);
		strbuf_addstr(buf, suffix);
213 214 215
	}
}

216
void log_write_email_headers(struct rev_info *opt, struct commit *commit,
J
Junio C Hamano 已提交
217 218 219
			     const char **subject_p,
			     const char **extra_headers_p,
			     int *need_8bit_cte_p)
220 221 222
{
	const char *subject = NULL;
	const char *extra_headers = opt->extra_headers;
223
	const char *name = sha1_to_hex(commit->object.sha1);
J
Junio C Hamano 已提交
224 225

	*need_8bit_cte_p = 0; /* unknown */
226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244
	if (opt->total > 0) {
		static char buffer[64];
		snprintf(buffer, sizeof(buffer),
			 "Subject: [%s %0*d/%d] ",
			 opt->subject_prefix,
			 digits_in_number(opt->total),
			 opt->nr, opt->total);
		subject = buffer;
	} else if (opt->total == 0 && opt->subject_prefix && *opt->subject_prefix) {
		static char buffer[256];
		snprintf(buffer, sizeof(buffer),
			 "Subject: [%s] ",
			 opt->subject_prefix);
		subject = buffer;
	} else {
		subject = "Subject: ";
	}

	printf("From %s Mon Sep 17 00:00:00 2001\n", name);
245 246
	graph_show_oneline(opt->graph);
	if (opt->message_id) {
247
		printf("Message-Id: <%s>\n", opt->message_id);
248 249
		graph_show_oneline(opt->graph);
	}
250 251 252 253 254 255 256
	if (opt->ref_message_ids && opt->ref_message_ids->nr > 0) {
		int i, n;
		n = opt->ref_message_ids->nr;
		printf("In-Reply-To: <%s>\n", opt->ref_message_ids->items[n-1].string);
		for (i = 0; i < n; i++)
			printf("%s<%s>\n", (i > 0 ? "\t" : "References: "),
			       opt->ref_message_ids->items[i].string);
257 258
		graph_show_oneline(opt->graph);
	}
259 260 261
	if (opt->mime_boundary) {
		static char subject_buffer[1024];
		static char buffer[1024];
262
		struct strbuf filename =  STRBUF_INIT;
J
Junio C Hamano 已提交
263
		*need_8bit_cte_p = -1; /* NEVER */
264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280
		snprintf(subject_buffer, sizeof(subject_buffer) - 1,
			 "%s"
			 "MIME-Version: 1.0\n"
			 "Content-Type: multipart/mixed;"
			 " boundary=\"%s%s\"\n"
			 "\n"
			 "This is a multi-part message in MIME "
			 "format.\n"
			 "--%s%s\n"
			 "Content-Type: text/plain; "
			 "charset=UTF-8; format=fixed\n"
			 "Content-Transfer-Encoding: 8bit\n\n",
			 extra_headers ? extra_headers : "",
			 mime_boundary_leader, opt->mime_boundary,
			 mime_boundary_leader, opt->mime_boundary);
		extra_headers = subject_buffer;

281 282
		get_patch_filename(opt->numbered_files ? NULL : commit, opt->nr,
				    opt->patch_suffix, &filename);
283
		snprintf(buffer, sizeof(buffer) - 1,
284
			 "\n--%s%s\n"
285
			 "Content-Type: text/x-patch;"
286
			 " name=\"%s\"\n"
287 288
			 "Content-Transfer-Encoding: 8bit\n"
			 "Content-Disposition: %s;"
289
			 " filename=\"%s\"\n\n",
290
			 mime_boundary_leader, opt->mime_boundary,
291
			 filename.buf,
292
			 opt->no_inline ? "attachment" : "inline",
293
			 filename.buf);
294
		opt->diffopt.stat_sep = buffer;
295
		strbuf_release(&filename);
296 297 298 299 300
	}
	*subject_p = subject;
	*extra_headers_p = extra_headers;
}

301
void show_log(struct rev_info *opt)
L
Linus Torvalds 已提交
302
{
303
	struct strbuf msgbuf = STRBUF_INIT;
T
Timo Hirvonen 已提交
304
	struct log_info *log = opt->loginfo;
L
Linus Torvalds 已提交
305 306
	struct commit *commit = log->commit, *parent = log->parent;
	int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
307 308
	const char *extra_headers = opt->extra_headers;
	struct pretty_print_context ctx = {0};
L
Linus Torvalds 已提交
309 310

	opt->loginfo = NULL;
311
	ctx.show_notes = opt->show_notes;
L
Linus Torvalds 已提交
312
	if (!opt->verbose_header) {
313 314
		graph_show_commit(opt->graph);

315 316 317 318 319 320 321 322 323 324 325
		if (!opt->graph) {
			if (commit->object.flags & BOUNDARY)
				putchar('-');
			else if (commit->object.flags & UNINTERESTING)
				putchar('^');
			else if (opt->left_right) {
				if (commit->object.flags & SYMMETRIC_LEFT)
					putchar('<');
				else
					putchar('>');
			}
326
		}
327
		fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit), stdout);
328
		if (opt->print_parents)
329
			show_parents(commit, abbrev_commit);
330
		show_decorations(opt, commit);
331 332 333 334
		if (opt->graph && !graph_is_commit_finished(opt->graph)) {
			putchar('\n');
			graph_show_remainder(opt->graph);
		}
335
		putchar(opt->diffopt.line_termination);
L
Linus Torvalds 已提交
336 337 338 339
		return;
	}

	/*
J
Jeff King 已提交
340 341
	 * If use_terminator is set, we already handled any record termination
	 * at the end of the last record.
342 343
	 * Otherwise, add a diffopt.line_termination character before all
	 * entries but the first.  (IOW, as a separator between entries)
L
Linus Torvalds 已提交
344
	 */
345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360
	if (opt->shown_one && !opt->use_terminator) {
		/*
		 * If entries are separated by a newline, the output
		 * should look human-readable.  If the last entry ended
		 * with a newline, print the graph output before this
		 * newline.  Otherwise it will end up as a completely blank
		 * line and will look like a gap in the graph.
		 *
		 * If the entry separator is not a newline, the output is
		 * primarily intended for programmatic consumption, and we
		 * never want the extra graph output before the entry
		 * separator.
		 */
		if (opt->diffopt.line_termination == '\n' &&
		    !opt->missing_newline)
			graph_show_padding(opt->graph);
L
Linus Torvalds 已提交
361
		putchar(opt->diffopt.line_termination);
362
	}
L
Linus Torvalds 已提交
363 364
	opt->shown_one = 1;

365 366 367 368 369 370
	/*
	 * If the history graph was requested,
	 * print the graph, up to this commit's line
	 */
	graph_show_commit(opt->graph);

L
Linus Torvalds 已提交
371 372 373
	/*
	 * Print header line of header..
	 */
374

375
	if (opt->commit_format == CMIT_FMT_EMAIL) {
376 377
		log_write_email_headers(opt, commit, &ctx.subject, &extra_headers,
					&ctx.need_8bit_cte);
378
	} else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
379
		fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), stdout);
380 381
		if (opt->commit_format != CMIT_FMT_ONELINE)
			fputs("commit ", stdout);
382 383 384 385 386 387 388 389 390 391 392 393

		if (!opt->graph) {
			if (commit->object.flags & BOUNDARY)
				putchar('-');
			else if (commit->object.flags & UNINTERESTING)
				putchar('^');
			else if (opt->left_right) {
				if (commit->object.flags & SYMMETRIC_LEFT)
					putchar('<');
				else
					putchar('>');
			}
394
		}
395
		fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit),
396
		      stdout);
397
		if (opt->print_parents)
398
			show_parents(commit, abbrev_commit);
J
Junio C Hamano 已提交
399
		if (parent)
400
			printf(" (from %s)",
401
			       find_unique_abbrev(parent->object.sha1,
402
						  abbrev_commit));
403
		show_decorations(opt, commit);
404
		printf("%s", diff_get_color_opt(&opt->diffopt, DIFF_RESET));
405 406 407 408 409 410
		if (opt->commit_format == CMIT_FMT_ONELINE) {
			putchar(' ');
		} else {
			putchar('\n');
			graph_show_oneline(opt->graph);
		}
411
		if (opt->reflog_info) {
412 413 414 415 416 417
			/*
			 * setup_revisions() ensures that opt->reflog_info
			 * and opt->graph cannot both be set,
			 * so we don't need to worry about printing the
			 * graph info here.
			 */
418
			show_reflog_message(opt->reflog_info,
419
				    opt->commit_format == CMIT_FMT_ONELINE,
J
Jeff King 已提交
420 421 422
				    opt->date_mode_explicit ?
					opt->date_mode :
					DATE_NORMAL);
423
			if (opt->commit_format == CMIT_FMT_ONELINE)
424 425
				return;
		}
426
	}
L
Linus Torvalds 已提交
427

428 429 430
	if (!commit->buffer)
		return;

L
Linus Torvalds 已提交
431 432 433
	/*
	 * And then the pretty-printed message itself
	 */
434 435 436 437 438
	if (ctx.need_8bit_cte >= 0)
		ctx.need_8bit_cte = has_non_ascii(opt->add_signoff);
	ctx.date_mode = opt->date_mode;
	ctx.abbrev = opt->diffopt.abbrev;
	ctx.after_subject = extra_headers;
439
	ctx.reflog_info = opt->reflog_info;
440
	pretty_print_commit(opt->commit_format, commit, &msgbuf, &ctx);
J
Junio C Hamano 已提交
441 442

	if (opt->add_signoff)
443
		append_signoff(&msgbuf, opt->add_signoff);
444
	if (opt->show_log_size) {
445
		printf("log size %i\n", (int)msgbuf.len);
446 447
		graph_show_oneline(opt->graph);
	}
448

449 450 451 452 453 454 455 456 457 458 459 460
	/*
	 * Set opt->missing_newline if msgbuf doesn't
	 * end in a newline (including if it is empty)
	 */
	if (!msgbuf.len || msgbuf.buf[msgbuf.len - 1] != '\n')
		opt->missing_newline = 1;
	else
		opt->missing_newline = 0;

	if (opt->graph)
		graph_show_commit_msg(opt->graph, &msgbuf);
	else
461
		fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
462 463 464
	if (opt->use_terminator) {
		if (!opt->missing_newline)
			graph_show_padding(opt->graph);
465
		putchar('\n');
466 467
	}

468
	strbuf_release(&msgbuf);
L
Linus Torvalds 已提交
469 470
}

471
int log_tree_diff_flush(struct rev_info *opt)
472 473
{
	diffcore_std(&opt->diffopt);
L
Linus Torvalds 已提交
474

475 476 477 478 479 480 481
	if (diff_queue_is_empty()) {
		int saved_fmt = opt->diffopt.output_format;
		opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
		diff_flush(&opt->diffopt);
		opt->diffopt.output_format = saved_fmt;
		return 0;
	}
L
Linus Torvalds 已提交
482

483 484 485 486 487 488
	if (opt->loginfo && !opt->no_commit_id) {
		/* When showing a verbose header (i.e. log message),
		 * and not in --pretty=oneline format, we would want
		 * an extra newline between the end of log and the
		 * output for readability.
		 */
489
		show_log(opt);
490 491
		if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) &&
		    opt->verbose_header &&
492 493 494
		    opt->commit_format != CMIT_FMT_ONELINE) {
			int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
			if ((pch & opt->diffopt.output_format) == pch)
L
Linus Torvalds 已提交
495
				printf("---");
496 497 498 499 500 501
			if (opt->diffopt.output_prefix) {
				struct strbuf *msg = NULL;
				msg = opt->diffopt.output_prefix(&opt->diffopt,
					opt->diffopt.output_prefix_data);
				fwrite(msg->buf, msg->len, 1, stdout);
			}
L
Linus Torvalds 已提交
502
			putchar('\n');
503 504
		}
	}
505 506 507 508
	diff_flush(&opt->diffopt);
	return 1;
}

509
static int do_diff_combined(struct rev_info *opt, struct commit *commit)
510 511 512
{
	unsigned const char *sha1 = commit->object.sha1;

L
Linus Torvalds 已提交
513 514
	diff_tree_combined_merge(sha1, opt->dense_combined_merges, opt);
	return !opt->loginfo;
515 516
}

L
Linus Torvalds 已提交
517 518 519 520 521 522
/*
 * Show the diff of a commit.
 *
 * Return true if we printed any log info messages
 */
static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log_info *log)
523
{
L
Linus Torvalds 已提交
524
	int showed_log;
525 526 527
	struct commit_list *parents;
	unsigned const char *sha1 = commit->object.sha1;

528
	if (!opt->diff && !DIFF_OPT_TST(&opt->diffopt, EXIT_WITH_STATUS))
L
Linus Torvalds 已提交
529 530
		return 0;

531
	/* Root commit? */
L
Linus Torvalds 已提交
532 533
	parents = commit->parents;
	if (!parents) {
R
Rene Scharfe 已提交
534 535 536 537
		if (opt->show_root_diff) {
			diff_root_tree_sha1(sha1, "", &opt->diffopt);
			log_tree_diff_flush(opt);
		}
L
Linus Torvalds 已提交
538
		return !opt->loginfo;
539 540 541
	}

	/* More than one parent? */
L
Linus Torvalds 已提交
542
	if (parents && parents->next) {
543 544 545 546
		if (opt->ignore_merges)
			return 0;
		else if (opt->combine_merges)
			return do_diff_combined(opt, commit);
547 548 549 550 551 552 553 554 555 556
		else if (opt->first_parent_only) {
			/*
			 * Generate merge log entry only for the first
			 * parent, showing summary diff of the others
			 * we merged _in_.
			 */
			diff_tree_sha1(parents->item->object.sha1, sha1, "", &opt->diffopt);
			log_tree_diff_flush(opt);
			return !opt->loginfo;
		}
L
Linus Torvalds 已提交
557 558 559

		/* If we show individual diffs, show the parent info */
		log->parent = parents->item;
560 561
	}

L
Linus Torvalds 已提交
562 563
	showed_log = 0;
	for (;;) {
564 565
		struct commit *parent = parents->item;

L
Linus Torvalds 已提交
566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583
		diff_tree_sha1(parent->object.sha1, sha1, "", &opt->diffopt);
		log_tree_diff_flush(opt);

		showed_log |= !opt->loginfo;

		/* Set up the log info for the next parent, if any.. */
		parents = parents->next;
		if (!parents)
			break;
		log->parent = parents->item;
		opt->loginfo = log;
	}
	return showed_log;
}

int log_tree_commit(struct rev_info *opt, struct commit *commit)
{
	struct log_info log;
584
	int shown;
L
Linus Torvalds 已提交
585 586 587 588 589

	log.commit = commit;
	log.parent = NULL;
	opt->loginfo = &log;

590 591
	shown = log_tree_diff(opt, commit, &log);
	if (!shown && opt->loginfo && opt->always_show_header) {
L
Linus Torvalds 已提交
592
		log.parent = NULL;
593
		show_log(opt);
594
		shown = 1;
595
	}
L
Linus Torvalds 已提交
596
	opt->loginfo = NULL;
597
	maybe_flush_or_die(stdout, "stdout");
598
	return shown;
599
}