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