builtin-log.c 11.0 KB
Newer Older
1 2 3 4 5 6 7 8 9 10 11
/*
 * 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"
12
#include "builtin.h"
13 14
#include <time.h>
#include <sys/time.h>
15

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

19
static void cmd_log_init(int argc, const char **argv, char **envp,
20 21 22 23 24 25
		      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");
26 27
	if (rev->diffopt.pickaxe || rev->diffopt.filter)
		rev->always_show_header = 0;
28 29
	if (argc > 1)
		die("unrecognized argument: %s", argv[1]);
30 31 32 33 34
}

static int cmd_log_walk(struct rev_info *rev)
{
	struct commit *commit;
35 36 37 38 39 40 41

	prepare_revision_walk(rev);
	setup_pager();
	while ((commit = get_revision(rev)) != NULL) {
		log_tree_commit(rev, commit);
		free(commit->buffer);
		commit->buffer = NULL;
L
Linus Torvalds 已提交
42 43
		free_commit_list(commit->parents);
		commit->parents = NULL;
44 45 46 47 48 49 50 51 52
	}
	return 0;
}

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

	init_revisions(&rev);
53 54
	git_config(git_diff_ui_config);
	diff_setup(&rev.diffopt);
55 56
	rev.diff = 1;
	rev.diffopt.recursive = 1;
L
Linus Torvalds 已提交
57
	rev.simplify_history = 0;
58 59 60 61
	cmd_log_init(argc, argv, envp, &rev);
	if (!rev.diffopt.output_format)
		rev.diffopt.output_format = DIFF_FORMAT_RAW;
	return cmd_log_walk(&rev);
62 63 64 65 66 67 68
}

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

	init_revisions(&rev);
69 70
	git_config(git_diff_ui_config);
	diff_setup(&rev.diffopt);
71 72 73 74 75 76 77
	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;
78 79
	cmd_log_init(argc, argv, envp, &rev);
	return cmd_log_walk(&rev);
80 81 82 83 84 85 86
}

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

	init_revisions(&rev);
87 88
	git_config(git_diff_ui_config);
	diff_setup(&rev.diffopt);
89
	rev.always_show_header = 1;
90 91
	cmd_log_init(argc, argv, envp, &rev);
	return cmd_log_walk(&rev);
92
}
93

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

100 101 102 103 104 105 106 107 108 109 110 111 112
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;
	}
113 114 115
	if (!strcmp(var, "diff.color")) {
		return 0;
	}
116
	return git_diff_ui_config(var, value);
117 118 119
}


120
static FILE *realstdout = NULL;
121
static const char *output_directory = NULL;
122

123
static void reopen_stdout(struct commit *commit, int nr, int keep_subject)
124 125 126
{
	char filename[1024];
	char *sol;
127
	int len = 0;
128

129
	if (output_directory) {
130
		strlcpy(filename, output_directory, 1010);
131 132 133 134
		len = strlen(filename);
		if (filename[len - 1] != '/')
			filename[len++] = '/';
	}
135

136
	sprintf(filename + len, "%04d", nr);
137 138 139 140 141 142 143 144
	len = strlen(filename);

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

		sol += 2;
		/* strip [PATCH] or [PATCH blabla] */
145
		if (!keep_subject && !strncmp(sol, "[PATCH", 6)) {
146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170
			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");
171
	fprintf(realstdout, "%s\n", filename);
172 173 174
	freopen(filename, "w", stdout);
}

175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225
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 */
226 227 228 229
	clear_commit_marks((struct commit *)o1,
			SEEN | UNINTERESTING | SHOWN | ADDED);
	clear_commit_marks((struct commit *)o2,
			SEEN | UNINTERESTING | SHOWN | ADDED);
230 231 232 233
	o1->flags = flags1;
	o2->flags = flags2;
}

234 235 236 237 238 239 240
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.");
241 242 243
	snprintf(dest, length, "%s.%lu.git.%.*s", base,
		 (unsigned long) time(NULL),
		 (int)(email_end - email_start - 1), email_start + 1);
244 245
}

246 247 248 249 250
int cmd_format_patch(int argc, const char **argv, char **envp)
{
	struct commit *commit;
	struct commit **list = NULL;
	struct rev_info rev;
251
	int nr = 0, total, i, j;
252
	int use_stdout = 0;
253
	int numbered = 0;
254
	int start_number = -1;
255
	int keep_subject = 0;
256
	int ignore_if_in_upstream = 0;
257
	int thread = 0;
258
	const char *in_reply_to = NULL;
259
	struct diff_options patch_id_opts;
J
Junio C Hamano 已提交
260
	char *add_signoff = NULL;
261 262
	char message_id[1024];
	char ref_message_id[1024];
263

264
	git_config(git_format_config);
265 266 267 268 269 270
	init_revisions(&rev);
	rev.commit_format = CMIT_FMT_EMAIL;
	rev.verbose_header = 1;
	rev.diff = 1;
	rev.combine_merges = 0;
	rev.ignore_merges = 1;
271 272
	rev.diffopt.msg_sep = "";
	rev.diffopt.recursive = 1;
273

274 275
	rev.extra_headers = extra_headers;

276 277 278 279 280 281 282
	/*
	 * 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"))
283
			use_stdout = 1;
284 285 286
		else if (!strcmp(argv[i], "-n") ||
				!strcmp(argv[i], "--numbered"))
			numbered = 1;
287 288 289 290 291 292 293
		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);
J
Junio C Hamano 已提交
294 295
		}
		else if (!strcmp(argv[i], "-k") ||
296 297 298
				!strcmp(argv[i], "--keep-subject")) {
			keep_subject = 1;
			rev.total = -1;
J
Junio C Hamano 已提交
299
		}
300 301
		else if (!strcmp(argv[i], "--output-directory") ||
			 !strcmp(argv[i], "-o")) {
302
			i++;
303 304 305 306 307
			if (argc <= i)
				die("Which directory?");
			if (output_directory)
				die("Two output directories?");
			output_directory = argv[i];
308
		}
J
Junio C Hamano 已提交
309 310
		else if (!strcmp(argv[i], "--signoff") ||
			 !strcmp(argv[i], "-s")) {
E
Eric W. Biederman 已提交
311 312 313 314 315
			const char *committer;
			const char *endpos;
			setup_ident();
			committer = git_committer_info(1);
			endpos = strchr(committer, '>');
J
Junio C Hamano 已提交
316 317 318 319 320 321
			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;
		}
322 323 324 325
		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;
326 327
		else if (!strcmp(argv[i], "--ignore-if-in-upstream"))
			ignore_if_in_upstream = 1;
328 329
		else if (!strcmp(argv[i], "--thread"))
			thread = 1;
330 331 332 333 334 335 336 337
		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];
		}
338
		else
339
			argv[j++] = argv[i];
340
	}
341 342
	argc = j;

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

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

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

355 356 357 358 359 360 361 362
	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);
	}

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

368 369 370
	if (ignore_if_in_upstream)
		get_patch_ids(&rev, &patch_id_opts);

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

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

378 379 380
		/* ignore merges */
		if (commit->parents && commit->parents->next)
			continue;
381 382 383 384 385 386

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

387 388 389 390
		nr++;
		list = realloc(list, nr * sizeof(list[0]));
		list[nr - 1] = commit;
	}
391
	total = nr;
392
	if (numbered)
393
		rev.total = total + start_number - 1;
J
Junio C Hamano 已提交
394
	rev.add_signoff = add_signoff;
395
	rev.ref_message_id = in_reply_to;
396 397 398
	while (0 <= --nr) {
		int shown;
		commit = list[nr];
399
		rev.nr = total - nr + (start_number - 1);
400
		/* Make the second and subsequent mails replies to the first */
401 402 403 404 405 406 407 408 409 410
		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;
411
		}
412
		if (!use_stdout)
413
			reopen_stdout(commit, rev.nr, keep_subject);
414 415 416
		shown = log_tree_commit(&rev, commit);
		free(commit->buffer);
		commit->buffer = NULL;
417 418 419 420 421 422 423 424 425

		/* 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;
426 427 428 429 430 431 432 433
		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);
		}
434 435
		if (!use_stdout)
			fclose(stdout);
436 437 438 439 440
	}
	free(list);
	return 0;
}