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