🌐 AI搜索 & 代理 主页
Google Git
Sign in
chromium / external / github.com / git / git / refs/tags/v2.7.1 / . / pretty.c
blob: 92b2870a7eabb6a99ffbbcfc222d2ff1c1186fa0 [file] [log] [blame]
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1#include "cache.h"
2#include "commit.h"
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]3#include "utf8.h"
4#include "diff.h"
5#include "revision.h"
Johannes Schindelinc455c872008-07-21 18:03:49[diff] [blame]6#include "string-list.h"
Johannes Schindeline0cbc392008-07-11 23:28:18[diff] [blame]7#include "mailmap.h"
René Scharfe3b3d4432008-09-04 21:40:03[diff] [blame]8#include "log-tree.h"
Johannes Schindelina97a7462009-10-09 10:21:57[diff] [blame]9#include "notes.h"
Jeff Kingc0029222009-01-17 15:38:46[diff] [blame]10#include "color.h"
Thomas Rast8f8f5472009-10-19 15:48:10[diff] [blame]11#include "reflog-walk.h"
Junio C Hamanof6667c52011-10-22 04:06:02[diff] [blame]12#include "gpg-interface.h"
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]13
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]14static char *user_format;
Will Palmer40957892010-05-02 11:00:42[diff] [blame]15static struct cmt_fmt_map {
16 const char *name;
17 enum cmit_fmt format;
18 int is_tformat;
Will Palmer2d7671e2010-05-02 11:00:43[diff] [blame]19 int is_alias;
20 const char *user_format;
Will Palmer40957892010-05-02 11:00:42[diff] [blame]21} *commit_formats;
Will Palmer80281842010-05-02 11:00:44[diff] [blame]22static size_t builtin_formats_len;
Will Palmer40957892010-05-02 11:00:42[diff] [blame]23static size_t commit_formats_len;
Will Palmer80281842010-05-02 11:00:44[diff] [blame]24static size_t commit_formats_alloc;
Will Palmer40957892010-05-02 11:00:42[diff] [blame]25static struct cmt_fmt_map *find_commit_format(const char *sought);
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]26
Jeff Kingb9c7d6e2014-07-29 17:56:48[diff] [blame]27int commit_format_is_empty(enum cmit_fmt fmt)
28{
29 return fmt == CMIT_FMT_USERFORMAT && !*user_format;
30}
31
Nanako Shiraishi36407542009-02-24 09:59:15[diff] [blame]32static void save_user_format(struct rev_info *rev, const char *cp, int is_tformat)
33{
34 free(user_format);
35 user_format = xstrdup(cp);
36 if (is_tformat)
37 rev->use_terminator = 1;
38 rev->commit_format = CMIT_FMT_USERFORMAT;
39}
40
Will Palmer80281842010-05-02 11:00:44[diff] [blame]41static int git_pretty_formats_config(const char *var, const char *value, void *cb)
42{
43 struct cmt_fmt_map *commit_format = NULL;
44 const char *name;
45 const char *fmt;
46 int i;
47
Jeff King95b567c2014-06-18 19:48:29[diff] [blame]48 if (!skip_prefix(var, "pretty.", &name))
Will Palmer80281842010-05-02 11:00:44[diff] [blame]49 return 0;
50
Will Palmer80281842010-05-02 11:00:44[diff] [blame]51 for (i = 0; i < builtin_formats_len; i++) {
52 if (!strcmp(commit_formats[i].name, name))
53 return 0;
54 }
55
56 for (i = builtin_formats_len; i < commit_formats_len; i++) {
57 if (!strcmp(commit_formats[i].name, name)) {
58 commit_format = &commit_formats[i];
59 break;
60 }
61 }
62
63 if (!commit_format) {
64 ALLOC_GROW(commit_formats, commit_formats_len+1,
65 commit_formats_alloc);
66 commit_format = &commit_formats[commit_formats_len];
Jonathan Nieder95a26182010-05-08 21:07:39[diff] [blame]67 memset(commit_format, 0, sizeof(*commit_format));
Will Palmer80281842010-05-02 11:00:44[diff] [blame]68 commit_formats_len++;
69 }
70
71 commit_format->name = xstrdup(name);
72 commit_format->format = CMIT_FMT_USERFORMAT;
Tanay Abhraa26bc612014-08-04 14:41:15[diff] [blame]73 if (git_config_string(&fmt, var, value))
74 return -1;
75
René Scharfee3f1da92014-10-04 18:54:50[diff] [blame]76 if (skip_prefix(fmt, "format:", &fmt))
77 commit_format->is_tformat = 0;
78 else if (skip_prefix(fmt, "tformat:", &fmt) || strchr(fmt, '%'))
Will Palmer80281842010-05-02 11:00:44[diff] [blame]79 commit_format->is_tformat = 1;
80 else
81 commit_format->is_alias = 1;
82 commit_format->user_format = fmt;
83
84 return 0;
85}
86
Will Palmer40957892010-05-02 11:00:42[diff] [blame]87static void setup_commit_formats(void)
88{
89 struct cmt_fmt_map builtin_formats[] = {
90 { "raw", CMIT_FMT_RAW, 0 },
91 { "medium", CMIT_FMT_MEDIUM, 0 },
92 { "short", CMIT_FMT_SHORT, 0 },
93 { "email", CMIT_FMT_EMAIL, 0 },
94 { "fuller", CMIT_FMT_FULLER, 0 },
95 { "full", CMIT_FMT_FULL, 0 },
96 { "oneline", CMIT_FMT_ONELINE, 1 }
97 };
98 commit_formats_len = ARRAY_SIZE(builtin_formats);
Will Palmer80281842010-05-02 11:00:44[diff] [blame]99 builtin_formats_len = commit_formats_len;
100 ALLOC_GROW(commit_formats, commit_formats_len, commit_formats_alloc);
Will Palmer40957892010-05-02 11:00:42[diff] [blame]101 memcpy(commit_formats, builtin_formats,
102 sizeof(*builtin_formats)*ARRAY_SIZE(builtin_formats));
Will Palmer80281842010-05-02 11:00:44[diff] [blame]103
104 git_config(git_pretty_formats_config, NULL);
Will Palmer40957892010-05-02 11:00:42[diff] [blame]105}
106
Will Palmer2d7671e2010-05-02 11:00:43[diff] [blame]107static struct cmt_fmt_map *find_commit_format_recursive(const char *sought,
108 const char *original,
109 int num_redirections)
Will Palmer40957892010-05-02 11:00:42[diff] [blame]110{
111 struct cmt_fmt_map *found = NULL;
112 size_t found_match_len = 0;
113 int i;
114
Will Palmer2d7671e2010-05-02 11:00:43[diff] [blame]115 if (num_redirections >= commit_formats_len)
116 die("invalid --pretty format: "
117 "'%s' references an alias which points to itself",
118 original);
Will Palmer40957892010-05-02 11:00:42[diff] [blame]119
120 for (i = 0; i < commit_formats_len; i++) {
121 size_t match_len;
122
Christian Couder59556542013-11-30 20:55:40[diff] [blame]123 if (!starts_with(commit_formats[i].name, sought))
Will Palmer40957892010-05-02 11:00:42[diff] [blame]124 continue;
125
126 match_len = strlen(commit_formats[i].name);
127 if (found == NULL || found_match_len > match_len) {
128 found = &commit_formats[i];
129 found_match_len = match_len;
130 }
131 }
Will Palmer2d7671e2010-05-02 11:00:43[diff] [blame]132
133 if (found && found->is_alias) {
134 found = find_commit_format_recursive(found->user_format,
135 original,
136 num_redirections+1);
137 }
138
Will Palmer40957892010-05-02 11:00:42[diff] [blame]139 return found;
140}
141
Will Palmer2d7671e2010-05-02 11:00:43[diff] [blame]142static struct cmt_fmt_map *find_commit_format(const char *sought)
143{
144 if (!commit_formats)
145 setup_commit_formats();
146
147 return find_commit_format_recursive(sought, sought, 0);
148}
149
Junio C Hamano4da45be2008-04-08 00:11:34[diff] [blame]150void get_commit_format(const char *arg, struct rev_info *rev)
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]151{
Will Palmer40957892010-05-02 11:00:42[diff] [blame]152 struct cmt_fmt_map *commit_format;
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]153
Junio C Hamano4da45be2008-04-08 00:11:34[diff] [blame]154 rev->use_terminator = 0;
Jeff Kingc75e7ad2014-07-29 17:54:46[diff] [blame]155 if (!arg) {
Junio C Hamano4da45be2008-04-08 00:11:34[diff] [blame]156 rev->commit_format = CMIT_FMT_DEFAULT;
157 return;
158 }
René Scharfee3f1da92014-10-04 18:54:50[diff] [blame]159 if (skip_prefix(arg, "format:", &arg)) {
160 save_user_format(rev, arg, 0);
Junio C Hamano4da45be2008-04-08 00:11:34[diff] [blame]161 return;
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]162 }
Will Palmer40957892010-05-02 11:00:42[diff] [blame]163
René Scharfee3f1da92014-10-04 18:54:50[diff] [blame]164 if (!*arg || skip_prefix(arg, "tformat:", &arg) || strchr(arg, '%')) {
Nanako Shiraishi36407542009-02-24 09:59:15[diff] [blame]165 save_user_format(rev, arg, 1);
166 return;
167 }
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]168
Will Palmer40957892010-05-02 11:00:42[diff] [blame]169 commit_format = find_commit_format(arg);
170 if (!commit_format)
171 die("invalid --pretty format: %s", arg);
172
173 rev->commit_format = commit_format->format;
174 rev->use_terminator = commit_format->is_tformat;
Will Palmer80281842010-05-02 11:00:44[diff] [blame]175 if (commit_format->format == CMIT_FMT_USERFORMAT) {
176 save_user_format(rev, commit_format->user_format,
177 commit_format->is_tformat);
178 }
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]179}
180
181/*
182 * Generic support for pretty-printing the header
183 */
184static int get_one_line(const char *msg)
185{
186 int ret = 0;
187
188 for (;;) {
189 char c = *msg++;
190 if (!c)
191 break;
192 ret++;
193 if (c == '\n')
194 break;
195 }
196 return ret;
197}
198
199/* High bit set, or ISO-2022-INT */
Junio C Hamanocc571142010-01-12 06:23:35[diff] [blame]200static int non_ascii(int ch)
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]201{
René Scharfec2e93642009-03-07 13:06:49[diff] [blame]202 return !isascii(ch) || ch == '\033';
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]203}
204
Johannes Schindelin28e9cf62009-08-10 16:22:18[diff] [blame]205int has_non_ascii(const char *s)
206{
207 int ch;
208 if (!s)
209 return 0;
210 while ((ch = *s++) != '\0') {
211 if (non_ascii(ch))
212 return 1;
213 }
214 return 0;
215}
216
Jeff King4d03c182011-04-08 22:40:36[diff] [blame]217static int is_rfc822_special(char ch)
218{
219 switch (ch) {
220 case '(':
221 case ')':
222 case '<':
223 case '>':
224 case '[':
225 case ']':
226 case ':':
227 case ';':
228 case '@':
229 case ',':
230 case '.':
231 case '"':
232 case '\\':
233 return 1;
234 default:
235 return 0;
236 }
237}
238
Jan H. Schönherr41dd00b2012-10-18 14:43:33[diff] [blame]239static int needs_rfc822_quoting(const char *s, int len)
Jeff King4d03c182011-04-08 22:40:36[diff] [blame]240{
241 int i;
242 for (i = 0; i < len; i++)
243 if (is_rfc822_special(s[i]))
244 return 1;
245 return 0;
246}
247
Jan H. Schönherrf9b72042012-10-18 14:43:31[diff] [blame]248static int last_line_length(struct strbuf *sb)
249{
250 int i;
251
252 /* How many bytes are already used on the last line? */
253 for (i = sb->len - 1; i >= 0; i--)
254 if (sb->buf[i] == '\n')
255 break;
256 return sb->len - (i + 1);
257}
258
Jeff King4d03c182011-04-08 22:40:36[diff] [blame]259static void add_rfc822_quoted(struct strbuf *out, const char *s, int len)
260{
261 int i;
262
263 /* just a guess, we may have to also backslash-quote */
264 strbuf_grow(out, len + 2);
265
266 strbuf_addch(out, '"');
267 for (i = 0; i < len; i++) {
268 switch (s[i]) {
269 case '"':
270 case '\\':
271 strbuf_addch(out, '\\');
272 /* fall through */
273 default:
274 strbuf_addch(out, s[i]);
275 }
276 }
277 strbuf_addch(out, '"');
278}
279
Jan H. Schönherr0fcec2c2012-10-18 14:43:32[diff] [blame]280enum rfc2047_type {
281 RFC2047_SUBJECT,
Ronnie Sahlberg78273522014-07-02 18:24:05[diff] [blame]282 RFC2047_ADDRESS
Jan H. Schönherr0fcec2c2012-10-18 14:43:32[diff] [blame]283};
284
285static int is_rfc2047_special(char ch, enum rfc2047_type type)
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]286{
Jan H. Schönherr0fcec2c2012-10-18 14:43:32[diff] [blame]287 /*
288 * rfc2047, section 4.2:
289 *
290 * 8-bit values which correspond to printable ASCII characters other
291 * than "=", "?", and "_" (underscore), MAY be represented as those
292 * characters. (But see section 5 for restrictions.) In
293 * particular, SPACE and TAB MUST NOT be represented as themselves
294 * within encoded words.
295 */
296
297 /*
298 * rule out non-ASCII characters and non-printable characters (the
299 * non-ASCII check should be redundant as isprint() is not localized
300 * and only knows about ASCII, but be defensive about that)
301 */
302 if (non_ascii(ch) || !isprint(ch))
Jan H. Schönherr94f6cdf2012-10-18 14:43:30[diff] [blame]303 return 1;
304
Jan H. Schönherr0fcec2c2012-10-18 14:43:32[diff] [blame]305 /*
306 * rule out special printable characters (' ' should be the only
307 * whitespace character considered printable, but be defensive and use
308 * isspace())
309 */
310 if (isspace(ch) || ch == '=' || ch == '?' || ch == '_')
311 return 1;
312
313 /*
314 * rfc2047, section 5.3:
315 *
316 * As a replacement for a 'word' entity within a 'phrase', for example,
317 * one that precedes an address in a From, To, or Cc header. The ABNF
318 * definition for 'phrase' from RFC 822 thus becomes:
319 *
320 * phrase = 1*( encoded-word / word )
321 *
322 * In this case the set of characters that may be used in a "Q"-encoded
323 * 'encoded-word' is restricted to: <upper and lower case ASCII
324 * letters, decimal digits, "!", "*", "+", "-", "/", "=", and "_"
325 * (underscore, ASCII 95.)>. An 'encoded-word' that appears within a
326 * 'phrase' MUST be separated from any adjacent 'word', 'text' or
327 * 'special' by 'linear-white-space'.
328 */
329
330 if (type != RFC2047_ADDRESS)
331 return 0;
332
333 /* '=' and '_' are special cases and have been checked above */
334 return !(isalnum(ch) || ch == '!' || ch == '*' || ch == '+' || ch == '-' || ch == '/');
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]335}
336
Jan H. Schönherr41dd00b2012-10-18 14:43:33[diff] [blame]337static int needs_rfc2047_encoding(const char *line, int len,
338 enum rfc2047_type type)
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]339{
Jeff Kinga1f6baa2011-02-23 09:58:41[diff] [blame]340 int i;
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]341
342 for (i = 0; i < len; i++) {
343 int ch = line[i];
Jeff Kingc22e7de2011-02-23 09:59:18[diff] [blame]344 if (non_ascii(ch) || ch == '\n')
Jan H. Schönherr41dd00b2012-10-18 14:43:33[diff] [blame]345 return 1;
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]346 if ((i + 1 < len) && (ch == '=' && line[i+1] == '?'))
Jan H. Schönherr41dd00b2012-10-18 14:43:33[diff] [blame]347 return 1;
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]348 }
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]349
Jan H. Schönherr41dd00b2012-10-18 14:43:33[diff] [blame]350 return 0;
351}
352
Kirill Smelkov6cd3c052013-03-07 10:55:07[diff] [blame]353static void add_rfc2047(struct strbuf *sb, const char *line, size_t len,
Jan H. Schönherr41dd00b2012-10-18 14:43:33[diff] [blame]354 const char *encoding, enum rfc2047_type type)
355{
356 static const int max_encoded_length = 76; /* per rfc2047 */
357 int i;
358 int line_len = last_line_length(sb);
359
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]360 strbuf_grow(sb, len * 3 + strlen(encoding) + 100);
361 strbuf_addf(sb, "=?%s?q?", encoding);
Jeff Kinga1f6baa2011-02-23 09:58:41[diff] [blame]362 line_len += strlen(encoding) + 5; /* 5 for =??q? */
Kirill Smelkov6cd3c052013-03-07 10:55:07[diff] [blame]363
364 while (len) {
365 /*
366 * RFC 2047, section 5 (3):
367 *
368 * Each 'encoded-word' MUST represent an integral number of
369 * characters. A multi-octet character may not be split across
370 * adjacent 'encoded- word's.
371 */
372 const unsigned char *p = (const unsigned char *)line;
373 int chrlen = mbs_chrlen(&line, &len, encoding);
374 int is_special = (chrlen > 1) || is_rfc2047_special(*p, type);
375
376 /* "=%02X" * chrlen, or the byte itself */
377 const char *encoded_fmt = is_special ? "=%02X" : "%c";
378 int encoded_len = is_special ? 3 * chrlen : 1;
Jeff Kinga1f6baa2011-02-23 09:58:41[diff] [blame]379
Jan H. Schönherr94f6cdf2012-10-18 14:43:30[diff] [blame]380 /*
381 * According to RFC 2047, we could encode the special character
382 * ' ' (space) with '_' (underscore) for readability. But many
383 * programs do not understand this and just leave the
384 * underscore in place. Thus, we do nothing special here, which
385 * causes ' ' to be encoded as '=20', avoiding this problem.
386 */
387
Kirill Smelkov6cd3c052013-03-07 10:55:07[diff] [blame]388 if (line_len + encoded_len + 2 > max_encoded_length) {
389 /* It won't fit with trailing "?=" --- break the line */
Jeff Kinga1f6baa2011-02-23 09:58:41[diff] [blame]390 strbuf_addf(sb, "?=\n =?%s?q?", encoding);
391 line_len = strlen(encoding) + 5 + 1; /* =??q? plus SP */
392 }
393
Kirill Smelkov6cd3c052013-03-07 10:55:07[diff] [blame]394 for (i = 0; i < chrlen; i++)
395 strbuf_addf(sb, encoded_fmt, p[i]);
396 line_len += encoded_len;
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]397 }
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]398 strbuf_addstr(sb, "?=");
399}
400
Jeff Kingd1053242014-05-02 01:07:22[diff] [blame]401const char *show_ident_date(const struct ident_split *ident,
Jeff Kinga5481a62015-06-25 16:55:02[diff] [blame]402 const struct date_mode *mode)
René Scharfe9dbe7c32013-04-17 18:33:35[diff] [blame]403{
404 unsigned long date = 0;
Jeff King3f419d42014-03-07 17:15:01[diff] [blame]405 long tz = 0;
René Scharfe9dbe7c32013-04-17 18:33:35[diff] [blame]406
407 if (ident->date_begin && ident->date_end)
408 date = strtoul(ident->date_begin, NULL, 10);
Jeff King1dca1552014-02-24 07:46:37[diff] [blame]409 if (date_overflows(date))
410 date = 0;
411 else {
412 if (ident->tz_begin && ident->tz_end)
413 tz = strtol(ident->tz_begin, NULL, 10);
Jeff King3f419d42014-03-07 17:15:01[diff] [blame]414 if (tz >= INT_MAX || tz <= INT_MIN)
Jeff King1dca1552014-02-24 07:46:37[diff] [blame]415 tz = 0;
416 }
René Scharfe9dbe7c32013-04-17 18:33:35[diff] [blame]417 return show_date(date, tz, mode);
418}
419
Jeff King10f2fbf2013-07-03 07:07:48[diff] [blame]420void pp_user_info(struct pretty_print_context *pp,
Jeff King6bf13942011-05-26 22:27:49[diff] [blame]421 const char *what, struct strbuf *sb,
422 const char *line, const char *encoding)
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]423{
Antoine Pelisse3c020bd2013-01-05 21:26:38[diff] [blame]424 struct ident_split ident;
René Scharfe9dbe7c32013-04-17 18:33:35[diff] [blame]425 char *line_end;
Antoine Pelissedffd3252013-01-05 21:26:42[diff] [blame]426 const char *mailbuf, *namebuf;
427 size_t namelen, maillen;
Jan H. Schönherr41dd00b2012-10-18 14:43:33[diff] [blame]428 int max_length = 78; /* per rfc2822 */
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]429
Jeff King6bf13942011-05-26 22:27:49[diff] [blame]430 if (pp->fmt == CMIT_FMT_ONELINE)
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]431 return;
Antoine Pelisse3c020bd2013-01-05 21:26:38[diff] [blame]432
René Scharfe30e77bc2013-04-25 19:40:25[diff] [blame]433 line_end = strchrnul(line, '\n');
434 if (split_ident_line(&ident, line, line_end - line))
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]435 return;
Antoine Pelisse3c020bd2013-01-05 21:26:38[diff] [blame]436
Antoine Pelissedffd3252013-01-05 21:26:42[diff] [blame]437 mailbuf = ident.mail_begin;
438 maillen = ident.mail_end - ident.mail_begin;
439 namebuf = ident.name_begin;
440 namelen = ident.name_end - ident.name_begin;
441
442 if (pp->mailmap)
443 map_user(pp->mailmap, &mailbuf, &maillen, &namebuf, &namelen);
444
Jeff King6bf13942011-05-26 22:27:49[diff] [blame]445 if (pp->fmt == CMIT_FMT_EMAIL) {
Jeff King662cc302013-09-20 10:16:28[diff] [blame]446 if (pp->from_ident && ident_cmp(pp->from_ident, &ident)) {
Jeff Kinga9080472013-07-03 07:08:22[diff] [blame]447 struct strbuf buf = STRBUF_INIT;
448
449 strbuf_addstr(&buf, "From: ");
450 strbuf_add(&buf, namebuf, namelen);
451 strbuf_addstr(&buf, " <");
452 strbuf_add(&buf, mailbuf, maillen);
453 strbuf_addstr(&buf, ">\n");
454 string_list_append(&pp->in_body_headers,
455 strbuf_detach(&buf, NULL));
456
457 mailbuf = pp->from_ident->mail_begin;
458 maillen = pp->from_ident->mail_end - mailbuf;
459 namebuf = pp->from_ident->name_begin;
460 namelen = pp->from_ident->name_end - namebuf;
461 }
462
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]463 strbuf_addstr(sb, "From: ");
René Scharfea0511b32013-04-25 19:43:56[diff] [blame]464 if (needs_rfc2047_encoding(namebuf, namelen, RFC2047_ADDRESS)) {
465 add_rfc2047(sb, namebuf, namelen,
Antoine Pelissedffd3252013-01-05 21:26:42[diff] [blame]466 encoding, RFC2047_ADDRESS);
Jan H. Schönherr41dd00b2012-10-18 14:43:33[diff] [blame]467 max_length = 76; /* per rfc2047 */
René Scharfea0511b32013-04-25 19:43:56[diff] [blame]468 } else if (needs_rfc822_quoting(namebuf, namelen)) {
Jeff King4d03c182011-04-08 22:40:36[diff] [blame]469 struct strbuf quoted = STRBUF_INIT;
René Scharfea0511b32013-04-25 19:43:56[diff] [blame]470 add_rfc822_quoted(&quoted, namebuf, namelen);
Jan H. Schönherr41dd00b2012-10-18 14:43:33[diff] [blame]471 strbuf_add_wrapped_bytes(sb, quoted.buf, quoted.len,
472 -6, 1, max_length);
Jeff King4d03c182011-04-08 22:40:36[diff] [blame]473 strbuf_release(&quoted);
Jan H. Schönherr41dd00b2012-10-18 14:43:33[diff] [blame]474 } else {
René Scharfea0511b32013-04-25 19:43:56[diff] [blame]475 strbuf_add_wrapped_bytes(sb, namebuf, namelen,
Antoine Pelissedffd3252013-01-05 21:26:42[diff] [blame]476 -6, 1, max_length);
Jeff King4d03c182011-04-08 22:40:36[diff] [blame]477 }
Antoine Pelissedffd3252013-01-05 21:26:42[diff] [blame]478
René Scharfe97a17e72013-04-25 19:41:57[diff] [blame]479 if (max_length <
480 last_line_length(sb) + strlen(" <") + maillen + strlen(">"))
Jeff King990f6e32011-04-14 22:18:09[diff] [blame]481 strbuf_addch(sb, '\n');
René Scharfea0511b32013-04-25 19:43:56[diff] [blame]482 strbuf_addf(sb, " <%.*s>\n", (int)maillen, mailbuf);
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]483 } else {
René Scharfea0511b32013-04-25 19:43:56[diff] [blame]484 strbuf_addf(sb, "%s: %.*s%.*s <%.*s>\n", what,
485 (pp->fmt == CMIT_FMT_FULLER) ? 4 : 0, " ",
486 (int)namelen, namebuf, (int)maillen, mailbuf);
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]487 }
Antoine Pelissedffd3252013-01-05 21:26:42[diff] [blame]488
Jeff King6bf13942011-05-26 22:27:49[diff] [blame]489 switch (pp->fmt) {
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]490 case CMIT_FMT_MEDIUM:
René Scharfe9dbe7c32013-04-17 18:33:35[diff] [blame]491 strbuf_addf(sb, "Date: %s\n",
Jeff Kinga5481a62015-06-25 16:55:02[diff] [blame]492 show_ident_date(&ident, &pp->date_mode));
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]493 break;
494 case CMIT_FMT_EMAIL:
René Scharfe9dbe7c32013-04-17 18:33:35[diff] [blame]495 strbuf_addf(sb, "Date: %s\n",
Jeff Kinga5481a62015-06-25 16:55:02[diff] [blame]496 show_ident_date(&ident, DATE_MODE(RFC2822)));
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]497 break;
498 case CMIT_FMT_FULLER:
René Scharfe9dbe7c32013-04-17 18:33:35[diff] [blame]499 strbuf_addf(sb, "%sDate: %s\n", what,
Jeff Kinga5481a62015-06-25 16:55:02[diff] [blame]500 show_ident_date(&ident, &pp->date_mode));
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]501 break;
502 default:
503 /* notin' */
504 break;
505 }
506}
507
508static int is_empty_line(const char *line, int *len_p)
509{
510 int len = *len_p;
Felipe Contreras35b2fa52013-10-31 09:25:42[diff] [blame]511 while (len && isspace(line[len - 1]))
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]512 len--;
513 *len_p = len;
514 return !len;
515}
516
René Scharfea0109662008-12-27 00:32:49[diff] [blame]517static const char *skip_empty_lines(const char *msg)
518{
519 for (;;) {
520 int linelen = get_one_line(msg);
521 int ll = linelen;
522 if (!linelen)
523 break;
524 if (!is_empty_line(msg, &ll))
525 break;
526 msg += linelen;
527 }
528 return msg;
529}
530
Jeff King6bf13942011-05-26 22:27:49[diff] [blame]531static void add_merge_info(const struct pretty_print_context *pp,
532 struct strbuf *sb, const struct commit *commit)
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]533{
534 struct commit_list *parent = commit->parents;
535
Jeff King6bf13942011-05-26 22:27:49[diff] [blame]536 if ((pp->fmt == CMIT_FMT_ONELINE) || (pp->fmt == CMIT_FMT_EMAIL) ||
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]537 !parent || !parent->next)
538 return;
539
540 strbuf_addstr(sb, "Merge:");
541
542 while (parent) {
543 struct commit *p = parent->item;
544 const char *hex = NULL;
Jeff King6bf13942011-05-26 22:27:49[diff] [blame]545 if (pp->abbrev)
brian m. carlsoned1c9972015-11-10 02:22:29[diff] [blame]546 hex = find_unique_abbrev(p->object.oid.hash, pp->abbrev);
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]547 if (!hex)
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]548 hex = oid_to_hex(&p->object.oid);
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]549 parent = parent->next;
550
Thomas Rast7fcda922009-02-13 22:10:41[diff] [blame]551 strbuf_addf(sb, " %s", hex);
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]552 }
553 strbuf_addch(sb, '\n');
554}
555
Jeff Kingfe6eb7f2014-08-27 07:56:01[diff] [blame]556static char *get_header(const char *msg, const char *key)
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]557{
Jeff Kingfe6eb7f2014-08-27 07:56:01[diff] [blame]558 size_t len;
559 const char *v = find_commit_header(msg, key, &len);
560 return v ? xmemdupz(v, len) : NULL;
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]561}
562
563static char *replace_encoding_header(char *buf, const char *encoding)
564{
Brandon Caseyf285a2d2008-10-09 19:12:12[diff] [blame]565 struct strbuf tmp = STRBUF_INIT;
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]566 size_t start, len;
567 char *cp = buf;
568
569 /* guess if there is an encoding header before a \n\n */
René Scharfe68d6d6e2015-02-21 19:53:09[diff] [blame]570 while (!starts_with(cp, "encoding ")) {
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]571 cp = strchr(cp, '\n');
572 if (!cp || *++cp == '\n')
573 return buf;
574 }
575 start = cp - buf;
576 cp = strchr(cp, '\n');
577 if (!cp)
578 return buf; /* should not happen but be defensive */
579 len = cp + 1 - (buf + start);
580
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]581 strbuf_attach(&tmp, buf, strlen(buf), strlen(buf) + 1);
582 if (is_encoding_utf8(encoding)) {
583 /* we have re-coded to UTF-8; drop the header */
584 strbuf_remove(&tmp, start, len);
585 } else {
586 /* just replaces XXXX in 'encoding XXXX\n' */
587 strbuf_splice(&tmp, start + strlen("encoding "),
588 len - strlen("encoding \n"),
589 encoding, strlen(encoding));
590 }
591 return strbuf_detach(&tmp, NULL);
592}
593
Jeff Kingb000c592014-06-10 21:39:30[diff] [blame]594const char *logmsg_reencode(const struct commit *commit,
595 char **commit_encoding,
596 const char *output_encoding)
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]597{
Brandon Casey330db182009-05-18 23:44:39[diff] [blame]598 static const char *utf8 = "UTF-8";
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]599 const char *use_encoding;
600 char *encoding;
Jeff King8597ea32014-06-10 21:44:13[diff] [blame]601 const char *msg = get_commit_buffer(commit, NULL);
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]602 char *out;
603
Nguyễn Thái Ngọc Duy5a10d232013-04-18 23:08:40[diff] [blame]604 if (!output_encoding || !*output_encoding) {
605 if (commit_encoding)
Jeff Kingfe6eb7f2014-08-27 07:56:01[diff] [blame]606 *commit_encoding = get_header(msg, "encoding");
Jeff Kingdd0d3882013-01-26 09:44:06[diff] [blame]607 return msg;
Nguyễn Thái Ngọc Duy5a10d232013-04-18 23:08:40[diff] [blame]608 }
Jeff Kingfe6eb7f2014-08-27 07:56:01[diff] [blame]609 encoding = get_header(msg, "encoding");
Nguyễn Thái Ngọc Duy5a10d232013-04-18 23:08:40[diff] [blame]610 if (commit_encoding)
611 *commit_encoding = encoding;
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]612 use_encoding = encoding ? encoding : utf8;
Jeff Kingbe5c9fb2013-01-26 09:44:28[diff] [blame]613 if (same_encoding(use_encoding, output_encoding)) {
614 /*
615 * No encoding work to be done. If we have no encoding header
616 * at all, then there's nothing to do, and we can return the
617 * message verbatim (whether newly allocated or not).
618 */
619 if (!encoding)
620 return msg;
621
622 /*
623 * Otherwise, we still want to munge the encoding header in the
624 * result, which will be done by modifying the buffer. If we
625 * are using a fresh copy, we can reuse it. But if we are using
Jeff Kingb66103c2014-06-10 21:41:39[diff] [blame]626 * the cached copy from get_commit_buffer, we need to duplicate it
627 * to avoid munging the cached copy.
Jeff Kingbe5c9fb2013-01-26 09:44:28[diff] [blame]628 */
Jeff King8597ea32014-06-10 21:44:13[diff] [blame]629 if (msg == get_cached_commit_buffer(commit, NULL))
Jeff Kingb66103c2014-06-10 21:41:39[diff] [blame]630 out = xstrdup(msg);
631 else
632 out = (char *)msg;
Jeff Kingbe5c9fb2013-01-26 09:44:28[diff] [blame]633 }
634 else {
635 /*
636 * There's actual encoding work to do. Do the reencoding, which
637 * still leaves the header to be replaced in the next step. At
638 * this point, we are done with msg. If we allocated a fresh
639 * copy, we can free it.
640 */
641 out = reencode_string(msg, output_encoding, use_encoding);
Jeff Kingb66103c2014-06-10 21:41:39[diff] [blame]642 if (out)
643 unuse_commit_buffer(commit, msg);
Jeff Kingbe5c9fb2013-01-26 09:44:28[diff] [blame]644 }
645
646 /*
647 * This replacement actually consumes the buffer we hand it, so we do
648 * not have to worry about freeing the old "out" here.
649 */
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]650 if (out)
651 out = replace_encoding_header(out, output_encoding);
652
Nguyễn Thái Ngọc Duy5a10d232013-04-18 23:08:40[diff] [blame]653 if (!commit_encoding)
654 free(encoding);
Jeff Kingdd0d3882013-01-26 09:44:06[diff] [blame]655 /*
656 * If the re-encoding failed, out might be NULL here; in that
657 * case we just return the commit message verbatim.
658 */
659 return out ? out : msg;
660}
661
Antoine Pelisseea02ffa2013-01-05 21:26:40[diff] [blame]662static int mailmap_name(const char **email, size_t *email_len,
663 const char **name, size_t *name_len)
Johannes Schindeline0cbc392008-07-11 23:28:18[diff] [blame]664{
Johannes Schindelinc455c872008-07-21 18:03:49[diff] [blame]665 static struct string_list *mail_map;
Johannes Schindeline0cbc392008-07-11 23:28:18[diff] [blame]666 if (!mail_map) {
667 mail_map = xcalloc(1, sizeof(*mail_map));
Marius Storm-Olsend551a482009-02-08 14:34:27[diff] [blame]668 read_mailmap(mail_map, NULL);
Johannes Schindeline0cbc392008-07-11 23:28:18[diff] [blame]669 }
Marius Storm-Olsend20d6542009-02-08 14:34:30[diff] [blame]670 return mail_map->nr && map_user(mail_map, email, email_len, name, name_len);
Johannes Schindeline0cbc392008-07-11 23:28:18[diff] [blame]671}
672
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]673static size_t format_person_part(struct strbuf *sb, char part,
Jeff Kinga5481a62015-06-25 16:55:02[diff] [blame]674 const char *msg, int len,
675 const struct date_mode *dmode)
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]676{
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]677 /* currently all placeholders have same length */
678 const int placeholder_len = 2;
Junio C Hamano4b340cf2012-03-11 09:25:43[diff] [blame]679 struct ident_split s;
Antoine Pelisseea02ffa2013-01-05 21:26:40[diff] [blame]680 const char *name, *mail;
681 size_t maillen, namelen;
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]682
Junio C Hamano4b340cf2012-03-11 09:25:43[diff] [blame]683 if (split_ident_line(&s, msg, len) < 0)
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]684 goto skip;
685
Antoine Pelisseea02ffa2013-01-05 21:26:40[diff] [blame]686 name = s.name_begin;
687 namelen = s.name_end - s.name_begin;
688 mail = s.mail_begin;
689 maillen = s.mail_end - s.mail_begin;
Marius Storm-Olsend20d6542009-02-08 14:34:30[diff] [blame]690
Antoine Pelisseea02ffa2013-01-05 21:26:40[diff] [blame]691 if (part == 'N' || part == 'E') /* mailmap lookup */
692 mailmap_name(&mail, &maillen, &name, &namelen);
Johannes Schindeline0cbc392008-07-11 23:28:18[diff] [blame]693 if (part == 'n' || part == 'N') { /* name */
Antoine Pelisseea02ffa2013-01-05 21:26:40[diff] [blame]694 strbuf_add(sb, name, namelen);
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]695 return placeholder_len;
696 }
Marius Storm-Olsend20d6542009-02-08 14:34:30[diff] [blame]697 if (part == 'e' || part == 'E') { /* email */
Antoine Pelisseea02ffa2013-01-05 21:26:40[diff] [blame]698 strbuf_add(sb, mail, maillen);
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]699 return placeholder_len;
René Scharfecde75e52007-11-09 00:49:42[diff] [blame]700 }
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]701
Junio C Hamano4b340cf2012-03-11 09:25:43[diff] [blame]702 if (!s.date_begin)
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]703 goto skip;
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]704
René Scharfecde75e52007-11-09 00:49:42[diff] [blame]705 if (part == 't') { /* date, UNIX timestamp */
Junio C Hamano4b340cf2012-03-11 09:25:43[diff] [blame]706 strbuf_add(sb, s.date_begin, s.date_end - s.date_begin);
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]707 return placeholder_len;
René Scharfecde75e52007-11-09 00:49:42[diff] [blame]708 }
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]709
René Scharfecde75e52007-11-09 00:49:42[diff] [blame]710 switch (part) {
711 case 'd': /* date */
René Scharfe9dbe7c32013-04-17 18:33:35[diff] [blame]712 strbuf_addstr(sb, show_ident_date(&s, dmode));
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]713 return placeholder_len;
René Scharfecde75e52007-11-09 00:49:42[diff] [blame]714 case 'D': /* date, RFC2822 style */
Jeff Kinga5481a62015-06-25 16:55:02[diff] [blame]715 strbuf_addstr(sb, show_ident_date(&s, DATE_MODE(RFC2822)));
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]716 return placeholder_len;
René Scharfecde75e52007-11-09 00:49:42[diff] [blame]717 case 'r': /* date, relative */
Jeff Kinga5481a62015-06-25 16:55:02[diff] [blame]718 strbuf_addstr(sb, show_ident_date(&s, DATE_MODE(RELATIVE)));
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]719 return placeholder_len;
Beat Bolli466fb672014-08-29 16:58:42[diff] [blame]720 case 'i': /* date, ISO 8601-like */
Jeff Kinga5481a62015-06-25 16:55:02[diff] [blame]721 strbuf_addstr(sb, show_ident_date(&s, DATE_MODE(ISO8601)));
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]722 return placeholder_len;
Beat Bolli466fb672014-08-29 16:58:42[diff] [blame]723 case 'I': /* date, ISO 8601 strict */
Jeff Kinga5481a62015-06-25 16:55:02[diff] [blame]724 strbuf_addstr(sb, show_ident_date(&s, DATE_MODE(ISO8601_STRICT)));
Beat Bolli466fb672014-08-29 16:58:42[diff] [blame]725 return placeholder_len;
René Scharfecde75e52007-11-09 00:49:42[diff] [blame]726 }
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]727
728skip:
729 /*
Junio C Hamano4b340cf2012-03-11 09:25:43[diff] [blame]730 * reading from either a bogus commit, or a reflog entry with
731 * %gn, %ge, etc.; 'sb' cannot be updated, but we still need
732 * to compute a valid return value.
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]733 */
734 if (part == 'n' || part == 'e' || part == 't' || part == 'd'
735 || part == 'D' || part == 'r' || part == 'i')
736 return placeholder_len;
737
738 return 0; /* unknown placeholder */
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]739}
740
René Scharfef29d5952007-11-10 11:14:20[diff] [blame]741struct chunk {
742 size_t off;
743 size_t len;
744};
745
Nguyễn Thái Ngọc Duya5752342013-04-18 23:08:50[diff] [blame]746enum flush_type {
747 no_flush,
748 flush_right,
749 flush_left,
Nguyễn Thái Ngọc Duy16406322013-04-18 23:08:52[diff] [blame]750 flush_left_and_steal,
Nguyễn Thái Ngọc Duya5752342013-04-18 23:08:50[diff] [blame]751 flush_both
752};
753
Nguyễn Thái Ngọc Duya7f01c62013-04-18 23:08:51[diff] [blame]754enum trunc_type {
755 trunc_none,
756 trunc_left,
757 trunc_middle,
758 trunc_right
759};
760
René Scharfef29d5952007-11-10 11:14:20[diff] [blame]761struct format_commit_context {
762 const struct commit *commit;
Thomas Rastdd2e7942009-10-19 15:48:08[diff] [blame]763 const struct pretty_print_context *pretty_ctx;
René Scharfef53bd742008-12-27 00:49:21[diff] [blame]764 unsigned commit_header_parsed:1;
765 unsigned commit_message_parsed:1;
Sebastian Götteffb6d7d2013-03-31 16:00:14[diff] [blame]766 struct signature_check signature_check;
Nguyễn Thái Ngọc Duya5752342013-04-18 23:08:50[diff] [blame]767 enum flush_type flush_type;
Nguyễn Thái Ngọc Duya7f01c62013-04-18 23:08:51[diff] [blame]768 enum trunc_type truncate;
Jeff Kingb000c592014-06-10 21:39:30[diff] [blame]769 const char *message;
Nguyễn Thái Ngọc Duy0940a762013-04-18 23:08:41[diff] [blame]770 char *commit_encoding;
René Scharfe02edd562009-10-17 21:04:19[diff] [blame]771 size_t width, indent1, indent2;
Nguyễn Thái Ngọc Duya95f0672013-04-18 23:08:49[diff] [blame]772 int auto_color;
Nguyễn Thái Ngọc Duya5752342013-04-18 23:08:50[diff] [blame]773 int padding;
René Scharfef29d5952007-11-10 11:14:20[diff] [blame]774
775 /* These offsets are relative to the start of the commit message. */
René Scharfef29d5952007-11-10 11:14:20[diff] [blame]776 struct chunk author;
777 struct chunk committer;
René Scharfef53bd742008-12-27 00:49:21[diff] [blame]778 size_t message_off;
779 size_t subject_off;
René Scharfef29d5952007-11-10 11:14:20[diff] [blame]780 size_t body_off;
René Scharfeb9c62322007-11-10 11:18:26[diff] [blame]781
782 /* The following ones are relative to the result struct strbuf. */
783 struct chunk abbrev_commit_hash;
784 struct chunk abbrev_tree_hash;
785 struct chunk abbrev_parent_hashes;
René Scharfe02edd562009-10-17 21:04:19[diff] [blame]786 size_t wrap_start;
René Scharfef29d5952007-11-10 11:14:20[diff] [blame]787};
788
René Scharfeb9c62322007-11-10 11:18:26[diff] [blame]789static int add_again(struct strbuf *sb, struct chunk *chunk)
790{
791 if (chunk->len) {
792 strbuf_adddup(sb, chunk->off, chunk->len);
793 return 1;
794 }
795
796 /*
797 * We haven't seen this chunk before. Our caller is surely
798 * going to add it the hard way now. Remember the most likely
799 * start of the to-be-added chunk: the current end of the
800 * struct strbuf.
801 */
802 chunk->off = sb->len;
803 return 0;
804}
805
René Scharfef29d5952007-11-10 11:14:20[diff] [blame]806static void parse_commit_header(struct format_commit_context *context)
807{
Pat Notz177b29d2010-11-02 19:59:08[diff] [blame]808 const char *msg = context->message;
René Scharfef29d5952007-11-10 11:14:20[diff] [blame]809 int i;
René Scharfef29d5952007-11-10 11:14:20[diff] [blame]810
René Scharfef53bd742008-12-27 00:49:21[diff] [blame]811 for (i = 0; msg[i]; i++) {
René Scharfee3f1da92014-10-04 18:54:50[diff] [blame]812 const char *name;
René Scharfef29d5952007-11-10 11:14:20[diff] [blame]813 int eol;
814 for (eol = i; msg[eol] && msg[eol] != '\n'; eol++)
815 ; /* do nothing */
816
René Scharfef29d5952007-11-10 11:14:20[diff] [blame]817 if (i == eol) {
René Scharfef53bd742008-12-27 00:49:21[diff] [blame]818 break;
René Scharfee3f1da92014-10-04 18:54:50[diff] [blame]819 } else if (skip_prefix(msg + i, "author ", &name)) {
820 context->author.off = name - msg;
821 context->author.len = msg + eol - name;
822 } else if (skip_prefix(msg + i, "committer ", &name)) {
823 context->committer.off = name - msg;
824 context->committer.len = msg + eol - name;
René Scharfef29d5952007-11-10 11:14:20[diff] [blame]825 }
826 i = eol;
René Scharfef29d5952007-11-10 11:14:20[diff] [blame]827 }
René Scharfef53bd742008-12-27 00:49:21[diff] [blame]828 context->message_off = i;
René Scharfef29d5952007-11-10 11:14:20[diff] [blame]829 context->commit_header_parsed = 1;
830}
831
Stephen Boyd46d164b2009-03-23 02:14:01[diff] [blame]832static int istitlechar(char c)
833{
834 return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
835 (c >= '0' && c <= '9') || c == '.' || c == '_';
836}
837
838static void format_sanitized_subject(struct strbuf *sb, const char *msg)
839{
840 size_t trimlen;
Stephen Boyd871d21d2009-03-31 23:24:38[diff] [blame]841 size_t start_len = sb->len;
Stephen Boyd46d164b2009-03-23 02:14:01[diff] [blame]842 int space = 2;
843
844 for (; *msg && *msg != '\n'; msg++) {
845 if (istitlechar(*msg)) {
846 if (space == 1)
847 strbuf_addch(sb, '-');
848 space = 0;
849 strbuf_addch(sb, *msg);
850 if (*msg == '.')
851 while (*(msg+1) == '.')
852 msg++;
853 } else
854 space |= 1;
855 }
856
857 /* trim any trailing '.' or '-' characters */
858 trimlen = 0;
Stephen Boyd871d21d2009-03-31 23:24:38[diff] [blame]859 while (sb->len - trimlen > start_len &&
860 (sb->buf[sb->len - 1 - trimlen] == '.'
861 || sb->buf[sb->len - 1 - trimlen] == '-'))
Stephen Boyd46d164b2009-03-23 02:14:01[diff] [blame]862 trimlen++;
863 strbuf_remove(sb, sb->len - trimlen, trimlen);
864}
865
René Scharfecec08712009-01-06 20:41:06[diff] [blame]866const char *format_subject(struct strbuf *sb, const char *msg,
867 const char *line_separator)
René Scharfe88c44732008-12-27 00:39:35[diff] [blame]868{
869 int first = 1;
870
871 for (;;) {
872 const char *line = msg;
873 int linelen = get_one_line(line);
874
875 msg += linelen;
876 if (!linelen || is_empty_line(line, &linelen))
877 break;
878
René Scharfef53bd742008-12-27 00:49:21[diff] [blame]879 if (!sb)
880 continue;
René Scharfe88c44732008-12-27 00:39:35[diff] [blame]881 strbuf_grow(sb, linelen + 2);
882 if (!first)
883 strbuf_addstr(sb, line_separator);
884 strbuf_add(sb, line, linelen);
885 first = 0;
886 }
887 return msg;
888}
889
René Scharfef53bd742008-12-27 00:49:21[diff] [blame]890static void parse_commit_message(struct format_commit_context *c)
891{
Pat Notz177b29d2010-11-02 19:59:08[diff] [blame]892 const char *msg = c->message + c->message_off;
893 const char *start = c->message;
René Scharfef53bd742008-12-27 00:49:21[diff] [blame]894
895 msg = skip_empty_lines(msg);
896 c->subject_off = msg - start;
897
898 msg = format_subject(NULL, msg, NULL);
899 msg = skip_empty_lines(msg);
900 c->body_off = msg - start;
901
902 c->commit_message_parsed = 1;
903}
904
René Scharfe02edd562009-10-17 21:04:19[diff] [blame]905static void strbuf_wrap(struct strbuf *sb, size_t pos,
906 size_t width, size_t indent1, size_t indent2)
907{
908 struct strbuf tmp = STRBUF_INIT;
909
910 if (pos)
911 strbuf_add(&tmp, sb->buf, pos);
912 strbuf_add_wrapped_text(&tmp, sb->buf + pos,
913 (int) indent1, (int) indent2, (int) width);
914 strbuf_swap(&tmp, sb);
915 strbuf_release(&tmp);
916}
917
918static void rewrap_message_tail(struct strbuf *sb,
919 struct format_commit_context *c,
920 size_t new_width, size_t new_indent1,
921 size_t new_indent2)
922{
923 if (c->width == new_width && c->indent1 == new_indent1 &&
924 c->indent2 == new_indent2)
925 return;
René Scharfe32ca4242009-11-08 01:04:21[diff] [blame]926 if (c->wrap_start < sb->len)
René Scharfe02edd562009-10-17 21:04:19[diff] [blame]927 strbuf_wrap(sb, c->wrap_start, c->width, c->indent1, c->indent2);
928 c->wrap_start = sb->len;
929 c->width = new_width;
930 c->indent1 = new_indent1;
931 c->indent2 = new_indent2;
932}
933
Jeff Kingcd1957f2011-12-16 11:40:24[diff] [blame]934static int format_reflog_person(struct strbuf *sb,
935 char part,
936 struct reflog_walk_info *log,
Jeff Kinga5481a62015-06-25 16:55:02[diff] [blame]937 const struct date_mode *dmode)
Jeff Kingcd1957f2011-12-16 11:40:24[diff] [blame]938{
939 const char *ident;
940
941 if (!log)
942 return 2;
943
944 ident = get_reflog_ident(log);
945 if (!ident)
946 return 2;
947
948 return format_person_part(sb, part, ident, strlen(ident), dmode);
949}
950
Nguyễn Thái Ngọc Duyfcabc2d2013-04-18 23:08:48[diff] [blame]951static size_t parse_color(struct strbuf *sb, /* in UTF-8 */
952 const char *placeholder,
953 struct format_commit_context *c)
954{
René Scharfee3f1da92014-10-04 18:54:50[diff] [blame]955 const char *rest = placeholder;
956
Nguyễn Thái Ngọc Duyfcabc2d2013-04-18 23:08:48[diff] [blame]957 if (placeholder[1] == '(') {
958 const char *begin = placeholder + 2;
959 const char *end = strchr(begin, ')');
960 char color[COLOR_MAXLEN];
961
962 if (!end)
963 return 0;
René Scharfee3f1da92014-10-04 18:54:50[diff] [blame]964 if (skip_prefix(begin, "auto,", &begin)) {
Nguyễn Thái Ngọc Duyfcabc2d2013-04-18 23:08:48[diff] [blame]965 if (!want_color(c->pretty_ctx->color))
966 return end - placeholder + 1;
Nguyễn Thái Ngọc Duyfcabc2d2013-04-18 23:08:48[diff] [blame]967 }
Jeff Kingf6c5a292014-10-07 19:33:09[diff] [blame]968 if (color_parse_mem(begin, end - begin, color) < 0)
969 die(_("unable to parse --pretty format"));
Nguyễn Thái Ngọc Duyfcabc2d2013-04-18 23:08:48[diff] [blame]970 strbuf_addstr(sb, color);
971 return end - placeholder + 1;
972 }
René Scharfee3f1da92014-10-04 18:54:50[diff] [blame]973 if (skip_prefix(placeholder + 1, "red", &rest))
Nguyễn Thái Ngọc Duyfcabc2d2013-04-18 23:08:48[diff] [blame]974 strbuf_addstr(sb, GIT_COLOR_RED);
René Scharfee3f1da92014-10-04 18:54:50[diff] [blame]975 else if (skip_prefix(placeholder + 1, "green", &rest))
Nguyễn Thái Ngọc Duyfcabc2d2013-04-18 23:08:48[diff] [blame]976 strbuf_addstr(sb, GIT_COLOR_GREEN);
René Scharfee3f1da92014-10-04 18:54:50[diff] [blame]977 else if (skip_prefix(placeholder + 1, "blue", &rest))
Nguyễn Thái Ngọc Duyfcabc2d2013-04-18 23:08:48[diff] [blame]978 strbuf_addstr(sb, GIT_COLOR_BLUE);
René Scharfee3f1da92014-10-04 18:54:50[diff] [blame]979 else if (skip_prefix(placeholder + 1, "reset", &rest))
Nguyễn Thái Ngọc Duyfcabc2d2013-04-18 23:08:48[diff] [blame]980 strbuf_addstr(sb, GIT_COLOR_RESET);
René Scharfee3f1da92014-10-04 18:54:50[diff] [blame]981 return rest - placeholder;
Nguyễn Thái Ngọc Duyfcabc2d2013-04-18 23:08:48[diff] [blame]982}
983
Nguyễn Thái Ngọc Duya5752342013-04-18 23:08:50[diff] [blame]984static size_t parse_padding_placeholder(struct strbuf *sb,
985 const char *placeholder,
986 struct format_commit_context *c)
987{
988 const char *ch = placeholder;
989 enum flush_type flush_type;
990 int to_column = 0;
991
992 switch (*ch++) {
993 case '<':
994 flush_type = flush_right;
995 break;
996 case '>':
997 if (*ch == '<') {
998 flush_type = flush_both;
999 ch++;
Nguyễn Thái Ngọc Duy16406322013-04-18 23:08:52[diff] [blame]1000 } else if (*ch == '>') {
1001 flush_type = flush_left_and_steal;
1002 ch++;
Nguyễn Thái Ngọc Duya5752342013-04-18 23:08:50[diff] [blame]1003 } else
1004 flush_type = flush_left;
1005 break;
1006 default:
1007 return 0;
1008 }
1009
1010 /* the next value means "wide enough to that column" */
1011 if (*ch == '|') {
1012 to_column = 1;
1013 ch++;
1014 }
1015
1016 if (*ch == '(') {
1017 const char *start = ch + 1;
Nguyễn Thái Ngọc Duya7f01c62013-04-18 23:08:51[diff] [blame]1018 const char *end = start + strcspn(start, ",)");
Nguyễn Thái Ngọc Duya5752342013-04-18 23:08:50[diff] [blame]1019 char *next;
1020 int width;
1021 if (!end || end == start)
1022 return 0;
1023 width = strtoul(start, &next, 10);
1024 if (next == start || width == 0)
1025 return 0;
1026 c->padding = to_column ? -width : width;
1027 c->flush_type = flush_type;
Nguyễn Thái Ngọc Duya7f01c62013-04-18 23:08:51[diff] [blame]1028
1029 if (*end == ',') {
1030 start = end + 1;
1031 end = strchr(start, ')');
1032 if (!end || end == start)
1033 return 0;
Christian Couder59556542013-11-30 20:55:40[diff] [blame]1034 if (starts_with(start, "trunc)"))
Nguyễn Thái Ngọc Duya7f01c62013-04-18 23:08:51[diff] [blame]1035 c->truncate = trunc_right;
Christian Couder59556542013-11-30 20:55:40[diff] [blame]1036 else if (starts_with(start, "ltrunc)"))
Nguyễn Thái Ngọc Duya7f01c62013-04-18 23:08:51[diff] [blame]1037 c->truncate = trunc_left;
Christian Couder59556542013-11-30 20:55:40[diff] [blame]1038 else if (starts_with(start, "mtrunc)"))
Nguyễn Thái Ngọc Duya7f01c62013-04-18 23:08:51[diff] [blame]1039 c->truncate = trunc_middle;
1040 else
1041 return 0;
1042 } else
1043 c->truncate = trunc_none;
1044
Nguyễn Thái Ngọc Duya5752342013-04-18 23:08:50[diff] [blame]1045 return end - placeholder + 1;
1046 }
1047 return 0;
1048}
1049
Nguyễn Thái Ngọc Duy7e77df32013-04-18 23:08:47[diff] [blame]1050static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
1051 const char *placeholder,
Junio C Hamano9fa708d2009-10-05 06:43:32[diff] [blame]1052 void *context)
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1053{
René Scharfef29d5952007-11-10 11:14:20[diff] [blame]1054 struct format_commit_context *c = context;
1055 const struct commit *commit = c->commit;
Pat Notz177b29d2010-11-02 19:59:08[diff] [blame]1056 const char *msg = c->message;
René Scharfef29d5952007-11-10 11:14:20[diff] [blame]1057 struct commit_list *p;
Govind Salinas42c8c742008-03-21 15:05:06[diff] [blame]1058 int h1, h2;
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1059
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1060 /* these are independent of the commit */
René Scharfecde75e52007-11-09 00:49:42[diff] [blame]1061 switch (placeholder[0]) {
1062 case 'C':
Christian Couder59556542013-11-30 20:55:40[diff] [blame]1063 if (starts_with(placeholder + 1, "(auto)")) {
Nguyễn Thái Ngọc Duya95f0672013-04-18 23:08:49[diff] [blame]1064 c->auto_color = 1;
1065 return 7; /* consumed 7 bytes, "C(auto)" */
1066 } else {
1067 int ret = parse_color(sb, placeholder, c);
1068 if (ret)
1069 c->auto_color = 0;
1070 /*
1071 * Otherwise, we decided to treat %C<unknown>
1072 * as a literal string, and the previous
1073 * %C(auto) is still valid.
1074 */
1075 return ret;
Jeff Kingc0029222009-01-17 15:38:46[diff] [blame]1076 }
René Scharfecde75e52007-11-09 00:49:42[diff] [blame]1077 case 'n': /* newline */
1078 strbuf_addch(sb, '\n');
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]1079 return 1;
Govind Salinas42c8c742008-03-21 15:05:06[diff] [blame]1080 case 'x':
1081 /* %x00 == NUL, %x0a == LF, etc. */
1082 if (0 <= (h1 = hexval_table[0xff & placeholder[1]]) &&
1083 h1 <= 16 &&
1084 0 <= (h2 = hexval_table[0xff & placeholder[2]]) &&
1085 h2 <= 16) {
1086 strbuf_addch(sb, (h1<<4)|h2);
1087 return 3;
1088 } else
1089 return 0;
René Scharfe02edd562009-10-17 21:04:19[diff] [blame]1090 case 'w':
1091 if (placeholder[1] == '(') {
1092 unsigned long width = 0, indent1 = 0, indent2 = 0;
1093 char *next;
1094 const char *start = placeholder + 2;
1095 const char *end = strchr(start, ')');
1096 if (!end)
1097 return 0;
1098 if (end > start) {
1099 width = strtoul(start, &next, 10);
1100 if (*next == ',') {
1101 indent1 = strtoul(next + 1, &next, 10);
1102 if (*next == ',') {
1103 indent2 = strtoul(next + 1,
1104 &next, 10);
1105 }
1106 }
1107 if (*next != ')')
1108 return 0;
1109 }
1110 rewrap_message_tail(sb, c, width, indent1, indent2);
1111 return end - placeholder + 1;
1112 } else
1113 return 0;
Nguyễn Thái Ngọc Duya5752342013-04-18 23:08:50[diff] [blame]1114
1115 case '<':
1116 case '>':
1117 return parse_padding_placeholder(sb, placeholder, c);
René Scharfecde75e52007-11-09 00:49:42[diff] [blame]1118 }
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1119
1120 /* these depend on the commit */
1121 if (!commit->object.parsed)
brian m. carlsoned1c9972015-11-10 02:22:29[diff] [blame]1122 parse_object(commit->object.oid.hash);
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1123
René Scharfecde75e52007-11-09 00:49:42[diff] [blame]1124 switch (placeholder[0]) {
1125 case 'H': /* commit hash */
Nguyễn Thái Ngọc Duya95f0672013-04-18 23:08:49[diff] [blame]1126 strbuf_addstr(sb, diff_get_color(c->auto_color, DIFF_COMMIT));
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]1127 strbuf_addstr(sb, oid_to_hex(&commit->object.oid));
Nguyễn Thái Ngọc Duya95f0672013-04-18 23:08:49[diff] [blame]1128 strbuf_addstr(sb, diff_get_color(c->auto_color, DIFF_RESET));
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]1129 return 1;
René Scharfecde75e52007-11-09 00:49:42[diff] [blame]1130 case 'h': /* abbreviated commit hash */
Nguyễn Thái Ngọc Duya95f0672013-04-18 23:08:49[diff] [blame]1131 strbuf_addstr(sb, diff_get_color(c->auto_color, DIFF_COMMIT));
1132 if (add_again(sb, &c->abbrev_commit_hash)) {
1133 strbuf_addstr(sb, diff_get_color(c->auto_color, DIFF_RESET));
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]1134 return 1;
Nguyễn Thái Ngọc Duya95f0672013-04-18 23:08:49[diff] [blame]1135 }
brian m. carlsoned1c9972015-11-10 02:22:29[diff] [blame]1136 strbuf_addstr(sb, find_unique_abbrev(commit->object.oid.hash,
Will Palmerc1977022010-05-04 03:18:57[diff] [blame]1137 c->pretty_ctx->abbrev));
Nguyễn Thái Ngọc Duya95f0672013-04-18 23:08:49[diff] [blame]1138 strbuf_addstr(sb, diff_get_color(c->auto_color, DIFF_RESET));
René Scharfeb9c62322007-11-10 11:18:26[diff] [blame]1139 c->abbrev_commit_hash.len = sb->len - c->abbrev_commit_hash.off;
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]1140 return 1;
René Scharfecde75e52007-11-09 00:49:42[diff] [blame]1141 case 'T': /* tree hash */
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]1142 strbuf_addstr(sb, oid_to_hex(&commit->tree->object.oid));
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]1143 return 1;
René Scharfecde75e52007-11-09 00:49:42[diff] [blame]1144 case 't': /* abbreviated tree hash */
René Scharfeb9c62322007-11-10 11:18:26[diff] [blame]1145 if (add_again(sb, &c->abbrev_tree_hash))
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]1146 return 1;
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]1147 strbuf_addstr(sb, find_unique_abbrev(commit->tree->object.oid.hash,
Will Palmerc1977022010-05-04 03:18:57[diff] [blame]1148 c->pretty_ctx->abbrev));
René Scharfeb9c62322007-11-10 11:18:26[diff] [blame]1149 c->abbrev_tree_hash.len = sb->len - c->abbrev_tree_hash.off;
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]1150 return 1;
René Scharfecde75e52007-11-09 00:49:42[diff] [blame]1151 case 'P': /* parent hashes */
1152 for (p = commit->parents; p; p = p->next) {
1153 if (p != commit->parents)
1154 strbuf_addch(sb, ' ');
brian m. carlsonf2fd0762015-11-10 02:22:28[diff] [blame]1155 strbuf_addstr(sb, oid_to_hex(&p->item->object.oid));
René Scharfecde75e52007-11-09 00:49:42[diff] [blame]1156 }
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]1157 return 1;
René Scharfecde75e52007-11-09 00:49:42[diff] [blame]1158 case 'p': /* abbreviated parent hashes */
René Scharfeb9c62322007-11-10 11:18:26[diff] [blame]1159 if (add_again(sb, &c->abbrev_parent_hashes))
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]1160 return 1;
René Scharfecde75e52007-11-09 00:49:42[diff] [blame]1161 for (p = commit->parents; p; p = p->next) {
1162 if (p != commit->parents)
1163 strbuf_addch(sb, ' ');
1164 strbuf_addstr(sb, find_unique_abbrev(
brian m. carlsoned1c9972015-11-10 02:22:29[diff] [blame]1165 p->item->object.oid.hash,
Will Palmerc1977022010-05-04 03:18:57[diff] [blame]1166 c->pretty_ctx->abbrev));
René Scharfecde75e52007-11-09 00:49:42[diff] [blame]1167 }
René Scharfeb9c62322007-11-10 11:18:26[diff] [blame]1168 c->abbrev_parent_hashes.len = sb->len -
1169 c->abbrev_parent_hashes.off;
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]1170 return 1;
René Scharfecde75e52007-11-09 00:49:42[diff] [blame]1171 case 'm': /* left/right/bottom */
Michael J Gruber1df2d652011-03-07 12:31:39[diff] [blame]1172 strbuf_addstr(sb, get_revision_mark(NULL, commit));
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]1173 return 1;
René Scharfe3b3d4432008-09-04 21:40:03[diff] [blame]1174 case 'd':
Nguyễn Thái Ngọc Duy9d3f0022013-04-18 23:08:43[diff] [blame]1175 load_ref_decorations(DECORATE_SHORT_REFS);
Nguyễn Thái Ngọc Duya95f0672013-04-18 23:08:49[diff] [blame]1176 format_decorations(sb, commit, c->auto_color);
René Scharfe3b3d4432008-09-04 21:40:03[diff] [blame]1177 return 1;
Harry Jeffery92710952014-09-18 20:53:53[diff] [blame]1178 case 'D':
1179 load_ref_decorations(DECORATE_SHORT_REFS);
1180 format_decorations_extended(sb, commit, c->auto_color, "", ", ", "");
1181 return 1;
Thomas Rast8f8f5472009-10-19 15:48:10[diff] [blame]1182 case 'g': /* reflog info */
1183 switch(placeholder[1]) {
1184 case 'd': /* reflog selector */
1185 case 'D':
1186 if (c->pretty_ctx->reflog_info)
1187 get_reflog_selector(sb,
1188 c->pretty_ctx->reflog_info,
Jeff Kinga5481a62015-06-25 16:55:02[diff] [blame]1189 &c->pretty_ctx->date_mode,
Junio C Hamano55ccf852012-05-07 21:11:32[diff] [blame]1190 c->pretty_ctx->date_mode_explicit,
Thomas Rast8f8f5472009-10-19 15:48:10[diff] [blame]1191 (placeholder[1] == 'd'));
1192 return 2;
1193 case 's': /* reflog message */
1194 if (c->pretty_ctx->reflog_info)
1195 get_reflog_message(sb, c->pretty_ctx->reflog_info);
1196 return 2;
Jeff Kingcd1957f2011-12-16 11:40:24[diff] [blame]1197 case 'n':
1198 case 'N':
1199 case 'e':
1200 case 'E':
1201 return format_reflog_person(sb,
1202 placeholder[1],
1203 c->pretty_ctx->reflog_info,
Jeff Kinga5481a62015-06-25 16:55:02[diff] [blame]1204 &c->pretty_ctx->date_mode);
Thomas Rast8f8f5472009-10-19 15:48:10[diff] [blame]1205 }
1206 return 0; /* unknown %g placeholder */
Johannes Schindelin8b208f02009-10-09 10:22:05[diff] [blame]1207 case 'N':
Junio C Hamanoddf333f2012-10-18 01:51:47[diff] [blame]1208 if (c->pretty_ctx->notes_message) {
1209 strbuf_addstr(sb, c->pretty_ctx->notes_message);
Johannes Gilger5b163602010-04-13 20:31:12[diff] [blame]1210 return 1;
1211 }
1212 return 0;
René Scharfecde75e52007-11-09 00:49:42[diff] [blame]1213 }
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1214
Junio C Hamanof6667c52011-10-22 04:06:02[diff] [blame]1215 if (placeholder[0] == 'G') {
Sebastian Götteffb6d7d2013-03-31 16:00:14[diff] [blame]1216 if (!c->signature_check.result)
1217 check_commit_signature(c->commit, &(c->signature_check));
Junio C Hamanof6667c52011-10-22 04:06:02[diff] [blame]1218 switch (placeholder[1]) {
1219 case 'G':
Sebastian Götteffb6d7d2013-03-31 16:00:14[diff] [blame]1220 if (c->signature_check.gpg_output)
1221 strbuf_addstr(sb, c->signature_check.gpg_output);
Junio C Hamanof6667c52011-10-22 04:06:02[diff] [blame]1222 break;
1223 case '?':
Sebastian Götteffb6d7d2013-03-31 16:00:14[diff] [blame]1224 switch (c->signature_check.result) {
Junio C Hamanof6667c52011-10-22 04:06:02[diff] [blame]1225 case 'G':
1226 case 'B':
Sebastian Göttee290c4b2013-03-31 16:03:22[diff] [blame]1227 case 'U':
1228 case 'N':
Sebastian Götteffb6d7d2013-03-31 16:00:14[diff] [blame]1229 strbuf_addch(sb, c->signature_check.result);
Junio C Hamanof6667c52011-10-22 04:06:02[diff] [blame]1230 }
1231 break;
1232 case 'S':
Sebastian Götteffb6d7d2013-03-31 16:00:14[diff] [blame]1233 if (c->signature_check.signer)
1234 strbuf_addstr(sb, c->signature_check.signer);
Junio C Hamanof6667c52011-10-22 04:06:02[diff] [blame]1235 break;
Michael J Gruber0174eea2013-02-14 16:04:46[diff] [blame]1236 case 'K':
Sebastian Götteffb6d7d2013-03-31 16:00:14[diff] [blame]1237 if (c->signature_check.key)
1238 strbuf_addstr(sb, c->signature_check.key);
Michael J Gruber0174eea2013-02-14 16:04:46[diff] [blame]1239 break;
Jeff Kingaa4b78d2014-06-17 00:07:07[diff] [blame]1240 default:
1241 return 0;
Junio C Hamanof6667c52011-10-22 04:06:02[diff] [blame]1242 }
1243 return 2;
1244 }
1245
1246
René Scharfecde75e52007-11-09 00:49:42[diff] [blame]1247 /* For the rest we have to parse the commit header. */
René Scharfef29d5952007-11-10 11:14:20[diff] [blame]1248 if (!c->commit_header_parsed)
1249 parse_commit_header(c);
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1250
René Scharfef29d5952007-11-10 11:14:20[diff] [blame]1251 switch (placeholder[0]) {
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]1252 case 'a': /* author ... */
1253 return format_person_part(sb, placeholder[1],
Jeff Kingd36f8672008-08-29 00:54:59[diff] [blame]1254 msg + c->author.off, c->author.len,
Jeff Kinga5481a62015-06-25 16:55:02[diff] [blame]1255 &c->pretty_ctx->date_mode);
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]1256 case 'c': /* committer ... */
1257 return format_person_part(sb, placeholder[1],
Jeff Kingd36f8672008-08-29 00:54:59[diff] [blame]1258 msg + c->committer.off, c->committer.len,
Jeff Kinga5481a62015-06-25 16:55:02[diff] [blame]1259 &c->pretty_ctx->date_mode);
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]1260 case 'e': /* encoding */
Nguyễn Thái Ngọc Duy0940a762013-04-18 23:08:41[diff] [blame]1261 if (c->commit_encoding)
1262 strbuf_addstr(sb, c->commit_encoding);
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]1263 return 1;
Eli Barzilay1367b122010-03-25 02:51:52[diff] [blame]1264 case 'B': /* raw body */
1265 /* message_off is always left at the initial newline */
1266 strbuf_addstr(sb, msg + c->message_off + 1);
1267 return 1;
René Scharfef53bd742008-12-27 00:49:21[diff] [blame]1268 }
1269
1270 /* Now we need to parse the commit message. */
1271 if (!c->commit_message_parsed)
1272 parse_commit_message(c);
1273
1274 switch (placeholder[0]) {
1275 case 's': /* subject */
1276 format_subject(sb, msg + c->subject_off, " ");
1277 return 1;
Stephen Boyd46d164b2009-03-23 02:14:01[diff] [blame]1278 case 'f': /* sanitized subject */
1279 format_sanitized_subject(sb, msg + c->subject_off);
1280 return 1;
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]1281 case 'b': /* body */
René Scharfef29d5952007-11-10 11:14:20[diff] [blame]1282 strbuf_addstr(sb, msg + c->body_off);
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]1283 return 1;
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1284 }
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]1285 return 0; /* unknown placeholder */
René Scharfecde75e52007-11-09 00:49:42[diff] [blame]1286}
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1287
Nguyễn Thái Ngọc Duya5752342013-04-18 23:08:50[diff] [blame]1288static size_t format_and_pad_commit(struct strbuf *sb, /* in UTF-8 */
1289 const char *placeholder,
1290 struct format_commit_context *c)
1291{
1292 struct strbuf local_sb = STRBUF_INIT;
1293 int total_consumed = 0, len, padding = c->padding;
1294 if (padding < 0) {
1295 const char *start = strrchr(sb->buf, '\n');
1296 int occupied;
1297 if (!start)
1298 start = sb->buf;
1299 occupied = utf8_strnwidth(start, -1, 1);
1300 padding = (-padding) - occupied;
1301 }
1302 while (1) {
1303 int modifier = *placeholder == 'C';
1304 int consumed = format_commit_one(&local_sb, placeholder, c);
1305 total_consumed += consumed;
1306
1307 if (!modifier)
1308 break;
1309
1310 placeholder += consumed;
1311 if (*placeholder != '%')
1312 break;
1313 placeholder++;
1314 total_consumed++;
1315 }
1316 len = utf8_strnwidth(local_sb.buf, -1, 1);
Nguyễn Thái Ngọc Duy16406322013-04-18 23:08:52[diff] [blame]1317
1318 if (c->flush_type == flush_left_and_steal) {
1319 const char *ch = sb->buf + sb->len - 1;
1320 while (len > padding && ch > sb->buf) {
1321 const char *p;
1322 if (*ch == ' ') {
1323 ch--;
1324 padding++;
1325 continue;
1326 }
1327 /* check for trailing ansi sequences */
1328 if (*ch != 'm')
1329 break;
1330 p = ch - 1;
1331 while (ch - p < 10 && *p != '\033')
1332 p--;
1333 if (*p != '\033' ||
1334 ch + 1 - p != display_mode_esc_sequence_len(p))
1335 break;
1336 /*
1337 * got a good ansi sequence, put it back to
1338 * local_sb as we're cutting sb
1339 */
1340 strbuf_insert(&local_sb, 0, p, ch + 1 - p);
1341 ch = p - 1;
1342 }
1343 strbuf_setlen(sb, ch + 1 - sb->buf);
1344 c->flush_type = flush_left;
1345 }
1346
Nguyễn Thái Ngọc Duya7f01c62013-04-18 23:08:51[diff] [blame]1347 if (len > padding) {
1348 switch (c->truncate) {
1349 case trunc_left:
1350 strbuf_utf8_replace(&local_sb,
1351 0, len - (padding - 2),
1352 "..");
1353 break;
1354 case trunc_middle:
1355 strbuf_utf8_replace(&local_sb,
1356 padding / 2 - 1,
1357 len - (padding - 2),
1358 "..");
1359 break;
1360 case trunc_right:
1361 strbuf_utf8_replace(&local_sb,
1362 padding - 2, len - (padding - 2),
1363 "..");
1364 break;
1365 case trunc_none:
1366 break;
1367 }
René Scharfee992d1e2014-07-10 08:52:21[diff] [blame]1368 strbuf_addbuf(sb, &local_sb);
Nguyễn Thái Ngọc Duya7f01c62013-04-18 23:08:51[diff] [blame]1369 } else {
Nguyễn Thái Ngọc Duya5752342013-04-18 23:08:50[diff] [blame]1370 int sb_len = sb->len, offset = 0;
1371 if (c->flush_type == flush_left)
1372 offset = padding - len;
1373 else if (c->flush_type == flush_both)
1374 offset = (padding - len) / 2;
1375 /*
1376 * we calculate padding in columns, now
1377 * convert it back to chars
1378 */
1379 padding = padding - len + local_sb.len;
René Scharfe415792e2014-09-07 07:06:42[diff] [blame]1380 strbuf_addchars(sb, ' ', padding);
Nguyễn Thái Ngọc Duya5752342013-04-18 23:08:50[diff] [blame]1381 memcpy(sb->buf + sb_len + offset, local_sb.buf,
1382 local_sb.len);
1383 }
1384 strbuf_release(&local_sb);
1385 c->flush_type = no_flush;
1386 return total_consumed;
1387}
1388
Nguyễn Thái Ngọc Duy7e77df32013-04-18 23:08:47[diff] [blame]1389static size_t format_commit_item(struct strbuf *sb, /* in UTF-8 */
1390 const char *placeholder,
Junio C Hamano9fa708d2009-10-05 06:43:32[diff] [blame]1391 void *context)
1392{
1393 int consumed;
1394 size_t orig_len;
1395 enum {
1396 NO_MAGIC,
1397 ADD_LF_BEFORE_NON_EMPTY,
1398 DEL_LF_BEFORE_EMPTY,
Junio C Hamano223a9232010-06-22 16:45:22[diff] [blame]1399 ADD_SP_BEFORE_NON_EMPTY
Junio C Hamano9fa708d2009-10-05 06:43:32[diff] [blame]1400 } magic = NO_MAGIC;
1401
1402 switch (placeholder[0]) {
1403 case '-':
1404 magic = DEL_LF_BEFORE_EMPTY;
1405 break;
1406 case '+':
1407 magic = ADD_LF_BEFORE_NON_EMPTY;
1408 break;
Michael J Gruber7b881762010-06-14 16:12:29[diff] [blame]1409 case ' ':
1410 magic = ADD_SP_BEFORE_NON_EMPTY;
1411 break;
Junio C Hamano9fa708d2009-10-05 06:43:32[diff] [blame]1412 default:
1413 break;
1414 }
1415 if (magic != NO_MAGIC)
1416 placeholder++;
1417
1418 orig_len = sb->len;
Nguyễn Thái Ngọc Duya5752342013-04-18 23:08:50[diff] [blame]1419 if (((struct format_commit_context *)context)->flush_type != no_flush)
1420 consumed = format_and_pad_commit(sb, placeholder, context);
1421 else
1422 consumed = format_commit_one(sb, placeholder, context);
Junio C Hamano9fa708d2009-10-05 06:43:32[diff] [blame]1423 if (magic == NO_MAGIC)
1424 return consumed;
1425
1426 if ((orig_len == sb->len) && magic == DEL_LF_BEFORE_EMPTY) {
1427 while (sb->len && sb->buf[sb->len - 1] == '\n')
1428 strbuf_setlen(sb, sb->len - 1);
Michael J Gruber7b881762010-06-14 16:12:29[diff] [blame]1429 } else if (orig_len != sb->len) {
1430 if (magic == ADD_LF_BEFORE_NON_EMPTY)
1431 strbuf_insert(sb, orig_len, "\n", 1);
1432 else if (magic == ADD_SP_BEFORE_NON_EMPTY)
1433 strbuf_insert(sb, orig_len, " ", 1);
Junio C Hamano9fa708d2009-10-05 06:43:32[diff] [blame]1434 }
1435 return consumed + 1;
1436}
1437
Johannes Gilger5b163602010-04-13 20:31:12[diff] [blame]1438static size_t userformat_want_item(struct strbuf *sb, const char *placeholder,
1439 void *context)
1440{
1441 struct userformat_want *w = context;
1442
Michael J Gruber7b881762010-06-14 16:12:29[diff] [blame]1443 if (*placeholder == '+' || *placeholder == '-' || *placeholder == ' ')
Johannes Gilger5b163602010-04-13 20:31:12[diff] [blame]1444 placeholder++;
1445
1446 switch (*placeholder) {
1447 case 'N':
1448 w->notes = 1;
1449 break;
1450 }
1451 return 0;
1452}
1453
1454void userformat_find_requirements(const char *fmt, struct userformat_want *w)
1455{
1456 struct strbuf dummy = STRBUF_INIT;
1457
1458 if (!fmt) {
1459 if (!user_format)
1460 return;
1461 fmt = user_format;
1462 }
Junio C Hamanoa6253d12011-05-25 19:23:44[diff] [blame]1463 strbuf_expand(&dummy, fmt, userformat_want_item, w);
Johannes Gilger5b163602010-04-13 20:31:12[diff] [blame]1464 strbuf_release(&dummy);
1465}
1466
René Scharfecde75e52007-11-09 00:49:42[diff] [blame]1467void format_commit_message(const struct commit *commit,
Junio C Hamano7f98ebc2009-10-16 05:59:41[diff] [blame]1468 const char *format, struct strbuf *sb,
Thomas Rastdd2e7942009-10-19 15:48:08[diff] [blame]1469 const struct pretty_print_context *pretty_ctx)
René Scharfecde75e52007-11-09 00:49:42[diff] [blame]1470{
René Scharfef29d5952007-11-10 11:14:20[diff] [blame]1471 struct format_commit_context context;
Pat Notz177b29d2010-11-02 19:59:08[diff] [blame]1472 const char *output_enc = pretty_ctx->output_encoding;
Nguyễn Thái Ngọc Duy7e77df32013-04-18 23:08:47[diff] [blame]1473 const char *utf8 = "UTF-8";
René Scharfef29d5952007-11-10 11:14:20[diff] [blame]1474
1475 memset(&context, 0, sizeof(context));
1476 context.commit = commit;
Thomas Rastdd2e7942009-10-19 15:48:08[diff] [blame]1477 context.pretty_ctx = pretty_ctx;
René Scharfe02edd562009-10-17 21:04:19[diff] [blame]1478 context.wrap_start = sb->len;
Alexey Shumkin7d509872014-05-21 13:20:07[diff] [blame]1479 /*
1480 * convert a commit message to UTF-8 first
1481 * as far as 'format_commit_item' assumes it in UTF-8
1482 */
Nguyễn Thái Ngọc Duy0940a762013-04-18 23:08:41[diff] [blame]1483 context.message = logmsg_reencode(commit,
1484 &context.commit_encoding,
Alexey Shumkin7d509872014-05-21 13:20:07[diff] [blame]1485 utf8);
Pat Notz177b29d2010-11-02 19:59:08[diff] [blame]1486
Marco Costalbac3a670d2008-02-09 14:40:19[diff] [blame]1487 strbuf_expand(sb, format, format_commit_item, &context);
René Scharfe02edd562009-10-17 21:04:19[diff] [blame]1488 rewrap_message_tail(sb, &context, 0, 0, 0);
Pat Notz177b29d2010-11-02 19:59:08[diff] [blame]1489
Alexey Shumkin7d509872014-05-21 13:20:07[diff] [blame]1490 /* then convert a commit message to an actual output encoding */
Nguyễn Thái Ngọc Duy7e77df32013-04-18 23:08:47[diff] [blame]1491 if (output_enc) {
1492 if (same_encoding(utf8, output_enc))
1493 output_enc = NULL;
1494 } else {
1495 if (context.commit_encoding &&
1496 !same_encoding(context.commit_encoding, utf8))
1497 output_enc = context.commit_encoding;
1498 }
1499
1500 if (output_enc) {
1501 int outsz;
1502 char *out = reencode_string_len(sb->buf, sb->len,
1503 output_enc, utf8, &outsz);
1504 if (out)
1505 strbuf_attach(sb, out, outsz, outsz + 1);
1506 }
1507
Nguyễn Thái Ngọc Duy0940a762013-04-18 23:08:41[diff] [blame]1508 free(context.commit_encoding);
Jeff Kingb66103c2014-06-10 21:41:39[diff] [blame]1509 unuse_commit_buffer(commit, context.message);
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1510}
1511
Jeff King10f2fbf2013-07-03 07:07:48[diff] [blame]1512static void pp_header(struct pretty_print_context *pp,
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1513 const char *encoding,
1514 const struct commit *commit,
1515 const char **msg_p,
1516 struct strbuf *sb)
1517{
1518 int parents_shown = 0;
1519
1520 for (;;) {
René Scharfee3f1da92014-10-04 18:54:50[diff] [blame]1521 const char *name, *line = *msg_p;
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1522 int linelen = get_one_line(*msg_p);
1523
1524 if (!linelen)
1525 return;
1526 *msg_p += linelen;
1527
1528 if (linelen == 1)
1529 /* End of header */
1530 return;
1531
Jeff King6bf13942011-05-26 22:27:49[diff] [blame]1532 if (pp->fmt == CMIT_FMT_RAW) {
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1533 strbuf_add(sb, line, linelen);
1534 continue;
1535 }
1536
Christian Couder59556542013-11-30 20:55:40[diff] [blame]1537 if (starts_with(line, "parent ")) {
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1538 if (linelen != 48)
1539 die("bad parent line in commit");
1540 continue;
1541 }
1542
1543 if (!parents_shown) {
René Scharfe4bbaa1e2014-07-16 23:52:09[diff] [blame]1544 unsigned num = commit_list_count(commit->parents);
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1545 /* with enough slop */
1546 strbuf_grow(sb, num * 50 + 20);
Jeff King6bf13942011-05-26 22:27:49[diff] [blame]1547 add_merge_info(pp, sb, commit);
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1548 parents_shown = 1;
1549 }
1550
1551 /*
1552 * MEDIUM == DEFAULT shows only author with dates.
1553 * FULL shows both authors but not dates.
1554 * FULLER shows both authors and dates.
1555 */
René Scharfee3f1da92014-10-04 18:54:50[diff] [blame]1556 if (skip_prefix(line, "author ", &name)) {
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1557 strbuf_grow(sb, linelen + 80);
René Scharfee3f1da92014-10-04 18:54:50[diff] [blame]1558 pp_user_info(pp, "Author", sb, name, encoding);
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1559 }
René Scharfee3f1da92014-10-04 18:54:50[diff] [blame]1560 if (skip_prefix(line, "committer ", &name) &&
Jeff King6bf13942011-05-26 22:27:49[diff] [blame]1561 (pp->fmt == CMIT_FMT_FULL || pp->fmt == CMIT_FMT_FULLER)) {
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1562 strbuf_grow(sb, linelen + 80);
René Scharfee3f1da92014-10-04 18:54:50[diff] [blame]1563 pp_user_info(pp, "Commit", sb, name, encoding);
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1564 }
1565 }
1566}
1567
Jeff King10f2fbf2013-07-03 07:07:48[diff] [blame]1568void pp_title_line(struct pretty_print_context *pp,
Daniel Barkalowb02bd652008-02-19 03:56:08[diff] [blame]1569 const char **msg_p,
1570 struct strbuf *sb,
Daniel Barkalowb02bd652008-02-19 03:56:08[diff] [blame]1571 const char *encoding,
Junio C Hamano267123b2008-03-15 07:09:20[diff] [blame]1572 int need_8bit_cte)
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1573{
Jan H. Schönherr41dd00b2012-10-18 14:43:33[diff] [blame]1574 static const int max_length = 78; /* per rfc2047 */
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1575 struct strbuf title;
1576
1577 strbuf_init(&title, 80);
Jeff King9553d2b2011-05-26 22:28:17[diff] [blame]1578 *msg_p = format_subject(&title, *msg_p,
1579 pp->preserve_subject ? "\n" : " ");
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1580
1581 strbuf_grow(sb, title.len + 1024);
Jeff King6bf13942011-05-26 22:27:49[diff] [blame]1582 if (pp->subject) {
1583 strbuf_addstr(sb, pp->subject);
Jan H. Schönherr41dd00b2012-10-18 14:43:33[diff] [blame]1584 if (needs_rfc2047_encoding(title.buf, title.len, RFC2047_SUBJECT))
1585 add_rfc2047(sb, title.buf, title.len,
1586 encoding, RFC2047_SUBJECT);
1587 else
1588 strbuf_add_wrapped_bytes(sb, title.buf, title.len,
1589 -last_line_length(sb), 1, max_length);
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1590 } else {
1591 strbuf_addbuf(sb, &title);
1592 }
1593 strbuf_addch(sb, '\n');
1594
Jeff Kinga9080472013-07-03 07:08:22[diff] [blame]1595 if (need_8bit_cte == 0) {
1596 int i;
1597 for (i = 0; i < pp->in_body_headers.nr; i++) {
1598 if (has_non_ascii(pp->in_body_headers.items[i].string)) {
1599 need_8bit_cte = 1;
1600 break;
1601 }
1602 }
1603 }
1604
Junio C Hamano6bf4f1b2008-03-15 00:10:09[diff] [blame]1605 if (need_8bit_cte > 0) {
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1606 const char *header_fmt =
1607 "MIME-Version: 1.0\n"
1608 "Content-Type: text/plain; charset=%s\n"
1609 "Content-Transfer-Encoding: 8bit\n";
1610 strbuf_addf(sb, header_fmt, encoding);
1611 }
Jeff King6bf13942011-05-26 22:27:49[diff] [blame]1612 if (pp->after_subject) {
1613 strbuf_addstr(sb, pp->after_subject);
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1614 }
Jeff King6bf13942011-05-26 22:27:49[diff] [blame]1615 if (pp->fmt == CMIT_FMT_EMAIL) {
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1616 strbuf_addch(sb, '\n');
1617 }
Jeff Kinga9080472013-07-03 07:08:22[diff] [blame]1618
1619 if (pp->in_body_headers.nr) {
1620 int i;
1621 for (i = 0; i < pp->in_body_headers.nr; i++) {
1622 strbuf_addstr(sb, pp->in_body_headers.items[i].string);
1623 free(pp->in_body_headers.items[i].string);
1624 }
1625 string_list_clear(&pp->in_body_headers, 0);
1626 strbuf_addch(sb, '\n');
1627 }
1628
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1629 strbuf_release(&title);
1630}
1631
Jeff King10f2fbf2013-07-03 07:07:48[diff] [blame]1632void pp_remainder(struct pretty_print_context *pp,
Daniel Barkalowb02bd652008-02-19 03:56:08[diff] [blame]1633 const char **msg_p,
1634 struct strbuf *sb,
1635 int indent)
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1636{
1637 int first = 1;
1638 for (;;) {
1639 const char *line = *msg_p;
1640 int linelen = get_one_line(line);
1641 *msg_p += linelen;
1642
1643 if (!linelen)
1644 break;
1645
1646 if (is_empty_line(line, &linelen)) {
1647 if (first)
1648 continue;
Jeff King6bf13942011-05-26 22:27:49[diff] [blame]1649 if (pp->fmt == CMIT_FMT_SHORT)
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1650 break;
1651 }
1652 first = 0;
1653
1654 strbuf_grow(sb, linelen + indent + 20);
René Scharfe415792e2014-09-07 07:06:42[diff] [blame]1655 if (indent)
1656 strbuf_addchars(sb, ' ', indent);
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1657 strbuf_add(sb, line, linelen);
1658 strbuf_addch(sb, '\n');
1659 }
1660}
1661
Jeff King10f2fbf2013-07-03 07:07:48[diff] [blame]1662void pretty_print_commit(struct pretty_print_context *pp,
Jeff King6bf13942011-05-26 22:27:49[diff] [blame]1663 const struct commit *commit,
1664 struct strbuf *sb)
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1665{
1666 unsigned long beginning_of_body;
1667 int indent = 4;
Jeff Kingdd0d3882013-01-26 09:44:06[diff] [blame]1668 const char *msg;
Jeff Kingb000c592014-06-10 21:39:30[diff] [blame]1669 const char *reencoded;
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1670 const char *encoding;
Jeff King6bf13942011-05-26 22:27:49[diff] [blame]1671 int need_8bit_cte = pp->need_8bit_cte;
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1672
Jeff King6bf13942011-05-26 22:27:49[diff] [blame]1673 if (pp->fmt == CMIT_FMT_USERFORMAT) {
1674 format_commit_message(commit, user_format, sb, pp);
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1675 return;
1676 }
1677
Junio C Hamanoe297cf52012-10-18 00:12:55[diff] [blame]1678 encoding = get_log_output_encoding();
Nguyễn Thái Ngọc Duy5a10d232013-04-18 23:08:40[diff] [blame]1679 msg = reencoded = logmsg_reencode(commit, NULL, encoding);
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1680
Jeff King6bf13942011-05-26 22:27:49[diff] [blame]1681 if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL)
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1682 indent = 0;
1683
Junio C Hamano6bf4f1b2008-03-15 00:10:09[diff] [blame]1684 /*
1685 * We need to check and emit Content-type: to mark it
1686 * as 8-bit if we haven't done so.
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1687 */
Jeff King6bf13942011-05-26 22:27:49[diff] [blame]1688 if (pp->fmt == CMIT_FMT_EMAIL && need_8bit_cte == 0) {
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1689 int i, ch, in_body;
1690
1691 for (in_body = i = 0; (ch = msg[i]); i++) {
1692 if (!in_body) {
1693 /* author could be non 7-bit ASCII but
1694 * the log may be so; skip over the
1695 * header part first.
1696 */
1697 if (ch == '\n' && msg[i+1] == '\n')
1698 in_body = 1;
1699 }
1700 else if (non_ascii(ch)) {
Junio C Hamano6bf4f1b2008-03-15 00:10:09[diff] [blame]1701 need_8bit_cte = 1;
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1702 break;
1703 }
1704 }
1705 }
1706
Jeff King6bf13942011-05-26 22:27:49[diff] [blame]1707 pp_header(pp, encoding, commit, &msg, sb);
1708 if (pp->fmt != CMIT_FMT_ONELINE && !pp->subject) {
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1709 strbuf_addch(sb, '\n');
1710 }
1711
1712 /* Skip excess blank lines at the beginning of body, if any... */
René Scharfea0109662008-12-27 00:32:49[diff] [blame]1713 msg = skip_empty_lines(msg);
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1714
1715 /* These formats treat the title line specially. */
Jeff King6bf13942011-05-26 22:27:49[diff] [blame]1716 if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL)
1717 pp_title_line(pp, &msg, sb, encoding, need_8bit_cte);
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1718
1719 beginning_of_body = sb->len;
Jeff King6bf13942011-05-26 22:27:49[diff] [blame]1720 if (pp->fmt != CMIT_FMT_ONELINE)
1721 pp_remainder(pp, &msg, sb, indent);
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1722 strbuf_rtrim(sb);
1723
1724 /* Make sure there is an EOLN for the non-oneline case */
Jeff King6bf13942011-05-26 22:27:49[diff] [blame]1725 if (pp->fmt != CMIT_FMT_ONELINE)
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1726 strbuf_addch(sb, '\n');
1727
1728 /*
1729 * The caller may append additional body text in e-mail
1730 * format. Make sure we did not strip the blank line
1731 * between the header and the body.
1732 */
Jeff King6bf13942011-05-26 22:27:49[diff] [blame]1733 if (pp->fmt == CMIT_FMT_EMAIL && sb->len <= beginning_of_body)
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1734 strbuf_addch(sb, '\n');
Johannes Schindelina97a7462009-10-09 10:21:57[diff] [blame]1735
Jeff Kingb66103c2014-06-10 21:41:39[diff] [blame]1736 unuse_commit_buffer(commit, reencoded);
Johannes Schindelin93fc05e2007-11-04 19:15:06[diff] [blame]1737}
Jeff King8b8a5372011-05-26 22:27:24[diff] [blame]1738
1739void pp_commit_easy(enum cmit_fmt fmt, const struct commit *commit,
1740 struct strbuf *sb)
1741{
1742 struct pretty_print_context pp = {0};
Jeff King6bf13942011-05-26 22:27:49[diff] [blame]1743 pp.fmt = fmt;
1744 pretty_print_commit(&pp, commit, sb);
Jeff King8b8a5372011-05-26 22:27:24[diff] [blame]1745}