log-tree.c 13.0 KB
Newer Older
1 2 3
#include "cache.h"
#include "diff.h"
#include "commit.h"
4
#include "tag.h"
5
#include "graph.h"
6
#include "log-tree.h"
7
#include "reflog-walk.h"
8
#include "refs.h"
9

10 11
struct decoration name_decoration = { "object names" };

12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45
static void add_name_decoration(const char *prefix, const char *name, struct object *obj)
{
	int plen = strlen(prefix);
	int nlen = strlen(name);
	struct name_decoration *res = xmalloc(sizeof(struct name_decoration) + plen + nlen);
	memcpy(res->name, prefix, plen);
	memcpy(res->name + plen, name, nlen + 1);
	res->next = add_decoration(&name_decoration, obj, res);
}

static int add_ref_decoration(const char *refname, const unsigned char *sha1, int flags, void *cb_data)
{
	struct object *obj = parse_object(sha1);
	if (!obj)
		return 0;
	add_name_decoration("", refname, obj);
	while (obj->type == OBJ_TAG) {
		obj = ((struct tag *)obj)->tagged;
		if (!obj)
			break;
		add_name_decoration("tag: ", refname, obj);
	}
	return 0;
}

void load_ref_decorations(void)
{
	static int loaded;
	if (!loaded) {
		loaded = 1;
		for_each_ref(add_ref_decoration, NULL);
	}
}

46 47 48 49 50
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;
51
		printf(" %s", find_unique_abbrev(parent->object.sha1, abbrev));
52 53 54
	}
}

55
void show_decorations(struct rev_info *opt, struct commit *commit)
56 57 58 59
{
	const char *prefix;
	struct name_decoration *decoration;

60
	if (opt->show_source && commit->util)
61
		printf("\t%s", (char *) commit->util);
62 63
	if (!opt->show_decorations)
		return;
64 65 66 67 68 69 70 71 72 73 74 75
	decoration = lookup_decoration(&name_decoration, &commit->object);
	if (!decoration)
		return;
	prefix = " (";
	while (decoration) {
		printf("%s%s", prefix, decoration->name);
		prefix = ", ";
		decoration = decoration->next;
	}
	putchar(')');
}

76 77 78 79 80 81
/*
 * 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)
{
82
	char *cp;
83 84 85 86 87 88
	int seen_colon = 0;
	int seen_at = 0;
	int seen_name = 0;
	int seen_head = 0;

	cp = letter + size;
89
	while (letter <= --cp && *cp == '\n')
90 91 92
		continue;

	while (letter <= cp) {
93
		char ch = *cp--;
94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122
		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;
}

123
static void append_signoff(struct strbuf *sb, const char *signoff)
J
Junio C Hamano 已提交
124 125
{
	static const char signed_off_by[] = "Signed-off-by: ";
126
	size_t signoff_len = strlen(signoff);
127
	int has_signoff = 0;
128
	char *cp;
J
Junio C Hamano 已提交
129

130
	cp = sb->buf;
J
Junio C Hamano 已提交
131 132

	/* First see if we already have the sign-off by the signer */
133 134 135 136
	while ((cp = strstr(cp, signed_off_by))) {

		has_signoff = 1;

J
Junio C Hamano 已提交
137
		cp += strlen(signed_off_by);
138
		if (cp + signoff_len >= sb->buf + sb->len)
139 140 141 142 143 144
			break;
		if (strncmp(cp, signoff, signoff_len))
			continue;
		if (!isspace(cp[signoff_len]))
			continue;
		/* we already have him */
145
		return;
J
Junio C Hamano 已提交
146 147
	}

148
	if (!has_signoff)
149
		has_signoff = detect_any_signoff(sb->buf, sb->len);
150 151

	if (!has_signoff)
152
		strbuf_addch(sb, '\n');
153

154 155 156
	strbuf_addstr(sb, signed_off_by);
	strbuf_add(sb, signoff, signoff_len);
	strbuf_addch(sb, '\n');
J
Junio C Hamano 已提交
157 158
}

159 160 161 162 163 164 165 166 167 168
static unsigned int digits_in_number(unsigned int number)
{
	unsigned int i = 10, result = 1;
	while (i <= number) {
		i *= 10;
		result++;
	}
	return result;
}

169 170 171 172 173 174 175 176 177 178 179 180
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;
}

181
void log_write_email_headers(struct rev_info *opt, const char *name,
J
Junio C Hamano 已提交
182 183 184
			     const char **subject_p,
			     const char **extra_headers_p,
			     int *need_8bit_cte_p)
185 186 187
{
	const char *subject = NULL;
	const char *extra_headers = opt->extra_headers;
J
Junio C Hamano 已提交
188 189

	*need_8bit_cte_p = 0; /* unknown */
190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208
	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);
209 210
	graph_show_oneline(opt->graph);
	if (opt->message_id) {
211
		printf("Message-Id: <%s>\n", opt->message_id);
212 213 214
		graph_show_oneline(opt->graph);
	}
	if (opt->ref_message_id) {
215 216
		printf("In-Reply-To: <%s>\nReferences: <%s>\n",
		       opt->ref_message_id, opt->ref_message_id);
217 218
		graph_show_oneline(opt->graph);
	}
219 220 221
	if (opt->mime_boundary) {
		static char subject_buffer[1024];
		static char buffer[1024];
J
Junio C Hamano 已提交
222
		*need_8bit_cte_p = -1; /* NEVER */
223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240
		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,
241
			 "\n--%s%s\n"
242 243 244 245 246 247 248 249 250 251 252 253 254 255 256
			 "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;
}

257
void show_log(struct rev_info *opt)
L
Linus Torvalds 已提交
258
{
259
	struct strbuf msgbuf = STRBUF_INIT;
T
Timo Hirvonen 已提交
260
	struct log_info *log = opt->loginfo;
L
Linus Torvalds 已提交
261 262 263
	struct commit *commit = log->commit, *parent = log->parent;
	int abbrev = opt->diffopt.abbrev;
	int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
264
	const char *subject = NULL, *extra_headers = opt->extra_headers;
265
	int need_8bit_cte = 0;
L
Linus Torvalds 已提交
266 267 268

	opt->loginfo = NULL;
	if (!opt->verbose_header) {
269 270
		graph_show_commit(opt->graph);

271 272 273 274 275 276 277 278 279 280 281
		if (!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('>');
			}
282
		}
283
		fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit), stdout);
284
		if (opt->print_parents)
285
			show_parents(commit, abbrev_commit);
286
		show_decorations(opt, commit);
287 288 289 290
		if (opt->graph && !graph_is_commit_finished(opt->graph)) {
			putchar('\n');
			graph_show_remainder(opt->graph);
		}
291
		putchar(opt->diffopt.line_termination);
L
Linus Torvalds 已提交
292 293 294 295
		return;
	}

	/*
296 297 298
	 * 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)
L
Linus Torvalds 已提交
299
	 */
300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315
	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);
L
Linus Torvalds 已提交
316
		putchar(opt->diffopt.line_termination);
317
	}
L
Linus Torvalds 已提交
318 319
	opt->shown_one = 1;

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

L
Linus Torvalds 已提交
326 327 328
	/*
	 * Print header line of header..
	 */
329

330
	if (opt->commit_format == CMIT_FMT_EMAIL) {
331
		log_write_email_headers(opt, sha1_to_hex(commit->object.sha1),
J
Junio C Hamano 已提交
332 333
					&subject, &extra_headers,
					&need_8bit_cte);
334
	} else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
335
		fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), stdout);
336 337
		if (opt->commit_format != CMIT_FMT_ONELINE)
			fputs("commit ", stdout);
338 339 340 341 342 343 344 345 346 347 348 349

		if (!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('>');
			}
350
		}
351
		fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit),
352
		      stdout);
353
		if (opt->print_parents)
354
			show_parents(commit, abbrev_commit);
J
Junio C Hamano 已提交
355
		if (parent)
356
			printf(" (from %s)",
357
			       find_unique_abbrev(parent->object.sha1,
358
						  abbrev_commit));
359
		show_decorations(opt, commit);
360
		printf("%s", diff_get_color_opt(&opt->diffopt, DIFF_RESET));
361 362 363 364 365 366
		if (opt->commit_format == CMIT_FMT_ONELINE) {
			putchar(' ');
		} else {
			putchar('\n');
			graph_show_oneline(opt->graph);
		}
367
		if (opt->reflog_info) {
368 369 370 371 372 373
			/*
			 * 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.
			 */
374
			show_reflog_message(opt->reflog_info,
375
				    opt->commit_format == CMIT_FMT_ONELINE,
376
				    opt->date_mode);
377
			if (opt->commit_format == CMIT_FMT_ONELINE)
378 379
				return;
		}
380
	}
L
Linus Torvalds 已提交
381

382 383 384
	if (!commit->buffer)
		return;

L
Linus Torvalds 已提交
385 386 387
	/*
	 * And then the pretty-printed message itself
	 */
388 389
	if (need_8bit_cte >= 0)
		need_8bit_cte = has_non_ascii(opt->add_signoff);
390
	pretty_print_commit(opt->commit_format, commit, &msgbuf,
391
			    abbrev, subject, extra_headers, opt->date_mode,
392
			    need_8bit_cte);
J
Junio C Hamano 已提交
393 394

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

401 402 403 404 405 406 407 408 409 410 411 412
	/*
	 * 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
413
		fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
414 415 416
	if (opt->use_terminator) {
		if (!opt->missing_newline)
			graph_show_padding(opt->graph);
417
		putchar('\n');
418 419
	}

420
	strbuf_release(&msgbuf);
L
Linus Torvalds 已提交
421 422
}

423
int log_tree_diff_flush(struct rev_info *opt)
424 425
{
	diffcore_std(&opt->diffopt);
L
Linus Torvalds 已提交
426

427 428 429 430 431 432 433
	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;
	}
L
Linus Torvalds 已提交
434

435 436 437 438 439 440
	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.
		 */
441
		show_log(opt);
442 443
		if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) &&
		    opt->verbose_header &&
444 445 446
		    opt->commit_format != CMIT_FMT_ONELINE) {
			int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
			if ((pch & opt->diffopt.output_format) == pch)
L
Linus Torvalds 已提交
447 448
				printf("---");
			putchar('\n');
449 450
		}
	}
451 452 453 454
	diff_flush(&opt->diffopt);
	return 1;
}

455
static int do_diff_combined(struct rev_info *opt, struct commit *commit)
456 457 458
{
	unsigned const char *sha1 = commit->object.sha1;

L
Linus Torvalds 已提交
459 460
	diff_tree_combined_merge(sha1, opt->dense_combined_merges, opt);
	return !opt->loginfo;
461 462
}

L
Linus Torvalds 已提交
463 464 465 466 467 468
/*
 * 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)
469
{
L
Linus Torvalds 已提交
470
	int showed_log;
471 472 473
	struct commit_list *parents;
	unsigned const char *sha1 = commit->object.sha1;

474
	if (!opt->diff && !DIFF_OPT_TST(&opt->diffopt, EXIT_WITH_STATUS))
L
Linus Torvalds 已提交
475 476
		return 0;

477
	/* Root commit? */
L
Linus Torvalds 已提交
478 479
	parents = commit->parents;
	if (!parents) {
R
Rene Scharfe 已提交
480 481 482 483
		if (opt->show_root_diff) {
			diff_root_tree_sha1(sha1, "", &opt->diffopt);
			log_tree_diff_flush(opt);
		}
L
Linus Torvalds 已提交
484
		return !opt->loginfo;
485 486 487
	}

	/* More than one parent? */
L
Linus Torvalds 已提交
488
	if (parents && parents->next) {
489 490 491 492
		if (opt->ignore_merges)
			return 0;
		else if (opt->combine_merges)
			return do_diff_combined(opt, commit);
L
Linus Torvalds 已提交
493 494 495

		/* If we show individual diffs, show the parent info */
		log->parent = parents->item;
496 497
	}

L
Linus Torvalds 已提交
498 499
	showed_log = 0;
	for (;;) {
500 501
		struct commit *parent = parents->item;

L
Linus Torvalds 已提交
502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519
		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;
520
	int shown;
L
Linus Torvalds 已提交
521 522 523 524 525

	log.commit = commit;
	log.parent = NULL;
	opt->loginfo = &log;

526 527
	shown = log_tree_diff(opt, commit, &log);
	if (!shown && opt->loginfo && opt->always_show_header) {
L
Linus Torvalds 已提交
528
		log.parent = NULL;
529
		show_log(opt);
530
		shown = 1;
531
	}
L
Linus Torvalds 已提交
532
	opt->loginfo = NULL;
533
	maybe_flush_or_die(stdout, "stdout");
534
	return shown;
535
}