pretty.c 38.6 KB
Newer Older
1 2 3 4 5
#include "cache.h"
#include "commit.h"
#include "utf8.h"
#include "diff.h"
#include "revision.h"
6
#include "string-list.h"
7
#include "mailmap.h"
8
#include "log-tree.h"
J
Johannes Schindelin 已提交
9
#include "notes.h"
J
Jeff King 已提交
10
#include "color.h"
11
#include "reflog-walk.h"
J
Junio C Hamano 已提交
12
#include "gpg-interface.h"
13 14

static char *user_format;
15 16 17 18
static struct cmt_fmt_map {
	const char *name;
	enum cmit_fmt format;
	int is_tformat;
19 20
	int is_alias;
	const char *user_format;
21
} *commit_formats;
22
static size_t builtin_formats_len;
23
static size_t commit_formats_len;
24
static size_t commit_formats_alloc;
25
static struct cmt_fmt_map *find_commit_format(const char *sought);
26

27 28 29 30 31 32 33 34 35
static void save_user_format(struct rev_info *rev, const char *cp, int is_tformat)
{
	free(user_format);
	user_format = xstrdup(cp);
	if (is_tformat)
		rev->use_terminator = 1;
	rev->commit_format = CMIT_FMT_USERFORMAT;
}

36
static int git_pretty_formats_config(const char *var, const char *value, void *cb)
37
{
38 39 40
	struct cmt_fmt_map *commit_format = NULL;
	const char *name;
	const char *fmt;
41
	int i;
42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62

	if (prefixcmp(var, "pretty."))
		return 0;

	name = var + strlen("pretty.");
	for (i = 0; i < builtin_formats_len; i++) {
		if (!strcmp(commit_formats[i].name, name))
			return 0;
	}

	for (i = builtin_formats_len; i < commit_formats_len; i++) {
		if (!strcmp(commit_formats[i].name, name)) {
			commit_format = &commit_formats[i];
			break;
		}
	}

	if (!commit_format) {
		ALLOC_GROW(commit_formats, commit_formats_len+1,
			   commit_formats_alloc);
		commit_format = &commit_formats[commit_formats_len];
63
		memset(commit_format, 0, sizeof(*commit_format));
64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81
		commit_formats_len++;
	}

	commit_format->name = xstrdup(name);
	commit_format->format = CMIT_FMT_USERFORMAT;
	git_config_string(&fmt, var, value);
	if (!prefixcmp(fmt, "format:") || !prefixcmp(fmt, "tformat:")) {
		commit_format->is_tformat = fmt[0] == 't';
		fmt = strchr(fmt, ':') + 1;
	} else if (strchr(fmt, '%'))
		commit_format->is_tformat = 1;
	else
		commit_format->is_alias = 1;
	commit_format->user_format = fmt;

	return 0;
}

82
static void setup_commit_formats(void)
83
{
84 85 86 87 88 89 90 91
	struct cmt_fmt_map builtin_formats[] = {
		{ "raw",	CMIT_FMT_RAW,		0 },
		{ "medium",	CMIT_FMT_MEDIUM,	0 },
		{ "short",	CMIT_FMT_SHORT,		0 },
		{ "email",	CMIT_FMT_EMAIL,		0 },
		{ "fuller",	CMIT_FMT_FULLER,	0 },
		{ "full",	CMIT_FMT_FULL,		0 },
		{ "oneline",	CMIT_FMT_ONELINE,	1 }
92
	};
93
	commit_formats_len = ARRAY_SIZE(builtin_formats);
94 95
	builtin_formats_len = commit_formats_len;
	ALLOC_GROW(commit_formats, commit_formats_len, commit_formats_alloc);
96 97
	memcpy(commit_formats, builtin_formats,
	       sizeof(*builtin_formats)*ARRAY_SIZE(builtin_formats));
98 99

	git_config(git_pretty_formats_config, NULL);
100 101
}

102 103 104
static struct cmt_fmt_map *find_commit_format_recursive(const char *sought,
							const char *original,
							int num_redirections)
105 106 107 108 109
{
	struct cmt_fmt_map *found = NULL;
	size_t found_match_len = 0;
	int i;

110 111 112 113
	if (num_redirections >= commit_formats_len)
		die("invalid --pretty format: "
		    "'%s' references an alias which points to itself",
		    original);
114 115 116 117 118 119 120 121 122 123 124 125 126

	for (i = 0; i < commit_formats_len; i++) {
		size_t match_len;

		if (prefixcmp(commit_formats[i].name, sought))
			continue;

		match_len = strlen(commit_formats[i].name);
		if (found == NULL || found_match_len > match_len) {
			found = &commit_formats[i];
			found_match_len = match_len;
		}
	}
127 128 129 130 131 132 133

	if (found && found->is_alias) {
		found = find_commit_format_recursive(found->user_format,
						     original,
						     num_redirections+1);
	}

134 135 136
	return found;
}

137 138 139 140 141 142 143 144
static struct cmt_fmt_map *find_commit_format(const char *sought)
{
	if (!commit_formats)
		setup_commit_formats();

	return find_commit_format_recursive(sought, sought, 0);
}

145 146 147
void get_commit_format(const char *arg, struct rev_info *rev)
{
	struct cmt_fmt_map *commit_format;
148

149 150 151 152 153 154
	rev->use_terminator = 0;
	if (!arg || !*arg) {
		rev->commit_format = CMIT_FMT_DEFAULT;
		return;
	}
	if (!prefixcmp(arg, "format:") || !prefixcmp(arg, "tformat:")) {
155
		save_user_format(rev, strchr(arg, ':') + 1, arg[0] == 't');
156
		return;
157
	}
158

159 160 161 162
	if (strchr(arg, '%')) {
		save_user_format(rev, arg, 1);
		return;
	}
163

164 165 166 167 168 169
	commit_format = find_commit_format(arg);
	if (!commit_format)
		die("invalid --pretty format: %s", arg);

	rev->commit_format = commit_format->format;
	rev->use_terminator = commit_format->is_tformat;
170 171 172 173
	if (commit_format->format == CMIT_FMT_USERFORMAT) {
		save_user_format(rev, commit_format->user_format,
				 commit_format->is_tformat);
	}
174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194
}

/*
 * Generic support for pretty-printing the header
 */
static int get_one_line(const char *msg)
{
	int ret = 0;

	for (;;) {
		char c = *msg++;
		if (!c)
			break;
		ret++;
		if (c == '\n')
			break;
	}
	return ret;
}

/* High bit set, or ISO-2022-INT */
195
static int non_ascii(int ch)
196
{
R
René Scharfe 已提交
197
	return !isascii(ch) || ch == '\033';
198 199
}

200 201 202 203 204 205 206 207 208 209 210 211
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;
}

212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233
static int is_rfc822_special(char ch)
{
	switch (ch) {
	case '(':
	case ')':
	case '<':
	case '>':
	case '[':
	case ']':
	case ':':
	case ';':
	case '@':
	case ',':
	case '.':
	case '"':
	case '\\':
		return 1;
	default:
		return 0;
	}
}

234
static int needs_rfc822_quoting(const char *s, int len)
235 236 237 238 239 240 241 242
{
	int i;
	for (i = 0; i < len; i++)
		if (is_rfc822_special(s[i]))
			return 1;
	return 0;
}

243 244 245 246 247 248 249 250 251 252 253
static int last_line_length(struct strbuf *sb)
{
	int i;

	/* How many bytes are already used on the last line? */
	for (i = sb->len - 1; i >= 0; i--)
		if (sb->buf[i] == '\n')
			break;
	return sb->len - (i + 1);
}

254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274
static void add_rfc822_quoted(struct strbuf *out, const char *s, int len)
{
	int i;

	/* just a guess, we may have to also backslash-quote */
	strbuf_grow(out, len + 2);

	strbuf_addch(out, '"');
	for (i = 0; i < len; i++) {
		switch (s[i]) {
		case '"':
		case '\\':
			strbuf_addch(out, '\\');
			/* fall through */
		default:
			strbuf_addch(out, s[i]);
		}
	}
	strbuf_addch(out, '"');
}

275 276 277 278 279 280
enum rfc2047_type {
	RFC2047_SUBJECT,
	RFC2047_ADDRESS,
};

static int is_rfc2047_special(char ch, enum rfc2047_type type)
281
{
282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305
	/*
	 * rfc2047, section 4.2:
	 *
	 *    8-bit values which correspond to printable ASCII characters other
	 *    than "=", "?", and "_" (underscore), MAY be represented as those
	 *    characters.  (But see section 5 for restrictions.)  In
	 *    particular, SPACE and TAB MUST NOT be represented as themselves
	 *    within encoded words.
	 */

	/*
	 * rule out non-ASCII characters and non-printable characters (the
	 * non-ASCII check should be redundant as isprint() is not localized
	 * and only knows about ASCII, but be defensive about that)
	 */
	if (non_ascii(ch) || !isprint(ch))
		return 1;

	/*
	 * rule out special printable characters (' ' should be the only
	 * whitespace character considered printable, but be defensive and use
	 * isspace())
	 */
	if (isspace(ch) || ch == '=' || ch == '?' || ch == '_')
306 307
		return 1;

308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329
	/*
	 * rfc2047, section 5.3:
	 *
	 *    As a replacement for a 'word' entity within a 'phrase', for example,
	 *    one that precedes an address in a From, To, or Cc header.  The ABNF
	 *    definition for 'phrase' from RFC 822 thus becomes:
	 *
	 *    phrase = 1*( encoded-word / word )
	 *
	 *    In this case the set of characters that may be used in a "Q"-encoded
	 *    'encoded-word' is restricted to: <upper and lower case ASCII
	 *    letters, decimal digits, "!", "*", "+", "-", "/", "=", and "_"
	 *    (underscore, ASCII 95.)>.  An 'encoded-word' that appears within a
	 *    'phrase' MUST be separated from any adjacent 'word', 'text' or
	 *    'special' by 'linear-white-space'.
	 */

	if (type != RFC2047_ADDRESS)
		return 0;

	/* '=' and '_' are special cases and have been checked above */
	return !(isalnum(ch) || ch == '!' || ch == '*' || ch == '+' || ch == '-' || ch == '/');
330 331
}

332 333
static int needs_rfc2047_encoding(const char *line, int len,
				  enum rfc2047_type type)
334
{
J
Jeff King 已提交
335
	int i;
336 337 338

	for (i = 0; i < len; i++) {
		int ch = line[i];
339
		if (non_ascii(ch) || ch == '\n')
340
			return 1;
341
		if ((i + 1 < len) && (ch == '=' && line[i+1] == '?'))
342
			return 1;
343 344
	}

345 346 347
	return 0;
}

348
static void add_rfc2047(struct strbuf *sb, const char *line, size_t len,
349 350 351 352 353 354
		       const char *encoding, enum rfc2047_type type)
{
	static const int max_encoded_length = 76; /* per rfc2047 */
	int i;
	int line_len = last_line_length(sb);

355 356
	strbuf_grow(sb, len * 3 + strlen(encoding) + 100);
	strbuf_addf(sb, "=?%s?q?", encoding);
J
Jeff King 已提交
357
	line_len += strlen(encoding) + 5; /* 5 for =??q? */
358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373

	while (len) {
		/*
		 * RFC 2047, section 5 (3):
		 *
		 * Each 'encoded-word' MUST represent an integral number of
		 * characters.  A multi-octet character may not be split across
		 * adjacent 'encoded- word's.
		 */
		const unsigned char *p = (const unsigned char *)line;
		int chrlen = mbs_chrlen(&line, &len, encoding);
		int is_special = (chrlen > 1) || is_rfc2047_special(*p, type);

		/* "=%02X" * chrlen, or the byte itself */
		const char *encoded_fmt = is_special ? "=%02X"    : "%c";
		int	    encoded_len = is_special ? 3 * chrlen : 1;
374 375 376 377 378 379 380 381

		/*
		 * According to RFC 2047, we could encode the special character
		 * ' ' (space) with '_' (underscore) for readability. But many
		 * programs do not understand this and just leave the
		 * underscore in place. Thus, we do nothing special here, which
		 * causes ' ' to be encoded as '=20', avoiding this problem.
		 */
J
Jeff King 已提交
382

383 384
		if (line_len + encoded_len + 2 > max_encoded_length) {
			/* It won't fit with trailing "?=" --- break the line */
J
Jeff King 已提交
385 386 387 388
			strbuf_addf(sb, "?=\n =?%s?q?", encoding);
			line_len = strlen(encoding) + 5 + 1; /* =??q? plus SP */
		}

389 390 391
		for (i = 0; i < chrlen; i++)
			strbuf_addf(sb, encoded_fmt, p[i]);
		line_len += encoded_len;
392 393 394 395
	}
	strbuf_addstr(sb, "?=");
}

396 397 398 399 400 401 402 403
static const char *show_ident_date(const struct ident_split *ident,
				   enum date_mode mode)
{
	unsigned long date = 0;
	int tz = 0;

	if (ident->date_begin && ident->date_end)
		date = strtoul(ident->date_begin, NULL, 10);
404 405 406 407 408 409 410 411
	if (date_overflows(date))
		date = 0;
	else {
		if (ident->tz_begin && ident->tz_end)
			tz = strtol(ident->tz_begin, NULL, 10);
		if (tz == LONG_MAX || tz == LONG_MIN)
			tz = 0;
	}
412 413 414
	return show_date(date, tz, mode);
}

415 416 417
void pp_user_info(const struct pretty_print_context *pp,
		  const char *what, struct strbuf *sb,
		  const char *line, const char *encoding)
418
{
419 420
	struct strbuf name;
	struct strbuf mail;
421
	struct ident_split ident;
422
	int linelen;
423
	char *line_end;
424 425
	const char *mailbuf, *namebuf;
	size_t namelen, maillen;
426
	int max_length = 78; /* per rfc2822 */
427

428
	if (pp->fmt == CMIT_FMT_ONELINE)
429
		return;
430 431 432 433 434 435 436 437 438 439

	line_end = strchr(line, '\n');
	if (!line_end) {
		line_end = strchr(line, '\0');
		if (!line_end)
			return;
	}

	linelen = ++line_end - line;
	if (split_ident_line(&ident, line, linelen))
440
		return;
441

442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457

	mailbuf = ident.mail_begin;
	maillen = ident.mail_end - ident.mail_begin;
	namebuf = ident.name_begin;
	namelen = ident.name_end - ident.name_begin;

	if (pp->mailmap)
		map_user(pp->mailmap, &mailbuf, &maillen, &namebuf, &namelen);

	strbuf_init(&mail, 0);
	strbuf_init(&name, 0);

	strbuf_add(&mail, mailbuf, maillen);
	strbuf_add(&name, namebuf, namelen);

	namelen = name.len + mail.len + 3; /* ' ' + '<' + '>' */
458

459
	if (pp->fmt == CMIT_FMT_EMAIL) {
460
		strbuf_addstr(sb, "From: ");
461 462 463
		if (needs_rfc2047_encoding(name.buf, name.len, RFC2047_ADDRESS)) {
			add_rfc2047(sb, name.buf, name.len,
				    encoding, RFC2047_ADDRESS);
464
			max_length = 76; /* per rfc2047 */
465
		} else if (needs_rfc822_quoting(name.buf, name.len)) {
466
			struct strbuf quoted = STRBUF_INIT;
467
			add_rfc822_quoted(&quoted, name.buf, name.len);
468 469
			strbuf_add_wrapped_bytes(sb, quoted.buf, quoted.len,
							-6, 1, max_length);
470
			strbuf_release(&quoted);
471
		} else {
472 473
			strbuf_add_wrapped_bytes(sb, name.buf, name.len,
						 -6, 1, max_length);
474
		}
475
		if (namelen - name.len + last_line_length(sb) > max_length)
476
			strbuf_addch(sb, '\n');
477 478

		strbuf_addf(sb, " <%s>\n", mail.buf);
479
	} else {
480
		strbuf_addf(sb, "%s: %.*s%s <%s>\n", what,
481
			      (pp->fmt == CMIT_FMT_FULLER) ? 4 : 0,
482
			      "    ", name.buf, mail.buf);
483
	}
484 485 486 487

	strbuf_release(&mail);
	strbuf_release(&name);

488
	switch (pp->fmt) {
489
	case CMIT_FMT_MEDIUM:
490 491
		strbuf_addf(sb, "Date:   %s\n",
			    show_ident_date(&ident, pp->date_mode));
492 493
		break;
	case CMIT_FMT_EMAIL:
494 495
		strbuf_addf(sb, "Date: %s\n",
			    show_ident_date(&ident, DATE_RFC2822));
496 497
		break;
	case CMIT_FMT_FULLER:
498 499
		strbuf_addf(sb, "%sDate: %s\n", what,
			    show_ident_date(&ident, pp->date_mode));
500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515
		break;
	default:
		/* notin' */
		break;
	}
}

static int is_empty_line(const char *line, int *len_p)
{
	int len = *len_p;
	while (len && isspace(line[len-1]))
		len--;
	*len_p = len;
	return !len;
}

516 517 518 519 520 521 522 523 524 525 526 527 528 529
static const char *skip_empty_lines(const char *msg)
{
	for (;;) {
		int linelen = get_one_line(msg);
		int ll = linelen;
		if (!linelen)
			break;
		if (!is_empty_line(msg, &ll))
			break;
		msg += linelen;
	}
	return msg;
}

530 531
static void add_merge_info(const struct pretty_print_context *pp,
			   struct strbuf *sb, const struct commit *commit)
532 533 534
{
	struct commit_list *parent = commit->parents;

535
	if ((pp->fmt == CMIT_FMT_ONELINE) || (pp->fmt == CMIT_FMT_EMAIL) ||
536 537 538 539 540 541 542 543
	    !parent || !parent->next)
		return;

	strbuf_addstr(sb, "Merge:");

	while (parent) {
		struct commit *p = parent->item;
		const char *hex = NULL;
544 545
		if (pp->abbrev)
			hex = find_unique_abbrev(p->object.sha1, pp->abbrev);
546 547 548 549
		if (!hex)
			hex = sha1_to_hex(p->object.sha1);
		parent = parent->next;

550
		strbuf_addf(sb, " %s", hex);
551 552 553 554
	}
	strbuf_addch(sb, '\n');
}

J
Jeff King 已提交
555 556
static char *get_header(const struct commit *commit, const char *msg,
			const char *key)
557 558
{
	int key_len = strlen(key);
J
Jeff King 已提交
559
	const char *line = msg;
560

561
	while (line) {
562 563 564 565 566
		const char *eol = strchr(line, '\n'), *next;

		if (line == eol)
			return NULL;
		if (!eol) {
567 568
			warning("malformed commit (header is missing newline): %s",
				sha1_to_hex(commit->object.sha1));
569 570 571 572 573 574 575 576 577 578 579
			eol = line + strlen(line);
			next = NULL;
		} else
			next = eol + 1;
		if (eol - line > key_len &&
		    !strncmp(line, key, key_len) &&
		    line[key_len] == ' ') {
			return xmemdupz(line + key_len + 1, eol - line - key_len - 1);
		}
		line = next;
	}
580
	return NULL;
581 582 583 584
}

static char *replace_encoding_header(char *buf, const char *encoding)
{
585
	struct strbuf tmp = STRBUF_INIT;
586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613
	size_t start, len;
	char *cp = buf;

	/* guess if there is an encoding header before a \n\n */
	while (strncmp(cp, "encoding ", strlen("encoding "))) {
		cp = strchr(cp, '\n');
		if (!cp || *++cp == '\n')
			return buf;
	}
	start = cp - buf;
	cp = strchr(cp, '\n');
	if (!cp)
		return buf; /* should not happen but be defensive */
	len = cp + 1 - (buf + start);

	strbuf_attach(&tmp, buf, strlen(buf), strlen(buf) + 1);
	if (is_encoding_utf8(encoding)) {
		/* we have re-coded to UTF-8; drop the header */
		strbuf_remove(&tmp, start, len);
	} else {
		/* just replaces XXXX in 'encoding XXXX\n' */
		strbuf_splice(&tmp, start + strlen("encoding "),
					  len - strlen("encoding \n"),
					  encoding, strlen(encoding));
	}
	return strbuf_detach(&tmp, NULL);
}

614 615
char *logmsg_reencode(const struct commit *commit,
		      const char *output_encoding)
616
{
617
	static const char *utf8 = "UTF-8";
618 619
	const char *use_encoding;
	char *encoding;
J
Jeff King 已提交
620
	char *msg = commit->buffer;
621 622
	char *out;

623 624 625 626 627 628 629 630 631 632 633 634 635
	if (!msg) {
		enum object_type type;
		unsigned long size;

		msg = read_sha1_file(commit->object.sha1, &type, &size);
		if (!msg)
			die("Cannot read commit object %s",
			    sha1_to_hex(commit->object.sha1));
		if (type != OBJ_COMMIT)
			die("Expected commit for '%s', got %s",
			    sha1_to_hex(commit->object.sha1), typename(type));
	}

636
	if (!output_encoding || !*output_encoding)
J
Jeff King 已提交
637 638
		return msg;
	encoding = get_header(commit, msg, "encoding");
639
	use_encoding = encoding ? encoding : utf8;
640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675
	if (same_encoding(use_encoding, output_encoding)) {
		/*
		 * No encoding work to be done. If we have no encoding header
		 * at all, then there's nothing to do, and we can return the
		 * message verbatim (whether newly allocated or not).
		 */
		if (!encoding)
			return msg;

		/*
		 * Otherwise, we still want to munge the encoding header in the
		 * result, which will be done by modifying the buffer. If we
		 * are using a fresh copy, we can reuse it. But if we are using
		 * the cached copy from commit->buffer, we need to duplicate it
		 * to avoid munging commit->buffer.
		 */
		out = msg;
		if (out == commit->buffer)
			out = xstrdup(out);
	}
	else {
		/*
		 * There's actual encoding work to do. Do the reencoding, which
		 * still leaves the header to be replaced in the next step. At
		 * this point, we are done with msg. If we allocated a fresh
		 * copy, we can free it.
		 */
		out = reencode_string(msg, output_encoding, use_encoding);
		if (out && msg != commit->buffer)
			free(msg);
	}

	/*
	 * This replacement actually consumes the buffer we hand it, so we do
	 * not have to worry about freeing the old "out" here.
	 */
676 677 678 679
	if (out)
		out = replace_encoding_header(out, output_encoding);

	free(encoding);
J
Jeff King 已提交
680 681 682 683 684 685 686 687 688 689 690
	/*
	 * If the re-encoding failed, out might be NULL here; in that
	 * case we just return the commit message verbatim.
	 */
	return out ? out : msg;
}

void logmsg_free(char *msg, const struct commit *commit)
{
	if (msg != commit->buffer)
		free(msg);
691 692
}

693 694
static int mailmap_name(const char **email, size_t *email_len,
			const char **name, size_t *name_len)
695
{
696
	static struct string_list *mail_map;
697 698
	if (!mail_map) {
		mail_map = xcalloc(1, sizeof(*mail_map));
699
		read_mailmap(mail_map, NULL);
700
	}
701
	return mail_map->nr && map_user(mail_map, email, email_len, name, name_len);
702 703
}

704
static size_t format_person_part(struct strbuf *sb, char part,
705
				 const char *msg, int len, enum date_mode dmode)
706
{
707 708
	/* currently all placeholders have same length */
	const int placeholder_len = 2;
709
	struct ident_split s;
710 711
	const char *name, *mail;
	size_t maillen, namelen;
712

713
	if (split_ident_line(&s, msg, len) < 0)
714 715
		goto skip;

716 717 718 719 720 721 722
	name = s.name_begin;
	namelen = s.name_end - s.name_begin;
	mail = s.mail_begin;
	maillen = s.mail_end - s.mail_begin;

	if (part == 'N' || part == 'E') /* mailmap lookup */
		mailmap_name(&mail, &maillen, &name, &namelen);
723
	if (part == 'n' || part == 'N') {	/* name */
724
		strbuf_add(sb, name, namelen);
725
		return placeholder_len;
726
	}
727
	if (part == 'e' || part == 'E') {	/* email */
728
		strbuf_add(sb, mail, maillen);
729
		return placeholder_len;
730
	}
731

732
	if (!s.date_begin)
733
		goto skip;
734

735
	if (part == 't') {	/* date, UNIX timestamp */
736
		strbuf_add(sb, s.date_begin, s.date_end - s.date_begin);
737
		return placeholder_len;
738
	}
739

740 741
	switch (part) {
	case 'd':	/* date */
742
		strbuf_addstr(sb, show_ident_date(&s, dmode));
743
		return placeholder_len;
744
	case 'D':	/* date, RFC2822 style */
745
		strbuf_addstr(sb, show_ident_date(&s, DATE_RFC2822));
746
		return placeholder_len;
747
	case 'r':	/* date, relative */
748
		strbuf_addstr(sb, show_ident_date(&s, DATE_RELATIVE));
749
		return placeholder_len;
750
	case 'i':	/* date, ISO 8601 */
751
		strbuf_addstr(sb, show_ident_date(&s, DATE_ISO8601));
752
		return placeholder_len;
753
	}
754 755 756

skip:
	/*
757 758 759
	 * reading from either a bogus commit, or a reflog entry with
	 * %gn, %ge, etc.; 'sb' cannot be updated, but we still need
	 * to compute a valid return value.
760 761 762 763 764 765
	 */
	if (part == 'n' || part == 'e' || part == 't' || part == 'd'
	    || part == 'D' || part == 'r' || part == 'i')
		return placeholder_len;

	return 0; /* unknown placeholder */
766 767
}

768 769 770 771 772 773 774
struct chunk {
	size_t off;
	size_t len;
};

struct format_commit_context {
	const struct commit *commit;
775
	const struct pretty_print_context *pretty_ctx;
776 777
	unsigned commit_header_parsed:1;
	unsigned commit_message_parsed:1;
J
Junio C Hamano 已提交
778 779 780
	unsigned commit_signature_parsed:1;
	struct {
		char *gpg_output;
781
		char *gpg_status;
J
Junio C Hamano 已提交
782 783
		char good_bad;
		char *signer;
784
		char *key;
J
Junio C Hamano 已提交
785
	} signature;
786
	char *message;
787
	size_t width, indent1, indent2;
788 789 790 791 792

	/* These offsets are relative to the start of the commit message. */
	struct chunk author;
	struct chunk committer;
	struct chunk encoding;
793 794
	size_t message_off;
	size_t subject_off;
795
	size_t body_off;
796 797 798 799 800

	/* The following ones are relative to the result struct strbuf. */
	struct chunk abbrev_commit_hash;
	struct chunk abbrev_tree_hash;
	struct chunk abbrev_parent_hashes;
801
	size_t wrap_start;
802 803
};

804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820
static int add_again(struct strbuf *sb, struct chunk *chunk)
{
	if (chunk->len) {
		strbuf_adddup(sb, chunk->off, chunk->len);
		return 1;
	}

	/*
	 * We haven't seen this chunk before.  Our caller is surely
	 * going to add it the hard way now.  Remember the most likely
	 * start of the to-be-added chunk: the current end of the
	 * struct strbuf.
	 */
	chunk->off = sb->len;
	return 0;
}

821
static void parse_commit_header(struct format_commit_context *context)
822
{
823
	const char *msg = context->message;
824
	int i;
825

826
	for (i = 0; msg[i]; i++) {
827 828 829 830 831
		int eol;
		for (eol = i; msg[eol] && msg[eol] != '\n'; eol++)
			; /* do nothing */

		if (i == eol) {
832
			break;
833 834 835 836 837 838 839 840 841 842 843 844
		} else if (!prefixcmp(msg + i, "author ")) {
			context->author.off = i + 7;
			context->author.len = eol - i - 7;
		} else if (!prefixcmp(msg + i, "committer ")) {
			context->committer.off = i + 10;
			context->committer.len = eol - i - 10;
		} else if (!prefixcmp(msg + i, "encoding ")) {
			context->encoding.off = i + 9;
			context->encoding.len = eol - i - 9;
		}
		i = eol;
	}
845
	context->message_off = i;
846 847 848
	context->commit_header_parsed = 1;
}

849 850 851 852 853 854 855 856 857
static int istitlechar(char c)
{
	return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
		(c >= '0' && c <= '9') || c == '.' || c == '_';
}

static void format_sanitized_subject(struct strbuf *sb, const char *msg)
{
	size_t trimlen;
858
	size_t start_len = sb->len;
859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875
	int space = 2;

	for (; *msg && *msg != '\n'; msg++) {
		if (istitlechar(*msg)) {
			if (space == 1)
				strbuf_addch(sb, '-');
			space = 0;
			strbuf_addch(sb, *msg);
			if (*msg == '.')
				while (*(msg+1) == '.')
					msg++;
		} else
			space |= 1;
	}

	/* trim any trailing '.' or '-' characters */
	trimlen = 0;
876 877 878
	while (sb->len - trimlen > start_len &&
		(sb->buf[sb->len - 1 - trimlen] == '.'
		|| sb->buf[sb->len - 1 - trimlen] == '-'))
879 880 881 882
		trimlen++;
	strbuf_remove(sb, sb->len - trimlen, trimlen);
}

883 884
const char *format_subject(struct strbuf *sb, const char *msg,
			   const char *line_separator)
885 886 887 888 889 890 891 892 893 894 895
{
	int first = 1;

	for (;;) {
		const char *line = msg;
		int linelen = get_one_line(line);

		msg += linelen;
		if (!linelen || is_empty_line(line, &linelen))
			break;

896 897
		if (!sb)
			continue;
898 899 900 901 902 903 904 905 906
		strbuf_grow(sb, linelen + 2);
		if (!first)
			strbuf_addstr(sb, line_separator);
		strbuf_add(sb, line, linelen);
		first = 0;
	}
	return msg;
}

907 908
static void parse_commit_message(struct format_commit_context *c)
{
909 910
	const char *msg = c->message + c->message_off;
	const char *start = c->message;
911 912 913 914 915 916 917 918 919 920 921

	msg = skip_empty_lines(msg);
	c->subject_off = msg - start;

	msg = format_subject(NULL, msg, NULL);
	msg = skip_empty_lines(msg);
	c->body_off = msg - start;

	c->commit_message_parsed = 1;
}

922 923 924 925 926
static void format_decoration(struct strbuf *sb, const struct commit *commit)
{
	struct name_decoration *d;
	const char *prefix = " (";

927
	load_ref_decorations(DECORATE_SHORT_REFS);
928 929 930 931 932 933 934 935 936 937 938
	d = lookup_decoration(&name_decoration, &commit->object);
	while (d) {
		strbuf_addstr(sb, prefix);
		prefix = ", ";
		strbuf_addstr(sb, d->name);
		d = d->next;
	}
	if (prefix[0] == ',')
		strbuf_addch(sb, ')');
}

939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959
static void strbuf_wrap(struct strbuf *sb, size_t pos,
			size_t width, size_t indent1, size_t indent2)
{
	struct strbuf tmp = STRBUF_INIT;

	if (pos)
		strbuf_add(&tmp, sb->buf, pos);
	strbuf_add_wrapped_text(&tmp, sb->buf + pos,
				(int) indent1, (int) indent2, (int) width);
	strbuf_swap(&tmp, sb);
	strbuf_release(&tmp);
}

static void rewrap_message_tail(struct strbuf *sb,
				struct format_commit_context *c,
				size_t new_width, size_t new_indent1,
				size_t new_indent2)
{
	if (c->width == new_width && c->indent1 == new_indent1 &&
	    c->indent2 == new_indent2)
		return;
960
	if (c->wrap_start < sb->len)
961 962 963 964 965 966 967
		strbuf_wrap(sb, c->wrap_start, c->width, c->indent1, c->indent2);
	c->wrap_start = sb->len;
	c->width = new_width;
	c->indent1 = new_indent1;
	c->indent2 = new_indent2;
}

J
Junio C Hamano 已提交
968 969 970 971
static struct {
	char result;
	const char *check;
} signature_check[] = {
972 973
	{ 'G', "\n[GNUPG:] GOODSIG " },
	{ 'B', "\n[GNUPG:] BADSIG " },
J
Junio C Hamano 已提交
974 975 976 977
};

static void parse_signature_lines(struct format_commit_context *ctx)
{
978
	const char *buf = ctx->signature.gpg_status;
J
Junio C Hamano 已提交
979 980 981 982 983 984 985 986 987
	int i;

	for (i = 0; i < ARRAY_SIZE(signature_check); i++) {
		const char *found = strstr(buf, signature_check[i].check);
		const char *next;
		if (!found)
			continue;
		ctx->signature.good_bad = signature_check[i].result;
		found += strlen(signature_check[i].check);
988 989
		ctx->signature.key = xmemdupz(found, 16);
		found += 17;
J
Junio C Hamano 已提交
990 991 992 993 994 995 996 997 998 999 1000
		next = strchrnul(found, '\n');
		ctx->signature.signer = xmemdupz(found, next - found);
		break;
	}
}

static void parse_commit_signature(struct format_commit_context *ctx)
{
	struct strbuf payload = STRBUF_INIT;
	struct strbuf signature = STRBUF_INIT;
	struct strbuf gpg_output = STRBUF_INIT;
1001
	struct strbuf gpg_status = STRBUF_INIT;
J
Junio C Hamano 已提交
1002 1003 1004 1005 1006 1007 1008 1009 1010
	int status;

	ctx->commit_signature_parsed = 1;

	if (parse_signed_commit(ctx->commit->object.sha1,
				&payload, &signature) <= 0)
		goto out;
	status = verify_signed_buffer(payload.buf, payload.len,
				      signature.buf, signature.len,
1011
				      &gpg_output, &gpg_status);
J
Junio C Hamano 已提交
1012 1013 1014
	if (status && !gpg_output.len)
		goto out;
	ctx->signature.gpg_output = strbuf_detach(&gpg_output, NULL);
1015
	ctx->signature.gpg_status = strbuf_detach(&gpg_status, NULL);
J
Junio C Hamano 已提交
1016 1017 1018
	parse_signature_lines(ctx);

 out:
1019
	strbuf_release(&gpg_status);
J
Junio C Hamano 已提交
1020 1021 1022 1023 1024 1025
	strbuf_release(&gpg_output);
	strbuf_release(&payload);
	strbuf_release(&signature);
}


1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042
static int format_reflog_person(struct strbuf *sb,
				char part,
				struct reflog_walk_info *log,
				enum date_mode dmode)
{
	const char *ident;

	if (!log)
		return 2;

	ident = get_reflog_ident(log);
	if (!ident)
		return 2;

	return format_person_part(sb, part, ident, strlen(ident), dmode);
}

1043 1044
static size_t format_commit_one(struct strbuf *sb, const char *placeholder,
				void *context)
1045 1046 1047
{
	struct format_commit_context *c = context;
	const struct commit *commit = c->commit;
1048
	const char *msg = c->message;
1049
	struct commit_list *p;
1050
	int h1, h2;
1051 1052

	/* these are independent of the commit */
1053 1054
	switch (placeholder[0]) {
	case 'C':
J
Jeff King 已提交
1055
		if (placeholder[1] == '(') {
1056 1057
			const char *begin = placeholder + 2;
			const char *end = strchr(begin, ')');
J
Jeff King 已提交
1058
			char color[COLOR_MAXLEN];
1059

J
Jeff King 已提交
1060 1061
			if (!end)
				return 0;
1062
			if (!prefixcmp(begin, "auto,")) {
1063 1064 1065 1066 1067 1068
				if (!want_color(c->pretty_ctx->color))
					return end - placeholder + 1;
				begin += 5;
			}
			color_parse_mem(begin,
					end - begin,
J
Jeff King 已提交
1069 1070 1071 1072
					"--pretty format", color);
			strbuf_addstr(sb, color);
			return end - placeholder + 1;
		}
1073
		if (!prefixcmp(placeholder + 1, "red")) {
1074
			strbuf_addstr(sb, GIT_COLOR_RED);
1075 1076
			return 4;
		} else if (!prefixcmp(placeholder + 1, "green")) {
1077
			strbuf_addstr(sb, GIT_COLOR_GREEN);
1078 1079
			return 6;
		} else if (!prefixcmp(placeholder + 1, "blue")) {
1080
			strbuf_addstr(sb, GIT_COLOR_BLUE);
1081 1082
			return 5;
		} else if (!prefixcmp(placeholder + 1, "reset")) {
1083
			strbuf_addstr(sb, GIT_COLOR_RESET);
1084 1085 1086
			return 6;
		} else
			return 0;
1087 1088
	case 'n':		/* newline */
		strbuf_addch(sb, '\n');
1089
		return 1;
1090 1091 1092 1093 1094 1095 1096 1097 1098 1099
	case 'x':
		/* %x00 == NUL, %x0a == LF, etc. */
		if (0 <= (h1 = hexval_table[0xff & placeholder[1]]) &&
		    h1 <= 16 &&
		    0 <= (h2 = hexval_table[0xff & placeholder[2]]) &&
		    h2 <= 16) {
			strbuf_addch(sb, (h1<<4)|h2);
			return 3;
		} else
			return 0;
1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123
	case 'w':
		if (placeholder[1] == '(') {
			unsigned long width = 0, indent1 = 0, indent2 = 0;
			char *next;
			const char *start = placeholder + 2;
			const char *end = strchr(start, ')');
			if (!end)
				return 0;
			if (end > start) {
				width = strtoul(start, &next, 10);
				if (*next == ',') {
					indent1 = strtoul(next + 1, &next, 10);
					if (*next == ',') {
						indent2 = strtoul(next + 1,
								 &next, 10);
					}
				}
				if (*next != ')')
					return 0;
			}
			rewrap_message_tail(sb, c, width, indent1, indent2);
			return end - placeholder + 1;
		} else
			return 0;
1124
	}
1125 1126 1127 1128 1129

	/* these depend on the commit */
	if (!commit->object.parsed)
		parse_object(commit->object.sha1);

1130 1131 1132
	switch (placeholder[0]) {
	case 'H':		/* commit hash */
		strbuf_addstr(sb, sha1_to_hex(commit->object.sha1));
1133
		return 1;
1134
	case 'h':		/* abbreviated commit hash */
1135
		if (add_again(sb, &c->abbrev_commit_hash))
1136
			return 1;
1137
		strbuf_addstr(sb, find_unique_abbrev(commit->object.sha1,
W
Will Palmer 已提交
1138
						     c->pretty_ctx->abbrev));
1139
		c->abbrev_commit_hash.len = sb->len - c->abbrev_commit_hash.off;
1140
		return 1;
1141 1142
	case 'T':		/* tree hash */
		strbuf_addstr(sb, sha1_to_hex(commit->tree->object.sha1));
1143
		return 1;
1144
	case 't':		/* abbreviated tree hash */
1145
		if (add_again(sb, &c->abbrev_tree_hash))
1146
			return 1;
1147
		strbuf_addstr(sb, find_unique_abbrev(commit->tree->object.sha1,
W
Will Palmer 已提交
1148
						     c->pretty_ctx->abbrev));
1149
		c->abbrev_tree_hash.len = sb->len - c->abbrev_tree_hash.off;
1150
		return 1;
1151 1152 1153 1154 1155 1156
	case 'P':		/* parent hashes */
		for (p = commit->parents; p; p = p->next) {
			if (p != commit->parents)
				strbuf_addch(sb, ' ');
			strbuf_addstr(sb, sha1_to_hex(p->item->object.sha1));
		}
1157
		return 1;
1158
	case 'p':		/* abbreviated parent hashes */
1159
		if (add_again(sb, &c->abbrev_parent_hashes))
1160
			return 1;
1161 1162 1163 1164
		for (p = commit->parents; p; p = p->next) {
			if (p != commit->parents)
				strbuf_addch(sb, ' ');
			strbuf_addstr(sb, find_unique_abbrev(
W
Will Palmer 已提交
1165 1166
					p->item->object.sha1,
					c->pretty_ctx->abbrev));
1167
		}
1168 1169
		c->abbrev_parent_hashes.len = sb->len -
		                              c->abbrev_parent_hashes.off;
1170
		return 1;
1171
	case 'm':		/* left/right/bottom */
1172
		strbuf_addstr(sb, get_revision_mark(NULL, commit));
1173
		return 1;
1174 1175 1176
	case 'd':
		format_decoration(sb, commit);
		return 1;
1177 1178 1179 1180 1181 1182 1183 1184
	case 'g':		/* reflog info */
		switch(placeholder[1]) {
		case 'd':	/* reflog selector */
		case 'D':
			if (c->pretty_ctx->reflog_info)
				get_reflog_selector(sb,
						    c->pretty_ctx->reflog_info,
						    c->pretty_ctx->date_mode,
1185
						    c->pretty_ctx->date_mode_explicit,
1186 1187 1188 1189 1190 1191
						    (placeholder[1] == 'd'));
			return 2;
		case 's':	/* reflog message */
			if (c->pretty_ctx->reflog_info)
				get_reflog_message(sb, c->pretty_ctx->reflog_info);
			return 2;
1192 1193 1194 1195 1196 1197 1198 1199
		case 'n':
		case 'N':
		case 'e':
		case 'E':
			return format_reflog_person(sb,
						    placeholder[1],
						    c->pretty_ctx->reflog_info,
						    c->pretty_ctx->date_mode);
1200 1201
		}
		return 0;	/* unknown %g placeholder */
1202
	case 'N':
1203 1204
		if (c->pretty_ctx->notes_message) {
			strbuf_addstr(sb, c->pretty_ctx->notes_message);
1205 1206 1207
			return 1;
		}
		return 0;
1208 1209
	}

J
Junio C Hamano 已提交
1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228
	if (placeholder[0] == 'G') {
		if (!c->commit_signature_parsed)
			parse_commit_signature(c);
		switch (placeholder[1]) {
		case 'G':
			if (c->signature.gpg_output)
				strbuf_addstr(sb, c->signature.gpg_output);
			break;
		case '?':
			switch (c->signature.good_bad) {
			case 'G':
			case 'B':
				strbuf_addch(sb, c->signature.good_bad);
			}
			break;
		case 'S':
			if (c->signature.signer)
				strbuf_addstr(sb, c->signature.signer);
			break;
1229 1230 1231 1232
		case 'K':
			if (c->signature.key)
				strbuf_addstr(sb, c->signature.key);
			break;
J
Junio C Hamano 已提交
1233 1234 1235 1236 1237
		}
		return 2;
	}


1238
	/* For the rest we have to parse the commit header. */
1239 1240
	if (!c->commit_header_parsed)
		parse_commit_header(c);
1241

1242
	switch (placeholder[0]) {
1243 1244
	case 'a':	/* author ... */
		return format_person_part(sb, placeholder[1],
1245
				   msg + c->author.off, c->author.len,
1246
				   c->pretty_ctx->date_mode);
1247 1248
	case 'c':	/* committer ... */
		return format_person_part(sb, placeholder[1],
1249
				   msg + c->committer.off, c->committer.len,
1250
				   c->pretty_ctx->date_mode);
1251
	case 'e':	/* encoding */
1252
		strbuf_add(sb, msg + c->encoding.off, c->encoding.len);
1253
		return 1;
1254 1255 1256 1257
	case 'B':	/* raw body */
		/* message_off is always left at the initial newline */
		strbuf_addstr(sb, msg + c->message_off + 1);
		return 1;
1258 1259 1260 1261 1262 1263 1264 1265 1266 1267
	}

	/* Now we need to parse the commit message. */
	if (!c->commit_message_parsed)
		parse_commit_message(c);

	switch (placeholder[0]) {
	case 's':	/* subject */
		format_subject(sb, msg + c->subject_off, " ");
		return 1;
1268 1269 1270
	case 'f':	/* sanitized subject */
		format_sanitized_subject(sb, msg + c->subject_off);
		return 1;
1271
	case 'b':	/* body */
1272
		strbuf_addstr(sb, msg + c->body_off);
1273
		return 1;
1274
	}
1275
	return 0;	/* unknown placeholder */
1276 1277
}

1278 1279 1280 1281 1282 1283 1284 1285 1286
static size_t format_commit_item(struct strbuf *sb, const char *placeholder,
				 void *context)
{
	int consumed;
	size_t orig_len;
	enum {
		NO_MAGIC,
		ADD_LF_BEFORE_NON_EMPTY,
		DEL_LF_BEFORE_EMPTY,
1287
		ADD_SP_BEFORE_NON_EMPTY
1288 1289 1290 1291 1292 1293 1294 1295 1296
	} magic = NO_MAGIC;

	switch (placeholder[0]) {
	case '-':
		magic = DEL_LF_BEFORE_EMPTY;
		break;
	case '+':
		magic = ADD_LF_BEFORE_NON_EMPTY;
		break;
1297 1298 1299
	case ' ':
		magic = ADD_SP_BEFORE_NON_EMPTY;
		break;
1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313
	default:
		break;
	}
	if (magic != NO_MAGIC)
		placeholder++;

	orig_len = sb->len;
	consumed = format_commit_one(sb, placeholder, context);
	if (magic == NO_MAGIC)
		return consumed;

	if ((orig_len == sb->len) && magic == DEL_LF_BEFORE_EMPTY) {
		while (sb->len && sb->buf[sb->len - 1] == '\n')
			strbuf_setlen(sb, sb->len - 1);
1314 1315 1316 1317 1318
	} else if (orig_len != sb->len) {
		if (magic == ADD_LF_BEFORE_NON_EMPTY)
			strbuf_insert(sb, orig_len, "\n", 1);
		else if (magic == ADD_SP_BEFORE_NON_EMPTY)
			strbuf_insert(sb, orig_len, " ", 1);
1319 1320 1321 1322
	}
	return consumed + 1;
}

1323 1324 1325 1326 1327
static size_t userformat_want_item(struct strbuf *sb, const char *placeholder,
				   void *context)
{
	struct userformat_want *w = context;

1328
	if (*placeholder == '+' || *placeholder == '-' || *placeholder == ' ')
1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347
		placeholder++;

	switch (*placeholder) {
	case 'N':
		w->notes = 1;
		break;
	}
	return 0;
}

void userformat_find_requirements(const char *fmt, struct userformat_want *w)
{
	struct strbuf dummy = STRBUF_INIT;

	if (!fmt) {
		if (!user_format)
			return;
		fmt = user_format;
	}
1348
	strbuf_expand(&dummy, fmt, userformat_want_item, w);
1349 1350 1351
	strbuf_release(&dummy);
}

1352
void format_commit_message(const struct commit *commit,
1353
			   const char *format, struct strbuf *sb,
1354
			   const struct pretty_print_context *pretty_ctx)
1355
{
1356
	struct format_commit_context context;
1357
	const char *output_enc = pretty_ctx->output_encoding;
1358 1359 1360

	memset(&context, 0, sizeof(context));
	context.commit = commit;
1361
	context.pretty_ctx = pretty_ctx;
1362
	context.wrap_start = sb->len;
1363
	context.message = logmsg_reencode(commit, output_enc);
1364

1365
	strbuf_expand(sb, format, format_commit_item, &context);
1366
	rewrap_message_tail(sb, &context, 0, 0, 0);
1367

J
Jeff King 已提交
1368
	logmsg_free(context.message, commit);
J
Junio C Hamano 已提交
1369 1370
	free(context.signature.gpg_output);
	free(context.signature.signer);
1371 1372
}

1373
static void pp_header(const struct pretty_print_context *pp,
1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392
		      const char *encoding,
		      const struct commit *commit,
		      const char **msg_p,
		      struct strbuf *sb)
{
	int parents_shown = 0;

	for (;;) {
		const char *line = *msg_p;
		int linelen = get_one_line(*msg_p);

		if (!linelen)
			return;
		*msg_p += linelen;

		if (linelen == 1)
			/* End of header */
			return;

1393
		if (pp->fmt == CMIT_FMT_RAW) {
1394 1395 1396 1397
			strbuf_add(sb, line, linelen);
			continue;
		}

1398
		if (!prefixcmp(line, "parent ")) {
1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412
			if (linelen != 48)
				die("bad parent line in commit");
			continue;
		}

		if (!parents_shown) {
			struct commit_list *parent;
			int num;
			for (parent = commit->parents, num = 0;
			     parent;
			     parent = parent->next, num++)
				;
			/* with enough slop */
			strbuf_grow(sb, num * 50 + 20);
1413
			add_merge_info(pp, sb, commit);
1414 1415 1416 1417 1418 1419 1420 1421
			parents_shown = 1;
		}

		/*
		 * MEDIUM == DEFAULT shows only author with dates.
		 * FULL shows both authors but not dates.
		 * FULLER shows both authors and dates.
		 */
1422
		if (!prefixcmp(line, "author ")) {
1423
			strbuf_grow(sb, linelen + 80);
1424
			pp_user_info(pp, "Author", sb, line + 7, encoding);
1425
		}
1426
		if (!prefixcmp(line, "committer ") &&
1427
		    (pp->fmt == CMIT_FMT_FULL || pp->fmt == CMIT_FMT_FULLER)) {
1428
			strbuf_grow(sb, linelen + 80);
1429
			pp_user_info(pp, "Commit", sb, line + 10, encoding);
1430 1431 1432 1433
		}
	}
}

1434
void pp_title_line(const struct pretty_print_context *pp,
1435 1436 1437
		   const char **msg_p,
		   struct strbuf *sb,
		   const char *encoding,
J
Junio C Hamano 已提交
1438
		   int need_8bit_cte)
1439
{
1440
	static const int max_length = 78; /* per rfc2047 */
1441 1442 1443
	struct strbuf title;

	strbuf_init(&title, 80);
1444 1445
	*msg_p = format_subject(&title, *msg_p,
				pp->preserve_subject ? "\n" : " ");
1446 1447

	strbuf_grow(sb, title.len + 1024);
1448 1449
	if (pp->subject) {
		strbuf_addstr(sb, pp->subject);
1450 1451 1452 1453 1454 1455
		if (needs_rfc2047_encoding(title.buf, title.len, RFC2047_SUBJECT))
			add_rfc2047(sb, title.buf, title.len,
						encoding, RFC2047_SUBJECT);
		else
			strbuf_add_wrapped_bytes(sb, title.buf, title.len,
					 -last_line_length(sb), 1, max_length);
1456 1457 1458 1459 1460
	} else {
		strbuf_addbuf(sb, &title);
	}
	strbuf_addch(sb, '\n');

1461
	if (need_8bit_cte > 0) {
1462 1463 1464 1465 1466 1467
		const char *header_fmt =
			"MIME-Version: 1.0\n"
			"Content-Type: text/plain; charset=%s\n"
			"Content-Transfer-Encoding: 8bit\n";
		strbuf_addf(sb, header_fmt, encoding);
	}
1468 1469
	if (pp->after_subject) {
		strbuf_addstr(sb, pp->after_subject);
1470
	}
1471
	if (pp->fmt == CMIT_FMT_EMAIL) {
1472 1473 1474 1475 1476
		strbuf_addch(sb, '\n');
	}
	strbuf_release(&title);
}

1477
void pp_remainder(const struct pretty_print_context *pp,
1478 1479 1480
		  const char **msg_p,
		  struct strbuf *sb,
		  int indent)
1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493
{
	int first = 1;
	for (;;) {
		const char *line = *msg_p;
		int linelen = get_one_line(line);
		*msg_p += linelen;

		if (!linelen)
			break;

		if (is_empty_line(line, &linelen)) {
			if (first)
				continue;
1494
			if (pp->fmt == CMIT_FMT_SHORT)
1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508
				break;
		}
		first = 0;

		strbuf_grow(sb, linelen + indent + 20);
		if (indent) {
			memset(sb->buf + sb->len, ' ', indent);
			strbuf_setlen(sb, sb->len + indent);
		}
		strbuf_add(sb, line, linelen);
		strbuf_addch(sb, '\n');
	}
}

1509 1510 1511
void pretty_print_commit(const struct pretty_print_context *pp,
			 const struct commit *commit,
			 struct strbuf *sb)
1512 1513 1514
{
	unsigned long beginning_of_body;
	int indent = 4;
J
Jeff King 已提交
1515
	const char *msg;
1516 1517
	char *reencoded;
	const char *encoding;
1518
	int need_8bit_cte = pp->need_8bit_cte;
1519

1520 1521
	if (pp->fmt == CMIT_FMT_USERFORMAT) {
		format_commit_message(commit, user_format, sb, pp);
1522 1523 1524
		return;
	}

1525
	encoding = get_log_output_encoding();
J
Jeff King 已提交
1526
	msg = reencoded = logmsg_reencode(commit, encoding);
1527

1528
	if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL)
1529 1530
		indent = 0;

1531 1532 1533
	/*
	 * We need to check and emit Content-type: to mark it
	 * as 8-bit if we haven't done so.
1534
	 */
1535
	if (pp->fmt == CMIT_FMT_EMAIL && need_8bit_cte == 0) {
1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547
		int i, ch, in_body;

		for (in_body = i = 0; (ch = msg[i]); i++) {
			if (!in_body) {
				/* author could be non 7-bit ASCII but
				 * the log may be so; skip over the
				 * header part first.
				 */
				if (ch == '\n' && msg[i+1] == '\n')
					in_body = 1;
			}
			else if (non_ascii(ch)) {
1548
				need_8bit_cte = 1;
1549 1550 1551 1552 1553
				break;
			}
		}
	}

1554 1555
	pp_header(pp, encoding, commit, &msg, sb);
	if (pp->fmt != CMIT_FMT_ONELINE && !pp->subject) {
1556 1557 1558 1559
		strbuf_addch(sb, '\n');
	}

	/* Skip excess blank lines at the beginning of body, if any... */
1560
	msg = skip_empty_lines(msg);
1561 1562

	/* These formats treat the title line specially. */
1563 1564
	if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL)
		pp_title_line(pp, &msg, sb, encoding, need_8bit_cte);
1565 1566

	beginning_of_body = sb->len;
1567 1568
	if (pp->fmt != CMIT_FMT_ONELINE)
		pp_remainder(pp, &msg, sb, indent);
1569 1570 1571
	strbuf_rtrim(sb);

	/* Make sure there is an EOLN for the non-oneline case */
1572
	if (pp->fmt != CMIT_FMT_ONELINE)
1573 1574 1575 1576 1577 1578 1579
		strbuf_addch(sb, '\n');

	/*
	 * The caller may append additional body text in e-mail
	 * format.  Make sure we did not strip the blank line
	 * between the header and the body.
	 */
1580
	if (pp->fmt == CMIT_FMT_EMAIL && sb->len <= beginning_of_body)
1581
		strbuf_addch(sb, '\n');
J
Johannes Schindelin 已提交
1582

J
Jeff King 已提交
1583
	logmsg_free(reencoded, commit);
1584
}
1585 1586 1587 1588 1589

void pp_commit_easy(enum cmit_fmt fmt, const struct commit *commit,
		    struct strbuf *sb)
{
	struct pretty_print_context pp = {0};
1590 1591
	pp.fmt = fmt;
	pretty_print_commit(&pp, commit, sb);
1592
}