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 (!skip_prefix(var
, "pretty.", &name
))
46 for (i
= 0; i
< builtin_formats_len
; i
++) {
47 if (!strcmp(commit_formats
[i
].name
, name
))
51 for (i
= builtin_formats_len
; i
< commit_formats_len
; i
++) {
52 if (!strcmp(commit_formats
[i
].name
, name
)) {
53 commit_format
= &commit_formats
[i
];
59 ALLOC_GROW(commit_formats
, commit_formats_len
+1,
60 commit_formats_alloc
);
61 commit_format
= &commit_formats
[commit_formats_len
];
62 memset(commit_format
, 0, sizeof(*commit_format
));
66 commit_format
->name
= xstrdup(name
);
67 commit_format
->format
= CMIT_FMT_USERFORMAT
;
68 git_config_string(&fmt
, var
, value
);
69 if (starts_with(fmt
, "format:") || starts_with(fmt
, "tformat:")) {
70 commit_format
->is_tformat
= fmt
[0] == 't';
71 fmt
= strchr(fmt
, ':') + 1;
72 } else if (strchr(fmt
, '%'))
73 commit_format
->is_tformat
= 1;
75 commit_format
->is_alias
= 1;
76 commit_format
->user_format
= fmt
;
81 static void setup_commit_formats(void)
83 struct cmt_fmt_map builtin_formats
[] = {
84 { "raw", CMIT_FMT_RAW
, 0 },
85 { "medium", CMIT_FMT_MEDIUM
, 0 },
86 { "short", CMIT_FMT_SHORT
, 0 },
87 { "email", CMIT_FMT_EMAIL
, 0 },
88 { "fuller", CMIT_FMT_FULLER
, 0 },
89 { "full", CMIT_FMT_FULL
, 0 },
90 { "oneline", CMIT_FMT_ONELINE
, 1 }
92 commit_formats_len
= ARRAY_SIZE(builtin_formats
);
93 builtin_formats_len
= commit_formats_len
;
94 ALLOC_GROW(commit_formats
, commit_formats_len
, commit_formats_alloc
);
95 memcpy(commit_formats
, builtin_formats
,
96 sizeof(*builtin_formats
)*ARRAY_SIZE(builtin_formats
));
98 git_config(git_pretty_formats_config
, NULL
);
101 static struct cmt_fmt_map
*find_commit_format_recursive(const char *sought
,
102 const char *original
,
103 int num_redirections
)
105 struct cmt_fmt_map
*found
= NULL
;
106 size_t found_match_len
= 0;
109 if (num_redirections
>= commit_formats_len
)
110 die("invalid --pretty format: "
111 "'%s' references an alias which points to itself",
114 for (i
= 0; i
< commit_formats_len
; i
++) {
117 if (!starts_with(commit_formats
[i
].name
, sought
))
120 match_len
= strlen(commit_formats
[i
].name
);
121 if (found
== NULL
|| found_match_len
> match_len
) {
122 found
= &commit_formats
[i
];
123 found_match_len
= match_len
;
127 if (found
&& found
->is_alias
) {
128 found
= find_commit_format_recursive(found
->user_format
,
136 static struct cmt_fmt_map
*find_commit_format(const char *sought
)
139 setup_commit_formats();
141 return find_commit_format_recursive(sought
, sought
, 0);
144 void get_commit_format(const char *arg
, struct rev_info
*rev
)
146 struct cmt_fmt_map
*commit_format
;
148 rev
->use_terminator
= 0;
150 rev
->commit_format
= CMIT_FMT_DEFAULT
;
153 if (starts_with(arg
, "format:") || starts_with(arg
, "tformat:")) {
154 save_user_format(rev
, strchr(arg
, ':') + 1, arg
[0] == 't');
158 if (strchr(arg
, '%')) {
159 save_user_format(rev
, arg
, 1);
163 commit_format
= find_commit_format(arg
);
165 die("invalid --pretty format: %s", arg
);
167 rev
->commit_format
= commit_format
->format
;
168 rev
->use_terminator
= commit_format
->is_tformat
;
169 if (commit_format
->format
== CMIT_FMT_USERFORMAT
) {
170 save_user_format(rev
, commit_format
->user_format
,
171 commit_format
->is_tformat
);
176 * Generic support for pretty-printing the header
178 static int get_one_line(const char *msg
)
193 /* High bit set, or ISO-2022-INT */
194 static int non_ascii(int ch
)
196 return !isascii(ch
) || ch
== '\033';
199 int has_non_ascii(const char *s
)
204 while ((ch
= *s
++) != '\0') {
211 static int is_rfc822_special(char ch
)
233 static int needs_rfc822_quoting(const char *s
, int len
)
236 for (i
= 0; i
< len
; i
++)
237 if (is_rfc822_special(s
[i
]))
242 static int last_line_length(struct strbuf
*sb
)
246 /* How many bytes are already used on the last line? */
247 for (i
= sb
->len
- 1; i
>= 0; i
--)
248 if (sb
->buf
[i
] == '\n')
250 return sb
->len
- (i
+ 1);
253 static void add_rfc822_quoted(struct strbuf
*out
, const char *s
, int len
)
257 /* just a guess, we may have to also backslash-quote */
258 strbuf_grow(out
, len
+ 2);
260 strbuf_addch(out
, '"');
261 for (i
= 0; i
< len
; i
++) {
265 strbuf_addch(out
, '\\');
268 strbuf_addch(out
, s
[i
]);
271 strbuf_addch(out
, '"');
279 static int is_rfc2047_special(char ch
, enum rfc2047_type type
)
282 * rfc2047, section 4.2:
284 * 8-bit values which correspond to printable ASCII characters other
285 * than "=", "?", and "_" (underscore), MAY be represented as those
286 * characters. (But see section 5 for restrictions.) In
287 * particular, SPACE and TAB MUST NOT be represented as themselves
288 * within encoded words.
292 * rule out non-ASCII characters and non-printable characters (the
293 * non-ASCII check should be redundant as isprint() is not localized
294 * and only knows about ASCII, but be defensive about that)
296 if (non_ascii(ch
) || !isprint(ch
))
300 * rule out special printable characters (' ' should be the only
301 * whitespace character considered printable, but be defensive and use
304 if (isspace(ch
) || ch
== '=' || ch
== '?' || ch
== '_')
308 * rfc2047, section 5.3:
310 * As a replacement for a 'word' entity within a 'phrase', for example,
311 * one that precedes an address in a From, To, or Cc header. The ABNF
312 * definition for 'phrase' from RFC 822 thus becomes:
314 * phrase = 1*( encoded-word / word )
316 * In this case the set of characters that may be used in a "Q"-encoded
317 * 'encoded-word' is restricted to: <upper and lower case ASCII
318 * letters, decimal digits, "!", "*", "+", "-", "/", "=", and "_"
319 * (underscore, ASCII 95.)>. An 'encoded-word' that appears within a
320 * 'phrase' MUST be separated from any adjacent 'word', 'text' or
321 * 'special' by 'linear-white-space'.
324 if (type
!= RFC2047_ADDRESS
)
327 /* '=' and '_' are special cases and have been checked above */
328 return !(isalnum(ch
) || ch
== '!' || ch
== '*' || ch
== '+' || ch
== '-' || ch
== '/');
331 static int needs_rfc2047_encoding(const char *line
, int len
,
332 enum rfc2047_type type
)
336 for (i
= 0; i
< len
; i
++) {
338 if (non_ascii(ch
) || ch
== '\n')
340 if ((i
+ 1 < len
) && (ch
== '=' && line
[i
+1] == '?'))
347 static void add_rfc2047(struct strbuf
*sb
, const char *line
, size_t len
,
348 const char *encoding
, enum rfc2047_type type
)
350 static const int max_encoded_length
= 76; /* per rfc2047 */
352 int line_len
= last_line_length(sb
);
354 strbuf_grow(sb
, len
* 3 + strlen(encoding
) + 100);
355 strbuf_addf(sb
, "=?%s?q?", encoding
);
356 line_len
+= strlen(encoding
) + 5; /* 5 for =??q? */
360 * RFC 2047, section 5 (3):
362 * Each 'encoded-word' MUST represent an integral number of
363 * characters. A multi-octet character may not be split across
364 * adjacent 'encoded- word's.
366 const unsigned char *p
= (const unsigned char *)line
;
367 int chrlen
= mbs_chrlen(&line
, &len
, encoding
);
368 int is_special
= (chrlen
> 1) || is_rfc2047_special(*p
, type
);
370 /* "=%02X" * chrlen, or the byte itself */
371 const char *encoded_fmt
= is_special
? "=%02X" : "%c";
372 int encoded_len
= is_special
? 3 * chrlen
: 1;
375 * According to RFC 2047, we could encode the special character
376 * ' ' (space) with '_' (underscore) for readability. But many
377 * programs do not understand this and just leave the
378 * underscore in place. Thus, we do nothing special here, which
379 * causes ' ' to be encoded as '=20', avoiding this problem.
382 if (line_len
+ encoded_len
+ 2 > max_encoded_length
) {
383 /* It won't fit with trailing "?=" --- break the line */
384 strbuf_addf(sb
, "?=\n =?%s?q?", encoding
);
385 line_len
= strlen(encoding
) + 5 + 1; /* =??q? plus SP */
388 for (i
= 0; i
< chrlen
; i
++)
389 strbuf_addf(sb
, encoded_fmt
, p
[i
]);
390 line_len
+= encoded_len
;
392 strbuf_addstr(sb
, "?=");
395 const char *show_ident_date(const struct ident_split
*ident
,
398 unsigned long date
= 0;
401 if (ident
->date_begin
&& ident
->date_end
)
402 date
= strtoul(ident
->date_begin
, NULL
, 10);
403 if (date_overflows(date
))
406 if (ident
->tz_begin
&& ident
->tz_end
)
407 tz
= strtol(ident
->tz_begin
, NULL
, 10);
408 if (tz
>= INT_MAX
|| tz
<= INT_MIN
)
411 return show_date(date
, tz
, mode
);
414 void pp_user_info(struct pretty_print_context
*pp
,
415 const char *what
, struct strbuf
*sb
,
416 const char *line
, const char *encoding
)
418 struct ident_split ident
;
420 const char *mailbuf
, *namebuf
;
421 size_t namelen
, maillen
;
422 int max_length
= 78; /* per rfc2822 */
424 if (pp
->fmt
== CMIT_FMT_ONELINE
)
427 line_end
= strchrnul(line
, '\n');
428 if (split_ident_line(&ident
, line
, line_end
- line
))
431 mailbuf
= ident
.mail_begin
;
432 maillen
= ident
.mail_end
- ident
.mail_begin
;
433 namebuf
= ident
.name_begin
;
434 namelen
= ident
.name_end
- ident
.name_begin
;
437 map_user(pp
->mailmap
, &mailbuf
, &maillen
, &namebuf
, &namelen
);
439 if (pp
->fmt
== CMIT_FMT_EMAIL
) {
440 if (pp
->from_ident
&& ident_cmp(pp
->from_ident
, &ident
)) {
441 struct strbuf buf
= STRBUF_INIT
;
443 strbuf_addstr(&buf
, "From: ");
444 strbuf_add(&buf
, namebuf
, namelen
);
445 strbuf_addstr(&buf
, " <");
446 strbuf_add(&buf
, mailbuf
, maillen
);
447 strbuf_addstr(&buf
, ">\n");
448 string_list_append(&pp
->in_body_headers
,
449 strbuf_detach(&buf
, NULL
));
451 mailbuf
= pp
->from_ident
->mail_begin
;
452 maillen
= pp
->from_ident
->mail_end
- mailbuf
;
453 namebuf
= pp
->from_ident
->name_begin
;
454 namelen
= pp
->from_ident
->name_end
- namebuf
;
457 strbuf_addstr(sb
, "From: ");
458 if (needs_rfc2047_encoding(namebuf
, namelen
, RFC2047_ADDRESS
)) {
459 add_rfc2047(sb
, namebuf
, namelen
,
460 encoding
, RFC2047_ADDRESS
);
461 max_length
= 76; /* per rfc2047 */
462 } else if (needs_rfc822_quoting(namebuf
, namelen
)) {
463 struct strbuf quoted
= STRBUF_INIT
;
464 add_rfc822_quoted("ed
, namebuf
, namelen
);
465 strbuf_add_wrapped_bytes(sb
, quoted
.buf
, quoted
.len
,
467 strbuf_release("ed
);
469 strbuf_add_wrapped_bytes(sb
, namebuf
, namelen
,
474 last_line_length(sb
) + strlen(" <") + maillen
+ strlen(">"))
475 strbuf_addch(sb
, '\n');
476 strbuf_addf(sb
, " <%.*s>\n", (int)maillen
, mailbuf
);
478 strbuf_addf(sb
, "%s: %.*s%.*s <%.*s>\n", what
,
479 (pp
->fmt
== CMIT_FMT_FULLER
) ? 4 : 0, " ",
480 (int)namelen
, namebuf
, (int)maillen
, mailbuf
);
484 case CMIT_FMT_MEDIUM
:
485 strbuf_addf(sb
, "Date: %s\n",
486 show_ident_date(&ident
, pp
->date_mode
));
489 strbuf_addf(sb
, "Date: %s\n",
490 show_ident_date(&ident
, DATE_RFC2822
));
492 case CMIT_FMT_FULLER
:
493 strbuf_addf(sb
, "%sDate: %s\n", what
,
494 show_ident_date(&ident
, pp
->date_mode
));
502 static int is_empty_line(const char *line
, int *len_p
)
505 while (len
&& isspace(line
[len
- 1]))
511 static const char *skip_empty_lines(const char *msg
)
514 int linelen
= get_one_line(msg
);
518 if (!is_empty_line(msg
, &ll
))
525 static void add_merge_info(const struct pretty_print_context
*pp
,
526 struct strbuf
*sb
, const struct commit
*commit
)
528 struct commit_list
*parent
= commit
->parents
;
530 if ((pp
->fmt
== CMIT_FMT_ONELINE
) || (pp
->fmt
== CMIT_FMT_EMAIL
) ||
531 !parent
|| !parent
->next
)
534 strbuf_addstr(sb
, "Merge:");
537 struct commit
*p
= parent
->item
;
538 const char *hex
= NULL
;
540 hex
= find_unique_abbrev(p
->object
.sha1
, pp
->abbrev
);
542 hex
= sha1_to_hex(p
->object
.sha1
);
543 parent
= parent
->next
;
545 strbuf_addf(sb
, " %s", hex
);
547 strbuf_addch(sb
, '\n');
550 static char *get_header(const struct commit
*commit
, const char *msg
,
553 int key_len
= strlen(key
);
554 const char *line
= msg
;
557 const char *eol
= strchrnul(line
, '\n'), *next
;
562 warning("malformed commit (header is missing newline): %s",
563 sha1_to_hex(commit
->object
.sha1
));
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 const char *logmsg_reencode(const struct commit
*commit
,
609 char **commit_encoding
,
610 const char *output_encoding
)
612 static const char *utf8
= "UTF-8";
613 const char *use_encoding
;
615 const char *msg
= get_commit_buffer(commit
, NULL
);
618 if (!output_encoding
|| !*output_encoding
) {
621 get_header(commit
, msg
, "encoding");
624 encoding
= get_header(commit
, 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(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 unuse_commit_buffer(commit
, msg
);
662 * This replacement actually consumes the buffer we hand it, so we do
663 * not have to worry about freeing the old "out" here.
666 out
= replace_encoding_header(out
, output_encoding
);
668 if (!commit_encoding
)
671 * If the re-encoding failed, out might be NULL here; in that
672 * case we just return the commit message verbatim.
674 return out
? out
: msg
;
677 static int mailmap_name(const char **email
, size_t *email_len
,
678 const char **name
, size_t *name_len
)
680 static struct string_list
*mail_map
;
682 mail_map
= xcalloc(1, sizeof(*mail_map
));
683 read_mailmap(mail_map
, NULL
);
685 return mail_map
->nr
&& map_user(mail_map
, email
, email_len
, name
, name_len
);
688 static size_t format_person_part(struct strbuf
*sb
, char part
,
689 const char *msg
, int len
, enum date_mode dmode
)
691 /* currently all placeholders have same length */
692 const int placeholder_len
= 2;
693 struct ident_split s
;
694 const char *name
, *mail
;
695 size_t maillen
, namelen
;
697 if (split_ident_line(&s
, msg
, len
) < 0)
701 namelen
= s
.name_end
- s
.name_begin
;
703 maillen
= s
.mail_end
- s
.mail_begin
;
705 if (part
== 'N' || part
== 'E') /* mailmap lookup */
706 mailmap_name(&mail
, &maillen
, &name
, &namelen
);
707 if (part
== 'n' || part
== 'N') { /* name */
708 strbuf_add(sb
, name
, namelen
);
709 return placeholder_len
;
711 if (part
== 'e' || part
== 'E') { /* email */
712 strbuf_add(sb
, mail
, maillen
);
713 return placeholder_len
;
719 if (part
== 't') { /* date, UNIX timestamp */
720 strbuf_add(sb
, s
.date_begin
, s
.date_end
- s
.date_begin
);
721 return placeholder_len
;
726 strbuf_addstr(sb
, show_ident_date(&s
, dmode
));
727 return placeholder_len
;
728 case 'D': /* date, RFC2822 style */
729 strbuf_addstr(sb
, show_ident_date(&s
, DATE_RFC2822
));
730 return placeholder_len
;
731 case 'r': /* date, relative */
732 strbuf_addstr(sb
, show_ident_date(&s
, DATE_RELATIVE
));
733 return placeholder_len
;
734 case 'i': /* date, ISO 8601-like */
735 strbuf_addstr(sb
, show_ident_date(&s
, DATE_ISO8601
));
736 return placeholder_len
;
737 case 'I': /* date, ISO 8601 strict */
738 strbuf_addstr(sb
, show_ident_date(&s
, DATE_ISO8601_STRICT
));
739 return placeholder_len
;
744 * reading from either a bogus commit, or a reflog entry with
745 * %gn, %ge, etc.; 'sb' cannot be updated, but we still need
746 * to compute a valid return value.
748 if (part
== 'n' || part
== 'e' || part
== 't' || part
== 'd'
749 || part
== 'D' || part
== 'r' || part
== 'i')
750 return placeholder_len
;
752 return 0; /* unknown placeholder */
764 flush_left_and_steal
,
775 struct format_commit_context
{
776 const struct commit
*commit
;
777 const struct pretty_print_context
*pretty_ctx
;
778 unsigned commit_header_parsed
:1;
779 unsigned commit_message_parsed
:1;
780 struct signature_check signature_check
;
781 enum flush_type flush_type
;
782 enum trunc_type truncate
;
784 char *commit_encoding
;
785 size_t width
, indent1
, indent2
;
789 /* These offsets are relative to the start of the commit message. */
791 struct chunk committer
;
796 /* The following ones are relative to the result struct strbuf. */
797 struct chunk abbrev_commit_hash
;
798 struct chunk abbrev_tree_hash
;
799 struct chunk abbrev_parent_hashes
;
803 static int add_again(struct strbuf
*sb
, struct chunk
*chunk
)
806 strbuf_adddup(sb
, chunk
->off
, chunk
->len
);
811 * We haven't seen this chunk before. Our caller is surely
812 * going to add it the hard way now. Remember the most likely
813 * start of the to-be-added chunk: the current end of the
816 chunk
->off
= sb
->len
;
820 static void parse_commit_header(struct format_commit_context
*context
)
822 const char *msg
= context
->message
;
825 for (i
= 0; msg
[i
]; i
++) {
827 for (eol
= i
; msg
[eol
] && msg
[eol
] != '\n'; eol
++)
832 } else if (starts_with(msg
+ i
, "author ")) {
833 context
->author
.off
= i
+ 7;
834 context
->author
.len
= eol
- i
- 7;
835 } else if (starts_with(msg
+ i
, "committer ")) {
836 context
->committer
.off
= i
+ 10;
837 context
->committer
.len
= eol
- i
- 10;
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 static void format_sanitized_subject(struct strbuf
*sb
, const char *msg
)
854 size_t start_len
= sb
->len
;
857 for (; *msg
&& *msg
!= '\n'; msg
++) {
858 if (istitlechar(*msg
)) {
860 strbuf_addch(sb
, '-');
862 strbuf_addch(sb
, *msg
);
864 while (*(msg
+1) == '.')
870 /* trim any trailing '.' or '-' characters */
872 while (sb
->len
- trimlen
> start_len
&&
873 (sb
->buf
[sb
->len
- 1 - trimlen
] == '.'
874 || sb
->buf
[sb
->len
- 1 - trimlen
] == '-'))
876 strbuf_remove(sb
, sb
->len
- trimlen
, trimlen
);
879 const char *format_subject(struct strbuf
*sb
, const char *msg
,
880 const char *line_separator
)
885 const char *line
= msg
;
886 int linelen
= get_one_line(line
);
889 if (!linelen
|| is_empty_line(line
, &linelen
))
894 strbuf_grow(sb
, linelen
+ 2);
896 strbuf_addstr(sb
, line_separator
);
897 strbuf_add(sb
, line
, linelen
);
903 static void parse_commit_message(struct format_commit_context
*c
)
905 const char *msg
= c
->message
+ c
->message_off
;
906 const char *start
= c
->message
;
908 msg
= skip_empty_lines(msg
);
909 c
->subject_off
= msg
- start
;
911 msg
= format_subject(NULL
, msg
, NULL
);
912 msg
= skip_empty_lines(msg
);
913 c
->body_off
= msg
- start
;
915 c
->commit_message_parsed
= 1;
918 static void strbuf_wrap(struct strbuf
*sb
, size_t pos
,
919 size_t width
, size_t indent1
, size_t indent2
)
921 struct strbuf tmp
= STRBUF_INIT
;
924 strbuf_add(&tmp
, sb
->buf
, pos
);
925 strbuf_add_wrapped_text(&tmp
, sb
->buf
+ pos
,
926 (int) indent1
, (int) indent2
, (int) width
);
927 strbuf_swap(&tmp
, sb
);
928 strbuf_release(&tmp
);
931 static void rewrap_message_tail(struct strbuf
*sb
,
932 struct format_commit_context
*c
,
933 size_t new_width
, size_t new_indent1
,
936 if (c
->width
== new_width
&& c
->indent1
== new_indent1
&&
937 c
->indent2
== new_indent2
)
939 if (c
->wrap_start
< sb
->len
)
940 strbuf_wrap(sb
, c
->wrap_start
, c
->width
, c
->indent1
, c
->indent2
);
941 c
->wrap_start
= sb
->len
;
942 c
->width
= new_width
;
943 c
->indent1
= new_indent1
;
944 c
->indent2
= new_indent2
;
947 static int format_reflog_person(struct strbuf
*sb
,
949 struct reflog_walk_info
*log
,
950 enum date_mode dmode
)
957 ident
= get_reflog_ident(log
);
961 return format_person_part(sb
, part
, ident
, strlen(ident
), dmode
);
964 static size_t parse_color(struct strbuf
*sb
, /* in UTF-8 */
965 const char *placeholder
,
966 struct format_commit_context
*c
)
968 if (placeholder
[1] == '(') {
969 const char *begin
= placeholder
+ 2;
970 const char *end
= strchr(begin
, ')');
971 char color
[COLOR_MAXLEN
];
975 if (starts_with(begin
, "auto,")) {
976 if (!want_color(c
->pretty_ctx
->color
))
977 return end
- placeholder
+ 1;
980 color_parse_mem(begin
,
982 "--pretty format", color
);
983 strbuf_addstr(sb
, color
);
984 return end
- placeholder
+ 1;
986 if (starts_with(placeholder
+ 1, "red")) {
987 strbuf_addstr(sb
, GIT_COLOR_RED
);
989 } else if (starts_with(placeholder
+ 1, "green")) {
990 strbuf_addstr(sb
, GIT_COLOR_GREEN
);
992 } else if (starts_with(placeholder
+ 1, "blue")) {
993 strbuf_addstr(sb
, GIT_COLOR_BLUE
);
995 } else if (starts_with(placeholder
+ 1, "reset")) {
996 strbuf_addstr(sb
, GIT_COLOR_RESET
);
1002 static size_t parse_padding_placeholder(struct strbuf
*sb
,
1003 const char *placeholder
,
1004 struct format_commit_context
*c
)
1006 const char *ch
= placeholder
;
1007 enum flush_type flush_type
;
1012 flush_type
= flush_right
;
1016 flush_type
= flush_both
;
1018 } else if (*ch
== '>') {
1019 flush_type
= flush_left_and_steal
;
1022 flush_type
= flush_left
;
1028 /* the next value means "wide enough to that column" */
1035 const char *start
= ch
+ 1;
1036 const char *end
= start
+ strcspn(start
, ",)");
1039 if (!end
|| end
== start
)
1041 width
= strtoul(start
, &next
, 10);
1042 if (next
== start
|| width
== 0)
1044 c
->padding
= to_column
? -width
: width
;
1045 c
->flush_type
= flush_type
;
1049 end
= strchr(start
, ')');
1050 if (!end
|| end
== start
)
1052 if (starts_with(start
, "trunc)"))
1053 c
->truncate
= trunc_right
;
1054 else if (starts_with(start
, "ltrunc)"))
1055 c
->truncate
= trunc_left
;
1056 else if (starts_with(start
, "mtrunc)"))
1057 c
->truncate
= trunc_middle
;
1061 c
->truncate
= trunc_none
;
1063 return end
- placeholder
+ 1;
1068 static size_t format_commit_one(struct strbuf
*sb
, /* in UTF-8 */
1069 const char *placeholder
,
1072 struct format_commit_context
*c
= context
;
1073 const struct commit
*commit
= c
->commit
;
1074 const char *msg
= c
->message
;
1075 struct commit_list
*p
;
1078 /* these are independent of the commit */
1079 switch (placeholder
[0]) {
1081 if (starts_with(placeholder
+ 1, "(auto)")) {
1083 return 7; /* consumed 7 bytes, "C(auto)" */
1085 int ret
= parse_color(sb
, placeholder
, c
);
1089 * Otherwise, we decided to treat %C<unknown>
1090 * as a literal string, and the previous
1091 * %C(auto) is still valid.
1095 case 'n': /* newline */
1096 strbuf_addch(sb
, '\n');
1099 /* %x00 == NUL, %x0a == LF, etc. */
1100 if (0 <= (h1
= hexval_table
[0xff & placeholder
[1]]) &&
1102 0 <= (h2
= hexval_table
[0xff & placeholder
[2]]) &&
1104 strbuf_addch(sb
, (h1
<<4)|h2
);
1109 if (placeholder
[1] == '(') {
1110 unsigned long width
= 0, indent1
= 0, indent2
= 0;
1112 const char *start
= placeholder
+ 2;
1113 const char *end
= strchr(start
, ')');
1117 width
= strtoul(start
, &next
, 10);
1119 indent1
= strtoul(next
+ 1, &next
, 10);
1121 indent2
= strtoul(next
+ 1,
1128 rewrap_message_tail(sb
, c
, width
, indent1
, indent2
);
1129 return end
- placeholder
+ 1;
1135 return parse_padding_placeholder(sb
, placeholder
, c
);
1138 /* these depend on the commit */
1139 if (!commit
->object
.parsed
)
1140 parse_object(commit
->object
.sha1
);
1142 switch (placeholder
[0]) {
1143 case 'H': /* commit hash */
1144 strbuf_addstr(sb
, diff_get_color(c
->auto_color
, DIFF_COMMIT
));
1145 strbuf_addstr(sb
, sha1_to_hex(commit
->object
.sha1
));
1146 strbuf_addstr(sb
, diff_get_color(c
->auto_color
, DIFF_RESET
));
1148 case 'h': /* abbreviated commit hash */
1149 strbuf_addstr(sb
, diff_get_color(c
->auto_color
, DIFF_COMMIT
));
1150 if (add_again(sb
, &c
->abbrev_commit_hash
)) {
1151 strbuf_addstr(sb
, diff_get_color(c
->auto_color
, DIFF_RESET
));
1154 strbuf_addstr(sb
, find_unique_abbrev(commit
->object
.sha1
,
1155 c
->pretty_ctx
->abbrev
));
1156 strbuf_addstr(sb
, diff_get_color(c
->auto_color
, DIFF_RESET
));
1157 c
->abbrev_commit_hash
.len
= sb
->len
- c
->abbrev_commit_hash
.off
;
1159 case 'T': /* tree hash */
1160 strbuf_addstr(sb
, sha1_to_hex(commit
->tree
->object
.sha1
));
1162 case 't': /* abbreviated tree hash */
1163 if (add_again(sb
, &c
->abbrev_tree_hash
))
1165 strbuf_addstr(sb
, find_unique_abbrev(commit
->tree
->object
.sha1
,
1166 c
->pretty_ctx
->abbrev
));
1167 c
->abbrev_tree_hash
.len
= sb
->len
- c
->abbrev_tree_hash
.off
;
1169 case 'P': /* parent hashes */
1170 for (p
= commit
->parents
; p
; p
= p
->next
) {
1171 if (p
!= commit
->parents
)
1172 strbuf_addch(sb
, ' ');
1173 strbuf_addstr(sb
, sha1_to_hex(p
->item
->object
.sha1
));
1176 case 'p': /* abbreviated parent hashes */
1177 if (add_again(sb
, &c
->abbrev_parent_hashes
))
1179 for (p
= commit
->parents
; p
; p
= p
->next
) {
1180 if (p
!= commit
->parents
)
1181 strbuf_addch(sb
, ' ');
1182 strbuf_addstr(sb
, find_unique_abbrev(
1183 p
->item
->object
.sha1
,
1184 c
->pretty_ctx
->abbrev
));
1186 c
->abbrev_parent_hashes
.len
= sb
->len
-
1187 c
->abbrev_parent_hashes
.off
;
1189 case 'm': /* left/right/bottom */
1190 strbuf_addstr(sb
, get_revision_mark(NULL
, commit
));
1193 load_ref_decorations(DECORATE_SHORT_REFS
);
1194 format_decorations(sb
, commit
, c
->auto_color
);
1196 case 'g': /* reflog info */
1197 switch(placeholder
[1]) {
1198 case 'd': /* reflog selector */
1200 if (c
->pretty_ctx
->reflog_info
)
1201 get_reflog_selector(sb
,
1202 c
->pretty_ctx
->reflog_info
,
1203 c
->pretty_ctx
->date_mode
,
1204 c
->pretty_ctx
->date_mode_explicit
,
1205 (placeholder
[1] == 'd'));
1207 case 's': /* reflog message */
1208 if (c
->pretty_ctx
->reflog_info
)
1209 get_reflog_message(sb
, c
->pretty_ctx
->reflog_info
);
1215 return format_reflog_person(sb
,
1217 c
->pretty_ctx
->reflog_info
,
1218 c
->pretty_ctx
->date_mode
);
1220 return 0; /* unknown %g placeholder */
1222 if (c
->pretty_ctx
->notes_message
) {
1223 strbuf_addstr(sb
, c
->pretty_ctx
->notes_message
);
1229 if (placeholder
[0] == 'G') {
1230 if (!c
->signature_check
.result
)
1231 check_commit_signature(c
->commit
, &(c
->signature_check
));
1232 switch (placeholder
[1]) {
1234 if (c
->signature_check
.gpg_output
)
1235 strbuf_addstr(sb
, c
->signature_check
.gpg_output
);
1238 switch (c
->signature_check
.result
) {
1243 strbuf_addch(sb
, c
->signature_check
.result
);
1247 if (c
->signature_check
.signer
)
1248 strbuf_addstr(sb
, c
->signature_check
.signer
);
1251 if (c
->signature_check
.key
)
1252 strbuf_addstr(sb
, c
->signature_check
.key
);
1261 /* For the rest we have to parse the commit header. */
1262 if (!c
->commit_header_parsed
)
1263 parse_commit_header(c
);
1265 switch (placeholder
[0]) {
1266 case 'a': /* author ... */
1267 return format_person_part(sb
, placeholder
[1],
1268 msg
+ c
->author
.off
, c
->author
.len
,
1269 c
->pretty_ctx
->date_mode
);
1270 case 'c': /* committer ... */
1271 return format_person_part(sb
, placeholder
[1],
1272 msg
+ c
->committer
.off
, c
->committer
.len
,
1273 c
->pretty_ctx
->date_mode
);
1274 case 'e': /* encoding */
1275 if (c
->commit_encoding
)
1276 strbuf_addstr(sb
, c
->commit_encoding
);
1278 case 'B': /* raw body */
1279 /* message_off is always left at the initial newline */
1280 strbuf_addstr(sb
, msg
+ c
->message_off
+ 1);
1284 /* Now we need to parse the commit message. */
1285 if (!c
->commit_message_parsed
)
1286 parse_commit_message(c
);
1288 switch (placeholder
[0]) {
1289 case 's': /* subject */
1290 format_subject(sb
, msg
+ c
->subject_off
, " ");
1292 case 'f': /* sanitized subject */
1293 format_sanitized_subject(sb
, msg
+ c
->subject_off
);
1295 case 'b': /* body */
1296 strbuf_addstr(sb
, msg
+ c
->body_off
);
1299 return 0; /* unknown placeholder */
1302 static size_t format_and_pad_commit(struct strbuf
*sb
, /* in UTF-8 */
1303 const char *placeholder
,
1304 struct format_commit_context
*c
)
1306 struct strbuf local_sb
= STRBUF_INIT
;
1307 int total_consumed
= 0, len
, padding
= c
->padding
;
1309 const char *start
= strrchr(sb
->buf
, '\n');
1313 occupied
= utf8_strnwidth(start
, -1, 1);
1314 padding
= (-padding
) - occupied
;
1317 int modifier
= *placeholder
== 'C';
1318 int consumed
= format_commit_one(&local_sb
, placeholder
, c
);
1319 total_consumed
+= consumed
;
1324 placeholder
+= consumed
;
1325 if (*placeholder
!= '%')
1330 len
= utf8_strnwidth(local_sb
.buf
, -1, 1);
1332 if (c
->flush_type
== flush_left_and_steal
) {
1333 const char *ch
= sb
->buf
+ sb
->len
- 1;
1334 while (len
> padding
&& ch
> sb
->buf
) {
1341 /* check for trailing ansi sequences */
1345 while (ch
- p
< 10 && *p
!= '\033')
1348 ch
+ 1 - p
!= display_mode_esc_sequence_len(p
))
1351 * got a good ansi sequence, put it back to
1352 * local_sb as we're cutting sb
1354 strbuf_insert(&local_sb
, 0, p
, ch
+ 1 - p
);
1357 strbuf_setlen(sb
, ch
+ 1 - sb
->buf
);
1358 c
->flush_type
= flush_left
;
1361 if (len
> padding
) {
1362 switch (c
->truncate
) {
1364 strbuf_utf8_replace(&local_sb
,
1365 0, len
- (padding
- 2),
1369 strbuf_utf8_replace(&local_sb
,
1371 len
- (padding
- 2),
1375 strbuf_utf8_replace(&local_sb
,
1376 padding
- 2, len
- (padding
- 2),
1382 strbuf_addbuf(sb
, &local_sb
);
1384 int sb_len
= sb
->len
, offset
= 0;
1385 if (c
->flush_type
== flush_left
)
1386 offset
= padding
- len
;
1387 else if (c
->flush_type
== flush_both
)
1388 offset
= (padding
- len
) / 2;
1390 * we calculate padding in columns, now
1391 * convert it back to chars
1393 padding
= padding
- len
+ local_sb
.len
;
1394 strbuf_grow(sb
, padding
);
1395 strbuf_setlen(sb
, sb_len
+ padding
);
1396 memset(sb
->buf
+ sb_len
, ' ', sb
->len
- sb_len
);
1397 memcpy(sb
->buf
+ sb_len
+ offset
, local_sb
.buf
,
1400 strbuf_release(&local_sb
);
1401 c
->flush_type
= no_flush
;
1402 return total_consumed
;
1405 static size_t format_commit_item(struct strbuf
*sb
, /* in UTF-8 */
1406 const char *placeholder
,
1413 ADD_LF_BEFORE_NON_EMPTY
,
1414 DEL_LF_BEFORE_EMPTY
,
1415 ADD_SP_BEFORE_NON_EMPTY
1418 switch (placeholder
[0]) {
1420 magic
= DEL_LF_BEFORE_EMPTY
;
1423 magic
= ADD_LF_BEFORE_NON_EMPTY
;
1426 magic
= ADD_SP_BEFORE_NON_EMPTY
;
1431 if (magic
!= NO_MAGIC
)
1435 if (((struct format_commit_context
*)context
)->flush_type
!= no_flush
)
1436 consumed
= format_and_pad_commit(sb
, placeholder
, context
);
1438 consumed
= format_commit_one(sb
, placeholder
, context
);
1439 if (magic
== NO_MAGIC
)
1442 if ((orig_len
== sb
->len
) && magic
== DEL_LF_BEFORE_EMPTY
) {
1443 while (sb
->len
&& sb
->buf
[sb
->len
- 1] == '\n')
1444 strbuf_setlen(sb
, sb
->len
- 1);
1445 } else if (orig_len
!= sb
->len
) {
1446 if (magic
== ADD_LF_BEFORE_NON_EMPTY
)
1447 strbuf_insert(sb
, orig_len
, "\n", 1);
1448 else if (magic
== ADD_SP_BEFORE_NON_EMPTY
)
1449 strbuf_insert(sb
, orig_len
, " ", 1);
1451 return consumed
+ 1;
1454 static size_t userformat_want_item(struct strbuf
*sb
, const char *placeholder
,
1457 struct userformat_want
*w
= context
;
1459 if (*placeholder
== '+' || *placeholder
== '-' || *placeholder
== ' ')
1462 switch (*placeholder
) {
1470 void userformat_find_requirements(const char *fmt
, struct userformat_want
*w
)
1472 struct strbuf dummy
= STRBUF_INIT
;
1479 strbuf_expand(&dummy
, fmt
, userformat_want_item
, w
);
1480 strbuf_release(&dummy
);
1483 void format_commit_message(const struct commit
*commit
,
1484 const char *format
, struct strbuf
*sb
,
1485 const struct pretty_print_context
*pretty_ctx
)
1487 struct format_commit_context context
;
1488 const char *output_enc
= pretty_ctx
->output_encoding
;
1489 const char *utf8
= "UTF-8";
1491 memset(&context
, 0, sizeof(context
));
1492 context
.commit
= commit
;
1493 context
.pretty_ctx
= pretty_ctx
;
1494 context
.wrap_start
= sb
->len
;
1496 * convert a commit message to UTF-8 first
1497 * as far as 'format_commit_item' assumes it in UTF-8
1499 context
.message
= logmsg_reencode(commit
,
1500 &context
.commit_encoding
,
1503 strbuf_expand(sb
, format
, format_commit_item
, &context
);
1504 rewrap_message_tail(sb
, &context
, 0, 0, 0);
1506 /* then convert a commit message to an actual output encoding */
1508 if (same_encoding(utf8
, output_enc
))
1511 if (context
.commit_encoding
&&
1512 !same_encoding(context
.commit_encoding
, utf8
))
1513 output_enc
= context
.commit_encoding
;
1518 char *out
= reencode_string_len(sb
->buf
, sb
->len
,
1519 output_enc
, utf8
, &outsz
);
1521 strbuf_attach(sb
, out
, outsz
, outsz
+ 1);
1524 free(context
.commit_encoding
);
1525 unuse_commit_buffer(commit
, context
.message
);
1528 static void pp_header(struct pretty_print_context
*pp
,
1529 const char *encoding
,
1530 const struct commit
*commit
,
1534 int parents_shown
= 0;
1537 const char *line
= *msg_p
;
1538 int linelen
= get_one_line(*msg_p
);
1548 if (pp
->fmt
== CMIT_FMT_RAW
) {
1549 strbuf_add(sb
, line
, linelen
);
1553 if (starts_with(line
, "parent ")) {
1555 die("bad parent line in commit");
1559 if (!parents_shown
) {
1560 unsigned num
= commit_list_count(commit
->parents
);
1561 /* with enough slop */
1562 strbuf_grow(sb
, num
* 50 + 20);
1563 add_merge_info(pp
, sb
, commit
);
1568 * MEDIUM == DEFAULT shows only author with dates.
1569 * FULL shows both authors but not dates.
1570 * FULLER shows both authors and dates.
1572 if (starts_with(line
, "author ")) {
1573 strbuf_grow(sb
, linelen
+ 80);
1574 pp_user_info(pp
, "Author", sb
, line
+ 7, encoding
);
1576 if (starts_with(line
, "committer ") &&
1577 (pp
->fmt
== CMIT_FMT_FULL
|| pp
->fmt
== CMIT_FMT_FULLER
)) {
1578 strbuf_grow(sb
, linelen
+ 80);
1579 pp_user_info(pp
, "Commit", sb
, line
+ 10, encoding
);
1584 void pp_title_line(struct pretty_print_context
*pp
,
1587 const char *encoding
,
1590 static const int max_length
= 78; /* per rfc2047 */
1591 struct strbuf title
;
1593 strbuf_init(&title
, 80);
1594 *msg_p
= format_subject(&title
, *msg_p
,
1595 pp
->preserve_subject
? "\n" : " ");
1597 strbuf_grow(sb
, title
.len
+ 1024);
1599 strbuf_addstr(sb
, pp
->subject
);
1600 if (needs_rfc2047_encoding(title
.buf
, title
.len
, RFC2047_SUBJECT
))
1601 add_rfc2047(sb
, title
.buf
, title
.len
,
1602 encoding
, RFC2047_SUBJECT
);
1604 strbuf_add_wrapped_bytes(sb
, title
.buf
, title
.len
,
1605 -last_line_length(sb
), 1, max_length
);
1607 strbuf_addbuf(sb
, &title
);
1609 strbuf_addch(sb
, '\n');
1611 if (need_8bit_cte
== 0) {
1613 for (i
= 0; i
< pp
->in_body_headers
.nr
; i
++) {
1614 if (has_non_ascii(pp
->in_body_headers
.items
[i
].string
)) {
1621 if (need_8bit_cte
> 0) {
1622 const char *header_fmt
=
1623 "MIME-Version: 1.0\n"
1624 "Content-Type: text/plain; charset=%s\n"
1625 "Content-Transfer-Encoding: 8bit\n";
1626 strbuf_addf(sb
, header_fmt
, encoding
);
1628 if (pp
->after_subject
) {
1629 strbuf_addstr(sb
, pp
->after_subject
);
1631 if (pp
->fmt
== CMIT_FMT_EMAIL
) {
1632 strbuf_addch(sb
, '\n');
1635 if (pp
->in_body_headers
.nr
) {
1637 for (i
= 0; i
< pp
->in_body_headers
.nr
; i
++) {
1638 strbuf_addstr(sb
, pp
->in_body_headers
.items
[i
].string
);
1639 free(pp
->in_body_headers
.items
[i
].string
);
1641 string_list_clear(&pp
->in_body_headers
, 0);
1642 strbuf_addch(sb
, '\n');
1645 strbuf_release(&title
);
1648 void pp_remainder(struct pretty_print_context
*pp
,
1655 const char *line
= *msg_p
;
1656 int linelen
= get_one_line(line
);
1662 if (is_empty_line(line
, &linelen
)) {
1665 if (pp
->fmt
== CMIT_FMT_SHORT
)
1670 strbuf_grow(sb
, linelen
+ indent
+ 20);
1672 memset(sb
->buf
+ sb
->len
, ' ', indent
);
1673 strbuf_setlen(sb
, sb
->len
+ indent
);
1675 strbuf_add(sb
, line
, linelen
);
1676 strbuf_addch(sb
, '\n');
1680 void pretty_print_commit(struct pretty_print_context
*pp
,
1681 const struct commit
*commit
,
1684 unsigned long beginning_of_body
;
1687 const char *reencoded
;
1688 const char *encoding
;
1689 int need_8bit_cte
= pp
->need_8bit_cte
;
1691 if (pp
->fmt
== CMIT_FMT_USERFORMAT
) {
1692 format_commit_message(commit
, user_format
, sb
, pp
);
1696 encoding
= get_log_output_encoding();
1697 msg
= reencoded
= logmsg_reencode(commit
, NULL
, encoding
);
1699 if (pp
->fmt
== CMIT_FMT_ONELINE
|| pp
->fmt
== CMIT_FMT_EMAIL
)
1703 * We need to check and emit Content-type: to mark it
1704 * as 8-bit if we haven't done so.
1706 if (pp
->fmt
== CMIT_FMT_EMAIL
&& need_8bit_cte
== 0) {
1709 for (in_body
= i
= 0; (ch
= msg
[i
]); i
++) {
1711 /* author could be non 7-bit ASCII but
1712 * the log may be so; skip over the
1713 * header part first.
1715 if (ch
== '\n' && msg
[i
+1] == '\n')
1718 else if (non_ascii(ch
)) {
1725 pp_header(pp
, encoding
, commit
, &msg
, sb
);
1726 if (pp
->fmt
!= CMIT_FMT_ONELINE
&& !pp
->subject
) {
1727 strbuf_addch(sb
, '\n');
1730 /* Skip excess blank lines at the beginning of body, if any... */
1731 msg
= skip_empty_lines(msg
);
1733 /* These formats treat the title line specially. */
1734 if (pp
->fmt
== CMIT_FMT_ONELINE
|| pp
->fmt
== CMIT_FMT_EMAIL
)
1735 pp_title_line(pp
, &msg
, sb
, encoding
, need_8bit_cte
);
1737 beginning_of_body
= sb
->len
;
1738 if (pp
->fmt
!= CMIT_FMT_ONELINE
)
1739 pp_remainder(pp
, &msg
, sb
, indent
);
1742 /* Make sure there is an EOLN for the non-oneline case */
1743 if (pp
->fmt
!= CMIT_FMT_ONELINE
)
1744 strbuf_addch(sb
, '\n');
1747 * The caller may append additional body text in e-mail
1748 * format. Make sure we did not strip the blank line
1749 * between the header and the body.
1751 if (pp
->fmt
== CMIT_FMT_EMAIL
&& sb
->len
<= beginning_of_body
)
1752 strbuf_addch(sb
, '\n');
1754 unuse_commit_buffer(commit
, reencoded
);
1757 void pp_commit_easy(enum cmit_fmt fmt
, const struct commit
*commit
,
1760 struct pretty_print_context pp
= {0};
1762 pretty_print_commit(&pp
, commit
, sb
);