pretty.c

   1 #include "cache.h"
   2 #include "commit.h"
   3 #include "utf8.h"
   4 #include "diff.h"
   5 #include "revision.h"
   6 #include "string-list.h"
   7 #include "mailmap.h"
   8
   9 static char *user_format;
  10
  11 void get_commit_format(const char *arg, struct rev_info *rev)
  12 {
  13         int i;
  14         static struct cmt_fmt_map {
  15                 const char *n;
  16                 size_t cmp_len;
  17                 enum cmit_fmt v;
  18         } cmt_fmts[] = {
  19                 { "raw",        1,      CMIT_FMT_RAW },
  20                 { "medium",     1,      CMIT_FMT_MEDIUM },
  21                 { "short",      1,      CMIT_FMT_SHORT },
  22                 { "email",      1,      CMIT_FMT_EMAIL },
  23                 { "full",       5,      CMIT_FMT_FULL },
  24                 { "fuller",     5,      CMIT_FMT_FULLER },
  25                 { "oneline",    1,      CMIT_FMT_ONELINE },
  26         };
  27
  28         rev->use_terminator = 0;
  29         if (!arg || !*arg) {
  30                 rev->commit_format = CMIT_FMT_DEFAULT;
  31                 return;
  32         }
  33         if (!prefixcmp(arg, "format:") || !prefixcmp(arg, "tformat:")) {
  34                 const char *cp = strchr(arg, ':') + 1;
  35                 free(user_format);
  36                 user_format = xstrdup(cp);
  37                 if (arg[0] == 't')
  38                         rev->use_terminator = 1;
  39                 rev->commit_format = CMIT_FMT_USERFORMAT;
  40                 return;
  41         }
  42         for (i = 0; i < ARRAY_SIZE(cmt_fmts); i++) {
  43                 if (!strncmp(arg, cmt_fmts[i].n, cmt_fmts[i].cmp_len) &&
  44                     !strncmp(arg, cmt_fmts[i].n, strlen(arg))) {
  45                         if (cmt_fmts[i].v == CMIT_FMT_ONELINE)
  46                                 rev->use_terminator = 1;
  47                         rev->commit_format = cmt_fmts[i].v;
  48                         return;
  49                 }
  50         }
  51
  52         die("invalid --pretty format: %s", arg);
  53 }
  54
  55 /*
  56  * Generic support for pretty-printing the header
  57  */
  58 static int get_one_line(const char *msg)
  59 {
  60         int ret = 0;
  61
  62         for (;;) {
  63                 char c = *msg++;
  64                 if (!c)
  65                         break;
  66                 ret++;
  67                 if (c == '\n')
  68                         break;
  69         }
  70         return ret;
  71 }
  72
  73 /* High bit set, or ISO-2022-INT */
  74 int non_ascii(int ch)
  75 {
  76         ch = (ch & 0xff);
  77         return ((ch & 0x80) || (ch == 0x1b));
  78 }
  79
  80 static int is_rfc2047_special(char ch)
  81 {
  82         return (non_ascii(ch) || (ch == '=') || (ch == '?') || (ch == '_'));
  83 }
  84
  85 static void add_rfc2047(struct strbuf *sb, const char *line, int len,
  86                        const char *encoding)
  87 {
  88         int i, last;
  89
  90         for (i = 0; i < len; i++) {
  91                 int ch = line[i];
  92                 if (non_ascii(ch))
  93                         goto needquote;
  94                 if ((i + 1 < len) && (ch == '=' && line[i+1] == '?'))
  95                         goto needquote;
  96         }
  97         strbuf_add(sb, line, len);
  98         return;
  99
 100 needquote:
 101         strbuf_grow(sb, len * 3 + strlen(encoding) + 100);
 102         strbuf_addf(sb, "=?%s?q?", encoding);
 103         for (i = last = 0; i < len; i++) {
 104                 unsigned ch = line[i] & 0xFF;
 105                 /*
 106                  * We encode ' ' using '=20' even though rfc2047
 107                  * allows using '_' for readability.  Unfortunately,
 108                  * many programs do not understand this and just
 109                  * leave the underscore in place.
 110                  */
 111                 if (is_rfc2047_special(ch) || ch == ' ') {
 112                         strbuf_add(sb, line + last, i - last);
 113                         strbuf_addf(sb, "=%02X", ch);
 114                         last = i + 1;
 115                 }
 116         }
 117         strbuf_add(sb, line + last, len - last);
 118         strbuf_addstr(sb, "?=");
 119 }
 120
 121 void pp_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb,
 122                   const char *line, enum date_mode dmode,
 123                   const char *encoding)
 124 {
 125         char *date;
 126         int namelen;
 127         unsigned long time;
 128         int tz;
 129         const char *filler = "    ";
 130
 131         if (fmt == CMIT_FMT_ONELINE)
 132                 return;
 133         date = strchr(line, '>');
 134         if (!date)
 135                 return;
 136         namelen = ++date - line;
 137         time = strtoul(date, &date, 10);
 138         tz = strtol(date, NULL, 10);
 139
 140         if (fmt == CMIT_FMT_EMAIL) {
 141                 char *name_tail = strchr(line, '<');
 142                 int display_name_length;
 143                 if (!name_tail)
 144                         return;
 145                 while (line < name_tail && isspace(name_tail[-1]))
 146                         name_tail--;
 147                 display_name_length = name_tail - line;
 148                 filler = "";
 149                 strbuf_addstr(sb, "From: ");
 150                 add_rfc2047(sb, line, display_name_length, encoding);
 151                 strbuf_add(sb, name_tail, namelen - display_name_length);
 152                 strbuf_addch(sb, '\n');
 153         } else {
 154                 strbuf_addf(sb, "%s: %.*s%.*s\n", what,
 155                               (fmt == CMIT_FMT_FULLER) ? 4 : 0,
 156                               filler, namelen, line);
 157         }
 158         switch (fmt) {
 159         case CMIT_FMT_MEDIUM:
 160                 strbuf_addf(sb, "Date:   %s\n", show_date(time, tz, dmode));
 161                 break;
 162         case CMIT_FMT_EMAIL:
 163                 strbuf_addf(sb, "Date: %s\n", show_date(time, tz, DATE_RFC2822));
 164                 break;
 165         case CMIT_FMT_FULLER:
 166                 strbuf_addf(sb, "%sDate: %s\n", what, show_date(time, tz, dmode));
 167                 break;
 168         default:
 169                 /* notin' */
 170                 break;
 171         }
 172 }
 173
 174 static int is_empty_line(const char *line, int *len_p)
 175 {
 176         int len = *len_p;
 177         while (len && isspace(line[len-1]))
 178                 len--;
 179         *len_p = len;
 180         return !len;
 181 }
 182
 183 static void add_merge_info(enum cmit_fmt fmt, struct strbuf *sb,
 184                         const struct commit *commit, int abbrev)
 185 {
 186         struct commit_list *parent = commit->parents;
 187
 188         if ((fmt == CMIT_FMT_ONELINE) || (fmt == CMIT_FMT_EMAIL) ||
 189             !parent || !parent->next)
 190                 return;
 191
 192         strbuf_addstr(sb, "Merge:");
 193
 194         while (parent) {
 195                 struct commit *p = parent->item;
 196                 const char *hex = NULL;
 197                 const char *dots;
 198                 if (abbrev)
 199                         hex = find_unique_abbrev(p->object.sha1, abbrev);
 200                 if (!hex)
 201                         hex = sha1_to_hex(p->object.sha1);
 202                 dots = (abbrev && strlen(hex) != 40) ?  "..." : "";
 203                 parent = parent->next;
 204
 205                 strbuf_addf(sb, " %s%s", hex, dots);
 206         }
 207         strbuf_addch(sb, '\n');
 208 }
 209
 210 static char *get_header(const struct commit *commit, const char *key)
 211 {
 212         int key_len = strlen(key);
 213         const char *line = commit->buffer;
 214
 215         for (;;) {
 216                 const char *eol = strchr(line, '\n'), *next;
 217
 218                 if (line == eol)
 219                         return NULL;
 220                 if (!eol) {
 221                         eol = line + strlen(line);
 222                         next = NULL;
 223                 } else
 224                         next = eol + 1;
 225                 if (eol - line > key_len &&
 226                     !strncmp(line, key, key_len) &&
 227                     line[key_len] == ' ') {
 228                         return xmemdupz(line + key_len + 1, eol - line - key_len - 1);
 229                 }
 230                 line = next;
 231         }
 232 }
 233
 234 static char *replace_encoding_header(char *buf, const char *encoding)
 235 {
 236         struct strbuf tmp;
 237         size_t start, len;
 238         char *cp = buf;
 239
 240         /* guess if there is an encoding header before a \n\n */
 241         while (strncmp(cp, "encoding ", strlen("encoding "))) {
 242                 cp = strchr(cp, '\n');
 243                 if (!cp || *++cp == '\n')
 244                         return buf;
 245         }
 246         start = cp - buf;
 247         cp = strchr(cp, '\n');
 248         if (!cp)
 249                 return buf; /* should not happen but be defensive */
 250         len = cp + 1 - (buf + start);
 251
 252         strbuf_init(&tmp, 0);
 253         strbuf_attach(&tmp, buf, strlen(buf), strlen(buf) + 1);
 254         if (is_encoding_utf8(encoding)) {
 255                 /* we have re-coded to UTF-8; drop the header */
 256                 strbuf_remove(&tmp, start, len);
 257         } else {
 258                 /* just replaces XXXX in 'encoding XXXX\n' */
 259                 strbuf_splice(&tmp, start + strlen("encoding "),
 260                                           len - strlen("encoding \n"),
 261                                           encoding, strlen(encoding));
 262         }
 263         return strbuf_detach(&tmp, NULL);
 264 }
 265
 266 static char *logmsg_reencode(const struct commit *commit,
 267                              const char *output_encoding)
 268 {
 269         static const char *utf8 = "utf-8";
 270         const char *use_encoding;
 271         char *encoding;
 272         char *out;
 273
 274         if (!*output_encoding)
 275                 return NULL;
 276         encoding = get_header(commit, "encoding");
 277         use_encoding = encoding ? encoding : utf8;
 278         if (!strcmp(use_encoding, output_encoding))
 279                 if (encoding) /* we'll strip encoding header later */
 280                         out = xstrdup(commit->buffer);
 281                 else
 282                         return NULL; /* nothing to do */
 283         else
 284                 out = reencode_string(commit->buffer,
 285                                       output_encoding, use_encoding);
 286         if (out)
 287                 out = replace_encoding_header(out, output_encoding);
 288
 289         free(encoding);
 290         return out;
 291 }
 292
 293 static int mailmap_name(struct strbuf *sb, const char *email)
 294 {
 295         static struct string_list *mail_map;
 296         char buffer[1024];
 297
 298         if (!mail_map) {
 299                 mail_map = xcalloc(1, sizeof(*mail_map));
 300                 read_mailmap(mail_map, ".mailmap", NULL);
 301         }
 302
 303         if (!mail_map->nr)
 304                 return -1;
 305
 306         if (!map_email(mail_map, email, buffer, sizeof(buffer)))
 307                 return -1;
 308         strbuf_addstr(sb, buffer);
 309         return 0;
 310 }
 311
 312 static size_t format_person_part(struct strbuf *sb, char part,
 313                                  const char *msg, int len, enum date_mode dmode)
 314 {
 315         /* currently all placeholders have same length */
 316         const int placeholder_len = 2;
 317         int start, end, tz = 0;
 318         unsigned long date = 0;
 319         char *ep;
 320
 321         /* advance 'end' to point to email start delimiter */
 322         for (end = 0; end < len && msg[end] != '<'; end++)
 323                 ; /* do nothing */
 324
 325         /*
 326          * When end points at the '<' that we found, it should have
 327          * matching '>' later, which means 'end' must be strictly
 328          * below len - 1.
 329          */
 330         if (end >= len - 2)
 331                 goto skip;
 332
 333         if (part == 'n' || part == 'N') {       /* name */
 334                 while (end > 0 && isspace(msg[end - 1]))
 335                         end--;
 336                 if (part != 'N' || !msg[end] || !msg[end + 1] ||
 337                     mailmap_name(sb, msg + end + 2) < 0)
 338                         strbuf_add(sb, msg, end);
 339                 return placeholder_len;
 340         }
 341         start = ++end; /* save email start position */
 342
 343         /* advance 'end' to point to email end delimiter */
 344         for ( ; end < len && msg[end] != '>'; end++)
 345                 ; /* do nothing */
 346
 347         if (end >= len)
 348                 goto skip;
 349
 350         if (part == 'e') {      /* email */
 351                 strbuf_add(sb, msg + start, end - start);
 352                 return placeholder_len;
 353         }
 354
 355         /* advance 'start' to point to date start delimiter */
 356         for (start = end + 1; start < len && isspace(msg[start]); start++)
 357                 ; /* do nothing */
 358         if (start >= len)
 359                 goto skip;
 360         date = strtoul(msg + start, &ep, 10);
 361         if (msg + start == ep)
 362                 goto skip;
 363
 364         if (part == 't') {      /* date, UNIX timestamp */
 365                 strbuf_add(sb, msg + start, ep - (msg + start));
 366                 return placeholder_len;
 367         }
 368
 369         /* parse tz */
 370         for (start = ep - msg + 1; start < len && isspace(msg[start]); start++)
 371                 ; /* do nothing */
 372         if (start + 1 < len) {
 373                 tz = strtoul(msg + start + 1, NULL, 10);
 374                 if (msg[start] == '-')
 375                         tz = -tz;
 376         }
 377
 378         switch (part) {
 379         case 'd':       /* date */
 380                 strbuf_addstr(sb, show_date(date, tz, dmode));
 381                 return placeholder_len;
 382         case 'D':       /* date, RFC2822 style */
 383                 strbuf_addstr(sb, show_date(date, tz, DATE_RFC2822));
 384                 return placeholder_len;
 385         case 'r':       /* date, relative */
 386                 strbuf_addstr(sb, show_date(date, tz, DATE_RELATIVE));
 387                 return placeholder_len;
 388         case 'i':       /* date, ISO 8601 */
 389                 strbuf_addstr(sb, show_date(date, tz, DATE_ISO8601));
 390                 return placeholder_len;
 391         }
 392
 393 skip:
 394         /*
 395          * bogus commit, 'sb' cannot be updated, but we still need to
 396          * compute a valid return value.
 397          */
 398         if (part == 'n' || part == 'e' || part == 't' || part == 'd'
 399             || part == 'D' || part == 'r' || part == 'i')
 400                 return placeholder_len;
 401
 402         return 0; /* unknown placeholder */
 403 }
 404
 405 struct chunk {
 406         size_t off;
 407         size_t len;
 408 };
 409
 410 struct format_commit_context {
 411         const struct commit *commit;
 412         enum date_mode dmode;
 413
 414         /* These offsets are relative to the start of the commit message. */
 415         int commit_header_parsed;
 416         struct chunk subject;
 417         struct chunk author;
 418         struct chunk committer;
 419         struct chunk encoding;
 420         size_t body_off;
 421
 422         /* The following ones are relative to the result struct strbuf. */
 423         struct chunk abbrev_commit_hash;
 424         struct chunk abbrev_tree_hash;
 425         struct chunk abbrev_parent_hashes;
 426 };
 427
 428 static int add_again(struct strbuf *sb, struct chunk *chunk)
 429 {
 430         if (chunk->len) {
 431                 strbuf_adddup(sb, chunk->off, chunk->len);
 432                 return 1;
 433         }
 434
 435         /*
 436          * We haven't seen this chunk before.  Our caller is surely
 437          * going to add it the hard way now.  Remember the most likely
 438          * start of the to-be-added chunk: the current end of the
 439          * struct strbuf.
 440          */
 441         chunk->off = sb->len;
 442         return 0;
 443 }
 444
 445 static void parse_commit_header(struct format_commit_context *context)
 446 {
 447         const char *msg = context->commit->buffer;
 448         int i;
 449         enum { HEADER, SUBJECT, BODY } state;
 450
 451         for (i = 0, state = HEADER; msg[i] && state < BODY; i++) {
 452                 int eol;
 453                 for (eol = i; msg[eol] && msg[eol] != '\n'; eol++)
 454                         ; /* do nothing */
 455
 456                 if (state == SUBJECT) {
 457                         context->subject.off = i;
 458                         context->subject.len = eol - i;
 459                         i = eol;
 460                 }
 461                 if (i == eol) {
 462                         state++;
 463                         /* strip empty lines */
 464                         while (msg[eol] == '\n' && msg[eol + 1] == '\n')
 465                                 eol++;
 466                 } else if (!prefixcmp(msg + i, "author ")) {
 467                         context->author.off = i + 7;
 468                         context->author.len = eol - i - 7;
 469                 } else if (!prefixcmp(msg + i, "committer ")) {
 470                         context->committer.off = i + 10;
 471                         context->committer.len = eol - i - 10;
 472                 } else if (!prefixcmp(msg + i, "encoding ")) {
 473                         context->encoding.off = i + 9;
 474                         context->encoding.len = eol - i - 9;
 475                 }
 476                 i = eol;
 477                 if (!msg[i])
 478                         break;
 479         }
 480         context->body_off = i;
 481         context->commit_header_parsed = 1;
 482 }
 483
 484 static size_t format_commit_item(struct strbuf *sb, const char *placeholder,
 485                                void *context)
 486 {
 487         struct format_commit_context *c = context;
 488         const struct commit *commit = c->commit;
 489         const char *msg = commit->buffer;
 490         struct commit_list *p;
 491         int h1, h2;
 492
 493         /* these are independent of the commit */
 494         switch (placeholder[0]) {
 495         case 'C':
 496                 if (!prefixcmp(placeholder + 1, "red")) {
 497                         strbuf_addstr(sb, "\033[31m");
 498                         return 4;
 499                 } else if (!prefixcmp(placeholder + 1, "green")) {
 500                         strbuf_addstr(sb, "\033[32m");
 501                         return 6;
 502                 } else if (!prefixcmp(placeholder + 1, "blue")) {
 503                         strbuf_addstr(sb, "\033[34m");
 504                         return 5;
 505                 } else if (!prefixcmp(placeholder + 1, "reset")) {
 506                         strbuf_addstr(sb, "\033[m");
 507                         return 6;
 508                 } else
 509                         return 0;
 510         case 'n':               /* newline */
 511                 strbuf_addch(sb, '\n');
 512                 return 1;
 513         case 'x':
 514                 /* %x00 == NUL, %x0a == LF, etc. */
 515                 if (0 <= (h1 = hexval_table[0xff & placeholder[1]]) &&
 516                     h1 <= 16 &&
 517                     0 <= (h2 = hexval_table[0xff & placeholder[2]]) &&
 518                     h2 <= 16) {
 519                         strbuf_addch(sb, (h1<<4)|h2);
 520                         return 3;
 521                 } else
 522                         return 0;
 523         }
 524
 525         /* these depend on the commit */
 526         if (!commit->object.parsed)
 527                 parse_object(commit->object.sha1);
 528
 529         switch (placeholder[0]) {
 530         case 'H':               /* commit hash */
 531                 strbuf_addstr(sb, sha1_to_hex(commit->object.sha1));
 532                 return 1;
 533         case 'h':               /* abbreviated commit hash */
 534                 if (add_again(sb, &c->abbrev_commit_hash))
 535                         return 1;
 536                 strbuf_addstr(sb, find_unique_abbrev(commit->object.sha1,
 537                                                      DEFAULT_ABBREV));
 538                 c->abbrev_commit_hash.len = sb->len - c->abbrev_commit_hash.off;
 539                 return 1;
 540         case 'T':               /* tree hash */
 541                 strbuf_addstr(sb, sha1_to_hex(commit->tree->object.sha1));
 542                 return 1;
 543         case 't':               /* abbreviated tree hash */
 544                 if (add_again(sb, &c->abbrev_tree_hash))
 545                         return 1;
 546                 strbuf_addstr(sb, find_unique_abbrev(commit->tree->object.sha1,
 547                                                      DEFAULT_ABBREV));
 548                 c->abbrev_tree_hash.len = sb->len - c->abbrev_tree_hash.off;
 549                 return 1;
 550         case 'P':               /* parent hashes */
 551                 for (p = commit->parents; p; p = p->next) {
 552                         if (p != commit->parents)
 553                                 strbuf_addch(sb, ' ');
 554                         strbuf_addstr(sb, sha1_to_hex(p->item->object.sha1));
 555                 }
 556                 return 1;
 557         case 'p':               /* abbreviated parent hashes */
 558                 if (add_again(sb, &c->abbrev_parent_hashes))
 559                         return 1;
 560                 for (p = commit->parents; p; p = p->next) {
 561                         if (p != commit->parents)
 562                                 strbuf_addch(sb, ' ');
 563                         strbuf_addstr(sb, find_unique_abbrev(
 564                                         p->item->object.sha1, DEFAULT_ABBREV));
 565                 }
 566                 c->abbrev_parent_hashes.len = sb->len -
 567                                               c->abbrev_parent_hashes.off;
 568                 return 1;
 569         case 'm':               /* left/right/bottom */
 570                 strbuf_addch(sb, (commit->object.flags & BOUNDARY)
 571                                  ? '-'
 572                                  : (commit->object.flags & SYMMETRIC_LEFT)
 573                                  ? '<'
 574                                  : '>');
 575                 return 1;
 576         }
 577
 578         /* For the rest we have to parse the commit header. */
 579         if (!c->commit_header_parsed)
 580                 parse_commit_header(c);
 581
 582         switch (placeholder[0]) {
 583         case 's':       /* subject */
 584                 strbuf_add(sb, msg + c->subject.off, c->subject.len);
 585                 return 1;
 586         case 'a':       /* author ... */
 587                 return format_person_part(sb, placeholder[1],
 588                                    msg + c->author.off, c->author.len,
 589                                    c->dmode);
 590         case 'c':       /* committer ... */
 591                 return format_person_part(sb, placeholder[1],
 592                                    msg + c->committer.off, c->committer.len,
 593                                    c->dmode);
 594         case 'e':       /* encoding */
 595                 strbuf_add(sb, msg + c->encoding.off, c->encoding.len);
 596                 return 1;
 597         case 'b':       /* body */
 598                 strbuf_addstr(sb, msg + c->body_off);
 599                 return 1;
 600         }
 601         return 0;       /* unknown placeholder */
 602 }
 603
 604 void format_commit_message(const struct commit *commit,
 605                            const void *format, struct strbuf *sb,
 606                            enum date_mode dmode)
 607 {
 608         struct format_commit_context context;
 609
 610         memset(&context, 0, sizeof(context));
 611         context.commit = commit;
 612         context.dmode = dmode;
 613         strbuf_expand(sb, format, format_commit_item, &context);
 614 }
 615
 616 static void pp_header(enum cmit_fmt fmt,
 617                       int abbrev,
 618                       enum date_mode dmode,
 619                       const char *encoding,
 620                       const struct commit *commit,
 621                       const char **msg_p,
 622                       struct strbuf *sb)
 623 {
 624         int parents_shown = 0;
 625
 626         for (;;) {
 627                 const char *line = *msg_p;
 628                 int linelen = get_one_line(*msg_p);
 629
 630                 if (!linelen)
 631                         return;
 632                 *msg_p += linelen;
 633
 634                 if (linelen == 1)
 635                         /* End of header */
 636                         return;
 637
 638                 if (fmt == CMIT_FMT_RAW) {
 639                         strbuf_add(sb, line, linelen);
 640                         continue;
 641                 }
 642
 643                 if (!memcmp(line, "parent ", 7)) {
 644                         if (linelen != 48)
 645                                 die("bad parent line in commit");
 646                         continue;
 647                 }
 648
 649                 if (!parents_shown) {
 650                         struct commit_list *parent;
 651                         int num;
 652                         for (parent = commit->parents, num = 0;
 653                              parent;
 654                              parent = parent->next, num++)
 655                                 ;
 656                         /* with enough slop */
 657                         strbuf_grow(sb, num * 50 + 20);
 658                         add_merge_info(fmt, sb, commit, abbrev);
 659                         parents_shown = 1;
 660                 }
 661
 662                 /*
 663                  * MEDIUM == DEFAULT shows only author with dates.
 664                  * FULL shows both authors but not dates.
 665                  * FULLER shows both authors and dates.
 666                  */
 667                 if (!memcmp(line, "author ", 7)) {
 668                         strbuf_grow(sb, linelen + 80);
 669                         pp_user_info("Author", fmt, sb, line + 7, dmode, encoding);
 670                 }
 671                 if (!memcmp(line, "committer ", 10) &&
 672                     (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER)) {
 673                         strbuf_grow(sb, linelen + 80);
 674                         pp_user_info("Commit", fmt, sb, line + 10, dmode, encoding);
 675                 }
 676         }
 677 }
 678
 679 void pp_title_line(enum cmit_fmt fmt,
 680                    const char **msg_p,
 681                    struct strbuf *sb,
 682                    const char *subject,
 683                    const char *after_subject,
 684                    const char *encoding,
 685                    int need_8bit_cte)
 686 {
 687         struct strbuf title;
 688
 689         strbuf_init(&title, 80);
 690
 691         for (;;) {
 692                 const char *line = *msg_p;
 693                 int linelen = get_one_line(line);
 694
 695                 *msg_p += linelen;
 696                 if (!linelen || is_empty_line(line, &linelen))
 697                         break;
 698
 699                 strbuf_grow(&title, linelen + 2);
 700                 if (title.len) {
 701                         if (fmt == CMIT_FMT_EMAIL) {
 702                                 strbuf_addch(&title, '\n');
 703                         }
 704                         strbuf_addch(&title, ' ');
 705                 }
 706                 strbuf_add(&title, line, linelen);
 707         }
 708
 709         strbuf_grow(sb, title.len + 1024);
 710         if (subject) {
 711                 strbuf_addstr(sb, subject);
 712                 add_rfc2047(sb, title.buf, title.len, encoding);
 713         } else {
 714                 strbuf_addbuf(sb, &title);
 715         }
 716         strbuf_addch(sb, '\n');
 717
 718         if (need_8bit_cte > 0) {
 719                 const char *header_fmt =
 720                         "MIME-Version: 1.0\n"
 721                         "Content-Type: text/plain; charset=%s\n"
 722                         "Content-Transfer-Encoding: 8bit\n";
 723                 strbuf_addf(sb, header_fmt, encoding);
 724         }
 725         if (after_subject) {
 726                 strbuf_addstr(sb, after_subject);
 727         }
 728         if (fmt == CMIT_FMT_EMAIL) {
 729                 strbuf_addch(sb, '\n');
 730         }
 731         strbuf_release(&title);
 732 }
 733
 734 void pp_remainder(enum cmit_fmt fmt,
 735                   const char **msg_p,
 736                   struct strbuf *sb,
 737                   int indent)
 738 {
 739         int first = 1;
 740         for (;;) {
 741                 const char *line = *msg_p;
 742                 int linelen = get_one_line(line);
 743                 *msg_p += linelen;
 744
 745                 if (!linelen)
 746                         break;
 747
 748                 if (is_empty_line(line, &linelen)) {
 749                         if (first)
 750                                 continue;
 751                         if (fmt == CMIT_FMT_SHORT)
 752                                 break;
 753                 }
 754                 first = 0;
 755
 756                 strbuf_grow(sb, linelen + indent + 20);
 757                 if (indent) {
 758                         memset(sb->buf + sb->len, ' ', indent);
 759                         strbuf_setlen(sb, sb->len + indent);
 760                 }
 761                 strbuf_add(sb, line, linelen);
 762                 strbuf_addch(sb, '\n');
 763         }
 764 }
 765
 766 void pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit,
 767                          struct strbuf *sb, int abbrev,
 768                          const char *subject, const char *after_subject,
 769                          enum date_mode dmode, int need_8bit_cte)
 770 {
 771         unsigned long beginning_of_body;
 772         int indent = 4;
 773         const char *msg = commit->buffer;
 774         char *reencoded;
 775         const char *encoding;
 776
 777         if (fmt == CMIT_FMT_USERFORMAT) {
 778                 format_commit_message(commit, user_format, sb, dmode);
 779                 return;
 780         }
 781
 782         encoding = (git_log_output_encoding
 783                     ? git_log_output_encoding
 784                     : git_commit_encoding);
 785         if (!encoding)
 786                 encoding = "utf-8";
 787         reencoded = logmsg_reencode(commit, encoding);
 788         if (reencoded) {
 789                 msg = reencoded;
 790         }
 791
 792         if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
 793                 indent = 0;
 794
 795         /*
 796          * We need to check and emit Content-type: to mark it
 797          * as 8-bit if we haven't done so.
 798          */
 799         if (fmt == CMIT_FMT_EMAIL && need_8bit_cte == 0) {
 800                 int i, ch, in_body;
 801
 802                 for (in_body = i = 0; (ch = msg[i]); i++) {
 803                         if (!in_body) {
 804                                 /* author could be non 7-bit ASCII but
 805                                  * the log may be so; skip over the
 806                                  * header part first.
 807                                  */
 808                                 if (ch == '\n' && msg[i+1] == '\n')
 809                                         in_body = 1;
 810                         }
 811                         else if (non_ascii(ch)) {
 812                                 need_8bit_cte = 1;
 813                                 break;
 814                         }
 815                 }
 816         }
 817
 818         pp_header(fmt, abbrev, dmode, encoding, commit, &msg, sb);
 819         if (fmt != CMIT_FMT_ONELINE && !subject) {
 820                 strbuf_addch(sb, '\n');
 821         }
 822
 823         /* Skip excess blank lines at the beginning of body, if any... */
 824         for (;;) {
 825                 int linelen = get_one_line(msg);
 826                 int ll = linelen;
 827                 if (!linelen)
 828                         break;
 829                 if (!is_empty_line(msg, &ll))
 830                         break;
 831                 msg += linelen;
 832         }
 833
 834         /* These formats treat the title line specially. */
 835         if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
 836                 pp_title_line(fmt, &msg, sb, subject,
 837                               after_subject, encoding, need_8bit_cte);
 838
 839         beginning_of_body = sb->len;
 840         if (fmt != CMIT_FMT_ONELINE)
 841                 pp_remainder(fmt, &msg, sb, indent);
 842         strbuf_rtrim(sb);
 843
 844         /* Make sure there is an EOLN for the non-oneline case */
 845         if (fmt != CMIT_FMT_ONELINE)
 846                 strbuf_addch(sb, '\n');
 847
 848         /*
 849          * The caller may append additional body text in e-mail
 850          * format.  Make sure we did not strip the blank line
 851          * between the header and the body.
 852          */
 853         if (fmt == CMIT_FMT_EMAIL && sb->len <= beginning_of_body)
 854                 strbuf_addch(sb, '\n');
 855         free(reencoded);
 856 }