2 #include "commit-reach.h"
5 #include "object-store.h"
6 #include "repository.h"
7 #include "tmp-objdir.h"
12 #include "merge-ort.h"
13 #include "reflog-walk.h"
15 #include "string-list.h"
17 #include "gpg-interface.h"
18 #include "sequencer.h"
21 #include "range-diff.h"
24 static struct decoration name_decoration
= { "object names" };
25 static int decoration_loaded
;
26 static int decoration_flags
;
28 static char decoration_colors
[][COLOR_MAXLEN
] = {
30 GIT_COLOR_BOLD_GREEN
, /* REF_LOCAL */
31 GIT_COLOR_BOLD_RED
, /* REF_REMOTE */
32 GIT_COLOR_BOLD_YELLOW
, /* REF_TAG */
33 GIT_COLOR_BOLD_MAGENTA
, /* REF_STASH */
34 GIT_COLOR_BOLD_CYAN
, /* REF_HEAD */
35 GIT_COLOR_BOLD_BLUE
, /* GRAFTED */
38 static const char *color_decorate_slots
[] = {
39 [DECORATION_REF_LOCAL
] = "branch",
40 [DECORATION_REF_REMOTE
] = "remoteBranch",
41 [DECORATION_REF_TAG
] = "tag",
42 [DECORATION_REF_STASH
] = "stash",
43 [DECORATION_REF_HEAD
] = "HEAD",
44 [DECORATION_GRAFTED
] = "grafted",
47 static const char *decorate_get_color(int decorate_use_color
, enum decoration_type ix
)
49 if (want_color(decorate_use_color
))
50 return decoration_colors
[ix
];
54 define_list_config_array(color_decorate_slots
);
56 int parse_decorate_color_config(const char *var
, const char *slot_name
, const char *value
)
58 int slot
= LOOKUP_CONFIG(color_decorate_slots
, slot_name
);
62 return config_error_nonbool(var
);
63 return color_parse(value
, decoration_colors
[slot
]);
67 * log-tree.c uses DIFF_OPT_TST for determining whether to use color
68 * for showing the commit sha1, use the same check for --decorate
70 #define decorate_get_color_opt(o, ix) \
71 decorate_get_color((o)->use_color, ix)
73 void add_name_decoration(enum decoration_type type
, const char *name
, struct object
*obj
)
75 struct name_decoration
*res
;
76 FLEX_ALLOC_STR(res
, name
, name
);
78 res
->next
= add_decoration(&name_decoration
, obj
, res
);
81 const struct name_decoration
*get_name_decoration(const struct object
*obj
)
83 load_ref_decorations(NULL
, DECORATE_SHORT_REFS
);
84 return lookup_decoration(&name_decoration
, obj
);
87 static int match_ref_pattern(const char *refname
,
88 const struct string_list_item
*item
)
92 if (!wildmatch(item
->string
, refname
, 0))
96 if (skip_prefix(refname
, item
->string
, &rest
) &&
97 (!*rest
|| *rest
== '/'))
103 static int ref_filter_match(const char *refname
,
104 const struct decoration_filter
*filter
)
106 struct string_list_item
*item
;
107 const struct string_list
*exclude_patterns
= filter
->exclude_ref_pattern
;
108 const struct string_list
*include_patterns
= filter
->include_ref_pattern
;
109 const struct string_list
*exclude_patterns_config
=
110 filter
->exclude_ref_config_pattern
;
112 if (exclude_patterns
&& exclude_patterns
->nr
) {
113 for_each_string_list_item(item
, exclude_patterns
) {
114 if (match_ref_pattern(refname
, item
))
119 if (include_patterns
&& include_patterns
->nr
) {
120 for_each_string_list_item(item
, include_patterns
) {
121 if (match_ref_pattern(refname
, item
))
127 if (exclude_patterns_config
&& exclude_patterns_config
->nr
) {
128 for_each_string_list_item(item
, exclude_patterns_config
) {
129 if (match_ref_pattern(refname
, item
))
137 static int add_ref_decoration(const char *refname
, const struct object_id
*oid
,
143 enum object_type objtype
;
144 enum decoration_type deco_type
= DECORATION_NONE
;
145 struct decoration_filter
*filter
= (struct decoration_filter
*)cb_data
;
146 const char *git_replace_ref_base
= ref_namespace
[NAMESPACE_REPLACE
].ref
;
148 if (filter
&& !ref_filter_match(refname
, filter
))
151 if (starts_with(refname
, git_replace_ref_base
)) {
152 struct object_id original_oid
;
153 if (!read_replace_refs
)
155 if (get_oid_hex(refname
+ strlen(git_replace_ref_base
),
157 warning("invalid replace ref %s", refname
);
160 obj
= parse_object(the_repository
, &original_oid
);
162 add_name_decoration(DECORATION_GRAFTED
, "replaced", obj
);
166 objtype
= oid_object_info(the_repository
, oid
, NULL
);
169 obj
= lookup_object_by_type(the_repository
, oid
, objtype
);
171 for (i
= 0; i
< ARRAY_SIZE(ref_namespace
); i
++) {
172 struct ref_namespace_info
*info
= &ref_namespace
[i
];
174 if (!info
->decoration
)
177 if (!strcmp(refname
, info
->ref
)) {
178 deco_type
= info
->decoration
;
181 } else if (starts_with(refname
, info
->ref
)) {
182 deco_type
= info
->decoration
;
187 add_name_decoration(deco_type
, refname
, obj
);
188 while (obj
->type
== OBJ_TAG
) {
190 parse_object(the_repository
, &obj
->oid
);
191 obj
= ((struct tag
*)obj
)->tagged
;
194 add_name_decoration(DECORATION_REF_TAG
, refname
, obj
);
199 static int add_graft_decoration(const struct commit_graft
*graft
, void *cb_data
)
201 struct commit
*commit
= lookup_commit(the_repository
, &graft
->oid
);
204 add_name_decoration(DECORATION_GRAFTED
, "grafted", &commit
->object
);
208 void load_ref_decorations(struct decoration_filter
*filter
, int flags
)
210 if (!decoration_loaded
) {
212 struct string_list_item
*item
;
213 for_each_string_list_item(item
, filter
->exclude_ref_pattern
) {
214 normalize_glob_ref(item
, NULL
, item
->string
);
216 for_each_string_list_item(item
, filter
->include_ref_pattern
) {
217 normalize_glob_ref(item
, NULL
, item
->string
);
219 for_each_string_list_item(item
, filter
->exclude_ref_config_pattern
) {
220 normalize_glob_ref(item
, NULL
, item
->string
);
223 decoration_loaded
= 1;
224 decoration_flags
= flags
;
225 for_each_ref(add_ref_decoration
, filter
);
226 head_ref(add_ref_decoration
, filter
);
227 for_each_commit_graft(add_graft_decoration
, filter
);
231 static void show_parents(struct commit
*commit
, int abbrev
, FILE *file
)
233 struct commit_list
*p
;
234 for (p
= commit
->parents
; p
; p
= p
->next
) {
235 struct commit
*parent
= p
->item
;
237 repo_find_unique_abbrev(the_repository
, &parent
->object
.oid
, abbrev
));
241 static void show_children(struct rev_info
*opt
, struct commit
*commit
, int abbrev
)
243 struct commit_list
*p
= lookup_decoration(&opt
->children
, &commit
->object
);
244 for ( ; p
; p
= p
->next
) {
245 fprintf(opt
->diffopt
.file
, " %s",
246 repo_find_unique_abbrev(the_repository
, &p
->item
->object
.oid
, abbrev
));
251 * Do we have HEAD in the output, and also the branch it points at?
252 * If so, find that decoration entry for that current branch.
254 static const struct name_decoration
*current_pointed_by_HEAD(const struct name_decoration
*decoration
)
256 const struct name_decoration
*list
, *head
= NULL
;
257 const char *branch_name
= NULL
;
260 /* First find HEAD */
261 for (list
= decoration
; list
; list
= list
->next
)
262 if (list
->type
== DECORATION_REF_HEAD
) {
269 /* Now resolve and find the matching current branch */
270 branch_name
= resolve_ref_unsafe("HEAD", 0, NULL
, &rru_flags
);
271 if (!branch_name
|| !(rru_flags
& REF_ISSYMREF
))
274 if (!starts_with(branch_name
, "refs/"))
277 /* OK, do we have that ref in the list? */
278 for (list
= decoration
; list
; list
= list
->next
)
279 if ((list
->type
== DECORATION_REF_LOCAL
) &&
280 !strcmp(branch_name
, list
->name
)) {
287 static void show_name(struct strbuf
*sb
, const struct name_decoration
*decoration
)
289 if (decoration_flags
== DECORATE_SHORT_REFS
)
290 strbuf_addstr(sb
, prettify_refname(decoration
->name
));
292 strbuf_addstr(sb
, decoration
->name
);
296 * The caller makes sure there is no funny color before calling.
297 * format_decorations_extended makes sure the same after return.
299 void format_decorations_extended(struct strbuf
*sb
,
300 const struct commit
*commit
,
303 const char *separator
,
306 const struct name_decoration
*decoration
;
307 const struct name_decoration
*current_and_HEAD
;
308 const char *color_commit
=
309 diff_get_color(use_color
, DIFF_COMMIT
);
310 const char *color_reset
=
311 decorate_get_color(use_color
, DECORATION_NONE
);
313 decoration
= get_name_decoration(&commit
->object
);
317 current_and_HEAD
= current_pointed_by_HEAD(decoration
);
320 * When both current and HEAD are there, only
321 * show HEAD->current where HEAD would have
322 * appeared, skipping the entry for current.
324 if (decoration
!= current_and_HEAD
) {
325 strbuf_addstr(sb
, color_commit
);
326 strbuf_addstr(sb
, prefix
);
327 strbuf_addstr(sb
, color_reset
);
328 strbuf_addstr(sb
, decorate_get_color(use_color
, decoration
->type
));
329 if (decoration
->type
== DECORATION_REF_TAG
)
330 strbuf_addstr(sb
, "tag: ");
332 show_name(sb
, decoration
);
334 if (current_and_HEAD
&&
335 decoration
->type
== DECORATION_REF_HEAD
) {
336 strbuf_addstr(sb
, " -> ");
337 strbuf_addstr(sb
, color_reset
);
338 strbuf_addstr(sb
, decorate_get_color(use_color
, current_and_HEAD
->type
));
339 show_name(sb
, current_and_HEAD
);
341 strbuf_addstr(sb
, color_reset
);
345 decoration
= decoration
->next
;
347 strbuf_addstr(sb
, color_commit
);
348 strbuf_addstr(sb
, suffix
);
349 strbuf_addstr(sb
, color_reset
);
352 void show_decorations(struct rev_info
*opt
, struct commit
*commit
)
354 struct strbuf sb
= STRBUF_INIT
;
357 char **slot
= revision_sources_peek(opt
->sources
, commit
);
360 fprintf(opt
->diffopt
.file
, "\t%s", *slot
);
362 if (!opt
->show_decorations
)
364 format_decorations(&sb
, commit
, opt
->diffopt
.use_color
);
365 fputs(sb
.buf
, opt
->diffopt
.file
);
369 static unsigned int digits_in_number(unsigned int number
)
371 unsigned int i
= 10, result
= 1;
372 while (i
<= number
) {
379 void fmt_output_subject(struct strbuf
*filename
,
381 struct rev_info
*info
)
383 const char *suffix
= info
->patch_suffix
;
385 int start_len
= filename
->len
;
386 int max_len
= start_len
+ info
->patch_name_max
- (strlen(suffix
) + 1);
388 if (info
->reroll_count
) {
389 struct strbuf temp
= STRBUF_INIT
;
391 strbuf_addf(&temp
, "v%s", info
->reroll_count
);
392 format_sanitized_subject(filename
, temp
.buf
, temp
.len
);
393 strbuf_addstr(filename
, "-");
394 strbuf_release(&temp
);
396 strbuf_addf(filename
, "%04d-%s", nr
, subject
);
398 if (max_len
< filename
->len
)
399 strbuf_setlen(filename
, max_len
);
400 strbuf_addstr(filename
, suffix
);
403 void fmt_output_commit(struct strbuf
*filename
,
404 struct commit
*commit
,
405 struct rev_info
*info
)
407 struct pretty_print_context ctx
= {0};
408 struct strbuf subject
= STRBUF_INIT
;
410 repo_format_commit_message(the_repository
, commit
, "%f", &subject
,
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(repo_find_unique_abbrev(the_repository
, &commit
->object
.oid
, abbrev_commit
),
652 if (opt
->print_parents
)
653 show_parents(commit
, abbrev_commit
, opt
->diffopt
.file
);
654 if (opt
->children
.name
)
655 show_children(opt
, commit
, abbrev_commit
);
656 show_decorations(opt
, commit
);
657 if (opt
->graph
&& !graph_is_commit_finished(opt
->graph
)) {
658 putc('\n', opt
->diffopt
.file
);
659 graph_show_remainder(opt
->graph
);
661 putc(opt
->diffopt
.line_termination
, opt
->diffopt
.file
);
666 * If use_terminator is set, we already handled any record termination
667 * at the end of the last record.
668 * Otherwise, add a diffopt.line_termination character before all
669 * entries but the first. (IOW, as a separator between entries)
671 if (opt
->shown_one
&& !opt
->use_terminator
) {
673 * If entries are separated by a newline, the output
674 * should look human-readable. If the last entry ended
675 * with a newline, print the graph output before this
676 * newline. Otherwise it will end up as a completely blank
677 * line and will look like a gap in the graph.
679 * If the entry separator is not a newline, the output is
680 * primarily intended for programmatic consumption, and we
681 * never want the extra graph output before the entry
684 if (opt
->diffopt
.line_termination
== '\n' &&
685 !opt
->missing_newline
)
686 graph_show_padding(opt
->graph
);
687 putc(opt
->diffopt
.line_termination
, opt
->diffopt
.file
);
692 * If the history graph was requested,
693 * print the graph, up to this commit's line
695 graph_show_commit(opt
->graph
);
698 * Print header line of header..
701 if (cmit_fmt_is_mail(opt
->commit_format
)) {
702 log_write_email_headers(opt
, commit
, &extra_headers
,
703 &ctx
.need_8bit_cte
, 1);
705 ctx
.print_email_subject
= 1;
706 } else if (opt
->commit_format
!= CMIT_FMT_USERFORMAT
) {
707 fputs(diff_get_color_opt(&opt
->diffopt
, DIFF_COMMIT
), opt
->diffopt
.file
);
708 if (opt
->commit_format
!= CMIT_FMT_ONELINE
)
709 fputs("commit ", opt
->diffopt
.file
);
712 put_revision_mark(opt
, commit
);
713 fputs(repo_find_unique_abbrev(the_repository
, &commit
->object
.oid
,
716 if (opt
->print_parents
)
717 show_parents(commit
, abbrev_commit
, opt
->diffopt
.file
);
718 if (opt
->children
.name
)
719 show_children(opt
, commit
, abbrev_commit
);
721 fprintf(opt
->diffopt
.file
, " (from %s)",
722 repo_find_unique_abbrev(the_repository
, &parent
->object
.oid
, abbrev_commit
));
723 fputs(diff_get_color_opt(&opt
->diffopt
, DIFF_RESET
), opt
->diffopt
.file
);
724 show_decorations(opt
, commit
);
725 if (opt
->commit_format
== CMIT_FMT_ONELINE
) {
726 putc(' ', opt
->diffopt
.file
);
728 putc('\n', opt
->diffopt
.file
);
729 graph_show_oneline(opt
->graph
);
731 if (opt
->reflog_info
) {
733 * setup_revisions() ensures that opt->reflog_info
734 * and opt->graph cannot both be set,
735 * so we don't need to worry about printing the
738 show_reflog_message(opt
->reflog_info
,
739 opt
->commit_format
== CMIT_FMT_ONELINE
,
741 opt
->date_mode_explicit
);
742 if (opt
->commit_format
== CMIT_FMT_ONELINE
)
747 if (opt
->show_signature
) {
748 show_signature(opt
, commit
);
749 show_mergetag(opt
, commit
);
752 if (opt
->show_notes
) {
754 struct strbuf notebuf
= STRBUF_INIT
;
756 raw
= (opt
->commit_format
== CMIT_FMT_USERFORMAT
);
757 format_display_notes(&commit
->object
.oid
, ¬ebuf
,
758 get_log_output_encoding(), raw
);
759 ctx
.notes_message
= strbuf_detach(¬ebuf
, NULL
);
763 * And then the pretty-printed message itself
765 if (ctx
.need_8bit_cte
>= 0 && opt
->add_signoff
)
767 has_non_ascii(fmt_name(WANT_COMMITTER_IDENT
));
768 ctx
.date_mode
= opt
->date_mode
;
769 ctx
.date_mode_explicit
= opt
->date_mode_explicit
;
770 ctx
.abbrev
= opt
->diffopt
.abbrev
;
771 ctx
.after_subject
= extra_headers
;
772 ctx
.preserve_subject
= opt
->preserve_subject
;
773 ctx
.encode_email_headers
= opt
->encode_email_headers
;
774 ctx
.reflog_info
= opt
->reflog_info
;
775 ctx
.fmt
= opt
->commit_format
;
776 ctx
.mailmap
= opt
->mailmap
;
777 ctx
.color
= opt
->diffopt
.use_color
;
778 ctx
.expand_tabs_in_log
= opt
->expand_tabs_in_log
;
779 ctx
.output_encoding
= get_log_output_encoding();
781 if (opt
->from_ident
.mail_begin
&& opt
->from_ident
.name_begin
)
782 ctx
.from_ident
= &opt
->from_ident
;
784 ctx
.graph_width
= graph_width(opt
->graph
);
785 pretty_print_commit(&ctx
, commit
, &msgbuf
);
787 if (opt
->add_signoff
)
788 append_signoff(&msgbuf
, 0, APPEND_SIGNOFF_DEDUP
);
790 if ((ctx
.fmt
!= CMIT_FMT_USERFORMAT
) &&
791 ctx
.notes_message
&& *ctx
.notes_message
) {
792 if (cmit_fmt_is_mail(ctx
.fmt
))
793 next_commentary_block(opt
, &msgbuf
);
794 strbuf_addstr(&msgbuf
, ctx
.notes_message
);
797 if (opt
->show_log_size
) {
798 fprintf(opt
->diffopt
.file
, "log size %i\n", (int)msgbuf
.len
);
799 graph_show_oneline(opt
->graph
);
803 * Set opt->missing_newline if msgbuf doesn't
804 * end in a newline (including if it is empty)
806 if (!msgbuf
.len
|| msgbuf
.buf
[msgbuf
.len
- 1] != '\n')
807 opt
->missing_newline
= 1;
809 opt
->missing_newline
= 0;
811 graph_show_commit_msg(opt
->graph
, opt
->diffopt
.file
, &msgbuf
);
812 if (opt
->use_terminator
&& !commit_format_is_empty(opt
->commit_format
)) {
813 if (!opt
->missing_newline
)
814 graph_show_padding(opt
->graph
);
815 putc(opt
->diffopt
.line_termination
, opt
->diffopt
.file
);
818 strbuf_release(&msgbuf
);
819 free(ctx
.notes_message
);
821 if (cmit_fmt_is_mail(ctx
.fmt
) && opt
->idiff_oid1
) {
822 struct diff_queue_struct dq
;
824 memcpy(&dq
, &diff_queued_diff
, sizeof(diff_queued_diff
));
825 DIFF_QUEUE_CLEAR(&diff_queued_diff
);
827 next_commentary_block(opt
, NULL
);
828 fprintf_ln(opt
->diffopt
.file
, "%s", opt
->idiff_title
);
829 show_interdiff(opt
->idiff_oid1
, opt
->idiff_oid2
, 2,
832 memcpy(&diff_queued_diff
, &dq
, sizeof(diff_queued_diff
));
835 if (cmit_fmt_is_mail(ctx
.fmt
) && opt
->rdiff1
) {
836 struct diff_queue_struct dq
;
837 struct diff_options opts
;
838 struct range_diff_options range_diff_opts
= {
839 .creation_factor
= opt
->creation_factor
,
844 memcpy(&dq
, &diff_queued_diff
, sizeof(diff_queued_diff
));
845 DIFF_QUEUE_CLEAR(&diff_queued_diff
);
847 next_commentary_block(opt
, NULL
);
848 fprintf_ln(opt
->diffopt
.file
, "%s", opt
->rdiff_title
);
850 * Pass minimum required diff-options to range-diff; others
851 * can be added later if deemed desirable.
853 repo_diff_setup(the_repository
, &opts
);
854 opts
.file
= opt
->diffopt
.file
;
855 opts
.use_color
= opt
->diffopt
.use_color
;
856 diff_setup_done(&opts
);
857 show_range_diff(opt
->rdiff1
, opt
->rdiff2
, &range_diff_opts
);
859 memcpy(&diff_queued_diff
, &dq
, sizeof(diff_queued_diff
));
863 int log_tree_diff_flush(struct rev_info
*opt
)
865 opt
->shown_dashes
= 0;
866 diffcore_std(&opt
->diffopt
);
868 if (diff_queue_is_empty(&opt
->diffopt
)) {
869 int saved_fmt
= opt
->diffopt
.output_format
;
870 opt
->diffopt
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
871 diff_flush(&opt
->diffopt
);
872 opt
->diffopt
.output_format
= saved_fmt
;
876 if (opt
->loginfo
&& !opt
->no_commit_id
) {
878 if ((opt
->diffopt
.output_format
& ~DIFF_FORMAT_NO_OUTPUT
) &&
879 opt
->verbose_header
&&
880 opt
->commit_format
!= CMIT_FMT_ONELINE
&&
881 !commit_format_is_empty(opt
->commit_format
)) {
883 * When showing a verbose header (i.e. log message),
884 * and not in --pretty=oneline format, we would want
885 * an extra newline between the end of log and the
886 * diff/diffstat output for readability.
888 int pch
= DIFF_FORMAT_DIFFSTAT
| DIFF_FORMAT_PATCH
;
889 if (opt
->diffopt
.output_prefix
) {
890 struct strbuf
*msg
= NULL
;
891 msg
= opt
->diffopt
.output_prefix(&opt
->diffopt
,
892 opt
->diffopt
.output_prefix_data
);
893 fwrite(msg
->buf
, msg
->len
, 1, opt
->diffopt
.file
);
897 * We may have shown three-dashes line early
898 * between generated commentary (notes, etc.)
899 * and the log message, in which case we only
900 * want a blank line after the commentary
901 * without (an extra) three-dashes line.
902 * Otherwise, we show the three-dashes line if
903 * we are showing the patch with diffstat, but
904 * in that case, there is no extra blank line
905 * after the three-dashes line.
907 if (!opt
->shown_dashes
&&
908 (pch
& opt
->diffopt
.output_format
) == pch
)
909 fprintf(opt
->diffopt
.file
, "---");
910 putc('\n', opt
->diffopt
.file
);
913 diff_flush(&opt
->diffopt
);
917 static int do_diff_combined(struct rev_info
*opt
, struct commit
*commit
)
919 diff_tree_combined_merge(commit
, opt
);
920 return !opt
->loginfo
;
923 static void setup_additional_headers(struct diff_options
*o
,
924 struct strmap
*all_headers
)
926 struct hashmap_iter iter
;
927 struct strmap_entry
*entry
;
930 * Make o->additional_path_headers contain the subset of all_headers
931 * that match o->pathspec. If there aren't any that match o->pathspec,
932 * then make o->additional_path_headers be NULL.
935 if (!o
->pathspec
.nr
) {
936 o
->additional_path_headers
= all_headers
;
940 o
->additional_path_headers
= xmalloc(sizeof(struct strmap
));
941 strmap_init_with_options(o
->additional_path_headers
, NULL
, 0);
942 strmap_for_each_entry(all_headers
, &iter
, entry
) {
943 if (match_pathspec(the_repository
->index
, &o
->pathspec
,
944 entry
->key
, strlen(entry
->key
),
945 0 /* prefix */, NULL
/* seen */,
947 strmap_put(o
->additional_path_headers
,
948 entry
->key
, entry
->value
);
950 if (!strmap_get_size(o
->additional_path_headers
)) {
951 strmap_clear(o
->additional_path_headers
, 0);
952 FREE_AND_NULL(o
->additional_path_headers
);
956 static void cleanup_additional_headers(struct diff_options
*o
)
958 if (!o
->pathspec
.nr
) {
959 o
->additional_path_headers
= NULL
;
962 if (!o
->additional_path_headers
)
965 strmap_clear(o
->additional_path_headers
, 0);
966 FREE_AND_NULL(o
->additional_path_headers
);
969 static int do_remerge_diff(struct rev_info
*opt
,
970 struct commit_list
*parents
,
971 struct object_id
*oid
)
973 struct merge_options o
;
974 struct commit_list
*bases
;
975 struct merge_result res
= {0};
976 struct pretty_print_context ctx
= {0};
977 struct commit
*parent1
= parents
->item
;
978 struct commit
*parent2
= parents
->next
->item
;
979 struct strbuf parent1_desc
= STRBUF_INIT
;
980 struct strbuf parent2_desc
= STRBUF_INIT
;
982 /* Setup merge options */
983 init_merge_options(&o
, the_repository
);
984 o
.show_rename_progress
= 0;
985 o
.record_conflict_msgs_as_headers
= 1;
986 o
.msg_header_prefix
= "remerge";
988 ctx
.abbrev
= DEFAULT_ABBREV
;
989 repo_format_commit_message(the_repository
, parent1
, "%h (%s)",
990 &parent1_desc
, &ctx
);
991 repo_format_commit_message(the_repository
, parent2
, "%h (%s)",
992 &parent2_desc
, &ctx
);
993 o
.branch1
= parent1_desc
.buf
;
994 o
.branch2
= parent2_desc
.buf
;
996 /* Parse the relevant commits and get the merge bases */
997 parse_commit_or_die(parent1
);
998 parse_commit_or_die(parent2
);
999 bases
= repo_get_merge_bases(the_repository
, parent1
, parent2
);
1001 /* Re-merge the parents */
1002 merge_incore_recursive(&o
, bases
, parent1
, parent2
, &res
);
1005 setup_additional_headers(&opt
->diffopt
, res
.path_messages
);
1006 diff_tree_oid(&res
.tree
->object
.oid
, oid
, "", &opt
->diffopt
);
1007 log_tree_diff_flush(opt
);
1010 cleanup_additional_headers(&opt
->diffopt
);
1011 strbuf_release(&parent1_desc
);
1012 strbuf_release(&parent2_desc
);
1013 merge_finalize(&o
, &res
);
1015 /* Clean up the contents of the temporary object directory */
1016 if (opt
->remerge_objdir
)
1017 tmp_objdir_discard_objects(opt
->remerge_objdir
);
1019 BUG("did a remerge diff without remerge_objdir?!?");
1021 return !opt
->loginfo
;
1025 * Show the diff of a commit.
1027 * Return true if we printed any log info messages
1029 static int log_tree_diff(struct rev_info
*opt
, struct commit
*commit
, struct log_info
*log
)
1032 struct commit_list
*parents
;
1033 struct object_id
*oid
;
1035 int all_need_diff
= opt
->diff
|| opt
->diffopt
.flags
.exit_with_status
;
1037 if (!all_need_diff
&& !opt
->merges_need_diff
)
1040 parse_commit_or_die(commit
);
1041 oid
= get_commit_tree_oid(commit
);
1043 parents
= get_saved_parents(opt
, commit
);
1044 is_merge
= parents
&& parents
->next
;
1045 if (!is_merge
&& !all_need_diff
)
1050 if (opt
->show_root_diff
) {
1051 diff_root_tree_oid(oid
, "", &opt
->diffopt
);
1052 log_tree_diff_flush(opt
);
1054 return !opt
->loginfo
;
1058 int octopus
= (parents
->next
->next
!= NULL
);
1060 if (opt
->remerge_diff
) {
1063 fprintf(opt
->diffopt
.file
,
1064 "diff: warning: Skipping remerge-diff "
1065 "for octopus merges.\n");
1068 return do_remerge_diff(opt
, parents
, oid
);
1070 if (opt
->combine_merges
)
1071 return do_diff_combined(opt
, commit
);
1072 if (opt
->separate_merges
) {
1073 if (!opt
->first_parent_merges
) {
1074 /* Show parent info for multiple diffs */
1075 log
->parent
= parents
->item
;
1083 struct commit
*parent
= parents
->item
;
1085 parse_commit_or_die(parent
);
1086 diff_tree_oid(get_commit_tree_oid(parent
),
1087 oid
, "", &opt
->diffopt
);
1088 log_tree_diff_flush(opt
);
1090 showed_log
|= !opt
->loginfo
;
1092 /* Set up the log info for the next parent, if any.. */
1093 parents
= parents
->next
;
1094 if (!parents
|| opt
->first_parent_merges
)
1096 log
->parent
= parents
->item
;
1102 int log_tree_commit(struct rev_info
*opt
, struct commit
*commit
)
1104 struct log_info log
;
1106 /* maybe called by e.g. cmd_log_walk(), maybe stand-alone */
1107 int no_free
= opt
->diffopt
.no_free
;
1109 log
.commit
= commit
;
1111 opt
->loginfo
= &log
;
1112 opt
->diffopt
.no_free
= 1;
1114 /* NEEDSWORK: no restoring of no_free? Why? */
1115 if (opt
->line_level_traverse
)
1116 return line_log_print(opt
, commit
);
1118 if (opt
->track_linear
&& !opt
->linear
&& !opt
->reverse_output_stage
)
1119 fprintf(opt
->diffopt
.file
, "\n%s\n", opt
->break_bar
);
1120 shown
= log_tree_diff(opt
, commit
, &log
);
1121 if (!shown
&& opt
->loginfo
&& opt
->always_show_header
) {
1126 if (opt
->track_linear
&& !opt
->linear
&& opt
->reverse_output_stage
)
1127 fprintf(opt
->diffopt
.file
, "\n%s\n", opt
->break_bar
);
1128 opt
->loginfo
= NULL
;
1129 maybe_flush_or_die(opt
->diffopt
.file
, "stdout");
1130 opt
->diffopt
.no_free
= no_free
;
1131 diff_free(&opt
->diffopt
);