]>
Commit | Line | Data |
---|---|---|
5f1c3f07 | 1 | #include "cache.h" |
b2141fc1 | 2 | #include "config.h" |
5f1c3f07 | 3 | #include "diff.h" |
cbd53a21 | 4 | #include "object-store.h" |
109cd76d | 5 | #include "repository.h" |
5f1c3f07 | 6 | #include "commit.h" |
cab4feb6 | 7 | #include "tag.h" |
7fefda5c | 8 | #include "graph.h" |
5f1c3f07 | 9 | #include "log-tree.h" |
8860fd42 | 10 | #include "reflog-walk.h" |
cab4feb6 | 11 | #include "refs.h" |
b079c50e | 12 | #include "string-list.h" |
67a4b586 | 13 | #include "color.h" |
0c37f1fc | 14 | #include "gpg-interface.h" |
959a2623 | 15 | #include "sequencer.h" |
12da1d1f | 16 | #include "line-log.h" |
3ac68a93 | 17 | #include "help.h" |
ee6cbf71 | 18 | #include "interdiff.h" |
40ce4160 | 19 | #include "range-diff.h" |
5f1c3f07 | 20 | |
2608c249 | 21 | static struct decoration name_decoration = { "object names" }; |
76c61fbd JH |
22 | static int decoration_loaded; |
23 | static int decoration_flags; | |
a7524128 | 24 | |
67a4b586 NR |
25 | static char decoration_colors[][COLOR_MAXLEN] = { |
26 | GIT_COLOR_RESET, | |
27 | GIT_COLOR_BOLD_GREEN, /* REF_LOCAL */ | |
28 | GIT_COLOR_BOLD_RED, /* REF_REMOTE */ | |
29 | GIT_COLOR_BOLD_YELLOW, /* REF_TAG */ | |
30 | GIT_COLOR_BOLD_MAGENTA, /* REF_STASH */ | |
31 | GIT_COLOR_BOLD_CYAN, /* REF_HEAD */ | |
76f5df30 | 32 | GIT_COLOR_BOLD_BLUE, /* GRAFTED */ |
67a4b586 NR |
33 | }; |
34 | ||
a73b3680 NTND |
35 | static const char *color_decorate_slots[] = { |
36 | [DECORATION_REF_LOCAL] = "branch", | |
37 | [DECORATION_REF_REMOTE] = "remoteBranch", | |
38 | [DECORATION_REF_TAG] = "tag", | |
39 | [DECORATION_REF_STASH] = "stash", | |
40 | [DECORATION_REF_HEAD] = "HEAD", | |
09c4ba41 | 41 | [DECORATION_GRAFTED] = "grafted", |
a73b3680 NTND |
42 | }; |
43 | ||
67a4b586 NR |
44 | static const char *decorate_get_color(int decorate_use_color, enum decoration_type ix) |
45 | { | |
daa0c3d9 | 46 | if (want_color(decorate_use_color)) |
67a4b586 NR |
47 | return decoration_colors[ix]; |
48 | return ""; | |
49 | } | |
50 | ||
3ac68a93 | 51 | define_list_config_array(color_decorate_slots); |
5e11bee6 | 52 | |
8852117a | 53 | int parse_decorate_color_config(const char *var, const char *slot_name, const char *value) |
5e11bee6 | 54 | { |
a73b3680 | 55 | int slot = LOOKUP_CONFIG(color_decorate_slots, slot_name); |
5e11bee6 NR |
56 | if (slot < 0) |
57 | return 0; | |
58 | if (!value) | |
59 | return config_error_nonbool(var); | |
f6c5a296 | 60 | return color_parse(value, decoration_colors[slot]); |
5e11bee6 NR |
61 | } |
62 | ||
67a4b586 NR |
63 | /* |
64 | * log-tree.c uses DIFF_OPT_TST for determining whether to use color | |
65 | * for showing the commit sha1, use the same check for --decorate | |
66 | */ | |
67 | #define decorate_get_color_opt(o, ix) \ | |
f1c96261 | 68 | decorate_get_color((o)->use_color, ix) |
67a4b586 | 69 | |
662174d2 | 70 | void add_name_decoration(enum decoration_type type, const char *name, struct object *obj) |
cab4feb6 | 71 | { |
96ffc06f JK |
72 | struct name_decoration *res; |
73 | FLEX_ALLOC_STR(res, name, name); | |
a7524128 | 74 | res->type = type; |
cab4feb6 RS |
75 | res->next = add_decoration(&name_decoration, obj, res); |
76 | } | |
77 | ||
2608c249 JK |
78 | const struct name_decoration *get_name_decoration(const struct object *obj) |
79 | { | |
0cc7380d | 80 | load_ref_decorations(NULL, DECORATE_SHORT_REFS); |
2608c249 JK |
81 | return lookup_decoration(&name_decoration, obj); |
82 | } | |
83 | ||
c9f7a793 DS |
84 | static int match_ref_pattern(const char *refname, |
85 | const struct string_list_item *item) | |
86 | { | |
87 | int matched = 0; | |
88 | if (item->util == NULL) { | |
89 | if (!wildmatch(item->string, refname, 0)) | |
90 | matched = 1; | |
91 | } else { | |
92 | const char *rest; | |
93 | if (skip_prefix(refname, item->string, &rest) && | |
94 | (!*rest || *rest == '/')) | |
95 | matched = 1; | |
96 | } | |
97 | return matched; | |
98 | } | |
99 | ||
100 | static int ref_filter_match(const char *refname, | |
101 | const struct decoration_filter *filter) | |
102 | { | |
103 | struct string_list_item *item; | |
104 | const struct string_list *exclude_patterns = filter->exclude_ref_pattern; | |
105 | const struct string_list *include_patterns = filter->include_ref_pattern; | |
a6be5e67 DS |
106 | const struct string_list *exclude_patterns_config = |
107 | filter->exclude_ref_config_pattern; | |
c9f7a793 DS |
108 | |
109 | if (exclude_patterns && exclude_patterns->nr) { | |
110 | for_each_string_list_item(item, exclude_patterns) { | |
111 | if (match_ref_pattern(refname, item)) | |
112 | return 0; | |
113 | } | |
114 | } | |
115 | ||
116 | if (include_patterns && include_patterns->nr) { | |
c9f7a793 | 117 | for_each_string_list_item(item, include_patterns) { |
a6be5e67 DS |
118 | if (match_ref_pattern(refname, item)) |
119 | return 1; | |
c9f7a793 | 120 | } |
a6be5e67 DS |
121 | return 0; |
122 | } | |
c9f7a793 | 123 | |
a6be5e67 DS |
124 | if (exclude_patterns_config && exclude_patterns_config->nr) { |
125 | for_each_string_list_item(item, exclude_patterns_config) { | |
126 | if (match_ref_pattern(refname, item)) | |
127 | return 0; | |
128 | } | |
c9f7a793 | 129 | } |
a6be5e67 | 130 | |
c9f7a793 DS |
131 | return 1; |
132 | } | |
133 | ||
f124b730 MH |
134 | static int add_ref_decoration(const char *refname, const struct object_id *oid, |
135 | int flags, void *cb_data) | |
cab4feb6 | 136 | { |
5267d292 | 137 | struct object *obj; |
a7524128 | 138 | enum decoration_type type = DECORATION_NONE; |
65516f58 | 139 | struct decoration_filter *filter = (struct decoration_filter *)cb_data; |
5267d292 | 140 | |
c9f7a793 | 141 | if (filter && !ref_filter_match(refname, filter)) |
65516f58 | 142 | return 0; |
429ad204 | 143 | |
58d121b2 | 144 | if (starts_with(refname, git_replace_ref_base)) { |
3d79f657 | 145 | struct object_id original_oid; |
6ebd1caf | 146 | if (!read_replace_refs) |
b9ad5002 | 147 | return 0; |
31a0ad54 JH |
148 | if (get_oid_hex(refname + strlen(git_replace_ref_base), |
149 | &original_oid)) { | |
5267d292 NTND |
150 | warning("invalid replace ref %s", refname); |
151 | return 0; | |
152 | } | |
109cd76d | 153 | obj = parse_object(the_repository, &original_oid); |
5267d292 NTND |
154 | if (obj) |
155 | add_name_decoration(DECORATION_GRAFTED, "replaced", obj); | |
156 | return 0; | |
157 | } | |
158 | ||
109cd76d | 159 | obj = parse_object(the_repository, oid); |
cab4feb6 RS |
160 | if (!obj) |
161 | return 0; | |
a7524128 | 162 | |
59556548 | 163 | if (starts_with(refname, "refs/heads/")) |
a7524128 | 164 | type = DECORATION_REF_LOCAL; |
59556548 | 165 | else if (starts_with(refname, "refs/remotes/")) |
a7524128 | 166 | type = DECORATION_REF_REMOTE; |
59556548 | 167 | else if (starts_with(refname, "refs/tags/")) |
a7524128 | 168 | type = DECORATION_REF_TAG; |
97ba642b | 169 | else if (!strcmp(refname, "refs/stash")) |
a7524128 | 170 | type = DECORATION_REF_STASH; |
97ba642b | 171 | else if (!strcmp(refname, "HEAD")) |
a7524128 NR |
172 | type = DECORATION_REF_HEAD; |
173 | ||
a7524128 | 174 | add_name_decoration(type, refname, obj); |
cab4feb6 RS |
175 | while (obj->type == OBJ_TAG) { |
176 | obj = ((struct tag *)obj)->tagged; | |
177 | if (!obj) | |
178 | break; | |
5e1361cc | 179 | if (!obj->parsed) |
109cd76d | 180 | parse_object(the_repository, &obj->oid); |
a7524128 | 181 | add_name_decoration(DECORATION_REF_TAG, refname, obj); |
cab4feb6 RS |
182 | } |
183 | return 0; | |
184 | } | |
185 | ||
76f5df30 NTND |
186 | static int add_graft_decoration(const struct commit_graft *graft, void *cb_data) |
187 | { | |
c1f5eb49 | 188 | struct commit *commit = lookup_commit(the_repository, &graft->oid); |
76f5df30 NTND |
189 | if (!commit) |
190 | return 0; | |
191 | add_name_decoration(DECORATION_GRAFTED, "grafted", &commit->object); | |
192 | return 0; | |
193 | } | |
194 | ||
65516f58 | 195 | void load_ref_decorations(struct decoration_filter *filter, int flags) |
cab4feb6 | 196 | { |
76c61fbd | 197 | if (!decoration_loaded) { |
65516f58 RA |
198 | if (filter) { |
199 | struct string_list_item *item; | |
200 | for_each_string_list_item(item, filter->exclude_ref_pattern) { | |
201 | normalize_glob_ref(item, NULL, item->string); | |
202 | } | |
203 | for_each_string_list_item(item, filter->include_ref_pattern) { | |
204 | normalize_glob_ref(item, NULL, item->string); | |
205 | } | |
a6be5e67 DS |
206 | for_each_string_list_item(item, filter->exclude_ref_config_pattern) { |
207 | normalize_glob_ref(item, NULL, item->string); | |
208 | } | |
65516f58 | 209 | } |
76c61fbd JH |
210 | decoration_loaded = 1; |
211 | decoration_flags = flags; | |
65516f58 RA |
212 | for_each_ref(add_ref_decoration, filter); |
213 | head_ref(add_ref_decoration, filter); | |
214 | for_each_commit_graft(add_graft_decoration, filter); | |
cab4feb6 RS |
215 | } |
216 | } | |
217 | ||
4d7b0efc | 218 | static void show_parents(struct commit *commit, int abbrev, FILE *file) |
c8c893c6 LT |
219 | { |
220 | struct commit_list *p; | |
221 | for (p = commit->parents; p ; p = p->next) { | |
222 | struct commit *parent = p->item; | |
aab9583f | 223 | fprintf(file, " %s", find_unique_abbrev(&parent->object.oid, abbrev)); |
c8c893c6 LT |
224 | } |
225 | } | |
226 | ||
91b849b2 JS |
227 | static void show_children(struct rev_info *opt, struct commit *commit, int abbrev) |
228 | { | |
229 | struct commit_list *p = lookup_decoration(&opt->children, &commit->object); | |
230 | for ( ; p; p = p->next) { | |
aab9583f | 231 | fprintf(opt->diffopt.file, " %s", find_unique_abbrev(&p->item->object.oid, abbrev)); |
91b849b2 JS |
232 | } |
233 | } | |
234 | ||
51ff0f27 JH |
235 | /* |
236 | * Do we have HEAD in the output, and also the branch it points at? | |
237 | * If so, find that decoration entry for that current branch. | |
238 | */ | |
239 | static const struct name_decoration *current_pointed_by_HEAD(const struct name_decoration *decoration) | |
240 | { | |
241 | const struct name_decoration *list, *head = NULL; | |
242 | const char *branch_name = NULL; | |
51ff0f27 JH |
243 | int rru_flags; |
244 | ||
245 | /* First find HEAD */ | |
246 | for (list = decoration; list; list = list->next) | |
247 | if (list->type == DECORATION_REF_HEAD) { | |
248 | head = list; | |
249 | break; | |
250 | } | |
251 | if (!head) | |
252 | return NULL; | |
253 | ||
254 | /* Now resolve and find the matching current branch */ | |
744c040b | 255 | branch_name = resolve_ref_unsafe("HEAD", 0, NULL, &rru_flags); |
d79be498 | 256 | if (!branch_name || !(rru_flags & REF_ISSYMREF)) |
51ff0f27 | 257 | return NULL; |
76c61fbd | 258 | |
429ad204 | 259 | if (!starts_with(branch_name, "refs/")) |
51ff0f27 JH |
260 | return NULL; |
261 | ||
262 | /* OK, do we have that ref in the list? */ | |
263 | for (list = decoration; list; list = list->next) | |
264 | if ((list->type == DECORATION_REF_LOCAL) && | |
265 | !strcmp(branch_name, list->name)) { | |
266 | return list; | |
267 | } | |
268 | ||
269 | return NULL; | |
270 | } | |
271 | ||
429ad204 JH |
272 | static void show_name(struct strbuf *sb, const struct name_decoration *decoration) |
273 | { | |
274 | if (decoration_flags == DECORATE_SHORT_REFS) | |
275 | strbuf_addstr(sb, prettify_refname(decoration->name)); | |
276 | else | |
277 | strbuf_addstr(sb, decoration->name); | |
278 | } | |
279 | ||
9d3f002f | 280 | /* |
9271095c HJ |
281 | * The caller makes sure there is no funny color before calling. |
282 | * format_decorations_extended makes sure the same after return. | |
9d3f002f | 283 | */ |
9271095c | 284 | void format_decorations_extended(struct strbuf *sb, |
9d3f002f | 285 | const struct commit *commit, |
9271095c HJ |
286 | int use_color, |
287 | const char *prefix, | |
288 | const char *separator, | |
289 | const char *suffix) | |
ca135e7a | 290 | { |
2608c249 | 291 | const struct name_decoration *decoration; |
51ff0f27 | 292 | const struct name_decoration *current_and_HEAD; |
67a4b586 | 293 | const char *color_commit = |
9d3f002f | 294 | diff_get_color(use_color, DIFF_COMMIT); |
67a4b586 | 295 | const char *color_reset = |
9d3f002f | 296 | decorate_get_color(use_color, DECORATION_NONE); |
ca135e7a | 297 | |
2608c249 | 298 | decoration = get_name_decoration(&commit->object); |
ca135e7a LT |
299 | if (!decoration) |
300 | return; | |
51ff0f27 JH |
301 | |
302 | current_and_HEAD = current_pointed_by_HEAD(decoration); | |
ca135e7a | 303 | while (decoration) { |
51ff0f27 JH |
304 | /* |
305 | * When both current and HEAD are there, only | |
306 | * show HEAD->current where HEAD would have | |
307 | * appeared, skipping the entry for current. | |
308 | */ | |
309 | if (decoration != current_and_HEAD) { | |
310 | strbuf_addstr(sb, color_commit); | |
311 | strbuf_addstr(sb, prefix); | |
312 | strbuf_addstr(sb, color_reset); | |
313 | strbuf_addstr(sb, decorate_get_color(use_color, decoration->type)); | |
314 | if (decoration->type == DECORATION_REF_TAG) | |
315 | strbuf_addstr(sb, "tag: "); | |
316 | ||
429ad204 | 317 | show_name(sb, decoration); |
51ff0f27 JH |
318 | |
319 | if (current_and_HEAD && | |
320 | decoration->type == DECORATION_REF_HEAD) { | |
51ff0f27 JH |
321 | strbuf_addstr(sb, " -> "); |
322 | strbuf_addstr(sb, color_reset); | |
323 | strbuf_addstr(sb, decorate_get_color(use_color, current_and_HEAD->type)); | |
429ad204 | 324 | show_name(sb, current_and_HEAD); |
51ff0f27 JH |
325 | } |
326 | strbuf_addstr(sb, color_reset); | |
327 | ||
328 | prefix = separator; | |
329 | } | |
ca135e7a LT |
330 | decoration = decoration->next; |
331 | } | |
9d3f002f | 332 | strbuf_addstr(sb, color_commit); |
9271095c | 333 | strbuf_addstr(sb, suffix); |
9d3f002f NTND |
334 | strbuf_addstr(sb, color_reset); |
335 | } | |
336 | ||
337 | void show_decorations(struct rev_info *opt, struct commit *commit) | |
338 | { | |
339 | struct strbuf sb = STRBUF_INIT; | |
340 | ||
87be2523 NTND |
341 | if (opt->sources) { |
342 | char **slot = revision_sources_peek(opt->sources, commit); | |
343 | ||
344 | if (slot && *slot) | |
345 | fprintf(opt->diffopt.file, "\t%s", *slot); | |
346 | } | |
9d3f002f NTND |
347 | if (!opt->show_decorations) |
348 | return; | |
349 | format_decorations(&sb, commit, opt->diffopt.use_color); | |
4d7b0efc | 350 | fputs(sb.buf, opt->diffopt.file); |
9d3f002f | 351 | strbuf_release(&sb); |
ca135e7a LT |
352 | } |
353 | ||
e00de24b JS |
354 | static unsigned int digits_in_number(unsigned int number) |
355 | { | |
356 | unsigned int i = 10, result = 1; | |
357 | while (i <= number) { | |
358 | i *= 10; | |
359 | result++; | |
360 | } | |
361 | return result; | |
362 | } | |
363 | ||
d28b5d47 JH |
364 | void fmt_output_subject(struct strbuf *filename, |
365 | const char *subject, | |
021f2f4c | 366 | struct rev_info *info) |
6fa8e627 | 367 | { |
021f2f4c JH |
368 | const char *suffix = info->patch_suffix; |
369 | int nr = info->nr; | |
d28b5d47 JH |
370 | int start_len = filename->len; |
371 | int max_len = start_len + FORMAT_PATCH_NAME_MAX - (strlen(suffix) + 1); | |
372 | ||
5fe10fe8 JH |
373 | if (0 < info->reroll_count) |
374 | strbuf_addf(filename, "v%d-", info->reroll_count); | |
d28b5d47 JH |
375 | strbuf_addf(filename, "%04d-%s", nr, subject); |
376 | ||
377 | if (max_len < filename->len) | |
378 | strbuf_setlen(filename, max_len); | |
379 | strbuf_addstr(filename, suffix); | |
380 | } | |
381 | ||
382 | void fmt_output_commit(struct strbuf *filename, | |
383 | struct commit *commit, | |
384 | struct rev_info *info) | |
385 | { | |
386 | struct pretty_print_context ctx = {0}; | |
387 | struct strbuf subject = STRBUF_INIT; | |
388 | ||
389 | format_commit_message(commit, "%f", &subject, &ctx); | |
390 | fmt_output_subject(filename, subject.buf, info); | |
391 | strbuf_release(&subject); | |
6fa8e627 SB |
392 | } |
393 | ||
8ffc8dc6 RS |
394 | void fmt_output_email_subject(struct strbuf *sb, struct rev_info *opt) |
395 | { | |
396 | if (opt->total > 0) { | |
397 | strbuf_addf(sb, "Subject: [%s%s%0*d/%d] ", | |
398 | opt->subject_prefix, | |
399 | *opt->subject_prefix ? " " : "", | |
400 | digits_in_number(opt->total), | |
401 | opt->nr, opt->total); | |
402 | } else if (opt->total == 0 && opt->subject_prefix && *opt->subject_prefix) { | |
403 | strbuf_addf(sb, "Subject: [%s] ", | |
404 | opt->subject_prefix); | |
405 | } else { | |
406 | strbuf_addstr(sb, "Subject: "); | |
407 | } | |
408 | } | |
409 | ||
108dab28 | 410 | void log_write_email_headers(struct rev_info *opt, struct commit *commit, |
267123b4 | 411 | const char **extra_headers_p, |
50cd54ef | 412 | int *need_8bit_cte_p, |
413 | int maybe_multipart) | |
b02bd65f | 414 | { |
b02bd65f | 415 | const char *extra_headers = opt->extra_headers; |
3a30aa17 | 416 | const char *name = oid_to_hex(opt->zero_commit ? |
417 | &null_oid : &commit->object.oid); | |
267123b4 JH |
418 | |
419 | *need_8bit_cte_p = 0; /* unknown */ | |
b02bd65f | 420 | |
4d7b0efc | 421 | fprintf(opt->diffopt.file, "From %s Mon Sep 17 00:00:00 2001\n", name); |
7fefda5c AS |
422 | graph_show_oneline(opt->graph); |
423 | if (opt->message_id) { | |
4d7b0efc | 424 | fprintf(opt->diffopt.file, "Message-Id: <%s>\n", opt->message_id); |
7fefda5c AS |
425 | graph_show_oneline(opt->graph); |
426 | } | |
b079c50e TR |
427 | if (opt->ref_message_ids && opt->ref_message_ids->nr > 0) { |
428 | int i, n; | |
429 | n = opt->ref_message_ids->nr; | |
4d7b0efc | 430 | fprintf(opt->diffopt.file, "In-Reply-To: <%s>\n", opt->ref_message_ids->items[n-1].string); |
b079c50e | 431 | for (i = 0; i < n; i++) |
4d7b0efc | 432 | fprintf(opt->diffopt.file, "%s<%s>\n", (i > 0 ? "\t" : "References: "), |
b079c50e | 433 | opt->ref_message_ids->items[i].string); |
7fefda5c AS |
434 | graph_show_oneline(opt->graph); |
435 | } | |
50cd54ef | 436 | if (opt->mime_boundary && maybe_multipart) { |
d50b69b8 JK |
437 | static struct strbuf subject_buffer = STRBUF_INIT; |
438 | static struct strbuf buffer = STRBUF_INIT; | |
108dab28 | 439 | struct strbuf filename = STRBUF_INIT; |
267123b4 | 440 | *need_8bit_cte_p = -1; /* NEVER */ |
d50b69b8 JK |
441 | |
442 | strbuf_reset(&subject_buffer); | |
443 | strbuf_reset(&buffer); | |
444 | ||
445 | strbuf_addf(&subject_buffer, | |
b02bd65f DB |
446 | "%s" |
447 | "MIME-Version: 1.0\n" | |
448 | "Content-Type: multipart/mixed;" | |
449 | " boundary=\"%s%s\"\n" | |
450 | "\n" | |
451 | "This is a multi-part message in MIME " | |
452 | "format.\n" | |
453 | "--%s%s\n" | |
454 | "Content-Type: text/plain; " | |
455 | "charset=UTF-8; format=fixed\n" | |
456 | "Content-Transfer-Encoding: 8bit\n\n", | |
457 | extra_headers ? extra_headers : "", | |
458 | mime_boundary_leader, opt->mime_boundary, | |
459 | mime_boundary_leader, opt->mime_boundary); | |
d50b69b8 | 460 | extra_headers = subject_buffer.buf; |
b02bd65f | 461 | |
38ec23ac JH |
462 | if (opt->numbered_files) |
463 | strbuf_addf(&filename, "%d", opt->nr); | |
464 | else | |
d28b5d47 | 465 | fmt_output_commit(&filename, commit, opt); |
d50b69b8 | 466 | strbuf_addf(&buffer, |
6b2fbaaf | 467 | "\n--%s%s\n" |
b02bd65f | 468 | "Content-Type: text/x-patch;" |
108dab28 | 469 | " name=\"%s\"\n" |
b02bd65f DB |
470 | "Content-Transfer-Encoding: 8bit\n" |
471 | "Content-Disposition: %s;" | |
108dab28 | 472 | " filename=\"%s\"\n\n", |
b02bd65f | 473 | mime_boundary_leader, opt->mime_boundary, |
108dab28 | 474 | filename.buf, |
b02bd65f | 475 | opt->no_inline ? "attachment" : "inline", |
108dab28 | 476 | filename.buf); |
d50b69b8 | 477 | opt->diffopt.stat_sep = buffer.buf; |
108dab28 | 478 | strbuf_release(&filename); |
b02bd65f | 479 | } |
b02bd65f DB |
480 | *extra_headers_p = extra_headers; |
481 | } | |
482 | ||
c6b3ec41 JH |
483 | static void show_sig_lines(struct rev_info *opt, int status, const char *bol) |
484 | { | |
485 | const char *color, *reset, *eol; | |
486 | ||
487 | color = diff_get_color_opt(&opt->diffopt, | |
488 | status ? DIFF_WHITESPACE : DIFF_FRAGINFO); | |
489 | reset = diff_get_color_opt(&opt->diffopt, DIFF_RESET); | |
490 | while (*bol) { | |
491 | eol = strchrnul(bol, '\n'); | |
4d7b0efc | 492 | fprintf(opt->diffopt.file, "%s%.*s%s%s", color, (int)(eol - bol), bol, reset, |
c6b3ec41 | 493 | *eol ? "\n" : ""); |
cf3983d1 | 494 | graph_show_oneline(opt->graph); |
c6b3ec41 JH |
495 | bol = (*eol) ? (eol + 1) : eol; |
496 | } | |
497 | } | |
498 | ||
0c37f1fc JH |
499 | static void show_signature(struct rev_info *opt, struct commit *commit) |
500 | { | |
501 | struct strbuf payload = STRBUF_INIT; | |
502 | struct strbuf signature = STRBUF_INIT; | |
67948981 | 503 | struct signature_check sigc = { 0 }; |
0c37f1fc | 504 | int status; |
0c37f1fc | 505 | |
218aa3a6 | 506 | if (parse_signed_commit(commit, &payload, &signature) <= 0) |
0c37f1fc JH |
507 | goto out; |
508 | ||
67948981 HJI |
509 | status = check_signature(payload.buf, payload.len, signature.buf, |
510 | signature.len, &sigc); | |
511 | if (status && !sigc.gpg_output) | |
512 | show_sig_lines(opt, status, "No signature\n"); | |
513 | else | |
514 | show_sig_lines(opt, status, sigc.gpg_output); | |
515 | signature_check_clear(&sigc); | |
0c37f1fc JH |
516 | |
517 | out: | |
0c37f1fc JH |
518 | strbuf_release(&payload); |
519 | strbuf_release(&signature); | |
520 | } | |
521 | ||
a92ea68f | 522 | static int which_parent(const struct object_id *oid, const struct commit *commit) |
824958e5 JH |
523 | { |
524 | int nth; | |
525 | const struct commit_list *parent; | |
526 | ||
527 | for (nth = 0, parent = commit->parents; parent; parent = parent->next) { | |
4a7e27e9 | 528 | if (oideq(&parent->item->object.oid, oid)) |
824958e5 JH |
529 | return nth; |
530 | nth++; | |
531 | } | |
532 | return -1; | |
533 | } | |
534 | ||
d041ffa5 JH |
535 | static int is_common_merge(const struct commit *commit) |
536 | { | |
537 | return (commit->parents | |
538 | && commit->parents->next | |
539 | && !commit->parents->next->next); | |
540 | } | |
541 | ||
fef461ea JS |
542 | static int show_one_mergetag(struct commit *commit, |
543 | struct commit_extra_header *extra, | |
544 | void *data) | |
824958e5 | 545 | { |
063da62b | 546 | struct rev_info *opt = (struct rev_info *)data; |
a92ea68f | 547 | struct object_id oid; |
824958e5 JH |
548 | struct tag *tag; |
549 | struct strbuf verify_message; | |
67948981 | 550 | struct signature_check sigc = { 0 }; |
824958e5 | 551 | int status, nth; |
67948981 | 552 | size_t payload_size; |
824958e5 | 553 | |
2dcde20e MT |
554 | hash_object_file(the_hash_algo, extra->value, extra->len, |
555 | type_name(OBJ_TAG), &oid); | |
ce71efb7 | 556 | tag = lookup_tag(the_repository, &oid); |
824958e5 | 557 | if (!tag) |
fef461ea | 558 | return -1; /* error message already given */ |
824958e5 JH |
559 | |
560 | strbuf_init(&verify_message, 256); | |
0e740fed | 561 | if (parse_tag_buffer(the_repository, tag, extra->value, extra->len)) |
824958e5 | 562 | strbuf_addstr(&verify_message, "malformed mergetag\n"); |
d041ffa5 | 563 | else if (is_common_merge(commit) && |
4a7e27e9 JK |
564 | oideq(&tag->tagged->oid, |
565 | &commit->parents->next->item->object.oid)) | |
d041ffa5 JH |
566 | strbuf_addf(&verify_message, |
567 | "merged tag '%s'\n", tag->tag); | |
a92ea68f | 568 | else if ((nth = which_parent(&tag->tagged->oid, commit)) < 0) |
824958e5 | 569 | strbuf_addf(&verify_message, "tag %s names a non-parent %s\n", |
237a2817 | 570 | tag->tag, oid_to_hex(&tag->tagged->oid)); |
824958e5 JH |
571 | else |
572 | strbuf_addf(&verify_message, | |
573 | "parent #%d, tagged '%s'\n", nth + 1, tag->tag); | |
824958e5 JH |
574 | |
575 | payload_size = parse_signature(extra->value, extra->len); | |
1315093f | 576 | status = -1; |
42c55ce4 MG |
577 | if (extra->len > payload_size) { |
578 | /* could have a good signature */ | |
67948981 HJI |
579 | status = check_signature(extra->value, payload_size, |
580 | extra->value + payload_size, | |
581 | extra->len - payload_size, &sigc); | |
582 | if (sigc.gpg_output) | |
583 | strbuf_addstr(&verify_message, sigc.gpg_output); | |
584 | else | |
42c55ce4 | 585 | strbuf_addstr(&verify_message, "No signature\n"); |
67948981 | 586 | signature_check_clear(&sigc); |
42c55ce4 MG |
587 | /* otherwise we couldn't verify, which is shown as bad */ |
588 | } | |
824958e5 JH |
589 | |
590 | show_sig_lines(opt, status, verify_message.buf); | |
591 | strbuf_release(&verify_message); | |
fef461ea | 592 | return 0; |
824958e5 JH |
593 | } |
594 | ||
fef461ea | 595 | static int show_mergetag(struct rev_info *opt, struct commit *commit) |
824958e5 | 596 | { |
fef461ea | 597 | return for_each_mergetag(show_one_mergetag, commit, opt); |
824958e5 JH |
598 | } |
599 | ||
3fcc7a23 ES |
600 | static void next_commentary_block(struct rev_info *opt, struct strbuf *sb) |
601 | { | |
602 | const char *x = opt->shown_dashes ? "\n" : "---\n"; | |
603 | if (sb) | |
604 | strbuf_addstr(sb, x); | |
605 | else | |
606 | fputs(x, opt->diffopt.file); | |
607 | opt->shown_dashes = 1; | |
608 | } | |
609 | ||
02865655 | 610 | void show_log(struct rev_info *opt) |
91539833 | 611 | { |
f285a2d7 | 612 | struct strbuf msgbuf = STRBUF_INIT; |
39bc9a6c | 613 | struct log_info *log = opt->loginfo; |
91539833 | 614 | struct commit *commit = log->commit, *parent = log->parent; |
2ed1960a | 615 | int abbrev_commit = opt->abbrev_commit ? opt->abbrev : the_hash_algo->hexsz; |
dd2e794a TR |
616 | const char *extra_headers = opt->extra_headers; |
617 | struct pretty_print_context ctx = {0}; | |
91539833 LT |
618 | |
619 | opt->loginfo = NULL; | |
620 | if (!opt->verbose_header) { | |
7fefda5c AS |
621 | graph_show_commit(opt->graph); |
622 | ||
1df2d656 | 623 | if (!opt->graph) |
b1b47554 | 624 | put_revision_mark(opt, commit); |
aab9583f | 625 | fputs(find_unique_abbrev(&commit->object.oid, abbrev_commit), opt->diffopt.file); |
885cf808 | 626 | if (opt->print_parents) |
4d7b0efc | 627 | show_parents(commit, abbrev_commit, opt->diffopt.file); |
91b849b2 JS |
628 | if (opt->children.name) |
629 | show_children(opt, commit, abbrev_commit); | |
0f3a290b | 630 | show_decorations(opt, commit); |
7fefda5c | 631 | if (opt->graph && !graph_is_commit_finished(opt->graph)) { |
4d7b0efc | 632 | putc('\n', opt->diffopt.file); |
7fefda5c AS |
633 | graph_show_remainder(opt->graph); |
634 | } | |
4d7b0efc | 635 | putc(opt->diffopt.line_termination, opt->diffopt.file); |
91539833 LT |
636 | return; |
637 | } | |
638 | ||
639 | /* | |
8715227d JK |
640 | * If use_terminator is set, we already handled any record termination |
641 | * at the end of the last record. | |
02865655 AS |
642 | * Otherwise, add a diffopt.line_termination character before all |
643 | * entries but the first. (IOW, as a separator between entries) | |
91539833 | 644 | */ |
7fefda5c AS |
645 | if (opt->shown_one && !opt->use_terminator) { |
646 | /* | |
647 | * If entries are separated by a newline, the output | |
648 | * should look human-readable. If the last entry ended | |
649 | * with a newline, print the graph output before this | |
650 | * newline. Otherwise it will end up as a completely blank | |
651 | * line and will look like a gap in the graph. | |
652 | * | |
653 | * If the entry separator is not a newline, the output is | |
654 | * primarily intended for programmatic consumption, and we | |
655 | * never want the extra graph output before the entry | |
656 | * separator. | |
657 | */ | |
658 | if (opt->diffopt.line_termination == '\n' && | |
659 | !opt->missing_newline) | |
660 | graph_show_padding(opt->graph); | |
4d7b0efc | 661 | putc(opt->diffopt.line_termination, opt->diffopt.file); |
7fefda5c | 662 | } |
91539833 LT |
663 | opt->shown_one = 1; |
664 | ||
7fefda5c AS |
665 | /* |
666 | * If the history graph was requested, | |
667 | * print the graph, up to this commit's line | |
668 | */ | |
669 | graph_show_commit(opt->graph); | |
670 | ||
91539833 LT |
671 | /* |
672 | * Print header line of header.. | |
673 | */ | |
3eefc189 | 674 | |
9f23e040 | 675 | if (cmit_fmt_is_mail(opt->commit_format)) { |
6d167fd7 | 676 | log_write_email_headers(opt, commit, &extra_headers, |
50cd54ef | 677 | &ctx.need_8bit_cte, 1); |
6d167fd7 RS |
678 | ctx.rev = opt; |
679 | ctx.print_email_subject = 1; | |
e52a5de4 | 680 | } else if (opt->commit_format != CMIT_FMT_USERFORMAT) { |
4d7b0efc | 681 | fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), opt->diffopt.file); |
74bd9029 | 682 | if (opt->commit_format != CMIT_FMT_ONELINE) |
4d7b0efc | 683 | fputs("commit ", opt->diffopt.file); |
7528f27d | 684 | |
1df2d656 | 685 | if (!opt->graph) |
b1b47554 | 686 | put_revision_mark(opt, commit); |
aab9583f | 687 | fputs(find_unique_abbrev(&commit->object.oid, |
688 | abbrev_commit), | |
4d7b0efc | 689 | opt->diffopt.file); |
885cf808 | 690 | if (opt->print_parents) |
4d7b0efc | 691 | show_parents(commit, abbrev_commit, opt->diffopt.file); |
91b849b2 JS |
692 | if (opt->children.name) |
693 | show_children(opt, commit, abbrev_commit); | |
73f0a157 | 694 | if (parent) |
4d7b0efc | 695 | fprintf(opt->diffopt.file, " (from %s)", |
aab9583f | 696 | find_unique_abbrev(&parent->object.oid, abbrev_commit)); |
4d7b0efc | 697 | fputs(diff_get_color_opt(&opt->diffopt, DIFF_RESET), opt->diffopt.file); |
0f3a290b | 698 | show_decorations(opt, commit); |
7fefda5c | 699 | if (opt->commit_format == CMIT_FMT_ONELINE) { |
4d7b0efc | 700 | putc(' ', opt->diffopt.file); |
7fefda5c | 701 | } else { |
4d7b0efc | 702 | putc('\n', opt->diffopt.file); |
7fefda5c AS |
703 | graph_show_oneline(opt->graph); |
704 | } | |
903b45fe | 705 | if (opt->reflog_info) { |
7fefda5c AS |
706 | /* |
707 | * setup_revisions() ensures that opt->reflog_info | |
708 | * and opt->graph cannot both be set, | |
709 | * so we don't need to worry about printing the | |
710 | * graph info here. | |
711 | */ | |
4d12a471 | 712 | show_reflog_message(opt->reflog_info, |
55ccf85a | 713 | opt->commit_format == CMIT_FMT_ONELINE, |
a5481a6c | 714 | &opt->date_mode, |
55ccf85a | 715 | opt->date_mode_explicit); |
02865655 | 716 | if (opt->commit_format == CMIT_FMT_ONELINE) |
903b45fe | 717 | return; |
903b45fe | 718 | } |
3eefc189 | 719 | } |
91539833 | 720 | |
824958e5 | 721 | if (opt->show_signature) { |
0c37f1fc | 722 | show_signature(opt, commit); |
824958e5 JH |
723 | show_mergetag(opt, commit); |
724 | } | |
0c37f1fc | 725 | |
ddf333f6 JH |
726 | if (opt->show_notes) { |
727 | int raw; | |
728 | struct strbuf notebuf = STRBUF_INIT; | |
729 | ||
730 | raw = (opt->commit_format == CMIT_FMT_USERFORMAT); | |
fb61e4d3 | 731 | format_display_notes(&commit->object.oid, ¬ebuf, |
ddf333f6 | 732 | get_log_output_encoding(), raw); |
82f51af3 | 733 | ctx.notes_message = strbuf_detach(¬ebuf, NULL); |
ddf333f6 JH |
734 | } |
735 | ||
91539833 LT |
736 | /* |
737 | * And then the pretty-printed message itself | |
738 | */ | |
5289c56a NTND |
739 | if (ctx.need_8bit_cte >= 0 && opt->add_signoff) |
740 | ctx.need_8bit_cte = | |
39ab4d09 | 741 | has_non_ascii(fmt_name(WANT_COMMITTER_IDENT)); |
dd2e794a | 742 | ctx.date_mode = opt->date_mode; |
f026c756 | 743 | ctx.date_mode_explicit = opt->date_mode_explicit; |
dd2e794a TR |
744 | ctx.abbrev = opt->diffopt.abbrev; |
745 | ctx.after_subject = extra_headers; | |
9553d2b2 | 746 | ctx.preserve_subject = opt->preserve_subject; |
19d097e3 | 747 | ctx.encode_email_headers = opt->encode_email_headers; |
8f8f5476 | 748 | ctx.reflog_info = opt->reflog_info; |
6bf13944 | 749 | ctx.fmt = opt->commit_format; |
0e2913b0 | 750 | ctx.mailmap = opt->mailmap; |
30825178 | 751 | ctx.color = opt->diffopt.use_color; |
7cc13c71 | 752 | ctx.expand_tabs_in_log = opt->expand_tabs_in_log; |
ecaee805 | 753 | ctx.output_encoding = get_log_output_encoding(); |
ad6f028f | 754 | ctx.rev = opt; |
a9080475 JK |
755 | if (opt->from_ident.mail_begin && opt->from_ident.name_begin) |
756 | ctx.from_ident = &opt->from_ident; | |
3ad87c80 JK |
757 | if (opt->graph) |
758 | ctx.graph_width = graph_width(opt->graph); | |
6bf13944 | 759 | pretty_print_commit(&ctx, commit, &msgbuf); |
212620fe JH |
760 | |
761 | if (opt->add_signoff) | |
5289c56a | 762 | append_signoff(&msgbuf, 0, APPEND_SIGNOFF_DEDUP); |
212620fe | 763 | |
5a664cf2 | 764 | if ((ctx.fmt != CMIT_FMT_USERFORMAT) && |
bd1470b8 | 765 | ctx.notes_message && *ctx.notes_message) { |
3fcc7a23 ES |
766 | if (cmit_fmt_is_mail(ctx.fmt)) |
767 | next_commentary_block(opt, &msgbuf); | |
5a664cf2 | 768 | strbuf_addstr(&msgbuf, ctx.notes_message); |
bd1470b8 | 769 | } |
cf2251b6 | 770 | |
7fefda5c | 771 | if (opt->show_log_size) { |
4d7b0efc | 772 | fprintf(opt->diffopt.file, "log size %i\n", (int)msgbuf.len); |
7fefda5c AS |
773 | graph_show_oneline(opt->graph); |
774 | } | |
9fa3465d | 775 | |
7fefda5c AS |
776 | /* |
777 | * Set opt->missing_newline if msgbuf doesn't | |
778 | * end in a newline (including if it is empty) | |
779 | */ | |
780 | if (!msgbuf.len || msgbuf.buf[msgbuf.len - 1] != '\n') | |
781 | opt->missing_newline = 1; | |
782 | else | |
783 | opt->missing_newline = 0; | |
784 | ||
660e113c | 785 | graph_show_commit_msg(opt->graph, opt->diffopt.file, &msgbuf); |
b9c7d6e4 | 786 | if (opt->use_terminator && !commit_format_is_empty(opt->commit_format)) { |
7fefda5c AS |
787 | if (!opt->missing_newline) |
788 | graph_show_padding(opt->graph); | |
4d7b0efc | 789 | putc(opt->diffopt.line_termination, opt->diffopt.file); |
7fefda5c AS |
790 | } |
791 | ||
674d1727 | 792 | strbuf_release(&msgbuf); |
ddf333f6 | 793 | free(ctx.notes_message); |
ee6cbf71 ES |
794 | |
795 | if (cmit_fmt_is_mail(ctx.fmt) && opt->idiff_oid1) { | |
796 | struct diff_queue_struct dq; | |
797 | ||
798 | memcpy(&dq, &diff_queued_diff, sizeof(diff_queued_diff)); | |
799 | DIFF_QUEUE_CLEAR(&diff_queued_diff); | |
800 | ||
801 | next_commentary_block(opt, NULL); | |
802 | fprintf_ln(opt->diffopt.file, "%s", opt->idiff_title); | |
803 | show_interdiff(opt, 2); | |
804 | ||
805 | memcpy(&diff_queued_diff, &dq, sizeof(diff_queued_diff)); | |
806 | } | |
40ce4160 ES |
807 | |
808 | if (cmit_fmt_is_mail(ctx.fmt) && opt->rdiff1) { | |
809 | struct diff_queue_struct dq; | |
ac0edf1f | 810 | struct diff_options opts; |
40ce4160 ES |
811 | |
812 | memcpy(&dq, &diff_queued_diff, sizeof(diff_queued_diff)); | |
813 | DIFF_QUEUE_CLEAR(&diff_queued_diff); | |
814 | ||
815 | next_commentary_block(opt, NULL); | |
816 | fprintf_ln(opt->diffopt.file, "%s", opt->rdiff_title); | |
ac0edf1f MÅ |
817 | /* |
818 | * Pass minimum required diff-options to range-diff; others | |
819 | * can be added later if deemed desirable. | |
820 | */ | |
821 | diff_setup(&opts); | |
822 | opts.file = opt->diffopt.file; | |
823 | opts.use_color = opt->diffopt.use_color; | |
824 | diff_setup_done(&opts); | |
40ce4160 | 825 | show_range_diff(opt->rdiff1, opt->rdiff2, |
bd361918 | 826 | opt->creation_factor, 1, &opts, NULL); |
40ce4160 ES |
827 | |
828 | memcpy(&diff_queued_diff, &dq, sizeof(diff_queued_diff)); | |
829 | } | |
91539833 LT |
830 | } |
831 | ||
cd2bdc53 | 832 | int log_tree_diff_flush(struct rev_info *opt) |
5f1c3f07 | 833 | { |
bd1470b8 | 834 | opt->shown_dashes = 0; |
5f1c3f07 | 835 | diffcore_std(&opt->diffopt); |
91539833 | 836 | |
5f1c3f07 JH |
837 | if (diff_queue_is_empty()) { |
838 | int saved_fmt = opt->diffopt.output_format; | |
839 | opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT; | |
840 | diff_flush(&opt->diffopt); | |
841 | opt->diffopt.output_format = saved_fmt; | |
842 | return 0; | |
843 | } | |
91539833 | 844 | |
3969cf7d | 845 | if (opt->loginfo && !opt->no_commit_id) { |
02865655 | 846 | show_log(opt); |
304b5af6 LT |
847 | if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) && |
848 | opt->verbose_header && | |
b9c7d6e4 JK |
849 | opt->commit_format != CMIT_FMT_ONELINE && |
850 | !commit_format_is_empty(opt->commit_format)) { | |
1d34c50f JH |
851 | /* |
852 | * When showing a verbose header (i.e. log message), | |
853 | * and not in --pretty=oneline format, we would want | |
854 | * an extra newline between the end of log and the | |
855 | * diff/diffstat output for readability. | |
856 | */ | |
3969cf7d | 857 | int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH; |
81bd1b2a BY |
858 | if (opt->diffopt.output_prefix) { |
859 | struct strbuf *msg = NULL; | |
860 | msg = opt->diffopt.output_prefix(&opt->diffopt, | |
861 | opt->diffopt.output_prefix_data); | |
4d7b0efc | 862 | fwrite(msg->buf, msg->len, 1, opt->diffopt.file); |
81bd1b2a | 863 | } |
1d34c50f JH |
864 | |
865 | /* | |
866 | * We may have shown three-dashes line early | |
3fcc7a23 ES |
867 | * between generated commentary (notes, etc.) |
868 | * and the log message, in which case we only | |
869 | * want a blank line after the commentary | |
870 | * without (an extra) three-dashes line. | |
1d34c50f JH |
871 | * Otherwise, we show the three-dashes line if |
872 | * we are showing the patch with diffstat, but | |
873 | * in that case, there is no extra blank line | |
874 | * after the three-dashes line. | |
875 | */ | |
876 | if (!opt->shown_dashes && | |
877 | (pch & opt->diffopt.output_format) == pch) | |
4d7b0efc JS |
878 | fprintf(opt->diffopt.file, "---"); |
879 | putc('\n', opt->diffopt.file); | |
3969cf7d JH |
880 | } |
881 | } | |
5f1c3f07 JH |
882 | diff_flush(&opt->diffopt); |
883 | return 1; | |
884 | } | |
885 | ||
cd2bdc53 | 886 | static int do_diff_combined(struct rev_info *opt, struct commit *commit) |
5f1c3f07 | 887 | { |
82889295 | 888 | diff_tree_combined_merge(commit, opt->dense_combined_merges, opt); |
91539833 | 889 | return !opt->loginfo; |
5f1c3f07 JH |
890 | } |
891 | ||
91539833 LT |
892 | /* |
893 | * Show the diff of a commit. | |
894 | * | |
895 | * Return true if we printed any log info messages | |
896 | */ | |
897 | static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log_info *log) | |
5f1c3f07 | 898 | { |
91539833 | 899 | int showed_log; |
5f1c3f07 | 900 | struct commit_list *parents; |
f2fd0760 | 901 | struct object_id *oid; |
5f1c3f07 | 902 | |
0d1e0e78 | 903 | if (!opt->diff && !opt->diffopt.flags.exit_with_status) |
91539833 LT |
904 | return 0; |
905 | ||
7059dccc | 906 | parse_commit_or_die(commit); |
2e27bd77 | 907 | oid = get_commit_tree_oid(commit); |
d1b9b767 | 908 | |
5f1c3f07 | 909 | /* Root commit? */ |
53d00b39 | 910 | parents = get_saved_parents(opt, commit); |
91539833 | 911 | if (!parents) { |
2b60356d | 912 | if (opt->show_root_diff) { |
7b8dea0c | 913 | diff_root_tree_oid(oid, "", &opt->diffopt); |
2b60356d RS |
914 | log_tree_diff_flush(opt); |
915 | } | |
91539833 | 916 | return !opt->loginfo; |
5f1c3f07 JH |
917 | } |
918 | ||
919 | /* More than one parent? */ | |
91539833 | 920 | if (parents && parents->next) { |
5f1c3f07 JH |
921 | if (opt->ignore_merges) |
922 | return 0; | |
923 | else if (opt->combine_merges) | |
924 | return do_diff_combined(opt, commit); | |
88d9d45d PB |
925 | else if (opt->first_parent_only) { |
926 | /* | |
927 | * Generate merge log entry only for the first | |
928 | * parent, showing summary diff of the others | |
929 | * we merged _in_. | |
930 | */ | |
7059dccc | 931 | parse_commit_or_die(parents->item); |
2e27bd77 | 932 | diff_tree_oid(get_commit_tree_oid(parents->item), |
66f414f8 | 933 | oid, "", &opt->diffopt); |
88d9d45d PB |
934 | log_tree_diff_flush(opt); |
935 | return !opt->loginfo; | |
936 | } | |
91539833 LT |
937 | |
938 | /* If we show individual diffs, show the parent info */ | |
939 | log->parent = parents->item; | |
5f1c3f07 JH |
940 | } |
941 | ||
91539833 LT |
942 | showed_log = 0; |
943 | for (;;) { | |
5f1c3f07 | 944 | struct commit *parent = parents->item; |
5f1c3f07 | 945 | |
7059dccc | 946 | parse_commit_or_die(parent); |
2e27bd77 | 947 | diff_tree_oid(get_commit_tree_oid(parent), |
66f414f8 | 948 | oid, "", &opt->diffopt); |
91539833 LT |
949 | log_tree_diff_flush(opt); |
950 | ||
951 | showed_log |= !opt->loginfo; | |
952 | ||
953 | /* Set up the log info for the next parent, if any.. */ | |
954 | parents = parents->next; | |
955 | if (!parents) | |
956 | break; | |
957 | log->parent = parents->item; | |
958 | opt->loginfo = log; | |
959 | } | |
960 | return showed_log; | |
961 | } | |
962 | ||
963 | int log_tree_commit(struct rev_info *opt, struct commit *commit) | |
964 | { | |
965 | struct log_info log; | |
6ea57703 | 966 | int shown, close_file = opt->diffopt.close_file; |
91539833 LT |
967 | |
968 | log.commit = commit; | |
969 | log.parent = NULL; | |
970 | opt->loginfo = &log; | |
6ea57703 | 971 | opt->diffopt.close_file = 0; |
91539833 | 972 | |
12da1d1f TR |
973 | if (opt->line_level_traverse) |
974 | return line_log_print(opt, commit); | |
975 | ||
1b32dece | 976 | if (opt->track_linear && !opt->linear && !opt->reverse_output_stage) |
4d7b0efc | 977 | fprintf(opt->diffopt.file, "\n%s\n", opt->break_bar); |
3eefc189 JH |
978 | shown = log_tree_diff(opt, commit, &log); |
979 | if (!shown && opt->loginfo && opt->always_show_header) { | |
91539833 | 980 | log.parent = NULL; |
02865655 | 981 | show_log(opt); |
3eefc189 | 982 | shown = 1; |
5f1c3f07 | 983 | } |
1b32dece | 984 | if (opt->track_linear && !opt->linear && opt->reverse_output_stage) |
4d7b0efc | 985 | fprintf(opt->diffopt.file, "\n%s\n", opt->break_bar); |
91539833 | 986 | opt->loginfo = NULL; |
4d7b0efc | 987 | maybe_flush_or_die(opt->diffopt.file, "stdout"); |
6ea57703 JS |
988 | if (close_file) |
989 | fclose(opt->diffopt.file); | |
3eefc189 | 990 | return shown; |
5f1c3f07 | 991 | } |