git-multimail: update to release 1.2.0
[git.git] / log-tree.c
blob7b1b57aaf6e48a430f664fa8deafb75a0cfcc576
1 #include "cache.h"
2 #include "diff.h"
3 #include "commit.h"
4 #include "tag.h"
5 #include "graph.h"
6 #include "log-tree.h"
7 #include "reflog-walk.h"
8 #include "refs.h"
9 #include "string-list.h"
10 #include "color.h"
11 #include "gpg-interface.h"
12 #include "sequencer.h"
13 #include "line-log.h"
15 static struct decoration name_decoration = { "object names" };
16 static int decoration_loaded;
17 static int decoration_flags;
19 static char decoration_colors[][COLOR_MAXLEN] = {
20 GIT_COLOR_RESET,
21 GIT_COLOR_BOLD_GREEN, /* REF_LOCAL */
22 GIT_COLOR_BOLD_RED, /* REF_REMOTE */
23 GIT_COLOR_BOLD_YELLOW, /* REF_TAG */
24 GIT_COLOR_BOLD_MAGENTA, /* REF_STASH */
25 GIT_COLOR_BOLD_CYAN, /* REF_HEAD */
26 GIT_COLOR_BOLD_BLUE, /* GRAFTED */
29 static const char *decorate_get_color(int decorate_use_color, enum decoration_type ix)
31 if (want_color(decorate_use_color))
32 return decoration_colors[ix];
33 return "";
36 static int parse_decorate_color_slot(const char *slot)
39 * We're comparing with 'ignore-case' on
40 * (because config.c sets them all tolower),
41 * but let's match the letters in the literal
42 * string values here with how they are
43 * documented in Documentation/config.txt, for
44 * consistency.
46 * We love being consistent, don't we?
48 if (!strcasecmp(slot, "branch"))
49 return DECORATION_REF_LOCAL;
50 if (!strcasecmp(slot, "remoteBranch"))
51 return DECORATION_REF_REMOTE;
52 if (!strcasecmp(slot, "tag"))
53 return DECORATION_REF_TAG;
54 if (!strcasecmp(slot, "stash"))
55 return DECORATION_REF_STASH;
56 if (!strcasecmp(slot, "HEAD"))
57 return DECORATION_REF_HEAD;
58 return -1;
61 int parse_decorate_color_config(const char *var, const char *slot_name, const char *value)
63 int slot = parse_decorate_color_slot(slot_name);
64 if (slot < 0)
65 return 0;
66 if (!value)
67 return config_error_nonbool(var);
68 return color_parse(value, decoration_colors[slot]);
72 * log-tree.c uses DIFF_OPT_TST for determining whether to use color
73 * for showing the commit sha1, use the same check for --decorate
75 #define decorate_get_color_opt(o, ix) \
76 decorate_get_color((o)->use_color, ix)
78 void add_name_decoration(enum decoration_type type, const char *name, struct object *obj)
80 int nlen = strlen(name);
81 struct name_decoration *res = xmalloc(sizeof(*res) + nlen + 1);
82 memcpy(res->name, name, nlen + 1);
83 res->type = type;
84 res->next = add_decoration(&name_decoration, obj, res);
87 const struct name_decoration *get_name_decoration(const struct object *obj)
89 return lookup_decoration(&name_decoration, obj);
92 static int add_ref_decoration(const char *refname, const struct object_id *oid,
93 int flags, void *cb_data)
95 struct object *obj;
96 enum decoration_type type = DECORATION_NONE;
98 assert(cb_data == NULL);
100 if (starts_with(refname, git_replace_ref_base)) {
101 struct object_id original_oid;
102 if (!check_replace_refs)
103 return 0;
104 if (get_oid_hex(refname + strlen(git_replace_ref_base),
105 &original_oid)) {
106 warning("invalid replace ref %s", refname);
107 return 0;
109 obj = parse_object(original_oid.hash);
110 if (obj)
111 add_name_decoration(DECORATION_GRAFTED, "replaced", obj);
112 return 0;
115 obj = parse_object(oid->hash);
116 if (!obj)
117 return 0;
119 if (starts_with(refname, "refs/heads/"))
120 type = DECORATION_REF_LOCAL;
121 else if (starts_with(refname, "refs/remotes/"))
122 type = DECORATION_REF_REMOTE;
123 else if (starts_with(refname, "refs/tags/"))
124 type = DECORATION_REF_TAG;
125 else if (!strcmp(refname, "refs/stash"))
126 type = DECORATION_REF_STASH;
127 else if (!strcmp(refname, "HEAD"))
128 type = DECORATION_REF_HEAD;
130 add_name_decoration(type, refname, obj);
131 while (obj->type == OBJ_TAG) {
132 obj = ((struct tag *)obj)->tagged;
133 if (!obj)
134 break;
135 if (!obj->parsed)
136 parse_object(obj->sha1);
137 add_name_decoration(DECORATION_REF_TAG, refname, obj);
139 return 0;
142 static int add_graft_decoration(const struct commit_graft *graft, void *cb_data)
144 struct commit *commit = lookup_commit(graft->oid.hash);
145 if (!commit)
146 return 0;
147 add_name_decoration(DECORATION_GRAFTED, "grafted", &commit->object);
148 return 0;
151 void load_ref_decorations(int flags)
153 if (!decoration_loaded) {
155 decoration_loaded = 1;
156 decoration_flags = flags;
157 for_each_ref(add_ref_decoration, NULL);
158 head_ref(add_ref_decoration, NULL);
159 for_each_commit_graft(add_graft_decoration, NULL);
163 static void show_parents(struct commit *commit, int abbrev)
165 struct commit_list *p;
166 for (p = commit->parents; p ; p = p->next) {
167 struct commit *parent = p->item;
168 printf(" %s", find_unique_abbrev(parent->object.sha1, abbrev));
172 static void show_children(struct rev_info *opt, struct commit *commit, int abbrev)
174 struct commit_list *p = lookup_decoration(&opt->children, &commit->object);
175 for ( ; p; p = p->next) {
176 printf(" %s", find_unique_abbrev(p->item->object.sha1, abbrev));
181 * Do we have HEAD in the output, and also the branch it points at?
182 * If so, find that decoration entry for that current branch.
184 static const struct name_decoration *current_pointed_by_HEAD(const struct name_decoration *decoration)
186 const struct name_decoration *list, *head = NULL;
187 const char *branch_name = NULL;
188 unsigned char unused[20];
189 int rru_flags;
191 /* First find HEAD */
192 for (list = decoration; list; list = list->next)
193 if (list->type == DECORATION_REF_HEAD) {
194 head = list;
195 break;
197 if (!head)
198 return NULL;
200 /* Now resolve and find the matching current branch */
201 branch_name = resolve_ref_unsafe("HEAD", 0, unused, &rru_flags);
202 if (!(rru_flags & REF_ISSYMREF))
203 return NULL;
205 if (!starts_with(branch_name, "refs/"))
206 return NULL;
208 /* OK, do we have that ref in the list? */
209 for (list = decoration; list; list = list->next)
210 if ((list->type == DECORATION_REF_LOCAL) &&
211 !strcmp(branch_name, list->name)) {
212 return list;
215 return NULL;
218 static void show_name(struct strbuf *sb, const struct name_decoration *decoration)
220 if (decoration_flags == DECORATE_SHORT_REFS)
221 strbuf_addstr(sb, prettify_refname(decoration->name));
222 else
223 strbuf_addstr(sb, decoration->name);
227 * The caller makes sure there is no funny color before calling.
228 * format_decorations_extended makes sure the same after return.
230 void format_decorations_extended(struct strbuf *sb,
231 const struct commit *commit,
232 int use_color,
233 const char *prefix,
234 const char *separator,
235 const char *suffix)
237 const struct name_decoration *decoration;
238 const struct name_decoration *current_and_HEAD;
239 const char *color_commit =
240 diff_get_color(use_color, DIFF_COMMIT);
241 const char *color_reset =
242 decorate_get_color(use_color, DECORATION_NONE);
244 decoration = get_name_decoration(&commit->object);
245 if (!decoration)
246 return;
248 current_and_HEAD = current_pointed_by_HEAD(decoration);
249 while (decoration) {
251 * When both current and HEAD are there, only
252 * show HEAD->current where HEAD would have
253 * appeared, skipping the entry for current.
255 if (decoration != current_and_HEAD) {
256 strbuf_addstr(sb, color_commit);
257 strbuf_addstr(sb, prefix);
258 strbuf_addstr(sb, color_reset);
259 strbuf_addstr(sb, decorate_get_color(use_color, decoration->type));
260 if (decoration->type == DECORATION_REF_TAG)
261 strbuf_addstr(sb, "tag: ");
263 show_name(sb, decoration);
265 if (current_and_HEAD &&
266 decoration->type == DECORATION_REF_HEAD) {
267 strbuf_addstr(sb, color_reset);
268 strbuf_addstr(sb, color_commit);
269 strbuf_addstr(sb, " -> ");
270 strbuf_addstr(sb, color_reset);
271 strbuf_addstr(sb, decorate_get_color(use_color, current_and_HEAD->type));
272 show_name(sb, current_and_HEAD);
274 strbuf_addstr(sb, color_reset);
276 prefix = separator;
278 decoration = decoration->next;
280 strbuf_addstr(sb, color_commit);
281 strbuf_addstr(sb, suffix);
282 strbuf_addstr(sb, color_reset);
285 void show_decorations(struct rev_info *opt, struct commit *commit)
287 struct strbuf sb = STRBUF_INIT;
289 if (opt->show_source && commit->util)
290 printf("\t%s", (char *) commit->util);
291 if (!opt->show_decorations)
292 return;
293 format_decorations(&sb, commit, opt->diffopt.use_color);
294 fputs(sb.buf, stdout);
295 strbuf_release(&sb);
298 static unsigned int digits_in_number(unsigned int number)
300 unsigned int i = 10, result = 1;
301 while (i <= number) {
302 i *= 10;
303 result++;
305 return result;
308 void fmt_output_subject(struct strbuf *filename,
309 const char *subject,
310 struct rev_info *info)
312 const char *suffix = info->patch_suffix;
313 int nr = info->nr;
314 int start_len = filename->len;
315 int max_len = start_len + FORMAT_PATCH_NAME_MAX - (strlen(suffix) + 1);
317 if (0 < info->reroll_count)
318 strbuf_addf(filename, "v%d-", info->reroll_count);
319 strbuf_addf(filename, "%04d-%s", nr, subject);
321 if (max_len < filename->len)
322 strbuf_setlen(filename, max_len);
323 strbuf_addstr(filename, suffix);
326 void fmt_output_commit(struct strbuf *filename,
327 struct commit *commit,
328 struct rev_info *info)
330 struct pretty_print_context ctx = {0};
331 struct strbuf subject = STRBUF_INIT;
333 format_commit_message(commit, "%f", &subject, &ctx);
334 fmt_output_subject(filename, subject.buf, info);
335 strbuf_release(&subject);
338 void log_write_email_headers(struct rev_info *opt, struct commit *commit,
339 const char **subject_p,
340 const char **extra_headers_p,
341 int *need_8bit_cte_p)
343 const char *subject = NULL;
344 const char *extra_headers = opt->extra_headers;
345 const char *name = sha1_to_hex(commit->object.sha1);
347 *need_8bit_cte_p = 0; /* unknown */
348 if (opt->total > 0) {
349 static char buffer[64];
350 snprintf(buffer, sizeof(buffer),
351 "Subject: [%s%s%0*d/%d] ",
352 opt->subject_prefix,
353 *opt->subject_prefix ? " " : "",
354 digits_in_number(opt->total),
355 opt->nr, opt->total);
356 subject = buffer;
357 } else if (opt->total == 0 && opt->subject_prefix && *opt->subject_prefix) {
358 static char buffer[256];
359 snprintf(buffer, sizeof(buffer),
360 "Subject: [%s] ",
361 opt->subject_prefix);
362 subject = buffer;
363 } else {
364 subject = "Subject: ";
367 printf("From %s Mon Sep 17 00:00:00 2001\n", name);
368 graph_show_oneline(opt->graph);
369 if (opt->message_id) {
370 printf("Message-Id: <%s>\n", opt->message_id);
371 graph_show_oneline(opt->graph);
373 if (opt->ref_message_ids && opt->ref_message_ids->nr > 0) {
374 int i, n;
375 n = opt->ref_message_ids->nr;
376 printf("In-Reply-To: <%s>\n", opt->ref_message_ids->items[n-1].string);
377 for (i = 0; i < n; i++)
378 printf("%s<%s>\n", (i > 0 ? "\t" : "References: "),
379 opt->ref_message_ids->items[i].string);
380 graph_show_oneline(opt->graph);
382 if (opt->mime_boundary) {
383 static char subject_buffer[1024];
384 static char buffer[1024];
385 struct strbuf filename = STRBUF_INIT;
386 *need_8bit_cte_p = -1; /* NEVER */
387 snprintf(subject_buffer, sizeof(subject_buffer) - 1,
388 "%s"
389 "MIME-Version: 1.0\n"
390 "Content-Type: multipart/mixed;"
391 " boundary=\"%s%s\"\n"
392 "\n"
393 "This is a multi-part message in MIME "
394 "format.\n"
395 "--%s%s\n"
396 "Content-Type: text/plain; "
397 "charset=UTF-8; format=fixed\n"
398 "Content-Transfer-Encoding: 8bit\n\n",
399 extra_headers ? extra_headers : "",
400 mime_boundary_leader, opt->mime_boundary,
401 mime_boundary_leader, opt->mime_boundary);
402 extra_headers = subject_buffer;
404 if (opt->numbered_files)
405 strbuf_addf(&filename, "%d", opt->nr);
406 else
407 fmt_output_commit(&filename, commit, opt);
408 snprintf(buffer, sizeof(buffer) - 1,
409 "\n--%s%s\n"
410 "Content-Type: text/x-patch;"
411 " name=\"%s\"\n"
412 "Content-Transfer-Encoding: 8bit\n"
413 "Content-Disposition: %s;"
414 " filename=\"%s\"\n\n",
415 mime_boundary_leader, opt->mime_boundary,
416 filename.buf,
417 opt->no_inline ? "attachment" : "inline",
418 filename.buf);
419 opt->diffopt.stat_sep = buffer;
420 strbuf_release(&filename);
422 *subject_p = subject;
423 *extra_headers_p = extra_headers;
426 static void show_sig_lines(struct rev_info *opt, int status, const char *bol)
428 const char *color, *reset, *eol;
430 color = diff_get_color_opt(&opt->diffopt,
431 status ? DIFF_WHITESPACE : DIFF_FRAGINFO);
432 reset = diff_get_color_opt(&opt->diffopt, DIFF_RESET);
433 while (*bol) {
434 eol = strchrnul(bol, '\n');
435 printf("%s%.*s%s%s", color, (int)(eol - bol), bol, reset,
436 *eol ? "\n" : "");
437 graph_show_oneline(opt->graph);
438 bol = (*eol) ? (eol + 1) : eol;
442 static void show_signature(struct rev_info *opt, struct commit *commit)
444 struct strbuf payload = STRBUF_INIT;
445 struct strbuf signature = STRBUF_INIT;
446 struct strbuf gpg_output = STRBUF_INIT;
447 int status;
449 if (parse_signed_commit(commit, &payload, &signature) <= 0)
450 goto out;
452 status = verify_signed_buffer(payload.buf, payload.len,
453 signature.buf, signature.len,
454 &gpg_output, NULL);
455 if (status && !gpg_output.len)
456 strbuf_addstr(&gpg_output, "No signature\n");
458 show_sig_lines(opt, status, gpg_output.buf);
460 out:
461 strbuf_release(&gpg_output);
462 strbuf_release(&payload);
463 strbuf_release(&signature);
466 static int which_parent(const unsigned char *sha1, const struct commit *commit)
468 int nth;
469 const struct commit_list *parent;
471 for (nth = 0, parent = commit->parents; parent; parent = parent->next) {
472 if (!hashcmp(parent->item->object.sha1, sha1))
473 return nth;
474 nth++;
476 return -1;
479 static int is_common_merge(const struct commit *commit)
481 return (commit->parents
482 && commit->parents->next
483 && !commit->parents->next->next);
486 static void show_one_mergetag(struct commit *commit,
487 struct commit_extra_header *extra,
488 void *data)
490 struct rev_info *opt = (struct rev_info *)data;
491 unsigned char sha1[20];
492 struct tag *tag;
493 struct strbuf verify_message;
494 int status, nth;
495 size_t payload_size, gpg_message_offset;
497 hash_sha1_file(extra->value, extra->len, typename(OBJ_TAG), sha1);
498 tag = lookup_tag(sha1);
499 if (!tag)
500 return; /* error message already given */
502 strbuf_init(&verify_message, 256);
503 if (parse_tag_buffer(tag, extra->value, extra->len))
504 strbuf_addstr(&verify_message, "malformed mergetag\n");
505 else if (is_common_merge(commit) &&
506 !hashcmp(tag->tagged->sha1,
507 commit->parents->next->item->object.sha1))
508 strbuf_addf(&verify_message,
509 "merged tag '%s'\n", tag->tag);
510 else if ((nth = which_parent(tag->tagged->sha1, commit)) < 0)
511 strbuf_addf(&verify_message, "tag %s names a non-parent %s\n",
512 tag->tag, tag->tagged->sha1);
513 else
514 strbuf_addf(&verify_message,
515 "parent #%d, tagged '%s'\n", nth + 1, tag->tag);
516 gpg_message_offset = verify_message.len;
518 payload_size = parse_signature(extra->value, extra->len);
519 status = -1;
520 if (extra->len > payload_size) {
521 /* could have a good signature */
522 if (!verify_signed_buffer(extra->value, payload_size,
523 extra->value + payload_size,
524 extra->len - payload_size,
525 &verify_message, NULL))
526 status = 0; /* good */
527 else if (verify_message.len <= gpg_message_offset)
528 strbuf_addstr(&verify_message, "No signature\n");
529 /* otherwise we couldn't verify, which is shown as bad */
532 show_sig_lines(opt, status, verify_message.buf);
533 strbuf_release(&verify_message);
536 static void show_mergetag(struct rev_info *opt, struct commit *commit)
538 for_each_mergetag(show_one_mergetag, commit, opt);
541 void show_log(struct rev_info *opt)
543 struct strbuf msgbuf = STRBUF_INIT;
544 struct log_info *log = opt->loginfo;
545 struct commit *commit = log->commit, *parent = log->parent;
546 int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
547 const char *extra_headers = opt->extra_headers;
548 struct pretty_print_context ctx = {0};
550 opt->loginfo = NULL;
551 if (!opt->verbose_header) {
552 graph_show_commit(opt->graph);
554 if (!opt->graph)
555 put_revision_mark(opt, commit);
556 fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit), stdout);
557 if (opt->print_parents)
558 show_parents(commit, abbrev_commit);
559 if (opt->children.name)
560 show_children(opt, commit, abbrev_commit);
561 show_decorations(opt, commit);
562 if (opt->graph && !graph_is_commit_finished(opt->graph)) {
563 putchar('\n');
564 graph_show_remainder(opt->graph);
566 putchar(opt->diffopt.line_termination);
567 return;
571 * If use_terminator is set, we already handled any record termination
572 * at the end of the last record.
573 * Otherwise, add a diffopt.line_termination character before all
574 * entries but the first. (IOW, as a separator between entries)
576 if (opt->shown_one && !opt->use_terminator) {
578 * If entries are separated by a newline, the output
579 * should look human-readable. If the last entry ended
580 * with a newline, print the graph output before this
581 * newline. Otherwise it will end up as a completely blank
582 * line and will look like a gap in the graph.
584 * If the entry separator is not a newline, the output is
585 * primarily intended for programmatic consumption, and we
586 * never want the extra graph output before the entry
587 * separator.
589 if (opt->diffopt.line_termination == '\n' &&
590 !opt->missing_newline)
591 graph_show_padding(opt->graph);
592 putchar(opt->diffopt.line_termination);
594 opt->shown_one = 1;
597 * If the history graph was requested,
598 * print the graph, up to this commit's line
600 graph_show_commit(opt->graph);
603 * Print header line of header..
606 if (opt->commit_format == CMIT_FMT_EMAIL) {
607 log_write_email_headers(opt, commit, &ctx.subject, &extra_headers,
608 &ctx.need_8bit_cte);
609 } else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
610 fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), stdout);
611 if (opt->commit_format != CMIT_FMT_ONELINE)
612 fputs("commit ", stdout);
614 if (!opt->graph)
615 put_revision_mark(opt, commit);
616 fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit),
617 stdout);
618 if (opt->print_parents)
619 show_parents(commit, abbrev_commit);
620 if (opt->children.name)
621 show_children(opt, commit, abbrev_commit);
622 if (parent)
623 printf(" (from %s)",
624 find_unique_abbrev(parent->object.sha1,
625 abbrev_commit));
626 fputs(diff_get_color_opt(&opt->diffopt, DIFF_RESET), stdout);
627 show_decorations(opt, commit);
628 if (opt->commit_format == CMIT_FMT_ONELINE) {
629 putchar(' ');
630 } else {
631 putchar('\n');
632 graph_show_oneline(opt->graph);
634 if (opt->reflog_info) {
636 * setup_revisions() ensures that opt->reflog_info
637 * and opt->graph cannot both be set,
638 * so we don't need to worry about printing the
639 * graph info here.
641 show_reflog_message(opt->reflog_info,
642 opt->commit_format == CMIT_FMT_ONELINE,
643 &opt->date_mode,
644 opt->date_mode_explicit);
645 if (opt->commit_format == CMIT_FMT_ONELINE)
646 return;
650 if (opt->show_signature) {
651 show_signature(opt, commit);
652 show_mergetag(opt, commit);
655 if (!get_cached_commit_buffer(commit, NULL))
656 return;
658 if (opt->show_notes) {
659 int raw;
660 struct strbuf notebuf = STRBUF_INIT;
662 raw = (opt->commit_format == CMIT_FMT_USERFORMAT);
663 format_display_notes(commit->object.sha1, &notebuf,
664 get_log_output_encoding(), raw);
665 ctx.notes_message = notebuf.len
666 ? strbuf_detach(&notebuf, NULL)
667 : xcalloc(1, 1);
671 * And then the pretty-printed message itself
673 if (ctx.need_8bit_cte >= 0 && opt->add_signoff)
674 ctx.need_8bit_cte =
675 has_non_ascii(fmt_name(getenv("GIT_COMMITTER_NAME"),
676 getenv("GIT_COMMITTER_EMAIL")));
677 ctx.date_mode = opt->date_mode;
678 ctx.date_mode_explicit = opt->date_mode_explicit;
679 ctx.abbrev = opt->diffopt.abbrev;
680 ctx.after_subject = extra_headers;
681 ctx.preserve_subject = opt->preserve_subject;
682 ctx.reflog_info = opt->reflog_info;
683 ctx.fmt = opt->commit_format;
684 ctx.mailmap = opt->mailmap;
685 ctx.color = opt->diffopt.use_color;
686 ctx.output_encoding = get_log_output_encoding();
687 if (opt->from_ident.mail_begin && opt->from_ident.name_begin)
688 ctx.from_ident = &opt->from_ident;
689 pretty_print_commit(&ctx, commit, &msgbuf);
691 if (opt->add_signoff)
692 append_signoff(&msgbuf, 0, APPEND_SIGNOFF_DEDUP);
694 if ((ctx.fmt != CMIT_FMT_USERFORMAT) &&
695 ctx.notes_message && *ctx.notes_message) {
696 if (ctx.fmt == CMIT_FMT_EMAIL) {
697 strbuf_addstr(&msgbuf, "---\n");
698 opt->shown_dashes = 1;
700 strbuf_addstr(&msgbuf, ctx.notes_message);
703 if (opt->show_log_size) {
704 printf("log size %i\n", (int)msgbuf.len);
705 graph_show_oneline(opt->graph);
709 * Set opt->missing_newline if msgbuf doesn't
710 * end in a newline (including if it is empty)
712 if (!msgbuf.len || msgbuf.buf[msgbuf.len - 1] != '\n')
713 opt->missing_newline = 1;
714 else
715 opt->missing_newline = 0;
717 if (opt->graph)
718 graph_show_commit_msg(opt->graph, &msgbuf);
719 else
720 fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
721 if (opt->use_terminator && !commit_format_is_empty(opt->commit_format)) {
722 if (!opt->missing_newline)
723 graph_show_padding(opt->graph);
724 putchar(opt->diffopt.line_termination);
727 strbuf_release(&msgbuf);
728 free(ctx.notes_message);
731 int log_tree_diff_flush(struct rev_info *opt)
733 opt->shown_dashes = 0;
734 diffcore_std(&opt->diffopt);
736 if (diff_queue_is_empty()) {
737 int saved_fmt = opt->diffopt.output_format;
738 opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
739 diff_flush(&opt->diffopt);
740 opt->diffopt.output_format = saved_fmt;
741 return 0;
744 if (opt->loginfo && !opt->no_commit_id) {
745 show_log(opt);
746 if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) &&
747 opt->verbose_header &&
748 opt->commit_format != CMIT_FMT_ONELINE &&
749 !commit_format_is_empty(opt->commit_format)) {
751 * When showing a verbose header (i.e. log message),
752 * and not in --pretty=oneline format, we would want
753 * an extra newline between the end of log and the
754 * diff/diffstat output for readability.
756 int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
757 if (opt->diffopt.output_prefix) {
758 struct strbuf *msg = NULL;
759 msg = opt->diffopt.output_prefix(&opt->diffopt,
760 opt->diffopt.output_prefix_data);
761 fwrite(msg->buf, msg->len, 1, stdout);
765 * We may have shown three-dashes line early
766 * between notes and the log message, in which
767 * case we only want a blank line after the
768 * notes without (an extra) three-dashes line.
769 * Otherwise, we show the three-dashes line if
770 * we are showing the patch with diffstat, but
771 * in that case, there is no extra blank line
772 * after the three-dashes line.
774 if (!opt->shown_dashes &&
775 (pch & opt->diffopt.output_format) == pch)
776 printf("---");
777 putchar('\n');
780 diff_flush(&opt->diffopt);
781 return 1;
784 static int do_diff_combined(struct rev_info *opt, struct commit *commit)
786 diff_tree_combined_merge(commit, opt->dense_combined_merges, opt);
787 return !opt->loginfo;
791 * Show the diff of a commit.
793 * Return true if we printed any log info messages
795 static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log_info *log)
797 int showed_log;
798 struct commit_list *parents;
799 unsigned const char *sha1;
801 if (!opt->diff && !DIFF_OPT_TST(&opt->diffopt, EXIT_WITH_STATUS))
802 return 0;
804 parse_commit_or_die(commit);
805 sha1 = commit->tree->object.sha1;
807 /* Root commit? */
808 parents = get_saved_parents(opt, commit);
809 if (!parents) {
810 if (opt->show_root_diff) {
811 diff_root_tree_sha1(sha1, "", &opt->diffopt);
812 log_tree_diff_flush(opt);
814 return !opt->loginfo;
817 /* More than one parent? */
818 if (parents && parents->next) {
819 if (opt->ignore_merges)
820 return 0;
821 else if (opt->combine_merges)
822 return do_diff_combined(opt, commit);
823 else if (opt->first_parent_only) {
825 * Generate merge log entry only for the first
826 * parent, showing summary diff of the others
827 * we merged _in_.
829 parse_commit_or_die(parents->item);
830 diff_tree_sha1(parents->item->tree->object.sha1,
831 sha1, "", &opt->diffopt);
832 log_tree_diff_flush(opt);
833 return !opt->loginfo;
836 /* If we show individual diffs, show the parent info */
837 log->parent = parents->item;
840 showed_log = 0;
841 for (;;) {
842 struct commit *parent = parents->item;
844 parse_commit_or_die(parent);
845 diff_tree_sha1(parent->tree->object.sha1,
846 sha1, "", &opt->diffopt);
847 log_tree_diff_flush(opt);
849 showed_log |= !opt->loginfo;
851 /* Set up the log info for the next parent, if any.. */
852 parents = parents->next;
853 if (!parents)
854 break;
855 log->parent = parents->item;
856 opt->loginfo = log;
858 return showed_log;
861 int log_tree_commit(struct rev_info *opt, struct commit *commit)
863 struct log_info log;
864 int shown;
866 log.commit = commit;
867 log.parent = NULL;
868 opt->loginfo = &log;
870 if (opt->line_level_traverse)
871 return line_log_print(opt, commit);
873 if (opt->track_linear && !opt->linear && !opt->reverse_output_stage)
874 printf("\n%s\n", opt->break_bar);
875 shown = log_tree_diff(opt, commit, &log);
876 if (!shown && opt->loginfo && opt->always_show_header) {
877 log.parent = NULL;
878 show_log(opt);
879 shown = 1;
881 if (opt->track_linear && !opt->linear && opt->reverse_output_stage)
882 printf("\n%s\n", opt->break_bar);
883 opt->loginfo = NULL;
884 maybe_flush_or_die(stdout, "stdout");
885 return shown;