2 #include "commit-reach.h"
6 #include "object-store.h"
7 #include "repository.h"
8 #include "tmp-objdir.h"
13 #include "merge-ort.h"
14 #include "reflog-walk.h"
16 #include "replace-object.h"
17 #include "string-list.h"
19 #include "gpg-interface.h"
20 #include "sequencer.h"
23 #include "range-diff.h"
26 static struct decoration name_decoration
= { "object names" };
27 static int decoration_loaded
;
28 static int decoration_flags
;
30 static char decoration_colors
[][COLOR_MAXLEN
] = {
32 GIT_COLOR_BOLD_GREEN
, /* REF_LOCAL */
33 GIT_COLOR_BOLD_RED
, /* REF_REMOTE */
34 GIT_COLOR_BOLD_YELLOW
, /* REF_TAG */
35 GIT_COLOR_BOLD_MAGENTA
, /* REF_STASH */
36 GIT_COLOR_BOLD_CYAN
, /* REF_HEAD */
37 GIT_COLOR_BOLD_BLUE
, /* GRAFTED */
40 static const char *color_decorate_slots
[] = {
41 [DECORATION_REF_LOCAL
] = "branch",
42 [DECORATION_REF_REMOTE
] = "remoteBranch",
43 [DECORATION_REF_TAG
] = "tag",
44 [DECORATION_REF_STASH
] = "stash",
45 [DECORATION_REF_HEAD
] = "HEAD",
46 [DECORATION_GRAFTED
] = "grafted",
49 static const char *decorate_get_color(int decorate_use_color
, enum decoration_type ix
)
51 if (want_color(decorate_use_color
))
52 return decoration_colors
[ix
];
56 define_list_config_array(color_decorate_slots
);
58 int parse_decorate_color_config(const char *var
, const char *slot_name
, const char *value
)
60 int slot
= LOOKUP_CONFIG(color_decorate_slots
, slot_name
);
64 return config_error_nonbool(var
);
65 return color_parse(value
, decoration_colors
[slot
]);
69 * log-tree.c uses DIFF_OPT_TST for determining whether to use color
70 * for showing the commit sha1, use the same check for --decorate
72 #define decorate_get_color_opt(o, ix) \
73 decorate_get_color((o)->use_color, ix)
75 void add_name_decoration(enum decoration_type type
, const char *name
, struct object
*obj
)
77 struct name_decoration
*res
;
78 FLEX_ALLOC_STR(res
, name
, name
);
80 res
->next
= add_decoration(&name_decoration
, obj
, res
);
83 const struct name_decoration
*get_name_decoration(const struct object
*obj
)
85 load_ref_decorations(NULL
, DECORATE_SHORT_REFS
);
86 return lookup_decoration(&name_decoration
, obj
);
89 static int match_ref_pattern(const char *refname
,
90 const struct string_list_item
*item
)
94 if (!wildmatch(item
->string
, refname
, 0))
98 if (skip_prefix(refname
, item
->string
, &rest
) &&
99 (!*rest
|| *rest
== '/'))
105 static int ref_filter_match(const char *refname
,
106 const struct decoration_filter
*filter
)
108 struct string_list_item
*item
;
109 const struct string_list
*exclude_patterns
= filter
->exclude_ref_pattern
;
110 const struct string_list
*include_patterns
= filter
->include_ref_pattern
;
111 const struct string_list
*exclude_patterns_config
=
112 filter
->exclude_ref_config_pattern
;
114 if (exclude_patterns
&& exclude_patterns
->nr
) {
115 for_each_string_list_item(item
, exclude_patterns
) {
116 if (match_ref_pattern(refname
, item
))
121 if (include_patterns
&& include_patterns
->nr
) {
122 for_each_string_list_item(item
, include_patterns
) {
123 if (match_ref_pattern(refname
, item
))
129 if (exclude_patterns_config
&& exclude_patterns_config
->nr
) {
130 for_each_string_list_item(item
, exclude_patterns_config
) {
131 if (match_ref_pattern(refname
, item
))
139 static int add_ref_decoration(const char *refname
, const struct object_id
*oid
,
145 enum object_type objtype
;
146 enum decoration_type deco_type
= DECORATION_NONE
;
147 struct decoration_filter
*filter
= (struct decoration_filter
*)cb_data
;
148 const char *git_replace_ref_base
= ref_namespace
[NAMESPACE_REPLACE
].ref
;
150 if (filter
&& !ref_filter_match(refname
, filter
))
153 if (starts_with(refname
, git_replace_ref_base
)) {
154 struct object_id original_oid
;
155 if (!read_replace_refs
)
157 if (get_oid_hex(refname
+ strlen(git_replace_ref_base
),
159 warning("invalid replace ref %s", refname
);
162 obj
= parse_object(the_repository
, &original_oid
);
164 add_name_decoration(DECORATION_GRAFTED
, "replaced", obj
);
168 objtype
= oid_object_info(the_repository
, oid
, NULL
);
171 obj
= lookup_object_by_type(the_repository
, oid
, objtype
);
173 for (i
= 0; i
< ARRAY_SIZE(ref_namespace
); i
++) {
174 struct ref_namespace_info
*info
= &ref_namespace
[i
];
176 if (!info
->decoration
)
179 if (!strcmp(refname
, info
->ref
)) {
180 deco_type
= info
->decoration
;
183 } else if (starts_with(refname
, info
->ref
)) {
184 deco_type
= info
->decoration
;
189 add_name_decoration(deco_type
, refname
, obj
);
190 while (obj
->type
== OBJ_TAG
) {
192 parse_object(the_repository
, &obj
->oid
);
193 obj
= ((struct tag
*)obj
)->tagged
;
196 add_name_decoration(DECORATION_REF_TAG
, refname
, obj
);
201 static int add_graft_decoration(const struct commit_graft
*graft
,
202 void *cb_data UNUSED
)
204 struct commit
*commit
= lookup_commit(the_repository
, &graft
->oid
);
207 add_name_decoration(DECORATION_GRAFTED
, "grafted", &commit
->object
);
211 void load_ref_decorations(struct decoration_filter
*filter
, int flags
)
213 if (!decoration_loaded
) {
215 struct string_list_item
*item
;
216 for_each_string_list_item(item
, filter
->exclude_ref_pattern
) {
217 normalize_glob_ref(item
, NULL
, item
->string
);
219 for_each_string_list_item(item
, filter
->include_ref_pattern
) {
220 normalize_glob_ref(item
, NULL
, item
->string
);
222 for_each_string_list_item(item
, filter
->exclude_ref_config_pattern
) {
223 normalize_glob_ref(item
, NULL
, item
->string
);
226 decoration_loaded
= 1;
227 decoration_flags
= flags
;
228 for_each_ref(add_ref_decoration
, filter
);
229 head_ref(add_ref_decoration
, filter
);
230 for_each_commit_graft(add_graft_decoration
, filter
);
234 static void show_parents(struct commit
*commit
, int abbrev
, FILE *file
)
236 struct commit_list
*p
;
237 for (p
= commit
->parents
; p
; p
= p
->next
) {
238 struct commit
*parent
= p
->item
;
239 fprintf(file
, " %s", find_unique_abbrev(&parent
->object
.oid
, abbrev
));
243 static void show_children(struct rev_info
*opt
, struct commit
*commit
, int abbrev
)
245 struct commit_list
*p
= lookup_decoration(&opt
->children
, &commit
->object
);
246 for ( ; p
; p
= p
->next
) {
247 fprintf(opt
->diffopt
.file
, " %s", find_unique_abbrev(&p
->item
->object
.oid
, abbrev
));
252 * Do we have HEAD in the output, and also the branch it points at?
253 * If so, find that decoration entry for that current branch.
255 static const struct name_decoration
*current_pointed_by_HEAD(const struct name_decoration
*decoration
)
257 const struct name_decoration
*list
, *head
= NULL
;
258 const char *branch_name
= NULL
;
261 /* First find HEAD */
262 for (list
= decoration
; list
; list
= list
->next
)
263 if (list
->type
== DECORATION_REF_HEAD
) {
270 /* Now resolve and find the matching current branch */
271 branch_name
= resolve_ref_unsafe("HEAD", 0, NULL
, &rru_flags
);
272 if (!branch_name
|| !(rru_flags
& REF_ISSYMREF
))
275 if (!starts_with(branch_name
, "refs/"))
278 /* OK, do we have that ref in the list? */
279 for (list
= decoration
; list
; list
= list
->next
)
280 if ((list
->type
== DECORATION_REF_LOCAL
) &&
281 !strcmp(branch_name
, list
->name
)) {
288 static void show_name(struct strbuf
*sb
, const struct name_decoration
*decoration
)
290 if (decoration_flags
== DECORATE_SHORT_REFS
)
291 strbuf_addstr(sb
, prettify_refname(decoration
->name
));
293 strbuf_addstr(sb
, decoration
->name
);
297 * The caller makes sure there is no funny color before calling.
298 * format_decorations_extended makes sure the same after return.
300 void format_decorations_extended(struct strbuf
*sb
,
301 const struct commit
*commit
,
304 const char *separator
,
307 const struct name_decoration
*decoration
;
308 const struct name_decoration
*current_and_HEAD
;
309 const char *color_commit
=
310 diff_get_color(use_color
, DIFF_COMMIT
);
311 const char *color_reset
=
312 decorate_get_color(use_color
, DECORATION_NONE
);
314 decoration
= get_name_decoration(&commit
->object
);
318 current_and_HEAD
= current_pointed_by_HEAD(decoration
);
321 * When both current and HEAD are there, only
322 * show HEAD->current where HEAD would have
323 * appeared, skipping the entry for current.
325 if (decoration
!= current_and_HEAD
) {
326 strbuf_addstr(sb
, color_commit
);
327 strbuf_addstr(sb
, prefix
);
328 strbuf_addstr(sb
, color_reset
);
329 strbuf_addstr(sb
, decorate_get_color(use_color
, decoration
->type
));
330 if (decoration
->type
== DECORATION_REF_TAG
)
331 strbuf_addstr(sb
, "tag: ");
333 show_name(sb
, decoration
);
335 if (current_and_HEAD
&&
336 decoration
->type
== DECORATION_REF_HEAD
) {
337 strbuf_addstr(sb
, " -> ");
338 strbuf_addstr(sb
, color_reset
);
339 strbuf_addstr(sb
, decorate_get_color(use_color
, current_and_HEAD
->type
));
340 show_name(sb
, current_and_HEAD
);
342 strbuf_addstr(sb
, color_reset
);
346 decoration
= decoration
->next
;
348 strbuf_addstr(sb
, color_commit
);
349 strbuf_addstr(sb
, suffix
);
350 strbuf_addstr(sb
, color_reset
);
353 void show_decorations(struct rev_info
*opt
, struct commit
*commit
)
355 struct strbuf sb
= STRBUF_INIT
;
358 char **slot
= revision_sources_peek(opt
->sources
, commit
);
361 fprintf(opt
->diffopt
.file
, "\t%s", *slot
);
363 if (!opt
->show_decorations
)
365 format_decorations(&sb
, commit
, opt
->diffopt
.use_color
);
366 fputs(sb
.buf
, opt
->diffopt
.file
);
370 static unsigned int digits_in_number(unsigned int number
)
372 unsigned int i
= 10, result
= 1;
373 while (i
<= number
) {
380 void fmt_output_subject(struct strbuf
*filename
,
382 struct rev_info
*info
)
384 const char *suffix
= info
->patch_suffix
;
386 int start_len
= filename
->len
;
387 int max_len
= start_len
+ info
->patch_name_max
- (strlen(suffix
) + 1);
389 if (info
->reroll_count
) {
390 struct strbuf temp
= STRBUF_INIT
;
392 strbuf_addf(&temp
, "v%s", info
->reroll_count
);
393 format_sanitized_subject(filename
, temp
.buf
, temp
.len
);
394 strbuf_addstr(filename
, "-");
395 strbuf_release(&temp
);
397 strbuf_addf(filename
, "%04d-%s", nr
, subject
);
399 if (max_len
< filename
->len
)
400 strbuf_setlen(filename
, max_len
);
401 strbuf_addstr(filename
, suffix
);
404 void fmt_output_commit(struct strbuf
*filename
,
405 struct commit
*commit
,
406 struct rev_info
*info
)
408 struct pretty_print_context ctx
= {0};
409 struct strbuf subject
= STRBUF_INIT
;
411 format_commit_message(commit
, "%f", &subject
, &ctx
);
412 fmt_output_subject(filename
, subject
.buf
, info
);
413 strbuf_release(&subject
);
416 void fmt_output_email_subject(struct strbuf
*sb
, struct rev_info
*opt
)
418 if (opt
->total
> 0) {
419 strbuf_addf(sb
, "Subject: [%s%s%0*d/%d] ",
421 *opt
->subject_prefix
? " " : "",
422 digits_in_number(opt
->total
),
423 opt
->nr
, opt
->total
);
424 } else if (opt
->total
== 0 && opt
->subject_prefix
&& *opt
->subject_prefix
) {
425 strbuf_addf(sb
, "Subject: [%s] ",
426 opt
->subject_prefix
);
428 strbuf_addstr(sb
, "Subject: ");
432 void log_write_email_headers(struct rev_info
*opt
, struct commit
*commit
,
433 const char **extra_headers_p
,
434 int *need_8bit_cte_p
,
437 const char *extra_headers
= opt
->extra_headers
;
438 const char *name
= oid_to_hex(opt
->zero_commit
?
439 null_oid() : &commit
->object
.oid
);
441 *need_8bit_cte_p
= 0; /* unknown */
443 fprintf(opt
->diffopt
.file
, "From %s Mon Sep 17 00:00:00 2001\n", name
);
444 graph_show_oneline(opt
->graph
);
445 if (opt
->message_id
) {
446 fprintf(opt
->diffopt
.file
, "Message-Id: <%s>\n", opt
->message_id
);
447 graph_show_oneline(opt
->graph
);
449 if (opt
->ref_message_ids
&& opt
->ref_message_ids
->nr
> 0) {
451 n
= opt
->ref_message_ids
->nr
;
452 fprintf(opt
->diffopt
.file
, "In-Reply-To: <%s>\n", opt
->ref_message_ids
->items
[n
-1].string
);
453 for (i
= 0; i
< n
; i
++)
454 fprintf(opt
->diffopt
.file
, "%s<%s>\n", (i
> 0 ? "\t" : "References: "),
455 opt
->ref_message_ids
->items
[i
].string
);
456 graph_show_oneline(opt
->graph
);
458 if (opt
->mime_boundary
&& maybe_multipart
) {
459 static struct strbuf subject_buffer
= STRBUF_INIT
;
460 static struct strbuf buffer
= STRBUF_INIT
;
461 struct strbuf filename
= STRBUF_INIT
;
462 *need_8bit_cte_p
= -1; /* NEVER */
464 strbuf_reset(&subject_buffer
);
465 strbuf_reset(&buffer
);
467 strbuf_addf(&subject_buffer
,
469 "MIME-Version: 1.0\n"
470 "Content-Type: multipart/mixed;"
471 " boundary=\"%s%s\"\n"
473 "This is a multi-part message in MIME "
476 "Content-Type: text/plain; "
477 "charset=UTF-8; format=fixed\n"
478 "Content-Transfer-Encoding: 8bit\n\n",
479 extra_headers
? extra_headers
: "",
480 mime_boundary_leader
, opt
->mime_boundary
,
481 mime_boundary_leader
, opt
->mime_boundary
);
482 extra_headers
= subject_buffer
.buf
;
484 if (opt
->numbered_files
)
485 strbuf_addf(&filename
, "%d", opt
->nr
);
487 fmt_output_commit(&filename
, commit
, opt
);
490 "Content-Type: text/x-patch;"
492 "Content-Transfer-Encoding: 8bit\n"
493 "Content-Disposition: %s;"
494 " filename=\"%s\"\n\n",
495 mime_boundary_leader
, opt
->mime_boundary
,
497 opt
->no_inline
? "attachment" : "inline",
499 opt
->diffopt
.stat_sep
= buffer
.buf
;
500 strbuf_release(&filename
);
502 *extra_headers_p
= extra_headers
;
505 static void show_sig_lines(struct rev_info
*opt
, int status
, const char *bol
)
507 const char *color
, *reset
, *eol
;
509 color
= diff_get_color_opt(&opt
->diffopt
,
510 status
? DIFF_WHITESPACE
: DIFF_FRAGINFO
);
511 reset
= diff_get_color_opt(&opt
->diffopt
, DIFF_RESET
);
513 eol
= strchrnul(bol
, '\n');
514 fprintf(opt
->diffopt
.file
, "%s%.*s%s%s", color
, (int)(eol
- bol
), bol
, reset
,
516 graph_show_oneline(opt
->graph
);
517 bol
= (*eol
) ? (eol
+ 1) : eol
;
521 static void show_signature(struct rev_info
*opt
, struct commit
*commit
)
523 struct strbuf payload
= STRBUF_INIT
;
524 struct strbuf signature
= STRBUF_INIT
;
525 struct signature_check sigc
= { 0 };
528 if (parse_signed_commit(commit
, &payload
, &signature
, the_hash_algo
) <= 0)
531 sigc
.payload_type
= SIGNATURE_PAYLOAD_COMMIT
;
532 sigc
.payload
= strbuf_detach(&payload
, &sigc
.payload_len
);
533 status
= check_signature(&sigc
, signature
.buf
, signature
.len
);
534 if (status
&& !sigc
.output
)
535 show_sig_lines(opt
, status
, "No signature\n");
537 show_sig_lines(opt
, status
, sigc
.output
);
538 signature_check_clear(&sigc
);
541 strbuf_release(&payload
);
542 strbuf_release(&signature
);
545 static int which_parent(const struct object_id
*oid
, const struct commit
*commit
)
548 const struct commit_list
*parent
;
550 for (nth
= 0, parent
= commit
->parents
; parent
; parent
= parent
->next
) {
551 if (oideq(&parent
->item
->object
.oid
, oid
))
558 static int is_common_merge(const struct commit
*commit
)
560 return (commit
->parents
561 && commit
->parents
->next
562 && !commit
->parents
->next
->next
);
565 static int show_one_mergetag(struct commit
*commit
,
566 struct commit_extra_header
*extra
,
569 struct rev_info
*opt
= (struct rev_info
*)data
;
570 struct object_id oid
;
572 struct strbuf verify_message
;
573 struct signature_check sigc
= { 0 };
575 struct strbuf payload
= STRBUF_INIT
;
576 struct strbuf signature
= STRBUF_INIT
;
578 hash_object_file(the_hash_algo
, extra
->value
, extra
->len
,
580 tag
= lookup_tag(the_repository
, &oid
);
582 return -1; /* error message already given */
584 strbuf_init(&verify_message
, 256);
585 if (parse_tag_buffer(the_repository
, tag
, extra
->value
, extra
->len
))
586 strbuf_addstr(&verify_message
, "malformed mergetag\n");
587 else if (is_common_merge(commit
) &&
588 oideq(&tag
->tagged
->oid
,
589 &commit
->parents
->next
->item
->object
.oid
))
590 strbuf_addf(&verify_message
,
591 "merged tag '%s'\n", tag
->tag
);
592 else if ((nth
= which_parent(&tag
->tagged
->oid
, commit
)) < 0)
593 strbuf_addf(&verify_message
, "tag %s names a non-parent %s\n",
594 tag
->tag
, oid_to_hex(&tag
->tagged
->oid
));
596 strbuf_addf(&verify_message
,
597 "parent #%d, tagged '%s'\n", nth
+ 1, tag
->tag
);
600 if (parse_signature(extra
->value
, extra
->len
, &payload
, &signature
)) {
601 /* could have a good signature */
602 sigc
.payload_type
= SIGNATURE_PAYLOAD_TAG
;
603 sigc
.payload
= strbuf_detach(&payload
, &sigc
.payload_len
);
604 status
= check_signature(&sigc
, signature
.buf
, signature
.len
);
606 strbuf_addstr(&verify_message
, sigc
.output
);
608 strbuf_addstr(&verify_message
, "No signature\n");
609 signature_check_clear(&sigc
);
610 /* otherwise we couldn't verify, which is shown as bad */
613 show_sig_lines(opt
, status
, verify_message
.buf
);
614 strbuf_release(&verify_message
);
615 strbuf_release(&payload
);
616 strbuf_release(&signature
);
620 static int show_mergetag(struct rev_info
*opt
, struct commit
*commit
)
622 return for_each_mergetag(show_one_mergetag
, commit
, opt
);
625 static void next_commentary_block(struct rev_info
*opt
, struct strbuf
*sb
)
627 const char *x
= opt
->shown_dashes
? "\n" : "---\n";
629 strbuf_addstr(sb
, x
);
631 fputs(x
, opt
->diffopt
.file
);
632 opt
->shown_dashes
= 1;
635 void show_log(struct rev_info
*opt
)
637 struct strbuf msgbuf
= STRBUF_INIT
;
638 struct log_info
*log
= opt
->loginfo
;
639 struct commit
*commit
= log
->commit
, *parent
= log
->parent
;
640 int abbrev_commit
= opt
->abbrev_commit
? opt
->abbrev
: the_hash_algo
->hexsz
;
641 const char *extra_headers
= opt
->extra_headers
;
642 struct pretty_print_context ctx
= {0};
645 if (!opt
->verbose_header
) {
646 graph_show_commit(opt
->graph
);
649 put_revision_mark(opt
, commit
);
650 fputs(find_unique_abbrev(&commit
->object
.oid
, abbrev_commit
), opt
->diffopt
.file
);
651 if (opt
->print_parents
)
652 show_parents(commit
, abbrev_commit
, opt
->diffopt
.file
);
653 if (opt
->children
.name
)
654 show_children(opt
, commit
, abbrev_commit
);
655 show_decorations(opt
, commit
);
656 if (opt
->graph
&& !graph_is_commit_finished(opt
->graph
)) {
657 putc('\n', opt
->diffopt
.file
);
658 graph_show_remainder(opt
->graph
);
660 putc(opt
->diffopt
.line_termination
, opt
->diffopt
.file
);
665 * If use_terminator is set, we already handled any record termination
666 * at the end of the last record.
667 * Otherwise, add a diffopt.line_termination character before all
668 * entries but the first. (IOW, as a separator between entries)
670 if (opt
->shown_one
&& !opt
->use_terminator
) {
672 * If entries are separated by a newline, the output
673 * should look human-readable. If the last entry ended
674 * with a newline, print the graph output before this
675 * newline. Otherwise it will end up as a completely blank
676 * line and will look like a gap in the graph.
678 * If the entry separator is not a newline, the output is
679 * primarily intended for programmatic consumption, and we
680 * never want the extra graph output before the entry
683 if (opt
->diffopt
.line_termination
== '\n' &&
684 !opt
->missing_newline
)
685 graph_show_padding(opt
->graph
);
686 putc(opt
->diffopt
.line_termination
, opt
->diffopt
.file
);
691 * If the history graph was requested,
692 * print the graph, up to this commit's line
694 graph_show_commit(opt
->graph
);
697 * Print header line of header..
700 if (cmit_fmt_is_mail(opt
->commit_format
)) {
701 log_write_email_headers(opt
, commit
, &extra_headers
,
702 &ctx
.need_8bit_cte
, 1);
704 ctx
.print_email_subject
= 1;
705 } else if (opt
->commit_format
!= CMIT_FMT_USERFORMAT
) {
706 fputs(diff_get_color_opt(&opt
->diffopt
, DIFF_COMMIT
), opt
->diffopt
.file
);
707 if (opt
->commit_format
!= CMIT_FMT_ONELINE
)
708 fputs("commit ", opt
->diffopt
.file
);
711 put_revision_mark(opt
, commit
);
712 fputs(find_unique_abbrev(&commit
->object
.oid
,
715 if (opt
->print_parents
)
716 show_parents(commit
, abbrev_commit
, opt
->diffopt
.file
);
717 if (opt
->children
.name
)
718 show_children(opt
, commit
, abbrev_commit
);
720 fprintf(opt
->diffopt
.file
, " (from %s)",
721 find_unique_abbrev(&parent
->object
.oid
, abbrev_commit
));
722 fputs(diff_get_color_opt(&opt
->diffopt
, DIFF_RESET
), opt
->diffopt
.file
);
723 show_decorations(opt
, commit
);
724 if (opt
->commit_format
== CMIT_FMT_ONELINE
) {
725 putc(' ', opt
->diffopt
.file
);
727 putc('\n', opt
->diffopt
.file
);
728 graph_show_oneline(opt
->graph
);
730 if (opt
->reflog_info
) {
732 * setup_revisions() ensures that opt->reflog_info
733 * and opt->graph cannot both be set,
734 * so we don't need to worry about printing the
737 show_reflog_message(opt
->reflog_info
,
738 opt
->commit_format
== CMIT_FMT_ONELINE
,
740 opt
->date_mode_explicit
);
741 if (opt
->commit_format
== CMIT_FMT_ONELINE
)
746 if (opt
->show_signature
) {
747 show_signature(opt
, commit
);
748 show_mergetag(opt
, commit
);
751 if (opt
->show_notes
) {
753 struct strbuf notebuf
= STRBUF_INIT
;
755 raw
= (opt
->commit_format
== CMIT_FMT_USERFORMAT
);
756 format_display_notes(&commit
->object
.oid
, ¬ebuf
,
757 get_log_output_encoding(), raw
);
758 ctx
.notes_message
= strbuf_detach(¬ebuf
, NULL
);
762 * And then the pretty-printed message itself
764 if (ctx
.need_8bit_cte
>= 0 && opt
->add_signoff
)
766 has_non_ascii(fmt_name(WANT_COMMITTER_IDENT
));
767 ctx
.date_mode
= opt
->date_mode
;
768 ctx
.date_mode_explicit
= opt
->date_mode_explicit
;
769 ctx
.abbrev
= opt
->diffopt
.abbrev
;
770 ctx
.after_subject
= extra_headers
;
771 ctx
.preserve_subject
= opt
->preserve_subject
;
772 ctx
.encode_email_headers
= opt
->encode_email_headers
;
773 ctx
.reflog_info
= opt
->reflog_info
;
774 ctx
.fmt
= opt
->commit_format
;
775 ctx
.mailmap
= opt
->mailmap
;
776 ctx
.color
= opt
->diffopt
.use_color
;
777 ctx
.expand_tabs_in_log
= opt
->expand_tabs_in_log
;
778 ctx
.output_encoding
= get_log_output_encoding();
780 if (opt
->from_ident
.mail_begin
&& opt
->from_ident
.name_begin
)
781 ctx
.from_ident
= &opt
->from_ident
;
783 ctx
.graph_width
= graph_width(opt
->graph
);
784 pretty_print_commit(&ctx
, commit
, &msgbuf
);
786 if (opt
->add_signoff
)
787 append_signoff(&msgbuf
, 0, APPEND_SIGNOFF_DEDUP
);
789 if ((ctx
.fmt
!= CMIT_FMT_USERFORMAT
) &&
790 ctx
.notes_message
&& *ctx
.notes_message
) {
791 if (cmit_fmt_is_mail(ctx
.fmt
))
792 next_commentary_block(opt
, &msgbuf
);
793 strbuf_addstr(&msgbuf
, ctx
.notes_message
);
796 if (opt
->show_log_size
) {
797 fprintf(opt
->diffopt
.file
, "log size %i\n", (int)msgbuf
.len
);
798 graph_show_oneline(opt
->graph
);
802 * Set opt->missing_newline if msgbuf doesn't
803 * end in a newline (including if it is empty)
805 if (!msgbuf
.len
|| msgbuf
.buf
[msgbuf
.len
- 1] != '\n')
806 opt
->missing_newline
= 1;
808 opt
->missing_newline
= 0;
810 graph_show_commit_msg(opt
->graph
, opt
->diffopt
.file
, &msgbuf
);
811 if (opt
->use_terminator
&& !commit_format_is_empty(opt
->commit_format
)) {
812 if (!opt
->missing_newline
)
813 graph_show_padding(opt
->graph
);
814 putc(opt
->diffopt
.line_termination
, opt
->diffopt
.file
);
817 strbuf_release(&msgbuf
);
818 free(ctx
.notes_message
);
820 if (cmit_fmt_is_mail(ctx
.fmt
) && opt
->idiff_oid1
) {
821 struct diff_queue_struct dq
;
823 memcpy(&dq
, &diff_queued_diff
, sizeof(diff_queued_diff
));
824 DIFF_QUEUE_CLEAR(&diff_queued_diff
);
826 next_commentary_block(opt
, NULL
);
827 fprintf_ln(opt
->diffopt
.file
, "%s", opt
->idiff_title
);
828 show_interdiff(opt
->idiff_oid1
, opt
->idiff_oid2
, 2,
831 memcpy(&diff_queued_diff
, &dq
, sizeof(diff_queued_diff
));
834 if (cmit_fmt_is_mail(ctx
.fmt
) && opt
->rdiff1
) {
835 struct diff_queue_struct dq
;
836 struct diff_options opts
;
837 struct range_diff_options range_diff_opts
= {
838 .creation_factor
= opt
->creation_factor
,
843 memcpy(&dq
, &diff_queued_diff
, sizeof(diff_queued_diff
));
844 DIFF_QUEUE_CLEAR(&diff_queued_diff
);
846 next_commentary_block(opt
, NULL
);
847 fprintf_ln(opt
->diffopt
.file
, "%s", opt
->rdiff_title
);
849 * Pass minimum required diff-options to range-diff; others
850 * can be added later if deemed desirable.
853 opts
.file
= opt
->diffopt
.file
;
854 opts
.use_color
= opt
->diffopt
.use_color
;
855 diff_setup_done(&opts
);
856 show_range_diff(opt
->rdiff1
, opt
->rdiff2
, &range_diff_opts
);
858 memcpy(&diff_queued_diff
, &dq
, sizeof(diff_queued_diff
));
862 int log_tree_diff_flush(struct rev_info
*opt
)
864 opt
->shown_dashes
= 0;
865 diffcore_std(&opt
->diffopt
);
867 if (diff_queue_is_empty(&opt
->diffopt
)) {
868 int saved_fmt
= opt
->diffopt
.output_format
;
869 opt
->diffopt
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
870 diff_flush(&opt
->diffopt
);
871 opt
->diffopt
.output_format
= saved_fmt
;
875 if (opt
->loginfo
&& !opt
->no_commit_id
) {
877 if ((opt
->diffopt
.output_format
& ~DIFF_FORMAT_NO_OUTPUT
) &&
878 opt
->verbose_header
&&
879 opt
->commit_format
!= CMIT_FMT_ONELINE
&&
880 !commit_format_is_empty(opt
->commit_format
)) {
882 * When showing a verbose header (i.e. log message),
883 * and not in --pretty=oneline format, we would want
884 * an extra newline between the end of log and the
885 * diff/diffstat output for readability.
887 int pch
= DIFF_FORMAT_DIFFSTAT
| DIFF_FORMAT_PATCH
;
888 if (opt
->diffopt
.output_prefix
) {
889 struct strbuf
*msg
= NULL
;
890 msg
= opt
->diffopt
.output_prefix(&opt
->diffopt
,
891 opt
->diffopt
.output_prefix_data
);
892 fwrite(msg
->buf
, msg
->len
, 1, opt
->diffopt
.file
);
896 * We may have shown three-dashes line early
897 * between generated commentary (notes, etc.)
898 * and the log message, in which case we only
899 * want a blank line after the commentary
900 * without (an extra) three-dashes line.
901 * Otherwise, we show the three-dashes line if
902 * we are showing the patch with diffstat, but
903 * in that case, there is no extra blank line
904 * after the three-dashes line.
906 if (!opt
->shown_dashes
&&
907 (pch
& opt
->diffopt
.output_format
) == pch
)
908 fprintf(opt
->diffopt
.file
, "---");
909 putc('\n', opt
->diffopt
.file
);
912 diff_flush(&opt
->diffopt
);
916 static int do_diff_combined(struct rev_info
*opt
, struct commit
*commit
)
918 diff_tree_combined_merge(commit
, opt
);
919 return !opt
->loginfo
;
922 static void setup_additional_headers(struct diff_options
*o
,
923 struct strmap
*all_headers
)
925 struct hashmap_iter iter
;
926 struct strmap_entry
*entry
;
929 * Make o->additional_path_headers contain the subset of all_headers
930 * that match o->pathspec. If there aren't any that match o->pathspec,
931 * then make o->additional_path_headers be NULL.
934 if (!o
->pathspec
.nr
) {
935 o
->additional_path_headers
= all_headers
;
939 o
->additional_path_headers
= xmalloc(sizeof(struct strmap
));
940 strmap_init_with_options(o
->additional_path_headers
, NULL
, 0);
941 strmap_for_each_entry(all_headers
, &iter
, entry
) {
942 if (match_pathspec(the_repository
->index
, &o
->pathspec
,
943 entry
->key
, strlen(entry
->key
),
944 0 /* prefix */, NULL
/* seen */,
946 strmap_put(o
->additional_path_headers
,
947 entry
->key
, entry
->value
);
949 if (!strmap_get_size(o
->additional_path_headers
)) {
950 strmap_clear(o
->additional_path_headers
, 0);
951 FREE_AND_NULL(o
->additional_path_headers
);
955 static void cleanup_additional_headers(struct diff_options
*o
)
957 if (!o
->pathspec
.nr
) {
958 o
->additional_path_headers
= NULL
;
961 if (!o
->additional_path_headers
)
964 strmap_clear(o
->additional_path_headers
, 0);
965 FREE_AND_NULL(o
->additional_path_headers
);
968 static int do_remerge_diff(struct rev_info
*opt
,
969 struct commit_list
*parents
,
970 struct object_id
*oid
)
972 struct merge_options o
;
973 struct commit_list
*bases
;
974 struct merge_result res
= {0};
975 struct pretty_print_context ctx
= {0};
976 struct commit
*parent1
= parents
->item
;
977 struct commit
*parent2
= parents
->next
->item
;
978 struct strbuf parent1_desc
= STRBUF_INIT
;
979 struct strbuf parent2_desc
= STRBUF_INIT
;
981 /* Setup merge options */
982 init_merge_options(&o
, the_repository
);
983 o
.show_rename_progress
= 0;
984 o
.record_conflict_msgs_as_headers
= 1;
985 o
.msg_header_prefix
= "remerge";
987 ctx
.abbrev
= DEFAULT_ABBREV
;
988 format_commit_message(parent1
, "%h (%s)", &parent1_desc
, &ctx
);
989 format_commit_message(parent2
, "%h (%s)", &parent2_desc
, &ctx
);
990 o
.branch1
= parent1_desc
.buf
;
991 o
.branch2
= parent2_desc
.buf
;
993 /* Parse the relevant commits and get the merge bases */
994 parse_commit_or_die(parent1
);
995 parse_commit_or_die(parent2
);
996 bases
= get_merge_bases(parent1
, parent2
);
998 /* Re-merge the parents */
999 merge_incore_recursive(&o
, bases
, parent1
, parent2
, &res
);
1002 setup_additional_headers(&opt
->diffopt
, res
.path_messages
);
1003 diff_tree_oid(&res
.tree
->object
.oid
, oid
, "", &opt
->diffopt
);
1004 log_tree_diff_flush(opt
);
1007 cleanup_additional_headers(&opt
->diffopt
);
1008 strbuf_release(&parent1_desc
);
1009 strbuf_release(&parent2_desc
);
1010 merge_finalize(&o
, &res
);
1012 /* Clean up the contents of the temporary object directory */
1013 if (opt
->remerge_objdir
)
1014 tmp_objdir_discard_objects(opt
->remerge_objdir
);
1016 BUG("did a remerge diff without remerge_objdir?!?");
1018 return !opt
->loginfo
;
1022 * Show the diff of a commit.
1024 * Return true if we printed any log info messages
1026 static int log_tree_diff(struct rev_info
*opt
, struct commit
*commit
, struct log_info
*log
)
1029 struct commit_list
*parents
;
1030 struct object_id
*oid
;
1032 int all_need_diff
= opt
->diff
|| opt
->diffopt
.flags
.exit_with_status
;
1034 if (!all_need_diff
&& !opt
->merges_need_diff
)
1037 parse_commit_or_die(commit
);
1038 oid
= get_commit_tree_oid(commit
);
1040 parents
= get_saved_parents(opt
, commit
);
1041 is_merge
= parents
&& parents
->next
;
1042 if (!is_merge
&& !all_need_diff
)
1047 if (opt
->show_root_diff
) {
1048 diff_root_tree_oid(oid
, "", &opt
->diffopt
);
1049 log_tree_diff_flush(opt
);
1051 return !opt
->loginfo
;
1055 int octopus
= (parents
->next
->next
!= NULL
);
1057 if (opt
->remerge_diff
) {
1060 fprintf(opt
->diffopt
.file
,
1061 "diff: warning: Skipping remerge-diff "
1062 "for octopus merges.\n");
1065 return do_remerge_diff(opt
, parents
, oid
);
1067 if (opt
->combine_merges
)
1068 return do_diff_combined(opt
, commit
);
1069 if (opt
->separate_merges
) {
1070 if (!opt
->first_parent_merges
) {
1071 /* Show parent info for multiple diffs */
1072 log
->parent
= parents
->item
;
1080 struct commit
*parent
= parents
->item
;
1082 parse_commit_or_die(parent
);
1083 diff_tree_oid(get_commit_tree_oid(parent
),
1084 oid
, "", &opt
->diffopt
);
1085 log_tree_diff_flush(opt
);
1087 showed_log
|= !opt
->loginfo
;
1089 /* Set up the log info for the next parent, if any.. */
1090 parents
= parents
->next
;
1091 if (!parents
|| opt
->first_parent_merges
)
1093 log
->parent
= parents
->item
;
1099 int log_tree_commit(struct rev_info
*opt
, struct commit
*commit
)
1101 struct log_info log
;
1103 /* maybe called by e.g. cmd_log_walk(), maybe stand-alone */
1104 int no_free
= opt
->diffopt
.no_free
;
1106 log
.commit
= commit
;
1108 opt
->loginfo
= &log
;
1109 opt
->diffopt
.no_free
= 1;
1111 /* NEEDSWORK: no restoring of no_free? Why? */
1112 if (opt
->line_level_traverse
)
1113 return line_log_print(opt
, commit
);
1115 if (opt
->track_linear
&& !opt
->linear
&& !opt
->reverse_output_stage
)
1116 fprintf(opt
->diffopt
.file
, "\n%s\n", opt
->break_bar
);
1117 shown
= log_tree_diff(opt
, commit
, &log
);
1118 if (!shown
&& opt
->loginfo
&& opt
->always_show_header
) {
1123 if (opt
->track_linear
&& !opt
->linear
&& opt
->reverse_output_stage
)
1124 fprintf(opt
->diffopt
.file
, "\n%s\n", opt
->break_bar
);
1125 opt
->loginfo
= NULL
;
1126 maybe_flush_or_die(opt
->diffopt
.file
, "stdout");
1127 opt
->diffopt
.no_free
= no_free
;
1128 diff_free(&opt
->diffopt
);