git.1: switch homepage for stats
[git.git] / log-tree.c
blobf87b7e891adc5dfb429bc0ae35227e19f335b90f
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 struct decoration name_decoration = { "object names" };
17 enum decoration_type {
18 DECORATION_NONE = 0,
19 DECORATION_REF_LOCAL,
20 DECORATION_REF_REMOTE,
21 DECORATION_REF_TAG,
22 DECORATION_REF_STASH,
23 DECORATION_REF_HEAD,
24 DECORATION_GRAFTED,
27 static char decoration_colors[][COLOR_MAXLEN] = {
28 GIT_COLOR_RESET,
29 GIT_COLOR_BOLD_GREEN, /* REF_LOCAL */
30 GIT_COLOR_BOLD_RED, /* REF_REMOTE */
31 GIT_COLOR_BOLD_YELLOW, /* REF_TAG */
32 GIT_COLOR_BOLD_MAGENTA, /* REF_STASH */
33 GIT_COLOR_BOLD_CYAN, /* REF_HEAD */
34 GIT_COLOR_BOLD_BLUE, /* GRAFTED */
37 static const char *decorate_get_color(int decorate_use_color, enum decoration_type ix)
39 if (want_color(decorate_use_color))
40 return decoration_colors[ix];
41 return "";
44 static int parse_decorate_color_slot(const char *slot)
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.
54 * We love being consistent, don't we?
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;
69 int parse_decorate_color_config(const char *var, const int ofs, const char *value)
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;
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
84 #define decorate_get_color_opt(o, ix) \
85 decorate_get_color((o)->use_color, ix)
87 static void add_name_decoration(enum decoration_type type, const char *name, struct object *obj)
89 int nlen = strlen(name);
90 struct name_decoration *res = xmalloc(sizeof(struct name_decoration) + nlen);
91 memcpy(res->name, name, nlen + 1);
92 res->type = type;
93 res->next = add_decoration(&name_decoration, obj, res);
96 static int add_ref_decoration(const char *refname, const unsigned char *sha1, int flags, void *cb_data)
98 struct object *obj;
99 enum decoration_type type = DECORATION_NONE;
101 if (starts_with(refname, "refs/replace/")) {
102 unsigned char original_sha1[20];
103 if (!check_replace_refs)
104 return 0;
105 if (get_sha1_hex(refname + 13, original_sha1)) {
106 warning("invalid replace ref %s", refname);
107 return 0;
109 obj = parse_object(original_sha1);
110 if (obj)
111 add_name_decoration(DECORATION_GRAFTED, "replaced", obj);
112 return 0;
115 obj = parse_object(sha1);
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 if (!cb_data || *(int *)cb_data == DECORATE_SHORT_REFS)
131 refname = prettify_refname(refname);
132 add_name_decoration(type, refname, obj);
133 while (obj->type == OBJ_TAG) {
134 obj = ((struct tag *)obj)->tagged;
135 if (!obj)
136 break;
137 if (!obj->parsed)
138 parse_object(obj->sha1);
139 add_name_decoration(DECORATION_REF_TAG, refname, obj);
141 return 0;
144 static int add_graft_decoration(const struct commit_graft *graft, void *cb_data)
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;
153 void load_ref_decorations(int flags)
155 static int loaded;
156 if (!loaded) {
157 loaded = 1;
158 for_each_ref(add_ref_decoration, &flags);
159 head_ref(add_ref_decoration, &flags);
160 for_each_commit_graft(add_graft_decoration, NULL);
164 static void show_parents(struct commit *commit, int abbrev)
166 struct commit_list *p;
167 for (p = commit->parents; p ; p = p->next) {
168 struct commit *parent = p->item;
169 printf(" %s", find_unique_abbrev(parent->object.sha1, abbrev));
173 static void show_children(struct rev_info *opt, struct commit *commit, int abbrev)
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));
182 * The caller makes sure there is no funny color before
183 * calling. format_decorations makes sure the same after return.
185 void format_decorations(struct strbuf *sb,
186 const struct commit *commit,
187 int use_color)
189 const char *prefix;
190 struct name_decoration *decoration;
191 const char *color_commit =
192 diff_get_color(use_color, DIFF_COMMIT);
193 const char *color_reset =
194 decorate_get_color(use_color, DECORATION_NONE);
196 decoration = lookup_decoration(&name_decoration, &commit->object);
197 if (!decoration)
198 return;
199 prefix = " (";
200 while (decoration) {
201 strbuf_addstr(sb, color_commit);
202 strbuf_addstr(sb, prefix);
203 strbuf_addstr(sb, decorate_get_color(use_color, decoration->type));
204 if (decoration->type == DECORATION_REF_TAG)
205 strbuf_addstr(sb, "tag: ");
206 strbuf_addstr(sb, decoration->name);
207 strbuf_addstr(sb, color_reset);
208 prefix = ", ";
209 decoration = decoration->next;
211 strbuf_addstr(sb, color_commit);
212 strbuf_addch(sb, ')');
213 strbuf_addstr(sb, color_reset);
216 void show_decorations(struct rev_info *opt, struct commit *commit)
218 struct strbuf sb = STRBUF_INIT;
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);
229 static unsigned int digits_in_number(unsigned int number)
231 unsigned int i = 10, result = 1;
232 while (i <= number) {
233 i *= 10;
234 result++;
236 return result;
239 void fmt_output_subject(struct strbuf *filename,
240 const char *subject,
241 struct rev_info *info)
243 const char *suffix = info->patch_suffix;
244 int nr = info->nr;
245 int start_len = filename->len;
246 int max_len = start_len + FORMAT_PATCH_NAME_MAX - (strlen(suffix) + 1);
248 if (0 < info->reroll_count)
249 strbuf_addf(filename, "v%d-", info->reroll_count);
250 strbuf_addf(filename, "%04d-%s", nr, subject);
252 if (max_len < filename->len)
253 strbuf_setlen(filename, max_len);
254 strbuf_addstr(filename, suffix);
257 void fmt_output_commit(struct strbuf *filename,
258 struct commit *commit,
259 struct rev_info *info)
261 struct pretty_print_context ctx = {0};
262 struct strbuf subject = STRBUF_INIT;
264 format_commit_message(commit, "%f", &subject, &ctx);
265 fmt_output_subject(filename, subject.buf, info);
266 strbuf_release(&subject);
269 void log_write_email_headers(struct rev_info *opt, struct commit *commit,
270 const char **subject_p,
271 const char **extra_headers_p,
272 int *need_8bit_cte_p)
274 const char *subject = NULL;
275 const char *extra_headers = opt->extra_headers;
276 const char *name = sha1_to_hex(commit->object.sha1);
278 *need_8bit_cte_p = 0; /* unknown */
279 if (opt->total > 0) {
280 static char buffer[64];
281 snprintf(buffer, sizeof(buffer),
282 "Subject: [%s%s%0*d/%d] ",
283 opt->subject_prefix,
284 *opt->subject_prefix ? " " : "",
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: ";
298 printf("From %s Mon Sep 17 00:00:00 2001\n", name);
299 graph_show_oneline(opt->graph);
300 if (opt->message_id) {
301 printf("Message-Id: <%s>\n", opt->message_id);
302 graph_show_oneline(opt->graph);
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);
311 graph_show_oneline(opt->graph);
313 if (opt->mime_boundary) {
314 static char subject_buffer[1024];
315 static char buffer[1024];
316 struct strbuf filename = STRBUF_INIT;
317 *need_8bit_cte_p = -1; /* NEVER */
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;
335 if (opt->numbered_files)
336 strbuf_addf(&filename, "%d", opt->nr);
337 else
338 fmt_output_commit(&filename, commit, opt);
339 snprintf(buffer, sizeof(buffer) - 1,
340 "\n--%s%s\n"
341 "Content-Type: text/x-patch;"
342 " name=\"%s\"\n"
343 "Content-Transfer-Encoding: 8bit\n"
344 "Content-Disposition: %s;"
345 " filename=\"%s\"\n\n",
346 mime_boundary_leader, opt->mime_boundary,
347 filename.buf,
348 opt->no_inline ? "attachment" : "inline",
349 filename.buf);
350 opt->diffopt.stat_sep = buffer;
351 strbuf_release(&filename);
353 *subject_p = subject;
354 *extra_headers_p = extra_headers;
357 static void show_sig_lines(struct rev_info *opt, int status, const char *bol)
359 const char *color, *reset, *eol;
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" : "");
368 graph_show_oneline(opt->graph);
369 bol = (*eol) ? (eol + 1) : eol;
373 static void show_signature(struct rev_info *opt, struct commit *commit)
375 struct strbuf payload = STRBUF_INIT;
376 struct strbuf signature = STRBUF_INIT;
377 struct strbuf gpg_output = STRBUF_INIT;
378 int status;
380 if (parse_signed_commit(commit, &payload, &signature) <= 0)
381 goto out;
383 status = verify_signed_buffer(payload.buf, payload.len,
384 signature.buf, signature.len,
385 &gpg_output, NULL);
386 if (status && !gpg_output.len)
387 strbuf_addstr(&gpg_output, "No signature\n");
389 show_sig_lines(opt, status, gpg_output.buf);
391 out:
392 strbuf_release(&gpg_output);
393 strbuf_release(&payload);
394 strbuf_release(&signature);
397 static int which_parent(const unsigned char *sha1, const struct commit *commit)
399 int nth;
400 const struct commit_list *parent;
402 for (nth = 0, parent = commit->parents; parent; parent = parent->next) {
403 if (!hashcmp(parent->item->object.sha1, sha1))
404 return nth;
405 nth++;
407 return -1;
410 static int is_common_merge(const struct commit *commit)
412 return (commit->parents
413 && commit->parents->next
414 && !commit->parents->next->next);
417 static void show_one_mergetag(struct rev_info *opt,
418 struct commit_extra_header *extra,
419 struct commit *commit)
421 unsigned char sha1[20];
422 struct tag *tag;
423 struct strbuf verify_message;
424 int status, nth;
425 size_t payload_size, gpg_message_offset;
427 hash_sha1_file(extra->value, extra->len, typename(OBJ_TAG), sha1);
428 tag = lookup_tag(sha1);
429 if (!tag)
430 return; /* error message already given */
432 strbuf_init(&verify_message, 256);
433 if (parse_tag_buffer(tag, extra->value, extra->len))
434 strbuf_addstr(&verify_message, "malformed mergetag\n");
435 else if (is_common_merge(commit) &&
436 !hashcmp(tag->tagged->sha1,
437 commit->parents->next->item->object.sha1))
438 strbuf_addf(&verify_message,
439 "merged tag '%s'\n", tag->tag);
440 else if ((nth = which_parent(tag->tagged->sha1, commit)) < 0)
441 strbuf_addf(&verify_message, "tag %s names a non-parent %s\n",
442 tag->tag, tag->tagged->sha1);
443 else
444 strbuf_addf(&verify_message,
445 "parent #%d, tagged '%s'\n", nth + 1, tag->tag);
446 gpg_message_offset = verify_message.len;
448 payload_size = parse_signature(extra->value, extra->len);
449 status = -1;
450 if (extra->len > payload_size) {
451 /* could have a good signature */
452 if (!verify_signed_buffer(extra->value, payload_size,
453 extra->value + payload_size,
454 extra->len - payload_size,
455 &verify_message, NULL))
456 status = 0; /* good */
457 else if (verify_message.len <= gpg_message_offset)
458 strbuf_addstr(&verify_message, "No signature\n");
459 /* otherwise we couldn't verify, which is shown as bad */
462 show_sig_lines(opt, status, verify_message.buf);
463 strbuf_release(&verify_message);
466 static void show_mergetag(struct rev_info *opt, struct commit *commit)
468 struct commit_extra_header *extra, *to_free;
470 to_free = read_commit_extra_headers(commit, NULL);
471 for (extra = to_free; extra; extra = extra->next) {
472 if (strcmp(extra->key, "mergetag"))
473 continue; /* not a merge tag */
474 show_one_mergetag(opt, extra, commit);
476 free_commit_extra_headers(to_free);
479 void show_log(struct rev_info *opt)
481 struct strbuf msgbuf = STRBUF_INIT;
482 struct log_info *log = opt->loginfo;
483 struct commit *commit = log->commit, *parent = log->parent;
484 int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
485 const char *extra_headers = opt->extra_headers;
486 struct pretty_print_context ctx = {0};
488 opt->loginfo = NULL;
489 if (!opt->verbose_header) {
490 graph_show_commit(opt->graph);
492 if (!opt->graph)
493 put_revision_mark(opt, commit);
494 fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit), stdout);
495 if (opt->print_parents)
496 show_parents(commit, abbrev_commit);
497 if (opt->children.name)
498 show_children(opt, commit, abbrev_commit);
499 show_decorations(opt, commit);
500 if (opt->graph && !graph_is_commit_finished(opt->graph)) {
501 putchar('\n');
502 graph_show_remainder(opt->graph);
504 putchar(opt->diffopt.line_termination);
505 return;
509 * If use_terminator is set, we already handled any record termination
510 * at the end of the last record.
511 * Otherwise, add a diffopt.line_termination character before all
512 * entries but the first. (IOW, as a separator between entries)
514 if (opt->shown_one && !opt->use_terminator) {
516 * If entries are separated by a newline, the output
517 * should look human-readable. If the last entry ended
518 * with a newline, print the graph output before this
519 * newline. Otherwise it will end up as a completely blank
520 * line and will look like a gap in the graph.
522 * If the entry separator is not a newline, the output is
523 * primarily intended for programmatic consumption, and we
524 * never want the extra graph output before the entry
525 * separator.
527 if (opt->diffopt.line_termination == '\n' &&
528 !opt->missing_newline)
529 graph_show_padding(opt->graph);
530 putchar(opt->diffopt.line_termination);
532 opt->shown_one = 1;
535 * If the history graph was requested,
536 * print the graph, up to this commit's line
538 graph_show_commit(opt->graph);
541 * Print header line of header..
544 if (opt->commit_format == CMIT_FMT_EMAIL) {
545 log_write_email_headers(opt, commit, &ctx.subject, &extra_headers,
546 &ctx.need_8bit_cte);
547 } else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
548 fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), stdout);
549 if (opt->commit_format != CMIT_FMT_ONELINE)
550 fputs("commit ", stdout);
552 if (!opt->graph)
553 put_revision_mark(opt, commit);
554 fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit),
555 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 if (parent)
561 printf(" (from %s)",
562 find_unique_abbrev(parent->object.sha1,
563 abbrev_commit));
564 fputs(diff_get_color_opt(&opt->diffopt, DIFF_RESET), stdout);
565 show_decorations(opt, commit);
566 if (opt->commit_format == CMIT_FMT_ONELINE) {
567 putchar(' ');
568 } else {
569 putchar('\n');
570 graph_show_oneline(opt->graph);
572 if (opt->reflog_info) {
574 * setup_revisions() ensures that opt->reflog_info
575 * and opt->graph cannot both be set,
576 * so we don't need to worry about printing the
577 * graph info here.
579 show_reflog_message(opt->reflog_info,
580 opt->commit_format == CMIT_FMT_ONELINE,
581 opt->date_mode,
582 opt->date_mode_explicit);
583 if (opt->commit_format == CMIT_FMT_ONELINE)
584 return;
588 if (opt->show_signature) {
589 show_signature(opt, commit);
590 show_mergetag(opt, commit);
593 if (!get_cached_commit_buffer(commit, NULL))
594 return;
596 if (opt->show_notes) {
597 int raw;
598 struct strbuf notebuf = STRBUF_INIT;
600 raw = (opt->commit_format == CMIT_FMT_USERFORMAT);
601 format_display_notes(commit->object.sha1, &notebuf,
602 get_log_output_encoding(), raw);
603 ctx.notes_message = notebuf.len
604 ? strbuf_detach(&notebuf, NULL)
605 : xcalloc(1, 1);
609 * And then the pretty-printed message itself
611 if (ctx.need_8bit_cte >= 0 && opt->add_signoff)
612 ctx.need_8bit_cte =
613 has_non_ascii(fmt_name(getenv("GIT_COMMITTER_NAME"),
614 getenv("GIT_COMMITTER_EMAIL")));
615 ctx.date_mode = opt->date_mode;
616 ctx.date_mode_explicit = opt->date_mode_explicit;
617 ctx.abbrev = opt->diffopt.abbrev;
618 ctx.after_subject = extra_headers;
619 ctx.preserve_subject = opt->preserve_subject;
620 ctx.reflog_info = opt->reflog_info;
621 ctx.fmt = opt->commit_format;
622 ctx.mailmap = opt->mailmap;
623 ctx.color = opt->diffopt.use_color;
624 ctx.output_encoding = get_log_output_encoding();
625 if (opt->from_ident.mail_begin && opt->from_ident.name_begin)
626 ctx.from_ident = &opt->from_ident;
627 pretty_print_commit(&ctx, commit, &msgbuf);
629 if (opt->add_signoff)
630 append_signoff(&msgbuf, 0, APPEND_SIGNOFF_DEDUP);
632 if ((ctx.fmt != CMIT_FMT_USERFORMAT) &&
633 ctx.notes_message && *ctx.notes_message) {
634 if (ctx.fmt == CMIT_FMT_EMAIL) {
635 strbuf_addstr(&msgbuf, "---\n");
636 opt->shown_dashes = 1;
638 strbuf_addstr(&msgbuf, ctx.notes_message);
641 if (opt->show_log_size) {
642 printf("log size %i\n", (int)msgbuf.len);
643 graph_show_oneline(opt->graph);
647 * Set opt->missing_newline if msgbuf doesn't
648 * end in a newline (including if it is empty)
650 if (!msgbuf.len || msgbuf.buf[msgbuf.len - 1] != '\n')
651 opt->missing_newline = 1;
652 else
653 opt->missing_newline = 0;
655 if (opt->graph)
656 graph_show_commit_msg(opt->graph, &msgbuf);
657 else
658 fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
659 if (opt->use_terminator) {
660 if (!opt->missing_newline)
661 graph_show_padding(opt->graph);
662 putchar(opt->diffopt.line_termination);
665 strbuf_release(&msgbuf);
666 free(ctx.notes_message);
669 int log_tree_diff_flush(struct rev_info *opt)
671 opt->shown_dashes = 0;
672 diffcore_std(&opt->diffopt);
674 if (diff_queue_is_empty()) {
675 int saved_fmt = opt->diffopt.output_format;
676 opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
677 diff_flush(&opt->diffopt);
678 opt->diffopt.output_format = saved_fmt;
679 return 0;
682 if (opt->loginfo && !opt->no_commit_id) {
683 show_log(opt);
684 if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) &&
685 opt->verbose_header &&
686 opt->commit_format != CMIT_FMT_ONELINE) {
688 * When showing a verbose header (i.e. log message),
689 * and not in --pretty=oneline format, we would want
690 * an extra newline between the end of log and the
691 * diff/diffstat output for readability.
693 int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
694 if (opt->diffopt.output_prefix) {
695 struct strbuf *msg = NULL;
696 msg = opt->diffopt.output_prefix(&opt->diffopt,
697 opt->diffopt.output_prefix_data);
698 fwrite(msg->buf, msg->len, 1, stdout);
702 * We may have shown three-dashes line early
703 * between notes and the log message, in which
704 * case we only want a blank line after the
705 * notes without (an extra) three-dashes line.
706 * Otherwise, we show the three-dashes line if
707 * we are showing the patch with diffstat, but
708 * in that case, there is no extra blank line
709 * after the three-dashes line.
711 if (!opt->shown_dashes &&
712 (pch & opt->diffopt.output_format) == pch)
713 printf("---");
714 putchar('\n');
717 diff_flush(&opt->diffopt);
718 return 1;
721 static int do_diff_combined(struct rev_info *opt, struct commit *commit)
723 diff_tree_combined_merge(commit, opt->dense_combined_merges, opt);
724 return !opt->loginfo;
728 * Show the diff of a commit.
730 * Return true if we printed any log info messages
732 static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log_info *log)
734 int showed_log;
735 struct commit_list *parents;
736 unsigned const char *sha1;
738 if (!opt->diff && !DIFF_OPT_TST(&opt->diffopt, EXIT_WITH_STATUS))
739 return 0;
741 parse_commit_or_die(commit);
742 sha1 = commit->tree->object.sha1;
744 /* Root commit? */
745 parents = get_saved_parents(opt, commit);
746 if (!parents) {
747 if (opt->show_root_diff) {
748 diff_root_tree_sha1(sha1, "", &opt->diffopt);
749 log_tree_diff_flush(opt);
751 return !opt->loginfo;
754 /* More than one parent? */
755 if (parents && parents->next) {
756 if (opt->ignore_merges)
757 return 0;
758 else if (opt->combine_merges)
759 return do_diff_combined(opt, commit);
760 else if (opt->first_parent_only) {
762 * Generate merge log entry only for the first
763 * parent, showing summary diff of the others
764 * we merged _in_.
766 parse_commit_or_die(parents->item);
767 diff_tree_sha1(parents->item->tree->object.sha1,
768 sha1, "", &opt->diffopt);
769 log_tree_diff_flush(opt);
770 return !opt->loginfo;
773 /* If we show individual diffs, show the parent info */
774 log->parent = parents->item;
777 showed_log = 0;
778 for (;;) {
779 struct commit *parent = parents->item;
781 parse_commit_or_die(parent);
782 diff_tree_sha1(parent->tree->object.sha1,
783 sha1, "", &opt->diffopt);
784 log_tree_diff_flush(opt);
786 showed_log |= !opt->loginfo;
788 /* Set up the log info for the next parent, if any.. */
789 parents = parents->next;
790 if (!parents)
791 break;
792 log->parent = parents->item;
793 opt->loginfo = log;
795 return showed_log;
798 int log_tree_commit(struct rev_info *opt, struct commit *commit)
800 struct log_info log;
801 int shown;
803 log.commit = commit;
804 log.parent = NULL;
805 opt->loginfo = &log;
807 if (opt->line_level_traverse)
808 return line_log_print(opt, commit);
810 if (opt->track_linear && !opt->linear && !opt->reverse_output_stage)
811 printf("\n%s\n", opt->break_bar);
812 shown = log_tree_diff(opt, commit, &log);
813 if (!shown && opt->loginfo && opt->always_show_header) {
814 log.parent = NULL;
815 show_log(opt);
816 shown = 1;
818 if (opt->track_linear && !opt->linear && opt->reverse_output_stage)
819 printf("\n%s\n", opt->break_bar);
820 opt->loginfo = NULL;
821 maybe_flush_or_die(stdout, "stdout");
822 return shown;