[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, const char *prefix,
		      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);
	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, const char *prefix)
{
	struct rev_info rev;

	git_config(git_diff_ui_config);
	init_revisions(&rev, prefix);
	rev.diff = 1;
	rev.diffopt.recursive = 1;
	rev.simplify_history = 0;
	cmd_log_init(argc, argv, prefix, &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, const char *prefix)
{
	struct rev_info rev;

	git_config(git_diff_ui_config);
	init_revisions(&rev, prefix);
	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, prefix, &rev);
	return cmd_log_walk(&rev);
}

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

	git_config(git_diff_ui_config);
	init_revisions(&rev, prefix);
	rev.always_show_header = 1;
	cmd_log_init(argc, argv, prefix, &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 = xrealloc(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)
{
	if (commit->parents)
		diff_tree_sha1(commit->parents->item->object.sha1,
		               commit->object.sha1, "", options);
	else
		diff_root_tree_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, const char *prefix)
{
	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, prefix);
	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, const char *prefix)
{
	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];

	setup_ident();
	git_config(git_format_config);
	init_revisions(&rev, prefix);
	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;
			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)
		output_directory = prefix;

	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, prefix);

	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 = xrealloc(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;
}

static int add_pending_commit(const char *arg, struct rev_info *revs, int flags)
{
	unsigned char sha1[20];
	if (get_sha1(arg, sha1) == 0) {
		struct commit *commit = lookup_commit_reference(sha1);
		if (commit) {
			commit->object.flags |= flags;
			add_pending_object(revs, &commit->object, arg);
			return 0;
		}
	}
	return -1;
}

static const char cherry_usage[] =
"git-cherry [-v] <upstream> [<head>] [<limit>]";
int cmd_cherry(int argc, const char **argv, const char *prefix)
{
	struct rev_info revs;
	struct diff_options patch_id_opts;
	struct commit *commit;
	struct commit_list *list = NULL;
	const char *upstream;
	const char *head = "HEAD";
	const char *limit = NULL;
	int verbose = 0;

	if (argc > 1 && !strcmp(argv[1], "-v")) {
		verbose = 1;
		argc--;
		argv++;
	}

	switch (argc) {
	case 4:
		limit = argv[3];
		/* FALLTHROUGH */
	case 3:
		head = argv[2];
		/* FALLTHROUGH */
	case 2:
		upstream = argv[1];
		break;
	default:
		usage(cherry_usage);
	}

	init_revisions(&revs, prefix);
	revs.diff = 1;
	revs.combine_merges = 0;
	revs.ignore_merges = 1;
	revs.diffopt.recursive = 1;

	if (add_pending_commit(head, &revs, 0))
		die("Unknown commit %s", head);
	if (add_pending_commit(upstream, &revs, UNINTERESTING))
		die("Unknown commit %s", upstream);

	/* Don't say anything if head and upstream are the same. */
	if (revs.pending.nr == 2) {
		struct object_array_entry *o = revs.pending.objects;
		if (hashcmp(o[0].item->sha1, o[1].item->sha1) == 0)
			return 0;
	}

	get_patch_ids(&revs, &patch_id_opts, prefix);

	if (limit && add_pending_commit(limit, &revs, UNINTERESTING))
		die("Unknown commit %s", limit);

	/* reverse the list of commits */
	prepare_revision_walk(&revs);
	while ((commit = get_revision(&revs)) != NULL) {
		/* ignore merges */
		if (commit->parents && commit->parents->next)
			continue;

		commit_list_insert(commit, &list);
	}

	while (list) {
		unsigned char sha1[20];
		char sign = '+';

		commit = list->item;
		if (!get_patch_id(commit, &patch_id_opts, sha1) &&
		    lookup_object(sha1))
			sign = '-';

		if (verbose) {
			static char buf[16384];
			pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0,
			                    buf, sizeof(buf), 0, NULL, NULL, 0);
			printf("%c %s %s\n", sign,
			       sha1_to_hex(commit->object.sha1), buf);
		}
		else {
			printf("%c %s\n", sign,
			       sha1_to_hex(commit->object.sha1));
		}

		list = list->next;
	}

	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
a633fca0	19	static void cmd_log_init(int argc, const char *argv, const char prefix,
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
70827b15 LT	36	prepare_revision_walk(rev);
70827b15 LT	37	while ((commit = get_revision(rev)) != NULL) {
	38	log_tree_commit(rev, commit);
	39	free(commit->buffer);
	40	commit->buffer = NULL;
cb115748 LT	41	free_commit_list(commit->parents);
cb115748 LT	42	commit->parents = NULL;
70827b15 LT	43	}
	44	return 0;
	45	}
	46
a633fca0	47	int cmd_whatchanged(int argc, const char *argv, const char prefix)
70827b15 LT	48	{
	49	struct rev_info rev;
	50
ef1d9c5a	51	git_config(git_diff_ui_config);
db6296a5	52	init_revisions(&rev, prefix);
70827b15 LT	53	rev.diff = 1;
70827b15 LT	54	rev.diffopt.recursive = 1;
9202434c	55	rev.simplify_history = 0;
a633fca0	56	cmd_log_init(argc, argv, prefix, &rev);
9dafea26 TH	57	if (!rev.diffopt.output_format)
	58	rev.diffopt.output_format = DIFF_FORMAT_RAW;
	59	return cmd_log_walk(&rev);
70827b15 LT	60	}
70827b15 LT	61
a633fca0	62	int cmd_show(int argc, const char *argv, const char prefix)
70827b15 LT	63	{
	64	struct rev_info rev;
	65
ef1d9c5a	66	git_config(git_diff_ui_config);
db6296a5	67	init_revisions(&rev, prefix);
70827b15 LT	68	rev.diff = 1;
	69	rev.diffopt.recursive = 1;
	70	rev.combine_merges = 1;
	71	rev.dense_combined_merges = 1;
	72	rev.always_show_header = 1;
	73	rev.ignore_merges = 0;
	74	rev.no_walk = 1;
a633fca0	75	cmd_log_init(argc, argv, prefix, &rev);
9dafea26	76	return cmd_log_walk(&rev);
70827b15 LT	77	}
70827b15 LT	78
a633fca0	79	int cmd_log(int argc, const char *argv, const char prefix)
70827b15 LT	80	{
	81	struct rev_info rev;
	82
ef1d9c5a	83	git_config(git_diff_ui_config);
db6296a5	84	init_revisions(&rev, prefix);
70827b15	85	rev.always_show_header = 1;
a633fca0	86	cmd_log_init(argc, argv, prefix, &rev);
9dafea26	87	return cmd_log_walk(&rev);
70827b15	88	}
91efcf60	89
0377db77 JS	90	static int istitlechar(char c)
	91	{
	92	return (c >= 'a' && c <= 'z') \|\| (c >= 'A' && c <= 'Z') \|\|
	93	(c >= '0' && c <= '9') \|\| c == '.' \|\| c == '_';
	94	}
	95
20ff0680 JS	96	static char *extra_headers = NULL;
	97	static int extra_headers_size = 0;
	98
	99	static int git_format_config(const char var, const char value)
	100	{
	101	if (!strcmp(var, "format.headers")) {
	102	int len = strlen(value);
	103	extra_headers_size += len + 1;
83572c1a	104	extra_headers = xrealloc(extra_headers, extra_headers_size);
20ff0680 JS	105	extra_headers[extra_headers_size - len - 1] = 0;
	106	strcat(extra_headers, value);
	107	return 0;
	108	}
f3aafa4d RA	109	if (!strcmp(var, "diff.color")) {
	110	return 0;
	111	}
83ad63cf	112	return git_diff_ui_config(var, value);
20ff0680 JS	113	}
	114
	115
81f3a188	116	static FILE *realstdout = NULL;
efd02016	117	static const char *output_directory = NULL;
81f3a188	118
8ac80a57	119	static void reopen_stdout(struct commit *commit, int nr, int keep_subject)
0377db77 JS	120	{
	121	char filename[1024];
	122	char *sol;
2448482b	123	int len = 0;
0377db77	124
2448482b	125	if (output_directory) {
817151e6	126	strlcpy(filename, output_directory, 1010);
2448482b JS	127	len = strlen(filename);
	128	if (filename[len - 1] != '/')
	129	filename[len++] = '/';
	130	}
0377db77	131
2448482b	132	sprintf(filename + len, "%04d", nr);
0377db77 JS	133	len = strlen(filename);
	134
	135	sol = strstr(commit->buffer, "\n\n");
	136	if (sol) {
	137	int j, space = 1;
	138
	139	sol += 2;
	140	/* strip [PATCH] or [PATCH blabla] */
8ac80a57	141	if (!keep_subject && !strncmp(sol, "[PATCH", 6)) {
0377db77 JS	142	char *eos = strchr(sol + 6, ']');
	143	if (eos) {
	144	while (isspace(*eos))
	145	eos++;
	146	sol = eos;
	147	}
	148	}
	149
	150	for (j = 0; len < 1024 - 6 && sol[j] && sol[j] != '\n'; j++) {
	151	if (istitlechar(sol[j])) {
	152	if (space) {
	153	filename[len++] = '-';
	154	space = 0;
	155	}
	156	filename[len++] = sol[j];
	157	if (sol[j] == '.')
	158	while (sol[j + 1] == '.')
	159	j++;
	160	} else
	161	space = 1;
	162	}
	163	while (filename[len - 1] == '.' \|\| filename[len - 1] == '-')
	164	len--;
	165	}
	166	strcpy(filename + len, ".txt");
81f3a188	167	fprintf(realstdout, "%s\n", filename);
0377db77 JS	168	freopen(filename, "w", stdout);
	169	}
	170
9c6efa36 JS	171	static int get_patch_id(struct commit commit, struct diff_options options,
	172	unsigned char *sha1)
	173	{
2b60356d RS	174	if (commit->parents)
	175	diff_tree_sha1(commit->parents->item->object.sha1,
	176	commit->object.sha1, "", options);
	177	else
	178	diff_root_tree_sha1(commit->object.sha1, "", options);
9c6efa36 JS	179	diffcore_std(options);
	180	return diff_flush_patch_id(options, sha1);
	181	}
	182
a633fca0	183	static void get_patch_ids(struct rev_info rev, struct diff_options options, const char *prefix)
9c6efa36 JS	184	{
	185	struct rev_info check_rev;
	186	struct commit *commit;
	187	struct object o1, o2;
	188	unsigned flags1, flags2;
	189	unsigned char sha1[20];
	190
	191	if (rev->pending.nr != 2)
	192	die("Need exactly one range.");
	193
	194	o1 = rev->pending.objects[0].item;
	195	flags1 = o1->flags;
	196	o2 = rev->pending.objects[1].item;
	197	flags2 = o2->flags;
	198
	199	if ((flags1 & UNINTERESTING) == (flags2 & UNINTERESTING))
	200	die("Not a range.");
	201
	202	diff_setup(options);
	203	options->recursive = 1;
	204	if (diff_setup_done(options) < 0)
	205	die("diff_setup_done failed");
	206
	207	/* given a range a..b get all patch ids for b..a */
db6296a5	208	init_revisions(&check_rev, prefix);
9c6efa36 JS	209	o1->flags ^= UNINTERESTING;
	210	o2->flags ^= UNINTERESTING;
	211	add_pending_object(&check_rev, o1, "o1");
	212	add_pending_object(&check_rev, o2, "o2");
	213	prepare_revision_walk(&check_rev);
	214
	215	while ((commit = get_revision(&check_rev)) != NULL) {
	216	/* ignore merges */
	217	if (commit->parents && commit->parents->next)
	218	continue;
	219
	220	if (!get_patch_id(commit, options, sha1))
	221	created_object(sha1, xcalloc(1, sizeof(struct object)));
	222	}
	223
	224	/* reset for next revision walk */
81db0941 JS	225	clear_commit_marks((struct commit *)o1,
	226	SEEN \| UNINTERESTING \| SHOWN \| ADDED);
	227	clear_commit_marks((struct commit *)o2,
	228	SEEN \| UNINTERESTING \| SHOWN \| ADDED);
9c6efa36 JS	229	o1->flags = flags1;
	230	o2->flags = flags2;
	231	}
	232
d1566f78 JT	233	static void gen_message_id(char dest, unsigned int length, char base)
	234	{
	235	const char *committer = git_committer_info(1);
	236	const char *email_start = strrchr(committer, '<');
	237	const char *email_end = strrchr(committer, '>');
	238	if(!email_start \|\| !email_end \|\| email_start > email_end - 1)
	239	die("Could not extract email from committer identity.");
76af0734 JH	240	snprintf(dest, length, "%s.%lu.git.%.*s", base,
	241	(unsigned long) time(NULL),
	242	(int)(email_end - email_start - 1), email_start + 1);
d1566f78 JT	243	}
d1566f78 JT	244
a633fca0	245	int cmd_format_patch(int argc, const char *argv, const char prefix)
91efcf60 JH	246	{
	247	struct commit *commit;
	248	struct commit **list = NULL;
	249	struct rev_info rev;
2448482b	250	int nr = 0, total, i, j;
0377db77	251	int use_stdout = 0;
596524b3	252	int numbered = 0;
fa0f02df	253	int start_number = -1;
8ac80a57	254	int keep_subject = 0;
9c6efa36	255	int ignore_if_in_upstream = 0;
cc35de84	256	int thread = 0;
76af0734	257	const char *in_reply_to = NULL;
9c6efa36	258	struct diff_options patch_id_opts;
cf2251b6	259	char *add_signoff = NULL;
d1566f78 JT	260	char message_id[1024];
d1566f78 JT	261	char ref_message_id[1024];
91efcf60	262
07efc6a6	263	setup_ident();
97beb812	264	git_config(git_format_config);
db6296a5	265	init_revisions(&rev, prefix);
91efcf60 JH	266	rev.commit_format = CMIT_FMT_EMAIL;
	267	rev.verbose_header = 1;
	268	rev.diff = 1;
91efcf60 JH	269	rev.combine_merges = 0;
91efcf60 JH	270	rev.ignore_merges = 1;
27e1b127 JH	271	rev.diffopt.msg_sep = "";
27e1b127 JH	272	rev.diffopt.recursive = 1;
91efcf60	273
20ff0680 JS	274	rev.extra_headers = extra_headers;
20ff0680 JS	275
2448482b JS	276	/*
	277	* Parse the arguments before setup_revisions(), or something
	278	* like "git fmt-patch -o a123 HEAD^.." may fail; a123 is
	279	* possibly a valid SHA1.
	280	*/
	281	for (i = 1, j = 1; i < argc; i++) {
	282	if (!strcmp(argv[i], "--stdout"))
0377db77	283	use_stdout = 1;
596524b3 JS	284	else if (!strcmp(argv[i], "-n") \|\|
	285	!strcmp(argv[i], "--numbered"))
	286	numbered = 1;
fa0f02df JS	287	else if (!strncmp(argv[i], "--start-number=", 15))
	288	start_number = strtol(argv[i] + 15, NULL, 10);
	289	else if (!strcmp(argv[i], "--start-number")) {
	290	i++;
	291	if (i == argc)
	292	die("Need a number for --start-number");
	293	start_number = strtol(argv[i], NULL, 10);
cf2251b6 JH	294	}
cf2251b6 JH	295	else if (!strcmp(argv[i], "-k") \|\|
8ac80a57 JS	296	!strcmp(argv[i], "--keep-subject")) {
	297	keep_subject = 1;
	298	rev.total = -1;
cf2251b6	299	}
efd02016 JH	300	else if (!strcmp(argv[i], "--output-directory") \|\|
efd02016 JH	301	!strcmp(argv[i], "-o")) {
2448482b	302	i++;
efd02016 JH	303	if (argc <= i)
	304	die("Which directory?");
	305	if (output_directory)
	306	die("Two output directories?");
	307	output_directory = argv[i];
698ce6f8	308	}
cf2251b6 JH	309	else if (!strcmp(argv[i], "--signoff") \|\|
cf2251b6 JH	310	!strcmp(argv[i], "-s")) {
6c4cca1c EB	311	const char *committer;
6c4cca1c EB	312	const char *endpos;
6c4cca1c EB	313	committer = git_committer_info(1);
6c4cca1c EB	314	endpos = strchr(committer, '>');
cf2251b6 JH	315	if (!endpos)
	316	die("bogos committer info %s\n", committer);
	317	add_signoff = xmalloc(endpos - committer + 2);
	318	memcpy(add_signoff, committer, endpos - committer + 1);
	319	add_signoff[endpos - committer + 1] = 0;
	320	}
698ce6f8 JS	321	else if (!strcmp(argv[i], "--attach"))
	322	rev.mime_boundary = git_version_string;
	323	else if (!strncmp(argv[i], "--attach=", 9))
	324	rev.mime_boundary = argv[i] + 9;
9c6efa36 JS	325	else if (!strcmp(argv[i], "--ignore-if-in-upstream"))
9c6efa36 JS	326	ignore_if_in_upstream = 1;
cc35de84 JT	327	else if (!strcmp(argv[i], "--thread"))
cc35de84 JT	328	thread = 1;
da56645d JT	329	else if (!strncmp(argv[i], "--in-reply-to=", 14))
	330	in_reply_to = argv[i] + 14;
	331	else if (!strcmp(argv[i], "--in-reply-to")) {
	332	i++;
	333	if (i == argc)
	334	die("Need a Message-Id for --in-reply-to");
	335	in_reply_to = argv[i];
	336	}
698ce6f8	337	else
2448482b	338	argv[j++] = argv[i];
0377db77	339	}
2448482b JS	340	argc = j;
2448482b JS	341
add5c8a5	342	if (start_number < 0)
fa0f02df	343	start_number = 1;
63b398a4	344	if (numbered && keep_subject)
8ac80a57 JS	345	die ("-n and -k are mutually exclusive.");
8ac80a57 JS	346
2448482b JS	347	argc = setup_revisions(argc, argv, &rev, "HEAD");
	348	if (argc > 1)
	349	die ("unrecognized argument: %s", argv[1]);
0377db77	350
c9b5ef99 TH	351	if (!rev.diffopt.output_format)
	352	rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT \| DIFF_FORMAT_PATCH;
	353
77e565d8 ML	354	if (!output_directory)
	355	output_directory = prefix;
	356
efd02016 JH	357	if (output_directory) {
	358	if (use_stdout)
	359	die("standard output, or directory, which one?");
	360	if (mkdir(output_directory, 0777) < 0 && errno != EEXIST)
	361	die("Could not create directory %s",
	362	output_directory);
	363	}
	364
1f1e895f LT	365	if (rev.pending.nr == 1) {
1f1e895f LT	366	rev.pending.objects[0].item->flags \|= UNINTERESTING;
e686eb98 JS	367	add_head(&rev);
	368	}
	369
9c6efa36	370	if (ignore_if_in_upstream)
a633fca0	371	get_patch_ids(&rev, &patch_id_opts, prefix);
9c6efa36	372
81f3a188 JS	373	if (!use_stdout)
	374	realstdout = fdopen(dup(1), "w");
	375
91efcf60 JH	376	prepare_revision_walk(&rev);
91efcf60 JH	377	while ((commit = get_revision(&rev)) != NULL) {
9c6efa36 JS	378	unsigned char sha1[20];
9c6efa36 JS	379
0377db77 JS	380	/* ignore merges */
	381	if (commit->parents && commit->parents->next)
	382	continue;
9c6efa36 JS	383
	384	if (ignore_if_in_upstream &&
	385	!get_patch_id(commit, &patch_id_opts, sha1) &&
	386	lookup_object(sha1))
	387	continue;
	388
91efcf60	389	nr++;
83572c1a	390	list = xrealloc(list, nr * sizeof(list[0]));
91efcf60 JH	391	list[nr - 1] = commit;
91efcf60 JH	392	}
0377db77	393	total = nr;
596524b3	394	if (numbered)
fa0f02df	395	rev.total = total + start_number - 1;
cf2251b6	396	rev.add_signoff = add_signoff;
da56645d	397	rev.ref_message_id = in_reply_to;
91efcf60 JH	398	while (0 <= --nr) {
	399	int shown;
	400	commit = list[nr];
add5c8a5	401	rev.nr = total - nr + (start_number - 1);
d1566f78	402	/* Make the second and subsequent mails replies to the first */
cc35de84 JT	403	if (thread) {
	404	if (nr == (total - 2)) {
	405	strncpy(ref_message_id, message_id,
	406	sizeof(ref_message_id));
	407	ref_message_id[sizeof(ref_message_id)-1]='\0';
	408	rev.ref_message_id = ref_message_id;
	409	}
	410	gen_message_id(message_id, sizeof(message_id),
	411	sha1_to_hex(commit->object.sha1));
	412	rev.message_id = message_id;
d1566f78	413	}
0377db77	414	if (!use_stdout)
8ac80a57	415	reopen_stdout(commit, rev.nr, keep_subject);
91efcf60 JH	416	shown = log_tree_commit(&rev, commit);
	417	free(commit->buffer);
	418	commit->buffer = NULL;
add5c8a5 JH	419
	420	/* We put one extra blank line between formatted
	421	* patches and this flag is used by log-tree code
	422	* to see if it needs to emit a LF before showing
	423	* the log; when using one file per patch, we do
	424	* not want the extra blank line.
	425	*/
	426	if (!use_stdout)
	427	rev.shown_one = 0;
698ce6f8 JS	428	if (shown) {
	429	if (rev.mime_boundary)
	430	printf("\n--%s%s--\n\n\n",
	431	mime_boundary_leader,
	432	rev.mime_boundary);
	433	else
	434	printf("-- \n%s\n\n", git_version_string);
	435	}
0377db77 JS	436	if (!use_stdout)
0377db77 JS	437	fclose(stdout);
91efcf60 JH	438	}
	439	free(list);
	440	return 0;
	441	}
	442
e827633a RS	443	static int add_pending_commit(const char arg, struct rev_info revs, int flags)
	444	{
	445	unsigned char sha1[20];
	446	if (get_sha1(arg, sha1) == 0) {
	447	struct commit *commit = lookup_commit_reference(sha1);
	448	if (commit) {
	449	commit->object.flags \|= flags;
	450	add_pending_object(revs, &commit->object, arg);
	451	return 0;
	452	}
	453	}
	454	return -1;
	455	}
	456
	457	static const char cherry_usage[] =
	458	"git-cherry [-v] <upstream> [<head>] [<limit>]";
	459	int cmd_cherry(int argc, const char *argv, const char prefix)
	460	{
	461	struct rev_info revs;
	462	struct diff_options patch_id_opts;
	463	struct commit *commit;
	464	struct commit_list *list = NULL;
	465	const char *upstream;
	466	const char *head = "HEAD";
	467	const char *limit = NULL;
	468	int verbose = 0;
	469
	470	if (argc > 1 && !strcmp(argv[1], "-v")) {
	471	verbose = 1;
	472	argc--;
	473	argv++;
	474	}
	475
	476	switch (argc) {
	477	case 4:
	478	limit = argv[3];
	479	/* FALLTHROUGH */
	480	case 3:
	481	head = argv[2];
	482	/* FALLTHROUGH */
	483	case 2:
	484	upstream = argv[1];
	485	break;
	486	default:
	487	usage(cherry_usage);
	488	}
	489
	490	init_revisions(&revs, prefix);
	491	revs.diff = 1;
	492	revs.combine_merges = 0;
	493	revs.ignore_merges = 1;
	494	revs.diffopt.recursive = 1;
	495
	496	if (add_pending_commit(head, &revs, 0))
	497	die("Unknown commit %s", head);
	498	if (add_pending_commit(upstream, &revs, UNINTERESTING))
	499	die("Unknown commit %s", upstream);
	500
	501	/* Don't say anything if head and upstream are the same. */
	502	if (revs.pending.nr == 2) {
	503	struct object_array_entry *o = revs.pending.objects;
	504	if (hashcmp(o[0].item->sha1, o[1].item->sha1) == 0)
	505	return 0;
	506	}
507
508	get_patch_ids(&revs, &patch_id_opts, prefix);
509
510	if (limit && add_pending_commit(limit, &revs, UNINTERESTING))
511	die("Unknown commit %s", limit);
512
513	/* reverse the list of commits */
514	prepare_revision_walk(&revs);
515	while ((commit = get_revision(&revs)) != NULL) {
516	/* ignore merges */
517	if (commit->parents && commit->parents->next)
518	continue;
519
520	commit_list_insert(commit, &list);
521	}
522
523	while (list) {
524	unsigned char sha1[20];
525	char sign = '+';
526
527	commit = list->item;
528	if (!get_patch_id(commit, &patch_id_opts, sha1) &&
529	lookup_object(sha1))
530	sign = '-';
531
532	if (verbose) {
533	static char buf[16384];
534	pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0,
535	buf, sizeof(buf), 0, NULL, NULL, 0);
536	printf("%c %s %s\n", sign,
537	sha1_to_hex(commit->object.sha1), buf);
538	}
539	else {
540	printf("%c %s\n", sign,
541	sha1_to_hex(commit->object.sha1));
542	}
543
544	list = list->next;
545	}
546
547	return 0;
548	}