]>
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 | ||
234 | static int has_rfc822_specials(const char *s, int len) | |
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 | ||
243 | static void add_rfc822_quoted(struct strbuf *out, const char *s, int len) | |
244 | { | |
245 | int i; | |
246 | ||
247 | /* just a guess, we may have to also backslash-quote */ | |
248 | strbuf_grow(out, len + 2); | |
249 | ||
250 | strbuf_addch(out, '"'); | |
251 | for (i = 0; i < len; i++) { | |
252 | switch (s[i]) { | |
253 | case '"': | |
254 | case '\\': | |
255 | strbuf_addch(out, '\\'); | |
256 | /* fall through */ | |
257 | default: | |
258 | strbuf_addch(out, s[i]); | |
259 | } | |
260 | } | |
261 | strbuf_addch(out, '"'); | |
262 | } | |
263 | ||
93fc05eb JS |
264 | static int is_rfc2047_special(char ch) |
265 | { | |
266 | return (non_ascii(ch) || (ch == '=') || (ch == '?') || (ch == '_')); | |
267 | } | |
268 | ||
269 | static void add_rfc2047(struct strbuf *sb, const char *line, int len, | |
270 | const char *encoding) | |
271 | { | |
a1f6baa5 JK |
272 | static const int max_length = 78; /* per rfc2822 */ |
273 | int i; | |
274 | int line_len; | |
275 | ||
276 | /* How many bytes are already used on the current line? */ | |
277 | for (i = sb->len - 1; i >= 0; i--) | |
278 | if (sb->buf[i] == '\n') | |
279 | break; | |
280 | line_len = sb->len - (i+1); | |
93fc05eb JS |
281 | |
282 | for (i = 0; i < len; i++) { | |
283 | int ch = line[i]; | |
c22e7de3 | 284 | if (non_ascii(ch) || ch == '\n') |
93fc05eb JS |
285 | goto needquote; |
286 | if ((i + 1 < len) && (ch == '=' && line[i+1] == '?')) | |
287 | goto needquote; | |
288 | } | |
a1f6baa5 | 289 | strbuf_add_wrapped_bytes(sb, line, len, 0, 1, max_length - line_len); |
93fc05eb JS |
290 | return; |
291 | ||
292 | needquote: | |
293 | strbuf_grow(sb, len * 3 + strlen(encoding) + 100); | |
294 | strbuf_addf(sb, "=?%s?q?", encoding); | |
a1f6baa5 JK |
295 | line_len += strlen(encoding) + 5; /* 5 for =??q? */ |
296 | for (i = 0; i < len; i++) { | |
93fc05eb | 297 | unsigned ch = line[i] & 0xFF; |
a1f6baa5 JK |
298 | |
299 | if (line_len >= max_length - 2) { | |
300 | strbuf_addf(sb, "?=\n =?%s?q?", encoding); | |
301 | line_len = strlen(encoding) + 5 + 1; /* =??q? plus SP */ | |
302 | } | |
303 | ||
93fc05eb JS |
304 | /* |
305 | * We encode ' ' using '=20' even though rfc2047 | |
306 | * allows using '_' for readability. Unfortunately, | |
307 | * many programs do not understand this and just | |
308 | * leave the underscore in place. | |
309 | */ | |
c22e7de3 | 310 | if (is_rfc2047_special(ch) || ch == ' ' || ch == '\n') { |
93fc05eb | 311 | strbuf_addf(sb, "=%02X", ch); |
a1f6baa5 JK |
312 | line_len += 3; |
313 | } | |
314 | else { | |
315 | strbuf_addch(sb, ch); | |
316 | line_len++; | |
93fc05eb JS |
317 | } |
318 | } | |
93fc05eb JS |
319 | strbuf_addstr(sb, "?="); |
320 | } | |
321 | ||
6bf13944 JK |
322 | void pp_user_info(const struct pretty_print_context *pp, |
323 | const char *what, struct strbuf *sb, | |
324 | const char *line, const char *encoding) | |
93fc05eb JS |
325 | { |
326 | char *date; | |
327 | int namelen; | |
328 | unsigned long time; | |
329 | int tz; | |
93fc05eb | 330 | |
6bf13944 | 331 | if (pp->fmt == CMIT_FMT_ONELINE) |
93fc05eb JS |
332 | return; |
333 | date = strchr(line, '>'); | |
334 | if (!date) | |
335 | return; | |
336 | namelen = ++date - line; | |
337 | time = strtoul(date, &date, 10); | |
338 | tz = strtol(date, NULL, 10); | |
339 | ||
6bf13944 | 340 | if (pp->fmt == CMIT_FMT_EMAIL) { |
93fc05eb JS |
341 | char *name_tail = strchr(line, '<'); |
342 | int display_name_length; | |
990f6e30 | 343 | int final_line; |
93fc05eb JS |
344 | if (!name_tail) |
345 | return; | |
346 | while (line < name_tail && isspace(name_tail[-1])) | |
347 | name_tail--; | |
348 | display_name_length = name_tail - line; | |
93fc05eb | 349 | strbuf_addstr(sb, "From: "); |
4d03c18a JK |
350 | if (!has_rfc822_specials(line, display_name_length)) { |
351 | add_rfc2047(sb, line, display_name_length, encoding); | |
352 | } else { | |
353 | struct strbuf quoted = STRBUF_INIT; | |
354 | add_rfc822_quoted("ed, line, display_name_length); | |
355 | add_rfc2047(sb, quoted.buf, quoted.len, encoding); | |
356 | strbuf_release("ed); | |
357 | } | |
990f6e30 JK |
358 | for (final_line = 0; final_line < sb->len; final_line++) |
359 | if (sb->buf[sb->len - final_line - 1] == '\n') | |
360 | break; | |
361 | if (namelen - display_name_length + final_line > 78) { | |
362 | strbuf_addch(sb, '\n'); | |
363 | if (!isspace(name_tail[0])) | |
364 | strbuf_addch(sb, ' '); | |
365 | } | |
93fc05eb JS |
366 | strbuf_add(sb, name_tail, namelen - display_name_length); |
367 | strbuf_addch(sb, '\n'); | |
368 | } else { | |
369 | strbuf_addf(sb, "%s: %.*s%.*s\n", what, | |
6bf13944 | 370 | (pp->fmt == CMIT_FMT_FULLER) ? 4 : 0, |
8e76bf3f | 371 | " ", namelen, line); |
93fc05eb | 372 | } |
6bf13944 | 373 | switch (pp->fmt) { |
93fc05eb | 374 | case CMIT_FMT_MEDIUM: |
6bf13944 | 375 | strbuf_addf(sb, "Date: %s\n", show_date(time, tz, pp->date_mode)); |
93fc05eb JS |
376 | break; |
377 | case CMIT_FMT_EMAIL: | |
378 | strbuf_addf(sb, "Date: %s\n", show_date(time, tz, DATE_RFC2822)); | |
379 | break; | |
380 | case CMIT_FMT_FULLER: | |
6bf13944 | 381 | strbuf_addf(sb, "%sDate: %s\n", what, show_date(time, tz, pp->date_mode)); |
93fc05eb JS |
382 | break; |
383 | default: | |
384 | /* notin' */ | |
385 | break; | |
386 | } | |
387 | } | |
388 | ||
389 | static int is_empty_line(const char *line, int *len_p) | |
390 | { | |
391 | int len = *len_p; | |
392 | while (len && isspace(line[len-1])) | |
393 | len--; | |
394 | *len_p = len; | |
395 | return !len; | |
396 | } | |
397 | ||
a0109668 RS |
398 | static const char *skip_empty_lines(const char *msg) |
399 | { | |
400 | for (;;) { | |
401 | int linelen = get_one_line(msg); | |
402 | int ll = linelen; | |
403 | if (!linelen) | |
404 | break; | |
405 | if (!is_empty_line(msg, &ll)) | |
406 | break; | |
407 | msg += linelen; | |
408 | } | |
409 | return msg; | |
410 | } | |
411 | ||
6bf13944 JK |
412 | static void add_merge_info(const struct pretty_print_context *pp, |
413 | struct strbuf *sb, const struct commit *commit) | |
93fc05eb JS |
414 | { |
415 | struct commit_list *parent = commit->parents; | |
416 | ||
6bf13944 | 417 | if ((pp->fmt == CMIT_FMT_ONELINE) || (pp->fmt == CMIT_FMT_EMAIL) || |
93fc05eb JS |
418 | !parent || !parent->next) |
419 | return; | |
420 | ||
421 | strbuf_addstr(sb, "Merge:"); | |
422 | ||
423 | while (parent) { | |
424 | struct commit *p = parent->item; | |
425 | const char *hex = NULL; | |
6bf13944 JK |
426 | if (pp->abbrev) |
427 | hex = find_unique_abbrev(p->object.sha1, pp->abbrev); | |
93fc05eb JS |
428 | if (!hex) |
429 | hex = sha1_to_hex(p->object.sha1); | |
93fc05eb JS |
430 | parent = parent->next; |
431 | ||
7fcda920 | 432 | strbuf_addf(sb, " %s", hex); |
93fc05eb JS |
433 | } |
434 | strbuf_addch(sb, '\n'); | |
435 | } | |
436 | ||
437 | static char *get_header(const struct commit *commit, const char *key) | |
438 | { | |
439 | int key_len = strlen(key); | |
440 | const char *line = commit->buffer; | |
441 | ||
a9c7a8a8 | 442 | while (line) { |
93fc05eb JS |
443 | const char *eol = strchr(line, '\n'), *next; |
444 | ||
445 | if (line == eol) | |
446 | return NULL; | |
447 | if (!eol) { | |
a9c7a8a8 JK |
448 | warning("malformed commit (header is missing newline): %s", |
449 | sha1_to_hex(commit->object.sha1)); | |
93fc05eb JS |
450 | eol = line + strlen(line); |
451 | next = NULL; | |
452 | } else | |
453 | next = eol + 1; | |
454 | if (eol - line > key_len && | |
455 | !strncmp(line, key, key_len) && | |
456 | line[key_len] == ' ') { | |
457 | return xmemdupz(line + key_len + 1, eol - line - key_len - 1); | |
458 | } | |
459 | line = next; | |
460 | } | |
a9c7a8a8 | 461 | return NULL; |
93fc05eb JS |
462 | } |
463 | ||
464 | static char *replace_encoding_header(char *buf, const char *encoding) | |
465 | { | |
f285a2d7 | 466 | struct strbuf tmp = STRBUF_INIT; |
93fc05eb JS |
467 | size_t start, len; |
468 | char *cp = buf; | |
469 | ||
470 | /* guess if there is an encoding header before a \n\n */ | |
471 | while (strncmp(cp, "encoding ", strlen("encoding "))) { | |
472 | cp = strchr(cp, '\n'); | |
473 | if (!cp || *++cp == '\n') | |
474 | return buf; | |
475 | } | |
476 | start = cp - buf; | |
477 | cp = strchr(cp, '\n'); | |
478 | if (!cp) | |
479 | return buf; /* should not happen but be defensive */ | |
480 | len = cp + 1 - (buf + start); | |
481 | ||
93fc05eb JS |
482 | strbuf_attach(&tmp, buf, strlen(buf), strlen(buf) + 1); |
483 | if (is_encoding_utf8(encoding)) { | |
484 | /* we have re-coded to UTF-8; drop the header */ | |
485 | strbuf_remove(&tmp, start, len); | |
486 | } else { | |
487 | /* just replaces XXXX in 'encoding XXXX\n' */ | |
488 | strbuf_splice(&tmp, start + strlen("encoding "), | |
489 | len - strlen("encoding \n"), | |
490 | encoding, strlen(encoding)); | |
491 | } | |
492 | return strbuf_detach(&tmp, NULL); | |
493 | } | |
494 | ||
177b29dc PN |
495 | char *logmsg_reencode(const struct commit *commit, |
496 | const char *output_encoding) | |
93fc05eb | 497 | { |
330db18c | 498 | static const char *utf8 = "UTF-8"; |
93fc05eb JS |
499 | const char *use_encoding; |
500 | char *encoding; | |
501 | char *out; | |
502 | ||
503 | if (!*output_encoding) | |
504 | return NULL; | |
505 | encoding = get_header(commit, "encoding"); | |
506 | use_encoding = encoding ? encoding : utf8; | |
507 | if (!strcmp(use_encoding, output_encoding)) | |
508 | if (encoding) /* we'll strip encoding header later */ | |
509 | out = xstrdup(commit->buffer); | |
510 | else | |
511 | return NULL; /* nothing to do */ | |
512 | else | |
513 | out = reencode_string(commit->buffer, | |
514 | output_encoding, use_encoding); | |
515 | if (out) | |
516 | out = replace_encoding_header(out, output_encoding); | |
517 | ||
518 | free(encoding); | |
519 | return out; | |
520 | } | |
521 | ||
d20d654f | 522 | static int mailmap_name(char *email, int email_len, char *name, int name_len) |
e0cbc397 | 523 | { |
c455c87c | 524 | static struct string_list *mail_map; |
e0cbc397 JS |
525 | if (!mail_map) { |
526 | mail_map = xcalloc(1, sizeof(*mail_map)); | |
d551a488 | 527 | read_mailmap(mail_map, NULL); |
e0cbc397 | 528 | } |
d20d654f | 529 | return mail_map->nr && map_user(mail_map, email, email_len, name, name_len); |
e0cbc397 JS |
530 | } |
531 | ||
c3a670de | 532 | static size_t format_person_part(struct strbuf *sb, char part, |
d36f8679 | 533 | const char *msg, int len, enum date_mode dmode) |
93fc05eb | 534 | { |
c3a670de MC |
535 | /* currently all placeholders have same length */ |
536 | const int placeholder_len = 2; | |
93fc05eb | 537 | int start, end, tz = 0; |
c3a670de | 538 | unsigned long date = 0; |
93fc05eb | 539 | char *ep; |
d20d654f MSO |
540 | const char *name_start, *name_end, *mail_start, *mail_end, *msg_end = msg+len; |
541 | char person_name[1024]; | |
542 | char person_mail[1024]; | |
93fc05eb | 543 | |
c3a670de | 544 | /* advance 'end' to point to email start delimiter */ |
93fc05eb JS |
545 | for (end = 0; end < len && msg[end] != '<'; end++) |
546 | ; /* do nothing */ | |
c3a670de | 547 | |
f7ab5c79 | 548 | /* |
c3a670de MC |
549 | * When end points at the '<' that we found, it should have |
550 | * matching '>' later, which means 'end' must be strictly | |
551 | * below len - 1. | |
f7ab5c79 | 552 | */ |
c3a670de MC |
553 | if (end >= len - 2) |
554 | goto skip; | |
555 | ||
d20d654f MSO |
556 | /* Seek for both name and email part */ |
557 | name_start = msg; | |
558 | name_end = msg+end; | |
559 | while (name_end > name_start && isspace(*(name_end-1))) | |
560 | name_end--; | |
561 | mail_start = msg+end+1; | |
562 | mail_end = mail_start; | |
563 | while (mail_end < msg_end && *mail_end != '>') | |
564 | mail_end++; | |
565 | if (mail_end == msg_end) | |
566 | goto skip; | |
567 | end = mail_end-msg; | |
568 | ||
569 | if (part == 'N' || part == 'E') { /* mailmap lookup */ | |
570 | strlcpy(person_name, name_start, name_end-name_start+1); | |
571 | strlcpy(person_mail, mail_start, mail_end-mail_start+1); | |
572 | mailmap_name(person_mail, sizeof(person_mail), person_name, sizeof(person_name)); | |
573 | name_start = person_name; | |
574 | name_end = name_start + strlen(person_name); | |
575 | mail_start = person_mail; | |
576 | mail_end = mail_start + strlen(person_mail); | |
577 | } | |
e0cbc397 | 578 | if (part == 'n' || part == 'N') { /* name */ |
d20d654f | 579 | strbuf_add(sb, name_start, name_end-name_start); |
c3a670de | 580 | return placeholder_len; |
cde75e59 | 581 | } |
d20d654f MSO |
582 | if (part == 'e' || part == 'E') { /* email */ |
583 | strbuf_add(sb, mail_start, mail_end-mail_start); | |
c3a670de | 584 | return placeholder_len; |
cde75e59 | 585 | } |
93fc05eb | 586 | |
c3a670de | 587 | /* advance 'start' to point to date start delimiter */ |
93fc05eb JS |
588 | for (start = end + 1; start < len && isspace(msg[start]); start++) |
589 | ; /* do nothing */ | |
590 | if (start >= len) | |
c3a670de | 591 | goto skip; |
93fc05eb JS |
592 | date = strtoul(msg + start, &ep, 10); |
593 | if (msg + start == ep) | |
c3a670de | 594 | goto skip; |
93fc05eb | 595 | |
cde75e59 RS |
596 | if (part == 't') { /* date, UNIX timestamp */ |
597 | strbuf_add(sb, msg + start, ep - (msg + start)); | |
c3a670de | 598 | return placeholder_len; |
cde75e59 | 599 | } |
93fc05eb JS |
600 | |
601 | /* parse tz */ | |
602 | for (start = ep - msg + 1; start < len && isspace(msg[start]); start++) | |
603 | ; /* do nothing */ | |
604 | if (start + 1 < len) { | |
605 | tz = strtoul(msg + start + 1, NULL, 10); | |
606 | if (msg[start] == '-') | |
607 | tz = -tz; | |
608 | } | |
609 | ||
cde75e59 RS |
610 | switch (part) { |
611 | case 'd': /* date */ | |
d36f8679 | 612 | strbuf_addstr(sb, show_date(date, tz, dmode)); |
c3a670de | 613 | return placeholder_len; |
cde75e59 RS |
614 | case 'D': /* date, RFC2822 style */ |
615 | strbuf_addstr(sb, show_date(date, tz, DATE_RFC2822)); | |
c3a670de | 616 | return placeholder_len; |
cde75e59 RS |
617 | case 'r': /* date, relative */ |
618 | strbuf_addstr(sb, show_date(date, tz, DATE_RELATIVE)); | |
c3a670de | 619 | return placeholder_len; |
cde75e59 RS |
620 | case 'i': /* date, ISO 8601 */ |
621 | strbuf_addstr(sb, show_date(date, tz, DATE_ISO8601)); | |
c3a670de | 622 | return placeholder_len; |
cde75e59 | 623 | } |
c3a670de MC |
624 | |
625 | skip: | |
626 | /* | |
627 | * bogus commit, 'sb' cannot be updated, but we still need to | |
628 | * compute a valid return value. | |
629 | */ | |
630 | if (part == 'n' || part == 'e' || part == 't' || part == 'd' | |
631 | || part == 'D' || part == 'r' || part == 'i') | |
632 | return placeholder_len; | |
633 | ||
634 | return 0; /* unknown placeholder */ | |
93fc05eb JS |
635 | } |
636 | ||
f29d5958 RS |
637 | struct chunk { |
638 | size_t off; | |
639 | size_t len; | |
640 | }; | |
641 | ||
642 | struct format_commit_context { | |
643 | const struct commit *commit; | |
dd2e794a | 644 | const struct pretty_print_context *pretty_ctx; |
f53bd743 RS |
645 | unsigned commit_header_parsed:1; |
646 | unsigned commit_message_parsed:1; | |
f6667c5e JH |
647 | unsigned commit_signature_parsed:1; |
648 | struct { | |
649 | char *gpg_output; | |
650 | char good_bad; | |
651 | char *signer; | |
652 | } signature; | |
177b29dc | 653 | char *message; |
02edd56b | 654 | size_t width, indent1, indent2; |
f29d5958 RS |
655 | |
656 | /* These offsets are relative to the start of the commit message. */ | |
f29d5958 RS |
657 | struct chunk author; |
658 | struct chunk committer; | |
659 | struct chunk encoding; | |
f53bd743 RS |
660 | size_t message_off; |
661 | size_t subject_off; | |
f29d5958 | 662 | size_t body_off; |
b9c62321 RS |
663 | |
664 | /* The following ones are relative to the result struct strbuf. */ | |
665 | struct chunk abbrev_commit_hash; | |
666 | struct chunk abbrev_tree_hash; | |
667 | struct chunk abbrev_parent_hashes; | |
02edd56b | 668 | size_t wrap_start; |
f29d5958 RS |
669 | }; |
670 | ||
b9c62321 RS |
671 | static int add_again(struct strbuf *sb, struct chunk *chunk) |
672 | { | |
673 | if (chunk->len) { | |
674 | strbuf_adddup(sb, chunk->off, chunk->len); | |
675 | return 1; | |
676 | } | |
677 | ||
678 | /* | |
679 | * We haven't seen this chunk before. Our caller is surely | |
680 | * going to add it the hard way now. Remember the most likely | |
681 | * start of the to-be-added chunk: the current end of the | |
682 | * struct strbuf. | |
683 | */ | |
684 | chunk->off = sb->len; | |
685 | return 0; | |
686 | } | |
687 | ||
f29d5958 | 688 | static void parse_commit_header(struct format_commit_context *context) |
93fc05eb | 689 | { |
177b29dc | 690 | const char *msg = context->message; |
93fc05eb | 691 | int i; |
f29d5958 | 692 | |
f53bd743 | 693 | for (i = 0; msg[i]; i++) { |
f29d5958 RS |
694 | int eol; |
695 | for (eol = i; msg[eol] && msg[eol] != '\n'; eol++) | |
696 | ; /* do nothing */ | |
697 | ||
f29d5958 | 698 | if (i == eol) { |
f53bd743 | 699 | break; |
f29d5958 RS |
700 | } else if (!prefixcmp(msg + i, "author ")) { |
701 | context->author.off = i + 7; | |
702 | context->author.len = eol - i - 7; | |
703 | } else if (!prefixcmp(msg + i, "committer ")) { | |
704 | context->committer.off = i + 10; | |
705 | context->committer.len = eol - i - 10; | |
706 | } else if (!prefixcmp(msg + i, "encoding ")) { | |
707 | context->encoding.off = i + 9; | |
708 | context->encoding.len = eol - i - 9; | |
709 | } | |
710 | i = eol; | |
711 | } | |
f53bd743 | 712 | context->message_off = i; |
f29d5958 RS |
713 | context->commit_header_parsed = 1; |
714 | } | |
715 | ||
46d164b0 SB |
716 | static int istitlechar(char c) |
717 | { | |
718 | return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || | |
719 | (c >= '0' && c <= '9') || c == '.' || c == '_'; | |
720 | } | |
721 | ||
722 | static void format_sanitized_subject(struct strbuf *sb, const char *msg) | |
723 | { | |
724 | size_t trimlen; | |
871d21d4 | 725 | size_t start_len = sb->len; |
46d164b0 SB |
726 | int space = 2; |
727 | ||
728 | for (; *msg && *msg != '\n'; msg++) { | |
729 | if (istitlechar(*msg)) { | |
730 | if (space == 1) | |
731 | strbuf_addch(sb, '-'); | |
732 | space = 0; | |
733 | strbuf_addch(sb, *msg); | |
734 | if (*msg == '.') | |
735 | while (*(msg+1) == '.') | |
736 | msg++; | |
737 | } else | |
738 | space |= 1; | |
739 | } | |
740 | ||
741 | /* trim any trailing '.' or '-' characters */ | |
742 | trimlen = 0; | |
871d21d4 SB |
743 | while (sb->len - trimlen > start_len && |
744 | (sb->buf[sb->len - 1 - trimlen] == '.' | |
745 | || sb->buf[sb->len - 1 - trimlen] == '-')) | |
46d164b0 SB |
746 | trimlen++; |
747 | strbuf_remove(sb, sb->len - trimlen, trimlen); | |
748 | } | |
749 | ||
cec08717 RS |
750 | const char *format_subject(struct strbuf *sb, const char *msg, |
751 | const char *line_separator) | |
88c44735 RS |
752 | { |
753 | int first = 1; | |
754 | ||
755 | for (;;) { | |
756 | const char *line = msg; | |
757 | int linelen = get_one_line(line); | |
758 | ||
759 | msg += linelen; | |
760 | if (!linelen || is_empty_line(line, &linelen)) | |
761 | break; | |
762 | ||
f53bd743 RS |
763 | if (!sb) |
764 | continue; | |
88c44735 RS |
765 | strbuf_grow(sb, linelen + 2); |
766 | if (!first) | |
767 | strbuf_addstr(sb, line_separator); | |
768 | strbuf_add(sb, line, linelen); | |
769 | first = 0; | |
770 | } | |
771 | return msg; | |
772 | } | |
773 | ||
f53bd743 RS |
774 | static void parse_commit_message(struct format_commit_context *c) |
775 | { | |
177b29dc PN |
776 | const char *msg = c->message + c->message_off; |
777 | const char *start = c->message; | |
f53bd743 RS |
778 | |
779 | msg = skip_empty_lines(msg); | |
780 | c->subject_off = msg - start; | |
781 | ||
782 | msg = format_subject(NULL, msg, NULL); | |
783 | msg = skip_empty_lines(msg); | |
784 | c->body_off = msg - start; | |
785 | ||
786 | c->commit_message_parsed = 1; | |
787 | } | |
788 | ||
3b3d443f RS |
789 | static void format_decoration(struct strbuf *sb, const struct commit *commit) |
790 | { | |
791 | struct name_decoration *d; | |
792 | const char *prefix = " ("; | |
793 | ||
33e7018c | 794 | load_ref_decorations(DECORATE_SHORT_REFS); |
3b3d443f RS |
795 | d = lookup_decoration(&name_decoration, &commit->object); |
796 | while (d) { | |
797 | strbuf_addstr(sb, prefix); | |
798 | prefix = ", "; | |
799 | strbuf_addstr(sb, d->name); | |
800 | d = d->next; | |
801 | } | |
802 | if (prefix[0] == ',') | |
803 | strbuf_addch(sb, ')'); | |
804 | } | |
805 | ||
02edd56b RS |
806 | static void strbuf_wrap(struct strbuf *sb, size_t pos, |
807 | size_t width, size_t indent1, size_t indent2) | |
808 | { | |
809 | struct strbuf tmp = STRBUF_INIT; | |
810 | ||
811 | if (pos) | |
812 | strbuf_add(&tmp, sb->buf, pos); | |
813 | strbuf_add_wrapped_text(&tmp, sb->buf + pos, | |
814 | (int) indent1, (int) indent2, (int) width); | |
815 | strbuf_swap(&tmp, sb); | |
816 | strbuf_release(&tmp); | |
817 | } | |
818 | ||
819 | static void rewrap_message_tail(struct strbuf *sb, | |
820 | struct format_commit_context *c, | |
821 | size_t new_width, size_t new_indent1, | |
822 | size_t new_indent2) | |
823 | { | |
824 | if (c->width == new_width && c->indent1 == new_indent1 && | |
825 | c->indent2 == new_indent2) | |
826 | return; | |
32ca4249 | 827 | if (c->wrap_start < sb->len) |
02edd56b RS |
828 | strbuf_wrap(sb, c->wrap_start, c->width, c->indent1, c->indent2); |
829 | c->wrap_start = sb->len; | |
830 | c->width = new_width; | |
831 | c->indent1 = new_indent1; | |
832 | c->indent2 = new_indent2; | |
833 | } | |
834 | ||
f6667c5e JH |
835 | static struct { |
836 | char result; | |
837 | const char *check; | |
838 | } signature_check[] = { | |
839 | { 'G', ": Good signature from " }, | |
840 | { 'B', ": BAD signature from " }, | |
841 | }; | |
842 | ||
843 | static void parse_signature_lines(struct format_commit_context *ctx) | |
844 | { | |
845 | const char *buf = ctx->signature.gpg_output; | |
846 | int i; | |
847 | ||
848 | for (i = 0; i < ARRAY_SIZE(signature_check); i++) { | |
849 | const char *found = strstr(buf, signature_check[i].check); | |
850 | const char *next; | |
851 | if (!found) | |
852 | continue; | |
853 | ctx->signature.good_bad = signature_check[i].result; | |
854 | found += strlen(signature_check[i].check); | |
855 | next = strchrnul(found, '\n'); | |
856 | ctx->signature.signer = xmemdupz(found, next - found); | |
857 | break; | |
858 | } | |
859 | } | |
860 | ||
861 | static void parse_commit_signature(struct format_commit_context *ctx) | |
862 | { | |
863 | struct strbuf payload = STRBUF_INIT; | |
864 | struct strbuf signature = STRBUF_INIT; | |
865 | struct strbuf gpg_output = STRBUF_INIT; | |
866 | int status; | |
867 | ||
868 | ctx->commit_signature_parsed = 1; | |
869 | ||
870 | if (parse_signed_commit(ctx->commit->object.sha1, | |
871 | &payload, &signature) <= 0) | |
872 | goto out; | |
873 | status = verify_signed_buffer(payload.buf, payload.len, | |
874 | signature.buf, signature.len, | |
875 | &gpg_output); | |
876 | if (status && !gpg_output.len) | |
877 | goto out; | |
878 | ctx->signature.gpg_output = strbuf_detach(&gpg_output, NULL); | |
879 | parse_signature_lines(ctx); | |
880 | ||
881 | out: | |
882 | strbuf_release(&gpg_output); | |
883 | strbuf_release(&payload); | |
884 | strbuf_release(&signature); | |
885 | } | |
886 | ||
887 | ||
cd1957f5 JK |
888 | static int format_reflog_person(struct strbuf *sb, |
889 | char part, | |
890 | struct reflog_walk_info *log, | |
891 | enum date_mode dmode) | |
892 | { | |
893 | const char *ident; | |
894 | ||
895 | if (!log) | |
896 | return 2; | |
897 | ||
898 | ident = get_reflog_ident(log); | |
899 | if (!ident) | |
900 | return 2; | |
901 | ||
902 | return format_person_part(sb, part, ident, strlen(ident), dmode); | |
903 | } | |
904 | ||
9fa708da JH |
905 | static size_t format_commit_one(struct strbuf *sb, const char *placeholder, |
906 | void *context) | |
f29d5958 RS |
907 | { |
908 | struct format_commit_context *c = context; | |
909 | const struct commit *commit = c->commit; | |
177b29dc | 910 | const char *msg = c->message; |
f29d5958 | 911 | struct commit_list *p; |
42c8c74c | 912 | int h1, h2; |
93fc05eb | 913 | |
93fc05eb | 914 | /* these are independent of the commit */ |
cde75e59 RS |
915 | switch (placeholder[0]) { |
916 | case 'C': | |
c002922a JK |
917 | if (placeholder[1] == '(') { |
918 | const char *end = strchr(placeholder + 2, ')'); | |
919 | char color[COLOR_MAXLEN]; | |
920 | if (!end) | |
921 | return 0; | |
922 | color_parse_mem(placeholder + 2, | |
923 | end - (placeholder + 2), | |
924 | "--pretty format", color); | |
925 | strbuf_addstr(sb, color); | |
926 | return end - placeholder + 1; | |
927 | } | |
c3a670de | 928 | if (!prefixcmp(placeholder + 1, "red")) { |
dc6ebd4c | 929 | strbuf_addstr(sb, GIT_COLOR_RED); |
c3a670de MC |
930 | return 4; |
931 | } else if (!prefixcmp(placeholder + 1, "green")) { | |
dc6ebd4c | 932 | strbuf_addstr(sb, GIT_COLOR_GREEN); |
c3a670de MC |
933 | return 6; |
934 | } else if (!prefixcmp(placeholder + 1, "blue")) { | |
dc6ebd4c | 935 | strbuf_addstr(sb, GIT_COLOR_BLUE); |
c3a670de MC |
936 | return 5; |
937 | } else if (!prefixcmp(placeholder + 1, "reset")) { | |
dc6ebd4c | 938 | strbuf_addstr(sb, GIT_COLOR_RESET); |
c3a670de MC |
939 | return 6; |
940 | } else | |
941 | return 0; | |
cde75e59 RS |
942 | case 'n': /* newline */ |
943 | strbuf_addch(sb, '\n'); | |
c3a670de | 944 | return 1; |
42c8c74c GS |
945 | case 'x': |
946 | /* %x00 == NUL, %x0a == LF, etc. */ | |
947 | if (0 <= (h1 = hexval_table[0xff & placeholder[1]]) && | |
948 | h1 <= 16 && | |
949 | 0 <= (h2 = hexval_table[0xff & placeholder[2]]) && | |
950 | h2 <= 16) { | |
951 | strbuf_addch(sb, (h1<<4)|h2); | |
952 | return 3; | |
953 | } else | |
954 | return 0; | |
02edd56b RS |
955 | case 'w': |
956 | if (placeholder[1] == '(') { | |
957 | unsigned long width = 0, indent1 = 0, indent2 = 0; | |
958 | char *next; | |
959 | const char *start = placeholder + 2; | |
960 | const char *end = strchr(start, ')'); | |
961 | if (!end) | |
962 | return 0; | |
963 | if (end > start) { | |
964 | width = strtoul(start, &next, 10); | |
965 | if (*next == ',') { | |
966 | indent1 = strtoul(next + 1, &next, 10); | |
967 | if (*next == ',') { | |
968 | indent2 = strtoul(next + 1, | |
969 | &next, 10); | |
970 | } | |
971 | } | |
972 | if (*next != ')') | |
973 | return 0; | |
974 | } | |
975 | rewrap_message_tail(sb, c, width, indent1, indent2); | |
976 | return end - placeholder + 1; | |
977 | } else | |
978 | return 0; | |
cde75e59 | 979 | } |
93fc05eb JS |
980 | |
981 | /* these depend on the commit */ | |
982 | if (!commit->object.parsed) | |
983 | parse_object(commit->object.sha1); | |
93fc05eb | 984 | |
cde75e59 RS |
985 | switch (placeholder[0]) { |
986 | case 'H': /* commit hash */ | |
987 | strbuf_addstr(sb, sha1_to_hex(commit->object.sha1)); | |
c3a670de | 988 | return 1; |
cde75e59 | 989 | case 'h': /* abbreviated commit hash */ |
b9c62321 | 990 | if (add_again(sb, &c->abbrev_commit_hash)) |
c3a670de | 991 | return 1; |
cde75e59 | 992 | strbuf_addstr(sb, find_unique_abbrev(commit->object.sha1, |
c1977021 | 993 | c->pretty_ctx->abbrev)); |
b9c62321 | 994 | c->abbrev_commit_hash.len = sb->len - c->abbrev_commit_hash.off; |
c3a670de | 995 | return 1; |
cde75e59 RS |
996 | case 'T': /* tree hash */ |
997 | strbuf_addstr(sb, sha1_to_hex(commit->tree->object.sha1)); | |
c3a670de | 998 | return 1; |
cde75e59 | 999 | case 't': /* abbreviated tree hash */ |
b9c62321 | 1000 | if (add_again(sb, &c->abbrev_tree_hash)) |
c3a670de | 1001 | return 1; |
cde75e59 | 1002 | strbuf_addstr(sb, find_unique_abbrev(commit->tree->object.sha1, |
c1977021 | 1003 | c->pretty_ctx->abbrev)); |
b9c62321 | 1004 | c->abbrev_tree_hash.len = sb->len - c->abbrev_tree_hash.off; |
c3a670de | 1005 | return 1; |
cde75e59 RS |
1006 | case 'P': /* parent hashes */ |
1007 | for (p = commit->parents; p; p = p->next) { | |
1008 | if (p != commit->parents) | |
1009 | strbuf_addch(sb, ' '); | |
1010 | strbuf_addstr(sb, sha1_to_hex(p->item->object.sha1)); | |
1011 | } | |
c3a670de | 1012 | return 1; |
cde75e59 | 1013 | case 'p': /* abbreviated parent hashes */ |
b9c62321 | 1014 | if (add_again(sb, &c->abbrev_parent_hashes)) |
c3a670de | 1015 | return 1; |
cde75e59 RS |
1016 | for (p = commit->parents; p; p = p->next) { |
1017 | if (p != commit->parents) | |
1018 | strbuf_addch(sb, ' '); | |
1019 | strbuf_addstr(sb, find_unique_abbrev( | |
c1977021 WP |
1020 | p->item->object.sha1, |
1021 | c->pretty_ctx->abbrev)); | |
cde75e59 | 1022 | } |
b9c62321 RS |
1023 | c->abbrev_parent_hashes.len = sb->len - |
1024 | c->abbrev_parent_hashes.off; | |
c3a670de | 1025 | return 1; |
cde75e59 | 1026 | case 'm': /* left/right/bottom */ |
1df2d656 | 1027 | strbuf_addstr(sb, get_revision_mark(NULL, commit)); |
c3a670de | 1028 | return 1; |
3b3d443f RS |
1029 | case 'd': |
1030 | format_decoration(sb, commit); | |
1031 | return 1; | |
8f8f5476 TR |
1032 | case 'g': /* reflog info */ |
1033 | switch(placeholder[1]) { | |
1034 | case 'd': /* reflog selector */ | |
1035 | case 'D': | |
1036 | if (c->pretty_ctx->reflog_info) | |
1037 | get_reflog_selector(sb, | |
1038 | c->pretty_ctx->reflog_info, | |
1039 | c->pretty_ctx->date_mode, | |
1040 | (placeholder[1] == 'd')); | |
1041 | return 2; | |
1042 | case 's': /* reflog message */ | |
1043 | if (c->pretty_ctx->reflog_info) | |
1044 | get_reflog_message(sb, c->pretty_ctx->reflog_info); | |
1045 | return 2; | |
cd1957f5 JK |
1046 | case 'n': |
1047 | case 'N': | |
1048 | case 'e': | |
1049 | case 'E': | |
1050 | return format_reflog_person(sb, | |
1051 | placeholder[1], | |
1052 | c->pretty_ctx->reflog_info, | |
1053 | c->pretty_ctx->date_mode); | |
8f8f5476 TR |
1054 | } |
1055 | return 0; /* unknown %g placeholder */ | |
8b208f02 | 1056 | case 'N': |
5b163603 JG |
1057 | if (c->pretty_ctx->show_notes) { |
1058 | format_display_notes(commit->object.sha1, sb, | |
a6fa5992 | 1059 | get_log_output_encoding(), 0); |
5b163603 JG |
1060 | return 1; |
1061 | } | |
1062 | return 0; | |
cde75e59 RS |
1063 | } |
1064 | ||
f6667c5e JH |
1065 | if (placeholder[0] == 'G') { |
1066 | if (!c->commit_signature_parsed) | |
1067 | parse_commit_signature(c); | |
1068 | switch (placeholder[1]) { | |
1069 | case 'G': | |
1070 | if (c->signature.gpg_output) | |
1071 | strbuf_addstr(sb, c->signature.gpg_output); | |
1072 | break; | |
1073 | case '?': | |
1074 | switch (c->signature.good_bad) { | |
1075 | case 'G': | |
1076 | case 'B': | |
1077 | strbuf_addch(sb, c->signature.good_bad); | |
1078 | } | |
1079 | break; | |
1080 | case 'S': | |
1081 | if (c->signature.signer) | |
1082 | strbuf_addstr(sb, c->signature.signer); | |
1083 | break; | |
1084 | } | |
1085 | return 2; | |
1086 | } | |
1087 | ||
1088 | ||
cde75e59 | 1089 | /* For the rest we have to parse the commit header. */ |
f29d5958 RS |
1090 | if (!c->commit_header_parsed) |
1091 | parse_commit_header(c); | |
93fc05eb | 1092 | |
f29d5958 | 1093 | switch (placeholder[0]) { |
c3a670de MC |
1094 | case 'a': /* author ... */ |
1095 | return format_person_part(sb, placeholder[1], | |
d36f8679 | 1096 | msg + c->author.off, c->author.len, |
dd2e794a | 1097 | c->pretty_ctx->date_mode); |
c3a670de MC |
1098 | case 'c': /* committer ... */ |
1099 | return format_person_part(sb, placeholder[1], | |
d36f8679 | 1100 | msg + c->committer.off, c->committer.len, |
dd2e794a | 1101 | c->pretty_ctx->date_mode); |
c3a670de | 1102 | case 'e': /* encoding */ |
f29d5958 | 1103 | strbuf_add(sb, msg + c->encoding.off, c->encoding.len); |
c3a670de | 1104 | return 1; |
1367b12a EB |
1105 | case 'B': /* raw body */ |
1106 | /* message_off is always left at the initial newline */ | |
1107 | strbuf_addstr(sb, msg + c->message_off + 1); | |
1108 | return 1; | |
f53bd743 RS |
1109 | } |
1110 | ||
1111 | /* Now we need to parse the commit message. */ | |
1112 | if (!c->commit_message_parsed) | |
1113 | parse_commit_message(c); | |
1114 | ||
1115 | switch (placeholder[0]) { | |
1116 | case 's': /* subject */ | |
1117 | format_subject(sb, msg + c->subject_off, " "); | |
1118 | return 1; | |
46d164b0 SB |
1119 | case 'f': /* sanitized subject */ |
1120 | format_sanitized_subject(sb, msg + c->subject_off); | |
1121 | return 1; | |
c3a670de | 1122 | case 'b': /* body */ |
f29d5958 | 1123 | strbuf_addstr(sb, msg + c->body_off); |
c3a670de | 1124 | return 1; |
93fc05eb | 1125 | } |
c3a670de | 1126 | return 0; /* unknown placeholder */ |
cde75e59 RS |
1127 | } |
1128 | ||
9fa708da JH |
1129 | static size_t format_commit_item(struct strbuf *sb, const char *placeholder, |
1130 | void *context) | |
1131 | { | |
1132 | int consumed; | |
1133 | size_t orig_len; | |
1134 | enum { | |
1135 | NO_MAGIC, | |
1136 | ADD_LF_BEFORE_NON_EMPTY, | |
1137 | DEL_LF_BEFORE_EMPTY, | |
223a923c | 1138 | ADD_SP_BEFORE_NON_EMPTY |
9fa708da JH |
1139 | } magic = NO_MAGIC; |
1140 | ||
1141 | switch (placeholder[0]) { | |
1142 | case '-': | |
1143 | magic = DEL_LF_BEFORE_EMPTY; | |
1144 | break; | |
1145 | case '+': | |
1146 | magic = ADD_LF_BEFORE_NON_EMPTY; | |
1147 | break; | |
7b88176e MG |
1148 | case ' ': |
1149 | magic = ADD_SP_BEFORE_NON_EMPTY; | |
1150 | break; | |
9fa708da JH |
1151 | default: |
1152 | break; | |
1153 | } | |
1154 | if (magic != NO_MAGIC) | |
1155 | placeholder++; | |
1156 | ||
1157 | orig_len = sb->len; | |
1158 | consumed = format_commit_one(sb, placeholder, context); | |
1159 | if (magic == NO_MAGIC) | |
1160 | return consumed; | |
1161 | ||
1162 | if ((orig_len == sb->len) && magic == DEL_LF_BEFORE_EMPTY) { | |
1163 | while (sb->len && sb->buf[sb->len - 1] == '\n') | |
1164 | strbuf_setlen(sb, sb->len - 1); | |
7b88176e MG |
1165 | } else if (orig_len != sb->len) { |
1166 | if (magic == ADD_LF_BEFORE_NON_EMPTY) | |
1167 | strbuf_insert(sb, orig_len, "\n", 1); | |
1168 | else if (magic == ADD_SP_BEFORE_NON_EMPTY) | |
1169 | strbuf_insert(sb, orig_len, " ", 1); | |
9fa708da JH |
1170 | } |
1171 | return consumed + 1; | |
1172 | } | |
1173 | ||
5b163603 JG |
1174 | static size_t userformat_want_item(struct strbuf *sb, const char *placeholder, |
1175 | void *context) | |
1176 | { | |
1177 | struct userformat_want *w = context; | |
1178 | ||
7b88176e | 1179 | if (*placeholder == '+' || *placeholder == '-' || *placeholder == ' ') |
5b163603 JG |
1180 | placeholder++; |
1181 | ||
1182 | switch (*placeholder) { | |
1183 | case 'N': | |
1184 | w->notes = 1; | |
1185 | break; | |
1186 | } | |
1187 | return 0; | |
1188 | } | |
1189 | ||
1190 | void userformat_find_requirements(const char *fmt, struct userformat_want *w) | |
1191 | { | |
1192 | struct strbuf dummy = STRBUF_INIT; | |
1193 | ||
1194 | if (!fmt) { | |
1195 | if (!user_format) | |
1196 | return; | |
1197 | fmt = user_format; | |
1198 | } | |
a6253d10 | 1199 | strbuf_expand(&dummy, fmt, userformat_want_item, w); |
5b163603 JG |
1200 | strbuf_release(&dummy); |
1201 | } | |
1202 | ||
cde75e59 | 1203 | void format_commit_message(const struct commit *commit, |
7f98ebc8 | 1204 | const char *format, struct strbuf *sb, |
dd2e794a | 1205 | const struct pretty_print_context *pretty_ctx) |
cde75e59 | 1206 | { |
f29d5958 | 1207 | struct format_commit_context context; |
177b29dc | 1208 | static const char utf8[] = "UTF-8"; |
177b29dc | 1209 | const char *output_enc = pretty_ctx->output_encoding; |
f29d5958 RS |
1210 | |
1211 | memset(&context, 0, sizeof(context)); | |
1212 | context.commit = commit; | |
dd2e794a | 1213 | context.pretty_ctx = pretty_ctx; |
02edd56b | 1214 | context.wrap_start = sb->len; |
177b29dc PN |
1215 | context.message = commit->buffer; |
1216 | if (output_enc) { | |
9cd7a92b | 1217 | char *enc = get_header(commit, "encoding"); |
1d5bd615 | 1218 | if (strcmp(enc ? enc : utf8, output_enc)) { |
177b29dc | 1219 | context.message = logmsg_reencode(commit, output_enc); |
1d5bd615 NTND |
1220 | if (!context.message) |
1221 | context.message = commit->buffer; | |
1222 | } | |
9cd7a92b | 1223 | free(enc); |
177b29dc PN |
1224 | } |
1225 | ||
c3a670de | 1226 | strbuf_expand(sb, format, format_commit_item, &context); |
02edd56b | 1227 | rewrap_message_tail(sb, &context, 0, 0, 0); |
177b29dc PN |
1228 | |
1229 | if (context.message != commit->buffer) | |
1230 | free(context.message); | |
f6667c5e JH |
1231 | free(context.signature.gpg_output); |
1232 | free(context.signature.signer); | |
93fc05eb JS |
1233 | } |
1234 | ||
6bf13944 | 1235 | static void pp_header(const struct pretty_print_context *pp, |
93fc05eb JS |
1236 | const char *encoding, |
1237 | const struct commit *commit, | |
1238 | const char **msg_p, | |
1239 | struct strbuf *sb) | |
1240 | { | |
1241 | int parents_shown = 0; | |
1242 | ||
1243 | for (;;) { | |
1244 | const char *line = *msg_p; | |
1245 | int linelen = get_one_line(*msg_p); | |
1246 | ||
1247 | if (!linelen) | |
1248 | return; | |
1249 | *msg_p += linelen; | |
1250 | ||
1251 | if (linelen == 1) | |
1252 | /* End of header */ | |
1253 | return; | |
1254 | ||
6bf13944 | 1255 | if (pp->fmt == CMIT_FMT_RAW) { |
93fc05eb JS |
1256 | strbuf_add(sb, line, linelen); |
1257 | continue; | |
1258 | } | |
1259 | ||
1260 | if (!memcmp(line, "parent ", 7)) { | |
1261 | if (linelen != 48) | |
1262 | die("bad parent line in commit"); | |
1263 | continue; | |
1264 | } | |
1265 | ||
1266 | if (!parents_shown) { | |
1267 | struct commit_list *parent; | |
1268 | int num; | |
1269 | for (parent = commit->parents, num = 0; | |
1270 | parent; | |
1271 | parent = parent->next, num++) | |
1272 | ; | |
1273 | /* with enough slop */ | |
1274 | strbuf_grow(sb, num * 50 + 20); | |
6bf13944 | 1275 | add_merge_info(pp, sb, commit); |
93fc05eb JS |
1276 | parents_shown = 1; |
1277 | } | |
1278 | ||
1279 | /* | |
1280 | * MEDIUM == DEFAULT shows only author with dates. | |
1281 | * FULL shows both authors but not dates. | |
1282 | * FULLER shows both authors and dates. | |
1283 | */ | |
1284 | if (!memcmp(line, "author ", 7)) { | |
1285 | strbuf_grow(sb, linelen + 80); | |
6bf13944 | 1286 | pp_user_info(pp, "Author", sb, line + 7, encoding); |
93fc05eb JS |
1287 | } |
1288 | if (!memcmp(line, "committer ", 10) && | |
6bf13944 | 1289 | (pp->fmt == CMIT_FMT_FULL || pp->fmt == CMIT_FMT_FULLER)) { |
93fc05eb | 1290 | strbuf_grow(sb, linelen + 80); |
6bf13944 | 1291 | pp_user_info(pp, "Commit", sb, line + 10, encoding); |
93fc05eb JS |
1292 | } |
1293 | } | |
1294 | } | |
1295 | ||
6bf13944 | 1296 | void pp_title_line(const struct pretty_print_context *pp, |
b02bd65f DB |
1297 | const char **msg_p, |
1298 | struct strbuf *sb, | |
b02bd65f | 1299 | const char *encoding, |
267123b4 | 1300 | int need_8bit_cte) |
93fc05eb JS |
1301 | { |
1302 | struct strbuf title; | |
1303 | ||
1304 | strbuf_init(&title, 80); | |
9553d2b2 JK |
1305 | *msg_p = format_subject(&title, *msg_p, |
1306 | pp->preserve_subject ? "\n" : " "); | |
93fc05eb JS |
1307 | |
1308 | strbuf_grow(sb, title.len + 1024); | |
6bf13944 JK |
1309 | if (pp->subject) { |
1310 | strbuf_addstr(sb, pp->subject); | |
93fc05eb JS |
1311 | add_rfc2047(sb, title.buf, title.len, encoding); |
1312 | } else { | |
1313 | strbuf_addbuf(sb, &title); | |
1314 | } | |
1315 | strbuf_addch(sb, '\n'); | |
1316 | ||
6bf4f1b4 | 1317 | if (need_8bit_cte > 0) { |
93fc05eb JS |
1318 | const char *header_fmt = |
1319 | "MIME-Version: 1.0\n" | |
1320 | "Content-Type: text/plain; charset=%s\n" | |
1321 | "Content-Transfer-Encoding: 8bit\n"; | |
1322 | strbuf_addf(sb, header_fmt, encoding); | |
1323 | } | |
6bf13944 JK |
1324 | if (pp->after_subject) { |
1325 | strbuf_addstr(sb, pp->after_subject); | |
93fc05eb | 1326 | } |
6bf13944 | 1327 | if (pp->fmt == CMIT_FMT_EMAIL) { |
93fc05eb JS |
1328 | strbuf_addch(sb, '\n'); |
1329 | } | |
1330 | strbuf_release(&title); | |
1331 | } | |
1332 | ||
6bf13944 | 1333 | void pp_remainder(const struct pretty_print_context *pp, |
b02bd65f DB |
1334 | const char **msg_p, |
1335 | struct strbuf *sb, | |
1336 | int indent) | |
93fc05eb JS |
1337 | { |
1338 | int first = 1; | |
1339 | for (;;) { | |
1340 | const char *line = *msg_p; | |
1341 | int linelen = get_one_line(line); | |
1342 | *msg_p += linelen; | |
1343 | ||
1344 | if (!linelen) | |
1345 | break; | |
1346 | ||
1347 | if (is_empty_line(line, &linelen)) { | |
1348 | if (first) | |
1349 | continue; | |
6bf13944 | 1350 | if (pp->fmt == CMIT_FMT_SHORT) |
93fc05eb JS |
1351 | break; |
1352 | } | |
1353 | first = 0; | |
1354 | ||
1355 | strbuf_grow(sb, linelen + indent + 20); | |
1356 | if (indent) { | |
1357 | memset(sb->buf + sb->len, ' ', indent); | |
1358 | strbuf_setlen(sb, sb->len + indent); | |
1359 | } | |
1360 | strbuf_add(sb, line, linelen); | |
1361 | strbuf_addch(sb, '\n'); | |
1362 | } | |
1363 | } | |
1364 | ||
69cd8f63 AG |
1365 | char *reencode_commit_message(const struct commit *commit, const char **encoding_p) |
1366 | { | |
1367 | const char *encoding; | |
1368 | ||
a6fa5992 | 1369 | encoding = get_log_output_encoding(); |
69cd8f63 AG |
1370 | if (encoding_p) |
1371 | *encoding_p = encoding; | |
1372 | return logmsg_reencode(commit, encoding); | |
1373 | } | |
1374 | ||
6bf13944 JK |
1375 | void pretty_print_commit(const struct pretty_print_context *pp, |
1376 | const struct commit *commit, | |
1377 | struct strbuf *sb) | |
93fc05eb JS |
1378 | { |
1379 | unsigned long beginning_of_body; | |
1380 | int indent = 4; | |
1381 | const char *msg = commit->buffer; | |
1382 | char *reencoded; | |
1383 | const char *encoding; | |
6bf13944 | 1384 | int need_8bit_cte = pp->need_8bit_cte; |
93fc05eb | 1385 | |
6bf13944 JK |
1386 | if (pp->fmt == CMIT_FMT_USERFORMAT) { |
1387 | format_commit_message(commit, user_format, sb, pp); | |
93fc05eb JS |
1388 | return; |
1389 | } | |
1390 | ||
69cd8f63 | 1391 | reencoded = reencode_commit_message(commit, &encoding); |
93fc05eb JS |
1392 | if (reencoded) { |
1393 | msg = reencoded; | |
1394 | } | |
1395 | ||
6bf13944 | 1396 | if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL) |
93fc05eb JS |
1397 | indent = 0; |
1398 | ||
6bf4f1b4 JH |
1399 | /* |
1400 | * We need to check and emit Content-type: to mark it | |
1401 | * as 8-bit if we haven't done so. | |
93fc05eb | 1402 | */ |
6bf13944 | 1403 | if (pp->fmt == CMIT_FMT_EMAIL && need_8bit_cte == 0) { |
93fc05eb JS |
1404 | int i, ch, in_body; |
1405 | ||
1406 | for (in_body = i = 0; (ch = msg[i]); i++) { | |
1407 | if (!in_body) { | |
1408 | /* author could be non 7-bit ASCII but | |
1409 | * the log may be so; skip over the | |
1410 | * header part first. | |
1411 | */ | |
1412 | if (ch == '\n' && msg[i+1] == '\n') | |
1413 | in_body = 1; | |
1414 | } | |
1415 | else if (non_ascii(ch)) { | |
6bf4f1b4 | 1416 | need_8bit_cte = 1; |
93fc05eb JS |
1417 | break; |
1418 | } | |
1419 | } | |
1420 | } | |
1421 | ||
6bf13944 JK |
1422 | pp_header(pp, encoding, commit, &msg, sb); |
1423 | if (pp->fmt != CMIT_FMT_ONELINE && !pp->subject) { | |
93fc05eb JS |
1424 | strbuf_addch(sb, '\n'); |
1425 | } | |
1426 | ||
1427 | /* Skip excess blank lines at the beginning of body, if any... */ | |
a0109668 | 1428 | msg = skip_empty_lines(msg); |
93fc05eb JS |
1429 | |
1430 | /* These formats treat the title line specially. */ | |
6bf13944 JK |
1431 | if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL) |
1432 | pp_title_line(pp, &msg, sb, encoding, need_8bit_cte); | |
93fc05eb JS |
1433 | |
1434 | beginning_of_body = sb->len; | |
6bf13944 JK |
1435 | if (pp->fmt != CMIT_FMT_ONELINE) |
1436 | pp_remainder(pp, &msg, sb, indent); | |
93fc05eb JS |
1437 | strbuf_rtrim(sb); |
1438 | ||
1439 | /* Make sure there is an EOLN for the non-oneline case */ | |
6bf13944 | 1440 | if (pp->fmt != CMIT_FMT_ONELINE) |
93fc05eb JS |
1441 | strbuf_addch(sb, '\n'); |
1442 | ||
1443 | /* | |
1444 | * The caller may append additional body text in e-mail | |
1445 | * format. Make sure we did not strip the blank line | |
1446 | * between the header and the body. | |
1447 | */ | |
6bf13944 | 1448 | if (pp->fmt == CMIT_FMT_EMAIL && sb->len <= beginning_of_body) |
93fc05eb | 1449 | strbuf_addch(sb, '\n'); |
a97a7468 | 1450 | |
6bf13944 | 1451 | if (pp->show_notes) |
894a9d33 TR |
1452 | format_display_notes(commit->object.sha1, sb, encoding, |
1453 | NOTES_SHOW_HEADER | NOTES_INDENT); | |
a97a7468 | 1454 | |
93fc05eb JS |
1455 | free(reencoded); |
1456 | } | |
8b8a5374 JK |
1457 | |
1458 | void pp_commit_easy(enum cmit_fmt fmt, const struct commit *commit, | |
1459 | struct strbuf *sb) | |
1460 | { | |
1461 | struct pretty_print_context pp = {0}; | |
6bf13944 JK |
1462 | pp.fmt = fmt; |
1463 | pretty_print_commit(&pp, commit, sb); | |
8b8a5374 | 1464 | } |