]>
Commit | Line | Data |
---|---|---|
70827b15 LT |
1 | /* |
2 | * Builtin "git log" and related commands (show, whatchanged) | |
3 | * | |
4 | * (C) Copyright 2006 Linus Torvalds | |
5 | * 2006 Junio Hamano | |
6 | */ | |
7 | #include "cache.h" | |
b2141fc1 | 8 | #include "config.h" |
fb58c8d5 | 9 | #include "refs.h" |
cbd53a21 | 10 | #include "object-store.h" |
6b2f2d98 | 11 | #include "color.h" |
70827b15 LT |
12 | #include "commit.h" |
13 | #include "diff.h" | |
14 | #include "revision.h" | |
15 | #include "log-tree.h" | |
91efcf60 | 16 | #include "builtin.h" |
5d7eeee2 | 17 | #include "tag.h" |
cf39f54e | 18 | #include "reflog-walk.h" |
5d23e133 | 19 | #include "patch-ids.h" |
a5a27c79 | 20 | #include "run-command.h" |
2bda2cf4 | 21 | #include "shortlog.h" |
f2968022 | 22 | #include "remote.h" |
b079c50e | 23 | #include "string-list.h" |
fff02ee6 | 24 | #include "parse-options.h" |
12da1d1f | 25 | #include "line-log.h" |
739453a3 | 26 | #include "branch.h" |
74775a09 | 27 | #include "streaming.h" |
816fb46b | 28 | #include "version.h" |
ea57bc0d | 29 | #include "mailmap.h" |
6005dbb9 | 30 | #include "gpg-interface.h" |
738e88a2 | 31 | #include "progress.h" |
7b680d32 | 32 | #include "commit-slab.h" |
109cd76d | 33 | #include "repository.h" |
64043556 | 34 | #include "commit-reach.h" |
126facf8 | 35 | #include "interdiff.h" |
31e2617a | 36 | #include "range-diff.h" |
70827b15 | 37 | |
43662b23 NTND |
38 | #define MAIL_DEFAULT_WRAP 72 |
39 | ||
dd0ffd5b HO |
40 | /* Set a default date-time format for git log ("log.date" config variable) */ |
41 | static const char *default_date_mode = NULL; | |
42 | ||
0c47695a | 43 | static int default_abbrev_commit; |
0f03ca94 | 44 | static int default_show_root = 1; |
076c9837 | 45 | static int default_follow; |
fce04c3c | 46 | static int default_show_signature; |
8a3d203b | 47 | static int decoration_style; |
1c40c36b | 48 | static int decoration_given; |
e6bb5f78 | 49 | static int use_mailmap_config; |
d54276f2 | 50 | static const char *fmt_patch_subject_prefix = "PATCH"; |
94c22a5e | 51 | static const char *fmt_pretty; |
0f03ca94 | 52 | |
1c40c36b | 53 | static const char * const builtin_log_usage[] = { |
ce41720c | 54 | N_("git log [<options>] [<revision-range>] [[--] <path>...]"), |
bb831db6 | 55 | N_("git show [<options>] <object>..."), |
1c40c36b CMN |
56 | NULL |
57 | }; | |
1c370ea4 | 58 | |
12da1d1f TR |
59 | struct line_opt_callback_data { |
60 | struct rev_info *rev; | |
61 | const char *prefix; | |
62 | struct string_list args; | |
63 | }; | |
64 | ||
940a911f AH |
65 | static int auto_decoration_style(void) |
66 | { | |
67 | return (isatty(1) || pager_in_use()) ? DECORATE_SHORT_REFS : 0; | |
68 | } | |
69 | ||
f094b89a | 70 | static int parse_decoration_style(const char *value) |
8a3d203b | 71 | { |
89576613 | 72 | switch (git_parse_maybe_bool(value)) { |
8a3d203b JH |
73 | case 1: |
74 | return DECORATE_SHORT_REFS; | |
75 | case 0: | |
76 | return 0; | |
77 | default: | |
78 | break; | |
79 | } | |
80 | if (!strcmp(value, "full")) | |
81 | return DECORATE_FULL_REFS; | |
82 | else if (!strcmp(value, "short")) | |
83 | return DECORATE_SHORT_REFS; | |
15715866 | 84 | else if (!strcmp(value, "auto")) |
940a911f | 85 | return auto_decoration_style(); |
8a3d203b JH |
86 | return -1; |
87 | } | |
88 | ||
1c40c36b CMN |
89 | static int decorate_callback(const struct option *opt, const char *arg, int unset) |
90 | { | |
91 | if (unset) | |
92 | decoration_style = 0; | |
93 | else if (arg) | |
f094b89a | 94 | decoration_style = parse_decoration_style(arg); |
1c40c36b CMN |
95 | else |
96 | decoration_style = DECORATE_SHORT_REFS; | |
97 | ||
98 | if (decoration_style < 0) | |
e4a590ef | 99 | die(_("invalid --decorate option: %s"), arg); |
1c40c36b CMN |
100 | |
101 | decoration_given = 1; | |
102 | ||
103 | return 0; | |
104 | } | |
105 | ||
12da1d1f TR |
106 | static int log_line_range_callback(const struct option *option, const char *arg, int unset) |
107 | { | |
108 | struct line_opt_callback_data *data = option->value; | |
109 | ||
517fe807 JK |
110 | BUG_ON_OPT_NEG(unset); |
111 | ||
12da1d1f TR |
112 | if (!arg) |
113 | return -1; | |
114 | ||
115 | data->rev->line_level_traverse = 1; | |
116 | string_list_append(&data->args, arg); | |
117 | ||
118 | return 0; | |
119 | } | |
120 | ||
9501d191 MM |
121 | static void init_log_defaults(void) |
122 | { | |
38bbc2ea | 123 | init_grep_defaults(the_repository); |
5404c116 | 124 | init_diff_ui_defaults(); |
c74271aa | 125 | |
126 | decoration_style = auto_decoration_style(); | |
9501d191 MM |
127 | } |
128 | ||
ef803fd4 | 129 | static void cmd_log_init_defaults(struct rev_info *rev) |
70827b15 | 130 | { |
94c22a5e | 131 | if (fmt_pretty) |
4da45bef | 132 | get_commit_format(fmt_pretty, rev); |
076c9837 | 133 | if (default_follow) |
0d1e0e78 | 134 | rev->diffopt.flags.default_follow_renames = 1; |
70827b15 | 135 | rev->verbose_header = 1; |
0d1e0e78 | 136 | rev->diffopt.flags.recursive = 1; |
5e0ec15e | 137 | rev->diffopt.stat_width = -1; /* use full terminal width */ |
df44483a | 138 | rev->diffopt.stat_graph_width = -1; /* respect statGraphWidth config */ |
0c47695a | 139 | rev->abbrev_commit = default_abbrev_commit; |
0f03ca94 | 140 | rev->show_root_diff = default_show_root; |
d54276f2 | 141 | rev->subject_prefix = fmt_patch_subject_prefix; |
fce04c3c | 142 | rev->show_signature = default_show_signature; |
0d1e0e78 | 143 | rev->diffopt.flags.allow_textconv = 1; |
dd0ffd5b HO |
144 | |
145 | if (default_date_mode) | |
a5481a6c | 146 | parse_date_format(default_date_mode, &rev->date_mode); |
ef803fd4 | 147 | } |
dd0ffd5b | 148 | |
ef803fd4 MG |
149 | static void cmd_log_init_finish(int argc, const char **argv, const char *prefix, |
150 | struct rev_info *rev, struct setup_revision_opt *opt) | |
151 | { | |
ef803fd4 | 152 | struct userformat_want w; |
ea57bc0d | 153 | int quiet = 0, source = 0, mailmap = 0; |
12da1d1f | 154 | static struct line_opt_callback_data line_cb = {NULL, NULL, STRING_LIST_INIT_DUP}; |
65516f58 RA |
155 | static struct string_list decorate_refs_exclude = STRING_LIST_INIT_NODUP; |
156 | static struct string_list decorate_refs_include = STRING_LIST_INIT_NODUP; | |
157 | struct decoration_filter decoration_filter = {&decorate_refs_include, | |
158 | &decorate_refs_exclude}; | |
87be2523 | 159 | static struct revision_sources revision_sources; |
1c40c36b CMN |
160 | |
161 | const struct option builtin_log_options[] = { | |
b7df098c | 162 | OPT__QUIET(&quiet, N_("suppress diff output")), |
aa089cd9 FC |
163 | OPT_BOOL(0, "source", &source, N_("show source")), |
164 | OPT_BOOL(0, "use-mailmap", &mailmap, N_("Use mail map file")), | |
65516f58 RA |
165 | OPT_STRING_LIST(0, "decorate-refs", &decorate_refs_include, |
166 | N_("pattern"), N_("only decorate refs that match <pattern>")), | |
167 | OPT_STRING_LIST(0, "decorate-refs-exclude", &decorate_refs_exclude, | |
168 | N_("pattern"), N_("do not decorate refs that match <pattern>")), | |
e62cd35a | 169 | { OPTION_CALLBACK, 0, "decorate", NULL, NULL, N_("decorate options"), |
1c40c36b | 170 | PARSE_OPT_OPTARG, decorate_callback}, |
12da1d1f | 171 | OPT_CALLBACK('L', NULL, &line_cb, "n,m:file", |
e4a590ef | 172 | N_("Process line range n,m in file, counting from 1"), |
12da1d1f | 173 | log_line_range_callback), |
1c40c36b CMN |
174 | OPT_END() |
175 | }; | |
176 | ||
12da1d1f TR |
177 | line_cb.rev = rev; |
178 | line_cb.prefix = prefix; | |
179 | ||
e6bb5f78 | 180 | mailmap = use_mailmap_config; |
1c40c36b CMN |
181 | argc = parse_options(argc, argv, prefix, |
182 | builtin_log_options, builtin_log_usage, | |
183 | PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN | | |
184 | PARSE_OPT_KEEP_DASHDASH); | |
52883fbd | 185 | |
01771a8e JH |
186 | if (quiet) |
187 | rev->diffopt.output_format |= DIFF_FORMAT_NO_OUTPUT; | |
f9c75d85 | 188 | argc = setup_revisions(argc, argv, rev, opt); |
dd0ffd5b | 189 | |
1c40c36b CMN |
190 | /* Any arguments at this point are not recognized */ |
191 | if (argc > 1) | |
e4a590ef | 192 | die(_("unrecognized argument: %s"), argv[1]); |
1c40c36b | 193 | |
5b163603 JG |
194 | memset(&w, 0, sizeof(w)); |
195 | userformat_find_requirements(NULL, &w); | |
196 | ||
197 | if (!rev->show_notes_given && (!rev->pretty_given || w.notes)) | |
66b2ed09 | 198 | rev->show_notes = 1; |
894a9d33 TR |
199 | if (rev->show_notes) |
200 | init_display_notes(&rev->notes_opt); | |
66b2ed09 | 201 | |
cf63051a SB |
202 | if ((rev->diffopt.pickaxe_opts & DIFF_PICKAXE_KINDS_MASK) || |
203 | rev->diffopt.filter || rev->diffopt.flags.follow_renames) | |
9dafea26 | 204 | rev->always_show_header = 0; |
1c40c36b | 205 | |
87be2523 NTND |
206 | if (source) { |
207 | init_revision_sources(&revision_sources); | |
208 | rev->sources = &revision_sources; | |
209 | } | |
635530a2 | 210 | |
ea57bc0d AP |
211 | if (mailmap) { |
212 | rev->mailmap = xcalloc(1, sizeof(struct string_list)); | |
213 | read_mailmap(rev->mailmap, NULL); | |
214 | } | |
215 | ||
0c47695a JS |
216 | if (rev->pretty_given && rev->commit_format == CMIT_FMT_RAW) { |
217 | /* | |
218 | * "log --pretty=raw" is special; ignore UI oriented | |
219 | * configuration variables such as decoration. | |
220 | */ | |
221 | if (!decoration_given) | |
222 | decoration_style = 0; | |
223 | if (!rev->abbrev_commit_given) | |
224 | rev->abbrev_commit = 0; | |
225 | } | |
635530a2 | 226 | |
33e7018c LH |
227 | if (decoration_style) { |
228 | rev->show_decorations = 1; | |
65516f58 | 229 | load_ref_decorations(&decoration_filter, decoration_style); |
33e7018c | 230 | } |
12da1d1f TR |
231 | |
232 | if (rev->line_level_traverse) | |
233 | line_log_init(rev, line_cb.prefix, &line_cb.args); | |
234 | ||
1fda91b5 | 235 | setup_pager(); |
9dafea26 TH |
236 | } |
237 | ||
ef803fd4 MG |
238 | static void cmd_log_init(int argc, const char **argv, const char *prefix, |
239 | struct rev_info *rev, struct setup_revision_opt *opt) | |
240 | { | |
241 | cmd_log_init_defaults(rev); | |
242 | cmd_log_init_finish(argc, argv, prefix, rev, opt); | |
243 | } | |
244 | ||
252a7c02 LT |
245 | /* |
246 | * This gives a rough estimate for how many commits we | |
247 | * will print out in the list. | |
248 | */ | |
249 | static int estimate_commit_count(struct rev_info *rev, struct commit_list *list) | |
250 | { | |
251 | int n = 0; | |
252 | ||
253 | while (list) { | |
254 | struct commit *commit = list->item; | |
255 | unsigned int flags = commit->object.flags; | |
252a7c02 | 256 | list = list->next; |
7dc0fe3b | 257 | if (!(flags & (TREESAME | UNINTERESTING))) |
53b2c823 | 258 | n++; |
252a7c02 LT |
259 | } |
260 | return n; | |
261 | } | |
262 | ||
263 | static void show_early_header(struct rev_info *rev, const char *stage, int nr) | |
264 | { | |
265 | if (rev->shown_one) { | |
266 | rev->shown_one = 0; | |
267 | if (rev->commit_format != CMIT_FMT_ONELINE) | |
268 | putchar(rev->diffopt.line_termination); | |
269 | } | |
95235f5b | 270 | fprintf(rev->diffopt.file, _("Final output: %d %s\n"), nr, stage); |
252a7c02 LT |
271 | } |
272 | ||
2af202be | 273 | static struct itimerval early_output_timer; |
252a7c02 | 274 | |
cdcefbc9 LT |
275 | static void log_show_early(struct rev_info *revs, struct commit_list *list) |
276 | { | |
6ea57703 | 277 | int i = revs->early_output, close_file = revs->diffopt.close_file; |
252a7c02 | 278 | int show_header = 1; |
cdcefbc9 | 279 | |
6ea57703 | 280 | revs->diffopt.close_file = 0; |
08f704f2 | 281 | sort_in_topological_order(&list, revs->sort_order); |
cdcefbc9 LT |
282 | while (list && i) { |
283 | struct commit *commit = list->item; | |
252a7c02 LT |
284 | switch (simplify_commit(revs, commit)) { |
285 | case commit_show: | |
286 | if (show_header) { | |
287 | int n = estimate_commit_count(revs, list); | |
288 | show_early_header(revs, "incomplete", n); | |
289 | show_header = 0; | |
290 | } | |
291 | log_tree_commit(revs, commit); | |
292 | i--; | |
293 | break; | |
294 | case commit_ignore: | |
295 | break; | |
296 | case commit_error: | |
6ea57703 JS |
297 | if (close_file) |
298 | fclose(revs->diffopt.file); | |
252a7c02 LT |
299 | return; |
300 | } | |
cdcefbc9 | 301 | list = list->next; |
cdcefbc9 | 302 | } |
252a7c02 LT |
303 | |
304 | /* Did we already get enough commits for the early output? */ | |
6ea57703 JS |
305 | if (!i) { |
306 | if (close_file) | |
307 | fclose(revs->diffopt.file); | |
252a7c02 | 308 | return; |
6ea57703 | 309 | } |
252a7c02 LT |
310 | |
311 | /* | |
312 | * ..if no, then repeat it twice a second until we | |
313 | * do. | |
314 | * | |
315 | * NOTE! We don't use "it_interval", because if the | |
316 | * reader isn't listening, we want our output to be | |
317 | * throttled by the writing, and not have the timer | |
318 | * trigger every second even if we're blocked on a | |
319 | * reader! | |
320 | */ | |
321 | early_output_timer.it_value.tv_sec = 0; | |
322 | early_output_timer.it_value.tv_usec = 500000; | |
323 | setitimer(ITIMER_REAL, &early_output_timer, NULL); | |
cdcefbc9 LT |
324 | } |
325 | ||
326 | static void early_output(int signal) | |
327 | { | |
328 | show_early_output = log_show_early; | |
329 | } | |
330 | ||
331 | static void setup_early_output(struct rev_info *rev) | |
332 | { | |
333 | struct sigaction sa; | |
cdcefbc9 LT |
334 | |
335 | /* | |
336 | * Set up the signal handler, minimally intrusively: | |
337 | * we only set a single volatile integer word (not | |
338 | * using sigatomic_t - trying to avoid unnecessary | |
339 | * system dependencies and headers), and using | |
340 | * SA_RESTART. | |
341 | */ | |
342 | memset(&sa, 0, sizeof(sa)); | |
343 | sa.sa_handler = early_output; | |
344 | sigemptyset(&sa.sa_mask); | |
345 | sa.sa_flags = SA_RESTART; | |
346 | sigaction(SIGALRM, &sa, NULL); | |
347 | ||
348 | /* | |
349 | * If we can get the whole output in less than a | |
350 | * tenth of a second, don't even bother doing the | |
351 | * early-output thing.. | |
352 | * | |
353 | * This is a one-time-only trigger. | |
354 | */ | |
252a7c02 LT |
355 | early_output_timer.it_value.tv_sec = 0; |
356 | early_output_timer.it_value.tv_usec = 100000; | |
357 | setitimer(ITIMER_REAL, &early_output_timer, NULL); | |
cdcefbc9 LT |
358 | } |
359 | ||
360 | static void finish_early_output(struct rev_info *rev) | |
361 | { | |
252a7c02 | 362 | int n = estimate_commit_count(rev, rev->commits); |
cdcefbc9 | 363 | signal(SIGALRM, SIG_IGN); |
252a7c02 | 364 | show_early_header(rev, "done", n); |
cdcefbc9 LT |
365 | } |
366 | ||
9dafea26 TH |
367 | static int cmd_log_walk(struct rev_info *rev) |
368 | { | |
369 | struct commit *commit; | |
f31027c9 | 370 | int saved_nrl = 0; |
6ea57703 | 371 | int saved_dcctc = 0, close_file = rev->diffopt.close_file; |
70827b15 | 372 | |
cdcefbc9 LT |
373 | if (rev->early_output) |
374 | setup_early_output(rev); | |
375 | ||
3d51e1b5 | 376 | if (prepare_revision_walk(rev)) |
5c5f1d7c | 377 | die(_("revision walk setup failed")); |
cdcefbc9 LT |
378 | |
379 | if (rev->early_output) | |
380 | finish_early_output(rev); | |
381 | ||
036d17fe | 382 | /* |
84102a33 PVM |
383 | * For --check and --exit-code, the exit code is based on CHECK_FAILED |
384 | * and HAS_CHANGES being accumulated in rev->diffopt, so be careful to | |
385 | * retain that state information if replacing rev->diffopt in this loop | |
036d17fe | 386 | */ |
6ea57703 | 387 | rev->diffopt.close_file = 0; |
70827b15 | 388 | while ((commit = get_revision(rev)) != NULL) { |
3acf8dd8 | 389 | if (!log_tree_commit(rev, commit) && rev->max_count >= 0) |
251df09b MM |
390 | /* |
391 | * We decremented max_count in get_revision, | |
392 | * but we didn't actually show the commit. | |
393 | */ | |
394 | rev->max_count++; | |
a6c73064 | 395 | if (!rev->reflog_info) { |
822601e8 JK |
396 | /* |
397 | * We may show a given commit multiple times when | |
398 | * walking the reflogs. | |
399 | */ | |
0fb370da | 400 | free_commit_buffer(commit); |
f35650df JK |
401 | free_commit_list(commit->parents); |
402 | commit->parents = NULL; | |
a6c73064 | 403 | } |
f31027c9 JH |
404 | if (saved_nrl < rev->diffopt.needed_rename_limit) |
405 | saved_nrl = rev->diffopt.needed_rename_limit; | |
406 | if (rev->diffopt.degraded_cc_to_c) | |
407 | saved_dcctc = 1; | |
70827b15 | 408 | } |
f31027c9 JH |
409 | rev->diffopt.degraded_cc_to_c = saved_dcctc; |
410 | rev->diffopt.needed_rename_limit = saved_nrl; | |
6ea57703 JS |
411 | if (close_file) |
412 | fclose(rev->diffopt.file); | |
f31027c9 | 413 | |
036d17fe | 414 | if (rev->diffopt.output_format & DIFF_FORMAT_CHECKDIFF && |
0d1e0e78 | 415 | rev->diffopt.flags.check_failed) { |
036d17fe PVM |
416 | return 02; |
417 | } | |
84102a33 | 418 | return diff_result_code(&rev->diffopt, 0); |
70827b15 LT |
419 | } |
420 | ||
ef90d6d4 | 421 | static int git_log_config(const char *var, const char *value, void *cb) |
0f03ca94 | 422 | { |
e3f1da98 RS |
423 | const char *slot_name; |
424 | ||
94c22a5e CR |
425 | if (!strcmp(var, "format.pretty")) |
426 | return git_config_string(&fmt_pretty, var, value); | |
70cff3ac BH |
427 | if (!strcmp(var, "format.subjectprefix")) |
428 | return git_config_string(&fmt_patch_subject_prefix, var, value); | |
0c47695a JS |
429 | if (!strcmp(var, "log.abbrevcommit")) { |
430 | default_abbrev_commit = git_config_bool(var, value); | |
431 | return 0; | |
432 | } | |
dd0ffd5b HO |
433 | if (!strcmp(var, "log.date")) |
434 | return git_config_string(&default_date_mode, var, value); | |
eb734454 | 435 | if (!strcmp(var, "log.decorate")) { |
f094b89a | 436 | decoration_style = parse_decoration_style(value); |
8a3d203b JH |
437 | if (decoration_style < 0) |
438 | decoration_style = 0; /* maybe warn? */ | |
eb734454 SD |
439 | return 0; |
440 | } | |
0f03ca94 PB |
441 | if (!strcmp(var, "log.showroot")) { |
442 | default_show_root = git_config_bool(var, value); | |
443 | return 0; | |
444 | } | |
076c9837 DT |
445 | if (!strcmp(var, "log.follow")) { |
446 | default_follow = git_config_bool(var, value); | |
447 | return 0; | |
448 | } | |
e3f1da98 | 449 | if (skip_prefix(var, "color.decorate.", &slot_name)) |
b9465768 | 450 | return parse_decorate_color_config(var, slot_name, value); |
e6bb5f78 AP |
451 | if (!strcmp(var, "log.mailmap")) { |
452 | use_mailmap_config = git_config_bool(var, value); | |
453 | return 0; | |
454 | } | |
fce04c3c MJ |
455 | if (!strcmp(var, "log.showsignature")) { |
456 | default_show_signature = git_config_bool(var, value); | |
457 | return 0; | |
458 | } | |
e6bb5f78 | 459 | |
0657bcbf JH |
460 | if (grep_config(var, value, cb) < 0) |
461 | return -1; | |
6005dbb9 | 462 | if (git_gpg_config(var, value, cb) < 0) |
0657bcbf | 463 | return -1; |
ef90d6d4 | 464 | return git_diff_ui_config(var, value, cb); |
0f03ca94 PB |
465 | } |
466 | ||
a633fca0 | 467 | int cmd_whatchanged(int argc, const char **argv, const char *prefix) |
70827b15 LT |
468 | { |
469 | struct rev_info rev; | |
32962c9b | 470 | struct setup_revision_opt opt; |
70827b15 | 471 | |
9501d191 | 472 | init_log_defaults(); |
ef90d6d4 | 473 | git_config(git_log_config, NULL); |
6b2f2d98 | 474 | |
2abf3503 | 475 | repo_init_revisions(the_repository, &rev, prefix); |
70827b15 | 476 | rev.diff = 1; |
9202434c | 477 | rev.simplify_history = 0; |
32962c9b JH |
478 | memset(&opt, 0, sizeof(opt)); |
479 | opt.def = "HEAD"; | |
d5f6b1d7 | 480 | opt.revarg_opt = REVARG_COMMITTISH; |
32962c9b | 481 | cmd_log_init(argc, argv, prefix, &rev, &opt); |
9dafea26 TH |
482 | if (!rev.diffopt.output_format) |
483 | rev.diffopt.output_format = DIFF_FORMAT_RAW; | |
484 | return cmd_log_walk(&rev); | |
70827b15 LT |
485 | } |
486 | ||
56122ed8 JS |
487 | static void show_tagger(char *buf, int len, struct rev_info *rev) |
488 | { | |
ea718e65 | 489 | struct strbuf out = STRBUF_INIT; |
6bf13944 | 490 | struct pretty_print_context pp = {0}; |
56122ed8 | 491 | |
6bf13944 JK |
492 | pp.fmt = rev->commit_format; |
493 | pp.date_mode = rev->date_mode; | |
494 | pp_user_info(&pp, "Tagger", &out, buf, get_log_output_encoding()); | |
95235f5b | 495 | fprintf(rev->diffopt.file, "%s", out.buf); |
ea718e65 | 496 | strbuf_release(&out); |
56122ed8 JS |
497 | } |
498 | ||
d801627b | 499 | static int show_blob_object(const struct object_id *oid, struct rev_info *rev, const char *obj_name) |
74775a09 | 500 | { |
d801627b | 501 | struct object_id oidc; |
083b9931 MG |
502 | struct object_context obj_context; |
503 | char *buf; | |
504 | unsigned long size; | |
505 | ||
95235f5b | 506 | fflush(rev->diffopt.file); |
0d1e0e78 BW |
507 | if (!rev->diffopt.flags.textconv_set_via_cmdline || |
508 | !rev->diffopt.flags.allow_textconv) | |
7eda0e4f | 509 | return stream_blob_to_fd(1, oid, NULL, 0); |
083b9931 | 510 | |
321c89bf | 511 | if (get_oid_with_context(obj_name, GET_OID_RECORD_PATH, |
e82caf38 | 512 | &oidc, &obj_context)) |
e4a590ef | 513 | die(_("Not a valid object name %s"), obj_name); |
dc944b65 | 514 | if (!obj_context.path || |
6afaf807 NTND |
515 | !textconv_object(the_repository, obj_context.path, |
516 | obj_context.mode, &oidc, 1, &buf, &size)) { | |
dc944b65 | 517 | free(obj_context.path); |
7eda0e4f | 518 | return stream_blob_to_fd(1, oid, NULL, 0); |
dc944b65 | 519 | } |
083b9931 MG |
520 | |
521 | if (!buf) | |
e4a590ef | 522 | die(_("git show %s: bad file"), obj_name); |
083b9931 MG |
523 | |
524 | write_or_die(1, buf, size); | |
dc944b65 | 525 | free(obj_context.path); |
083b9931 | 526 | return 0; |
74775a09 NTND |
527 | } |
528 | ||
d801627b | 529 | static int show_tag_object(const struct object_id *oid, struct rev_info *rev) |
5d7eeee2 JS |
530 | { |
531 | unsigned long size; | |
21666f1a | 532 | enum object_type type; |
b4f5aca4 | 533 | char *buf = read_object_file(oid, &type, &size); |
5d7eeee2 JS |
534 | int offset = 0; |
535 | ||
536 | if (!buf) | |
d801627b | 537 | return error(_("Could not read object %s"), oid_to_hex(oid)); |
5d7eeee2 | 538 | |
74775a09 NTND |
539 | assert(type == OBJ_TAG); |
540 | while (offset < size && buf[offset] != '\n') { | |
541 | int new_offset = offset + 1; | |
542 | while (new_offset < size && buf[new_offset++] != '\n') | |
543 | ; /* do nothing */ | |
59556548 | 544 | if (starts_with(buf + offset, "tagger ")) |
74775a09 NTND |
545 | show_tagger(buf + offset + 7, |
546 | new_offset - offset - 7, rev); | |
547 | offset = new_offset; | |
548 | } | |
5d7eeee2 JS |
549 | |
550 | if (offset < size) | |
95235f5b | 551 | fwrite(buf + offset, size - offset, 1, rev->diffopt.file); |
5d7eeee2 JS |
552 | free(buf); |
553 | return 0; | |
554 | } | |
555 | ||
df46d77e | 556 | static int show_tree_object(const struct object_id *oid, |
6a0b0b6d | 557 | struct strbuf *base, |
671f0707 | 558 | const char *pathname, unsigned mode, int stage, void *context) |
5d7eeee2 | 559 | { |
95235f5b JS |
560 | FILE *file = context; |
561 | fprintf(file, "%s%s\n", pathname, S_ISDIR(mode) ? "/" : ""); | |
5d7eeee2 JS |
562 | return 0; |
563 | } | |
564 | ||
b130c706 JH |
565 | static void show_setup_revisions_tweak(struct rev_info *rev, |
566 | struct setup_revision_opt *opt) | |
b4490059 | 567 | { |
2bf65873 JH |
568 | if (rev->ignore_merges) { |
569 | /* There was no "-m" on the command line */ | |
570 | rev->ignore_merges = 0; | |
571 | if (!rev->first_parent_only && !rev->combine_merges) { | |
01689909 | 572 | /* No "--first-parent", "-c", or "--cc" */ |
2bf65873 JH |
573 | rev->combine_merges = 1; |
574 | rev->dense_combined_merges = 1; | |
575 | } | |
576 | } | |
b4490059 JH |
577 | if (!rev->diffopt.output_format) |
578 | rev->diffopt.output_format = DIFF_FORMAT_PATCH; | |
579 | } | |
580 | ||
a633fca0 | 581 | int cmd_show(int argc, const char **argv, const char *prefix) |
70827b15 LT |
582 | { |
583 | struct rev_info rev; | |
5d7eeee2 | 584 | struct object_array_entry *objects; |
32962c9b | 585 | struct setup_revision_opt opt; |
f0096c06 | 586 | struct pathspec match_all; |
5d7eeee2 | 587 | int i, count, ret = 0; |
70827b15 | 588 | |
9501d191 | 589 | init_log_defaults(); |
ef90d6d4 | 590 | git_config(git_log_config, NULL); |
6b2f2d98 | 591 | |
9a087274 | 592 | memset(&match_all, 0, sizeof(match_all)); |
2abf3503 | 593 | repo_init_revisions(the_repository, &rev, prefix); |
70827b15 | 594 | rev.diff = 1; |
70827b15 | 595 | rev.always_show_header = 1; |
ca92e59e | 596 | rev.no_walk = REVISION_WALK_NO_WALK_SORTED; |
666c92a2 ZJS |
597 | rev.diffopt.stat_width = -1; /* Scale to real terminal size */ |
598 | ||
32962c9b JH |
599 | memset(&opt, 0, sizeof(opt)); |
600 | opt.def = "HEAD"; | |
b130c706 | 601 | opt.tweak = show_setup_revisions_tweak; |
32962c9b | 602 | cmd_log_init(argc, argv, prefix, &rev, &opt); |
5d7eeee2 | 603 | |
c5941f1a JH |
604 | if (!rev.no_walk) |
605 | return cmd_log_walk(&rev); | |
606 | ||
5d7eeee2 JS |
607 | count = rev.pending.nr; |
608 | objects = rev.pending.objects; | |
609 | for (i = 0; i < count && !ret; i++) { | |
610 | struct object *o = objects[i].item; | |
611 | const char *name = objects[i].name; | |
612 | switch (o->type) { | |
613 | case OBJ_BLOB: | |
d801627b | 614 | ret = show_blob_object(&o->oid, &rev, name); |
5d7eeee2 JS |
615 | break; |
616 | case OBJ_TAG: { | |
617 | struct tag *t = (struct tag *)o; | |
618 | ||
ae03ee64 JK |
619 | if (rev.shown_one) |
620 | putchar('\n'); | |
95235f5b | 621 | fprintf(rev.diffopt.file, "%stag %s%s\n", |
8f67f8ae | 622 | diff_get_color_opt(&rev.diffopt, DIFF_COMMIT), |
5d7eeee2 | 623 | t->tag, |
8f67f8ae | 624 | diff_get_color_opt(&rev.diffopt, DIFF_RESET)); |
d801627b | 625 | ret = show_tag_object(&o->oid, &rev); |
ae03ee64 | 626 | rev.shown_one = 1; |
d2dadfe8 JH |
627 | if (ret) |
628 | break; | |
109cd76d | 629 | o = parse_object(the_repository, &t->tagged->oid); |
d2dadfe8 | 630 | if (!o) |
5c5f1d7c | 631 | ret = error(_("Could not read object %s"), |
f2fd0760 | 632 | oid_to_hex(&t->tagged->oid)); |
d2dadfe8 | 633 | objects[i].item = o; |
5d7eeee2 JS |
634 | i--; |
635 | break; | |
636 | } | |
637 | case OBJ_TREE: | |
ae03ee64 JK |
638 | if (rev.shown_one) |
639 | putchar('\n'); | |
95235f5b | 640 | fprintf(rev.diffopt.file, "%stree %s%s\n\n", |
8f67f8ae | 641 | diff_get_color_opt(&rev.diffopt, DIFF_COMMIT), |
5d7eeee2 | 642 | name, |
8f67f8ae | 643 | diff_get_color_opt(&rev.diffopt, DIFF_RESET)); |
f0096c06 | 644 | read_tree_recursive((struct tree *)o, "", 0, 0, &match_all, |
95235f5b | 645 | show_tree_object, rev.diffopt.file); |
ae03ee64 | 646 | rev.shown_one = 1; |
5d7eeee2 JS |
647 | break; |
648 | case OBJ_COMMIT: | |
649 | rev.pending.nr = rev.pending.alloc = 0; | |
650 | rev.pending.objects = NULL; | |
651 | add_object_array(o, name, &rev.pending); | |
652 | ret = cmd_log_walk(&rev); | |
653 | break; | |
654 | default: | |
5c5f1d7c | 655 | ret = error(_("Unknown type: %d"), o->type); |
5d7eeee2 JS |
656 | } |
657 | } | |
658 | free(objects); | |
659 | return ret; | |
70827b15 LT |
660 | } |
661 | ||
cf39f54e LT |
662 | /* |
663 | * This is equivalent to "git log -g --abbrev-commit --pretty=oneline" | |
664 | */ | |
665 | int cmd_log_reflog(int argc, const char **argv, const char *prefix) | |
666 | { | |
667 | struct rev_info rev; | |
32962c9b | 668 | struct setup_revision_opt opt; |
cf39f54e | 669 | |
9501d191 | 670 | init_log_defaults(); |
ef90d6d4 | 671 | git_config(git_log_config, NULL); |
6b2f2d98 | 672 | |
2abf3503 | 673 | repo_init_revisions(the_repository, &rev, prefix); |
cf39f54e | 674 | init_reflog_walk(&rev.reflog_info); |
cf39f54e | 675 | rev.verbose_header = 1; |
32962c9b JH |
676 | memset(&opt, 0, sizeof(opt)); |
677 | opt.def = "HEAD"; | |
4b56cf58 | 678 | cmd_log_init_defaults(&rev); |
0c47695a | 679 | rev.abbrev_commit = 1; |
cf39f54e | 680 | rev.commit_format = CMIT_FMT_ONELINE; |
4da45bef | 681 | rev.use_terminator = 1; |
cf39f54e | 682 | rev.always_show_header = 1; |
4b56cf58 | 683 | cmd_log_init_finish(argc, argv, prefix, &rev, &opt); |
cf39f54e | 684 | |
cf39f54e LT |
685 | return cmd_log_walk(&rev); |
686 | } | |
687 | ||
b130c706 JH |
688 | static void log_setup_revisions_tweak(struct rev_info *rev, |
689 | struct setup_revision_opt *opt) | |
076c9837 | 690 | { |
0d1e0e78 | 691 | if (rev->diffopt.flags.default_follow_renames && |
076c9837 | 692 | rev->prune_data.nr == 1) |
0d1e0e78 | 693 | rev->diffopt.flags.follow_renames = 1; |
c7eaf8b4 JH |
694 | |
695 | /* Turn --cc/-c into -p --cc/-c when -p was not given */ | |
696 | if (!rev->diffopt.output_format && rev->combine_merges) | |
697 | rev->diffopt.output_format = DIFF_FORMAT_PATCH; | |
82dee416 JH |
698 | |
699 | /* Turn -m on when --cc/-c was given */ | |
700 | if (rev->combine_merges) | |
701 | rev->ignore_merges = 0; | |
076c9837 DT |
702 | } |
703 | ||
a633fca0 | 704 | int cmd_log(int argc, const char **argv, const char *prefix) |
70827b15 LT |
705 | { |
706 | struct rev_info rev; | |
32962c9b | 707 | struct setup_revision_opt opt; |
70827b15 | 708 | |
9501d191 | 709 | init_log_defaults(); |
ef90d6d4 | 710 | git_config(git_log_config, NULL); |
6b2f2d98 | 711 | |
2abf3503 | 712 | repo_init_revisions(the_repository, &rev, prefix); |
70827b15 | 713 | rev.always_show_header = 1; |
32962c9b JH |
714 | memset(&opt, 0, sizeof(opt)); |
715 | opt.def = "HEAD"; | |
d5f6b1d7 | 716 | opt.revarg_opt = REVARG_COMMITTISH; |
b130c706 | 717 | opt.tweak = log_setup_revisions_tweak; |
32962c9b | 718 | cmd_log_init(argc, argv, prefix, &rev, &opt); |
9dafea26 | 719 | return cmd_log_walk(&rev); |
70827b15 | 720 | } |
91efcf60 | 721 | |
c06d2daa | 722 | /* format-patch */ |
0377db77 | 723 | |
917a8f89 | 724 | static const char *fmt_patch_suffix = ".patch"; |
49604a4d | 725 | static int numbered = 0; |
a567fdcb | 726 | static int auto_number = 1; |
20ff0680 | 727 | |
0db5260b JW |
728 | static char *default_attach = NULL; |
729 | ||
2721ce21 JK |
730 | static struct string_list extra_hdr = STRING_LIST_INIT_NODUP; |
731 | static struct string_list extra_to = STRING_LIST_INIT_NODUP; | |
732 | static struct string_list extra_cc = STRING_LIST_INIT_NODUP; | |
3ee79d9f DB |
733 | |
734 | static void add_header(const char *value) | |
735 | { | |
ca9e0a1b | 736 | struct string_list_item *item; |
3ee79d9f | 737 | int len = strlen(value); |
c8c4450e | 738 | while (len && value[len - 1] == '\n') |
3ee79d9f | 739 | len--; |
ca9e0a1b | 740 | |
3ee79d9f | 741 | if (!strncasecmp(value, "to: ", 4)) { |
1d2f80fa | 742 | item = string_list_append(&extra_to, value + 4); |
ca9e0a1b SB |
743 | len -= 4; |
744 | } else if (!strncasecmp(value, "cc: ", 4)) { | |
1d2f80fa | 745 | item = string_list_append(&extra_cc, value + 4); |
ca9e0a1b SB |
746 | len -= 4; |
747 | } else { | |
1d2f80fa | 748 | item = string_list_append(&extra_hdr, value); |
3ee79d9f | 749 | } |
ca9e0a1b SB |
750 | |
751 | item->string[len] = '\0'; | |
3ee79d9f DB |
752 | } |
753 | ||
30984ed2 TR |
754 | #define THREAD_SHALLOW 1 |
755 | #define THREAD_DEEP 2 | |
6622d9c7 SB |
756 | static int thread; |
757 | static int do_signoff; | |
bb52995f | 758 | static int base_auto; |
6bc6b6c0 | 759 | static char *from; |
6622d9c7 | 760 | static const char *signature = git_version_string; |
7022650f | 761 | static const char *signature_file; |
2a4c2607 | 762 | static int config_cover_letter; |
bc6bf2d7 | 763 | static const char *config_output_directory; |
2a4c2607 FC |
764 | |
765 | enum { | |
766 | COVER_UNSET, | |
767 | COVER_OFF, | |
768 | COVER_ON, | |
769 | COVER_AUTO | |
770 | }; | |
30984ed2 | 771 | |
ef90d6d4 | 772 | static int git_format_config(const char *var, const char *value, void *cb) |
20ff0680 JS |
773 | { |
774 | if (!strcmp(var, "format.headers")) { | |
d7fb91c6 | 775 | if (!value) |
5c5f1d7c | 776 | die(_("format.headers without value")); |
3ee79d9f | 777 | add_header(value); |
20ff0680 JS |
778 | return 0; |
779 | } | |
70cff3ac BH |
780 | if (!strcmp(var, "format.suffix")) |
781 | return git_config_string(&fmt_patch_suffix, var, value); | |
ae6c098f SD |
782 | if (!strcmp(var, "format.to")) { |
783 | if (!value) | |
784 | return config_error_nonbool(var); | |
1d2f80fa | 785 | string_list_append(&extra_to, value); |
ae6c098f SD |
786 | return 0; |
787 | } | |
fe8928e6 MV |
788 | if (!strcmp(var, "format.cc")) { |
789 | if (!value) | |
790 | return config_error_nonbool(var); | |
1d2f80fa | 791 | string_list_append(&extra_cc, value); |
fe8928e6 MV |
792 | return 0; |
793 | } | |
787570c7 | 794 | if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff") || |
339de508 | 795 | !strcmp(var, "color.ui") || !strcmp(var, "diff.submodule")) { |
f3aafa4d RA |
796 | return 0; |
797 | } | |
49604a4d | 798 | if (!strcmp(var, "format.numbered")) { |
90f5c186 | 799 | if (value && !strcasecmp(value, "auto")) { |
49604a4d BG |
800 | auto_number = 1; |
801 | return 0; | |
802 | } | |
49604a4d | 803 | numbered = git_config_bool(var, value); |
a567fdcb | 804 | auto_number = auto_number && numbered; |
49604a4d BG |
805 | return 0; |
806 | } | |
0db5260b JW |
807 | if (!strcmp(var, "format.attach")) { |
808 | if (value && *value) | |
809 | default_attach = xstrdup(value); | |
810 | else | |
811 | default_attach = xstrdup(git_version_string); | |
812 | return 0; | |
813 | } | |
30984ed2 TR |
814 | if (!strcmp(var, "format.thread")) { |
815 | if (value && !strcasecmp(value, "deep")) { | |
816 | thread = THREAD_DEEP; | |
817 | return 0; | |
818 | } | |
819 | if (value && !strcasecmp(value, "shallow")) { | |
820 | thread = THREAD_SHALLOW; | |
821 | return 0; | |
822 | } | |
823 | thread = git_config_bool(var, value) && THREAD_SHALLOW; | |
824 | return 0; | |
825 | } | |
1d1876e9 HV |
826 | if (!strcmp(var, "format.signoff")) { |
827 | do_signoff = git_config_bool(var, value); | |
828 | return 0; | |
829 | } | |
6622d9c7 SB |
830 | if (!strcmp(var, "format.signature")) |
831 | return git_config_string(&signature, var, value); | |
7022650f JM |
832 | if (!strcmp(var, "format.signaturefile")) |
833 | return git_config_pathname(&signature_file, var, value); | |
2a4c2607 FC |
834 | if (!strcmp(var, "format.coverletter")) { |
835 | if (value && !strcasecmp(value, "auto")) { | |
836 | config_cover_letter = COVER_AUTO; | |
837 | return 0; | |
838 | } | |
839 | config_cover_letter = git_config_bool(var, value) ? COVER_ON : COVER_OFF; | |
840 | return 0; | |
841 | } | |
bc6bf2d7 AK |
842 | if (!strcmp(var, "format.outputdirectory")) |
843 | return git_config_string(&config_output_directory, var, value); | |
bb52995f XY |
844 | if (!strcmp(var, "format.useautobase")) { |
845 | base_auto = git_config_bool(var, value); | |
846 | return 0; | |
847 | } | |
6bc6b6c0 | 848 | if (!strcmp(var, "format.from")) { |
89576613 | 849 | int b = git_parse_maybe_bool(value); |
6bc6b6c0 JT |
850 | free(from); |
851 | if (b < 0) | |
852 | from = xstrdup(value); | |
853 | else if (b) | |
854 | from = xstrdup(git_committer_info(IDENT_NO_DATE)); | |
855 | else | |
856 | from = NULL; | |
857 | return 0; | |
858 | } | |
dbd21447 | 859 | |
ef90d6d4 | 860 | return git_log_config(var, value, cb); |
20ff0680 JS |
861 | } |
862 | ||
efd02016 | 863 | static const char *output_directory = NULL; |
9800a754 | 864 | static int outdir_offset; |
81f3a188 | 865 | |
95235f5b | 866 | static int open_next_file(struct commit *commit, const char *subject, |
a21c2f94 | 867 | struct rev_info *rev, int quiet) |
0377db77 | 868 | { |
cd2ef591 | 869 | struct strbuf filename = STRBUF_INIT; |
68cb7b6f | 870 | int suffix_len = strlen(rev->patch_suffix) + 1; |
0377db77 | 871 | |
2448482b | 872 | if (output_directory) { |
cd2ef591 SB |
873 | strbuf_addstr(&filename, output_directory); |
874 | if (filename.len >= | |
15d980a7 NTND |
875 | PATH_MAX - FORMAT_PATCH_NAME_MAX - suffix_len) { |
876 | strbuf_release(&filename); | |
5c5f1d7c | 877 | return error(_("name of output directory is too long")); |
15d980a7 | 878 | } |
00b6c178 | 879 | strbuf_complete(&filename, '/'); |
2448482b | 880 | } |
0377db77 | 881 | |
38ec23ac JH |
882 | if (rev->numbered_files) |
883 | strbuf_addf(&filename, "%d", rev->nr); | |
d28b5d47 JH |
884 | else if (commit) |
885 | fmt_output_commit(&filename, commit, rev); | |
38ec23ac | 886 | else |
d28b5d47 | 887 | fmt_output_subject(&filename, subject, rev); |
e6ff0f42 | 888 | |
250087f2 | 889 | if (!quiet) |
36a4d905 | 890 | printf("%s\n", filename.buf + outdir_offset); |
ec2956df | 891 | |
15d980a7 NTND |
892 | if ((rev->diffopt.file = fopen(filename.buf, "w")) == NULL) { |
893 | error_errno(_("Cannot open patch file %s"), filename.buf); | |
894 | strbuf_release(&filename); | |
895 | return -1; | |
896 | } | |
c06d2daa | 897 | |
cd2ef591 | 898 | strbuf_release(&filename); |
e6ff0f42 | 899 | return 0; |
0377db77 JS |
900 | } |
901 | ||
811929f1 | 902 | static void get_patch_ids(struct rev_info *rev, struct patch_ids *ids) |
9c6efa36 JS |
903 | { |
904 | struct rev_info check_rev; | |
9b7a61d7 | 905 | struct commit *commit, *c1, *c2; |
9c6efa36 JS |
906 | struct object *o1, *o2; |
907 | unsigned flags1, flags2; | |
9c6efa36 JS |
908 | |
909 | if (rev->pending.nr != 2) | |
5c5f1d7c | 910 | die(_("Need exactly one range.")); |
9c6efa36 JS |
911 | |
912 | o1 = rev->pending.objects[0].item; | |
9c6efa36 | 913 | o2 = rev->pending.objects[1].item; |
9b7a61d7 | 914 | flags1 = o1->flags; |
9c6efa36 | 915 | flags2 = o2->flags; |
2122f675 SB |
916 | c1 = lookup_commit_reference(the_repository, &o1->oid); |
917 | c2 = lookup_commit_reference(the_repository, &o2->oid); | |
9c6efa36 JS |
918 | |
919 | if ((flags1 & UNINTERESTING) == (flags2 & UNINTERESTING)) | |
5c5f1d7c | 920 | die(_("Not a range.")); |
9c6efa36 | 921 | |
a7edadda | 922 | init_patch_ids(the_repository, ids); |
9c6efa36 JS |
923 | |
924 | /* given a range a..b get all patch ids for b..a */ | |
2abf3503 | 925 | repo_init_revisions(the_repository, &check_rev, rev->prefix); |
51f4de3a | 926 | check_rev.max_parents = 1; |
9c6efa36 JS |
927 | o1->flags ^= UNINTERESTING; |
928 | o2->flags ^= UNINTERESTING; | |
929 | add_pending_object(&check_rev, o1, "o1"); | |
930 | add_pending_object(&check_rev, o2, "o2"); | |
3d51e1b5 | 931 | if (prepare_revision_walk(&check_rev)) |
5c5f1d7c | 932 | die(_("revision walk setup failed")); |
9c6efa36 JS |
933 | |
934 | while ((commit = get_revision(&check_rev)) != NULL) { | |
5d23e133 | 935 | add_commit_patch_id(commit, ids); |
9c6efa36 JS |
936 | } |
937 | ||
938 | /* reset for next revision walk */ | |
9b7a61d7 JH |
939 | clear_commit_marks(c1, SEEN | UNINTERESTING | SHOWN | ADDED); |
940 | clear_commit_marks(c2, SEEN | UNINTERESTING | SHOWN | ADDED); | |
9c6efa36 JS |
941 | o1->flags = flags1; |
942 | o2->flags = flags2; | |
943 | } | |
944 | ||
e1a37346 | 945 | static void gen_message_id(struct rev_info *info, char *base) |
d1566f78 | 946 | { |
f285a2d7 | 947 | struct strbuf buf = STRBUF_INIT; |
cb71f8bd | 948 | strbuf_addf(&buf, "%s.%"PRItime".git.%s", base, |
dddbad72 | 949 | (timestamp_t) time(NULL), |
59f9b8a9 | 950 | git_committer_info(IDENT_NO_NAME|IDENT_NO_DATE|IDENT_STRICT)); |
e1a37346 | 951 | info->message_id = strbuf_detach(&buf, NULL); |
d1566f78 JT |
952 | } |
953 | ||
95235f5b | 954 | static void print_signature(FILE *file) |
6622d9c7 | 955 | { |
c6076e2b JK |
956 | if (!signature || !*signature) |
957 | return; | |
958 | ||
95235f5b | 959 | fprintf(file, "-- \n%s", signature); |
c6076e2b | 960 | if (signature[strlen(signature)-1] != '\n') |
95235f5b JS |
961 | putc('\n', file); |
962 | putc('\n', file); | |
6622d9c7 SB |
963 | } |
964 | ||
739453a3 JH |
965 | static void add_branch_description(struct strbuf *buf, const char *branch_name) |
966 | { | |
967 | struct strbuf desc = STRBUF_INIT; | |
968 | if (!branch_name || !*branch_name) | |
969 | return; | |
970 | read_branch_desc(&desc, branch_name); | |
971 | if (desc.len) { | |
972 | strbuf_addch(buf, '\n'); | |
e992d1eb | 973 | strbuf_addbuf(buf, &desc); |
739453a3 JH |
974 | strbuf_addch(buf, '\n'); |
975 | } | |
94204bf5 | 976 | strbuf_release(&desc); |
739453a3 JH |
977 | } |
978 | ||
d7ddad01 FC |
979 | static char *find_branch_name(struct rev_info *rev) |
980 | { | |
981 | int i, positive = -1; | |
f2fd0760 | 982 | struct object_id branch_oid; |
983 | const struct object_id *tip_oid; | |
95b567c7 | 984 | const char *ref, *v; |
d7ddad01 FC |
985 | char *full_ref, *branch = NULL; |
986 | ||
987 | for (i = 0; i < rev->cmdline.nr; i++) { | |
988 | if (rev->cmdline.rev[i].flags & UNINTERESTING) | |
989 | continue; | |
990 | if (positive < 0) | |
991 | positive = i; | |
992 | else | |
993 | return NULL; | |
994 | } | |
995 | if (positive < 0) | |
996 | return NULL; | |
997 | ref = rev->cmdline.rev[positive].name; | |
f2fd0760 | 998 | tip_oid = &rev->cmdline.rev[positive].item->oid; |
cca5fa64 | 999 | if (dwim_ref(ref, strlen(ref), &branch_oid, &full_ref) && |
95b567c7 | 1000 | skip_prefix(full_ref, "refs/heads/", &v) && |
4a7e27e9 | 1001 | oideq(tip_oid, &branch_oid)) |
95b567c7 | 1002 | branch = xstrdup(v); |
d7ddad01 FC |
1003 | free(full_ref); |
1004 | return branch; | |
1005 | } | |
1006 | ||
fa5b7ea6 ES |
1007 | static void show_diffstat(struct rev_info *rev, |
1008 | struct commit *origin, struct commit *head) | |
1009 | { | |
1010 | struct diff_options opts; | |
1011 | ||
1012 | memcpy(&opts, &rev->diffopt, sizeof(opts)); | |
1013 | opts.output_format = DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT; | |
fa5b7ea6 ES |
1014 | diff_setup_done(&opts); |
1015 | ||
1016 | diff_tree_oid(get_commit_tree_oid(origin), | |
1017 | get_commit_tree_oid(head), | |
1018 | "", &opts); | |
1019 | diffcore_std(&opts); | |
1020 | diff_flush(&opts); | |
1021 | ||
1022 | fprintf(rev->diffopt.file, "\n"); | |
1023 | } | |
1024 | ||
2bda2cf4 | 1025 | static void make_cover_letter(struct rev_info *rev, int use_stdout, |
2bda2cf4 | 1026 | struct commit *origin, |
d7ddad01 | 1027 | int nr, struct commit **list, |
739453a3 | 1028 | const char *branch_name, |
250087f2 | 1029 | int quiet) |
a5a27c79 DB |
1030 | { |
1031 | const char *committer; | |
a5a27c79 DB |
1032 | const char *body = "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n"; |
1033 | const char *msg; | |
2bda2cf4 | 1034 | struct shortlog log; |
f285a2d7 | 1035 | struct strbuf sb = STRBUF_INIT; |
2bda2cf4 | 1036 | int i; |
330db18c | 1037 | const char *encoding = "UTF-8"; |
267123b4 | 1038 | int need_8bit_cte = 0; |
6bf13944 | 1039 | struct pretty_print_context pp = {0}; |
d7ddad01 | 1040 | struct commit *head = list[0]; |
a5a27c79 | 1041 | |
9f23e040 | 1042 | if (!cmit_fmt_is_mail(rev->commit_format)) |
5c5f1d7c | 1043 | die(_("Cover letter needs email format")); |
a5a27c79 | 1044 | |
cd2ef591 | 1045 | committer = git_committer_info(0); |
6df514af | 1046 | |
a21c2f94 | 1047 | if (!use_stdout && |
95235f5b | 1048 | open_next_file(NULL, rev->numbered_files ? NULL : "cover-letter", rev, quiet)) |
a5a27c79 DB |
1049 | return; |
1050 | ||
50cd54ef | 1051 | log_write_email_headers(rev, head, &pp.after_subject, &need_8bit_cte, 0); |
a5a27c79 | 1052 | |
bc6b8fc1 | 1053 | for (i = 0; !need_8bit_cte && i < nr; i++) { |
8597ea3a | 1054 | const char *buf = get_commit_buffer(list[i], NULL); |
bc6b8fc1 | 1055 | if (has_non_ascii(buf)) |
0a7f4483 | 1056 | need_8bit_cte = 1; |
bc6b8fc1 JK |
1057 | unuse_commit_buffer(list[i], buf); |
1058 | } | |
0a7f4483 | 1059 | |
d7ddad01 FC |
1060 | if (!branch_name) |
1061 | branch_name = find_branch_name(rev); | |
1062 | ||
a5a27c79 | 1063 | msg = body; |
6bf13944 | 1064 | pp.fmt = CMIT_FMT_EMAIL; |
a5481a6c | 1065 | pp.date_mode.type = DATE_RFC2822; |
6d167fd7 RS |
1066 | pp.rev = rev; |
1067 | pp.print_email_subject = 1; | |
6bf13944 JK |
1068 | pp_user_info(&pp, NULL, &sb, committer, encoding); |
1069 | pp_title_line(&pp, &msg, &sb, encoding, need_8bit_cte); | |
1070 | pp_remainder(&pp, &msg, &sb, 0); | |
739453a3 | 1071 | add_branch_description(&sb, branch_name); |
95235f5b | 1072 | fprintf(rev->diffopt.file, "%s\n", sb.buf); |
a5a27c79 DB |
1073 | |
1074 | strbuf_release(&sb); | |
1075 | ||
2bda2cf4 | 1076 | shortlog_init(&log); |
859c4fbe | 1077 | log.wrap_lines = 1; |
43662b23 | 1078 | log.wrap = MAIL_DEFAULT_WRAP; |
859c4fbe JS |
1079 | log.in1 = 2; |
1080 | log.in2 = 4; | |
95235f5b | 1081 | log.file = rev->diffopt.file; |
2bda2cf4 DB |
1082 | for (i = 0; i < nr; i++) |
1083 | shortlog_add_commit(&log, list[i]); | |
1084 | ||
1085 | shortlog_output(&log); | |
1086 | ||
fa5b7ea6 ES |
1087 | /* We can only do diffstat with a unique reference point */ |
1088 | if (origin) | |
1089 | show_diffstat(rev, origin, head); | |
a5a27c79 | 1090 | |
126facf8 | 1091 | if (rev->idiff_oid1) { |
5ac290f9 | 1092 | fprintf_ln(rev->diffopt.file, "%s", rev->idiff_title); |
3b026417 | 1093 | show_interdiff(rev, 0); |
126facf8 | 1094 | } |
31e2617a ES |
1095 | |
1096 | if (rev->rdiff1) { | |
4ee99689 | 1097 | fprintf_ln(rev->diffopt.file, "%s", rev->rdiff_title); |
31e2617a ES |
1098 | show_range_diff(rev->rdiff1, rev->rdiff2, |
1099 | rev->creation_factor, 1, &rev->diffopt); | |
1100 | } | |
d1566f78 JT |
1101 | } |
1102 | ||
8419d2ee JH |
1103 | static const char *clean_message_id(const char *msg_id) |
1104 | { | |
1105 | char ch; | |
1106 | const char *a, *z, *m; | |
8419d2ee JH |
1107 | |
1108 | m = msg_id; | |
1109 | while ((ch = *m) && (isspace(ch) || (ch == '<'))) | |
1110 | m++; | |
1111 | a = m; | |
1112 | z = NULL; | |
1113 | while ((ch = *m)) { | |
1114 | if (!isspace(ch) && (ch != '>')) | |
1115 | z = m; | |
1116 | m++; | |
1117 | } | |
1118 | if (!z) | |
5c5f1d7c | 1119 | die(_("insane in-reply-to: %s"), msg_id); |
8419d2ee JH |
1120 | if (++z == m) |
1121 | return a; | |
182af834 | 1122 | return xmemdupz(a, z - a); |
8419d2ee JH |
1123 | } |
1124 | ||
9800a754 JH |
1125 | static const char *set_outdir(const char *prefix, const char *output_directory) |
1126 | { | |
1127 | if (output_directory && is_absolute_path(output_directory)) | |
1128 | return output_directory; | |
1129 | ||
1130 | if (!prefix || !*prefix) { | |
1131 | if (output_directory) | |
1132 | return output_directory; | |
1133 | /* The user did not explicitly ask for "./" */ | |
1134 | outdir_offset = 2; | |
1135 | return "./"; | |
1136 | } | |
1137 | ||
1138 | outdir_offset = strlen(prefix); | |
1139 | if (!output_directory) | |
1140 | return prefix; | |
1141 | ||
e4da43b1 | 1142 | return prefix_filename(prefix, output_directory); |
9800a754 JH |
1143 | } |
1144 | ||
fff02ee6 | 1145 | static const char * const builtin_format_patch_usage[] = { |
9c9b4f2f | 1146 | N_("git format-patch [<options>] [<since> | <revision-range>]"), |
fff02ee6 SB |
1147 | NULL |
1148 | }; | |
1149 | ||
1150 | static int keep_subject = 0; | |
1151 | ||
1152 | static int keep_callback(const struct option *opt, const char *arg, int unset) | |
1153 | { | |
517fe807 JK |
1154 | BUG_ON_OPT_NEG(unset); |
1155 | BUG_ON_OPT_ARG(arg); | |
fff02ee6 SB |
1156 | ((struct rev_info *)opt->value)->total = -1; |
1157 | keep_subject = 1; | |
1158 | return 0; | |
1159 | } | |
1160 | ||
1161 | static int subject_prefix = 0; | |
1162 | ||
1163 | static int subject_prefix_callback(const struct option *opt, const char *arg, | |
1164 | int unset) | |
1165 | { | |
517fe807 | 1166 | BUG_ON_OPT_NEG(unset); |
fff02ee6 SB |
1167 | subject_prefix = 1; |
1168 | ((struct rev_info *)opt->value)->subject_prefix = arg; | |
1169 | return 0; | |
1170 | } | |
1171 | ||
68e83a5b JT |
1172 | static int rfc_callback(const struct option *opt, const char *arg, int unset) |
1173 | { | |
517fe807 JK |
1174 | BUG_ON_OPT_NEG(unset); |
1175 | BUG_ON_OPT_ARG(arg); | |
68e83a5b JT |
1176 | return subject_prefix_callback(opt, "RFC PATCH", unset); |
1177 | } | |
1178 | ||
1af4731b JH |
1179 | static int numbered_cmdline_opt = 0; |
1180 | ||
fff02ee6 SB |
1181 | static int numbered_callback(const struct option *opt, const char *arg, |
1182 | int unset) | |
1183 | { | |
517fe807 | 1184 | BUG_ON_OPT_ARG(arg); |
1af4731b | 1185 | *(int *)opt->value = numbered_cmdline_opt = unset ? 0 : 1; |
fff02ee6 SB |
1186 | if (unset) |
1187 | auto_number = 0; | |
1188 | return 0; | |
1189 | } | |
1190 | ||
1191 | static int no_numbered_callback(const struct option *opt, const char *arg, | |
1192 | int unset) | |
1193 | { | |
517fe807 | 1194 | BUG_ON_OPT_NEG(unset); |
fff02ee6 SB |
1195 | return numbered_callback(opt, arg, 1); |
1196 | } | |
1197 | ||
1198 | static int output_directory_callback(const struct option *opt, const char *arg, | |
1199 | int unset) | |
1200 | { | |
1201 | const char **dir = (const char **)opt->value; | |
517fe807 | 1202 | BUG_ON_OPT_NEG(unset); |
fff02ee6 | 1203 | if (*dir) |
5c5f1d7c | 1204 | die(_("Two output directories?")); |
fff02ee6 SB |
1205 | *dir = arg; |
1206 | return 0; | |
1207 | } | |
1208 | ||
1209 | static int thread_callback(const struct option *opt, const char *arg, int unset) | |
1210 | { | |
1211 | int *thread = (int *)opt->value; | |
1212 | if (unset) | |
1213 | *thread = 0; | |
1214 | else if (!arg || !strcmp(arg, "shallow")) | |
1215 | *thread = THREAD_SHALLOW; | |
1216 | else if (!strcmp(arg, "deep")) | |
1217 | *thread = THREAD_DEEP; | |
1218 | else | |
1219 | return 1; | |
1220 | return 0; | |
1221 | } | |
1222 | ||
1223 | static int attach_callback(const struct option *opt, const char *arg, int unset) | |
1224 | { | |
1225 | struct rev_info *rev = (struct rev_info *)opt->value; | |
1226 | if (unset) | |
1227 | rev->mime_boundary = NULL; | |
1228 | else if (arg) | |
1229 | rev->mime_boundary = arg; | |
1230 | else | |
1231 | rev->mime_boundary = git_version_string; | |
1232 | rev->no_inline = unset ? 0 : 1; | |
1233 | return 0; | |
1234 | } | |
1235 | ||
1236 | static int inline_callback(const struct option *opt, const char *arg, int unset) | |
1237 | { | |
1238 | struct rev_info *rev = (struct rev_info *)opt->value; | |
1239 | if (unset) | |
1240 | rev->mime_boundary = NULL; | |
1241 | else if (arg) | |
1242 | rev->mime_boundary = arg; | |
1243 | else | |
1244 | rev->mime_boundary = git_version_string; | |
1245 | rev->no_inline = 0; | |
1246 | return 0; | |
1247 | } | |
1248 | ||
1249 | static int header_callback(const struct option *opt, const char *arg, int unset) | |
1250 | { | |
c4260034 SB |
1251 | if (unset) { |
1252 | string_list_clear(&extra_hdr, 0); | |
1253 | string_list_clear(&extra_to, 0); | |
1254 | string_list_clear(&extra_cc, 0); | |
1255 | } else { | |
1256 | add_header(arg); | |
1257 | } | |
fff02ee6 SB |
1258 | return 0; |
1259 | } | |
1260 | ||
ae6c098f SD |
1261 | static int to_callback(const struct option *opt, const char *arg, int unset) |
1262 | { | |
c4260034 SB |
1263 | if (unset) |
1264 | string_list_clear(&extra_to, 0); | |
1265 | else | |
1d2f80fa | 1266 | string_list_append(&extra_to, arg); |
fff02ee6 SB |
1267 | return 0; |
1268 | } | |
1269 | ||
1270 | static int cc_callback(const struct option *opt, const char *arg, int unset) | |
1271 | { | |
c4260034 SB |
1272 | if (unset) |
1273 | string_list_clear(&extra_cc, 0); | |
1274 | else | |
1d2f80fa | 1275 | string_list_append(&extra_cc, arg); |
fff02ee6 SB |
1276 | return 0; |
1277 | } | |
1278 | ||
a9080475 JK |
1279 | static int from_callback(const struct option *opt, const char *arg, int unset) |
1280 | { | |
1281 | char **from = opt->value; | |
1282 | ||
1283 | free(*from); | |
1284 | ||
1285 | if (unset) | |
1286 | *from = NULL; | |
1287 | else if (arg) | |
1288 | *from = xstrdup(arg); | |
1289 | else | |
1290 | *from = xstrdup(git_committer_info(IDENT_NO_DATE)); | |
1291 | return 0; | |
1292 | } | |
1293 | ||
fa2ab86d XY |
1294 | struct base_tree_info { |
1295 | struct object_id base_commit; | |
1296 | int nr_patch_id, alloc_patch_id; | |
1297 | struct object_id *patch_id; | |
1298 | }; | |
1299 | ||
1300 | static struct commit *get_base_commit(const char *base_commit, | |
1301 | struct commit **list, | |
1302 | int total) | |
1303 | { | |
1304 | struct commit *base = NULL; | |
1305 | struct commit **rev; | |
1306 | int i = 0, rev_nr = 0; | |
1307 | ||
bb52995f XY |
1308 | if (base_commit && strcmp(base_commit, "auto")) { |
1309 | base = lookup_commit_reference_by_name(base_commit); | |
1310 | if (!base) | |
1311 | die(_("Unknown commit %s"), base_commit); | |
1312 | } else if ((base_commit && !strcmp(base_commit, "auto")) || base_auto) { | |
3de66517 XY |
1313 | struct branch *curr_branch = branch_get(NULL); |
1314 | const char *upstream = branch_get_upstream(curr_branch, NULL); | |
1315 | if (upstream) { | |
1316 | struct commit_list *base_list; | |
1317 | struct commit *commit; | |
d801627b | 1318 | struct object_id oid; |
3de66517 | 1319 | |
d801627b | 1320 | if (get_oid(upstream, &oid)) |
3de66517 | 1321 | die(_("Failed to resolve '%s' as a valid ref."), upstream); |
bc83266a | 1322 | commit = lookup_commit_or_die(&oid, "upstream base"); |
3de66517 XY |
1323 | base_list = get_merge_bases_many(commit, total, list); |
1324 | /* There should be one and only one merge base. */ | |
1325 | if (!base_list || base_list->next) | |
1326 | die(_("Could not find exact merge base.")); | |
1327 | base = base_list->item; | |
1328 | free_commit_list(base_list); | |
1329 | } else { | |
1330 | die(_("Failed to get upstream, if you want to record base commit automatically,\n" | |
1331 | "please use git branch --set-upstream-to to track a remote branch.\n" | |
1332 | "Or you could specify base commit by --base=<base-commit-id> manually.")); | |
1333 | } | |
3de66517 | 1334 | } |
fa2ab86d XY |
1335 | |
1336 | ALLOC_ARRAY(rev, total); | |
1337 | for (i = 0; i < total; i++) | |
1338 | rev[i] = list[i]; | |
1339 | ||
1340 | rev_nr = total; | |
1341 | /* | |
1342 | * Get merge base through pair-wise computations | |
1343 | * and store it in rev[0]. | |
1344 | */ | |
1345 | while (rev_nr > 1) { | |
1346 | for (i = 0; i < rev_nr / 2; i++) { | |
1347 | struct commit_list *merge_base; | |
1348 | merge_base = get_merge_bases(rev[2 * i], rev[2 * i + 1]); | |
1349 | if (!merge_base || merge_base->next) | |
1350 | die(_("Failed to find exact merge base")); | |
1351 | ||
1352 | rev[i] = merge_base->item; | |
1353 | } | |
1354 | ||
1355 | if (rev_nr % 2) | |
1356 | rev[i] = rev[2 * i]; | |
42c78a21 | 1357 | rev_nr = DIV_ROUND_UP(rev_nr, 2); |
fa2ab86d XY |
1358 | } |
1359 | ||
1360 | if (!in_merge_bases(base, rev[0])) | |
1361 | die(_("base commit should be the ancestor of revision list")); | |
1362 | ||
1363 | for (i = 0; i < total; i++) { | |
1364 | if (base == list[i]) | |
1365 | die(_("base commit shouldn't be in revision list")); | |
1366 | } | |
1367 | ||
1368 | free(rev); | |
1369 | return base; | |
1370 | } | |
1371 | ||
7b680d32 NTND |
1372 | define_commit_slab(commit_base, int); |
1373 | ||
fa2ab86d XY |
1374 | static void prepare_bases(struct base_tree_info *bases, |
1375 | struct commit *base, | |
1376 | struct commit **list, | |
1377 | int total) | |
1378 | { | |
1379 | struct commit *commit; | |
1380 | struct rev_info revs; | |
1381 | struct diff_options diffopt; | |
7b680d32 | 1382 | struct commit_base commit_base; |
fa2ab86d XY |
1383 | int i; |
1384 | ||
1385 | if (!base) | |
1386 | return; | |
1387 | ||
7b680d32 | 1388 | init_commit_base(&commit_base); |
e6757652 | 1389 | repo_diff_setup(the_repository, &diffopt); |
0d1e0e78 | 1390 | diffopt.flags.recursive = 1; |
fa2ab86d XY |
1391 | diff_setup_done(&diffopt); |
1392 | ||
1393 | oidcpy(&bases->base_commit, &base->object.oid); | |
1394 | ||
2abf3503 | 1395 | repo_init_revisions(the_repository, &revs, NULL); |
fa2ab86d XY |
1396 | revs.max_parents = 1; |
1397 | revs.topo_order = 1; | |
1398 | for (i = 0; i < total; i++) { | |
1399 | list[i]->object.flags &= ~UNINTERESTING; | |
1400 | add_pending_object(&revs, &list[i]->object, "rev_list"); | |
7b680d32 | 1401 | *commit_base_at(&commit_base, list[i]) = 1; |
fa2ab86d XY |
1402 | } |
1403 | base->object.flags |= UNINTERESTING; | |
1404 | add_pending_object(&revs, &base->object, "base"); | |
1405 | ||
1406 | if (prepare_revision_walk(&revs)) | |
1407 | die(_("revision walk setup failed")); | |
1408 | /* | |
1409 | * Traverse the commits list, get prerequisite patch ids | |
1410 | * and stuff them in bases structure. | |
1411 | */ | |
1412 | while ((commit = get_revision(&revs)) != NULL) { | |
d801627b | 1413 | struct object_id oid; |
fa2ab86d | 1414 | struct object_id *patch_id; |
7b680d32 | 1415 | if (*commit_base_at(&commit_base, commit)) |
fa2ab86d | 1416 | continue; |
34f3c0eb | 1417 | if (commit_patch_id(commit, &diffopt, &oid, 0)) |
fa2ab86d XY |
1418 | die(_("cannot get patch id")); |
1419 | ALLOC_GROW(bases->patch_id, bases->nr_patch_id + 1, bases->alloc_patch_id); | |
1420 | patch_id = bases->patch_id + bases->nr_patch_id; | |
d801627b | 1421 | oidcpy(patch_id, &oid); |
fa2ab86d XY |
1422 | bases->nr_patch_id++; |
1423 | } | |
7b680d32 | 1424 | clear_commit_base(&commit_base); |
fa2ab86d XY |
1425 | } |
1426 | ||
95235f5b | 1427 | static void print_bases(struct base_tree_info *bases, FILE *file) |
fa2ab86d XY |
1428 | { |
1429 | int i; | |
1430 | ||
1431 | /* Only do this once, either for the cover or for the first one */ | |
1432 | if (is_null_oid(&bases->base_commit)) | |
1433 | return; | |
1434 | ||
1435 | /* Show the base commit */ | |
480871e0 | 1436 | fprintf(file, "\nbase-commit: %s\n", oid_to_hex(&bases->base_commit)); |
fa2ab86d XY |
1437 | |
1438 | /* Show the prerequisite patches */ | |
1439 | for (i = bases->nr_patch_id - 1; i >= 0; i--) | |
95235f5b | 1440 | fprintf(file, "prerequisite-patch-id: %s\n", oid_to_hex(&bases->patch_id[i])); |
fa2ab86d XY |
1441 | |
1442 | free(bases->patch_id); | |
1443 | bases->nr_patch_id = 0; | |
1444 | bases->alloc_patch_id = 0; | |
1445 | oidclr(&bases->base_commit); | |
1446 | } | |
1447 | ||
5ac290f9 ES |
1448 | static const char *diff_title(struct strbuf *sb, int reroll_count, |
1449 | const char *generic, const char *rerolled) | |
1450 | { | |
1451 | if (reroll_count <= 0) | |
1452 | strbuf_addstr(sb, generic); | |
1453 | else /* RFC may be v0, so allow -v1 to diff against v0 */ | |
1454 | strbuf_addf(sb, rerolled, reroll_count - 1); | |
1455 | return sb->buf; | |
1456 | } | |
1457 | ||
31e2617a ES |
1458 | static void infer_range_diff_ranges(struct strbuf *r1, |
1459 | struct strbuf *r2, | |
1460 | const char *prev, | |
2e6fd71a | 1461 | struct commit *origin, |
31e2617a ES |
1462 | struct commit *head) |
1463 | { | |
1464 | const char *head_oid = oid_to_hex(&head->object.oid); | |
1465 | ||
2e6fd71a ES |
1466 | if (!strstr(prev, "..")) { |
1467 | strbuf_addf(r1, "%s..%s", head_oid, prev); | |
1468 | strbuf_addf(r2, "%s..%s", prev, head_oid); | |
1469 | } else if (!origin) { | |
1470 | die(_("failed to infer range-diff ranges")); | |
1471 | } else { | |
1472 | strbuf_addstr(r1, prev); | |
1473 | strbuf_addf(r2, "%s..%s", | |
1474 | oid_to_hex(&origin->object.oid), head_oid); | |
1475 | } | |
31e2617a ES |
1476 | } |
1477 | ||
a633fca0 | 1478 | int cmd_format_patch(int argc, const char **argv, const char *prefix) |
91efcf60 JH |
1479 | { |
1480 | struct commit *commit; | |
1481 | struct commit **list = NULL; | |
1482 | struct rev_info rev; | |
32962c9b | 1483 | struct setup_revision_opt s_r_opt; |
fff02ee6 | 1484 | int nr = 0, total, i; |
0377db77 | 1485 | int use_stdout = 0; |
fa0f02df | 1486 | int start_number = -1; |
ce37596c | 1487 | int just_numbers = 0; |
9c6efa36 | 1488 | int ignore_if_in_upstream = 0; |
2a4c2607 | 1489 | int cover_letter = -1; |
2bda2cf4 | 1490 | int boundary_count = 0; |
37c22a4b | 1491 | int no_binary_diff = 0; |
3a30aa17 | 1492 | int zero_commit = 0; |
d7ddad01 | 1493 | struct commit *origin = NULL; |
76af0734 | 1494 | const char *in_reply_to = NULL; |
5d23e133 | 1495 | struct patch_ids ids; |
f285a2d7 | 1496 | struct strbuf buf = STRBUF_INIT; |
1d46f2ea | 1497 | int use_patch_format = 0; |
250087f2 | 1498 | int quiet = 0; |
5fe10fe8 | 1499 | int reroll_count = -1; |
739453a3 | 1500 | char *branch_name = NULL; |
fa2ab86d XY |
1501 | char *base_commit = NULL; |
1502 | struct base_tree_info bases; | |
738e88a2 KW |
1503 | int show_progress = 0; |
1504 | struct progress *progress = NULL; | |
126facf8 | 1505 | struct oid_array idiff_prev = OID_ARRAY_INIT; |
5ac290f9 | 1506 | struct strbuf idiff_title = STRBUF_INIT; |
31e2617a ES |
1507 | const char *rdiff_prev = NULL; |
1508 | struct strbuf rdiff1 = STRBUF_INIT; | |
1509 | struct strbuf rdiff2 = STRBUF_INIT; | |
4ee99689 | 1510 | struct strbuf rdiff_title = STRBUF_INIT; |
8631bf1c | 1511 | int creation_factor = -1; |
fa2ab86d | 1512 | |
fff02ee6 SB |
1513 | const struct option builtin_format_patch_options[] = { |
1514 | { OPTION_CALLBACK, 'n', "numbered", &numbered, NULL, | |
61007a58 | 1515 | N_("use [PATCH n/m] even with a single patch"), |
fff02ee6 SB |
1516 | PARSE_OPT_NOARG, numbered_callback }, |
1517 | { OPTION_CALLBACK, 'N', "no-numbered", &numbered, NULL, | |
61007a58 | 1518 | N_("use [PATCH] even with multiple patches"), |
964fd83b | 1519 | PARSE_OPT_NOARG | PARSE_OPT_NONEG, no_numbered_callback }, |
aa089cd9 FC |
1520 | OPT_BOOL('s', "signoff", &do_signoff, N_("add Signed-off-by:")), |
1521 | OPT_BOOL(0, "stdout", &use_stdout, | |
61007a58 | 1522 | N_("print patches to standard out")), |
aa089cd9 | 1523 | OPT_BOOL(0, "cover-letter", &cover_letter, |
61007a58 | 1524 | N_("generate a cover letter")), |
aa089cd9 | 1525 | OPT_BOOL(0, "numbered-files", &just_numbers, |
61007a58 NTND |
1526 | N_("use simple number sequence for output file names")), |
1527 | OPT_STRING(0, "suffix", &fmt_patch_suffix, N_("sfx"), | |
1528 | N_("use <sfx> instead of '.patch'")), | |
fff02ee6 | 1529 | OPT_INTEGER(0, "start-number", &start_number, |
61007a58 | 1530 | N_("start numbering patches at <n> instead of 1")), |
7952ea66 | 1531 | OPT_INTEGER('v', "reroll-count", &reroll_count, |
5fe10fe8 | 1532 | N_("mark the series as Nth re-roll")), |
68e83a5b JT |
1533 | { OPTION_CALLBACK, 0, "rfc", &rev, NULL, |
1534 | N_("Use [RFC PATCH] instead of [PATCH]"), | |
1535 | PARSE_OPT_NOARG | PARSE_OPT_NONEG, rfc_callback }, | |
61007a58 NTND |
1536 | { OPTION_CALLBACK, 0, "subject-prefix", &rev, N_("prefix"), |
1537 | N_("Use [<prefix>] instead of [PATCH]"), | |
fff02ee6 SB |
1538 | PARSE_OPT_NONEG, subject_prefix_callback }, |
1539 | { OPTION_CALLBACK, 'o', "output-directory", &output_directory, | |
61007a58 | 1540 | N_("dir"), N_("store resulting files in <dir>"), |
fff02ee6 SB |
1541 | PARSE_OPT_NONEG, output_directory_callback }, |
1542 | { OPTION_CALLBACK, 'k', "keep-subject", &rev, NULL, | |
61007a58 | 1543 | N_("don't strip/add [PATCH]"), |
fff02ee6 | 1544 | PARSE_OPT_NOARG | PARSE_OPT_NONEG, keep_callback }, |
d5d09d47 SB |
1545 | OPT_BOOL(0, "no-binary", &no_binary_diff, |
1546 | N_("don't output binary diffs")), | |
3a30aa17 | 1547 | OPT_BOOL(0, "zero-commit", &zero_commit, |
1548 | N_("output all-zero hash in From header")), | |
d5d09d47 SB |
1549 | OPT_BOOL(0, "ignore-if-in-upstream", &ignore_if_in_upstream, |
1550 | N_("don't include a patch matching a commit upstream")), | |
3e4a67b4 NTND |
1551 | OPT_SET_INT_F('p', "no-stat", &use_patch_format, |
1552 | N_("show patch format instead of default (patch + stat)"), | |
1553 | 1, PARSE_OPT_NONEG), | |
61007a58 NTND |
1554 | OPT_GROUP(N_("Messaging")), |
1555 | { OPTION_CALLBACK, 0, "add-header", NULL, N_("header"), | |
1556 | N_("add email header"), 0, header_callback }, | |
1557 | { OPTION_CALLBACK, 0, "to", NULL, N_("email"), N_("add To: header"), | |
c4260034 | 1558 | 0, to_callback }, |
61007a58 | 1559 | { OPTION_CALLBACK, 0, "cc", NULL, N_("email"), N_("add Cc: header"), |
c4260034 | 1560 | 0, cc_callback }, |
a9080475 JK |
1561 | { OPTION_CALLBACK, 0, "from", &from, N_("ident"), |
1562 | N_("set From address to <ident> (or committer ident if absent)"), | |
1563 | PARSE_OPT_OPTARG, from_callback }, | |
61007a58 NTND |
1564 | OPT_STRING(0, "in-reply-to", &in_reply_to, N_("message-id"), |
1565 | N_("make first mail a reply to <message-id>")), | |
1566 | { OPTION_CALLBACK, 0, "attach", &rev, N_("boundary"), | |
1567 | N_("attach the patch"), PARSE_OPT_OPTARG, | |
fff02ee6 | 1568 | attach_callback }, |
61007a58 NTND |
1569 | { OPTION_CALLBACK, 0, "inline", &rev, N_("boundary"), |
1570 | N_("inline the patch"), | |
fff02ee6 SB |
1571 | PARSE_OPT_OPTARG | PARSE_OPT_NONEG, |
1572 | inline_callback }, | |
61007a58 NTND |
1573 | { OPTION_CALLBACK, 0, "thread", &thread, N_("style"), |
1574 | N_("enable message threading, styles: shallow, deep"), | |
fff02ee6 | 1575 | PARSE_OPT_OPTARG, thread_callback }, |
61007a58 NTND |
1576 | OPT_STRING(0, "signature", &signature, N_("signature"), |
1577 | N_("add a signature")), | |
fa2ab86d XY |
1578 | OPT_STRING(0, "base", &base_commit, N_("base-commit"), |
1579 | N_("add prerequisite tree info to the patch series")), | |
7022650f JM |
1580 | OPT_FILENAME(0, "signature-file", &signature_file, |
1581 | N_("add a signature from a file")), | |
b7df098c | 1582 | OPT__QUIET(&quiet, N_("don't print the patch filenames")), |
738e88a2 KW |
1583 | OPT_BOOL(0, "progress", &show_progress, |
1584 | N_("show progress while generating patches")), | |
126facf8 | 1585 | OPT_CALLBACK(0, "interdiff", &idiff_prev, N_("rev"), |
ee6cbf71 | 1586 | N_("show changes against <rev> in cover letter or single patch"), |
126facf8 | 1587 | parse_opt_object_name), |
31e2617a | 1588 | OPT_STRING(0, "range-diff", &rdiff_prev, N_("refspec"), |
40ce4160 | 1589 | N_("show changes against <refspec> in cover letter or single patch")), |
8631bf1c ES |
1590 | OPT_INTEGER(0, "creation-factor", &creation_factor, |
1591 | N_("percentage by which creation is weighted")), | |
fff02ee6 SB |
1592 | OPT_END() |
1593 | }; | |
91efcf60 | 1594 | |
ca9e0a1b SB |
1595 | extra_hdr.strdup_strings = 1; |
1596 | extra_to.strdup_strings = 1; | |
1597 | extra_cc.strdup_strings = 1; | |
9501d191 | 1598 | init_log_defaults(); |
ef90d6d4 | 1599 | git_config(git_format_config, NULL); |
2abf3503 | 1600 | repo_init_revisions(the_repository, &rev, prefix); |
91efcf60 | 1601 | rev.commit_format = CMIT_FMT_EMAIL; |
0893eec8 | 1602 | rev.expand_tabs_in_log_default = 0; |
91efcf60 JH |
1603 | rev.verbose_header = 1; |
1604 | rev.diff = 1; | |
ad5aeede | 1605 | rev.max_parents = 1; |
0d1e0e78 | 1606 | rev.diffopt.flags.recursive = 1; |
dbd21447 | 1607 | rev.subject_prefix = fmt_patch_subject_prefix; |
32962c9b JH |
1608 | memset(&s_r_opt, 0, sizeof(s_r_opt)); |
1609 | s_r_opt.def = "HEAD"; | |
d5f6b1d7 | 1610 | s_r_opt.revarg_opt = REVARG_COMMITTISH; |
20ff0680 | 1611 | |
0db5260b JW |
1612 | if (default_attach) { |
1613 | rev.mime_boundary = default_attach; | |
1614 | rev.no_inline = 1; | |
1615 | } | |
1616 | ||
2448482b JS |
1617 | /* |
1618 | * Parse the arguments before setup_revisions(), or something | |
2dc189a3 | 1619 | * like "git format-patch -o a123 HEAD^.." may fail; a123 is |
2448482b JS |
1620 | * possibly a valid SHA1. |
1621 | */ | |
37782920 | 1622 | argc = parse_options(argc, argv, prefix, builtin_format_patch_options, |
fff02ee6 | 1623 | builtin_format_patch_usage, |
382da402 FC |
1624 | PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN | |
1625 | PARSE_OPT_KEEP_DASHDASH); | |
2448482b | 1626 | |
5fe10fe8 JH |
1627 | if (0 < reroll_count) { |
1628 | struct strbuf sprefix = STRBUF_INIT; | |
1629 | strbuf_addf(&sprefix, "%s v%d", | |
1630 | rev.subject_prefix, reroll_count); | |
1631 | rev.reroll_count = reroll_count; | |
1632 | rev.subject_prefix = strbuf_detach(&sprefix, NULL); | |
1633 | } | |
1634 | ||
ca9e0a1b SB |
1635 | for (i = 0; i < extra_hdr.nr; i++) { |
1636 | strbuf_addstr(&buf, extra_hdr.items[i].string); | |
3ee79d9f DB |
1637 | strbuf_addch(&buf, '\n'); |
1638 | } | |
1639 | ||
ca9e0a1b | 1640 | if (extra_to.nr) |
3ee79d9f | 1641 | strbuf_addstr(&buf, "To: "); |
ca9e0a1b | 1642 | for (i = 0; i < extra_to.nr; i++) { |
3ee79d9f DB |
1643 | if (i) |
1644 | strbuf_addstr(&buf, " "); | |
ca9e0a1b SB |
1645 | strbuf_addstr(&buf, extra_to.items[i].string); |
1646 | if (i + 1 < extra_to.nr) | |
3ee79d9f DB |
1647 | strbuf_addch(&buf, ','); |
1648 | strbuf_addch(&buf, '\n'); | |
1649 | } | |
1650 | ||
ca9e0a1b | 1651 | if (extra_cc.nr) |
3ee79d9f | 1652 | strbuf_addstr(&buf, "Cc: "); |
ca9e0a1b | 1653 | for (i = 0; i < extra_cc.nr; i++) { |
3ee79d9f DB |
1654 | if (i) |
1655 | strbuf_addstr(&buf, " "); | |
ca9e0a1b SB |
1656 | strbuf_addstr(&buf, extra_cc.items[i].string); |
1657 | if (i + 1 < extra_cc.nr) | |
3ee79d9f DB |
1658 | strbuf_addch(&buf, ','); |
1659 | strbuf_addch(&buf, '\n'); | |
1660 | } | |
1661 | ||
2af202be | 1662 | rev.extra_headers = strbuf_detach(&buf, NULL); |
3ee79d9f | 1663 | |
a9080475 JK |
1664 | if (from) { |
1665 | if (split_ident_line(&rev.from_ident, from, strlen(from))) | |
1666 | die(_("invalid ident line: %s"), from); | |
1667 | } | |
1668 | ||
add5c8a5 | 1669 | if (start_number < 0) |
fa0f02df | 1670 | start_number = 1; |
ca6b91d2 JM |
1671 | |
1672 | /* | |
1673 | * If numbered is set solely due to format.numbered in config, | |
1674 | * and it would conflict with --keep-subject (-k) from the | |
1675 | * command line, reset "numbered". | |
1676 | */ | |
1677 | if (numbered && keep_subject && !numbered_cmdline_opt) | |
1678 | numbered = 0; | |
1679 | ||
63b398a4 | 1680 | if (numbered && keep_subject) |
1a07e59c | 1681 | die(_("-n and -k are mutually exclusive")); |
2d9e4a47 | 1682 | if (keep_subject && subject_prefix) |
1a07e59c | 1683 | die(_("--subject-prefix/--rfc and -k are mutually exclusive")); |
9553d2b2 | 1684 | rev.preserve_subject = keep_subject; |
8ac80a57 | 1685 | |
32962c9b | 1686 | argc = setup_revisions(argc, argv, &rev, &s_r_opt); |
2448482b | 1687 | if (argc > 1) |
1a07e59c | 1688 | die(_("unrecognized argument: %s"), argv[1]); |
0377db77 | 1689 | |
02bc5b03 | 1690 | if (rev.diffopt.output_format & DIFF_FORMAT_NAME) |
f338cb83 | 1691 | die(_("--name-only does not make sense")); |
02bc5b03 | 1692 | if (rev.diffopt.output_format & DIFF_FORMAT_NAME_STATUS) |
f338cb83 | 1693 | die(_("--name-status does not make sense")); |
02bc5b03 | 1694 | if (rev.diffopt.output_format & DIFF_FORMAT_CHECKDIFF) |
f338cb83 | 1695 | die(_("--check does not make sense")); |
02bc5b03 BG |
1696 | |
1697 | if (!use_patch_format && | |
1698 | (!rev.diffopt.output_format || | |
1699 | rev.diffopt.output_format == DIFF_FORMAT_PATCH)) | |
1700 | rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_SUMMARY; | |
071dd0ba NTND |
1701 | if (!rev.diffopt.stat_width) |
1702 | rev.diffopt.stat_width = MAIL_DEFAULT_WRAP; | |
02bc5b03 BG |
1703 | |
1704 | /* Always generate a patch */ | |
1705 | rev.diffopt.output_format |= DIFF_FORMAT_PATCH; | |
c9b5ef99 | 1706 | |
3a30aa17 | 1707 | rev.zero_commit = zero_commit; |
1708 | ||
0d1e0e78 BW |
1709 | if (!rev.diffopt.flags.text && !no_binary_diff) |
1710 | rev.diffopt.flags.binary = 1; | |
e47f306d | 1711 | |
894a9d33 TR |
1712 | if (rev.show_notes) |
1713 | init_display_notes(&rev.notes_opt); | |
1714 | ||
bc6bf2d7 AK |
1715 | if (!output_directory && !use_stdout) |
1716 | output_directory = config_output_directory; | |
1717 | ||
9800a754 JH |
1718 | if (!use_stdout) |
1719 | output_directory = set_outdir(prefix, output_directory); | |
38a94bb6 TRC |
1720 | else |
1721 | setup_pager(); | |
77e565d8 | 1722 | |
efd02016 | 1723 | if (output_directory) { |
11f4eb19 JS |
1724 | if (rev.diffopt.use_color != GIT_COLOR_ALWAYS) |
1725 | rev.diffopt.use_color = GIT_COLOR_NEVER; | |
efd02016 | 1726 | if (use_stdout) |
5c5f1d7c | 1727 | die(_("standard output, or directory, which one?")); |
efd02016 | 1728 | if (mkdir(output_directory, 0777) < 0 && errno != EEXIST) |
5c5f1d7c | 1729 | die_errno(_("Could not create directory '%s'"), |
0721c314 | 1730 | output_directory); |
efd02016 JH |
1731 | } |
1732 | ||
1f1e895f | 1733 | if (rev.pending.nr == 1) { |
427a8ec5 FC |
1734 | int check_head = 0; |
1735 | ||
8a1d076e JH |
1736 | if (rev.max_count < 0 && !rev.show_root_diff) { |
1737 | /* | |
1738 | * This is traditional behaviour of "git format-patch | |
1739 | * origin" that prepares what the origin side still | |
1740 | * does not have. | |
1741 | */ | |
7c496280 | 1742 | rev.pending.objects[0].item->flags |= UNINTERESTING; |
3384a2df | 1743 | add_head_to_pending(&rev); |
427a8ec5 | 1744 | check_head = 1; |
7c496280 | 1745 | } |
8a1d076e JH |
1746 | /* |
1747 | * Otherwise, it is "format-patch -22 HEAD", and/or | |
1748 | * "format-patch --root HEAD". The user wants | |
1749 | * get_revision() to do the usual traversal. | |
7c496280 | 1750 | */ |
427a8ec5 FC |
1751 | |
1752 | if (!strcmp(rev.pending.objects[0].name, "HEAD")) | |
1753 | check_head = 1; | |
1754 | ||
1755 | if (check_head) { | |
95b567c7 | 1756 | const char *ref, *v; |
7695d118 | 1757 | ref = resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, |
744c040b | 1758 | NULL, NULL); |
95b567c7 JK |
1759 | if (ref && skip_prefix(ref, "refs/heads/", &v)) |
1760 | branch_name = xstrdup(v); | |
427a8ec5 FC |
1761 | else |
1762 | branch_name = xstrdup(""); /* no branch */ | |
1763 | } | |
e686eb98 | 1764 | } |
68c2ec7f JH |
1765 | |
1766 | /* | |
1767 | * We cannot move this anywhere earlier because we do want to | |
9517e6b8 | 1768 | * know if --root was given explicitly from the command line. |
68c2ec7f JH |
1769 | */ |
1770 | rev.show_root_diff = 1; | |
1771 | ||
657ab61e KB |
1772 | if (ignore_if_in_upstream) { |
1773 | /* Don't say anything if head and upstream are the same. */ | |
1774 | if (rev.pending.nr == 2) { | |
1775 | struct object_array_entry *o = rev.pending.objects; | |
4a7e27e9 | 1776 | if (oideq(&o[0].item->oid, &o[1].item->oid)) |
126facf8 | 1777 | goto done; |
657ab61e | 1778 | } |
811929f1 | 1779 | get_patch_ids(&rev, &ids); |
657ab61e | 1780 | } |
9c6efa36 | 1781 | |
3d51e1b5 | 1782 | if (prepare_revision_walk(&rev)) |
5c5f1d7c | 1783 | die(_("revision walk setup failed")); |
2bda2cf4 | 1784 | rev.boundary = 1; |
91efcf60 | 1785 | while ((commit = get_revision(&rev)) != NULL) { |
2bda2cf4 | 1786 | if (commit->object.flags & BOUNDARY) { |
2bda2cf4 DB |
1787 | boundary_count++; |
1788 | origin = (boundary_count == 1) ? commit : NULL; | |
1789 | continue; | |
1790 | } | |
1791 | ||
3acf8dd8 | 1792 | if (ignore_if_in_upstream && has_commit_patch_id(commit, &ids)) |
9c6efa36 JS |
1793 | continue; |
1794 | ||
91efcf60 | 1795 | nr++; |
2756ca43 | 1796 | REALLOC_ARRAY(list, nr); |
91efcf60 JH |
1797 | list[nr - 1] = commit; |
1798 | } | |
80d35ca0 FC |
1799 | if (nr == 0) |
1800 | /* nothing to do */ | |
126facf8 | 1801 | goto done; |
0377db77 | 1802 | total = nr; |
2a4c2607 FC |
1803 | if (cover_letter == -1) { |
1804 | if (config_cover_letter == COVER_AUTO) | |
1805 | cover_letter = (total > 1); | |
1806 | else | |
1807 | cover_letter = (config_cover_letter == COVER_ON); | |
1808 | } | |
957ed3a5 JK |
1809 | if (!keep_subject && auto_number && (total > 1 || cover_letter)) |
1810 | numbered = 1; | |
1811 | if (numbered) | |
1812 | rev.total = total + start_number - 1; | |
2a4c2607 | 1813 | |
126facf8 | 1814 | if (idiff_prev.nr) { |
ee6cbf71 ES |
1815 | if (!cover_letter && total != 1) |
1816 | die(_("--interdiff requires --cover-letter or single patch")); | |
126facf8 ES |
1817 | rev.idiff_oid1 = &idiff_prev.oid[idiff_prev.nr - 1]; |
1818 | rev.idiff_oid2 = get_commit_tree_oid(list[0]); | |
5ac290f9 ES |
1819 | rev.idiff_title = diff_title(&idiff_title, reroll_count, |
1820 | _("Interdiff:"), | |
1821 | _("Interdiff against v%d:")); | |
126facf8 ES |
1822 | } |
1823 | ||
8631bf1c ES |
1824 | if (creation_factor < 0) |
1825 | creation_factor = RANGE_DIFF_CREATION_FACTOR_DEFAULT; | |
1826 | else if (!rdiff_prev) | |
1827 | die(_("--creation-factor requires --range-diff")); | |
1828 | ||
31e2617a | 1829 | if (rdiff_prev) { |
40ce4160 ES |
1830 | if (!cover_letter && total != 1) |
1831 | die(_("--range-diff requires --cover-letter or single patch")); | |
31e2617a | 1832 | |
2e6fd71a ES |
1833 | infer_range_diff_ranges(&rdiff1, &rdiff2, rdiff_prev, |
1834 | origin, list[0]); | |
31e2617a ES |
1835 | rev.rdiff1 = rdiff1.buf; |
1836 | rev.rdiff2 = rdiff2.buf; | |
8631bf1c | 1837 | rev.creation_factor = creation_factor; |
4ee99689 ES |
1838 | rev.rdiff_title = diff_title(&rdiff_title, reroll_count, |
1839 | _("Range-diff:"), | |
1840 | _("Range-diff against v%d:")); | |
31e2617a ES |
1841 | } |
1842 | ||
7022650f JM |
1843 | if (!signature) { |
1844 | ; /* --no-signature inhibits all signatures */ | |
1845 | } else if (signature && signature != git_version_string) { | |
1846 | ; /* non-default signature already set */ | |
1847 | } else if (signature_file) { | |
1848 | struct strbuf buf = STRBUF_INIT; | |
1849 | ||
1850 | if (strbuf_read_file(&buf, signature_file, 128) < 0) | |
1851 | die_errno(_("unable to read signature file '%s'"), signature_file); | |
1852 | signature = strbuf_detach(&buf, NULL); | |
1853 | } | |
1854 | ||
fa2ab86d | 1855 | memset(&bases, 0, sizeof(bases)); |
bb52995f | 1856 | if (base_commit || base_auto) { |
fa2ab86d XY |
1857 | struct commit *base = get_base_commit(base_commit, list, nr); |
1858 | reset_revision_walk(); | |
15b76c1f | 1859 | clear_object_flags(UNINTERESTING); |
fa2ab86d XY |
1860 | prepare_bases(&bases, base, list, nr); |
1861 | } | |
1862 | ||
b079c50e TR |
1863 | if (in_reply_to || thread || cover_letter) |
1864 | rev.ref_message_ids = xcalloc(1, sizeof(struct string_list)); | |
1865 | if (in_reply_to) { | |
1866 | const char *msgid = clean_message_id(in_reply_to); | |
1d2f80fa | 1867 | string_list_append(rev.ref_message_ids, msgid); |
b079c50e | 1868 | } |
ce37596c | 1869 | rev.numbered_files = just_numbers; |
108dab28 | 1870 | rev.patch_suffix = fmt_patch_suffix; |
a5a27c79 DB |
1871 | if (cover_letter) { |
1872 | if (thread) | |
1873 | gen_message_id(&rev, "cover"); | |
ce37596c | 1874 | make_cover_letter(&rev, use_stdout, |
d7ddad01 | 1875 | origin, nr, list, branch_name, quiet); |
95235f5b | 1876 | print_bases(&bases, rev.diffopt.file); |
480871e0 | 1877 | print_signature(rev.diffopt.file); |
a5a27c79 DB |
1878 | total++; |
1879 | start_number--; | |
40ce4160 | 1880 | /* interdiff/range-diff in cover-letter; omit from patches */ |
ee6cbf71 | 1881 | rev.idiff_oid1 = NULL; |
40ce4160 | 1882 | rev.rdiff1 = NULL; |
a5a27c79 | 1883 | } |
5289c56a | 1884 | rev.add_signoff = do_signoff; |
738e88a2 KW |
1885 | |
1886 | if (show_progress) | |
d33a4332 | 1887 | progress = start_delayed_progress(_("Generating patches"), total); |
91efcf60 JH |
1888 | while (0 <= --nr) { |
1889 | int shown; | |
738e88a2 | 1890 | display_progress(progress, total - nr); |
91efcf60 | 1891 | commit = list[nr]; |
add5c8a5 | 1892 | rev.nr = total - nr + (start_number - 1); |
d1566f78 | 1893 | /* Make the second and subsequent mails replies to the first */ |
cc35de84 | 1894 | if (thread) { |
a5a27c79 | 1895 | /* Have we already had a message ID? */ |
e1a37346 | 1896 | if (rev.message_id) { |
a5a27c79 | 1897 | /* |
30984ed2 TR |
1898 | * For deep threading: make every mail |
1899 | * a reply to the previous one, no | |
1900 | * matter what other options are set. | |
1901 | * | |
1902 | * For shallow threading: | |
1903 | * | |
2175c10d TR |
1904 | * Without --cover-letter and |
1905 | * --in-reply-to, make every mail a | |
1906 | * reply to the one before. | |
1907 | * | |
1908 | * With --in-reply-to but no | |
1909 | * --cover-letter, make every mail a | |
1910 | * reply to the <reply-to>. | |
1911 | * | |
1912 | * With --cover-letter, make every | |
1913 | * mail but the cover letter a reply | |
1914 | * to the cover letter. The cover | |
1915 | * letter is a reply to the | |
1916 | * --in-reply-to, if specified. | |
a5a27c79 | 1917 | */ |
30984ed2 TR |
1918 | if (thread == THREAD_SHALLOW |
1919 | && rev.ref_message_ids->nr > 0 | |
2175c10d | 1920 | && (!cover_letter || rev.nr > 1)) |
e1a37346 DB |
1921 | free(rev.message_id); |
1922 | else | |
1d2f80fa JP |
1923 | string_list_append(rev.ref_message_ids, |
1924 | rev.message_id); | |
cc35de84 | 1925 | } |
f2fd0760 | 1926 | gen_message_id(&rev, oid_to_hex(&commit->object.oid)); |
d1566f78 | 1927 | } |
6df514af | 1928 | |
a21c2f94 | 1929 | if (!use_stdout && |
95235f5b | 1930 | open_next_file(rev.numbered_files ? NULL : commit, NULL, &rev, quiet)) |
5c5f1d7c | 1931 | die(_("Failed to create output files")); |
91efcf60 | 1932 | shown = log_tree_commit(&rev, commit); |
0fb370da | 1933 | free_commit_buffer(commit); |
add5c8a5 JH |
1934 | |
1935 | /* We put one extra blank line between formatted | |
1936 | * patches and this flag is used by log-tree code | |
1937 | * to see if it needs to emit a LF before showing | |
1938 | * the log; when using one file per patch, we do | |
1939 | * not want the extra blank line. | |
1940 | */ | |
1941 | if (!use_stdout) | |
1942 | rev.shown_one = 0; | |
698ce6f8 | 1943 | if (shown) { |
480871e0 | 1944 | print_bases(&bases, rev.diffopt.file); |
698ce6f8 | 1945 | if (rev.mime_boundary) |
95235f5b | 1946 | fprintf(rev.diffopt.file, "\n--%s%s--\n\n\n", |
698ce6f8 JS |
1947 | mime_boundary_leader, |
1948 | rev.mime_boundary); | |
1949 | else | |
95235f5b | 1950 | print_signature(rev.diffopt.file); |
698ce6f8 | 1951 | } |
0377db77 | 1952 | if (!use_stdout) |
95235f5b | 1953 | fclose(rev.diffopt.file); |
91efcf60 | 1954 | } |
738e88a2 | 1955 | stop_progress(&progress); |
91efcf60 | 1956 | free(list); |
739453a3 | 1957 | free(branch_name); |
ca9e0a1b SB |
1958 | string_list_clear(&extra_to, 0); |
1959 | string_list_clear(&extra_cc, 0); | |
1960 | string_list_clear(&extra_hdr, 0); | |
5d23e133 JH |
1961 | if (ignore_if_in_upstream) |
1962 | free_patch_ids(&ids); | |
126facf8 ES |
1963 | |
1964 | done: | |
1965 | oid_array_clear(&idiff_prev); | |
5ac290f9 | 1966 | strbuf_release(&idiff_title); |
31e2617a ES |
1967 | strbuf_release(&rdiff1); |
1968 | strbuf_release(&rdiff2); | |
4ee99689 | 1969 | strbuf_release(&rdiff_title); |
91efcf60 JH |
1970 | return 0; |
1971 | } | |
1972 | ||
e827633a RS |
1973 | static int add_pending_commit(const char *arg, struct rev_info *revs, int flags) |
1974 | { | |
d801627b | 1975 | struct object_id oid; |
1976 | if (get_oid(arg, &oid) == 0) { | |
2122f675 SB |
1977 | struct commit *commit = lookup_commit_reference(the_repository, |
1978 | &oid); | |
e827633a RS |
1979 | if (commit) { |
1980 | commit->object.flags |= flags; | |
1981 | add_pending_object(revs, &commit->object, arg); | |
1982 | return 0; | |
1983 | } | |
1984 | } | |
1985 | return -1; | |
1986 | } | |
1987 | ||
28a53178 | 1988 | static const char * const cherry_usage[] = { |
986d1bb8 | 1989 | N_("git cherry [-v] [<upstream> [<head> [<limit>]]]"), |
28a53178 EFL |
1990 | NULL |
1991 | }; | |
1992 | ||
a3a32e7f | 1993 | static void print_commit(char sign, struct commit *commit, int verbose, |
95235f5b | 1994 | int abbrev, FILE *file) |
a3a32e7f JN |
1995 | { |
1996 | if (!verbose) { | |
95235f5b | 1997 | fprintf(file, "%c %s\n", sign, |
aab9583f | 1998 | find_unique_abbrev(&commit->object.oid, abbrev)); |
a3a32e7f JN |
1999 | } else { |
2000 | struct strbuf buf = STRBUF_INIT; | |
f67d2e82 | 2001 | pp_commit_easy(CMIT_FMT_ONELINE, commit, &buf); |
95235f5b | 2002 | fprintf(file, "%c %s %s\n", sign, |
aab9583f | 2003 | find_unique_abbrev(&commit->object.oid, abbrev), |
a3a32e7f JN |
2004 | buf.buf); |
2005 | strbuf_release(&buf); | |
2006 | } | |
2007 | } | |
2008 | ||
e827633a RS |
2009 | int cmd_cherry(int argc, const char **argv, const char *prefix) |
2010 | { | |
2011 | struct rev_info revs; | |
5d23e133 | 2012 | struct patch_ids ids; |
e827633a RS |
2013 | struct commit *commit; |
2014 | struct commit_list *list = NULL; | |
f2968022 | 2015 | struct branch *current_branch; |
e827633a RS |
2016 | const char *upstream; |
2017 | const char *head = "HEAD"; | |
2018 | const char *limit = NULL; | |
28a53178 | 2019 | int verbose = 0, abbrev = 0; |
e827633a | 2020 | |
28a53178 EFL |
2021 | struct option options[] = { |
2022 | OPT__ABBREV(&abbrev), | |
986d1bb8 | 2023 | OPT__VERBOSE(&verbose, N_("be verbose")), |
28a53178 EFL |
2024 | OPT_END() |
2025 | }; | |
e827633a | 2026 | |
28a53178 | 2027 | argc = parse_options(argc, argv, prefix, options, cherry_usage, 0); |
fef34270 | 2028 | |
e827633a | 2029 | switch (argc) { |
e827633a | 2030 | case 3: |
28a53178 | 2031 | limit = argv[2]; |
e827633a RS |
2032 | /* FALLTHROUGH */ |
2033 | case 2: | |
28a53178 EFL |
2034 | head = argv[1]; |
2035 | /* FALLTHROUGH */ | |
2036 | case 1: | |
2037 | upstream = argv[0]; | |
e827633a RS |
2038 | break; |
2039 | default: | |
f2968022 | 2040 | current_branch = branch_get(NULL); |
3a429d0a | 2041 | upstream = branch_get_upstream(current_branch, NULL); |
a9f9f8cc | 2042 | if (!upstream) { |
5c5f1d7c | 2043 | fprintf(stderr, _("Could not find a tracked" |
f2968022 | 2044 | " remote branch, please" |
5c5f1d7c | 2045 | " specify <upstream> manually.\n")); |
28a53178 | 2046 | usage_with_options(cherry_usage, options); |
f2968022 | 2047 | } |
e827633a RS |
2048 | } |
2049 | ||
2abf3503 | 2050 | repo_init_revisions(the_repository, &revs, prefix); |
51f4de3a | 2051 | revs.max_parents = 1; |
e827633a RS |
2052 | |
2053 | if (add_pending_commit(head, &revs, 0)) | |
5c5f1d7c | 2054 | die(_("Unknown commit %s"), head); |
e827633a | 2055 | if (add_pending_commit(upstream, &revs, UNINTERESTING)) |
5c5f1d7c | 2056 | die(_("Unknown commit %s"), upstream); |
e827633a RS |
2057 | |
2058 | /* Don't say anything if head and upstream are the same. */ | |
2059 | if (revs.pending.nr == 2) { | |
2060 | struct object_array_entry *o = revs.pending.objects; | |
4a7e27e9 | 2061 | if (oideq(&o[0].item->oid, &o[1].item->oid)) |
e827633a RS |
2062 | return 0; |
2063 | } | |
2064 | ||
811929f1 | 2065 | get_patch_ids(&revs, &ids); |
e827633a RS |
2066 | |
2067 | if (limit && add_pending_commit(limit, &revs, UNINTERESTING)) | |
5c5f1d7c | 2068 | die(_("Unknown commit %s"), limit); |
e827633a RS |
2069 | |
2070 | /* reverse the list of commits */ | |
3d51e1b5 | 2071 | if (prepare_revision_walk(&revs)) |
5c5f1d7c | 2072 | die(_("revision walk setup failed")); |
e827633a | 2073 | while ((commit = get_revision(&revs)) != NULL) { |
e827633a RS |
2074 | commit_list_insert(commit, &list); |
2075 | } | |
2076 | ||
2077 | while (list) { | |
e827633a RS |
2078 | char sign = '+'; |
2079 | ||
2080 | commit = list->item; | |
5d23e133 | 2081 | if (has_commit_patch_id(commit, &ids)) |
e827633a | 2082 | sign = '-'; |
95235f5b | 2083 | print_commit(sign, commit, verbose, abbrev, revs.diffopt.file); |
e827633a RS |
2084 | list = list->next; |
2085 | } | |
2086 | ||
5d23e133 | 2087 | free_patch_ids(&ids); |
e827633a RS |
2088 | return 0; |
2089 | } |