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.
675 warning("unable to reencode commit to '%s'", output_encoding
);
681 static int mailmap_name(const char **email
, size_t *email_len
,
682 const char **name
, size_t *name_len
)
684 static struct string_list
*mail_map
;
686 CALLOC_ARRAY(mail_map
, 1);
687 read_mailmap(mail_map
);
689 return mail_map
->nr
&& map_user(mail_map
, email
, email_len
, name
, name_len
);
692 static size_t format_person_part(struct strbuf
*sb
, char part
,
693 const char *msg
, int len
,
694 const struct date_mode
*dmode
)
696 /* currently all placeholders have same length */
697 const int placeholder_len
= 2;
698 struct ident_split s
;
699 const char *name
, *mail
;
700 size_t maillen
, namelen
;
702 if (split_ident_line(&s
, msg
, len
) < 0)
706 namelen
= s
.name_end
- s
.name_begin
;
708 maillen
= s
.mail_end
- s
.mail_begin
;
710 if (part
== 'N' || part
== 'E' || part
== 'L') /* mailmap lookup */
711 mailmap_name(&mail
, &maillen
, &name
, &namelen
);
712 if (part
== 'n' || part
== 'N') { /* name */
713 strbuf_add(sb
, name
, namelen
);
714 return placeholder_len
;
716 if (part
== 'e' || part
== 'E') { /* email */
717 strbuf_add(sb
, mail
, maillen
);
718 return placeholder_len
;
720 if (part
== 'l' || part
== 'L') { /* local-part */
721 const char *at
= memchr(mail
, '@', maillen
);
724 strbuf_add(sb
, mail
, maillen
);
725 return placeholder_len
;
731 if (part
== 't') { /* date, UNIX timestamp */
732 strbuf_add(sb
, s
.date_begin
, s
.date_end
- s
.date_begin
);
733 return placeholder_len
;
738 strbuf_addstr(sb
, show_ident_date(&s
, dmode
));
739 return placeholder_len
;
740 case 'D': /* date, RFC2822 style */
741 strbuf_addstr(sb
, show_ident_date(&s
, DATE_MODE(RFC2822
)));
742 return placeholder_len
;
743 case 'r': /* date, relative */
744 strbuf_addstr(sb
, show_ident_date(&s
, DATE_MODE(RELATIVE
)));
745 return placeholder_len
;
746 case 'i': /* date, ISO 8601-like */
747 strbuf_addstr(sb
, show_ident_date(&s
, DATE_MODE(ISO8601
)));
748 return placeholder_len
;
749 case 'I': /* date, ISO 8601 strict */
750 strbuf_addstr(sb
, show_ident_date(&s
, DATE_MODE(ISO8601_STRICT
)));
751 return placeholder_len
;
752 case 'h': /* date, human */
753 strbuf_addstr(sb
, show_ident_date(&s
, DATE_MODE(HUMAN
)));
754 return placeholder_len
;
756 strbuf_addstr(sb
, show_ident_date(&s
, DATE_MODE(SHORT
)));
757 return placeholder_len
;
762 * reading from either a bogus commit, or a reflog entry with
763 * %gn, %ge, etc.; 'sb' cannot be updated, but we still need
764 * to compute a valid return value.
766 if (part
== 'n' || part
== 'e' || part
== 't' || part
== 'd'
767 || part
== 'D' || part
== 'r' || part
== 'i')
768 return placeholder_len
;
770 return 0; /* unknown placeholder */
782 flush_left_and_steal
,
793 struct format_commit_context
{
794 struct repository
*repository
;
795 const struct commit
*commit
;
796 const struct pretty_print_context
*pretty_ctx
;
797 unsigned commit_header_parsed
:1;
798 unsigned commit_message_parsed
:1;
799 struct signature_check signature_check
;
800 enum flush_type flush_type
;
801 enum trunc_type truncate
;
803 char *commit_encoding
;
804 size_t width
, indent1
, indent2
;
808 /* These offsets are relative to the start of the commit message. */
810 struct chunk committer
;
815 /* The following ones are relative to the result struct strbuf. */
819 static void parse_commit_header(struct format_commit_context
*context
)
821 const char *msg
= context
->message
;
824 for (i
= 0; msg
[i
]; i
++) {
827 for (eol
= i
; msg
[eol
] && msg
[eol
] != '\n'; eol
++)
832 } else if (skip_prefix(msg
+ i
, "author ", &name
)) {
833 context
->author
.off
= name
- msg
;
834 context
->author
.len
= msg
+ eol
- name
;
835 } else if (skip_prefix(msg
+ i
, "committer ", &name
)) {
836 context
->committer
.off
= name
- msg
;
837 context
->committer
.len
= msg
+ eol
- name
;
841 context
->message_off
= i
;
842 context
->commit_header_parsed
= 1;
845 static int istitlechar(char c
)
847 return (c
>= 'a' && c
<= 'z') || (c
>= 'A' && c
<= 'Z') ||
848 (c
>= '0' && c
<= '9') || c
== '.' || c
== '_';
851 void format_sanitized_subject(struct strbuf
*sb
, const char *msg
, size_t len
)
854 size_t start_len
= sb
->len
;
858 for (i
= 0; i
< len
; i
++) {
859 if (istitlechar(msg
[i
])) {
861 strbuf_addch(sb
, '-');
863 strbuf_addch(sb
, msg
[i
]);
865 while (msg
[i
+1] == '.')
871 /* trim any trailing '.' or '-' characters */
873 while (sb
->len
- trimlen
> start_len
&&
874 (sb
->buf
[sb
->len
- 1 - trimlen
] == '.'
875 || sb
->buf
[sb
->len
- 1 - trimlen
] == '-'))
877 strbuf_remove(sb
, sb
->len
- trimlen
, trimlen
);
880 const char *format_subject(struct strbuf
*sb
, const char *msg
,
881 const char *line_separator
)
886 const char *line
= msg
;
887 int linelen
= get_one_line(line
);
890 if (!linelen
|| is_blank_line(line
, &linelen
))
895 strbuf_grow(sb
, linelen
+ 2);
897 strbuf_addstr(sb
, line_separator
);
898 strbuf_add(sb
, line
, linelen
);
904 static void parse_commit_message(struct format_commit_context
*c
)
906 const char *msg
= c
->message
+ c
->message_off
;
907 const char *start
= c
->message
;
909 msg
= skip_blank_lines(msg
);
910 c
->subject_off
= msg
- start
;
912 msg
= format_subject(NULL
, msg
, NULL
);
913 msg
= skip_blank_lines(msg
);
914 c
->body_off
= msg
- start
;
916 c
->commit_message_parsed
= 1;
919 static void strbuf_wrap(struct strbuf
*sb
, size_t pos
,
920 size_t width
, size_t indent1
, size_t indent2
)
922 struct strbuf tmp
= STRBUF_INIT
;
925 strbuf_add(&tmp
, sb
->buf
, pos
);
926 strbuf_add_wrapped_text(&tmp
, sb
->buf
+ pos
,
927 (int) indent1
, (int) indent2
, (int) width
);
928 strbuf_swap(&tmp
, sb
);
929 strbuf_release(&tmp
);
932 static void rewrap_message_tail(struct strbuf
*sb
,
933 struct format_commit_context
*c
,
934 size_t new_width
, size_t new_indent1
,
937 if (c
->width
== new_width
&& c
->indent1
== new_indent1
&&
938 c
->indent2
== new_indent2
)
940 if (c
->wrap_start
< sb
->len
)
941 strbuf_wrap(sb
, c
->wrap_start
, c
->width
, c
->indent1
, c
->indent2
);
942 c
->wrap_start
= sb
->len
;
943 c
->width
= new_width
;
944 c
->indent1
= new_indent1
;
945 c
->indent2
= new_indent2
;
948 static int format_reflog_person(struct strbuf
*sb
,
950 struct reflog_walk_info
*log
,
951 const struct date_mode
*dmode
)
958 ident
= get_reflog_ident(log
);
962 return format_person_part(sb
, part
, ident
, strlen(ident
), dmode
);
965 static size_t parse_color(struct strbuf
*sb
, /* in UTF-8 */
966 const char *placeholder
,
967 struct format_commit_context
*c
)
969 const char *rest
= placeholder
;
970 const char *basic_color
= NULL
;
972 if (placeholder
[1] == '(') {
973 const char *begin
= placeholder
+ 2;
974 const char *end
= strchr(begin
, ')');
975 char color
[COLOR_MAXLEN
];
980 if (skip_prefix(begin
, "auto,", &begin
)) {
981 if (!want_color(c
->pretty_ctx
->color
))
982 return end
- placeholder
+ 1;
983 } else if (skip_prefix(begin
, "always,", &begin
)) {
984 /* nothing to do; we do not respect want_color at all */
986 /* the default is the same as "auto" */
987 if (!want_color(c
->pretty_ctx
->color
))
988 return end
- placeholder
+ 1;
991 if (color_parse_mem(begin
, end
- begin
, color
) < 0)
992 die(_("unable to parse --pretty format"));
993 strbuf_addstr(sb
, color
);
994 return end
- placeholder
+ 1;
998 * We handle things like "%C(red)" above; for historical reasons, there
999 * are a few colors that can be specified without parentheses (and
1000 * they cannot support things like "auto" or "always" at all).
1002 if (skip_prefix(placeholder
+ 1, "red", &rest
))
1003 basic_color
= GIT_COLOR_RED
;
1004 else if (skip_prefix(placeholder
+ 1, "green", &rest
))
1005 basic_color
= GIT_COLOR_GREEN
;
1006 else if (skip_prefix(placeholder
+ 1, "blue", &rest
))
1007 basic_color
= GIT_COLOR_BLUE
;
1008 else if (skip_prefix(placeholder
+ 1, "reset", &rest
))
1009 basic_color
= GIT_COLOR_RESET
;
1011 if (basic_color
&& want_color(c
->pretty_ctx
->color
))
1012 strbuf_addstr(sb
, basic_color
);
1014 return rest
- placeholder
;
1017 static size_t parse_padding_placeholder(const char *placeholder
,
1018 struct format_commit_context
*c
)
1020 const char *ch
= placeholder
;
1021 enum flush_type flush_type
;
1026 flush_type
= flush_right
;
1030 flush_type
= flush_both
;
1032 } else if (*ch
== '>') {
1033 flush_type
= flush_left_and_steal
;
1036 flush_type
= flush_left
;
1042 /* the next value means "wide enough to that column" */
1049 const char *start
= ch
+ 1;
1050 const char *end
= start
+ strcspn(start
, ",)");
1053 if (!end
|| end
== start
)
1055 width
= strtol(start
, &next
, 10);
1056 if (next
== start
|| width
== 0)
1060 width
+= term_columns();
1064 c
->padding
= to_column
? -width
: width
;
1065 c
->flush_type
= flush_type
;
1069 end
= strchr(start
, ')');
1070 if (!end
|| end
== start
)
1072 if (starts_with(start
, "trunc)"))
1073 c
->truncate
= trunc_right
;
1074 else if (starts_with(start
, "ltrunc)"))
1075 c
->truncate
= trunc_left
;
1076 else if (starts_with(start
, "mtrunc)"))
1077 c
->truncate
= trunc_middle
;
1081 c
->truncate
= trunc_none
;
1083 return end
- placeholder
+ 1;
1088 static int match_placeholder_arg_value(const char *to_parse
, const char *candidate
,
1089 const char **end
, const char **valuestart
,
1094 if (!(skip_prefix(to_parse
, candidate
, &p
)))
1098 *valuestart
= p
+ 1;
1099 *valuelen
= strcspn(*valuestart
, ",)");
1100 p
= *valuestart
+ *valuelen
;
1102 if (*p
!= ',' && *p
!= ')')
1119 static int match_placeholder_bool_arg(const char *to_parse
, const char *candidate
,
1120 const char **end
, int *val
)
1127 if (!match_placeholder_arg_value(to_parse
, candidate
, end
, &argval
, &arglen
))
1135 strval
= xstrndup(argval
, arglen
);
1136 v
= git_parse_maybe_bool(strval
);
1147 static int format_trailer_match_cb(const struct strbuf
*key
, void *ud
)
1149 const struct string_list
*list
= ud
;
1150 const struct string_list_item
*item
;
1152 for_each_string_list_item (item
, list
) {
1153 if (key
->len
== (uintptr_t)item
->util
&&
1154 !strncasecmp(item
->string
, key
->buf
, key
->len
))
1160 int format_set_trailers_options(struct process_trailer_options
*opts
,
1161 struct string_list
*filter_list
,
1162 struct strbuf
*sepbuf
,
1163 struct strbuf
*kvsepbuf
,
1174 if (match_placeholder_arg_value(*arg
, "key", arg
, &argval
, &arglen
)) {
1175 uintptr_t len
= arglen
;
1180 if (len
&& argval
[len
- 1] == ':')
1182 string_list_append(filter_list
, argval
)->util
= (char *)len
;
1184 opts
->filter
= format_trailer_match_cb
;
1185 opts
->filter_data
= filter_list
;
1186 opts
->only_trailers
= 1;
1187 } else if (match_placeholder_arg_value(*arg
, "separator", arg
, &argval
, &arglen
)) {
1190 strbuf_reset(sepbuf
);
1191 fmt
= xstrndup(argval
, arglen
);
1192 strbuf_expand(sepbuf
, fmt
, strbuf_expand_literal_cb
, NULL
);
1194 opts
->separator
= sepbuf
;
1195 } else if (match_placeholder_arg_value(*arg
, "key_value_separator", arg
, &argval
, &arglen
)) {
1198 strbuf_reset(kvsepbuf
);
1199 fmt
= xstrndup(argval
, arglen
);
1200 strbuf_expand(kvsepbuf
, fmt
, strbuf_expand_literal_cb
, NULL
);
1202 opts
->key_value_separator
= kvsepbuf
;
1203 } else if (!match_placeholder_bool_arg(*arg
, "only", arg
, &opts
->only_trailers
) &&
1204 !match_placeholder_bool_arg(*arg
, "unfold", arg
, &opts
->unfold
) &&
1205 !match_placeholder_bool_arg(*arg
, "keyonly", arg
, &opts
->key_only
) &&
1206 !match_placeholder_bool_arg(*arg
, "valueonly", arg
, &opts
->value_only
)) {
1208 size_t len
= strcspn(*arg
, ",)");
1209 *invalid_arg
= xstrndup(*arg
, len
);
1217 static size_t parse_describe_args(const char *start
, struct strvec
*args
)
1219 const char *options
[] = { "match", "exclude" };
1220 const char *arg
= start
;
1223 const char *matched
= NULL
;
1228 for (i
= 0; i
< ARRAY_SIZE(options
); i
++) {
1229 if (match_placeholder_arg_value(arg
, options
[i
], &arg
,
1230 &argval
, &arglen
)) {
1231 matched
= options
[i
];
1240 strvec_pushf(args
, "--%s=%.*s", matched
, (int)arglen
, argval
);
1245 static size_t format_commit_one(struct strbuf
*sb
, /* in UTF-8 */
1246 const char *placeholder
,
1249 struct format_commit_context
*c
= context
;
1250 const struct commit
*commit
= c
->commit
;
1251 const char *msg
= c
->message
;
1252 struct commit_list
*p
;
1253 const char *arg
, *eol
;
1257 /* these are independent of the commit */
1258 res
= strbuf_expand_literal_cb(sb
, placeholder
, NULL
);
1262 switch (placeholder
[0]) {
1264 if (starts_with(placeholder
+ 1, "(auto)")) {
1265 c
->auto_color
= want_color(c
->pretty_ctx
->color
);
1266 if (c
->auto_color
&& sb
->len
)
1267 strbuf_addstr(sb
, GIT_COLOR_RESET
);
1268 return 7; /* consumed 7 bytes, "C(auto)" */
1270 int ret
= parse_color(sb
, placeholder
, c
);
1274 * Otherwise, we decided to treat %C<unknown>
1275 * as a literal string, and the previous
1276 * %C(auto) is still valid.
1281 if (placeholder
[1] == '(') {
1282 unsigned long width
= 0, indent1
= 0, indent2
= 0;
1284 const char *start
= placeholder
+ 2;
1285 const char *end
= strchr(start
, ')');
1289 width
= strtoul(start
, &next
, 10);
1291 indent1
= strtoul(next
+ 1, &next
, 10);
1293 indent2
= strtoul(next
+ 1,
1300 rewrap_message_tail(sb
, c
, width
, indent1
, indent2
);
1301 return end
- placeholder
+ 1;
1307 return parse_padding_placeholder(placeholder
, c
);
1310 if (skip_prefix(placeholder
, "(describe", &arg
)) {
1311 struct child_process cmd
= CHILD_PROCESS_INIT
;
1312 struct strbuf out
= STRBUF_INIT
;
1313 struct strbuf err
= STRBUF_INIT
;
1314 struct pretty_print_describe_status
*describe_status
;
1316 describe_status
= c
->pretty_ctx
->describe_status
;
1317 if (describe_status
) {
1318 if (!describe_status
->max_invocations
)
1320 describe_status
->max_invocations
--;
1324 strvec_push(&cmd
.args
, "describe");
1328 arg
+= parse_describe_args(arg
, &cmd
.args
);
1332 child_process_clear(&cmd
);
1336 strvec_push(&cmd
.args
, oid_to_hex(&commit
->object
.oid
));
1337 pipe_command(&cmd
, NULL
, 0, &out
, 0, &err
, 0);
1339 strbuf_addbuf(sb
, &out
);
1340 strbuf_release(&out
);
1341 strbuf_release(&err
);
1342 return arg
- placeholder
+ 1;
1345 /* these depend on the commit */
1346 if (!commit
->object
.parsed
)
1347 parse_object(the_repository
, &commit
->object
.oid
);
1349 switch (placeholder
[0]) {
1350 case 'H': /* commit hash */
1351 strbuf_addstr(sb
, diff_get_color(c
->auto_color
, DIFF_COMMIT
));
1352 strbuf_addstr(sb
, oid_to_hex(&commit
->object
.oid
));
1353 strbuf_addstr(sb
, diff_get_color(c
->auto_color
, DIFF_RESET
));
1355 case 'h': /* abbreviated commit hash */
1356 strbuf_addstr(sb
, diff_get_color(c
->auto_color
, DIFF_COMMIT
));
1357 strbuf_add_unique_abbrev(sb
, &commit
->object
.oid
,
1358 c
->pretty_ctx
->abbrev
);
1359 strbuf_addstr(sb
, diff_get_color(c
->auto_color
, DIFF_RESET
));
1361 case 'T': /* tree hash */
1362 strbuf_addstr(sb
, oid_to_hex(get_commit_tree_oid(commit
)));
1364 case 't': /* abbreviated tree hash */
1365 strbuf_add_unique_abbrev(sb
,
1366 get_commit_tree_oid(commit
),
1367 c
->pretty_ctx
->abbrev
);
1369 case 'P': /* parent hashes */
1370 for (p
= commit
->parents
; p
; p
= p
->next
) {
1371 if (p
!= commit
->parents
)
1372 strbuf_addch(sb
, ' ');
1373 strbuf_addstr(sb
, oid_to_hex(&p
->item
->object
.oid
));
1376 case 'p': /* abbreviated parent hashes */
1377 for (p
= commit
->parents
; p
; p
= p
->next
) {
1378 if (p
!= commit
->parents
)
1379 strbuf_addch(sb
, ' ');
1380 strbuf_add_unique_abbrev(sb
, &p
->item
->object
.oid
,
1381 c
->pretty_ctx
->abbrev
);
1384 case 'm': /* left/right/bottom */
1385 strbuf_addstr(sb
, get_revision_mark(NULL
, commit
));
1388 format_decorations(sb
, commit
, c
->auto_color
);
1391 format_decorations_extended(sb
, commit
, c
->auto_color
, "", ", ", "");
1393 case 'S': /* tag/branch like --source */
1394 if (!(c
->pretty_ctx
->rev
&& c
->pretty_ctx
->rev
->sources
))
1396 slot
= revision_sources_at(c
->pretty_ctx
->rev
->sources
, commit
);
1397 if (!(slot
&& *slot
))
1399 strbuf_addstr(sb
, *slot
);
1401 case 'g': /* reflog info */
1402 switch(placeholder
[1]) {
1403 case 'd': /* reflog selector */
1405 if (c
->pretty_ctx
->reflog_info
)
1406 get_reflog_selector(sb
,
1407 c
->pretty_ctx
->reflog_info
,
1408 &c
->pretty_ctx
->date_mode
,
1409 c
->pretty_ctx
->date_mode_explicit
,
1410 (placeholder
[1] == 'd'));
1412 case 's': /* reflog message */
1413 if (c
->pretty_ctx
->reflog_info
)
1414 get_reflog_message(sb
, c
->pretty_ctx
->reflog_info
);
1420 return format_reflog_person(sb
,
1422 c
->pretty_ctx
->reflog_info
,
1423 &c
->pretty_ctx
->date_mode
);
1425 return 0; /* unknown %g placeholder */
1427 if (c
->pretty_ctx
->notes_message
) {
1428 strbuf_addstr(sb
, c
->pretty_ctx
->notes_message
);
1434 if (placeholder
[0] == 'G') {
1435 if (!c
->signature_check
.result
)
1436 check_commit_signature(c
->commit
, &(c
->signature_check
));
1437 switch (placeholder
[1]) {
1439 if (c
->signature_check
.gpg_output
)
1440 strbuf_addstr(sb
, c
->signature_check
.gpg_output
);
1443 switch (c
->signature_check
.result
) {
1445 switch (c
->signature_check
.trust_level
) {
1446 case TRUST_UNDEFINED
:
1448 strbuf_addch(sb
, 'U');
1451 strbuf_addch(sb
, 'G');
1461 strbuf_addch(sb
, c
->signature_check
.result
);
1465 if (c
->signature_check
.signer
)
1466 strbuf_addstr(sb
, c
->signature_check
.signer
);
1469 if (c
->signature_check
.key
)
1470 strbuf_addstr(sb
, c
->signature_check
.key
);
1473 if (c
->signature_check
.fingerprint
)
1474 strbuf_addstr(sb
, c
->signature_check
.fingerprint
);
1477 if (c
->signature_check
.primary_key_fingerprint
)
1478 strbuf_addstr(sb
, c
->signature_check
.primary_key_fingerprint
);
1481 switch (c
->signature_check
.trust_level
) {
1482 case TRUST_UNDEFINED
:
1483 strbuf_addstr(sb
, "undefined");
1486 strbuf_addstr(sb
, "never");
1488 case TRUST_MARGINAL
:
1489 strbuf_addstr(sb
, "marginal");
1492 strbuf_addstr(sb
, "fully");
1494 case TRUST_ULTIMATE
:
1495 strbuf_addstr(sb
, "ultimate");
1505 /* For the rest we have to parse the commit header. */
1506 if (!c
->commit_header_parsed
) {
1508 repo_logmsg_reencode(c
->repository
, commit
,
1509 &c
->commit_encoding
, "UTF-8");
1510 parse_commit_header(c
);
1513 switch (placeholder
[0]) {
1514 case 'a': /* author ... */
1515 return format_person_part(sb
, placeholder
[1],
1516 msg
+ c
->author
.off
, c
->author
.len
,
1517 &c
->pretty_ctx
->date_mode
);
1518 case 'c': /* committer ... */
1519 return format_person_part(sb
, placeholder
[1],
1520 msg
+ c
->committer
.off
, c
->committer
.len
,
1521 &c
->pretty_ctx
->date_mode
);
1522 case 'e': /* encoding */
1523 if (c
->commit_encoding
)
1524 strbuf_addstr(sb
, c
->commit_encoding
);
1526 case 'B': /* raw body */
1527 /* message_off is always left at the initial newline */
1528 strbuf_addstr(sb
, msg
+ c
->message_off
+ 1);
1532 /* Now we need to parse the commit message. */
1533 if (!c
->commit_message_parsed
)
1534 parse_commit_message(c
);
1536 switch (placeholder
[0]) {
1537 case 's': /* subject */
1538 format_subject(sb
, msg
+ c
->subject_off
, " ");
1540 case 'f': /* sanitized subject */
1541 eol
= strchrnul(msg
+ c
->subject_off
, '\n');
1542 format_sanitized_subject(sb
, msg
+ c
->subject_off
, eol
- (msg
+ c
->subject_off
));
1544 case 'b': /* body */
1545 strbuf_addstr(sb
, msg
+ c
->body_off
);
1549 if (skip_prefix(placeholder
, "(trailers", &arg
)) {
1550 struct process_trailer_options opts
= PROCESS_TRAILER_OPTIONS_INIT
;
1551 struct string_list filter_list
= STRING_LIST_INIT_NODUP
;
1552 struct strbuf sepbuf
= STRBUF_INIT
;
1553 struct strbuf kvsepbuf
= STRBUF_INIT
;
1556 opts
.no_divider
= 1;
1560 if (format_set_trailers_options(&opts
, &filter_list
, &sepbuf
, &kvsepbuf
, &arg
, NULL
))
1564 format_trailers_from_commit(sb
, msg
+ c
->subject_off
, &opts
);
1565 ret
= arg
- placeholder
+ 1;
1568 string_list_clear(&filter_list
, 0);
1569 strbuf_release(&sepbuf
);
1573 return 0; /* unknown placeholder */
1576 static size_t format_and_pad_commit(struct strbuf
*sb
, /* in UTF-8 */
1577 const char *placeholder
,
1578 struct format_commit_context
*c
)
1580 struct strbuf local_sb
= STRBUF_INIT
;
1581 int total_consumed
= 0, len
, padding
= c
->padding
;
1583 const char *start
= strrchr(sb
->buf
, '\n');
1587 occupied
= utf8_strnwidth(start
, -1, 1);
1588 occupied
+= c
->pretty_ctx
->graph_width
;
1589 padding
= (-padding
) - occupied
;
1592 int modifier
= *placeholder
== 'C';
1593 int consumed
= format_commit_one(&local_sb
, placeholder
, c
);
1594 total_consumed
+= consumed
;
1599 placeholder
+= consumed
;
1600 if (*placeholder
!= '%')
1605 len
= utf8_strnwidth(local_sb
.buf
, -1, 1);
1607 if (c
->flush_type
== flush_left_and_steal
) {
1608 const char *ch
= sb
->buf
+ sb
->len
- 1;
1609 while (len
> padding
&& ch
> sb
->buf
) {
1616 /* check for trailing ansi sequences */
1620 while (ch
- p
< 10 && *p
!= '\033')
1623 ch
+ 1 - p
!= display_mode_esc_sequence_len(p
))
1626 * got a good ansi sequence, put it back to
1627 * local_sb as we're cutting sb
1629 strbuf_insert(&local_sb
, 0, p
, ch
+ 1 - p
);
1632 strbuf_setlen(sb
, ch
+ 1 - sb
->buf
);
1633 c
->flush_type
= flush_left
;
1636 if (len
> padding
) {
1637 switch (c
->truncate
) {
1639 strbuf_utf8_replace(&local_sb
,
1640 0, len
- (padding
- 2),
1644 strbuf_utf8_replace(&local_sb
,
1646 len
- (padding
- 2),
1650 strbuf_utf8_replace(&local_sb
,
1651 padding
- 2, len
- (padding
- 2),
1657 strbuf_addbuf(sb
, &local_sb
);
1659 int sb_len
= sb
->len
, offset
= 0;
1660 if (c
->flush_type
== flush_left
)
1661 offset
= padding
- len
;
1662 else if (c
->flush_type
== flush_both
)
1663 offset
= (padding
- len
) / 2;
1665 * we calculate padding in columns, now
1666 * convert it back to chars
1668 padding
= padding
- len
+ local_sb
.len
;
1669 strbuf_addchars(sb
, ' ', padding
);
1670 memcpy(sb
->buf
+ sb_len
+ offset
, local_sb
.buf
,
1673 strbuf_release(&local_sb
);
1674 c
->flush_type
= no_flush
;
1675 return total_consumed
;
1678 static size_t format_commit_item(struct strbuf
*sb
, /* in UTF-8 */
1679 const char *placeholder
,
1686 ADD_LF_BEFORE_NON_EMPTY
,
1687 DEL_LF_BEFORE_EMPTY
,
1688 ADD_SP_BEFORE_NON_EMPTY
1691 switch (placeholder
[0]) {
1693 magic
= DEL_LF_BEFORE_EMPTY
;
1696 magic
= ADD_LF_BEFORE_NON_EMPTY
;
1699 magic
= ADD_SP_BEFORE_NON_EMPTY
;
1704 if (magic
!= NO_MAGIC
)
1708 if (((struct format_commit_context
*)context
)->flush_type
!= no_flush
)
1709 consumed
= format_and_pad_commit(sb
, placeholder
, context
);
1711 consumed
= format_commit_one(sb
, placeholder
, context
);
1712 if (magic
== NO_MAGIC
)
1715 if ((orig_len
== sb
->len
) && magic
== DEL_LF_BEFORE_EMPTY
) {
1716 while (sb
->len
&& sb
->buf
[sb
->len
- 1] == '\n')
1717 strbuf_setlen(sb
, sb
->len
- 1);
1718 } else if (orig_len
!= sb
->len
) {
1719 if (magic
== ADD_LF_BEFORE_NON_EMPTY
)
1720 strbuf_insertstr(sb
, orig_len
, "\n");
1721 else if (magic
== ADD_SP_BEFORE_NON_EMPTY
)
1722 strbuf_insertstr(sb
, orig_len
, " ");
1724 return consumed
+ 1;
1727 static size_t userformat_want_item(struct strbuf
*sb
, const char *placeholder
,
1730 struct userformat_want
*w
= context
;
1732 if (*placeholder
== '+' || *placeholder
== '-' || *placeholder
== ' ')
1735 switch (*placeholder
) {
1750 void userformat_find_requirements(const char *fmt
, struct userformat_want
*w
)
1752 struct strbuf dummy
= STRBUF_INIT
;
1759 strbuf_expand(&dummy
, fmt
, userformat_want_item
, w
);
1760 strbuf_release(&dummy
);
1763 void repo_format_commit_message(struct repository
*r
,
1764 const struct commit
*commit
,
1765 const char *format
, struct strbuf
*sb
,
1766 const struct pretty_print_context
*pretty_ctx
)
1768 struct format_commit_context context
= {
1771 .pretty_ctx
= pretty_ctx
,
1772 .wrap_start
= sb
->len
1774 const char *output_enc
= pretty_ctx
->output_encoding
;
1775 const char *utf8
= "UTF-8";
1777 strbuf_expand(sb
, format
, format_commit_item
, &context
);
1778 rewrap_message_tail(sb
, &context
, 0, 0, 0);
1781 * Convert output to an actual output encoding; note that
1782 * format_commit_item() will always use UTF-8, so we don't
1783 * have to bother if that's what the output wants.
1786 if (same_encoding(utf8
, output_enc
))
1789 if (context
.commit_encoding
&&
1790 !same_encoding(context
.commit_encoding
, utf8
))
1791 output_enc
= context
.commit_encoding
;
1796 char *out
= reencode_string_len(sb
->buf
, sb
->len
,
1797 output_enc
, utf8
, &outsz
);
1799 strbuf_attach(sb
, out
, outsz
, outsz
+ 1);
1802 free(context
.commit_encoding
);
1803 repo_unuse_commit_buffer(r
, commit
, context
.message
);
1806 static void pp_header(struct pretty_print_context
*pp
,
1807 const char *encoding
,
1808 const struct commit
*commit
,
1812 int parents_shown
= 0;
1815 const char *name
, *line
= *msg_p
;
1816 int linelen
= get_one_line(*msg_p
);
1826 if (pp
->fmt
== CMIT_FMT_RAW
) {
1827 strbuf_add(sb
, line
, linelen
);
1831 if (starts_with(line
, "parent ")) {
1832 if (linelen
!= the_hash_algo
->hexsz
+ 8)
1833 die("bad parent line in commit");
1837 if (!parents_shown
) {
1838 unsigned num
= commit_list_count(commit
->parents
);
1839 /* with enough slop */
1840 strbuf_grow(sb
, num
* (GIT_MAX_HEXSZ
+ 10) + 20);
1841 add_merge_info(pp
, sb
, commit
);
1846 * MEDIUM == DEFAULT shows only author with dates.
1847 * FULL shows both authors but not dates.
1848 * FULLER shows both authors and dates.
1850 if (skip_prefix(line
, "author ", &name
)) {
1851 strbuf_grow(sb
, linelen
+ 80);
1852 pp_user_info(pp
, "Author", sb
, name
, encoding
);
1854 if (skip_prefix(line
, "committer ", &name
) &&
1855 (pp
->fmt
== CMIT_FMT_FULL
|| pp
->fmt
== CMIT_FMT_FULLER
)) {
1856 strbuf_grow(sb
, linelen
+ 80);
1857 pp_user_info(pp
, "Commit", sb
, name
, encoding
);
1862 void pp_title_line(struct pretty_print_context
*pp
,
1865 const char *encoding
,
1868 static const int max_length
= 78; /* per rfc2047 */
1869 struct strbuf title
;
1871 strbuf_init(&title
, 80);
1872 *msg_p
= format_subject(&title
, *msg_p
,
1873 pp
->preserve_subject
? "\n" : " ");
1875 strbuf_grow(sb
, title
.len
+ 1024);
1876 if (pp
->print_email_subject
) {
1878 fmt_output_email_subject(sb
, pp
->rev
);
1879 if (pp
->encode_email_headers
&&
1880 needs_rfc2047_encoding(title
.buf
, title
.len
))
1881 add_rfc2047(sb
, title
.buf
, title
.len
,
1882 encoding
, RFC2047_SUBJECT
);
1884 strbuf_add_wrapped_bytes(sb
, title
.buf
, title
.len
,
1885 -last_line_length(sb
), 1, max_length
);
1887 strbuf_addbuf(sb
, &title
);
1889 strbuf_addch(sb
, '\n');
1891 if (need_8bit_cte
== 0) {
1893 for (i
= 0; i
< pp
->in_body_headers
.nr
; i
++) {
1894 if (has_non_ascii(pp
->in_body_headers
.items
[i
].string
)) {
1901 if (need_8bit_cte
> 0) {
1902 const char *header_fmt
=
1903 "MIME-Version: 1.0\n"
1904 "Content-Type: text/plain; charset=%s\n"
1905 "Content-Transfer-Encoding: 8bit\n";
1906 strbuf_addf(sb
, header_fmt
, encoding
);
1908 if (pp
->after_subject
) {
1909 strbuf_addstr(sb
, pp
->after_subject
);
1911 if (cmit_fmt_is_mail(pp
->fmt
)) {
1912 strbuf_addch(sb
, '\n');
1915 if (pp
->in_body_headers
.nr
) {
1917 for (i
= 0; i
< pp
->in_body_headers
.nr
; i
++) {
1918 strbuf_addstr(sb
, pp
->in_body_headers
.items
[i
].string
);
1919 free(pp
->in_body_headers
.items
[i
].string
);
1921 string_list_clear(&pp
->in_body_headers
, 0);
1922 strbuf_addch(sb
, '\n');
1925 strbuf_release(&title
);
1928 static int pp_utf8_width(const char *start
, const char *end
)
1931 size_t remain
= end
- start
;
1934 int n
= utf8_width(&start
, &remain
);
1935 if (n
< 0 || !start
)
1942 static void strbuf_add_tabexpand(struct strbuf
*sb
, int tabwidth
,
1943 const char *line
, int linelen
)
1947 while ((tab
= memchr(line
, '\t', linelen
)) != NULL
) {
1948 int width
= pp_utf8_width(line
, tab
);
1951 * If it wasn't well-formed utf8, or it
1952 * had characters with badly defined
1953 * width (control characters etc), just
1954 * give up on trying to align things.
1959 /* Output the data .. */
1960 strbuf_add(sb
, line
, tab
- line
);
1962 /* .. and the de-tabified tab */
1963 strbuf_addchars(sb
, ' ', tabwidth
- (width
% tabwidth
));
1965 /* Skip over the printed part .. */
1966 linelen
-= tab
+ 1 - line
;
1971 * Print out everything after the last tab without
1972 * worrying about width - there's nothing more to
1975 strbuf_add(sb
, line
, linelen
);
1979 * pp_handle_indent() prints out the intendation, and
1980 * the whole line (without the final newline), after
1983 static void pp_handle_indent(struct pretty_print_context
*pp
,
1984 struct strbuf
*sb
, int indent
,
1985 const char *line
, int linelen
)
1987 strbuf_addchars(sb
, ' ', indent
);
1988 if (pp
->expand_tabs_in_log
)
1989 strbuf_add_tabexpand(sb
, pp
->expand_tabs_in_log
, line
, linelen
);
1991 strbuf_add(sb
, line
, linelen
);
1994 static int is_mboxrd_from(const char *line
, int len
)
1997 * a line matching /^From $/ here would only have len == 4
1998 * at this point because is_empty_line would've trimmed all
2001 return len
> 4 && starts_with(line
+ strspn(line
, ">"), "From ");
2004 void pp_remainder(struct pretty_print_context
*pp
,
2011 const char *line
= *msg_p
;
2012 int linelen
= get_one_line(line
);
2018 if (is_blank_line(line
, &linelen
)) {
2021 if (pp
->fmt
== CMIT_FMT_SHORT
)
2026 strbuf_grow(sb
, linelen
+ indent
+ 20);
2028 pp_handle_indent(pp
, sb
, indent
, line
, linelen
);
2029 else if (pp
->expand_tabs_in_log
)
2030 strbuf_add_tabexpand(sb
, pp
->expand_tabs_in_log
,
2033 if (pp
->fmt
== CMIT_FMT_MBOXRD
&&
2034 is_mboxrd_from(line
, linelen
))
2035 strbuf_addch(sb
, '>');
2037 strbuf_add(sb
, line
, linelen
);
2039 strbuf_addch(sb
, '\n');
2043 void pretty_print_commit(struct pretty_print_context
*pp
,
2044 const struct commit
*commit
,
2047 unsigned long beginning_of_body
;
2050 const char *reencoded
;
2051 const char *encoding
;
2052 int need_8bit_cte
= pp
->need_8bit_cte
;
2054 if (pp
->fmt
== CMIT_FMT_USERFORMAT
) {
2055 format_commit_message(commit
, user_format
, sb
, pp
);
2059 encoding
= get_log_output_encoding();
2060 msg
= reencoded
= logmsg_reencode(commit
, NULL
, encoding
);
2062 if (pp
->fmt
== CMIT_FMT_ONELINE
|| cmit_fmt_is_mail(pp
->fmt
))
2066 * We need to check and emit Content-type: to mark it
2067 * as 8-bit if we haven't done so.
2069 if (cmit_fmt_is_mail(pp
->fmt
) && need_8bit_cte
== 0) {
2072 for (in_body
= i
= 0; (ch
= msg
[i
]); i
++) {
2074 /* author could be non 7-bit ASCII but
2075 * the log may be so; skip over the
2076 * header part first.
2078 if (ch
== '\n' && msg
[i
+1] == '\n')
2081 else if (non_ascii(ch
)) {
2088 pp_header(pp
, encoding
, commit
, &msg
, sb
);
2089 if (pp
->fmt
!= CMIT_FMT_ONELINE
&& !pp
->print_email_subject
) {
2090 strbuf_addch(sb
, '\n');
2093 /* Skip excess blank lines at the beginning of body, if any... */
2094 msg
= skip_blank_lines(msg
);
2096 /* These formats treat the title line specially. */
2097 if (pp
->fmt
== CMIT_FMT_ONELINE
|| cmit_fmt_is_mail(pp
->fmt
))
2098 pp_title_line(pp
, &msg
, sb
, encoding
, need_8bit_cte
);
2100 beginning_of_body
= sb
->len
;
2101 if (pp
->fmt
!= CMIT_FMT_ONELINE
)
2102 pp_remainder(pp
, &msg
, sb
, indent
);
2105 /* Make sure there is an EOLN for the non-oneline case */
2106 if (pp
->fmt
!= CMIT_FMT_ONELINE
)
2107 strbuf_addch(sb
, '\n');
2110 * The caller may append additional body text in e-mail
2111 * format. Make sure we did not strip the blank line
2112 * between the header and the body.
2114 if (cmit_fmt_is_mail(pp
->fmt
) && sb
->len
<= beginning_of_body
)
2115 strbuf_addch(sb
, '\n');
2117 unuse_commit_buffer(commit
, reencoded
);
2120 void pp_commit_easy(enum cmit_fmt fmt
, const struct commit
*commit
,
2123 struct pretty_print_context pp
= {0};
2125 pretty_print_commit(&pp
, commit
, sb
);