7 #include "reflog-walk.h"
9 #include "string-list.h"
11 struct decoration name_decoration
= { "object names" };
13 static void add_name_decoration(const char *prefix
, const char *name
, struct object
*obj
)
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
);
23 static int add_ref_decoration(const char *refname
, const unsigned char *sha1
, int flags
, void *cb_data
)
25 struct object
*obj
= parse_object(sha1
);
28 add_name_decoration("", refname
, obj
);
29 while (obj
->type
== OBJ_TAG
) {
30 obj
= ((struct tag
*)obj
)->tagged
;
33 add_name_decoration("tag: ", refname
, obj
);
38 void load_ref_decorations(void)
43 for_each_ref(add_ref_decoration
, NULL
);
47 static void show_parents(struct commit
*commit
, int abbrev
)
49 struct commit_list
*p
;
50 for (p
= commit
->parents
; p
; p
= p
->next
) {
51 struct commit
*parent
= p
->item
;
52 printf(" %s", find_unique_abbrev(parent
->object
.sha1
, abbrev
));
56 void show_decorations(struct rev_info
*opt
, struct commit
*commit
)
59 struct name_decoration
*decoration
;
61 if (opt
->show_source
&& commit
->util
)
62 printf("\t%s", (char *) commit
->util
);
63 if (!opt
->show_decorations
)
65 decoration
= lookup_decoration(&name_decoration
, &commit
->object
);
70 printf("%s%s", prefix
, decoration
->name
);
72 decoration
= decoration
->next
;
78 * Search for "^[-A-Za-z]+: [^@]+@" pattern. It usually matches
79 * Signed-off-by: and Acked-by: lines.
81 static int detect_any_signoff(char *letter
, int size
)
90 while (letter
<= --cp
&& *cp
== '\n')
93 while (letter
<= cp
) {
112 if (('A' <= ch
&& ch
<= 'Z') ||
113 ('a' <= ch
&& ch
<= 'z') ||
118 /* no empty last line doesn't match */
121 return seen_head
&& seen_name
;
124 static void append_signoff(struct strbuf
*sb
, const char *signoff
)
126 static const char signed_off_by
[] = "Signed-off-by: ";
127 size_t signoff_len
= strlen(signoff
);
133 /* First see if we already have the sign-off by the signer */
134 while ((cp
= strstr(cp
, signed_off_by
))) {
138 cp
+= strlen(signed_off_by
);
139 if (cp
+ signoff_len
>= sb
->buf
+ sb
->len
)
141 if (strncmp(cp
, signoff
, signoff_len
))
143 if (!isspace(cp
[signoff_len
]))
145 /* we already have him */
150 has_signoff
= detect_any_signoff(sb
->buf
, sb
->len
);
153 strbuf_addch(sb
, '\n');
155 strbuf_addstr(sb
, signed_off_by
);
156 strbuf_add(sb
, signoff
, signoff_len
);
157 strbuf_addch(sb
, '\n');
160 static unsigned int digits_in_number(unsigned int number
)
162 unsigned int i
= 10, result
= 1;
163 while (i
<= number
) {
170 static int has_non_ascii(const char *s
)
175 while ((ch
= *s
++) != '\0') {
182 void log_write_email_headers(struct rev_info
*opt
, const char *name
,
183 const char **subject_p
,
184 const char **extra_headers_p
,
185 int *need_8bit_cte_p
)
187 const char *subject
= NULL
;
188 const char *extra_headers
= opt
->extra_headers
;
190 *need_8bit_cte_p
= 0; /* unknown */
191 if (opt
->total
> 0) {
192 static char buffer
[64];
193 snprintf(buffer
, sizeof(buffer
),
194 "Subject: [%s %0*d/%d] ",
196 digits_in_number(opt
->total
),
197 opt
->nr
, opt
->total
);
199 } else if (opt
->total
== 0 && opt
->subject_prefix
&& *opt
->subject_prefix
) {
200 static char buffer
[256];
201 snprintf(buffer
, sizeof(buffer
),
203 opt
->subject_prefix
);
206 subject
= "Subject: ";
209 printf("From %s Mon Sep 17 00:00:00 2001\n", name
);
210 graph_show_oneline(opt
->graph
);
211 if (opt
->message_id
) {
212 printf("Message-Id: <%s>\n", opt
->message_id
);
213 graph_show_oneline(opt
->graph
);
215 if (opt
->ref_message_ids
&& opt
->ref_message_ids
->nr
> 0) {
217 n
= opt
->ref_message_ids
->nr
;
218 printf("In-Reply-To: <%s>\n", opt
->ref_message_ids
->items
[n
-1].string
);
219 for (i
= 0; i
< n
; i
++)
220 printf("%s<%s>\n", (i
> 0 ? "\t" : "References: "),
221 opt
->ref_message_ids
->items
[i
].string
);
222 graph_show_oneline(opt
->graph
);
224 if (opt
->mime_boundary
) {
225 static char subject_buffer
[1024];
226 static char buffer
[1024];
227 *need_8bit_cte_p
= -1; /* NEVER */
228 snprintf(subject_buffer
, sizeof(subject_buffer
) - 1,
230 "MIME-Version: 1.0\n"
231 "Content-Type: multipart/mixed;"
232 " boundary=\"%s%s\"\n"
234 "This is a multi-part message in MIME "
237 "Content-Type: text/plain; "
238 "charset=UTF-8; format=fixed\n"
239 "Content-Transfer-Encoding: 8bit\n\n",
240 extra_headers
? extra_headers
: "",
241 mime_boundary_leader
, opt
->mime_boundary
,
242 mime_boundary_leader
, opt
->mime_boundary
);
243 extra_headers
= subject_buffer
;
245 snprintf(buffer
, sizeof(buffer
) - 1,
247 "Content-Type: text/x-patch;"
248 " name=\"%s.diff\"\n"
249 "Content-Transfer-Encoding: 8bit\n"
250 "Content-Disposition: %s;"
251 " filename=\"%s.diff\"\n\n",
252 mime_boundary_leader
, opt
->mime_boundary
,
254 opt
->no_inline
? "attachment" : "inline",
256 opt
->diffopt
.stat_sep
= buffer
;
258 *subject_p
= subject
;
259 *extra_headers_p
= extra_headers
;
262 void show_log(struct rev_info
*opt
)
264 struct strbuf msgbuf
= STRBUF_INIT
;
265 struct log_info
*log
= opt
->loginfo
;
266 struct commit
*commit
= log
->commit
, *parent
= log
->parent
;
267 int abbrev
= opt
->diffopt
.abbrev
;
268 int abbrev_commit
= opt
->abbrev_commit
? opt
->abbrev
: 40;
269 const char *subject
= NULL
, *extra_headers
= opt
->extra_headers
;
270 int need_8bit_cte
= 0;
273 if (!opt
->verbose_header
) {
274 graph_show_commit(opt
->graph
);
277 if (commit
->object
.flags
& BOUNDARY
)
279 else if (commit
->object
.flags
& UNINTERESTING
)
281 else if (opt
->left_right
) {
282 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
288 fputs(find_unique_abbrev(commit
->object
.sha1
, abbrev_commit
), stdout
);
289 if (opt
->print_parents
)
290 show_parents(commit
, abbrev_commit
);
291 show_decorations(opt
, commit
);
292 if (opt
->graph
&& !graph_is_commit_finished(opt
->graph
)) {
294 graph_show_remainder(opt
->graph
);
296 putchar(opt
->diffopt
.line_termination
);
301 * If use_terminator is set, add a newline at the end of the entry.
302 * Otherwise, add a diffopt.line_termination character before all
303 * entries but the first. (IOW, as a separator between entries)
305 if (opt
->shown_one
&& !opt
->use_terminator
) {
307 * If entries are separated by a newline, the output
308 * should look human-readable. If the last entry ended
309 * with a newline, print the graph output before this
310 * newline. Otherwise it will end up as a completely blank
311 * line and will look like a gap in the graph.
313 * If the entry separator is not a newline, the output is
314 * primarily intended for programmatic consumption, and we
315 * never want the extra graph output before the entry
318 if (opt
->diffopt
.line_termination
== '\n' &&
319 !opt
->missing_newline
)
320 graph_show_padding(opt
->graph
);
321 putchar(opt
->diffopt
.line_termination
);
326 * If the history graph was requested,
327 * print the graph, up to this commit's line
329 graph_show_commit(opt
->graph
);
332 * Print header line of header..
335 if (opt
->commit_format
== CMIT_FMT_EMAIL
) {
336 log_write_email_headers(opt
, sha1_to_hex(commit
->object
.sha1
),
337 &subject
, &extra_headers
,
339 } else if (opt
->commit_format
!= CMIT_FMT_USERFORMAT
) {
340 fputs(diff_get_color_opt(&opt
->diffopt
, DIFF_COMMIT
), stdout
);
341 if (opt
->commit_format
!= CMIT_FMT_ONELINE
)
342 fputs("commit ", stdout
);
345 if (commit
->object
.flags
& BOUNDARY
)
347 else if (commit
->object
.flags
& UNINTERESTING
)
349 else if (opt
->left_right
) {
350 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
356 fputs(find_unique_abbrev(commit
->object
.sha1
, abbrev_commit
),
358 if (opt
->print_parents
)
359 show_parents(commit
, abbrev_commit
);
362 find_unique_abbrev(parent
->object
.sha1
,
364 show_decorations(opt
, commit
);
365 printf("%s", diff_get_color_opt(&opt
->diffopt
, DIFF_RESET
));
366 if (opt
->commit_format
== CMIT_FMT_ONELINE
) {
370 graph_show_oneline(opt
->graph
);
372 if (opt
->reflog_info
) {
374 * setup_revisions() ensures that opt->reflog_info
375 * and opt->graph cannot both be set,
376 * so we don't need to worry about printing the
379 show_reflog_message(opt
->reflog_info
,
380 opt
->commit_format
== CMIT_FMT_ONELINE
,
382 if (opt
->commit_format
== CMIT_FMT_ONELINE
)
391 * And then the pretty-printed message itself
393 if (need_8bit_cte
>= 0)
394 need_8bit_cte
= has_non_ascii(opt
->add_signoff
);
395 pretty_print_commit(opt
->commit_format
, commit
, &msgbuf
,
396 abbrev
, subject
, extra_headers
, opt
->date_mode
,
399 if (opt
->add_signoff
)
400 append_signoff(&msgbuf
, opt
->add_signoff
);
401 if (opt
->show_log_size
) {
402 printf("log size %i\n", (int)msgbuf
.len
);
403 graph_show_oneline(opt
->graph
);
407 * Set opt->missing_newline if msgbuf doesn't
408 * end in a newline (including if it is empty)
410 if (!msgbuf
.len
|| msgbuf
.buf
[msgbuf
.len
- 1] != '\n')
411 opt
->missing_newline
= 1;
413 opt
->missing_newline
= 0;
416 graph_show_commit_msg(opt
->graph
, &msgbuf
);
418 fwrite(msgbuf
.buf
, sizeof(char), msgbuf
.len
, stdout
);
419 if (opt
->use_terminator
) {
420 if (!opt
->missing_newline
)
421 graph_show_padding(opt
->graph
);
425 strbuf_release(&msgbuf
);
428 int log_tree_diff_flush(struct rev_info
*opt
)
430 diffcore_std(&opt
->diffopt
);
432 if (diff_queue_is_empty()) {
433 int saved_fmt
= opt
->diffopt
.output_format
;
434 opt
->diffopt
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
435 diff_flush(&opt
->diffopt
);
436 opt
->diffopt
.output_format
= saved_fmt
;
440 if (opt
->loginfo
&& !opt
->no_commit_id
) {
441 /* When showing a verbose header (i.e. log message),
442 * and not in --pretty=oneline format, we would want
443 * an extra newline between the end of log and the
444 * output for readability.
447 if ((opt
->diffopt
.output_format
& ~DIFF_FORMAT_NO_OUTPUT
) &&
448 opt
->verbose_header
&&
449 opt
->commit_format
!= CMIT_FMT_ONELINE
) {
450 int pch
= DIFF_FORMAT_DIFFSTAT
| DIFF_FORMAT_PATCH
;
451 if ((pch
& opt
->diffopt
.output_format
) == pch
)
456 diff_flush(&opt
->diffopt
);
460 static int do_diff_combined(struct rev_info
*opt
, struct commit
*commit
)
462 unsigned const char *sha1
= commit
->object
.sha1
;
464 diff_tree_combined_merge(sha1
, opt
->dense_combined_merges
, opt
);
465 return !opt
->loginfo
;
469 * Show the diff of a commit.
471 * Return true if we printed any log info messages
473 static int log_tree_diff(struct rev_info
*opt
, struct commit
*commit
, struct log_info
*log
)
476 struct commit_list
*parents
;
477 unsigned const char *sha1
= commit
->object
.sha1
;
479 if (!opt
->diff
&& !DIFF_OPT_TST(&opt
->diffopt
, EXIT_WITH_STATUS
))
483 parents
= commit
->parents
;
485 if (opt
->show_root_diff
) {
486 diff_root_tree_sha1(sha1
, "", &opt
->diffopt
);
487 log_tree_diff_flush(opt
);
489 return !opt
->loginfo
;
492 /* More than one parent? */
493 if (parents
&& parents
->next
) {
494 if (opt
->ignore_merges
)
496 else if (opt
->combine_merges
)
497 return do_diff_combined(opt
, commit
);
499 /* If we show individual diffs, show the parent info */
500 log
->parent
= parents
->item
;
505 struct commit
*parent
= parents
->item
;
507 diff_tree_sha1(parent
->object
.sha1
, sha1
, "", &opt
->diffopt
);
508 log_tree_diff_flush(opt
);
510 showed_log
|= !opt
->loginfo
;
512 /* Set up the log info for the next parent, if any.. */
513 parents
= parents
->next
;
516 log
->parent
= parents
->item
;
522 int log_tree_commit(struct rev_info
*opt
, struct commit
*commit
)
531 shown
= log_tree_diff(opt
, commit
, &log
);
532 if (!shown
&& opt
->loginfo
&& opt
->always_show_header
) {
538 maybe_flush_or_die(stdout
, "stdout");