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