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

/*
 * Builtin "git log" and related commands (show, whatchanged)
 *
 * (C) Copyright 2006 Linus Torvalds
 *		 2006 Junio Hamano
 */
#include "cache.h"
#include "commit.h"
#include "diff.h"
#include "revision.h"
#include "log-tree.h"
#include "builtin.h"
#include <time.h>
#include <sys/time.h>

/* this is in builtin-diff.c */
void add_head(struct rev_info *revs);

static void cmd_log_init(int argc, const char **argv, char **envp,
		      struct rev_info *rev)
{
	rev->abbrev = DEFAULT_ABBREV;
	rev->commit_format = CMIT_FMT_DEFAULT;
	rev->verbose_header = 1;
	argc = setup_revisions(argc, argv, rev, "HEAD");
	if (rev->diffopt.pickaxe || rev->diffopt.filter)
		rev->always_show_header = 0;
	if (argc > 1)
		die("unrecognized argument: %s", argv[1]);
}

static int cmd_log_walk(struct rev_info *rev)
{
	struct commit *commit;

	prepare_revision_walk(rev);
	setup_pager();
	while ((commit = get_revision(rev)) != NULL) {
		log_tree_commit(rev, commit);
		free(commit->buffer);
		commit->buffer = NULL;
		free_commit_list(commit->parents);
		commit->parents = NULL;
	}
	return 0;
}

int cmd_whatchanged(int argc, const char **argv, char **envp)
{
	struct rev_info rev;

	git_config(git_diff_ui_config);
	init_revisions(&rev);
	rev.diff = 1;
	rev.diffopt.recursive = 1;
	rev.simplify_history = 0;
	cmd_log_init(argc, argv, envp, &rev);
	if (!rev.diffopt.output_format)
		rev.diffopt.output_format = DIFF_FORMAT_RAW;
	return cmd_log_walk(&rev);
}

int cmd_show(int argc, const char **argv, char **envp)
{
	struct rev_info rev;

	git_config(git_diff_ui_config);
	init_revisions(&rev);
	rev.diff = 1;
	rev.diffopt.recursive = 1;
	rev.combine_merges = 1;
	rev.dense_combined_merges = 1;
	rev.always_show_header = 1;
	rev.ignore_merges = 0;
	rev.no_walk = 1;
	cmd_log_init(argc, argv, envp, &rev);
	return cmd_log_walk(&rev);
}

int cmd_log(int argc, const char **argv, char **envp)
{
	struct rev_info rev;

	git_config(git_diff_ui_config);
	init_revisions(&rev);
	rev.always_show_header = 1;
	cmd_log_init(argc, argv, envp, &rev);
	return cmd_log_walk(&rev);
}

static int istitlechar(char c)
{
	return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
		(c >= '0' && c <= '9') || c == '.' || c == '_';
}

static char *extra_headers = NULL;
static int extra_headers_size = 0;

static int git_format_config(const char *var, const char *value)
{
	if (!strcmp(var, "format.headers")) {
		int len = strlen(value);
		extra_headers_size += len + 1;
		extra_headers = realloc(extra_headers, extra_headers_size);
		extra_headers[extra_headers_size - len - 1] = 0;
		strcat(extra_headers, value);
		return 0;
	}
	if (!strcmp(var, "diff.color")) {
		return 0;
	}
	return git_diff_ui_config(var, value);
}


static FILE *realstdout = NULL;
static const char *output_directory = NULL;

static void reopen_stdout(struct commit *commit, int nr, int keep_subject)
{
	char filename[1024];
	char *sol;
	int len = 0;

	if (output_directory) {
		strlcpy(filename, output_directory, 1010);
		len = strlen(filename);
		if (filename[len - 1] != '/')
			filename[len++] = '/';
	}

	sprintf(filename + len, "%04d", nr);
	len = strlen(filename);

	sol = strstr(commit->buffer, "\n\n");
	if (sol) {
		int j, space = 1;

		sol += 2;
		/* strip [PATCH] or [PATCH blabla] */
		if (!keep_subject && !strncmp(sol, "[PATCH", 6)) {
			char *eos = strchr(sol + 6, ']');
			if (eos) {
				while (isspace(*eos))
					eos++;
				sol = eos;
			}
		}

		for (j = 0; len < 1024 - 6 && sol[j] && sol[j] != '\n'; j++) {
			if (istitlechar(sol[j])) {
				if (space) {
					filename[len++] = '-';
					space = 0;
				}
				filename[len++] = sol[j];
				if (sol[j] == '.')
					while (sol[j + 1] == '.')
						j++;
			} else
				space = 1;
		}
		while (filename[len - 1] == '.' || filename[len - 1] == '-')
			len--;
	}
	strcpy(filename + len, ".txt");
	fprintf(realstdout, "%s\n", filename);
	freopen(filename, "w", stdout);
}

static int get_patch_id(struct commit *commit, struct diff_options *options,
		unsigned char *sha1)
{
	diff_tree_sha1(commit->parents->item->object.sha1, commit->object.sha1,
			"", options);
	diffcore_std(options);
	return diff_flush_patch_id(options, sha1);
}

static void get_patch_ids(struct rev_info *rev, struct diff_options *options)
{
	struct rev_info check_rev;
	struct commit *commit;
	struct object *o1, *o2;
	unsigned flags1, flags2;
	unsigned char sha1[20];

	if (rev->pending.nr != 2)
		die("Need exactly one range.");

	o1 = rev->pending.objects[0].item;
	flags1 = o1->flags;
	o2 = rev->pending.objects[1].item;
	flags2 = o2->flags;

	if ((flags1 & UNINTERESTING) == (flags2 & UNINTERESTING))
		die("Not a range.");

	diff_setup(options);
	options->recursive = 1;
	if (diff_setup_done(options) < 0)
		die("diff_setup_done failed");

	/* given a range a..b get all patch ids for b..a */
	init_revisions(&check_rev);
	o1->flags ^= UNINTERESTING;
	o2->flags ^= UNINTERESTING;
	add_pending_object(&check_rev, o1, "o1");
	add_pending_object(&check_rev, o2, "o2");
	prepare_revision_walk(&check_rev);

	while ((commit = get_revision(&check_rev)) != NULL) {
		/* ignore merges */
		if (commit->parents && commit->parents->next)
			continue;

		if (!get_patch_id(commit, options, sha1))
			created_object(sha1, xcalloc(1, sizeof(struct object)));
	}

	/* reset for next revision walk */
	clear_commit_marks((struct commit *)o1,
			SEEN | UNINTERESTING | SHOWN | ADDED);
	clear_commit_marks((struct commit *)o2,
			SEEN | UNINTERESTING | SHOWN | ADDED);
	o1->flags = flags1;
	o2->flags = flags2;
}

static void gen_message_id(char *dest, unsigned int length, char *base)
{
	const char *committer = git_committer_info(1);
	const char *email_start = strrchr(committer, '<');
	const char *email_end = strrchr(committer, '>');
	if(!email_start || !email_end || email_start > email_end - 1)
		die("Could not extract email from committer identity.");
	snprintf(dest, length, "%s.%lu.git.%.*s", base,
		 (unsigned long) time(NULL),
		 (int)(email_end - email_start - 1), email_start + 1);
}

int cmd_format_patch(int argc, const char **argv, char **envp)
{
	struct commit *commit;
	struct commit **list = NULL;
	struct rev_info rev;
	int nr = 0, total, i, j;
	int use_stdout = 0;
	int numbered = 0;
	int start_number = -1;
	int keep_subject = 0;
	int ignore_if_in_upstream = 0;
	int thread = 0;
	const char *in_reply_to = NULL;
	struct diff_options patch_id_opts;
	char *add_signoff = NULL;
	char message_id[1024];
	char ref_message_id[1024];

	git_config(git_format_config);
	init_revisions(&rev);
	rev.commit_format = CMIT_FMT_EMAIL;
	rev.verbose_header = 1;
	rev.diff = 1;
	rev.combine_merges = 0;
	rev.ignore_merges = 1;
	rev.diffopt.msg_sep = "";
	rev.diffopt.recursive = 1;

	rev.extra_headers = extra_headers;

	/*
	 * Parse the arguments before setup_revisions(), or something
	 * like "git fmt-patch -o a123 HEAD^.." may fail; a123 is
	 * possibly a valid SHA1.
	 */
	for (i = 1, j = 1; i < argc; i++) {
		if (!strcmp(argv[i], "--stdout"))
			use_stdout = 1;
		else if (!strcmp(argv[i], "-n") ||
				!strcmp(argv[i], "--numbered"))
			numbered = 1;
		else if (!strncmp(argv[i], "--start-number=", 15))
			start_number = strtol(argv[i] + 15, NULL, 10);
		else if (!strcmp(argv[i], "--start-number")) {
			i++;
			if (i == argc)
				die("Need a number for --start-number");
			start_number = strtol(argv[i], NULL, 10);
		}
		else if (!strcmp(argv[i], "-k") ||
				!strcmp(argv[i], "--keep-subject")) {
			keep_subject = 1;
			rev.total = -1;
		}
		else if (!strcmp(argv[i], "--output-directory") ||
			 !strcmp(argv[i], "-o")) {
			i++;
			if (argc <= i)
				die("Which directory?");
			if (output_directory)
				die("Two output directories?");
			output_directory = argv[i];
		}
		else if (!strcmp(argv[i], "--signoff") ||
			 !strcmp(argv[i], "-s")) {
			const char *committer;
			const char *endpos;
			setup_ident();
			committer = git_committer_info(1);
			endpos = strchr(committer, '>');
			if (!endpos)
				die("bogos committer info %s\n", committer);
			add_signoff = xmalloc(endpos - committer + 2);
			memcpy(add_signoff, committer, endpos - committer + 1);
			add_signoff[endpos - committer + 1] = 0;
		}
		else if (!strcmp(argv[i], "--attach"))
			rev.mime_boundary = git_version_string;
		else if (!strncmp(argv[i], "--attach=", 9))
			rev.mime_boundary = argv[i] + 9;
		else if (!strcmp(argv[i], "--ignore-if-in-upstream"))
			ignore_if_in_upstream = 1;
		else if (!strcmp(argv[i], "--thread"))
			thread = 1;
		else if (!strncmp(argv[i], "--in-reply-to=", 14))
			in_reply_to = argv[i] + 14;
		else if (!strcmp(argv[i], "--in-reply-to")) {
			i++;
			if (i == argc)
				die("Need a Message-Id for --in-reply-to");
			in_reply_to = argv[i];
		}
		else
			argv[j++] = argv[i];
	}
	argc = j;

	if (start_number < 0)
		start_number = 1;
	if (numbered && keep_subject)
		die ("-n and -k are mutually exclusive.");

	argc = setup_revisions(argc, argv, &rev, "HEAD");
	if (argc > 1)
		die ("unrecognized argument: %s", argv[1]);

	if (!rev.diffopt.output_format)
		rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;

	if (output_directory) {
		if (use_stdout)
			die("standard output, or directory, which one?");
		if (mkdir(output_directory, 0777) < 0 && errno != EEXIST)
			die("Could not create directory %s",
			    output_directory);
	}

	if (rev.pending.nr == 1) {
		rev.pending.objects[0].item->flags |= UNINTERESTING;
		add_head(&rev);
	}

	if (ignore_if_in_upstream)
		get_patch_ids(&rev, &patch_id_opts);

	if (!use_stdout)
		realstdout = fdopen(dup(1), "w");

	prepare_revision_walk(&rev);
	while ((commit = get_revision(&rev)) != NULL) {
		unsigned char sha1[20];

		/* ignore merges */
		if (commit->parents && commit->parents->next)
			continue;

		if (ignore_if_in_upstream &&
				!get_patch_id(commit, &patch_id_opts, sha1) &&
				lookup_object(sha1))
			continue;

		nr++;
		list = realloc(list, nr * sizeof(list[0]));
		list[nr - 1] = commit;
	}
	total = nr;
	if (numbered)
		rev.total = total + start_number - 1;
	rev.add_signoff = add_signoff;
	rev.ref_message_id = in_reply_to;
	while (0 <= --nr) {
		int shown;
		commit = list[nr];
		rev.nr = total - nr + (start_number - 1);
		/* Make the second and subsequent mails replies to the first */
		if (thread) {
			if (nr == (total - 2)) {
				strncpy(ref_message_id, message_id,
					sizeof(ref_message_id));
				ref_message_id[sizeof(ref_message_id)-1]='\0';
				rev.ref_message_id = ref_message_id;
			}
			gen_message_id(message_id, sizeof(message_id),
				       sha1_to_hex(commit->object.sha1));
			rev.message_id = message_id;
		}
		if (!use_stdout)
			reopen_stdout(commit, rev.nr, keep_subject);
		shown = log_tree_commit(&rev, commit);
		free(commit->buffer);
		commit->buffer = NULL;

		/* We put one extra blank line between formatted
		 * patches and this flag is used by log-tree code
		 * to see if it needs to emit a LF before showing
		 * the log; when using one file per patch, we do
		 * not want the extra blank line.
		 */
		if (!use_stdout)
			rev.shown_one = 0;
		if (shown) {
			if (rev.mime_boundary)
				printf("\n--%s%s--\n\n\n",
				       mime_boundary_leader,
				       rev.mime_boundary);
			else
				printf("-- \n%s\n\n", git_version_string);
		}
		if (!use_stdout)
			fclose(stdout);
	}
	free(list);
	return 0;
}
Commit	Line	Data
70827b15 LT	1	/*
	2	* Builtin "git log" and related commands (show, whatchanged)
	3	*
	4	* (C) Copyright 2006 Linus Torvalds
	5	* 2006 Junio Hamano
	6	*/
	7	#include "cache.h"
	8	#include "commit.h"
	9	#include "diff.h"
	10	#include "revision.h"
	11	#include "log-tree.h"
91efcf60	12	#include "builtin.h"
76af0734 JH	13	#include <time.h>
76af0734 JH	14	#include <sys/time.h>
70827b15	15
e686eb98 JS	16	/* this is in builtin-diff.c */
	17	void add_head(struct rev_info *revs);
	18
9dafea26	19	static void cmd_log_init(int argc, const char argv, char envp,
70827b15 LT	20	struct rev_info *rev)
70827b15 LT	21	{
70827b15 LT	22	rev->abbrev = DEFAULT_ABBREV;
	23	rev->commit_format = CMIT_FMT_DEFAULT;
	24	rev->verbose_header = 1;
	25	argc = setup_revisions(argc, argv, rev, "HEAD");
9dafea26 TH	26	if (rev->diffopt.pickaxe \|\| rev->diffopt.filter)
9dafea26 TH	27	rev->always_show_header = 0;
70827b15 LT	28	if (argc > 1)
70827b15 LT	29	die("unrecognized argument: %s", argv[1]);
9dafea26 TH	30	}
	31
	32	static int cmd_log_walk(struct rev_info *rev)
	33	{
	34	struct commit *commit;
70827b15 LT	35
	36	prepare_revision_walk(rev);
	37	setup_pager();
	38	while ((commit = get_revision(rev)) != NULL) {
	39	log_tree_commit(rev, commit);
	40	free(commit->buffer);
	41	commit->buffer = NULL;
cb115748 LT	42	free_commit_list(commit->parents);
cb115748 LT	43	commit->parents = NULL;
70827b15 LT	44	}
	45	return 0;
	46	}
	47
	48	int cmd_whatchanged(int argc, const char argv, char envp)
	49	{
	50	struct rev_info rev;
	51
83ad63cf	52	git_config(git_diff_ui_config);
70827b15 LT	53	init_revisions(&rev);
	54	rev.diff = 1;
	55	rev.diffopt.recursive = 1;
9202434c	56	rev.simplify_history = 0;
9dafea26 TH	57	cmd_log_init(argc, argv, envp, &rev);
	58	if (!rev.diffopt.output_format)
	59	rev.diffopt.output_format = DIFF_FORMAT_RAW;
	60	return cmd_log_walk(&rev);
70827b15 LT	61	}
	62
	63	int cmd_show(int argc, const char argv, char envp)
	64	{
	65	struct rev_info rev;
	66
83ad63cf	67	git_config(git_diff_ui_config);
70827b15 LT	68	init_revisions(&rev);
	69	rev.diff = 1;
	70	rev.diffopt.recursive = 1;
	71	rev.combine_merges = 1;
	72	rev.dense_combined_merges = 1;
	73	rev.always_show_header = 1;
	74	rev.ignore_merges = 0;
	75	rev.no_walk = 1;
9dafea26 TH	76	cmd_log_init(argc, argv, envp, &rev);
9dafea26 TH	77	return cmd_log_walk(&rev);
70827b15 LT	78	}
	79
	80	int cmd_log(int argc, const char argv, char envp)
	81	{
	82	struct rev_info rev;
	83
83ad63cf	84	git_config(git_diff_ui_config);
70827b15 LT	85	init_revisions(&rev);
70827b15 LT	86	rev.always_show_header = 1;
9dafea26 TH	87	cmd_log_init(argc, argv, envp, &rev);
9dafea26 TH	88	return cmd_log_walk(&rev);
70827b15	89	}
91efcf60	90
0377db77 JS	91	static int istitlechar(char c)
	92	{
	93	return (c >= 'a' && c <= 'z') \|\| (c >= 'A' && c <= 'Z') \|\|
	94	(c >= '0' && c <= '9') \|\| c == '.' \|\| c == '_';
	95	}
	96
20ff0680 JS	97	static char *extra_headers = NULL;
	98	static int extra_headers_size = 0;
	99
	100	static int git_format_config(const char var, const char value)
	101	{
	102	if (!strcmp(var, "format.headers")) {
	103	int len = strlen(value);
	104	extra_headers_size += len + 1;
	105	extra_headers = realloc(extra_headers, extra_headers_size);
	106	extra_headers[extra_headers_size - len - 1] = 0;
	107	strcat(extra_headers, value);
	108	return 0;
	109	}
f3aafa4d RA	110	if (!strcmp(var, "diff.color")) {
	111	return 0;
	112	}
83ad63cf	113	return git_diff_ui_config(var, value);
20ff0680 JS	114	}
	115
	116
81f3a188	117	static FILE *realstdout = NULL;
efd02016	118	static const char *output_directory = NULL;
81f3a188	119
8ac80a57	120	static void reopen_stdout(struct commit *commit, int nr, int keep_subject)
0377db77 JS	121	{
	122	char filename[1024];
	123	char *sol;
2448482b	124	int len = 0;
0377db77	125
2448482b	126	if (output_directory) {
817151e6	127	strlcpy(filename, output_directory, 1010);
2448482b JS	128	len = strlen(filename);
	129	if (filename[len - 1] != '/')
	130	filename[len++] = '/';
	131	}
0377db77	132
2448482b	133	sprintf(filename + len, "%04d", nr);
0377db77 JS	134	len = strlen(filename);
	135
	136	sol = strstr(commit->buffer, "\n\n");
	137	if (sol) {
	138	int j, space = 1;
	139
	140	sol += 2;
	141	/* strip [PATCH] or [PATCH blabla] */
8ac80a57	142	if (!keep_subject && !strncmp(sol, "[PATCH", 6)) {
0377db77 JS	143	char *eos = strchr(sol + 6, ']');
	144	if (eos) {
	145	while (isspace(*eos))
	146	eos++;
	147	sol = eos;
	148	}
	149	}
	150
	151	for (j = 0; len < 1024 - 6 && sol[j] && sol[j] != '\n'; j++) {
	152	if (istitlechar(sol[j])) {
	153	if (space) {
	154	filename[len++] = '-';
	155	space = 0;
	156	}
	157	filename[len++] = sol[j];
	158	if (sol[j] == '.')
	159	while (sol[j + 1] == '.')
	160	j++;
	161	} else
	162	space = 1;
	163	}
	164	while (filename[len - 1] == '.' \|\| filename[len - 1] == '-')
	165	len--;
	166	}
	167	strcpy(filename + len, ".txt");
81f3a188	168	fprintf(realstdout, "%s\n", filename);
0377db77 JS	169	freopen(filename, "w", stdout);
	170	}
	171
9c6efa36 JS	172	static int get_patch_id(struct commit commit, struct diff_options options,
	173	unsigned char *sha1)
	174	{
	175	diff_tree_sha1(commit->parents->item->object.sha1, commit->object.sha1,
	176	"", options);
	177	diffcore_std(options);
	178	return diff_flush_patch_id(options, sha1);
	179	}
	180
	181	static void get_patch_ids(struct rev_info rev, struct diff_options options)
	182	{
	183	struct rev_info check_rev;
	184	struct commit *commit;
	185	struct object o1, o2;
	186	unsigned flags1, flags2;
	187	unsigned char sha1[20];
	188
	189	if (rev->pending.nr != 2)
	190	die("Need exactly one range.");
	191
	192	o1 = rev->pending.objects[0].item;
	193	flags1 = o1->flags;
	194	o2 = rev->pending.objects[1].item;
	195	flags2 = o2->flags;
	196
	197	if ((flags1 & UNINTERESTING) == (flags2 & UNINTERESTING))
	198	die("Not a range.");
	199
	200	diff_setup(options);
	201	options->recursive = 1;
	202	if (diff_setup_done(options) < 0)
	203	die("diff_setup_done failed");
	204
	205	/* given a range a..b get all patch ids for b..a */
	206	init_revisions(&check_rev);
	207	o1->flags ^= UNINTERESTING;
	208	o2->flags ^= UNINTERESTING;
	209	add_pending_object(&check_rev, o1, "o1");
	210	add_pending_object(&check_rev, o2, "o2");
	211	prepare_revision_walk(&check_rev);
	212
	213	while ((commit = get_revision(&check_rev)) != NULL) {
	214	/* ignore merges */
	215	if (commit->parents && commit->parents->next)
	216	continue;
	217
	218	if (!get_patch_id(commit, options, sha1))
	219	created_object(sha1, xcalloc(1, sizeof(struct object)));
	220	}
	221
	222	/* reset for next revision walk */
81db0941 JS	223	clear_commit_marks((struct commit *)o1,
	224	SEEN \| UNINTERESTING \| SHOWN \| ADDED);
	225	clear_commit_marks((struct commit *)o2,
	226	SEEN \| UNINTERESTING \| SHOWN \| ADDED);
9c6efa36 JS	227	o1->flags = flags1;
	228	o2->flags = flags2;
	229	}
	230
d1566f78 JT	231	static void gen_message_id(char dest, unsigned int length, char base)
	232	{
	233	const char *committer = git_committer_info(1);
	234	const char *email_start = strrchr(committer, '<');
	235	const char *email_end = strrchr(committer, '>');
	236	if(!email_start \|\| !email_end \|\| email_start > email_end - 1)
	237	die("Could not extract email from committer identity.");
76af0734 JH	238	snprintf(dest, length, "%s.%lu.git.%.*s", base,
	239	(unsigned long) time(NULL),
	240	(int)(email_end - email_start - 1), email_start + 1);
d1566f78 JT	241	}
d1566f78 JT	242
91efcf60 JH	243	int cmd_format_patch(int argc, const char argv, char envp)
	244	{
	245	struct commit *commit;
	246	struct commit **list = NULL;
	247	struct rev_info rev;
2448482b	248	int nr = 0, total, i, j;
0377db77	249	int use_stdout = 0;
596524b3	250	int numbered = 0;
fa0f02df	251	int start_number = -1;
8ac80a57	252	int keep_subject = 0;
9c6efa36	253	int ignore_if_in_upstream = 0;
cc35de84	254	int thread = 0;
76af0734	255	const char *in_reply_to = NULL;
9c6efa36	256	struct diff_options patch_id_opts;
cf2251b6	257	char *add_signoff = NULL;
d1566f78 JT	258	char message_id[1024];
d1566f78 JT	259	char ref_message_id[1024];
91efcf60	260
97beb812	261	git_config(git_format_config);
91efcf60 JH	262	init_revisions(&rev);
	263	rev.commit_format = CMIT_FMT_EMAIL;
	264	rev.verbose_header = 1;
	265	rev.diff = 1;
91efcf60 JH	266	rev.combine_merges = 0;
91efcf60 JH	267	rev.ignore_merges = 1;
27e1b127 JH	268	rev.diffopt.msg_sep = "";
27e1b127 JH	269	rev.diffopt.recursive = 1;
91efcf60	270
20ff0680 JS	271	rev.extra_headers = extra_headers;
20ff0680 JS	272
2448482b JS	273	/*
	274	* Parse the arguments before setup_revisions(), or something
	275	* like "git fmt-patch -o a123 HEAD^.." may fail; a123 is
	276	* possibly a valid SHA1.
	277	*/
	278	for (i = 1, j = 1; i < argc; i++) {
	279	if (!strcmp(argv[i], "--stdout"))
0377db77	280	use_stdout = 1;
596524b3 JS	281	else if (!strcmp(argv[i], "-n") \|\|
	282	!strcmp(argv[i], "--numbered"))
	283	numbered = 1;
fa0f02df JS	284	else if (!strncmp(argv[i], "--start-number=", 15))
	285	start_number = strtol(argv[i] + 15, NULL, 10);
	286	else if (!strcmp(argv[i], "--start-number")) {
	287	i++;
	288	if (i == argc)
	289	die("Need a number for --start-number");
	290	start_number = strtol(argv[i], NULL, 10);
cf2251b6 JH	291	}
cf2251b6 JH	292	else if (!strcmp(argv[i], "-k") \|\|
8ac80a57 JS	293	!strcmp(argv[i], "--keep-subject")) {
	294	keep_subject = 1;
	295	rev.total = -1;
cf2251b6	296	}
efd02016 JH	297	else if (!strcmp(argv[i], "--output-directory") \|\|
efd02016 JH	298	!strcmp(argv[i], "-o")) {
2448482b	299	i++;
efd02016 JH	300	if (argc <= i)
	301	die("Which directory?");
	302	if (output_directory)
	303	die("Two output directories?");
	304	output_directory = argv[i];
698ce6f8	305	}
cf2251b6 JH	306	else if (!strcmp(argv[i], "--signoff") \|\|
cf2251b6 JH	307	!strcmp(argv[i], "-s")) {
6c4cca1c EB	308	const char *committer;
	309	const char *endpos;
	310	setup_ident();
	311	committer = git_committer_info(1);
	312	endpos = strchr(committer, '>');
cf2251b6 JH	313	if (!endpos)
	314	die("bogos committer info %s\n", committer);
	315	add_signoff = xmalloc(endpos - committer + 2);
	316	memcpy(add_signoff, committer, endpos - committer + 1);
	317	add_signoff[endpos - committer + 1] = 0;
	318	}
698ce6f8 JS	319	else if (!strcmp(argv[i], "--attach"))
	320	rev.mime_boundary = git_version_string;
	321	else if (!strncmp(argv[i], "--attach=", 9))
	322	rev.mime_boundary = argv[i] + 9;
9c6efa36 JS	323	else if (!strcmp(argv[i], "--ignore-if-in-upstream"))
9c6efa36 JS	324	ignore_if_in_upstream = 1;
cc35de84 JT	325	else if (!strcmp(argv[i], "--thread"))
cc35de84 JT	326	thread = 1;
da56645d JT	327	else if (!strncmp(argv[i], "--in-reply-to=", 14))
	328	in_reply_to = argv[i] + 14;
	329	else if (!strcmp(argv[i], "--in-reply-to")) {
	330	i++;
	331	if (i == argc)
	332	die("Need a Message-Id for --in-reply-to");
	333	in_reply_to = argv[i];
	334	}
698ce6f8	335	else
2448482b	336	argv[j++] = argv[i];
0377db77	337	}
2448482b JS	338	argc = j;
2448482b JS	339
add5c8a5	340	if (start_number < 0)
fa0f02df	341	start_number = 1;
63b398a4	342	if (numbered && keep_subject)
8ac80a57 JS	343	die ("-n and -k are mutually exclusive.");
8ac80a57 JS	344
2448482b JS	345	argc = setup_revisions(argc, argv, &rev, "HEAD");
	346	if (argc > 1)
	347	die ("unrecognized argument: %s", argv[1]);
0377db77	348
c9b5ef99 TH	349	if (!rev.diffopt.output_format)
	350	rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT \| DIFF_FORMAT_PATCH;
	351
efd02016 JH	352	if (output_directory) {
	353	if (use_stdout)
	354	die("standard output, or directory, which one?");
	355	if (mkdir(output_directory, 0777) < 0 && errno != EEXIST)
	356	die("Could not create directory %s",
	357	output_directory);
	358	}
	359
1f1e895f LT	360	if (rev.pending.nr == 1) {
1f1e895f LT	361	rev.pending.objects[0].item->flags \|= UNINTERESTING;
e686eb98 JS	362	add_head(&rev);
	363	}
	364
9c6efa36 JS	365	if (ignore_if_in_upstream)
	366	get_patch_ids(&rev, &patch_id_opts);
	367
81f3a188 JS	368	if (!use_stdout)
	369	realstdout = fdopen(dup(1), "w");
	370
91efcf60 JH	371	prepare_revision_walk(&rev);
91efcf60 JH	372	while ((commit = get_revision(&rev)) != NULL) {
9c6efa36 JS	373	unsigned char sha1[20];
9c6efa36 JS	374
0377db77 JS	375	/* ignore merges */
	376	if (commit->parents && commit->parents->next)
	377	continue;
9c6efa36 JS	378
	379	if (ignore_if_in_upstream &&
	380	!get_patch_id(commit, &patch_id_opts, sha1) &&
	381	lookup_object(sha1))
	382	continue;
	383
91efcf60 JH	384	nr++;
	385	list = realloc(list, nr * sizeof(list[0]));
	386	list[nr - 1] = commit;
	387	}
0377db77	388	total = nr;
596524b3	389	if (numbered)
fa0f02df	390	rev.total = total + start_number - 1;
cf2251b6	391	rev.add_signoff = add_signoff;
da56645d	392	rev.ref_message_id = in_reply_to;
91efcf60 JH	393	while (0 <= --nr) {
	394	int shown;
	395	commit = list[nr];
add5c8a5	396	rev.nr = total - nr + (start_number - 1);
d1566f78	397	/* Make the second and subsequent mails replies to the first */
cc35de84 JT	398	if (thread) {
	399	if (nr == (total - 2)) {
	400	strncpy(ref_message_id, message_id,
	401	sizeof(ref_message_id));
	402	ref_message_id[sizeof(ref_message_id)-1]='\0';
	403	rev.ref_message_id = ref_message_id;
	404	}
	405	gen_message_id(message_id, sizeof(message_id),
	406	sha1_to_hex(commit->object.sha1));
	407	rev.message_id = message_id;
d1566f78	408	}
0377db77	409	if (!use_stdout)
8ac80a57	410	reopen_stdout(commit, rev.nr, keep_subject);
91efcf60 JH	411	shown = log_tree_commit(&rev, commit);
	412	free(commit->buffer);
	413	commit->buffer = NULL;
add5c8a5 JH	414
	415	/* We put one extra blank line between formatted
	416	* patches and this flag is used by log-tree code
	417	* to see if it needs to emit a LF before showing
	418	* the log; when using one file per patch, we do
	419	* not want the extra blank line.
	420	*/
	421	if (!use_stdout)
	422	rev.shown_one = 0;
698ce6f8 JS	423	if (shown) {
	424	if (rev.mime_boundary)
	425	printf("\n--%s%s--\n\n\n",
	426	mime_boundary_leader,
	427	rev.mime_boundary);
	428	else
	429	printf("-- \n%s\n\n", git_version_string);
	430	}
0377db77 JS	431	if (!use_stdout)
0377db77 JS	432	fclose(stdout);
91efcf60 JH	433	}
	434	free(list);
	435	return 0;
	436	}
	437