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

#include "cache.h"
#include "diff.h"
#include "commit.h"
#include "graph.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 log_write_email_headers(struct rev_info *opt, const char *name,
			     const char **subject_p,
			     const char **extra_headers_p,
			     int *need_8bit_cte_p)
{
	const char *subject = NULL;
	const char *extra_headers = opt->extra_headers;

	*need_8bit_cte_p = 0; /* unknown */
	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);
	graph_show_oneline(opt->graph);
	if (opt->message_id) {
		printf("Message-Id: <%s>\n", opt->message_id);
		graph_show_oneline(opt->graph);
	}
	if (opt->ref_message_id) {
		printf("In-Reply-To: <%s>\nReferences: <%s>\n",
		       opt->ref_message_id, opt->ref_message_id);
		graph_show_oneline(opt->graph);
	}
	if (opt->mime_boundary) {
		static char subject_buffer[1024];
		static char buffer[1024];
		*need_8bit_cte_p = -1; /* NEVER */
		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,
			 name,
			 opt->no_inline ? "attachment" : "inline",
			 name);
		opt->diffopt.stat_sep = buffer;
	}
	*subject_p = subject;
	*extra_headers_p = extra_headers;
}

void show_log(struct rev_info *opt)
{
	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 *subject = NULL, *extra_headers = opt->extra_headers;
	int need_8bit_cte = 0;

	opt->loginfo = NULL;
	if (!opt->verbose_header) {
		graph_show_commit(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('>');
		}
		fputs(diff_unique_abbrev(commit->object.sha1, abbrev_commit), stdout);
		if (opt->print_parents)
			show_parents(commit, abbrev_commit);
		show_decorations(commit);
		if (opt->graph && !graph_is_commit_finished(opt->graph)) {
			putchar('\n');
			graph_show_remainder(opt->graph);
		}
		putchar(opt->diffopt.line_termination);
		return;
	}

	/*
	 * If use_terminator is set, add a newline at the end of the entry.
	 * Otherwise, add a diffopt.line_termination character before all
	 * entries but the first.  (IOW, as a separator between entries)
	 */
	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);
		putchar(opt->diffopt.line_termination);
	}
	opt->shown_one = 1;

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

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

	if (opt->commit_format == CMIT_FMT_EMAIL) {
		log_write_email_headers(opt, sha1_to_hex(commit->object.sha1),
					&subject, &extra_headers,
					&need_8bit_cte);
	} else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
		fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), stdout);
		if (opt->commit_format != CMIT_FMT_ONELINE)
			fputs("commit ", stdout);
		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('>');
		}
		fputs(diff_unique_abbrev(commit->object.sha1, abbrev_commit),
		      stdout);
		if (opt->print_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(&opt->diffopt, DIFF_RESET));
		if (opt->commit_format == CMIT_FMT_ONELINE) {
			putchar(' ');
		} else {
			putchar('\n');
			graph_show_oneline(opt->graph);
		}
		if (opt->reflog_info) {
			/*
			 * 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.
			 */
			show_reflog_message(opt->reflog_info,
				    opt->commit_format == CMIT_FMT_ONELINE,
				    opt->date_mode);
			if (opt->commit_format == CMIT_FMT_ONELINE)
				return;
		}
	}

	if (!commit->buffer)
		return;

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

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

	/*
	 * 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
		fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
	if (opt->use_terminator) {
		if (!opt->missing_newline)
			graph_show_padding(opt->graph);
		putchar('\n');
	}

	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);
		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"
7fefda5c	4	#include "graph.h"
5f1c3f07	5	#include "log-tree.h"
8860fd42	6	#include "reflog-walk.h"
5f1c3f07	7
ca135e7a LT	8	struct decoration name_decoration = { "object names" };
ca135e7a LT	9
c8c893c6 LT	10	static void show_parents(struct commit *commit, int abbrev)
	11	{
	12	struct commit_list *p;
	13	for (p = commit->parents; p ; p = p->next) {
	14	struct commit *parent = p->item;
	15	printf(" %s", diff_unique_abbrev(parent->object.sha1, abbrev));
	16	}
	17	}
	18
50e62a8e	19	void show_decorations(struct commit *commit)
ca135e7a LT	20	{
	21	const char *prefix;
	22	struct name_decoration *decoration;
	23
	24	decoration = lookup_decoration(&name_decoration, &commit->object);
	25	if (!decoration)
	26	return;
	27	prefix = " (";
	28	while (decoration) {
	29	printf("%s%s", prefix, decoration->name);
	30	prefix = ", ";
	31	decoration = decoration->next;
	32	}
	33	putchar(')');
	34	}
	35
fc1c75ec FBH	36	/*
	37	* Search for "^[-A-Za-z]+: [^@]+@" pattern. It usually matches
	38	* Signed-off-by: and Acked-by: lines.
	39	*/
	40	static int detect_any_signoff(char *letter, int size)
	41	{
	42	char ch, *cp;
	43	int seen_colon = 0;
	44	int seen_at = 0;
	45	int seen_name = 0;
	46	int seen_head = 0;
	47
	48	cp = letter + size;
	49	while (letter <= --cp && (ch = *cp) == '\n')
	50	continue;
	51
	52	while (letter <= cp) {
	53	ch = *cp--;
	54	if (ch == '\n')
	55	break;
	56
	57	if (!seen_at) {
	58	if (ch == '@')
	59	seen_at = 1;
	60	continue;
	61	}
	62	if (!seen_colon) {
	63	if (ch == '@')
	64	return 0;
	65	else if (ch == ':')
	66	seen_colon = 1;
	67	else
	68	seen_name = 1;
	69	continue;
	70	}
	71	if (('A' <= ch && ch <= 'Z') \|\|
	72	('a' <= ch && ch <= 'z') \|\|
	73	ch == '-') {
	74	seen_head = 1;
	75	continue;
	76	}
	77	/* no empty last line doesn't match */
	78	return 0;
	79	}
	80	return seen_head && seen_name;
	81	}
	82
674d1727	83	static void append_signoff(struct strbuf sb, const char signoff)
cf2251b6	84	{
cf2251b6	85	static const char signed_off_by[] = "Signed-off-by: ";
80583c0e	86	size_t signoff_len = strlen(signoff);
fc1c75ec	87	int has_signoff = 0;
80583c0e	88	char *cp;
cf2251b6	89
674d1727	90	cp = sb->buf;
cf2251b6 JH	91
cf2251b6 JH	92	/* First see if we already have the sign-off by the signer */
fc1c75ec FBH	93	while ((cp = strstr(cp, signed_off_by))) {
	94
	95	has_signoff = 1;
	96
cf2251b6	97	cp += strlen(signed_off_by);
674d1727	98	if (cp + signoff_len >= sb->buf + sb->len)
fc1c75ec FBH	99	break;
	100	if (strncmp(cp, signoff, signoff_len))
	101	continue;
	102	if (!isspace(cp[signoff_len]))
	103	continue;
	104	/* we already have him */
674d1727	105	return;
cf2251b6 JH	106	}
cf2251b6 JH	107
fc1c75ec	108	if (!has_signoff)
674d1727	109	has_signoff = detect_any_signoff(sb->buf, sb->len);
fc1c75ec FBH	110
fc1c75ec FBH	111	if (!has_signoff)
674d1727	112	strbuf_addch(sb, '\n');
c35f4c37	113
674d1727 PH	114	strbuf_addstr(sb, signed_off_by);
	115	strbuf_add(sb, signoff, signoff_len);
	116	strbuf_addch(sb, '\n');
cf2251b6 JH	117	}
cf2251b6 JH	118
e00de24b JS	119	static unsigned int digits_in_number(unsigned int number)
	120	{
	121	unsigned int i = 10, result = 1;
	122	while (i <= number) {
	123	i *= 10;
	124	result++;
	125	}
	126	return result;
	127	}
	128
4593fb84 JH	129	static int has_non_ascii(const char *s)
	130	{
	131	int ch;
	132	if (!s)
	133	return 0;
	134	while ((ch = *s++) != '\0') {
	135	if (non_ascii(ch))
	136	return 1;
	137	}
	138	return 0;
	139	}
	140
b02bd65f	141	void log_write_email_headers(struct rev_info opt, const char name,
267123b4 JH	142	const char **subject_p,
	143	const char **extra_headers_p,
	144	int *need_8bit_cte_p)
b02bd65f DB	145	{
	146	const char *subject = NULL;
	147	const char *extra_headers = opt->extra_headers;
267123b4 JH	148
267123b4 JH	149	need_8bit_cte_p = 0; / unknown */
b02bd65f DB	150	if (opt->total > 0) {
	151	static char buffer[64];
	152	snprintf(buffer, sizeof(buffer),
	153	"Subject: [%s %0*d/%d] ",
	154	opt->subject_prefix,
	155	digits_in_number(opt->total),
	156	opt->nr, opt->total);
	157	subject = buffer;
	158	} else if (opt->total == 0 && opt->subject_prefix && *opt->subject_prefix) {
	159	static char buffer[256];
	160	snprintf(buffer, sizeof(buffer),
	161	"Subject: [%s] ",
	162	opt->subject_prefix);
	163	subject = buffer;
	164	} else {
	165	subject = "Subject: ";
	166	}
	167
	168	printf("From %s Mon Sep 17 00:00:00 2001\n", name);
7fefda5c AS	169	graph_show_oneline(opt->graph);
7fefda5c AS	170	if (opt->message_id) {
b02bd65f	171	printf("Message-Id: <%s>\n", opt->message_id);
7fefda5c AS	172	graph_show_oneline(opt->graph);
	173	}
	174	if (opt->ref_message_id) {
b02bd65f DB	175	printf("In-Reply-To: <%s>\nReferences: <%s>\n",
b02bd65f DB	176	opt->ref_message_id, opt->ref_message_id);
7fefda5c AS	177	graph_show_oneline(opt->graph);
7fefda5c AS	178	}
b02bd65f DB	179	if (opt->mime_boundary) {
	180	static char subject_buffer[1024];
	181	static char buffer[1024];
267123b4	182	need_8bit_cte_p = -1; / NEVER */
b02bd65f DB	183	snprintf(subject_buffer, sizeof(subject_buffer) - 1,
	184	"%s"
	185	"MIME-Version: 1.0\n"
	186	"Content-Type: multipart/mixed;"
	187	" boundary=\"%s%s\"\n"
	188	"\n"
	189	"This is a multi-part message in MIME "
	190	"format.\n"
	191	"--%s%s\n"
	192	"Content-Type: text/plain; "
	193	"charset=UTF-8; format=fixed\n"
	194	"Content-Transfer-Encoding: 8bit\n\n",
	195	extra_headers ? extra_headers : "",
	196	mime_boundary_leader, opt->mime_boundary,
	197	mime_boundary_leader, opt->mime_boundary);
	198	extra_headers = subject_buffer;
	199
	200	snprintf(buffer, sizeof(buffer) - 1,
	201	"--%s%s\n"
	202	"Content-Type: text/x-patch;"
	203	" name=\"%s.diff\"\n"
	204	"Content-Transfer-Encoding: 8bit\n"
	205	"Content-Disposition: %s;"
	206	" filename=\"%s.diff\"\n\n",
	207	mime_boundary_leader, opt->mime_boundary,
	208	name,
	209	opt->no_inline ? "attachment" : "inline",
	210	name);
	211	opt->diffopt.stat_sep = buffer;
	212	}
	213	*subject_p = subject;
	214	*extra_headers_p = extra_headers;
	215	}
	216
02865655	217	void show_log(struct rev_info *opt)
91539833	218	{
674d1727	219	struct strbuf msgbuf;
39bc9a6c	220	struct log_info *log = opt->loginfo;
91539833 LT	221	struct commit commit = log->commit, parent = log->parent;
	222	int abbrev = opt->diffopt.abbrev;
	223	int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
20ff0680	224	const char subject = NULL, extra_headers = opt->extra_headers;
6bf4f1b4	225	int need_8bit_cte = 0;
91539833 LT	226
	227	opt->loginfo = NULL;
	228	if (!opt->verbose_header) {
7fefda5c AS	229	graph_show_commit(opt->graph);
7fefda5c AS	230
3131b713 LT	231	if (commit->object.flags & BOUNDARY)
	232	putchar('-');
	233	else if (commit->object.flags & UNINTERESTING)
	234	putchar('^');
	235	else if (opt->left_right) {
	236	if (commit->object.flags & SYMMETRIC_LEFT)
74bd9029 JH	237	putchar('<');
	238	else
	239	putchar('>');
	240	}
c8c893c6	241	fputs(diff_unique_abbrev(commit->object.sha1, abbrev_commit), stdout);
885cf808	242	if (opt->print_parents)
c8c893c6	243	show_parents(commit, abbrev_commit);
ca135e7a	244	show_decorations(commit);
7fefda5c AS	245	if (opt->graph && !graph_is_commit_finished(opt->graph)) {
	246	putchar('\n');
	247	graph_show_remainder(opt->graph);
	248	}
1dcb6922	249	putchar(opt->diffopt.line_termination);
91539833 LT	250	return;
	251	}
	252
	253	/*
02865655 AS	254	* If use_terminator is set, add a newline at the end of the entry.
	255	* Otherwise, add a diffopt.line_termination character before all
	256	* entries but the first. (IOW, as a separator between entries)
91539833	257	*/
7fefda5c AS	258	if (opt->shown_one && !opt->use_terminator) {
	259	/*
	260	* If entries are separated by a newline, the output
	261	* should look human-readable. If the last entry ended
	262	* with a newline, print the graph output before this
	263	* newline. Otherwise it will end up as a completely blank
	264	* line and will look like a gap in the graph.
	265	*
	266	* If the entry separator is not a newline, the output is
	267	* primarily intended for programmatic consumption, and we
	268	* never want the extra graph output before the entry
	269	* separator.
	270	*/
	271	if (opt->diffopt.line_termination == '\n' &&
	272	!opt->missing_newline)
	273	graph_show_padding(opt->graph);
abd4e222	274	putchar(opt->diffopt.line_termination);
7fefda5c	275	}
91539833 LT	276	opt->shown_one = 1;
91539833 LT	277
7fefda5c AS	278	/*
	279	* If the history graph was requested,
	280	* print the graph, up to this commit's line
	281	*/
	282	graph_show_commit(opt->graph);
	283
91539833 LT	284	/*
	285	* Print header line of header..
	286	*/
3eefc189	287
596524b3	288	if (opt->commit_format == CMIT_FMT_EMAIL) {
b02bd65f	289	log_write_email_headers(opt, sha1_to_hex(commit->object.sha1),
267123b4 JH	290	&subject, &extra_headers,
267123b4 JH	291	&need_8bit_cte);
e52a5de4	292	} else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
8f67f8ae	293	fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), stdout);
74bd9029 JH	294	if (opt->commit_format != CMIT_FMT_ONELINE)
74bd9029 JH	295	fputs("commit ", stdout);
e330a406 LT	296	if (commit->object.flags & BOUNDARY)
e330a406 LT	297	putchar('-');
3131b713 LT	298	else if (commit->object.flags & UNINTERESTING)
3131b713 LT	299	putchar('^');
e330a406 LT	300	else if (opt->left_right) {
e330a406 LT	301	if (commit->object.flags & SYMMETRIC_LEFT)
74bd9029 JH	302	putchar('<');
	303	else
	304	putchar('>');
	305	}
	306	fputs(diff_unique_abbrev(commit->object.sha1, abbrev_commit),
	307	stdout);
885cf808	308	if (opt->print_parents)
c66b6c06	309	show_parents(commit, abbrev_commit);
73f0a157	310	if (parent)
3eefc189 JH	311	printf(" (from %s)",
	312	diff_unique_abbrev(parent->object.sha1,
	313	abbrev_commit));
ca135e7a	314	show_decorations(commit);
8f67f8ae	315	printf("%s", diff_get_color_opt(&opt->diffopt, DIFF_RESET));
7fefda5c AS	316	if (opt->commit_format == CMIT_FMT_ONELINE) {
	317	putchar(' ');
	318	} else {
	319	putchar('\n');
	320	graph_show_oneline(opt->graph);
	321	}
903b45fe	322	if (opt->reflog_info) {
7fefda5c AS	323	/*
	324	* setup_revisions() ensures that opt->reflog_info
	325	* and opt->graph cannot both be set,
	326	* so we don't need to worry about printing the
	327	* graph info here.
	328	*/
4d12a471	329	show_reflog_message(opt->reflog_info,
4e244cbc	330	opt->commit_format == CMIT_FMT_ONELINE,
a7b02ccf	331	opt->date_mode);
02865655	332	if (opt->commit_format == CMIT_FMT_ONELINE)
903b45fe	333	return;
903b45fe	334	}
3eefc189	335	}
91539833	336
3131b713 LT	337	if (!commit->buffer)
	338	return;
	339
91539833 LT	340	/*
	341	* And then the pretty-printed message itself
	342	*/
674d1727	343	strbuf_init(&msgbuf, 0);
6bf4f1b4 JH	344	if (need_8bit_cte >= 0)
6bf4f1b4 JH	345	need_8bit_cte = has_non_ascii(opt->add_signoff);
674d1727	346	pretty_print_commit(opt->commit_format, commit, &msgbuf,
4593fb84	347	abbrev, subject, extra_headers, opt->date_mode,
6bf4f1b4	348	need_8bit_cte);
cf2251b6 JH	349
cf2251b6 JH	350	if (opt->add_signoff)
674d1727	351	append_signoff(&msgbuf, opt->add_signoff);
7fefda5c	352	if (opt->show_log_size) {
674d1727	353	printf("log size %i\n", (int)msgbuf.len);
7fefda5c AS	354	graph_show_oneline(opt->graph);
7fefda5c AS	355	}
9fa3465d	356
7fefda5c AS	357	/*
	358	* Set opt->missing_newline if msgbuf doesn't
	359	* end in a newline (including if it is empty)
	360	*/
	361	if (!msgbuf.len \|\| msgbuf.buf[msgbuf.len - 1] != '\n')
	362	opt->missing_newline = 1;
	363	else
	364	opt->missing_newline = 0;
	365
	366	if (opt->graph)
	367	graph_show_commit_msg(opt->graph, &msgbuf);
	368	else
42c8c74c	369	fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
7fefda5c AS	370	if (opt->use_terminator) {
	371	if (!opt->missing_newline)
	372	graph_show_padding(opt->graph);
9b58bfe8	373	putchar('\n');
7fefda5c AS	374	}
7fefda5c AS	375
674d1727	376	strbuf_release(&msgbuf);
91539833 LT	377	}
91539833 LT	378
cd2bdc53	379	int log_tree_diff_flush(struct rev_info *opt)
5f1c3f07 JH	380	{
5f1c3f07 JH	381	diffcore_std(&opt->diffopt);
91539833	382
5f1c3f07 JH	383	if (diff_queue_is_empty()) {
	384	int saved_fmt = opt->diffopt.output_format;
	385	opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
	386	diff_flush(&opt->diffopt);
	387	opt->diffopt.output_format = saved_fmt;
	388	return 0;
	389	}
91539833	390
3969cf7d JH	391	if (opt->loginfo && !opt->no_commit_id) {
	392	/* When showing a verbose header (i.e. log message),
	393	* and not in --pretty=oneline format, we would want
	394	* an extra newline between the end of log and the
	395	* output for readability.
	396	*/
02865655	397	show_log(opt);
304b5af6 LT	398	if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) &&
304b5af6 LT	399	opt->verbose_header &&
3969cf7d JH	400	opt->commit_format != CMIT_FMT_ONELINE) {
	401	int pch = DIFF_FORMAT_DIFFSTAT \| DIFF_FORMAT_PATCH;
	402	if ((pch & opt->diffopt.output_format) == pch)
abd4e222 LT	403	printf("---");
abd4e222 LT	404	putchar('\n');
3969cf7d JH	405	}
3969cf7d JH	406	}
5f1c3f07 JH	407	diff_flush(&opt->diffopt);
	408	return 1;
	409	}
	410
cd2bdc53	411	static int do_diff_combined(struct rev_info opt, struct commit commit)
5f1c3f07 JH	412	{
	413	unsigned const char *sha1 = commit->object.sha1;
	414
91539833 LT	415	diff_tree_combined_merge(sha1, opt->dense_combined_merges, opt);
91539833 LT	416	return !opt->loginfo;
5f1c3f07 JH	417	}
5f1c3f07 JH	418
91539833 LT	419	/*
	420	* Show the diff of a commit.
	421	*
	422	* Return true if we printed any log info messages
	423	*/
	424	static int log_tree_diff(struct rev_info opt, struct commit commit, struct log_info *log)
5f1c3f07	425	{
91539833	426	int showed_log;
5f1c3f07 JH	427	struct commit_list *parents;
	428	unsigned const char *sha1 = commit->object.sha1;
	429
91539833 LT	430	if (!opt->diff)
	431	return 0;
	432
5f1c3f07	433	/* Root commit? */
91539833 LT	434	parents = commit->parents;
91539833 LT	435	if (!parents) {
2b60356d RS	436	if (opt->show_root_diff) {
	437	diff_root_tree_sha1(sha1, "", &opt->diffopt);
	438	log_tree_diff_flush(opt);
	439	}
91539833	440	return !opt->loginfo;
5f1c3f07 JH	441	}
	442
	443	/* More than one parent? */
91539833	444	if (parents && parents->next) {
5f1c3f07 JH	445	if (opt->ignore_merges)
	446	return 0;
	447	else if (opt->combine_merges)
	448	return do_diff_combined(opt, commit);
91539833 LT	449
	450	/* If we show individual diffs, show the parent info */
	451	log->parent = parents->item;
5f1c3f07 JH	452	}
5f1c3f07 JH	453
91539833 LT	454	showed_log = 0;
91539833 LT	455	for (;;) {
5f1c3f07	456	struct commit *parent = parents->item;
5f1c3f07	457
91539833 LT	458	diff_tree_sha1(parent->object.sha1, sha1, "", &opt->diffopt);
	459	log_tree_diff_flush(opt);
	460
	461	showed_log \|= !opt->loginfo;
	462
	463	/* Set up the log info for the next parent, if any.. */
	464	parents = parents->next;
	465	if (!parents)
	466	break;
	467	log->parent = parents->item;
	468	opt->loginfo = log;
	469	}
	470	return showed_log;
	471	}
	472
	473	int log_tree_commit(struct rev_info opt, struct commit commit)
	474	{
	475	struct log_info log;
3eefc189	476	int shown;
91539833 LT	477
	478	log.commit = commit;
	479	log.parent = NULL;
	480	opt->loginfo = &log;
	481
3eefc189 JH	482	shown = log_tree_diff(opt, commit, &log);
3eefc189 JH	483	if (!shown && opt->loginfo && opt->always_show_header) {
91539833	484	log.parent = NULL;
02865655	485	show_log(opt);
3eefc189	486	shown = 1;
5f1c3f07	487	}
91539833	488	opt->loginfo = NULL;
06f59e9f	489	maybe_flush_or_die(stdout, "stdout");
3eefc189	490	return shown;
5f1c3f07	491	}