7 #include "string-list.h"
12 #include "reflog-walk.h"
13 #include "gpg-interface.h"
15 #include "run-command.h"
17 static char *user_format
;
18 static struct cmt_fmt_map
{
22 int expand_tabs_in_log
;
24 enum date_mode_type default_date_mode_type
;
25 const char *user_format
;
27 static size_t builtin_formats_len
;
28 static size_t commit_formats_len
;
29 static size_t commit_formats_alloc
;
30 static struct cmt_fmt_map
*find_commit_format(const char *sought
);
32 int commit_format_is_empty(enum cmit_fmt fmt
)
34 return fmt
== CMIT_FMT_USERFORMAT
&& !*user_format
;
37 static void save_user_format(struct rev_info
*rev
, const char *cp
, int is_tformat
)
40 user_format
= xstrdup(cp
);
42 rev
->use_terminator
= 1;
43 rev
->commit_format
= CMIT_FMT_USERFORMAT
;
46 static int git_pretty_formats_config(const char *var
, const char *value
, void *cb
)
48 struct cmt_fmt_map
*commit_format
= NULL
;
53 if (!skip_prefix(var
, "pretty.", &name
))
56 for (i
= 0; i
< builtin_formats_len
; i
++) {
57 if (!strcmp(commit_formats
[i
].name
, name
))
61 for (i
= builtin_formats_len
; i
< commit_formats_len
; i
++) {
62 if (!strcmp(commit_formats
[i
].name
, name
)) {
63 commit_format
= &commit_formats
[i
];
69 ALLOC_GROW(commit_formats
, commit_formats_len
+1,
70 commit_formats_alloc
);
71 commit_format
= &commit_formats
[commit_formats_len
];
72 memset(commit_format
, 0, sizeof(*commit_format
));
76 commit_format
->name
= xstrdup(name
);
77 commit_format
->format
= CMIT_FMT_USERFORMAT
;
78 if (git_config_string(&fmt
, var
, value
))
81 if (skip_prefix(fmt
, "format:", &fmt
))
82 commit_format
->is_tformat
= 0;
83 else if (skip_prefix(fmt
, "tformat:", &fmt
) || strchr(fmt
, '%'))
84 commit_format
->is_tformat
= 1;
86 commit_format
->is_alias
= 1;
87 commit_format
->user_format
= fmt
;
92 static void setup_commit_formats(void)
94 struct cmt_fmt_map builtin_formats
[] = {
95 { "raw", CMIT_FMT_RAW
, 0, 0 },
96 { "medium", CMIT_FMT_MEDIUM
, 0, 8 },
97 { "short", CMIT_FMT_SHORT
, 0, 0 },
98 { "email", CMIT_FMT_EMAIL
, 0, 0 },
99 { "mboxrd", CMIT_FMT_MBOXRD
, 0, 0 },
100 { "fuller", CMIT_FMT_FULLER
, 0, 8 },
101 { "full", CMIT_FMT_FULL
, 0, 8 },
102 { "oneline", CMIT_FMT_ONELINE
, 1, 0 },
103 { "reference", CMIT_FMT_USERFORMAT
, 1, 0,
104 0, DATE_SHORT
, "%C(auto)%h (%s, %ad)" },
106 * Please update $__git_log_pretty_formats in
107 * git-completion.bash when you add new formats.
110 commit_formats_len
= ARRAY_SIZE(builtin_formats
);
111 builtin_formats_len
= commit_formats_len
;
112 ALLOC_GROW(commit_formats
, commit_formats_len
, commit_formats_alloc
);
113 COPY_ARRAY(commit_formats
, builtin_formats
,
114 ARRAY_SIZE(builtin_formats
));
116 git_config(git_pretty_formats_config
, NULL
);
119 static struct cmt_fmt_map
*find_commit_format_recursive(const char *sought
,
120 const char *original
,
121 int num_redirections
)
123 struct cmt_fmt_map
*found
= NULL
;
124 size_t found_match_len
= 0;
127 if (num_redirections
>= commit_formats_len
)
128 die("invalid --pretty format: "
129 "'%s' references an alias which points to itself",
132 for (i
= 0; i
< commit_formats_len
; i
++) {
135 if (!starts_with(commit_formats
[i
].name
, sought
))
138 match_len
= strlen(commit_formats
[i
].name
);
139 if (found
== NULL
|| found_match_len
> match_len
) {
140 found
= &commit_formats
[i
];
141 found_match_len
= match_len
;
145 if (found
&& found
->is_alias
) {
146 found
= find_commit_format_recursive(found
->user_format
,
154 static struct cmt_fmt_map
*find_commit_format(const char *sought
)
157 setup_commit_formats();
159 return find_commit_format_recursive(sought
, sought
, 0);
162 void get_commit_format(const char *arg
, struct rev_info
*rev
)
164 struct cmt_fmt_map
*commit_format
;
166 rev
->use_terminator
= 0;
168 rev
->commit_format
= CMIT_FMT_DEFAULT
;
171 if (skip_prefix(arg
, "format:", &arg
)) {
172 save_user_format(rev
, arg
, 0);
176 if (!*arg
|| skip_prefix(arg
, "tformat:", &arg
) || strchr(arg
, '%')) {
177 save_user_format(rev
, arg
, 1);
181 commit_format
= find_commit_format(arg
);
183 die("invalid --pretty format: %s", arg
);
185 rev
->commit_format
= commit_format
->format
;
186 rev
->use_terminator
= commit_format
->is_tformat
;
187 rev
->expand_tabs_in_log_default
= commit_format
->expand_tabs_in_log
;
188 if (!rev
->date_mode_explicit
&& commit_format
->default_date_mode_type
)
189 rev
->date_mode
.type
= commit_format
->default_date_mode_type
;
190 if (commit_format
->format
== CMIT_FMT_USERFORMAT
) {
191 save_user_format(rev
, commit_format
->user_format
,
192 commit_format
->is_tformat
);
197 * Generic support for pretty-printing the header
199 static int get_one_line(const char *msg
)
214 /* High bit set, or ISO-2022-INT */
215 static int non_ascii(int ch
)
217 return !isascii(ch
) || ch
== '\033';
220 int has_non_ascii(const char *s
)
225 while ((ch
= *s
++) != '\0') {
232 static int is_rfc822_special(char ch
)
254 static int needs_rfc822_quoting(const char *s
, int len
)
257 for (i
= 0; i
< len
; i
++)
258 if (is_rfc822_special(s
[i
]))
263 static int last_line_length(struct strbuf
*sb
)
267 /* How many bytes are already used on the last line? */
268 for (i
= sb
->len
- 1; i
>= 0; i
--)
269 if (sb
->buf
[i
] == '\n')
271 return sb
->len
- (i
+ 1);
274 static void add_rfc822_quoted(struct strbuf
*out
, const char *s
, int len
)
278 /* just a guess, we may have to also backslash-quote */
279 strbuf_grow(out
, len
+ 2);
281 strbuf_addch(out
, '"');
282 for (i
= 0; i
< len
; i
++) {
286 strbuf_addch(out
, '\\');
289 strbuf_addch(out
, s
[i
]);
292 strbuf_addch(out
, '"');
300 static int is_rfc2047_special(char ch
, enum rfc2047_type type
)
303 * rfc2047, section 4.2:
305 * 8-bit values which correspond to printable ASCII characters other
306 * than "=", "?", and "_" (underscore), MAY be represented as those
307 * characters. (But see section 5 for restrictions.) In
308 * particular, SPACE and TAB MUST NOT be represented as themselves
309 * within encoded words.
313 * rule out non-ASCII characters and non-printable characters (the
314 * non-ASCII check should be redundant as isprint() is not localized
315 * and only knows about ASCII, but be defensive about that)
317 if (non_ascii(ch
) || !isprint(ch
))
321 * rule out special printable characters (' ' should be the only
322 * whitespace character considered printable, but be defensive and use
325 if (isspace(ch
) || ch
== '=' || ch
== '?' || ch
== '_')
329 * rfc2047, section 5.3:
331 * As a replacement for a 'word' entity within a 'phrase', for example,
332 * one that precedes an address in a From, To, or Cc header. The ABNF
333 * definition for 'phrase' from RFC 822 thus becomes:
335 * phrase = 1*( encoded-word / word )
337 * In this case the set of characters that may be used in a "Q"-encoded
338 * 'encoded-word' is restricted to: <upper and lower case ASCII
339 * letters, decimal digits, "!", "*", "+", "-", "/", "=", and "_"
340 * (underscore, ASCII 95.)>. An 'encoded-word' that appears within a
341 * 'phrase' MUST be separated from any adjacent 'word', 'text' or
342 * 'special' by 'linear-white-space'.
345 if (type
!= RFC2047_ADDRESS
)
348 /* '=' and '_' are special cases and have been checked above */
349 return !(isalnum(ch
) || ch
== '!' || ch
== '*' || ch
== '+' || ch
== '-' || ch
== '/');
352 static int needs_rfc2047_encoding(const char *line
, int len
)
356 for (i
= 0; i
< len
; i
++) {
358 if (non_ascii(ch
) || ch
== '\n')
360 if ((i
+ 1 < len
) && (ch
== '=' && line
[i
+1] == '?'))
367 static void add_rfc2047(struct strbuf
*sb
, const char *line
, size_t len
,
368 const char *encoding
, enum rfc2047_type type
)
370 static const int max_encoded_length
= 76; /* per rfc2047 */
372 int line_len
= last_line_length(sb
);
374 strbuf_grow(sb
, len
* 3 + strlen(encoding
) + 100);
375 strbuf_addf(sb
, "=?%s?q?", encoding
);
376 line_len
+= strlen(encoding
) + 5; /* 5 for =??q? */
380 * RFC 2047, section 5 (3):
382 * Each 'encoded-word' MUST represent an integral number of
383 * characters. A multi-octet character may not be split across
384 * adjacent 'encoded- word's.
386 const unsigned char *p
= (const unsigned char *)line
;
387 int chrlen
= mbs_chrlen(&line
, &len
, encoding
);
388 int is_special
= (chrlen
> 1) || is_rfc2047_special(*p
, type
);
390 /* "=%02X" * chrlen, or the byte itself */
391 const char *encoded_fmt
= is_special
? "=%02X" : "%c";
392 int encoded_len
= is_special
? 3 * chrlen
: 1;
395 * According to RFC 2047, we could encode the special character
396 * ' ' (space) with '_' (underscore) for readability. But many
397 * programs do not understand this and just leave the
398 * underscore in place. Thus, we do nothing special here, which
399 * causes ' ' to be encoded as '=20', avoiding this problem.
402 if (line_len
+ encoded_len
+ 2 > max_encoded_length
) {
403 /* It won't fit with trailing "?=" --- break the line */
404 strbuf_addf(sb
, "?=\n =?%s?q?", encoding
);
405 line_len
= strlen(encoding
) + 5 + 1; /* =??q? plus SP */
408 for (i
= 0; i
< chrlen
; i
++)
409 strbuf_addf(sb
, encoded_fmt
, p
[i
]);
410 line_len
+= encoded_len
;
412 strbuf_addstr(sb
, "?=");
415 const char *show_ident_date(const struct ident_split
*ident
,
416 const struct date_mode
*mode
)
418 timestamp_t date
= 0;
421 if (ident
->date_begin
&& ident
->date_end
)
422 date
= parse_timestamp(ident
->date_begin
, NULL
, 10);
423 if (date_overflows(date
))
426 if (ident
->tz_begin
&& ident
->tz_end
)
427 tz
= strtol(ident
->tz_begin
, NULL
, 10);
428 if (tz
>= INT_MAX
|| tz
<= INT_MIN
)
431 return show_date(date
, tz
, mode
);
434 void pp_user_info(struct pretty_print_context
*pp
,
435 const char *what
, struct strbuf
*sb
,
436 const char *line
, const char *encoding
)
438 struct ident_split ident
;
440 const char *mailbuf
, *namebuf
;
441 size_t namelen
, maillen
;
442 int max_length
= 78; /* per rfc2822 */
444 if (pp
->fmt
== CMIT_FMT_ONELINE
)
447 line_end
= strchrnul(line
, '\n');
448 if (split_ident_line(&ident
, line
, line_end
- line
))
451 mailbuf
= ident
.mail_begin
;
452 maillen
= ident
.mail_end
- ident
.mail_begin
;
453 namebuf
= ident
.name_begin
;
454 namelen
= ident
.name_end
- ident
.name_begin
;
457 map_user(pp
->mailmap
, &mailbuf
, &maillen
, &namebuf
, &namelen
);
459 if (cmit_fmt_is_mail(pp
->fmt
)) {
460 if (pp
->from_ident
&& ident_cmp(pp
->from_ident
, &ident
)) {
461 struct strbuf buf
= STRBUF_INIT
;
463 strbuf_addstr(&buf
, "From: ");
464 strbuf_add(&buf
, namebuf
, namelen
);
465 strbuf_addstr(&buf
, " <");
466 strbuf_add(&buf
, mailbuf
, maillen
);
467 strbuf_addstr(&buf
, ">\n");
468 string_list_append(&pp
->in_body_headers
,
469 strbuf_detach(&buf
, NULL
));
471 mailbuf
= pp
->from_ident
->mail_begin
;
472 maillen
= pp
->from_ident
->mail_end
- mailbuf
;
473 namebuf
= pp
->from_ident
->name_begin
;
474 namelen
= pp
->from_ident
->name_end
- namebuf
;
477 strbuf_addstr(sb
, "From: ");
478 if (pp
->encode_email_headers
&&
479 needs_rfc2047_encoding(namebuf
, namelen
)) {
480 add_rfc2047(sb
, namebuf
, namelen
,
481 encoding
, RFC2047_ADDRESS
);
482 max_length
= 76; /* per rfc2047 */
483 } else if (needs_rfc822_quoting(namebuf
, namelen
)) {
484 struct strbuf quoted
= STRBUF_INIT
;
485 add_rfc822_quoted("ed
, namebuf
, namelen
);
486 strbuf_add_wrapped_bytes(sb
, quoted
.buf
, quoted
.len
,
488 strbuf_release("ed
);
490 strbuf_add_wrapped_bytes(sb
, namebuf
, namelen
,
495 last_line_length(sb
) + strlen(" <") + maillen
+ strlen(">"))
496 strbuf_addch(sb
, '\n');
497 strbuf_addf(sb
, " <%.*s>\n", (int)maillen
, mailbuf
);
499 strbuf_addf(sb
, "%s: %.*s%.*s <%.*s>\n", what
,
500 (pp
->fmt
== CMIT_FMT_FULLER
) ? 4 : 0, " ",
501 (int)namelen
, namebuf
, (int)maillen
, mailbuf
);
505 case CMIT_FMT_MEDIUM
:
506 strbuf_addf(sb
, "Date: %s\n",
507 show_ident_date(&ident
, &pp
->date_mode
));
510 case CMIT_FMT_MBOXRD
:
511 strbuf_addf(sb
, "Date: %s\n",
512 show_ident_date(&ident
, DATE_MODE(RFC2822
)));
514 case CMIT_FMT_FULLER
:
515 strbuf_addf(sb
, "%sDate: %s\n", what
,
516 show_ident_date(&ident
, &pp
->date_mode
));
524 static int is_blank_line(const char *line
, int *len_p
)
527 while (len
&& isspace(line
[len
- 1]))
533 const char *skip_blank_lines(const char *msg
)
536 int linelen
= get_one_line(msg
);
540 if (!is_blank_line(msg
, &ll
))
547 static void add_merge_info(const struct pretty_print_context
*pp
,
548 struct strbuf
*sb
, const struct commit
*commit
)
550 struct commit_list
*parent
= commit
->parents
;
552 if ((pp
->fmt
== CMIT_FMT_ONELINE
) || (cmit_fmt_is_mail(pp
->fmt
)) ||
553 !parent
|| !parent
->next
)
556 strbuf_addstr(sb
, "Merge:");
559 struct object_id
*oidp
= &parent
->item
->object
.oid
;
560 strbuf_addch(sb
, ' ');
562 strbuf_add_unique_abbrev(sb
, oidp
, pp
->abbrev
);
564 strbuf_addstr(sb
, oid_to_hex(oidp
));
565 parent
= parent
->next
;
567 strbuf_addch(sb
, '\n');
570 static char *get_header(const char *msg
, const char *key
)
573 const char *v
= find_commit_header(msg
, key
, &len
);
574 return v
? xmemdupz(v
, len
) : NULL
;
577 static char *replace_encoding_header(char *buf
, const char *encoding
)
579 struct strbuf tmp
= STRBUF_INIT
;
583 /* guess if there is an encoding header before a \n\n */
584 while (!starts_with(cp
, "encoding ")) {
585 cp
= strchr(cp
, '\n');
586 if (!cp
|| *++cp
== '\n')
590 cp
= strchr(cp
, '\n');
592 return buf
; /* should not happen but be defensive */
593 len
= cp
+ 1 - (buf
+ start
);
595 strbuf_attach(&tmp
, buf
, strlen(buf
), strlen(buf
) + 1);
596 if (is_encoding_utf8(encoding
)) {
597 /* we have re-coded to UTF-8; drop the header */
598 strbuf_remove(&tmp
, start
, len
);
600 /* just replaces XXXX in 'encoding XXXX\n' */
601 strbuf_splice(&tmp
, start
+ strlen("encoding "),
602 len
- strlen("encoding \n"),
603 encoding
, strlen(encoding
));
605 return strbuf_detach(&tmp
, NULL
);
608 const char *repo_logmsg_reencode(struct repository
*r
,
609 const struct commit
*commit
,
610 char **commit_encoding
,
611 const char *output_encoding
)
613 static const char *utf8
= "UTF-8";
614 const char *use_encoding
;
616 const char *msg
= repo_get_commit_buffer(r
, commit
, NULL
);
619 if (!output_encoding
|| !*output_encoding
) {
621 *commit_encoding
= get_header(msg
, "encoding");
624 encoding
= get_header(msg
, "encoding");
626 *commit_encoding
= encoding
;
627 use_encoding
= encoding
? encoding
: utf8
;
628 if (same_encoding(use_encoding
, output_encoding
)) {
630 * No encoding work to be done. If we have no encoding header
631 * at all, then there's nothing to do, and we can return the
632 * message verbatim (whether newly allocated or not).
638 * Otherwise, we still want to munge the encoding header in the
639 * result, which will be done by modifying the buffer. If we
640 * are using a fresh copy, we can reuse it. But if we are using
641 * the cached copy from get_commit_buffer, we need to duplicate it
642 * to avoid munging the cached copy.
644 if (msg
== get_cached_commit_buffer(r
, commit
, NULL
))
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
);
658 repo_unuse_commit_buffer(r
, commit
, 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.
666 out
= replace_encoding_header(out
, output_encoding
);
668 if (!commit_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 static int mailmap_name(const char **email
, size_t *email_len
,
678 const char **name
, size_t *name_len
)
680 static struct string_list
*mail_map
;
682 mail_map
= xcalloc(1, sizeof(*mail_map
));
683 read_mailmap(mail_map
);
685 return mail_map
->nr
&& map_user(mail_map
, email
, email_len
, name
, name_len
);
688 static size_t format_person_part(struct strbuf
*sb
, char part
,
689 const char *msg
, int len
,
690 const struct date_mode
*dmode
)
692 /* currently all placeholders have same length */
693 const int placeholder_len
= 2;
694 struct ident_split s
;
695 const char *name
, *mail
;
696 size_t maillen
, namelen
;
698 if (split_ident_line(&s
, msg
, len
) < 0)
702 namelen
= s
.name_end
- s
.name_begin
;
704 maillen
= s
.mail_end
- s
.mail_begin
;
706 if (part
== 'N' || part
== 'E' || part
== 'L') /* mailmap lookup */
707 mailmap_name(&mail
, &maillen
, &name
, &namelen
);
708 if (part
== 'n' || part
== 'N') { /* name */
709 strbuf_add(sb
, name
, namelen
);
710 return placeholder_len
;
712 if (part
== 'e' || part
== 'E') { /* email */
713 strbuf_add(sb
, mail
, maillen
);
714 return placeholder_len
;
716 if (part
== 'l' || part
== 'L') { /* local-part */
717 const char *at
= memchr(mail
, '@', maillen
);
720 strbuf_add(sb
, mail
, maillen
);
721 return placeholder_len
;
727 if (part
== 't') { /* date, UNIX timestamp */
728 strbuf_add(sb
, s
.date_begin
, s
.date_end
- s
.date_begin
);
729 return placeholder_len
;
734 strbuf_addstr(sb
, show_ident_date(&s
, dmode
));
735 return placeholder_len
;
736 case 'D': /* date, RFC2822 style */
737 strbuf_addstr(sb
, show_ident_date(&s
, DATE_MODE(RFC2822
)));
738 return placeholder_len
;
739 case 'r': /* date, relative */
740 strbuf_addstr(sb
, show_ident_date(&s
, DATE_MODE(RELATIVE
)));
741 return placeholder_len
;
742 case 'i': /* date, ISO 8601-like */
743 strbuf_addstr(sb
, show_ident_date(&s
, DATE_MODE(ISO8601
)));
744 return placeholder_len
;
745 case 'I': /* date, ISO 8601 strict */
746 strbuf_addstr(sb
, show_ident_date(&s
, DATE_MODE(ISO8601_STRICT
)));
747 return placeholder_len
;
749 strbuf_addstr(sb
, show_ident_date(&s
, DATE_MODE(SHORT
)));
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 struct repository
*repository
;
788 const struct commit
*commit
;
789 const struct pretty_print_context
*pretty_ctx
;
790 unsigned commit_header_parsed
:1;
791 unsigned commit_message_parsed
:1;
792 struct signature_check signature_check
;
793 enum flush_type flush_type
;
794 enum trunc_type truncate
;
796 char *commit_encoding
;
797 size_t width
, indent1
, indent2
;
801 /* These offsets are relative to the start of the commit message. */
803 struct chunk committer
;
808 /* The following ones are relative to the result struct strbuf. */
812 static void parse_commit_header(struct format_commit_context
*context
)
814 const char *msg
= context
->message
;
817 for (i
= 0; msg
[i
]; i
++) {
820 for (eol
= i
; msg
[eol
] && msg
[eol
] != '\n'; eol
++)
825 } else if (skip_prefix(msg
+ i
, "author ", &name
)) {
826 context
->author
.off
= name
- msg
;
827 context
->author
.len
= msg
+ eol
- name
;
828 } else if (skip_prefix(msg
+ i
, "committer ", &name
)) {
829 context
->committer
.off
= name
- msg
;
830 context
->committer
.len
= msg
+ eol
- name
;
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 void format_sanitized_subject(struct strbuf
*sb
, const char *msg
, size_t len
)
847 size_t start_len
= sb
->len
;
851 for (i
= 0; i
< len
; i
++) {
852 if (istitlechar(msg
[i
])) {
854 strbuf_addch(sb
, '-');
856 strbuf_addch(sb
, msg
[i
]);
858 while (msg
[i
+1] == '.')
864 /* trim any trailing '.' or '-' characters */
866 while (sb
->len
- trimlen
> start_len
&&
867 (sb
->buf
[sb
->len
- 1 - trimlen
] == '.'
868 || sb
->buf
[sb
->len
- 1 - trimlen
] == '-'))
870 strbuf_remove(sb
, sb
->len
- trimlen
, trimlen
);
873 const char *format_subject(struct strbuf
*sb
, const char *msg
,
874 const char *line_separator
)
879 const char *line
= msg
;
880 int linelen
= get_one_line(line
);
883 if (!linelen
|| is_blank_line(line
, &linelen
))
888 strbuf_grow(sb
, linelen
+ 2);
890 strbuf_addstr(sb
, line_separator
);
891 strbuf_add(sb
, line
, linelen
);
897 static void parse_commit_message(struct format_commit_context
*c
)
899 const char *msg
= c
->message
+ c
->message_off
;
900 const char *start
= c
->message
;
902 msg
= skip_blank_lines(msg
);
903 c
->subject_off
= msg
- start
;
905 msg
= format_subject(NULL
, msg
, NULL
);
906 msg
= skip_blank_lines(msg
);
907 c
->body_off
= msg
- start
;
909 c
->commit_message_parsed
= 1;
912 static void strbuf_wrap(struct strbuf
*sb
, size_t pos
,
913 size_t width
, size_t indent1
, size_t indent2
)
915 struct strbuf tmp
= STRBUF_INIT
;
918 strbuf_add(&tmp
, sb
->buf
, pos
);
919 strbuf_add_wrapped_text(&tmp
, sb
->buf
+ pos
,
920 (int) indent1
, (int) indent2
, (int) width
);
921 strbuf_swap(&tmp
, sb
);
922 strbuf_release(&tmp
);
925 static void rewrap_message_tail(struct strbuf
*sb
,
926 struct format_commit_context
*c
,
927 size_t new_width
, size_t new_indent1
,
930 if (c
->width
== new_width
&& c
->indent1
== new_indent1
&&
931 c
->indent2
== new_indent2
)
933 if (c
->wrap_start
< sb
->len
)
934 strbuf_wrap(sb
, c
->wrap_start
, c
->width
, c
->indent1
, c
->indent2
);
935 c
->wrap_start
= sb
->len
;
936 c
->width
= new_width
;
937 c
->indent1
= new_indent1
;
938 c
->indent2
= new_indent2
;
941 static int format_reflog_person(struct strbuf
*sb
,
943 struct reflog_walk_info
*log
,
944 const struct date_mode
*dmode
)
951 ident
= get_reflog_ident(log
);
955 return format_person_part(sb
, part
, ident
, strlen(ident
), dmode
);
958 static size_t parse_color(struct strbuf
*sb
, /* in UTF-8 */
959 const char *placeholder
,
960 struct format_commit_context
*c
)
962 const char *rest
= placeholder
;
963 const char *basic_color
= NULL
;
965 if (placeholder
[1] == '(') {
966 const char *begin
= placeholder
+ 2;
967 const char *end
= strchr(begin
, ')');
968 char color
[COLOR_MAXLEN
];
973 if (skip_prefix(begin
, "auto,", &begin
)) {
974 if (!want_color(c
->pretty_ctx
->color
))
975 return end
- placeholder
+ 1;
976 } else if (skip_prefix(begin
, "always,", &begin
)) {
977 /* nothing to do; we do not respect want_color at all */
979 /* the default is the same as "auto" */
980 if (!want_color(c
->pretty_ctx
->color
))
981 return end
- placeholder
+ 1;
984 if (color_parse_mem(begin
, end
- begin
, color
) < 0)
985 die(_("unable to parse --pretty format"));
986 strbuf_addstr(sb
, color
);
987 return end
- placeholder
+ 1;
991 * We handle things like "%C(red)" above; for historical reasons, there
992 * are a few colors that can be specified without parentheses (and
993 * they cannot support things like "auto" or "always" at all).
995 if (skip_prefix(placeholder
+ 1, "red", &rest
))
996 basic_color
= GIT_COLOR_RED
;
997 else if (skip_prefix(placeholder
+ 1, "green", &rest
))
998 basic_color
= GIT_COLOR_GREEN
;
999 else if (skip_prefix(placeholder
+ 1, "blue", &rest
))
1000 basic_color
= GIT_COLOR_BLUE
;
1001 else if (skip_prefix(placeholder
+ 1, "reset", &rest
))
1002 basic_color
= GIT_COLOR_RESET
;
1004 if (basic_color
&& want_color(c
->pretty_ctx
->color
))
1005 strbuf_addstr(sb
, basic_color
);
1007 return rest
- placeholder
;
1010 static size_t parse_padding_placeholder(const char *placeholder
,
1011 struct format_commit_context
*c
)
1013 const char *ch
= placeholder
;
1014 enum flush_type flush_type
;
1019 flush_type
= flush_right
;
1023 flush_type
= flush_both
;
1025 } else if (*ch
== '>') {
1026 flush_type
= flush_left_and_steal
;
1029 flush_type
= flush_left
;
1035 /* the next value means "wide enough to that column" */
1042 const char *start
= ch
+ 1;
1043 const char *end
= start
+ strcspn(start
, ",)");
1046 if (!end
|| end
== start
)
1048 width
= strtol(start
, &next
, 10);
1049 if (next
== start
|| width
== 0)
1053 width
+= term_columns();
1057 c
->padding
= to_column
? -width
: width
;
1058 c
->flush_type
= flush_type
;
1062 end
= strchr(start
, ')');
1063 if (!end
|| end
== start
)
1065 if (starts_with(start
, "trunc)"))
1066 c
->truncate
= trunc_right
;
1067 else if (starts_with(start
, "ltrunc)"))
1068 c
->truncate
= trunc_left
;
1069 else if (starts_with(start
, "mtrunc)"))
1070 c
->truncate
= trunc_middle
;
1074 c
->truncate
= trunc_none
;
1076 return end
- placeholder
+ 1;
1081 static int match_placeholder_arg_value(const char *to_parse
, const char *candidate
,
1082 const char **end
, const char **valuestart
,
1087 if (!(skip_prefix(to_parse
, candidate
, &p
)))
1091 *valuestart
= p
+ 1;
1092 *valuelen
= strcspn(*valuestart
, ",)");
1093 p
= *valuestart
+ *valuelen
;
1095 if (*p
!= ',' && *p
!= ')')
1112 static int match_placeholder_bool_arg(const char *to_parse
, const char *candidate
,
1113 const char **end
, int *val
)
1120 if (!match_placeholder_arg_value(to_parse
, candidate
, end
, &argval
, &arglen
))
1128 strval
= xstrndup(argval
, arglen
);
1129 v
= git_parse_maybe_bool(strval
);
1140 static int format_trailer_match_cb(const struct strbuf
*key
, void *ud
)
1142 const struct string_list
*list
= ud
;
1143 const struct string_list_item
*item
;
1145 for_each_string_list_item (item
, list
) {
1146 if (key
->len
== (uintptr_t)item
->util
&&
1147 !strncasecmp(item
->string
, key
->buf
, key
->len
))
1153 static size_t format_commit_one(struct strbuf
*sb
, /* in UTF-8 */
1154 const char *placeholder
,
1157 struct format_commit_context
*c
= context
;
1158 const struct commit
*commit
= c
->commit
;
1159 const char *msg
= c
->message
;
1160 struct commit_list
*p
;
1161 const char *arg
, *eol
;
1165 /* these are independent of the commit */
1166 res
= strbuf_expand_literal_cb(sb
, placeholder
, NULL
);
1170 switch (placeholder
[0]) {
1172 if (starts_with(placeholder
+ 1, "(auto)")) {
1173 c
->auto_color
= want_color(c
->pretty_ctx
->color
);
1174 if (c
->auto_color
&& sb
->len
)
1175 strbuf_addstr(sb
, GIT_COLOR_RESET
);
1176 return 7; /* consumed 7 bytes, "C(auto)" */
1178 int ret
= parse_color(sb
, placeholder
, c
);
1182 * Otherwise, we decided to treat %C<unknown>
1183 * as a literal string, and the previous
1184 * %C(auto) is still valid.
1189 if (placeholder
[1] == '(') {
1190 unsigned long width
= 0, indent1
= 0, indent2
= 0;
1192 const char *start
= placeholder
+ 2;
1193 const char *end
= strchr(start
, ')');
1197 width
= strtoul(start
, &next
, 10);
1199 indent1
= strtoul(next
+ 1, &next
, 10);
1201 indent2
= strtoul(next
+ 1,
1208 rewrap_message_tail(sb
, c
, width
, indent1
, indent2
);
1209 return end
- placeholder
+ 1;
1215 return parse_padding_placeholder(placeholder
, c
);
1218 if (skip_prefix(placeholder
, "(describe)", &arg
)) {
1219 struct child_process cmd
= CHILD_PROCESS_INIT
;
1220 struct strbuf out
= STRBUF_INIT
;
1221 struct strbuf err
= STRBUF_INIT
;
1224 strvec_push(&cmd
.args
, "describe");
1225 strvec_push(&cmd
.args
, oid_to_hex(&commit
->object
.oid
));
1226 pipe_command(&cmd
, NULL
, 0, &out
, 0, &err
, 0);
1228 strbuf_addbuf(sb
, &out
);
1229 strbuf_release(&out
);
1230 strbuf_release(&err
);
1231 return arg
- placeholder
;
1234 /* these depend on the commit */
1235 if (!commit
->object
.parsed
)
1236 parse_object(the_repository
, &commit
->object
.oid
);
1238 switch (placeholder
[0]) {
1239 case 'H': /* commit hash */
1240 strbuf_addstr(sb
, diff_get_color(c
->auto_color
, DIFF_COMMIT
));
1241 strbuf_addstr(sb
, oid_to_hex(&commit
->object
.oid
));
1242 strbuf_addstr(sb
, diff_get_color(c
->auto_color
, DIFF_RESET
));
1244 case 'h': /* abbreviated commit hash */
1245 strbuf_addstr(sb
, diff_get_color(c
->auto_color
, DIFF_COMMIT
));
1246 strbuf_add_unique_abbrev(sb
, &commit
->object
.oid
,
1247 c
->pretty_ctx
->abbrev
);
1248 strbuf_addstr(sb
, diff_get_color(c
->auto_color
, DIFF_RESET
));
1250 case 'T': /* tree hash */
1251 strbuf_addstr(sb
, oid_to_hex(get_commit_tree_oid(commit
)));
1253 case 't': /* abbreviated tree hash */
1254 strbuf_add_unique_abbrev(sb
,
1255 get_commit_tree_oid(commit
),
1256 c
->pretty_ctx
->abbrev
);
1258 case 'P': /* parent hashes */
1259 for (p
= commit
->parents
; p
; p
= p
->next
) {
1260 if (p
!= commit
->parents
)
1261 strbuf_addch(sb
, ' ');
1262 strbuf_addstr(sb
, oid_to_hex(&p
->item
->object
.oid
));
1265 case 'p': /* abbreviated parent hashes */
1266 for (p
= commit
->parents
; p
; p
= p
->next
) {
1267 if (p
!= commit
->parents
)
1268 strbuf_addch(sb
, ' ');
1269 strbuf_add_unique_abbrev(sb
, &p
->item
->object
.oid
,
1270 c
->pretty_ctx
->abbrev
);
1273 case 'm': /* left/right/bottom */
1274 strbuf_addstr(sb
, get_revision_mark(NULL
, commit
));
1277 format_decorations(sb
, commit
, c
->auto_color
);
1280 format_decorations_extended(sb
, commit
, c
->auto_color
, "", ", ", "");
1282 case 'S': /* tag/branch like --source */
1283 if (!(c
->pretty_ctx
->rev
&& c
->pretty_ctx
->rev
->sources
))
1285 slot
= revision_sources_at(c
->pretty_ctx
->rev
->sources
, commit
);
1286 if (!(slot
&& *slot
))
1288 strbuf_addstr(sb
, *slot
);
1290 case 'g': /* reflog info */
1291 switch(placeholder
[1]) {
1292 case 'd': /* reflog selector */
1294 if (c
->pretty_ctx
->reflog_info
)
1295 get_reflog_selector(sb
,
1296 c
->pretty_ctx
->reflog_info
,
1297 &c
->pretty_ctx
->date_mode
,
1298 c
->pretty_ctx
->date_mode_explicit
,
1299 (placeholder
[1] == 'd'));
1301 case 's': /* reflog message */
1302 if (c
->pretty_ctx
->reflog_info
)
1303 get_reflog_message(sb
, c
->pretty_ctx
->reflog_info
);
1309 return format_reflog_person(sb
,
1311 c
->pretty_ctx
->reflog_info
,
1312 &c
->pretty_ctx
->date_mode
);
1314 return 0; /* unknown %g placeholder */
1316 if (c
->pretty_ctx
->notes_message
) {
1317 strbuf_addstr(sb
, c
->pretty_ctx
->notes_message
);
1323 if (placeholder
[0] == 'G') {
1324 if (!c
->signature_check
.result
)
1325 check_commit_signature(c
->commit
, &(c
->signature_check
));
1326 switch (placeholder
[1]) {
1328 if (c
->signature_check
.gpg_output
)
1329 strbuf_addstr(sb
, c
->signature_check
.gpg_output
);
1332 switch (c
->signature_check
.result
) {
1334 switch (c
->signature_check
.trust_level
) {
1335 case TRUST_UNDEFINED
:
1337 strbuf_addch(sb
, 'U');
1340 strbuf_addch(sb
, 'G');
1350 strbuf_addch(sb
, c
->signature_check
.result
);
1354 if (c
->signature_check
.signer
)
1355 strbuf_addstr(sb
, c
->signature_check
.signer
);
1358 if (c
->signature_check
.key
)
1359 strbuf_addstr(sb
, c
->signature_check
.key
);
1362 if (c
->signature_check
.fingerprint
)
1363 strbuf_addstr(sb
, c
->signature_check
.fingerprint
);
1366 if (c
->signature_check
.primary_key_fingerprint
)
1367 strbuf_addstr(sb
, c
->signature_check
.primary_key_fingerprint
);
1370 switch (c
->signature_check
.trust_level
) {
1371 case TRUST_UNDEFINED
:
1372 strbuf_addstr(sb
, "undefined");
1375 strbuf_addstr(sb
, "never");
1377 case TRUST_MARGINAL
:
1378 strbuf_addstr(sb
, "marginal");
1381 strbuf_addstr(sb
, "fully");
1383 case TRUST_ULTIMATE
:
1384 strbuf_addstr(sb
, "ultimate");
1394 /* For the rest we have to parse the commit header. */
1395 if (!c
->commit_header_parsed
) {
1397 repo_logmsg_reencode(c
->repository
, commit
,
1398 &c
->commit_encoding
, "UTF-8");
1399 parse_commit_header(c
);
1402 switch (placeholder
[0]) {
1403 case 'a': /* author ... */
1404 return format_person_part(sb
, placeholder
[1],
1405 msg
+ c
->author
.off
, c
->author
.len
,
1406 &c
->pretty_ctx
->date_mode
);
1407 case 'c': /* committer ... */
1408 return format_person_part(sb
, placeholder
[1],
1409 msg
+ c
->committer
.off
, c
->committer
.len
,
1410 &c
->pretty_ctx
->date_mode
);
1411 case 'e': /* encoding */
1412 if (c
->commit_encoding
)
1413 strbuf_addstr(sb
, c
->commit_encoding
);
1415 case 'B': /* raw body */
1416 /* message_off is always left at the initial newline */
1417 strbuf_addstr(sb
, msg
+ c
->message_off
+ 1);
1421 /* Now we need to parse the commit message. */
1422 if (!c
->commit_message_parsed
)
1423 parse_commit_message(c
);
1425 switch (placeholder
[0]) {
1426 case 's': /* subject */
1427 format_subject(sb
, msg
+ c
->subject_off
, " ");
1429 case 'f': /* sanitized subject */
1430 eol
= strchrnul(msg
+ c
->subject_off
, '\n');
1431 format_sanitized_subject(sb
, msg
+ c
->subject_off
, eol
- (msg
+ c
->subject_off
));
1433 case 'b': /* body */
1434 strbuf_addstr(sb
, msg
+ c
->body_off
);
1438 if (skip_prefix(placeholder
, "(trailers", &arg
)) {
1439 struct process_trailer_options opts
= PROCESS_TRAILER_OPTIONS_INIT
;
1440 struct string_list filter_list
= STRING_LIST_INIT_NODUP
;
1441 struct strbuf sepbuf
= STRBUF_INIT
;
1442 struct strbuf kvsepbuf
= STRBUF_INIT
;
1445 opts
.no_divider
= 1;
1453 if (match_placeholder_arg_value(arg
, "key", &arg
, &argval
, &arglen
)) {
1454 uintptr_t len
= arglen
;
1459 if (len
&& argval
[len
- 1] == ':')
1461 string_list_append(&filter_list
, argval
)->util
= (char *)len
;
1463 opts
.filter
= format_trailer_match_cb
;
1464 opts
.filter_data
= &filter_list
;
1465 opts
.only_trailers
= 1;
1466 } else if (match_placeholder_arg_value(arg
, "separator", &arg
, &argval
, &arglen
)) {
1469 strbuf_reset(&sepbuf
);
1470 fmt
= xstrndup(argval
, arglen
);
1471 strbuf_expand(&sepbuf
, fmt
, strbuf_expand_literal_cb
, NULL
);
1473 opts
.separator
= &sepbuf
;
1474 } else if (match_placeholder_arg_value(arg
, "key_value_separator", &arg
, &argval
, &arglen
)) {
1477 strbuf_reset(&kvsepbuf
);
1478 fmt
= xstrndup(argval
, arglen
);
1479 strbuf_expand(&kvsepbuf
, fmt
, strbuf_expand_literal_cb
, NULL
);
1481 opts
.key_value_separator
= &kvsepbuf
;
1482 } else if (!match_placeholder_bool_arg(arg
, "only", &arg
, &opts
.only_trailers
) &&
1483 !match_placeholder_bool_arg(arg
, "unfold", &arg
, &opts
.unfold
) &&
1484 !match_placeholder_bool_arg(arg
, "keyonly", &arg
, &opts
.key_only
) &&
1485 !match_placeholder_bool_arg(arg
, "valueonly", &arg
, &opts
.value_only
))
1490 format_trailers_from_commit(sb
, msg
+ c
->subject_off
, &opts
);
1491 ret
= arg
- placeholder
+ 1;
1494 string_list_clear(&filter_list
, 0);
1495 strbuf_release(&sepbuf
);
1499 return 0; /* unknown placeholder */
1502 static size_t format_and_pad_commit(struct strbuf
*sb
, /* in UTF-8 */
1503 const char *placeholder
,
1504 struct format_commit_context
*c
)
1506 struct strbuf local_sb
= STRBUF_INIT
;
1507 int total_consumed
= 0, len
, padding
= c
->padding
;
1509 const char *start
= strrchr(sb
->buf
, '\n');
1513 occupied
= utf8_strnwidth(start
, -1, 1);
1514 occupied
+= c
->pretty_ctx
->graph_width
;
1515 padding
= (-padding
) - occupied
;
1518 int modifier
= *placeholder
== 'C';
1519 int consumed
= format_commit_one(&local_sb
, placeholder
, c
);
1520 total_consumed
+= consumed
;
1525 placeholder
+= consumed
;
1526 if (*placeholder
!= '%')
1531 len
= utf8_strnwidth(local_sb
.buf
, -1, 1);
1533 if (c
->flush_type
== flush_left_and_steal
) {
1534 const char *ch
= sb
->buf
+ sb
->len
- 1;
1535 while (len
> padding
&& ch
> sb
->buf
) {
1542 /* check for trailing ansi sequences */
1546 while (ch
- p
< 10 && *p
!= '\033')
1549 ch
+ 1 - p
!= display_mode_esc_sequence_len(p
))
1552 * got a good ansi sequence, put it back to
1553 * local_sb as we're cutting sb
1555 strbuf_insert(&local_sb
, 0, p
, ch
+ 1 - p
);
1558 strbuf_setlen(sb
, ch
+ 1 - sb
->buf
);
1559 c
->flush_type
= flush_left
;
1562 if (len
> padding
) {
1563 switch (c
->truncate
) {
1565 strbuf_utf8_replace(&local_sb
,
1566 0, len
- (padding
- 2),
1570 strbuf_utf8_replace(&local_sb
,
1572 len
- (padding
- 2),
1576 strbuf_utf8_replace(&local_sb
,
1577 padding
- 2, len
- (padding
- 2),
1583 strbuf_addbuf(sb
, &local_sb
);
1585 int sb_len
= sb
->len
, offset
= 0;
1586 if (c
->flush_type
== flush_left
)
1587 offset
= padding
- len
;
1588 else if (c
->flush_type
== flush_both
)
1589 offset
= (padding
- len
) / 2;
1591 * we calculate padding in columns, now
1592 * convert it back to chars
1594 padding
= padding
- len
+ local_sb
.len
;
1595 strbuf_addchars(sb
, ' ', padding
);
1596 memcpy(sb
->buf
+ sb_len
+ offset
, local_sb
.buf
,
1599 strbuf_release(&local_sb
);
1600 c
->flush_type
= no_flush
;
1601 return total_consumed
;
1604 static size_t format_commit_item(struct strbuf
*sb
, /* in UTF-8 */
1605 const char *placeholder
,
1612 ADD_LF_BEFORE_NON_EMPTY
,
1613 DEL_LF_BEFORE_EMPTY
,
1614 ADD_SP_BEFORE_NON_EMPTY
1617 switch (placeholder
[0]) {
1619 magic
= DEL_LF_BEFORE_EMPTY
;
1622 magic
= ADD_LF_BEFORE_NON_EMPTY
;
1625 magic
= ADD_SP_BEFORE_NON_EMPTY
;
1630 if (magic
!= NO_MAGIC
)
1634 if (((struct format_commit_context
*)context
)->flush_type
!= no_flush
)
1635 consumed
= format_and_pad_commit(sb
, placeholder
, context
);
1637 consumed
= format_commit_one(sb
, placeholder
, context
);
1638 if (magic
== NO_MAGIC
)
1641 if ((orig_len
== sb
->len
) && magic
== DEL_LF_BEFORE_EMPTY
) {
1642 while (sb
->len
&& sb
->buf
[sb
->len
- 1] == '\n')
1643 strbuf_setlen(sb
, sb
->len
- 1);
1644 } else if (orig_len
!= sb
->len
) {
1645 if (magic
== ADD_LF_BEFORE_NON_EMPTY
)
1646 strbuf_insertstr(sb
, orig_len
, "\n");
1647 else if (magic
== ADD_SP_BEFORE_NON_EMPTY
)
1648 strbuf_insertstr(sb
, orig_len
, " ");
1650 return consumed
+ 1;
1653 static size_t userformat_want_item(struct strbuf
*sb
, const char *placeholder
,
1656 struct userformat_want
*w
= context
;
1658 if (*placeholder
== '+' || *placeholder
== '-' || *placeholder
== ' ')
1661 switch (*placeholder
) {
1672 void userformat_find_requirements(const char *fmt
, struct userformat_want
*w
)
1674 struct strbuf dummy
= STRBUF_INIT
;
1681 strbuf_expand(&dummy
, fmt
, userformat_want_item
, w
);
1682 strbuf_release(&dummy
);
1685 void repo_format_commit_message(struct repository
*r
,
1686 const struct commit
*commit
,
1687 const char *format
, struct strbuf
*sb
,
1688 const struct pretty_print_context
*pretty_ctx
)
1690 struct format_commit_context context
= {
1693 .pretty_ctx
= pretty_ctx
,
1694 .wrap_start
= sb
->len
1696 const char *output_enc
= pretty_ctx
->output_encoding
;
1697 const char *utf8
= "UTF-8";
1699 strbuf_expand(sb
, format
, format_commit_item
, &context
);
1700 rewrap_message_tail(sb
, &context
, 0, 0, 0);
1703 * Convert output to an actual output encoding; note that
1704 * format_commit_item() will always use UTF-8, so we don't
1705 * have to bother if that's what the output wants.
1708 if (same_encoding(utf8
, output_enc
))
1711 if (context
.commit_encoding
&&
1712 !same_encoding(context
.commit_encoding
, utf8
))
1713 output_enc
= context
.commit_encoding
;
1718 char *out
= reencode_string_len(sb
->buf
, sb
->len
,
1719 output_enc
, utf8
, &outsz
);
1721 strbuf_attach(sb
, out
, outsz
, outsz
+ 1);
1724 free(context
.commit_encoding
);
1725 repo_unuse_commit_buffer(r
, commit
, context
.message
);
1728 static void pp_header(struct pretty_print_context
*pp
,
1729 const char *encoding
,
1730 const struct commit
*commit
,
1734 int parents_shown
= 0;
1737 const char *name
, *line
= *msg_p
;
1738 int linelen
= get_one_line(*msg_p
);
1748 if (pp
->fmt
== CMIT_FMT_RAW
) {
1749 strbuf_add(sb
, line
, linelen
);
1753 if (starts_with(line
, "parent ")) {
1754 if (linelen
!= the_hash_algo
->hexsz
+ 8)
1755 die("bad parent line in commit");
1759 if (!parents_shown
) {
1760 unsigned num
= commit_list_count(commit
->parents
);
1761 /* with enough slop */
1762 strbuf_grow(sb
, num
* (GIT_MAX_HEXSZ
+ 10) + 20);
1763 add_merge_info(pp
, sb
, commit
);
1768 * MEDIUM == DEFAULT shows only author with dates.
1769 * FULL shows both authors but not dates.
1770 * FULLER shows both authors and dates.
1772 if (skip_prefix(line
, "author ", &name
)) {
1773 strbuf_grow(sb
, linelen
+ 80);
1774 pp_user_info(pp
, "Author", sb
, name
, encoding
);
1776 if (skip_prefix(line
, "committer ", &name
) &&
1777 (pp
->fmt
== CMIT_FMT_FULL
|| pp
->fmt
== CMIT_FMT_FULLER
)) {
1778 strbuf_grow(sb
, linelen
+ 80);
1779 pp_user_info(pp
, "Commit", sb
, name
, encoding
);
1784 void pp_title_line(struct pretty_print_context
*pp
,
1787 const char *encoding
,
1790 static const int max_length
= 78; /* per rfc2047 */
1791 struct strbuf title
;
1793 strbuf_init(&title
, 80);
1794 *msg_p
= format_subject(&title
, *msg_p
,
1795 pp
->preserve_subject
? "\n" : " ");
1797 strbuf_grow(sb
, title
.len
+ 1024);
1798 if (pp
->print_email_subject
) {
1800 fmt_output_email_subject(sb
, pp
->rev
);
1801 if (pp
->encode_email_headers
&&
1802 needs_rfc2047_encoding(title
.buf
, title
.len
))
1803 add_rfc2047(sb
, title
.buf
, title
.len
,
1804 encoding
, RFC2047_SUBJECT
);
1806 strbuf_add_wrapped_bytes(sb
, title
.buf
, title
.len
,
1807 -last_line_length(sb
), 1, max_length
);
1809 strbuf_addbuf(sb
, &title
);
1811 strbuf_addch(sb
, '\n');
1813 if (need_8bit_cte
== 0) {
1815 for (i
= 0; i
< pp
->in_body_headers
.nr
; i
++) {
1816 if (has_non_ascii(pp
->in_body_headers
.items
[i
].string
)) {
1823 if (need_8bit_cte
> 0) {
1824 const char *header_fmt
=
1825 "MIME-Version: 1.0\n"
1826 "Content-Type: text/plain; charset=%s\n"
1827 "Content-Transfer-Encoding: 8bit\n";
1828 strbuf_addf(sb
, header_fmt
, encoding
);
1830 if (pp
->after_subject
) {
1831 strbuf_addstr(sb
, pp
->after_subject
);
1833 if (cmit_fmt_is_mail(pp
->fmt
)) {
1834 strbuf_addch(sb
, '\n');
1837 if (pp
->in_body_headers
.nr
) {
1839 for (i
= 0; i
< pp
->in_body_headers
.nr
; i
++) {
1840 strbuf_addstr(sb
, pp
->in_body_headers
.items
[i
].string
);
1841 free(pp
->in_body_headers
.items
[i
].string
);
1843 string_list_clear(&pp
->in_body_headers
, 0);
1844 strbuf_addch(sb
, '\n');
1847 strbuf_release(&title
);
1850 static int pp_utf8_width(const char *start
, const char *end
)
1853 size_t remain
= end
- start
;
1856 int n
= utf8_width(&start
, &remain
);
1857 if (n
< 0 || !start
)
1864 static void strbuf_add_tabexpand(struct strbuf
*sb
, int tabwidth
,
1865 const char *line
, int linelen
)
1869 while ((tab
= memchr(line
, '\t', linelen
)) != NULL
) {
1870 int width
= pp_utf8_width(line
, tab
);
1873 * If it wasn't well-formed utf8, or it
1874 * had characters with badly defined
1875 * width (control characters etc), just
1876 * give up on trying to align things.
1881 /* Output the data .. */
1882 strbuf_add(sb
, line
, tab
- line
);
1884 /* .. and the de-tabified tab */
1885 strbuf_addchars(sb
, ' ', tabwidth
- (width
% tabwidth
));
1887 /* Skip over the printed part .. */
1888 linelen
-= tab
+ 1 - line
;
1893 * Print out everything after the last tab without
1894 * worrying about width - there's nothing more to
1897 strbuf_add(sb
, line
, linelen
);
1901 * pp_handle_indent() prints out the intendation, and
1902 * the whole line (without the final newline), after
1905 static void pp_handle_indent(struct pretty_print_context
*pp
,
1906 struct strbuf
*sb
, int indent
,
1907 const char *line
, int linelen
)
1909 strbuf_addchars(sb
, ' ', indent
);
1910 if (pp
->expand_tabs_in_log
)
1911 strbuf_add_tabexpand(sb
, pp
->expand_tabs_in_log
, line
, linelen
);
1913 strbuf_add(sb
, line
, linelen
);
1916 static int is_mboxrd_from(const char *line
, int len
)
1919 * a line matching /^From $/ here would only have len == 4
1920 * at this point because is_empty_line would've trimmed all
1923 return len
> 4 && starts_with(line
+ strspn(line
, ">"), "From ");
1926 void pp_remainder(struct pretty_print_context
*pp
,
1933 const char *line
= *msg_p
;
1934 int linelen
= get_one_line(line
);
1940 if (is_blank_line(line
, &linelen
)) {
1943 if (pp
->fmt
== CMIT_FMT_SHORT
)
1948 strbuf_grow(sb
, linelen
+ indent
+ 20);
1950 pp_handle_indent(pp
, sb
, indent
, line
, linelen
);
1951 else if (pp
->expand_tabs_in_log
)
1952 strbuf_add_tabexpand(sb
, pp
->expand_tabs_in_log
,
1955 if (pp
->fmt
== CMIT_FMT_MBOXRD
&&
1956 is_mboxrd_from(line
, linelen
))
1957 strbuf_addch(sb
, '>');
1959 strbuf_add(sb
, line
, linelen
);
1961 strbuf_addch(sb
, '\n');
1965 void pretty_print_commit(struct pretty_print_context
*pp
,
1966 const struct commit
*commit
,
1969 unsigned long beginning_of_body
;
1972 const char *reencoded
;
1973 const char *encoding
;
1974 int need_8bit_cte
= pp
->need_8bit_cte
;
1976 if (pp
->fmt
== CMIT_FMT_USERFORMAT
) {
1977 format_commit_message(commit
, user_format
, sb
, pp
);
1981 encoding
= get_log_output_encoding();
1982 msg
= reencoded
= logmsg_reencode(commit
, NULL
, encoding
);
1984 if (pp
->fmt
== CMIT_FMT_ONELINE
|| cmit_fmt_is_mail(pp
->fmt
))
1988 * We need to check and emit Content-type: to mark it
1989 * as 8-bit if we haven't done so.
1991 if (cmit_fmt_is_mail(pp
->fmt
) && need_8bit_cte
== 0) {
1994 for (in_body
= i
= 0; (ch
= msg
[i
]); i
++) {
1996 /* author could be non 7-bit ASCII but
1997 * the log may be so; skip over the
1998 * header part first.
2000 if (ch
== '\n' && msg
[i
+1] == '\n')
2003 else if (non_ascii(ch
)) {
2010 pp_header(pp
, encoding
, commit
, &msg
, sb
);
2011 if (pp
->fmt
!= CMIT_FMT_ONELINE
&& !pp
->print_email_subject
) {
2012 strbuf_addch(sb
, '\n');
2015 /* Skip excess blank lines at the beginning of body, if any... */
2016 msg
= skip_blank_lines(msg
);
2018 /* These formats treat the title line specially. */
2019 if (pp
->fmt
== CMIT_FMT_ONELINE
|| cmit_fmt_is_mail(pp
->fmt
))
2020 pp_title_line(pp
, &msg
, sb
, encoding
, need_8bit_cte
);
2022 beginning_of_body
= sb
->len
;
2023 if (pp
->fmt
!= CMIT_FMT_ONELINE
)
2024 pp_remainder(pp
, &msg
, sb
, indent
);
2027 /* Make sure there is an EOLN for the non-oneline case */
2028 if (pp
->fmt
!= CMIT_FMT_ONELINE
)
2029 strbuf_addch(sb
, '\n');
2032 * The caller may append additional body text in e-mail
2033 * format. Make sure we did not strip the blank line
2034 * between the header and the body.
2036 if (cmit_fmt_is_mail(pp
->fmt
) && sb
->len
<= beginning_of_body
)
2037 strbuf_addch(sb
, '\n');
2039 unuse_commit_buffer(commit
, reencoded
);
2042 void pp_commit_easy(enum cmit_fmt fmt
, const struct commit
*commit
,
2045 struct pretty_print_context pp
= {0};
2047 pretty_print_commit(&pp
, commit
, sb
);