pretty: two phase conversion for non utf-8 commits
[git/mingw.git] / pretty.c
blob59472750ada226df15ac90092723b044f4eece6f
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, size_t 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? */
359 while (len) {
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 void pp_user_info(const struct pretty_print_context *pp,
397 const char *what, struct strbuf *sb,
398 const char *line, const char *encoding)
400 struct strbuf name;
401 struct strbuf mail;
402 struct ident_split ident;
403 int linelen;
404 char *line_end, *date;
405 const char *mailbuf, *namebuf;
406 size_t namelen, maillen;
407 int max_length = 78; /* per rfc2822 */
408 unsigned long time;
409 int tz;
411 if (pp->fmt == CMIT_FMT_ONELINE)
412 return;
414 line_end = strchr(line, '\n');
415 if (!line_end) {
416 line_end = strchr(line, '\0');
417 if (!line_end)
418 return;
421 linelen = ++line_end - line;
422 if (split_ident_line(&ident, line, linelen))
423 return;
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;
431 if (pp->mailmap)
432 map_user(pp->mailmap, &mailbuf, &maillen, &namebuf, &namelen);
434 strbuf_init(&mail, 0);
435 strbuf_init(&name, 0);
437 strbuf_add(&mail, mailbuf, maillen);
438 strbuf_add(&name, namebuf, namelen);
440 namelen = name.len + mail.len + 3; /* ' ' + '<' + '>' */
441 time = strtoul(ident.date_begin, &date, 10);
442 tz = strtol(date, NULL, 10);
444 if (pp->fmt == CMIT_FMT_EMAIL) {
445 strbuf_addstr(sb, "From: ");
446 if (needs_rfc2047_encoding(name.buf, name.len, RFC2047_ADDRESS)) {
447 add_rfc2047(sb, name.buf, name.len,
448 encoding, RFC2047_ADDRESS);
449 max_length = 76; /* per rfc2047 */
450 } else if (needs_rfc822_quoting(name.buf, name.len)) {
451 struct strbuf quoted = STRBUF_INIT;
452 add_rfc822_quoted(&quoted, name.buf, name.len);
453 strbuf_add_wrapped_bytes(sb, quoted.buf, quoted.len,
454 -6, 1, max_length);
455 strbuf_release(&quoted);
456 } else {
457 strbuf_add_wrapped_bytes(sb, name.buf, name.len,
458 -6, 1, max_length);
460 if (namelen - name.len + last_line_length(sb) > max_length)
461 strbuf_addch(sb, '\n');
463 strbuf_addf(sb, " <%s>\n", mail.buf);
464 } else {
465 strbuf_addf(sb, "%s: %.*s%s <%s>\n", what,
466 (pp->fmt == CMIT_FMT_FULLER) ? 4 : 0,
467 " ", name.buf, mail.buf);
470 strbuf_release(&mail);
471 strbuf_release(&name);
473 switch (pp->fmt) {
474 case CMIT_FMT_MEDIUM:
475 strbuf_addf(sb, "Date: %s\n", show_date(time, tz, pp->date_mode));
476 break;
477 case CMIT_FMT_EMAIL:
478 strbuf_addf(sb, "Date: %s\n", show_date(time, tz, DATE_RFC2822));
479 break;
480 case CMIT_FMT_FULLER:
481 strbuf_addf(sb, "%sDate: %s\n", what, show_date(time, tz, pp->date_mode));
482 break;
483 default:
484 /* notin' */
485 break;
489 static int is_empty_line(const char *line, int *len_p)
491 int len = *len_p;
492 while (len && isspace(line[len-1]))
493 len--;
494 *len_p = len;
495 return !len;
498 static const char *skip_empty_lines(const char *msg)
500 for (;;) {
501 int linelen = get_one_line(msg);
502 int ll = linelen;
503 if (!linelen)
504 break;
505 if (!is_empty_line(msg, &ll))
506 break;
507 msg += linelen;
509 return msg;
512 static void add_merge_info(const struct pretty_print_context *pp,
513 struct strbuf *sb, const struct commit *commit)
515 struct commit_list *parent = commit->parents;
517 if ((pp->fmt == CMIT_FMT_ONELINE) || (pp->fmt == CMIT_FMT_EMAIL) ||
518 !parent || !parent->next)
519 return;
521 strbuf_addstr(sb, "Merge:");
523 while (parent) {
524 struct commit *p = parent->item;
525 const char *hex = NULL;
526 if (pp->abbrev)
527 hex = find_unique_abbrev(p->object.sha1, pp->abbrev);
528 if (!hex)
529 hex = sha1_to_hex(p->object.sha1);
530 parent = parent->next;
532 strbuf_addf(sb, " %s", hex);
534 strbuf_addch(sb, '\n');
537 static char *get_header(const struct commit *commit, const char *msg,
538 const char *key)
540 int key_len = strlen(key);
541 const char *line = msg;
543 while (line) {
544 const char *eol = strchr(line, '\n'), *next;
546 if (line == eol)
547 return NULL;
548 if (!eol) {
549 warning("malformed commit (header is missing newline): %s",
550 sha1_to_hex(commit->object.sha1));
551 eol = line + strlen(line);
552 next = NULL;
553 } else
554 next = eol + 1;
555 if (eol - line > key_len &&
556 !strncmp(line, key, key_len) &&
557 line[key_len] == ' ') {
558 return xmemdupz(line + key_len + 1, eol - line - key_len - 1);
560 line = next;
562 return NULL;
565 static char *replace_encoding_header(char *buf, const char *encoding)
567 struct strbuf tmp = STRBUF_INIT;
568 size_t start, len;
569 char *cp = buf;
571 /* guess if there is an encoding header before a \n\n */
572 while (strncmp(cp, "encoding ", strlen("encoding "))) {
573 cp = strchr(cp, '\n');
574 if (!cp || *++cp == '\n')
575 return buf;
577 start = cp - buf;
578 cp = strchr(cp, '\n');
579 if (!cp)
580 return buf; /* should not happen but be defensive */
581 len = cp + 1 - (buf + start);
583 strbuf_attach(&tmp, buf, strlen(buf), strlen(buf) + 1);
584 if (is_encoding_utf8(encoding)) {
585 /* we have re-coded to UTF-8; drop the header */
586 strbuf_remove(&tmp, start, len);
587 } else {
588 /* just replaces XXXX in 'encoding XXXX\n' */
589 strbuf_splice(&tmp, start + strlen("encoding "),
590 len - strlen("encoding \n"),
591 encoding, strlen(encoding));
593 return strbuf_detach(&tmp, NULL);
596 char *logmsg_reencode(const struct commit *commit,
597 char **commit_encoding,
598 const char *output_encoding)
600 static const char *utf8 = "UTF-8";
601 const char *use_encoding;
602 char *encoding;
603 char *msg = commit->buffer;
604 char *out;
606 if (!msg) {
607 enum object_type type;
608 unsigned long size;
610 msg = read_sha1_file(commit->object.sha1, &type, &size);
611 if (!msg)
612 die("Cannot read commit object %s",
613 sha1_to_hex(commit->object.sha1));
614 if (type != OBJ_COMMIT)
615 die("Expected commit for '%s', got %s",
616 sha1_to_hex(commit->object.sha1), typename(type));
619 if (!output_encoding || !*output_encoding) {
620 if (commit_encoding)
621 *commit_encoding =
622 get_header(commit, msg, "encoding");
623 return msg;
625 encoding = get_header(commit, msg, "encoding");
626 if (commit_encoding)
627 *commit_encoding = encoding;
628 use_encoding = encoding ? encoding : utf8;
629 if (same_encoding(use_encoding, output_encoding)) {
631 * No encoding work to be done. If we have no encoding header
632 * at all, then there's nothing to do, and we can return the
633 * message verbatim (whether newly allocated or not).
635 if (!encoding)
636 return msg;
639 * Otherwise, we still want to munge the encoding header in the
640 * result, which will be done by modifying the buffer. If we
641 * are using a fresh copy, we can reuse it. But if we are using
642 * the cached copy from commit->buffer, we need to duplicate it
643 * to avoid munging commit->buffer.
645 out = msg;
646 if (out == commit->buffer)
647 out = xstrdup(out);
649 else {
651 * There's actual encoding work to do. Do the reencoding, which
652 * still leaves the header to be replaced in the next step. At
653 * this point, we are done with msg. If we allocated a fresh
654 * copy, we can free it.
656 out = reencode_string(msg, output_encoding, use_encoding);
657 if (out && msg != commit->buffer)
658 free(msg);
662 * This replacement actually consumes the buffer we hand it, so we do
663 * not have to worry about freeing the old "out" here.
665 if (out)
666 out = replace_encoding_header(out, output_encoding);
668 if (!commit_encoding)
669 free(encoding);
671 * If the re-encoding failed, out might be NULL here; in that
672 * case we just return the commit message verbatim.
674 return out ? out : msg;
677 void logmsg_free(char *msg, const struct commit *commit)
679 if (msg != commit->buffer)
680 free(msg);
683 static int mailmap_name(const char **email, size_t *email_len,
684 const char **name, size_t *name_len)
686 static struct string_list *mail_map;
687 if (!mail_map) {
688 mail_map = xcalloc(1, sizeof(*mail_map));
689 read_mailmap(mail_map, NULL);
691 return mail_map->nr && map_user(mail_map, email, email_len, name, name_len);
694 static size_t format_person_part(struct strbuf *sb, char part,
695 const char *msg, int len, enum date_mode dmode)
697 /* currently all placeholders have same length */
698 const int placeholder_len = 2;
699 int tz;
700 unsigned long date = 0;
701 struct ident_split s;
702 const char *name, *mail;
703 size_t maillen, namelen;
705 if (split_ident_line(&s, msg, len) < 0)
706 goto skip;
708 name = s.name_begin;
709 namelen = s.name_end - s.name_begin;
710 mail = s.mail_begin;
711 maillen = s.mail_end - s.mail_begin;
713 if (part == 'N' || part == 'E') /* mailmap lookup */
714 mailmap_name(&mail, &maillen, &name, &namelen);
715 if (part == 'n' || part == 'N') { /* name */
716 strbuf_add(sb, name, namelen);
717 return placeholder_len;
719 if (part == 'e' || part == 'E') { /* email */
720 strbuf_add(sb, mail, maillen);
721 return placeholder_len;
724 if (!s.date_begin)
725 goto skip;
727 date = strtoul(s.date_begin, NULL, 10);
729 if (part == 't') { /* date, UNIX timestamp */
730 strbuf_add(sb, s.date_begin, s.date_end - s.date_begin);
731 return placeholder_len;
734 /* parse tz */
735 tz = strtoul(s.tz_begin + 1, NULL, 10);
736 if (*s.tz_begin == '-')
737 tz = -tz;
739 switch (part) {
740 case 'd': /* date */
741 strbuf_addstr(sb, show_date(date, tz, dmode));
742 return placeholder_len;
743 case 'D': /* date, RFC2822 style */
744 strbuf_addstr(sb, show_date(date, tz, DATE_RFC2822));
745 return placeholder_len;
746 case 'r': /* date, relative */
747 strbuf_addstr(sb, show_date(date, tz, DATE_RELATIVE));
748 return placeholder_len;
749 case 'i': /* date, ISO 8601 */
750 strbuf_addstr(sb, show_date(date, tz, DATE_ISO8601));
751 return placeholder_len;
754 skip:
756 * reading from either a bogus commit, or a reflog entry with
757 * %gn, %ge, etc.; 'sb' cannot be updated, but we still need
758 * to compute a valid return value.
760 if (part == 'n' || part == 'e' || part == 't' || part == 'd'
761 || part == 'D' || part == 'r' || part == 'i')
762 return placeholder_len;
764 return 0; /* unknown placeholder */
767 struct chunk {
768 size_t off;
769 size_t len;
772 struct format_commit_context {
773 const struct commit *commit;
774 const struct pretty_print_context *pretty_ctx;
775 unsigned commit_header_parsed:1;
776 unsigned commit_message_parsed:1;
777 struct signature_check signature_check;
778 char *message;
779 char *commit_encoding;
780 size_t width, indent1, indent2;
782 /* These offsets are relative to the start of the commit message. */
783 struct chunk author;
784 struct chunk committer;
785 size_t message_off;
786 size_t subject_off;
787 size_t body_off;
789 /* The following ones are relative to the result struct strbuf. */
790 struct chunk abbrev_commit_hash;
791 struct chunk abbrev_tree_hash;
792 struct chunk abbrev_parent_hashes;
793 size_t wrap_start;
796 static int add_again(struct strbuf *sb, struct chunk *chunk)
798 if (chunk->len) {
799 strbuf_adddup(sb, chunk->off, chunk->len);
800 return 1;
804 * We haven't seen this chunk before. Our caller is surely
805 * going to add it the hard way now. Remember the most likely
806 * start of the to-be-added chunk: the current end of the
807 * struct strbuf.
809 chunk->off = sb->len;
810 return 0;
813 static void parse_commit_header(struct format_commit_context *context)
815 const char *msg = context->message;
816 int i;
818 for (i = 0; msg[i]; i++) {
819 int eol;
820 for (eol = i; msg[eol] && msg[eol] != '\n'; eol++)
821 ; /* do nothing */
823 if (i == eol) {
824 break;
825 } else if (!prefixcmp(msg + i, "author ")) {
826 context->author.off = i + 7;
827 context->author.len = eol - i - 7;
828 } else if (!prefixcmp(msg + i, "committer ")) {
829 context->committer.off = i + 10;
830 context->committer.len = eol - i - 10;
832 i = eol;
834 context->message_off = i;
835 context->commit_header_parsed = 1;
838 static int istitlechar(char c)
840 return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
841 (c >= '0' && c <= '9') || c == '.' || c == '_';
844 static void format_sanitized_subject(struct strbuf *sb, const char *msg)
846 size_t trimlen;
847 size_t start_len = sb->len;
848 int space = 2;
850 for (; *msg && *msg != '\n'; msg++) {
851 if (istitlechar(*msg)) {
852 if (space == 1)
853 strbuf_addch(sb, '-');
854 space = 0;
855 strbuf_addch(sb, *msg);
856 if (*msg == '.')
857 while (*(msg+1) == '.')
858 msg++;
859 } else
860 space |= 1;
863 /* trim any trailing '.' or '-' characters */
864 trimlen = 0;
865 while (sb->len - trimlen > start_len &&
866 (sb->buf[sb->len - 1 - trimlen] == '.'
867 || sb->buf[sb->len - 1 - trimlen] == '-'))
868 trimlen++;
869 strbuf_remove(sb, sb->len - trimlen, trimlen);
872 const char *format_subject(struct strbuf *sb, const char *msg,
873 const char *line_separator)
875 int first = 1;
877 for (;;) {
878 const char *line = msg;
879 int linelen = get_one_line(line);
881 msg += linelen;
882 if (!linelen || is_empty_line(line, &linelen))
883 break;
885 if (!sb)
886 continue;
887 strbuf_grow(sb, linelen + 2);
888 if (!first)
889 strbuf_addstr(sb, line_separator);
890 strbuf_add(sb, line, linelen);
891 first = 0;
893 return msg;
896 static void parse_commit_message(struct format_commit_context *c)
898 const char *msg = c->message + c->message_off;
899 const char *start = c->message;
901 msg = skip_empty_lines(msg);
902 c->subject_off = msg - start;
904 msg = format_subject(NULL, msg, NULL);
905 msg = skip_empty_lines(msg);
906 c->body_off = msg - start;
908 c->commit_message_parsed = 1;
911 static void strbuf_wrap(struct strbuf *sb, size_t pos,
912 size_t width, size_t indent1, size_t indent2)
914 struct strbuf tmp = STRBUF_INIT;
916 if (pos)
917 strbuf_add(&tmp, sb->buf, pos);
918 strbuf_add_wrapped_text(&tmp, sb->buf + pos,
919 (int) indent1, (int) indent2, (int) width);
920 strbuf_swap(&tmp, sb);
921 strbuf_release(&tmp);
924 static void rewrap_message_tail(struct strbuf *sb,
925 struct format_commit_context *c,
926 size_t new_width, size_t new_indent1,
927 size_t new_indent2)
929 if (c->width == new_width && c->indent1 == new_indent1 &&
930 c->indent2 == new_indent2)
931 return;
932 if (c->wrap_start < sb->len)
933 strbuf_wrap(sb, c->wrap_start, c->width, c->indent1, c->indent2);
934 c->wrap_start = sb->len;
935 c->width = new_width;
936 c->indent1 = new_indent1;
937 c->indent2 = new_indent2;
940 static int format_reflog_person(struct strbuf *sb,
941 char part,
942 struct reflog_walk_info *log,
943 enum date_mode dmode)
945 const char *ident;
947 if (!log)
948 return 2;
950 ident = get_reflog_ident(log);
951 if (!ident)
952 return 2;
954 return format_person_part(sb, part, ident, strlen(ident), dmode);
957 static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
958 const char *placeholder,
959 void *context)
961 struct format_commit_context *c = context;
962 const struct commit *commit = c->commit;
963 const char *msg = c->message;
964 struct commit_list *p;
965 int h1, h2;
967 /* these are independent of the commit */
968 switch (placeholder[0]) {
969 case 'C':
970 if (placeholder[1] == '(') {
971 const char *begin = placeholder + 2;
972 const char *end = strchr(begin, ')');
973 char color[COLOR_MAXLEN];
975 if (!end)
976 return 0;
977 if (!prefixcmp(begin, "auto,")) {
978 if (!want_color(c->pretty_ctx->color))
979 return end - placeholder + 1;
980 begin += 5;
982 color_parse_mem(begin,
983 end - begin,
984 "--pretty format", color);
985 strbuf_addstr(sb, color);
986 return end - placeholder + 1;
988 if (!prefixcmp(placeholder + 1, "red")) {
989 strbuf_addstr(sb, GIT_COLOR_RED);
990 return 4;
991 } else if (!prefixcmp(placeholder + 1, "green")) {
992 strbuf_addstr(sb, GIT_COLOR_GREEN);
993 return 6;
994 } else if (!prefixcmp(placeholder + 1, "blue")) {
995 strbuf_addstr(sb, GIT_COLOR_BLUE);
996 return 5;
997 } else if (!prefixcmp(placeholder + 1, "reset")) {
998 strbuf_addstr(sb, GIT_COLOR_RESET);
999 return 6;
1000 } else
1001 return 0;
1002 case 'n': /* newline */
1003 strbuf_addch(sb, '\n');
1004 return 1;
1005 case 'x':
1006 /* %x00 == NUL, %x0a == LF, etc. */
1007 if (0 <= (h1 = hexval_table[0xff & placeholder[1]]) &&
1008 h1 <= 16 &&
1009 0 <= (h2 = hexval_table[0xff & placeholder[2]]) &&
1010 h2 <= 16) {
1011 strbuf_addch(sb, (h1<<4)|h2);
1012 return 3;
1013 } else
1014 return 0;
1015 case 'w':
1016 if (placeholder[1] == '(') {
1017 unsigned long width = 0, indent1 = 0, indent2 = 0;
1018 char *next;
1019 const char *start = placeholder + 2;
1020 const char *end = strchr(start, ')');
1021 if (!end)
1022 return 0;
1023 if (end > start) {
1024 width = strtoul(start, &next, 10);
1025 if (*next == ',') {
1026 indent1 = strtoul(next + 1, &next, 10);
1027 if (*next == ',') {
1028 indent2 = strtoul(next + 1,
1029 &next, 10);
1032 if (*next != ')')
1033 return 0;
1035 rewrap_message_tail(sb, c, width, indent1, indent2);
1036 return end - placeholder + 1;
1037 } else
1038 return 0;
1041 /* these depend on the commit */
1042 if (!commit->object.parsed)
1043 parse_object(commit->object.sha1);
1045 switch (placeholder[0]) {
1046 case 'H': /* commit hash */
1047 strbuf_addstr(sb, sha1_to_hex(commit->object.sha1));
1048 return 1;
1049 case 'h': /* abbreviated commit hash */
1050 if (add_again(sb, &c->abbrev_commit_hash))
1051 return 1;
1052 strbuf_addstr(sb, find_unique_abbrev(commit->object.sha1,
1053 c->pretty_ctx->abbrev));
1054 c->abbrev_commit_hash.len = sb->len - c->abbrev_commit_hash.off;
1055 return 1;
1056 case 'T': /* tree hash */
1057 strbuf_addstr(sb, sha1_to_hex(commit->tree->object.sha1));
1058 return 1;
1059 case 't': /* abbreviated tree hash */
1060 if (add_again(sb, &c->abbrev_tree_hash))
1061 return 1;
1062 strbuf_addstr(sb, find_unique_abbrev(commit->tree->object.sha1,
1063 c->pretty_ctx->abbrev));
1064 c->abbrev_tree_hash.len = sb->len - c->abbrev_tree_hash.off;
1065 return 1;
1066 case 'P': /* parent hashes */
1067 for (p = commit->parents; p; p = p->next) {
1068 if (p != commit->parents)
1069 strbuf_addch(sb, ' ');
1070 strbuf_addstr(sb, sha1_to_hex(p->item->object.sha1));
1072 return 1;
1073 case 'p': /* abbreviated parent hashes */
1074 if (add_again(sb, &c->abbrev_parent_hashes))
1075 return 1;
1076 for (p = commit->parents; p; p = p->next) {
1077 if (p != commit->parents)
1078 strbuf_addch(sb, ' ');
1079 strbuf_addstr(sb, find_unique_abbrev(
1080 p->item->object.sha1,
1081 c->pretty_ctx->abbrev));
1083 c->abbrev_parent_hashes.len = sb->len -
1084 c->abbrev_parent_hashes.off;
1085 return 1;
1086 case 'm': /* left/right/bottom */
1087 strbuf_addstr(sb, get_revision_mark(NULL, commit));
1088 return 1;
1089 case 'd':
1090 load_ref_decorations(DECORATE_SHORT_REFS);
1091 format_decorations(sb, commit, 0);
1092 return 1;
1093 case 'g': /* reflog info */
1094 switch(placeholder[1]) {
1095 case 'd': /* reflog selector */
1096 case 'D':
1097 if (c->pretty_ctx->reflog_info)
1098 get_reflog_selector(sb,
1099 c->pretty_ctx->reflog_info,
1100 c->pretty_ctx->date_mode,
1101 c->pretty_ctx->date_mode_explicit,
1102 (placeholder[1] == 'd'));
1103 return 2;
1104 case 's': /* reflog message */
1105 if (c->pretty_ctx->reflog_info)
1106 get_reflog_message(sb, c->pretty_ctx->reflog_info);
1107 return 2;
1108 case 'n':
1109 case 'N':
1110 case 'e':
1111 case 'E':
1112 return format_reflog_person(sb,
1113 placeholder[1],
1114 c->pretty_ctx->reflog_info,
1115 c->pretty_ctx->date_mode);
1117 return 0; /* unknown %g placeholder */
1118 case 'N':
1119 if (c->pretty_ctx->notes_message) {
1120 strbuf_addstr(sb, c->pretty_ctx->notes_message);
1121 return 1;
1123 return 0;
1126 if (placeholder[0] == 'G') {
1127 if (!c->signature_check.result)
1128 check_commit_signature(c->commit, &(c->signature_check));
1129 switch (placeholder[1]) {
1130 case 'G':
1131 if (c->signature_check.gpg_output)
1132 strbuf_addstr(sb, c->signature_check.gpg_output);
1133 break;
1134 case '?':
1135 switch (c->signature_check.result) {
1136 case 'G':
1137 case 'B':
1138 case 'U':
1139 case 'N':
1140 strbuf_addch(sb, c->signature_check.result);
1142 break;
1143 case 'S':
1144 if (c->signature_check.signer)
1145 strbuf_addstr(sb, c->signature_check.signer);
1146 break;
1147 case 'K':
1148 if (c->signature_check.key)
1149 strbuf_addstr(sb, c->signature_check.key);
1150 break;
1152 return 2;
1156 /* For the rest we have to parse the commit header. */
1157 if (!c->commit_header_parsed)
1158 parse_commit_header(c);
1160 switch (placeholder[0]) {
1161 case 'a': /* author ... */
1162 return format_person_part(sb, placeholder[1],
1163 msg + c->author.off, c->author.len,
1164 c->pretty_ctx->date_mode);
1165 case 'c': /* committer ... */
1166 return format_person_part(sb, placeholder[1],
1167 msg + c->committer.off, c->committer.len,
1168 c->pretty_ctx->date_mode);
1169 case 'e': /* encoding */
1170 if (c->commit_encoding)
1171 strbuf_addstr(sb, c->commit_encoding);
1172 return 1;
1173 case 'B': /* raw body */
1174 /* message_off is always left at the initial newline */
1175 strbuf_addstr(sb, msg + c->message_off + 1);
1176 return 1;
1179 /* Now we need to parse the commit message. */
1180 if (!c->commit_message_parsed)
1181 parse_commit_message(c);
1183 switch (placeholder[0]) {
1184 case 's': /* subject */
1185 format_subject(sb, msg + c->subject_off, " ");
1186 return 1;
1187 case 'f': /* sanitized subject */
1188 format_sanitized_subject(sb, msg + c->subject_off);
1189 return 1;
1190 case 'b': /* body */
1191 strbuf_addstr(sb, msg + c->body_off);
1192 return 1;
1194 return 0; /* unknown placeholder */
1197 static size_t format_commit_item(struct strbuf *sb, /* in UTF-8 */
1198 const char *placeholder,
1199 void *context)
1201 int consumed;
1202 size_t orig_len;
1203 enum {
1204 NO_MAGIC,
1205 ADD_LF_BEFORE_NON_EMPTY,
1206 DEL_LF_BEFORE_EMPTY,
1207 ADD_SP_BEFORE_NON_EMPTY
1208 } magic = NO_MAGIC;
1210 switch (placeholder[0]) {
1211 case '-':
1212 magic = DEL_LF_BEFORE_EMPTY;
1213 break;
1214 case '+':
1215 magic = ADD_LF_BEFORE_NON_EMPTY;
1216 break;
1217 case ' ':
1218 magic = ADD_SP_BEFORE_NON_EMPTY;
1219 break;
1220 default:
1221 break;
1223 if (magic != NO_MAGIC)
1224 placeholder++;
1226 orig_len = sb->len;
1227 consumed = format_commit_one(sb, placeholder, context);
1228 if (magic == NO_MAGIC)
1229 return consumed;
1231 if ((orig_len == sb->len) && magic == DEL_LF_BEFORE_EMPTY) {
1232 while (sb->len && sb->buf[sb->len - 1] == '\n')
1233 strbuf_setlen(sb, sb->len - 1);
1234 } else if (orig_len != sb->len) {
1235 if (magic == ADD_LF_BEFORE_NON_EMPTY)
1236 strbuf_insert(sb, orig_len, "\n", 1);
1237 else if (magic == ADD_SP_BEFORE_NON_EMPTY)
1238 strbuf_insert(sb, orig_len, " ", 1);
1240 return consumed + 1;
1243 static size_t userformat_want_item(struct strbuf *sb, const char *placeholder,
1244 void *context)
1246 struct userformat_want *w = context;
1248 if (*placeholder == '+' || *placeholder == '-' || *placeholder == ' ')
1249 placeholder++;
1251 switch (*placeholder) {
1252 case 'N':
1253 w->notes = 1;
1254 break;
1256 return 0;
1259 void userformat_find_requirements(const char *fmt, struct userformat_want *w)
1261 struct strbuf dummy = STRBUF_INIT;
1263 if (!fmt) {
1264 if (!user_format)
1265 return;
1266 fmt = user_format;
1268 strbuf_expand(&dummy, fmt, userformat_want_item, w);
1269 strbuf_release(&dummy);
1272 void format_commit_message(const struct commit *commit,
1273 const char *format, struct strbuf *sb,
1274 const struct pretty_print_context *pretty_ctx)
1276 struct format_commit_context context;
1277 const char *output_enc = pretty_ctx->output_encoding;
1278 const char *utf8 = "UTF-8";
1280 memset(&context, 0, sizeof(context));
1281 context.commit = commit;
1282 context.pretty_ctx = pretty_ctx;
1283 context.wrap_start = sb->len;
1284 context.message = logmsg_reencode(commit,
1285 &context.commit_encoding,
1286 output_enc);
1288 strbuf_expand(sb, format, format_commit_item, &context);
1289 rewrap_message_tail(sb, &context, 0, 0, 0);
1291 if (output_enc) {
1292 if (same_encoding(utf8, output_enc))
1293 output_enc = NULL;
1294 } else {
1295 if (context.commit_encoding &&
1296 !same_encoding(context.commit_encoding, utf8))
1297 output_enc = context.commit_encoding;
1300 if (output_enc) {
1301 int outsz;
1302 char *out = reencode_string_len(sb->buf, sb->len,
1303 output_enc, utf8, &outsz);
1304 if (out)
1305 strbuf_attach(sb, out, outsz, outsz + 1);
1308 free(context.commit_encoding);
1309 logmsg_free(context.message, commit);
1310 free(context.signature_check.gpg_output);
1311 free(context.signature_check.signer);
1314 static void pp_header(const struct pretty_print_context *pp,
1315 const char *encoding,
1316 const struct commit *commit,
1317 const char **msg_p,
1318 struct strbuf *sb)
1320 int parents_shown = 0;
1322 for (;;) {
1323 const char *line = *msg_p;
1324 int linelen = get_one_line(*msg_p);
1326 if (!linelen)
1327 return;
1328 *msg_p += linelen;
1330 if (linelen == 1)
1331 /* End of header */
1332 return;
1334 if (pp->fmt == CMIT_FMT_RAW) {
1335 strbuf_add(sb, line, linelen);
1336 continue;
1339 if (!prefixcmp(line, "parent ")) {
1340 if (linelen != 48)
1341 die("bad parent line in commit");
1342 continue;
1345 if (!parents_shown) {
1346 struct commit_list *parent;
1347 int num;
1348 for (parent = commit->parents, num = 0;
1349 parent;
1350 parent = parent->next, num++)
1352 /* with enough slop */
1353 strbuf_grow(sb, num * 50 + 20);
1354 add_merge_info(pp, sb, commit);
1355 parents_shown = 1;
1359 * MEDIUM == DEFAULT shows only author with dates.
1360 * FULL shows both authors but not dates.
1361 * FULLER shows both authors and dates.
1363 if (!prefixcmp(line, "author ")) {
1364 strbuf_grow(sb, linelen + 80);
1365 pp_user_info(pp, "Author", sb, line + 7, encoding);
1367 if (!prefixcmp(line, "committer ") &&
1368 (pp->fmt == CMIT_FMT_FULL || pp->fmt == CMIT_FMT_FULLER)) {
1369 strbuf_grow(sb, linelen + 80);
1370 pp_user_info(pp, "Commit", sb, line + 10, encoding);
1375 void pp_title_line(const struct pretty_print_context *pp,
1376 const char **msg_p,
1377 struct strbuf *sb,
1378 const char *encoding,
1379 int need_8bit_cte)
1381 static const int max_length = 78; /* per rfc2047 */
1382 struct strbuf title;
1384 strbuf_init(&title, 80);
1385 *msg_p = format_subject(&title, *msg_p,
1386 pp->preserve_subject ? "\n" : " ");
1388 strbuf_grow(sb, title.len + 1024);
1389 if (pp->subject) {
1390 strbuf_addstr(sb, pp->subject);
1391 if (needs_rfc2047_encoding(title.buf, title.len, RFC2047_SUBJECT))
1392 add_rfc2047(sb, title.buf, title.len,
1393 encoding, RFC2047_SUBJECT);
1394 else
1395 strbuf_add_wrapped_bytes(sb, title.buf, title.len,
1396 -last_line_length(sb), 1, max_length);
1397 } else {
1398 strbuf_addbuf(sb, &title);
1400 strbuf_addch(sb, '\n');
1402 if (need_8bit_cte > 0) {
1403 const char *header_fmt =
1404 "MIME-Version: 1.0\n"
1405 "Content-Type: text/plain; charset=%s\n"
1406 "Content-Transfer-Encoding: 8bit\n";
1407 strbuf_addf(sb, header_fmt, encoding);
1409 if (pp->after_subject) {
1410 strbuf_addstr(sb, pp->after_subject);
1412 if (pp->fmt == CMIT_FMT_EMAIL) {
1413 strbuf_addch(sb, '\n');
1415 strbuf_release(&title);
1418 void pp_remainder(const struct pretty_print_context *pp,
1419 const char **msg_p,
1420 struct strbuf *sb,
1421 int indent)
1423 int first = 1;
1424 for (;;) {
1425 const char *line = *msg_p;
1426 int linelen = get_one_line(line);
1427 *msg_p += linelen;
1429 if (!linelen)
1430 break;
1432 if (is_empty_line(line, &linelen)) {
1433 if (first)
1434 continue;
1435 if (pp->fmt == CMIT_FMT_SHORT)
1436 break;
1438 first = 0;
1440 strbuf_grow(sb, linelen + indent + 20);
1441 if (indent) {
1442 memset(sb->buf + sb->len, ' ', indent);
1443 strbuf_setlen(sb, sb->len + indent);
1445 strbuf_add(sb, line, linelen);
1446 strbuf_addch(sb, '\n');
1450 void pretty_print_commit(const struct pretty_print_context *pp,
1451 const struct commit *commit,
1452 struct strbuf *sb)
1454 unsigned long beginning_of_body;
1455 int indent = 4;
1456 const char *msg;
1457 char *reencoded;
1458 const char *encoding;
1459 int need_8bit_cte = pp->need_8bit_cte;
1461 if (pp->fmt == CMIT_FMT_USERFORMAT) {
1462 format_commit_message(commit, user_format, sb, pp);
1463 return;
1466 encoding = get_log_output_encoding();
1467 msg = reencoded = logmsg_reencode(commit, NULL, encoding);
1469 if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL)
1470 indent = 0;
1473 * We need to check and emit Content-type: to mark it
1474 * as 8-bit if we haven't done so.
1476 if (pp->fmt == CMIT_FMT_EMAIL && need_8bit_cte == 0) {
1477 int i, ch, in_body;
1479 for (in_body = i = 0; (ch = msg[i]); i++) {
1480 if (!in_body) {
1481 /* author could be non 7-bit ASCII but
1482 * the log may be so; skip over the
1483 * header part first.
1485 if (ch == '\n' && msg[i+1] == '\n')
1486 in_body = 1;
1488 else if (non_ascii(ch)) {
1489 need_8bit_cte = 1;
1490 break;
1495 pp_header(pp, encoding, commit, &msg, sb);
1496 if (pp->fmt != CMIT_FMT_ONELINE && !pp->subject) {
1497 strbuf_addch(sb, '\n');
1500 /* Skip excess blank lines at the beginning of body, if any... */
1501 msg = skip_empty_lines(msg);
1503 /* These formats treat the title line specially. */
1504 if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL)
1505 pp_title_line(pp, &msg, sb, encoding, need_8bit_cte);
1507 beginning_of_body = sb->len;
1508 if (pp->fmt != CMIT_FMT_ONELINE)
1509 pp_remainder(pp, &msg, sb, indent);
1510 strbuf_rtrim(sb);
1512 /* Make sure there is an EOLN for the non-oneline case */
1513 if (pp->fmt != CMIT_FMT_ONELINE)
1514 strbuf_addch(sb, '\n');
1517 * The caller may append additional body text in e-mail
1518 * format. Make sure we did not strip the blank line
1519 * between the header and the body.
1521 if (pp->fmt == CMIT_FMT_EMAIL && sb->len <= beginning_of_body)
1522 strbuf_addch(sb, '\n');
1524 logmsg_free(reencoded, commit);
1527 void pp_commit_easy(enum cmit_fmt fmt, const struct commit *commit,
1528 struct strbuf *sb)
1530 struct pretty_print_context pp = {0};
1531 pp.fmt = fmt;
1532 pretty_print_commit(&pp, commit, sb);