]>
Commit | Line | Data |
---|---|---|
93fc05eb JS |
1 | #include "cache.h" |
2 | #include "commit.h" | |
93fc05eb JS |
3 | #include "utf8.h" |
4 | #include "diff.h" | |
5 | #include "revision.h" | |
c455c87c | 6 | #include "string-list.h" |
e0cbc397 | 7 | #include "mailmap.h" |
3b3d443f | 8 | #include "log-tree.h" |
a97a7468 | 9 | #include "notes.h" |
c002922a | 10 | #include "color.h" |
8f8f5476 | 11 | #include "reflog-walk.h" |
f6667c5e | 12 | #include "gpg-interface.h" |
93fc05eb | 13 | |
93fc05eb | 14 | static char *user_format; |
40957891 WP |
15 | static struct cmt_fmt_map { |
16 | const char *name; | |
17 | enum cmit_fmt format; | |
18 | int is_tformat; | |
2d7671ef WP |
19 | int is_alias; |
20 | const char *user_format; | |
40957891 | 21 | } *commit_formats; |
8028184e | 22 | static size_t builtin_formats_len; |
40957891 | 23 | static size_t commit_formats_len; |
8028184e | 24 | static size_t commit_formats_alloc; |
40957891 | 25 | static struct cmt_fmt_map *find_commit_format(const char *sought); |
93fc05eb | 26 | |
36407548 NS |
27 | static void save_user_format(struct rev_info *rev, const char *cp, int is_tformat) |
28 | { | |
29 | free(user_format); | |
30 | user_format = xstrdup(cp); | |
31 | if (is_tformat) | |
32 | rev->use_terminator = 1; | |
33 | rev->commit_format = CMIT_FMT_USERFORMAT; | |
34 | } | |
35 | ||
8028184e | 36 | static int git_pretty_formats_config(const char *var, const char *value, void *cb) |
93fc05eb | 37 | { |
8028184e WP |
38 | struct cmt_fmt_map *commit_format = NULL; |
39 | const char *name; | |
40 | const char *fmt; | |
93fc05eb | 41 | int i; |
8028184e WP |
42 | |
43 | if (prefixcmp(var, "pretty.")) | |
44 | return 0; | |
45 | ||
46 | name = var + strlen("pretty."); | |
47 | for (i = 0; i < builtin_formats_len; i++) { | |
48 | if (!strcmp(commit_formats[i].name, name)) | |
49 | return 0; | |
50 | } | |
51 | ||
52 | for (i = builtin_formats_len; i < commit_formats_len; i++) { | |
53 | if (!strcmp(commit_formats[i].name, name)) { | |
54 | commit_format = &commit_formats[i]; | |
55 | break; | |
56 | } | |
57 | } | |
58 | ||
59 | if (!commit_format) { | |
60 | ALLOC_GROW(commit_formats, commit_formats_len+1, | |
61 | commit_formats_alloc); | |
62 | commit_format = &commit_formats[commit_formats_len]; | |
95a2618f | 63 | memset(commit_format, 0, sizeof(*commit_format)); |
8028184e WP |
64 | commit_formats_len++; |
65 | } | |
66 | ||
67 | commit_format->name = xstrdup(name); | |
68 | commit_format->format = CMIT_FMT_USERFORMAT; | |
69 | git_config_string(&fmt, var, value); | |
70 | if (!prefixcmp(fmt, "format:") || !prefixcmp(fmt, "tformat:")) { | |
71 | commit_format->is_tformat = fmt[0] == 't'; | |
72 | fmt = strchr(fmt, ':') + 1; | |
73 | } else if (strchr(fmt, '%')) | |
74 | commit_format->is_tformat = 1; | |
75 | else | |
76 | commit_format->is_alias = 1; | |
77 | commit_format->user_format = fmt; | |
78 | ||
79 | return 0; | |
80 | } | |
81 | ||
40957891 | 82 | static void setup_commit_formats(void) |
93fc05eb | 83 | { |
40957891 WP |
84 | struct cmt_fmt_map builtin_formats[] = { |
85 | { "raw", CMIT_FMT_RAW, 0 }, | |
86 | { "medium", CMIT_FMT_MEDIUM, 0 }, | |
87 | { "short", CMIT_FMT_SHORT, 0 }, | |
88 | { "email", CMIT_FMT_EMAIL, 0 }, | |
89 | { "fuller", CMIT_FMT_FULLER, 0 }, | |
90 | { "full", CMIT_FMT_FULL, 0 }, | |
91 | { "oneline", CMIT_FMT_ONELINE, 1 } | |
4da45bef | 92 | }; |
40957891 | 93 | commit_formats_len = ARRAY_SIZE(builtin_formats); |
8028184e WP |
94 | builtin_formats_len = commit_formats_len; |
95 | ALLOC_GROW(commit_formats, commit_formats_len, commit_formats_alloc); | |
40957891 WP |
96 | memcpy(commit_formats, builtin_formats, |
97 | sizeof(*builtin_formats)*ARRAY_SIZE(builtin_formats)); | |
8028184e WP |
98 | |
99 | git_config(git_pretty_formats_config, NULL); | |
40957891 WP |
100 | } |
101 | ||
2d7671ef WP |
102 | static struct cmt_fmt_map *find_commit_format_recursive(const char *sought, |
103 | const char *original, | |
104 | int num_redirections) | |
40957891 WP |
105 | { |
106 | struct cmt_fmt_map *found = NULL; | |
107 | size_t found_match_len = 0; | |
108 | int i; | |
109 | ||
2d7671ef WP |
110 | if (num_redirections >= commit_formats_len) |
111 | die("invalid --pretty format: " | |
112 | "'%s' references an alias which points to itself", | |
113 | original); | |
40957891 WP |
114 | |
115 | for (i = 0; i < commit_formats_len; i++) { | |
116 | size_t match_len; | |
117 | ||
118 | if (prefixcmp(commit_formats[i].name, sought)) | |
119 | continue; | |
120 | ||
121 | match_len = strlen(commit_formats[i].name); | |
122 | if (found == NULL || found_match_len > match_len) { | |
123 | found = &commit_formats[i]; | |
124 | found_match_len = match_len; | |
125 | } | |
126 | } | |
2d7671ef WP |
127 | |
128 | if (found && found->is_alias) { | |
129 | found = find_commit_format_recursive(found->user_format, | |
130 | original, | |
131 | num_redirections+1); | |
132 | } | |
133 | ||
40957891 WP |
134 | return found; |
135 | } | |
136 | ||
2d7671ef WP |
137 | static struct cmt_fmt_map *find_commit_format(const char *sought) |
138 | { | |
139 | if (!commit_formats) | |
140 | setup_commit_formats(); | |
141 | ||
142 | return find_commit_format_recursive(sought, sought, 0); | |
143 | } | |
144 | ||
40957891 WP |
145 | void get_commit_format(const char *arg, struct rev_info *rev) |
146 | { | |
147 | struct cmt_fmt_map *commit_format; | |
93fc05eb | 148 | |
4da45bef JH |
149 | rev->use_terminator = 0; |
150 | if (!arg || !*arg) { | |
151 | rev->commit_format = CMIT_FMT_DEFAULT; | |
152 | return; | |
153 | } | |
4da45bef | 154 | if (!prefixcmp(arg, "format:") || !prefixcmp(arg, "tformat:")) { |
36407548 | 155 | save_user_format(rev, strchr(arg, ':') + 1, arg[0] == 't'); |
4da45bef | 156 | return; |
93fc05eb | 157 | } |
40957891 | 158 | |
36407548 NS |
159 | if (strchr(arg, '%')) { |
160 | save_user_format(rev, arg, 1); | |
161 | return; | |
162 | } | |
93fc05eb | 163 | |
40957891 WP |
164 | commit_format = find_commit_format(arg); |
165 | if (!commit_format) | |
166 | die("invalid --pretty format: %s", arg); | |
167 | ||
168 | rev->commit_format = commit_format->format; | |
169 | rev->use_terminator = commit_format->is_tformat; | |
8028184e WP |
170 | if (commit_format->format == CMIT_FMT_USERFORMAT) { |
171 | save_user_format(rev, commit_format->user_format, | |
172 | commit_format->is_tformat); | |
173 | } | |
93fc05eb JS |
174 | } |
175 | ||
176 | /* | |
177 | * Generic support for pretty-printing the header | |
178 | */ | |
179 | static int get_one_line(const char *msg) | |
180 | { | |
181 | int ret = 0; | |
182 | ||
183 | for (;;) { | |
184 | char c = *msg++; | |
185 | if (!c) | |
186 | break; | |
187 | ret++; | |
188 | if (c == '\n') | |
189 | break; | |
190 | } | |
191 | return ret; | |
192 | } | |
193 | ||
194 | /* High bit set, or ISO-2022-INT */ | |
cc571142 | 195 | static int non_ascii(int ch) |
93fc05eb | 196 | { |
c2e9364a | 197 | return !isascii(ch) || ch == '\033'; |
93fc05eb JS |
198 | } |
199 | ||
28e9cf65 JS |
200 | int has_non_ascii(const char *s) |
201 | { | |
202 | int ch; | |
203 | if (!s) | |
204 | return 0; | |
205 | while ((ch = *s++) != '\0') { | |
206 | if (non_ascii(ch)) | |
207 | return 1; | |
208 | } | |
209 | return 0; | |
210 | } | |
211 | ||
4d03c18a JK |
212 | static int is_rfc822_special(char ch) |
213 | { | |
214 | switch (ch) { | |
215 | case '(': | |
216 | case ')': | |
217 | case '<': | |
218 | case '>': | |
219 | case '[': | |
220 | case ']': | |
221 | case ':': | |
222 | case ';': | |
223 | case '@': | |
224 | case ',': | |
225 | case '.': | |
226 | case '"': | |
227 | case '\\': | |
228 | return 1; | |
229 | default: | |
230 | return 0; | |
231 | } | |
232 | } | |
233 | ||
41dd00ba | 234 | static int needs_rfc822_quoting(const char *s, int len) |
4d03c18a JK |
235 | { |
236 | int i; | |
237 | for (i = 0; i < len; i++) | |
238 | if (is_rfc822_special(s[i])) | |
239 | return 1; | |
240 | return 0; | |
241 | } | |
242 | ||
f9b7204b JS |
243 | static int last_line_length(struct strbuf *sb) |
244 | { | |
245 | int i; | |
246 | ||
247 | /* How many bytes are already used on the last line? */ | |
248 | for (i = sb->len - 1; i >= 0; i--) | |
249 | if (sb->buf[i] == '\n') | |
250 | break; | |
251 | return sb->len - (i + 1); | |
252 | } | |
253 | ||
4d03c18a JK |
254 | static void add_rfc822_quoted(struct strbuf *out, const char *s, int len) |
255 | { | |
256 | int i; | |
257 | ||
258 | /* just a guess, we may have to also backslash-quote */ | |
259 | strbuf_grow(out, len + 2); | |
260 | ||
261 | strbuf_addch(out, '"'); | |
262 | for (i = 0; i < len; i++) { | |
263 | switch (s[i]) { | |
264 | case '"': | |
265 | case '\\': | |
266 | strbuf_addch(out, '\\'); | |
267 | /* fall through */ | |
268 | default: | |
269 | strbuf_addch(out, s[i]); | |
270 | } | |
271 | } | |
272 | strbuf_addch(out, '"'); | |
273 | } | |
274 | ||
0fcec2ce JS |
275 | enum rfc2047_type { |
276 | RFC2047_SUBJECT, | |
277 | RFC2047_ADDRESS, | |
278 | }; | |
279 | ||
280 | static int is_rfc2047_special(char ch, enum rfc2047_type type) | |
93fc05eb | 281 | { |
0fcec2ce JS |
282 | /* |
283 | * rfc2047, section 4.2: | |
284 | * | |
285 | * 8-bit values which correspond to printable ASCII characters other | |
286 | * than "=", "?", and "_" (underscore), MAY be represented as those | |
287 | * characters. (But see section 5 for restrictions.) In | |
288 | * particular, SPACE and TAB MUST NOT be represented as themselves | |
289 | * within encoded words. | |
290 | */ | |
291 | ||
292 | /* | |
293 | * rule out non-ASCII characters and non-printable characters (the | |
294 | * non-ASCII check should be redundant as isprint() is not localized | |
295 | * and only knows about ASCII, but be defensive about that) | |
296 | */ | |
297 | if (non_ascii(ch) || !isprint(ch)) | |
298 | return 1; | |
299 | ||
300 | /* | |
301 | * rule out special printable characters (' ' should be the only | |
302 | * whitespace character considered printable, but be defensive and use | |
303 | * isspace()) | |
304 | */ | |
305 | if (isspace(ch) || ch == '=' || ch == '?' || ch == '_') | |
94f6cdf6 JS |
306 | return 1; |
307 | ||
0fcec2ce JS |
308 | /* |
309 | * rfc2047, section 5.3: | |
310 | * | |
311 | * As a replacement for a 'word' entity within a 'phrase', for example, | |
312 | * one that precedes an address in a From, To, or Cc header. The ABNF | |
313 | * definition for 'phrase' from RFC 822 thus becomes: | |
314 | * | |
315 | * phrase = 1*( encoded-word / word ) | |
316 | * | |
317 | * In this case the set of characters that may be used in a "Q"-encoded | |
318 | * 'encoded-word' is restricted to: <upper and lower case ASCII | |
319 | * letters, decimal digits, "!", "*", "+", "-", "/", "=", and "_" | |
320 | * (underscore, ASCII 95.)>. An 'encoded-word' that appears within a | |
321 | * 'phrase' MUST be separated from any adjacent 'word', 'text' or | |
322 | * 'special' by 'linear-white-space'. | |
323 | */ | |
324 | ||
325 | if (type != RFC2047_ADDRESS) | |
326 | return 0; | |
327 | ||
328 | /* '=' and '_' are special cases and have been checked above */ | |
329 | return !(isalnum(ch) || ch == '!' || ch == '*' || ch == '+' || ch == '-' || ch == '/'); | |
93fc05eb JS |
330 | } |
331 | ||
41dd00ba JS |
332 | static int needs_rfc2047_encoding(const char *line, int len, |
333 | enum rfc2047_type type) | |
93fc05eb | 334 | { |
a1f6baa5 | 335 | int i; |
93fc05eb JS |
336 | |
337 | for (i = 0; i < len; i++) { | |
338 | int ch = line[i]; | |
c22e7de3 | 339 | if (non_ascii(ch) || ch == '\n') |
41dd00ba | 340 | return 1; |
93fc05eb | 341 | if ((i + 1 < len) && (ch == '=' && line[i+1] == '?')) |
41dd00ba | 342 | return 1; |
93fc05eb | 343 | } |
93fc05eb | 344 | |
41dd00ba JS |
345 | return 0; |
346 | } | |
347 | ||
348 | static void add_rfc2047(struct strbuf *sb, const char *line, int len, | |
349 | const char *encoding, enum rfc2047_type type) | |
350 | { | |
351 | static const int max_encoded_length = 76; /* per rfc2047 */ | |
352 | int i; | |
353 | int line_len = last_line_length(sb); | |
354 | ||
93fc05eb JS |
355 | strbuf_grow(sb, len * 3 + strlen(encoding) + 100); |
356 | strbuf_addf(sb, "=?%s?q?", encoding); | |
a1f6baa5 JK |
357 | line_len += strlen(encoding) + 5; /* 5 for =??q? */ |
358 | for (i = 0; i < len; i++) { | |
93fc05eb | 359 | unsigned ch = line[i] & 0xFF; |
0fcec2ce | 360 | int is_special = is_rfc2047_special(ch, type); |
94f6cdf6 JS |
361 | |
362 | /* | |
363 | * According to RFC 2047, we could encode the special character | |
364 | * ' ' (space) with '_' (underscore) for readability. But many | |
365 | * programs do not understand this and just leave the | |
366 | * underscore in place. Thus, we do nothing special here, which | |
367 | * causes ' ' to be encoded as '=20', avoiding this problem. | |
368 | */ | |
a1f6baa5 | 369 | |
94f6cdf6 | 370 | if (line_len + 2 + (is_special ? 3 : 1) > max_encoded_length) { |
a1f6baa5 JK |
371 | strbuf_addf(sb, "?=\n =?%s?q?", encoding); |
372 | line_len = strlen(encoding) + 5 + 1; /* =??q? plus SP */ | |
373 | } | |
374 | ||
94f6cdf6 | 375 | if (is_special) { |
93fc05eb | 376 | strbuf_addf(sb, "=%02X", ch); |
a1f6baa5 | 377 | line_len += 3; |
94f6cdf6 | 378 | } else { |
a1f6baa5 JK |
379 | strbuf_addch(sb, ch); |
380 | line_len++; | |
93fc05eb JS |
381 | } |
382 | } | |
93fc05eb JS |
383 | strbuf_addstr(sb, "?="); |
384 | } | |
385 | ||
6bf13944 JK |
386 | void pp_user_info(const struct pretty_print_context *pp, |
387 | const char *what, struct strbuf *sb, | |
388 | const char *line, const char *encoding) | |
93fc05eb | 389 | { |
dffd325f AP |
390 | struct strbuf name; |
391 | struct strbuf mail; | |
3c020bd5 | 392 | struct ident_split ident; |
dffd325f | 393 | int linelen; |
3c020bd5 | 394 | char *line_end, *date; |
dffd325f AP |
395 | const char *mailbuf, *namebuf; |
396 | size_t namelen, maillen; | |
41dd00ba | 397 | int max_length = 78; /* per rfc2822 */ |
93fc05eb JS |
398 | unsigned long time; |
399 | int tz; | |
93fc05eb | 400 | |
6bf13944 | 401 | if (pp->fmt == CMIT_FMT_ONELINE) |
93fc05eb | 402 | return; |
3c020bd5 AP |
403 | |
404 | line_end = strchr(line, '\n'); | |
405 | if (!line_end) { | |
406 | line_end = strchr(line, '\0'); | |
407 | if (!line_end) | |
408 | return; | |
409 | } | |
410 | ||
411 | linelen = ++line_end - line; | |
412 | if (split_ident_line(&ident, line, linelen)) | |
93fc05eb | 413 | return; |
3c020bd5 | 414 | |
dffd325f AP |
415 | |
416 | mailbuf = ident.mail_begin; | |
417 | maillen = ident.mail_end - ident.mail_begin; | |
418 | namebuf = ident.name_begin; | |
419 | namelen = ident.name_end - ident.name_begin; | |
420 | ||
421 | if (pp->mailmap) | |
422 | map_user(pp->mailmap, &mailbuf, &maillen, &namebuf, &namelen); | |
423 | ||
424 | strbuf_init(&mail, 0); | |
425 | strbuf_init(&name, 0); | |
426 | ||
427 | strbuf_add(&mail, mailbuf, maillen); | |
428 | strbuf_add(&name, namebuf, namelen); | |
429 | ||
430 | namelen = name.len + mail.len + 3; /* ' ' + '<' + '>' */ | |
3c020bd5 | 431 | time = strtoul(ident.date_begin, &date, 10); |
93fc05eb JS |
432 | tz = strtol(date, NULL, 10); |
433 | ||
6bf13944 | 434 | if (pp->fmt == CMIT_FMT_EMAIL) { |
93fc05eb | 435 | strbuf_addstr(sb, "From: "); |
dffd325f AP |
436 | if (needs_rfc2047_encoding(name.buf, name.len, RFC2047_ADDRESS)) { |
437 | add_rfc2047(sb, name.buf, name.len, | |
438 | encoding, RFC2047_ADDRESS); | |
41dd00ba | 439 | max_length = 76; /* per rfc2047 */ |
dffd325f | 440 | } else if (needs_rfc822_quoting(name.buf, name.len)) { |
4d03c18a | 441 | struct strbuf quoted = STRBUF_INIT; |
dffd325f | 442 | add_rfc822_quoted("ed, name.buf, name.len); |
41dd00ba JS |
443 | strbuf_add_wrapped_bytes(sb, quoted.buf, quoted.len, |
444 | -6, 1, max_length); | |
4d03c18a | 445 | strbuf_release("ed); |
41dd00ba | 446 | } else { |
dffd325f AP |
447 | strbuf_add_wrapped_bytes(sb, name.buf, name.len, |
448 | -6, 1, max_length); | |
4d03c18a | 449 | } |
dffd325f | 450 | if (namelen - name.len + last_line_length(sb) > max_length) |
990f6e30 | 451 | strbuf_addch(sb, '\n'); |
dffd325f AP |
452 | |
453 | strbuf_addf(sb, " <%s>\n", mail.buf); | |
93fc05eb | 454 | } else { |
dffd325f | 455 | strbuf_addf(sb, "%s: %.*s%s <%s>\n", what, |
6bf13944 | 456 | (pp->fmt == CMIT_FMT_FULLER) ? 4 : 0, |
dffd325f | 457 | " ", name.buf, mail.buf); |
93fc05eb | 458 | } |
dffd325f AP |
459 | |
460 | strbuf_release(&mail); | |
461 | strbuf_release(&name); | |
462 | ||
6bf13944 | 463 | switch (pp->fmt) { |
93fc05eb | 464 | case CMIT_FMT_MEDIUM: |
6bf13944 | 465 | strbuf_addf(sb, "Date: %s\n", show_date(time, tz, pp->date_mode)); |
93fc05eb JS |
466 | break; |
467 | case CMIT_FMT_EMAIL: | |
468 | strbuf_addf(sb, "Date: %s\n", show_date(time, tz, DATE_RFC2822)); | |
469 | break; | |
470 | case CMIT_FMT_FULLER: | |
6bf13944 | 471 | strbuf_addf(sb, "%sDate: %s\n", what, show_date(time, tz, pp->date_mode)); |
93fc05eb JS |
472 | break; |
473 | default: | |
474 | /* notin' */ | |
475 | break; | |
476 | } | |
477 | } | |
478 | ||
479 | static int is_empty_line(const char *line, int *len_p) | |
480 | { | |
481 | int len = *len_p; | |
482 | while (len && isspace(line[len-1])) | |
483 | len--; | |
484 | *len_p = len; | |
485 | return !len; | |
486 | } | |
487 | ||
a0109668 RS |
488 | static const char *skip_empty_lines(const char *msg) |
489 | { | |
490 | for (;;) { | |
491 | int linelen = get_one_line(msg); | |
492 | int ll = linelen; | |
493 | if (!linelen) | |
494 | break; | |
495 | if (!is_empty_line(msg, &ll)) | |
496 | break; | |
497 | msg += linelen; | |
498 | } | |
499 | return msg; | |
500 | } | |
501 | ||
6bf13944 JK |
502 | static void add_merge_info(const struct pretty_print_context *pp, |
503 | struct strbuf *sb, const struct commit *commit) | |
93fc05eb JS |
504 | { |
505 | struct commit_list *parent = commit->parents; | |
506 | ||
6bf13944 | 507 | if ((pp->fmt == CMIT_FMT_ONELINE) || (pp->fmt == CMIT_FMT_EMAIL) || |
93fc05eb JS |
508 | !parent || !parent->next) |
509 | return; | |
510 | ||
511 | strbuf_addstr(sb, "Merge:"); | |
512 | ||
513 | while (parent) { | |
514 | struct commit *p = parent->item; | |
515 | const char *hex = NULL; | |
6bf13944 JK |
516 | if (pp->abbrev) |
517 | hex = find_unique_abbrev(p->object.sha1, pp->abbrev); | |
93fc05eb JS |
518 | if (!hex) |
519 | hex = sha1_to_hex(p->object.sha1); | |
93fc05eb JS |
520 | parent = parent->next; |
521 | ||
7fcda920 | 522 | strbuf_addf(sb, " %s", hex); |
93fc05eb JS |
523 | } |
524 | strbuf_addch(sb, '\n'); | |
525 | } | |
526 | ||
527 | static char *get_header(const struct commit *commit, const char *key) | |
528 | { | |
529 | int key_len = strlen(key); | |
530 | const char *line = commit->buffer; | |
531 | ||
a9c7a8a8 | 532 | while (line) { |
93fc05eb JS |
533 | const char *eol = strchr(line, '\n'), *next; |
534 | ||
535 | if (line == eol) | |
536 | return NULL; | |
537 | if (!eol) { | |
a9c7a8a8 JK |
538 | warning("malformed commit (header is missing newline): %s", |
539 | sha1_to_hex(commit->object.sha1)); | |
93fc05eb JS |
540 | eol = line + strlen(line); |
541 | next = NULL; | |
542 | } else | |
543 | next = eol + 1; | |
544 | if (eol - line > key_len && | |
545 | !strncmp(line, key, key_len) && | |
546 | line[key_len] == ' ') { | |
547 | return xmemdupz(line + key_len + 1, eol - line - key_len - 1); | |
548 | } | |
549 | line = next; | |
550 | } | |
a9c7a8a8 | 551 | return NULL; |
93fc05eb JS |
552 | } |
553 | ||
554 | static char *replace_encoding_header(char *buf, const char *encoding) | |
555 | { | |
f285a2d7 | 556 | struct strbuf tmp = STRBUF_INIT; |
93fc05eb JS |
557 | size_t start, len; |
558 | char *cp = buf; | |
559 | ||
560 | /* guess if there is an encoding header before a \n\n */ | |
561 | while (strncmp(cp, "encoding ", strlen("encoding "))) { | |
562 | cp = strchr(cp, '\n'); | |
563 | if (!cp || *++cp == '\n') | |
564 | return buf; | |
565 | } | |
566 | start = cp - buf; | |
567 | cp = strchr(cp, '\n'); | |
568 | if (!cp) | |
569 | return buf; /* should not happen but be defensive */ | |
570 | len = cp + 1 - (buf + start); | |
571 | ||
93fc05eb JS |
572 | strbuf_attach(&tmp, buf, strlen(buf), strlen(buf) + 1); |
573 | if (is_encoding_utf8(encoding)) { | |
574 | /* we have re-coded to UTF-8; drop the header */ | |
575 | strbuf_remove(&tmp, start, len); | |
576 | } else { | |
577 | /* just replaces XXXX in 'encoding XXXX\n' */ | |
578 | strbuf_splice(&tmp, start + strlen("encoding "), | |
579 | len - strlen("encoding \n"), | |
580 | encoding, strlen(encoding)); | |
581 | } | |
582 | return strbuf_detach(&tmp, NULL); | |
583 | } | |
584 | ||
177b29dc PN |
585 | char *logmsg_reencode(const struct commit *commit, |
586 | const char *output_encoding) | |
93fc05eb | 587 | { |
330db18c | 588 | static const char *utf8 = "UTF-8"; |
93fc05eb JS |
589 | const char *use_encoding; |
590 | char *encoding; | |
591 | char *out; | |
592 | ||
ec008076 | 593 | if (!output_encoding || !*output_encoding) |
93fc05eb JS |
594 | return NULL; |
595 | encoding = get_header(commit, "encoding"); | |
596 | use_encoding = encoding ? encoding : utf8; | |
0e18bcd5 | 597 | if (same_encoding(use_encoding, output_encoding)) |
93fc05eb JS |
598 | if (encoding) /* we'll strip encoding header later */ |
599 | out = xstrdup(commit->buffer); | |
600 | else | |
601 | return NULL; /* nothing to do */ | |
602 | else | |
603 | out = reencode_string(commit->buffer, | |
604 | output_encoding, use_encoding); | |
605 | if (out) | |
606 | out = replace_encoding_header(out, output_encoding); | |
607 | ||
608 | free(encoding); | |
609 | return out; | |
610 | } | |
611 | ||
ea02ffa3 AP |
612 | static int mailmap_name(const char **email, size_t *email_len, |
613 | const char **name, size_t *name_len) | |
e0cbc397 | 614 | { |
c455c87c | 615 | static struct string_list *mail_map; |
e0cbc397 JS |
616 | if (!mail_map) { |
617 | mail_map = xcalloc(1, sizeof(*mail_map)); | |
d551a488 | 618 | read_mailmap(mail_map, NULL); |
e0cbc397 | 619 | } |
d20d654f | 620 | return mail_map->nr && map_user(mail_map, email, email_len, name, name_len); |
e0cbc397 JS |
621 | } |
622 | ||
c3a670de | 623 | static size_t format_person_part(struct strbuf *sb, char part, |
d36f8679 | 624 | const char *msg, int len, enum date_mode dmode) |
93fc05eb | 625 | { |
c3a670de MC |
626 | /* currently all placeholders have same length */ |
627 | const int placeholder_len = 2; | |
4b340cfa | 628 | int tz; |
c3a670de | 629 | unsigned long date = 0; |
4b340cfa | 630 | struct ident_split s; |
ea02ffa3 AP |
631 | const char *name, *mail; |
632 | size_t maillen, namelen; | |
93fc05eb | 633 | |
4b340cfa | 634 | if (split_ident_line(&s, msg, len) < 0) |
c3a670de MC |
635 | goto skip; |
636 | ||
ea02ffa3 AP |
637 | name = s.name_begin; |
638 | namelen = s.name_end - s.name_begin; | |
639 | mail = s.mail_begin; | |
640 | maillen = s.mail_end - s.mail_begin; | |
641 | ||
642 | if (part == 'N' || part == 'E') /* mailmap lookup */ | |
643 | mailmap_name(&mail, &maillen, &name, &namelen); | |
e0cbc397 | 644 | if (part == 'n' || part == 'N') { /* name */ |
ea02ffa3 | 645 | strbuf_add(sb, name, namelen); |
c3a670de | 646 | return placeholder_len; |
cde75e59 | 647 | } |
d20d654f | 648 | if (part == 'e' || part == 'E') { /* email */ |
ea02ffa3 | 649 | strbuf_add(sb, mail, maillen); |
c3a670de | 650 | return placeholder_len; |
cde75e59 | 651 | } |
93fc05eb | 652 | |
4b340cfa | 653 | if (!s.date_begin) |
c3a670de | 654 | goto skip; |
93fc05eb | 655 | |
4b340cfa JH |
656 | date = strtoul(s.date_begin, NULL, 10); |
657 | ||
cde75e59 | 658 | if (part == 't') { /* date, UNIX timestamp */ |
4b340cfa | 659 | strbuf_add(sb, s.date_begin, s.date_end - s.date_begin); |
c3a670de | 660 | return placeholder_len; |
cde75e59 | 661 | } |
93fc05eb JS |
662 | |
663 | /* parse tz */ | |
4b340cfa JH |
664 | tz = strtoul(s.tz_begin + 1, NULL, 10); |
665 | if (*s.tz_begin == '-') | |
666 | tz = -tz; | |
93fc05eb | 667 | |
cde75e59 RS |
668 | switch (part) { |
669 | case 'd': /* date */ | |
d36f8679 | 670 | strbuf_addstr(sb, show_date(date, tz, dmode)); |
c3a670de | 671 | return placeholder_len; |
cde75e59 RS |
672 | case 'D': /* date, RFC2822 style */ |
673 | strbuf_addstr(sb, show_date(date, tz, DATE_RFC2822)); | |
c3a670de | 674 | return placeholder_len; |
cde75e59 RS |
675 | case 'r': /* date, relative */ |
676 | strbuf_addstr(sb, show_date(date, tz, DATE_RELATIVE)); | |
c3a670de | 677 | return placeholder_len; |
cde75e59 RS |
678 | case 'i': /* date, ISO 8601 */ |
679 | strbuf_addstr(sb, show_date(date, tz, DATE_ISO8601)); | |
c3a670de | 680 | return placeholder_len; |
cde75e59 | 681 | } |
c3a670de MC |
682 | |
683 | skip: | |
684 | /* | |
4b340cfa JH |
685 | * reading from either a bogus commit, or a reflog entry with |
686 | * %gn, %ge, etc.; 'sb' cannot be updated, but we still need | |
687 | * to compute a valid return value. | |
c3a670de MC |
688 | */ |
689 | if (part == 'n' || part == 'e' || part == 't' || part == 'd' | |
690 | || part == 'D' || part == 'r' || part == 'i') | |
691 | return placeholder_len; | |
692 | ||
693 | return 0; /* unknown placeholder */ | |
93fc05eb JS |
694 | } |
695 | ||
f29d5958 RS |
696 | struct chunk { |
697 | size_t off; | |
698 | size_t len; | |
699 | }; | |
700 | ||
701 | struct format_commit_context { | |
702 | const struct commit *commit; | |
dd2e794a | 703 | const struct pretty_print_context *pretty_ctx; |
f53bd743 RS |
704 | unsigned commit_header_parsed:1; |
705 | unsigned commit_message_parsed:1; | |
f6667c5e JH |
706 | unsigned commit_signature_parsed:1; |
707 | struct { | |
708 | char *gpg_output; | |
709 | char good_bad; | |
710 | char *signer; | |
711 | } signature; | |
177b29dc | 712 | char *message; |
02edd56b | 713 | size_t width, indent1, indent2; |
f29d5958 RS |
714 | |
715 | /* These offsets are relative to the start of the commit message. */ | |
f29d5958 RS |
716 | struct chunk author; |
717 | struct chunk committer; | |
718 | struct chunk encoding; | |
f53bd743 RS |
719 | size_t message_off; |
720 | size_t subject_off; | |
f29d5958 | 721 | size_t body_off; |
b9c62321 RS |
722 | |
723 | /* The following ones are relative to the result struct strbuf. */ | |
724 | struct chunk abbrev_commit_hash; | |
725 | struct chunk abbrev_tree_hash; | |
726 | struct chunk abbrev_parent_hashes; | |
02edd56b | 727 | size_t wrap_start; |
f29d5958 RS |
728 | }; |
729 | ||
b9c62321 RS |
730 | static int add_again(struct strbuf *sb, struct chunk *chunk) |
731 | { | |
732 | if (chunk->len) { | |
733 | strbuf_adddup(sb, chunk->off, chunk->len); | |
734 | return 1; | |
735 | } | |
736 | ||
737 | /* | |
738 | * We haven't seen this chunk before. Our caller is surely | |
739 | * going to add it the hard way now. Remember the most likely | |
740 | * start of the to-be-added chunk: the current end of the | |
741 | * struct strbuf. | |
742 | */ | |
743 | chunk->off = sb->len; | |
744 | return 0; | |
745 | } | |
746 | ||
f29d5958 | 747 | static void parse_commit_header(struct format_commit_context *context) |
93fc05eb | 748 | { |
177b29dc | 749 | const char *msg = context->message; |
93fc05eb | 750 | int i; |
f29d5958 | 751 | |
f53bd743 | 752 | for (i = 0; msg[i]; i++) { |
f29d5958 RS |
753 | int eol; |
754 | for (eol = i; msg[eol] && msg[eol] != '\n'; eol++) | |
755 | ; /* do nothing */ | |
756 | ||
f29d5958 | 757 | if (i == eol) { |
f53bd743 | 758 | break; |
f29d5958 RS |
759 | } else if (!prefixcmp(msg + i, "author ")) { |
760 | context->author.off = i + 7; | |
761 | context->author.len = eol - i - 7; | |
762 | } else if (!prefixcmp(msg + i, "committer ")) { | |
763 | context->committer.off = i + 10; | |
764 | context->committer.len = eol - i - 10; | |
765 | } else if (!prefixcmp(msg + i, "encoding ")) { | |
766 | context->encoding.off = i + 9; | |
767 | context->encoding.len = eol - i - 9; | |
768 | } | |
769 | i = eol; | |
770 | } | |
f53bd743 | 771 | context->message_off = i; |
f29d5958 RS |
772 | context->commit_header_parsed = 1; |
773 | } | |
774 | ||
46d164b0 SB |
775 | static int istitlechar(char c) |
776 | { | |
777 | return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || | |
778 | (c >= '0' && c <= '9') || c == '.' || c == '_'; | |
779 | } | |
780 | ||
781 | static void format_sanitized_subject(struct strbuf *sb, const char *msg) | |
782 | { | |
783 | size_t trimlen; | |
871d21d4 | 784 | size_t start_len = sb->len; |
46d164b0 SB |
785 | int space = 2; |
786 | ||
787 | for (; *msg && *msg != '\n'; msg++) { | |
788 | if (istitlechar(*msg)) { | |
789 | if (space == 1) | |
790 | strbuf_addch(sb, '-'); | |
791 | space = 0; | |
792 | strbuf_addch(sb, *msg); | |
793 | if (*msg == '.') | |
794 | while (*(msg+1) == '.') | |
795 | msg++; | |
796 | } else | |
797 | space |= 1; | |
798 | } | |
799 | ||
800 | /* trim any trailing '.' or '-' characters */ | |
801 | trimlen = 0; | |
871d21d4 SB |
802 | while (sb->len - trimlen > start_len && |
803 | (sb->buf[sb->len - 1 - trimlen] == '.' | |
804 | || sb->buf[sb->len - 1 - trimlen] == '-')) | |
46d164b0 SB |
805 | trimlen++; |
806 | strbuf_remove(sb, sb->len - trimlen, trimlen); | |
807 | } | |
808 | ||
cec08717 RS |
809 | const char *format_subject(struct strbuf *sb, const char *msg, |
810 | const char *line_separator) | |
88c44735 RS |
811 | { |
812 | int first = 1; | |
813 | ||
814 | for (;;) { | |
815 | const char *line = msg; | |
816 | int linelen = get_one_line(line); | |
817 | ||
818 | msg += linelen; | |
819 | if (!linelen || is_empty_line(line, &linelen)) | |
820 | break; | |
821 | ||
f53bd743 RS |
822 | if (!sb) |
823 | continue; | |
88c44735 RS |
824 | strbuf_grow(sb, linelen + 2); |
825 | if (!first) | |
826 | strbuf_addstr(sb, line_separator); | |
827 | strbuf_add(sb, line, linelen); | |
828 | first = 0; | |
829 | } | |
830 | return msg; | |
831 | } | |
832 | ||
f53bd743 RS |
833 | static void parse_commit_message(struct format_commit_context *c) |
834 | { | |
177b29dc PN |
835 | const char *msg = c->message + c->message_off; |
836 | const char *start = c->message; | |
f53bd743 RS |
837 | |
838 | msg = skip_empty_lines(msg); | |
839 | c->subject_off = msg - start; | |
840 | ||
841 | msg = format_subject(NULL, msg, NULL); | |
842 | msg = skip_empty_lines(msg); | |
843 | c->body_off = msg - start; | |
844 | ||
845 | c->commit_message_parsed = 1; | |
846 | } | |
847 | ||
3b3d443f RS |
848 | static void format_decoration(struct strbuf *sb, const struct commit *commit) |
849 | { | |
850 | struct name_decoration *d; | |
851 | const char *prefix = " ("; | |
852 | ||
33e7018c | 853 | load_ref_decorations(DECORATE_SHORT_REFS); |
3b3d443f RS |
854 | d = lookup_decoration(&name_decoration, &commit->object); |
855 | while (d) { | |
856 | strbuf_addstr(sb, prefix); | |
857 | prefix = ", "; | |
858 | strbuf_addstr(sb, d->name); | |
859 | d = d->next; | |
860 | } | |
861 | if (prefix[0] == ',') | |
862 | strbuf_addch(sb, ')'); | |
863 | } | |
864 | ||
02edd56b RS |
865 | static void strbuf_wrap(struct strbuf *sb, size_t pos, |
866 | size_t width, size_t indent1, size_t indent2) | |
867 | { | |
868 | struct strbuf tmp = STRBUF_INIT; | |
869 | ||
870 | if (pos) | |
871 | strbuf_add(&tmp, sb->buf, pos); | |
872 | strbuf_add_wrapped_text(&tmp, sb->buf + pos, | |
873 | (int) indent1, (int) indent2, (int) width); | |
874 | strbuf_swap(&tmp, sb); | |
875 | strbuf_release(&tmp); | |
876 | } | |
877 | ||
878 | static void rewrap_message_tail(struct strbuf *sb, | |
879 | struct format_commit_context *c, | |
880 | size_t new_width, size_t new_indent1, | |
881 | size_t new_indent2) | |
882 | { | |
883 | if (c->width == new_width && c->indent1 == new_indent1 && | |
884 | c->indent2 == new_indent2) | |
885 | return; | |
32ca4249 | 886 | if (c->wrap_start < sb->len) |
02edd56b RS |
887 | strbuf_wrap(sb, c->wrap_start, c->width, c->indent1, c->indent2); |
888 | c->wrap_start = sb->len; | |
889 | c->width = new_width; | |
890 | c->indent1 = new_indent1; | |
891 | c->indent2 = new_indent2; | |
892 | } | |
893 | ||
f6667c5e JH |
894 | static struct { |
895 | char result; | |
896 | const char *check; | |
897 | } signature_check[] = { | |
898 | { 'G', ": Good signature from " }, | |
899 | { 'B', ": BAD signature from " }, | |
900 | }; | |
901 | ||
902 | static void parse_signature_lines(struct format_commit_context *ctx) | |
903 | { | |
904 | const char *buf = ctx->signature.gpg_output; | |
905 | int i; | |
906 | ||
907 | for (i = 0; i < ARRAY_SIZE(signature_check); i++) { | |
908 | const char *found = strstr(buf, signature_check[i].check); | |
909 | const char *next; | |
910 | if (!found) | |
911 | continue; | |
912 | ctx->signature.good_bad = signature_check[i].result; | |
913 | found += strlen(signature_check[i].check); | |
914 | next = strchrnul(found, '\n'); | |
915 | ctx->signature.signer = xmemdupz(found, next - found); | |
916 | break; | |
917 | } | |
918 | } | |
919 | ||
920 | static void parse_commit_signature(struct format_commit_context *ctx) | |
921 | { | |
922 | struct strbuf payload = STRBUF_INIT; | |
923 | struct strbuf signature = STRBUF_INIT; | |
924 | struct strbuf gpg_output = STRBUF_INIT; | |
925 | int status; | |
926 | ||
927 | ctx->commit_signature_parsed = 1; | |
928 | ||
929 | if (parse_signed_commit(ctx->commit->object.sha1, | |
930 | &payload, &signature) <= 0) | |
931 | goto out; | |
932 | status = verify_signed_buffer(payload.buf, payload.len, | |
933 | signature.buf, signature.len, | |
934 | &gpg_output); | |
935 | if (status && !gpg_output.len) | |
936 | goto out; | |
937 | ctx->signature.gpg_output = strbuf_detach(&gpg_output, NULL); | |
938 | parse_signature_lines(ctx); | |
939 | ||
940 | out: | |
941 | strbuf_release(&gpg_output); | |
942 | strbuf_release(&payload); | |
943 | strbuf_release(&signature); | |
944 | } | |
945 | ||
946 | ||
cd1957f5 JK |
947 | static int format_reflog_person(struct strbuf *sb, |
948 | char part, | |
949 | struct reflog_walk_info *log, | |
950 | enum date_mode dmode) | |
951 | { | |
952 | const char *ident; | |
953 | ||
954 | if (!log) | |
955 | return 2; | |
956 | ||
957 | ident = get_reflog_ident(log); | |
958 | if (!ident) | |
959 | return 2; | |
960 | ||
961 | return format_person_part(sb, part, ident, strlen(ident), dmode); | |
962 | } | |
963 | ||
9fa708da JH |
964 | static size_t format_commit_one(struct strbuf *sb, const char *placeholder, |
965 | void *context) | |
f29d5958 RS |
966 | { |
967 | struct format_commit_context *c = context; | |
968 | const struct commit *commit = c->commit; | |
177b29dc | 969 | const char *msg = c->message; |
f29d5958 | 970 | struct commit_list *p; |
42c8c74c | 971 | int h1, h2; |
93fc05eb | 972 | |
93fc05eb | 973 | /* these are independent of the commit */ |
cde75e59 RS |
974 | switch (placeholder[0]) { |
975 | case 'C': | |
c002922a | 976 | if (placeholder[1] == '(') { |
30825178 JH |
977 | const char *begin = placeholder + 2; |
978 | const char *end = strchr(begin, ')'); | |
c002922a | 979 | char color[COLOR_MAXLEN]; |
30825178 | 980 | |
c002922a JK |
981 | if (!end) |
982 | return 0; | |
8a692d27 | 983 | if (!prefixcmp(begin, "auto,")) { |
30825178 JH |
984 | if (!want_color(c->pretty_ctx->color)) |
985 | return end - placeholder + 1; | |
986 | begin += 5; | |
987 | } | |
988 | color_parse_mem(begin, | |
989 | end - begin, | |
c002922a JK |
990 | "--pretty format", color); |
991 | strbuf_addstr(sb, color); | |
992 | return end - placeholder + 1; | |
993 | } | |
c3a670de | 994 | if (!prefixcmp(placeholder + 1, "red")) { |
dc6ebd4c | 995 | strbuf_addstr(sb, GIT_COLOR_RED); |
c3a670de MC |
996 | return 4; |
997 | } else if (!prefixcmp(placeholder + 1, "green")) { | |
dc6ebd4c | 998 | strbuf_addstr(sb, GIT_COLOR_GREEN); |
c3a670de MC |
999 | return 6; |
1000 | } else if (!prefixcmp(placeholder + 1, "blue")) { | |
dc6ebd4c | 1001 | strbuf_addstr(sb, GIT_COLOR_BLUE); |
c3a670de MC |
1002 | return 5; |
1003 | } else if (!prefixcmp(placeholder + 1, "reset")) { | |
dc6ebd4c | 1004 | strbuf_addstr(sb, GIT_COLOR_RESET); |
c3a670de MC |
1005 | return 6; |
1006 | } else | |
1007 | return 0; | |
cde75e59 RS |
1008 | case 'n': /* newline */ |
1009 | strbuf_addch(sb, '\n'); | |
c3a670de | 1010 | return 1; |
42c8c74c GS |
1011 | case 'x': |
1012 | /* %x00 == NUL, %x0a == LF, etc. */ | |
1013 | if (0 <= (h1 = hexval_table[0xff & placeholder[1]]) && | |
1014 | h1 <= 16 && | |
1015 | 0 <= (h2 = hexval_table[0xff & placeholder[2]]) && | |
1016 | h2 <= 16) { | |
1017 | strbuf_addch(sb, (h1<<4)|h2); | |
1018 | return 3; | |
1019 | } else | |
1020 | return 0; | |
02edd56b RS |
1021 | case 'w': |
1022 | if (placeholder[1] == '(') { | |
1023 | unsigned long width = 0, indent1 = 0, indent2 = 0; | |
1024 | char *next; | |
1025 | const char *start = placeholder + 2; | |
1026 | const char *end = strchr(start, ')'); | |
1027 | if (!end) | |
1028 | return 0; | |
1029 | if (end > start) { | |
1030 | width = strtoul(start, &next, 10); | |
1031 | if (*next == ',') { | |
1032 | indent1 = strtoul(next + 1, &next, 10); | |
1033 | if (*next == ',') { | |
1034 | indent2 = strtoul(next + 1, | |
1035 | &next, 10); | |
1036 | } | |
1037 | } | |
1038 | if (*next != ')') | |
1039 | return 0; | |
1040 | } | |
1041 | rewrap_message_tail(sb, c, width, indent1, indent2); | |
1042 | return end - placeholder + 1; | |
1043 | } else | |
1044 | return 0; | |
cde75e59 | 1045 | } |
93fc05eb JS |
1046 | |
1047 | /* these depend on the commit */ | |
1048 | if (!commit->object.parsed) | |
1049 | parse_object(commit->object.sha1); | |
93fc05eb | 1050 | |
cde75e59 RS |
1051 | switch (placeholder[0]) { |
1052 | case 'H': /* commit hash */ | |
1053 | strbuf_addstr(sb, sha1_to_hex(commit->object.sha1)); | |
c3a670de | 1054 | return 1; |
cde75e59 | 1055 | case 'h': /* abbreviated commit hash */ |
b9c62321 | 1056 | if (add_again(sb, &c->abbrev_commit_hash)) |
c3a670de | 1057 | return 1; |
cde75e59 | 1058 | strbuf_addstr(sb, find_unique_abbrev(commit->object.sha1, |
c1977021 | 1059 | c->pretty_ctx->abbrev)); |
b9c62321 | 1060 | c->abbrev_commit_hash.len = sb->len - c->abbrev_commit_hash.off; |
c3a670de | 1061 | return 1; |
cde75e59 RS |
1062 | case 'T': /* tree hash */ |
1063 | strbuf_addstr(sb, sha1_to_hex(commit->tree->object.sha1)); | |
c3a670de | 1064 | return 1; |
cde75e59 | 1065 | case 't': /* abbreviated tree hash */ |
b9c62321 | 1066 | if (add_again(sb, &c->abbrev_tree_hash)) |
c3a670de | 1067 | return 1; |
cde75e59 | 1068 | strbuf_addstr(sb, find_unique_abbrev(commit->tree->object.sha1, |
c1977021 | 1069 | c->pretty_ctx->abbrev)); |
b9c62321 | 1070 | c->abbrev_tree_hash.len = sb->len - c->abbrev_tree_hash.off; |
c3a670de | 1071 | return 1; |
cde75e59 RS |
1072 | case 'P': /* parent hashes */ |
1073 | for (p = commit->parents; p; p = p->next) { | |
1074 | if (p != commit->parents) | |
1075 | strbuf_addch(sb, ' '); | |
1076 | strbuf_addstr(sb, sha1_to_hex(p->item->object.sha1)); | |
1077 | } | |
c3a670de | 1078 | return 1; |
cde75e59 | 1079 | case 'p': /* abbreviated parent hashes */ |
b9c62321 | 1080 | if (add_again(sb, &c->abbrev_parent_hashes)) |
c3a670de | 1081 | return 1; |
cde75e59 RS |
1082 | for (p = commit->parents; p; p = p->next) { |
1083 | if (p != commit->parents) | |
1084 | strbuf_addch(sb, ' '); | |
1085 | strbuf_addstr(sb, find_unique_abbrev( | |
c1977021 WP |
1086 | p->item->object.sha1, |
1087 | c->pretty_ctx->abbrev)); | |
cde75e59 | 1088 | } |
b9c62321 RS |
1089 | c->abbrev_parent_hashes.len = sb->len - |
1090 | c->abbrev_parent_hashes.off; | |
c3a670de | 1091 | return 1; |
cde75e59 | 1092 | case 'm': /* left/right/bottom */ |
1df2d656 | 1093 | strbuf_addstr(sb, get_revision_mark(NULL, commit)); |
c3a670de | 1094 | return 1; |
3b3d443f RS |
1095 | case 'd': |
1096 | format_decoration(sb, commit); | |
1097 | return 1; | |
8f8f5476 TR |
1098 | case 'g': /* reflog info */ |
1099 | switch(placeholder[1]) { | |
1100 | case 'd': /* reflog selector */ | |
1101 | case 'D': | |
1102 | if (c->pretty_ctx->reflog_info) | |
1103 | get_reflog_selector(sb, | |
1104 | c->pretty_ctx->reflog_info, | |
1105 | c->pretty_ctx->date_mode, | |
55ccf85a | 1106 | c->pretty_ctx->date_mode_explicit, |
8f8f5476 TR |
1107 | (placeholder[1] == 'd')); |
1108 | return 2; | |
1109 | case 's': /* reflog message */ | |
1110 | if (c->pretty_ctx->reflog_info) | |
1111 | get_reflog_message(sb, c->pretty_ctx->reflog_info); | |
1112 | return 2; | |
cd1957f5 JK |
1113 | case 'n': |
1114 | case 'N': | |
1115 | case 'e': | |
1116 | case 'E': | |
1117 | return format_reflog_person(sb, | |
1118 | placeholder[1], | |
1119 | c->pretty_ctx->reflog_info, | |
1120 | c->pretty_ctx->date_mode); | |
8f8f5476 TR |
1121 | } |
1122 | return 0; /* unknown %g placeholder */ | |
8b208f02 | 1123 | case 'N': |
ddf333f6 JH |
1124 | if (c->pretty_ctx->notes_message) { |
1125 | strbuf_addstr(sb, c->pretty_ctx->notes_message); | |
5b163603 JG |
1126 | return 1; |
1127 | } | |
1128 | return 0; | |
cde75e59 RS |
1129 | } |
1130 | ||
f6667c5e JH |
1131 | if (placeholder[0] == 'G') { |
1132 | if (!c->commit_signature_parsed) | |
1133 | parse_commit_signature(c); | |
1134 | switch (placeholder[1]) { | |
1135 | case 'G': | |
1136 | if (c->signature.gpg_output) | |
1137 | strbuf_addstr(sb, c->signature.gpg_output); | |
1138 | break; | |
1139 | case '?': | |
1140 | switch (c->signature.good_bad) { | |
1141 | case 'G': | |
1142 | case 'B': | |
1143 | strbuf_addch(sb, c->signature.good_bad); | |
1144 | } | |
1145 | break; | |
1146 | case 'S': | |
1147 | if (c->signature.signer) | |
1148 | strbuf_addstr(sb, c->signature.signer); | |
1149 | break; | |
1150 | } | |
1151 | return 2; | |
1152 | } | |
1153 | ||
1154 | ||
cde75e59 | 1155 | /* For the rest we have to parse the commit header. */ |
f29d5958 RS |
1156 | if (!c->commit_header_parsed) |
1157 | parse_commit_header(c); | |
93fc05eb | 1158 | |
f29d5958 | 1159 | switch (placeholder[0]) { |
c3a670de MC |
1160 | case 'a': /* author ... */ |
1161 | return format_person_part(sb, placeholder[1], | |
d36f8679 | 1162 | msg + c->author.off, c->author.len, |
dd2e794a | 1163 | c->pretty_ctx->date_mode); |
c3a670de MC |
1164 | case 'c': /* committer ... */ |
1165 | return format_person_part(sb, placeholder[1], | |
d36f8679 | 1166 | msg + c->committer.off, c->committer.len, |
dd2e794a | 1167 | c->pretty_ctx->date_mode); |
c3a670de | 1168 | case 'e': /* encoding */ |
f29d5958 | 1169 | strbuf_add(sb, msg + c->encoding.off, c->encoding.len); |
c3a670de | 1170 | return 1; |
1367b12a EB |
1171 | case 'B': /* raw body */ |
1172 | /* message_off is always left at the initial newline */ | |
1173 | strbuf_addstr(sb, msg + c->message_off + 1); | |
1174 | return 1; | |
f53bd743 RS |
1175 | } |
1176 | ||
1177 | /* Now we need to parse the commit message. */ | |
1178 | if (!c->commit_message_parsed) | |
1179 | parse_commit_message(c); | |
1180 | ||
1181 | switch (placeholder[0]) { | |
1182 | case 's': /* subject */ | |
1183 | format_subject(sb, msg + c->subject_off, " "); | |
1184 | return 1; | |
46d164b0 SB |
1185 | case 'f': /* sanitized subject */ |
1186 | format_sanitized_subject(sb, msg + c->subject_off); | |
1187 | return 1; | |
c3a670de | 1188 | case 'b': /* body */ |
f29d5958 | 1189 | strbuf_addstr(sb, msg + c->body_off); |
c3a670de | 1190 | return 1; |
93fc05eb | 1191 | } |
c3a670de | 1192 | return 0; /* unknown placeholder */ |
cde75e59 RS |
1193 | } |
1194 | ||
9fa708da JH |
1195 | static size_t format_commit_item(struct strbuf *sb, const char *placeholder, |
1196 | void *context) | |
1197 | { | |
1198 | int consumed; | |
1199 | size_t orig_len; | |
1200 | enum { | |
1201 | NO_MAGIC, | |
1202 | ADD_LF_BEFORE_NON_EMPTY, | |
1203 | DEL_LF_BEFORE_EMPTY, | |
223a923c | 1204 | ADD_SP_BEFORE_NON_EMPTY |
9fa708da JH |
1205 | } magic = NO_MAGIC; |
1206 | ||
1207 | switch (placeholder[0]) { | |
1208 | case '-': | |
1209 | magic = DEL_LF_BEFORE_EMPTY; | |
1210 | break; | |
1211 | case '+': | |
1212 | magic = ADD_LF_BEFORE_NON_EMPTY; | |
1213 | break; | |
7b88176e MG |
1214 | case ' ': |
1215 | magic = ADD_SP_BEFORE_NON_EMPTY; | |
1216 | break; | |
9fa708da JH |
1217 | default: |
1218 | break; | |
1219 | } | |
1220 | if (magic != NO_MAGIC) | |
1221 | placeholder++; | |
1222 | ||
1223 | orig_len = sb->len; | |
1224 | consumed = format_commit_one(sb, placeholder, context); | |
1225 | if (magic == NO_MAGIC) | |
1226 | return consumed; | |
1227 | ||
1228 | if ((orig_len == sb->len) && magic == DEL_LF_BEFORE_EMPTY) { | |
1229 | while (sb->len && sb->buf[sb->len - 1] == '\n') | |
1230 | strbuf_setlen(sb, sb->len - 1); | |
7b88176e MG |
1231 | } else if (orig_len != sb->len) { |
1232 | if (magic == ADD_LF_BEFORE_NON_EMPTY) | |
1233 | strbuf_insert(sb, orig_len, "\n", 1); | |
1234 | else if (magic == ADD_SP_BEFORE_NON_EMPTY) | |
1235 | strbuf_insert(sb, orig_len, " ", 1); | |
9fa708da JH |
1236 | } |
1237 | return consumed + 1; | |
1238 | } | |
1239 | ||
5b163603 JG |
1240 | static size_t userformat_want_item(struct strbuf *sb, const char *placeholder, |
1241 | void *context) | |
1242 | { | |
1243 | struct userformat_want *w = context; | |
1244 | ||
7b88176e | 1245 | if (*placeholder == '+' || *placeholder == '-' || *placeholder == ' ') |
5b163603 JG |
1246 | placeholder++; |
1247 | ||
1248 | switch (*placeholder) { | |
1249 | case 'N': | |
1250 | w->notes = 1; | |
1251 | break; | |
1252 | } | |
1253 | return 0; | |
1254 | } | |
1255 | ||
1256 | void userformat_find_requirements(const char *fmt, struct userformat_want *w) | |
1257 | { | |
1258 | struct strbuf dummy = STRBUF_INIT; | |
1259 | ||
1260 | if (!fmt) { | |
1261 | if (!user_format) | |
1262 | return; | |
1263 | fmt = user_format; | |
1264 | } | |
a6253d10 | 1265 | strbuf_expand(&dummy, fmt, userformat_want_item, w); |
5b163603 JG |
1266 | strbuf_release(&dummy); |
1267 | } | |
1268 | ||
cde75e59 | 1269 | void format_commit_message(const struct commit *commit, |
7f98ebc8 | 1270 | const char *format, struct strbuf *sb, |
dd2e794a | 1271 | const struct pretty_print_context *pretty_ctx) |
cde75e59 | 1272 | { |
f29d5958 | 1273 | struct format_commit_context context; |
177b29dc | 1274 | const char *output_enc = pretty_ctx->output_encoding; |
f29d5958 RS |
1275 | |
1276 | memset(&context, 0, sizeof(context)); | |
1277 | context.commit = commit; | |
dd2e794a | 1278 | context.pretty_ctx = pretty_ctx; |
02edd56b | 1279 | context.wrap_start = sb->len; |
ec008076 JH |
1280 | context.message = logmsg_reencode(commit, output_enc); |
1281 | if (!context.message) | |
1282 | context.message = commit->buffer; | |
177b29dc | 1283 | |
c3a670de | 1284 | strbuf_expand(sb, format, format_commit_item, &context); |
02edd56b | 1285 | rewrap_message_tail(sb, &context, 0, 0, 0); |
177b29dc PN |
1286 | |
1287 | if (context.message != commit->buffer) | |
1288 | free(context.message); | |
f6667c5e JH |
1289 | free(context.signature.gpg_output); |
1290 | free(context.signature.signer); | |
93fc05eb JS |
1291 | } |
1292 | ||
6bf13944 | 1293 | static void pp_header(const struct pretty_print_context *pp, |
93fc05eb JS |
1294 | const char *encoding, |
1295 | const struct commit *commit, | |
1296 | const char **msg_p, | |
1297 | struct strbuf *sb) | |
1298 | { | |
1299 | int parents_shown = 0; | |
1300 | ||
1301 | for (;;) { | |
1302 | const char *line = *msg_p; | |
1303 | int linelen = get_one_line(*msg_p); | |
1304 | ||
1305 | if (!linelen) | |
1306 | return; | |
1307 | *msg_p += linelen; | |
1308 | ||
1309 | if (linelen == 1) | |
1310 | /* End of header */ | |
1311 | return; | |
1312 | ||
6bf13944 | 1313 | if (pp->fmt == CMIT_FMT_RAW) { |
93fc05eb JS |
1314 | strbuf_add(sb, line, linelen); |
1315 | continue; | |
1316 | } | |
1317 | ||
8a692d27 | 1318 | if (!prefixcmp(line, "parent ")) { |
93fc05eb JS |
1319 | if (linelen != 48) |
1320 | die("bad parent line in commit"); | |
1321 | continue; | |
1322 | } | |
1323 | ||
1324 | if (!parents_shown) { | |
1325 | struct commit_list *parent; | |
1326 | int num; | |
1327 | for (parent = commit->parents, num = 0; | |
1328 | parent; | |
1329 | parent = parent->next, num++) | |
1330 | ; | |
1331 | /* with enough slop */ | |
1332 | strbuf_grow(sb, num * 50 + 20); | |
6bf13944 | 1333 | add_merge_info(pp, sb, commit); |
93fc05eb JS |
1334 | parents_shown = 1; |
1335 | } | |
1336 | ||
1337 | /* | |
1338 | * MEDIUM == DEFAULT shows only author with dates. | |
1339 | * FULL shows both authors but not dates. | |
1340 | * FULLER shows both authors and dates. | |
1341 | */ | |
8a692d27 | 1342 | if (!prefixcmp(line, "author ")) { |
93fc05eb | 1343 | strbuf_grow(sb, linelen + 80); |
6bf13944 | 1344 | pp_user_info(pp, "Author", sb, line + 7, encoding); |
93fc05eb | 1345 | } |
8a692d27 | 1346 | if (!prefixcmp(line, "committer ") && |
6bf13944 | 1347 | (pp->fmt == CMIT_FMT_FULL || pp->fmt == CMIT_FMT_FULLER)) { |
93fc05eb | 1348 | strbuf_grow(sb, linelen + 80); |
6bf13944 | 1349 | pp_user_info(pp, "Commit", sb, line + 10, encoding); |
93fc05eb JS |
1350 | } |
1351 | } | |
1352 | } | |
1353 | ||
6bf13944 | 1354 | void pp_title_line(const struct pretty_print_context *pp, |
b02bd65f DB |
1355 | const char **msg_p, |
1356 | struct strbuf *sb, | |
b02bd65f | 1357 | const char *encoding, |
267123b4 | 1358 | int need_8bit_cte) |
93fc05eb | 1359 | { |
41dd00ba | 1360 | static const int max_length = 78; /* per rfc2047 */ |
93fc05eb JS |
1361 | struct strbuf title; |
1362 | ||
1363 | strbuf_init(&title, 80); | |
9553d2b2 JK |
1364 | *msg_p = format_subject(&title, *msg_p, |
1365 | pp->preserve_subject ? "\n" : " "); | |
93fc05eb JS |
1366 | |
1367 | strbuf_grow(sb, title.len + 1024); | |
6bf13944 JK |
1368 | if (pp->subject) { |
1369 | strbuf_addstr(sb, pp->subject); | |
41dd00ba JS |
1370 | if (needs_rfc2047_encoding(title.buf, title.len, RFC2047_SUBJECT)) |
1371 | add_rfc2047(sb, title.buf, title.len, | |
1372 | encoding, RFC2047_SUBJECT); | |
1373 | else | |
1374 | strbuf_add_wrapped_bytes(sb, title.buf, title.len, | |
1375 | -last_line_length(sb), 1, max_length); | |
93fc05eb JS |
1376 | } else { |
1377 | strbuf_addbuf(sb, &title); | |
1378 | } | |
1379 | strbuf_addch(sb, '\n'); | |
1380 | ||
6bf4f1b4 | 1381 | if (need_8bit_cte > 0) { |
93fc05eb JS |
1382 | const char *header_fmt = |
1383 | "MIME-Version: 1.0\n" | |
1384 | "Content-Type: text/plain; charset=%s\n" | |
1385 | "Content-Transfer-Encoding: 8bit\n"; | |
1386 | strbuf_addf(sb, header_fmt, encoding); | |
1387 | } | |
6bf13944 JK |
1388 | if (pp->after_subject) { |
1389 | strbuf_addstr(sb, pp->after_subject); | |
93fc05eb | 1390 | } |
6bf13944 | 1391 | if (pp->fmt == CMIT_FMT_EMAIL) { |
93fc05eb JS |
1392 | strbuf_addch(sb, '\n'); |
1393 | } | |
1394 | strbuf_release(&title); | |
1395 | } | |
1396 | ||
6bf13944 | 1397 | void pp_remainder(const struct pretty_print_context *pp, |
b02bd65f DB |
1398 | const char **msg_p, |
1399 | struct strbuf *sb, | |
1400 | int indent) | |
93fc05eb JS |
1401 | { |
1402 | int first = 1; | |
1403 | for (;;) { | |
1404 | const char *line = *msg_p; | |
1405 | int linelen = get_one_line(line); | |
1406 | *msg_p += linelen; | |
1407 | ||
1408 | if (!linelen) | |
1409 | break; | |
1410 | ||
1411 | if (is_empty_line(line, &linelen)) { | |
1412 | if (first) | |
1413 | continue; | |
6bf13944 | 1414 | if (pp->fmt == CMIT_FMT_SHORT) |
93fc05eb JS |
1415 | break; |
1416 | } | |
1417 | first = 0; | |
1418 | ||
1419 | strbuf_grow(sb, linelen + indent + 20); | |
1420 | if (indent) { | |
1421 | memset(sb->buf + sb->len, ' ', indent); | |
1422 | strbuf_setlen(sb, sb->len + indent); | |
1423 | } | |
1424 | strbuf_add(sb, line, linelen); | |
1425 | strbuf_addch(sb, '\n'); | |
1426 | } | |
1427 | } | |
1428 | ||
6bf13944 JK |
1429 | void pretty_print_commit(const struct pretty_print_context *pp, |
1430 | const struct commit *commit, | |
1431 | struct strbuf *sb) | |
93fc05eb JS |
1432 | { |
1433 | unsigned long beginning_of_body; | |
1434 | int indent = 4; | |
1435 | const char *msg = commit->buffer; | |
1436 | char *reencoded; | |
1437 | const char *encoding; | |
6bf13944 | 1438 | int need_8bit_cte = pp->need_8bit_cte; |
93fc05eb | 1439 | |
6bf13944 JK |
1440 | if (pp->fmt == CMIT_FMT_USERFORMAT) { |
1441 | format_commit_message(commit, user_format, sb, pp); | |
93fc05eb JS |
1442 | return; |
1443 | } | |
1444 | ||
e297cf5a JH |
1445 | encoding = get_log_output_encoding(); |
1446 | reencoded = logmsg_reencode(commit, encoding); | |
93fc05eb JS |
1447 | if (reencoded) { |
1448 | msg = reencoded; | |
1449 | } | |
1450 | ||
6bf13944 | 1451 | if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL) |
93fc05eb JS |
1452 | indent = 0; |
1453 | ||
6bf4f1b4 JH |
1454 | /* |
1455 | * We need to check and emit Content-type: to mark it | |
1456 | * as 8-bit if we haven't done so. | |
93fc05eb | 1457 | */ |
6bf13944 | 1458 | if (pp->fmt == CMIT_FMT_EMAIL && need_8bit_cte == 0) { |
93fc05eb JS |
1459 | int i, ch, in_body; |
1460 | ||
1461 | for (in_body = i = 0; (ch = msg[i]); i++) { | |
1462 | if (!in_body) { | |
1463 | /* author could be non 7-bit ASCII but | |
1464 | * the log may be so; skip over the | |
1465 | * header part first. | |
1466 | */ | |
1467 | if (ch == '\n' && msg[i+1] == '\n') | |
1468 | in_body = 1; | |
1469 | } | |
1470 | else if (non_ascii(ch)) { | |
6bf4f1b4 | 1471 | need_8bit_cte = 1; |
93fc05eb JS |
1472 | break; |
1473 | } | |
1474 | } | |
1475 | } | |
1476 | ||
6bf13944 JK |
1477 | pp_header(pp, encoding, commit, &msg, sb); |
1478 | if (pp->fmt != CMIT_FMT_ONELINE && !pp->subject) { | |
93fc05eb JS |
1479 | strbuf_addch(sb, '\n'); |
1480 | } | |
1481 | ||
1482 | /* Skip excess blank lines at the beginning of body, if any... */ | |
a0109668 | 1483 | msg = skip_empty_lines(msg); |
93fc05eb JS |
1484 | |
1485 | /* These formats treat the title line specially. */ | |
6bf13944 JK |
1486 | if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL) |
1487 | pp_title_line(pp, &msg, sb, encoding, need_8bit_cte); | |
93fc05eb JS |
1488 | |
1489 | beginning_of_body = sb->len; | |
6bf13944 JK |
1490 | if (pp->fmt != CMIT_FMT_ONELINE) |
1491 | pp_remainder(pp, &msg, sb, indent); | |
93fc05eb JS |
1492 | strbuf_rtrim(sb); |
1493 | ||
1494 | /* Make sure there is an EOLN for the non-oneline case */ | |
6bf13944 | 1495 | if (pp->fmt != CMIT_FMT_ONELINE) |
93fc05eb JS |
1496 | strbuf_addch(sb, '\n'); |
1497 | ||
1498 | /* | |
1499 | * The caller may append additional body text in e-mail | |
1500 | * format. Make sure we did not strip the blank line | |
1501 | * between the header and the body. | |
1502 | */ | |
6bf13944 | 1503 | if (pp->fmt == CMIT_FMT_EMAIL && sb->len <= beginning_of_body) |
93fc05eb | 1504 | strbuf_addch(sb, '\n'); |
a97a7468 | 1505 | |
93fc05eb JS |
1506 | free(reencoded); |
1507 | } | |
8b8a5374 JK |
1508 | |
1509 | void pp_commit_easy(enum cmit_fmt fmt, const struct commit *commit, | |
1510 | struct strbuf *sb) | |
1511 | { | |
1512 | struct pretty_print_context pp = {0}; | |
6bf13944 JK |
1513 | pp.fmt = fmt; |
1514 | pretty_print_commit(&pp, commit, sb); | |
8b8a5374 | 1515 | } |