9 static char *user_format
;
11 void get_commit_format(const char *arg
, struct rev_info
*rev
)
14 static struct cmt_fmt_map
{
19 { "raw", 1, CMIT_FMT_RAW
},
20 { "medium", 1, CMIT_FMT_MEDIUM
},
21 { "short", 1, CMIT_FMT_SHORT
},
22 { "email", 1, CMIT_FMT_EMAIL
},
23 { "full", 5, CMIT_FMT_FULL
},
24 { "fuller", 5, CMIT_FMT_FULLER
},
25 { "oneline", 1, CMIT_FMT_ONELINE
},
28 rev
->use_terminator
= 0;
30 rev
->commit_format
= CMIT_FMT_DEFAULT
;
33 if (!prefixcmp(arg
, "format:") || !prefixcmp(arg
, "tformat:")) {
34 const char *cp
= strchr(arg
, ':') + 1;
36 user_format
= xstrdup(cp
);
38 rev
->use_terminator
= 1;
39 rev
->commit_format
= CMIT_FMT_USERFORMAT
;
42 for (i
= 0; i
< ARRAY_SIZE(cmt_fmts
); i
++) {
43 if (!strncmp(arg
, cmt_fmts
[i
].n
, cmt_fmts
[i
].cmp_len
) &&
44 !strncmp(arg
, cmt_fmts
[i
].n
, strlen(arg
))) {
45 if (cmt_fmts
[i
].v
== CMIT_FMT_ONELINE
)
46 rev
->use_terminator
= 1;
47 rev
->commit_format
= cmt_fmts
[i
].v
;
52 die("invalid --pretty format: %s", arg
);
56 * Generic support for pretty-printing the header
58 static int get_one_line(const char *msg
)
73 /* High bit set, or ISO-2022-INT */
77 return ((ch
& 0x80) || (ch
== 0x1b));
80 static int is_rfc2047_special(char ch
)
82 return (non_ascii(ch
) || (ch
== '=') || (ch
== '?') || (ch
== '_'));
85 static void add_rfc2047(struct strbuf
*sb
, const char *line
, int len
,
90 for (i
= 0; i
< len
; i
++) {
94 if ((i
+ 1 < len
) && (ch
== '=' && line
[i
+1] == '?'))
97 strbuf_add(sb
, line
, len
);
101 strbuf_grow(sb
, len
* 3 + strlen(encoding
) + 100);
102 strbuf_addf(sb
, "=?%s?q?", encoding
);
103 for (i
= last
= 0; i
< len
; i
++) {
104 unsigned ch
= line
[i
] & 0xFF;
106 * We encode ' ' using '=20' even though rfc2047
107 * allows using '_' for readability. Unfortunately,
108 * many programs do not understand this and just
109 * leave the underscore in place.
111 if (is_rfc2047_special(ch
) || ch
== ' ') {
112 strbuf_add(sb
, line
+ last
, i
- last
);
113 strbuf_addf(sb
, "=%02X", ch
);
117 strbuf_add(sb
, line
+ last
, len
- last
);
118 strbuf_addstr(sb
, "?=");
121 void pp_user_info(const char *what
, enum cmit_fmt fmt
, struct strbuf
*sb
,
122 const char *line
, enum date_mode dmode
,
123 const char *encoding
)
129 const char *filler
= " ";
131 if (fmt
== CMIT_FMT_ONELINE
)
133 date
= strchr(line
, '>');
136 namelen
= ++date
- line
;
137 time
= strtoul(date
, &date
, 10);
138 tz
= strtol(date
, NULL
, 10);
140 if (fmt
== CMIT_FMT_EMAIL
) {
141 char *name_tail
= strchr(line
, '<');
142 int display_name_length
;
145 while (line
< name_tail
&& isspace(name_tail
[-1]))
147 display_name_length
= name_tail
- line
;
149 strbuf_addstr(sb
, "From: ");
150 add_rfc2047(sb
, line
, display_name_length
, encoding
);
151 strbuf_add(sb
, name_tail
, namelen
- display_name_length
);
152 strbuf_addch(sb
, '\n');
154 strbuf_addf(sb
, "%s: %.*s%.*s\n", what
,
155 (fmt
== CMIT_FMT_FULLER
) ? 4 : 0,
156 filler
, namelen
, line
);
159 case CMIT_FMT_MEDIUM
:
160 strbuf_addf(sb
, "Date: %s\n", show_date(time
, tz
, dmode
));
163 strbuf_addf(sb
, "Date: %s\n", show_date(time
, tz
, DATE_RFC2822
));
165 case CMIT_FMT_FULLER
:
166 strbuf_addf(sb
, "%sDate: %s\n", what
, show_date(time
, tz
, dmode
));
174 static int is_empty_line(const char *line
, int *len_p
)
177 while (len
&& isspace(line
[len
-1]))
183 static void add_merge_info(enum cmit_fmt fmt
, struct strbuf
*sb
,
184 const struct commit
*commit
, int abbrev
)
186 struct commit_list
*parent
= commit
->parents
;
188 if ((fmt
== CMIT_FMT_ONELINE
) || (fmt
== CMIT_FMT_EMAIL
) ||
189 !parent
|| !parent
->next
)
192 strbuf_addstr(sb
, "Merge:");
195 struct commit
*p
= parent
->item
;
196 const char *hex
= NULL
;
199 hex
= find_unique_abbrev(p
->object
.sha1
, abbrev
);
201 hex
= sha1_to_hex(p
->object
.sha1
);
202 dots
= (abbrev
&& strlen(hex
) != 40) ? "..." : "";
203 parent
= parent
->next
;
205 strbuf_addf(sb
, " %s%s", hex
, dots
);
207 strbuf_addch(sb
, '\n');
210 static char *get_header(const struct commit
*commit
, const char *key
)
212 int key_len
= strlen(key
);
213 const char *line
= commit
->buffer
;
216 const char *eol
= strchr(line
, '\n'), *next
;
221 eol
= line
+ strlen(line
);
225 if (eol
- line
> key_len
&&
226 !strncmp(line
, key
, key_len
) &&
227 line
[key_len
] == ' ') {
228 return xmemdupz(line
+ key_len
+ 1, eol
- line
- key_len
- 1);
234 static char *replace_encoding_header(char *buf
, const char *encoding
)
240 /* guess if there is an encoding header before a \n\n */
241 while (strncmp(cp
, "encoding ", strlen("encoding "))) {
242 cp
= strchr(cp
, '\n');
243 if (!cp
|| *++cp
== '\n')
247 cp
= strchr(cp
, '\n');
249 return buf
; /* should not happen but be defensive */
250 len
= cp
+ 1 - (buf
+ start
);
252 strbuf_init(&tmp
, 0);
253 strbuf_attach(&tmp
, buf
, strlen(buf
), strlen(buf
) + 1);
254 if (is_encoding_utf8(encoding
)) {
255 /* we have re-coded to UTF-8; drop the header */
256 strbuf_remove(&tmp
, start
, len
);
258 /* just replaces XXXX in 'encoding XXXX\n' */
259 strbuf_splice(&tmp
, start
+ strlen("encoding "),
260 len
- strlen("encoding \n"),
261 encoding
, strlen(encoding
));
263 return strbuf_detach(&tmp
, NULL
);
266 static char *logmsg_reencode(const struct commit
*commit
,
267 const char *output_encoding
)
269 static const char *utf8
= "utf-8";
270 const char *use_encoding
;
274 if (!*output_encoding
)
276 encoding
= get_header(commit
, "encoding");
277 use_encoding
= encoding
? encoding
: utf8
;
278 if (!strcmp(use_encoding
, output_encoding
))
279 if (encoding
) /* we'll strip encoding header later */
280 out
= xstrdup(commit
->buffer
);
282 return NULL
; /* nothing to do */
284 out
= reencode_string(commit
->buffer
,
285 output_encoding
, use_encoding
);
287 out
= replace_encoding_header(out
, output_encoding
);
293 static int mailmap_name(struct strbuf
*sb
, const char *email
)
295 static struct path_list
*mail_map
;
299 mail_map
= xcalloc(1, sizeof(*mail_map
));
300 read_mailmap(mail_map
, ".mailmap", NULL
);
306 if (!map_email(mail_map
, email
, buffer
, sizeof(buffer
)))
308 strbuf_addstr(sb
, buffer
);
312 static size_t format_person_part(struct strbuf
*sb
, char part
,
313 const char *msg
, int len
)
315 /* currently all placeholders have same length */
316 const int placeholder_len
= 2;
317 int start
, end
, tz
= 0;
318 unsigned long date
= 0;
321 /* advance 'end' to point to email start delimiter */
322 for (end
= 0; end
< len
&& msg
[end
] != '<'; end
++)
326 * When end points at the '<' that we found, it should have
327 * matching '>' later, which means 'end' must be strictly
333 if (part
== 'n' || part
== 'N') { /* name */
334 while (end
> 0 && isspace(msg
[end
- 1]))
336 if (part
!= 'N' || !msg
[end
] || !msg
[end
+ 1] ||
337 mailmap_name(sb
, msg
+ end
+ 2) < 0)
338 strbuf_add(sb
, msg
, end
);
339 return placeholder_len
;
341 start
= ++end
; /* save email start position */
343 /* advance 'end' to point to email end delimiter */
344 for ( ; end
< len
&& msg
[end
] != '>'; end
++)
350 if (part
== 'e') { /* email */
351 strbuf_add(sb
, msg
+ start
, end
- start
);
352 return placeholder_len
;
355 /* advance 'start' to point to date start delimiter */
356 for (start
= end
+ 1; start
< len
&& isspace(msg
[start
]); start
++)
360 date
= strtoul(msg
+ start
, &ep
, 10);
361 if (msg
+ start
== ep
)
364 if (part
== 't') { /* date, UNIX timestamp */
365 strbuf_add(sb
, msg
+ start
, ep
- (msg
+ start
));
366 return placeholder_len
;
370 for (start
= ep
- msg
+ 1; start
< len
&& isspace(msg
[start
]); start
++)
372 if (start
+ 1 < len
) {
373 tz
= strtoul(msg
+ start
+ 1, NULL
, 10);
374 if (msg
[start
] == '-')
380 strbuf_addstr(sb
, show_date(date
, tz
, DATE_NORMAL
));
381 return placeholder_len
;
382 case 'D': /* date, RFC2822 style */
383 strbuf_addstr(sb
, show_date(date
, tz
, DATE_RFC2822
));
384 return placeholder_len
;
385 case 'r': /* date, relative */
386 strbuf_addstr(sb
, show_date(date
, tz
, DATE_RELATIVE
));
387 return placeholder_len
;
388 case 'i': /* date, ISO 8601 */
389 strbuf_addstr(sb
, show_date(date
, tz
, DATE_ISO8601
));
390 return placeholder_len
;
395 * bogus commit, 'sb' cannot be updated, but we still need to
396 * compute a valid return value.
398 if (part
== 'n' || part
== 'e' || part
== 't' || part
== 'd'
399 || part
== 'D' || part
== 'r' || part
== 'i')
400 return placeholder_len
;
402 return 0; /* unknown placeholder */
410 struct format_commit_context
{
411 const struct commit
*commit
;
413 /* These offsets are relative to the start of the commit message. */
414 int commit_header_parsed
;
415 struct chunk subject
;
417 struct chunk committer
;
418 struct chunk encoding
;
421 /* The following ones are relative to the result struct strbuf. */
422 struct chunk abbrev_commit_hash
;
423 struct chunk abbrev_tree_hash
;
424 struct chunk abbrev_parent_hashes
;
427 static int add_again(struct strbuf
*sb
, struct chunk
*chunk
)
430 strbuf_adddup(sb
, chunk
->off
, chunk
->len
);
435 * We haven't seen this chunk before. Our caller is surely
436 * going to add it the hard way now. Remember the most likely
437 * start of the to-be-added chunk: the current end of the
440 chunk
->off
= sb
->len
;
444 static void parse_commit_header(struct format_commit_context
*context
)
446 const char *msg
= context
->commit
->buffer
;
448 enum { HEADER
, SUBJECT
, BODY
} state
;
450 for (i
= 0, state
= HEADER
; msg
[i
] && state
< BODY
; i
++) {
452 for (eol
= i
; msg
[eol
] && msg
[eol
] != '\n'; eol
++)
455 if (state
== SUBJECT
) {
456 context
->subject
.off
= i
;
457 context
->subject
.len
= eol
- i
;
462 /* strip empty lines */
463 while (msg
[eol
] == '\n' && msg
[eol
+ 1] == '\n')
465 } else if (!prefixcmp(msg
+ i
, "author ")) {
466 context
->author
.off
= i
+ 7;
467 context
->author
.len
= eol
- i
- 7;
468 } else if (!prefixcmp(msg
+ i
, "committer ")) {
469 context
->committer
.off
= i
+ 10;
470 context
->committer
.len
= eol
- i
- 10;
471 } else if (!prefixcmp(msg
+ i
, "encoding ")) {
472 context
->encoding
.off
= i
+ 9;
473 context
->encoding
.len
= eol
- i
- 9;
479 context
->body_off
= i
;
480 context
->commit_header_parsed
= 1;
483 static size_t format_commit_item(struct strbuf
*sb
, const char *placeholder
,
486 struct format_commit_context
*c
= context
;
487 const struct commit
*commit
= c
->commit
;
488 const char *msg
= commit
->buffer
;
489 struct commit_list
*p
;
492 /* these are independent of the commit */
493 switch (placeholder
[0]) {
495 if (!prefixcmp(placeholder
+ 1, "red")) {
496 strbuf_addstr(sb
, "\033[31m");
498 } else if (!prefixcmp(placeholder
+ 1, "green")) {
499 strbuf_addstr(sb
, "\033[32m");
501 } else if (!prefixcmp(placeholder
+ 1, "blue")) {
502 strbuf_addstr(sb
, "\033[34m");
504 } else if (!prefixcmp(placeholder
+ 1, "reset")) {
505 strbuf_addstr(sb
, "\033[m");
509 case 'n': /* newline */
510 strbuf_addch(sb
, '\n');
513 /* %x00 == NUL, %x0a == LF, etc. */
514 if (0 <= (h1
= hexval_table
[0xff & placeholder
[1]]) &&
516 0 <= (h2
= hexval_table
[0xff & placeholder
[2]]) &&
518 strbuf_addch(sb
, (h1
<<4)|h2
);
524 /* these depend on the commit */
525 if (!commit
->object
.parsed
)
526 parse_object(commit
->object
.sha1
);
528 switch (placeholder
[0]) {
529 case 'H': /* commit hash */
530 strbuf_addstr(sb
, sha1_to_hex(commit
->object
.sha1
));
532 case 'h': /* abbreviated commit hash */
533 if (add_again(sb
, &c
->abbrev_commit_hash
))
535 strbuf_addstr(sb
, find_unique_abbrev(commit
->object
.sha1
,
537 c
->abbrev_commit_hash
.len
= sb
->len
- c
->abbrev_commit_hash
.off
;
539 case 'T': /* tree hash */
540 strbuf_addstr(sb
, sha1_to_hex(commit
->tree
->object
.sha1
));
542 case 't': /* abbreviated tree hash */
543 if (add_again(sb
, &c
->abbrev_tree_hash
))
545 strbuf_addstr(sb
, find_unique_abbrev(commit
->tree
->object
.sha1
,
547 c
->abbrev_tree_hash
.len
= sb
->len
- c
->abbrev_tree_hash
.off
;
549 case 'P': /* parent hashes */
550 for (p
= commit
->parents
; p
; p
= p
->next
) {
551 if (p
!= commit
->parents
)
552 strbuf_addch(sb
, ' ');
553 strbuf_addstr(sb
, sha1_to_hex(p
->item
->object
.sha1
));
556 case 'p': /* abbreviated parent hashes */
557 if (add_again(sb
, &c
->abbrev_parent_hashes
))
559 for (p
= commit
->parents
; p
; p
= p
->next
) {
560 if (p
!= commit
->parents
)
561 strbuf_addch(sb
, ' ');
562 strbuf_addstr(sb
, find_unique_abbrev(
563 p
->item
->object
.sha1
, DEFAULT_ABBREV
));
565 c
->abbrev_parent_hashes
.len
= sb
->len
-
566 c
->abbrev_parent_hashes
.off
;
568 case 'm': /* left/right/bottom */
569 strbuf_addch(sb
, (commit
->object
.flags
& BOUNDARY
)
571 : (commit
->object
.flags
& SYMMETRIC_LEFT
)
577 /* For the rest we have to parse the commit header. */
578 if (!c
->commit_header_parsed
)
579 parse_commit_header(c
);
581 switch (placeholder
[0]) {
582 case 's': /* subject */
583 strbuf_add(sb
, msg
+ c
->subject
.off
, c
->subject
.len
);
585 case 'a': /* author ... */
586 return format_person_part(sb
, placeholder
[1],
587 msg
+ c
->author
.off
, c
->author
.len
);
588 case 'c': /* committer ... */
589 return format_person_part(sb
, placeholder
[1],
590 msg
+ c
->committer
.off
, c
->committer
.len
);
591 case 'e': /* encoding */
592 strbuf_add(sb
, msg
+ c
->encoding
.off
, c
->encoding
.len
);
595 strbuf_addstr(sb
, msg
+ c
->body_off
);
598 return 0; /* unknown placeholder */
601 void format_commit_message(const struct commit
*commit
,
602 const void *format
, struct strbuf
*sb
)
604 struct format_commit_context context
;
606 memset(&context
, 0, sizeof(context
));
607 context
.commit
= commit
;
608 strbuf_expand(sb
, format
, format_commit_item
, &context
);
611 static void pp_header(enum cmit_fmt fmt
,
613 enum date_mode dmode
,
614 const char *encoding
,
615 const struct commit
*commit
,
619 int parents_shown
= 0;
622 const char *line
= *msg_p
;
623 int linelen
= get_one_line(*msg_p
);
633 if (fmt
== CMIT_FMT_RAW
) {
634 strbuf_add(sb
, line
, linelen
);
638 if (!memcmp(line
, "parent ", 7)) {
640 die("bad parent line in commit");
644 if (!parents_shown
) {
645 struct commit_list
*parent
;
647 for (parent
= commit
->parents
, num
= 0;
649 parent
= parent
->next
, num
++)
651 /* with enough slop */
652 strbuf_grow(sb
, num
* 50 + 20);
653 add_merge_info(fmt
, sb
, commit
, abbrev
);
658 * MEDIUM == DEFAULT shows only author with dates.
659 * FULL shows both authors but not dates.
660 * FULLER shows both authors and dates.
662 if (!memcmp(line
, "author ", 7)) {
663 strbuf_grow(sb
, linelen
+ 80);
664 pp_user_info("Author", fmt
, sb
, line
+ 7, dmode
, encoding
);
666 if (!memcmp(line
, "committer ", 10) &&
667 (fmt
== CMIT_FMT_FULL
|| fmt
== CMIT_FMT_FULLER
)) {
668 strbuf_grow(sb
, linelen
+ 80);
669 pp_user_info("Commit", fmt
, sb
, line
+ 10, dmode
, encoding
);
674 void pp_title_line(enum cmit_fmt fmt
,
678 const char *after_subject
,
679 const char *encoding
,
684 strbuf_init(&title
, 80);
687 const char *line
= *msg_p
;
688 int linelen
= get_one_line(line
);
691 if (!linelen
|| is_empty_line(line
, &linelen
))
694 strbuf_grow(&title
, linelen
+ 2);
696 if (fmt
== CMIT_FMT_EMAIL
) {
697 strbuf_addch(&title
, '\n');
699 strbuf_addch(&title
, ' ');
701 strbuf_add(&title
, line
, linelen
);
704 strbuf_grow(sb
, title
.len
+ 1024);
706 strbuf_addstr(sb
, subject
);
707 add_rfc2047(sb
, title
.buf
, title
.len
, encoding
);
709 strbuf_addbuf(sb
, &title
);
711 strbuf_addch(sb
, '\n');
713 if (need_8bit_cte
> 0) {
714 const char *header_fmt
=
715 "MIME-Version: 1.0\n"
716 "Content-Type: text/plain; charset=%s\n"
717 "Content-Transfer-Encoding: 8bit\n";
718 strbuf_addf(sb
, header_fmt
, encoding
);
721 strbuf_addstr(sb
, after_subject
);
723 if (fmt
== CMIT_FMT_EMAIL
) {
724 strbuf_addch(sb
, '\n');
726 strbuf_release(&title
);
729 void pp_remainder(enum cmit_fmt fmt
,
736 const char *line
= *msg_p
;
737 int linelen
= get_one_line(line
);
743 if (is_empty_line(line
, &linelen
)) {
746 if (fmt
== CMIT_FMT_SHORT
)
751 strbuf_grow(sb
, linelen
+ indent
+ 20);
753 memset(sb
->buf
+ sb
->len
, ' ', indent
);
754 strbuf_setlen(sb
, sb
->len
+ indent
);
756 strbuf_add(sb
, line
, linelen
);
757 strbuf_addch(sb
, '\n');
761 void pretty_print_commit(enum cmit_fmt fmt
, const struct commit
*commit
,
762 struct strbuf
*sb
, int abbrev
,
763 const char *subject
, const char *after_subject
,
764 enum date_mode dmode
, int need_8bit_cte
)
766 unsigned long beginning_of_body
;
768 const char *msg
= commit
->buffer
;
770 const char *encoding
;
772 if (fmt
== CMIT_FMT_USERFORMAT
) {
773 format_commit_message(commit
, user_format
, sb
);
777 encoding
= (git_log_output_encoding
778 ? git_log_output_encoding
779 : git_commit_encoding
);
782 reencoded
= logmsg_reencode(commit
, encoding
);
787 if (fmt
== CMIT_FMT_ONELINE
|| fmt
== CMIT_FMT_EMAIL
)
791 * We need to check and emit Content-type: to mark it
792 * as 8-bit if we haven't done so.
794 if (fmt
== CMIT_FMT_EMAIL
&& need_8bit_cte
== 0) {
797 for (in_body
= i
= 0; (ch
= msg
[i
]); i
++) {
799 /* author could be non 7-bit ASCII but
800 * the log may be so; skip over the
803 if (ch
== '\n' && msg
[i
+1] == '\n')
806 else if (non_ascii(ch
)) {
813 pp_header(fmt
, abbrev
, dmode
, encoding
, commit
, &msg
, sb
);
814 if (fmt
!= CMIT_FMT_ONELINE
&& !subject
) {
815 strbuf_addch(sb
, '\n');
818 /* Skip excess blank lines at the beginning of body, if any... */
820 int linelen
= get_one_line(msg
);
824 if (!is_empty_line(msg
, &ll
))
829 /* These formats treat the title line specially. */
830 if (fmt
== CMIT_FMT_ONELINE
|| fmt
== CMIT_FMT_EMAIL
)
831 pp_title_line(fmt
, &msg
, sb
, subject
,
832 after_subject
, encoding
, need_8bit_cte
);
834 beginning_of_body
= sb
->len
;
835 if (fmt
!= CMIT_FMT_ONELINE
)
836 pp_remainder(fmt
, &msg
, sb
, indent
);
839 /* Make sure there is an EOLN for the non-oneline case */
840 if (fmt
!= CMIT_FMT_ONELINE
)
841 strbuf_addch(sb
, '\n');
844 * The caller may append additional body text in e-mail
845 * format. Make sure we did not strip the blank line
846 * between the header and the body.
848 if (fmt
== CMIT_FMT_EMAIL
&& sb
->len
<= beginning_of_body
)
849 strbuf_addch(sb
, '\n');