blob: 5bd29e6994c92268ec576671bb8564b57d1a5c9d [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;
28 add_name_decoration("", refname, obj);
29 while (obj->type == OBJ_TAG) {
30 obj = ((struct tag *)obj)->tagged;
31 if (!obj)
32 break;
33 add_name_decoration("tag: ", refname, obj);
34 }
35 return 0;
36}
37
38void load_ref_decorations(void)
39{
40 static int loaded;
41 if (!loaded) {
42 loaded = 1;
43 for_each_ref(add_ref_decoration, NULL);
44 }
45}
46
Linus Torvaldsc8c893c2006-05-03 07:59:00 -070047static void show_parents(struct commit *commit, int abbrev)
48{
49 struct commit_list *p;
50 for (p = commit->parents; p ; p = p->next) {
51 struct commit *parent = p->item;
Thomas Rast7fcda922009-02-13 23:10:41 +010052 printf(" %s", find_unique_abbrev(parent->object.sha1, abbrev));
Linus Torvaldsc8c893c2006-05-03 07:59:00 -070053 }
54}
55
Linus Torvalds0f3a2902008-10-27 12:51:59 -070056void show_decorations(struct rev_info *opt, struct commit *commit)
Linus Torvaldsca135e72007-04-16 16:05:10 -070057{
58 const char *prefix;
59 struct name_decoration *decoration;
60
Linus Torvalds0f3a2902008-10-27 12:51:59 -070061 if (opt->show_source && commit->util)
Linus Torvalds8c4021a2008-11-15 10:02:01 -080062 printf("\t%s", (char *) commit->util);
Linus Torvaldsd467a522008-11-03 11:23:57 -080063 if (!opt->show_decorations)
64 return;
Linus Torvaldsca135e72007-04-16 16:05:10 -070065 decoration = lookup_decoration(&name_decoration, &commit->object);
66 if (!decoration)
67 return;
68 prefix = " (";
69 while (decoration) {
70 printf("%s%s", prefix, decoration->name);
71 prefix = ", ";
72 decoration = decoration->next;
73 }
74 putchar(')');
75}
76
Franck Bui-Huufc1c75e2006-08-29 13:37:06 +020077/*
78 * Search for "^[-A-Za-z]+: [^@]+@" pattern. It usually matches
79 * Signed-off-by: and Acked-by: lines.
80 */
81static int detect_any_signoff(char *letter, int size)
82{
Benjamin Kramerfd13b212009-03-07 21:02:26 +010083 char *cp;
Franck Bui-Huufc1c75e2006-08-29 13:37:06 +020084 int seen_colon = 0;
85 int seen_at = 0;
86 int seen_name = 0;
87 int seen_head = 0;
88
89 cp = letter + size;
Benjamin Kramerfd13b212009-03-07 21:02:26 +010090 while (letter <= --cp && *cp == '\n')
Franck Bui-Huufc1c75e2006-08-29 13:37:06 +020091 continue;
92
93 while (letter <= cp) {
Benjamin Kramerfd13b212009-03-07 21:02:26 +010094 char ch = *cp--;
Franck Bui-Huufc1c75e2006-08-29 13:37:06 +020095 if (ch == '\n')
96 break;
97
98 if (!seen_at) {
99 if (ch == '@')
100 seen_at = 1;
101 continue;
102 }
103 if (!seen_colon) {
104 if (ch == '@')
105 return 0;
106 else if (ch == ':')
107 seen_colon = 1;
108 else
109 seen_name = 1;
110 continue;
111 }
112 if (('A' <= ch && ch <= 'Z') ||
113 ('a' <= ch && ch <= 'z') ||
114 ch == '-') {
115 seen_head = 1;
116 continue;
117 }
118 /* no empty last line doesn't match */
119 return 0;
120 }
121 return seen_head && seen_name;
122}
123
Pierre Habouzit674d1722007-09-10 12:35:06 +0200124static void append_signoff(struct strbuf *sb, const char *signoff)
Junio C Hamanocf2251b2006-05-31 15:11:49 -0700125{
Junio C Hamanocf2251b2006-05-31 15:11:49 -0700126 static const char signed_off_by[] = "Signed-off-by: ";
Junio C Hamano80583c02007-06-11 00:34:54 -0700127 size_t signoff_len = strlen(signoff);
Franck Bui-Huufc1c75e2006-08-29 13:37:06 +0200128 int has_signoff = 0;
Junio C Hamano80583c02007-06-11 00:34:54 -0700129 char *cp;
Junio C Hamanocf2251b2006-05-31 15:11:49 -0700130
Pierre Habouzit674d1722007-09-10 12:35:06 +0200131 cp = sb->buf;
Junio C Hamanocf2251b2006-05-31 15:11:49 -0700132
133 /* First see if we already have the sign-off by the signer */
Franck Bui-Huufc1c75e2006-08-29 13:37:06 +0200134 while ((cp = strstr(cp, signed_off_by))) {
135
136 has_signoff = 1;
137
Junio C Hamanocf2251b2006-05-31 15:11:49 -0700138 cp += strlen(signed_off_by);
Pierre Habouzit674d1722007-09-10 12:35:06 +0200139 if (cp + signoff_len >= sb->buf + sb->len)
Franck Bui-Huufc1c75e2006-08-29 13:37:06 +0200140 break;
141 if (strncmp(cp, signoff, signoff_len))
142 continue;
143 if (!isspace(cp[signoff_len]))
144 continue;
145 /* we already have him */
Pierre Habouzit674d1722007-09-10 12:35:06 +0200146 return;
Junio C Hamanocf2251b2006-05-31 15:11:49 -0700147 }
148
Franck Bui-Huufc1c75e2006-08-29 13:37:06 +0200149 if (!has_signoff)
Pierre Habouzit674d1722007-09-10 12:35:06 +0200150 has_signoff = detect_any_signoff(sb->buf, sb->len);
Franck Bui-Huufc1c75e2006-08-29 13:37:06 +0200151
152 if (!has_signoff)
Pierre Habouzit674d1722007-09-10 12:35:06 +0200153 strbuf_addch(sb, '\n');
Franck Bui-Huuc35f4c32006-08-13 11:30:27 -0700154
Pierre Habouzit674d1722007-09-10 12:35:06 +0200155 strbuf_addstr(sb, signed_off_by);
156 strbuf_add(sb, signoff, signoff_len);
157 strbuf_addch(sb, '\n');
Junio C Hamanocf2251b2006-05-31 15:11:49 -0700158}
159
Johannes Schindeline00de242007-02-09 01:43:54 +0100160static unsigned int digits_in_number(unsigned int number)
161{
162 unsigned int i = 10, result = 1;
163 while (i <= number) {
164 i *= 10;
165 result++;
166 }
167 return result;
168}
169
Junio C Hamano4593fb82007-10-31 14:55:17 -0700170static int has_non_ascii(const char *s)
171{
172 int ch;
173 if (!s)
174 return 0;
175 while ((ch = *s++) != '\0') {
176 if (non_ascii(ch))
177 return 1;
178 }
179 return 0;
180}
181
Stephen Boyd6fa8e622009-03-22 19:14:04 -0700182void get_patch_filename(struct commit *commit, int nr, const char *suffix,
183 struct strbuf *buf)
184{
185 int suffix_len = strlen(suffix) + 1;
186 int start_len = buf->len;
187
188 strbuf_addf(buf, commit ? "%04d-" : "%d", nr);
189 if (commit) {
Christian Couderb09b8682009-03-27 01:13:01 +0100190 int max_len = start_len + FORMAT_PATCH_NAME_MAX - suffix_len;
191
Stephen Boyd6fa8e622009-03-22 19:14:04 -0700192 format_commit_message(commit, "%f", buf, DATE_NORMAL);
Christian Couderb09b8682009-03-27 01:13:01 +0100193 if (max_len < buf->len)
194 strbuf_setlen(buf, max_len);
195 strbuf_addstr(buf, suffix);
Stephen Boyd6fa8e622009-03-22 19:14:04 -0700196 }
197}
198
Stephen Boyd108dab22009-03-22 19:14:05 -0700199void log_write_email_headers(struct rev_info *opt, struct commit *commit,
Junio C Hamano267123b2008-03-15 00:09:20 -0700200 const char **subject_p,
201 const char **extra_headers_p,
202 int *need_8bit_cte_p)
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500203{
204 const char *subject = NULL;
205 const char *extra_headers = opt->extra_headers;
Stephen Boyd108dab22009-03-22 19:14:05 -0700206 const char *name = sha1_to_hex(commit->object.sha1);
Junio C Hamano267123b2008-03-15 00:09:20 -0700207
208 *need_8bit_cte_p = 0; /* unknown */
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500209 if (opt->total > 0) {
210 static char buffer[64];
211 snprintf(buffer, sizeof(buffer),
212 "Subject: [%s %0*d/%d] ",
213 opt->subject_prefix,
214 digits_in_number(opt->total),
215 opt->nr, opt->total);
216 subject = buffer;
217 } else if (opt->total == 0 && opt->subject_prefix && *opt->subject_prefix) {
218 static char buffer[256];
219 snprintf(buffer, sizeof(buffer),
220 "Subject: [%s] ",
221 opt->subject_prefix);
222 subject = buffer;
223 } else {
224 subject = "Subject: ";
225 }
226
227 printf("From %s Mon Sep 17 00:00:00 2001\n", name);
Adam Simpkins7fefda52008-05-04 03:36:54 -0700228 graph_show_oneline(opt->graph);
229 if (opt->message_id) {
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500230 printf("Message-Id: <%s>\n", opt->message_id);
Adam Simpkins7fefda52008-05-04 03:36:54 -0700231 graph_show_oneline(opt->graph);
232 }
Thomas Rastb079c502009-02-19 22:26:31 +0100233 if (opt->ref_message_ids && opt->ref_message_ids->nr > 0) {
234 int i, n;
235 n = opt->ref_message_ids->nr;
236 printf("In-Reply-To: <%s>\n", opt->ref_message_ids->items[n-1].string);
237 for (i = 0; i < n; i++)
238 printf("%s<%s>\n", (i > 0 ? "\t" : "References: "),
239 opt->ref_message_ids->items[i].string);
Adam Simpkins7fefda52008-05-04 03:36:54 -0700240 graph_show_oneline(opt->graph);
241 }
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500242 if (opt->mime_boundary) {
243 static char subject_buffer[1024];
244 static char buffer[1024];
Stephen Boyd108dab22009-03-22 19:14:05 -0700245 struct strbuf filename = STRBUF_INIT;
Junio C Hamano267123b2008-03-15 00:09:20 -0700246 *need_8bit_cte_p = -1; /* NEVER */
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500247 snprintf(subject_buffer, sizeof(subject_buffer) - 1,
248 "%s"
249 "MIME-Version: 1.0\n"
250 "Content-Type: multipart/mixed;"
251 " boundary=\"%s%s\"\n"
252 "\n"
253 "This is a multi-part message in MIME "
254 "format.\n"
255 "--%s%s\n"
256 "Content-Type: text/plain; "
257 "charset=UTF-8; format=fixed\n"
258 "Content-Transfer-Encoding: 8bit\n\n",
259 extra_headers ? extra_headers : "",
260 mime_boundary_leader, opt->mime_boundary,
261 mime_boundary_leader, opt->mime_boundary);
262 extra_headers = subject_buffer;
263
Stephen Boyd108dab22009-03-22 19:14:05 -0700264 get_patch_filename(opt->numbered_files ? NULL : commit, opt->nr,
265 opt->patch_suffix, &filename);
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500266 snprintf(buffer, sizeof(buffer) - 1,
Kevin Ballard6b2fbaa2008-07-29 22:49:33 -0700267 "\n--%s%s\n"
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500268 "Content-Type: text/x-patch;"
Stephen Boyd108dab22009-03-22 19:14:05 -0700269 " name=\"%s\"\n"
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500270 "Content-Transfer-Encoding: 8bit\n"
271 "Content-Disposition: %s;"
Stephen Boyd108dab22009-03-22 19:14:05 -0700272 " filename=\"%s\"\n\n",
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500273 mime_boundary_leader, opt->mime_boundary,
Stephen Boyd108dab22009-03-22 19:14:05 -0700274 filename.buf,
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500275 opt->no_inline ? "attachment" : "inline",
Stephen Boyd108dab22009-03-22 19:14:05 -0700276 filename.buf);
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500277 opt->diffopt.stat_sep = buffer;
Stephen Boyd108dab22009-03-22 19:14:05 -0700278 strbuf_release(&filename);
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500279 }
280 *subject_p = subject;
281 *extra_headers_p = extra_headers;
282}
283
Adam Simpkins02865652008-04-29 01:32:59 -0700284void show_log(struct rev_info *opt)
Linus Torvalds91539832006-04-17 11:59:32 -0700285{
Brandon Caseyf285a2d2008-10-09 14:12:12 -0500286 struct strbuf msgbuf = STRBUF_INIT;
Timo Hirvonen39bc9a62006-06-25 13:54:14 +0300287 struct log_info *log = opt->loginfo;
Linus Torvalds91539832006-04-17 11:59:32 -0700288 struct commit *commit = log->commit, *parent = log->parent;
289 int abbrev = opt->diffopt.abbrev;
290 int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
Johannes Schindelin20ff0682006-06-02 15:21:17 +0200291 const char *subject = NULL, *extra_headers = opt->extra_headers;
Junio C Hamano6bf4f1b2008-03-14 17:10:09 -0700292 int need_8bit_cte = 0;
Linus Torvalds91539832006-04-17 11:59:32 -0700293
294 opt->loginfo = NULL;
295 if (!opt->verbose_header) {
Adam Simpkins7fefda52008-05-04 03:36:54 -0700296 graph_show_commit(opt->graph);
297
Adam Simpkins7528f272008-05-25 00:07:21 -0700298 if (!opt->graph) {
299 if (commit->object.flags & BOUNDARY)
300 putchar('-');
301 else if (commit->object.flags & UNINTERESTING)
302 putchar('^');
303 else if (opt->left_right) {
304 if (commit->object.flags & SYMMETRIC_LEFT)
305 putchar('<');
306 else
307 putchar('>');
308 }
Junio C Hamano74bd9022006-12-16 15:31:25 -0800309 }
Thomas Rast7fcda922009-02-13 23:10:41 +0100310 fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit), stdout);
Adam Simpkins885cf802008-05-04 03:36:52 -0700311 if (opt->print_parents)
Linus Torvaldsc8c893c2006-05-03 07:59:00 -0700312 show_parents(commit, abbrev_commit);
Linus Torvalds0f3a2902008-10-27 12:51:59 -0700313 show_decorations(opt, commit);
Adam Simpkins7fefda52008-05-04 03:36:54 -0700314 if (opt->graph && !graph_is_commit_finished(opt->graph)) {
315 putchar('\n');
316 graph_show_remainder(opt->graph);
317 }
Ryan Anderson1dcb6922006-08-07 05:11:23 -0700318 putchar(opt->diffopt.line_termination);
Linus Torvalds91539832006-04-17 11:59:32 -0700319 return;
320 }
321
322 /*
Adam Simpkins02865652008-04-29 01:32:59 -0700323 * If use_terminator is set, add a newline at the end of the entry.
324 * Otherwise, add a diffopt.line_termination character before all
325 * entries but the first. (IOW, as a separator between entries)
Linus Torvalds91539832006-04-17 11:59:32 -0700326 */
Adam Simpkins7fefda52008-05-04 03:36:54 -0700327 if (opt->shown_one && !opt->use_terminator) {
328 /*
329 * If entries are separated by a newline, the output
330 * should look human-readable. If the last entry ended
331 * with a newline, print the graph output before this
332 * newline. Otherwise it will end up as a completely blank
333 * line and will look like a gap in the graph.
334 *
335 * If the entry separator is not a newline, the output is
336 * primarily intended for programmatic consumption, and we
337 * never want the extra graph output before the entry
338 * separator.
339 */
340 if (opt->diffopt.line_termination == '\n' &&
341 !opt->missing_newline)
342 graph_show_padding(opt->graph);
Linus Torvaldsabd4e222007-02-07 11:49:56 -0800343 putchar(opt->diffopt.line_termination);
Adam Simpkins7fefda52008-05-04 03:36:54 -0700344 }
Linus Torvalds91539832006-04-17 11:59:32 -0700345 opt->shown_one = 1;
346
347 /*
Adam Simpkins7fefda52008-05-04 03:36:54 -0700348 * If the history graph was requested,
349 * print the graph, up to this commit's line
350 */
351 graph_show_commit(opt->graph);
352
353 /*
Linus Torvalds91539832006-04-17 11:59:32 -0700354 * Print header line of header..
355 */
Junio C Hamano3eefc182006-04-18 16:45:27 -0700356
Johannes Schindelin596524b2006-05-05 04:30:52 +0200357 if (opt->commit_format == CMIT_FMT_EMAIL) {
Stephen Boyd108dab22009-03-22 19:14:05 -0700358 log_write_email_headers(opt, commit, &subject, &extra_headers,
Junio C Hamano267123b2008-03-15 00:09:20 -0700359 &need_8bit_cte);
Johannes Schindeline52a5de2007-02-23 01:35:03 +0100360 } else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +0100361 fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), stdout);
Junio C Hamano74bd9022006-12-16 15:31:25 -0800362 if (opt->commit_format != CMIT_FMT_ONELINE)
363 fputs("commit ", stdout);
Adam Simpkins7528f272008-05-25 00:07:21 -0700364
365 if (!opt->graph) {
366 if (commit->object.flags & BOUNDARY)
367 putchar('-');
368 else if (commit->object.flags & UNINTERESTING)
369 putchar('^');
370 else if (opt->left_right) {
371 if (commit->object.flags & SYMMETRIC_LEFT)
372 putchar('<');
373 else
374 putchar('>');
375 }
Junio C Hamano74bd9022006-12-16 15:31:25 -0800376 }
Thomas Rast7fcda922009-02-13 23:10:41 +0100377 fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit),
Junio C Hamano74bd9022006-12-16 15:31:25 -0800378 stdout);
Adam Simpkins885cf802008-05-04 03:36:52 -0700379 if (opt->print_parents)
Junio C Hamanoc66b6c02006-05-06 14:42:08 -0700380 show_parents(commit, abbrev_commit);
Junio C Hamano73f0a152006-05-24 12:19:47 -0700381 if (parent)
Junio C Hamano3eefc182006-04-18 16:45:27 -0700382 printf(" (from %s)",
Thomas Rast7fcda922009-02-13 23:10:41 +0100383 find_unique_abbrev(parent->object.sha1,
Junio C Hamano3eefc182006-04-18 16:45:27 -0700384 abbrev_commit));
Linus Torvalds0f3a2902008-10-27 12:51:59 -0700385 show_decorations(opt, commit);
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +0100386 printf("%s", diff_get_color_opt(&opt->diffopt, DIFF_RESET));
Adam Simpkins7fefda52008-05-04 03:36:54 -0700387 if (opt->commit_format == CMIT_FMT_ONELINE) {
388 putchar(' ');
389 } else {
390 putchar('\n');
391 graph_show_oneline(opt->graph);
392 }
Nicolas Pitre903b45f2007-01-27 22:40:36 -0500393 if (opt->reflog_info) {
Adam Simpkins7fefda52008-05-04 03:36:54 -0700394 /*
395 * setup_revisions() ensures that opt->reflog_info
396 * and opt->graph cannot both be set,
397 * so we don't need to worry about printing the
398 * graph info here.
399 */
Junio C Hamano4d12a472007-01-20 00:51:41 -0800400 show_reflog_message(opt->reflog_info,
Johannes Schindelin4e244cb2007-02-08 21:58:33 +0100401 opt->commit_format == CMIT_FMT_ONELINE,
Junio C Hamanoa7b02cc2007-04-24 23:36:22 -0700402 opt->date_mode);
Adam Simpkins02865652008-04-29 01:32:59 -0700403 if (opt->commit_format == CMIT_FMT_ONELINE)
Nicolas Pitre903b45f2007-01-27 22:40:36 -0500404 return;
Nicolas Pitre903b45f2007-01-27 22:40:36 -0500405 }
Junio C Hamano3eefc182006-04-18 16:45:27 -0700406 }
Linus Torvalds91539832006-04-17 11:59:32 -0700407
Linus Torvalds3131b712008-02-09 14:02:07 -0800408 if (!commit->buffer)
409 return;
410
Linus Torvalds91539832006-04-17 11:59:32 -0700411 /*
412 * And then the pretty-printed message itself
413 */
Junio C Hamano6bf4f1b2008-03-14 17:10:09 -0700414 if (need_8bit_cte >= 0)
415 need_8bit_cte = has_non_ascii(opt->add_signoff);
Pierre Habouzit674d1722007-09-10 12:35:06 +0200416 pretty_print_commit(opt->commit_format, commit, &msgbuf,
Junio C Hamano4593fb82007-10-31 14:55:17 -0700417 abbrev, subject, extra_headers, opt->date_mode,
Junio C Hamano6bf4f1b2008-03-14 17:10:09 -0700418 need_8bit_cte);
Junio C Hamanocf2251b2006-05-31 15:11:49 -0700419
420 if (opt->add_signoff)
Pierre Habouzit674d1722007-09-10 12:35:06 +0200421 append_signoff(&msgbuf, opt->add_signoff);
Adam Simpkins7fefda52008-05-04 03:36:54 -0700422 if (opt->show_log_size) {
Pierre Habouzit674d1722007-09-10 12:35:06 +0200423 printf("log size %i\n", (int)msgbuf.len);
Adam Simpkins7fefda52008-05-04 03:36:54 -0700424 graph_show_oneline(opt->graph);
425 }
Marco Costalba9fa34652007-07-20 20:15:13 +0200426
Adam Simpkins7fefda52008-05-04 03:36:54 -0700427 /*
428 * Set opt->missing_newline if msgbuf doesn't
429 * end in a newline (including if it is empty)
430 */
431 if (!msgbuf.len || msgbuf.buf[msgbuf.len - 1] != '\n')
432 opt->missing_newline = 1;
433 else
434 opt->missing_newline = 0;
435
436 if (opt->graph)
437 graph_show_commit_msg(opt->graph, &msgbuf);
438 else
Govind Salinas42c8c742008-03-21 10:05:06 -0500439 fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
Adam Simpkins7fefda52008-05-04 03:36:54 -0700440 if (opt->use_terminator) {
441 if (!opt->missing_newline)
442 graph_show_padding(opt->graph);
Adam Simpkins9b58bfe2008-04-29 01:33:00 -0700443 putchar('\n');
Adam Simpkins7fefda52008-05-04 03:36:54 -0700444 }
445
Pierre Habouzit674d1722007-09-10 12:35:06 +0200446 strbuf_release(&msgbuf);
Linus Torvalds91539832006-04-17 11:59:32 -0700447}
448
Linus Torvaldscd2bdc52006-04-14 16:52:13 -0700449int log_tree_diff_flush(struct rev_info *opt)
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700450{
451 diffcore_std(&opt->diffopt);
Linus Torvalds91539832006-04-17 11:59:32 -0700452
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700453 if (diff_queue_is_empty()) {
454 int saved_fmt = opt->diffopt.output_format;
455 opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
456 diff_flush(&opt->diffopt);
457 opt->diffopt.output_format = saved_fmt;
458 return 0;
459 }
Linus Torvalds91539832006-04-17 11:59:32 -0700460
Junio C Hamano3969cf72006-06-27 15:08:19 -0700461 if (opt->loginfo && !opt->no_commit_id) {
462 /* When showing a verbose header (i.e. log message),
463 * and not in --pretty=oneline format, we would want
464 * an extra newline between the end of log and the
465 * output for readability.
466 */
Adam Simpkins02865652008-04-29 01:32:59 -0700467 show_log(opt);
Linus Torvalds304b5af2007-10-09 09:35:22 -0700468 if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) &&
469 opt->verbose_header &&
Junio C Hamano3969cf72006-06-27 15:08:19 -0700470 opt->commit_format != CMIT_FMT_ONELINE) {
471 int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
472 if ((pch & opt->diffopt.output_format) == pch)
Linus Torvaldsabd4e222007-02-07 11:49:56 -0800473 printf("---");
474 putchar('\n');
Junio C Hamano3969cf72006-06-27 15:08:19 -0700475 }
476 }
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700477 diff_flush(&opt->diffopt);
478 return 1;
479}
480
Linus Torvaldscd2bdc52006-04-14 16:52:13 -0700481static int do_diff_combined(struct rev_info *opt, struct commit *commit)
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700482{
483 unsigned const char *sha1 = commit->object.sha1;
484
Linus Torvalds91539832006-04-17 11:59:32 -0700485 diff_tree_combined_merge(sha1, opt->dense_combined_merges, opt);
486 return !opt->loginfo;
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700487}
488
Linus Torvalds91539832006-04-17 11:59:32 -0700489/*
490 * Show the diff of a commit.
491 *
492 * Return true if we printed any log info messages
493 */
494static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log_info *log)
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700495{
Linus Torvalds91539832006-04-17 11:59:32 -0700496 int showed_log;
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700497 struct commit_list *parents;
498 unsigned const char *sha1 = commit->object.sha1;
499
Peter Valdemar Mørch84102a32008-08-11 08:46:25 +0200500 if (!opt->diff && !DIFF_OPT_TST(&opt->diffopt, EXIT_WITH_STATUS))
Linus Torvalds91539832006-04-17 11:59:32 -0700501 return 0;
502
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700503 /* Root commit? */
Linus Torvalds91539832006-04-17 11:59:32 -0700504 parents = commit->parents;
505 if (!parents) {
Rene Scharfe2b603562006-10-26 18:52:39 +0200506 if (opt->show_root_diff) {
507 diff_root_tree_sha1(sha1, "", &opt->diffopt);
508 log_tree_diff_flush(opt);
509 }
Linus Torvalds91539832006-04-17 11:59:32 -0700510 return !opt->loginfo;
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700511 }
512
513 /* More than one parent? */
Linus Torvalds91539832006-04-17 11:59:32 -0700514 if (parents && parents->next) {
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700515 if (opt->ignore_merges)
516 return 0;
517 else if (opt->combine_merges)
518 return do_diff_combined(opt, commit);
Linus Torvalds91539832006-04-17 11:59:32 -0700519
520 /* If we show individual diffs, show the parent info */
521 log->parent = parents->item;
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700522 }
523
Linus Torvalds91539832006-04-17 11:59:32 -0700524 showed_log = 0;
525 for (;;) {
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700526 struct commit *parent = parents->item;
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700527
Linus Torvalds91539832006-04-17 11:59:32 -0700528 diff_tree_sha1(parent->object.sha1, sha1, "", &opt->diffopt);
529 log_tree_diff_flush(opt);
530
531 showed_log |= !opt->loginfo;
532
533 /* Set up the log info for the next parent, if any.. */
534 parents = parents->next;
535 if (!parents)
536 break;
537 log->parent = parents->item;
538 opt->loginfo = log;
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700539 }
Linus Torvalds91539832006-04-17 11:59:32 -0700540 return showed_log;
541}
542
543int log_tree_commit(struct rev_info *opt, struct commit *commit)
544{
545 struct log_info log;
Junio C Hamano3eefc182006-04-18 16:45:27 -0700546 int shown;
Linus Torvalds91539832006-04-17 11:59:32 -0700547
548 log.commit = commit;
549 log.parent = NULL;
550 opt->loginfo = &log;
551
Junio C Hamano3eefc182006-04-18 16:45:27 -0700552 shown = log_tree_diff(opt, commit, &log);
553 if (!shown && opt->loginfo && opt->always_show_header) {
Linus Torvalds91539832006-04-17 11:59:32 -0700554 log.parent = NULL;
Adam Simpkins02865652008-04-29 01:32:59 -0700555 show_log(opt);
Junio C Hamano3eefc182006-04-18 16:45:27 -0700556 shown = 1;
Linus Torvalds91539832006-04-17 11:59:32 -0700557 }
558 opt->loginfo = NULL;
Theodore Ts'o06f59e92007-06-29 13:40:46 -0400559 maybe_flush_or_die(stdout, "stdout");
Junio C Hamano3eefc182006-04-18 16:45:27 -0700560 return shown;
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700561}