Merge branch 'jk/die-on-bogus-worktree-late'
[git.git] / log-tree.c
blob01beb11f65b518e382fa01f18f03c5a9f2ddf529
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, "refs/replace/")) {
101 struct object_id original_oid;
102 if (!check_replace_refs)
103 return 0;
104 if (get_oid_hex(refname + 13, &original_oid)) {
105 warning("invalid replace ref %s", refname);
106 return 0;
108 obj = parse_object(original_oid.hash);
109 if (obj)
110 add_name_decoration(DECORATION_GRAFTED, "replaced", obj);
111 return 0;
114 obj = parse_object(oid->hash);
115 if (!obj)
116 return 0;
118 if (starts_with(refname, "refs/heads/"))
119 type = DECORATION_REF_LOCAL;
120 else if (starts_with(refname, "refs/remotes/"))
121 type = DECORATION_REF_REMOTE;
122 else if (starts_with(refname, "refs/tags/"))
123 type = DECORATION_REF_TAG;
124 else if (!strcmp(refname, "refs/stash"))
125 type = DECORATION_REF_STASH;
126 else if (!strcmp(refname, "HEAD"))
127 type = DECORATION_REF_HEAD;
129 add_name_decoration(type, refname, obj);
130 while (obj->type == OBJ_TAG) {
131 obj = ((struct tag *)obj)->tagged;
132 if (!obj)
133 break;
134 if (!obj->parsed)
135 parse_object(obj->sha1);
136 add_name_decoration(DECORATION_REF_TAG, refname, obj);
138 return 0;
141 static int add_graft_decoration(const struct commit_graft *graft, void *cb_data)
143 struct commit *commit = lookup_commit(graft->oid.hash);
144 if (!commit)
145 return 0;
146 add_name_decoration(DECORATION_GRAFTED, "grafted", &commit->object);
147 return 0;
150 void load_ref_decorations(int flags)
152 if (!decoration_loaded) {
154 decoration_loaded = 1;
155 decoration_flags = flags;
156 for_each_ref(add_ref_decoration, NULL);
157 head_ref(add_ref_decoration, NULL);
158 for_each_commit_graft(add_graft_decoration, NULL);
162 static void show_parents(struct commit *commit, int abbrev)
164 struct commit_list *p;
165 for (p = commit->parents; p ; p = p->next) {
166 struct commit *parent = p->item;
167 printf(" %s", find_unique_abbrev(parent->object.sha1, abbrev));
171 static void show_children(struct rev_info *opt, struct commit *commit, int abbrev)
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));
180 * Do we have HEAD in the output, and also the branch it points at?
181 * If so, find that decoration entry for that current branch.
183 static const struct name_decoration *current_pointed_by_HEAD(const struct name_decoration *decoration)
185 const struct name_decoration *list, *head = NULL;
186 const char *branch_name = NULL;
187 unsigned char unused[20];
188 int rru_flags;
190 /* First find HEAD */
191 for (list = decoration; list; list = list->next)
192 if (list->type == DECORATION_REF_HEAD) {
193 head = list;
194 break;
196 if (!head)
197 return NULL;
199 /* Now resolve and find the matching current branch */
200 branch_name = resolve_ref_unsafe("HEAD", 0, unused, &rru_flags);
201 if (!(rru_flags & REF_ISSYMREF))
202 return NULL;
204 if (!starts_with(branch_name, "refs/"))
205 return NULL;
207 /* OK, do we have that ref in the list? */
208 for (list = decoration; list; list = list->next)
209 if ((list->type == DECORATION_REF_LOCAL) &&
210 !strcmp(branch_name, list->name)) {
211 return list;
214 return NULL;
217 static void show_name(struct strbuf *sb, const struct name_decoration *decoration)
219 if (decoration_flags == DECORATE_SHORT_REFS)
220 strbuf_addstr(sb, prettify_refname(decoration->name));
221 else
222 strbuf_addstr(sb, decoration->name);
226 * The caller makes sure there is no funny color before calling.
227 * format_decorations_extended makes sure the same after return.
229 void format_decorations_extended(struct strbuf *sb,
230 const struct commit *commit,
231 int use_color,
232 const char *prefix,
233 const char *separator,
234 const char *suffix)
236 const struct name_decoration *decoration;
237 const struct name_decoration *current_and_HEAD;
238 const char *color_commit =
239 diff_get_color(use_color, DIFF_COMMIT);
240 const char *color_reset =
241 decorate_get_color(use_color, DECORATION_NONE);
243 decoration = get_name_decoration(&commit->object);
244 if (!decoration)
245 return;
247 current_and_HEAD = current_pointed_by_HEAD(decoration);
248 while (decoration) {
250 * When both current and HEAD are there, only
251 * show HEAD->current where HEAD would have
252 * appeared, skipping the entry for current.
254 if (decoration != current_and_HEAD) {
255 strbuf_addstr(sb, color_commit);
256 strbuf_addstr(sb, prefix);
257 strbuf_addstr(sb, color_reset);
258 strbuf_addstr(sb, decorate_get_color(use_color, decoration->type));
259 if (decoration->type == DECORATION_REF_TAG)
260 strbuf_addstr(sb, "tag: ");
262 show_name(sb, decoration);
264 if (current_and_HEAD &&
265 decoration->type == DECORATION_REF_HEAD) {
266 strbuf_addstr(sb, color_reset);
267 strbuf_addstr(sb, color_commit);
268 strbuf_addstr(sb, " -> ");
269 strbuf_addstr(sb, color_reset);
270 strbuf_addstr(sb, decorate_get_color(use_color, current_and_HEAD->type));
271 show_name(sb, current_and_HEAD);
273 strbuf_addstr(sb, color_reset);
275 prefix = separator;
277 decoration = decoration->next;
279 strbuf_addstr(sb, color_commit);
280 strbuf_addstr(sb, suffix);
281 strbuf_addstr(sb, color_reset);
284 void show_decorations(struct rev_info *opt, struct commit *commit)
286 struct strbuf sb = STRBUF_INIT;
288 if (opt->show_source && commit->util)
289 printf("\t%s", (char *) commit->util);
290 if (!opt->show_decorations)
291 return;
292 format_decorations(&sb, commit, opt->diffopt.use_color);
293 fputs(sb.buf, stdout);
294 strbuf_release(&sb);
297 static unsigned int digits_in_number(unsigned int number)
299 unsigned int i = 10, result = 1;
300 while (i <= number) {
301 i *= 10;
302 result++;
304 return result;
307 void fmt_output_subject(struct strbuf *filename,
308 const char *subject,
309 struct rev_info *info)
311 const char *suffix = info->patch_suffix;
312 int nr = info->nr;
313 int start_len = filename->len;
314 int max_len = start_len + FORMAT_PATCH_NAME_MAX - (strlen(suffix) + 1);
316 if (0 < info->reroll_count)
317 strbuf_addf(filename, "v%d-", info->reroll_count);
318 strbuf_addf(filename, "%04d-%s", nr, subject);
320 if (max_len < filename->len)
321 strbuf_setlen(filename, max_len);
322 strbuf_addstr(filename, suffix);
325 void fmt_output_commit(struct strbuf *filename,
326 struct commit *commit,
327 struct rev_info *info)
329 struct pretty_print_context ctx = {0};
330 struct strbuf subject = STRBUF_INIT;
332 format_commit_message(commit, "%f", &subject, &ctx);
333 fmt_output_subject(filename, subject.buf, info);
334 strbuf_release(&subject);
337 void log_write_email_headers(struct rev_info *opt, struct commit *commit,
338 const char **subject_p,
339 const char **extra_headers_p,
340 int *need_8bit_cte_p)
342 const char *subject = NULL;
343 const char *extra_headers = opt->extra_headers;
344 const char *name = sha1_to_hex(commit->object.sha1);
346 *need_8bit_cte_p = 0; /* unknown */
347 if (opt->total > 0) {
348 static char buffer[64];
349 snprintf(buffer, sizeof(buffer),
350 "Subject: [%s%s%0*d/%d] ",
351 opt->subject_prefix,
352 *opt->subject_prefix ? " " : "",
353 digits_in_number(opt->total),
354 opt->nr, opt->total);
355 subject = buffer;
356 } else if (opt->total == 0 && opt->subject_prefix && *opt->subject_prefix) {
357 static char buffer[256];
358 snprintf(buffer, sizeof(buffer),
359 "Subject: [%s] ",
360 opt->subject_prefix);
361 subject = buffer;
362 } else {
363 subject = "Subject: ";
366 printf("From %s Mon Sep 17 00:00:00 2001\n", name);
367 graph_show_oneline(opt->graph);
368 if (opt->message_id) {
369 printf("Message-Id: <%s>\n", opt->message_id);
370 graph_show_oneline(opt->graph);
372 if (opt->ref_message_ids && opt->ref_message_ids->nr > 0) {
373 int i, n;
374 n = opt->ref_message_ids->nr;
375 printf("In-Reply-To: <%s>\n", opt->ref_message_ids->items[n-1].string);
376 for (i = 0; i < n; i++)
377 printf("%s<%s>\n", (i > 0 ? "\t" : "References: "),
378 opt->ref_message_ids->items[i].string);
379 graph_show_oneline(opt->graph);
381 if (opt->mime_boundary) {
382 static char subject_buffer[1024];
383 static char buffer[1024];
384 struct strbuf filename = STRBUF_INIT;
385 *need_8bit_cte_p = -1; /* NEVER */
386 snprintf(subject_buffer, sizeof(subject_buffer) - 1,
387 "%s"
388 "MIME-Version: 1.0\n"
389 "Content-Type: multipart/mixed;"
390 " boundary=\"%s%s\"\n"
391 "\n"
392 "This is a multi-part message in MIME "
393 "format.\n"
394 "--%s%s\n"
395 "Content-Type: text/plain; "
396 "charset=UTF-8; format=fixed\n"
397 "Content-Transfer-Encoding: 8bit\n\n",
398 extra_headers ? extra_headers : "",
399 mime_boundary_leader, opt->mime_boundary,
400 mime_boundary_leader, opt->mime_boundary);
401 extra_headers = subject_buffer;
403 if (opt->numbered_files)
404 strbuf_addf(&filename, "%d", opt->nr);
405 else
406 fmt_output_commit(&filename, commit, opt);
407 snprintf(buffer, sizeof(buffer) - 1,
408 "\n--%s%s\n"
409 "Content-Type: text/x-patch;"
410 " name=\"%s\"\n"
411 "Content-Transfer-Encoding: 8bit\n"
412 "Content-Disposition: %s;"
413 " filename=\"%s\"\n\n",
414 mime_boundary_leader, opt->mime_boundary,
415 filename.buf,
416 opt->no_inline ? "attachment" : "inline",
417 filename.buf);
418 opt->diffopt.stat_sep = buffer;
419 strbuf_release(&filename);
421 *subject_p = subject;
422 *extra_headers_p = extra_headers;
425 static void show_sig_lines(struct rev_info *opt, int status, const char *bol)
427 const char *color, *reset, *eol;
429 color = diff_get_color_opt(&opt->diffopt,
430 status ? DIFF_WHITESPACE : DIFF_FRAGINFO);
431 reset = diff_get_color_opt(&opt->diffopt, DIFF_RESET);
432 while (*bol) {
433 eol = strchrnul(bol, '\n');
434 printf("%s%.*s%s%s", color, (int)(eol - bol), bol, reset,
435 *eol ? "\n" : "");
436 graph_show_oneline(opt->graph);
437 bol = (*eol) ? (eol + 1) : eol;
441 static void show_signature(struct rev_info *opt, struct commit *commit)
443 struct strbuf payload = STRBUF_INIT;
444 struct strbuf signature = STRBUF_INIT;
445 struct strbuf gpg_output = STRBUF_INIT;
446 int status;
448 if (parse_signed_commit(commit, &payload, &signature) <= 0)
449 goto out;
451 status = verify_signed_buffer(payload.buf, payload.len,
452 signature.buf, signature.len,
453 &gpg_output, NULL);
454 if (status && !gpg_output.len)
455 strbuf_addstr(&gpg_output, "No signature\n");
457 show_sig_lines(opt, status, gpg_output.buf);
459 out:
460 strbuf_release(&gpg_output);
461 strbuf_release(&payload);
462 strbuf_release(&signature);
465 static int which_parent(const unsigned char *sha1, const struct commit *commit)
467 int nth;
468 const struct commit_list *parent;
470 for (nth = 0, parent = commit->parents; parent; parent = parent->next) {
471 if (!hashcmp(parent->item->object.sha1, sha1))
472 return nth;
473 nth++;
475 return -1;
478 static int is_common_merge(const struct commit *commit)
480 return (commit->parents
481 && commit->parents->next
482 && !commit->parents->next->next);
485 static void show_one_mergetag(struct commit *commit,
486 struct commit_extra_header *extra,
487 void *data)
489 struct rev_info *opt = (struct rev_info *)data;
490 unsigned char sha1[20];
491 struct tag *tag;
492 struct strbuf verify_message;
493 int status, nth;
494 size_t payload_size, gpg_message_offset;
496 hash_sha1_file(extra->value, extra->len, typename(OBJ_TAG), sha1);
497 tag = lookup_tag(sha1);
498 if (!tag)
499 return; /* error message already given */
501 strbuf_init(&verify_message, 256);
502 if (parse_tag_buffer(tag, extra->value, extra->len))
503 strbuf_addstr(&verify_message, "malformed mergetag\n");
504 else if (is_common_merge(commit) &&
505 !hashcmp(tag->tagged->sha1,
506 commit->parents->next->item->object.sha1))
507 strbuf_addf(&verify_message,
508 "merged tag '%s'\n", tag->tag);
509 else if ((nth = which_parent(tag->tagged->sha1, commit)) < 0)
510 strbuf_addf(&verify_message, "tag %s names a non-parent %s\n",
511 tag->tag, tag->tagged->sha1);
512 else
513 strbuf_addf(&verify_message,
514 "parent #%d, tagged '%s'\n", nth + 1, tag->tag);
515 gpg_message_offset = verify_message.len;
517 payload_size = parse_signature(extra->value, extra->len);
518 status = -1;
519 if (extra->len > payload_size) {
520 /* could have a good signature */
521 if (!verify_signed_buffer(extra->value, payload_size,
522 extra->value + payload_size,
523 extra->len - payload_size,
524 &verify_message, NULL))
525 status = 0; /* good */
526 else if (verify_message.len <= gpg_message_offset)
527 strbuf_addstr(&verify_message, "No signature\n");
528 /* otherwise we couldn't verify, which is shown as bad */
531 show_sig_lines(opt, status, verify_message.buf);
532 strbuf_release(&verify_message);
535 static void show_mergetag(struct rev_info *opt, struct commit *commit)
537 for_each_mergetag(show_one_mergetag, commit, opt);
540 void show_log(struct rev_info *opt)
542 struct strbuf msgbuf = STRBUF_INIT;
543 struct log_info *log = opt->loginfo;
544 struct commit *commit = log->commit, *parent = log->parent;
545 int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
546 const char *extra_headers = opt->extra_headers;
547 struct pretty_print_context ctx = {0};
549 opt->loginfo = NULL;
550 if (!opt->verbose_header) {
551 graph_show_commit(opt->graph);
553 if (!opt->graph)
554 put_revision_mark(opt, commit);
555 fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit), stdout);
556 if (opt->print_parents)
557 show_parents(commit, abbrev_commit);
558 if (opt->children.name)
559 show_children(opt, commit, abbrev_commit);
560 show_decorations(opt, commit);
561 if (opt->graph && !graph_is_commit_finished(opt->graph)) {
562 putchar('\n');
563 graph_show_remainder(opt->graph);
565 putchar(opt->diffopt.line_termination);
566 return;
570 * If use_terminator is set, we already handled any record termination
571 * at the end of the last record.
572 * Otherwise, add a diffopt.line_termination character before all
573 * entries but the first. (IOW, as a separator between entries)
575 if (opt->shown_one && !opt->use_terminator) {
577 * If entries are separated by a newline, the output
578 * should look human-readable. If the last entry ended
579 * with a newline, print the graph output before this
580 * newline. Otherwise it will end up as a completely blank
581 * line and will look like a gap in the graph.
583 * If the entry separator is not a newline, the output is
584 * primarily intended for programmatic consumption, and we
585 * never want the extra graph output before the entry
586 * separator.
588 if (opt->diffopt.line_termination == '\n' &&
589 !opt->missing_newline)
590 graph_show_padding(opt->graph);
591 putchar(opt->diffopt.line_termination);
593 opt->shown_one = 1;
596 * If the history graph was requested,
597 * print the graph, up to this commit's line
599 graph_show_commit(opt->graph);
602 * Print header line of header..
605 if (opt->commit_format == CMIT_FMT_EMAIL) {
606 log_write_email_headers(opt, commit, &ctx.subject, &extra_headers,
607 &ctx.need_8bit_cte);
608 } else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
609 fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), stdout);
610 if (opt->commit_format != CMIT_FMT_ONELINE)
611 fputs("commit ", stdout);
613 if (!opt->graph)
614 put_revision_mark(opt, commit);
615 fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit),
616 stdout);
617 if (opt->print_parents)
618 show_parents(commit, abbrev_commit);
619 if (opt->children.name)
620 show_children(opt, commit, abbrev_commit);
621 if (parent)
622 printf(" (from %s)",
623 find_unique_abbrev(parent->object.sha1,
624 abbrev_commit));
625 fputs(diff_get_color_opt(&opt->diffopt, DIFF_RESET), stdout);
626 show_decorations(opt, commit);
627 if (opt->commit_format == CMIT_FMT_ONELINE) {
628 putchar(' ');
629 } else {
630 putchar('\n');
631 graph_show_oneline(opt->graph);
633 if (opt->reflog_info) {
635 * setup_revisions() ensures that opt->reflog_info
636 * and opt->graph cannot both be set,
637 * so we don't need to worry about printing the
638 * graph info here.
640 show_reflog_message(opt->reflog_info,
641 opt->commit_format == CMIT_FMT_ONELINE,
642 opt->date_mode,
643 opt->date_mode_explicit);
644 if (opt->commit_format == CMIT_FMT_ONELINE)
645 return;
649 if (opt->show_signature) {
650 show_signature(opt, commit);
651 show_mergetag(opt, commit);
654 if (!get_cached_commit_buffer(commit, NULL))
655 return;
657 if (opt->show_notes) {
658 int raw;
659 struct strbuf notebuf = STRBUF_INIT;
661 raw = (opt->commit_format == CMIT_FMT_USERFORMAT);
662 format_display_notes(commit->object.sha1, &notebuf,
663 get_log_output_encoding(), raw);
664 ctx.notes_message = notebuf.len
665 ? strbuf_detach(&notebuf, NULL)
666 : xcalloc(1, 1);
670 * And then the pretty-printed message itself
672 if (ctx.need_8bit_cte >= 0 && opt->add_signoff)
673 ctx.need_8bit_cte =
674 has_non_ascii(fmt_name(getenv("GIT_COMMITTER_NAME"),
675 getenv("GIT_COMMITTER_EMAIL")));
676 ctx.date_mode = opt->date_mode;
677 ctx.date_mode_explicit = opt->date_mode_explicit;
678 ctx.abbrev = opt->diffopt.abbrev;
679 ctx.after_subject = extra_headers;
680 ctx.preserve_subject = opt->preserve_subject;
681 ctx.reflog_info = opt->reflog_info;
682 ctx.fmt = opt->commit_format;
683 ctx.mailmap = opt->mailmap;
684 ctx.color = opt->diffopt.use_color;
685 ctx.output_encoding = get_log_output_encoding();
686 if (opt->from_ident.mail_begin && opt->from_ident.name_begin)
687 ctx.from_ident = &opt->from_ident;
688 pretty_print_commit(&ctx, commit, &msgbuf);
690 if (opt->add_signoff)
691 append_signoff(&msgbuf, 0, APPEND_SIGNOFF_DEDUP);
693 if ((ctx.fmt != CMIT_FMT_USERFORMAT) &&
694 ctx.notes_message && *ctx.notes_message) {
695 if (ctx.fmt == CMIT_FMT_EMAIL) {
696 strbuf_addstr(&msgbuf, "---\n");
697 opt->shown_dashes = 1;
699 strbuf_addstr(&msgbuf, ctx.notes_message);
702 if (opt->show_log_size) {
703 printf("log size %i\n", (int)msgbuf.len);
704 graph_show_oneline(opt->graph);
708 * Set opt->missing_newline if msgbuf doesn't
709 * end in a newline (including if it is empty)
711 if (!msgbuf.len || msgbuf.buf[msgbuf.len - 1] != '\n')
712 opt->missing_newline = 1;
713 else
714 opt->missing_newline = 0;
716 if (opt->graph)
717 graph_show_commit_msg(opt->graph, &msgbuf);
718 else
719 fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
720 if (opt->use_terminator && !commit_format_is_empty(opt->commit_format)) {
721 if (!opt->missing_newline)
722 graph_show_padding(opt->graph);
723 putchar(opt->diffopt.line_termination);
726 strbuf_release(&msgbuf);
727 free(ctx.notes_message);
730 int log_tree_diff_flush(struct rev_info *opt)
732 opt->shown_dashes = 0;
733 diffcore_std(&opt->diffopt);
735 if (diff_queue_is_empty()) {
736 int saved_fmt = opt->diffopt.output_format;
737 opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
738 diff_flush(&opt->diffopt);
739 opt->diffopt.output_format = saved_fmt;
740 return 0;
743 if (opt->loginfo && !opt->no_commit_id) {
744 show_log(opt);
745 if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) &&
746 opt->verbose_header &&
747 opt->commit_format != CMIT_FMT_ONELINE &&
748 !commit_format_is_empty(opt->commit_format)) {
750 * When showing a verbose header (i.e. log message),
751 * and not in --pretty=oneline format, we would want
752 * an extra newline between the end of log and the
753 * diff/diffstat output for readability.
755 int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
756 if (opt->diffopt.output_prefix) {
757 struct strbuf *msg = NULL;
758 msg = opt->diffopt.output_prefix(&opt->diffopt,
759 opt->diffopt.output_prefix_data);
760 fwrite(msg->buf, msg->len, 1, stdout);
764 * We may have shown three-dashes line early
765 * between notes and the log message, in which
766 * case we only want a blank line after the
767 * notes without (an extra) three-dashes line.
768 * Otherwise, we show the three-dashes line if
769 * we are showing the patch with diffstat, but
770 * in that case, there is no extra blank line
771 * after the three-dashes line.
773 if (!opt->shown_dashes &&
774 (pch & opt->diffopt.output_format) == pch)
775 printf("---");
776 putchar('\n');
779 diff_flush(&opt->diffopt);
780 return 1;
783 static int do_diff_combined(struct rev_info *opt, struct commit *commit)
785 diff_tree_combined_merge(commit, opt->dense_combined_merges, opt);
786 return !opt->loginfo;
790 * Show the diff of a commit.
792 * Return true if we printed any log info messages
794 static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log_info *log)
796 int showed_log;
797 struct commit_list *parents;
798 unsigned const char *sha1;
800 if (!opt->diff && !DIFF_OPT_TST(&opt->diffopt, EXIT_WITH_STATUS))
801 return 0;
803 parse_commit_or_die(commit);
804 sha1 = commit->tree->object.sha1;
806 /* Root commit? */
807 parents = get_saved_parents(opt, commit);
808 if (!parents) {
809 if (opt->show_root_diff) {
810 diff_root_tree_sha1(sha1, "", &opt->diffopt);
811 log_tree_diff_flush(opt);
813 return !opt->loginfo;
816 /* More than one parent? */
817 if (parents && parents->next) {
818 if (opt->ignore_merges)
819 return 0;
820 else if (opt->combine_merges)
821 return do_diff_combined(opt, commit);
822 else if (opt->first_parent_only) {
824 * Generate merge log entry only for the first
825 * parent, showing summary diff of the others
826 * we merged _in_.
828 parse_commit_or_die(parents->item);
829 diff_tree_sha1(parents->item->tree->object.sha1,
830 sha1, "", &opt->diffopt);
831 log_tree_diff_flush(opt);
832 return !opt->loginfo;
835 /* If we show individual diffs, show the parent info */
836 log->parent = parents->item;
839 showed_log = 0;
840 for (;;) {
841 struct commit *parent = parents->item;
843 parse_commit_or_die(parent);
844 diff_tree_sha1(parent->tree->object.sha1,
845 sha1, "", &opt->diffopt);
846 log_tree_diff_flush(opt);
848 showed_log |= !opt->loginfo;
850 /* Set up the log info for the next parent, if any.. */
851 parents = parents->next;
852 if (!parents)
853 break;
854 log->parent = parents->item;
855 opt->loginfo = log;
857 return showed_log;
860 int log_tree_commit(struct rev_info *opt, struct commit *commit)
862 struct log_info log;
863 int shown;
865 log.commit = commit;
866 log.parent = NULL;
867 opt->loginfo = &log;
869 if (opt->line_level_traverse)
870 return line_log_print(opt, commit);
872 if (opt->track_linear && !opt->linear && !opt->reverse_output_stage)
873 printf("\n%s\n", opt->break_bar);
874 shown = log_tree_diff(opt, commit, &log);
875 if (!shown && opt->loginfo && opt->always_show_header) {
876 log.parent = NULL;
877 show_log(opt);
878 shown = 1;
880 if (opt->track_linear && !opt->linear && opt->reverse_output_stage)
881 printf("\n%s\n", opt->break_bar);
882 opt->loginfo = NULL;
883 maybe_flush_or_die(stdout, "stdout");
884 return shown;