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