Commit | Line | Data |
---|---|---|
5f1c3f07 JH |
1 | #include "cache.h" |
2 | #include "diff.h" | |
3 | #include "commit.h" | |
cab4feb6 | 4 | #include "tag.h" |
7fefda5c | 5 | #include "graph.h" |
5f1c3f07 | 6 | #include "log-tree.h" |
8860fd42 | 7 | #include "reflog-walk.h" |
cab4feb6 | 8 | #include "refs.h" |
b079c50e | 9 | #include "string-list.h" |
67a4b586 | 10 | #include "color.h" |
0c37f1fc | 11 | #include "gpg-interface.h" |
5f1c3f07 | 12 | |
ca135e7a LT |
13 | struct decoration name_decoration = { "object names" }; |
14 | ||
a7524128 NR |
15 | enum decoration_type { |
16 | DECORATION_NONE = 0, | |
17 | DECORATION_REF_LOCAL, | |
18 | DECORATION_REF_REMOTE, | |
19 | DECORATION_REF_TAG, | |
20 | DECORATION_REF_STASH, | |
21 | DECORATION_REF_HEAD, | |
76f5df30 | 22 | DECORATION_GRAFTED, |
a7524128 NR |
23 | }; |
24 | ||
67a4b586 NR |
25 | static char decoration_colors[][COLOR_MAXLEN] = { |
26 | GIT_COLOR_RESET, | |
27 | GIT_COLOR_BOLD_GREEN, /* REF_LOCAL */ | |
28 | GIT_COLOR_BOLD_RED, /* REF_REMOTE */ | |
29 | GIT_COLOR_BOLD_YELLOW, /* REF_TAG */ | |
30 | GIT_COLOR_BOLD_MAGENTA, /* REF_STASH */ | |
31 | GIT_COLOR_BOLD_CYAN, /* REF_HEAD */ | |
76f5df30 | 32 | GIT_COLOR_BOLD_BLUE, /* GRAFTED */ |
67a4b586 NR |
33 | }; |
34 | ||
35 | static const char *decorate_get_color(int decorate_use_color, enum decoration_type ix) | |
36 | { | |
daa0c3d9 | 37 | if (want_color(decorate_use_color)) |
67a4b586 NR |
38 | return decoration_colors[ix]; |
39 | return ""; | |
40 | } | |
41 | ||
5e11bee6 NR |
42 | static int parse_decorate_color_slot(const char *slot) |
43 | { | |
44 | /* | |
45 | * We're comparing with 'ignore-case' on | |
46 | * (because config.c sets them all tolower), | |
47 | * but let's match the letters in the literal | |
48 | * string values here with how they are | |
49 | * documented in Documentation/config.txt, for | |
50 | * consistency. | |
51 | * | |
52 | * We love being consistent, don't we? | |
53 | */ | |
54 | if (!strcasecmp(slot, "branch")) | |
55 | return DECORATION_REF_LOCAL; | |
56 | if (!strcasecmp(slot, "remoteBranch")) | |
57 | return DECORATION_REF_REMOTE; | |
58 | if (!strcasecmp(slot, "tag")) | |
59 | return DECORATION_REF_TAG; | |
60 | if (!strcasecmp(slot, "stash")) | |
61 | return DECORATION_REF_STASH; | |
62 | if (!strcasecmp(slot, "HEAD")) | |
63 | return DECORATION_REF_HEAD; | |
64 | return -1; | |
65 | } | |
66 | ||
67 | int parse_decorate_color_config(const char *var, const int ofs, const char *value) | |
68 | { | |
69 | int slot = parse_decorate_color_slot(var + ofs); | |
70 | if (slot < 0) | |
71 | return 0; | |
72 | if (!value) | |
73 | return config_error_nonbool(var); | |
74 | color_parse(value, var, decoration_colors[slot]); | |
75 | return 0; | |
76 | } | |
77 | ||
67a4b586 NR |
78 | /* |
79 | * log-tree.c uses DIFF_OPT_TST for determining whether to use color | |
80 | * for showing the commit sha1, use the same check for --decorate | |
81 | */ | |
82 | #define decorate_get_color_opt(o, ix) \ | |
f1c96261 | 83 | decorate_get_color((o)->use_color, ix) |
67a4b586 | 84 | |
a7524128 | 85 | static void add_name_decoration(enum decoration_type type, const char *name, struct object *obj) |
cab4feb6 | 86 | { |
cab4feb6 | 87 | int nlen = strlen(name); |
a7524128 NR |
88 | struct name_decoration *res = xmalloc(sizeof(struct name_decoration) + nlen); |
89 | memcpy(res->name, name, nlen + 1); | |
90 | res->type = type; | |
cab4feb6 RS |
91 | res->next = add_decoration(&name_decoration, obj, res); |
92 | } | |
93 | ||
94 | static int add_ref_decoration(const char *refname, const unsigned char *sha1, int flags, void *cb_data) | |
95 | { | |
5267d292 | 96 | struct object *obj; |
a7524128 | 97 | enum decoration_type type = DECORATION_NONE; |
5267d292 NTND |
98 | |
99 | if (!prefixcmp(refname, "refs/replace/")) { | |
100 | unsigned char original_sha1[20]; | |
b9ad5002 MG |
101 | if (!read_replace_refs) |
102 | return 0; | |
5267d292 NTND |
103 | if (get_sha1_hex(refname + 13, original_sha1)) { |
104 | warning("invalid replace ref %s", refname); | |
105 | return 0; | |
106 | } | |
107 | obj = parse_object(original_sha1); | |
108 | if (obj) | |
109 | add_name_decoration(DECORATION_GRAFTED, "replaced", obj); | |
110 | return 0; | |
111 | } | |
112 | ||
113 | obj = parse_object(sha1); | |
cab4feb6 RS |
114 | if (!obj) |
115 | return 0; | |
a7524128 | 116 | |
594ffe80 | 117 | if (!prefixcmp(refname, "refs/heads/")) |
a7524128 | 118 | type = DECORATION_REF_LOCAL; |
594ffe80 | 119 | else if (!prefixcmp(refname, "refs/remotes/")) |
a7524128 | 120 | type = DECORATION_REF_REMOTE; |
594ffe80 | 121 | else if (!prefixcmp(refname, "refs/tags/")) |
a7524128 | 122 | type = DECORATION_REF_TAG; |
97ba642b | 123 | else if (!strcmp(refname, "refs/stash")) |
a7524128 | 124 | type = DECORATION_REF_STASH; |
97ba642b | 125 | else if (!strcmp(refname, "HEAD")) |
a7524128 NR |
126 | type = DECORATION_REF_HEAD; |
127 | ||
33e7018c LH |
128 | if (!cb_data || *(int *)cb_data == DECORATE_SHORT_REFS) |
129 | refname = prettify_refname(refname); | |
a7524128 | 130 | add_name_decoration(type, refname, obj); |
cab4feb6 RS |
131 | while (obj->type == OBJ_TAG) { |
132 | obj = ((struct tag *)obj)->tagged; | |
133 | if (!obj) | |
134 | break; | |
a7524128 | 135 | add_name_decoration(DECORATION_REF_TAG, refname, obj); |
cab4feb6 RS |
136 | } |
137 | return 0; | |
138 | } | |
139 | ||
76f5df30 NTND |
140 | static int add_graft_decoration(const struct commit_graft *graft, void *cb_data) |
141 | { | |
142 | struct commit *commit = lookup_commit(graft->sha1); | |
143 | if (!commit) | |
144 | return 0; | |
145 | add_name_decoration(DECORATION_GRAFTED, "grafted", &commit->object); | |
146 | return 0; | |
147 | } | |
148 | ||
33e7018c | 149 | void load_ref_decorations(int flags) |
cab4feb6 RS |
150 | { |
151 | static int loaded; | |
152 | if (!loaded) { | |
153 | loaded = 1; | |
33e7018c | 154 | for_each_ref(add_ref_decoration, &flags); |
77abcbdc | 155 | head_ref(add_ref_decoration, &flags); |
76f5df30 | 156 | for_each_commit_graft(add_graft_decoration, NULL); |
cab4feb6 RS |
157 | } |
158 | } | |
159 | ||
c8c893c6 LT |
160 | static void show_parents(struct commit *commit, int abbrev) |
161 | { | |
162 | struct commit_list *p; | |
163 | for (p = commit->parents; p ; p = p->next) { | |
164 | struct commit *parent = p->item; | |
7fcda920 | 165 | printf(" %s", find_unique_abbrev(parent->object.sha1, abbrev)); |
c8c893c6 LT |
166 | } |
167 | } | |
168 | ||
91b849b2 JS |
169 | static void show_children(struct rev_info *opt, struct commit *commit, int abbrev) |
170 | { | |
171 | struct commit_list *p = lookup_decoration(&opt->children, &commit->object); | |
172 | for ( ; p; p = p->next) { | |
173 | printf(" %s", find_unique_abbrev(p->item->object.sha1, abbrev)); | |
174 | } | |
175 | } | |
176 | ||
0f3a290b | 177 | void show_decorations(struct rev_info *opt, struct commit *commit) |
ca135e7a LT |
178 | { |
179 | const char *prefix; | |
180 | struct name_decoration *decoration; | |
67a4b586 NR |
181 | const char *color_commit = |
182 | diff_get_color_opt(&opt->diffopt, DIFF_COMMIT); | |
183 | const char *color_reset = | |
184 | decorate_get_color_opt(&opt->diffopt, DECORATION_NONE); | |
ca135e7a | 185 | |
0f3a290b | 186 | if (opt->show_source && commit->util) |
8c4021ab | 187 | printf("\t%s", (char *) commit->util); |
d467a525 LT |
188 | if (!opt->show_decorations) |
189 | return; | |
ca135e7a LT |
190 | decoration = lookup_decoration(&name_decoration, &commit->object); |
191 | if (!decoration) | |
192 | return; | |
193 | prefix = " ("; | |
194 | while (decoration) { | |
a7524128 | 195 | printf("%s", prefix); |
67a4b586 NR |
196 | fputs(decorate_get_color_opt(&opt->diffopt, decoration->type), |
197 | stdout); | |
a7524128 | 198 | if (decoration->type == DECORATION_REF_TAG) |
67a4b586 | 199 | fputs("tag: ", stdout); |
a7524128 | 200 | printf("%s", decoration->name); |
67a4b586 NR |
201 | fputs(color_reset, stdout); |
202 | fputs(color_commit, stdout); | |
ca135e7a LT |
203 | prefix = ", "; |
204 | decoration = decoration->next; | |
205 | } | |
206 | putchar(')'); | |
207 | } | |
208 | ||
fc1c75ec FBH |
209 | /* |
210 | * Search for "^[-A-Za-z]+: [^@]+@" pattern. It usually matches | |
211 | * Signed-off-by: and Acked-by: lines. | |
212 | */ | |
213 | static int detect_any_signoff(char *letter, int size) | |
214 | { | |
fd13b21f | 215 | char *cp; |
fc1c75ec FBH |
216 | int seen_colon = 0; |
217 | int seen_at = 0; | |
218 | int seen_name = 0; | |
219 | int seen_head = 0; | |
220 | ||
221 | cp = letter + size; | |
fd13b21f | 222 | while (letter <= --cp && *cp == '\n') |
fc1c75ec FBH |
223 | continue; |
224 | ||
225 | while (letter <= cp) { | |
fd13b21f | 226 | char ch = *cp--; |
fc1c75ec FBH |
227 | if (ch == '\n') |
228 | break; | |
229 | ||
230 | if (!seen_at) { | |
231 | if (ch == '@') | |
232 | seen_at = 1; | |
233 | continue; | |
234 | } | |
235 | if (!seen_colon) { | |
236 | if (ch == '@') | |
237 | return 0; | |
238 | else if (ch == ':') | |
239 | seen_colon = 1; | |
240 | else | |
241 | seen_name = 1; | |
242 | continue; | |
243 | } | |
244 | if (('A' <= ch && ch <= 'Z') || | |
245 | ('a' <= ch && ch <= 'z') || | |
246 | ch == '-') { | |
247 | seen_head = 1; | |
248 | continue; | |
249 | } | |
250 | /* no empty last line doesn't match */ | |
251 | return 0; | |
252 | } | |
253 | return seen_head && seen_name; | |
254 | } | |
255 | ||
674d1727 | 256 | static void append_signoff(struct strbuf *sb, const char *signoff) |
cf2251b6 | 257 | { |
cf2251b6 | 258 | static const char signed_off_by[] = "Signed-off-by: "; |
80583c0e | 259 | size_t signoff_len = strlen(signoff); |
fc1c75ec | 260 | int has_signoff = 0; |
80583c0e | 261 | char *cp; |
cf2251b6 | 262 | |
674d1727 | 263 | cp = sb->buf; |
cf2251b6 JH |
264 | |
265 | /* First see if we already have the sign-off by the signer */ | |
fc1c75ec FBH |
266 | while ((cp = strstr(cp, signed_off_by))) { |
267 | ||
268 | has_signoff = 1; | |
269 | ||
cf2251b6 | 270 | cp += strlen(signed_off_by); |
674d1727 | 271 | if (cp + signoff_len >= sb->buf + sb->len) |
fc1c75ec FBH |
272 | break; |
273 | if (strncmp(cp, signoff, signoff_len)) | |
274 | continue; | |
275 | if (!isspace(cp[signoff_len])) | |
276 | continue; | |
277 | /* we already have him */ | |
674d1727 | 278 | return; |
cf2251b6 JH |
279 | } |
280 | ||
fc1c75ec | 281 | if (!has_signoff) |
674d1727 | 282 | has_signoff = detect_any_signoff(sb->buf, sb->len); |
fc1c75ec FBH |
283 | |
284 | if (!has_signoff) | |
674d1727 | 285 | strbuf_addch(sb, '\n'); |
c35f4c37 | 286 | |
674d1727 PH |
287 | strbuf_addstr(sb, signed_off_by); |
288 | strbuf_add(sb, signoff, signoff_len); | |
289 | strbuf_addch(sb, '\n'); | |
cf2251b6 JH |
290 | } |
291 | ||
e00de24b JS |
292 | static unsigned int digits_in_number(unsigned int number) |
293 | { | |
294 | unsigned int i = 10, result = 1; | |
295 | while (i <= number) { | |
296 | i *= 10; | |
297 | result++; | |
298 | } | |
299 | return result; | |
300 | } | |
301 | ||
a21c2f94 JK |
302 | void get_patch_filename(struct commit *commit, const char *subject, int nr, |
303 | const char *suffix, struct strbuf *buf) | |
6fa8e627 SB |
304 | { |
305 | int suffix_len = strlen(suffix) + 1; | |
306 | int start_len = buf->len; | |
307 | ||
a21c2f94 JK |
308 | strbuf_addf(buf, commit || subject ? "%04d-" : "%d", nr); |
309 | if (commit || subject) { | |
b09b868f | 310 | int max_len = start_len + FORMAT_PATCH_NAME_MAX - suffix_len; |
dd2e794a | 311 | struct pretty_print_context ctx = {0}; |
b09b868f | 312 | |
a21c2f94 JK |
313 | if (subject) |
314 | strbuf_addstr(buf, subject); | |
315 | else if (commit) | |
316 | format_commit_message(commit, "%f", buf, &ctx); | |
317 | ||
b09b868f CC |
318 | if (max_len < buf->len) |
319 | strbuf_setlen(buf, max_len); | |
320 | strbuf_addstr(buf, suffix); | |
6fa8e627 SB |
321 | } |
322 | } | |
323 | ||
108dab28 | 324 | void log_write_email_headers(struct rev_info *opt, struct commit *commit, |
267123b4 JH |
325 | const char **subject_p, |
326 | const char **extra_headers_p, | |
327 | int *need_8bit_cte_p) | |
b02bd65f DB |
328 | { |
329 | const char *subject = NULL; | |
330 | const char *extra_headers = opt->extra_headers; | |
108dab28 | 331 | const char *name = sha1_to_hex(commit->object.sha1); |
267123b4 JH |
332 | |
333 | *need_8bit_cte_p = 0; /* unknown */ | |
b02bd65f DB |
334 | if (opt->total > 0) { |
335 | static char buffer[64]; | |
336 | snprintf(buffer, sizeof(buffer), | |
e7af8e49 | 337 | "Subject: [%s%s%0*d/%d] ", |
b02bd65f | 338 | opt->subject_prefix, |
e7af8e49 | 339 | *opt->subject_prefix ? " " : "", |
b02bd65f DB |
340 | digits_in_number(opt->total), |
341 | opt->nr, opt->total); | |
342 | subject = buffer; | |
343 | } else if (opt->total == 0 && opt->subject_prefix && *opt->subject_prefix) { | |
344 | static char buffer[256]; | |
345 | snprintf(buffer, sizeof(buffer), | |
346 | "Subject: [%s] ", | |
347 | opt->subject_prefix); | |
348 | subject = buffer; | |
349 | } else { | |
350 | subject = "Subject: "; | |
351 | } | |
352 | ||
353 | printf("From %s Mon Sep 17 00:00:00 2001\n", name); | |
7fefda5c AS |
354 | graph_show_oneline(opt->graph); |
355 | if (opt->message_id) { | |
b02bd65f | 356 | printf("Message-Id: <%s>\n", opt->message_id); |
7fefda5c AS |
357 | graph_show_oneline(opt->graph); |
358 | } | |
b079c50e TR |
359 | if (opt->ref_message_ids && opt->ref_message_ids->nr > 0) { |
360 | int i, n; | |
361 | n = opt->ref_message_ids->nr; | |
362 | printf("In-Reply-To: <%s>\n", opt->ref_message_ids->items[n-1].string); | |
363 | for (i = 0; i < n; i++) | |
364 | printf("%s<%s>\n", (i > 0 ? "\t" : "References: "), | |
365 | opt->ref_message_ids->items[i].string); | |
7fefda5c AS |
366 | graph_show_oneline(opt->graph); |
367 | } | |
b02bd65f DB |
368 | if (opt->mime_boundary) { |
369 | static char subject_buffer[1024]; | |
370 | static char buffer[1024]; | |
108dab28 | 371 | struct strbuf filename = STRBUF_INIT; |
267123b4 | 372 | *need_8bit_cte_p = -1; /* NEVER */ |
b02bd65f DB |
373 | snprintf(subject_buffer, sizeof(subject_buffer) - 1, |
374 | "%s" | |
375 | "MIME-Version: 1.0\n" | |
376 | "Content-Type: multipart/mixed;" | |
377 | " boundary=\"%s%s\"\n" | |
378 | "\n" | |
379 | "This is a multi-part message in MIME " | |
380 | "format.\n" | |
381 | "--%s%s\n" | |
382 | "Content-Type: text/plain; " | |
383 | "charset=UTF-8; format=fixed\n" | |
384 | "Content-Transfer-Encoding: 8bit\n\n", | |
385 | extra_headers ? extra_headers : "", | |
386 | mime_boundary_leader, opt->mime_boundary, | |
387 | mime_boundary_leader, opt->mime_boundary); | |
388 | extra_headers = subject_buffer; | |
389 | ||
a21c2f94 JK |
390 | get_patch_filename(opt->numbered_files ? NULL : commit, NULL, |
391 | opt->nr, opt->patch_suffix, &filename); | |
b02bd65f | 392 | snprintf(buffer, sizeof(buffer) - 1, |
6b2fbaaf | 393 | "\n--%s%s\n" |
b02bd65f | 394 | "Content-Type: text/x-patch;" |
108dab28 | 395 | " name=\"%s\"\n" |
b02bd65f DB |
396 | "Content-Transfer-Encoding: 8bit\n" |
397 | "Content-Disposition: %s;" | |
108dab28 | 398 | " filename=\"%s\"\n\n", |
b02bd65f | 399 | mime_boundary_leader, opt->mime_boundary, |
108dab28 | 400 | filename.buf, |
b02bd65f | 401 | opt->no_inline ? "attachment" : "inline", |
108dab28 | 402 | filename.buf); |
b02bd65f | 403 | opt->diffopt.stat_sep = buffer; |
108dab28 | 404 | strbuf_release(&filename); |
b02bd65f DB |
405 | } |
406 | *subject_p = subject; | |
407 | *extra_headers_p = extra_headers; | |
408 | } | |
409 | ||
c6b3ec41 JH |
410 | static void show_sig_lines(struct rev_info *opt, int status, const char *bol) |
411 | { | |
412 | const char *color, *reset, *eol; | |
413 | ||
414 | color = diff_get_color_opt(&opt->diffopt, | |
415 | status ? DIFF_WHITESPACE : DIFF_FRAGINFO); | |
416 | reset = diff_get_color_opt(&opt->diffopt, DIFF_RESET); | |
417 | while (*bol) { | |
418 | eol = strchrnul(bol, '\n'); | |
419 | printf("%s%.*s%s%s", color, (int)(eol - bol), bol, reset, | |
420 | *eol ? "\n" : ""); | |
421 | bol = (*eol) ? (eol + 1) : eol; | |
422 | } | |
423 | } | |
424 | ||
0c37f1fc JH |
425 | static void show_signature(struct rev_info *opt, struct commit *commit) |
426 | { | |
427 | struct strbuf payload = STRBUF_INIT; | |
428 | struct strbuf signature = STRBUF_INIT; | |
429 | struct strbuf gpg_output = STRBUF_INIT; | |
430 | int status; | |
0c37f1fc JH |
431 | |
432 | if (parse_signed_commit(commit->object.sha1, &payload, &signature) <= 0) | |
433 | goto out; | |
434 | ||
435 | status = verify_signed_buffer(payload.buf, payload.len, | |
436 | signature.buf, signature.len, | |
437 | &gpg_output); | |
438 | if (status && !gpg_output.len) | |
439 | strbuf_addstr(&gpg_output, "No signature\n"); | |
440 | ||
c6b3ec41 | 441 | show_sig_lines(opt, status, gpg_output.buf); |
0c37f1fc JH |
442 | |
443 | out: | |
444 | strbuf_release(&gpg_output); | |
445 | strbuf_release(&payload); | |
446 | strbuf_release(&signature); | |
447 | } | |
448 | ||
824958e5 JH |
449 | static int which_parent(const unsigned char *sha1, const struct commit *commit) |
450 | { | |
451 | int nth; | |
452 | const struct commit_list *parent; | |
453 | ||
454 | for (nth = 0, parent = commit->parents; parent; parent = parent->next) { | |
455 | if (!hashcmp(parent->item->object.sha1, sha1)) | |
456 | return nth; | |
457 | nth++; | |
458 | } | |
459 | return -1; | |
460 | } | |
461 | ||
d041ffa5 JH |
462 | static int is_common_merge(const struct commit *commit) |
463 | { | |
464 | return (commit->parents | |
465 | && commit->parents->next | |
466 | && !commit->parents->next->next); | |
467 | } | |
468 | ||
824958e5 JH |
469 | static void show_one_mergetag(struct rev_info *opt, |
470 | struct commit_extra_header *extra, | |
471 | struct commit *commit) | |
472 | { | |
473 | unsigned char sha1[20]; | |
474 | struct tag *tag; | |
475 | struct strbuf verify_message; | |
476 | int status, nth; | |
477 | size_t payload_size, gpg_message_offset; | |
478 | ||
479 | hash_sha1_file(extra->value, extra->len, typename(OBJ_TAG), sha1); | |
480 | tag = lookup_tag(sha1); | |
481 | if (!tag) | |
482 | return; /* error message already given */ | |
483 | ||
484 | strbuf_init(&verify_message, 256); | |
485 | if (parse_tag_buffer(tag, extra->value, extra->len)) | |
486 | strbuf_addstr(&verify_message, "malformed mergetag\n"); | |
d041ffa5 JH |
487 | else if (is_common_merge(commit) && |
488 | !hashcmp(tag->tagged->sha1, | |
489 | commit->parents->next->item->object.sha1)) | |
490 | strbuf_addf(&verify_message, | |
491 | "merged tag '%s'\n", tag->tag); | |
824958e5 JH |
492 | else if ((nth = which_parent(tag->tagged->sha1, commit)) < 0) |
493 | strbuf_addf(&verify_message, "tag %s names a non-parent %s\n", | |
494 | tag->tag, tag->tagged->sha1); | |
495 | else | |
496 | strbuf_addf(&verify_message, | |
497 | "parent #%d, tagged '%s'\n", nth + 1, tag->tag); | |
498 | gpg_message_offset = verify_message.len; | |
499 | ||
500 | payload_size = parse_signature(extra->value, extra->len); | |
501 | if ((extra->len <= payload_size) || | |
502 | (verify_signed_buffer(extra->value, payload_size, | |
503 | extra->value + payload_size, | |
504 | extra->len - payload_size, | |
505 | &verify_message) && | |
506 | verify_message.len <= gpg_message_offset)) { | |
507 | strbuf_addstr(&verify_message, "No signature\n"); | |
508 | status = -1; | |
509 | } | |
510 | else if (strstr(verify_message.buf + gpg_message_offset, | |
511 | ": Good signature from ")) | |
512 | status = 0; | |
513 | else | |
514 | status = -1; | |
515 | ||
516 | show_sig_lines(opt, status, verify_message.buf); | |
517 | strbuf_release(&verify_message); | |
518 | } | |
519 | ||
520 | static void show_mergetag(struct rev_info *opt, struct commit *commit) | |
521 | { | |
522 | struct commit_extra_header *extra, *to_free; | |
523 | ||
524 | to_free = read_commit_extra_headers(commit, NULL); | |
525 | for (extra = to_free; extra; extra = extra->next) { | |
526 | if (strcmp(extra->key, "mergetag")) | |
527 | continue; /* not a merge tag */ | |
528 | show_one_mergetag(opt, extra, commit); | |
529 | } | |
530 | free_commit_extra_headers(to_free); | |
531 | } | |
532 | ||
02865655 | 533 | void show_log(struct rev_info *opt) |
91539833 | 534 | { |
f285a2d7 | 535 | struct strbuf msgbuf = STRBUF_INIT; |
39bc9a6c | 536 | struct log_info *log = opt->loginfo; |
91539833 | 537 | struct commit *commit = log->commit, *parent = log->parent; |
91539833 | 538 | int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40; |
dd2e794a TR |
539 | const char *extra_headers = opt->extra_headers; |
540 | struct pretty_print_context ctx = {0}; | |
91539833 LT |
541 | |
542 | opt->loginfo = NULL; | |
66b2ed09 | 543 | ctx.show_notes = opt->show_notes; |
91539833 | 544 | if (!opt->verbose_header) { |
7fefda5c AS |
545 | graph_show_commit(opt->graph); |
546 | ||
1df2d656 | 547 | if (!opt->graph) |
b1b47554 | 548 | put_revision_mark(opt, commit); |
7fcda920 | 549 | fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit), stdout); |
885cf808 | 550 | if (opt->print_parents) |
c8c893c6 | 551 | show_parents(commit, abbrev_commit); |
91b849b2 JS |
552 | if (opt->children.name) |
553 | show_children(opt, commit, abbrev_commit); | |
0f3a290b | 554 | show_decorations(opt, commit); |
7fefda5c AS |
555 | if (opt->graph && !graph_is_commit_finished(opt->graph)) { |
556 | putchar('\n'); | |
557 | graph_show_remainder(opt->graph); | |
558 | } | |
1dcb6922 | 559 | putchar(opt->diffopt.line_termination); |
91539833 LT |
560 | return; |
561 | } | |
562 | ||
563 | /* | |
8715227d JK |
564 | * If use_terminator is set, we already handled any record termination |
565 | * at the end of the last record. | |
02865655 AS |
566 | * Otherwise, add a diffopt.line_termination character before all |
567 | * entries but the first. (IOW, as a separator between entries) | |
91539833 | 568 | */ |
7fefda5c AS |
569 | if (opt->shown_one && !opt->use_terminator) { |
570 | /* | |
571 | * If entries are separated by a newline, the output | |
572 | * should look human-readable. If the last entry ended | |
573 | * with a newline, print the graph output before this | |
574 | * newline. Otherwise it will end up as a completely blank | |
575 | * line and will look like a gap in the graph. | |
576 | * | |
577 | * If the entry separator is not a newline, the output is | |
578 | * primarily intended for programmatic consumption, and we | |
579 | * never want the extra graph output before the entry | |
580 | * separator. | |
581 | */ | |
582 | if (opt->diffopt.line_termination == '\n' && | |
583 | !opt->missing_newline) | |
584 | graph_show_padding(opt->graph); | |
abd4e222 | 585 | putchar(opt->diffopt.line_termination); |
7fefda5c | 586 | } |
91539833 LT |
587 | opt->shown_one = 1; |
588 | ||
7fefda5c AS |
589 | /* |
590 | * If the history graph was requested, | |
591 | * print the graph, up to this commit's line | |
592 | */ | |
593 | graph_show_commit(opt->graph); | |
594 | ||
91539833 LT |
595 | /* |
596 | * Print header line of header.. | |
597 | */ | |
3eefc189 | 598 | |
596524b3 | 599 | if (opt->commit_format == CMIT_FMT_EMAIL) { |
dd2e794a TR |
600 | log_write_email_headers(opt, commit, &ctx.subject, &extra_headers, |
601 | &ctx.need_8bit_cte); | |
e52a5de4 | 602 | } else if (opt->commit_format != CMIT_FMT_USERFORMAT) { |
8f67f8ae | 603 | fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), stdout); |
74bd9029 JH |
604 | if (opt->commit_format != CMIT_FMT_ONELINE) |
605 | fputs("commit ", stdout); | |
7528f27d | 606 | |
1df2d656 | 607 | if (!opt->graph) |
b1b47554 | 608 | put_revision_mark(opt, commit); |
7fcda920 | 609 | fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit), |
74bd9029 | 610 | stdout); |
885cf808 | 611 | if (opt->print_parents) |
c66b6c06 | 612 | show_parents(commit, abbrev_commit); |
91b849b2 JS |
613 | if (opt->children.name) |
614 | show_children(opt, commit, abbrev_commit); | |
73f0a157 | 615 | if (parent) |
3eefc189 | 616 | printf(" (from %s)", |
7fcda920 | 617 | find_unique_abbrev(parent->object.sha1, |
3eefc189 | 618 | abbrev_commit)); |
0f3a290b | 619 | show_decorations(opt, commit); |
8f67f8ae | 620 | printf("%s", diff_get_color_opt(&opt->diffopt, DIFF_RESET)); |
7fefda5c AS |
621 | if (opt->commit_format == CMIT_FMT_ONELINE) { |
622 | putchar(' '); | |
623 | } else { | |
624 | putchar('\n'); | |
625 | graph_show_oneline(opt->graph); | |
626 | } | |
903b45fe | 627 | if (opt->reflog_info) { |
7fefda5c AS |
628 | /* |
629 | * setup_revisions() ensures that opt->reflog_info | |
630 | * and opt->graph cannot both be set, | |
631 | * so we don't need to worry about printing the | |
632 | * graph info here. | |
633 | */ | |
4d12a471 | 634 | show_reflog_message(opt->reflog_info, |
55ccf85a JH |
635 | opt->commit_format == CMIT_FMT_ONELINE, |
636 | opt->date_mode, | |
637 | opt->date_mode_explicit); | |
02865655 | 638 | if (opt->commit_format == CMIT_FMT_ONELINE) |
903b45fe | 639 | return; |
903b45fe | 640 | } |
3eefc189 | 641 | } |
91539833 | 642 | |
824958e5 | 643 | if (opt->show_signature) { |
0c37f1fc | 644 | show_signature(opt, commit); |
824958e5 JH |
645 | show_mergetag(opt, commit); |
646 | } | |
0c37f1fc | 647 | |
3131b713 LT |
648 | if (!commit->buffer) |
649 | return; | |
650 | ||
91539833 LT |
651 | /* |
652 | * And then the pretty-printed message itself | |
653 | */ | |
dd2e794a TR |
654 | if (ctx.need_8bit_cte >= 0) |
655 | ctx.need_8bit_cte = has_non_ascii(opt->add_signoff); | |
656 | ctx.date_mode = opt->date_mode; | |
f026c756 | 657 | ctx.date_mode_explicit = opt->date_mode_explicit; |
dd2e794a TR |
658 | ctx.abbrev = opt->diffopt.abbrev; |
659 | ctx.after_subject = extra_headers; | |
9553d2b2 | 660 | ctx.preserve_subject = opt->preserve_subject; |
8f8f5476 | 661 | ctx.reflog_info = opt->reflog_info; |
6bf13944 JK |
662 | ctx.fmt = opt->commit_format; |
663 | pretty_print_commit(&ctx, commit, &msgbuf); | |
cf2251b6 JH |
664 | |
665 | if (opt->add_signoff) | |
674d1727 | 666 | append_signoff(&msgbuf, opt->add_signoff); |
7fefda5c | 667 | if (opt->show_log_size) { |
674d1727 | 668 | printf("log size %i\n", (int)msgbuf.len); |
7fefda5c AS |
669 | graph_show_oneline(opt->graph); |
670 | } | |
9fa3465d | 671 | |
7fefda5c AS |
672 | /* |
673 | * Set opt->missing_newline if msgbuf doesn't | |
674 | * end in a newline (including if it is empty) | |
675 | */ | |
676 | if (!msgbuf.len || msgbuf.buf[msgbuf.len - 1] != '\n') | |
677 | opt->missing_newline = 1; | |
678 | else | |
679 | opt->missing_newline = 0; | |
680 | ||
681 | if (opt->graph) | |
682 | graph_show_commit_msg(opt->graph, &msgbuf); | |
683 | else | |
42c8c74c | 684 | fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout); |
7fefda5c AS |
685 | if (opt->use_terminator) { |
686 | if (!opt->missing_newline) | |
687 | graph_show_padding(opt->graph); | |
3e065308 | 688 | putchar(opt->diffopt.line_termination); |
7fefda5c AS |
689 | } |
690 | ||
674d1727 | 691 | strbuf_release(&msgbuf); |
91539833 LT |
692 | } |
693 | ||
cd2bdc53 | 694 | int log_tree_diff_flush(struct rev_info *opt) |
5f1c3f07 JH |
695 | { |
696 | diffcore_std(&opt->diffopt); | |
91539833 | 697 | |
5f1c3f07 JH |
698 | if (diff_queue_is_empty()) { |
699 | int saved_fmt = opt->diffopt.output_format; | |
700 | opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT; | |
701 | diff_flush(&opt->diffopt); | |
702 | opt->diffopt.output_format = saved_fmt; | |
703 | return 0; | |
704 | } | |
91539833 | 705 | |
3969cf7d JH |
706 | if (opt->loginfo && !opt->no_commit_id) { |
707 | /* When showing a verbose header (i.e. log message), | |
708 | * and not in --pretty=oneline format, we would want | |
709 | * an extra newline between the end of log and the | |
710 | * output for readability. | |
711 | */ | |
02865655 | 712 | show_log(opt); |
304b5af6 LT |
713 | if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) && |
714 | opt->verbose_header && | |
3969cf7d JH |
715 | opt->commit_format != CMIT_FMT_ONELINE) { |
716 | int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH; | |
81bd1b2a BY |
717 | if (opt->diffopt.output_prefix) { |
718 | struct strbuf *msg = NULL; | |
719 | msg = opt->diffopt.output_prefix(&opt->diffopt, | |
720 | opt->diffopt.output_prefix_data); | |
721 | fwrite(msg->buf, msg->len, 1, stdout); | |
722 | } | |
aea69a01 LP |
723 | if ((pch & opt->diffopt.output_format) == pch) { |
724 | printf("---"); | |
725 | } | |
abd4e222 | 726 | putchar('\n'); |
3969cf7d JH |
727 | } |
728 | } | |
5f1c3f07 JH |
729 | diff_flush(&opt->diffopt); |
730 | return 1; | |
731 | } | |
732 | ||
cd2bdc53 | 733 | static int do_diff_combined(struct rev_info *opt, struct commit *commit) |
5f1c3f07 | 734 | { |
82889295 | 735 | diff_tree_combined_merge(commit, opt->dense_combined_merges, opt); |
91539833 | 736 | return !opt->loginfo; |
5f1c3f07 JH |
737 | } |
738 | ||
91539833 LT |
739 | /* |
740 | * Show the diff of a commit. | |
741 | * | |
742 | * Return true if we printed any log info messages | |
743 | */ | |
744 | static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log_info *log) | |
5f1c3f07 | 745 | { |
91539833 | 746 | int showed_log; |
5f1c3f07 JH |
747 | struct commit_list *parents; |
748 | unsigned const char *sha1 = commit->object.sha1; | |
749 | ||
84102a33 | 750 | if (!opt->diff && !DIFF_OPT_TST(&opt->diffopt, EXIT_WITH_STATUS)) |
91539833 LT |
751 | return 0; |
752 | ||
5f1c3f07 | 753 | /* Root commit? */ |
91539833 LT |
754 | parents = commit->parents; |
755 | if (!parents) { | |
2b60356d RS |
756 | if (opt->show_root_diff) { |
757 | diff_root_tree_sha1(sha1, "", &opt->diffopt); | |
758 | log_tree_diff_flush(opt); | |
759 | } | |
91539833 | 760 | return !opt->loginfo; |
5f1c3f07 JH |
761 | } |
762 | ||
763 | /* More than one parent? */ | |
91539833 | 764 | if (parents && parents->next) { |
5f1c3f07 JH |
765 | if (opt->ignore_merges) |
766 | return 0; | |
767 | else if (opt->combine_merges) | |
768 | return do_diff_combined(opt, commit); | |
88d9d45d PB |
769 | else if (opt->first_parent_only) { |
770 | /* | |
771 | * Generate merge log entry only for the first | |
772 | * parent, showing summary diff of the others | |
773 | * we merged _in_. | |
774 | */ | |
775 | diff_tree_sha1(parents->item->object.sha1, sha1, "", &opt->diffopt); | |
776 | log_tree_diff_flush(opt); | |
777 | return !opt->loginfo; | |
778 | } | |
91539833 LT |
779 | |
780 | /* If we show individual diffs, show the parent info */ | |
781 | log->parent = parents->item; | |
5f1c3f07 JH |
782 | } |
783 | ||
91539833 LT |
784 | showed_log = 0; |
785 | for (;;) { | |
5f1c3f07 | 786 | struct commit *parent = parents->item; |
5f1c3f07 | 787 | |
91539833 LT |
788 | diff_tree_sha1(parent->object.sha1, sha1, "", &opt->diffopt); |
789 | log_tree_diff_flush(opt); | |
790 | ||
791 | showed_log |= !opt->loginfo; | |
792 | ||
793 | /* Set up the log info for the next parent, if any.. */ | |
794 | parents = parents->next; | |
795 | if (!parents) | |
796 | break; | |
797 | log->parent = parents->item; | |
798 | opt->loginfo = log; | |
799 | } | |
800 | return showed_log; | |
801 | } | |
802 | ||
803 | int log_tree_commit(struct rev_info *opt, struct commit *commit) | |
804 | { | |
805 | struct log_info log; | |
3eefc189 | 806 | int shown; |
91539833 LT |
807 | |
808 | log.commit = commit; | |
809 | log.parent = NULL; | |
810 | opt->loginfo = &log; | |
811 | ||
3eefc189 JH |
812 | shown = log_tree_diff(opt, commit, &log); |
813 | if (!shown && opt->loginfo && opt->always_show_header) { | |
91539833 | 814 | log.parent = NULL; |
02865655 | 815 | show_log(opt); |
3eefc189 | 816 | shown = 1; |
5f1c3f07 | 817 | } |
91539833 | 818 | opt->loginfo = NULL; |
06f59e9f | 819 | maybe_flush_or_die(stdout, "stdout"); |
3eefc189 | 820 | return shown; |
5f1c3f07 | 821 | } |