1 #include "git-compat-util.h"
2 #include "commit-reach.h"
6 #include "environment.h"
8 #include "object-name.h"
9 #include "object-store-ll.h"
10 #include "repository.h"
11 #include "tmp-objdir.h"
16 #include "merge-ort.h"
17 #include "reflog-walk.h"
19 #include "replace-object.h"
21 #include "string-list.h"
23 #include "gpg-interface.h"
24 #include "sequencer.h"
27 #include "range-diff.h"
30 #include "wildmatch.h"
31 #include "write-or-die.h"
33 static struct decoration name_decoration
= { "object names" };
34 static int decoration_loaded
;
35 static int decoration_flags
;
37 static char decoration_colors
[][COLOR_MAXLEN
] = {
39 GIT_COLOR_BOLD_GREEN
, /* REF_LOCAL */
40 GIT_COLOR_BOLD_RED
, /* REF_REMOTE */
41 GIT_COLOR_BOLD_YELLOW
, /* REF_TAG */
42 GIT_COLOR_BOLD_MAGENTA
, /* REF_STASH */
43 GIT_COLOR_BOLD_CYAN
, /* REF_HEAD */
44 GIT_COLOR_BOLD_BLUE
, /* GRAFTED */
47 static const char *color_decorate_slots
[] = {
48 [DECORATION_REF_LOCAL
] = "branch",
49 [DECORATION_REF_REMOTE
] = "remoteBranch",
50 [DECORATION_REF_TAG
] = "tag",
51 [DECORATION_REF_STASH
] = "stash",
52 [DECORATION_REF_HEAD
] = "HEAD",
53 [DECORATION_GRAFTED
] = "grafted",
56 static const char *decorate_get_color(int decorate_use_color
, enum decoration_type ix
)
58 if (want_color(decorate_use_color
))
59 return decoration_colors
[ix
];
63 define_list_config_array(color_decorate_slots
);
65 int parse_decorate_color_config(const char *var
, const char *slot_name
, const char *value
)
67 int slot
= LOOKUP_CONFIG(color_decorate_slots
, slot_name
);
71 return config_error_nonbool(var
);
72 return color_parse(value
, decoration_colors
[slot
]);
76 * log-tree.c uses DIFF_OPT_TST for determining whether to use color
77 * for showing the commit sha1, use the same check for --decorate
79 #define decorate_get_color_opt(o, ix) \
80 decorate_get_color((o)->use_color, ix)
82 void add_name_decoration(enum decoration_type type
, const char *name
, struct object
*obj
)
84 struct name_decoration
*res
;
85 FLEX_ALLOC_STR(res
, name
, name
);
87 res
->next
= add_decoration(&name_decoration
, obj
, res
);
90 const struct name_decoration
*get_name_decoration(const struct object
*obj
)
92 load_ref_decorations(NULL
, DECORATE_SHORT_REFS
);
93 return lookup_decoration(&name_decoration
, obj
);
96 static int match_ref_pattern(const char *refname
,
97 const struct string_list_item
*item
)
101 if (!wildmatch(item
->string
, refname
, 0))
105 if (skip_prefix(refname
, item
->string
, &rest
) &&
106 (!*rest
|| *rest
== '/'))
112 static int ref_filter_match(const char *refname
,
113 const struct decoration_filter
*filter
)
115 struct string_list_item
*item
;
116 const struct string_list
*exclude_patterns
= filter
->exclude_ref_pattern
;
117 const struct string_list
*include_patterns
= filter
->include_ref_pattern
;
118 const struct string_list
*exclude_patterns_config
=
119 filter
->exclude_ref_config_pattern
;
121 if (exclude_patterns
&& exclude_patterns
->nr
) {
122 for_each_string_list_item(item
, exclude_patterns
) {
123 if (match_ref_pattern(refname
, item
))
128 if (include_patterns
&& include_patterns
->nr
) {
129 for_each_string_list_item(item
, include_patterns
) {
130 if (match_ref_pattern(refname
, item
))
136 if (exclude_patterns_config
&& exclude_patterns_config
->nr
) {
137 for_each_string_list_item(item
, exclude_patterns_config
) {
138 if (match_ref_pattern(refname
, item
))
146 static int add_ref_decoration(const char *refname
, const struct object_id
*oid
,
152 enum object_type objtype
;
153 enum decoration_type deco_type
= DECORATION_NONE
;
154 struct decoration_filter
*filter
= (struct decoration_filter
*)cb_data
;
155 const char *git_replace_ref_base
= ref_namespace
[NAMESPACE_REPLACE
].ref
;
157 if (filter
&& !ref_filter_match(refname
, filter
))
160 if (starts_with(refname
, git_replace_ref_base
)) {
161 struct object_id original_oid
;
162 if (!replace_refs_enabled(the_repository
))
164 if (get_oid_hex(refname
+ strlen(git_replace_ref_base
),
166 warning("invalid replace ref %s", refname
);
169 obj
= parse_object(the_repository
, &original_oid
);
171 add_name_decoration(DECORATION_GRAFTED
, "replaced", obj
);
175 objtype
= oid_object_info(the_repository
, oid
, NULL
);
178 obj
= lookup_object_by_type(the_repository
, oid
, objtype
);
180 for (i
= 0; i
< ARRAY_SIZE(ref_namespace
); i
++) {
181 struct ref_namespace_info
*info
= &ref_namespace
[i
];
183 if (!info
->decoration
)
186 if (!strcmp(refname
, info
->ref
)) {
187 deco_type
= info
->decoration
;
190 } else if (starts_with(refname
, info
->ref
)) {
191 deco_type
= info
->decoration
;
196 add_name_decoration(deco_type
, refname
, obj
);
197 while (obj
->type
== OBJ_TAG
) {
199 parse_object(the_repository
, &obj
->oid
);
200 obj
= ((struct tag
*)obj
)->tagged
;
203 add_name_decoration(DECORATION_REF_TAG
, refname
, obj
);
208 static int add_graft_decoration(const struct commit_graft
*graft
,
209 void *cb_data UNUSED
)
211 struct commit
*commit
= lookup_commit(the_repository
, &graft
->oid
);
214 add_name_decoration(DECORATION_GRAFTED
, "grafted", &commit
->object
);
218 void load_ref_decorations(struct decoration_filter
*filter
, int flags
)
220 if (!decoration_loaded
) {
222 struct string_list_item
*item
;
223 for_each_string_list_item(item
, filter
->exclude_ref_pattern
) {
224 normalize_glob_ref(item
, NULL
, item
->string
);
226 for_each_string_list_item(item
, filter
->include_ref_pattern
) {
227 normalize_glob_ref(item
, NULL
, item
->string
);
229 for_each_string_list_item(item
, filter
->exclude_ref_config_pattern
) {
230 normalize_glob_ref(item
, NULL
, item
->string
);
233 decoration_loaded
= 1;
234 decoration_flags
= flags
;
235 for_each_ref(add_ref_decoration
, filter
);
236 head_ref(add_ref_decoration
, filter
);
237 for_each_commit_graft(add_graft_decoration
, filter
);
241 static void show_parents(struct commit
*commit
, int abbrev
, FILE *file
)
243 struct commit_list
*p
;
244 for (p
= commit
->parents
; p
; p
= p
->next
) {
245 struct commit
*parent
= p
->item
;
247 repo_find_unique_abbrev(the_repository
, &parent
->object
.oid
, abbrev
));
251 static void show_children(struct rev_info
*opt
, struct commit
*commit
, int abbrev
)
253 struct commit_list
*p
= lookup_decoration(&opt
->children
, &commit
->object
);
254 for ( ; p
; p
= p
->next
) {
255 fprintf(opt
->diffopt
.file
, " %s",
256 repo_find_unique_abbrev(the_repository
, &p
->item
->object
.oid
, abbrev
));
261 * Do we have HEAD in the output, and also the branch it points at?
262 * If so, find that decoration entry for that current branch.
264 static const struct name_decoration
*current_pointed_by_HEAD(const struct name_decoration
*decoration
)
266 const struct name_decoration
*list
, *head
= NULL
;
267 const char *branch_name
= NULL
;
270 /* First find HEAD */
271 for (list
= decoration
; list
; list
= list
->next
)
272 if (list
->type
== DECORATION_REF_HEAD
) {
279 /* Now resolve and find the matching current branch */
280 branch_name
= resolve_ref_unsafe("HEAD", 0, NULL
, &rru_flags
);
281 if (!branch_name
|| !(rru_flags
& REF_ISSYMREF
))
284 if (!starts_with(branch_name
, "refs/"))
287 /* OK, do we have that ref in the list? */
288 for (list
= decoration
; list
; list
= list
->next
)
289 if ((list
->type
== DECORATION_REF_LOCAL
) &&
290 !strcmp(branch_name
, list
->name
)) {
297 static void show_name(struct strbuf
*sb
, const struct name_decoration
*decoration
)
299 if (decoration_flags
== DECORATE_SHORT_REFS
)
300 strbuf_addstr(sb
, prettify_refname(decoration
->name
));
302 strbuf_addstr(sb
, decoration
->name
);
306 * The caller makes sure there is no funny color before calling.
307 * format_decorations ensures the same after return.
309 void format_decorations(struct strbuf
*sb
,
310 const struct commit
*commit
,
312 const struct decoration_options
*opts
)
314 const struct name_decoration
*decoration
;
315 const struct name_decoration
*current_and_HEAD
;
316 const char *color_commit
, *color_reset
;
318 const char *prefix
= " (";
319 const char *suffix
= ")";
320 const char *separator
= ", ";
321 const char *pointer
= " -> ";
322 const char *tag
= "tag: ";
324 decoration
= get_name_decoration(&commit
->object
);
330 prefix
= opts
->prefix
;
332 suffix
= opts
->suffix
;
334 separator
= opts
->separator
;
336 pointer
= opts
->pointer
;
341 color_commit
= diff_get_color(use_color
, DIFF_COMMIT
);
342 color_reset
= decorate_get_color(use_color
, DECORATION_NONE
);
344 current_and_HEAD
= current_pointed_by_HEAD(decoration
);
347 * When both current and HEAD are there, only
348 * show HEAD->current where HEAD would have
349 * appeared, skipping the entry for current.
351 if (decoration
!= current_and_HEAD
) {
353 decorate_get_color(use_color
, decoration
->type
);
356 strbuf_addstr(sb
, color_commit
);
357 strbuf_addstr(sb
, prefix
);
358 strbuf_addstr(sb
, color_reset
);
361 if (*tag
&& decoration
->type
== DECORATION_REF_TAG
) {
362 strbuf_addstr(sb
, color
);
363 strbuf_addstr(sb
, tag
);
364 strbuf_addstr(sb
, color_reset
);
367 strbuf_addstr(sb
, color
);
368 show_name(sb
, decoration
);
369 strbuf_addstr(sb
, color_reset
);
371 if (current_and_HEAD
&&
372 decoration
->type
== DECORATION_REF_HEAD
) {
373 strbuf_addstr(sb
, color_commit
);
374 strbuf_addstr(sb
, pointer
);
375 strbuf_addstr(sb
, color_reset
);
376 strbuf_addstr(sb
, decorate_get_color(use_color
, current_and_HEAD
->type
));
377 show_name(sb
, current_and_HEAD
);
378 strbuf_addstr(sb
, color_reset
);
383 decoration
= decoration
->next
;
386 strbuf_addstr(sb
, color_commit
);
387 strbuf_addstr(sb
, suffix
);
388 strbuf_addstr(sb
, color_reset
);
392 void show_decorations(struct rev_info
*opt
, struct commit
*commit
)
394 struct strbuf sb
= STRBUF_INIT
;
397 char **slot
= revision_sources_peek(opt
->sources
, commit
);
400 fprintf(opt
->diffopt
.file
, "\t%s", *slot
);
402 if (!opt
->show_decorations
)
404 format_decorations(&sb
, commit
, opt
->diffopt
.use_color
, NULL
);
405 fputs(sb
.buf
, opt
->diffopt
.file
);
409 static unsigned int digits_in_number(unsigned int number
)
411 unsigned int i
= 10, result
= 1;
412 while (i
<= number
) {
419 void fmt_output_subject(struct strbuf
*filename
,
421 struct rev_info
*info
)
423 const char *suffix
= info
->patch_suffix
;
425 int start_len
= filename
->len
;
426 int max_len
= start_len
+ info
->patch_name_max
- (strlen(suffix
) + 1);
428 if (info
->reroll_count
) {
429 struct strbuf temp
= STRBUF_INIT
;
431 strbuf_addf(&temp
, "v%s", info
->reroll_count
);
432 format_sanitized_subject(filename
, temp
.buf
, temp
.len
);
433 strbuf_addstr(filename
, "-");
434 strbuf_release(&temp
);
436 strbuf_addf(filename
, "%04d-%s", nr
, subject
);
438 if (max_len
< filename
->len
)
439 strbuf_setlen(filename
, max_len
);
440 strbuf_addstr(filename
, suffix
);
443 void fmt_output_commit(struct strbuf
*filename
,
444 struct commit
*commit
,
445 struct rev_info
*info
)
447 struct pretty_print_context ctx
= {0};
448 struct strbuf subject
= STRBUF_INIT
;
450 repo_format_commit_message(the_repository
, commit
, "%f", &subject
,
452 fmt_output_subject(filename
, subject
.buf
, info
);
453 strbuf_release(&subject
);
456 void fmt_output_email_subject(struct strbuf
*sb
, struct rev_info
*opt
)
458 if (opt
->total
> 0) {
459 strbuf_addf(sb
, "Subject: [%s%s%0*d/%d] ",
461 *opt
->subject_prefix
? " " : "",
462 digits_in_number(opt
->total
),
463 opt
->nr
, opt
->total
);
464 } else if (opt
->total
== 0 && opt
->subject_prefix
&& *opt
->subject_prefix
) {
465 strbuf_addf(sb
, "Subject: [%s] ",
466 opt
->subject_prefix
);
468 strbuf_addstr(sb
, "Subject: ");
472 void log_write_email_headers(struct rev_info
*opt
, struct commit
*commit
,
473 char **extra_headers_p
,
474 int *need_8bit_cte_p
,
477 char *extra_headers
= xstrdup_or_null(opt
->extra_headers
);
478 const char *name
= oid_to_hex(opt
->zero_commit
?
479 null_oid() : &commit
->object
.oid
);
481 *need_8bit_cte_p
= 0; /* unknown */
483 fprintf(opt
->diffopt
.file
, "From %s Mon Sep 17 00:00:00 2001\n", name
);
484 graph_show_oneline(opt
->graph
);
485 if (opt
->message_id
) {
486 fprintf(opt
->diffopt
.file
, "Message-ID: <%s>\n", opt
->message_id
);
487 graph_show_oneline(opt
->graph
);
489 if (opt
->ref_message_ids
&& opt
->ref_message_ids
->nr
> 0) {
491 n
= opt
->ref_message_ids
->nr
;
492 fprintf(opt
->diffopt
.file
, "In-Reply-To: <%s>\n", opt
->ref_message_ids
->items
[n
-1].string
);
493 for (i
= 0; i
< n
; i
++)
494 fprintf(opt
->diffopt
.file
, "%s<%s>\n", (i
> 0 ? "\t" : "References: "),
495 opt
->ref_message_ids
->items
[i
].string
);
496 graph_show_oneline(opt
->graph
);
498 if (opt
->mime_boundary
&& maybe_multipart
) {
499 struct strbuf subject_buffer
= STRBUF_INIT
;
500 static struct strbuf buffer
= STRBUF_INIT
;
501 struct strbuf filename
= STRBUF_INIT
;
502 *need_8bit_cte_p
= -1; /* NEVER */
504 strbuf_reset(&buffer
);
506 strbuf_addf(&subject_buffer
,
508 "MIME-Version: 1.0\n"
509 "Content-Type: multipart/mixed;"
510 " boundary=\"%s%s\"\n"
512 "This is a multi-part message in MIME "
515 "Content-Type: text/plain; "
516 "charset=UTF-8; format=fixed\n"
517 "Content-Transfer-Encoding: 8bit\n\n",
518 extra_headers
? extra_headers
: "",
519 mime_boundary_leader
, opt
->mime_boundary
,
520 mime_boundary_leader
, opt
->mime_boundary
);
522 extra_headers
= strbuf_detach(&subject_buffer
, NULL
);
524 if (opt
->numbered_files
)
525 strbuf_addf(&filename
, "%d", opt
->nr
);
527 fmt_output_commit(&filename
, commit
, opt
);
530 "Content-Type: text/x-patch;"
532 "Content-Transfer-Encoding: 8bit\n"
533 "Content-Disposition: %s;"
534 " filename=\"%s\"\n\n",
535 mime_boundary_leader
, opt
->mime_boundary
,
537 opt
->no_inline
? "attachment" : "inline",
539 opt
->diffopt
.stat_sep
= buffer
.buf
;
540 strbuf_release(&filename
);
542 *extra_headers_p
= extra_headers
;
545 static void show_sig_lines(struct rev_info
*opt
, int status
, const char *bol
)
547 const char *color
, *reset
, *eol
;
549 color
= diff_get_color_opt(&opt
->diffopt
,
550 status
? DIFF_WHITESPACE
: DIFF_FRAGINFO
);
551 reset
= diff_get_color_opt(&opt
->diffopt
, DIFF_RESET
);
553 eol
= strchrnul(bol
, '\n');
554 fprintf(opt
->diffopt
.file
, "%s%.*s%s%s", color
, (int)(eol
- bol
), bol
, reset
,
556 graph_show_oneline(opt
->graph
);
557 bol
= (*eol
) ? (eol
+ 1) : eol
;
561 static void show_signature(struct rev_info
*opt
, struct commit
*commit
)
563 struct strbuf payload
= STRBUF_INIT
;
564 struct strbuf signature
= STRBUF_INIT
;
565 struct signature_check sigc
= { 0 };
568 if (parse_signed_commit(commit
, &payload
, &signature
, the_hash_algo
) <= 0)
571 sigc
.payload_type
= SIGNATURE_PAYLOAD_COMMIT
;
572 sigc
.payload
= strbuf_detach(&payload
, &sigc
.payload_len
);
573 status
= check_signature(&sigc
, signature
.buf
, signature
.len
);
574 if (status
&& !sigc
.output
)
575 show_sig_lines(opt
, status
, "No signature\n");
577 show_sig_lines(opt
, status
, sigc
.output
);
578 signature_check_clear(&sigc
);
581 strbuf_release(&payload
);
582 strbuf_release(&signature
);
585 static int which_parent(const struct object_id
*oid
, const struct commit
*commit
)
588 const struct commit_list
*parent
;
590 for (nth
= 0, parent
= commit
->parents
; parent
; parent
= parent
->next
) {
591 if (oideq(&parent
->item
->object
.oid
, oid
))
598 static int is_common_merge(const struct commit
*commit
)
600 return (commit
->parents
601 && commit
->parents
->next
602 && !commit
->parents
->next
->next
);
605 static int show_one_mergetag(struct commit
*commit
,
606 struct commit_extra_header
*extra
,
609 struct rev_info
*opt
= (struct rev_info
*)data
;
610 struct object_id oid
;
612 struct strbuf verify_message
;
613 struct signature_check sigc
= { 0 };
615 struct strbuf payload
= STRBUF_INIT
;
616 struct strbuf signature
= STRBUF_INIT
;
618 hash_object_file(the_hash_algo
, extra
->value
, extra
->len
,
620 tag
= lookup_tag(the_repository
, &oid
);
622 return -1; /* error message already given */
624 strbuf_init(&verify_message
, 256);
625 if (parse_tag_buffer(the_repository
, tag
, extra
->value
, extra
->len
))
626 strbuf_addstr(&verify_message
, "malformed mergetag\n");
627 else if (is_common_merge(commit
) &&
628 oideq(&tag
->tagged
->oid
,
629 &commit
->parents
->next
->item
->object
.oid
))
630 strbuf_addf(&verify_message
,
631 "merged tag '%s'\n", tag
->tag
);
632 else if ((nth
= which_parent(&tag
->tagged
->oid
, commit
)) < 0)
633 strbuf_addf(&verify_message
, "tag %s names a non-parent %s\n",
634 tag
->tag
, oid_to_hex(&tag
->tagged
->oid
));
636 strbuf_addf(&verify_message
,
637 "parent #%d, tagged '%s'\n", nth
+ 1, tag
->tag
);
640 if (parse_signature(extra
->value
, extra
->len
, &payload
, &signature
)) {
641 /* could have a good signature */
642 sigc
.payload_type
= SIGNATURE_PAYLOAD_TAG
;
643 sigc
.payload
= strbuf_detach(&payload
, &sigc
.payload_len
);
644 status
= check_signature(&sigc
, signature
.buf
, signature
.len
);
646 strbuf_addstr(&verify_message
, sigc
.output
);
648 strbuf_addstr(&verify_message
, "No signature\n");
649 signature_check_clear(&sigc
);
650 /* otherwise we couldn't verify, which is shown as bad */
653 show_sig_lines(opt
, status
, verify_message
.buf
);
654 strbuf_release(&verify_message
);
655 strbuf_release(&payload
);
656 strbuf_release(&signature
);
660 static int show_mergetag(struct rev_info
*opt
, struct commit
*commit
)
662 return for_each_mergetag(show_one_mergetag
, commit
, opt
);
665 static void next_commentary_block(struct rev_info
*opt
, struct strbuf
*sb
)
667 const char *x
= opt
->shown_dashes
? "\n" : "---\n";
669 strbuf_addstr(sb
, x
);
671 fputs(x
, opt
->diffopt
.file
);
672 opt
->shown_dashes
= 1;
675 void show_log(struct rev_info
*opt
)
677 struct strbuf msgbuf
= STRBUF_INIT
;
678 struct log_info
*log
= opt
->loginfo
;
679 struct commit
*commit
= log
->commit
, *parent
= log
->parent
;
680 int abbrev_commit
= opt
->abbrev_commit
? opt
->abbrev
: the_hash_algo
->hexsz
;
681 struct pretty_print_context ctx
= {0};
684 if (!opt
->verbose_header
) {
685 graph_show_commit(opt
->graph
);
688 put_revision_mark(opt
, commit
);
689 fputs(repo_find_unique_abbrev(the_repository
, &commit
->object
.oid
, abbrev_commit
),
691 if (opt
->print_parents
)
692 show_parents(commit
, abbrev_commit
, opt
->diffopt
.file
);
693 if (opt
->children
.name
)
694 show_children(opt
, commit
, abbrev_commit
);
695 show_decorations(opt
, commit
);
696 if (opt
->graph
&& !graph_is_commit_finished(opt
->graph
)) {
697 putc('\n', opt
->diffopt
.file
);
698 graph_show_remainder(opt
->graph
);
700 putc(opt
->diffopt
.line_termination
, opt
->diffopt
.file
);
705 * If use_terminator is set, we already handled any record termination
706 * at the end of the last record.
707 * Otherwise, add a diffopt.line_termination character before all
708 * entries but the first. (IOW, as a separator between entries)
710 if (opt
->shown_one
&& !opt
->use_terminator
) {
712 * If entries are separated by a newline, the output
713 * should look human-readable. If the last entry ended
714 * with a newline, print the graph output before this
715 * newline. Otherwise it will end up as a completely blank
716 * line and will look like a gap in the graph.
718 * If the entry separator is not a newline, the output is
719 * primarily intended for programmatic consumption, and we
720 * never want the extra graph output before the entry
723 if (opt
->diffopt
.line_termination
== '\n' &&
724 !opt
->missing_newline
)
725 graph_show_padding(opt
->graph
);
726 putc(opt
->diffopt
.line_termination
, opt
->diffopt
.file
);
731 * If the history graph was requested,
732 * print the graph, up to this commit's line
734 graph_show_commit(opt
->graph
);
737 * Print header line of header..
740 if (cmit_fmt_is_mail(opt
->commit_format
)) {
741 log_write_email_headers(opt
, commit
, &ctx
.after_subject
,
742 &ctx
.need_8bit_cte
, 1);
744 } else if (opt
->commit_format
!= CMIT_FMT_USERFORMAT
) {
745 fputs(diff_get_color_opt(&opt
->diffopt
, DIFF_COMMIT
), opt
->diffopt
.file
);
746 if (opt
->commit_format
!= CMIT_FMT_ONELINE
)
747 fputs("commit ", opt
->diffopt
.file
);
750 put_revision_mark(opt
, commit
);
751 fputs(repo_find_unique_abbrev(the_repository
, &commit
->object
.oid
,
754 if (opt
->print_parents
)
755 show_parents(commit
, abbrev_commit
, opt
->diffopt
.file
);
756 if (opt
->children
.name
)
757 show_children(opt
, commit
, abbrev_commit
);
759 fprintf(opt
->diffopt
.file
, " (from %s)",
760 repo_find_unique_abbrev(the_repository
, &parent
->object
.oid
, abbrev_commit
));
761 fputs(diff_get_color_opt(&opt
->diffopt
, DIFF_RESET
), opt
->diffopt
.file
);
762 show_decorations(opt
, commit
);
763 if (opt
->commit_format
== CMIT_FMT_ONELINE
) {
764 putc(' ', opt
->diffopt
.file
);
766 putc('\n', opt
->diffopt
.file
);
767 graph_show_oneline(opt
->graph
);
769 if (opt
->reflog_info
) {
771 * setup_revisions() ensures that opt->reflog_info
772 * and opt->graph cannot both be set,
773 * so we don't need to worry about printing the
776 show_reflog_message(opt
->reflog_info
,
777 opt
->commit_format
== CMIT_FMT_ONELINE
,
779 opt
->date_mode_explicit
);
780 if (opt
->commit_format
== CMIT_FMT_ONELINE
)
785 if (opt
->show_signature
) {
786 show_signature(opt
, commit
);
787 show_mergetag(opt
, commit
);
790 if (opt
->show_notes
) {
792 struct strbuf notebuf
= STRBUF_INIT
;
794 raw
= (opt
->commit_format
== CMIT_FMT_USERFORMAT
);
795 format_display_notes(&commit
->object
.oid
, ¬ebuf
,
796 get_log_output_encoding(), raw
);
797 ctx
.notes_message
= strbuf_detach(¬ebuf
, NULL
);
801 * And then the pretty-printed message itself
803 if (ctx
.need_8bit_cte
>= 0 && opt
->add_signoff
)
805 has_non_ascii(fmt_name(WANT_COMMITTER_IDENT
));
806 ctx
.date_mode
= opt
->date_mode
;
807 ctx
.date_mode_explicit
= opt
->date_mode_explicit
;
808 ctx
.abbrev
= opt
->diffopt
.abbrev
;
809 ctx
.preserve_subject
= opt
->preserve_subject
;
810 ctx
.encode_email_headers
= opt
->encode_email_headers
;
811 ctx
.reflog_info
= opt
->reflog_info
;
812 ctx
.fmt
= opt
->commit_format
;
813 ctx
.mailmap
= opt
->mailmap
;
814 ctx
.color
= opt
->diffopt
.use_color
;
815 ctx
.expand_tabs_in_log
= opt
->expand_tabs_in_log
;
816 ctx
.output_encoding
= get_log_output_encoding();
818 if (opt
->from_ident
.mail_begin
&& opt
->from_ident
.name_begin
)
819 ctx
.from_ident
= &opt
->from_ident
;
821 ctx
.graph_width
= graph_width(opt
->graph
);
822 pretty_print_commit(&ctx
, commit
, &msgbuf
);
824 if (opt
->add_signoff
)
825 append_signoff(&msgbuf
, 0, APPEND_SIGNOFF_DEDUP
);
827 if ((ctx
.fmt
!= CMIT_FMT_USERFORMAT
) &&
828 ctx
.notes_message
&& *ctx
.notes_message
) {
829 if (cmit_fmt_is_mail(ctx
.fmt
))
830 next_commentary_block(opt
, &msgbuf
);
831 strbuf_addstr(&msgbuf
, ctx
.notes_message
);
834 if (opt
->show_log_size
) {
835 fprintf(opt
->diffopt
.file
, "log size %i\n", (int)msgbuf
.len
);
836 graph_show_oneline(opt
->graph
);
840 * Set opt->missing_newline if msgbuf doesn't
841 * end in a newline (including if it is empty)
843 if (!msgbuf
.len
|| msgbuf
.buf
[msgbuf
.len
- 1] != '\n')
844 opt
->missing_newline
= 1;
846 opt
->missing_newline
= 0;
848 graph_show_commit_msg(opt
->graph
, opt
->diffopt
.file
, &msgbuf
);
849 if (opt
->use_terminator
&& !commit_format_is_empty(opt
->commit_format
)) {
850 if (!opt
->missing_newline
)
851 graph_show_padding(opt
->graph
);
852 putc(opt
->diffopt
.line_termination
, opt
->diffopt
.file
);
855 strbuf_release(&msgbuf
);
856 free(ctx
.notes_message
);
857 free(ctx
.after_subject
);
859 if (cmit_fmt_is_mail(ctx
.fmt
) && opt
->idiff_oid1
) {
860 struct diff_queue_struct dq
;
862 memcpy(&dq
, &diff_queued_diff
, sizeof(diff_queued_diff
));
863 DIFF_QUEUE_CLEAR(&diff_queued_diff
);
865 next_commentary_block(opt
, NULL
);
866 fprintf_ln(opt
->diffopt
.file
, "%s", opt
->idiff_title
);
867 show_interdiff(opt
->idiff_oid1
, opt
->idiff_oid2
, 2,
870 memcpy(&diff_queued_diff
, &dq
, sizeof(diff_queued_diff
));
873 if (cmit_fmt_is_mail(ctx
.fmt
) && opt
->rdiff1
) {
874 struct diff_queue_struct dq
;
875 struct diff_options opts
;
876 struct range_diff_options range_diff_opts
= {
877 .creation_factor
= opt
->creation_factor
,
882 memcpy(&dq
, &diff_queued_diff
, sizeof(diff_queued_diff
));
883 DIFF_QUEUE_CLEAR(&diff_queued_diff
);
885 next_commentary_block(opt
, NULL
);
886 fprintf_ln(opt
->diffopt
.file
, "%s", opt
->rdiff_title
);
888 * Pass minimum required diff-options to range-diff; others
889 * can be added later if deemed desirable.
891 repo_diff_setup(the_repository
, &opts
);
892 opts
.file
= opt
->diffopt
.file
;
893 opts
.use_color
= opt
->diffopt
.use_color
;
894 diff_setup_done(&opts
);
895 show_range_diff(opt
->rdiff1
, opt
->rdiff2
, &range_diff_opts
);
897 memcpy(&diff_queued_diff
, &dq
, sizeof(diff_queued_diff
));
901 int log_tree_diff_flush(struct rev_info
*opt
)
903 opt
->shown_dashes
= 0;
904 diffcore_std(&opt
->diffopt
);
906 if (diff_queue_is_empty(&opt
->diffopt
)) {
907 int saved_fmt
= opt
->diffopt
.output_format
;
908 opt
->diffopt
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
909 diff_flush(&opt
->diffopt
);
910 opt
->diffopt
.output_format
= saved_fmt
;
914 if (opt
->loginfo
&& !opt
->no_commit_id
) {
916 if ((opt
->diffopt
.output_format
& ~DIFF_FORMAT_NO_OUTPUT
) &&
917 opt
->verbose_header
&&
918 opt
->commit_format
!= CMIT_FMT_ONELINE
&&
919 !commit_format_is_empty(opt
->commit_format
)) {
921 * When showing a verbose header (i.e. log message),
922 * and not in --pretty=oneline format, we would want
923 * an extra newline between the end of log and the
924 * diff/diffstat output for readability.
926 int pch
= DIFF_FORMAT_DIFFSTAT
| DIFF_FORMAT_PATCH
;
927 if (opt
->diffopt
.output_prefix
) {
928 struct strbuf
*msg
= NULL
;
929 msg
= opt
->diffopt
.output_prefix(&opt
->diffopt
,
930 opt
->diffopt
.output_prefix_data
);
931 fwrite(msg
->buf
, msg
->len
, 1, opt
->diffopt
.file
);
935 * We may have shown three-dashes line early
936 * between generated commentary (notes, etc.)
937 * and the log message, in which case we only
938 * want a blank line after the commentary
939 * without (an extra) three-dashes line.
940 * Otherwise, we show the three-dashes line if
941 * we are showing the patch with diffstat, but
942 * in that case, there is no extra blank line
943 * after the three-dashes line.
945 if (!opt
->shown_dashes
&&
946 (pch
& opt
->diffopt
.output_format
) == pch
)
947 fprintf(opt
->diffopt
.file
, "---");
948 putc('\n', opt
->diffopt
.file
);
951 diff_flush(&opt
->diffopt
);
955 static int do_diff_combined(struct rev_info
*opt
, struct commit
*commit
)
957 diff_tree_combined_merge(commit
, opt
);
958 return !opt
->loginfo
;
961 static void setup_additional_headers(struct diff_options
*o
,
962 struct strmap
*all_headers
)
964 struct hashmap_iter iter
;
965 struct strmap_entry
*entry
;
968 * Make o->additional_path_headers contain the subset of all_headers
969 * that match o->pathspec. If there aren't any that match o->pathspec,
970 * then make o->additional_path_headers be NULL.
973 if (!o
->pathspec
.nr
) {
974 o
->additional_path_headers
= all_headers
;
978 o
->additional_path_headers
= xmalloc(sizeof(struct strmap
));
979 strmap_init_with_options(o
->additional_path_headers
, NULL
, 0);
980 strmap_for_each_entry(all_headers
, &iter
, entry
) {
981 if (match_pathspec(the_repository
->index
, &o
->pathspec
,
982 entry
->key
, strlen(entry
->key
),
983 0 /* prefix */, NULL
/* seen */,
985 strmap_put(o
->additional_path_headers
,
986 entry
->key
, entry
->value
);
988 if (!strmap_get_size(o
->additional_path_headers
)) {
989 strmap_clear(o
->additional_path_headers
, 0);
990 FREE_AND_NULL(o
->additional_path_headers
);
994 static void cleanup_additional_headers(struct diff_options
*o
)
996 if (!o
->pathspec
.nr
) {
997 o
->additional_path_headers
= NULL
;
1000 if (!o
->additional_path_headers
)
1003 strmap_clear(o
->additional_path_headers
, 0);
1004 FREE_AND_NULL(o
->additional_path_headers
);
1007 static int do_remerge_diff(struct rev_info
*opt
,
1008 struct commit_list
*parents
,
1009 struct object_id
*oid
)
1011 struct merge_options o
;
1012 struct commit_list
*bases
;
1013 struct merge_result res
= {0};
1014 struct pretty_print_context ctx
= {0};
1015 struct commit
*parent1
= parents
->item
;
1016 struct commit
*parent2
= parents
->next
->item
;
1017 struct strbuf parent1_desc
= STRBUF_INIT
;
1018 struct strbuf parent2_desc
= STRBUF_INIT
;
1020 /* Setup merge options */
1021 init_merge_options(&o
, the_repository
);
1022 o
.show_rename_progress
= 0;
1023 o
.record_conflict_msgs_as_headers
= 1;
1024 o
.msg_header_prefix
= "remerge";
1026 ctx
.abbrev
= DEFAULT_ABBREV
;
1027 repo_format_commit_message(the_repository
, parent1
, "%h (%s)",
1028 &parent1_desc
, &ctx
);
1029 repo_format_commit_message(the_repository
, parent2
, "%h (%s)",
1030 &parent2_desc
, &ctx
);
1031 o
.branch1
= parent1_desc
.buf
;
1032 o
.branch2
= parent2_desc
.buf
;
1034 /* Parse the relevant commits and get the merge bases */
1035 parse_commit_or_die(parent1
);
1036 parse_commit_or_die(parent2
);
1037 bases
= repo_get_merge_bases(the_repository
, parent1
, parent2
);
1039 /* Re-merge the parents */
1040 merge_incore_recursive(&o
, bases
, parent1
, parent2
, &res
);
1043 setup_additional_headers(&opt
->diffopt
, res
.path_messages
);
1044 diff_tree_oid(&res
.tree
->object
.oid
, oid
, "", &opt
->diffopt
);
1045 log_tree_diff_flush(opt
);
1048 cleanup_additional_headers(&opt
->diffopt
);
1049 strbuf_release(&parent1_desc
);
1050 strbuf_release(&parent2_desc
);
1051 merge_finalize(&o
, &res
);
1053 /* Clean up the contents of the temporary object directory */
1054 if (opt
->remerge_objdir
)
1055 tmp_objdir_discard_objects(opt
->remerge_objdir
);
1057 BUG("did a remerge diff without remerge_objdir?!?");
1059 return !opt
->loginfo
;
1063 * Show the diff of a commit.
1065 * Return true if we printed any log info messages
1067 static int log_tree_diff(struct rev_info
*opt
, struct commit
*commit
, struct log_info
*log
)
1070 struct commit_list
*parents
;
1071 struct object_id
*oid
;
1073 int all_need_diff
= opt
->diff
|| opt
->diffopt
.flags
.exit_with_status
;
1075 if (!all_need_diff
&& !opt
->merges_need_diff
)
1078 parse_commit_or_die(commit
);
1079 oid
= get_commit_tree_oid(commit
);
1081 parents
= get_saved_parents(opt
, commit
);
1082 is_merge
= parents
&& parents
->next
;
1083 if (!is_merge
&& !all_need_diff
)
1088 if (opt
->show_root_diff
) {
1089 diff_root_tree_oid(oid
, "", &opt
->diffopt
);
1090 log_tree_diff_flush(opt
);
1092 return !opt
->loginfo
;
1096 int octopus
= (parents
->next
->next
!= NULL
);
1098 if (opt
->remerge_diff
) {
1101 fprintf(opt
->diffopt
.file
,
1102 "diff: warning: Skipping remerge-diff "
1103 "for octopus merges.\n");
1106 return do_remerge_diff(opt
, parents
, oid
);
1108 if (opt
->combine_merges
)
1109 return do_diff_combined(opt
, commit
);
1110 if (opt
->separate_merges
) {
1111 if (!opt
->first_parent_merges
) {
1112 /* Show parent info for multiple diffs */
1113 log
->parent
= parents
->item
;
1121 struct commit
*parent
= parents
->item
;
1123 parse_commit_or_die(parent
);
1124 diff_tree_oid(get_commit_tree_oid(parent
),
1125 oid
, "", &opt
->diffopt
);
1126 log_tree_diff_flush(opt
);
1128 showed_log
|= !opt
->loginfo
;
1130 /* Set up the log info for the next parent, if any.. */
1131 parents
= parents
->next
;
1132 if (!parents
|| opt
->first_parent_merges
)
1134 log
->parent
= parents
->item
;
1140 int log_tree_commit(struct rev_info
*opt
, struct commit
*commit
)
1142 struct log_info log
;
1144 /* maybe called by e.g. cmd_log_walk(), maybe stand-alone */
1145 int no_free
= opt
->diffopt
.no_free
;
1147 log
.commit
= commit
;
1149 opt
->loginfo
= &log
;
1150 opt
->diffopt
.no_free
= 1;
1152 /* NEEDSWORK: no restoring of no_free? Why? */
1153 if (opt
->line_level_traverse
)
1154 return line_log_print(opt
, commit
);
1156 if (opt
->track_linear
&& !opt
->linear
&& !opt
->reverse_output_stage
)
1157 fprintf(opt
->diffopt
.file
, "\n%s\n", opt
->break_bar
);
1158 shown
= log_tree_diff(opt
, commit
, &log
);
1159 if (!shown
&& opt
->loginfo
&& opt
->always_show_header
) {
1164 if (opt
->track_linear
&& !opt
->linear
&& opt
->reverse_output_stage
)
1165 fprintf(opt
->diffopt
.file
, "\n%s\n", opt
->break_bar
);
1166 opt
->loginfo
= NULL
;
1167 maybe_flush_or_die(opt
->diffopt
.file
, "stdout");
1168 opt
->diffopt
.no_free
= no_free
;
1169 diff_free(&opt
->diffopt
);