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 has_rfc822_specials(const char *s
, int len
)
237 for (i
= 0; i
< len
; i
++)
238 if (is_rfc822_special(s
[i
]))
243 static void add_rfc822_quoted(struct strbuf
*out
, const char *s
, int len
)
247 /* just a guess, we may have to also backslash-quote */
248 strbuf_grow(out
, len
+ 2);
250 strbuf_addch(out
, '"');
251 for (i
= 0; i
< len
; i
++) {
255 strbuf_addch(out
, '\\');
258 strbuf_addch(out
, s
[i
]);
261 strbuf_addch(out
, '"');
264 static int is_rfc2047_special(char ch
)
266 return (non_ascii(ch
) || (ch
== '=') || (ch
== '?') || (ch
== '_'));
269 static void add_rfc2047(struct strbuf
*sb
, const char *line
, int len
,
270 const char *encoding
)
272 static const int max_length
= 78; /* per rfc2822 */
276 /* How many bytes are already used on the current line? */
277 for (i
= sb
->len
- 1; i
>= 0; i
--)
278 if (sb
->buf
[i
] == '\n')
280 line_len
= sb
->len
- (i
+1);
282 for (i
= 0; i
< len
; i
++) {
284 if (non_ascii(ch
) || ch
== '\n')
286 if ((i
+ 1 < len
) && (ch
== '=' && line
[i
+1] == '?'))
289 strbuf_add_wrapped_bytes(sb
, line
, len
, 0, 1, max_length
- line_len
);
293 strbuf_grow(sb
, len
* 3 + strlen(encoding
) + 100);
294 strbuf_addf(sb
, "=?%s?q?", encoding
);
295 line_len
+= strlen(encoding
) + 5; /* 5 for =??q? */
296 for (i
= 0; i
< len
; i
++) {
297 unsigned ch
= line
[i
] & 0xFF;
299 if (line_len
>= max_length
- 2) {
300 strbuf_addf(sb
, "?=\n =?%s?q?", encoding
);
301 line_len
= strlen(encoding
) + 5 + 1; /* =??q? plus SP */
305 * We encode ' ' using '=20' even though rfc2047
306 * allows using '_' for readability. Unfortunately,
307 * many programs do not understand this and just
308 * leave the underscore in place.
310 if (is_rfc2047_special(ch
) || ch
== ' ' || ch
== '\n') {
311 strbuf_addf(sb
, "=%02X", ch
);
315 strbuf_addch(sb
, ch
);
319 strbuf_addstr(sb
, "?=");
322 void pp_user_info(const struct pretty_print_context
*pp
,
323 const char *what
, struct strbuf
*sb
,
324 const char *line
, const char *encoding
)
331 if (pp
->fmt
== CMIT_FMT_ONELINE
)
333 date
= strchr(line
, '>');
336 namelen
= ++date
- line
;
337 time
= strtoul(date
, &date
, 10);
338 tz
= strtol(date
, NULL
, 10);
340 if (pp
->fmt
== CMIT_FMT_EMAIL
) {
341 char *name_tail
= strchr(line
, '<');
342 int display_name_length
;
346 while (line
< name_tail
&& isspace(name_tail
[-1]))
348 display_name_length
= name_tail
- line
;
349 strbuf_addstr(sb
, "From: ");
350 if (!has_rfc822_specials(line
, display_name_length
)) {
351 add_rfc2047(sb
, line
, display_name_length
, encoding
);
353 struct strbuf quoted
= STRBUF_INIT
;
354 add_rfc822_quoted("ed
, line
, display_name_length
);
355 add_rfc2047(sb
, quoted
.buf
, quoted
.len
, encoding
);
356 strbuf_release("ed
);
358 for (final_line
= 0; final_line
< sb
->len
; final_line
++)
359 if (sb
->buf
[sb
->len
- final_line
- 1] == '\n')
361 if (namelen
- display_name_length
+ final_line
> 78) {
362 strbuf_addch(sb
, '\n');
363 if (!isspace(name_tail
[0]))
364 strbuf_addch(sb
, ' ');
366 strbuf_add(sb
, name_tail
, namelen
- display_name_length
);
367 strbuf_addch(sb
, '\n');
369 strbuf_addf(sb
, "%s: %.*s%.*s\n", what
,
370 (pp
->fmt
== CMIT_FMT_FULLER
) ? 4 : 0,
374 case CMIT_FMT_MEDIUM
:
375 strbuf_addf(sb
, "Date: %s\n", show_date(time
, tz
, pp
->date_mode
));
378 strbuf_addf(sb
, "Date: %s\n", show_date(time
, tz
, DATE_RFC2822
));
380 case CMIT_FMT_FULLER
:
381 strbuf_addf(sb
, "%sDate: %s\n", what
, show_date(time
, tz
, pp
->date_mode
));
389 static int is_empty_line(const char *line
, int *len_p
)
392 while (len
&& isspace(line
[len
-1]))
398 static const char *skip_empty_lines(const char *msg
)
401 int linelen
= get_one_line(msg
);
405 if (!is_empty_line(msg
, &ll
))
412 static void add_merge_info(const struct pretty_print_context
*pp
,
413 struct strbuf
*sb
, const struct commit
*commit
)
415 struct commit_list
*parent
= commit
->parents
;
417 if ((pp
->fmt
== CMIT_FMT_ONELINE
) || (pp
->fmt
== CMIT_FMT_EMAIL
) ||
418 !parent
|| !parent
->next
)
421 strbuf_addstr(sb
, "Merge:");
424 struct commit
*p
= parent
->item
;
425 const char *hex
= NULL
;
427 hex
= find_unique_abbrev(p
->object
.sha1
, pp
->abbrev
);
429 hex
= sha1_to_hex(p
->object
.sha1
);
430 parent
= parent
->next
;
432 strbuf_addf(sb
, " %s", hex
);
434 strbuf_addch(sb
, '\n');
437 static char *get_header(const struct commit
*commit
, const char *key
)
439 int key_len
= strlen(key
);
440 const char *line
= commit
->buffer
;
443 const char *eol
= strchr(line
, '\n'), *next
;
448 warning("malformed commit (header is missing newline): %s",
449 sha1_to_hex(commit
->object
.sha1
));
450 eol
= line
+ strlen(line
);
454 if (eol
- line
> key_len
&&
455 !strncmp(line
, key
, key_len
) &&
456 line
[key_len
] == ' ') {
457 return xmemdupz(line
+ key_len
+ 1, eol
- line
- key_len
- 1);
464 static char *replace_encoding_header(char *buf
, const char *encoding
)
466 struct strbuf tmp
= STRBUF_INIT
;
470 /* guess if there is an encoding header before a \n\n */
471 while (strncmp(cp
, "encoding ", strlen("encoding "))) {
472 cp
= strchr(cp
, '\n');
473 if (!cp
|| *++cp
== '\n')
477 cp
= strchr(cp
, '\n');
479 return buf
; /* should not happen but be defensive */
480 len
= cp
+ 1 - (buf
+ start
);
482 strbuf_attach(&tmp
, buf
, strlen(buf
), strlen(buf
) + 1);
483 if (is_encoding_utf8(encoding
)) {
484 /* we have re-coded to UTF-8; drop the header */
485 strbuf_remove(&tmp
, start
, len
);
487 /* just replaces XXXX in 'encoding XXXX\n' */
488 strbuf_splice(&tmp
, start
+ strlen("encoding "),
489 len
- strlen("encoding \n"),
490 encoding
, strlen(encoding
));
492 return strbuf_detach(&tmp
, NULL
);
495 char *logmsg_reencode(const struct commit
*commit
,
496 const char *output_encoding
)
498 static const char *utf8
= "UTF-8";
499 const char *use_encoding
;
503 if (!*output_encoding
)
505 encoding
= get_header(commit
, "encoding");
506 use_encoding
= encoding
? encoding
: utf8
;
507 if (!strcmp(use_encoding
, output_encoding
))
508 if (encoding
) /* we'll strip encoding header later */
509 out
= xstrdup(commit
->buffer
);
511 return NULL
; /* nothing to do */
513 out
= reencode_string(commit
->buffer
,
514 output_encoding
, use_encoding
);
516 out
= replace_encoding_header(out
, output_encoding
);
522 static int mailmap_name(char *email
, int email_len
, char *name
, int name_len
)
524 static struct string_list
*mail_map
;
526 mail_map
= xcalloc(1, sizeof(*mail_map
));
527 read_mailmap(mail_map
, NULL
);
529 return mail_map
->nr
&& map_user(mail_map
, email
, email_len
, name
, name_len
);
532 static size_t format_person_part(struct strbuf
*sb
, char part
,
533 const char *msg
, int len
, enum date_mode dmode
)
535 /* currently all placeholders have same length */
536 const int placeholder_len
= 2;
537 int start
, end
, tz
= 0;
538 unsigned long date
= 0;
540 const char *name_start
, *name_end
, *mail_start
, *mail_end
, *msg_end
= msg
+len
;
541 char person_name
[1024];
542 char person_mail
[1024];
544 /* advance 'end' to point to email start delimiter */
545 for (end
= 0; end
< len
&& msg
[end
] != '<'; end
++)
549 * When end points at the '<' that we found, it should have
550 * matching '>' later, which means 'end' must be strictly
556 /* Seek for both name and email part */
559 while (name_end
> name_start
&& isspace(*(name_end
-1)))
561 mail_start
= msg
+end
+1;
562 mail_end
= mail_start
;
563 while (mail_end
< msg_end
&& *mail_end
!= '>')
565 if (mail_end
== msg_end
)
569 if (part
== 'N' || part
== 'E') { /* mailmap lookup */
570 strlcpy(person_name
, name_start
, name_end
-name_start
+1);
571 strlcpy(person_mail
, mail_start
, mail_end
-mail_start
+1);
572 mailmap_name(person_mail
, sizeof(person_mail
), person_name
, sizeof(person_name
));
573 name_start
= person_name
;
574 name_end
= name_start
+ strlen(person_name
);
575 mail_start
= person_mail
;
576 mail_end
= mail_start
+ strlen(person_mail
);
578 if (part
== 'n' || part
== 'N') { /* name */
579 strbuf_add(sb
, name_start
, name_end
-name_start
);
580 return placeholder_len
;
582 if (part
== 'e' || part
== 'E') { /* email */
583 strbuf_add(sb
, mail_start
, mail_end
-mail_start
);
584 return placeholder_len
;
587 /* advance 'start' to point to date start delimiter */
588 for (start
= end
+ 1; start
< len
&& isspace(msg
[start
]); start
++)
592 date
= strtoul(msg
+ start
, &ep
, 10);
593 if (msg
+ start
== ep
)
596 if (part
== 't') { /* date, UNIX timestamp */
597 strbuf_add(sb
, msg
+ start
, ep
- (msg
+ start
));
598 return placeholder_len
;
602 for (start
= ep
- msg
+ 1; start
< len
&& isspace(msg
[start
]); start
++)
604 if (start
+ 1 < len
) {
605 tz
= strtoul(msg
+ start
+ 1, NULL
, 10);
606 if (msg
[start
] == '-')
612 strbuf_addstr(sb
, show_date(date
, tz
, dmode
));
613 return placeholder_len
;
614 case 'D': /* date, RFC2822 style */
615 strbuf_addstr(sb
, show_date(date
, tz
, DATE_RFC2822
));
616 return placeholder_len
;
617 case 'r': /* date, relative */
618 strbuf_addstr(sb
, show_date(date
, tz
, DATE_RELATIVE
));
619 return placeholder_len
;
620 case 'i': /* date, ISO 8601 */
621 strbuf_addstr(sb
, show_date(date
, tz
, DATE_ISO8601
));
622 return placeholder_len
;
627 * bogus commit, 'sb' cannot be updated, but we still need to
628 * compute a valid return value.
630 if (part
== 'n' || part
== 'e' || part
== 't' || part
== 'd'
631 || part
== 'D' || part
== 'r' || part
== 'i')
632 return placeholder_len
;
634 return 0; /* unknown placeholder */
642 struct format_commit_context
{
643 const struct commit
*commit
;
644 const struct pretty_print_context
*pretty_ctx
;
645 unsigned commit_header_parsed
:1;
646 unsigned commit_message_parsed
:1;
647 unsigned commit_signature_parsed
:1;
654 size_t width
, indent1
, indent2
;
656 /* These offsets are relative to the start of the commit message. */
658 struct chunk committer
;
659 struct chunk encoding
;
664 /* The following ones are relative to the result struct strbuf. */
665 struct chunk abbrev_commit_hash
;
666 struct chunk abbrev_tree_hash
;
667 struct chunk abbrev_parent_hashes
;
671 static int add_again(struct strbuf
*sb
, struct chunk
*chunk
)
674 strbuf_adddup(sb
, chunk
->off
, chunk
->len
);
679 * We haven't seen this chunk before. Our caller is surely
680 * going to add it the hard way now. Remember the most likely
681 * start of the to-be-added chunk: the current end of the
684 chunk
->off
= sb
->len
;
688 static void parse_commit_header(struct format_commit_context
*context
)
690 const char *msg
= context
->message
;
693 for (i
= 0; msg
[i
]; i
++) {
695 for (eol
= i
; msg
[eol
] && msg
[eol
] != '\n'; eol
++)
700 } else if (!prefixcmp(msg
+ i
, "author ")) {
701 context
->author
.off
= i
+ 7;
702 context
->author
.len
= eol
- i
- 7;
703 } else if (!prefixcmp(msg
+ i
, "committer ")) {
704 context
->committer
.off
= i
+ 10;
705 context
->committer
.len
= eol
- i
- 10;
706 } else if (!prefixcmp(msg
+ i
, "encoding ")) {
707 context
->encoding
.off
= i
+ 9;
708 context
->encoding
.len
= eol
- i
- 9;
712 context
->message_off
= i
;
713 context
->commit_header_parsed
= 1;
716 static int istitlechar(char c
)
718 return (c
>= 'a' && c
<= 'z') || (c
>= 'A' && c
<= 'Z') ||
719 (c
>= '0' && c
<= '9') || c
== '.' || c
== '_';
722 static void format_sanitized_subject(struct strbuf
*sb
, const char *msg
)
725 size_t start_len
= sb
->len
;
728 for (; *msg
&& *msg
!= '\n'; msg
++) {
729 if (istitlechar(*msg
)) {
731 strbuf_addch(sb
, '-');
733 strbuf_addch(sb
, *msg
);
735 while (*(msg
+1) == '.')
741 /* trim any trailing '.' or '-' characters */
743 while (sb
->len
- trimlen
> start_len
&&
744 (sb
->buf
[sb
->len
- 1 - trimlen
] == '.'
745 || sb
->buf
[sb
->len
- 1 - trimlen
] == '-'))
747 strbuf_remove(sb
, sb
->len
- trimlen
, trimlen
);
750 const char *format_subject(struct strbuf
*sb
, const char *msg
,
751 const char *line_separator
)
756 const char *line
= msg
;
757 int linelen
= get_one_line(line
);
760 if (!linelen
|| is_empty_line(line
, &linelen
))
765 strbuf_grow(sb
, linelen
+ 2);
767 strbuf_addstr(sb
, line_separator
);
768 strbuf_add(sb
, line
, linelen
);
774 static void parse_commit_message(struct format_commit_context
*c
)
776 const char *msg
= c
->message
+ c
->message_off
;
777 const char *start
= c
->message
;
779 msg
= skip_empty_lines(msg
);
780 c
->subject_off
= msg
- start
;
782 msg
= format_subject(NULL
, msg
, NULL
);
783 msg
= skip_empty_lines(msg
);
784 c
->body_off
= msg
- start
;
786 c
->commit_message_parsed
= 1;
789 static void format_decoration(struct strbuf
*sb
, const struct commit
*commit
)
791 struct name_decoration
*d
;
792 const char *prefix
= " (";
794 load_ref_decorations(DECORATE_SHORT_REFS
);
795 d
= lookup_decoration(&name_decoration
, &commit
->object
);
797 strbuf_addstr(sb
, prefix
);
799 strbuf_addstr(sb
, d
->name
);
802 if (prefix
[0] == ',')
803 strbuf_addch(sb
, ')');
806 static void strbuf_wrap(struct strbuf
*sb
, size_t pos
,
807 size_t width
, size_t indent1
, size_t indent2
)
809 struct strbuf tmp
= STRBUF_INIT
;
812 strbuf_add(&tmp
, sb
->buf
, pos
);
813 strbuf_add_wrapped_text(&tmp
, sb
->buf
+ pos
,
814 (int) indent1
, (int) indent2
, (int) width
);
815 strbuf_swap(&tmp
, sb
);
816 strbuf_release(&tmp
);
819 static void rewrap_message_tail(struct strbuf
*sb
,
820 struct format_commit_context
*c
,
821 size_t new_width
, size_t new_indent1
,
824 if (c
->width
== new_width
&& c
->indent1
== new_indent1
&&
825 c
->indent2
== new_indent2
)
827 if (c
->wrap_start
< sb
->len
)
828 strbuf_wrap(sb
, c
->wrap_start
, c
->width
, c
->indent1
, c
->indent2
);
829 c
->wrap_start
= sb
->len
;
830 c
->width
= new_width
;
831 c
->indent1
= new_indent1
;
832 c
->indent2
= new_indent2
;
838 } signature_check
[] = {
839 { 'G', ": Good signature from " },
840 { 'B', ": BAD signature from " },
843 static void parse_signature_lines(struct format_commit_context
*ctx
)
845 const char *buf
= ctx
->signature
.gpg_output
;
848 for (i
= 0; i
< ARRAY_SIZE(signature_check
); i
++) {
849 const char *found
= strstr(buf
, signature_check
[i
].check
);
853 ctx
->signature
.good_bad
= signature_check
[i
].result
;
854 found
+= strlen(signature_check
[i
].check
);
855 next
= strchrnul(found
, '\n');
856 ctx
->signature
.signer
= xmemdupz(found
, next
- found
);
861 static void parse_commit_signature(struct format_commit_context
*ctx
)
863 struct strbuf payload
= STRBUF_INIT
;
864 struct strbuf signature
= STRBUF_INIT
;
865 struct strbuf gpg_output
= STRBUF_INIT
;
868 ctx
->commit_signature_parsed
= 1;
870 if (parse_signed_commit(ctx
->commit
->object
.sha1
,
871 &payload
, &signature
) <= 0)
873 status
= verify_signed_buffer(payload
.buf
, payload
.len
,
874 signature
.buf
, signature
.len
,
876 if (status
&& !gpg_output
.len
)
878 ctx
->signature
.gpg_output
= strbuf_detach(&gpg_output
, NULL
);
879 parse_signature_lines(ctx
);
882 strbuf_release(&gpg_output
);
883 strbuf_release(&payload
);
884 strbuf_release(&signature
);
888 static int format_reflog_person(struct strbuf
*sb
,
890 struct reflog_walk_info
*log
,
891 enum date_mode dmode
)
898 ident
= get_reflog_ident(log
);
902 return format_person_part(sb
, part
, ident
, strlen(ident
), dmode
);
905 static size_t format_commit_one(struct strbuf
*sb
, const char *placeholder
,
908 struct format_commit_context
*c
= context
;
909 const struct commit
*commit
= c
->commit
;
910 const char *msg
= c
->message
;
911 struct commit_list
*p
;
914 /* these are independent of the commit */
915 switch (placeholder
[0]) {
917 if (placeholder
[1] == '(') {
918 const char *end
= strchr(placeholder
+ 2, ')');
919 char color
[COLOR_MAXLEN
];
922 color_parse_mem(placeholder
+ 2,
923 end
- (placeholder
+ 2),
924 "--pretty format", color
);
925 strbuf_addstr(sb
, color
);
926 return end
- placeholder
+ 1;
928 if (!prefixcmp(placeholder
+ 1, "red")) {
929 strbuf_addstr(sb
, GIT_COLOR_RED
);
931 } else if (!prefixcmp(placeholder
+ 1, "green")) {
932 strbuf_addstr(sb
, GIT_COLOR_GREEN
);
934 } else if (!prefixcmp(placeholder
+ 1, "blue")) {
935 strbuf_addstr(sb
, GIT_COLOR_BLUE
);
937 } else if (!prefixcmp(placeholder
+ 1, "reset")) {
938 strbuf_addstr(sb
, GIT_COLOR_RESET
);
942 case 'n': /* newline */
943 strbuf_addch(sb
, '\n');
946 /* %x00 == NUL, %x0a == LF, etc. */
947 if (0 <= (h1
= hexval_table
[0xff & placeholder
[1]]) &&
949 0 <= (h2
= hexval_table
[0xff & placeholder
[2]]) &&
951 strbuf_addch(sb
, (h1
<<4)|h2
);
956 if (placeholder
[1] == '(') {
957 unsigned long width
= 0, indent1
= 0, indent2
= 0;
959 const char *start
= placeholder
+ 2;
960 const char *end
= strchr(start
, ')');
964 width
= strtoul(start
, &next
, 10);
966 indent1
= strtoul(next
+ 1, &next
, 10);
968 indent2
= strtoul(next
+ 1,
975 rewrap_message_tail(sb
, c
, width
, indent1
, indent2
);
976 return end
- placeholder
+ 1;
981 /* these depend on the commit */
982 if (!commit
->object
.parsed
)
983 parse_object(commit
->object
.sha1
);
985 switch (placeholder
[0]) {
986 case 'H': /* commit hash */
987 strbuf_addstr(sb
, sha1_to_hex(commit
->object
.sha1
));
989 case 'h': /* abbreviated commit hash */
990 if (add_again(sb
, &c
->abbrev_commit_hash
))
992 strbuf_addstr(sb
, find_unique_abbrev(commit
->object
.sha1
,
993 c
->pretty_ctx
->abbrev
));
994 c
->abbrev_commit_hash
.len
= sb
->len
- c
->abbrev_commit_hash
.off
;
996 case 'T': /* tree hash */
997 strbuf_addstr(sb
, sha1_to_hex(commit
->tree
->object
.sha1
));
999 case 't': /* abbreviated tree hash */
1000 if (add_again(sb
, &c
->abbrev_tree_hash
))
1002 strbuf_addstr(sb
, find_unique_abbrev(commit
->tree
->object
.sha1
,
1003 c
->pretty_ctx
->abbrev
));
1004 c
->abbrev_tree_hash
.len
= sb
->len
- c
->abbrev_tree_hash
.off
;
1006 case 'P': /* parent hashes */
1007 for (p
= commit
->parents
; p
; p
= p
->next
) {
1008 if (p
!= commit
->parents
)
1009 strbuf_addch(sb
, ' ');
1010 strbuf_addstr(sb
, sha1_to_hex(p
->item
->object
.sha1
));
1013 case 'p': /* abbreviated parent hashes */
1014 if (add_again(sb
, &c
->abbrev_parent_hashes
))
1016 for (p
= commit
->parents
; p
; p
= p
->next
) {
1017 if (p
!= commit
->parents
)
1018 strbuf_addch(sb
, ' ');
1019 strbuf_addstr(sb
, find_unique_abbrev(
1020 p
->item
->object
.sha1
,
1021 c
->pretty_ctx
->abbrev
));
1023 c
->abbrev_parent_hashes
.len
= sb
->len
-
1024 c
->abbrev_parent_hashes
.off
;
1026 case 'm': /* left/right/bottom */
1027 strbuf_addstr(sb
, get_revision_mark(NULL
, commit
));
1030 format_decoration(sb
, commit
);
1032 case 'g': /* reflog info */
1033 switch(placeholder
[1]) {
1034 case 'd': /* reflog selector */
1036 if (c
->pretty_ctx
->reflog_info
)
1037 get_reflog_selector(sb
,
1038 c
->pretty_ctx
->reflog_info
,
1039 c
->pretty_ctx
->date_mode
,
1040 (placeholder
[1] == 'd'));
1042 case 's': /* reflog message */
1043 if (c
->pretty_ctx
->reflog_info
)
1044 get_reflog_message(sb
, c
->pretty_ctx
->reflog_info
);
1050 return format_reflog_person(sb
,
1052 c
->pretty_ctx
->reflog_info
,
1053 c
->pretty_ctx
->date_mode
);
1055 return 0; /* unknown %g placeholder */
1057 if (c
->pretty_ctx
->show_notes
) {
1058 format_display_notes(commit
->object
.sha1
, sb
,
1059 get_log_output_encoding(), 0);
1065 if (placeholder
[0] == 'G') {
1066 if (!c
->commit_signature_parsed
)
1067 parse_commit_signature(c
);
1068 switch (placeholder
[1]) {
1070 if (c
->signature
.gpg_output
)
1071 strbuf_addstr(sb
, c
->signature
.gpg_output
);
1074 switch (c
->signature
.good_bad
) {
1077 strbuf_addch(sb
, c
->signature
.good_bad
);
1081 if (c
->signature
.signer
)
1082 strbuf_addstr(sb
, c
->signature
.signer
);
1089 /* For the rest we have to parse the commit header. */
1090 if (!c
->commit_header_parsed
)
1091 parse_commit_header(c
);
1093 switch (placeholder
[0]) {
1094 case 'a': /* author ... */
1095 return format_person_part(sb
, placeholder
[1],
1096 msg
+ c
->author
.off
, c
->author
.len
,
1097 c
->pretty_ctx
->date_mode
);
1098 case 'c': /* committer ... */
1099 return format_person_part(sb
, placeholder
[1],
1100 msg
+ c
->committer
.off
, c
->committer
.len
,
1101 c
->pretty_ctx
->date_mode
);
1102 case 'e': /* encoding */
1103 strbuf_add(sb
, msg
+ c
->encoding
.off
, c
->encoding
.len
);
1105 case 'B': /* raw body */
1106 /* message_off is always left at the initial newline */
1107 strbuf_addstr(sb
, msg
+ c
->message_off
+ 1);
1111 /* Now we need to parse the commit message. */
1112 if (!c
->commit_message_parsed
)
1113 parse_commit_message(c
);
1115 switch (placeholder
[0]) {
1116 case 's': /* subject */
1117 format_subject(sb
, msg
+ c
->subject_off
, " ");
1119 case 'f': /* sanitized subject */
1120 format_sanitized_subject(sb
, msg
+ c
->subject_off
);
1122 case 'b': /* body */
1123 strbuf_addstr(sb
, msg
+ c
->body_off
);
1126 return 0; /* unknown placeholder */
1129 static size_t format_commit_item(struct strbuf
*sb
, const char *placeholder
,
1136 ADD_LF_BEFORE_NON_EMPTY
,
1137 DEL_LF_BEFORE_EMPTY
,
1138 ADD_SP_BEFORE_NON_EMPTY
1141 switch (placeholder
[0]) {
1143 magic
= DEL_LF_BEFORE_EMPTY
;
1146 magic
= ADD_LF_BEFORE_NON_EMPTY
;
1149 magic
= ADD_SP_BEFORE_NON_EMPTY
;
1154 if (magic
!= NO_MAGIC
)
1158 consumed
= format_commit_one(sb
, placeholder
, context
);
1159 if (magic
== NO_MAGIC
)
1162 if ((orig_len
== sb
->len
) && magic
== DEL_LF_BEFORE_EMPTY
) {
1163 while (sb
->len
&& sb
->buf
[sb
->len
- 1] == '\n')
1164 strbuf_setlen(sb
, sb
->len
- 1);
1165 } else if (orig_len
!= sb
->len
) {
1166 if (magic
== ADD_LF_BEFORE_NON_EMPTY
)
1167 strbuf_insert(sb
, orig_len
, "\n", 1);
1168 else if (magic
== ADD_SP_BEFORE_NON_EMPTY
)
1169 strbuf_insert(sb
, orig_len
, " ", 1);
1171 return consumed
+ 1;
1174 static size_t userformat_want_item(struct strbuf
*sb
, const char *placeholder
,
1177 struct userformat_want
*w
= context
;
1179 if (*placeholder
== '+' || *placeholder
== '-' || *placeholder
== ' ')
1182 switch (*placeholder
) {
1190 void userformat_find_requirements(const char *fmt
, struct userformat_want
*w
)
1192 struct strbuf dummy
= STRBUF_INIT
;
1199 strbuf_expand(&dummy
, fmt
, userformat_want_item
, w
);
1200 strbuf_release(&dummy
);
1203 void format_commit_message(const struct commit
*commit
,
1204 const char *format
, struct strbuf
*sb
,
1205 const struct pretty_print_context
*pretty_ctx
)
1207 struct format_commit_context context
;
1208 static const char utf8
[] = "UTF-8";
1209 const char *output_enc
= pretty_ctx
->output_encoding
;
1211 memset(&context
, 0, sizeof(context
));
1212 context
.commit
= commit
;
1213 context
.pretty_ctx
= pretty_ctx
;
1214 context
.wrap_start
= sb
->len
;
1215 context
.message
= commit
->buffer
;
1217 char *enc
= get_header(commit
, "encoding");
1218 if (strcmp(enc
? enc
: utf8
, output_enc
)) {
1219 context
.message
= logmsg_reencode(commit
, output_enc
);
1220 if (!context
.message
)
1221 context
.message
= commit
->buffer
;
1226 strbuf_expand(sb
, format
, format_commit_item
, &context
);
1227 rewrap_message_tail(sb
, &context
, 0, 0, 0);
1229 if (context
.message
!= commit
->buffer
)
1230 free(context
.message
);
1231 free(context
.signature
.gpg_output
);
1232 free(context
.signature
.signer
);
1235 static void pp_header(const struct pretty_print_context
*pp
,
1236 const char *encoding
,
1237 const struct commit
*commit
,
1241 int parents_shown
= 0;
1244 const char *line
= *msg_p
;
1245 int linelen
= get_one_line(*msg_p
);
1255 if (pp
->fmt
== CMIT_FMT_RAW
) {
1256 strbuf_add(sb
, line
, linelen
);
1260 if (!memcmp(line
, "parent ", 7)) {
1262 die("bad parent line in commit");
1266 if (!parents_shown
) {
1267 struct commit_list
*parent
;
1269 for (parent
= commit
->parents
, num
= 0;
1271 parent
= parent
->next
, num
++)
1273 /* with enough slop */
1274 strbuf_grow(sb
, num
* 50 + 20);
1275 add_merge_info(pp
, sb
, commit
);
1280 * MEDIUM == DEFAULT shows only author with dates.
1281 * FULL shows both authors but not dates.
1282 * FULLER shows both authors and dates.
1284 if (!memcmp(line
, "author ", 7)) {
1285 strbuf_grow(sb
, linelen
+ 80);
1286 pp_user_info(pp
, "Author", sb
, line
+ 7, encoding
);
1288 if (!memcmp(line
, "committer ", 10) &&
1289 (pp
->fmt
== CMIT_FMT_FULL
|| pp
->fmt
== CMIT_FMT_FULLER
)) {
1290 strbuf_grow(sb
, linelen
+ 80);
1291 pp_user_info(pp
, "Commit", sb
, line
+ 10, encoding
);
1296 void pp_title_line(const struct pretty_print_context
*pp
,
1299 const char *encoding
,
1302 struct strbuf title
;
1304 strbuf_init(&title
, 80);
1305 *msg_p
= format_subject(&title
, *msg_p
,
1306 pp
->preserve_subject
? "\n" : " ");
1308 strbuf_grow(sb
, title
.len
+ 1024);
1310 strbuf_addstr(sb
, pp
->subject
);
1311 add_rfc2047(sb
, title
.buf
, title
.len
, encoding
);
1313 strbuf_addbuf(sb
, &title
);
1315 strbuf_addch(sb
, '\n');
1317 if (need_8bit_cte
> 0) {
1318 const char *header_fmt
=
1319 "MIME-Version: 1.0\n"
1320 "Content-Type: text/plain; charset=%s\n"
1321 "Content-Transfer-Encoding: 8bit\n";
1322 strbuf_addf(sb
, header_fmt
, encoding
);
1324 if (pp
->after_subject
) {
1325 strbuf_addstr(sb
, pp
->after_subject
);
1327 if (pp
->fmt
== CMIT_FMT_EMAIL
) {
1328 strbuf_addch(sb
, '\n');
1330 strbuf_release(&title
);
1333 void pp_remainder(const struct pretty_print_context
*pp
,
1340 const char *line
= *msg_p
;
1341 int linelen
= get_one_line(line
);
1347 if (is_empty_line(line
, &linelen
)) {
1350 if (pp
->fmt
== CMIT_FMT_SHORT
)
1355 strbuf_grow(sb
, linelen
+ indent
+ 20);
1357 memset(sb
->buf
+ sb
->len
, ' ', indent
);
1358 strbuf_setlen(sb
, sb
->len
+ indent
);
1360 strbuf_add(sb
, line
, linelen
);
1361 strbuf_addch(sb
, '\n');
1365 char *reencode_commit_message(const struct commit
*commit
, const char **encoding_p
)
1367 const char *encoding
;
1369 encoding
= get_log_output_encoding();
1371 *encoding_p
= encoding
;
1372 return logmsg_reencode(commit
, encoding
);
1375 void pretty_print_commit(const struct pretty_print_context
*pp
,
1376 const struct commit
*commit
,
1379 unsigned long beginning_of_body
;
1381 const char *msg
= commit
->buffer
;
1383 const char *encoding
;
1384 int need_8bit_cte
= pp
->need_8bit_cte
;
1386 if (pp
->fmt
== CMIT_FMT_USERFORMAT
) {
1387 format_commit_message(commit
, user_format
, sb
, pp
);
1391 reencoded
= reencode_commit_message(commit
, &encoding
);
1396 if (pp
->fmt
== CMIT_FMT_ONELINE
|| pp
->fmt
== CMIT_FMT_EMAIL
)
1400 * We need to check and emit Content-type: to mark it
1401 * as 8-bit if we haven't done so.
1403 if (pp
->fmt
== CMIT_FMT_EMAIL
&& need_8bit_cte
== 0) {
1406 for (in_body
= i
= 0; (ch
= msg
[i
]); i
++) {
1408 /* author could be non 7-bit ASCII but
1409 * the log may be so; skip over the
1410 * header part first.
1412 if (ch
== '\n' && msg
[i
+1] == '\n')
1415 else if (non_ascii(ch
)) {
1422 pp_header(pp
, encoding
, commit
, &msg
, sb
);
1423 if (pp
->fmt
!= CMIT_FMT_ONELINE
&& !pp
->subject
) {
1424 strbuf_addch(sb
, '\n');
1427 /* Skip excess blank lines at the beginning of body, if any... */
1428 msg
= skip_empty_lines(msg
);
1430 /* These formats treat the title line specially. */
1431 if (pp
->fmt
== CMIT_FMT_ONELINE
|| pp
->fmt
== CMIT_FMT_EMAIL
)
1432 pp_title_line(pp
, &msg
, sb
, encoding
, need_8bit_cte
);
1434 beginning_of_body
= sb
->len
;
1435 if (pp
->fmt
!= CMIT_FMT_ONELINE
)
1436 pp_remainder(pp
, &msg
, sb
, indent
);
1439 /* Make sure there is an EOLN for the non-oneline case */
1440 if (pp
->fmt
!= CMIT_FMT_ONELINE
)
1441 strbuf_addch(sb
, '\n');
1444 * The caller may append additional body text in e-mail
1445 * format. Make sure we did not strip the blank line
1446 * between the header and the body.
1448 if (pp
->fmt
== CMIT_FMT_EMAIL
&& sb
->len
<= beginning_of_body
)
1449 strbuf_addch(sb
, '\n');
1452 format_display_notes(commit
->object
.sha1
, sb
, encoding
,
1453 NOTES_SHOW_HEADER
| NOTES_INDENT
);
1458 void pp_commit_easy(enum cmit_fmt fmt
, const struct commit
*commit
,
1461 struct pretty_print_context pp
= {0};
1463 pretty_print_commit(&pp
, commit
, sb
);