[thirdparty/git.git] / log-tree.c

#include "cache.h"
#include "diff.h"
#include "commit.h"
#include "log-tree.h"
#include "reflog-walk.h"

struct decoration name_decoration = { "object names" };

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;
		printf(" %s", diff_unique_abbrev(parent->object.sha1, abbrev));
	}
}

void show_decorations(struct commit *commit)
{
	const char *prefix;
	struct name_decoration *decoration;

	decoration = lookup_decoration(&name_decoration, &commit->object);
	if (!decoration)
		return;
	prefix = " (";
	while (decoration) {
		printf("%s%s", prefix, decoration->name);
		prefix = ", ";
		decoration = decoration->next;
	}
	putchar(')');
}

/*
 * 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)
{
	char ch, *cp;
	int seen_colon = 0;
	int seen_at = 0;
	int seen_name = 0;
	int seen_head = 0;

	cp = letter + size;
	while (letter <= --cp && (ch = *cp) == '\n')
		continue;

	while (letter <= cp) {
		ch = *cp--;
		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;
}

static void append_signoff(struct strbuf *sb, const char *signoff)
{
	static const char signed_off_by[] = "Signed-off-by: ";
	size_t signoff_len = strlen(signoff);
	int has_signoff = 0;
	char *cp;

	cp = sb->buf;

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

		has_signoff = 1;

		cp += strlen(signed_off_by);
		if (cp + signoff_len >= sb->buf + sb->len)
			break;
		if (strncmp(cp, signoff, signoff_len))
			continue;
		if (!isspace(cp[signoff_len]))
			continue;
		/* we already have him */
		return;
	}

	if (!has_signoff)
		has_signoff = detect_any_signoff(sb->buf, sb->len);

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

	strbuf_addstr(sb, signed_off_by);
	strbuf_add(sb, signoff, signoff_len);
	strbuf_addch(sb, '\n');
}

static unsigned int digits_in_number(unsigned int number)
{
	unsigned int i = 10, result = 1;
	while (i <= number) {
		i *= 10;
		result++;
	}
	return result;
}

static int has_non_ascii(const char *s)
{
	int ch;
	if (!s)
		return 0;
	while ((ch = *s++) != '\0') {
		if (non_ascii(ch))
			return 1;
	}
	return 0;
}

void show_log(struct rev_info *opt, const char *sep)
{
	struct strbuf msgbuf;
	struct log_info *log = opt->loginfo;
	struct commit *commit = log->commit, *parent = log->parent;
	int abbrev = opt->diffopt.abbrev;
	int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
	const char *extra;
	const char *subject = NULL, *extra_headers = opt->extra_headers;

	opt->loginfo = NULL;
	if (!opt->verbose_header) {
		if (opt->left_right) {
			if (commit->object.flags & BOUNDARY)
				putchar('-');
			else if (commit->object.flags & SYMMETRIC_LEFT)
				putchar('<');
			else
				putchar('>');
		}
		fputs(diff_unique_abbrev(commit->object.sha1, abbrev_commit), stdout);
		if (opt->parents)
			show_parents(commit, abbrev_commit);
		show_decorations(commit);
		putchar(opt->diffopt.line_termination);
		return;
	}

	/*
	 * The "oneline" format has several special cases:
	 *  - The pretty-printed commit lacks a newline at the end
	 *    of the buffer, but we do want to make sure that we
	 *    have a newline there. If the separator isn't already
	 *    a newline, add an extra one.
	 *  - unlike other log messages, the one-line format does
	 *    not have an empty line between entries.
	 */
	extra = "";
	if (*sep != '\n' && opt->commit_format == CMIT_FMT_ONELINE)
		extra = "\n";
	if (opt->shown_one && opt->commit_format != CMIT_FMT_ONELINE)
		putchar(opt->diffopt.line_termination);
	opt->shown_one = 1;

	/*
	 * Print header line of header..
	 */

	if (opt->commit_format == CMIT_FMT_EMAIL) {
		char *sha1 = sha1_to_hex(commit->object.sha1);
		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", sha1);
		if (opt->message_id)
			printf("Message-Id: <%s>\n", opt->message_id);
		if (opt->ref_message_id)
			printf("In-Reply-To: <%s>\nReferences: <%s>\n",
			       opt->ref_message_id, opt->ref_message_id);
		if (opt->mime_boundary) {
			static char subject_buffer[1024];
			static char buffer[1024];
			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;

			snprintf(buffer, sizeof(buffer) - 1,
				 "--%s%s\n"
				 "Content-Type: text/x-patch;"
				 " name=\"%s.diff\"\n"
				 "Content-Transfer-Encoding: 8bit\n"
				 "Content-Disposition: %s;"
				 " filename=\"%s.diff\"\n\n",
				 mime_boundary_leader, opt->mime_boundary,
				 sha1,
				 opt->no_inline ? "attachment" : "inline",
				 sha1);
			opt->diffopt.stat_sep = buffer;
		}
	} else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
		fputs(diff_get_color(opt->diffopt.color_diff, DIFF_COMMIT),
		      stdout);
		if (opt->commit_format != CMIT_FMT_ONELINE)
			fputs("commit ", stdout);
		if (commit->object.flags & BOUNDARY)
			putchar('-');
		else if (opt->left_right) {
			if (commit->object.flags & SYMMETRIC_LEFT)
				putchar('<');
			else
				putchar('>');
		}
		fputs(diff_unique_abbrev(commit->object.sha1, abbrev_commit),
		      stdout);
		if (opt->parents)
			show_parents(commit, abbrev_commit);
		if (parent)
			printf(" (from %s)",
			       diff_unique_abbrev(parent->object.sha1,
						  abbrev_commit));
		show_decorations(commit);
		printf("%s",
		       diff_get_color(opt->diffopt.color_diff, DIFF_RESET));
		putchar(opt->commit_format == CMIT_FMT_ONELINE ? ' ' : '\n');
		if (opt->reflog_info) {
			show_reflog_message(opt->reflog_info,
				    opt->commit_format == CMIT_FMT_ONELINE,
				    opt->date_mode);
			if (opt->commit_format == CMIT_FMT_ONELINE) {
				printf("%s", sep);
				return;
			}
		}
	}

	/*
	 * And then the pretty-printed message itself
	 */
	strbuf_init(&msgbuf, 0);
	pretty_print_commit(opt->commit_format, commit, &msgbuf,
			    abbrev, subject, extra_headers, opt->date_mode,
			    has_non_ascii(opt->add_signoff));

	if (opt->add_signoff)
		append_signoff(&msgbuf, opt->add_signoff);
	if (opt->show_log_size)
		printf("log size %i\n", (int)msgbuf.len);

	if (msgbuf.len)
		printf("%s%s%s", msgbuf.buf, extra, sep);
	strbuf_release(&msgbuf);
}

int log_tree_diff_flush(struct rev_info *opt)
{
	diffcore_std(&opt->diffopt);

	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;
	}

	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.
		 */
		show_log(opt, opt->diffopt.msg_sep);
		if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) &&
		    opt->verbose_header &&
		    opt->commit_format != CMIT_FMT_ONELINE) {
			int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
			if ((pch & opt->diffopt.output_format) == pch)
				printf("---");
			putchar('\n');
		}
	}
	diff_flush(&opt->diffopt);
	return 1;
}

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

	diff_tree_combined_merge(sha1, opt->dense_combined_merges, opt);
	return !opt->loginfo;
}

/*
 * 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)
{
	int showed_log;
	struct commit_list *parents;
	unsigned const char *sha1 = commit->object.sha1;

	if (!opt->diff)
		return 0;

	/* Root commit? */
	parents = commit->parents;
	if (!parents) {
		if (opt->show_root_diff) {
			diff_root_tree_sha1(sha1, "", &opt->diffopt);
			log_tree_diff_flush(opt);
		}
		return !opt->loginfo;
	}

	/* More than one parent? */
	if (parents && parents->next) {
		if (opt->ignore_merges)
			return 0;
		else if (opt->combine_merges)
			return do_diff_combined(opt, commit);

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

	showed_log = 0;
	for (;;) {
		struct commit *parent = parents->item;

		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;
	int shown;

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

	shown = log_tree_diff(opt, commit, &log);
	if (!shown && opt->loginfo && opt->always_show_header) {
		log.parent = NULL;
		show_log(opt, "");
		shown = 1;
	}
	opt->loginfo = NULL;
	maybe_flush_or_die(stdout, "stdout");
	return shown;
}
Commit	Line	Data
5f1c3f07 JH	1	#include "cache.h"
	2	#include "diff.h"
	3	#include "commit.h"
	4	#include "log-tree.h"
8860fd42	5	#include "reflog-walk.h"
5f1c3f07	6
ca135e7a LT	7	struct decoration name_decoration = { "object names" };
ca135e7a LT	8
c8c893c6 LT	9	static void show_parents(struct commit *commit, int abbrev)
	10	{
	11	struct commit_list *p;
	12	for (p = commit->parents; p ; p = p->next) {
	13	struct commit *parent = p->item;
	14	printf(" %s", diff_unique_abbrev(parent->object.sha1, abbrev));
	15	}
	16	}
	17
50e62a8e	18	void show_decorations(struct commit *commit)
ca135e7a LT	19	{
	20	const char *prefix;
	21	struct name_decoration *decoration;
	22
	23	decoration = lookup_decoration(&name_decoration, &commit->object);
	24	if (!decoration)
	25	return;
	26	prefix = " (";
	27	while (decoration) {
	28	printf("%s%s", prefix, decoration->name);
	29	prefix = ", ";
	30	decoration = decoration->next;
	31	}
	32	putchar(')');
	33	}
	34
fc1c75ec FBH	35	/*
	36	* Search for "^[-A-Za-z]+: [^@]+@" pattern. It usually matches
	37	* Signed-off-by: and Acked-by: lines.
	38	*/
	39	static int detect_any_signoff(char *letter, int size)
	40	{
	41	char ch, *cp;
	42	int seen_colon = 0;
	43	int seen_at = 0;
	44	int seen_name = 0;
	45	int seen_head = 0;
	46
	47	cp = letter + size;
	48	while (letter <= --cp && (ch = *cp) == '\n')
	49	continue;
	50
	51	while (letter <= cp) {
	52	ch = *cp--;
	53	if (ch == '\n')
	54	break;
	55
	56	if (!seen_at) {
	57	if (ch == '@')
	58	seen_at = 1;
	59	continue;
	60	}
	61	if (!seen_colon) {
	62	if (ch == '@')
	63	return 0;
	64	else if (ch == ':')
	65	seen_colon = 1;
	66	else
	67	seen_name = 1;
	68	continue;
	69	}
	70	if (('A' <= ch && ch <= 'Z') \|\|
	71	('a' <= ch && ch <= 'z') \|\|
	72	ch == '-') {
	73	seen_head = 1;
	74	continue;
	75	}
	76	/* no empty last line doesn't match */
	77	return 0;
	78	}
	79	return seen_head && seen_name;
	80	}
	81
674d1727	82	static void append_signoff(struct strbuf sb, const char signoff)
cf2251b6	83	{
cf2251b6	84	static const char signed_off_by[] = "Signed-off-by: ";
80583c0e	85	size_t signoff_len = strlen(signoff);
fc1c75ec	86	int has_signoff = 0;
80583c0e	87	char *cp;
cf2251b6	88
674d1727	89	cp = sb->buf;
cf2251b6 JH	90
cf2251b6 JH	91	/* First see if we already have the sign-off by the signer */
fc1c75ec FBH	92	while ((cp = strstr(cp, signed_off_by))) {
	93
	94	has_signoff = 1;
	95
cf2251b6	96	cp += strlen(signed_off_by);
674d1727	97	if (cp + signoff_len >= sb->buf + sb->len)
fc1c75ec FBH	98	break;
	99	if (strncmp(cp, signoff, signoff_len))
	100	continue;
	101	if (!isspace(cp[signoff_len]))
	102	continue;
	103	/* we already have him */
674d1727	104	return;
cf2251b6 JH	105	}
cf2251b6 JH	106
fc1c75ec	107	if (!has_signoff)
674d1727	108	has_signoff = detect_any_signoff(sb->buf, sb->len);
fc1c75ec FBH	109
fc1c75ec FBH	110	if (!has_signoff)
674d1727	111	strbuf_addch(sb, '\n');
c35f4c37	112
674d1727 PH	113	strbuf_addstr(sb, signed_off_by);
	114	strbuf_add(sb, signoff, signoff_len);
	115	strbuf_addch(sb, '\n');
cf2251b6 JH	116	}
cf2251b6 JH	117
e00de24b JS	118	static unsigned int digits_in_number(unsigned int number)
	119	{
	120	unsigned int i = 10, result = 1;
	121	while (i <= number) {
	122	i *= 10;
	123	result++;
	124	}
	125	return result;
	126	}
	127
4593fb84 JH	128	static int has_non_ascii(const char *s)
	129	{
	130	int ch;
	131	if (!s)
	132	return 0;
	133	while ((ch = *s++) != '\0') {
	134	if (non_ascii(ch))
	135	return 1;
	136	}
	137	return 0;
	138	}
	139
39bc9a6c	140	void show_log(struct rev_info opt, const char sep)
91539833	141	{
674d1727	142	struct strbuf msgbuf;
39bc9a6c	143	struct log_info *log = opt->loginfo;
91539833 LT	144	struct commit commit = log->commit, parent = log->parent;
	145	int abbrev = opt->diffopt.abbrev;
	146	int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
a4d34e2d	147	const char *extra;
20ff0680	148	const char subject = NULL, extra_headers = opt->extra_headers;
91539833 LT	149
	150	opt->loginfo = NULL;
	151	if (!opt->verbose_header) {
74bd9029 JH	152	if (opt->left_right) {
	153	if (commit->object.flags & BOUNDARY)
	154	putchar('-');
	155	else if (commit->object.flags & SYMMETRIC_LEFT)
	156	putchar('<');
	157	else
	158	putchar('>');
	159	}
c8c893c6 LT	160	fputs(diff_unique_abbrev(commit->object.sha1, abbrev_commit), stdout);
	161	if (opt->parents)
	162	show_parents(commit, abbrev_commit);
ca135e7a	163	show_decorations(commit);
1dcb6922	164	putchar(opt->diffopt.line_termination);
91539833 LT	165	return;
	166	}
	167
	168	/*
a4d34e2d LT	169	* The "oneline" format has several special cases:
	170	* - The pretty-printed commit lacks a newline at the end
	171	* of the buffer, but we do want to make sure that we
	172	* have a newline there. If the separator isn't already
	173	* a newline, add an extra one.
	174	* - unlike other log messages, the one-line format does
	175	* not have an empty line between entries.
91539833	176	*/
a4d34e2d LT	177	extra = "";
	178	if (*sep != '\n' && opt->commit_format == CMIT_FMT_ONELINE)
	179	extra = "\n";
91539833	180	if (opt->shown_one && opt->commit_format != CMIT_FMT_ONELINE)
abd4e222	181	putchar(opt->diffopt.line_termination);
91539833 LT	182	opt->shown_one = 1;
	183
	184	/*
	185	* Print header line of header..
	186	*/
3eefc189	187
596524b3	188	if (opt->commit_format == CMIT_FMT_EMAIL) {
698ce6f8	189	char *sha1 = sha1_to_hex(commit->object.sha1);
596524b3 JS	190	if (opt->total > 0) {
	191	static char buffer[64];
	192	snprintf(buffer, sizeof(buffer),
2d9e4a47 RJ	193	"Subject: [%s %0*d/%d] ",
2d9e4a47 RJ	194	opt->subject_prefix,
e00de24b	195	digits_in_number(opt->total),
596524b3 JS	196	opt->nr, opt->total);
596524b3 JS	197	subject = buffer;
88c447e8	198	} else if (opt->total == 0 && opt->subject_prefix && *opt->subject_prefix) {
2d9e4a47 RJ	199	static char buffer[256];
	200	snprintf(buffer, sizeof(buffer),
	201	"Subject: [%s] ",
	202	opt->subject_prefix);
	203	subject = buffer;
	204	} else {
8ac80a57	205	subject = "Subject: ";
2d9e4a47	206	}
8ac80a57	207
698ce6f8	208	printf("From %s Mon Sep 17 00:00:00 2001\n", sha1);
d1566f78 JT	209	if (opt->message_id)
	210	printf("Message-Id: <%s>\n", opt->message_id);
	211	if (opt->ref_message_id)
	212	printf("In-Reply-To: <%s>\nReferences: <%s>\n",
	213	opt->ref_message_id, opt->ref_message_id);
698ce6f8 JS	214	if (opt->mime_boundary) {
	215	static char subject_buffer[1024];
	216	static char buffer[1024];
	217	snprintf(subject_buffer, sizeof(subject_buffer) - 1,
20ff0680	218	"%s"
698ce6f8	219	"MIME-Version: 1.0\n"
33ee4cfb	220	"Content-Type: multipart/mixed;"
698ce6f8 JS	221	" boundary=\"%s%s\"\n"
	222	"\n"
	223	"This is a multi-part message in MIME "
	224	"format.\n"
	225	"--%s%s\n"
	226	"Content-Type: text/plain; "
	227	"charset=UTF-8; format=fixed\n"
	228	"Content-Transfer-Encoding: 8bit\n\n",
20ff0680	229	extra_headers ? extra_headers : "",
698ce6f8 JS	230	mime_boundary_leader, opt->mime_boundary,
698ce6f8 JS	231	mime_boundary_leader, opt->mime_boundary);
20ff0680	232	extra_headers = subject_buffer;
698ce6f8 JS	233
	234	snprintf(buffer, sizeof(buffer) - 1,
	235	"--%s%s\n"
33ee4cfb	236	"Content-Type: text/x-patch;"
698ce6f8 JS	237	" name=\"%s.diff\"\n"
698ce6f8 JS	238	"Content-Transfer-Encoding: 8bit\n"
33ee4cfb	239	"Content-Disposition: %s;"
698ce6f8 JS	240	" filename=\"%s.diff\"\n\n",
698ce6f8 JS	241	mime_boundary_leader, opt->mime_boundary,
c112f689 JS	242	sha1,
	243	opt->no_inline ? "attachment" : "inline",
	244	sha1);
698ce6f8 JS	245	opt->diffopt.stat_sep = buffer;
698ce6f8 JS	246	}
e52a5de4	247	} else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
74bd9029 JH	248	fputs(diff_get_color(opt->diffopt.color_diff, DIFF_COMMIT),
	249	stdout);
	250	if (opt->commit_format != CMIT_FMT_ONELINE)
	251	fputs("commit ", stdout);
e330a406 LT	252	if (commit->object.flags & BOUNDARY)
	253	putchar('-');
	254	else if (opt->left_right) {
	255	if (commit->object.flags & SYMMETRIC_LEFT)
74bd9029 JH	256	putchar('<');
	257	else
	258	putchar('>');
	259	}
	260	fputs(diff_unique_abbrev(commit->object.sha1, abbrev_commit),
	261	stdout);
c66b6c06 JH	262	if (opt->parents)
c66b6c06 JH	263	show_parents(commit, abbrev_commit);
73f0a157	264	if (parent)
3eefc189 JH	265	printf(" (from %s)",
	266	diff_unique_abbrev(parent->object.sha1,
	267	abbrev_commit));
ca135e7a	268	show_decorations(commit);
ce436973 JK	269	printf("%s",
ce436973 JK	270	diff_get_color(opt->diffopt.color_diff, DIFF_RESET));
e557667e	271	putchar(opt->commit_format == CMIT_FMT_ONELINE ? ' ' : '\n');
903b45fe	272	if (opt->reflog_info) {
4d12a471	273	show_reflog_message(opt->reflog_info,
4e244cbc	274	opt->commit_format == CMIT_FMT_ONELINE,
a7b02ccf	275	opt->date_mode);
903b45fe NP	276	if (opt->commit_format == CMIT_FMT_ONELINE) {
	277	printf("%s", sep);
	278	return;
	279	}
	280	}
3eefc189	281	}
91539833 LT	282
	283	/*
	284	* And then the pretty-printed message itself
	285	*/
674d1727 PH	286	strbuf_init(&msgbuf, 0);
674d1727 PH	287	pretty_print_commit(opt->commit_format, commit, &msgbuf,
4593fb84 JH	288	abbrev, subject, extra_headers, opt->date_mode,
4593fb84 JH	289	has_non_ascii(opt->add_signoff));
cf2251b6 JH	290
cf2251b6 JH	291	if (opt->add_signoff)
674d1727	292	append_signoff(&msgbuf, opt->add_signoff);
9fa3465d	293	if (opt->show_log_size)
674d1727	294	printf("log size %i\n", (int)msgbuf.len);
9fa3465d	295
cc61ae82 JH	296	if (msgbuf.len)
cc61ae82 JH	297	printf("%s%s%s", msgbuf.buf, extra, sep);
674d1727	298	strbuf_release(&msgbuf);
91539833 LT	299	}
91539833 LT	300
cd2bdc53	301	int log_tree_diff_flush(struct rev_info *opt)
5f1c3f07 JH	302	{
5f1c3f07 JH	303	diffcore_std(&opt->diffopt);
91539833	304
5f1c3f07 JH	305	if (diff_queue_is_empty()) {
	306	int saved_fmt = opt->diffopt.output_format;
	307	opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
	308	diff_flush(&opt->diffopt);
	309	opt->diffopt.output_format = saved_fmt;
	310	return 0;
	311	}
91539833	312
3969cf7d JH	313	if (opt->loginfo && !opt->no_commit_id) {
	314	/* When showing a verbose header (i.e. log message),
	315	* and not in --pretty=oneline format, we would want
	316	* an extra newline between the end of log and the
	317	* output for readability.
	318	*/
39bc9a6c	319	show_log(opt, opt->diffopt.msg_sep);
304b5af6 LT	320	if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) &&
304b5af6 LT	321	opt->verbose_header &&
3969cf7d JH	322	opt->commit_format != CMIT_FMT_ONELINE) {
	323	int pch = DIFF_FORMAT_DIFFSTAT \| DIFF_FORMAT_PATCH;
	324	if ((pch & opt->diffopt.output_format) == pch)
abd4e222 LT	325	printf("---");
abd4e222 LT	326	putchar('\n');
3969cf7d JH	327	}
3969cf7d JH	328	}
5f1c3f07 JH	329	diff_flush(&opt->diffopt);
	330	return 1;
	331	}
	332
cd2bdc53	333	static int do_diff_combined(struct rev_info opt, struct commit commit)
5f1c3f07 JH	334	{
	335	unsigned const char *sha1 = commit->object.sha1;
	336
91539833 LT	337	diff_tree_combined_merge(sha1, opt->dense_combined_merges, opt);
91539833 LT	338	return !opt->loginfo;
5f1c3f07 JH	339	}
5f1c3f07 JH	340
91539833 LT	341	/*
	342	* Show the diff of a commit.
	343	*
	344	* Return true if we printed any log info messages
	345	*/
	346	static int log_tree_diff(struct rev_info opt, struct commit commit, struct log_info *log)
5f1c3f07	347	{
91539833	348	int showed_log;
5f1c3f07 JH	349	struct commit_list *parents;
	350	unsigned const char *sha1 = commit->object.sha1;
	351
91539833 LT	352	if (!opt->diff)
	353	return 0;
	354
5f1c3f07	355	/* Root commit? */
91539833 LT	356	parents = commit->parents;
91539833 LT	357	if (!parents) {
2b60356d RS	358	if (opt->show_root_diff) {
	359	diff_root_tree_sha1(sha1, "", &opt->diffopt);
	360	log_tree_diff_flush(opt);
	361	}
91539833	362	return !opt->loginfo;
5f1c3f07 JH	363	}
	364
	365	/* More than one parent? */
91539833	366	if (parents && parents->next) {
5f1c3f07 JH	367	if (opt->ignore_merges)
	368	return 0;
	369	else if (opt->combine_merges)
	370	return do_diff_combined(opt, commit);
91539833 LT	371
	372	/* If we show individual diffs, show the parent info */
	373	log->parent = parents->item;
5f1c3f07 JH	374	}
5f1c3f07 JH	375
91539833 LT	376	showed_log = 0;
91539833 LT	377	for (;;) {
5f1c3f07	378	struct commit *parent = parents->item;
5f1c3f07	379
91539833 LT	380	diff_tree_sha1(parent->object.sha1, sha1, "", &opt->diffopt);
	381	log_tree_diff_flush(opt);
	382
	383	showed_log \|= !opt->loginfo;
	384
	385	/* Set up the log info for the next parent, if any.. */
	386	parents = parents->next;
	387	if (!parents)
	388	break;
	389	log->parent = parents->item;
	390	opt->loginfo = log;
	391	}
	392	return showed_log;
	393	}
	394
	395	int log_tree_commit(struct rev_info opt, struct commit commit)
	396	{
	397	struct log_info log;
3eefc189	398	int shown;
91539833 LT	399
	400	log.commit = commit;
	401	log.parent = NULL;
	402	opt->loginfo = &log;
	403
3eefc189 JH	404	shown = log_tree_diff(opt, commit, &log);
3eefc189 JH	405	if (!shown && opt->loginfo && opt->always_show_header) {
91539833	406	log.parent = NULL;
39bc9a6c	407	show_log(opt, "");
3eefc189	408	shown = 1;
5f1c3f07	409	}
91539833	410	opt->loginfo = NULL;
06f59e9f	411	maybe_flush_or_die(stdout, "stdout");
3eefc189	412	return shown;
5f1c3f07	413	}