pretty.c 36.4 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 348 349 350 351 352 353 354
	return 0;
}

static void add_rfc2047(struct strbuf *sb, const char *line, int len,
		       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 358
	line_len += strlen(encoding) + 5; /* 5 for =??q? */
	for (i = 0; i < len; i++) {
359
		unsigned ch = line[i] & 0xFF;
360
		int is_special = is_rfc2047_special(ch, type);
361 362 363 364 365 366 367 368

		/*
		 * 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 已提交
369

370
		if (line_len + 2 + (is_special ? 3 : 1) > max_encoded_length) {
J
Jeff King 已提交
371 372 373 374
			strbuf_addf(sb, "?=\n =?%s?q?", encoding);
			line_len = strlen(encoding) + 5 + 1; /* =??q? plus SP */
		}

375
		if (is_special) {
376
			strbuf_addf(sb, "=%02X", ch);
J
Jeff King 已提交
377
			line_len += 3;
378
		} else {
J
Jeff King 已提交
379 380
			strbuf_addch(sb, ch);
			line_len++;
381 382 383 384 385
		}
	}
	strbuf_addstr(sb, "?=");
}

386 387 388
void pp_user_info(const struct pretty_print_context *pp,
		  const char *what, struct strbuf *sb,
		  const char *line, const char *encoding)
389
{
390 391
	struct strbuf name;
	struct strbuf mail;
392
	struct ident_split ident;
393
	int linelen;
394
	char *line_end, *date;
395 396
	const char *mailbuf, *namebuf;
	size_t namelen, maillen;
397
	int max_length = 78; /* per rfc2822 */
398 399 400
	unsigned long time;
	int tz;

401
	if (pp->fmt == CMIT_FMT_ONELINE)
402
		return;
403 404 405 406 407 408 409 410 411 412

	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))
413
		return;
414

415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430

	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; /* ' ' + '<' + '>' */
431
	time = strtoul(ident.date_begin, &date, 10);
432 433
	tz = strtol(date, NULL, 10);

434
	if (pp->fmt == CMIT_FMT_EMAIL) {
435
		strbuf_addstr(sb, "From: ");
436 437 438
		if (needs_rfc2047_encoding(name.buf, name.len, RFC2047_ADDRESS)) {
			add_rfc2047(sb, name.buf, name.len,
				    encoding, RFC2047_ADDRESS);
439
			max_length = 76; /* per rfc2047 */
440
		} else if (needs_rfc822_quoting(name.buf, name.len)) {
441
			struct strbuf quoted = STRBUF_INIT;
442
			add_rfc822_quoted(&quoted, name.buf, name.len);
443 444
			strbuf_add_wrapped_bytes(sb, quoted.buf, quoted.len,
							-6, 1, max_length);
445
			strbuf_release(&quoted);
446
		} else {
447 448
			strbuf_add_wrapped_bytes(sb, name.buf, name.len,
						 -6, 1, max_length);
449
		}
450
		if (namelen - name.len + last_line_length(sb) > max_length)
451
			strbuf_addch(sb, '\n');
452 453

		strbuf_addf(sb, " <%s>\n", mail.buf);
454
	} else {
455
		strbuf_addf(sb, "%s: %.*s%s <%s>\n", what,
456
			      (pp->fmt == CMIT_FMT_FULLER) ? 4 : 0,
457
			      "    ", name.buf, mail.buf);
458
	}
459 460 461 462

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

463
	switch (pp->fmt) {
464
	case CMIT_FMT_MEDIUM:
465
		strbuf_addf(sb, "Date:   %s\n", show_date(time, tz, pp->date_mode));
466 467 468 469 470
		break;
	case CMIT_FMT_EMAIL:
		strbuf_addf(sb, "Date: %s\n", show_date(time, tz, DATE_RFC2822));
		break;
	case CMIT_FMT_FULLER:
471
		strbuf_addf(sb, "%sDate: %s\n", what, show_date(time, tz, pp->date_mode));
472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487
		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;
}

488 489 490 491 492 493 494 495 496 497 498 499 500 501
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;
}

502 503
static void add_merge_info(const struct pretty_print_context *pp,
			   struct strbuf *sb, const struct commit *commit)
504 505 506
{
	struct commit_list *parent = commit->parents;

507
	if ((pp->fmt == CMIT_FMT_ONELINE) || (pp->fmt == CMIT_FMT_EMAIL) ||
508 509 510 511 512 513 514 515
	    !parent || !parent->next)
		return;

	strbuf_addstr(sb, "Merge:");

	while (parent) {
		struct commit *p = parent->item;
		const char *hex = NULL;
516 517
		if (pp->abbrev)
			hex = find_unique_abbrev(p->object.sha1, pp->abbrev);
518 519 520 521
		if (!hex)
			hex = sha1_to_hex(p->object.sha1);
		parent = parent->next;

522
		strbuf_addf(sb, " %s", hex);
523 524 525 526 527 528 529 530 531
	}
	strbuf_addch(sb, '\n');
}

static char *get_header(const struct commit *commit, const char *key)
{
	int key_len = strlen(key);
	const char *line = commit->buffer;

532
	while (line) {
533 534 535 536 537
		const char *eol = strchr(line, '\n'), *next;

		if (line == eol)
			return NULL;
		if (!eol) {
538 539
			warning("malformed commit (header is missing newline): %s",
				sha1_to_hex(commit->object.sha1));
540 541 542 543 544 545 546 547 548 549 550
			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;
	}
551
	return NULL;
552 553 554 555
}

static char *replace_encoding_header(char *buf, const char *encoding)
{
556
	struct strbuf tmp = STRBUF_INIT;
557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584
	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);
}

585 586
char *logmsg_reencode(const struct commit *commit,
		      const char *output_encoding)
587
{
588
	static const char *utf8 = "UTF-8";
589 590 591 592 593 594 595 596
	const char *use_encoding;
	char *encoding;
	char *out;

	if (!*output_encoding)
		return NULL;
	encoding = get_header(commit, "encoding");
	use_encoding = encoding ? encoding : utf8;
597
	if (same_encoding(use_encoding, output_encoding))
598 599 600 601 602 603 604 605 606 607 608 609 610 611
		if (encoding) /* we'll strip encoding header later */
			out = xstrdup(commit->buffer);
		else
			return NULL; /* nothing to do */
	else
		out = reencode_string(commit->buffer,
				      output_encoding, use_encoding);
	if (out)
		out = replace_encoding_header(out, output_encoding);

	free(encoding);
	return out;
}

612 613
static int mailmap_name(const char **email, size_t *email_len,
			const char **name, size_t *name_len)
614
{
615
	static struct string_list *mail_map;
616 617
	if (!mail_map) {
		mail_map = xcalloc(1, sizeof(*mail_map));
618
		read_mailmap(mail_map, NULL);
619
	}
620
	return mail_map->nr && map_user(mail_map, email, email_len, name, name_len);
621 622
}

623
static size_t format_person_part(struct strbuf *sb, char part,
624
				 const char *msg, int len, enum date_mode dmode)
625
{
626 627
	/* currently all placeholders have same length */
	const int placeholder_len = 2;
628
	int tz;
629
	unsigned long date = 0;
630
	struct ident_split s;
631 632
	const char *name, *mail;
	size_t maillen, namelen;
633

634
	if (split_ident_line(&s, msg, len) < 0)
635 636
		goto skip;

637 638 639 640 641 642 643
	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);
644
	if (part == 'n' || part == 'N') {	/* name */
645
		strbuf_add(sb, name, namelen);
646
		return placeholder_len;
647
	}
648
	if (part == 'e' || part == 'E') {	/* email */
649
		strbuf_add(sb, mail, maillen);
650
		return placeholder_len;
651
	}
652

653
	if (!s.date_begin)
654
		goto skip;
655

656 657
	date = strtoul(s.date_begin, NULL, 10);

658
	if (part == 't') {	/* date, UNIX timestamp */
659
		strbuf_add(sb, s.date_begin, s.date_end - s.date_begin);
660
		return placeholder_len;
661
	}
662 663

	/* parse tz */
664 665 666
	tz = strtoul(s.tz_begin + 1, NULL, 10);
	if (*s.tz_begin == '-')
		tz = -tz;
667

668 669
	switch (part) {
	case 'd':	/* date */
670
		strbuf_addstr(sb, show_date(date, tz, dmode));
671
		return placeholder_len;
672 673
	case 'D':	/* date, RFC2822 style */
		strbuf_addstr(sb, show_date(date, tz, DATE_RFC2822));
674
		return placeholder_len;
675 676
	case 'r':	/* date, relative */
		strbuf_addstr(sb, show_date(date, tz, DATE_RELATIVE));
677
		return placeholder_len;
678 679
	case 'i':	/* date, ISO 8601 */
		strbuf_addstr(sb, show_date(date, tz, DATE_ISO8601));
680
		return placeholder_len;
681
	}
682 683 684

skip:
	/*
685 686 687
	 * 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.
688 689 690 691 692 693
	 */
	if (part == 'n' || part == 'e' || part == 't' || part == 'd'
	    || part == 'D' || part == 'r' || part == 'i')
		return placeholder_len;

	return 0; /* unknown placeholder */
694 695
}

696 697 698 699 700 701 702
struct chunk {
	size_t off;
	size_t len;
};

struct format_commit_context {
	const struct commit *commit;
703
	const struct pretty_print_context *pretty_ctx;
704 705
	unsigned commit_header_parsed:1;
	unsigned commit_message_parsed:1;
J
Junio C Hamano 已提交
706 707 708 709 710 711
	unsigned commit_signature_parsed:1;
	struct {
		char *gpg_output;
		char good_bad;
		char *signer;
	} signature;
712
	char *message;
713
	size_t width, indent1, indent2;
714 715 716 717 718

	/* These offsets are relative to the start of the commit message. */
	struct chunk author;
	struct chunk committer;
	struct chunk encoding;
719 720
	size_t message_off;
	size_t subject_off;
721
	size_t body_off;
722 723 724 725 726

	/* 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;
727
	size_t wrap_start;
728 729
};

730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746
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;
}

747
static void parse_commit_header(struct format_commit_context *context)
748
{
749
	const char *msg = context->message;
750
	int i;
751

752
	for (i = 0; msg[i]; i++) {
753 754 755 756 757
		int eol;
		for (eol = i; msg[eol] && msg[eol] != '\n'; eol++)
			; /* do nothing */

		if (i == eol) {
758
			break;
759 760 761 762 763 764 765 766 767 768 769 770
		} 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;
	}
771
	context->message_off = i;
772 773 774
	context->commit_header_parsed = 1;
}

775 776 777 778 779 780 781 782 783
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;
784
	size_t start_len = sb->len;
785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801
	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;
802 803 804
	while (sb->len - trimlen > start_len &&
		(sb->buf[sb->len - 1 - trimlen] == '.'
		|| sb->buf[sb->len - 1 - trimlen] == '-'))
805 806 807 808
		trimlen++;
	strbuf_remove(sb, sb->len - trimlen, trimlen);
}

809 810
const char *format_subject(struct strbuf *sb, const char *msg,
			   const char *line_separator)
811 812 813 814 815 816 817 818 819 820 821
{
	int first = 1;

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

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

822 823
		if (!sb)
			continue;
824 825 826 827 828 829 830 831 832
		strbuf_grow(sb, linelen + 2);
		if (!first)
			strbuf_addstr(sb, line_separator);
		strbuf_add(sb, line, linelen);
		first = 0;
	}
	return msg;
}

833 834
static void parse_commit_message(struct format_commit_context *c)
{
835 836
	const char *msg = c->message + c->message_off;
	const char *start = c->message;
837 838 839 840 841 842 843 844 845 846 847

	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;
}

848 849 850 851 852
static void format_decoration(struct strbuf *sb, const struct commit *commit)
{
	struct name_decoration *d;
	const char *prefix = " (";

853
	load_ref_decorations(DECORATE_SHORT_REFS);
854 855 856 857 858 859 860 861 862 863 864
	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, ')');
}

865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885
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;
886
	if (c->wrap_start < sb->len)
887 888 889 890 891 892 893
		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 已提交
894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946
static struct {
	char result;
	const char *check;
} signature_check[] = {
	{ 'G', ": Good signature from " },
	{ 'B', ": BAD signature from " },
};

static void parse_signature_lines(struct format_commit_context *ctx)
{
	const char *buf = ctx->signature.gpg_output;
	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);
		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;
	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,
				      &gpg_output);
	if (status && !gpg_output.len)
		goto out;
	ctx->signature.gpg_output = strbuf_detach(&gpg_output, NULL);
	parse_signature_lines(ctx);

 out:
	strbuf_release(&gpg_output);
	strbuf_release(&payload);
	strbuf_release(&signature);
}


947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963
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);
}

964 965
static size_t format_commit_one(struct strbuf *sb, const char *placeholder,
				void *context)
966 967 968
{
	struct format_commit_context *c = context;
	const struct commit *commit = c->commit;
969
	const char *msg = c->message;
970
	struct commit_list *p;
971
	int h1, h2;
972 973

	/* these are independent of the commit */
974 975
	switch (placeholder[0]) {
	case 'C':
J
Jeff King 已提交
976 977 978 979 980 981 982 983 984 985 986
		if (placeholder[1] == '(') {
			const char *end = strchr(placeholder + 2, ')');
			char color[COLOR_MAXLEN];
			if (!end)
				return 0;
			color_parse_mem(placeholder + 2,
					end - (placeholder + 2),
					"--pretty format", color);
			strbuf_addstr(sb, color);
			return end - placeholder + 1;
		}
987
		if (!prefixcmp(placeholder + 1, "red")) {
988
			strbuf_addstr(sb, GIT_COLOR_RED);
989 990
			return 4;
		} else if (!prefixcmp(placeholder + 1, "green")) {
991
			strbuf_addstr(sb, GIT_COLOR_GREEN);
992 993
			return 6;
		} else if (!prefixcmp(placeholder + 1, "blue")) {
994
			strbuf_addstr(sb, GIT_COLOR_BLUE);
995 996
			return 5;
		} else if (!prefixcmp(placeholder + 1, "reset")) {
997
			strbuf_addstr(sb, GIT_COLOR_RESET);
998 999 1000
			return 6;
		} else
			return 0;
1001 1002
	case 'n':		/* newline */
		strbuf_addch(sb, '\n');
1003
		return 1;
1004 1005 1006 1007 1008 1009 1010 1011 1012 1013
	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;
1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037
	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;
1038
	}
1039 1040 1041 1042 1043

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

1044 1045 1046
	switch (placeholder[0]) {
	case 'H':		/* commit hash */
		strbuf_addstr(sb, sha1_to_hex(commit->object.sha1));
1047
		return 1;
1048
	case 'h':		/* abbreviated commit hash */
1049
		if (add_again(sb, &c->abbrev_commit_hash))
1050
			return 1;
1051
		strbuf_addstr(sb, find_unique_abbrev(commit->object.sha1,
W
Will Palmer 已提交
1052
						     c->pretty_ctx->abbrev));
1053
		c->abbrev_commit_hash.len = sb->len - c->abbrev_commit_hash.off;
1054
		return 1;
1055 1056
	case 'T':		/* tree hash */
		strbuf_addstr(sb, sha1_to_hex(commit->tree->object.sha1));
1057
		return 1;
1058
	case 't':		/* abbreviated tree hash */
1059
		if (add_again(sb, &c->abbrev_tree_hash))
1060
			return 1;
1061
		strbuf_addstr(sb, find_unique_abbrev(commit->tree->object.sha1,
W
Will Palmer 已提交
1062
						     c->pretty_ctx->abbrev));
1063
		c->abbrev_tree_hash.len = sb->len - c->abbrev_tree_hash.off;
1064
		return 1;
1065 1066 1067 1068 1069 1070
	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));
		}
1071
		return 1;
1072
	case 'p':		/* abbreviated parent hashes */
1073
		if (add_again(sb, &c->abbrev_parent_hashes))
1074
			return 1;
1075 1076 1077 1078
		for (p = commit->parents; p; p = p->next) {
			if (p != commit->parents)
				strbuf_addch(sb, ' ');
			strbuf_addstr(sb, find_unique_abbrev(
W
Will Palmer 已提交
1079 1080
					p->item->object.sha1,
					c->pretty_ctx->abbrev));
1081
		}
1082 1083
		c->abbrev_parent_hashes.len = sb->len -
		                              c->abbrev_parent_hashes.off;
1084
		return 1;
1085
	case 'm':		/* left/right/bottom */
1086
		strbuf_addstr(sb, get_revision_mark(NULL, commit));
1087
		return 1;
1088 1089 1090
	case 'd':
		format_decoration(sb, commit);
		return 1;
1091 1092 1093 1094 1095 1096 1097 1098
	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,
1099
						    c->pretty_ctx->date_mode_explicit,
1100 1101 1102 1103 1104 1105
						    (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;
1106 1107 1108 1109 1110 1111 1112 1113
		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);
1114 1115
		}
		return 0;	/* unknown %g placeholder */
1116
	case 'N':
1117 1118
		if (c->pretty_ctx->notes_message) {
			strbuf_addstr(sb, c->pretty_ctx->notes_message);
1119 1120 1121
			return 1;
		}
		return 0;
1122 1123
	}

J
Junio C Hamano 已提交
1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147
	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;
		}
		return 2;
	}


1148
	/* For the rest we have to parse the commit header. */
1149 1150
	if (!c->commit_header_parsed)
		parse_commit_header(c);
1151

1152
	switch (placeholder[0]) {
1153 1154
	case 'a':	/* author ... */
		return format_person_part(sb, placeholder[1],
1155
				   msg + c->author.off, c->author.len,
1156
				   c->pretty_ctx->date_mode);
1157 1158
	case 'c':	/* committer ... */
		return format_person_part(sb, placeholder[1],
1159
				   msg + c->committer.off, c->committer.len,
1160
				   c->pretty_ctx->date_mode);
1161
	case 'e':	/* encoding */
1162
		strbuf_add(sb, msg + c->encoding.off, c->encoding.len);
1163
		return 1;
1164 1165 1166 1167
	case 'B':	/* raw body */
		/* message_off is always left at the initial newline */
		strbuf_addstr(sb, msg + c->message_off + 1);
		return 1;
1168 1169 1170 1171 1172 1173 1174 1175 1176 1177
	}

	/* 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;
1178 1179 1180
	case 'f':	/* sanitized subject */
		format_sanitized_subject(sb, msg + c->subject_off);
		return 1;
1181
	case 'b':	/* body */
1182
		strbuf_addstr(sb, msg + c->body_off);
1183
		return 1;
1184
	}
1185
	return 0;	/* unknown placeholder */
1186 1187
}

1188 1189 1190 1191 1192 1193 1194 1195 1196
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,
1197
		ADD_SP_BEFORE_NON_EMPTY
1198 1199 1200 1201 1202 1203 1204 1205 1206
	} magic = NO_MAGIC;

	switch (placeholder[0]) {
	case '-':
		magic = DEL_LF_BEFORE_EMPTY;
		break;
	case '+':
		magic = ADD_LF_BEFORE_NON_EMPTY;
		break;
1207 1208 1209
	case ' ':
		magic = ADD_SP_BEFORE_NON_EMPTY;
		break;
1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223
	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);
1224 1225 1226 1227 1228
	} 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);
1229 1230 1231 1232
	}
	return consumed + 1;
}

1233 1234 1235 1236 1237
static size_t userformat_want_item(struct strbuf *sb, const char *placeholder,
				   void *context)
{
	struct userformat_want *w = context;

1238
	if (*placeholder == '+' || *placeholder == '-' || *placeholder == ' ')
1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257
		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;
	}
1258
	strbuf_expand(&dummy, fmt, userformat_want_item, w);
1259 1260 1261
	strbuf_release(&dummy);
}

1262
void format_commit_message(const struct commit *commit,
1263
			   const char *format, struct strbuf *sb,
1264
			   const struct pretty_print_context *pretty_ctx)
1265
{
1266
	struct format_commit_context context;
1267 1268
	static const char utf8[] = "UTF-8";
	const char *output_enc = pretty_ctx->output_encoding;
1269 1270 1271

	memset(&context, 0, sizeof(context));
	context.commit = commit;
1272
	context.pretty_ctx = pretty_ctx;
1273
	context.wrap_start = sb->len;
1274 1275
	context.message = commit->buffer;
	if (output_enc) {
1276
		char *enc = get_header(commit, "encoding");
1277
		if (strcmp(enc ? enc : utf8, output_enc)) {
1278
			context.message = logmsg_reencode(commit, output_enc);
1279 1280 1281
			if (!context.message)
				context.message = commit->buffer;
		}
1282
		free(enc);
1283 1284
	}

1285
	strbuf_expand(sb, format, format_commit_item, &context);
1286
	rewrap_message_tail(sb, &context, 0, 0, 0);
1287 1288 1289

	if (context.message != commit->buffer)
		free(context.message);
J
Junio C Hamano 已提交
1290 1291
	free(context.signature.gpg_output);
	free(context.signature.signer);
1292 1293
}

1294
static void pp_header(const struct pretty_print_context *pp,
1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313
		      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;

1314
		if (pp->fmt == CMIT_FMT_RAW) {
1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333
			strbuf_add(sb, line, linelen);
			continue;
		}

		if (!memcmp(line, "parent ", 7)) {
			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);
1334
			add_merge_info(pp, sb, commit);
1335 1336 1337 1338 1339 1340 1341 1342 1343 1344
			parents_shown = 1;
		}

		/*
		 * MEDIUM == DEFAULT shows only author with dates.
		 * FULL shows both authors but not dates.
		 * FULLER shows both authors and dates.
		 */
		if (!memcmp(line, "author ", 7)) {
			strbuf_grow(sb, linelen + 80);
1345
			pp_user_info(pp, "Author", sb, line + 7, encoding);
1346 1347
		}
		if (!memcmp(line, "committer ", 10) &&
1348
		    (pp->fmt == CMIT_FMT_FULL || pp->fmt == CMIT_FMT_FULLER)) {
1349
			strbuf_grow(sb, linelen + 80);
1350
			pp_user_info(pp, "Commit", sb, line + 10, encoding);
1351 1352 1353 1354
		}
	}
}

1355
void pp_title_line(const struct pretty_print_context *pp,
1356 1357 1358
		   const char **msg_p,
		   struct strbuf *sb,
		   const char *encoding,
J
Junio C Hamano 已提交
1359
		   int need_8bit_cte)
1360
{
1361
	static const int max_length = 78; /* per rfc2047 */
1362 1363 1364
	struct strbuf title;

	strbuf_init(&title, 80);
1365 1366
	*msg_p = format_subject(&title, *msg_p,
				pp->preserve_subject ? "\n" : " ");
1367 1368

	strbuf_grow(sb, title.len + 1024);
1369 1370
	if (pp->subject) {
		strbuf_addstr(sb, pp->subject);
1371 1372 1373 1374 1375 1376
		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);
1377 1378 1379 1380 1381
	} else {
		strbuf_addbuf(sb, &title);
	}
	strbuf_addch(sb, '\n');

1382
	if (need_8bit_cte > 0) {
1383 1384 1385 1386 1387 1388
		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);
	}
1389 1390
	if (pp->after_subject) {
		strbuf_addstr(sb, pp->after_subject);
1391
	}
1392
	if (pp->fmt == CMIT_FMT_EMAIL) {
1393 1394 1395 1396 1397
		strbuf_addch(sb, '\n');
	}
	strbuf_release(&title);
}

1398
void pp_remainder(const struct pretty_print_context *pp,
1399 1400 1401
		  const char **msg_p,
		  struct strbuf *sb,
		  int indent)
1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414
{
	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;
1415
			if (pp->fmt == CMIT_FMT_SHORT)
1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429
				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');
	}
}

1430 1431 1432
void pretty_print_commit(const struct pretty_print_context *pp,
			 const struct commit *commit,
			 struct strbuf *sb)
1433 1434 1435 1436 1437 1438
{
	unsigned long beginning_of_body;
	int indent = 4;
	const char *msg = commit->buffer;
	char *reencoded;
	const char *encoding;
1439
	int need_8bit_cte = pp->need_8bit_cte;
1440

1441 1442
	if (pp->fmt == CMIT_FMT_USERFORMAT) {
		format_commit_message(commit, user_format, sb, pp);
1443 1444 1445
		return;
	}

1446 1447
	encoding = get_log_output_encoding();
	reencoded = logmsg_reencode(commit, encoding);
1448 1449 1450 1451
	if (reencoded) {
		msg = reencoded;
	}

1452
	if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL)
1453 1454
		indent = 0;

1455 1456 1457
	/*
	 * We need to check and emit Content-type: to mark it
	 * as 8-bit if we haven't done so.
1458
	 */
1459
	if (pp->fmt == CMIT_FMT_EMAIL && need_8bit_cte == 0) {
1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471
		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)) {
1472
				need_8bit_cte = 1;
1473 1474 1475 1476 1477
				break;
			}
		}
	}

1478 1479
	pp_header(pp, encoding, commit, &msg, sb);
	if (pp->fmt != CMIT_FMT_ONELINE && !pp->subject) {
1480 1481 1482 1483
		strbuf_addch(sb, '\n');
	}

	/* Skip excess blank lines at the beginning of body, if any... */
1484
	msg = skip_empty_lines(msg);
1485 1486

	/* These formats treat the title line specially. */
1487 1488
	if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL)
		pp_title_line(pp, &msg, sb, encoding, need_8bit_cte);
1489 1490

	beginning_of_body = sb->len;
1491 1492
	if (pp->fmt != CMIT_FMT_ONELINE)
		pp_remainder(pp, &msg, sb, indent);
1493 1494 1495
	strbuf_rtrim(sb);

	/* Make sure there is an EOLN for the non-oneline case */
1496
	if (pp->fmt != CMIT_FMT_ONELINE)
1497 1498 1499 1500 1501 1502 1503
		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.
	 */
1504
	if (pp->fmt == CMIT_FMT_EMAIL && sb->len <= beginning_of_body)
1505
		strbuf_addch(sb, '\n');
J
Johannes Schindelin 已提交
1506

1507 1508
	free(reencoded);
}
1509 1510 1511 1512 1513

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