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