blob: 27afcf697238a48c01dd49996f5263cd72a52eac [file] [log] [blame]
Junio C Hamano5f1c3f02006-04-09 01:11:11 -07001#include "cache.h"
2#include "diff.h"
3#include "commit.h"
René Scharfecab4feb2008-09-04 23:39:21 +02004#include "tag.h"
Adam Simpkins7fefda52008-05-04 03:36:54 -07005#include "graph.h"
Junio C Hamano5f1c3f02006-04-09 01:11:11 -07006#include "log-tree.h"
Johannes Schindelin8860fd42007-01-11 11:47:48 +01007#include "reflog-walk.h"
René Scharfecab4feb2008-09-04 23:39:21 +02008#include "refs.h"
Thomas Rastb079c502009-02-19 22:26:31 +01009#include "string-list.h"
Junio C Hamano5f1c3f02006-04-09 01:11:11 -070010
Linus Torvaldsca135e72007-04-16 16:05:10 -070011struct decoration name_decoration = { "object names" };
12
René Scharfecab4feb2008-09-04 23:39:21 +020013static void add_name_decoration(const char *prefix, const char *name, struct object *obj)
14{
15 int plen = strlen(prefix);
16 int nlen = strlen(name);
17 struct name_decoration *res = xmalloc(sizeof(struct name_decoration) + plen + nlen);
18 memcpy(res->name, prefix, plen);
19 memcpy(res->name + plen, name, nlen + 1);
20 res->next = add_decoration(&name_decoration, obj, res);
21}
22
23static int add_ref_decoration(const char *refname, const unsigned char *sha1, int flags, void *cb_data)
24{
25 struct object *obj = parse_object(sha1);
26 if (!obj)
27 return 0;
Lars Hjemli33e70182009-08-15 16:23:12 +020028 if (!cb_data || *(int *)cb_data == DECORATE_SHORT_REFS)
29 refname = prettify_refname(refname);
René Scharfecab4feb2008-09-04 23:39:21 +020030 add_name_decoration("", refname, obj);
31 while (obj->type == OBJ_TAG) {
32 obj = ((struct tag *)obj)->tagged;
33 if (!obj)
34 break;
35 add_name_decoration("tag: ", refname, obj);
36 }
37 return 0;
38}
39
Lars Hjemli33e70182009-08-15 16:23:12 +020040void load_ref_decorations(int flags)
René Scharfecab4feb2008-09-04 23:39:21 +020041{
42 static int loaded;
43 if (!loaded) {
44 loaded = 1;
Lars Hjemli33e70182009-08-15 16:23:12 +020045 for_each_ref(add_ref_decoration, &flags);
Thomas Rast77abcbd2009-10-12 22:34:12 +020046 head_ref(add_ref_decoration, &flags);
René Scharfecab4feb2008-09-04 23:39:21 +020047 }
48}
49
Linus Torvaldsc8c893c2006-05-03 07:59:00 -070050static void show_parents(struct commit *commit, int abbrev)
51{
52 struct commit_list *p;
53 for (p = commit->parents; p ; p = p->next) {
54 struct commit *parent = p->item;
Thomas Rast7fcda922009-02-13 23:10:41 +010055 printf(" %s", find_unique_abbrev(parent->object.sha1, abbrev));
Linus Torvaldsc8c893c2006-05-03 07:59:00 -070056 }
57}
58
Linus Torvalds0f3a2902008-10-27 12:51:59 -070059void show_decorations(struct rev_info *opt, struct commit *commit)
Linus Torvaldsca135e72007-04-16 16:05:10 -070060{
61 const char *prefix;
62 struct name_decoration *decoration;
63
Linus Torvalds0f3a2902008-10-27 12:51:59 -070064 if (opt->show_source && commit->util)
Linus Torvalds8c4021a2008-11-15 10:02:01 -080065 printf("\t%s", (char *) commit->util);
Linus Torvaldsd467a522008-11-03 11:23:57 -080066 if (!opt->show_decorations)
67 return;
Linus Torvaldsca135e72007-04-16 16:05:10 -070068 decoration = lookup_decoration(&name_decoration, &commit->object);
69 if (!decoration)
70 return;
71 prefix = " (";
72 while (decoration) {
73 printf("%s%s", prefix, decoration->name);
74 prefix = ", ";
75 decoration = decoration->next;
76 }
77 putchar(')');
78}
79
Franck Bui-Huufc1c75e2006-08-29 13:37:06 +020080/*
81 * Search for "^[-A-Za-z]+: [^@]+@" pattern. It usually matches
82 * Signed-off-by: and Acked-by: lines.
83 */
84static int detect_any_signoff(char *letter, int size)
85{
Benjamin Kramerfd13b212009-03-07 21:02:26 +010086 char *cp;
Franck Bui-Huufc1c75e2006-08-29 13:37:06 +020087 int seen_colon = 0;
88 int seen_at = 0;
89 int seen_name = 0;
90 int seen_head = 0;
91
92 cp = letter + size;
Benjamin Kramerfd13b212009-03-07 21:02:26 +010093 while (letter <= --cp && *cp == '\n')
Franck Bui-Huufc1c75e2006-08-29 13:37:06 +020094 continue;
95
96 while (letter <= cp) {
Benjamin Kramerfd13b212009-03-07 21:02:26 +010097 char ch = *cp--;
Franck Bui-Huufc1c75e2006-08-29 13:37:06 +020098 if (ch == '\n')
99 break;
100
101 if (!seen_at) {
102 if (ch == '@')
103 seen_at = 1;
104 continue;
105 }
106 if (!seen_colon) {
107 if (ch == '@')
108 return 0;
109 else if (ch == ':')
110 seen_colon = 1;
111 else
112 seen_name = 1;
113 continue;
114 }
115 if (('A' <= ch && ch <= 'Z') ||
116 ('a' <= ch && ch <= 'z') ||
117 ch == '-') {
118 seen_head = 1;
119 continue;
120 }
121 /* no empty last line doesn't match */
122 return 0;
123 }
124 return seen_head && seen_name;
125}
126
Pierre Habouzit674d1722007-09-10 12:35:06 +0200127static void append_signoff(struct strbuf *sb, const char *signoff)
Junio C Hamanocf2251b2006-05-31 15:11:49 -0700128{
Junio C Hamanocf2251b2006-05-31 15:11:49 -0700129 static const char signed_off_by[] = "Signed-off-by: ";
Junio C Hamano80583c02007-06-11 00:34:54 -0700130 size_t signoff_len = strlen(signoff);
Franck Bui-Huufc1c75e2006-08-29 13:37:06 +0200131 int has_signoff = 0;
Junio C Hamano80583c02007-06-11 00:34:54 -0700132 char *cp;
Junio C Hamanocf2251b2006-05-31 15:11:49 -0700133
Pierre Habouzit674d1722007-09-10 12:35:06 +0200134 cp = sb->buf;
Junio C Hamanocf2251b2006-05-31 15:11:49 -0700135
136 /* First see if we already have the sign-off by the signer */
Franck Bui-Huufc1c75e2006-08-29 13:37:06 +0200137 while ((cp = strstr(cp, signed_off_by))) {
138
139 has_signoff = 1;
140
Junio C Hamanocf2251b2006-05-31 15:11:49 -0700141 cp += strlen(signed_off_by);
Pierre Habouzit674d1722007-09-10 12:35:06 +0200142 if (cp + signoff_len >= sb->buf + sb->len)
Franck Bui-Huufc1c75e2006-08-29 13:37:06 +0200143 break;
144 if (strncmp(cp, signoff, signoff_len))
145 continue;
146 if (!isspace(cp[signoff_len]))
147 continue;
148 /* we already have him */
Pierre Habouzit674d1722007-09-10 12:35:06 +0200149 return;
Junio C Hamanocf2251b2006-05-31 15:11:49 -0700150 }
151
Franck Bui-Huufc1c75e2006-08-29 13:37:06 +0200152 if (!has_signoff)
Pierre Habouzit674d1722007-09-10 12:35:06 +0200153 has_signoff = detect_any_signoff(sb->buf, sb->len);
Franck Bui-Huufc1c75e2006-08-29 13:37:06 +0200154
155 if (!has_signoff)
Pierre Habouzit674d1722007-09-10 12:35:06 +0200156 strbuf_addch(sb, '\n');
Franck Bui-Huuc35f4c32006-08-13 11:30:27 -0700157
Pierre Habouzit674d1722007-09-10 12:35:06 +0200158 strbuf_addstr(sb, signed_off_by);
159 strbuf_add(sb, signoff, signoff_len);
160 strbuf_addch(sb, '\n');
Junio C Hamanocf2251b2006-05-31 15:11:49 -0700161}
162
Johannes Schindeline00de242007-02-09 01:43:54 +0100163static unsigned int digits_in_number(unsigned int number)
164{
165 unsigned int i = 10, result = 1;
166 while (i <= number) {
167 i *= 10;
168 result++;
169 }
170 return result;
171}
172
Stephen Boyd6fa8e622009-03-22 19:14:04 -0700173void get_patch_filename(struct commit *commit, int nr, const char *suffix,
174 struct strbuf *buf)
175{
176 int suffix_len = strlen(suffix) + 1;
177 int start_len = buf->len;
178
179 strbuf_addf(buf, commit ? "%04d-" : "%d", nr);
180 if (commit) {
Christian Couderb09b8682009-03-27 01:13:01 +0100181 int max_len = start_len + FORMAT_PATCH_NAME_MAX - suffix_len;
Thomas Rastdd2e7942009-10-19 17:48:08 +0200182 struct pretty_print_context ctx = {0};
183 ctx.date_mode = DATE_NORMAL;
Christian Couderb09b8682009-03-27 01:13:01 +0100184
Thomas Rastdd2e7942009-10-19 17:48:08 +0200185 format_commit_message(commit, "%f", buf, &ctx);
Christian Couderb09b8682009-03-27 01:13:01 +0100186 if (max_len < buf->len)
187 strbuf_setlen(buf, max_len);
188 strbuf_addstr(buf, suffix);
Stephen Boyd6fa8e622009-03-22 19:14:04 -0700189 }
190}
191
Stephen Boyd108dab22009-03-22 19:14:05 -0700192void log_write_email_headers(struct rev_info *opt, struct commit *commit,
Junio C Hamano267123b2008-03-15 00:09:20 -0700193 const char **subject_p,
194 const char **extra_headers_p,
195 int *need_8bit_cte_p)
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500196{
197 const char *subject = NULL;
198 const char *extra_headers = opt->extra_headers;
Stephen Boyd108dab22009-03-22 19:14:05 -0700199 const char *name = sha1_to_hex(commit->object.sha1);
Junio C Hamano267123b2008-03-15 00:09:20 -0700200
201 *need_8bit_cte_p = 0; /* unknown */
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500202 if (opt->total > 0) {
203 static char buffer[64];
204 snprintf(buffer, sizeof(buffer),
205 "Subject: [%s %0*d/%d] ",
206 opt->subject_prefix,
207 digits_in_number(opt->total),
208 opt->nr, opt->total);
209 subject = buffer;
210 } else if (opt->total == 0 && opt->subject_prefix && *opt->subject_prefix) {
211 static char buffer[256];
212 snprintf(buffer, sizeof(buffer),
213 "Subject: [%s] ",
214 opt->subject_prefix);
215 subject = buffer;
216 } else {
217 subject = "Subject: ";
218 }
219
220 printf("From %s Mon Sep 17 00:00:00 2001\n", name);
Adam Simpkins7fefda52008-05-04 03:36:54 -0700221 graph_show_oneline(opt->graph);
222 if (opt->message_id) {
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500223 printf("Message-Id: <%s>\n", opt->message_id);
Adam Simpkins7fefda52008-05-04 03:36:54 -0700224 graph_show_oneline(opt->graph);
225 }
Thomas Rastb079c502009-02-19 22:26:31 +0100226 if (opt->ref_message_ids && opt->ref_message_ids->nr > 0) {
227 int i, n;
228 n = opt->ref_message_ids->nr;
229 printf("In-Reply-To: <%s>\n", opt->ref_message_ids->items[n-1].string);
230 for (i = 0; i < n; i++)
231 printf("%s<%s>\n", (i > 0 ? "\t" : "References: "),
232 opt->ref_message_ids->items[i].string);
Adam Simpkins7fefda52008-05-04 03:36:54 -0700233 graph_show_oneline(opt->graph);
234 }
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500235 if (opt->mime_boundary) {
236 static char subject_buffer[1024];
237 static char buffer[1024];
Stephen Boyd108dab22009-03-22 19:14:05 -0700238 struct strbuf filename = STRBUF_INIT;
Junio C Hamano267123b2008-03-15 00:09:20 -0700239 *need_8bit_cte_p = -1; /* NEVER */
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500240 snprintf(subject_buffer, sizeof(subject_buffer) - 1,
241 "%s"
242 "MIME-Version: 1.0\n"
243 "Content-Type: multipart/mixed;"
244 " boundary=\"%s%s\"\n"
245 "\n"
246 "This is a multi-part message in MIME "
247 "format.\n"
248 "--%s%s\n"
249 "Content-Type: text/plain; "
250 "charset=UTF-8; format=fixed\n"
251 "Content-Transfer-Encoding: 8bit\n\n",
252 extra_headers ? extra_headers : "",
253 mime_boundary_leader, opt->mime_boundary,
254 mime_boundary_leader, opt->mime_boundary);
255 extra_headers = subject_buffer;
256
Stephen Boyd108dab22009-03-22 19:14:05 -0700257 get_patch_filename(opt->numbered_files ? NULL : commit, opt->nr,
258 opt->patch_suffix, &filename);
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500259 snprintf(buffer, sizeof(buffer) - 1,
Kevin Ballard6b2fbaa2008-07-29 22:49:33 -0700260 "\n--%s%s\n"
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500261 "Content-Type: text/x-patch;"
Stephen Boyd108dab22009-03-22 19:14:05 -0700262 " name=\"%s\"\n"
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500263 "Content-Transfer-Encoding: 8bit\n"
264 "Content-Disposition: %s;"
Stephen Boyd108dab22009-03-22 19:14:05 -0700265 " filename=\"%s\"\n\n",
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500266 mime_boundary_leader, opt->mime_boundary,
Stephen Boyd108dab22009-03-22 19:14:05 -0700267 filename.buf,
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500268 opt->no_inline ? "attachment" : "inline",
Stephen Boyd108dab22009-03-22 19:14:05 -0700269 filename.buf);
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500270 opt->diffopt.stat_sep = buffer;
Stephen Boyd108dab22009-03-22 19:14:05 -0700271 strbuf_release(&filename);
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500272 }
273 *subject_p = subject;
274 *extra_headers_p = extra_headers;
275}
276
Adam Simpkins02865652008-04-29 01:32:59 -0700277void show_log(struct rev_info *opt)
Linus Torvalds91539832006-04-17 11:59:32 -0700278{
Brandon Caseyf285a2d2008-10-09 14:12:12 -0500279 struct strbuf msgbuf = STRBUF_INIT;
Timo Hirvonen39bc9a62006-06-25 13:54:14 +0300280 struct log_info *log = opt->loginfo;
Linus Torvalds91539832006-04-17 11:59:32 -0700281 struct commit *commit = log->commit, *parent = log->parent;
Linus Torvalds91539832006-04-17 11:59:32 -0700282 int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
Thomas Rastdd2e7942009-10-19 17:48:08 +0200283 const char *extra_headers = opt->extra_headers;
284 struct pretty_print_context ctx = {0};
Linus Torvalds91539832006-04-17 11:59:32 -0700285
286 opt->loginfo = NULL;
Junio C Hamano66b2ed02010-01-20 13:59:36 -0800287 ctx.show_notes = opt->show_notes;
Linus Torvalds91539832006-04-17 11:59:32 -0700288 if (!opt->verbose_header) {
Adam Simpkins7fefda52008-05-04 03:36:54 -0700289 graph_show_commit(opt->graph);
290
Adam Simpkins7528f272008-05-25 00:07:21 -0700291 if (!opt->graph) {
292 if (commit->object.flags & BOUNDARY)
293 putchar('-');
294 else if (commit->object.flags & UNINTERESTING)
295 putchar('^');
296 else if (opt->left_right) {
297 if (commit->object.flags & SYMMETRIC_LEFT)
298 putchar('<');
299 else
300 putchar('>');
301 }
Junio C Hamano74bd9022006-12-16 15:31:25 -0800302 }
Thomas Rast7fcda922009-02-13 23:10:41 +0100303 fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit), stdout);
Adam Simpkins885cf802008-05-04 03:36:52 -0700304 if (opt->print_parents)
Linus Torvaldsc8c893c2006-05-03 07:59:00 -0700305 show_parents(commit, abbrev_commit);
Linus Torvalds0f3a2902008-10-27 12:51:59 -0700306 show_decorations(opt, commit);
Adam Simpkins7fefda52008-05-04 03:36:54 -0700307 if (opt->graph && !graph_is_commit_finished(opt->graph)) {
308 putchar('\n');
309 graph_show_remainder(opt->graph);
310 }
Ryan Anderson1dcb6922006-08-07 05:11:23 -0700311 putchar(opt->diffopt.line_termination);
Linus Torvalds91539832006-04-17 11:59:32 -0700312 return;
313 }
314
315 /*
Jeff King87152272009-07-01 03:26:28 -0400316 * If use_terminator is set, we already handled any record termination
317 * at the end of the last record.
Adam Simpkins02865652008-04-29 01:32:59 -0700318 * Otherwise, add a diffopt.line_termination character before all
319 * entries but the first. (IOW, as a separator between entries)
Linus Torvalds91539832006-04-17 11:59:32 -0700320 */
Adam Simpkins7fefda52008-05-04 03:36:54 -0700321 if (opt->shown_one && !opt->use_terminator) {
322 /*
323 * If entries are separated by a newline, the output
324 * should look human-readable. If the last entry ended
325 * with a newline, print the graph output before this
326 * newline. Otherwise it will end up as a completely blank
327 * line and will look like a gap in the graph.
328 *
329 * If the entry separator is not a newline, the output is
330 * primarily intended for programmatic consumption, and we
331 * never want the extra graph output before the entry
332 * separator.
333 */
334 if (opt->diffopt.line_termination == '\n' &&
335 !opt->missing_newline)
336 graph_show_padding(opt->graph);
Linus Torvaldsabd4e222007-02-07 11:49:56 -0800337 putchar(opt->diffopt.line_termination);
Adam Simpkins7fefda52008-05-04 03:36:54 -0700338 }
Linus Torvalds91539832006-04-17 11:59:32 -0700339 opt->shown_one = 1;
340
341 /*
Adam Simpkins7fefda52008-05-04 03:36:54 -0700342 * If the history graph was requested,
343 * print the graph, up to this commit's line
344 */
345 graph_show_commit(opt->graph);
346
347 /*
Linus Torvalds91539832006-04-17 11:59:32 -0700348 * Print header line of header..
349 */
Junio C Hamano3eefc182006-04-18 16:45:27 -0700350
Johannes Schindelin596524b2006-05-05 04:30:52 +0200351 if (opt->commit_format == CMIT_FMT_EMAIL) {
Thomas Rastdd2e7942009-10-19 17:48:08 +0200352 log_write_email_headers(opt, commit, &ctx.subject, &extra_headers,
353 &ctx.need_8bit_cte);
Johannes Schindeline52a5de2007-02-23 01:35:03 +0100354 } else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +0100355 fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), stdout);
Junio C Hamano74bd9022006-12-16 15:31:25 -0800356 if (opt->commit_format != CMIT_FMT_ONELINE)
357 fputs("commit ", stdout);
Adam Simpkins7528f272008-05-25 00:07:21 -0700358
359 if (!opt->graph) {
360 if (commit->object.flags & BOUNDARY)
361 putchar('-');
362 else if (commit->object.flags & UNINTERESTING)
363 putchar('^');
364 else if (opt->left_right) {
365 if (commit->object.flags & SYMMETRIC_LEFT)
366 putchar('<');
367 else
368 putchar('>');
369 }
Junio C Hamano74bd9022006-12-16 15:31:25 -0800370 }
Thomas Rast7fcda922009-02-13 23:10:41 +0100371 fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit),
Junio C Hamano74bd9022006-12-16 15:31:25 -0800372 stdout);
Adam Simpkins885cf802008-05-04 03:36:52 -0700373 if (opt->print_parents)
Junio C Hamanoc66b6c02006-05-06 14:42:08 -0700374 show_parents(commit, abbrev_commit);
Junio C Hamano73f0a152006-05-24 12:19:47 -0700375 if (parent)
Junio C Hamano3eefc182006-04-18 16:45:27 -0700376 printf(" (from %s)",
Thomas Rast7fcda922009-02-13 23:10:41 +0100377 find_unique_abbrev(parent->object.sha1,
Junio C Hamano3eefc182006-04-18 16:45:27 -0700378 abbrev_commit));
Linus Torvalds0f3a2902008-10-27 12:51:59 -0700379 show_decorations(opt, commit);
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +0100380 printf("%s", diff_get_color_opt(&opt->diffopt, DIFF_RESET));
Adam Simpkins7fefda52008-05-04 03:36:54 -0700381 if (opt->commit_format == CMIT_FMT_ONELINE) {
382 putchar(' ');
383 } else {
384 putchar('\n');
385 graph_show_oneline(opt->graph);
386 }
Nicolas Pitre903b45f2007-01-27 22:40:36 -0500387 if (opt->reflog_info) {
Adam Simpkins7fefda52008-05-04 03:36:54 -0700388 /*
389 * setup_revisions() ensures that opt->reflog_info
390 * and opt->graph cannot both be set,
391 * so we don't need to worry about printing the
392 * graph info here.
393 */
Junio C Hamano4d12a472007-01-20 00:51:41 -0800394 show_reflog_message(opt->reflog_info,
Johannes Schindelin4e244cb2007-02-08 21:58:33 +0100395 opt->commit_format == CMIT_FMT_ONELINE,
Jeff Kingf4ea32f2009-09-24 04:28:15 -0400396 opt->date_mode_explicit ?
397 opt->date_mode :
398 DATE_NORMAL);
Adam Simpkins02865652008-04-29 01:32:59 -0700399 if (opt->commit_format == CMIT_FMT_ONELINE)
Nicolas Pitre903b45f2007-01-27 22:40:36 -0500400 return;
Nicolas Pitre903b45f2007-01-27 22:40:36 -0500401 }
Junio C Hamano3eefc182006-04-18 16:45:27 -0700402 }
Linus Torvalds91539832006-04-17 11:59:32 -0700403
Linus Torvalds3131b712008-02-09 14:02:07 -0800404 if (!commit->buffer)
405 return;
406
Linus Torvalds91539832006-04-17 11:59:32 -0700407 /*
408 * And then the pretty-printed message itself
409 */
Thomas Rastdd2e7942009-10-19 17:48:08 +0200410 if (ctx.need_8bit_cte >= 0)
411 ctx.need_8bit_cte = has_non_ascii(opt->add_signoff);
412 ctx.date_mode = opt->date_mode;
413 ctx.abbrev = opt->diffopt.abbrev;
414 ctx.after_subject = extra_headers;
Thomas Rast8f8f5472009-10-19 17:48:10 +0200415 ctx.reflog_info = opt->reflog_info;
Thomas Rastdd2e7942009-10-19 17:48:08 +0200416 pretty_print_commit(opt->commit_format, commit, &msgbuf, &ctx);
Junio C Hamanocf2251b2006-05-31 15:11:49 -0700417
418 if (opt->add_signoff)
Pierre Habouzit674d1722007-09-10 12:35:06 +0200419 append_signoff(&msgbuf, opt->add_signoff);
Adam Simpkins7fefda52008-05-04 03:36:54 -0700420 if (opt->show_log_size) {
Pierre Habouzit674d1722007-09-10 12:35:06 +0200421 printf("log size %i\n", (int)msgbuf.len);
Adam Simpkins7fefda52008-05-04 03:36:54 -0700422 graph_show_oneline(opt->graph);
423 }
Marco Costalba9fa34652007-07-20 20:15:13 +0200424
Adam Simpkins7fefda52008-05-04 03:36:54 -0700425 /*
426 * Set opt->missing_newline if msgbuf doesn't
427 * end in a newline (including if it is empty)
428 */
429 if (!msgbuf.len || msgbuf.buf[msgbuf.len - 1] != '\n')
430 opt->missing_newline = 1;
431 else
432 opt->missing_newline = 0;
433
434 if (opt->graph)
435 graph_show_commit_msg(opt->graph, &msgbuf);
436 else
Govind Salinas42c8c742008-03-21 10:05:06 -0500437 fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
Adam Simpkins7fefda52008-05-04 03:36:54 -0700438 if (opt->use_terminator) {
439 if (!opt->missing_newline)
440 graph_show_padding(opt->graph);
Adam Simpkins9b58bfe2008-04-29 01:33:00 -0700441 putchar('\n');
Adam Simpkins7fefda52008-05-04 03:36:54 -0700442 }
443
Pierre Habouzit674d1722007-09-10 12:35:06 +0200444 strbuf_release(&msgbuf);
Linus Torvalds91539832006-04-17 11:59:32 -0700445}
446
Linus Torvaldscd2bdc52006-04-14 16:52:13 -0700447int log_tree_diff_flush(struct rev_info *opt)
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700448{
449 diffcore_std(&opt->diffopt);
Linus Torvalds91539832006-04-17 11:59:32 -0700450
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700451 if (diff_queue_is_empty()) {
452 int saved_fmt = opt->diffopt.output_format;
453 opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
454 diff_flush(&opt->diffopt);
455 opt->diffopt.output_format = saved_fmt;
456 return 0;
457 }
Linus Torvalds91539832006-04-17 11:59:32 -0700458
Junio C Hamano3969cf72006-06-27 15:08:19 -0700459 if (opt->loginfo && !opt->no_commit_id) {
460 /* When showing a verbose header (i.e. log message),
461 * and not in --pretty=oneline format, we would want
462 * an extra newline between the end of log and the
463 * output for readability.
464 */
Adam Simpkins02865652008-04-29 01:32:59 -0700465 show_log(opt);
Linus Torvalds304b5af2007-10-09 09:35:22 -0700466 if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) &&
467 opt->verbose_header &&
Junio C Hamano3969cf72006-06-27 15:08:19 -0700468 opt->commit_format != CMIT_FMT_ONELINE) {
469 int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
470 if ((pch & opt->diffopt.output_format) == pch)
Linus Torvaldsabd4e222007-02-07 11:49:56 -0800471 printf("---");
472 putchar('\n');
Junio C Hamano3969cf72006-06-27 15:08:19 -0700473 }
474 }
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700475 diff_flush(&opt->diffopt);
476 return 1;
477}
478
Linus Torvaldscd2bdc52006-04-14 16:52:13 -0700479static int do_diff_combined(struct rev_info *opt, struct commit *commit)
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700480{
481 unsigned const char *sha1 = commit->object.sha1;
482
Linus Torvalds91539832006-04-17 11:59:32 -0700483 diff_tree_combined_merge(sha1, opt->dense_combined_merges, opt);
484 return !opt->loginfo;
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700485}
486
Linus Torvalds91539832006-04-17 11:59:32 -0700487/*
488 * Show the diff of a commit.
489 *
490 * Return true if we printed any log info messages
491 */
492static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log_info *log)
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700493{
Linus Torvalds91539832006-04-17 11:59:32 -0700494 int showed_log;
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700495 struct commit_list *parents;
496 unsigned const char *sha1 = commit->object.sha1;
497
Peter Valdemar Mørch84102a32008-08-11 08:46:25 +0200498 if (!opt->diff && !DIFF_OPT_TST(&opt->diffopt, EXIT_WITH_STATUS))
Linus Torvalds91539832006-04-17 11:59:32 -0700499 return 0;
500
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700501 /* Root commit? */
Linus Torvalds91539832006-04-17 11:59:32 -0700502 parents = commit->parents;
503 if (!parents) {
Rene Scharfe2b603562006-10-26 18:52:39 +0200504 if (opt->show_root_diff) {
505 diff_root_tree_sha1(sha1, "", &opt->diffopt);
506 log_tree_diff_flush(opt);
507 }
Linus Torvalds91539832006-04-17 11:59:32 -0700508 return !opt->loginfo;
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700509 }
510
511 /* More than one parent? */
Linus Torvalds91539832006-04-17 11:59:32 -0700512 if (parents && parents->next) {
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700513 if (opt->ignore_merges)
514 return 0;
515 else if (opt->combine_merges)
516 return do_diff_combined(opt, commit);
Linus Torvalds91539832006-04-17 11:59:32 -0700517
518 /* If we show individual diffs, show the parent info */
519 log->parent = parents->item;
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700520 }
521
Linus Torvalds91539832006-04-17 11:59:32 -0700522 showed_log = 0;
523 for (;;) {
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700524 struct commit *parent = parents->item;
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700525
Linus Torvalds91539832006-04-17 11:59:32 -0700526 diff_tree_sha1(parent->object.sha1, sha1, "", &opt->diffopt);
527 log_tree_diff_flush(opt);
528
529 showed_log |= !opt->loginfo;
530
531 /* Set up the log info for the next parent, if any.. */
532 parents = parents->next;
533 if (!parents)
534 break;
535 log->parent = parents->item;
536 opt->loginfo = log;
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700537 }
Linus Torvalds91539832006-04-17 11:59:32 -0700538 return showed_log;
539}
540
541int log_tree_commit(struct rev_info *opt, struct commit *commit)
542{
543 struct log_info log;
Junio C Hamano3eefc182006-04-18 16:45:27 -0700544 int shown;
Linus Torvalds91539832006-04-17 11:59:32 -0700545
546 log.commit = commit;
547 log.parent = NULL;
548 opt->loginfo = &log;
549
Junio C Hamano3eefc182006-04-18 16:45:27 -0700550 shown = log_tree_diff(opt, commit, &log);
551 if (!shown && opt->loginfo && opt->always_show_header) {
Linus Torvalds91539832006-04-17 11:59:32 -0700552 log.parent = NULL;
Adam Simpkins02865652008-04-29 01:32:59 -0700553 show_log(opt);
Junio C Hamano3eefc182006-04-18 16:45:27 -0700554 shown = 1;
Linus Torvalds91539832006-04-17 11:59:32 -0700555 }
556 opt->loginfo = NULL;
Theodore Ts'o06f59e92007-06-29 13:40:46 -0400557 maybe_flush_or_die(stdout, "stdout");
Junio C Hamano3eefc182006-04-18 16:45:27 -0700558 return shown;
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700559}