6 #include "string-list.h"
11 #include "reflog-walk.h"
12 #include "gpg-interface.h"
14 static char *user_format;
15 static struct cmt_fmt_map {
20 const char *user_format;
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)
30 user_format = xstrdup(cp);
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;
43 if (prefixcmp(var, "pretty."))
46 name = var + strlen("pretty.");
47 for (i = 0; i < builtin_formats_len; i++) {
48 if (!strcmp(commit_formats[i].name, name))
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];
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));
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;
76 commit_format->is_alias = 1;
77 commit_format->user_format = fmt;
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;
110 if (num_redirections >= commit_formats_len)
111 die("invalid --pretty format: "
112 "'%s' references an alias which points to itself",
115 for (i = 0; i < commit_formats_len; i++) {
118 if (prefixcmp(commit_formats[i].name, sought))
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,
137 static struct cmt_fmt_map *find_commit_format(const char *sought)
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;
151 rev->commit_format = CMIT_FMT_DEFAULT;
154 if (!prefixcmp(arg, "format:") || !prefixcmp(arg, "tformat:")) {
155 save_user_format(rev, strchr(arg, ':') + 1, arg[0] == 't');
159 if (strchr(arg, '%')) {
160 save_user_format(rev, arg, 1);
164 commit_format = find_commit_format(arg);
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)
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)
205 while ((ch = *s++) != '\0') {
212 static int is_rfc822_special(char ch)
234 static int needs_rfc822_quoting(const char *s, int len)
237 for (i = 0; i < len; i++)
238 if (is_rfc822_special(s[i]))
243 static int last_line_length(struct strbuf *sb)
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')
251 return sb->len - (i + 1);
254 static void add_rfc822_quoted(struct strbuf *out, const char *s, int len)
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++) {
266 strbuf_addch(out, '\\');
269 strbuf_addch(out, s[i]);
272 strbuf_addch(out, '"');
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))
301 * rule out special printable characters (' ' should be the only
302 * whitespace character considered printable, but be defensive and use
305 if (isspace(ch) || ch == '=' || ch == '?' || ch == '_')
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)
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)
337 for (i = 0; i < len; i++) {
339 if (non_ascii(ch) || ch == '\n')
341 if ((i + 1 < len) && (ch == '=' && line[i+1] == '?'))
348 static void add_rfc2047(struct strbuf *sb, const char *line, size_t len,
349 const char *encoding, enum rfc2047_type type)
351 static const int max_encoded_length = 76; /* per rfc2047 */
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? */
361 * RFC 2047, section 5 (3):
363 * Each 'encoded-word' MUST represent an integral number of
364 * characters. A multi-octet character may not be split across
365 * adjacent 'encoded- word's.
367 const unsigned char *p = (const unsigned char *)line;
368 int chrlen = mbs_chrlen(&line, &len, encoding);
369 int is_special = (chrlen > 1) || is_rfc2047_special(*p, type);
371 /* "=%02X" * chrlen, or the byte itself */
372 const char *encoded_fmt = is_special ? "=%02X" : "%c";
373 int encoded_len = is_special ? 3 * chrlen : 1;
376 * According to RFC 2047, we could encode the special character
377 * ' ' (space) with '_' (underscore) for readability. But many
378 * programs do not understand this and just leave the
379 * underscore in place. Thus, we do nothing special here, which
380 * causes ' ' to be encoded as '=20', avoiding this problem.
383 if (line_len + encoded_len + 2 > max_encoded_length) {
384 /* It won't fit with trailing "?=" --- break the line */
385 strbuf_addf(sb, "?=\n =?%s?q?", encoding);
386 line_len = strlen(encoding) + 5 + 1; /* =??q? plus SP */
389 for (i = 0; i < chrlen; i++)
390 strbuf_addf(sb, encoded_fmt, p[i]);
391 line_len += encoded_len;
393 strbuf_addstr(sb, "?=");
396 static const char *show_ident_date(const struct ident_split *ident,
399 unsigned long date = 0;
402 if (ident->date_begin && ident->date_end)
403 date = strtoul(ident->date_begin, NULL, 10);
404 if (ident->tz_begin && ident->tz_end)
405 tz = strtol(ident->tz_begin, NULL, 10);
406 return show_date(date, tz, mode);
409 void pp_user_info(struct pretty_print_context *pp,
410 const char *what, struct strbuf *sb,
411 const char *line, const char *encoding)
413 struct ident_split ident;
415 const char *mailbuf, *namebuf;
416 size_t namelen, maillen;
417 int max_length = 78; /* per rfc2822 */
419 if (pp->fmt == CMIT_FMT_ONELINE)
422 line_end = strchrnul(line, '\n');
423 if (split_ident_line(&ident, line, line_end - line))
426 mailbuf = ident.mail_begin;
427 maillen = ident.mail_end - ident.mail_begin;
428 namebuf = ident.name_begin;
429 namelen = ident.name_end - ident.name_begin;
432 map_user(pp->mailmap, &mailbuf, &maillen, &namebuf, &namelen);
434 if (pp->fmt == CMIT_FMT_EMAIL) {
435 if (pp->from_ident) {
436 struct strbuf buf = STRBUF_INIT;
438 strbuf_addstr(&buf, "From: ");
439 strbuf_add(&buf, namebuf, namelen);
440 strbuf_addstr(&buf, " <");
441 strbuf_add(&buf, mailbuf, maillen);
442 strbuf_addstr(&buf, ">\n");
443 string_list_append(&pp->in_body_headers,
444 strbuf_detach(&buf, NULL));
446 mailbuf = pp->from_ident->mail_begin;
447 maillen = pp->from_ident->mail_end - mailbuf;
448 namebuf = pp->from_ident->name_begin;
449 namelen = pp->from_ident->name_end - namebuf;
452 strbuf_addstr(sb, "From: ");
453 if (needs_rfc2047_encoding(namebuf, namelen, RFC2047_ADDRESS)) {
454 add_rfc2047(sb, namebuf, namelen,
455 encoding, RFC2047_ADDRESS);
456 max_length = 76; /* per rfc2047 */
457 } else if (needs_rfc822_quoting(namebuf, namelen)) {
458 struct strbuf quoted = STRBUF_INIT;
459 add_rfc822_quoted("ed, namebuf, namelen);
460 strbuf_add_wrapped_bytes(sb, quoted.buf, quoted.len,
462 strbuf_release("ed);
464 strbuf_add_wrapped_bytes(sb, namebuf, namelen,
469 last_line_length(sb) + strlen(" <") + maillen + strlen(">"))
470 strbuf_addch(sb, '\n');
471 strbuf_addf(sb, " <%.*s>\n", (int)maillen, mailbuf);
473 strbuf_addf(sb, "%s: %.*s%.*s <%.*s>\n", what,
474 (pp->fmt == CMIT_FMT_FULLER) ? 4 : 0, " ",
475 (int)namelen, namebuf, (int)maillen, mailbuf);
479 case CMIT_FMT_MEDIUM:
480 strbuf_addf(sb, "Date: %s\n",
481 show_ident_date(&ident, pp->date_mode));
484 strbuf_addf(sb, "Date: %s\n",
485 show_ident_date(&ident, DATE_RFC2822));
487 case CMIT_FMT_FULLER:
488 strbuf_addf(sb, "%sDate: %s\n", what,
489 show_ident_date(&ident, pp->date_mode));
497 static int is_empty_line(const char *line, int *len_p)
500 while (len && isspace(line[len-1]))
506 static const char *skip_empty_lines(const char *msg)
509 int linelen = get_one_line(msg);
513 if (!is_empty_line(msg, &ll))
520 static void add_merge_info(const struct pretty_print_context *pp,
521 struct strbuf *sb, const struct commit *commit)
523 struct commit_list *parent = commit->parents;
525 if ((pp->fmt == CMIT_FMT_ONELINE) || (pp->fmt == CMIT_FMT_EMAIL) ||
526 !parent || !parent->next)
529 strbuf_addstr(sb, "Merge:");
532 struct commit *p = parent->item;
533 const char *hex = NULL;
535 hex = find_unique_abbrev(p->object.sha1, pp->abbrev);
537 hex = sha1_to_hex(p->object.sha1);
538 parent = parent->next;
540 strbuf_addf(sb, " %s", hex);
542 strbuf_addch(sb, '\n');
545 static char *get_header(const struct commit *commit, const char *msg,
548 int key_len = strlen(key);
549 const char *line = msg;
552 const char *eol = strchr(line, '\n'), *next;
557 warning("malformed commit (header is missing newline): %s",
558 sha1_to_hex(commit->object.sha1));
559 eol = line + strlen(line);
563 if (eol - line > key_len &&
564 !strncmp(line, key, key_len) &&
565 line[key_len] == ' ') {
566 return xmemdupz(line + key_len + 1, eol - line - key_len - 1);
573 static char *replace_encoding_header(char *buf, const char *encoding)
575 struct strbuf tmp = STRBUF_INIT;
579 /* guess if there is an encoding header before a \n\n */
580 while (strncmp(cp, "encoding ", strlen("encoding "))) {
581 cp = strchr(cp, '\n');
582 if (!cp || *++cp == '\n')
586 cp = strchr(cp, '\n');
588 return buf; /* should not happen but be defensive */
589 len = cp + 1 - (buf + start);
591 strbuf_attach(&tmp, buf, strlen(buf), strlen(buf) + 1);
592 if (is_encoding_utf8(encoding)) {
593 /* we have re-coded to UTF-8; drop the header */
594 strbuf_remove(&tmp, start, len);
596 /* just replaces XXXX in 'encoding XXXX\n' */
597 strbuf_splice(&tmp, start + strlen("encoding "),
598 len - strlen("encoding \n"),
599 encoding, strlen(encoding));
601 return strbuf_detach(&tmp, NULL);
604 char *logmsg_reencode(const struct commit *commit,
605 char **commit_encoding,
606 const char *output_encoding)
608 static const char *utf8 = "UTF-8";
609 const char *use_encoding;
611 char *msg = commit->buffer;
615 enum object_type type;
618 msg = read_sha1_file(commit->object.sha1, &type, &size);
620 die("Cannot read commit object %s",
621 sha1_to_hex(commit->object.sha1));
622 if (type != OBJ_COMMIT)
623 die("Expected commit for '%s', got %s",
624 sha1_to_hex(commit->object.sha1), typename(type));
627 if (!output_encoding || !*output_encoding) {
630 get_header(commit, msg, "encoding");
633 encoding = get_header(commit, msg, "encoding");
635 *commit_encoding = encoding;
636 use_encoding = encoding ? encoding : utf8;
637 if (same_encoding(use_encoding, output_encoding)) {
639 * No encoding work to be done. If we have no encoding header
640 * at all, then there's nothing to do, and we can return the
641 * message verbatim (whether newly allocated or not).
647 * Otherwise, we still want to munge the encoding header in the
648 * result, which will be done by modifying the buffer. If we
649 * are using a fresh copy, we can reuse it. But if we are using
650 * the cached copy from commit->buffer, we need to duplicate it
651 * to avoid munging commit->buffer.
654 if (out == commit->buffer)
659 * There's actual encoding work to do. Do the reencoding, which
660 * still leaves the header to be replaced in the next step. At
661 * this point, we are done with msg. If we allocated a fresh
662 * copy, we can free it.
664 out = reencode_string(msg, output_encoding, use_encoding);
665 if (out && msg != commit->buffer)
670 * This replacement actually consumes the buffer we hand it, so we do
671 * not have to worry about freeing the old "out" here.
674 out = replace_encoding_header(out, output_encoding);
676 if (!commit_encoding)
679 * If the re-encoding failed, out might be NULL here; in that
680 * case we just return the commit message verbatim.
682 return out ? out : msg;
685 void logmsg_free(char *msg, const struct commit *commit)
687 if (msg != commit->buffer)
691 static int mailmap_name(const char **email, size_t *email_len,
692 const char **name, size_t *name_len)
694 static struct string_list *mail_map;
696 mail_map = xcalloc(1, sizeof(*mail_map));
697 read_mailmap(mail_map, NULL);
699 return mail_map->nr && map_user(mail_map, email, email_len, name, name_len);
702 static size_t format_person_part(struct strbuf *sb, char part,
703 const char *msg, int len, enum date_mode dmode)
705 /* currently all placeholders have same length */
706 const int placeholder_len = 2;
707 struct ident_split s;
708 const char *name, *mail;
709 size_t maillen, namelen;
711 if (split_ident_line(&s, msg, len) < 0)
715 namelen = s.name_end - s.name_begin;
717 maillen = s.mail_end - s.mail_begin;
719 if (part == 'N' || part == 'E') /* mailmap lookup */
720 mailmap_name(&mail, &maillen, &name, &namelen);
721 if (part == 'n' || part == 'N') { /* name */
722 strbuf_add(sb, name, namelen);
723 return placeholder_len;
725 if (part == 'e' || part == 'E') { /* email */
726 strbuf_add(sb, mail, maillen);
727 return placeholder_len;
733 if (part == 't') { /* date, UNIX timestamp */
734 strbuf_add(sb, s.date_begin, s.date_end - s.date_begin);
735 return placeholder_len;
740 strbuf_addstr(sb, show_ident_date(&s, dmode));
741 return placeholder_len;
742 case 'D': /* date, RFC2822 style */
743 strbuf_addstr(sb, show_ident_date(&s, DATE_RFC2822));
744 return placeholder_len;
745 case 'r': /* date, relative */
746 strbuf_addstr(sb, show_ident_date(&s, DATE_RELATIVE));
747 return placeholder_len;
748 case 'i': /* date, ISO 8601 */
749 strbuf_addstr(sb, show_ident_date(&s, DATE_ISO8601));
750 return placeholder_len;
755 * reading from either a bogus commit, or a reflog entry with
756 * %gn, %ge, etc.; 'sb' cannot be updated, but we still need
757 * to compute a valid return value.
759 if (part == 'n' || part == 'e' || part == 't' || part == 'd'
760 || part == 'D' || part == 'r' || part == 'i')
761 return placeholder_len;
763 return 0; /* unknown placeholder */
775 flush_left_and_steal,
786 struct format_commit_context {
787 const struct commit *commit;
788 const struct pretty_print_context *pretty_ctx;
789 unsigned commit_header_parsed:1;
790 unsigned commit_message_parsed:1;
791 struct signature_check signature_check;
792 enum flush_type flush_type;
793 enum trunc_type truncate;
795 char *commit_encoding;
796 size_t width, indent1, indent2;
800 /* These offsets are relative to the start of the commit message. */
802 struct chunk committer;
807 /* The following ones are relative to the result struct strbuf. */
808 struct chunk abbrev_commit_hash;
809 struct chunk abbrev_tree_hash;
810 struct chunk abbrev_parent_hashes;
814 static int add_again(struct strbuf *sb, struct chunk *chunk)
817 strbuf_adddup(sb, chunk->off, chunk->len);
822 * We haven't seen this chunk before. Our caller is surely
823 * going to add it the hard way now. Remember the most likely
824 * start of the to-be-added chunk: the current end of the
827 chunk->off = sb->len;
831 static void parse_commit_header(struct format_commit_context *context)
833 const char *msg = context->message;
836 for (i = 0; msg[i]; i++) {
838 for (eol = i; msg[eol] && msg[eol] != '\n'; eol++)
843 } else if (!prefixcmp(msg + i, "author ")) {
844 context->author.off = i + 7;
845 context->author.len = eol - i - 7;
846 } else if (!prefixcmp(msg + i, "committer ")) {
847 context->committer.off = i + 10;
848 context->committer.len = eol - i - 10;
852 context->message_off = i;
853 context->commit_header_parsed = 1;
856 static int istitlechar(char c)
858 return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
859 (c >= '0' && c <= '9') || c == '.' || c == '_';
862 static void format_sanitized_subject(struct strbuf *sb, const char *msg)
865 size_t start_len = sb->len;
868 for (; *msg && *msg != '\n'; msg++) {
869 if (istitlechar(*msg)) {
871 strbuf_addch(sb, '-');
873 strbuf_addch(sb, *msg);
875 while (*(msg+1) == '.')
881 /* trim any trailing '.' or '-' characters */
883 while (sb->len - trimlen > start_len &&
884 (sb->buf[sb->len - 1 - trimlen] == '.'
885 || sb->buf[sb->len - 1 - trimlen] == '-'))
887 strbuf_remove(sb, sb->len - trimlen, trimlen);
890 const char *format_subject(struct strbuf *sb, const char *msg,
891 const char *line_separator)
896 const char *line = msg;
897 int linelen = get_one_line(line);
900 if (!linelen || is_empty_line(line, &linelen))
905 strbuf_grow(sb, linelen + 2);
907 strbuf_addstr(sb, line_separator);
908 strbuf_add(sb, line, linelen);
914 static void parse_commit_message(struct format_commit_context *c)
916 const char *msg = c->message + c->message_off;
917 const char *start = c->message;
919 msg = skip_empty_lines(msg);
920 c->subject_off = msg - start;
922 msg = format_subject(NULL, msg, NULL);
923 msg = skip_empty_lines(msg);
924 c->body_off = msg - start;
926 c->commit_message_parsed = 1;
929 static void strbuf_wrap(struct strbuf *sb, size_t pos,
930 size_t width, size_t indent1, size_t indent2)
932 struct strbuf tmp = STRBUF_INIT;
935 strbuf_add(&tmp, sb->buf, pos);
936 strbuf_add_wrapped_text(&tmp, sb->buf + pos,
937 (int) indent1, (int) indent2, (int) width);
938 strbuf_swap(&tmp, sb);
939 strbuf_release(&tmp);
942 static void rewrap_message_tail(struct strbuf *sb,
943 struct format_commit_context *c,
944 size_t new_width, size_t new_indent1,
947 if (c->width == new_width && c->indent1 == new_indent1 &&
948 c->indent2 == new_indent2)
950 if (c->wrap_start < sb->len)
951 strbuf_wrap(sb, c->wrap_start, c->width, c->indent1, c->indent2);
952 c->wrap_start = sb->len;
953 c->width = new_width;
954 c->indent1 = new_indent1;
955 c->indent2 = new_indent2;
958 static int format_reflog_person(struct strbuf *sb,
960 struct reflog_walk_info *log,
961 enum date_mode dmode)
968 ident = get_reflog_ident(log);
972 return format_person_part(sb, part, ident, strlen(ident), dmode);
975 static size_t parse_color(struct strbuf *sb, /* in UTF-8 */
976 const char *placeholder,
977 struct format_commit_context *c)
979 if (placeholder[1] == '(') {
980 const char *begin = placeholder + 2;
981 const char *end = strchr(begin, ')');
982 char color[COLOR_MAXLEN];
986 if (!prefixcmp(begin, "auto,")) {
987 if (!want_color(c->pretty_ctx->color))
988 return end - placeholder + 1;
991 color_parse_mem(begin,
993 "--pretty format", color);
994 strbuf_addstr(sb, color);
995 return end - placeholder + 1;
997 if (!prefixcmp(placeholder + 1, "red")) {
998 strbuf_addstr(sb, GIT_COLOR_RED);
1000 } else if (!prefixcmp(placeholder + 1, "green")) {
1001 strbuf_addstr(sb, GIT_COLOR_GREEN);
1003 } else if (!prefixcmp(placeholder + 1, "blue")) {
1004 strbuf_addstr(sb, GIT_COLOR_BLUE);
1006 } else if (!prefixcmp(placeholder + 1, "reset")) {
1007 strbuf_addstr(sb, GIT_COLOR_RESET);
1013 static size_t parse_padding_placeholder(struct strbuf *sb,
1014 const char *placeholder,
1015 struct format_commit_context *c)
1017 const char *ch = placeholder;
1018 enum flush_type flush_type;
1023 flush_type = flush_right;
1027 flush_type = flush_both;
1029 } else if (*ch == '>') {
1030 flush_type = flush_left_and_steal;
1033 flush_type = flush_left;
1039 /* the next value means "wide enough to that column" */
1046 const char *start = ch + 1;
1047 const char *end = start + strcspn(start, ",)");
1050 if (!end || end == start)
1052 width = strtoul(start, &next, 10);
1053 if (next == start || width == 0)
1055 c->padding = to_column ? -width : width;
1056 c->flush_type = flush_type;
1060 end = strchr(start, ')');
1061 if (!end || end == start)
1063 if (!prefixcmp(start, "trunc)"))
1064 c->truncate = trunc_right;
1065 else if (!prefixcmp(start, "ltrunc)"))
1066 c->truncate = trunc_left;
1067 else if (!prefixcmp(start, "mtrunc)"))
1068 c->truncate = trunc_middle;
1072 c->truncate = trunc_none;
1074 return end - placeholder + 1;
1079 static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
1080 const char *placeholder,
1083 struct format_commit_context *c = context;
1084 const struct commit *commit = c->commit;
1085 const char *msg = c->message;
1086 struct commit_list *p;
1089 /* these are independent of the commit */
1090 switch (placeholder[0]) {
1092 if (!prefixcmp(placeholder + 1, "(auto)")) {
1094 return 7; /* consumed 7 bytes, "C(auto)" */
1096 int ret = parse_color(sb, placeholder, c);
1100 * Otherwise, we decided to treat %C<unknown>
1101 * as a literal string, and the previous
1102 * %C(auto) is still valid.
1106 case 'n': /* newline */
1107 strbuf_addch(sb, '\n');
1110 /* %x00 == NUL, %x0a == LF, etc. */
1111 if (0 <= (h1 = hexval_table[0xff & placeholder[1]]) &&
1113 0 <= (h2 = hexval_table[0xff & placeholder[2]]) &&
1115 strbuf_addch(sb, (h1<<4)|h2);
1120 if (placeholder[1] == '(') {
1121 unsigned long width = 0, indent1 = 0, indent2 = 0;
1123 const char *start = placeholder + 2;
1124 const char *end = strchr(start, ')');
1128 width = strtoul(start, &next, 10);
1130 indent1 = strtoul(next + 1, &next, 10);
1132 indent2 = strtoul(next + 1,
1139 rewrap_message_tail(sb, c, width, indent1, indent2);
1140 return end - placeholder + 1;
1146 return parse_padding_placeholder(sb, placeholder, c);
1149 /* these depend on the commit */
1150 if (!commit->object.parsed)
1151 parse_object(commit->object.sha1);
1153 switch (placeholder[0]) {
1154 case 'H': /* commit hash */
1155 strbuf_addstr(sb, diff_get_color(c->auto_color, DIFF_COMMIT));
1156 strbuf_addstr(sb, sha1_to_hex(commit->object.sha1));
1157 strbuf_addstr(sb, diff_get_color(c->auto_color, DIFF_RESET));
1159 case 'h': /* abbreviated commit hash */
1160 strbuf_addstr(sb, diff_get_color(c->auto_color, DIFF_COMMIT));
1161 if (add_again(sb, &c->abbrev_commit_hash)) {
1162 strbuf_addstr(sb, diff_get_color(c->auto_color, DIFF_RESET));
1165 strbuf_addstr(sb, find_unique_abbrev(commit->object.sha1,
1166 c->pretty_ctx->abbrev));
1167 strbuf_addstr(sb, diff_get_color(c->auto_color, DIFF_RESET));
1168 c->abbrev_commit_hash.len = sb->len - c->abbrev_commit_hash.off;
1170 case 'T': /* tree hash */
1171 strbuf_addstr(sb, sha1_to_hex(commit->tree->object.sha1));
1173 case 't': /* abbreviated tree hash */
1174 if (add_again(sb, &c->abbrev_tree_hash))
1176 strbuf_addstr(sb, find_unique_abbrev(commit->tree->object.sha1,
1177 c->pretty_ctx->abbrev));
1178 c->abbrev_tree_hash.len = sb->len - c->abbrev_tree_hash.off;
1180 case 'P': /* parent hashes */
1181 for (p = commit->parents; p; p = p->next) {
1182 if (p != commit->parents)
1183 strbuf_addch(sb, ' ');
1184 strbuf_addstr(sb, sha1_to_hex(p->item->object.sha1));
1187 case 'p': /* abbreviated parent hashes */
1188 if (add_again(sb, &c->abbrev_parent_hashes))
1190 for (p = commit->parents; p; p = p->next) {
1191 if (p != commit->parents)
1192 strbuf_addch(sb, ' ');
1193 strbuf_addstr(sb, find_unique_abbrev(
1194 p->item->object.sha1,
1195 c->pretty_ctx->abbrev));
1197 c->abbrev_parent_hashes.len = sb->len -
1198 c->abbrev_parent_hashes.off;
1200 case 'm': /* left/right/bottom */
1201 strbuf_addstr(sb, get_revision_mark(NULL, commit));
1204 load_ref_decorations(DECORATE_SHORT_REFS);
1205 format_decorations(sb, commit, c->auto_color);
1207 case 'g': /* reflog info */
1208 switch(placeholder[1]) {
1209 case 'd': /* reflog selector */
1211 if (c->pretty_ctx->reflog_info)
1212 get_reflog_selector(sb,
1213 c->pretty_ctx->reflog_info,
1214 c->pretty_ctx->date_mode,
1215 c->pretty_ctx->date_mode_explicit,
1216 (placeholder[1] == 'd'));
1218 case 's': /* reflog message */
1219 if (c->pretty_ctx->reflog_info)
1220 get_reflog_message(sb, c->pretty_ctx->reflog_info);
1226 return format_reflog_person(sb,
1228 c->pretty_ctx->reflog_info,
1229 c->pretty_ctx->date_mode);
1231 return 0; /* unknown %g placeholder */
1233 if (c->pretty_ctx->notes_message) {
1234 strbuf_addstr(sb, c->pretty_ctx->notes_message);
1240 if (placeholder[0] == 'G') {
1241 if (!c->signature_check.result)
1242 check_commit_signature(c->commit, &(c->signature_check));
1243 switch (placeholder[1]) {
1245 if (c->signature_check.gpg_output)
1246 strbuf_addstr(sb, c->signature_check.gpg_output);
1249 switch (c->signature_check.result) {
1254 strbuf_addch(sb, c->signature_check.result);
1258 if (c->signature_check.signer)
1259 strbuf_addstr(sb, c->signature_check.signer);
1262 if (c->signature_check.key)
1263 strbuf_addstr(sb, c->signature_check.key);
1270 /* For the rest we have to parse the commit header. */
1271 if (!c->commit_header_parsed)
1272 parse_commit_header(c);
1274 switch (placeholder[0]) {
1275 case 'a': /* author ... */
1276 return format_person_part(sb, placeholder[1],
1277 msg + c->author.off, c->author.len,
1278 c->pretty_ctx->date_mode);
1279 case 'c': /* committer ... */
1280 return format_person_part(sb, placeholder[1],
1281 msg + c->committer.off, c->committer.len,
1282 c->pretty_ctx->date_mode);
1283 case 'e': /* encoding */
1284 if (c->commit_encoding)
1285 strbuf_addstr(sb, c->commit_encoding);
1287 case 'B': /* raw body */
1288 /* message_off is always left at the initial newline */
1289 strbuf_addstr(sb, msg + c->message_off + 1);
1293 /* Now we need to parse the commit message. */
1294 if (!c->commit_message_parsed)
1295 parse_commit_message(c);
1297 switch (placeholder[0]) {
1298 case 's': /* subject */
1299 format_subject(sb, msg + c->subject_off, " ");
1301 case 'f': /* sanitized subject */
1302 format_sanitized_subject(sb, msg + c->subject_off);
1304 case 'b': /* body */
1305 strbuf_addstr(sb, msg + c->body_off);
1308 return 0; /* unknown placeholder */
1311 static size_t format_and_pad_commit(struct strbuf *sb, /* in UTF-8 */
1312 const char *placeholder,
1313 struct format_commit_context *c)
1315 struct strbuf local_sb = STRBUF_INIT;
1316 int total_consumed = 0, len, padding = c->padding;
1318 const char *start = strrchr(sb->buf, '\n');
1322 occupied = utf8_strnwidth(start, -1, 1);
1323 padding = (-padding) - occupied;
1326 int modifier = *placeholder == 'C';
1327 int consumed = format_commit_one(&local_sb, placeholder, c);
1328 total_consumed += consumed;
1333 placeholder += consumed;
1334 if (*placeholder != '%')
1339 len = utf8_strnwidth(local_sb.buf, -1, 1);
1341 if (c->flush_type == flush_left_and_steal) {
1342 const char *ch = sb->buf + sb->len - 1;
1343 while (len > padding && ch > sb->buf) {
1350 /* check for trailing ansi sequences */
1354 while (ch - p < 10 && *p != '\033')
1357 ch + 1 - p != display_mode_esc_sequence_len(p))
1360 * got a good ansi sequence, put it back to
1361 * local_sb as we're cutting sb
1363 strbuf_insert(&local_sb, 0, p, ch + 1 - p);
1366 strbuf_setlen(sb, ch + 1 - sb->buf);
1367 c->flush_type = flush_left;
1370 if (len > padding) {
1371 switch (c->truncate) {
1373 strbuf_utf8_replace(&local_sb,
1374 0, len - (padding - 2),
1378 strbuf_utf8_replace(&local_sb,
1380 len - (padding - 2),
1384 strbuf_utf8_replace(&local_sb,
1385 padding - 2, len - (padding - 2),
1391 strbuf_addstr(sb, local_sb.buf);
1393 int sb_len = sb->len, offset = 0;
1394 if (c->flush_type == flush_left)
1395 offset = padding - len;
1396 else if (c->flush_type == flush_both)
1397 offset = (padding - len) / 2;
1399 * we calculate padding in columns, now
1400 * convert it back to chars
1402 padding = padding - len + local_sb.len;
1403 strbuf_grow(sb, padding);
1404 strbuf_setlen(sb, sb_len + padding);
1405 memset(sb->buf + sb_len, ' ', sb->len - sb_len);
1406 memcpy(sb->buf + sb_len + offset, local_sb.buf,
1409 strbuf_release(&local_sb);
1410 c->flush_type = no_flush;
1411 return total_consumed;
1414 static size_t format_commit_item(struct strbuf *sb, /* in UTF-8 */
1415 const char *placeholder,
1422 ADD_LF_BEFORE_NON_EMPTY,
1423 DEL_LF_BEFORE_EMPTY,
1424 ADD_SP_BEFORE_NON_EMPTY
1427 switch (placeholder[0]) {
1429 magic = DEL_LF_BEFORE_EMPTY;
1432 magic = ADD_LF_BEFORE_NON_EMPTY;
1435 magic = ADD_SP_BEFORE_NON_EMPTY;
1440 if (magic != NO_MAGIC)
1444 if (((struct format_commit_context *)context)->flush_type != no_flush)
1445 consumed = format_and_pad_commit(sb, placeholder, context);
1447 consumed = format_commit_one(sb, placeholder, context);
1448 if (magic == NO_MAGIC)
1451 if ((orig_len == sb->len) && magic == DEL_LF_BEFORE_EMPTY) {
1452 while (sb->len && sb->buf[sb->len - 1] == '\n')
1453 strbuf_setlen(sb, sb->len - 1);
1454 } else if (orig_len != sb->len) {
1455 if (magic == ADD_LF_BEFORE_NON_EMPTY)
1456 strbuf_insert(sb, orig_len, "\n", 1);
1457 else if (magic == ADD_SP_BEFORE_NON_EMPTY)
1458 strbuf_insert(sb, orig_len, " ", 1);
1460 return consumed + 1;
1463 static size_t userformat_want_item(struct strbuf *sb, const char *placeholder,
1466 struct userformat_want *w = context;
1468 if (*placeholder == '+' || *placeholder == '-' || *placeholder == ' ')
1471 switch (*placeholder) {
1479 void userformat_find_requirements(const char *fmt, struct userformat_want *w)
1481 struct strbuf dummy = STRBUF_INIT;
1488 strbuf_expand(&dummy, fmt, userformat_want_item, w);
1489 strbuf_release(&dummy);
1492 void format_commit_message(const struct commit *commit,
1493 const char *format, struct strbuf *sb,
1494 const struct pretty_print_context *pretty_ctx)
1496 struct format_commit_context context;
1497 const char *output_enc = pretty_ctx->output_encoding;
1498 const char *utf8 = "UTF-8";
1500 memset(&context, 0, sizeof(context));
1501 context.commit = commit;
1502 context.pretty_ctx = pretty_ctx;
1503 context.wrap_start = sb->len;
1504 context.message = logmsg_reencode(commit,
1505 &context.commit_encoding,
1508 strbuf_expand(sb, format, format_commit_item, &context);
1509 rewrap_message_tail(sb, &context, 0, 0, 0);
1512 if (same_encoding(utf8, output_enc))
1515 if (context.commit_encoding &&
1516 !same_encoding(context.commit_encoding, utf8))
1517 output_enc = context.commit_encoding;
1522 char *out = reencode_string_len(sb->buf, sb->len,
1523 output_enc, utf8, &outsz);
1525 strbuf_attach(sb, out, outsz, outsz + 1);
1528 free(context.commit_encoding);
1529 logmsg_free(context.message, commit);
1530 free(context.signature_check.gpg_output);
1531 free(context.signature_check.signer);
1534 static void pp_header(struct pretty_print_context *pp,
1535 const char *encoding,
1536 const struct commit *commit,
1540 int parents_shown = 0;
1543 const char *line = *msg_p;
1544 int linelen = get_one_line(*msg_p);
1554 if (pp->fmt == CMIT_FMT_RAW) {
1555 strbuf_add(sb, line, linelen);
1559 if (!prefixcmp(line, "parent ")) {
1561 die("bad parent line in commit");
1565 if (!parents_shown) {
1566 struct commit_list *parent;
1568 for (parent = commit->parents, num = 0;
1570 parent = parent->next, num++)
1572 /* with enough slop */
1573 strbuf_grow(sb, num * 50 + 20);
1574 add_merge_info(pp, sb, commit);
1579 * MEDIUM == DEFAULT shows only author with dates.
1580 * FULL shows both authors but not dates.
1581 * FULLER shows both authors and dates.
1583 if (!prefixcmp(line, "author ")) {
1584 strbuf_grow(sb, linelen + 80);
1585 pp_user_info(pp, "Author", sb, line + 7, encoding);
1587 if (!prefixcmp(line, "committer ") &&
1588 (pp->fmt == CMIT_FMT_FULL || pp->fmt == CMIT_FMT_FULLER)) {
1589 strbuf_grow(sb, linelen + 80);
1590 pp_user_info(pp, "Commit", sb, line + 10, encoding);
1595 void pp_title_line(struct pretty_print_context *pp,
1598 const char *encoding,
1601 static const int max_length = 78; /* per rfc2047 */
1602 struct strbuf title;
1604 strbuf_init(&title, 80);
1605 *msg_p = format_subject(&title, *msg_p,
1606 pp->preserve_subject ? "\n" : " ");
1608 strbuf_grow(sb, title.len + 1024);
1610 strbuf_addstr(sb, pp->subject);
1611 if (needs_rfc2047_encoding(title.buf, title.len, RFC2047_SUBJECT))
1612 add_rfc2047(sb, title.buf, title.len,
1613 encoding, RFC2047_SUBJECT);
1615 strbuf_add_wrapped_bytes(sb, title.buf, title.len,
1616 -last_line_length(sb), 1, max_length);
1618 strbuf_addbuf(sb, &title);
1620 strbuf_addch(sb, '\n');
1622 if (need_8bit_cte == 0) {
1624 for (i = 0; i < pp->in_body_headers.nr; i++) {
1625 if (has_non_ascii(pp->in_body_headers.items[i].string)) {
1632 if (need_8bit_cte > 0) {
1633 const char *header_fmt =
1634 "MIME-Version: 1.0\n"
1635 "Content-Type: text/plain; charset=%s\n"
1636 "Content-Transfer-Encoding: 8bit\n";
1637 strbuf_addf(sb, header_fmt, encoding);
1639 if (pp->after_subject) {
1640 strbuf_addstr(sb, pp->after_subject);
1642 if (pp->fmt == CMIT_FMT_EMAIL) {
1643 strbuf_addch(sb, '\n');
1646 if (pp->in_body_headers.nr) {
1648 for (i = 0; i < pp->in_body_headers.nr; i++) {
1649 strbuf_addstr(sb, pp->in_body_headers.items[i].string);
1650 free(pp->in_body_headers.items[i].string);
1652 string_list_clear(&pp->in_body_headers, 0);
1653 strbuf_addch(sb, '\n');
1656 strbuf_release(&title);
1659 void pp_remainder(struct pretty_print_context *pp,
1666 const char *line = *msg_p;
1667 int linelen = get_one_line(line);
1673 if (is_empty_line(line, &linelen)) {
1676 if (pp->fmt == CMIT_FMT_SHORT)
1681 strbuf_grow(sb, linelen + indent + 20);
1683 memset(sb->buf + sb->len, ' ', indent);
1684 strbuf_setlen(sb, sb->len + indent);
1686 strbuf_add(sb, line, linelen);
1687 strbuf_addch(sb, '\n');
1691 void pretty_print_commit(struct pretty_print_context *pp,
1692 const struct commit *commit,
1695 unsigned long beginning_of_body;
1699 const char *encoding;
1700 int need_8bit_cte = pp->need_8bit_cte;
1702 if (pp->fmt == CMIT_FMT_USERFORMAT) {
1703 format_commit_message(commit, user_format, sb, pp);
1707 encoding = get_log_output_encoding();
1708 msg = reencoded = logmsg_reencode(commit, NULL, encoding);
1710 if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL)
1714 * We need to check and emit Content-type: to mark it
1715 * as 8-bit if we haven't done so.
1717 if (pp->fmt == CMIT_FMT_EMAIL && need_8bit_cte == 0) {
1720 for (in_body = i = 0; (ch = msg[i]); i++) {
1722 /* author could be non 7-bit ASCII but
1723 * the log may be so; skip over the
1724 * header part first.
1726 if (ch == '\n' && msg[i+1] == '\n')
1729 else if (non_ascii(ch)) {
1736 pp_header(pp, encoding, commit, &msg, sb);
1737 if (pp->fmt != CMIT_FMT_ONELINE && !pp->subject) {
1738 strbuf_addch(sb, '\n');
1741 /* Skip excess blank lines at the beginning of body, if any... */
1742 msg = skip_empty_lines(msg);
1744 /* These formats treat the title line specially. */
1745 if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL)
1746 pp_title_line(pp, &msg, sb, encoding, need_8bit_cte);
1748 beginning_of_body = sb->len;
1749 if (pp->fmt != CMIT_FMT_ONELINE)
1750 pp_remainder(pp, &msg, sb, indent);
1753 /* Make sure there is an EOLN for the non-oneline case */
1754 if (pp->fmt != CMIT_FMT_ONELINE)
1755 strbuf_addch(sb, '\n');
1758 * The caller may append additional body text in e-mail
1759 * format. Make sure we did not strip the blank line
1760 * between the header and the body.
1762 if (pp->fmt == CMIT_FMT_EMAIL && sb->len <= beginning_of_body)
1763 strbuf_addch(sb, '\n');
1765 logmsg_free(reencoded, commit);
1768 void pp_commit_easy(enum cmit_fmt fmt, const struct commit *commit,
1771 struct pretty_print_context pp = {0};
1773 pretty_print_commit(&pp, commit, sb);