1#include "cache.h"
2#include "config.h"
3#include "diff.h"
4#include "commit.h"
5#include "tag.h"
6#include "graph.h"
7#include "log-tree.h"
8#include "reflog-walk.h"
9#include "refs.h"
10#include "string-list.h"
11#include "color.h"
12#include "gpg-interface.h"
13#include "sequencer.h"
14#include "line-log.h"
15
16static struct decoration name_decoration = { "object names" };
17static int decoration_loaded;
18static int decoration_flags;
19
20static char decoration_colors[][COLOR_MAXLEN] = {
21 GIT_COLOR_RESET,
22 GIT_COLOR_BOLD_GREEN, /* REF_LOCAL */
23 GIT_COLOR_BOLD_RED, /* REF_REMOTE */
24 GIT_COLOR_BOLD_YELLOW, /* REF_TAG */
25 GIT_COLOR_BOLD_MAGENTA, /* REF_STASH */
26 GIT_COLOR_BOLD_CYAN, /* REF_HEAD */
27 GIT_COLOR_BOLD_BLUE, /* GRAFTED */
28};
29
30static const char *color_decorate_slots[] = {
31 [DECORATION_REF_LOCAL] = "branch",
32 [DECORATION_REF_REMOTE] = "remoteBranch",
33 [DECORATION_REF_TAG] = "tag",
34 [DECORATION_REF_STASH] = "stash",
35 [DECORATION_REF_HEAD] = "HEAD",
36};
37
38static const char *decorate_get_color(int decorate_use_color, enum decoration_type ix)
39{
40 if (want_color(decorate_use_color))
41 return decoration_colors[ix];
42 return "";
43}
44
45int parse_decorate_color_config(const char *var, const char *slot_name, const char *value)
46{
47 int slot = LOOKUP_CONFIG(color_decorate_slots, slot_name);
48 if (slot < 0)
49 return 0;
50 if (!value)
51 return config_error_nonbool(var);
52 return color_parse(value, decoration_colors[slot]);
53}
54
55/*
56 * log-tree.c uses DIFF_OPT_TST for determining whether to use color
57 * for showing the commit sha1, use the same check for --decorate
58 */
59#define decorate_get_color_opt(o, ix) \
60 decorate_get_color((o)->use_color, ix)
61
62void add_name_decoration(enum decoration_type type, const char *name, struct object *obj)
63{
64 struct name_decoration *res;
65 FLEX_ALLOC_STR(res, name, name);
66 res->type = type;
67 res->next = add_decoration(&name_decoration, obj, res);
68}
69
70const struct name_decoration *get_name_decoration(const struct object *obj)
71{
72 return lookup_decoration(&name_decoration, obj);
73}
74
75static int add_ref_decoration(const char *refname, const struct object_id *oid,
76 int flags, void *cb_data)
77{
78 struct object *obj;
79 enum decoration_type type = DECORATION_NONE;
80 struct decoration_filter *filter = (struct decoration_filter *)cb_data;
81
82 if (filter && !ref_filter_match(refname,
83 filter->include_ref_pattern,
84 filter->exclude_ref_pattern))
85 return 0;
86
87 if (starts_with(refname, git_replace_ref_base)) {
88 struct object_id original_oid;
89 if (!check_replace_refs)
90 return 0;
91 if (get_oid_hex(refname + strlen(git_replace_ref_base),
92 &original_oid)) {
93 warning("invalid replace ref %s", refname);
94 return 0;
95 }
96 obj = parse_object(&original_oid);
97 if (obj)
98 add_name_decoration(DECORATION_GRAFTED, "replaced", obj);
99 return 0;
100 }
101
102 obj = parse_object(oid);
103 if (!obj)
104 return 0;
105
106 if (starts_with(refname, "refs/heads/"))
107 type = DECORATION_REF_LOCAL;
108 else if (starts_with(refname, "refs/remotes/"))
109 type = DECORATION_REF_REMOTE;
110 else if (starts_with(refname, "refs/tags/"))
111 type = DECORATION_REF_TAG;
112 else if (!strcmp(refname, "refs/stash"))
113 type = DECORATION_REF_STASH;
114 else if (!strcmp(refname, "HEAD"))
115 type = DECORATION_REF_HEAD;
116
117 add_name_decoration(type, refname, obj);
118 while (obj->type == OBJ_TAG) {
119 obj = ((struct tag *)obj)->tagged;
120 if (!obj)
121 break;
122 if (!obj->parsed)
123 parse_object(&obj->oid);
124 add_name_decoration(DECORATION_REF_TAG, refname, obj);
125 }
126 return 0;
127}
128
129static int add_graft_decoration(const struct commit_graft *graft, void *cb_data)
130{
131 struct commit *commit = lookup_commit(&graft->oid);
132 if (!commit)
133 return 0;
134 add_name_decoration(DECORATION_GRAFTED, "grafted", &commit->object);
135 return 0;
136}
137
138void load_ref_decorations(struct decoration_filter *filter, int flags)
139{
140 if (!decoration_loaded) {
141 if (filter) {
142 struct string_list_item *item;
143 for_each_string_list_item(item, filter->exclude_ref_pattern) {
144 normalize_glob_ref(item, NULL, item->string);
145 }
146 for_each_string_list_item(item, filter->include_ref_pattern) {
147 normalize_glob_ref(item, NULL, item->string);
148 }
149 }
150 decoration_loaded = 1;
151 decoration_flags = flags;
152 for_each_ref(add_ref_decoration, filter);
153 head_ref(add_ref_decoration, filter);
154 for_each_commit_graft(add_graft_decoration, filter);
155 }
156}
157
158static void show_parents(struct commit *commit, int abbrev, FILE *file)
159{
160 struct commit_list *p;
161 for (p = commit->parents; p ; p = p->next) {
162 struct commit *parent = p->item;
163 fprintf(file, " %s", find_unique_abbrev(&parent->object.oid, abbrev));
164 }
165}
166
167static void show_children(struct rev_info *opt, struct commit *commit, int abbrev)
168{
169 struct commit_list *p = lookup_decoration(&opt->children, &commit->object);
170 for ( ; p; p = p->next) {
171 fprintf(opt->diffopt.file, " %s", find_unique_abbrev(&p->item->object.oid, abbrev));
172 }
173}
174
175/*
176 * Do we have HEAD in the output, and also the branch it points at?
177 * If so, find that decoration entry for that current branch.
178 */
179static const struct name_decoration *current_pointed_by_HEAD(const struct name_decoration *decoration)
180{
181 const struct name_decoration *list, *head = NULL;
182 const char *branch_name = NULL;
183 int rru_flags;
184
185 /* First find HEAD */
186 for (list = decoration; list; list = list->next)
187 if (list->type == DECORATION_REF_HEAD) {
188 head = list;
189 break;
190 }
191 if (!head)
192 return NULL;
193
194 /* Now resolve and find the matching current branch */
195 branch_name = resolve_ref_unsafe("HEAD", 0, NULL, &rru_flags);
196 if (!branch_name || !(rru_flags & REF_ISSYMREF))
197 return NULL;
198
199 if (!starts_with(branch_name, "refs/"))
200 return NULL;
201
202 /* OK, do we have that ref in the list? */
203 for (list = decoration; list; list = list->next)
204 if ((list->type == DECORATION_REF_LOCAL) &&
205 !strcmp(branch_name, list->name)) {
206 return list;
207 }
208
209 return NULL;
210}
211
212static void show_name(struct strbuf *sb, const struct name_decoration *decoration)
213{
214 if (decoration_flags == DECORATE_SHORT_REFS)
215 strbuf_addstr(sb, prettify_refname(decoration->name));
216 else
217 strbuf_addstr(sb, decoration->name);
218}
219
220/*
221 * The caller makes sure there is no funny color before calling.
222 * format_decorations_extended makes sure the same after return.
223 */
224void format_decorations_extended(struct strbuf *sb,
225 const struct commit *commit,
226 int use_color,
227 const char *prefix,
228 const char *separator,
229 const char *suffix)
230{
231 const struct name_decoration *decoration;
232 const struct name_decoration *current_and_HEAD;
233 const char *color_commit =
234 diff_get_color(use_color, DIFF_COMMIT);
235 const char *color_reset =
236 decorate_get_color(use_color, DECORATION_NONE);
237
238 decoration = get_name_decoration(&commit->object);
239 if (!decoration)
240 return;
241
242 current_and_HEAD = current_pointed_by_HEAD(decoration);
243 while (decoration) {
244 /*
245 * When both current and HEAD are there, only
246 * show HEAD->current where HEAD would have
247 * appeared, skipping the entry for current.
248 */
249 if (decoration != current_and_HEAD) {
250 strbuf_addstr(sb, color_commit);
251 strbuf_addstr(sb, prefix);
252 strbuf_addstr(sb, color_reset);
253 strbuf_addstr(sb, decorate_get_color(use_color, decoration->type));
254 if (decoration->type == DECORATION_REF_TAG)
255 strbuf_addstr(sb, "tag: ");
256
257 show_name(sb, decoration);
258
259 if (current_and_HEAD &&
260 decoration->type == DECORATION_REF_HEAD) {
261 strbuf_addstr(sb, " -> ");
262 strbuf_addstr(sb, color_reset);
263 strbuf_addstr(sb, decorate_get_color(use_color, current_and_HEAD->type));
264 show_name(sb, current_and_HEAD);
265 }
266 strbuf_addstr(sb, color_reset);
267
268 prefix = separator;
269 }
270 decoration = decoration->next;
271 }
272 strbuf_addstr(sb, color_commit);
273 strbuf_addstr(sb, suffix);
274 strbuf_addstr(sb, color_reset);
275}
276
277void show_decorations(struct rev_info *opt, struct commit *commit)
278{
279 struct strbuf sb = STRBUF_INIT;
280
281 if (opt->show_source && commit->util)
282 fprintf(opt->diffopt.file, "\t%s", (char *) commit->util);
283 if (!opt->show_decorations)
284 return;
285 format_decorations(&sb, commit, opt->diffopt.use_color);
286 fputs(sb.buf, opt->diffopt.file);
287 strbuf_release(&sb);
288}
289
290static unsigned int digits_in_number(unsigned int number)
291{
292 unsigned int i = 10, result = 1;
293 while (i <= number) {
294 i *= 10;
295 result++;
296 }
297 return result;
298}
299
300void fmt_output_subject(struct strbuf *filename,
301 const char *subject,
302 struct rev_info *info)
303{
304 const char *suffix = info->patch_suffix;
305 int nr = info->nr;
306 int start_len = filename->len;
307 int max_len = start_len + FORMAT_PATCH_NAME_MAX - (strlen(suffix) + 1);
308
309 if (0 < info->reroll_count)
310 strbuf_addf(filename, "v%d-", info->reroll_count);
311 strbuf_addf(filename, "%04d-%s", nr, subject);
312
313 if (max_len < filename->len)
314 strbuf_setlen(filename, max_len);
315 strbuf_addstr(filename, suffix);
316}
317
318void fmt_output_commit(struct strbuf *filename,
319 struct commit *commit,
320 struct rev_info *info)
321{
322 struct pretty_print_context ctx = {0};
323 struct strbuf subject = STRBUF_INIT;
324
325 format_commit_message(commit, "%f", &subject, &ctx);
326 fmt_output_subject(filename, subject.buf, info);
327 strbuf_release(&subject);
328}
329
330void fmt_output_email_subject(struct strbuf *sb, struct rev_info *opt)
331{
332 if (opt->total > 0) {
333 strbuf_addf(sb, "Subject: [%s%s%0*d/%d] ",
334 opt->subject_prefix,
335 *opt->subject_prefix ? " " : "",
336 digits_in_number(opt->total),
337 opt->nr, opt->total);
338 } else if (opt->total == 0 && opt->subject_prefix && *opt->subject_prefix) {
339 strbuf_addf(sb, "Subject: [%s] ",
340 opt->subject_prefix);
341 } else {
342 strbuf_addstr(sb, "Subject: ");
343 }
344}
345
346void log_write_email_headers(struct rev_info *opt, struct commit *commit,
347 const char **extra_headers_p,
348 int *need_8bit_cte_p,
349 int maybe_multipart)
350{
351 const char *extra_headers = opt->extra_headers;
352 const char *name = oid_to_hex(opt->zero_commit ?
353 &null_oid : &commit->object.oid);
354
355 *need_8bit_cte_p = 0; /* unknown */
356
357 fprintf(opt->diffopt.file, "From %s Mon Sep 17 00:00:00 2001\n", name);
358 graph_show_oneline(opt->graph);
359 if (opt->message_id) {
360 fprintf(opt->diffopt.file, "Message-Id: <%s>\n", opt->message_id);
361 graph_show_oneline(opt->graph);
362 }
363 if (opt->ref_message_ids && opt->ref_message_ids->nr > 0) {
364 int i, n;
365 n = opt->ref_message_ids->nr;
366 fprintf(opt->diffopt.file, "In-Reply-To: <%s>\n", opt->ref_message_ids->items[n-1].string);
367 for (i = 0; i < n; i++)
368 fprintf(opt->diffopt.file, "%s<%s>\n", (i > 0 ? "\t" : "References: "),
369 opt->ref_message_ids->items[i].string);
370 graph_show_oneline(opt->graph);
371 }
372 if (opt->mime_boundary && maybe_multipart) {
373 static char subject_buffer[1024];
374 static char buffer[1024];
375 struct strbuf filename = STRBUF_INIT;
376 *need_8bit_cte_p = -1; /* NEVER */
377 snprintf(subject_buffer, sizeof(subject_buffer) - 1,
378 "%s"
379 "MIME-Version: 1.0\n"
380 "Content-Type: multipart/mixed;"
381 " boundary=\"%s%s\"\n"
382 "\n"
383 "This is a multi-part message in MIME "
384 "format.\n"
385 "--%s%s\n"
386 "Content-Type: text/plain; "
387 "charset=UTF-8; format=fixed\n"
388 "Content-Transfer-Encoding: 8bit\n\n",
389 extra_headers ? extra_headers : "",
390 mime_boundary_leader, opt->mime_boundary,
391 mime_boundary_leader, opt->mime_boundary);
392 extra_headers = subject_buffer;
393
394 if (opt->numbered_files)
395 strbuf_addf(&filename, "%d", opt->nr);
396 else
397 fmt_output_commit(&filename, commit, opt);
398 snprintf(buffer, sizeof(buffer) - 1,
399 "\n--%s%s\n"
400 "Content-Type: text/x-patch;"
401 " name=\"%s\"\n"
402 "Content-Transfer-Encoding: 8bit\n"
403 "Content-Disposition: %s;"
404 " filename=\"%s\"\n\n",
405 mime_boundary_leader, opt->mime_boundary,
406 filename.buf,
407 opt->no_inline ? "attachment" : "inline",
408 filename.buf);
409 opt->diffopt.stat_sep = buffer;
410 strbuf_release(&filename);
411 }
412 *extra_headers_p = extra_headers;
413}
414
415static void show_sig_lines(struct rev_info *opt, int status, const char *bol)
416{
417 const char *color, *reset, *eol;
418
419 color = diff_get_color_opt(&opt->diffopt,
420 status ? DIFF_WHITESPACE : DIFF_FRAGINFO);
421 reset = diff_get_color_opt(&opt->diffopt, DIFF_RESET);
422 while (*bol) {
423 eol = strchrnul(bol, '\n');
424 fprintf(opt->diffopt.file, "%s%.*s%s%s", color, (int)(eol - bol), bol, reset,
425 *eol ? "\n" : "");
426 graph_show_oneline(opt->graph);
427 bol = (*eol) ? (eol + 1) : eol;
428 }
429}
430
431static void show_signature(struct rev_info *opt, struct commit *commit)
432{
433 struct strbuf payload = STRBUF_INIT;
434 struct strbuf signature = STRBUF_INIT;
435 struct strbuf gpg_output = STRBUF_INIT;
436 int status;
437
438 if (parse_signed_commit(commit, &payload, &signature) <= 0)
439 goto out;
440
441 status = verify_signed_buffer(payload.buf, payload.len,
442 signature.buf, signature.len,
443 &gpg_output, NULL);
444 if (status && !gpg_output.len)
445 strbuf_addstr(&gpg_output, "No signature\n");
446
447 show_sig_lines(opt, status, gpg_output.buf);
448
449 out:
450 strbuf_release(&gpg_output);
451 strbuf_release(&payload);
452 strbuf_release(&signature);
453}
454
455static int which_parent(const struct object_id *oid, const struct commit *commit)
456{
457 int nth;
458 const struct commit_list *parent;
459
460 for (nth = 0, parent = commit->parents; parent; parent = parent->next) {
461 if (!oidcmp(&parent->item->object.oid, oid))
462 return nth;
463 nth++;
464 }
465 return -1;
466}
467
468static int is_common_merge(const struct commit *commit)
469{
470 return (commit->parents
471 && commit->parents->next
472 && !commit->parents->next->next);
473}
474
475static int show_one_mergetag(struct commit *commit,
476 struct commit_extra_header *extra,
477 void *data)
478{
479 struct rev_info *opt = (struct rev_info *)data;
480 struct object_id oid;
481 struct tag *tag;
482 struct strbuf verify_message;
483 int status, nth;
484 size_t payload_size, gpg_message_offset;
485
486 hash_object_file(extra->value, extra->len, type_name(OBJ_TAG), &oid);
487 tag = lookup_tag(&oid);
488 if (!tag)
489 return -1; /* error message already given */
490
491 strbuf_init(&verify_message, 256);
492 if (parse_tag_buffer(tag, extra->value, extra->len))
493 strbuf_addstr(&verify_message, "malformed mergetag\n");
494 else if (is_common_merge(commit) &&
495 !oidcmp(&tag->tagged->oid,
496 &commit->parents->next->item->object.oid))
497 strbuf_addf(&verify_message,
498 "merged tag '%s'\n", tag->tag);
499 else if ((nth = which_parent(&tag->tagged->oid, commit)) < 0)
500 strbuf_addf(&verify_message, "tag %s names a non-parent %s\n",
501 tag->tag, tag->tagged->oid.hash);
502 else
503 strbuf_addf(&verify_message,
504 "parent #%d, tagged '%s'\n", nth + 1, tag->tag);
505 gpg_message_offset = verify_message.len;
506
507 payload_size = parse_signature(extra->value, extra->len);
508 status = -1;
509 if (extra->len > payload_size) {
510 /* could have a good signature */
511 if (!verify_signed_buffer(extra->value, payload_size,
512 extra->value + payload_size,
513 extra->len - payload_size,
514 &verify_message, NULL))
515 status = 0; /* good */
516 else if (verify_message.len <= gpg_message_offset)
517 strbuf_addstr(&verify_message, "No signature\n");
518 /* otherwise we couldn't verify, which is shown as bad */
519 }
520
521 show_sig_lines(opt, status, verify_message.buf);
522 strbuf_release(&verify_message);
523 return 0;
524}
525
526static int show_mergetag(struct rev_info *opt, struct commit *commit)
527{
528 return for_each_mergetag(show_one_mergetag, commit, opt);
529}
530
531void show_log(struct rev_info *opt)
532{
533 struct strbuf msgbuf = STRBUF_INIT;
534 struct log_info *log = opt->loginfo;
535 struct commit *commit = log->commit, *parent = log->parent;
536 int abbrev_commit = opt->abbrev_commit ? opt->abbrev : GIT_SHA1_HEXSZ;
537 const char *extra_headers = opt->extra_headers;
538 struct pretty_print_context ctx = {0};
539
540 opt->loginfo = NULL;
541 if (!opt->verbose_header) {
542 graph_show_commit(opt->graph);
543
544 if (!opt->graph)
545 put_revision_mark(opt, commit);
546 fputs(find_unique_abbrev(&commit->object.oid, abbrev_commit), opt->diffopt.file);
547 if (opt->print_parents)
548 show_parents(commit, abbrev_commit, opt->diffopt.file);
549 if (opt->children.name)
550 show_children(opt, commit, abbrev_commit);
551 show_decorations(opt, commit);
552 if (opt->graph && !graph_is_commit_finished(opt->graph)) {
553 putc('\n', opt->diffopt.file);
554 graph_show_remainder(opt->graph);
555 }
556 putc(opt->diffopt.line_termination, opt->diffopt.file);
557 return;
558 }
559
560 /*
561 * If use_terminator is set, we already handled any record termination
562 * at the end of the last record.
563 * Otherwise, add a diffopt.line_termination character before all
564 * entries but the first. (IOW, as a separator between entries)
565 */
566 if (opt->shown_one && !opt->use_terminator) {
567 /*
568 * If entries are separated by a newline, the output
569 * should look human-readable. If the last entry ended
570 * with a newline, print the graph output before this
571 * newline. Otherwise it will end up as a completely blank
572 * line and will look like a gap in the graph.
573 *
574 * If the entry separator is not a newline, the output is
575 * primarily intended for programmatic consumption, and we
576 * never want the extra graph output before the entry
577 * separator.
578 */
579 if (opt->diffopt.line_termination == '\n' &&
580 !opt->missing_newline)
581 graph_show_padding(opt->graph);
582 putc(opt->diffopt.line_termination, opt->diffopt.file);
583 }
584 opt->shown_one = 1;
585
586 /*
587 * If the history graph was requested,
588 * print the graph, up to this commit's line
589 */
590 graph_show_commit(opt->graph);
591
592 /*
593 * Print header line of header..
594 */
595
596 if (cmit_fmt_is_mail(opt->commit_format)) {
597 log_write_email_headers(opt, commit, &extra_headers,
598 &ctx.need_8bit_cte, 1);
599 ctx.rev = opt;
600 ctx.print_email_subject = 1;
601 } else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
602 fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), opt->diffopt.file);
603 if (opt->commit_format != CMIT_FMT_ONELINE)
604 fputs("commit ", opt->diffopt.file);
605
606 if (!opt->graph)
607 put_revision_mark(opt, commit);
608 fputs(find_unique_abbrev(&commit->object.oid,
609 abbrev_commit),
610 opt->diffopt.file);
611 if (opt->print_parents)
612 show_parents(commit, abbrev_commit, opt->diffopt.file);
613 if (opt->children.name)
614 show_children(opt, commit, abbrev_commit);
615 if (parent)
616 fprintf(opt->diffopt.file, " (from %s)",
617 find_unique_abbrev(&parent->object.oid, abbrev_commit));
618 fputs(diff_get_color_opt(&opt->diffopt, DIFF_RESET), opt->diffopt.file);
619 show_decorations(opt, commit);
620 if (opt->commit_format == CMIT_FMT_ONELINE) {
621 putc(' ', opt->diffopt.file);
622 } else {
623 putc('\n', opt->diffopt.file);
624 graph_show_oneline(opt->graph);
625 }
626 if (opt->reflog_info) {
627 /*
628 * setup_revisions() ensures that opt->reflog_info
629 * and opt->graph cannot both be set,
630 * so we don't need to worry about printing the
631 * graph info here.
632 */
633 show_reflog_message(opt->reflog_info,
634 opt->commit_format == CMIT_FMT_ONELINE,
635 &opt->date_mode,
636 opt->date_mode_explicit);
637 if (opt->commit_format == CMIT_FMT_ONELINE)
638 return;
639 }
640 }
641
642 if (opt->show_signature) {
643 show_signature(opt, commit);
644 show_mergetag(opt, commit);
645 }
646
647 if (opt->show_notes) {
648 int raw;
649 struct strbuf notebuf = STRBUF_INIT;
650
651 raw = (opt->commit_format == CMIT_FMT_USERFORMAT);
652 format_display_notes(&commit->object.oid, ¬ebuf,
653 get_log_output_encoding(), raw);
654 ctx.notes_message = notebuf.len
655 ? strbuf_detach(¬ebuf, NULL)
656 : xcalloc(1, 1);
657 }
658
659 /*
660 * And then the pretty-printed message itself
661 */
662 if (ctx.need_8bit_cte >= 0 && opt->add_signoff)
663 ctx.need_8bit_cte =
664 has_non_ascii(fmt_name(getenv("GIT_COMMITTER_NAME"),
665 getenv("GIT_COMMITTER_EMAIL")));
666 ctx.date_mode = opt->date_mode;
667 ctx.date_mode_explicit = opt->date_mode_explicit;
668 ctx.abbrev = opt->diffopt.abbrev;
669 ctx.after_subject = extra_headers;
670 ctx.preserve_subject = opt->preserve_subject;
671 ctx.reflog_info = opt->reflog_info;
672 ctx.fmt = opt->commit_format;
673 ctx.mailmap = opt->mailmap;
674 ctx.color = opt->diffopt.use_color;
675 ctx.expand_tabs_in_log = opt->expand_tabs_in_log;
676 ctx.output_encoding = get_log_output_encoding();
677 if (opt->from_ident.mail_begin && opt->from_ident.name_begin)
678 ctx.from_ident = &opt->from_ident;
679 if (opt->graph)
680 ctx.graph_width = graph_width(opt->graph);
681 pretty_print_commit(&ctx, commit, &msgbuf);
682
683 if (opt->add_signoff)
684 append_signoff(&msgbuf, 0, APPEND_SIGNOFF_DEDUP);
685
686 if ((ctx.fmt != CMIT_FMT_USERFORMAT) &&
687 ctx.notes_message && *ctx.notes_message) {
688 if (cmit_fmt_is_mail(ctx.fmt)) {
689 strbuf_addstr(&msgbuf, "---\n");
690 opt->shown_dashes = 1;
691 }
692 strbuf_addstr(&msgbuf, ctx.notes_message);
693 }
694
695 if (opt->show_log_size) {
696 fprintf(opt->diffopt.file, "log size %i\n", (int)msgbuf.len);
697 graph_show_oneline(opt->graph);
698 }
699
700 /*
701 * Set opt->missing_newline if msgbuf doesn't
702 * end in a newline (including if it is empty)
703 */
704 if (!msgbuf.len || msgbuf.buf[msgbuf.len - 1] != '\n')
705 opt->missing_newline = 1;
706 else
707 opt->missing_newline = 0;
708
709 graph_show_commit_msg(opt->graph, opt->diffopt.file, &msgbuf);
710 if (opt->use_terminator && !commit_format_is_empty(opt->commit_format)) {
711 if (!opt->missing_newline)
712 graph_show_padding(opt->graph);
713 putc(opt->diffopt.line_termination, opt->diffopt.file);
714 }
715
716 strbuf_release(&msgbuf);
717 free(ctx.notes_message);
718}
719
720int log_tree_diff_flush(struct rev_info *opt)
721{
722 opt->shown_dashes = 0;
723 diffcore_std(&opt->diffopt);
724
725 if (diff_queue_is_empty()) {
726 int saved_fmt = opt->diffopt.output_format;
727 opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
728 diff_flush(&opt->diffopt);
729 opt->diffopt.output_format = saved_fmt;
730 return 0;
731 }
732
733 if (opt->loginfo && !opt->no_commit_id) {
734 show_log(opt);
735 if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) &&
736 opt->verbose_header &&
737 opt->commit_format != CMIT_FMT_ONELINE &&
738 !commit_format_is_empty(opt->commit_format)) {
739 /*
740 * When showing a verbose header (i.e. log message),
741 * and not in --pretty=oneline format, we would want
742 * an extra newline between the end of log and the
743 * diff/diffstat output for readability.
744 */
745 int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
746 if (opt->diffopt.output_prefix) {
747 struct strbuf *msg = NULL;
748 msg = opt->diffopt.output_prefix(&opt->diffopt,
749 opt->diffopt.output_prefix_data);
750 fwrite(msg->buf, msg->len, 1, opt->diffopt.file);
751 }
752
753 /*
754 * We may have shown three-dashes line early
755 * between notes and the log message, in which
756 * case we only want a blank line after the
757 * notes without (an extra) three-dashes line.
758 * Otherwise, we show the three-dashes line if
759 * we are showing the patch with diffstat, but
760 * in that case, there is no extra blank line
761 * after the three-dashes line.
762 */
763 if (!opt->shown_dashes &&
764 (pch & opt->diffopt.output_format) == pch)
765 fprintf(opt->diffopt.file, "---");
766 putc('\n', opt->diffopt.file);
767 }
768 }
769 diff_flush(&opt->diffopt);
770 return 1;
771}
772
773static int do_diff_combined(struct rev_info *opt, struct commit *commit)
774{
775 diff_tree_combined_merge(commit, opt->dense_combined_merges, opt);
776 return !opt->loginfo;
777}
778
779/*
780 * Show the diff of a commit.
781 *
782 * Return true if we printed any log info messages
783 */
784static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log_info *log)
785{
786 int showed_log;
787 struct commit_list *parents;
788 struct object_id *oid;
789
790 if (!opt->diff && !opt->diffopt.flags.exit_with_status)
791 return 0;
792
793 parse_commit_or_die(commit);
794 oid = get_commit_tree_oid(commit);
795
796 /* Root commit? */
797 parents = get_saved_parents(opt, commit);
798 if (!parents) {
799 if (opt->show_root_diff) {
800 diff_root_tree_oid(oid, "", &opt->diffopt);
801 log_tree_diff_flush(opt);
802 }
803 return !opt->loginfo;
804 }
805
806 /* More than one parent? */
807 if (parents && parents->next) {
808 if (opt->ignore_merges)
809 return 0;
810 else if (opt->combine_merges)
811 return do_diff_combined(opt, commit);
812 else if (opt->first_parent_only) {
813 /*
814 * Generate merge log entry only for the first
815 * parent, showing summary diff of the others
816 * we merged _in_.
817 */
818 parse_commit_or_die(parents->item);
819 diff_tree_oid(get_commit_tree_oid(parents->item),
820 oid, "", &opt->diffopt);
821 log_tree_diff_flush(opt);
822 return !opt->loginfo;
823 }
824
825 /* If we show individual diffs, show the parent info */
826 log->parent = parents->item;
827 }
828
829 showed_log = 0;
830 for (;;) {
831 struct commit *parent = parents->item;
832
833 parse_commit_or_die(parent);
834 diff_tree_oid(get_commit_tree_oid(parent),
835 oid, "", &opt->diffopt);
836 log_tree_diff_flush(opt);
837
838 showed_log |= !opt->loginfo;
839
840 /* Set up the log info for the next parent, if any.. */
841 parents = parents->next;
842 if (!parents)
843 break;
844 log->parent = parents->item;
845 opt->loginfo = log;
846 }
847 return showed_log;
848}
849
850int log_tree_commit(struct rev_info *opt, struct commit *commit)
851{
852 struct log_info log;
853 int shown, close_file = opt->diffopt.close_file;
854
855 log.commit = commit;
856 log.parent = NULL;
857 opt->loginfo = &log;
858 opt->diffopt.close_file = 0;
859
860 if (opt->line_level_traverse)
861 return line_log_print(opt, commit);
862
863 if (opt->track_linear && !opt->linear && !opt->reverse_output_stage)
864 fprintf(opt->diffopt.file, "\n%s\n", opt->break_bar);
865 shown = log_tree_diff(opt, commit, &log);
866 if (!shown && opt->loginfo && opt->always_show_header) {
867 log.parent = NULL;
868 show_log(opt);
869 shown = 1;
870 }
871 if (opt->track_linear && !opt->linear && opt->reverse_output_stage)
872 fprintf(opt->diffopt.file, "\n%s\n", opt->break_bar);
873 opt->loginfo = NULL;
874 maybe_flush_or_die(opt->diffopt.file, "stdout");
875 if (close_file)
876 fclose(opt->diffopt.file);
877 return shown;
878}