6 #include "string-list.h"
11 #include "reflog-walk.h"
13 static char *user_format;
14 static struct cmt_fmt_map {
19 const char *user_format;
21 static size_t builtin_formats_len;
22 static size_t commit_formats_len;
23 static size_t commit_formats_alloc;
24 static struct cmt_fmt_map *find_commit_format(const char *sought);
26 static void save_user_format(struct rev_info *rev, const char *cp, int is_tformat)
29 user_format = xstrdup(cp);
31 rev->use_terminator = 1;
32 rev->commit_format = CMIT_FMT_USERFORMAT;
35 static int git_pretty_formats_config(const char *var, const char *value, void *cb)
37 struct cmt_fmt_map *commit_format = NULL;
42 if (prefixcmp(var, "pretty."))
45 name = var + strlen("pretty.");
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 (!prefixcmp(fmt, "format:") || !prefixcmp(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 (prefixcmp(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 (!prefixcmp(arg, "format:") || !prefixcmp(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_rfc2047_special(char ch)
213 return (non_ascii(ch) || (ch == '=') || (ch == '?') || (ch == '_'));
216 static void add_rfc2047(struct strbuf *sb, const char *line, int len,
217 const char *encoding)
221 for (i = 0; i < len; i++) {
225 if ((i + 1 < len) && (ch == '=' && line[i+1] == '?'))
228 strbuf_add(sb, line, len);
232 strbuf_grow(sb, len * 3 + strlen(encoding) + 100);
233 strbuf_addf(sb, "=?%s?q?", encoding);
234 for (i = last = 0; i < len; i++) {
235 unsigned ch = line[i] & 0xFF;
237 * We encode ' ' using '=20' even though rfc2047
238 * allows using '_' for readability. Unfortunately,
239 * many programs do not understand this and just
240 * leave the underscore in place.
242 if (is_rfc2047_special(ch) || ch == ' ') {
243 strbuf_add(sb, line + last, i - last);
244 strbuf_addf(sb, "=%02X", ch);
248 strbuf_add(sb, line + last, len - last);
249 strbuf_addstr(sb, "?=");
252 void pp_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb,
253 const char *line, enum date_mode dmode,
254 const char *encoding)
261 if (fmt == CMIT_FMT_ONELINE)
263 date = strchr(line, '>');
266 namelen = ++date - line;
267 time = strtoul(date, &date, 10);
268 tz = strtol(date, NULL, 10);
270 if (fmt == CMIT_FMT_EMAIL) {
271 char *name_tail = strchr(line, '<');
272 int display_name_length;
275 while (line < name_tail && isspace(name_tail[-1]))
277 display_name_length = name_tail - line;
278 strbuf_addstr(sb, "From: ");
279 add_rfc2047(sb, line, display_name_length, encoding);
280 strbuf_add(sb, name_tail, namelen - display_name_length);
281 strbuf_addch(sb, '\n');
283 strbuf_addf(sb, "%s: %.*s%.*s\n", what,
284 (fmt == CMIT_FMT_FULLER) ? 4 : 0,
288 case CMIT_FMT_MEDIUM:
289 strbuf_addf(sb, "Date: %s\n", show_date(time, tz, dmode));
292 strbuf_addf(sb, "Date: %s\n", show_date(time, tz, DATE_RFC2822));
294 case CMIT_FMT_FULLER:
295 strbuf_addf(sb, "%sDate: %s\n", what, show_date(time, tz, dmode));
303 static int is_empty_line(const char *line, int *len_p)
306 while (len && isspace(line[len-1]))
312 static const char *skip_empty_lines(const char *msg)
315 int linelen = get_one_line(msg);
319 if (!is_empty_line(msg, &ll))
326 static void add_merge_info(enum cmit_fmt fmt, struct strbuf *sb,
327 const struct commit *commit, int abbrev)
329 struct commit_list *parent = commit->parents;
331 if ((fmt == CMIT_FMT_ONELINE) || (fmt == CMIT_FMT_EMAIL) ||
332 !parent || !parent->next)
335 strbuf_addstr(sb, "Merge:");
338 struct commit *p = parent->item;
339 const char *hex = NULL;
341 hex = find_unique_abbrev(p->object.sha1, abbrev);
343 hex = sha1_to_hex(p->object.sha1);
344 parent = parent->next;
346 strbuf_addf(sb, " %s", hex);
348 strbuf_addch(sb, '\n');
351 static char *get_header(const struct commit *commit, const char *key)
353 int key_len = strlen(key);
354 const char *line = commit->buffer;
357 const char *eol = strchr(line, '\n'), *next;
362 eol = line + strlen(line);
366 if (eol - line > key_len &&
367 !strncmp(line, key, key_len) &&
368 line[key_len] == ' ') {
369 return xmemdupz(line + key_len + 1, eol - line - key_len - 1);
375 static char *replace_encoding_header(char *buf, const char *encoding)
377 struct strbuf tmp = STRBUF_INIT;
381 /* guess if there is an encoding header before a \n\n */
382 while (strncmp(cp, "encoding ", strlen("encoding "))) {
383 cp = strchr(cp, '\n');
384 if (!cp || *++cp == '\n')
388 cp = strchr(cp, '\n');
390 return buf; /* should not happen but be defensive */
391 len = cp + 1 - (buf + start);
393 strbuf_attach(&tmp, buf, strlen(buf), strlen(buf) + 1);
394 if (is_encoding_utf8(encoding)) {
395 /* we have re-coded to UTF-8; drop the header */
396 strbuf_remove(&tmp, start, len);
398 /* just replaces XXXX in 'encoding XXXX\n' */
399 strbuf_splice(&tmp, start + strlen("encoding "),
400 len - strlen("encoding \n"),
401 encoding, strlen(encoding));
403 return strbuf_detach(&tmp, NULL);
406 char *logmsg_reencode(const struct commit *commit,
407 const char *output_encoding)
409 static const char *utf8 = "UTF-8";
410 const char *use_encoding;
414 if (!*output_encoding)
416 encoding = get_header(commit, "encoding");
417 use_encoding = encoding ? encoding : utf8;
418 if (!strcmp(use_encoding, output_encoding))
419 if (encoding) /* we'll strip encoding header later */
420 out = xstrdup(commit->buffer);
422 return NULL; /* nothing to do */
424 out = reencode_string(commit->buffer,
425 output_encoding, use_encoding);
427 out = replace_encoding_header(out, output_encoding);
433 static int mailmap_name(char *email, int email_len, char *name, int name_len)
435 static struct string_list *mail_map;
437 mail_map = xcalloc(1, sizeof(*mail_map));
438 read_mailmap(mail_map, NULL);
440 return mail_map->nr && map_user(mail_map, email, email_len, name, name_len);
443 static size_t format_person_part(struct strbuf *sb, char part,
444 const char *msg, int len, enum date_mode dmode)
446 /* currently all placeholders have same length */
447 const int placeholder_len = 2;
448 int start, end, tz = 0;
449 unsigned long date = 0;
451 const char *name_start, *name_end, *mail_start, *mail_end, *msg_end = msg+len;
452 char person_name[1024];
453 char person_mail[1024];
455 /* advance 'end' to point to email start delimiter */
456 for (end = 0; end < len && msg[end] != '<'; end++)
460 * When end points at the '<' that we found, it should have
461 * matching '>' later, which means 'end' must be strictly
467 /* Seek for both name and email part */
470 while (name_end > name_start && isspace(*(name_end-1)))
472 mail_start = msg+end+1;
473 mail_end = mail_start;
474 while (mail_end < msg_end && *mail_end != '>')
476 if (mail_end == msg_end)
480 if (part == 'N' || part == 'E') { /* mailmap lookup */
481 strlcpy(person_name, name_start, name_end-name_start+1);
482 strlcpy(person_mail, mail_start, mail_end-mail_start+1);
483 mailmap_name(person_mail, sizeof(person_mail), person_name, sizeof(person_name));
484 name_start = person_name;
485 name_end = name_start + strlen(person_name);
486 mail_start = person_mail;
487 mail_end = mail_start + strlen(person_mail);
489 if (part == 'n' || part == 'N') { /* name */
490 strbuf_add(sb, name_start, name_end-name_start);
491 return placeholder_len;
493 if (part == 'e' || part == 'E') { /* email */
494 strbuf_add(sb, mail_start, mail_end-mail_start);
495 return placeholder_len;
498 /* advance 'start' to point to date start delimiter */
499 for (start = end + 1; start < len && isspace(msg[start]); start++)
503 date = strtoul(msg + start, &ep, 10);
504 if (msg + start == ep)
507 if (part == 't') { /* date, UNIX timestamp */
508 strbuf_add(sb, msg + start, ep - (msg + start));
509 return placeholder_len;
513 for (start = ep - msg + 1; start < len && isspace(msg[start]); start++)
515 if (start + 1 < len) {
516 tz = strtoul(msg + start + 1, NULL, 10);
517 if (msg[start] == '-')
523 strbuf_addstr(sb, show_date(date, tz, dmode));
524 return placeholder_len;
525 case 'D': /* date, RFC2822 style */
526 strbuf_addstr(sb, show_date(date, tz, DATE_RFC2822));
527 return placeholder_len;
528 case 'r': /* date, relative */
529 strbuf_addstr(sb, show_date(date, tz, DATE_RELATIVE));
530 return placeholder_len;
531 case 'i': /* date, ISO 8601 */
532 strbuf_addstr(sb, show_date(date, tz, DATE_ISO8601));
533 return placeholder_len;
538 * bogus commit, 'sb' cannot be updated, but we still need to
539 * compute a valid return value.
541 if (part == 'n' || part == 'e' || part == 't' || part == 'd'
542 || part == 'D' || part == 'r' || part == 'i')
543 return placeholder_len;
545 return 0; /* unknown placeholder */
553 struct format_commit_context {
554 const struct commit *commit;
555 const struct pretty_print_context *pretty_ctx;
556 unsigned commit_header_parsed:1;
557 unsigned commit_message_parsed:1;
559 size_t width, indent1, indent2;
561 /* These offsets are relative to the start of the commit message. */
563 struct chunk committer;
564 struct chunk encoding;
569 /* The following ones are relative to the result struct strbuf. */
570 struct chunk abbrev_commit_hash;
571 struct chunk abbrev_tree_hash;
572 struct chunk abbrev_parent_hashes;
576 static int add_again(struct strbuf *sb, struct chunk *chunk)
579 strbuf_adddup(sb, chunk->off, chunk->len);
584 * We haven't seen this chunk before. Our caller is surely
585 * going to add it the hard way now. Remember the most likely
586 * start of the to-be-added chunk: the current end of the
589 chunk->off = sb->len;
593 static void parse_commit_header(struct format_commit_context *context)
595 const char *msg = context->message;
598 for (i = 0; msg[i]; i++) {
600 for (eol = i; msg[eol] && msg[eol] != '\n'; eol++)
605 } else if (!prefixcmp(msg + i, "author ")) {
606 context->author.off = i + 7;
607 context->author.len = eol - i - 7;
608 } else if (!prefixcmp(msg + i, "committer ")) {
609 context->committer.off = i + 10;
610 context->committer.len = eol - i - 10;
611 } else if (!prefixcmp(msg + i, "encoding ")) {
612 context->encoding.off = i + 9;
613 context->encoding.len = eol - i - 9;
617 context->message_off = i;
618 context->commit_header_parsed = 1;
621 static int istitlechar(char c)
623 return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
624 (c >= '0' && c <= '9') || c == '.' || c == '_';
627 static void format_sanitized_subject(struct strbuf *sb, const char *msg)
630 size_t start_len = sb->len;
633 for (; *msg && *msg != '\n'; msg++) {
634 if (istitlechar(*msg)) {
636 strbuf_addch(sb, '-');
638 strbuf_addch(sb, *msg);
640 while (*(msg+1) == '.')
646 /* trim any trailing '.' or '-' characters */
648 while (sb->len - trimlen > start_len &&
649 (sb->buf[sb->len - 1 - trimlen] == '.'
650 || sb->buf[sb->len - 1 - trimlen] == '-'))
652 strbuf_remove(sb, sb->len - trimlen, trimlen);
655 const char *format_subject(struct strbuf *sb, const char *msg,
656 const char *line_separator)
661 const char *line = msg;
662 int linelen = get_one_line(line);
665 if (!linelen || is_empty_line(line, &linelen))
670 strbuf_grow(sb, linelen + 2);
672 strbuf_addstr(sb, line_separator);
673 strbuf_add(sb, line, linelen);
679 static void parse_commit_message(struct format_commit_context *c)
681 const char *msg = c->message + c->message_off;
682 const char *start = c->message;
684 msg = skip_empty_lines(msg);
685 c->subject_off = msg - start;
687 msg = format_subject(NULL, msg, NULL);
688 msg = skip_empty_lines(msg);
689 c->body_off = msg - start;
691 c->commit_message_parsed = 1;
694 static void format_decoration(struct strbuf *sb, const struct commit *commit)
696 struct name_decoration *d;
697 const char *prefix = " (";
699 load_ref_decorations(DECORATE_SHORT_REFS);
700 d = lookup_decoration(&name_decoration, &commit->object);
702 strbuf_addstr(sb, prefix);
704 strbuf_addstr(sb, d->name);
707 if (prefix[0] == ',')
708 strbuf_addch(sb, ')');
711 static void strbuf_wrap(struct strbuf *sb, size_t pos,
712 size_t width, size_t indent1, size_t indent2)
714 struct strbuf tmp = STRBUF_INIT;
717 strbuf_add(&tmp, sb->buf, pos);
718 strbuf_add_wrapped_text(&tmp, sb->buf + pos,
719 (int) indent1, (int) indent2, (int) width);
720 strbuf_swap(&tmp, sb);
721 strbuf_release(&tmp);
724 static void rewrap_message_tail(struct strbuf *sb,
725 struct format_commit_context *c,
726 size_t new_width, size_t new_indent1,
729 if (c->width == new_width && c->indent1 == new_indent1 &&
730 c->indent2 == new_indent2)
732 if (c->wrap_start < sb->len)
733 strbuf_wrap(sb, c->wrap_start, c->width, c->indent1, c->indent2);
734 c->wrap_start = sb->len;
735 c->width = new_width;
736 c->indent1 = new_indent1;
737 c->indent2 = new_indent2;
740 static size_t format_commit_one(struct strbuf *sb, const char *placeholder,
743 struct format_commit_context *c = context;
744 const struct commit *commit = c->commit;
745 const char *msg = c->message;
746 struct commit_list *p;
749 /* these are independent of the commit */
750 switch (placeholder[0]) {
752 if (placeholder[1] == '(') {
753 const char *end = strchr(placeholder + 2, ')');
754 char color[COLOR_MAXLEN];
757 color_parse_mem(placeholder + 2,
758 end - (placeholder + 2),
759 "--pretty format", color);
760 strbuf_addstr(sb, color);
761 return end - placeholder + 1;
763 if (!prefixcmp(placeholder + 1, "red")) {
764 strbuf_addstr(sb, GIT_COLOR_RED);
766 } else if (!prefixcmp(placeholder + 1, "green")) {
767 strbuf_addstr(sb, GIT_COLOR_GREEN);
769 } else if (!prefixcmp(placeholder + 1, "blue")) {
770 strbuf_addstr(sb, GIT_COLOR_BLUE);
772 } else if (!prefixcmp(placeholder + 1, "reset")) {
773 strbuf_addstr(sb, GIT_COLOR_RESET);
777 case 'n': /* newline */
778 strbuf_addch(sb, '\n');
781 /* %x00 == NUL, %x0a == LF, etc. */
782 if (0 <= (h1 = hexval_table[0xff & placeholder[1]]) &&
784 0 <= (h2 = hexval_table[0xff & placeholder[2]]) &&
786 strbuf_addch(sb, (h1<<4)|h2);
791 if (placeholder[1] == '(') {
792 unsigned long width = 0, indent1 = 0, indent2 = 0;
794 const char *start = placeholder + 2;
795 const char *end = strchr(start, ')');
799 width = strtoul(start, &next, 10);
801 indent1 = strtoul(next + 1, &next, 10);
803 indent2 = strtoul(next + 1,
810 rewrap_message_tail(sb, c, width, indent1, indent2);
811 return end - placeholder + 1;
816 /* these depend on the commit */
817 if (!commit->object.parsed)
818 parse_object(commit->object.sha1);
820 switch (placeholder[0]) {
821 case 'H': /* commit hash */
822 strbuf_addstr(sb, sha1_to_hex(commit->object.sha1));
824 case 'h': /* abbreviated commit hash */
825 if (add_again(sb, &c->abbrev_commit_hash))
827 strbuf_addstr(sb, find_unique_abbrev(commit->object.sha1,
828 c->pretty_ctx->abbrev));
829 c->abbrev_commit_hash.len = sb->len - c->abbrev_commit_hash.off;
831 case 'T': /* tree hash */
832 strbuf_addstr(sb, sha1_to_hex(commit->tree->object.sha1));
834 case 't': /* abbreviated tree hash */
835 if (add_again(sb, &c->abbrev_tree_hash))
837 strbuf_addstr(sb, find_unique_abbrev(commit->tree->object.sha1,
838 c->pretty_ctx->abbrev));
839 c->abbrev_tree_hash.len = sb->len - c->abbrev_tree_hash.off;
841 case 'P': /* parent hashes */
842 for (p = commit->parents; p; p = p->next) {
843 if (p != commit->parents)
844 strbuf_addch(sb, ' ');
845 strbuf_addstr(sb, sha1_to_hex(p->item->object.sha1));
848 case 'p': /* abbreviated parent hashes */
849 if (add_again(sb, &c->abbrev_parent_hashes))
851 for (p = commit->parents; p; p = p->next) {
852 if (p != commit->parents)
853 strbuf_addch(sb, ' ');
854 strbuf_addstr(sb, find_unique_abbrev(
855 p->item->object.sha1,
856 c->pretty_ctx->abbrev));
858 c->abbrev_parent_hashes.len = sb->len -
859 c->abbrev_parent_hashes.off;
861 case 'm': /* left/right/bottom */
862 strbuf_addstr(sb, get_revision_mark(NULL, commit));
865 format_decoration(sb, commit);
867 case 'g': /* reflog info */
868 switch(placeholder[1]) {
869 case 'd': /* reflog selector */
871 if (c->pretty_ctx->reflog_info)
872 get_reflog_selector(sb,
873 c->pretty_ctx->reflog_info,
874 c->pretty_ctx->date_mode,
875 (placeholder[1] == 'd'));
877 case 's': /* reflog message */
878 if (c->pretty_ctx->reflog_info)
879 get_reflog_message(sb, c->pretty_ctx->reflog_info);
882 return 0; /* unknown %g placeholder */
884 if (c->pretty_ctx->show_notes) {
885 format_display_notes(commit->object.sha1, sb,
886 get_log_output_encoding(), 0);
892 /* For the rest we have to parse the commit header. */
893 if (!c->commit_header_parsed)
894 parse_commit_header(c);
896 switch (placeholder[0]) {
897 case 'a': /* author ... */
898 return format_person_part(sb, placeholder[1],
899 msg + c->author.off, c->author.len,
900 c->pretty_ctx->date_mode);
901 case 'c': /* committer ... */
902 return format_person_part(sb, placeholder[1],
903 msg + c->committer.off, c->committer.len,
904 c->pretty_ctx->date_mode);
905 case 'e': /* encoding */
906 strbuf_add(sb, msg + c->encoding.off, c->encoding.len);
908 case 'B': /* raw body */
909 /* message_off is always left at the initial newline */
910 strbuf_addstr(sb, msg + c->message_off + 1);
914 /* Now we need to parse the commit message. */
915 if (!c->commit_message_parsed)
916 parse_commit_message(c);
918 switch (placeholder[0]) {
919 case 's': /* subject */
920 format_subject(sb, msg + c->subject_off, " ");
922 case 'f': /* sanitized subject */
923 format_sanitized_subject(sb, msg + c->subject_off);
926 strbuf_addstr(sb, msg + c->body_off);
929 return 0; /* unknown placeholder */
932 static size_t format_commit_item(struct strbuf *sb, const char *placeholder,
939 ADD_LF_BEFORE_NON_EMPTY,
941 ADD_SP_BEFORE_NON_EMPTY
944 switch (placeholder[0]) {
946 magic = DEL_LF_BEFORE_EMPTY;
949 magic = ADD_LF_BEFORE_NON_EMPTY;
952 magic = ADD_SP_BEFORE_NON_EMPTY;
957 if (magic != NO_MAGIC)
961 consumed = format_commit_one(sb, placeholder, context);
962 if (magic == NO_MAGIC)
965 if ((orig_len == sb->len) && magic == DEL_LF_BEFORE_EMPTY) {
966 while (sb->len && sb->buf[sb->len - 1] == '\n')
967 strbuf_setlen(sb, sb->len - 1);
968 } else if (orig_len != sb->len) {
969 if (magic == ADD_LF_BEFORE_NON_EMPTY)
970 strbuf_insert(sb, orig_len, "\n", 1);
971 else if (magic == ADD_SP_BEFORE_NON_EMPTY)
972 strbuf_insert(sb, orig_len, " ", 1);
977 static size_t userformat_want_item(struct strbuf *sb, const char *placeholder,
980 struct userformat_want *w = context;
982 if (*placeholder == '+' || *placeholder == '-' || *placeholder == ' ')
985 switch (*placeholder) {
993 void userformat_find_requirements(const char *fmt, struct userformat_want *w)
995 struct strbuf dummy = STRBUF_INIT;
1002 strbuf_expand(&dummy, user_format, userformat_want_item, w);
1003 strbuf_release(&dummy);
1006 void format_commit_message(const struct commit *commit,
1007 const char *format, struct strbuf *sb,
1008 const struct pretty_print_context *pretty_ctx)
1010 struct format_commit_context context;
1011 static const char utf8[] = "UTF-8";
1013 const char *output_enc = pretty_ctx->output_encoding;
1015 memset(&context, 0, sizeof(context));
1016 context.commit = commit;
1017 context.pretty_ctx = pretty_ctx;
1018 context.wrap_start = sb->len;
1019 context.message = commit->buffer;
1021 enc = get_header(commit, "encoding");
1022 enc = enc ? enc : utf8;
1023 if (strcmp(enc, output_enc))
1024 context.message = logmsg_reencode(commit, output_enc);
1027 strbuf_expand(sb, format, format_commit_item, &context);
1028 rewrap_message_tail(sb, &context, 0, 0, 0);
1030 if (context.message != commit->buffer)
1031 free(context.message);
1034 static void pp_header(enum cmit_fmt fmt,
1036 enum date_mode dmode,
1037 const char *encoding,
1038 const struct commit *commit,
1042 int parents_shown = 0;
1045 const char *line = *msg_p;
1046 int linelen = get_one_line(*msg_p);
1056 if (fmt == CMIT_FMT_RAW) {
1057 strbuf_add(sb, line, linelen);
1061 if (!memcmp(line, "parent ", 7)) {
1063 die("bad parent line in commit");
1067 if (!parents_shown) {
1068 struct commit_list *parent;
1070 for (parent = commit->parents, num = 0;
1072 parent = parent->next, num++)
1074 /* with enough slop */
1075 strbuf_grow(sb, num * 50 + 20);
1076 add_merge_info(fmt, sb, commit, abbrev);
1081 * MEDIUM == DEFAULT shows only author with dates.
1082 * FULL shows both authors but not dates.
1083 * FULLER shows both authors and dates.
1085 if (!memcmp(line, "author ", 7)) {
1086 strbuf_grow(sb, linelen + 80);
1087 pp_user_info("Author", fmt, sb, line + 7, dmode, encoding);
1089 if (!memcmp(line, "committer ", 10) &&
1090 (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER)) {
1091 strbuf_grow(sb, linelen + 80);
1092 pp_user_info("Commit", fmt, sb, line + 10, dmode, encoding);
1097 void pp_title_line(enum cmit_fmt fmt,
1100 const char *subject,
1101 const char *after_subject,
1102 const char *encoding,
1105 const char *line_separator = (fmt == CMIT_FMT_EMAIL) ? "\n " : " ";
1106 struct strbuf title;
1108 strbuf_init(&title, 80);
1109 *msg_p = format_subject(&title, *msg_p, line_separator);
1111 strbuf_grow(sb, title.len + 1024);
1113 strbuf_addstr(sb, subject);
1114 add_rfc2047(sb, title.buf, title.len, encoding);
1116 strbuf_addbuf(sb, &title);
1118 strbuf_addch(sb, '\n');
1120 if (need_8bit_cte > 0) {
1121 const char *header_fmt =
1122 "MIME-Version: 1.0\n"
1123 "Content-Type: text/plain; charset=%s\n"
1124 "Content-Transfer-Encoding: 8bit\n";
1125 strbuf_addf(sb, header_fmt, encoding);
1127 if (after_subject) {
1128 strbuf_addstr(sb, after_subject);
1130 if (fmt == CMIT_FMT_EMAIL) {
1131 strbuf_addch(sb, '\n');
1133 strbuf_release(&title);
1136 void pp_remainder(enum cmit_fmt fmt,
1143 const char *line = *msg_p;
1144 int linelen = get_one_line(line);
1150 if (is_empty_line(line, &linelen)) {
1153 if (fmt == CMIT_FMT_SHORT)
1158 strbuf_grow(sb, linelen + indent + 20);
1160 memset(sb->buf + sb->len, ' ', indent);
1161 strbuf_setlen(sb, sb->len + indent);
1163 strbuf_add(sb, line, linelen);
1164 strbuf_addch(sb, '\n');
1168 char *reencode_commit_message(const struct commit *commit, const char **encoding_p)
1170 const char *encoding;
1172 encoding = get_log_output_encoding();
1174 *encoding_p = encoding;
1175 return logmsg_reencode(commit, encoding);
1178 void pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit,
1180 const struct pretty_print_context *context)
1182 unsigned long beginning_of_body;
1184 const char *msg = commit->buffer;
1186 const char *encoding;
1187 int need_8bit_cte = context->need_8bit_cte;
1189 if (fmt == CMIT_FMT_USERFORMAT) {
1190 format_commit_message(commit, user_format, sb, context);
1194 reencoded = reencode_commit_message(commit, &encoding);
1199 if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
1203 * We need to check and emit Content-type: to mark it
1204 * as 8-bit if we haven't done so.
1206 if (fmt == CMIT_FMT_EMAIL && need_8bit_cte == 0) {
1209 for (in_body = i = 0; (ch = msg[i]); i++) {
1211 /* author could be non 7-bit ASCII but
1212 * the log may be so; skip over the
1213 * header part first.
1215 if (ch == '\n' && msg[i+1] == '\n')
1218 else if (non_ascii(ch)) {
1225 pp_header(fmt, context->abbrev, context->date_mode, encoding,
1227 if (fmt != CMIT_FMT_ONELINE && !context->subject) {
1228 strbuf_addch(sb, '\n');
1231 /* Skip excess blank lines at the beginning of body, if any... */
1232 msg = skip_empty_lines(msg);
1234 /* These formats treat the title line specially. */
1235 if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
1236 pp_title_line(fmt, &msg, sb, context->subject,
1237 context->after_subject, encoding, need_8bit_cte);
1239 beginning_of_body = sb->len;
1240 if (fmt != CMIT_FMT_ONELINE)
1241 pp_remainder(fmt, &msg, sb, indent);
1244 /* Make sure there is an EOLN for the non-oneline case */
1245 if (fmt != CMIT_FMT_ONELINE)
1246 strbuf_addch(sb, '\n');
1249 * The caller may append additional body text in e-mail
1250 * format. Make sure we did not strip the blank line
1251 * between the header and the body.
1253 if (fmt == CMIT_FMT_EMAIL && sb->len <= beginning_of_body)
1254 strbuf_addch(sb, '\n');
1256 if (context->show_notes)
1257 format_display_notes(commit->object.sha1, sb, encoding,
1258 NOTES_SHOW_HEADER | NOTES_INDENT);