Merge git://github.com/git-l10n/git-po
[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 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
144static 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 153void 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
164static 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
173static 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 */
185void 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
216void 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
229static 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
239void 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
257void 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 269void 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
357static 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
373static 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
397static 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
410static int is_common_merge(const struct commit *commit)
411{
412 return (commit->parents
413 && commit->parents->next
414 && !commit->parents->next->next);
415}
416
063da62b 417static void show_one_mergetag(struct commit *commit,
824958e5 418 struct commit_extra_header *extra,
063da62b 419 void *data)
824958e5 420{
063da62b 421 struct rev_info *opt = (struct rev_info *)data;
824958e5
JH
422 unsigned char sha1[20];
423 struct tag *tag;
424 struct strbuf verify_message;
425 int status, nth;
426 size_t payload_size, gpg_message_offset;
427
428 hash_sha1_file(extra->value, extra->len, typename(OBJ_TAG), sha1);
429 tag = lookup_tag(sha1);
430 if (!tag)
431 return; /* error message already given */
432
433 strbuf_init(&verify_message, 256);
434 if (parse_tag_buffer(tag, extra->value, extra->len))
435 strbuf_addstr(&verify_message, "malformed mergetag\n");
d041ffa5
JH
436 else if (is_common_merge(commit) &&
437 !hashcmp(tag->tagged->sha1,
438 commit->parents->next->item->object.sha1))
439 strbuf_addf(&verify_message,
440 "merged tag '%s'\n", tag->tag);
824958e5
JH
441 else if ((nth = which_parent(tag->tagged->sha1, commit)) < 0)
442 strbuf_addf(&verify_message, "tag %s names a non-parent %s\n",
443 tag->tag, tag->tagged->sha1);
444 else
445 strbuf_addf(&verify_message,
446 "parent #%d, tagged '%s'\n", nth + 1, tag->tag);
447 gpg_message_offset = verify_message.len;
448
449 payload_size = parse_signature(extra->value, extra->len);
1315093f 450 status = -1;
42c55ce4
MG
451 if (extra->len > payload_size) {
452 /* could have a good signature */
453 if (!verify_signed_buffer(extra->value, payload_size,
454 extra->value + payload_size,
455 extra->len - payload_size,
456 &verify_message, NULL))
457 status = 0; /* good */
458 else if (verify_message.len <= gpg_message_offset)
459 strbuf_addstr(&verify_message, "No signature\n");
460 /* otherwise we couldn't verify, which is shown as bad */
461 }
824958e5
JH
462
463 show_sig_lines(opt, status, verify_message.buf);
464 strbuf_release(&verify_message);
465}
466
467static void show_mergetag(struct rev_info *opt, struct commit *commit)
468{
063da62b 469 for_each_mergetag(show_one_mergetag, commit, opt);
824958e5
JH
470}
471
02865655 472void show_log(struct rev_info *opt)
91539833 473{
f285a2d7 474 struct strbuf msgbuf = STRBUF_INIT;
39bc9a6c 475 struct log_info *log = opt->loginfo;
91539833 476 struct commit *commit = log->commit, *parent = log->parent;
91539833 477 int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
dd2e794a
TR
478 const char *extra_headers = opt->extra_headers;
479 struct pretty_print_context ctx = {0};
91539833
LT
480
481 opt->loginfo = NULL;
482 if (!opt->verbose_header) {
7fefda5c
AS
483 graph_show_commit(opt->graph);
484
1df2d656 485 if (!opt->graph)
b1b47554 486 put_revision_mark(opt, commit);
7fcda920 487 fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit), stdout);
885cf808 488 if (opt->print_parents)
c8c893c6 489 show_parents(commit, abbrev_commit);
91b849b2
JS
490 if (opt->children.name)
491 show_children(opt, commit, abbrev_commit);
0f3a290b 492 show_decorations(opt, commit);
7fefda5c
AS
493 if (opt->graph && !graph_is_commit_finished(opt->graph)) {
494 putchar('\n');
495 graph_show_remainder(opt->graph);
496 }
1dcb6922 497 putchar(opt->diffopt.line_termination);
91539833
LT
498 return;
499 }
500
501 /*
8715227d
JK
502 * If use_terminator is set, we already handled any record termination
503 * at the end of the last record.
02865655
AS
504 * Otherwise, add a diffopt.line_termination character before all
505 * entries but the first. (IOW, as a separator between entries)
91539833 506 */
7fefda5c
AS
507 if (opt->shown_one && !opt->use_terminator) {
508 /*
509 * If entries are separated by a newline, the output
510 * should look human-readable. If the last entry ended
511 * with a newline, print the graph output before this
512 * newline. Otherwise it will end up as a completely blank
513 * line and will look like a gap in the graph.
514 *
515 * If the entry separator is not a newline, the output is
516 * primarily intended for programmatic consumption, and we
517 * never want the extra graph output before the entry
518 * separator.
519 */
520 if (opt->diffopt.line_termination == '\n' &&
521 !opt->missing_newline)
522 graph_show_padding(opt->graph);
abd4e222 523 putchar(opt->diffopt.line_termination);
7fefda5c 524 }
91539833
LT
525 opt->shown_one = 1;
526
7fefda5c
AS
527 /*
528 * If the history graph was requested,
529 * print the graph, up to this commit's line
530 */
531 graph_show_commit(opt->graph);
532
91539833
LT
533 /*
534 * Print header line of header..
535 */
3eefc189 536
596524b3 537 if (opt->commit_format == CMIT_FMT_EMAIL) {
dd2e794a
TR
538 log_write_email_headers(opt, commit, &ctx.subject, &extra_headers,
539 &ctx.need_8bit_cte);
e52a5de4 540 } else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
8f67f8ae 541 fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), stdout);
74bd9029
JH
542 if (opt->commit_format != CMIT_FMT_ONELINE)
543 fputs("commit ", stdout);
7528f27d 544
1df2d656 545 if (!opt->graph)
b1b47554 546 put_revision_mark(opt, commit);
7fcda920 547 fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit),
74bd9029 548 stdout);
885cf808 549 if (opt->print_parents)
c66b6c06 550 show_parents(commit, abbrev_commit);
91b849b2
JS
551 if (opt->children.name)
552 show_children(opt, commit, abbrev_commit);
73f0a157 553 if (parent)
3eefc189 554 printf(" (from %s)",
7fcda920 555 find_unique_abbrev(parent->object.sha1,
3eefc189 556 abbrev_commit));
9d3f002f 557 fputs(diff_get_color_opt(&opt->diffopt, DIFF_RESET), stdout);
0f3a290b 558 show_decorations(opt, commit);
7fefda5c
AS
559 if (opt->commit_format == CMIT_FMT_ONELINE) {
560 putchar(' ');
561 } else {
562 putchar('\n');
563 graph_show_oneline(opt->graph);
564 }
903b45fe 565 if (opt->reflog_info) {
7fefda5c
AS
566 /*
567 * setup_revisions() ensures that opt->reflog_info
568 * and opt->graph cannot both be set,
569 * so we don't need to worry about printing the
570 * graph info here.
571 */
4d12a471 572 show_reflog_message(opt->reflog_info,
55ccf85a
JH
573 opt->commit_format == CMIT_FMT_ONELINE,
574 opt->date_mode,
575 opt->date_mode_explicit);
02865655 576 if (opt->commit_format == CMIT_FMT_ONELINE)
903b45fe 577 return;
903b45fe 578 }
3eefc189 579 }
91539833 580
824958e5 581 if (opt->show_signature) {
0c37f1fc 582 show_signature(opt, commit);
824958e5
JH
583 show_mergetag(opt, commit);
584 }
0c37f1fc 585
8597ea3a 586 if (!get_cached_commit_buffer(commit, NULL))
3131b713
LT
587 return;
588
ddf333f6
JH
589 if (opt->show_notes) {
590 int raw;
591 struct strbuf notebuf = STRBUF_INIT;
592
593 raw = (opt->commit_format == CMIT_FMT_USERFORMAT);
594 format_display_notes(commit->object.sha1, &notebuf,
595 get_log_output_encoding(), raw);
596 ctx.notes_message = notebuf.len
597 ? strbuf_detach(&notebuf, NULL)
598 : xcalloc(1, 1);
599 }
600
91539833
LT
601 /*
602 * And then the pretty-printed message itself
603 */
5289c56a
NTND
604 if (ctx.need_8bit_cte >= 0 && opt->add_signoff)
605 ctx.need_8bit_cte =
606 has_non_ascii(fmt_name(getenv("GIT_COMMITTER_NAME"),
607 getenv("GIT_COMMITTER_EMAIL")));
dd2e794a 608 ctx.date_mode = opt->date_mode;
f026c756 609 ctx.date_mode_explicit = opt->date_mode_explicit;
dd2e794a
TR
610 ctx.abbrev = opt->diffopt.abbrev;
611 ctx.after_subject = extra_headers;
9553d2b2 612 ctx.preserve_subject = opt->preserve_subject;
8f8f5476 613 ctx.reflog_info = opt->reflog_info;
6bf13944 614 ctx.fmt = opt->commit_format;
0e2913b0 615 ctx.mailmap = opt->mailmap;
30825178 616 ctx.color = opt->diffopt.use_color;
ecaee805 617 ctx.output_encoding = get_log_output_encoding();
a9080475
JK
618 if (opt->from_ident.mail_begin && opt->from_ident.name_begin)
619 ctx.from_ident = &opt->from_ident;
6bf13944 620 pretty_print_commit(&ctx, commit, &msgbuf);
212620fe
JH
621
622 if (opt->add_signoff)
5289c56a 623 append_signoff(&msgbuf, 0, APPEND_SIGNOFF_DEDUP);
212620fe 624
5a664cf2 625 if ((ctx.fmt != CMIT_FMT_USERFORMAT) &&
bd1470b8
JH
626 ctx.notes_message && *ctx.notes_message) {
627 if (ctx.fmt == CMIT_FMT_EMAIL) {
628 strbuf_addstr(&msgbuf, "---\n");
629 opt->shown_dashes = 1;
630 }
5a664cf2 631 strbuf_addstr(&msgbuf, ctx.notes_message);
bd1470b8 632 }
cf2251b6 633
7fefda5c 634 if (opt->show_log_size) {
674d1727 635 printf("log size %i\n", (int)msgbuf.len);
7fefda5c
AS
636 graph_show_oneline(opt->graph);
637 }
9fa3465d 638
7fefda5c
AS
639 /*
640 * Set opt->missing_newline if msgbuf doesn't
641 * end in a newline (including if it is empty)
642 */
643 if (!msgbuf.len || msgbuf.buf[msgbuf.len - 1] != '\n')
644 opt->missing_newline = 1;
645 else
646 opt->missing_newline = 0;
647
648 if (opt->graph)
649 graph_show_commit_msg(opt->graph, &msgbuf);
650 else
42c8c74c 651 fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
7fefda5c
AS
652 if (opt->use_terminator) {
653 if (!opt->missing_newline)
654 graph_show_padding(opt->graph);
3e065308 655 putchar(opt->diffopt.line_termination);
7fefda5c
AS
656 }
657
674d1727 658 strbuf_release(&msgbuf);
ddf333f6 659 free(ctx.notes_message);
91539833
LT
660}
661
cd2bdc53 662int log_tree_diff_flush(struct rev_info *opt)
5f1c3f07 663{
bd1470b8 664 opt->shown_dashes = 0;
5f1c3f07 665 diffcore_std(&opt->diffopt);
91539833 666
5f1c3f07
JH
667 if (diff_queue_is_empty()) {
668 int saved_fmt = opt->diffopt.output_format;
669 opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
670 diff_flush(&opt->diffopt);
671 opt->diffopt.output_format = saved_fmt;
672 return 0;
673 }
91539833 674
3969cf7d 675 if (opt->loginfo && !opt->no_commit_id) {
02865655 676 show_log(opt);
304b5af6
LT
677 if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) &&
678 opt->verbose_header &&
3969cf7d 679 opt->commit_format != CMIT_FMT_ONELINE) {
1d34c50f
JH
680 /*
681 * When showing a verbose header (i.e. log message),
682 * and not in --pretty=oneline format, we would want
683 * an extra newline between the end of log and the
684 * diff/diffstat output for readability.
685 */
3969cf7d 686 int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
81bd1b2a
BY
687 if (opt->diffopt.output_prefix) {
688 struct strbuf *msg = NULL;
689 msg = opt->diffopt.output_prefix(&opt->diffopt,
690 opt->diffopt.output_prefix_data);
691 fwrite(msg->buf, msg->len, 1, stdout);
692 }
1d34c50f
JH
693
694 /*
695 * We may have shown three-dashes line early
696 * between notes and the log message, in which
697 * case we only want a blank line after the
698 * notes without (an extra) three-dashes line.
699 * Otherwise, we show the three-dashes line if
700 * we are showing the patch with diffstat, but
701 * in that case, there is no extra blank line
702 * after the three-dashes line.
703 */
704 if (!opt->shown_dashes &&
705 (pch & opt->diffopt.output_format) == pch)
706 printf("---");
707 putchar('\n');
3969cf7d
JH
708 }
709 }
5f1c3f07
JH
710 diff_flush(&opt->diffopt);
711 return 1;
712}
713
cd2bdc53 714static int do_diff_combined(struct rev_info *opt, struct commit *commit)
5f1c3f07 715{
82889295 716 diff_tree_combined_merge(commit, opt->dense_combined_merges, opt);
91539833 717 return !opt->loginfo;
5f1c3f07
JH
718}
719
91539833
LT
720/*
721 * Show the diff of a commit.
722 *
723 * Return true if we printed any log info messages
724 */
725static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log_info *log)
5f1c3f07 726{
91539833 727 int showed_log;
5f1c3f07 728 struct commit_list *parents;
d1b9b767 729 unsigned const char *sha1;
5f1c3f07 730
84102a33 731 if (!opt->diff && !DIFF_OPT_TST(&opt->diffopt, EXIT_WITH_STATUS))
91539833
LT
732 return 0;
733
7059dccc 734 parse_commit_or_die(commit);
d1b9b767
TR
735 sha1 = commit->tree->object.sha1;
736
5f1c3f07 737 /* Root commit? */
53d00b39 738 parents = get_saved_parents(opt, commit);
91539833 739 if (!parents) {
2b60356d
RS
740 if (opt->show_root_diff) {
741 diff_root_tree_sha1(sha1, "", &opt->diffopt);
742 log_tree_diff_flush(opt);
743 }
91539833 744 return !opt->loginfo;
5f1c3f07
JH
745 }
746
747 /* More than one parent? */
91539833 748 if (parents && parents->next) {
5f1c3f07
JH
749 if (opt->ignore_merges)
750 return 0;
751 else if (opt->combine_merges)
752 return do_diff_combined(opt, commit);
88d9d45d
PB
753 else if (opt->first_parent_only) {
754 /*
755 * Generate merge log entry only for the first
756 * parent, showing summary diff of the others
757 * we merged _in_.
758 */
7059dccc 759 parse_commit_or_die(parents->item);
d1b9b767
TR
760 diff_tree_sha1(parents->item->tree->object.sha1,
761 sha1, "", &opt->diffopt);
88d9d45d
PB
762 log_tree_diff_flush(opt);
763 return !opt->loginfo;
764 }
91539833
LT
765
766 /* If we show individual diffs, show the parent info */
767 log->parent = parents->item;
5f1c3f07
JH
768 }
769
91539833
LT
770 showed_log = 0;
771 for (;;) {
5f1c3f07 772 struct commit *parent = parents->item;
5f1c3f07 773
7059dccc 774 parse_commit_or_die(parent);
d1b9b767
TR
775 diff_tree_sha1(parent->tree->object.sha1,
776 sha1, "", &opt->diffopt);
91539833
LT
777 log_tree_diff_flush(opt);
778
779 showed_log |= !opt->loginfo;
780
781 /* Set up the log info for the next parent, if any.. */
782 parents = parents->next;
783 if (!parents)
784 break;
785 log->parent = parents->item;
786 opt->loginfo = log;
787 }
788 return showed_log;
789}
790
791int log_tree_commit(struct rev_info *opt, struct commit *commit)
792{
793 struct log_info log;
3eefc189 794 int shown;
91539833
LT
795
796 log.commit = commit;
797 log.parent = NULL;
798 opt->loginfo = &log;
799
12da1d1f
TR
800 if (opt->line_level_traverse)
801 return line_log_print(opt, commit);
802
1b32dece
NTND
803 if (opt->track_linear && !opt->linear && !opt->reverse_output_stage)
804 printf("\n%s\n", opt->break_bar);
3eefc189
JH
805 shown = log_tree_diff(opt, commit, &log);
806 if (!shown && opt->loginfo && opt->always_show_header) {
91539833 807 log.parent = NULL;
02865655 808 show_log(opt);
3eefc189 809 shown = 1;
5f1c3f07 810 }
1b32dece
NTND
811 if (opt->track_linear && !opt->linear && opt->reverse_output_stage)
812 printf("\n%s\n", opt->break_bar);
91539833 813 opt->loginfo = NULL;
06f59e9f 814 maybe_flush_or_die(stdout, "stdout");
3eefc189 815 return shown;
5f1c3f07 816}