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