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