7 static struct cmt_fmt_map
{
12 { "raw", 1, CMIT_FMT_RAW
},
13 { "medium", 1, CMIT_FMT_MEDIUM
},
14 { "short", 1, CMIT_FMT_SHORT
},
15 { "email", 1, CMIT_FMT_EMAIL
},
16 { "full", 5, CMIT_FMT_FULL
},
17 { "fuller", 5, CMIT_FMT_FULLER
},
18 { "oneline", 1, CMIT_FMT_ONELINE
},
19 { "format:", 7, CMIT_FMT_USERFORMAT
},
22 static char *user_format
;
24 enum cmit_fmt
get_commit_format(const char *arg
)
29 return CMIT_FMT_DEFAULT
;
32 if (!prefixcmp(arg
, "format:")) {
35 user_format
= xstrdup(arg
+ 7);
36 return CMIT_FMT_USERFORMAT
;
38 for (i
= 0; i
< ARRAY_SIZE(cmt_fmts
); i
++) {
39 if (!strncmp(arg
, cmt_fmts
[i
].n
, cmt_fmts
[i
].cmp_len
) &&
40 !strncmp(arg
, cmt_fmts
[i
].n
, strlen(arg
)))
44 die("invalid --pretty format: %s", arg
);
48 * Generic support for pretty-printing the header
50 static int get_one_line(const char *msg
)
65 /* High bit set, or ISO-2022-INT */
69 return ((ch
& 0x80) || (ch
== 0x1b));
72 static int is_rfc2047_special(char ch
)
74 return (non_ascii(ch
) || (ch
== '=') || (ch
== '?') || (ch
== '_'));
77 static void add_rfc2047(struct strbuf
*sb
, const char *line
, int len
,
82 for (i
= 0; i
< len
; i
++) {
86 if ((i
+ 1 < len
) && (ch
== '=' && line
[i
+1] == '?'))
89 strbuf_add(sb
, line
, len
);
93 strbuf_grow(sb
, len
* 3 + strlen(encoding
) + 100);
94 strbuf_addf(sb
, "=?%s?q?", encoding
);
95 for (i
= last
= 0; i
< len
; i
++) {
96 unsigned ch
= line
[i
] & 0xFF;
98 * We encode ' ' using '=20' even though rfc2047
99 * allows using '_' for readability. Unfortunately,
100 * many programs do not understand this and just
101 * leave the underscore in place.
103 if (is_rfc2047_special(ch
) || ch
== ' ') {
104 strbuf_add(sb
, line
+ last
, i
- last
);
105 strbuf_addf(sb
, "=%02X", ch
);
109 strbuf_add(sb
, line
+ last
, len
- last
);
110 strbuf_addstr(sb
, "?=");
113 void pp_user_info(const char *what
, enum cmit_fmt fmt
, struct strbuf
*sb
,
114 const char *line
, enum date_mode dmode
,
115 const char *encoding
)
121 const char *filler
= " ";
123 if (fmt
== CMIT_FMT_ONELINE
)
125 date
= strchr(line
, '>');
128 namelen
= ++date
- line
;
129 time
= strtoul(date
, &date
, 10);
130 tz
= strtol(date
, NULL
, 10);
132 if (fmt
== CMIT_FMT_EMAIL
) {
133 char *name_tail
= strchr(line
, '<');
134 int display_name_length
;
137 while (line
< name_tail
&& isspace(name_tail
[-1]))
139 display_name_length
= name_tail
- line
;
141 strbuf_addstr(sb
, "From: ");
142 add_rfc2047(sb
, line
, display_name_length
, encoding
);
143 strbuf_add(sb
, name_tail
, namelen
- display_name_length
);
144 strbuf_addch(sb
, '\n');
146 strbuf_addf(sb
, "%s: %.*s%.*s\n", what
,
147 (fmt
== CMIT_FMT_FULLER
) ? 4 : 0,
148 filler
, namelen
, line
);
151 case CMIT_FMT_MEDIUM
:
152 strbuf_addf(sb
, "Date: %s\n", show_date(time
, tz
, dmode
));
155 strbuf_addf(sb
, "Date: %s\n", show_date(time
, tz
, DATE_RFC2822
));
157 case CMIT_FMT_FULLER
:
158 strbuf_addf(sb
, "%sDate: %s\n", what
, show_date(time
, tz
, dmode
));
166 static int is_empty_line(const char *line
, int *len_p
)
169 while (len
&& isspace(line
[len
-1]))
175 static void add_merge_info(enum cmit_fmt fmt
, struct strbuf
*sb
,
176 const struct commit
*commit
, int abbrev
)
178 struct commit_list
*parent
= commit
->parents
;
180 if ((fmt
== CMIT_FMT_ONELINE
) || (fmt
== CMIT_FMT_EMAIL
) ||
181 !parent
|| !parent
->next
)
184 strbuf_addstr(sb
, "Merge:");
187 struct commit
*p
= parent
->item
;
188 const char *hex
= NULL
;
191 hex
= find_unique_abbrev(p
->object
.sha1
, abbrev
);
193 hex
= sha1_to_hex(p
->object
.sha1
);
194 dots
= (abbrev
&& strlen(hex
) != 40) ? "..." : "";
195 parent
= parent
->next
;
197 strbuf_addf(sb
, " %s%s", hex
, dots
);
199 strbuf_addch(sb
, '\n');
202 static char *get_header(const struct commit
*commit
, const char *key
)
204 int key_len
= strlen(key
);
205 const char *line
= commit
->buffer
;
208 const char *eol
= strchr(line
, '\n'), *next
;
213 eol
= line
+ strlen(line
);
217 if (eol
- line
> key_len
&&
218 !strncmp(line
, key
, key_len
) &&
219 line
[key_len
] == ' ') {
220 return xmemdupz(line
+ key_len
+ 1, eol
- line
- key_len
- 1);
226 static char *replace_encoding_header(char *buf
, const char *encoding
)
232 /* guess if there is an encoding header before a \n\n */
233 while (strncmp(cp
, "encoding ", strlen("encoding "))) {
234 cp
= strchr(cp
, '\n');
235 if (!cp
|| *++cp
== '\n')
239 cp
= strchr(cp
, '\n');
241 return buf
; /* should not happen but be defensive */
242 len
= cp
+ 1 - (buf
+ start
);
244 strbuf_init(&tmp
, 0);
245 strbuf_attach(&tmp
, buf
, strlen(buf
), strlen(buf
) + 1);
246 if (is_encoding_utf8(encoding
)) {
247 /* we have re-coded to UTF-8; drop the header */
248 strbuf_remove(&tmp
, start
, len
);
250 /* just replaces XXXX in 'encoding XXXX\n' */
251 strbuf_splice(&tmp
, start
+ strlen("encoding "),
252 len
- strlen("encoding \n"),
253 encoding
, strlen(encoding
));
255 return strbuf_detach(&tmp
, NULL
);
258 static char *logmsg_reencode(const struct commit
*commit
,
259 const char *output_encoding
)
261 static const char *utf8
= "utf-8";
262 const char *use_encoding
;
266 if (!*output_encoding
)
268 encoding
= get_header(commit
, "encoding");
269 use_encoding
= encoding
? encoding
: utf8
;
270 if (!strcmp(use_encoding
, output_encoding
))
271 if (encoding
) /* we'll strip encoding header later */
272 out
= xstrdup(commit
->buffer
);
274 return NULL
; /* nothing to do */
276 out
= reencode_string(commit
->buffer
,
277 output_encoding
, use_encoding
);
279 out
= replace_encoding_header(out
, output_encoding
);
285 static void format_person_part(struct strbuf
*sb
, char part
,
286 const char *msg
, int len
)
288 int start
, end
, tz
= 0;
293 for (end
= 0; end
< len
&& msg
[end
] != '<'; end
++)
296 * If it does not even have a '<' and '>', that is
297 * quite a bogus commit author and we discard it;
298 * this is in line with pp_user_info() that is used
299 * in the normal codepath. When end points at the '<'
300 * that we found, it should have matching '>' later,
301 * which means start (beginning of email address) must
302 * be strictly below len.
305 if (start
>= len
- 1)
307 while (end
> 0 && isspace(msg
[end
- 1]))
309 if (part
== 'n') { /* name */
310 strbuf_add(sb
, msg
, end
);
315 for (end
= start
; end
< len
&& msg
[end
] != '>'; end
++)
321 if (part
== 'e') { /* email */
322 strbuf_add(sb
, msg
+ start
, end
- start
);
327 for (start
= end
+ 1; start
< len
&& isspace(msg
[start
]); start
++)
331 date
= strtoul(msg
+ start
, &ep
, 10);
332 if (msg
+ start
== ep
)
335 if (part
== 't') { /* date, UNIX timestamp */
336 strbuf_add(sb
, msg
+ start
, ep
- (msg
+ start
));
341 for (start
= ep
- msg
+ 1; start
< len
&& isspace(msg
[start
]); start
++)
343 if (start
+ 1 < len
) {
344 tz
= strtoul(msg
+ start
+ 1, NULL
, 10);
345 if (msg
[start
] == '-')
351 strbuf_addstr(sb
, show_date(date
, tz
, DATE_NORMAL
));
353 case 'D': /* date, RFC2822 style */
354 strbuf_addstr(sb
, show_date(date
, tz
, DATE_RFC2822
));
356 case 'r': /* date, relative */
357 strbuf_addstr(sb
, show_date(date
, tz
, DATE_RELATIVE
));
359 case 'i': /* date, ISO 8601 */
360 strbuf_addstr(sb
, show_date(date
, tz
, DATE_ISO8601
));
370 struct format_commit_context
{
371 const struct commit
*commit
;
373 /* These offsets are relative to the start of the commit message. */
374 int commit_header_parsed
;
375 struct chunk subject
;
377 struct chunk committer
;
378 struct chunk encoding
;
381 /* The following ones are relative to the result struct strbuf. */
382 struct chunk abbrev_commit_hash
;
383 struct chunk abbrev_tree_hash
;
384 struct chunk abbrev_parent_hashes
;
387 static int add_again(struct strbuf
*sb
, struct chunk
*chunk
)
390 strbuf_adddup(sb
, chunk
->off
, chunk
->len
);
395 * We haven't seen this chunk before. Our caller is surely
396 * going to add it the hard way now. Remember the most likely
397 * start of the to-be-added chunk: the current end of the
400 chunk
->off
= sb
->len
;
404 static void parse_commit_header(struct format_commit_context
*context
)
406 const char *msg
= context
->commit
->buffer
;
408 enum { HEADER
, SUBJECT
, BODY
} state
;
410 for (i
= 0, state
= HEADER
; msg
[i
] && state
< BODY
; i
++) {
412 for (eol
= i
; msg
[eol
] && msg
[eol
] != '\n'; eol
++)
415 if (state
== SUBJECT
) {
416 context
->subject
.off
= i
;
417 context
->subject
.len
= eol
- i
;
422 /* strip empty lines */
423 while (msg
[eol
] == '\n' && msg
[eol
+ 1] == '\n')
425 } else if (!prefixcmp(msg
+ i
, "author ")) {
426 context
->author
.off
= i
+ 7;
427 context
->author
.len
= eol
- i
- 7;
428 } else if (!prefixcmp(msg
+ i
, "committer ")) {
429 context
->committer
.off
= i
+ 10;
430 context
->committer
.len
= eol
- i
- 10;
431 } else if (!prefixcmp(msg
+ i
, "encoding ")) {
432 context
->encoding
.off
= i
+ 9;
433 context
->encoding
.len
= eol
- i
- 9;
439 context
->body_off
= i
;
440 context
->commit_header_parsed
= 1;
443 static void format_commit_item(struct strbuf
*sb
, const char *placeholder
,
446 struct format_commit_context
*c
= context
;
447 const struct commit
*commit
= c
->commit
;
448 const char *msg
= commit
->buffer
;
449 struct commit_list
*p
;
451 /* these are independent of the commit */
452 switch (placeholder
[0]) {
454 switch (placeholder
[3]) {
456 strbuf_addstr(sb
, "\033[31m");
458 case 'e': /* green */
459 strbuf_addstr(sb
, "\033[32m");
462 strbuf_addstr(sb
, "\033[34m");
464 case 's': /* reset color */
465 strbuf_addstr(sb
, "\033[m");
468 case 'n': /* newline */
469 strbuf_addch(sb
, '\n');
473 /* these depend on the commit */
474 if (!commit
->object
.parsed
)
475 parse_object(commit
->object
.sha1
);
477 switch (placeholder
[0]) {
478 case 'H': /* commit hash */
479 strbuf_addstr(sb
, sha1_to_hex(commit
->object
.sha1
));
481 case 'h': /* abbreviated commit hash */
482 if (add_again(sb
, &c
->abbrev_commit_hash
))
484 strbuf_addstr(sb
, find_unique_abbrev(commit
->object
.sha1
,
486 c
->abbrev_commit_hash
.len
= sb
->len
- c
->abbrev_commit_hash
.off
;
488 case 'T': /* tree hash */
489 strbuf_addstr(sb
, sha1_to_hex(commit
->tree
->object
.sha1
));
491 case 't': /* abbreviated tree hash */
492 if (add_again(sb
, &c
->abbrev_tree_hash
))
494 strbuf_addstr(sb
, find_unique_abbrev(commit
->tree
->object
.sha1
,
496 c
->abbrev_tree_hash
.len
= sb
->len
- c
->abbrev_tree_hash
.off
;
498 case 'P': /* parent hashes */
499 for (p
= commit
->parents
; p
; p
= p
->next
) {
500 if (p
!= commit
->parents
)
501 strbuf_addch(sb
, ' ');
502 strbuf_addstr(sb
, sha1_to_hex(p
->item
->object
.sha1
));
505 case 'p': /* abbreviated parent hashes */
506 if (add_again(sb
, &c
->abbrev_parent_hashes
))
508 for (p
= commit
->parents
; p
; p
= p
->next
) {
509 if (p
!= commit
->parents
)
510 strbuf_addch(sb
, ' ');
511 strbuf_addstr(sb
, find_unique_abbrev(
512 p
->item
->object
.sha1
, DEFAULT_ABBREV
));
514 c
->abbrev_parent_hashes
.len
= sb
->len
-
515 c
->abbrev_parent_hashes
.off
;
517 case 'm': /* left/right/bottom */
518 strbuf_addch(sb
, (commit
->object
.flags
& BOUNDARY
)
520 : (commit
->object
.flags
& SYMMETRIC_LEFT
)
526 /* For the rest we have to parse the commit header. */
527 if (!c
->commit_header_parsed
)
528 parse_commit_header(c
);
530 switch (placeholder
[0]) {
532 strbuf_add(sb
, msg
+ c
->subject
.off
, c
->subject
.len
);
535 format_person_part(sb
, placeholder
[1],
536 msg
+ c
->author
.off
, c
->author
.len
);
539 format_person_part(sb
, placeholder
[1],
540 msg
+ c
->committer
.off
, c
->committer
.len
);
543 strbuf_add(sb
, msg
+ c
->encoding
.off
, c
->encoding
.len
);
546 strbuf_addstr(sb
, msg
+ c
->body_off
);
551 void format_commit_message(const struct commit
*commit
,
552 const void *format
, struct strbuf
*sb
)
554 const char *placeholders
[] = {
555 "H", /* commit hash */
556 "h", /* abbreviated commit hash */
558 "t", /* abbreviated tree hash */
559 "P", /* parent hashes */
560 "p", /* abbreviated parent hashes */
561 "an", /* author name */
562 "ae", /* author email */
563 "ad", /* author date */
564 "aD", /* author date, RFC2822 style */
565 "ar", /* author date, relative */
566 "at", /* author date, UNIX timestamp */
567 "ai", /* author date, ISO 8601 */
568 "cn", /* committer name */
569 "ce", /* committer email */
570 "cd", /* committer date */
571 "cD", /* committer date, RFC2822 style */
572 "cr", /* committer date, relative */
573 "ct", /* committer date, UNIX timestamp */
574 "ci", /* committer date, ISO 8601 */
579 "Cgreen", /* green */
581 "Creset", /* reset color */
583 "m", /* left/right/bottom */
586 struct format_commit_context context
;
588 memset(&context
, 0, sizeof(context
));
589 context
.commit
= commit
;
590 strbuf_expand(sb
, format
, placeholders
, format_commit_item
, &context
);
593 static void pp_header(enum cmit_fmt fmt
,
595 enum date_mode dmode
,
596 const char *encoding
,
597 const struct commit
*commit
,
601 int parents_shown
= 0;
604 const char *line
= *msg_p
;
605 int linelen
= get_one_line(*msg_p
);
615 if (fmt
== CMIT_FMT_RAW
) {
616 strbuf_add(sb
, line
, linelen
);
620 if (!memcmp(line
, "parent ", 7)) {
622 die("bad parent line in commit");
626 if (!parents_shown
) {
627 struct commit_list
*parent
;
629 for (parent
= commit
->parents
, num
= 0;
631 parent
= parent
->next
, num
++)
633 /* with enough slop */
634 strbuf_grow(sb
, num
* 50 + 20);
635 add_merge_info(fmt
, sb
, commit
, abbrev
);
640 * MEDIUM == DEFAULT shows only author with dates.
641 * FULL shows both authors but not dates.
642 * FULLER shows both authors and dates.
644 if (!memcmp(line
, "author ", 7)) {
645 strbuf_grow(sb
, linelen
+ 80);
646 pp_user_info("Author", fmt
, sb
, line
+ 7, dmode
, encoding
);
648 if (!memcmp(line
, "committer ", 10) &&
649 (fmt
== CMIT_FMT_FULL
|| fmt
== CMIT_FMT_FULLER
)) {
650 strbuf_grow(sb
, linelen
+ 80);
651 pp_user_info("Commit", fmt
, sb
, line
+ 10, dmode
, encoding
);
656 void pp_title_line(enum cmit_fmt fmt
,
660 const char *after_subject
,
661 const char *encoding
,
666 strbuf_init(&title
, 80);
669 const char *line
= *msg_p
;
670 int linelen
= get_one_line(line
);
673 if (!linelen
|| is_empty_line(line
, &linelen
))
676 strbuf_grow(&title
, linelen
+ 2);
678 if (fmt
== CMIT_FMT_EMAIL
) {
679 strbuf_addch(&title
, '\n');
681 strbuf_addch(&title
, ' ');
683 strbuf_add(&title
, line
, linelen
);
686 strbuf_grow(sb
, title
.len
+ 1024);
688 strbuf_addstr(sb
, subject
);
689 add_rfc2047(sb
, title
.buf
, title
.len
, encoding
);
691 strbuf_addbuf(sb
, &title
);
693 strbuf_addch(sb
, '\n');
695 if (plain_non_ascii
) {
696 const char *header_fmt
=
697 "MIME-Version: 1.0\n"
698 "Content-Type: text/plain; charset=%s\n"
699 "Content-Transfer-Encoding: 8bit\n";
700 strbuf_addf(sb
, header_fmt
, encoding
);
703 strbuf_addstr(sb
, after_subject
);
705 if (fmt
== CMIT_FMT_EMAIL
) {
706 strbuf_addch(sb
, '\n');
708 strbuf_release(&title
);
711 void pp_remainder(enum cmit_fmt fmt
,
718 const char *line
= *msg_p
;
719 int linelen
= get_one_line(line
);
725 if (is_empty_line(line
, &linelen
)) {
728 if (fmt
== CMIT_FMT_SHORT
)
733 strbuf_grow(sb
, linelen
+ indent
+ 20);
735 memset(sb
->buf
+ sb
->len
, ' ', indent
);
736 strbuf_setlen(sb
, sb
->len
+ indent
);
738 strbuf_add(sb
, line
, linelen
);
739 strbuf_addch(sb
, '\n');
743 void pretty_print_commit(enum cmit_fmt fmt
, const struct commit
*commit
,
744 struct strbuf
*sb
, int abbrev
,
745 const char *subject
, const char *after_subject
,
746 enum date_mode dmode
, int plain_non_ascii
)
748 unsigned long beginning_of_body
;
750 const char *msg
= commit
->buffer
;
752 const char *encoding
;
754 if (fmt
== CMIT_FMT_USERFORMAT
) {
755 format_commit_message(commit
, user_format
, sb
);
759 encoding
= (git_log_output_encoding
760 ? git_log_output_encoding
761 : git_commit_encoding
);
764 reencoded
= logmsg_reencode(commit
, encoding
);
769 if (fmt
== CMIT_FMT_ONELINE
|| fmt
== CMIT_FMT_EMAIL
)
772 /* After-subject is used to pass in Content-Type: multipart
773 * MIME header; in that case we do not have to do the
774 * plaintext content type even if the commit message has
775 * non 7-bit ASCII character. Otherwise, check if we need
776 * to say this is not a 7-bit ASCII.
778 if (fmt
== CMIT_FMT_EMAIL
&& !after_subject
) {
781 for (in_body
= i
= 0; (ch
= msg
[i
]); i
++) {
783 /* author could be non 7-bit ASCII but
784 * the log may be so; skip over the
787 if (ch
== '\n' && msg
[i
+1] == '\n')
790 else if (non_ascii(ch
)) {
797 pp_header(fmt
, abbrev
, dmode
, encoding
, commit
, &msg
, sb
);
798 if (fmt
!= CMIT_FMT_ONELINE
&& !subject
) {
799 strbuf_addch(sb
, '\n');
802 /* Skip excess blank lines at the beginning of body, if any... */
804 int linelen
= get_one_line(msg
);
808 if (!is_empty_line(msg
, &ll
))
813 /* These formats treat the title line specially. */
814 if (fmt
== CMIT_FMT_ONELINE
|| fmt
== CMIT_FMT_EMAIL
)
815 pp_title_line(fmt
, &msg
, sb
, subject
,
816 after_subject
, encoding
, plain_non_ascii
);
818 beginning_of_body
= sb
->len
;
819 if (fmt
!= CMIT_FMT_ONELINE
)
820 pp_remainder(fmt
, &msg
, sb
, indent
);
823 /* Make sure there is an EOLN for the non-oneline case */
824 if (fmt
!= CMIT_FMT_ONELINE
)
825 strbuf_addch(sb
, '\n');
828 * The caller may append additional body text in e-mail
829 * format. Make sure we did not strip the blank line
830 * between the header and the body.
832 if (fmt
== CMIT_FMT_EMAIL
&& sb
->len
<= beginning_of_body
)
833 strbuf_addch(sb
, '\n');