6 #include "string-list.h"
11 #include "reflog-walk.h"
12 #include "gpg-interface.h"
14 static char *user_format
;
15 static struct cmt_fmt_map
{
20 const char *user_format
;
22 static size_t builtin_formats_len
;
23 static size_t commit_formats_len
;
24 static size_t commit_formats_alloc
;
25 static struct cmt_fmt_map
*find_commit_format(const char *sought
);
27 static void save_user_format(struct rev_info
*rev
, const char *cp
, int is_tformat
)
30 user_format
= xstrdup(cp
);
32 rev
->use_terminator
= 1;
33 rev
->commit_format
= CMIT_FMT_USERFORMAT
;
36 static int git_pretty_formats_config(const char *var
, const char *value
, void *cb
)
38 struct cmt_fmt_map
*commit_format
= NULL
;
43 if (prefixcmp(var
, "pretty."))
46 name
= var
+ strlen("pretty.");
47 for (i
= 0; i
< builtin_formats_len
; i
++) {
48 if (!strcmp(commit_formats
[i
].name
, name
))
52 for (i
= builtin_formats_len
; i
< commit_formats_len
; i
++) {
53 if (!strcmp(commit_formats
[i
].name
, name
)) {
54 commit_format
= &commit_formats
[i
];
60 ALLOC_GROW(commit_formats
, commit_formats_len
+1,
61 commit_formats_alloc
);
62 commit_format
= &commit_formats
[commit_formats_len
];
63 memset(commit_format
, 0, sizeof(*commit_format
));
67 commit_format
->name
= xstrdup(name
);
68 commit_format
->format
= CMIT_FMT_USERFORMAT
;
69 git_config_string(&fmt
, var
, value
);
70 if (!prefixcmp(fmt
, "format:") || !prefixcmp(fmt
, "tformat:")) {
71 commit_format
->is_tformat
= fmt
[0] == 't';
72 fmt
= strchr(fmt
, ':') + 1;
73 } else if (strchr(fmt
, '%'))
74 commit_format
->is_tformat
= 1;
76 commit_format
->is_alias
= 1;
77 commit_format
->user_format
= fmt
;
82 static void setup_commit_formats(void)
84 struct cmt_fmt_map builtin_formats
[] = {
85 { "raw", CMIT_FMT_RAW
, 0 },
86 { "medium", CMIT_FMT_MEDIUM
, 0 },
87 { "short", CMIT_FMT_SHORT
, 0 },
88 { "email", CMIT_FMT_EMAIL
, 0 },
89 { "fuller", CMIT_FMT_FULLER
, 0 },
90 { "full", CMIT_FMT_FULL
, 0 },
91 { "oneline", CMIT_FMT_ONELINE
, 1 }
93 commit_formats_len
= ARRAY_SIZE(builtin_formats
);
94 builtin_formats_len
= commit_formats_len
;
95 ALLOC_GROW(commit_formats
, commit_formats_len
, commit_formats_alloc
);
96 memcpy(commit_formats
, builtin_formats
,
97 sizeof(*builtin_formats
)*ARRAY_SIZE(builtin_formats
));
99 git_config(git_pretty_formats_config
, NULL
);
102 static struct cmt_fmt_map
*find_commit_format_recursive(const char *sought
,
103 const char *original
,
104 int num_redirections
)
106 struct cmt_fmt_map
*found
= NULL
;
107 size_t found_match_len
= 0;
110 if (num_redirections
>= commit_formats_len
)
111 die("invalid --pretty format: "
112 "'%s' references an alias which points to itself",
115 for (i
= 0; i
< commit_formats_len
; i
++) {
118 if (prefixcmp(commit_formats
[i
].name
, sought
))
121 match_len
= strlen(commit_formats
[i
].name
);
122 if (found
== NULL
|| found_match_len
> match_len
) {
123 found
= &commit_formats
[i
];
124 found_match_len
= match_len
;
128 if (found
&& found
->is_alias
) {
129 found
= find_commit_format_recursive(found
->user_format
,
137 static struct cmt_fmt_map
*find_commit_format(const char *sought
)
140 setup_commit_formats();
142 return find_commit_format_recursive(sought
, sought
, 0);
145 void get_commit_format(const char *arg
, struct rev_info
*rev
)
147 struct cmt_fmt_map
*commit_format
;
149 rev
->use_terminator
= 0;
151 rev
->commit_format
= CMIT_FMT_DEFAULT
;
154 if (!prefixcmp(arg
, "format:") || !prefixcmp(arg
, "tformat:")) {
155 save_user_format(rev
, strchr(arg
, ':') + 1, arg
[0] == 't');
159 if (strchr(arg
, '%')) {
160 save_user_format(rev
, arg
, 1);
164 commit_format
= find_commit_format(arg
);
166 die("invalid --pretty format: %s", arg
);
168 rev
->commit_format
= commit_format
->format
;
169 rev
->use_terminator
= commit_format
->is_tformat
;
170 if (commit_format
->format
== CMIT_FMT_USERFORMAT
) {
171 save_user_format(rev
, commit_format
->user_format
,
172 commit_format
->is_tformat
);
177 * Generic support for pretty-printing the header
179 static int get_one_line(const char *msg
)
194 /* High bit set, or ISO-2022-INT */
195 static int non_ascii(int ch
)
197 return !isascii(ch
) || ch
== '\033';
200 int has_non_ascii(const char *s
)
205 while ((ch
= *s
++) != '\0') {
212 static int is_rfc822_special(char ch
)
234 static int needs_rfc822_quoting(const char *s
, int len
)
237 for (i
= 0; i
< len
; i
++)
238 if (is_rfc822_special(s
[i
]))
243 static int last_line_length(struct strbuf
*sb
)
247 /* How many bytes are already used on the last line? */
248 for (i
= sb
->len
- 1; i
>= 0; i
--)
249 if (sb
->buf
[i
] == '\n')
251 return sb
->len
- (i
+ 1);
254 static void add_rfc822_quoted(struct strbuf
*out
, const char *s
, int len
)
258 /* just a guess, we may have to also backslash-quote */
259 strbuf_grow(out
, len
+ 2);
261 strbuf_addch(out
, '"');
262 for (i
= 0; i
< len
; i
++) {
266 strbuf_addch(out
, '\\');
269 strbuf_addch(out
, s
[i
]);
272 strbuf_addch(out
, '"');
280 static int is_rfc2047_special(char ch
, enum rfc2047_type type
)
283 * rfc2047, section 4.2:
285 * 8-bit values which correspond to printable ASCII characters other
286 * than "=", "?", and "_" (underscore), MAY be represented as those
287 * characters. (But see section 5 for restrictions.) In
288 * particular, SPACE and TAB MUST NOT be represented as themselves
289 * within encoded words.
293 * rule out non-ASCII characters and non-printable characters (the
294 * non-ASCII check should be redundant as isprint() is not localized
295 * and only knows about ASCII, but be defensive about that)
297 if (non_ascii(ch
) || !isprint(ch
))
301 * rule out special printable characters (' ' should be the only
302 * whitespace character considered printable, but be defensive and use
305 if (isspace(ch
) || ch
== '=' || ch
== '?' || ch
== '_')
309 * rfc2047, section 5.3:
311 * As a replacement for a 'word' entity within a 'phrase', for example,
312 * one that precedes an address in a From, To, or Cc header. The ABNF
313 * definition for 'phrase' from RFC 822 thus becomes:
315 * phrase = 1*( encoded-word / word )
317 * In this case the set of characters that may be used in a "Q"-encoded
318 * 'encoded-word' is restricted to: <upper and lower case ASCII
319 * letters, decimal digits, "!", "*", "+", "-", "/", "=", and "_"
320 * (underscore, ASCII 95.)>. An 'encoded-word' that appears within a
321 * 'phrase' MUST be separated from any adjacent 'word', 'text' or
322 * 'special' by 'linear-white-space'.
325 if (type
!= RFC2047_ADDRESS
)
328 /* '=' and '_' are special cases and have been checked above */
329 return !(isalnum(ch
) || ch
== '!' || ch
== '*' || ch
== '+' || ch
== '-' || ch
== '/');
332 static int needs_rfc2047_encoding(const char *line
, int len
,
333 enum rfc2047_type type
)
337 for (i
= 0; i
< len
; i
++) {
339 if (non_ascii(ch
) || ch
== '\n')
341 if ((i
+ 1 < len
) && (ch
== '=' && line
[i
+1] == '?'))
348 static void add_rfc2047(struct strbuf
*sb
, const char *line
, size_t len
,
349 const char *encoding
, enum rfc2047_type type
)
351 static const int max_encoded_length
= 76; /* per rfc2047 */
353 int line_len
= last_line_length(sb
);
355 strbuf_grow(sb
, len
* 3 + strlen(encoding
) + 100);
356 strbuf_addf(sb
, "=?%s?q?", encoding
);
357 line_len
+= strlen(encoding
) + 5; /* 5 for =??q? */
361 * RFC 2047, section 5 (3):
363 * Each 'encoded-word' MUST represent an integral number of
364 * characters. A multi-octet character may not be split across
365 * adjacent 'encoded- word's.
367 const unsigned char *p
= (const unsigned char *)line
;
368 int chrlen
= mbs_chrlen(&line
, &len
, encoding
);
369 int is_special
= (chrlen
> 1) || is_rfc2047_special(*p
, type
);
371 /* "=%02X" * chrlen, or the byte itself */
372 const char *encoded_fmt
= is_special
? "=%02X" : "%c";
373 int encoded_len
= is_special
? 3 * chrlen
: 1;
376 * According to RFC 2047, we could encode the special character
377 * ' ' (space) with '_' (underscore) for readability. But many
378 * programs do not understand this and just leave the
379 * underscore in place. Thus, we do nothing special here, which
380 * causes ' ' to be encoded as '=20', avoiding this problem.
383 if (line_len
+ encoded_len
+ 2 > max_encoded_length
) {
384 /* It won't fit with trailing "?=" --- break the line */
385 strbuf_addf(sb
, "?=\n =?%s?q?", encoding
);
386 line_len
= strlen(encoding
) + 5 + 1; /* =??q? plus SP */
389 for (i
= 0; i
< chrlen
; i
++)
390 strbuf_addf(sb
, encoded_fmt
, p
[i
]);
391 line_len
+= encoded_len
;
393 strbuf_addstr(sb
, "?=");
396 static const char *show_ident_date(const struct ident_split
*ident
,
399 unsigned long date
= 0;
402 if (ident
->date_begin
&& ident
->date_end
)
403 date
= strtoul(ident
->date_begin
, NULL
, 10);
404 if (ident
->tz_begin
&& ident
->tz_end
)
405 tz
= strtol(ident
->tz_begin
, NULL
, 10);
406 return show_date(date
, tz
, mode
);
409 void pp_user_info(const struct pretty_print_context
*pp
,
410 const char *what
, struct strbuf
*sb
,
411 const char *line
, const char *encoding
)
415 struct ident_split ident
;
418 const char *mailbuf
, *namebuf
;
419 size_t namelen
, maillen
;
420 int max_length
= 78; /* per rfc2822 */
422 if (pp
->fmt
== CMIT_FMT_ONELINE
)
425 line_end
= strchr(line
, '\n');
427 line_end
= strchr(line
, '\0');
432 linelen
= ++line_end
- line
;
433 if (split_ident_line(&ident
, line
, linelen
))
437 mailbuf
= ident
.mail_begin
;
438 maillen
= ident
.mail_end
- ident
.mail_begin
;
439 namebuf
= ident
.name_begin
;
440 namelen
= ident
.name_end
- ident
.name_begin
;
443 map_user(pp
->mailmap
, &mailbuf
, &maillen
, &namebuf
, &namelen
);
445 strbuf_init(&mail
, 0);
446 strbuf_init(&name
, 0);
448 strbuf_add(&mail
, mailbuf
, maillen
);
449 strbuf_add(&name
, namebuf
, namelen
);
451 namelen
= name
.len
+ mail
.len
+ 3; /* ' ' + '<' + '>' */
453 if (pp
->fmt
== CMIT_FMT_EMAIL
) {
454 strbuf_addstr(sb
, "From: ");
455 if (needs_rfc2047_encoding(name
.buf
, name
.len
, RFC2047_ADDRESS
)) {
456 add_rfc2047(sb
, name
.buf
, name
.len
,
457 encoding
, RFC2047_ADDRESS
);
458 max_length
= 76; /* per rfc2047 */
459 } else if (needs_rfc822_quoting(name
.buf
, name
.len
)) {
460 struct strbuf quoted
= STRBUF_INIT
;
461 add_rfc822_quoted("ed
, name
.buf
, name
.len
);
462 strbuf_add_wrapped_bytes(sb
, quoted
.buf
, quoted
.len
,
464 strbuf_release("ed
);
466 strbuf_add_wrapped_bytes(sb
, name
.buf
, name
.len
,
469 if (namelen
- name
.len
+ last_line_length(sb
) > max_length
)
470 strbuf_addch(sb
, '\n');
472 strbuf_addf(sb
, " <%s>\n", mail
.buf
);
474 strbuf_addf(sb
, "%s: %.*s%s <%s>\n", what
,
475 (pp
->fmt
== CMIT_FMT_FULLER
) ? 4 : 0,
476 " ", name
.buf
, mail
.buf
);
479 strbuf_release(&mail
);
480 strbuf_release(&name
);
483 case CMIT_FMT_MEDIUM
:
484 strbuf_addf(sb
, "Date: %s\n",
485 show_ident_date(&ident
, pp
->date_mode
));
488 strbuf_addf(sb
, "Date: %s\n",
489 show_ident_date(&ident
, DATE_RFC2822
));
491 case CMIT_FMT_FULLER
:
492 strbuf_addf(sb
, "%sDate: %s\n", what
,
493 show_ident_date(&ident
, pp
->date_mode
));
501 static int is_empty_line(const char *line
, int *len_p
)
504 while (len
&& isspace(line
[len
-1]))
510 static const char *skip_empty_lines(const char *msg
)
513 int linelen
= get_one_line(msg
);
517 if (!is_empty_line(msg
, &ll
))
524 static void add_merge_info(const struct pretty_print_context
*pp
,
525 struct strbuf
*sb
, const struct commit
*commit
)
527 struct commit_list
*parent
= commit
->parents
;
529 if ((pp
->fmt
== CMIT_FMT_ONELINE
) || (pp
->fmt
== CMIT_FMT_EMAIL
) ||
530 !parent
|| !parent
->next
)
533 strbuf_addstr(sb
, "Merge:");
536 struct commit
*p
= parent
->item
;
537 const char *hex
= NULL
;
539 hex
= find_unique_abbrev(p
->object
.sha1
, pp
->abbrev
);
541 hex
= sha1_to_hex(p
->object
.sha1
);
542 parent
= parent
->next
;
544 strbuf_addf(sb
, " %s", hex
);
546 strbuf_addch(sb
, '\n');
549 static char *get_header(const struct commit
*commit
, const char *msg
,
552 int key_len
= strlen(key
);
553 const char *line
= msg
;
556 const char *eol
= strchr(line
, '\n'), *next
;
561 warning("malformed commit (header is missing newline): %s",
562 sha1_to_hex(commit
->object
.sha1
));
563 eol
= line
+ strlen(line
);
567 if (eol
- line
> key_len
&&
568 !strncmp(line
, key
, key_len
) &&
569 line
[key_len
] == ' ') {
570 return xmemdupz(line
+ key_len
+ 1, eol
- line
- key_len
- 1);
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 (strncmp(cp
, "encoding ", strlen("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 char *logmsg_reencode(const struct commit
*commit
,
609 const char *output_encoding
)
611 static const char *utf8
= "UTF-8";
612 const char *use_encoding
;
614 char *msg
= commit
->buffer
;
618 enum object_type type
;
621 msg
= read_sha1_file(commit
->object
.sha1
, &type
, &size
);
623 die("Cannot read commit object %s",
624 sha1_to_hex(commit
->object
.sha1
));
625 if (type
!= OBJ_COMMIT
)
626 die("Expected commit for '%s', got %s",
627 sha1_to_hex(commit
->object
.sha1
), typename(type
));
630 if (!output_encoding
|| !*output_encoding
)
632 encoding
= get_header(commit
, msg
, "encoding");
633 use_encoding
= encoding
? encoding
: utf8
;
634 if (same_encoding(use_encoding
, output_encoding
)) {
636 * No encoding work to be done. If we have no encoding header
637 * at all, then there's nothing to do, and we can return the
638 * message verbatim (whether newly allocated or not).
644 * Otherwise, we still want to munge the encoding header in the
645 * result, which will be done by modifying the buffer. If we
646 * are using a fresh copy, we can reuse it. But if we are using
647 * the cached copy from commit->buffer, we need to duplicate it
648 * to avoid munging commit->buffer.
651 if (out
== commit
->buffer
)
656 * There's actual encoding work to do. Do the reencoding, which
657 * still leaves the header to be replaced in the next step. At
658 * this point, we are done with msg. If we allocated a fresh
659 * copy, we can free it.
661 out
= reencode_string(msg
, output_encoding
, use_encoding
);
662 if (out
&& msg
!= commit
->buffer
)
667 * This replacement actually consumes the buffer we hand it, so we do
668 * not have to worry about freeing the old "out" here.
671 out
= replace_encoding_header(out
, output_encoding
);
675 * If the re-encoding failed, out might be NULL here; in that
676 * case we just return the commit message verbatim.
678 return out
? out
: msg
;
681 void logmsg_free(char *msg
, const struct commit
*commit
)
683 if (msg
!= commit
->buffer
)
687 static int mailmap_name(const char **email
, size_t *email_len
,
688 const char **name
, size_t *name_len
)
690 static struct string_list
*mail_map
;
692 mail_map
= xcalloc(1, sizeof(*mail_map
));
693 read_mailmap(mail_map
, NULL
);
695 return mail_map
->nr
&& map_user(mail_map
, email
, email_len
, name
, name_len
);
698 static size_t format_person_part(struct strbuf
*sb
, char part
,
699 const char *msg
, int len
, enum date_mode dmode
)
701 /* currently all placeholders have same length */
702 const int placeholder_len
= 2;
703 struct ident_split s
;
704 const char *name
, *mail
;
705 size_t maillen
, namelen
;
707 if (split_ident_line(&s
, msg
, len
) < 0)
711 namelen
= s
.name_end
- s
.name_begin
;
713 maillen
= s
.mail_end
- s
.mail_begin
;
715 if (part
== 'N' || part
== 'E') /* mailmap lookup */
716 mailmap_name(&mail
, &maillen
, &name
, &namelen
);
717 if (part
== 'n' || part
== 'N') { /* name */
718 strbuf_add(sb
, name
, namelen
);
719 return placeholder_len
;
721 if (part
== 'e' || part
== 'E') { /* email */
722 strbuf_add(sb
, mail
, maillen
);
723 return placeholder_len
;
729 if (part
== 't') { /* date, UNIX timestamp */
730 strbuf_add(sb
, s
.date_begin
, s
.date_end
- s
.date_begin
);
731 return placeholder_len
;
736 strbuf_addstr(sb
, show_ident_date(&s
, dmode
));
737 return placeholder_len
;
738 case 'D': /* date, RFC2822 style */
739 strbuf_addstr(sb
, show_ident_date(&s
, DATE_RFC2822
));
740 return placeholder_len
;
741 case 'r': /* date, relative */
742 strbuf_addstr(sb
, show_ident_date(&s
, DATE_RELATIVE
));
743 return placeholder_len
;
744 case 'i': /* date, ISO 8601 */
745 strbuf_addstr(sb
, show_ident_date(&s
, DATE_ISO8601
));
746 return placeholder_len
;
751 * reading from either a bogus commit, or a reflog entry with
752 * %gn, %ge, etc.; 'sb' cannot be updated, but we still need
753 * to compute a valid return value.
755 if (part
== 'n' || part
== 'e' || part
== 't' || part
== 'd'
756 || part
== 'D' || part
== 'r' || part
== 'i')
757 return placeholder_len
;
759 return 0; /* unknown placeholder */
767 struct format_commit_context
{
768 const struct commit
*commit
;
769 const struct pretty_print_context
*pretty_ctx
;
770 unsigned commit_header_parsed
:1;
771 unsigned commit_message_parsed
:1;
772 struct signature_check signature_check
;
774 size_t width
, indent1
, indent2
;
776 /* These offsets are relative to the start of the commit message. */
778 struct chunk committer
;
779 struct chunk encoding
;
784 /* The following ones are relative to the result struct strbuf. */
785 struct chunk abbrev_commit_hash
;
786 struct chunk abbrev_tree_hash
;
787 struct chunk abbrev_parent_hashes
;
791 static int add_again(struct strbuf
*sb
, struct chunk
*chunk
)
794 strbuf_adddup(sb
, chunk
->off
, chunk
->len
);
799 * We haven't seen this chunk before. Our caller is surely
800 * going to add it the hard way now. Remember the most likely
801 * start of the to-be-added chunk: the current end of the
804 chunk
->off
= sb
->len
;
808 static void parse_commit_header(struct format_commit_context
*context
)
810 const char *msg
= context
->message
;
813 for (i
= 0; msg
[i
]; i
++) {
815 for (eol
= i
; msg
[eol
] && msg
[eol
] != '\n'; eol
++)
820 } else if (!prefixcmp(msg
+ i
, "author ")) {
821 context
->author
.off
= i
+ 7;
822 context
->author
.len
= eol
- i
- 7;
823 } else if (!prefixcmp(msg
+ i
, "committer ")) {
824 context
->committer
.off
= i
+ 10;
825 context
->committer
.len
= eol
- i
- 10;
826 } else if (!prefixcmp(msg
+ i
, "encoding ")) {
827 context
->encoding
.off
= i
+ 9;
828 context
->encoding
.len
= eol
- i
- 9;
832 context
->message_off
= i
;
833 context
->commit_header_parsed
= 1;
836 static int istitlechar(char c
)
838 return (c
>= 'a' && c
<= 'z') || (c
>= 'A' && c
<= 'Z') ||
839 (c
>= '0' && c
<= '9') || c
== '.' || c
== '_';
842 static void format_sanitized_subject(struct strbuf
*sb
, const char *msg
)
845 size_t start_len
= sb
->len
;
848 for (; *msg
&& *msg
!= '\n'; msg
++) {
849 if (istitlechar(*msg
)) {
851 strbuf_addch(sb
, '-');
853 strbuf_addch(sb
, *msg
);
855 while (*(msg
+1) == '.')
861 /* trim any trailing '.' or '-' characters */
863 while (sb
->len
- trimlen
> start_len
&&
864 (sb
->buf
[sb
->len
- 1 - trimlen
] == '.'
865 || sb
->buf
[sb
->len
- 1 - trimlen
] == '-'))
867 strbuf_remove(sb
, sb
->len
- trimlen
, trimlen
);
870 const char *format_subject(struct strbuf
*sb
, const char *msg
,
871 const char *line_separator
)
876 const char *line
= msg
;
877 int linelen
= get_one_line(line
);
880 if (!linelen
|| is_empty_line(line
, &linelen
))
885 strbuf_grow(sb
, linelen
+ 2);
887 strbuf_addstr(sb
, line_separator
);
888 strbuf_add(sb
, line
, linelen
);
894 static void parse_commit_message(struct format_commit_context
*c
)
896 const char *msg
= c
->message
+ c
->message_off
;
897 const char *start
= c
->message
;
899 msg
= skip_empty_lines(msg
);
900 c
->subject_off
= msg
- start
;
902 msg
= format_subject(NULL
, msg
, NULL
);
903 msg
= skip_empty_lines(msg
);
904 c
->body_off
= msg
- start
;
906 c
->commit_message_parsed
= 1;
909 static void format_decoration(struct strbuf
*sb
, const struct commit
*commit
)
911 struct name_decoration
*d
;
912 const char *prefix
= " (";
914 load_ref_decorations(DECORATE_SHORT_REFS
);
915 d
= lookup_decoration(&name_decoration
, &commit
->object
);
917 strbuf_addstr(sb
, prefix
);
919 strbuf_addstr(sb
, d
->name
);
922 if (prefix
[0] == ',')
923 strbuf_addch(sb
, ')');
926 static void strbuf_wrap(struct strbuf
*sb
, size_t pos
,
927 size_t width
, size_t indent1
, size_t indent2
)
929 struct strbuf tmp
= STRBUF_INIT
;
932 strbuf_add(&tmp
, sb
->buf
, pos
);
933 strbuf_add_wrapped_text(&tmp
, sb
->buf
+ pos
,
934 (int) indent1
, (int) indent2
, (int) width
);
935 strbuf_swap(&tmp
, sb
);
936 strbuf_release(&tmp
);
939 static void rewrap_message_tail(struct strbuf
*sb
,
940 struct format_commit_context
*c
,
941 size_t new_width
, size_t new_indent1
,
944 if (c
->width
== new_width
&& c
->indent1
== new_indent1
&&
945 c
->indent2
== new_indent2
)
947 if (c
->wrap_start
< sb
->len
)
948 strbuf_wrap(sb
, c
->wrap_start
, c
->width
, c
->indent1
, c
->indent2
);
949 c
->wrap_start
= sb
->len
;
950 c
->width
= new_width
;
951 c
->indent1
= new_indent1
;
952 c
->indent2
= new_indent2
;
955 static int format_reflog_person(struct strbuf
*sb
,
957 struct reflog_walk_info
*log
,
958 enum date_mode dmode
)
965 ident
= get_reflog_ident(log
);
969 return format_person_part(sb
, part
, ident
, strlen(ident
), dmode
);
972 static size_t format_commit_one(struct strbuf
*sb
, const char *placeholder
,
975 struct format_commit_context
*c
= context
;
976 const struct commit
*commit
= c
->commit
;
977 const char *msg
= c
->message
;
978 struct commit_list
*p
;
981 /* these are independent of the commit */
982 switch (placeholder
[0]) {
984 if (placeholder
[1] == '(') {
985 const char *begin
= placeholder
+ 2;
986 const char *end
= strchr(begin
, ')');
987 char color
[COLOR_MAXLEN
];
991 if (!prefixcmp(begin
, "auto,")) {
992 if (!want_color(c
->pretty_ctx
->color
))
993 return end
- placeholder
+ 1;
996 color_parse_mem(begin
,
998 "--pretty format", color
);
999 strbuf_addstr(sb
, color
);
1000 return end
- placeholder
+ 1;
1002 if (!prefixcmp(placeholder
+ 1, "red")) {
1003 strbuf_addstr(sb
, GIT_COLOR_RED
);
1005 } else if (!prefixcmp(placeholder
+ 1, "green")) {
1006 strbuf_addstr(sb
, GIT_COLOR_GREEN
);
1008 } else if (!prefixcmp(placeholder
+ 1, "blue")) {
1009 strbuf_addstr(sb
, GIT_COLOR_BLUE
);
1011 } else if (!prefixcmp(placeholder
+ 1, "reset")) {
1012 strbuf_addstr(sb
, GIT_COLOR_RESET
);
1016 case 'n': /* newline */
1017 strbuf_addch(sb
, '\n');
1020 /* %x00 == NUL, %x0a == LF, etc. */
1021 if (0 <= (h1
= hexval_table
[0xff & placeholder
[1]]) &&
1023 0 <= (h2
= hexval_table
[0xff & placeholder
[2]]) &&
1025 strbuf_addch(sb
, (h1
<<4)|h2
);
1030 if (placeholder
[1] == '(') {
1031 unsigned long width
= 0, indent1
= 0, indent2
= 0;
1033 const char *start
= placeholder
+ 2;
1034 const char *end
= strchr(start
, ')');
1038 width
= strtoul(start
, &next
, 10);
1040 indent1
= strtoul(next
+ 1, &next
, 10);
1042 indent2
= strtoul(next
+ 1,
1049 rewrap_message_tail(sb
, c
, width
, indent1
, indent2
);
1050 return end
- placeholder
+ 1;
1055 /* these depend on the commit */
1056 if (!commit
->object
.parsed
)
1057 parse_object(commit
->object
.sha1
);
1059 switch (placeholder
[0]) {
1060 case 'H': /* commit hash */
1061 strbuf_addstr(sb
, sha1_to_hex(commit
->object
.sha1
));
1063 case 'h': /* abbreviated commit hash */
1064 if (add_again(sb
, &c
->abbrev_commit_hash
))
1066 strbuf_addstr(sb
, find_unique_abbrev(commit
->object
.sha1
,
1067 c
->pretty_ctx
->abbrev
));
1068 c
->abbrev_commit_hash
.len
= sb
->len
- c
->abbrev_commit_hash
.off
;
1070 case 'T': /* tree hash */
1071 strbuf_addstr(sb
, sha1_to_hex(commit
->tree
->object
.sha1
));
1073 case 't': /* abbreviated tree hash */
1074 if (add_again(sb
, &c
->abbrev_tree_hash
))
1076 strbuf_addstr(sb
, find_unique_abbrev(commit
->tree
->object
.sha1
,
1077 c
->pretty_ctx
->abbrev
));
1078 c
->abbrev_tree_hash
.len
= sb
->len
- c
->abbrev_tree_hash
.off
;
1080 case 'P': /* parent hashes */
1081 for (p
= commit
->parents
; p
; p
= p
->next
) {
1082 if (p
!= commit
->parents
)
1083 strbuf_addch(sb
, ' ');
1084 strbuf_addstr(sb
, sha1_to_hex(p
->item
->object
.sha1
));
1087 case 'p': /* abbreviated parent hashes */
1088 if (add_again(sb
, &c
->abbrev_parent_hashes
))
1090 for (p
= commit
->parents
; p
; p
= p
->next
) {
1091 if (p
!= commit
->parents
)
1092 strbuf_addch(sb
, ' ');
1093 strbuf_addstr(sb
, find_unique_abbrev(
1094 p
->item
->object
.sha1
,
1095 c
->pretty_ctx
->abbrev
));
1097 c
->abbrev_parent_hashes
.len
= sb
->len
-
1098 c
->abbrev_parent_hashes
.off
;
1100 case 'm': /* left/right/bottom */
1101 strbuf_addstr(sb
, get_revision_mark(NULL
, commit
));
1104 format_decoration(sb
, commit
);
1106 case 'g': /* reflog info */
1107 switch(placeholder
[1]) {
1108 case 'd': /* reflog selector */
1110 if (c
->pretty_ctx
->reflog_info
)
1111 get_reflog_selector(sb
,
1112 c
->pretty_ctx
->reflog_info
,
1113 c
->pretty_ctx
->date_mode
,
1114 c
->pretty_ctx
->date_mode_explicit
,
1115 (placeholder
[1] == 'd'));
1117 case 's': /* reflog message */
1118 if (c
->pretty_ctx
->reflog_info
)
1119 get_reflog_message(sb
, c
->pretty_ctx
->reflog_info
);
1125 return format_reflog_person(sb
,
1127 c
->pretty_ctx
->reflog_info
,
1128 c
->pretty_ctx
->date_mode
);
1130 return 0; /* unknown %g placeholder */
1132 if (c
->pretty_ctx
->notes_message
) {
1133 strbuf_addstr(sb
, c
->pretty_ctx
->notes_message
);
1139 if (placeholder
[0] == 'G') {
1140 if (!c
->signature_check
.result
)
1141 check_commit_signature(c
->commit
, &(c
->signature_check
));
1142 switch (placeholder
[1]) {
1144 if (c
->signature_check
.gpg_output
)
1145 strbuf_addstr(sb
, c
->signature_check
.gpg_output
);
1148 switch (c
->signature_check
.result
) {
1153 strbuf_addch(sb
, c
->signature_check
.result
);
1157 if (c
->signature_check
.signer
)
1158 strbuf_addstr(sb
, c
->signature_check
.signer
);
1161 if (c
->signature_check
.key
)
1162 strbuf_addstr(sb
, c
->signature_check
.key
);
1169 /* For the rest we have to parse the commit header. */
1170 if (!c
->commit_header_parsed
)
1171 parse_commit_header(c
);
1173 switch (placeholder
[0]) {
1174 case 'a': /* author ... */
1175 return format_person_part(sb
, placeholder
[1],
1176 msg
+ c
->author
.off
, c
->author
.len
,
1177 c
->pretty_ctx
->date_mode
);
1178 case 'c': /* committer ... */
1179 return format_person_part(sb
, placeholder
[1],
1180 msg
+ c
->committer
.off
, c
->committer
.len
,
1181 c
->pretty_ctx
->date_mode
);
1182 case 'e': /* encoding */
1183 strbuf_add(sb
, msg
+ c
->encoding
.off
, c
->encoding
.len
);
1185 case 'B': /* raw body */
1186 /* message_off is always left at the initial newline */
1187 strbuf_addstr(sb
, msg
+ c
->message_off
+ 1);
1191 /* Now we need to parse the commit message. */
1192 if (!c
->commit_message_parsed
)
1193 parse_commit_message(c
);
1195 switch (placeholder
[0]) {
1196 case 's': /* subject */
1197 format_subject(sb
, msg
+ c
->subject_off
, " ");
1199 case 'f': /* sanitized subject */
1200 format_sanitized_subject(sb
, msg
+ c
->subject_off
);
1202 case 'b': /* body */
1203 strbuf_addstr(sb
, msg
+ c
->body_off
);
1206 return 0; /* unknown placeholder */
1209 static size_t format_commit_item(struct strbuf
*sb
, const char *placeholder
,
1216 ADD_LF_BEFORE_NON_EMPTY
,
1217 DEL_LF_BEFORE_EMPTY
,
1218 ADD_SP_BEFORE_NON_EMPTY
1221 switch (placeholder
[0]) {
1223 magic
= DEL_LF_BEFORE_EMPTY
;
1226 magic
= ADD_LF_BEFORE_NON_EMPTY
;
1229 magic
= ADD_SP_BEFORE_NON_EMPTY
;
1234 if (magic
!= NO_MAGIC
)
1238 consumed
= format_commit_one(sb
, placeholder
, context
);
1239 if (magic
== NO_MAGIC
)
1242 if ((orig_len
== sb
->len
) && magic
== DEL_LF_BEFORE_EMPTY
) {
1243 while (sb
->len
&& sb
->buf
[sb
->len
- 1] == '\n')
1244 strbuf_setlen(sb
, sb
->len
- 1);
1245 } else if (orig_len
!= sb
->len
) {
1246 if (magic
== ADD_LF_BEFORE_NON_EMPTY
)
1247 strbuf_insert(sb
, orig_len
, "\n", 1);
1248 else if (magic
== ADD_SP_BEFORE_NON_EMPTY
)
1249 strbuf_insert(sb
, orig_len
, " ", 1);
1251 return consumed
+ 1;
1254 static size_t userformat_want_item(struct strbuf
*sb
, const char *placeholder
,
1257 struct userformat_want
*w
= context
;
1259 if (*placeholder
== '+' || *placeholder
== '-' || *placeholder
== ' ')
1262 switch (*placeholder
) {
1270 void userformat_find_requirements(const char *fmt
, struct userformat_want
*w
)
1272 struct strbuf dummy
= STRBUF_INIT
;
1279 strbuf_expand(&dummy
, fmt
, userformat_want_item
, w
);
1280 strbuf_release(&dummy
);
1283 void format_commit_message(const struct commit
*commit
,
1284 const char *format
, struct strbuf
*sb
,
1285 const struct pretty_print_context
*pretty_ctx
)
1287 struct format_commit_context context
;
1288 const char *output_enc
= pretty_ctx
->output_encoding
;
1290 memset(&context
, 0, sizeof(context
));
1291 context
.commit
= commit
;
1292 context
.pretty_ctx
= pretty_ctx
;
1293 context
.wrap_start
= sb
->len
;
1294 context
.message
= logmsg_reencode(commit
, output_enc
);
1296 strbuf_expand(sb
, format
, format_commit_item
, &context
);
1297 rewrap_message_tail(sb
, &context
, 0, 0, 0);
1299 logmsg_free(context
.message
, commit
);
1300 free(context
.signature_check
.gpg_output
);
1301 free(context
.signature_check
.signer
);
1304 static void pp_header(const struct pretty_print_context
*pp
,
1305 const char *encoding
,
1306 const struct commit
*commit
,
1310 int parents_shown
= 0;
1313 const char *line
= *msg_p
;
1314 int linelen
= get_one_line(*msg_p
);
1324 if (pp
->fmt
== CMIT_FMT_RAW
) {
1325 strbuf_add(sb
, line
, linelen
);
1329 if (!prefixcmp(line
, "parent ")) {
1331 die("bad parent line in commit");
1335 if (!parents_shown
) {
1336 struct commit_list
*parent
;
1338 for (parent
= commit
->parents
, num
= 0;
1340 parent
= parent
->next
, num
++)
1342 /* with enough slop */
1343 strbuf_grow(sb
, num
* 50 + 20);
1344 add_merge_info(pp
, sb
, commit
);
1349 * MEDIUM == DEFAULT shows only author with dates.
1350 * FULL shows both authors but not dates.
1351 * FULLER shows both authors and dates.
1353 if (!prefixcmp(line
, "author ")) {
1354 strbuf_grow(sb
, linelen
+ 80);
1355 pp_user_info(pp
, "Author", sb
, line
+ 7, encoding
);
1357 if (!prefixcmp(line
, "committer ") &&
1358 (pp
->fmt
== CMIT_FMT_FULL
|| pp
->fmt
== CMIT_FMT_FULLER
)) {
1359 strbuf_grow(sb
, linelen
+ 80);
1360 pp_user_info(pp
, "Commit", sb
, line
+ 10, encoding
);
1365 void pp_title_line(const struct pretty_print_context
*pp
,
1368 const char *encoding
,
1371 static const int max_length
= 78; /* per rfc2047 */
1372 struct strbuf title
;
1374 strbuf_init(&title
, 80);
1375 *msg_p
= format_subject(&title
, *msg_p
,
1376 pp
->preserve_subject
? "\n" : " ");
1378 strbuf_grow(sb
, title
.len
+ 1024);
1380 strbuf_addstr(sb
, pp
->subject
);
1381 if (needs_rfc2047_encoding(title
.buf
, title
.len
, RFC2047_SUBJECT
))
1382 add_rfc2047(sb
, title
.buf
, title
.len
,
1383 encoding
, RFC2047_SUBJECT
);
1385 strbuf_add_wrapped_bytes(sb
, title
.buf
, title
.len
,
1386 -last_line_length(sb
), 1, max_length
);
1388 strbuf_addbuf(sb
, &title
);
1390 strbuf_addch(sb
, '\n');
1392 if (need_8bit_cte
> 0) {
1393 const char *header_fmt
=
1394 "MIME-Version: 1.0\n"
1395 "Content-Type: text/plain; charset=%s\n"
1396 "Content-Transfer-Encoding: 8bit\n";
1397 strbuf_addf(sb
, header_fmt
, encoding
);
1399 if (pp
->after_subject
) {
1400 strbuf_addstr(sb
, pp
->after_subject
);
1402 if (pp
->fmt
== CMIT_FMT_EMAIL
) {
1403 strbuf_addch(sb
, '\n');
1405 strbuf_release(&title
);
1408 void pp_remainder(const struct pretty_print_context
*pp
,
1415 const char *line
= *msg_p
;
1416 int linelen
= get_one_line(line
);
1422 if (is_empty_line(line
, &linelen
)) {
1425 if (pp
->fmt
== CMIT_FMT_SHORT
)
1430 strbuf_grow(sb
, linelen
+ indent
+ 20);
1432 memset(sb
->buf
+ sb
->len
, ' ', indent
);
1433 strbuf_setlen(sb
, sb
->len
+ indent
);
1435 strbuf_add(sb
, line
, linelen
);
1436 strbuf_addch(sb
, '\n');
1440 void pretty_print_commit(const struct pretty_print_context
*pp
,
1441 const struct commit
*commit
,
1444 unsigned long beginning_of_body
;
1448 const char *encoding
;
1449 int need_8bit_cte
= pp
->need_8bit_cte
;
1451 if (pp
->fmt
== CMIT_FMT_USERFORMAT
) {
1452 format_commit_message(commit
, user_format
, sb
, pp
);
1456 encoding
= get_log_output_encoding();
1457 msg
= reencoded
= logmsg_reencode(commit
, encoding
);
1459 if (pp
->fmt
== CMIT_FMT_ONELINE
|| pp
->fmt
== CMIT_FMT_EMAIL
)
1463 * We need to check and emit Content-type: to mark it
1464 * as 8-bit if we haven't done so.
1466 if (pp
->fmt
== CMIT_FMT_EMAIL
&& need_8bit_cte
== 0) {
1469 for (in_body
= i
= 0; (ch
= msg
[i
]); i
++) {
1471 /* author could be non 7-bit ASCII but
1472 * the log may be so; skip over the
1473 * header part first.
1475 if (ch
== '\n' && msg
[i
+1] == '\n')
1478 else if (non_ascii(ch
)) {
1485 pp_header(pp
, encoding
, commit
, &msg
, sb
);
1486 if (pp
->fmt
!= CMIT_FMT_ONELINE
&& !pp
->subject
) {
1487 strbuf_addch(sb
, '\n');
1490 /* Skip excess blank lines at the beginning of body, if any... */
1491 msg
= skip_empty_lines(msg
);
1493 /* These formats treat the title line specially. */
1494 if (pp
->fmt
== CMIT_FMT_ONELINE
|| pp
->fmt
== CMIT_FMT_EMAIL
)
1495 pp_title_line(pp
, &msg
, sb
, encoding
, need_8bit_cte
);
1497 beginning_of_body
= sb
->len
;
1498 if (pp
->fmt
!= CMIT_FMT_ONELINE
)
1499 pp_remainder(pp
, &msg
, sb
, indent
);
1502 /* Make sure there is an EOLN for the non-oneline case */
1503 if (pp
->fmt
!= CMIT_FMT_ONELINE
)
1504 strbuf_addch(sb
, '\n');
1507 * The caller may append additional body text in e-mail
1508 * format. Make sure we did not strip the blank line
1509 * between the header and the body.
1511 if (pp
->fmt
== CMIT_FMT_EMAIL
&& sb
->len
<= beginning_of_body
)
1512 strbuf_addch(sb
, '\n');
1514 logmsg_free(reencoded
, commit
);
1517 void pp_commit_easy(enum cmit_fmt fmt
, const struct commit
*commit
,
1520 struct pretty_print_context pp
= {0};
1522 pretty_print_commit(&pp
, commit
, sb
);