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