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