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