mailmap: simplify map_user() interface
[git/mjg.git] / pretty.c
blobdffcadec9eafe7a061c1df4580b06734a7c66e28
1 #include "cache.h"
2 #include "commit.h"
3 #include "utf8.h"
4 #include "diff.h"
5 #include "revision.h"
6 #include "string-list.h"
7 #include "mailmap.h"
8 #include "log-tree.h"
9 #include "notes.h"
10 #include "color.h"
11 #include "reflog-walk.h"
12 #include "gpg-interface.h"
14 static char *user_format;
15 static struct cmt_fmt_map {
16 const char *name;
17 enum cmit_fmt format;
18 int is_tformat;
19 int is_alias;
20 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);
27 static void save_user_format(struct rev_info *rev, const char *cp, int is_tformat)
29 free(user_format);
30 user_format = xstrdup(cp);
31 if (is_tformat)
32 rev->use_terminator = 1;
33 rev->commit_format = CMIT_FMT_USERFORMAT;
36 static int git_pretty_formats_config(const char *var, const char *value, void *cb)
38 struct cmt_fmt_map *commit_format = NULL;
39 const char *name;
40 const char *fmt;
41 int i;
43 if (prefixcmp(var, "pretty."))
44 return 0;
46 name = var + strlen("pretty.");
47 for (i = 0; i < builtin_formats_len; i++) {
48 if (!strcmp(commit_formats[i].name, name))
49 return 0;
52 for (i = builtin_formats_len; i < commit_formats_len; i++) {
53 if (!strcmp(commit_formats[i].name, name)) {
54 commit_format = &commit_formats[i];
55 break;
59 if (!commit_format) {
60 ALLOC_GROW(commit_formats, commit_formats_len+1,
61 commit_formats_alloc);
62 commit_format = &commit_formats[commit_formats_len];
63 memset(commit_format, 0, sizeof(*commit_format));
64 commit_formats_len++;
67 commit_format->name = xstrdup(name);
68 commit_format->format = CMIT_FMT_USERFORMAT;
69 git_config_string(&fmt, var, value);
70 if (!prefixcmp(fmt, "format:") || !prefixcmp(fmt, "tformat:")) {
71 commit_format->is_tformat = fmt[0] == 't';
72 fmt = strchr(fmt, ':') + 1;
73 } else if (strchr(fmt, '%'))
74 commit_format->is_tformat = 1;
75 else
76 commit_format->is_alias = 1;
77 commit_format->user_format = fmt;
79 return 0;
82 static void setup_commit_formats(void)
84 struct cmt_fmt_map builtin_formats[] = {
85 { "raw", CMIT_FMT_RAW, 0 },
86 { "medium", CMIT_FMT_MEDIUM, 0 },
87 { "short", CMIT_FMT_SHORT, 0 },
88 { "email", CMIT_FMT_EMAIL, 0 },
89 { "fuller", CMIT_FMT_FULLER, 0 },
90 { "full", CMIT_FMT_FULL, 0 },
91 { "oneline", CMIT_FMT_ONELINE, 1 }
93 commit_formats_len = ARRAY_SIZE(builtin_formats);
94 builtin_formats_len = commit_formats_len;
95 ALLOC_GROW(commit_formats, commit_formats_len, commit_formats_alloc);
96 memcpy(commit_formats, builtin_formats,
97 sizeof(*builtin_formats)*ARRAY_SIZE(builtin_formats));
99 git_config(git_pretty_formats_config, NULL);
102 static struct cmt_fmt_map *find_commit_format_recursive(const char *sought,
103 const char *original,
104 int num_redirections)
106 struct cmt_fmt_map *found = NULL;
107 size_t found_match_len = 0;
108 int i;
110 if (num_redirections >= commit_formats_len)
111 die("invalid --pretty format: "
112 "'%s' references an alias which points to itself",
113 original);
115 for (i = 0; i < commit_formats_len; i++) {
116 size_t match_len;
118 if (prefixcmp(commit_formats[i].name, sought))
119 continue;
121 match_len = strlen(commit_formats[i].name);
122 if (found == NULL || found_match_len > match_len) {
123 found = &commit_formats[i];
124 found_match_len = match_len;
128 if (found && found->is_alias) {
129 found = find_commit_format_recursive(found->user_format,
130 original,
131 num_redirections+1);
134 return found;
137 static struct cmt_fmt_map *find_commit_format(const char *sought)
139 if (!commit_formats)
140 setup_commit_formats();
142 return find_commit_format_recursive(sought, sought, 0);
145 void get_commit_format(const char *arg, struct rev_info *rev)
147 struct cmt_fmt_map *commit_format;
149 rev->use_terminator = 0;
150 if (!arg || !*arg) {
151 rev->commit_format = CMIT_FMT_DEFAULT;
152 return;
154 if (!prefixcmp(arg, "format:") || !prefixcmp(arg, "tformat:")) {
155 save_user_format(rev, strchr(arg, ':') + 1, arg[0] == 't');
156 return;
159 if (strchr(arg, '%')) {
160 save_user_format(rev, arg, 1);
161 return;
164 commit_format = find_commit_format(arg);
165 if (!commit_format)
166 die("invalid --pretty format: %s", arg);
168 rev->commit_format = commit_format->format;
169 rev->use_terminator = commit_format->is_tformat;
170 if (commit_format->format == CMIT_FMT_USERFORMAT) {
171 save_user_format(rev, commit_format->user_format,
172 commit_format->is_tformat);
177 * Generic support for pretty-printing the header
179 static int get_one_line(const char *msg)
181 int ret = 0;
183 for (;;) {
184 char c = *msg++;
185 if (!c)
186 break;
187 ret++;
188 if (c == '\n')
189 break;
191 return ret;
194 /* High bit set, or ISO-2022-INT */
195 static int non_ascii(int ch)
197 return !isascii(ch) || ch == '\033';
200 int has_non_ascii(const char *s)
202 int ch;
203 if (!s)
204 return 0;
205 while ((ch = *s++) != '\0') {
206 if (non_ascii(ch))
207 return 1;
209 return 0;
212 static int is_rfc822_special(char ch)
214 switch (ch) {
215 case '(':
216 case ')':
217 case '<':
218 case '>':
219 case '[':
220 case ']':
221 case ':':
222 case ';':
223 case '@':
224 case ',':
225 case '.':
226 case '"':
227 case '\\':
228 return 1;
229 default:
230 return 0;
234 static int needs_rfc822_quoting(const char *s, int len)
236 int i;
237 for (i = 0; i < len; i++)
238 if (is_rfc822_special(s[i]))
239 return 1;
240 return 0;
243 static int last_line_length(struct strbuf *sb)
245 int i;
247 /* How many bytes are already used on the last line? */
248 for (i = sb->len - 1; i >= 0; i--)
249 if (sb->buf[i] == '\n')
250 break;
251 return sb->len - (i + 1);
254 static void add_rfc822_quoted(struct strbuf *out, const char *s, int len)
256 int i;
258 /* just a guess, we may have to also backslash-quote */
259 strbuf_grow(out, len + 2);
261 strbuf_addch(out, '"');
262 for (i = 0; i < len; i++) {
263 switch (s[i]) {
264 case '"':
265 case '\\':
266 strbuf_addch(out, '\\');
267 /* fall through */
268 default:
269 strbuf_addch(out, s[i]);
272 strbuf_addch(out, '"');
275 enum rfc2047_type {
276 RFC2047_SUBJECT,
277 RFC2047_ADDRESS,
280 static int is_rfc2047_special(char ch, enum rfc2047_type type)
283 * rfc2047, section 4.2:
285 * 8-bit values which correspond to printable ASCII characters other
286 * than "=", "?", and "_" (underscore), MAY be represented as those
287 * characters. (But see section 5 for restrictions.) In
288 * particular, SPACE and TAB MUST NOT be represented as themselves
289 * within encoded words.
293 * rule out non-ASCII characters and non-printable characters (the
294 * non-ASCII check should be redundant as isprint() is not localized
295 * and only knows about ASCII, but be defensive about that)
297 if (non_ascii(ch) || !isprint(ch))
298 return 1;
301 * rule out special printable characters (' ' should be the only
302 * whitespace character considered printable, but be defensive and use
303 * isspace())
305 if (isspace(ch) || ch == '=' || ch == '?' || ch == '_')
306 return 1;
309 * rfc2047, section 5.3:
311 * As a replacement for a 'word' entity within a 'phrase', for example,
312 * one that precedes an address in a From, To, or Cc header. The ABNF
313 * definition for 'phrase' from RFC 822 thus becomes:
315 * phrase = 1*( encoded-word / word )
317 * In this case the set of characters that may be used in a "Q"-encoded
318 * 'encoded-word' is restricted to: <upper and lower case ASCII
319 * letters, decimal digits, "!", "*", "+", "-", "/", "=", and "_"
320 * (underscore, ASCII 95.)>. An 'encoded-word' that appears within a
321 * 'phrase' MUST be separated from any adjacent 'word', 'text' or
322 * 'special' by 'linear-white-space'.
325 if (type != RFC2047_ADDRESS)
326 return 0;
328 /* '=' and '_' are special cases and have been checked above */
329 return !(isalnum(ch) || ch == '!' || ch == '*' || ch == '+' || ch == '-' || ch == '/');
332 static int needs_rfc2047_encoding(const char *line, int len,
333 enum rfc2047_type type)
335 int i;
337 for (i = 0; i < len; i++) {
338 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;
345 return 0;
348 static void add_rfc2047(struct strbuf *sb, const char *line, int len,
349 const char *encoding, enum rfc2047_type type)
351 static const int max_encoded_length = 76; /* per rfc2047 */
352 int i;
353 int line_len = last_line_length(sb);
355 strbuf_grow(sb, len * 3 + strlen(encoding) + 100);
356 strbuf_addf(sb, "=?%s?q?", encoding);
357 line_len += strlen(encoding) + 5; /* 5 for =??q? */
358 for (i = 0; i < len; i++) {
359 unsigned ch = line[i] & 0xFF;
360 int is_special = is_rfc2047_special(ch, type);
363 * According to RFC 2047, we could encode the special character
364 * ' ' (space) with '_' (underscore) for readability. But many
365 * programs do not understand this and just leave the
366 * underscore in place. Thus, we do nothing special here, which
367 * causes ' ' to be encoded as '=20', avoiding this problem.
370 if (line_len + 2 + (is_special ? 3 : 1) > max_encoded_length) {
371 strbuf_addf(sb, "?=\n =?%s?q?", encoding);
372 line_len = strlen(encoding) + 5 + 1; /* =??q? plus SP */
375 if (is_special) {
376 strbuf_addf(sb, "=%02X", ch);
377 line_len += 3;
378 } else {
379 strbuf_addch(sb, ch);
380 line_len++;
383 strbuf_addstr(sb, "?=");
386 void pp_user_info(const struct pretty_print_context *pp,
387 const char *what, struct strbuf *sb,
388 const char *line, const char *encoding)
390 struct ident_split ident;
391 int linelen, namelen;
392 char *line_end, *date;
393 int max_length = 78; /* per rfc2822 */
394 unsigned long time;
395 int tz;
397 if (pp->fmt == CMIT_FMT_ONELINE)
398 return;
400 line_end = strchr(line, '\n');
401 if (!line_end) {
402 line_end = strchr(line, '\0');
403 if (!line_end)
404 return;
407 linelen = ++line_end - line;
408 if (split_ident_line(&ident, line, linelen))
409 return;
411 namelen = ident.mail_end - ident.name_begin + 1;
412 time = strtoul(ident.date_begin, &date, 10);
413 tz = strtol(date, NULL, 10);
415 if (pp->fmt == CMIT_FMT_EMAIL) {
416 int display_name_length;
418 display_name_length = ident.name_end - ident.name_begin;
420 strbuf_addstr(sb, "From: ");
421 if (needs_rfc2047_encoding(line, display_name_length, RFC2047_ADDRESS)) {
422 add_rfc2047(sb, line, display_name_length,
423 encoding, RFC2047_ADDRESS);
424 max_length = 76; /* per rfc2047 */
425 } else if (needs_rfc822_quoting(line, display_name_length)) {
426 struct strbuf quoted = STRBUF_INIT;
427 add_rfc822_quoted(&quoted, line, display_name_length);
428 strbuf_add_wrapped_bytes(sb, quoted.buf, quoted.len,
429 -6, 1, max_length);
430 strbuf_release(&quoted);
431 } else {
432 strbuf_add_wrapped_bytes(sb, line, display_name_length,
433 -6, 1, max_length);
435 if (namelen - display_name_length + last_line_length(sb) > max_length) {
436 strbuf_addch(sb, '\n');
437 if (!isspace(ident.name_end[0]))
438 strbuf_addch(sb, ' ');
440 strbuf_add(sb, ident.name_end, namelen - display_name_length);
441 strbuf_addch(sb, '\n');
442 } else {
443 strbuf_addf(sb, "%s: %.*s%.*s\n", what,
444 (pp->fmt == CMIT_FMT_FULLER) ? 4 : 0,
445 " ", namelen, line);
447 switch (pp->fmt) {
448 case CMIT_FMT_MEDIUM:
449 strbuf_addf(sb, "Date: %s\n", show_date(time, tz, pp->date_mode));
450 break;
451 case CMIT_FMT_EMAIL:
452 strbuf_addf(sb, "Date: %s\n", show_date(time, tz, DATE_RFC2822));
453 break;
454 case CMIT_FMT_FULLER:
455 strbuf_addf(sb, "%sDate: %s\n", what, show_date(time, tz, pp->date_mode));
456 break;
457 default:
458 /* notin' */
459 break;
463 static int is_empty_line(const char *line, int *len_p)
465 int len = *len_p;
466 while (len && isspace(line[len-1]))
467 len--;
468 *len_p = len;
469 return !len;
472 static const char *skip_empty_lines(const char *msg)
474 for (;;) {
475 int linelen = get_one_line(msg);
476 int ll = linelen;
477 if (!linelen)
478 break;
479 if (!is_empty_line(msg, &ll))
480 break;
481 msg += linelen;
483 return msg;
486 static void add_merge_info(const struct pretty_print_context *pp,
487 struct strbuf *sb, const struct commit *commit)
489 struct commit_list *parent = commit->parents;
491 if ((pp->fmt == CMIT_FMT_ONELINE) || (pp->fmt == CMIT_FMT_EMAIL) ||
492 !parent || !parent->next)
493 return;
495 strbuf_addstr(sb, "Merge:");
497 while (parent) {
498 struct commit *p = parent->item;
499 const char *hex = NULL;
500 if (pp->abbrev)
501 hex = find_unique_abbrev(p->object.sha1, pp->abbrev);
502 if (!hex)
503 hex = sha1_to_hex(p->object.sha1);
504 parent = parent->next;
506 strbuf_addf(sb, " %s", hex);
508 strbuf_addch(sb, '\n');
511 static char *get_header(const struct commit *commit, const char *key)
513 int key_len = strlen(key);
514 const char *line = commit->buffer;
516 while (line) {
517 const char *eol = strchr(line, '\n'), *next;
519 if (line == eol)
520 return NULL;
521 if (!eol) {
522 warning("malformed commit (header is missing newline): %s",
523 sha1_to_hex(commit->object.sha1));
524 eol = line + strlen(line);
525 next = NULL;
526 } else
527 next = eol + 1;
528 if (eol - line > key_len &&
529 !strncmp(line, key, key_len) &&
530 line[key_len] == ' ') {
531 return xmemdupz(line + key_len + 1, eol - line - key_len - 1);
533 line = next;
535 return NULL;
538 static char *replace_encoding_header(char *buf, const char *encoding)
540 struct strbuf tmp = STRBUF_INIT;
541 size_t start, len;
542 char *cp = buf;
544 /* guess if there is an encoding header before a \n\n */
545 while (strncmp(cp, "encoding ", strlen("encoding "))) {
546 cp = strchr(cp, '\n');
547 if (!cp || *++cp == '\n')
548 return buf;
550 start = cp - buf;
551 cp = strchr(cp, '\n');
552 if (!cp)
553 return buf; /* should not happen but be defensive */
554 len = cp + 1 - (buf + start);
556 strbuf_attach(&tmp, buf, strlen(buf), strlen(buf) + 1);
557 if (is_encoding_utf8(encoding)) {
558 /* we have re-coded to UTF-8; drop the header */
559 strbuf_remove(&tmp, start, len);
560 } else {
561 /* just replaces XXXX in 'encoding XXXX\n' */
562 strbuf_splice(&tmp, start + strlen("encoding "),
563 len - strlen("encoding \n"),
564 encoding, strlen(encoding));
566 return strbuf_detach(&tmp, NULL);
569 char *logmsg_reencode(const struct commit *commit,
570 const char *output_encoding)
572 static const char *utf8 = "UTF-8";
573 const char *use_encoding;
574 char *encoding;
575 char *out;
577 if (!*output_encoding)
578 return NULL;
579 encoding = get_header(commit, "encoding");
580 use_encoding = encoding ? encoding : utf8;
581 if (same_encoding(use_encoding, output_encoding))
582 if (encoding) /* we'll strip encoding header later */
583 out = xstrdup(commit->buffer);
584 else
585 return NULL; /* nothing to do */
586 else
587 out = reencode_string(commit->buffer,
588 output_encoding, use_encoding);
589 if (out)
590 out = replace_encoding_header(out, output_encoding);
592 free(encoding);
593 return out;
596 static int mailmap_name(const char **email, size_t *email_len,
597 const char **name, size_t *name_len)
599 static struct string_list *mail_map;
600 if (!mail_map) {
601 mail_map = xcalloc(1, sizeof(*mail_map));
602 read_mailmap(mail_map, NULL);
604 return mail_map->nr && map_user(mail_map, email, email_len, name, name_len);
607 static size_t format_person_part(struct strbuf *sb, char part,
608 const char *msg, int len, enum date_mode dmode)
610 /* currently all placeholders have same length */
611 const int placeholder_len = 2;
612 int tz;
613 unsigned long date = 0;
614 struct ident_split s;
615 const char *name, *mail;
616 size_t maillen, namelen;
618 if (split_ident_line(&s, msg, len) < 0)
619 goto skip;
621 name = s.name_begin;
622 namelen = s.name_end - s.name_begin;
623 mail = s.mail_begin;
624 maillen = s.mail_end - s.mail_begin;
626 if (part == 'N' || part == 'E') /* mailmap lookup */
627 mailmap_name(&mail, &maillen, &name, &namelen);
628 if (part == 'n' || part == 'N') { /* name */
629 strbuf_add(sb, name, namelen);
630 return placeholder_len;
632 if (part == 'e' || part == 'E') { /* email */
633 strbuf_add(sb, mail, maillen);
634 return placeholder_len;
637 if (!s.date_begin)
638 goto skip;
640 date = strtoul(s.date_begin, NULL, 10);
642 if (part == 't') { /* date, UNIX timestamp */
643 strbuf_add(sb, s.date_begin, s.date_end - s.date_begin);
644 return placeholder_len;
647 /* parse tz */
648 tz = strtoul(s.tz_begin + 1, NULL, 10);
649 if (*s.tz_begin == '-')
650 tz = -tz;
652 switch (part) {
653 case 'd': /* date */
654 strbuf_addstr(sb, show_date(date, tz, dmode));
655 return placeholder_len;
656 case 'D': /* date, RFC2822 style */
657 strbuf_addstr(sb, show_date(date, tz, DATE_RFC2822));
658 return placeholder_len;
659 case 'r': /* date, relative */
660 strbuf_addstr(sb, show_date(date, tz, DATE_RELATIVE));
661 return placeholder_len;
662 case 'i': /* date, ISO 8601 */
663 strbuf_addstr(sb, show_date(date, tz, DATE_ISO8601));
664 return placeholder_len;
667 skip:
669 * reading from either a bogus commit, or a reflog entry with
670 * %gn, %ge, etc.; 'sb' cannot be updated, but we still need
671 * to compute a valid return value.
673 if (part == 'n' || part == 'e' || part == 't' || part == 'd'
674 || part == 'D' || part == 'r' || part == 'i')
675 return placeholder_len;
677 return 0; /* unknown placeholder */
680 struct chunk {
681 size_t off;
682 size_t len;
685 struct format_commit_context {
686 const struct commit *commit;
687 const struct pretty_print_context *pretty_ctx;
688 unsigned commit_header_parsed:1;
689 unsigned commit_message_parsed:1;
690 unsigned commit_signature_parsed:1;
691 struct {
692 char *gpg_output;
693 char good_bad;
694 char *signer;
695 } signature;
696 char *message;
697 size_t width, indent1, indent2;
699 /* These offsets are relative to the start of the commit message. */
700 struct chunk author;
701 struct chunk committer;
702 struct chunk encoding;
703 size_t message_off;
704 size_t subject_off;
705 size_t body_off;
707 /* The following ones are relative to the result struct strbuf. */
708 struct chunk abbrev_commit_hash;
709 struct chunk abbrev_tree_hash;
710 struct chunk abbrev_parent_hashes;
711 size_t wrap_start;
714 static int add_again(struct strbuf *sb, struct chunk *chunk)
716 if (chunk->len) {
717 strbuf_adddup(sb, chunk->off, chunk->len);
718 return 1;
722 * We haven't seen this chunk before. Our caller is surely
723 * going to add it the hard way now. Remember the most likely
724 * start of the to-be-added chunk: the current end of the
725 * struct strbuf.
727 chunk->off = sb->len;
728 return 0;
731 static void parse_commit_header(struct format_commit_context *context)
733 const char *msg = context->message;
734 int i;
736 for (i = 0; msg[i]; i++) {
737 int eol;
738 for (eol = i; msg[eol] && msg[eol] != '\n'; eol++)
739 ; /* do nothing */
741 if (i == eol) {
742 break;
743 } else if (!prefixcmp(msg + i, "author ")) {
744 context->author.off = i + 7;
745 context->author.len = eol - i - 7;
746 } else if (!prefixcmp(msg + i, "committer ")) {
747 context->committer.off = i + 10;
748 context->committer.len = eol - i - 10;
749 } else if (!prefixcmp(msg + i, "encoding ")) {
750 context->encoding.off = i + 9;
751 context->encoding.len = eol - i - 9;
753 i = eol;
755 context->message_off = i;
756 context->commit_header_parsed = 1;
759 static int istitlechar(char c)
761 return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
762 (c >= '0' && c <= '9') || c == '.' || c == '_';
765 static void format_sanitized_subject(struct strbuf *sb, const char *msg)
767 size_t trimlen;
768 size_t start_len = sb->len;
769 int space = 2;
771 for (; *msg && *msg != '\n'; msg++) {
772 if (istitlechar(*msg)) {
773 if (space == 1)
774 strbuf_addch(sb, '-');
775 space = 0;
776 strbuf_addch(sb, *msg);
777 if (*msg == '.')
778 while (*(msg+1) == '.')
779 msg++;
780 } else
781 space |= 1;
784 /* trim any trailing '.' or '-' characters */
785 trimlen = 0;
786 while (sb->len - trimlen > start_len &&
787 (sb->buf[sb->len - 1 - trimlen] == '.'
788 || sb->buf[sb->len - 1 - trimlen] == '-'))
789 trimlen++;
790 strbuf_remove(sb, sb->len - trimlen, trimlen);
793 const char *format_subject(struct strbuf *sb, const char *msg,
794 const char *line_separator)
796 int first = 1;
798 for (;;) {
799 const char *line = msg;
800 int linelen = get_one_line(line);
802 msg += linelen;
803 if (!linelen || is_empty_line(line, &linelen))
804 break;
806 if (!sb)
807 continue;
808 strbuf_grow(sb, linelen + 2);
809 if (!first)
810 strbuf_addstr(sb, line_separator);
811 strbuf_add(sb, line, linelen);
812 first = 0;
814 return msg;
817 static void parse_commit_message(struct format_commit_context *c)
819 const char *msg = c->message + c->message_off;
820 const char *start = c->message;
822 msg = skip_empty_lines(msg);
823 c->subject_off = msg - start;
825 msg = format_subject(NULL, msg, NULL);
826 msg = skip_empty_lines(msg);
827 c->body_off = msg - start;
829 c->commit_message_parsed = 1;
832 static void format_decoration(struct strbuf *sb, const struct commit *commit)
834 struct name_decoration *d;
835 const char *prefix = " (";
837 load_ref_decorations(DECORATE_SHORT_REFS);
838 d = lookup_decoration(&name_decoration, &commit->object);
839 while (d) {
840 strbuf_addstr(sb, prefix);
841 prefix = ", ";
842 strbuf_addstr(sb, d->name);
843 d = d->next;
845 if (prefix[0] == ',')
846 strbuf_addch(sb, ')');
849 static void strbuf_wrap(struct strbuf *sb, size_t pos,
850 size_t width, size_t indent1, size_t indent2)
852 struct strbuf tmp = STRBUF_INIT;
854 if (pos)
855 strbuf_add(&tmp, sb->buf, pos);
856 strbuf_add_wrapped_text(&tmp, sb->buf + pos,
857 (int) indent1, (int) indent2, (int) width);
858 strbuf_swap(&tmp, sb);
859 strbuf_release(&tmp);
862 static void rewrap_message_tail(struct strbuf *sb,
863 struct format_commit_context *c,
864 size_t new_width, size_t new_indent1,
865 size_t new_indent2)
867 if (c->width == new_width && c->indent1 == new_indent1 &&
868 c->indent2 == new_indent2)
869 return;
870 if (c->wrap_start < sb->len)
871 strbuf_wrap(sb, c->wrap_start, c->width, c->indent1, c->indent2);
872 c->wrap_start = sb->len;
873 c->width = new_width;
874 c->indent1 = new_indent1;
875 c->indent2 = new_indent2;
878 static struct {
879 char result;
880 const char *check;
881 } signature_check[] = {
882 { 'G', ": Good signature from " },
883 { 'B', ": BAD signature from " },
886 static void parse_signature_lines(struct format_commit_context *ctx)
888 const char *buf = ctx->signature.gpg_output;
889 int i;
891 for (i = 0; i < ARRAY_SIZE(signature_check); i++) {
892 const char *found = strstr(buf, signature_check[i].check);
893 const char *next;
894 if (!found)
895 continue;
896 ctx->signature.good_bad = signature_check[i].result;
897 found += strlen(signature_check[i].check);
898 next = strchrnul(found, '\n');
899 ctx->signature.signer = xmemdupz(found, next - found);
900 break;
904 static void parse_commit_signature(struct format_commit_context *ctx)
906 struct strbuf payload = STRBUF_INIT;
907 struct strbuf signature = STRBUF_INIT;
908 struct strbuf gpg_output = STRBUF_INIT;
909 int status;
911 ctx->commit_signature_parsed = 1;
913 if (parse_signed_commit(ctx->commit->object.sha1,
914 &payload, &signature) <= 0)
915 goto out;
916 status = verify_signed_buffer(payload.buf, payload.len,
917 signature.buf, signature.len,
918 &gpg_output);
919 if (status && !gpg_output.len)
920 goto out;
921 ctx->signature.gpg_output = strbuf_detach(&gpg_output, NULL);
922 parse_signature_lines(ctx);
924 out:
925 strbuf_release(&gpg_output);
926 strbuf_release(&payload);
927 strbuf_release(&signature);
931 static int format_reflog_person(struct strbuf *sb,
932 char part,
933 struct reflog_walk_info *log,
934 enum date_mode dmode)
936 const char *ident;
938 if (!log)
939 return 2;
941 ident = get_reflog_ident(log);
942 if (!ident)
943 return 2;
945 return format_person_part(sb, part, ident, strlen(ident), dmode);
948 static size_t format_commit_one(struct strbuf *sb, const char *placeholder,
949 void *context)
951 struct format_commit_context *c = context;
952 const struct commit *commit = c->commit;
953 const char *msg = c->message;
954 struct commit_list *p;
955 int h1, h2;
957 /* these are independent of the commit */
958 switch (placeholder[0]) {
959 case 'C':
960 if (placeholder[1] == '(') {
961 const char *end = strchr(placeholder + 2, ')');
962 char color[COLOR_MAXLEN];
963 if (!end)
964 return 0;
965 color_parse_mem(placeholder + 2,
966 end - (placeholder + 2),
967 "--pretty format", color);
968 strbuf_addstr(sb, color);
969 return end - placeholder + 1;
971 if (!prefixcmp(placeholder + 1, "red")) {
972 strbuf_addstr(sb, GIT_COLOR_RED);
973 return 4;
974 } else if (!prefixcmp(placeholder + 1, "green")) {
975 strbuf_addstr(sb, GIT_COLOR_GREEN);
976 return 6;
977 } else if (!prefixcmp(placeholder + 1, "blue")) {
978 strbuf_addstr(sb, GIT_COLOR_BLUE);
979 return 5;
980 } else if (!prefixcmp(placeholder + 1, "reset")) {
981 strbuf_addstr(sb, GIT_COLOR_RESET);
982 return 6;
983 } else
984 return 0;
985 case 'n': /* newline */
986 strbuf_addch(sb, '\n');
987 return 1;
988 case 'x':
989 /* %x00 == NUL, %x0a == LF, etc. */
990 if (0 <= (h1 = hexval_table[0xff & placeholder[1]]) &&
991 h1 <= 16 &&
992 0 <= (h2 = hexval_table[0xff & placeholder[2]]) &&
993 h2 <= 16) {
994 strbuf_addch(sb, (h1<<4)|h2);
995 return 3;
996 } else
997 return 0;
998 case 'w':
999 if (placeholder[1] == '(') {
1000 unsigned long width = 0, indent1 = 0, indent2 = 0;
1001 char *next;
1002 const char *start = placeholder + 2;
1003 const char *end = strchr(start, ')');
1004 if (!end)
1005 return 0;
1006 if (end > start) {
1007 width = strtoul(start, &next, 10);
1008 if (*next == ',') {
1009 indent1 = strtoul(next + 1, &next, 10);
1010 if (*next == ',') {
1011 indent2 = strtoul(next + 1,
1012 &next, 10);
1015 if (*next != ')')
1016 return 0;
1018 rewrap_message_tail(sb, c, width, indent1, indent2);
1019 return end - placeholder + 1;
1020 } else
1021 return 0;
1024 /* these depend on the commit */
1025 if (!commit->object.parsed)
1026 parse_object(commit->object.sha1);
1028 switch (placeholder[0]) {
1029 case 'H': /* commit hash */
1030 strbuf_addstr(sb, sha1_to_hex(commit->object.sha1));
1031 return 1;
1032 case 'h': /* abbreviated commit hash */
1033 if (add_again(sb, &c->abbrev_commit_hash))
1034 return 1;
1035 strbuf_addstr(sb, find_unique_abbrev(commit->object.sha1,
1036 c->pretty_ctx->abbrev));
1037 c->abbrev_commit_hash.len = sb->len - c->abbrev_commit_hash.off;
1038 return 1;
1039 case 'T': /* tree hash */
1040 strbuf_addstr(sb, sha1_to_hex(commit->tree->object.sha1));
1041 return 1;
1042 case 't': /* abbreviated tree hash */
1043 if (add_again(sb, &c->abbrev_tree_hash))
1044 return 1;
1045 strbuf_addstr(sb, find_unique_abbrev(commit->tree->object.sha1,
1046 c->pretty_ctx->abbrev));
1047 c->abbrev_tree_hash.len = sb->len - c->abbrev_tree_hash.off;
1048 return 1;
1049 case 'P': /* parent hashes */
1050 for (p = commit->parents; p; p = p->next) {
1051 if (p != commit->parents)
1052 strbuf_addch(sb, ' ');
1053 strbuf_addstr(sb, sha1_to_hex(p->item->object.sha1));
1055 return 1;
1056 case 'p': /* abbreviated parent hashes */
1057 if (add_again(sb, &c->abbrev_parent_hashes))
1058 return 1;
1059 for (p = commit->parents; p; p = p->next) {
1060 if (p != commit->parents)
1061 strbuf_addch(sb, ' ');
1062 strbuf_addstr(sb, find_unique_abbrev(
1063 p->item->object.sha1,
1064 c->pretty_ctx->abbrev));
1066 c->abbrev_parent_hashes.len = sb->len -
1067 c->abbrev_parent_hashes.off;
1068 return 1;
1069 case 'm': /* left/right/bottom */
1070 strbuf_addstr(sb, get_revision_mark(NULL, commit));
1071 return 1;
1072 case 'd':
1073 format_decoration(sb, commit);
1074 return 1;
1075 case 'g': /* reflog info */
1076 switch(placeholder[1]) {
1077 case 'd': /* reflog selector */
1078 case 'D':
1079 if (c->pretty_ctx->reflog_info)
1080 get_reflog_selector(sb,
1081 c->pretty_ctx->reflog_info,
1082 c->pretty_ctx->date_mode,
1083 c->pretty_ctx->date_mode_explicit,
1084 (placeholder[1] == 'd'));
1085 return 2;
1086 case 's': /* reflog message */
1087 if (c->pretty_ctx->reflog_info)
1088 get_reflog_message(sb, c->pretty_ctx->reflog_info);
1089 return 2;
1090 case 'n':
1091 case 'N':
1092 case 'e':
1093 case 'E':
1094 return format_reflog_person(sb,
1095 placeholder[1],
1096 c->pretty_ctx->reflog_info,
1097 c->pretty_ctx->date_mode);
1099 return 0; /* unknown %g placeholder */
1100 case 'N':
1101 if (c->pretty_ctx->notes_message) {
1102 strbuf_addstr(sb, c->pretty_ctx->notes_message);
1103 return 1;
1105 return 0;
1108 if (placeholder[0] == 'G') {
1109 if (!c->commit_signature_parsed)
1110 parse_commit_signature(c);
1111 switch (placeholder[1]) {
1112 case 'G':
1113 if (c->signature.gpg_output)
1114 strbuf_addstr(sb, c->signature.gpg_output);
1115 break;
1116 case '?':
1117 switch (c->signature.good_bad) {
1118 case 'G':
1119 case 'B':
1120 strbuf_addch(sb, c->signature.good_bad);
1122 break;
1123 case 'S':
1124 if (c->signature.signer)
1125 strbuf_addstr(sb, c->signature.signer);
1126 break;
1128 return 2;
1132 /* For the rest we have to parse the commit header. */
1133 if (!c->commit_header_parsed)
1134 parse_commit_header(c);
1136 switch (placeholder[0]) {
1137 case 'a': /* author ... */
1138 return format_person_part(sb, placeholder[1],
1139 msg + c->author.off, c->author.len,
1140 c->pretty_ctx->date_mode);
1141 case 'c': /* committer ... */
1142 return format_person_part(sb, placeholder[1],
1143 msg + c->committer.off, c->committer.len,
1144 c->pretty_ctx->date_mode);
1145 case 'e': /* encoding */
1146 strbuf_add(sb, msg + c->encoding.off, c->encoding.len);
1147 return 1;
1148 case 'B': /* raw body */
1149 /* message_off is always left at the initial newline */
1150 strbuf_addstr(sb, msg + c->message_off + 1);
1151 return 1;
1154 /* Now we need to parse the commit message. */
1155 if (!c->commit_message_parsed)
1156 parse_commit_message(c);
1158 switch (placeholder[0]) {
1159 case 's': /* subject */
1160 format_subject(sb, msg + c->subject_off, " ");
1161 return 1;
1162 case 'f': /* sanitized subject */
1163 format_sanitized_subject(sb, msg + c->subject_off);
1164 return 1;
1165 case 'b': /* body */
1166 strbuf_addstr(sb, msg + c->body_off);
1167 return 1;
1169 return 0; /* unknown placeholder */
1172 static size_t format_commit_item(struct strbuf *sb, const char *placeholder,
1173 void *context)
1175 int consumed;
1176 size_t orig_len;
1177 enum {
1178 NO_MAGIC,
1179 ADD_LF_BEFORE_NON_EMPTY,
1180 DEL_LF_BEFORE_EMPTY,
1181 ADD_SP_BEFORE_NON_EMPTY
1182 } magic = NO_MAGIC;
1184 switch (placeholder[0]) {
1185 case '-':
1186 magic = DEL_LF_BEFORE_EMPTY;
1187 break;
1188 case '+':
1189 magic = ADD_LF_BEFORE_NON_EMPTY;
1190 break;
1191 case ' ':
1192 magic = ADD_SP_BEFORE_NON_EMPTY;
1193 break;
1194 default:
1195 break;
1197 if (magic != NO_MAGIC)
1198 placeholder++;
1200 orig_len = sb->len;
1201 consumed = format_commit_one(sb, placeholder, context);
1202 if (magic == NO_MAGIC)
1203 return consumed;
1205 if ((orig_len == sb->len) && magic == DEL_LF_BEFORE_EMPTY) {
1206 while (sb->len && sb->buf[sb->len - 1] == '\n')
1207 strbuf_setlen(sb, sb->len - 1);
1208 } else if (orig_len != sb->len) {
1209 if (magic == ADD_LF_BEFORE_NON_EMPTY)
1210 strbuf_insert(sb, orig_len, "\n", 1);
1211 else if (magic == ADD_SP_BEFORE_NON_EMPTY)
1212 strbuf_insert(sb, orig_len, " ", 1);
1214 return consumed + 1;
1217 static size_t userformat_want_item(struct strbuf *sb, const char *placeholder,
1218 void *context)
1220 struct userformat_want *w = context;
1222 if (*placeholder == '+' || *placeholder == '-' || *placeholder == ' ')
1223 placeholder++;
1225 switch (*placeholder) {
1226 case 'N':
1227 w->notes = 1;
1228 break;
1230 return 0;
1233 void userformat_find_requirements(const char *fmt, struct userformat_want *w)
1235 struct strbuf dummy = STRBUF_INIT;
1237 if (!fmt) {
1238 if (!user_format)
1239 return;
1240 fmt = user_format;
1242 strbuf_expand(&dummy, fmt, userformat_want_item, w);
1243 strbuf_release(&dummy);
1246 void format_commit_message(const struct commit *commit,
1247 const char *format, struct strbuf *sb,
1248 const struct pretty_print_context *pretty_ctx)
1250 struct format_commit_context context;
1251 static const char utf8[] = "UTF-8";
1252 const char *output_enc = pretty_ctx->output_encoding;
1254 memset(&context, 0, sizeof(context));
1255 context.commit = commit;
1256 context.pretty_ctx = pretty_ctx;
1257 context.wrap_start = sb->len;
1258 context.message = commit->buffer;
1259 if (output_enc) {
1260 char *enc = get_header(commit, "encoding");
1261 if (strcmp(enc ? enc : utf8, output_enc)) {
1262 context.message = logmsg_reencode(commit, output_enc);
1263 if (!context.message)
1264 context.message = commit->buffer;
1266 free(enc);
1269 strbuf_expand(sb, format, format_commit_item, &context);
1270 rewrap_message_tail(sb, &context, 0, 0, 0);
1272 if (context.message != commit->buffer)
1273 free(context.message);
1274 free(context.signature.gpg_output);
1275 free(context.signature.signer);
1278 static void pp_header(const struct pretty_print_context *pp,
1279 const char *encoding,
1280 const struct commit *commit,
1281 const char **msg_p,
1282 struct strbuf *sb)
1284 int parents_shown = 0;
1286 for (;;) {
1287 const char *line = *msg_p;
1288 int linelen = get_one_line(*msg_p);
1290 if (!linelen)
1291 return;
1292 *msg_p += linelen;
1294 if (linelen == 1)
1295 /* End of header */
1296 return;
1298 if (pp->fmt == CMIT_FMT_RAW) {
1299 strbuf_add(sb, line, linelen);
1300 continue;
1303 if (!memcmp(line, "parent ", 7)) {
1304 if (linelen != 48)
1305 die("bad parent line in commit");
1306 continue;
1309 if (!parents_shown) {
1310 struct commit_list *parent;
1311 int num;
1312 for (parent = commit->parents, num = 0;
1313 parent;
1314 parent = parent->next, num++)
1316 /* with enough slop */
1317 strbuf_grow(sb, num * 50 + 20);
1318 add_merge_info(pp, sb, commit);
1319 parents_shown = 1;
1323 * MEDIUM == DEFAULT shows only author with dates.
1324 * FULL shows both authors but not dates.
1325 * FULLER shows both authors and dates.
1327 if (!memcmp(line, "author ", 7)) {
1328 strbuf_grow(sb, linelen + 80);
1329 pp_user_info(pp, "Author", sb, line + 7, encoding);
1331 if (!memcmp(line, "committer ", 10) &&
1332 (pp->fmt == CMIT_FMT_FULL || pp->fmt == CMIT_FMT_FULLER)) {
1333 strbuf_grow(sb, linelen + 80);
1334 pp_user_info(pp, "Commit", sb, line + 10, encoding);
1339 void pp_title_line(const struct pretty_print_context *pp,
1340 const char **msg_p,
1341 struct strbuf *sb,
1342 const char *encoding,
1343 int need_8bit_cte)
1345 static const int max_length = 78; /* per rfc2047 */
1346 struct strbuf title;
1348 strbuf_init(&title, 80);
1349 *msg_p = format_subject(&title, *msg_p,
1350 pp->preserve_subject ? "\n" : " ");
1352 strbuf_grow(sb, title.len + 1024);
1353 if (pp->subject) {
1354 strbuf_addstr(sb, pp->subject);
1355 if (needs_rfc2047_encoding(title.buf, title.len, RFC2047_SUBJECT))
1356 add_rfc2047(sb, title.buf, title.len,
1357 encoding, RFC2047_SUBJECT);
1358 else
1359 strbuf_add_wrapped_bytes(sb, title.buf, title.len,
1360 -last_line_length(sb), 1, max_length);
1361 } else {
1362 strbuf_addbuf(sb, &title);
1364 strbuf_addch(sb, '\n');
1366 if (need_8bit_cte > 0) {
1367 const char *header_fmt =
1368 "MIME-Version: 1.0\n"
1369 "Content-Type: text/plain; charset=%s\n"
1370 "Content-Transfer-Encoding: 8bit\n";
1371 strbuf_addf(sb, header_fmt, encoding);
1373 if (pp->after_subject) {
1374 strbuf_addstr(sb, pp->after_subject);
1376 if (pp->fmt == CMIT_FMT_EMAIL) {
1377 strbuf_addch(sb, '\n');
1379 strbuf_release(&title);
1382 void pp_remainder(const struct pretty_print_context *pp,
1383 const char **msg_p,
1384 struct strbuf *sb,
1385 int indent)
1387 int first = 1;
1388 for (;;) {
1389 const char *line = *msg_p;
1390 int linelen = get_one_line(line);
1391 *msg_p += linelen;
1393 if (!linelen)
1394 break;
1396 if (is_empty_line(line, &linelen)) {
1397 if (first)
1398 continue;
1399 if (pp->fmt == CMIT_FMT_SHORT)
1400 break;
1402 first = 0;
1404 strbuf_grow(sb, linelen + indent + 20);
1405 if (indent) {
1406 memset(sb->buf + sb->len, ' ', indent);
1407 strbuf_setlen(sb, sb->len + indent);
1409 strbuf_add(sb, line, linelen);
1410 strbuf_addch(sb, '\n');
1414 void pretty_print_commit(const struct pretty_print_context *pp,
1415 const struct commit *commit,
1416 struct strbuf *sb)
1418 unsigned long beginning_of_body;
1419 int indent = 4;
1420 const char *msg = commit->buffer;
1421 char *reencoded;
1422 const char *encoding;
1423 int need_8bit_cte = pp->need_8bit_cte;
1425 if (pp->fmt == CMIT_FMT_USERFORMAT) {
1426 format_commit_message(commit, user_format, sb, pp);
1427 return;
1430 encoding = get_log_output_encoding();
1431 reencoded = logmsg_reencode(commit, encoding);
1432 if (reencoded) {
1433 msg = reencoded;
1436 if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL)
1437 indent = 0;
1440 * We need to check and emit Content-type: to mark it
1441 * as 8-bit if we haven't done so.
1443 if (pp->fmt == CMIT_FMT_EMAIL && need_8bit_cte == 0) {
1444 int i, ch, in_body;
1446 for (in_body = i = 0; (ch = msg[i]); i++) {
1447 if (!in_body) {
1448 /* author could be non 7-bit ASCII but
1449 * the log may be so; skip over the
1450 * header part first.
1452 if (ch == '\n' && msg[i+1] == '\n')
1453 in_body = 1;
1455 else if (non_ascii(ch)) {
1456 need_8bit_cte = 1;
1457 break;
1462 pp_header(pp, encoding, commit, &msg, sb);
1463 if (pp->fmt != CMIT_FMT_ONELINE && !pp->subject) {
1464 strbuf_addch(sb, '\n');
1467 /* Skip excess blank lines at the beginning of body, if any... */
1468 msg = skip_empty_lines(msg);
1470 /* These formats treat the title line specially. */
1471 if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL)
1472 pp_title_line(pp, &msg, sb, encoding, need_8bit_cte);
1474 beginning_of_body = sb->len;
1475 if (pp->fmt != CMIT_FMT_ONELINE)
1476 pp_remainder(pp, &msg, sb, indent);
1477 strbuf_rtrim(sb);
1479 /* Make sure there is an EOLN for the non-oneline case */
1480 if (pp->fmt != CMIT_FMT_ONELINE)
1481 strbuf_addch(sb, '\n');
1484 * The caller may append additional body text in e-mail
1485 * format. Make sure we did not strip the blank line
1486 * between the header and the body.
1488 if (pp->fmt == CMIT_FMT_EMAIL && sb->len <= beginning_of_body)
1489 strbuf_addch(sb, '\n');
1491 free(reencoded);
1494 void pp_commit_easy(enum cmit_fmt fmt, const struct commit *commit,
1495 struct strbuf *sb)
1497 struct pretty_print_context pp = {0};
1498 pp.fmt = fmt;
1499 pretty_print_commit(&pp, commit, sb);