]>
Commit | Line | Data |
---|---|---|
1 | #include "git-compat-util.h" | |
2 | #include "commit-reach.h" | |
3 | #include "config.h" | |
4 | #include "diff.h" | |
5 | #include "diffcore.h" | |
6 | #include "environment.h" | |
7 | #include "hex.h" | |
8 | #include "object-name.h" | |
9 | #include "object-store-ll.h" | |
10 | #include "repository.h" | |
11 | #include "tmp-objdir.h" | |
12 | #include "commit.h" | |
13 | #include "tag.h" | |
14 | #include "graph.h" | |
15 | #include "log-tree.h" | |
16 | #include "merge-ort.h" | |
17 | #include "reflog-walk.h" | |
18 | #include "refs.h" | |
19 | #include "replace-object.h" | |
20 | #include "revision.h" | |
21 | #include "string-list.h" | |
22 | #include "color.h" | |
23 | #include "gpg-interface.h" | |
24 | #include "sequencer.h" | |
25 | #include "line-log.h" | |
26 | #include "help.h" | |
27 | #include "range-diff.h" | |
28 | #include "strmap.h" | |
29 | #include "tree.h" | |
30 | #include "wildmatch.h" | |
31 | #include "write-or-die.h" | |
32 | ||
33 | static struct decoration name_decoration = { "object names" }; | |
34 | static int decoration_loaded; | |
35 | static int decoration_flags; | |
36 | ||
37 | static char decoration_colors[][COLOR_MAXLEN] = { | |
38 | GIT_COLOR_RESET, | |
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 */ | |
45 | }; | |
46 | ||
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", | |
54 | }; | |
55 | ||
56 | static const char *decorate_get_color(int decorate_use_color, enum decoration_type ix) | |
57 | { | |
58 | if (want_color(decorate_use_color)) | |
59 | return decoration_colors[ix]; | |
60 | return ""; | |
61 | } | |
62 | ||
63 | define_list_config_array(color_decorate_slots); | |
64 | ||
65 | int parse_decorate_color_config(const char *var, const char *slot_name, const char *value) | |
66 | { | |
67 | int slot = LOOKUP_CONFIG(color_decorate_slots, slot_name); | |
68 | if (slot < 0) | |
69 | return 0; | |
70 | if (!value) | |
71 | return config_error_nonbool(var); | |
72 | return color_parse(value, decoration_colors[slot]); | |
73 | } | |
74 | ||
75 | /* | |
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 | |
78 | */ | |
79 | #define decorate_get_color_opt(o, ix) \ | |
80 | decorate_get_color((o)->use_color, ix) | |
81 | ||
82 | void add_name_decoration(enum decoration_type type, const char *name, struct object *obj) | |
83 | { | |
84 | struct name_decoration *res; | |
85 | FLEX_ALLOC_STR(res, name, name); | |
86 | res->type = type; | |
87 | res->next = add_decoration(&name_decoration, obj, res); | |
88 | } | |
89 | ||
90 | const struct name_decoration *get_name_decoration(const struct object *obj) | |
91 | { | |
92 | load_ref_decorations(NULL, DECORATE_SHORT_REFS); | |
93 | return lookup_decoration(&name_decoration, obj); | |
94 | } | |
95 | ||
96 | static int match_ref_pattern(const char *refname, | |
97 | const struct string_list_item *item) | |
98 | { | |
99 | int matched = 0; | |
100 | if (!item->util) { | |
101 | if (!wildmatch(item->string, refname, 0)) | |
102 | matched = 1; | |
103 | } else { | |
104 | const char *rest; | |
105 | if (skip_prefix(refname, item->string, &rest) && | |
106 | (!*rest || *rest == '/')) | |
107 | matched = 1; | |
108 | } | |
109 | return matched; | |
110 | } | |
111 | ||
112 | static int ref_filter_match(const char *refname, | |
113 | const struct decoration_filter *filter) | |
114 | { | |
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; | |
120 | ||
121 | if (exclude_patterns && exclude_patterns->nr) { | |
122 | for_each_string_list_item(item, exclude_patterns) { | |
123 | if (match_ref_pattern(refname, item)) | |
124 | return 0; | |
125 | } | |
126 | } | |
127 | ||
128 | if (include_patterns && include_patterns->nr) { | |
129 | for_each_string_list_item(item, include_patterns) { | |
130 | if (match_ref_pattern(refname, item)) | |
131 | return 1; | |
132 | } | |
133 | return 0; | |
134 | } | |
135 | ||
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)) | |
139 | return 0; | |
140 | } | |
141 | } | |
142 | ||
143 | return 1; | |
144 | } | |
145 | ||
146 | static int add_ref_decoration(const char *refname, const struct object_id *oid, | |
147 | int flags UNUSED, | |
148 | void *cb_data) | |
149 | { | |
150 | int i; | |
151 | struct object *obj; | |
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; | |
156 | ||
157 | if (filter && !ref_filter_match(refname, filter)) | |
158 | return 0; | |
159 | ||
160 | if (starts_with(refname, git_replace_ref_base)) { | |
161 | struct object_id original_oid; | |
162 | if (!replace_refs_enabled(the_repository)) | |
163 | return 0; | |
164 | if (get_oid_hex(refname + strlen(git_replace_ref_base), | |
165 | &original_oid)) { | |
166 | warning("invalid replace ref %s", refname); | |
167 | return 0; | |
168 | } | |
169 | obj = parse_object(the_repository, &original_oid); | |
170 | if (obj) | |
171 | add_name_decoration(DECORATION_GRAFTED, "replaced", obj); | |
172 | return 0; | |
173 | } | |
174 | ||
175 | objtype = oid_object_info(the_repository, oid, NULL); | |
176 | if (objtype < 0) | |
177 | return 0; | |
178 | obj = lookup_object_by_type(the_repository, oid, objtype); | |
179 | ||
180 | for (i = 0; i < ARRAY_SIZE(ref_namespace); i++) { | |
181 | struct ref_namespace_info *info = &ref_namespace[i]; | |
182 | ||
183 | if (!info->decoration) | |
184 | continue; | |
185 | if (info->exact) { | |
186 | if (!strcmp(refname, info->ref)) { | |
187 | deco_type = info->decoration; | |
188 | break; | |
189 | } | |
190 | } else if (starts_with(refname, info->ref)) { | |
191 | deco_type = info->decoration; | |
192 | break; | |
193 | } | |
194 | } | |
195 | ||
196 | add_name_decoration(deco_type, refname, obj); | |
197 | while (obj->type == OBJ_TAG) { | |
198 | if (!obj->parsed) | |
199 | parse_object(the_repository, &obj->oid); | |
200 | obj = ((struct tag *)obj)->tagged; | |
201 | if (!obj) | |
202 | break; | |
203 | add_name_decoration(DECORATION_REF_TAG, refname, obj); | |
204 | } | |
205 | return 0; | |
206 | } | |
207 | ||
208 | static int add_graft_decoration(const struct commit_graft *graft, | |
209 | void *cb_data UNUSED) | |
210 | { | |
211 | struct commit *commit = lookup_commit(the_repository, &graft->oid); | |
212 | if (!commit) | |
213 | return 0; | |
214 | add_name_decoration(DECORATION_GRAFTED, "grafted", &commit->object); | |
215 | return 0; | |
216 | } | |
217 | ||
218 | void load_ref_decorations(struct decoration_filter *filter, int flags) | |
219 | { | |
220 | if (!decoration_loaded) { | |
221 | if (filter) { | |
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); | |
225 | } | |
226 | for_each_string_list_item(item, filter->include_ref_pattern) { | |
227 | normalize_glob_ref(item, NULL, item->string); | |
228 | } | |
229 | for_each_string_list_item(item, filter->exclude_ref_config_pattern) { | |
230 | normalize_glob_ref(item, NULL, item->string); | |
231 | } | |
232 | } | |
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); | |
238 | } | |
239 | } | |
240 | ||
241 | static void show_parents(struct commit *commit, int abbrev, FILE *file) | |
242 | { | |
243 | struct commit_list *p; | |
244 | for (p = commit->parents; p ; p = p->next) { | |
245 | struct commit *parent = p->item; | |
246 | fprintf(file, " %s", | |
247 | repo_find_unique_abbrev(the_repository, &parent->object.oid, abbrev)); | |
248 | } | |
249 | } | |
250 | ||
251 | static void show_children(struct rev_info *opt, struct commit *commit, int abbrev) | |
252 | { | |
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)); | |
257 | } | |
258 | } | |
259 | ||
260 | /* | |
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. | |
263 | */ | |
264 | static const struct name_decoration *current_pointed_by_HEAD(const struct name_decoration *decoration) | |
265 | { | |
266 | const struct name_decoration *list, *head = NULL; | |
267 | const char *branch_name = NULL; | |
268 | int rru_flags; | |
269 | ||
270 | /* First find HEAD */ | |
271 | for (list = decoration; list; list = list->next) | |
272 | if (list->type == DECORATION_REF_HEAD) { | |
273 | head = list; | |
274 | break; | |
275 | } | |
276 | if (!head) | |
277 | return NULL; | |
278 | ||
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)) | |
282 | return NULL; | |
283 | ||
284 | if (!starts_with(branch_name, "refs/")) | |
285 | return NULL; | |
286 | ||
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)) { | |
291 | return list; | |
292 | } | |
293 | ||
294 | return NULL; | |
295 | } | |
296 | ||
297 | static void show_name(struct strbuf *sb, const struct name_decoration *decoration) | |
298 | { | |
299 | if (decoration_flags == DECORATE_SHORT_REFS) | |
300 | strbuf_addstr(sb, prettify_refname(decoration->name)); | |
301 | else | |
302 | strbuf_addstr(sb, decoration->name); | |
303 | } | |
304 | ||
305 | /* | |
306 | * The caller makes sure there is no funny color before calling. | |
307 | * format_decorations ensures the same after return. | |
308 | */ | |
309 | void format_decorations(struct strbuf *sb, | |
310 | const struct commit *commit, | |
311 | int use_color, | |
312 | const struct decoration_options *opts) | |
313 | { | |
314 | const struct name_decoration *decoration; | |
315 | const struct name_decoration *current_and_HEAD; | |
316 | const char *color_commit, *color_reset; | |
317 | ||
318 | const char *prefix = " ("; | |
319 | const char *suffix = ")"; | |
320 | const char *separator = ", "; | |
321 | const char *pointer = " -> "; | |
322 | const char *tag = "tag: "; | |
323 | ||
324 | decoration = get_name_decoration(&commit->object); | |
325 | if (!decoration) | |
326 | return; | |
327 | ||
328 | if (opts) { | |
329 | if (opts->prefix) | |
330 | prefix = opts->prefix; | |
331 | if (opts->suffix) | |
332 | suffix = opts->suffix; | |
333 | if (opts->separator) | |
334 | separator = opts->separator; | |
335 | if (opts->pointer) | |
336 | pointer = opts->pointer; | |
337 | if (opts->tag) | |
338 | tag = opts->tag; | |
339 | } | |
340 | ||
341 | color_commit = diff_get_color(use_color, DIFF_COMMIT); | |
342 | color_reset = decorate_get_color(use_color, DECORATION_NONE); | |
343 | ||
344 | current_and_HEAD = current_pointed_by_HEAD(decoration); | |
345 | while (decoration) { | |
346 | /* | |
347 | * When both current and HEAD are there, only | |
348 | * show HEAD->current where HEAD would have | |
349 | * appeared, skipping the entry for current. | |
350 | */ | |
351 | if (decoration != current_and_HEAD) { | |
352 | const char *color = | |
353 | decorate_get_color(use_color, decoration->type); | |
354 | ||
355 | if (*prefix) { | |
356 | strbuf_addstr(sb, color_commit); | |
357 | strbuf_addstr(sb, prefix); | |
358 | strbuf_addstr(sb, color_reset); | |
359 | } | |
360 | ||
361 | if (*tag && decoration->type == DECORATION_REF_TAG) { | |
362 | strbuf_addstr(sb, color); | |
363 | strbuf_addstr(sb, tag); | |
364 | strbuf_addstr(sb, color_reset); | |
365 | } | |
366 | ||
367 | strbuf_addstr(sb, color); | |
368 | show_name(sb, decoration); | |
369 | strbuf_addstr(sb, color_reset); | |
370 | ||
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); | |
379 | } | |
380 | ||
381 | prefix = separator; | |
382 | } | |
383 | decoration = decoration->next; | |
384 | } | |
385 | if (*suffix) { | |
386 | strbuf_addstr(sb, color_commit); | |
387 | strbuf_addstr(sb, suffix); | |
388 | strbuf_addstr(sb, color_reset); | |
389 | } | |
390 | } | |
391 | ||
392 | void show_decorations(struct rev_info *opt, struct commit *commit) | |
393 | { | |
394 | struct strbuf sb = STRBUF_INIT; | |
395 | ||
396 | if (opt->sources) { | |
397 | char **slot = revision_sources_peek(opt->sources, commit); | |
398 | ||
399 | if (slot && *slot) | |
400 | fprintf(opt->diffopt.file, "\t%s", *slot); | |
401 | } | |
402 | if (!opt->show_decorations) | |
403 | return; | |
404 | format_decorations(&sb, commit, opt->diffopt.use_color, NULL); | |
405 | fputs(sb.buf, opt->diffopt.file); | |
406 | strbuf_release(&sb); | |
407 | } | |
408 | ||
409 | static unsigned int digits_in_number(unsigned int number) | |
410 | { | |
411 | unsigned int i = 10, result = 1; | |
412 | while (i <= number) { | |
413 | i *= 10; | |
414 | result++; | |
415 | } | |
416 | return result; | |
417 | } | |
418 | ||
419 | void fmt_output_subject(struct strbuf *filename, | |
420 | const char *subject, | |
421 | struct rev_info *info) | |
422 | { | |
423 | const char *suffix = info->patch_suffix; | |
424 | int nr = info->nr; | |
425 | int start_len = filename->len; | |
426 | int max_len = start_len + info->patch_name_max - (strlen(suffix) + 1); | |
427 | ||
428 | if (info->reroll_count) { | |
429 | struct strbuf temp = STRBUF_INIT; | |
430 | ||
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); | |
435 | } | |
436 | strbuf_addf(filename, "%04d-%s", nr, subject); | |
437 | ||
438 | if (max_len < filename->len) | |
439 | strbuf_setlen(filename, max_len); | |
440 | strbuf_addstr(filename, suffix); | |
441 | } | |
442 | ||
443 | void fmt_output_commit(struct strbuf *filename, | |
444 | struct commit *commit, | |
445 | struct rev_info *info) | |
446 | { | |
447 | struct pretty_print_context ctx = {0}; | |
448 | struct strbuf subject = STRBUF_INIT; | |
449 | ||
450 | repo_format_commit_message(the_repository, commit, "%f", &subject, | |
451 | &ctx); | |
452 | fmt_output_subject(filename, subject.buf, info); | |
453 | strbuf_release(&subject); | |
454 | } | |
455 | ||
456 | void fmt_output_email_subject(struct strbuf *sb, struct rev_info *opt) | |
457 | { | |
458 | if (opt->total > 0) { | |
459 | strbuf_addf(sb, "Subject: [%s%s%0*d/%d] ", | |
460 | opt->subject_prefix, | |
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); | |
467 | } else { | |
468 | strbuf_addstr(sb, "Subject: "); | |
469 | } | |
470 | } | |
471 | ||
472 | void log_write_email_headers(struct rev_info *opt, struct commit *commit, | |
473 | char **extra_headers_p, | |
474 | int *need_8bit_cte_p, | |
475 | int maybe_multipart) | |
476 | { | |
477 | struct strbuf headers = STRBUF_INIT; | |
478 | const char *name = oid_to_hex(opt->zero_commit ? | |
479 | null_oid() : &commit->object.oid); | |
480 | ||
481 | *need_8bit_cte_p = 0; /* unknown */ | |
482 | ||
483 | if (opt->extra_headers && *opt->extra_headers) | |
484 | strbuf_addstr(&headers, opt->extra_headers); | |
485 | ||
486 | fprintf(opt->diffopt.file, "From %s Mon Sep 17 00:00:00 2001\n", name); | |
487 | graph_show_oneline(opt->graph); | |
488 | if (opt->message_id) { | |
489 | fprintf(opt->diffopt.file, "Message-ID: <%s>\n", opt->message_id); | |
490 | graph_show_oneline(opt->graph); | |
491 | } | |
492 | if (opt->ref_message_ids && opt->ref_message_ids->nr > 0) { | |
493 | int i, n; | |
494 | n = opt->ref_message_ids->nr; | |
495 | fprintf(opt->diffopt.file, "In-Reply-To: <%s>\n", opt->ref_message_ids->items[n-1].string); | |
496 | for (i = 0; i < n; i++) | |
497 | fprintf(opt->diffopt.file, "%s<%s>\n", (i > 0 ? "\t" : "References: "), | |
498 | opt->ref_message_ids->items[i].string); | |
499 | graph_show_oneline(opt->graph); | |
500 | } | |
501 | if (opt->mime_boundary && maybe_multipart) { | |
502 | static struct strbuf buffer = STRBUF_INIT; | |
503 | struct strbuf filename = STRBUF_INIT; | |
504 | *need_8bit_cte_p = -1; /* NEVER */ | |
505 | ||
506 | strbuf_reset(&buffer); | |
507 | ||
508 | strbuf_addf(&headers, | |
509 | "MIME-Version: 1.0\n" | |
510 | "Content-Type: multipart/mixed;" | |
511 | " boundary=\"%s%s\"\n" | |
512 | "\n" | |
513 | "This is a multi-part message in MIME " | |
514 | "format.\n" | |
515 | "--%s%s\n" | |
516 | "Content-Type: text/plain; " | |
517 | "charset=UTF-8; format=fixed\n" | |
518 | "Content-Transfer-Encoding: 8bit\n\n", | |
519 | mime_boundary_leader, opt->mime_boundary, | |
520 | mime_boundary_leader, opt->mime_boundary); | |
521 | ||
522 | if (opt->numbered_files) | |
523 | strbuf_addf(&filename, "%d", opt->nr); | |
524 | else | |
525 | fmt_output_commit(&filename, commit, opt); | |
526 | strbuf_addf(&buffer, | |
527 | "\n--%s%s\n" | |
528 | "Content-Type: text/x-patch;" | |
529 | " name=\"%s\"\n" | |
530 | "Content-Transfer-Encoding: 8bit\n" | |
531 | "Content-Disposition: %s;" | |
532 | " filename=\"%s\"\n\n", | |
533 | mime_boundary_leader, opt->mime_boundary, | |
534 | filename.buf, | |
535 | opt->no_inline ? "attachment" : "inline", | |
536 | filename.buf); | |
537 | opt->diffopt.stat_sep = buffer.buf; | |
538 | strbuf_release(&filename); | |
539 | } | |
540 | *extra_headers_p = headers.len ? strbuf_detach(&headers, NULL) : NULL; | |
541 | } | |
542 | ||
543 | static void show_sig_lines(struct rev_info *opt, int status, const char *bol) | |
544 | { | |
545 | const char *color, *reset, *eol; | |
546 | ||
547 | color = diff_get_color_opt(&opt->diffopt, | |
548 | status ? DIFF_WHITESPACE : DIFF_FRAGINFO); | |
549 | reset = diff_get_color_opt(&opt->diffopt, DIFF_RESET); | |
550 | while (*bol) { | |
551 | eol = strchrnul(bol, '\n'); | |
552 | fprintf(opt->diffopt.file, "%s%.*s%s%s", color, (int)(eol - bol), bol, reset, | |
553 | *eol ? "\n" : ""); | |
554 | graph_show_oneline(opt->graph); | |
555 | bol = (*eol) ? (eol + 1) : eol; | |
556 | } | |
557 | } | |
558 | ||
559 | static void show_signature(struct rev_info *opt, struct commit *commit) | |
560 | { | |
561 | struct strbuf payload = STRBUF_INIT; | |
562 | struct strbuf signature = STRBUF_INIT; | |
563 | struct signature_check sigc = { 0 }; | |
564 | int status; | |
565 | ||
566 | if (parse_signed_commit(commit, &payload, &signature, the_hash_algo) <= 0) | |
567 | goto out; | |
568 | ||
569 | sigc.payload_type = SIGNATURE_PAYLOAD_COMMIT; | |
570 | sigc.payload = strbuf_detach(&payload, &sigc.payload_len); | |
571 | status = check_signature(&sigc, signature.buf, signature.len); | |
572 | if (status && !sigc.output) | |
573 | show_sig_lines(opt, status, "No signature\n"); | |
574 | else | |
575 | show_sig_lines(opt, status, sigc.output); | |
576 | signature_check_clear(&sigc); | |
577 | ||
578 | out: | |
579 | strbuf_release(&payload); | |
580 | strbuf_release(&signature); | |
581 | } | |
582 | ||
583 | static int which_parent(const struct object_id *oid, const struct commit *commit) | |
584 | { | |
585 | int nth; | |
586 | const struct commit_list *parent; | |
587 | ||
588 | for (nth = 0, parent = commit->parents; parent; parent = parent->next) { | |
589 | if (oideq(&parent->item->object.oid, oid)) | |
590 | return nth; | |
591 | nth++; | |
592 | } | |
593 | return -1; | |
594 | } | |
595 | ||
596 | static int is_common_merge(const struct commit *commit) | |
597 | { | |
598 | return (commit->parents | |
599 | && commit->parents->next | |
600 | && !commit->parents->next->next); | |
601 | } | |
602 | ||
603 | static int show_one_mergetag(struct commit *commit, | |
604 | struct commit_extra_header *extra, | |
605 | void *data) | |
606 | { | |
607 | struct rev_info *opt = (struct rev_info *)data; | |
608 | struct object_id oid; | |
609 | struct tag *tag; | |
610 | struct strbuf verify_message; | |
611 | struct signature_check sigc = { 0 }; | |
612 | int status, nth; | |
613 | struct strbuf payload = STRBUF_INIT; | |
614 | struct strbuf signature = STRBUF_INIT; | |
615 | ||
616 | hash_object_file(the_hash_algo, extra->value, extra->len, | |
617 | OBJ_TAG, &oid); | |
618 | tag = lookup_tag(the_repository, &oid); | |
619 | if (!tag) | |
620 | return -1; /* error message already given */ | |
621 | ||
622 | strbuf_init(&verify_message, 256); | |
623 | if (parse_tag_buffer(the_repository, tag, extra->value, extra->len)) | |
624 | strbuf_addstr(&verify_message, "malformed mergetag\n"); | |
625 | else if (is_common_merge(commit) && | |
626 | oideq(&tag->tagged->oid, | |
627 | &commit->parents->next->item->object.oid)) | |
628 | strbuf_addf(&verify_message, | |
629 | "merged tag '%s'\n", tag->tag); | |
630 | else if ((nth = which_parent(&tag->tagged->oid, commit)) < 0) | |
631 | strbuf_addf(&verify_message, "tag %s names a non-parent %s\n", | |
632 | tag->tag, oid_to_hex(&tag->tagged->oid)); | |
633 | else | |
634 | strbuf_addf(&verify_message, | |
635 | "parent #%d, tagged '%s'\n", nth + 1, tag->tag); | |
636 | ||
637 | status = -1; | |
638 | if (parse_signature(extra->value, extra->len, &payload, &signature)) { | |
639 | /* could have a good signature */ | |
640 | sigc.payload_type = SIGNATURE_PAYLOAD_TAG; | |
641 | sigc.payload = strbuf_detach(&payload, &sigc.payload_len); | |
642 | status = check_signature(&sigc, signature.buf, signature.len); | |
643 | if (sigc.output) | |
644 | strbuf_addstr(&verify_message, sigc.output); | |
645 | else | |
646 | strbuf_addstr(&verify_message, "No signature\n"); | |
647 | signature_check_clear(&sigc); | |
648 | /* otherwise we couldn't verify, which is shown as bad */ | |
649 | } | |
650 | ||
651 | show_sig_lines(opt, status, verify_message.buf); | |
652 | strbuf_release(&verify_message); | |
653 | strbuf_release(&payload); | |
654 | strbuf_release(&signature); | |
655 | return 0; | |
656 | } | |
657 | ||
658 | static int show_mergetag(struct rev_info *opt, struct commit *commit) | |
659 | { | |
660 | return for_each_mergetag(show_one_mergetag, commit, opt); | |
661 | } | |
662 | ||
663 | static void next_commentary_block(struct rev_info *opt, struct strbuf *sb) | |
664 | { | |
665 | const char *x = opt->shown_dashes ? "\n" : "---\n"; | |
666 | if (sb) | |
667 | strbuf_addstr(sb, x); | |
668 | else | |
669 | fputs(x, opt->diffopt.file); | |
670 | opt->shown_dashes = 1; | |
671 | } | |
672 | ||
673 | void show_log(struct rev_info *opt) | |
674 | { | |
675 | struct strbuf msgbuf = STRBUF_INIT; | |
676 | struct log_info *log = opt->loginfo; | |
677 | struct commit *commit = log->commit, *parent = log->parent; | |
678 | int abbrev_commit = opt->abbrev_commit ? opt->abbrev : the_hash_algo->hexsz; | |
679 | struct pretty_print_context ctx = {0}; | |
680 | ||
681 | opt->loginfo = NULL; | |
682 | if (!opt->verbose_header) { | |
683 | graph_show_commit(opt->graph); | |
684 | ||
685 | if (!opt->graph) | |
686 | put_revision_mark(opt, commit); | |
687 | fputs(repo_find_unique_abbrev(the_repository, &commit->object.oid, abbrev_commit), | |
688 | opt->diffopt.file); | |
689 | if (opt->print_parents) | |
690 | show_parents(commit, abbrev_commit, opt->diffopt.file); | |
691 | if (opt->children.name) | |
692 | show_children(opt, commit, abbrev_commit); | |
693 | show_decorations(opt, commit); | |
694 | if (opt->graph && !graph_is_commit_finished(opt->graph)) { | |
695 | putc('\n', opt->diffopt.file); | |
696 | graph_show_remainder(opt->graph); | |
697 | } | |
698 | putc(opt->diffopt.line_termination, opt->diffopt.file); | |
699 | return; | |
700 | } | |
701 | ||
702 | /* | |
703 | * If use_terminator is set, we already handled any record termination | |
704 | * at the end of the last record. | |
705 | * Otherwise, add a diffopt.line_termination character before all | |
706 | * entries but the first. (IOW, as a separator between entries) | |
707 | */ | |
708 | if (opt->shown_one && !opt->use_terminator) { | |
709 | /* | |
710 | * If entries are separated by a newline, the output | |
711 | * should look human-readable. If the last entry ended | |
712 | * with a newline, print the graph output before this | |
713 | * newline. Otherwise it will end up as a completely blank | |
714 | * line and will look like a gap in the graph. | |
715 | * | |
716 | * If the entry separator is not a newline, the output is | |
717 | * primarily intended for programmatic consumption, and we | |
718 | * never want the extra graph output before the entry | |
719 | * separator. | |
720 | */ | |
721 | if (opt->diffopt.line_termination == '\n' && | |
722 | !opt->missing_newline) | |
723 | graph_show_padding(opt->graph); | |
724 | putc(opt->diffopt.line_termination, opt->diffopt.file); | |
725 | } | |
726 | opt->shown_one = 1; | |
727 | ||
728 | /* | |
729 | * If the history graph was requested, | |
730 | * print the graph, up to this commit's line | |
731 | */ | |
732 | graph_show_commit(opt->graph); | |
733 | ||
734 | /* | |
735 | * Print header line of header.. | |
736 | */ | |
737 | ||
738 | if (cmit_fmt_is_mail(opt->commit_format)) { | |
739 | log_write_email_headers(opt, commit, &ctx.after_subject, | |
740 | &ctx.need_8bit_cte, 1); | |
741 | ctx.rev = opt; | |
742 | } else if (opt->commit_format != CMIT_FMT_USERFORMAT) { | |
743 | fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), opt->diffopt.file); | |
744 | if (opt->commit_format != CMIT_FMT_ONELINE) | |
745 | fputs("commit ", opt->diffopt.file); | |
746 | ||
747 | if (!opt->graph) | |
748 | put_revision_mark(opt, commit); | |
749 | fputs(repo_find_unique_abbrev(the_repository, &commit->object.oid, | |
750 | abbrev_commit), | |
751 | opt->diffopt.file); | |
752 | if (opt->print_parents) | |
753 | show_parents(commit, abbrev_commit, opt->diffopt.file); | |
754 | if (opt->children.name) | |
755 | show_children(opt, commit, abbrev_commit); | |
756 | if (parent) | |
757 | fprintf(opt->diffopt.file, " (from %s)", | |
758 | repo_find_unique_abbrev(the_repository, &parent->object.oid, abbrev_commit)); | |
759 | fputs(diff_get_color_opt(&opt->diffopt, DIFF_RESET), opt->diffopt.file); | |
760 | show_decorations(opt, commit); | |
761 | if (opt->commit_format == CMIT_FMT_ONELINE) { | |
762 | putc(' ', opt->diffopt.file); | |
763 | } else { | |
764 | putc('\n', opt->diffopt.file); | |
765 | graph_show_oneline(opt->graph); | |
766 | } | |
767 | if (opt->reflog_info) { | |
768 | /* | |
769 | * setup_revisions() ensures that opt->reflog_info | |
770 | * and opt->graph cannot both be set, | |
771 | * so we don't need to worry about printing the | |
772 | * graph info here. | |
773 | */ | |
774 | show_reflog_message(opt->reflog_info, | |
775 | opt->commit_format == CMIT_FMT_ONELINE, | |
776 | &opt->date_mode, | |
777 | opt->date_mode_explicit); | |
778 | if (opt->commit_format == CMIT_FMT_ONELINE) | |
779 | return; | |
780 | } | |
781 | } | |
782 | ||
783 | if (opt->show_signature) { | |
784 | show_signature(opt, commit); | |
785 | show_mergetag(opt, commit); | |
786 | } | |
787 | ||
788 | if (opt->show_notes) { | |
789 | int raw; | |
790 | struct strbuf notebuf = STRBUF_INIT; | |
791 | ||
792 | raw = (opt->commit_format == CMIT_FMT_USERFORMAT); | |
793 | format_display_notes(&commit->object.oid, ¬ebuf, | |
794 | get_log_output_encoding(), raw); | |
795 | ctx.notes_message = strbuf_detach(¬ebuf, NULL); | |
796 | } | |
797 | ||
798 | /* | |
799 | * And then the pretty-printed message itself | |
800 | */ | |
801 | if (ctx.need_8bit_cte >= 0 && opt->add_signoff) | |
802 | ctx.need_8bit_cte = | |
803 | has_non_ascii(fmt_name(WANT_COMMITTER_IDENT)); | |
804 | ctx.date_mode = opt->date_mode; | |
805 | ctx.date_mode_explicit = opt->date_mode_explicit; | |
806 | ctx.abbrev = opt->diffopt.abbrev; | |
807 | ctx.preserve_subject = opt->preserve_subject; | |
808 | ctx.encode_email_headers = opt->encode_email_headers; | |
809 | ctx.reflog_info = opt->reflog_info; | |
810 | ctx.fmt = opt->commit_format; | |
811 | ctx.mailmap = opt->mailmap; | |
812 | ctx.color = opt->diffopt.use_color; | |
813 | ctx.expand_tabs_in_log = opt->expand_tabs_in_log; | |
814 | ctx.output_encoding = get_log_output_encoding(); | |
815 | ctx.rev = opt; | |
816 | if (opt->from_ident.mail_begin && opt->from_ident.name_begin) | |
817 | ctx.from_ident = &opt->from_ident; | |
818 | if (opt->graph) | |
819 | ctx.graph_width = graph_width(opt->graph); | |
820 | pretty_print_commit(&ctx, commit, &msgbuf); | |
821 | ||
822 | if (opt->add_signoff) | |
823 | append_signoff(&msgbuf, 0, APPEND_SIGNOFF_DEDUP); | |
824 | ||
825 | if ((ctx.fmt != CMIT_FMT_USERFORMAT) && | |
826 | ctx.notes_message && *ctx.notes_message) { | |
827 | if (cmit_fmt_is_mail(ctx.fmt)) | |
828 | next_commentary_block(opt, &msgbuf); | |
829 | strbuf_addstr(&msgbuf, ctx.notes_message); | |
830 | } | |
831 | ||
832 | if (opt->show_log_size) { | |
833 | fprintf(opt->diffopt.file, "log size %i\n", (int)msgbuf.len); | |
834 | graph_show_oneline(opt->graph); | |
835 | } | |
836 | ||
837 | /* | |
838 | * Set opt->missing_newline if msgbuf doesn't | |
839 | * end in a newline (including if it is empty) | |
840 | */ | |
841 | if (!msgbuf.len || msgbuf.buf[msgbuf.len - 1] != '\n') | |
842 | opt->missing_newline = 1; | |
843 | else | |
844 | opt->missing_newline = 0; | |
845 | ||
846 | graph_show_commit_msg(opt->graph, opt->diffopt.file, &msgbuf); | |
847 | if (opt->use_terminator && !commit_format_is_empty(opt->commit_format)) { | |
848 | if (!opt->missing_newline) | |
849 | graph_show_padding(opt->graph); | |
850 | putc(opt->diffopt.line_termination, opt->diffopt.file); | |
851 | } | |
852 | ||
853 | strbuf_release(&msgbuf); | |
854 | free(ctx.notes_message); | |
855 | free(ctx.after_subject); | |
856 | ||
857 | if (cmit_fmt_is_mail(ctx.fmt) && opt->idiff_oid1) { | |
858 | struct diff_queue_struct dq; | |
859 | ||
860 | memcpy(&dq, &diff_queued_diff, sizeof(diff_queued_diff)); | |
861 | DIFF_QUEUE_CLEAR(&diff_queued_diff); | |
862 | ||
863 | next_commentary_block(opt, NULL); | |
864 | fprintf_ln(opt->diffopt.file, "%s", opt->idiff_title); | |
865 | show_interdiff(opt->idiff_oid1, opt->idiff_oid2, 2, | |
866 | &opt->diffopt); | |
867 | ||
868 | memcpy(&diff_queued_diff, &dq, sizeof(diff_queued_diff)); | |
869 | } | |
870 | ||
871 | if (cmit_fmt_is_mail(ctx.fmt) && opt->rdiff1) { | |
872 | struct diff_queue_struct dq; | |
873 | struct diff_options opts; | |
874 | struct range_diff_options range_diff_opts = { | |
875 | .creation_factor = opt->creation_factor, | |
876 | .dual_color = 1, | |
877 | .diffopt = &opts | |
878 | }; | |
879 | ||
880 | memcpy(&dq, &diff_queued_diff, sizeof(diff_queued_diff)); | |
881 | DIFF_QUEUE_CLEAR(&diff_queued_diff); | |
882 | ||
883 | next_commentary_block(opt, NULL); | |
884 | fprintf_ln(opt->diffopt.file, "%s", opt->rdiff_title); | |
885 | /* | |
886 | * Pass minimum required diff-options to range-diff; others | |
887 | * can be added later if deemed desirable. | |
888 | */ | |
889 | repo_diff_setup(the_repository, &opts); | |
890 | opts.file = opt->diffopt.file; | |
891 | opts.use_color = opt->diffopt.use_color; | |
892 | diff_setup_done(&opts); | |
893 | show_range_diff(opt->rdiff1, opt->rdiff2, &range_diff_opts); | |
894 | ||
895 | memcpy(&diff_queued_diff, &dq, sizeof(diff_queued_diff)); | |
896 | } | |
897 | } | |
898 | ||
899 | int log_tree_diff_flush(struct rev_info *opt) | |
900 | { | |
901 | opt->shown_dashes = 0; | |
902 | diffcore_std(&opt->diffopt); | |
903 | ||
904 | if (diff_queue_is_empty(&opt->diffopt)) { | |
905 | int saved_fmt = opt->diffopt.output_format; | |
906 | opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT; | |
907 | diff_flush(&opt->diffopt); | |
908 | opt->diffopt.output_format = saved_fmt; | |
909 | return 0; | |
910 | } | |
911 | ||
912 | if (opt->loginfo && !opt->no_commit_id) { | |
913 | show_log(opt); | |
914 | if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) && | |
915 | opt->verbose_header && | |
916 | opt->commit_format != CMIT_FMT_ONELINE && | |
917 | !commit_format_is_empty(opt->commit_format)) { | |
918 | /* | |
919 | * When showing a verbose header (i.e. log message), | |
920 | * and not in --pretty=oneline format, we would want | |
921 | * an extra newline between the end of log and the | |
922 | * diff/diffstat output for readability. | |
923 | */ | |
924 | int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH; | |
925 | if (opt->diffopt.output_prefix) { | |
926 | struct strbuf *msg = NULL; | |
927 | msg = opt->diffopt.output_prefix(&opt->diffopt, | |
928 | opt->diffopt.output_prefix_data); | |
929 | fwrite(msg->buf, msg->len, 1, opt->diffopt.file); | |
930 | } | |
931 | ||
932 | /* | |
933 | * We may have shown three-dashes line early | |
934 | * between generated commentary (notes, etc.) | |
935 | * and the log message, in which case we only | |
936 | * want a blank line after the commentary | |
937 | * without (an extra) three-dashes line. | |
938 | * Otherwise, we show the three-dashes line if | |
939 | * we are showing the patch with diffstat, but | |
940 | * in that case, there is no extra blank line | |
941 | * after the three-dashes line. | |
942 | */ | |
943 | if (!opt->shown_dashes && | |
944 | (pch & opt->diffopt.output_format) == pch) | |
945 | fprintf(opt->diffopt.file, "---"); | |
946 | putc('\n', opt->diffopt.file); | |
947 | } | |
948 | } | |
949 | diff_flush(&opt->diffopt); | |
950 | return 1; | |
951 | } | |
952 | ||
953 | static int do_diff_combined(struct rev_info *opt, struct commit *commit) | |
954 | { | |
955 | diff_tree_combined_merge(commit, opt); | |
956 | return !opt->loginfo; | |
957 | } | |
958 | ||
959 | static void setup_additional_headers(struct diff_options *o, | |
960 | struct strmap *all_headers) | |
961 | { | |
962 | struct hashmap_iter iter; | |
963 | struct strmap_entry *entry; | |
964 | ||
965 | /* | |
966 | * Make o->additional_path_headers contain the subset of all_headers | |
967 | * that match o->pathspec. If there aren't any that match o->pathspec, | |
968 | * then make o->additional_path_headers be NULL. | |
969 | */ | |
970 | ||
971 | if (!o->pathspec.nr) { | |
972 | o->additional_path_headers = all_headers; | |
973 | return; | |
974 | } | |
975 | ||
976 | o->additional_path_headers = xmalloc(sizeof(struct strmap)); | |
977 | strmap_init_with_options(o->additional_path_headers, NULL, 0); | |
978 | strmap_for_each_entry(all_headers, &iter, entry) { | |
979 | if (match_pathspec(the_repository->index, &o->pathspec, | |
980 | entry->key, strlen(entry->key), | |
981 | 0 /* prefix */, NULL /* seen */, | |
982 | 0 /* is_dir */)) | |
983 | strmap_put(o->additional_path_headers, | |
984 | entry->key, entry->value); | |
985 | } | |
986 | if (!strmap_get_size(o->additional_path_headers)) { | |
987 | strmap_clear(o->additional_path_headers, 0); | |
988 | FREE_AND_NULL(o->additional_path_headers); | |
989 | } | |
990 | } | |
991 | ||
992 | static void cleanup_additional_headers(struct diff_options *o) | |
993 | { | |
994 | if (!o->pathspec.nr) { | |
995 | o->additional_path_headers = NULL; | |
996 | return; | |
997 | } | |
998 | if (!o->additional_path_headers) | |
999 | return; | |
1000 | ||
1001 | strmap_clear(o->additional_path_headers, 0); | |
1002 | FREE_AND_NULL(o->additional_path_headers); | |
1003 | } | |
1004 | ||
1005 | static int do_remerge_diff(struct rev_info *opt, | |
1006 | struct commit_list *parents, | |
1007 | struct object_id *oid) | |
1008 | { | |
1009 | struct merge_options o; | |
1010 | struct commit_list *bases = NULL; | |
1011 | struct merge_result res = {0}; | |
1012 | struct pretty_print_context ctx = {0}; | |
1013 | struct commit *parent1 = parents->item; | |
1014 | struct commit *parent2 = parents->next->item; | |
1015 | struct strbuf parent1_desc = STRBUF_INIT; | |
1016 | struct strbuf parent2_desc = STRBUF_INIT; | |
1017 | ||
1018 | /* Setup merge options */ | |
1019 | init_merge_options(&o, the_repository); | |
1020 | o.show_rename_progress = 0; | |
1021 | o.record_conflict_msgs_as_headers = 1; | |
1022 | o.msg_header_prefix = "remerge"; | |
1023 | ||
1024 | ctx.abbrev = DEFAULT_ABBREV; | |
1025 | repo_format_commit_message(the_repository, parent1, "%h (%s)", | |
1026 | &parent1_desc, &ctx); | |
1027 | repo_format_commit_message(the_repository, parent2, "%h (%s)", | |
1028 | &parent2_desc, &ctx); | |
1029 | o.branch1 = parent1_desc.buf; | |
1030 | o.branch2 = parent2_desc.buf; | |
1031 | ||
1032 | /* Parse the relevant commits and get the merge bases */ | |
1033 | parse_commit_or_die(parent1); | |
1034 | parse_commit_or_die(parent2); | |
1035 | if (repo_get_merge_bases(the_repository, parent1, parent2, &bases) < 0) | |
1036 | exit(128); | |
1037 | ||
1038 | /* Re-merge the parents */ | |
1039 | merge_incore_recursive(&o, bases, parent1, parent2, &res); | |
1040 | ||
1041 | /* Show the diff */ | |
1042 | setup_additional_headers(&opt->diffopt, res.path_messages); | |
1043 | diff_tree_oid(&res.tree->object.oid, oid, "", &opt->diffopt); | |
1044 | log_tree_diff_flush(opt); | |
1045 | ||
1046 | /* Cleanup */ | |
1047 | cleanup_additional_headers(&opt->diffopt); | |
1048 | strbuf_release(&parent1_desc); | |
1049 | strbuf_release(&parent2_desc); | |
1050 | merge_finalize(&o, &res); | |
1051 | ||
1052 | /* Clean up the contents of the temporary object directory */ | |
1053 | if (opt->remerge_objdir) | |
1054 | tmp_objdir_discard_objects(opt->remerge_objdir); | |
1055 | else | |
1056 | BUG("did a remerge diff without remerge_objdir?!?"); | |
1057 | ||
1058 | return !opt->loginfo; | |
1059 | } | |
1060 | ||
1061 | /* | |
1062 | * Show the diff of a commit. | |
1063 | * | |
1064 | * Return true if we printed any log info messages | |
1065 | */ | |
1066 | static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log_info *log) | |
1067 | { | |
1068 | int showed_log; | |
1069 | struct commit_list *parents; | |
1070 | struct object_id *oid; | |
1071 | int is_merge; | |
1072 | int all_need_diff = opt->diff || opt->diffopt.flags.exit_with_status; | |
1073 | ||
1074 | if (!all_need_diff && !opt->merges_need_diff) | |
1075 | return 0; | |
1076 | ||
1077 | parse_commit_or_die(commit); | |
1078 | oid = get_commit_tree_oid(commit); | |
1079 | ||
1080 | parents = get_saved_parents(opt, commit); | |
1081 | is_merge = parents && parents->next; | |
1082 | if (!is_merge && !all_need_diff) | |
1083 | return 0; | |
1084 | ||
1085 | /* Root commit? */ | |
1086 | if (!parents) { | |
1087 | if (opt->show_root_diff) { | |
1088 | diff_root_tree_oid(oid, "", &opt->diffopt); | |
1089 | log_tree_diff_flush(opt); | |
1090 | } | |
1091 | return !opt->loginfo; | |
1092 | } | |
1093 | ||
1094 | if (is_merge) { | |
1095 | int octopus = (parents->next->next != NULL); | |
1096 | ||
1097 | if (opt->remerge_diff) { | |
1098 | if (octopus) { | |
1099 | show_log(opt); | |
1100 | fprintf(opt->diffopt.file, | |
1101 | "diff: warning: Skipping remerge-diff " | |
1102 | "for octopus merges.\n"); | |
1103 | return 1; | |
1104 | } | |
1105 | return do_remerge_diff(opt, parents, oid); | |
1106 | } | |
1107 | if (opt->combine_merges) | |
1108 | return do_diff_combined(opt, commit); | |
1109 | if (opt->separate_merges) { | |
1110 | if (!opt->first_parent_merges) { | |
1111 | /* Show parent info for multiple diffs */ | |
1112 | log->parent = parents->item; | |
1113 | } | |
1114 | } else | |
1115 | return 0; | |
1116 | } | |
1117 | ||
1118 | showed_log = 0; | |
1119 | for (;;) { | |
1120 | struct commit *parent = parents->item; | |
1121 | ||
1122 | parse_commit_or_die(parent); | |
1123 | diff_tree_oid(get_commit_tree_oid(parent), | |
1124 | oid, "", &opt->diffopt); | |
1125 | log_tree_diff_flush(opt); | |
1126 | ||
1127 | showed_log |= !opt->loginfo; | |
1128 | ||
1129 | /* Set up the log info for the next parent, if any.. */ | |
1130 | parents = parents->next; | |
1131 | if (!parents || opt->first_parent_merges) | |
1132 | break; | |
1133 | log->parent = parents->item; | |
1134 | opt->loginfo = log; | |
1135 | } | |
1136 | return showed_log; | |
1137 | } | |
1138 | ||
1139 | int log_tree_commit(struct rev_info *opt, struct commit *commit) | |
1140 | { | |
1141 | struct log_info log; | |
1142 | int shown; | |
1143 | /* maybe called by e.g. cmd_log_walk(), maybe stand-alone */ | |
1144 | int no_free = opt->diffopt.no_free; | |
1145 | ||
1146 | log.commit = commit; | |
1147 | log.parent = NULL; | |
1148 | opt->loginfo = &log; | |
1149 | opt->diffopt.no_free = 1; | |
1150 | ||
1151 | /* NEEDSWORK: no restoring of no_free? Why? */ | |
1152 | if (opt->line_level_traverse) | |
1153 | return line_log_print(opt, commit); | |
1154 | ||
1155 | if (opt->track_linear && !opt->linear && !opt->reverse_output_stage) | |
1156 | fprintf(opt->diffopt.file, "\n%s\n", opt->break_bar); | |
1157 | shown = log_tree_diff(opt, commit, &log); | |
1158 | if (!shown && opt->loginfo && opt->always_show_header) { | |
1159 | log.parent = NULL; | |
1160 | show_log(opt); | |
1161 | shown = 1; | |
1162 | } | |
1163 | if (opt->track_linear && !opt->linear && opt->reverse_output_stage) | |
1164 | fprintf(opt->diffopt.file, "\n%s\n", opt->break_bar); | |
1165 | opt->loginfo = NULL; | |
1166 | maybe_flush_or_die(opt->diffopt.file, "stdout"); | |
1167 | opt->diffopt.no_free = no_free; | |
1168 | diff_free(&opt->diffopt); | |
1169 | return shown; | |
1170 | } |