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

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

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

static int append_signoff(char *buf, int buf_sz, int at, const char *signoff)
{
	int signoff_len = strlen(signoff);
	static const char signed_off_by[] = "Signed-off-by: ";
	char *cp = buf;

	/* Do we have enough space to add it? */
	if (buf_sz - at <= strlen(signed_off_by) + signoff_len + 2)
		return at;

	/* First see if we already have the sign-off by the signer */
	while (1) {
		cp = strstr(cp, signed_off_by);
		if (!cp)
			break;
		cp += strlen(signed_off_by);
		if ((cp + signoff_len < buf + at) &&
		    !strncmp(cp, signoff, signoff_len) &&
		    isspace(cp[signoff_len]))
			return at; /* we already have him */
	}

	strcpy(buf + at, signed_off_by);
	at += strlen(signed_off_by);
	strcpy(buf + at, signoff);
	at += signoff_len;
	buf[at++] = '\n';
	buf[at] = 0;
	return at;
}

void show_log(struct rev_info *opt, const char *sep)
{
	static char this_header[16384];
	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;
	int len;
	const char *subject = NULL, *extra_headers = opt->extra_headers;

	opt->loginfo = NULL;
	if (!opt->verbose_header) {
		fputs(diff_unique_abbrev(commit->object.sha1, abbrev_commit), stdout);
		if (opt->parents)
			show_parents(commit, abbrev_commit);
		putchar('\n');
		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('\n');
	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: [PATCH %d/%d] ",
					opt->nr, opt->total);
			subject = buffer;
		} else if (opt->total == 0)
			subject = "Subject: [PATCH] ";
		else
			subject = "Subject: ";

		printf("From %s Mon Sep 17 00:00:00 2001\n", sha1);
		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;\n"
				 " 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;\n"
				 " name=\"%s.diff\"\n"
				 "Content-Transfer-Encoding: 8bit\n"
				 "Content-Disposition: inline;\n"
				 " filename=\"%s.diff\"\n\n",
				 mime_boundary_leader, opt->mime_boundary,
				 sha1, sha1);
			opt->diffopt.stat_sep = buffer;
		}
	} else {
		printf("%s%s",
		       opt->commit_format == CMIT_FMT_ONELINE ? "" : "commit ",
		       diff_unique_abbrev(commit->object.sha1, abbrev_commit));
		if (opt->parents)
			show_parents(commit, abbrev_commit);
		if (parent)
			printf(" (from %s)",
			       diff_unique_abbrev(parent->object.sha1,
						  abbrev_commit));
		putchar(opt->commit_format == CMIT_FMT_ONELINE ? ' ' : '\n');
	}

	/*
	 * And then the pretty-printed message itself
	 */
	len = pretty_print_commit(opt->commit_format, commit, ~0u, this_header, sizeof(this_header), abbrev, subject, extra_headers);

	if (opt->add_signoff)
		len = append_signoff(this_header, sizeof(this_header), len,
				     opt->add_signoff);
	printf("%s%s%s", this_header, extra, sep);
}

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)
		show_log(opt, opt->diffopt.msg_sep);

	diff_flush(&opt->diffopt);
	return 1;
}

static int diff_root_tree(struct rev_info *opt,
			  const unsigned char *new, const char *base)
{
	int retval;
	void *tree;
	struct tree_desc empty, real;

	tree = read_object_with_reference(new, tree_type, &real.size, NULL);
	if (!tree)
		die("unable to read root tree (%s)", sha1_to_hex(new));
	real.buf = tree;

	empty.buf = "";
	empty.size = 0;
	retval = diff_tree(&empty, &real, base, &opt->diffopt);
	free(tree);
	log_tree_diff_flush(opt);
	return retval;
}

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(opt, sha1, "");
		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;
	return shown;
}
Commit	Line	Data
5f1c3f07 JH	1	#include "cache.h"
	2	#include "diff.h"
	3	#include "commit.h"
	4	#include "log-tree.h"
	5
c8c893c6 LT	6	static void show_parents(struct commit *commit, int abbrev)
	7	{
	8	struct commit_list *p;
	9	for (p = commit->parents; p ; p = p->next) {
	10	struct commit *parent = p->item;
	11	printf(" %s", diff_unique_abbrev(parent->object.sha1, abbrev));
	12	}
	13	}
	14
cf2251b6 JH	15	static int append_signoff(char buf, int buf_sz, int at, const char signoff)
	16	{
	17	int signoff_len = strlen(signoff);
	18	static const char signed_off_by[] = "Signed-off-by: ";
	19	char *cp = buf;
	20
	21	/* Do we have enough space to add it? */
	22	if (buf_sz - at <= strlen(signed_off_by) + signoff_len + 2)
	23	return at;
	24
	25	/* First see if we already have the sign-off by the signer */
	26	while (1) {
	27	cp = strstr(cp, signed_off_by);
	28	if (!cp)
	29	break;
	30	cp += strlen(signed_off_by);
	31	if ((cp + signoff_len < buf + at) &&
	32	!strncmp(cp, signoff, signoff_len) &&
	33	isspace(cp[signoff_len]))
	34	return at; /* we already have him */
	35	}
	36
	37	strcpy(buf + at, signed_off_by);
	38	at += strlen(signed_off_by);
	39	strcpy(buf + at, signoff);
	40	at += signoff_len;
	41	buf[at++] = '\n';
	42	buf[at] = 0;
	43	return at;
	44	}
	45
39bc9a6c	46	void show_log(struct rev_info opt, const char sep)
91539833 LT	47	{
91539833 LT	48	static char this_header[16384];
39bc9a6c	49	struct log_info *log = opt->loginfo;
91539833 LT	50	struct commit commit = log->commit, parent = log->parent;
	51	int abbrev = opt->diffopt.abbrev;
	52	int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
a4d34e2d	53	const char *extra;
91539833	54	int len;
20ff0680	55	const char subject = NULL, extra_headers = opt->extra_headers;
91539833 LT	56
	57	opt->loginfo = NULL;
	58	if (!opt->verbose_header) {
c8c893c6 LT	59	fputs(diff_unique_abbrev(commit->object.sha1, abbrev_commit), stdout);
	60	if (opt->parents)
	61	show_parents(commit, abbrev_commit);
	62	putchar('\n');
91539833 LT	63	return;
	64	}
	65
	66	/*
a4d34e2d LT	67	* The "oneline" format has several special cases:
	68	* - The pretty-printed commit lacks a newline at the end
	69	* of the buffer, but we do want to make sure that we
	70	* have a newline there. If the separator isn't already
	71	* a newline, add an extra one.
	72	* - unlike other log messages, the one-line format does
	73	* not have an empty line between entries.
91539833	74	*/
a4d34e2d LT	75	extra = "";
	76	if (*sep != '\n' && opt->commit_format == CMIT_FMT_ONELINE)
	77	extra = "\n";
91539833 LT	78	if (opt->shown_one && opt->commit_format != CMIT_FMT_ONELINE)
	79	putchar('\n');
	80	opt->shown_one = 1;
	81
	82	/*
	83	* Print header line of header..
	84	*/
3eefc189	85
596524b3	86	if (opt->commit_format == CMIT_FMT_EMAIL) {
698ce6f8	87	char *sha1 = sha1_to_hex(commit->object.sha1);
596524b3 JS	88	if (opt->total > 0) {
	89	static char buffer[64];
	90	snprintf(buffer, sizeof(buffer),
	91	"Subject: [PATCH %d/%d] ",
	92	opt->nr, opt->total);
	93	subject = buffer;
8ac80a57	94	} else if (opt->total == 0)
596524b3	95	subject = "Subject: [PATCH] ";
8ac80a57 JS	96	else
	97	subject = "Subject: ";
	98
698ce6f8 JS	99	printf("From %s Mon Sep 17 00:00:00 2001\n", sha1);
	100	if (opt->mime_boundary) {
	101	static char subject_buffer[1024];
	102	static char buffer[1024];
	103	snprintf(subject_buffer, sizeof(subject_buffer) - 1,
20ff0680	104	"%s"
698ce6f8 JS	105	"MIME-Version: 1.0\n"
	106	"Content-Type: multipart/mixed;\n"
	107	" boundary=\"%s%s\"\n"
	108	"\n"
	109	"This is a multi-part message in MIME "
	110	"format.\n"
	111	"--%s%s\n"
	112	"Content-Type: text/plain; "
	113	"charset=UTF-8; format=fixed\n"
	114	"Content-Transfer-Encoding: 8bit\n\n",
20ff0680	115	extra_headers ? extra_headers : "",
698ce6f8 JS	116	mime_boundary_leader, opt->mime_boundary,
698ce6f8 JS	117	mime_boundary_leader, opt->mime_boundary);
20ff0680	118	extra_headers = subject_buffer;
698ce6f8 JS	119
	120	snprintf(buffer, sizeof(buffer) - 1,
	121	"--%s%s\n"
	122	"Content-Type: text/x-patch;\n"
	123	" name=\"%s.diff\"\n"
	124	"Content-Transfer-Encoding: 8bit\n"
	125	"Content-Disposition: inline;\n"
	126	" filename=\"%s.diff\"\n\n",
	127	mime_boundary_leader, opt->mime_boundary,
	128	sha1, sha1);
	129	opt->diffopt.stat_sep = buffer;
	130	}
596524b3	131	} else {
3eefc189 JH	132	printf("%s%s",
	133	opt->commit_format == CMIT_FMT_ONELINE ? "" : "commit ",
	134	diff_unique_abbrev(commit->object.sha1, abbrev_commit));
c66b6c06 JH	135	if (opt->parents)
c66b6c06 JH	136	show_parents(commit, abbrev_commit);
73f0a157	137	if (parent)
3eefc189 JH	138	printf(" (from %s)",
	139	diff_unique_abbrev(parent->object.sha1,
	140	abbrev_commit));
	141	putchar(opt->commit_format == CMIT_FMT_ONELINE ? ' ' : '\n');
	142	}
91539833 LT	143
	144	/*
	145	* And then the pretty-printed message itself
	146	*/
20ff0680	147	len = pretty_print_commit(opt->commit_format, commit, ~0u, this_header, sizeof(this_header), abbrev, subject, extra_headers);
cf2251b6 JH	148
	149	if (opt->add_signoff)
	150	len = append_signoff(this_header, sizeof(this_header), len,
	151	opt->add_signoff);
a4d34e2d	152	printf("%s%s%s", this_header, extra, sep);
91539833 LT	153	}
91539833 LT	154
cd2bdc53	155	int log_tree_diff_flush(struct rev_info *opt)
5f1c3f07 JH	156	{
5f1c3f07 JH	157	diffcore_std(&opt->diffopt);
91539833	158
5f1c3f07 JH	159	if (diff_queue_is_empty()) {
	160	int saved_fmt = opt->diffopt.output_format;
	161	opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
	162	diff_flush(&opt->diffopt);
	163	opt->diffopt.output_format = saved_fmt;
	164	return 0;
	165	}
91539833	166
39bc9a6c TH	167	if (opt->loginfo && !opt->no_commit_id)
	168	show_log(opt, opt->diffopt.msg_sep);
	169
5f1c3f07 JH	170	diff_flush(&opt->diffopt);
	171	return 1;
	172	}
	173
cd2bdc53	174	static int diff_root_tree(struct rev_info *opt,
5f1c3f07 JH	175	const unsigned char new, const char base)
	176	{
	177	int retval;
	178	void *tree;
	179	struct tree_desc empty, real;
	180
	181	tree = read_object_with_reference(new, tree_type, &real.size, NULL);
	182	if (!tree)
	183	die("unable to read root tree (%s)", sha1_to_hex(new));
	184	real.buf = tree;
	185
	186	empty.buf = "";
	187	empty.size = 0;
	188	retval = diff_tree(&empty, &real, base, &opt->diffopt);
	189	free(tree);
	190	log_tree_diff_flush(opt);
	191	return retval;
	192	}
	193
cd2bdc53	194	static int do_diff_combined(struct rev_info opt, struct commit commit)
5f1c3f07 JH	195	{
	196	unsigned const char *sha1 = commit->object.sha1;
	197
91539833 LT	198	diff_tree_combined_merge(sha1, opt->dense_combined_merges, opt);
91539833 LT	199	return !opt->loginfo;
5f1c3f07 JH	200	}
5f1c3f07 JH	201
91539833 LT	202	/*
	203	* Show the diff of a commit.
	204	*
	205	* Return true if we printed any log info messages
	206	*/
	207	static int log_tree_diff(struct rev_info opt, struct commit commit, struct log_info *log)
5f1c3f07	208	{
91539833	209	int showed_log;
5f1c3f07 JH	210	struct commit_list *parents;
	211	unsigned const char *sha1 = commit->object.sha1;
	212
91539833 LT	213	if (!opt->diff)
	214	return 0;
	215
5f1c3f07	216	/* Root commit? */
91539833 LT	217	parents = commit->parents;
	218	if (!parents) {
	219	if (opt->show_root_diff)
	220	diff_root_tree(opt, sha1, "");
	221	return !opt->loginfo;
5f1c3f07 JH	222	}
	223
	224	/* More than one parent? */
91539833	225	if (parents && parents->next) {
5f1c3f07 JH	226	if (opt->ignore_merges)
	227	return 0;
	228	else if (opt->combine_merges)
	229	return do_diff_combined(opt, commit);
91539833 LT	230
	231	/* If we show individual diffs, show the parent info */
	232	log->parent = parents->item;
5f1c3f07 JH	233	}
5f1c3f07 JH	234
91539833 LT	235	showed_log = 0;
91539833 LT	236	for (;;) {
5f1c3f07	237	struct commit *parent = parents->item;
5f1c3f07	238
91539833 LT	239	diff_tree_sha1(parent->object.sha1, sha1, "", &opt->diffopt);
	240	log_tree_diff_flush(opt);
	241
	242	showed_log \|= !opt->loginfo;
	243
	244	/* Set up the log info for the next parent, if any.. */
	245	parents = parents->next;
	246	if (!parents)
	247	break;
	248	log->parent = parents->item;
	249	opt->loginfo = log;
	250	}
	251	return showed_log;
	252	}
	253
	254	int log_tree_commit(struct rev_info opt, struct commit commit)
	255	{
	256	struct log_info log;
3eefc189	257	int shown;
91539833 LT	258
	259	log.commit = commit;
	260	log.parent = NULL;
	261	opt->loginfo = &log;
	262
3eefc189 JH	263	shown = log_tree_diff(opt, commit, &log);
3eefc189 JH	264	if (!shown && opt->loginfo && opt->always_show_header) {
91539833	265	log.parent = NULL;
39bc9a6c	266	show_log(opt, "");
3eefc189	267	shown = 1;
5f1c3f07	268	}
91539833	269	opt->loginfo = NULL;
3eefc189	270	return shown;
5f1c3f07	271	}