Improve message-id generation flow control for format-patch
[git/git.git] / log-tree.c
CommitLineData
5f1c3f07
JH
1#include "cache.h"
2#include "diff.h"
3#include "commit.h"
4#include "log-tree.h"
8860fd42 5#include "reflog-walk.h"
5f1c3f07 6
ca135e7a
LT
7struct decoration name_decoration = { "object names" };
8
c8c893c6
LT
9static void show_parents(struct commit *commit, int abbrev)
10{
11 struct commit_list *p;
12 for (p = commit->parents; p ; p = p->next) {
13 struct commit *parent = p->item;
14 printf(" %s", diff_unique_abbrev(parent->object.sha1, abbrev));
15 }
16}
17
50e62a8e 18void show_decorations(struct commit *commit)
ca135e7a
LT
19{
20 const char *prefix;
21 struct name_decoration *decoration;
22
23 decoration = lookup_decoration(&name_decoration, &commit->object);
24 if (!decoration)
25 return;
26 prefix = " (";
27 while (decoration) {
28 printf("%s%s", prefix, decoration->name);
29 prefix = ", ";
30 decoration = decoration->next;
31 }
32 putchar(')');
33}
34
fc1c75ec
FBH
35/*
36 * Search for "^[-A-Za-z]+: [^@]+@" pattern. It usually matches
37 * Signed-off-by: and Acked-by: lines.
38 */
39static int detect_any_signoff(char *letter, int size)
40{
41 char ch, *cp;
42 int seen_colon = 0;
43 int seen_at = 0;
44 int seen_name = 0;
45 int seen_head = 0;
46
47 cp = letter + size;
48 while (letter <= --cp && (ch = *cp) == '\n')
49 continue;
50
51 while (letter <= cp) {
52 ch = *cp--;
53 if (ch == '\n')
54 break;
55
56 if (!seen_at) {
57 if (ch == '@')
58 seen_at = 1;
59 continue;
60 }
61 if (!seen_colon) {
62 if (ch == '@')
63 return 0;
64 else if (ch == ':')
65 seen_colon = 1;
66 else
67 seen_name = 1;
68 continue;
69 }
70 if (('A' <= ch && ch <= 'Z') ||
71 ('a' <= ch && ch <= 'z') ||
72 ch == '-') {
73 seen_head = 1;
74 continue;
75 }
76 /* no empty last line doesn't match */
77 return 0;
78 }
79 return seen_head && seen_name;
80}
81
674d1727 82static void append_signoff(struct strbuf *sb, const char *signoff)
cf2251b6 83{
cf2251b6 84 static const char signed_off_by[] = "Signed-off-by: ";
80583c0e 85 size_t signoff_len = strlen(signoff);
fc1c75ec 86 int has_signoff = 0;
80583c0e 87 char *cp;
cf2251b6 88
674d1727 89 cp = sb->buf;
cf2251b6
JH
90
91 /* First see if we already have the sign-off by the signer */
fc1c75ec
FBH
92 while ((cp = strstr(cp, signed_off_by))) {
93
94 has_signoff = 1;
95
cf2251b6 96 cp += strlen(signed_off_by);
674d1727 97 if (cp + signoff_len >= sb->buf + sb->len)
fc1c75ec
FBH
98 break;
99 if (strncmp(cp, signoff, signoff_len))
100 continue;
101 if (!isspace(cp[signoff_len]))
102 continue;
103 /* we already have him */
674d1727 104 return;
cf2251b6
JH
105 }
106
fc1c75ec 107 if (!has_signoff)
674d1727 108 has_signoff = detect_any_signoff(sb->buf, sb->len);
fc1c75ec
FBH
109
110 if (!has_signoff)
674d1727 111 strbuf_addch(sb, '\n');
c35f4c37 112
674d1727
PH
113 strbuf_addstr(sb, signed_off_by);
114 strbuf_add(sb, signoff, signoff_len);
115 strbuf_addch(sb, '\n');
cf2251b6
JH
116}
117
e00de24b
JS
118static unsigned int digits_in_number(unsigned int number)
119{
120 unsigned int i = 10, result = 1;
121 while (i <= number) {
122 i *= 10;
123 result++;
124 }
125 return result;
126}
127
4593fb84
JH
128static int has_non_ascii(const char *s)
129{
130 int ch;
131 if (!s)
132 return 0;
133 while ((ch = *s++) != '\0') {
134 if (non_ascii(ch))
135 return 1;
136 }
137 return 0;
138}
139
39bc9a6c 140void show_log(struct rev_info *opt, const char *sep)
91539833 141{
674d1727 142 struct strbuf msgbuf;
39bc9a6c 143 struct log_info *log = opt->loginfo;
91539833
LT
144 struct commit *commit = log->commit, *parent = log->parent;
145 int abbrev = opt->diffopt.abbrev;
146 int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
a4d34e2d 147 const char *extra;
20ff0680 148 const char *subject = NULL, *extra_headers = opt->extra_headers;
91539833
LT
149
150 opt->loginfo = NULL;
151 if (!opt->verbose_header) {
74bd9029
JH
152 if (opt->left_right) {
153 if (commit->object.flags & BOUNDARY)
154 putchar('-');
155 else if (commit->object.flags & SYMMETRIC_LEFT)
156 putchar('<');
157 else
158 putchar('>');
159 }
c8c893c6
LT
160 fputs(diff_unique_abbrev(commit->object.sha1, abbrev_commit), stdout);
161 if (opt->parents)
162 show_parents(commit, abbrev_commit);
ca135e7a 163 show_decorations(commit);
1dcb6922 164 putchar(opt->diffopt.line_termination);
91539833
LT
165 return;
166 }
167
168 /*
a4d34e2d
LT
169 * The "oneline" format has several special cases:
170 * - The pretty-printed commit lacks a newline at the end
171 * of the buffer, but we do want to make sure that we
172 * have a newline there. If the separator isn't already
173 * a newline, add an extra one.
174 * - unlike other log messages, the one-line format does
175 * not have an empty line between entries.
91539833 176 */
a4d34e2d
LT
177 extra = "";
178 if (*sep != '\n' && opt->commit_format == CMIT_FMT_ONELINE)
179 extra = "\n";
91539833 180 if (opt->shown_one && opt->commit_format != CMIT_FMT_ONELINE)
abd4e222 181 putchar(opt->diffopt.line_termination);
91539833
LT
182 opt->shown_one = 1;
183
184 /*
185 * Print header line of header..
186 */
3eefc189 187
596524b3 188 if (opt->commit_format == CMIT_FMT_EMAIL) {
698ce6f8 189 char *sha1 = sha1_to_hex(commit->object.sha1);
596524b3
JS
190 if (opt->total > 0) {
191 static char buffer[64];
192 snprintf(buffer, sizeof(buffer),
2d9e4a47
RJ
193 "Subject: [%s %0*d/%d] ",
194 opt->subject_prefix,
e00de24b 195 digits_in_number(opt->total),
596524b3
JS
196 opt->nr, opt->total);
197 subject = buffer;
88c447e8 198 } else if (opt->total == 0 && opt->subject_prefix && *opt->subject_prefix) {
2d9e4a47
RJ
199 static char buffer[256];
200 snprintf(buffer, sizeof(buffer),
201 "Subject: [%s] ",
202 opt->subject_prefix);
203 subject = buffer;
204 } else {
8ac80a57 205 subject = "Subject: ";
2d9e4a47 206 }
8ac80a57 207
698ce6f8 208 printf("From %s Mon Sep 17 00:00:00 2001\n", sha1);
d1566f78
JT
209 if (opt->message_id)
210 printf("Message-Id: <%s>\n", opt->message_id);
211 if (opt->ref_message_id)
212 printf("In-Reply-To: <%s>\nReferences: <%s>\n",
213 opt->ref_message_id, opt->ref_message_id);
698ce6f8
JS
214 if (opt->mime_boundary) {
215 static char subject_buffer[1024];
216 static char buffer[1024];
217 snprintf(subject_buffer, sizeof(subject_buffer) - 1,
20ff0680 218 "%s"
698ce6f8 219 "MIME-Version: 1.0\n"
33ee4cfb 220 "Content-Type: multipart/mixed;"
698ce6f8
JS
221 " boundary=\"%s%s\"\n"
222 "\n"
223 "This is a multi-part message in MIME "
224 "format.\n"
225 "--%s%s\n"
226 "Content-Type: text/plain; "
227 "charset=UTF-8; format=fixed\n"
228 "Content-Transfer-Encoding: 8bit\n\n",
20ff0680 229 extra_headers ? extra_headers : "",
698ce6f8
JS
230 mime_boundary_leader, opt->mime_boundary,
231 mime_boundary_leader, opt->mime_boundary);
20ff0680 232 extra_headers = subject_buffer;
698ce6f8
JS
233
234 snprintf(buffer, sizeof(buffer) - 1,
235 "--%s%s\n"
33ee4cfb 236 "Content-Type: text/x-patch;"
698ce6f8
JS
237 " name=\"%s.diff\"\n"
238 "Content-Transfer-Encoding: 8bit\n"
33ee4cfb 239 "Content-Disposition: %s;"
698ce6f8
JS
240 " filename=\"%s.diff\"\n\n",
241 mime_boundary_leader, opt->mime_boundary,
c112f689
JS
242 sha1,
243 opt->no_inline ? "attachment" : "inline",
244 sha1);
698ce6f8
JS
245 opt->diffopt.stat_sep = buffer;
246 }
e52a5de4 247 } else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
8f67f8ae 248 fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), stdout);
74bd9029
JH
249 if (opt->commit_format != CMIT_FMT_ONELINE)
250 fputs("commit ", stdout);
e330a406
LT
251 if (commit->object.flags & BOUNDARY)
252 putchar('-');
253 else if (opt->left_right) {
254 if (commit->object.flags & SYMMETRIC_LEFT)
74bd9029
JH
255 putchar('<');
256 else
257 putchar('>');
258 }
259 fputs(diff_unique_abbrev(commit->object.sha1, abbrev_commit),
260 stdout);
c66b6c06
JH
261 if (opt->parents)
262 show_parents(commit, abbrev_commit);
73f0a157 263 if (parent)
3eefc189
JH
264 printf(" (from %s)",
265 diff_unique_abbrev(parent->object.sha1,
266 abbrev_commit));
ca135e7a 267 show_decorations(commit);
8f67f8ae 268 printf("%s", diff_get_color_opt(&opt->diffopt, DIFF_RESET));
e557667e 269 putchar(opt->commit_format == CMIT_FMT_ONELINE ? ' ' : '\n');
903b45fe 270 if (opt->reflog_info) {
4d12a471 271 show_reflog_message(opt->reflog_info,
4e244cbc 272 opt->commit_format == CMIT_FMT_ONELINE,
a7b02ccf 273 opt->date_mode);
903b45fe
NP
274 if (opt->commit_format == CMIT_FMT_ONELINE) {
275 printf("%s", sep);
276 return;
277 }
278 }
3eefc189 279 }
91539833
LT
280
281 /*
282 * And then the pretty-printed message itself
283 */
674d1727
PH
284 strbuf_init(&msgbuf, 0);
285 pretty_print_commit(opt->commit_format, commit, &msgbuf,
4593fb84
JH
286 abbrev, subject, extra_headers, opt->date_mode,
287 has_non_ascii(opt->add_signoff));
cf2251b6
JH
288
289 if (opt->add_signoff)
674d1727 290 append_signoff(&msgbuf, opt->add_signoff);
9fa3465d 291 if (opt->show_log_size)
674d1727 292 printf("log size %i\n", (int)msgbuf.len);
9fa3465d 293
cc61ae82
JH
294 if (msgbuf.len)
295 printf("%s%s%s", msgbuf.buf, extra, sep);
674d1727 296 strbuf_release(&msgbuf);
91539833
LT
297}
298
cd2bdc53 299int log_tree_diff_flush(struct rev_info *opt)
5f1c3f07
JH
300{
301 diffcore_std(&opt->diffopt);
91539833 302
5f1c3f07
JH
303 if (diff_queue_is_empty()) {
304 int saved_fmt = opt->diffopt.output_format;
305 opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
306 diff_flush(&opt->diffopt);
307 opt->diffopt.output_format = saved_fmt;
308 return 0;
309 }
91539833 310
3969cf7d
JH
311 if (opt->loginfo && !opt->no_commit_id) {
312 /* When showing a verbose header (i.e. log message),
313 * and not in --pretty=oneline format, we would want
314 * an extra newline between the end of log and the
315 * output for readability.
316 */
39bc9a6c 317 show_log(opt, opt->diffopt.msg_sep);
304b5af6
LT
318 if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) &&
319 opt->verbose_header &&
3969cf7d
JH
320 opt->commit_format != CMIT_FMT_ONELINE) {
321 int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
322 if ((pch & opt->diffopt.output_format) == pch)
abd4e222
LT
323 printf("---");
324 putchar('\n');
3969cf7d
JH
325 }
326 }
5f1c3f07
JH
327 diff_flush(&opt->diffopt);
328 return 1;
329}
330
cd2bdc53 331static int do_diff_combined(struct rev_info *opt, struct commit *commit)
5f1c3f07
JH
332{
333 unsigned const char *sha1 = commit->object.sha1;
334
91539833
LT
335 diff_tree_combined_merge(sha1, opt->dense_combined_merges, opt);
336 return !opt->loginfo;
5f1c3f07
JH
337}
338
91539833
LT
339/*
340 * Show the diff of a commit.
341 *
342 * Return true if we printed any log info messages
343 */
344static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log_info *log)
5f1c3f07 345{
91539833 346 int showed_log;
5f1c3f07
JH
347 struct commit_list *parents;
348 unsigned const char *sha1 = commit->object.sha1;
349
91539833
LT
350 if (!opt->diff)
351 return 0;
352
5f1c3f07 353 /* Root commit? */
91539833
LT
354 parents = commit->parents;
355 if (!parents) {
2b60356d
RS
356 if (opt->show_root_diff) {
357 diff_root_tree_sha1(sha1, "", &opt->diffopt);
358 log_tree_diff_flush(opt);
359 }
91539833 360 return !opt->loginfo;
5f1c3f07
JH
361 }
362
363 /* More than one parent? */
91539833 364 if (parents && parents->next) {
5f1c3f07
JH
365 if (opt->ignore_merges)
366 return 0;
367 else if (opt->combine_merges)
368 return do_diff_combined(opt, commit);
91539833
LT
369
370 /* If we show individual diffs, show the parent info */
371 log->parent = parents->item;
5f1c3f07
JH
372 }
373
91539833
LT
374 showed_log = 0;
375 for (;;) {
5f1c3f07 376 struct commit *parent = parents->item;
5f1c3f07 377
91539833
LT
378 diff_tree_sha1(parent->object.sha1, sha1, "", &opt->diffopt);
379 log_tree_diff_flush(opt);
380
381 showed_log |= !opt->loginfo;
382
383 /* Set up the log info for the next parent, if any.. */
384 parents = parents->next;
385 if (!parents)
386 break;
387 log->parent = parents->item;
388 opt->loginfo = log;
389 }
390 return showed_log;
391}
392
393int log_tree_commit(struct rev_info *opt, struct commit *commit)
394{
395 struct log_info log;
3eefc189 396 int shown;
91539833
LT
397
398 log.commit = commit;
399 log.parent = NULL;
400 opt->loginfo = &log;
401
3eefc189
JH
402 shown = log_tree_diff(opt, commit, &log);
403 if (!shown && opt->loginfo && opt->always_show_header) {
91539833 404 log.parent = NULL;
39bc9a6c 405 show_log(opt, "");
3eefc189 406 shown = 1;
5f1c3f07 407 }
91539833 408 opt->loginfo = NULL;
06f59e9f 409 maybe_flush_or_die(stdout, "stdout");
3eefc189 410 return shown;
5f1c3f07 411}