]>
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" | |
6b2f2d98 | 8 | #include "color.h" |
70827b15 LT |
9 | #include "commit.h" |
10 | #include "diff.h" | |
11 | #include "revision.h" | |
12 | #include "log-tree.h" | |
91efcf60 | 13 | #include "builtin.h" |
5d7eeee2 | 14 | #include "tag.h" |
cf39f54e | 15 | #include "reflog-walk.h" |
5d23e133 | 16 | #include "patch-ids.h" |
a5a27c79 | 17 | #include "run-command.h" |
2bda2cf4 | 18 | #include "shortlog.h" |
f2968022 | 19 | #include "remote.h" |
b079c50e | 20 | #include "string-list.h" |
fff02ee6 | 21 | #include "parse-options.h" |
70827b15 | 22 | |
dd0ffd5b HO |
23 | /* Set a default date-time format for git log ("log.date" config variable) */ |
24 | static const char *default_date_mode = NULL; | |
25 | ||
0f03ca94 | 26 | static int default_show_root = 1; |
8a3d203b | 27 | static int decoration_style; |
d54276f2 | 28 | static const char *fmt_patch_subject_prefix = "PATCH"; |
94c22a5e | 29 | static const char *fmt_pretty; |
0f03ca94 | 30 | |
1c370ea4 MM |
31 | static const char * const builtin_log_usage = |
32 | "git log [<options>] [<since>..<until>] [[--] <path>...]\n" | |
33 | " or: git show [options] <object>..."; | |
34 | ||
8a3d203b JH |
35 | static int parse_decoration_style(const char *var, const char *value) |
36 | { | |
37 | switch (git_config_maybe_bool(var, value)) { | |
38 | case 1: | |
39 | return DECORATE_SHORT_REFS; | |
40 | case 0: | |
41 | return 0; | |
42 | default: | |
43 | break; | |
44 | } | |
45 | if (!strcmp(value, "full")) | |
46 | return DECORATE_FULL_REFS; | |
47 | else if (!strcmp(value, "short")) | |
48 | return DECORATE_SHORT_REFS; | |
49 | return -1; | |
50 | } | |
51 | ||
a633fca0 | 52 | static void cmd_log_init(int argc, const char **argv, const char *prefix, |
32962c9b | 53 | struct rev_info *rev, struct setup_revision_opt *opt) |
70827b15 | 54 | { |
52883fbd | 55 | int i; |
635530a2 | 56 | int decoration_given = 0; |
5b163603 | 57 | struct userformat_want w; |
52883fbd | 58 | |
70827b15 LT |
59 | rev->abbrev = DEFAULT_ABBREV; |
60 | rev->commit_format = CMIT_FMT_DEFAULT; | |
94c22a5e | 61 | if (fmt_pretty) |
4da45bef | 62 | get_commit_format(fmt_pretty, rev); |
70827b15 | 63 | rev->verbose_header = 1; |
8f67f8ae | 64 | DIFF_OPT_SET(&rev->diffopt, RECURSIVE); |
0f03ca94 | 65 | rev->show_root_diff = default_show_root; |
d54276f2 | 66 | rev->subject_prefix = fmt_patch_subject_prefix; |
5ec11af6 | 67 | DIFF_OPT_SET(&rev->diffopt, ALLOW_TEXTCONV); |
dd0ffd5b HO |
68 | |
69 | if (default_date_mode) | |
70 | rev->date_mode = parse_date_format(default_date_mode); | |
71 | ||
99caeed0 JN |
72 | /* |
73 | * Check for -h before setup_revisions(), or "git log -h" will | |
74 | * fail when run without a git directory. | |
75 | */ | |
76 | if (argc == 2 && !strcmp(argv[1], "-h")) | |
77 | usage(builtin_log_usage); | |
32962c9b | 78 | argc = setup_revisions(argc, argv, rev, opt); |
dd0ffd5b | 79 | |
5b163603 JG |
80 | memset(&w, 0, sizeof(w)); |
81 | userformat_find_requirements(NULL, &w); | |
82 | ||
83 | if (!rev->show_notes_given && (!rev->pretty_given || w.notes)) | |
66b2ed09 | 84 | rev->show_notes = 1; |
894a9d33 TR |
85 | if (rev->show_notes) |
86 | init_display_notes(&rev->notes_opt); | |
66b2ed09 | 87 | |
9dafea26 TH |
88 | if (rev->diffopt.pickaxe || rev->diffopt.filter) |
89 | rev->always_show_header = 0; | |
8f67f8ae | 90 | if (DIFF_OPT_TST(&rev->diffopt, FOLLOW_RENAMES)) { |
750f7b66 LT |
91 | rev->always_show_header = 0; |
92 | if (rev->diffopt.nr_paths != 1) | |
93 | usage("git logs can only follow renames on one pathname at a time"); | |
94 | } | |
52883fbd JH |
95 | for (i = 1; i < argc; i++) { |
96 | const char *arg = argv[i]; | |
66688334 | 97 | if (!strcmp(arg, "--decorate")) { |
33e7018c | 98 | decoration_style = DECORATE_SHORT_REFS; |
635530a2 | 99 | decoration_given = 1; |
33e7018c LH |
100 | } else if (!prefixcmp(arg, "--decorate=")) { |
101 | const char *v = skip_prefix(arg, "--decorate="); | |
8a3d203b JH |
102 | decoration_style = parse_decoration_style(arg, v); |
103 | if (decoration_style < 0) | |
33e7018c | 104 | die("invalid --decorate option: %s", arg); |
635530a2 | 105 | decoration_given = 1; |
8a3d203b JH |
106 | } else if (!strcmp(arg, "--no-decorate")) { |
107 | decoration_style = 0; | |
0f3a290b LT |
108 | } else if (!strcmp(arg, "--source")) { |
109 | rev->show_source = 1; | |
1c370ea4 MM |
110 | } else if (!strcmp(arg, "-h")) { |
111 | usage(builtin_log_usage); | |
ca135e7a | 112 | } else |
52883fbd JH |
113 | die("unrecognized argument: %s", arg); |
114 | } | |
635530a2 JH |
115 | |
116 | /* | |
4f62c2bc | 117 | * defeat log.decorate configuration interacting with --pretty=raw |
635530a2 JH |
118 | * from the command line. |
119 | */ | |
4f62c2bc JH |
120 | if (!decoration_given && rev->pretty_given |
121 | && rev->commit_format == CMIT_FMT_RAW) | |
635530a2 JH |
122 | decoration_style = 0; |
123 | ||
33e7018c LH |
124 | if (decoration_style) { |
125 | rev->show_decorations = 1; | |
126 | load_ref_decorations(decoration_style); | |
127 | } | |
9dafea26 TH |
128 | } |
129 | ||
252a7c02 LT |
130 | /* |
131 | * This gives a rough estimate for how many commits we | |
132 | * will print out in the list. | |
133 | */ | |
134 | static int estimate_commit_count(struct rev_info *rev, struct commit_list *list) | |
135 | { | |
136 | int n = 0; | |
137 | ||
138 | while (list) { | |
139 | struct commit *commit = list->item; | |
140 | unsigned int flags = commit->object.flags; | |
252a7c02 | 141 | list = list->next; |
7dc0fe3b | 142 | if (!(flags & (TREESAME | UNINTERESTING))) |
53b2c823 | 143 | n++; |
252a7c02 LT |
144 | } |
145 | return n; | |
146 | } | |
147 | ||
148 | static void show_early_header(struct rev_info *rev, const char *stage, int nr) | |
149 | { | |
150 | if (rev->shown_one) { | |
151 | rev->shown_one = 0; | |
152 | if (rev->commit_format != CMIT_FMT_ONELINE) | |
153 | putchar(rev->diffopt.line_termination); | |
154 | } | |
155 | printf("Final output: %d %s\n", nr, stage); | |
156 | } | |
157 | ||
2af202be | 158 | static struct itimerval early_output_timer; |
252a7c02 | 159 | |
cdcefbc9 LT |
160 | static void log_show_early(struct rev_info *revs, struct commit_list *list) |
161 | { | |
162 | int i = revs->early_output; | |
252a7c02 | 163 | int show_header = 1; |
cdcefbc9 LT |
164 | |
165 | sort_in_topological_order(&list, revs->lifo); | |
166 | while (list && i) { | |
167 | struct commit *commit = list->item; | |
252a7c02 LT |
168 | switch (simplify_commit(revs, commit)) { |
169 | case commit_show: | |
170 | if (show_header) { | |
171 | int n = estimate_commit_count(revs, list); | |
172 | show_early_header(revs, "incomplete", n); | |
173 | show_header = 0; | |
174 | } | |
175 | log_tree_commit(revs, commit); | |
176 | i--; | |
177 | break; | |
178 | case commit_ignore: | |
179 | break; | |
180 | case commit_error: | |
181 | return; | |
182 | } | |
cdcefbc9 | 183 | list = list->next; |
cdcefbc9 | 184 | } |
252a7c02 LT |
185 | |
186 | /* Did we already get enough commits for the early output? */ | |
187 | if (!i) | |
188 | return; | |
189 | ||
190 | /* | |
191 | * ..if no, then repeat it twice a second until we | |
192 | * do. | |
193 | * | |
194 | * NOTE! We don't use "it_interval", because if the | |
195 | * reader isn't listening, we want our output to be | |
196 | * throttled by the writing, and not have the timer | |
197 | * trigger every second even if we're blocked on a | |
198 | * reader! | |
199 | */ | |
200 | early_output_timer.it_value.tv_sec = 0; | |
201 | early_output_timer.it_value.tv_usec = 500000; | |
202 | setitimer(ITIMER_REAL, &early_output_timer, NULL); | |
cdcefbc9 LT |
203 | } |
204 | ||
205 | static void early_output(int signal) | |
206 | { | |
207 | show_early_output = log_show_early; | |
208 | } | |
209 | ||
210 | static void setup_early_output(struct rev_info *rev) | |
211 | { | |
212 | struct sigaction sa; | |
cdcefbc9 LT |
213 | |
214 | /* | |
215 | * Set up the signal handler, minimally intrusively: | |
216 | * we only set a single volatile integer word (not | |
217 | * using sigatomic_t - trying to avoid unnecessary | |
218 | * system dependencies and headers), and using | |
219 | * SA_RESTART. | |
220 | */ | |
221 | memset(&sa, 0, sizeof(sa)); | |
222 | sa.sa_handler = early_output; | |
223 | sigemptyset(&sa.sa_mask); | |
224 | sa.sa_flags = SA_RESTART; | |
225 | sigaction(SIGALRM, &sa, NULL); | |
226 | ||
227 | /* | |
228 | * If we can get the whole output in less than a | |
229 | * tenth of a second, don't even bother doing the | |
230 | * early-output thing.. | |
231 | * | |
232 | * This is a one-time-only trigger. | |
233 | */ | |
252a7c02 LT |
234 | early_output_timer.it_value.tv_sec = 0; |
235 | early_output_timer.it_value.tv_usec = 100000; | |
236 | setitimer(ITIMER_REAL, &early_output_timer, NULL); | |
cdcefbc9 LT |
237 | } |
238 | ||
239 | static void finish_early_output(struct rev_info *rev) | |
240 | { | |
252a7c02 | 241 | int n = estimate_commit_count(rev, rev->commits); |
cdcefbc9 | 242 | signal(SIGALRM, SIG_IGN); |
252a7c02 | 243 | show_early_header(rev, "done", n); |
cdcefbc9 LT |
244 | } |
245 | ||
9dafea26 TH |
246 | static int cmd_log_walk(struct rev_info *rev) |
247 | { | |
248 | struct commit *commit; | |
70827b15 | 249 | |
cdcefbc9 LT |
250 | if (rev->early_output) |
251 | setup_early_output(rev); | |
252 | ||
3d51e1b5 MK |
253 | if (prepare_revision_walk(rev)) |
254 | die("revision walk setup failed"); | |
cdcefbc9 LT |
255 | |
256 | if (rev->early_output) | |
257 | finish_early_output(rev); | |
258 | ||
036d17fe | 259 | /* |
84102a33 PVM |
260 | * For --check and --exit-code, the exit code is based on CHECK_FAILED |
261 | * and HAS_CHANGES being accumulated in rev->diffopt, so be careful to | |
262 | * retain that state information if replacing rev->diffopt in this loop | |
036d17fe | 263 | */ |
70827b15 LT |
264 | while ((commit = get_revision(rev)) != NULL) { |
265 | log_tree_commit(rev, commit); | |
a6c73064 JS |
266 | if (!rev->reflog_info) { |
267 | /* we allow cycles in reflog ancestry */ | |
268 | free(commit->buffer); | |
269 | commit->buffer = NULL; | |
270 | } | |
cb115748 LT |
271 | free_commit_list(commit->parents); |
272 | commit->parents = NULL; | |
70827b15 | 273 | } |
036d17fe PVM |
274 | if (rev->diffopt.output_format & DIFF_FORMAT_CHECKDIFF && |
275 | DIFF_OPT_TST(&rev->diffopt, CHECK_FAILED)) { | |
276 | return 02; | |
277 | } | |
84102a33 | 278 | return diff_result_code(&rev->diffopt, 0); |
70827b15 LT |
279 | } |
280 | ||
ef90d6d4 | 281 | static int git_log_config(const char *var, const char *value, void *cb) |
0f03ca94 | 282 | { |
94c22a5e CR |
283 | if (!strcmp(var, "format.pretty")) |
284 | return git_config_string(&fmt_pretty, var, value); | |
70cff3ac BH |
285 | if (!strcmp(var, "format.subjectprefix")) |
286 | return git_config_string(&fmt_patch_subject_prefix, var, value); | |
dd0ffd5b HO |
287 | if (!strcmp(var, "log.date")) |
288 | return git_config_string(&default_date_mode, var, value); | |
eb734454 | 289 | if (!strcmp(var, "log.decorate")) { |
8a3d203b JH |
290 | decoration_style = parse_decoration_style(var, value); |
291 | if (decoration_style < 0) | |
292 | decoration_style = 0; /* maybe warn? */ | |
eb734454 SD |
293 | return 0; |
294 | } | |
0f03ca94 PB |
295 | if (!strcmp(var, "log.showroot")) { |
296 | default_show_root = git_config_bool(var, value); | |
297 | return 0; | |
298 | } | |
5e11bee6 NR |
299 | if (!prefixcmp(var, "color.decorate.")) |
300 | return parse_decorate_color_config(var, 15, value); | |
301 | ||
ef90d6d4 | 302 | return git_diff_ui_config(var, value, cb); |
0f03ca94 PB |
303 | } |
304 | ||
a633fca0 | 305 | int cmd_whatchanged(int argc, const char **argv, const char *prefix) |
70827b15 LT |
306 | { |
307 | struct rev_info rev; | |
32962c9b | 308 | struct setup_revision_opt opt; |
70827b15 | 309 | |
ef90d6d4 | 310 | git_config(git_log_config, NULL); |
6b2f2d98 MK |
311 | |
312 | if (diff_use_color_default == -1) | |
313 | diff_use_color_default = git_use_color_default; | |
314 | ||
db6296a5 | 315 | init_revisions(&rev, prefix); |
70827b15 | 316 | rev.diff = 1; |
9202434c | 317 | rev.simplify_history = 0; |
32962c9b JH |
318 | memset(&opt, 0, sizeof(opt)); |
319 | opt.def = "HEAD"; | |
320 | cmd_log_init(argc, argv, prefix, &rev, &opt); | |
9dafea26 TH |
321 | if (!rev.diffopt.output_format) |
322 | rev.diffopt.output_format = DIFF_FORMAT_RAW; | |
323 | return cmd_log_walk(&rev); | |
70827b15 LT |
324 | } |
325 | ||
56122ed8 JS |
326 | static void show_tagger(char *buf, int len, struct rev_info *rev) |
327 | { | |
ea718e65 | 328 | struct strbuf out = STRBUF_INIT; |
56122ed8 | 329 | |
ea718e65 JS |
330 | pp_user_info("Tagger", rev->commit_format, &out, buf, rev->date_mode, |
331 | git_log_output_encoding ? | |
332 | git_log_output_encoding: git_commit_encoding); | |
ca4ca9ed | 333 | printf("%s", out.buf); |
ea718e65 | 334 | strbuf_release(&out); |
56122ed8 JS |
335 | } |
336 | ||
337 | static int show_object(const unsigned char *sha1, int show_tag_object, | |
338 | struct rev_info *rev) | |
5d7eeee2 JS |
339 | { |
340 | unsigned long size; | |
21666f1a NP |
341 | enum object_type type; |
342 | char *buf = read_sha1_file(sha1, &type, &size); | |
5d7eeee2 JS |
343 | int offset = 0; |
344 | ||
345 | if (!buf) | |
346 | return error("Could not read object %s", sha1_to_hex(sha1)); | |
347 | ||
56122ed8 JS |
348 | if (show_tag_object) |
349 | while (offset < size && buf[offset] != '\n') { | |
350 | int new_offset = offset + 1; | |
5d7eeee2 JS |
351 | while (new_offset < size && buf[new_offset++] != '\n') |
352 | ; /* do nothing */ | |
56122ed8 JS |
353 | if (!prefixcmp(buf + offset, "tagger ")) |
354 | show_tagger(buf + offset + 7, | |
355 | new_offset - offset - 7, rev); | |
5d7eeee2 JS |
356 | offset = new_offset; |
357 | } | |
358 | ||
359 | if (offset < size) | |
360 | fwrite(buf + offset, size - offset, 1, stdout); | |
361 | free(buf); | |
362 | return 0; | |
363 | } | |
364 | ||
365 | static int show_tree_object(const unsigned char *sha1, | |
366 | const char *base, int baselen, | |
671f0707 | 367 | const char *pathname, unsigned mode, int stage, void *context) |
5d7eeee2 JS |
368 | { |
369 | printf("%s%s\n", pathname, S_ISDIR(mode) ? "/" : ""); | |
370 | return 0; | |
371 | } | |
372 | ||
b4490059 JH |
373 | static void show_rev_tweak_rev(struct rev_info *rev, struct setup_revision_opt *opt) |
374 | { | |
2bf65873 JH |
375 | if (rev->ignore_merges) { |
376 | /* There was no "-m" on the command line */ | |
377 | rev->ignore_merges = 0; | |
378 | if (!rev->first_parent_only && !rev->combine_merges) { | |
379 | /* No "--first-parent", "-c", nor "--cc" */ | |
380 | rev->combine_merges = 1; | |
381 | rev->dense_combined_merges = 1; | |
382 | } | |
383 | } | |
b4490059 JH |
384 | if (!rev->diffopt.output_format) |
385 | rev->diffopt.output_format = DIFF_FORMAT_PATCH; | |
386 | } | |
387 | ||
a633fca0 | 388 | int cmd_show(int argc, const char **argv, const char *prefix) |
70827b15 LT |
389 | { |
390 | struct rev_info rev; | |
5d7eeee2 | 391 | struct object_array_entry *objects; |
32962c9b | 392 | struct setup_revision_opt opt; |
5d7eeee2 | 393 | int i, count, ret = 0; |
70827b15 | 394 | |
ef90d6d4 | 395 | git_config(git_log_config, NULL); |
6b2f2d98 MK |
396 | |
397 | if (diff_use_color_default == -1) | |
398 | diff_use_color_default = git_use_color_default; | |
399 | ||
db6296a5 | 400 | init_revisions(&rev, prefix); |
70827b15 | 401 | rev.diff = 1; |
70827b15 | 402 | rev.always_show_header = 1; |
70827b15 | 403 | rev.no_walk = 1; |
32962c9b JH |
404 | memset(&opt, 0, sizeof(opt)); |
405 | opt.def = "HEAD"; | |
b4490059 | 406 | opt.tweak = show_rev_tweak_rev; |
32962c9b | 407 | cmd_log_init(argc, argv, prefix, &rev, &opt); |
5d7eeee2 JS |
408 | |
409 | count = rev.pending.nr; | |
410 | objects = rev.pending.objects; | |
411 | for (i = 0; i < count && !ret; i++) { | |
412 | struct object *o = objects[i].item; | |
413 | const char *name = objects[i].name; | |
414 | switch (o->type) { | |
415 | case OBJ_BLOB: | |
56122ed8 | 416 | ret = show_object(o->sha1, 0, NULL); |
5d7eeee2 JS |
417 | break; |
418 | case OBJ_TAG: { | |
419 | struct tag *t = (struct tag *)o; | |
420 | ||
ae03ee64 JK |
421 | if (rev.shown_one) |
422 | putchar('\n'); | |
56122ed8 | 423 | printf("%stag %s%s\n", |
8f67f8ae | 424 | diff_get_color_opt(&rev.diffopt, DIFF_COMMIT), |
5d7eeee2 | 425 | t->tag, |
8f67f8ae | 426 | diff_get_color_opt(&rev.diffopt, DIFF_RESET)); |
56122ed8 | 427 | ret = show_object(o->sha1, 1, &rev); |
ae03ee64 | 428 | rev.shown_one = 1; |
d2dadfe8 JH |
429 | if (ret) |
430 | break; | |
431 | o = parse_object(t->tagged->sha1); | |
432 | if (!o) | |
433 | ret = error("Could not read object %s", | |
434 | sha1_to_hex(t->tagged->sha1)); | |
435 | objects[i].item = o; | |
5d7eeee2 JS |
436 | i--; |
437 | break; | |
438 | } | |
439 | case OBJ_TREE: | |
ae03ee64 JK |
440 | if (rev.shown_one) |
441 | putchar('\n'); | |
5d7eeee2 | 442 | printf("%stree %s%s\n\n", |
8f67f8ae | 443 | diff_get_color_opt(&rev.diffopt, DIFF_COMMIT), |
5d7eeee2 | 444 | name, |
8f67f8ae | 445 | diff_get_color_opt(&rev.diffopt, DIFF_RESET)); |
5d7eeee2 | 446 | read_tree_recursive((struct tree *)o, "", 0, 0, NULL, |
671f0707 | 447 | show_tree_object, NULL); |
ae03ee64 | 448 | rev.shown_one = 1; |
5d7eeee2 JS |
449 | break; |
450 | case OBJ_COMMIT: | |
451 | rev.pending.nr = rev.pending.alloc = 0; | |
452 | rev.pending.objects = NULL; | |
453 | add_object_array(o, name, &rev.pending); | |
454 | ret = cmd_log_walk(&rev); | |
455 | break; | |
456 | default: | |
457 | ret = error("Unknown type: %d", o->type); | |
458 | } | |
459 | } | |
460 | free(objects); | |
461 | return ret; | |
70827b15 LT |
462 | } |
463 | ||
cf39f54e LT |
464 | /* |
465 | * This is equivalent to "git log -g --abbrev-commit --pretty=oneline" | |
466 | */ | |
467 | int cmd_log_reflog(int argc, const char **argv, const char *prefix) | |
468 | { | |
469 | struct rev_info rev; | |
32962c9b | 470 | struct setup_revision_opt opt; |
cf39f54e | 471 | |
ef90d6d4 | 472 | git_config(git_log_config, NULL); |
6b2f2d98 MK |
473 | |
474 | if (diff_use_color_default == -1) | |
475 | diff_use_color_default = git_use_color_default; | |
476 | ||
cf39f54e LT |
477 | init_revisions(&rev, prefix); |
478 | init_reflog_walk(&rev.reflog_info); | |
479 | rev.abbrev_commit = 1; | |
480 | rev.verbose_header = 1; | |
32962c9b JH |
481 | memset(&opt, 0, sizeof(opt)); |
482 | opt.def = "HEAD"; | |
483 | cmd_log_init(argc, argv, prefix, &rev, &opt); | |
cf39f54e LT |
484 | |
485 | /* | |
486 | * This means that we override whatever commit format the user gave | |
487 | * on the cmd line. Sad, but cmd_log_init() currently doesn't | |
488 | * allow us to set a different default. | |
489 | */ | |
490 | rev.commit_format = CMIT_FMT_ONELINE; | |
4da45bef | 491 | rev.use_terminator = 1; |
cf39f54e LT |
492 | rev.always_show_header = 1; |
493 | ||
494 | /* | |
495 | * We get called through "git reflog", so unlike the other log | |
496 | * routines, we need to set up our pager manually.. | |
497 | */ | |
498 | setup_pager(); | |
499 | ||
500 | return cmd_log_walk(&rev); | |
501 | } | |
502 | ||
a633fca0 | 503 | int cmd_log(int argc, const char **argv, const char *prefix) |
70827b15 LT |
504 | { |
505 | struct rev_info rev; | |
32962c9b | 506 | struct setup_revision_opt opt; |
70827b15 | 507 | |
ef90d6d4 | 508 | git_config(git_log_config, NULL); |
6b2f2d98 MK |
509 | |
510 | if (diff_use_color_default == -1) | |
511 | diff_use_color_default = git_use_color_default; | |
512 | ||
db6296a5 | 513 | init_revisions(&rev, prefix); |
70827b15 | 514 | rev.always_show_header = 1; |
32962c9b JH |
515 | memset(&opt, 0, sizeof(opt)); |
516 | opt.def = "HEAD"; | |
517 | cmd_log_init(argc, argv, prefix, &rev, &opt); | |
9dafea26 | 518 | return cmd_log_walk(&rev); |
70827b15 | 519 | } |
91efcf60 | 520 | |
c06d2daa | 521 | /* format-patch */ |
0377db77 | 522 | |
917a8f89 | 523 | static const char *fmt_patch_suffix = ".patch"; |
49604a4d | 524 | static int numbered = 0; |
a567fdcb | 525 | static int auto_number = 1; |
20ff0680 | 526 | |
0db5260b JW |
527 | static char *default_attach = NULL; |
528 | ||
ca9e0a1b SB |
529 | static struct string_list extra_hdr; |
530 | static struct string_list extra_to; | |
531 | static struct string_list extra_cc; | |
3ee79d9f DB |
532 | |
533 | static void add_header(const char *value) | |
534 | { | |
ca9e0a1b | 535 | struct string_list_item *item; |
3ee79d9f | 536 | int len = strlen(value); |
c8c4450e | 537 | while (len && value[len - 1] == '\n') |
3ee79d9f | 538 | len--; |
ca9e0a1b | 539 | |
3ee79d9f | 540 | if (!strncasecmp(value, "to: ", 4)) { |
1d2f80fa | 541 | item = string_list_append(&extra_to, value + 4); |
ca9e0a1b SB |
542 | len -= 4; |
543 | } else if (!strncasecmp(value, "cc: ", 4)) { | |
1d2f80fa | 544 | item = string_list_append(&extra_cc, value + 4); |
ca9e0a1b SB |
545 | len -= 4; |
546 | } else { | |
1d2f80fa | 547 | item = string_list_append(&extra_hdr, value); |
3ee79d9f | 548 | } |
ca9e0a1b SB |
549 | |
550 | item->string[len] = '\0'; | |
3ee79d9f DB |
551 | } |
552 | ||
30984ed2 TR |
553 | #define THREAD_SHALLOW 1 |
554 | #define THREAD_DEEP 2 | |
6622d9c7 SB |
555 | static int thread; |
556 | static int do_signoff; | |
557 | static const char *signature = git_version_string; | |
30984ed2 | 558 | |
ef90d6d4 | 559 | static int git_format_config(const char *var, const char *value, void *cb) |
20ff0680 JS |
560 | { |
561 | if (!strcmp(var, "format.headers")) { | |
d7fb91c6 JH |
562 | if (!value) |
563 | die("format.headers without value"); | |
3ee79d9f | 564 | add_header(value); |
20ff0680 JS |
565 | return 0; |
566 | } | |
70cff3ac BH |
567 | if (!strcmp(var, "format.suffix")) |
568 | return git_config_string(&fmt_patch_suffix, var, value); | |
ae6c098f SD |
569 | if (!strcmp(var, "format.to")) { |
570 | if (!value) | |
571 | return config_error_nonbool(var); | |
1d2f80fa | 572 | string_list_append(&extra_to, value); |
ae6c098f SD |
573 | return 0; |
574 | } | |
fe8928e6 MV |
575 | if (!strcmp(var, "format.cc")) { |
576 | if (!value) | |
577 | return config_error_nonbool(var); | |
1d2f80fa | 578 | string_list_append(&extra_cc, value); |
fe8928e6 MV |
579 | return 0; |
580 | } | |
a159ca0c | 581 | if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) { |
f3aafa4d RA |
582 | return 0; |
583 | } | |
49604a4d | 584 | if (!strcmp(var, "format.numbered")) { |
90f5c186 | 585 | if (value && !strcasecmp(value, "auto")) { |
49604a4d BG |
586 | auto_number = 1; |
587 | return 0; | |
588 | } | |
49604a4d | 589 | numbered = git_config_bool(var, value); |
a567fdcb | 590 | auto_number = auto_number && numbered; |
49604a4d BG |
591 | return 0; |
592 | } | |
0db5260b JW |
593 | if (!strcmp(var, "format.attach")) { |
594 | if (value && *value) | |
595 | default_attach = xstrdup(value); | |
596 | else | |
597 | default_attach = xstrdup(git_version_string); | |
598 | return 0; | |
599 | } | |
30984ed2 TR |
600 | if (!strcmp(var, "format.thread")) { |
601 | if (value && !strcasecmp(value, "deep")) { | |
602 | thread = THREAD_DEEP; | |
603 | return 0; | |
604 | } | |
605 | if (value && !strcasecmp(value, "shallow")) { | |
606 | thread = THREAD_SHALLOW; | |
607 | return 0; | |
608 | } | |
609 | thread = git_config_bool(var, value) && THREAD_SHALLOW; | |
610 | return 0; | |
611 | } | |
1d1876e9 HV |
612 | if (!strcmp(var, "format.signoff")) { |
613 | do_signoff = git_config_bool(var, value); | |
614 | return 0; | |
615 | } | |
6622d9c7 SB |
616 | if (!strcmp(var, "format.signature")) |
617 | return git_config_string(&signature, var, value); | |
dbd21447 | 618 | |
ef90d6d4 | 619 | return git_log_config(var, value, cb); |
20ff0680 JS |
620 | } |
621 | ||
81f3a188 | 622 | static FILE *realstdout = NULL; |
efd02016 | 623 | static const char *output_directory = NULL; |
9800a754 | 624 | static int outdir_offset; |
81f3a188 | 625 | |
cd2ef591 | 626 | static int reopen_stdout(struct commit *commit, struct rev_info *rev) |
0377db77 | 627 | { |
cd2ef591 | 628 | struct strbuf filename = STRBUF_INIT; |
c06d2daa | 629 | int suffix_len = strlen(fmt_patch_suffix) + 1; |
0377db77 | 630 | |
2448482b | 631 | if (output_directory) { |
cd2ef591 SB |
632 | strbuf_addstr(&filename, output_directory); |
633 | if (filename.len >= | |
634 | PATH_MAX - FORMAT_PATCH_NAME_MAX - suffix_len) | |
c06d2daa | 635 | return error("name of output directory is too long"); |
cd2ef591 SB |
636 | if (filename.buf[filename.len - 1] != '/') |
637 | strbuf_addch(&filename, '/'); | |
2448482b | 638 | } |
0377db77 | 639 | |
cd2ef591 | 640 | get_patch_filename(commit, rev->nr, fmt_patch_suffix, &filename); |
e6ff0f42 | 641 | |
90b19941 | 642 | if (!DIFF_OPT_TST(&rev->diffopt, QUICK)) |
cd2ef591 | 643 | fprintf(realstdout, "%s\n", filename.buf + outdir_offset); |
ec2956df | 644 | |
cd2ef591 SB |
645 | if (freopen(filename.buf, "w", stdout) == NULL) |
646 | return error("Cannot open patch file %s", filename.buf); | |
c06d2daa | 647 | |
cd2ef591 | 648 | strbuf_release(&filename); |
e6ff0f42 | 649 | return 0; |
0377db77 JS |
650 | } |
651 | ||
5d23e133 | 652 | static void get_patch_ids(struct rev_info *rev, struct patch_ids *ids, const char *prefix) |
9c6efa36 JS |
653 | { |
654 | struct rev_info check_rev; | |
655 | struct commit *commit; | |
656 | struct object *o1, *o2; | |
657 | unsigned flags1, flags2; | |
9c6efa36 JS |
658 | |
659 | if (rev->pending.nr != 2) | |
660 | die("Need exactly one range."); | |
661 | ||
662 | o1 = rev->pending.objects[0].item; | |
663 | flags1 = o1->flags; | |
664 | o2 = rev->pending.objects[1].item; | |
665 | flags2 = o2->flags; | |
666 | ||
667 | if ((flags1 & UNINTERESTING) == (flags2 & UNINTERESTING)) | |
668 | die("Not a range."); | |
669 | ||
5d23e133 | 670 | init_patch_ids(ids); |
9c6efa36 JS |
671 | |
672 | /* given a range a..b get all patch ids for b..a */ | |
db6296a5 | 673 | init_revisions(&check_rev, prefix); |
9c6efa36 JS |
674 | o1->flags ^= UNINTERESTING; |
675 | o2->flags ^= UNINTERESTING; | |
676 | add_pending_object(&check_rev, o1, "o1"); | |
677 | add_pending_object(&check_rev, o2, "o2"); | |
3d51e1b5 MK |
678 | if (prepare_revision_walk(&check_rev)) |
679 | die("revision walk setup failed"); | |
9c6efa36 JS |
680 | |
681 | while ((commit = get_revision(&check_rev)) != NULL) { | |
682 | /* ignore merges */ | |
683 | if (commit->parents && commit->parents->next) | |
684 | continue; | |
685 | ||
5d23e133 | 686 | add_commit_patch_id(commit, ids); |
9c6efa36 JS |
687 | } |
688 | ||
689 | /* reset for next revision walk */ | |
81db0941 JS |
690 | clear_commit_marks((struct commit *)o1, |
691 | SEEN | UNINTERESTING | SHOWN | ADDED); | |
692 | clear_commit_marks((struct commit *)o2, | |
693 | SEEN | UNINTERESTING | SHOWN | ADDED); | |
9c6efa36 JS |
694 | o1->flags = flags1; |
695 | o2->flags = flags2; | |
696 | } | |
697 | ||
e1a37346 | 698 | static void gen_message_id(struct rev_info *info, char *base) |
d1566f78 | 699 | { |
774751a8 | 700 | const char *committer = git_committer_info(IDENT_WARN_ON_NO_NAME); |
d1566f78 JT |
701 | const char *email_start = strrchr(committer, '<'); |
702 | const char *email_end = strrchr(committer, '>'); | |
f285a2d7 | 703 | struct strbuf buf = STRBUF_INIT; |
e1a37346 | 704 | if (!email_start || !email_end || email_start > email_end - 1) |
d1566f78 | 705 | die("Could not extract email from committer identity."); |
e1a37346 DB |
706 | strbuf_addf(&buf, "%s.%lu.git.%.*s", base, |
707 | (unsigned long) time(NULL), | |
708 | (int)(email_end - email_start - 1), email_start + 1); | |
709 | info->message_id = strbuf_detach(&buf, NULL); | |
d1566f78 JT |
710 | } |
711 | ||
6622d9c7 SB |
712 | static void print_signature(void) |
713 | { | |
714 | if (signature && *signature) | |
715 | printf("-- \n%s\n\n", signature); | |
716 | } | |
717 | ||
2bda2cf4 DB |
718 | static void make_cover_letter(struct rev_info *rev, int use_stdout, |
719 | int numbered, int numbered_files, | |
720 | struct commit *origin, | |
721 | int nr, struct commit **list, struct commit *head) | |
a5a27c79 DB |
722 | { |
723 | const char *committer; | |
a5a27c79 DB |
724 | const char *subject_start = NULL; |
725 | const char *body = "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n"; | |
726 | const char *msg; | |
727 | const char *extra_headers = rev->extra_headers; | |
2bda2cf4 | 728 | struct shortlog log; |
f285a2d7 | 729 | struct strbuf sb = STRBUF_INIT; |
2bda2cf4 | 730 | int i; |
330db18c | 731 | const char *encoding = "UTF-8"; |
39fe578b | 732 | struct diff_options opts; |
267123b4 | 733 | int need_8bit_cte = 0; |
cd2ef591 | 734 | struct commit *commit = NULL; |
a5a27c79 DB |
735 | |
736 | if (rev->commit_format != CMIT_FMT_EMAIL) | |
737 | die("Cover letter needs email format"); | |
738 | ||
cd2ef591 | 739 | committer = git_committer_info(0); |
6df514af | 740 | |
cd2ef591 SB |
741 | if (!numbered_files) { |
742 | /* | |
743 | * We fake a commit for the cover letter so we get the filename | |
744 | * desired. | |
745 | */ | |
746 | commit = xcalloc(1, sizeof(*commit)); | |
747 | commit->buffer = xmalloc(400); | |
748 | snprintf(commit->buffer, 400, | |
749 | "tree 0000000000000000000000000000000000000000\n" | |
750 | "parent %s\n" | |
751 | "author %s\n" | |
752 | "committer %s\n\n" | |
753 | "cover letter\n", | |
108dab28 | 754 | sha1_to_hex(head->object.sha1), committer, committer); |
cd2ef591 SB |
755 | } |
756 | ||
757 | if (!use_stdout && reopen_stdout(commit, rev)) | |
a5a27c79 DB |
758 | return; |
759 | ||
cd2ef591 | 760 | if (commit) { |
a5a27c79 | 761 | |
cd2ef591 SB |
762 | free(commit->buffer); |
763 | free(commit); | |
764 | } | |
a5a27c79 | 765 | |
108dab28 | 766 | log_write_email_headers(rev, head, &subject_start, &extra_headers, |
267123b4 | 767 | &need_8bit_cte); |
a5a27c79 | 768 | |
0a7f4483 JS |
769 | for (i = 0; !need_8bit_cte && i < nr; i++) |
770 | if (has_non_ascii(list[i]->buffer)) | |
771 | need_8bit_cte = 1; | |
772 | ||
a5a27c79 | 773 | msg = body; |
a5a27c79 DB |
774 | pp_user_info(NULL, CMIT_FMT_EMAIL, &sb, committer, DATE_RFC2822, |
775 | encoding); | |
776 | pp_title_line(CMIT_FMT_EMAIL, &msg, &sb, subject_start, extra_headers, | |
267123b4 | 777 | encoding, need_8bit_cte); |
a5a27c79 DB |
778 | pp_remainder(CMIT_FMT_EMAIL, &msg, &sb, 0); |
779 | printf("%s\n", sb.buf); | |
780 | ||
781 | strbuf_release(&sb); | |
782 | ||
2bda2cf4 | 783 | shortlog_init(&log); |
859c4fbe JS |
784 | log.wrap_lines = 1; |
785 | log.wrap = 72; | |
786 | log.in1 = 2; | |
787 | log.in2 = 4; | |
2bda2cf4 DB |
788 | for (i = 0; i < nr; i++) |
789 | shortlog_add_commit(&log, list[i]); | |
790 | ||
791 | shortlog_output(&log); | |
792 | ||
a5a27c79 | 793 | /* |
2bda2cf4 | 794 | * We can only do diffstat with a unique reference point |
a5a27c79 DB |
795 | */ |
796 | if (!origin) | |
797 | return; | |
798 | ||
5d02294c JS |
799 | memcpy(&opts, &rev->diffopt, sizeof(opts)); |
800 | opts.output_format = DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT; | |
a5a27c79 | 801 | |
39fe578b DB |
802 | diff_setup_done(&opts); |
803 | ||
804 | diff_tree_sha1(origin->tree->object.sha1, | |
805 | head->tree->object.sha1, | |
806 | "", &opts); | |
807 | diffcore_std(&opts); | |
808 | diff_flush(&opts); | |
a5a27c79 | 809 | |
a5a27c79 | 810 | printf("\n"); |
6622d9c7 | 811 | print_signature(); |
d1566f78 JT |
812 | } |
813 | ||
8419d2ee JH |
814 | static const char *clean_message_id(const char *msg_id) |
815 | { | |
816 | char ch; | |
817 | const char *a, *z, *m; | |
8419d2ee JH |
818 | |
819 | m = msg_id; | |
820 | while ((ch = *m) && (isspace(ch) || (ch == '<'))) | |
821 | m++; | |
822 | a = m; | |
823 | z = NULL; | |
824 | while ((ch = *m)) { | |
825 | if (!isspace(ch) && (ch != '>')) | |
826 | z = m; | |
827 | m++; | |
828 | } | |
829 | if (!z) | |
830 | die("insane in-reply-to: %s", msg_id); | |
831 | if (++z == m) | |
832 | return a; | |
182af834 | 833 | return xmemdupz(a, z - a); |
8419d2ee JH |
834 | } |
835 | ||
9800a754 JH |
836 | static const char *set_outdir(const char *prefix, const char *output_directory) |
837 | { | |
838 | if (output_directory && is_absolute_path(output_directory)) | |
839 | return output_directory; | |
840 | ||
841 | if (!prefix || !*prefix) { | |
842 | if (output_directory) | |
843 | return output_directory; | |
844 | /* The user did not explicitly ask for "./" */ | |
845 | outdir_offset = 2; | |
846 | return "./"; | |
847 | } | |
848 | ||
849 | outdir_offset = strlen(prefix); | |
850 | if (!output_directory) | |
851 | return prefix; | |
852 | ||
853 | return xstrdup(prefix_filename(prefix, outdir_offset, | |
854 | output_directory)); | |
855 | } | |
856 | ||
fff02ee6 SB |
857 | static const char * const builtin_format_patch_usage[] = { |
858 | "git format-patch [options] [<since> | <revision range>]", | |
859 | NULL | |
860 | }; | |
861 | ||
862 | static int keep_subject = 0; | |
863 | ||
864 | static int keep_callback(const struct option *opt, const char *arg, int unset) | |
865 | { | |
866 | ((struct rev_info *)opt->value)->total = -1; | |
867 | keep_subject = 1; | |
868 | return 0; | |
869 | } | |
870 | ||
871 | static int subject_prefix = 0; | |
872 | ||
873 | static int subject_prefix_callback(const struct option *opt, const char *arg, | |
874 | int unset) | |
875 | { | |
876 | subject_prefix = 1; | |
877 | ((struct rev_info *)opt->value)->subject_prefix = arg; | |
878 | return 0; | |
879 | } | |
880 | ||
1af4731b JH |
881 | static int numbered_cmdline_opt = 0; |
882 | ||
fff02ee6 SB |
883 | static int numbered_callback(const struct option *opt, const char *arg, |
884 | int unset) | |
885 | { | |
1af4731b | 886 | *(int *)opt->value = numbered_cmdline_opt = unset ? 0 : 1; |
fff02ee6 SB |
887 | if (unset) |
888 | auto_number = 0; | |
889 | return 0; | |
890 | } | |
891 | ||
892 | static int no_numbered_callback(const struct option *opt, const char *arg, | |
893 | int unset) | |
894 | { | |
895 | return numbered_callback(opt, arg, 1); | |
896 | } | |
897 | ||
898 | static int output_directory_callback(const struct option *opt, const char *arg, | |
899 | int unset) | |
900 | { | |
901 | const char **dir = (const char **)opt->value; | |
902 | if (*dir) | |
903 | die("Two output directories?"); | |
904 | *dir = arg; | |
905 | return 0; | |
906 | } | |
907 | ||
908 | static int thread_callback(const struct option *opt, const char *arg, int unset) | |
909 | { | |
910 | int *thread = (int *)opt->value; | |
911 | if (unset) | |
912 | *thread = 0; | |
913 | else if (!arg || !strcmp(arg, "shallow")) | |
914 | *thread = THREAD_SHALLOW; | |
915 | else if (!strcmp(arg, "deep")) | |
916 | *thread = THREAD_DEEP; | |
917 | else | |
918 | return 1; | |
919 | return 0; | |
920 | } | |
921 | ||
922 | static int attach_callback(const struct option *opt, const char *arg, int unset) | |
923 | { | |
924 | struct rev_info *rev = (struct rev_info *)opt->value; | |
925 | if (unset) | |
926 | rev->mime_boundary = NULL; | |
927 | else if (arg) | |
928 | rev->mime_boundary = arg; | |
929 | else | |
930 | rev->mime_boundary = git_version_string; | |
931 | rev->no_inline = unset ? 0 : 1; | |
932 | return 0; | |
933 | } | |
934 | ||
935 | static int inline_callback(const struct option *opt, const char *arg, int unset) | |
936 | { | |
937 | struct rev_info *rev = (struct rev_info *)opt->value; | |
938 | if (unset) | |
939 | rev->mime_boundary = NULL; | |
940 | else if (arg) | |
941 | rev->mime_boundary = arg; | |
942 | else | |
943 | rev->mime_boundary = git_version_string; | |
944 | rev->no_inline = 0; | |
945 | return 0; | |
946 | } | |
947 | ||
948 | static int header_callback(const struct option *opt, const char *arg, int unset) | |
949 | { | |
c4260034 SB |
950 | if (unset) { |
951 | string_list_clear(&extra_hdr, 0); | |
952 | string_list_clear(&extra_to, 0); | |
953 | string_list_clear(&extra_cc, 0); | |
954 | } else { | |
955 | add_header(arg); | |
956 | } | |
fff02ee6 SB |
957 | return 0; |
958 | } | |
959 | ||
ae6c098f SD |
960 | static int to_callback(const struct option *opt, const char *arg, int unset) |
961 | { | |
c4260034 SB |
962 | if (unset) |
963 | string_list_clear(&extra_to, 0); | |
964 | else | |
1d2f80fa | 965 | string_list_append(&extra_to, arg); |
fff02ee6 SB |
966 | return 0; |
967 | } | |
968 | ||
969 | static int cc_callback(const struct option *opt, const char *arg, int unset) | |
970 | { | |
c4260034 SB |
971 | if (unset) |
972 | string_list_clear(&extra_cc, 0); | |
973 | else | |
1d2f80fa | 974 | string_list_append(&extra_cc, arg); |
fff02ee6 SB |
975 | return 0; |
976 | } | |
977 | ||
a633fca0 | 978 | int cmd_format_patch(int argc, const char **argv, const char *prefix) |
91efcf60 JH |
979 | { |
980 | struct commit *commit; | |
981 | struct commit **list = NULL; | |
982 | struct rev_info rev; | |
32962c9b | 983 | struct setup_revision_opt s_r_opt; |
fff02ee6 | 984 | int nr = 0, total, i; |
0377db77 | 985 | int use_stdout = 0; |
fa0f02df | 986 | int start_number = -1; |
e6ff0f42 | 987 | int numbered_files = 0; /* _just_ numbers */ |
9c6efa36 | 988 | int ignore_if_in_upstream = 0; |
a5a27c79 | 989 | int cover_letter = 0; |
2bda2cf4 | 990 | int boundary_count = 0; |
37c22a4b | 991 | int no_binary_diff = 0; |
a5a27c79 | 992 | struct commit *origin = NULL, *head = NULL; |
76af0734 | 993 | const char *in_reply_to = NULL; |
5d23e133 | 994 | struct patch_ids ids; |
cf2251b6 | 995 | char *add_signoff = NULL; |
f285a2d7 | 996 | struct strbuf buf = STRBUF_INIT; |
1d46f2ea | 997 | int use_patch_format = 0; |
fff02ee6 SB |
998 | const struct option builtin_format_patch_options[] = { |
999 | { OPTION_CALLBACK, 'n', "numbered", &numbered, NULL, | |
1000 | "use [PATCH n/m] even with a single patch", | |
1001 | PARSE_OPT_NOARG, numbered_callback }, | |
1002 | { OPTION_CALLBACK, 'N', "no-numbered", &numbered, NULL, | |
1003 | "use [PATCH] even with multiple patches", | |
1004 | PARSE_OPT_NOARG, no_numbered_callback }, | |
1005 | OPT_BOOLEAN('s', "signoff", &do_signoff, "add Signed-off-by:"), | |
1006 | OPT_BOOLEAN(0, "stdout", &use_stdout, | |
1007 | "print patches to standard out"), | |
1008 | OPT_BOOLEAN(0, "cover-letter", &cover_letter, | |
1009 | "generate a cover letter"), | |
1010 | OPT_BOOLEAN(0, "numbered-files", &numbered_files, | |
1011 | "use simple number sequence for output file names"), | |
1012 | OPT_STRING(0, "suffix", &fmt_patch_suffix, "sfx", | |
1013 | "use <sfx> instead of '.patch'"), | |
1014 | OPT_INTEGER(0, "start-number", &start_number, | |
1015 | "start numbering patches at <n> instead of 1"), | |
1016 | { OPTION_CALLBACK, 0, "subject-prefix", &rev, "prefix", | |
1017 | "Use [<prefix>] instead of [PATCH]", | |
1018 | PARSE_OPT_NONEG, subject_prefix_callback }, | |
1019 | { OPTION_CALLBACK, 'o', "output-directory", &output_directory, | |
1020 | "dir", "store resulting files in <dir>", | |
1021 | PARSE_OPT_NONEG, output_directory_callback }, | |
1022 | { OPTION_CALLBACK, 'k', "keep-subject", &rev, NULL, | |
1023 | "don't strip/add [PATCH]", | |
1024 | PARSE_OPT_NOARG | PARSE_OPT_NONEG, keep_callback }, | |
1025 | OPT_BOOLEAN(0, "no-binary", &no_binary_diff, | |
1026 | "don't output binary diffs"), | |
1027 | OPT_BOOLEAN(0, "ignore-if-in-upstream", &ignore_if_in_upstream, | |
1028 | "don't include a patch matching a commit upstream"), | |
2cfa8330 BG |
1029 | { OPTION_BOOLEAN, 'p', "no-stat", &use_patch_format, NULL, |
1030 | "show patch format instead of default (patch + stat)", | |
1031 | PARSE_OPT_NONEG | PARSE_OPT_NOARG }, | |
fff02ee6 SB |
1032 | OPT_GROUP("Messaging"), |
1033 | { OPTION_CALLBACK, 0, "add-header", NULL, "header", | |
c4260034 | 1034 | "add email header", 0, header_callback }, |
ae6c098f | 1035 | { OPTION_CALLBACK, 0, "to", NULL, "email", "add To: header", |
c4260034 | 1036 | 0, to_callback }, |
fff02ee6 | 1037 | { OPTION_CALLBACK, 0, "cc", NULL, "email", "add Cc: header", |
c4260034 | 1038 | 0, cc_callback }, |
fff02ee6 SB |
1039 | OPT_STRING(0, "in-reply-to", &in_reply_to, "message-id", |
1040 | "make first mail a reply to <message-id>"), | |
1041 | { OPTION_CALLBACK, 0, "attach", &rev, "boundary", | |
1042 | "attach the patch", PARSE_OPT_OPTARG, | |
1043 | attach_callback }, | |
1044 | { OPTION_CALLBACK, 0, "inline", &rev, "boundary", | |
1045 | "inline the patch", | |
1046 | PARSE_OPT_OPTARG | PARSE_OPT_NONEG, | |
1047 | inline_callback }, | |
1048 | { OPTION_CALLBACK, 0, "thread", &thread, "style", | |
1049 | "enable message threading, styles: shallow, deep", | |
1050 | PARSE_OPT_OPTARG, thread_callback }, | |
6622d9c7 SB |
1051 | OPT_STRING(0, "signature", &signature, "signature", |
1052 | "add a signature"), | |
fff02ee6 SB |
1053 | OPT_END() |
1054 | }; | |
91efcf60 | 1055 | |
ca9e0a1b SB |
1056 | extra_hdr.strdup_strings = 1; |
1057 | extra_to.strdup_strings = 1; | |
1058 | extra_cc.strdup_strings = 1; | |
ef90d6d4 | 1059 | git_config(git_format_config, NULL); |
db6296a5 | 1060 | init_revisions(&rev, prefix); |
91efcf60 JH |
1061 | rev.commit_format = CMIT_FMT_EMAIL; |
1062 | rev.verbose_header = 1; | |
1063 | rev.diff = 1; | |
91efcf60 JH |
1064 | rev.combine_merges = 0; |
1065 | rev.ignore_merges = 1; | |
8f67f8ae | 1066 | DIFF_OPT_SET(&rev.diffopt, RECURSIVE); |
dbd21447 | 1067 | rev.subject_prefix = fmt_patch_subject_prefix; |
32962c9b JH |
1068 | memset(&s_r_opt, 0, sizeof(s_r_opt)); |
1069 | s_r_opt.def = "HEAD"; | |
20ff0680 | 1070 | |
0db5260b JW |
1071 | if (default_attach) { |
1072 | rev.mime_boundary = default_attach; | |
1073 | rev.no_inline = 1; | |
1074 | } | |
1075 | ||
2448482b JS |
1076 | /* |
1077 | * Parse the arguments before setup_revisions(), or something | |
2dc189a3 | 1078 | * like "git format-patch -o a123 HEAD^.." may fail; a123 is |
2448482b JS |
1079 | * possibly a valid SHA1. |
1080 | */ | |
37782920 | 1081 | argc = parse_options(argc, argv, prefix, builtin_format_patch_options, |
fff02ee6 | 1082 | builtin_format_patch_usage, |
382da402 FC |
1083 | PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN | |
1084 | PARSE_OPT_KEEP_DASHDASH); | |
2448482b | 1085 | |
1d1876e9 HV |
1086 | if (do_signoff) { |
1087 | const char *committer; | |
1088 | const char *endpos; | |
1089 | committer = git_committer_info(IDENT_ERROR_ON_NO_NAME); | |
1090 | endpos = strchr(committer, '>'); | |
1091 | if (!endpos) | |
1092 | die("bogus committer info %s", committer); | |
1093 | add_signoff = xmemdupz(committer, endpos - committer + 1); | |
1094 | } | |
1095 | ||
ca9e0a1b SB |
1096 | for (i = 0; i < extra_hdr.nr; i++) { |
1097 | strbuf_addstr(&buf, extra_hdr.items[i].string); | |
3ee79d9f DB |
1098 | strbuf_addch(&buf, '\n'); |
1099 | } | |
1100 | ||
ca9e0a1b | 1101 | if (extra_to.nr) |
3ee79d9f | 1102 | strbuf_addstr(&buf, "To: "); |
ca9e0a1b | 1103 | for (i = 0; i < extra_to.nr; i++) { |
3ee79d9f DB |
1104 | if (i) |
1105 | strbuf_addstr(&buf, " "); | |
ca9e0a1b SB |
1106 | strbuf_addstr(&buf, extra_to.items[i].string); |
1107 | if (i + 1 < extra_to.nr) | |
3ee79d9f DB |
1108 | strbuf_addch(&buf, ','); |
1109 | strbuf_addch(&buf, '\n'); | |
1110 | } | |
1111 | ||
ca9e0a1b | 1112 | if (extra_cc.nr) |
3ee79d9f | 1113 | strbuf_addstr(&buf, "Cc: "); |
ca9e0a1b | 1114 | for (i = 0; i < extra_cc.nr; i++) { |
3ee79d9f DB |
1115 | if (i) |
1116 | strbuf_addstr(&buf, " "); | |
ca9e0a1b SB |
1117 | strbuf_addstr(&buf, extra_cc.items[i].string); |
1118 | if (i + 1 < extra_cc.nr) | |
3ee79d9f DB |
1119 | strbuf_addch(&buf, ','); |
1120 | strbuf_addch(&buf, '\n'); | |
1121 | } | |
1122 | ||
2af202be | 1123 | rev.extra_headers = strbuf_detach(&buf, NULL); |
3ee79d9f | 1124 | |
add5c8a5 | 1125 | if (start_number < 0) |
fa0f02df | 1126 | start_number = 1; |
ca6b91d2 JM |
1127 | |
1128 | /* | |
1129 | * If numbered is set solely due to format.numbered in config, | |
1130 | * and it would conflict with --keep-subject (-k) from the | |
1131 | * command line, reset "numbered". | |
1132 | */ | |
1133 | if (numbered && keep_subject && !numbered_cmdline_opt) | |
1134 | numbered = 0; | |
1135 | ||
63b398a4 | 1136 | if (numbered && keep_subject) |
8ac80a57 | 1137 | die ("-n and -k are mutually exclusive."); |
2d9e4a47 RJ |
1138 | if (keep_subject && subject_prefix) |
1139 | die ("--subject-prefix and -k are mutually exclusive."); | |
8ac80a57 | 1140 | |
32962c9b | 1141 | argc = setup_revisions(argc, argv, &rev, &s_r_opt); |
2448482b JS |
1142 | if (argc > 1) |
1143 | die ("unrecognized argument: %s", argv[1]); | |
0377db77 | 1144 | |
02bc5b03 BG |
1145 | if (rev.diffopt.output_format & DIFF_FORMAT_NAME) |
1146 | die("--name-only does not make sense"); | |
1147 | if (rev.diffopt.output_format & DIFF_FORMAT_NAME_STATUS) | |
1148 | die("--name-status does not make sense"); | |
1149 | if (rev.diffopt.output_format & DIFF_FORMAT_CHECKDIFF) | |
1150 | die("--check does not make sense"); | |
1151 | ||
1152 | if (!use_patch_format && | |
1153 | (!rev.diffopt.output_format || | |
1154 | rev.diffopt.output_format == DIFF_FORMAT_PATCH)) | |
1155 | rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_SUMMARY; | |
1156 | ||
1157 | /* Always generate a patch */ | |
1158 | rev.diffopt.output_format |= DIFF_FORMAT_PATCH; | |
c9b5ef99 | 1159 | |
37c22a4b | 1160 | if (!DIFF_OPT_TST(&rev.diffopt, TEXT) && !no_binary_diff) |
8f67f8ae | 1161 | DIFF_OPT_SET(&rev.diffopt, BINARY); |
e47f306d | 1162 | |
894a9d33 TR |
1163 | if (rev.show_notes) |
1164 | init_display_notes(&rev.notes_opt); | |
1165 | ||
9800a754 JH |
1166 | if (!use_stdout) |
1167 | output_directory = set_outdir(prefix, output_directory); | |
77e565d8 | 1168 | |
efd02016 JH |
1169 | if (output_directory) { |
1170 | if (use_stdout) | |
1171 | die("standard output, or directory, which one?"); | |
1172 | if (mkdir(output_directory, 0777) < 0 && errno != EEXIST) | |
0721c314 TR |
1173 | die_errno("Could not create directory '%s'", |
1174 | output_directory); | |
efd02016 JH |
1175 | } |
1176 | ||
1f1e895f | 1177 | if (rev.pending.nr == 1) { |
8a1d076e JH |
1178 | if (rev.max_count < 0 && !rev.show_root_diff) { |
1179 | /* | |
1180 | * This is traditional behaviour of "git format-patch | |
1181 | * origin" that prepares what the origin side still | |
1182 | * does not have. | |
1183 | */ | |
7c496280 | 1184 | rev.pending.objects[0].item->flags |= UNINTERESTING; |
3384a2df | 1185 | add_head_to_pending(&rev); |
7c496280 | 1186 | } |
8a1d076e JH |
1187 | /* |
1188 | * Otherwise, it is "format-patch -22 HEAD", and/or | |
1189 | * "format-patch --root HEAD". The user wants | |
1190 | * get_revision() to do the usual traversal. | |
7c496280 | 1191 | */ |
e686eb98 | 1192 | } |
68c2ec7f JH |
1193 | |
1194 | /* | |
1195 | * We cannot move this anywhere earlier because we do want to | |
9517e6b8 | 1196 | * know if --root was given explicitly from the command line. |
68c2ec7f JH |
1197 | */ |
1198 | rev.show_root_diff = 1; | |
1199 | ||
a5a27c79 DB |
1200 | if (cover_letter) { |
1201 | /* remember the range */ | |
a5a27c79 DB |
1202 | int i; |
1203 | for (i = 0; i < rev.pending.nr; i++) { | |
1204 | struct object *o = rev.pending.objects[i].item; | |
2bda2cf4 | 1205 | if (!(o->flags & UNINTERESTING)) |
a5a27c79 DB |
1206 | head = (struct commit *)o; |
1207 | } | |
a5a27c79 DB |
1208 | /* We can't generate a cover letter without any patches */ |
1209 | if (!head) | |
1210 | return 0; | |
1211 | } | |
e686eb98 | 1212 | |
657ab61e KB |
1213 | if (ignore_if_in_upstream) { |
1214 | /* Don't say anything if head and upstream are the same. */ | |
1215 | if (rev.pending.nr == 2) { | |
1216 | struct object_array_entry *o = rev.pending.objects; | |
1217 | if (hashcmp(o[0].item->sha1, o[1].item->sha1) == 0) | |
1218 | return 0; | |
1219 | } | |
5d23e133 | 1220 | get_patch_ids(&rev, &ids, prefix); |
657ab61e | 1221 | } |
9c6efa36 | 1222 | |
81f3a188 | 1223 | if (!use_stdout) |
f5788250 | 1224 | realstdout = xfdopen(xdup(1), "w"); |
81f3a188 | 1225 | |
3d51e1b5 MK |
1226 | if (prepare_revision_walk(&rev)) |
1227 | die("revision walk setup failed"); | |
2bda2cf4 | 1228 | rev.boundary = 1; |
91efcf60 | 1229 | while ((commit = get_revision(&rev)) != NULL) { |
2bda2cf4 | 1230 | if (commit->object.flags & BOUNDARY) { |
2bda2cf4 DB |
1231 | boundary_count++; |
1232 | origin = (boundary_count == 1) ? commit : NULL; | |
1233 | continue; | |
1234 | } | |
1235 | ||
0377db77 JS |
1236 | /* ignore merges */ |
1237 | if (commit->parents && commit->parents->next) | |
1238 | continue; | |
9c6efa36 JS |
1239 | |
1240 | if (ignore_if_in_upstream && | |
5d23e133 | 1241 | has_commit_patch_id(commit, &ids)) |
9c6efa36 JS |
1242 | continue; |
1243 | ||
91efcf60 | 1244 | nr++; |
83572c1a | 1245 | list = xrealloc(list, nr * sizeof(list[0])); |
91efcf60 JH |
1246 | list[nr - 1] = commit; |
1247 | } | |
0377db77 | 1248 | total = nr; |
49604a4d BG |
1249 | if (!keep_subject && auto_number && total > 1) |
1250 | numbered = 1; | |
596524b3 | 1251 | if (numbered) |
fa0f02df | 1252 | rev.total = total + start_number - 1; |
b079c50e TR |
1253 | if (in_reply_to || thread || cover_letter) |
1254 | rev.ref_message_ids = xcalloc(1, sizeof(struct string_list)); | |
1255 | if (in_reply_to) { | |
1256 | const char *msgid = clean_message_id(in_reply_to); | |
1d2f80fa | 1257 | string_list_append(rev.ref_message_ids, msgid); |
b079c50e | 1258 | } |
108dab28 SB |
1259 | rev.numbered_files = numbered_files; |
1260 | rev.patch_suffix = fmt_patch_suffix; | |
a5a27c79 DB |
1261 | if (cover_letter) { |
1262 | if (thread) | |
1263 | gen_message_id(&rev, "cover"); | |
1264 | make_cover_letter(&rev, use_stdout, numbered, numbered_files, | |
2bda2cf4 | 1265 | origin, nr, list, head); |
a5a27c79 DB |
1266 | total++; |
1267 | start_number--; | |
1268 | } | |
1269 | rev.add_signoff = add_signoff; | |
91efcf60 JH |
1270 | while (0 <= --nr) { |
1271 | int shown; | |
1272 | commit = list[nr]; | |
add5c8a5 | 1273 | rev.nr = total - nr + (start_number - 1); |
d1566f78 | 1274 | /* Make the second and subsequent mails replies to the first */ |
cc35de84 | 1275 | if (thread) { |
a5a27c79 | 1276 | /* Have we already had a message ID? */ |
e1a37346 | 1277 | if (rev.message_id) { |
a5a27c79 | 1278 | /* |
30984ed2 TR |
1279 | * For deep threading: make every mail |
1280 | * a reply to the previous one, no | |
1281 | * matter what other options are set. | |
1282 | * | |
1283 | * For shallow threading: | |
1284 | * | |
2175c10d TR |
1285 | * Without --cover-letter and |
1286 | * --in-reply-to, make every mail a | |
1287 | * reply to the one before. | |
1288 | * | |
1289 | * With --in-reply-to but no | |
1290 | * --cover-letter, make every mail a | |
1291 | * reply to the <reply-to>. | |
1292 | * | |
1293 | * With --cover-letter, make every | |
1294 | * mail but the cover letter a reply | |
1295 | * to the cover letter. The cover | |
1296 | * letter is a reply to the | |
1297 | * --in-reply-to, if specified. | |
a5a27c79 | 1298 | */ |
30984ed2 TR |
1299 | if (thread == THREAD_SHALLOW |
1300 | && rev.ref_message_ids->nr > 0 | |
2175c10d | 1301 | && (!cover_letter || rev.nr > 1)) |
e1a37346 DB |
1302 | free(rev.message_id); |
1303 | else | |
1d2f80fa JP |
1304 | string_list_append(rev.ref_message_ids, |
1305 | rev.message_id); | |
cc35de84 | 1306 | } |
e1a37346 | 1307 | gen_message_id(&rev, sha1_to_hex(commit->object.sha1)); |
d1566f78 | 1308 | } |
6df514af | 1309 | |
cd2ef591 SB |
1310 | if (!use_stdout && reopen_stdout(numbered_files ? NULL : commit, |
1311 | &rev)) | |
a5a27c79 | 1312 | die("Failed to create output files"); |
91efcf60 JH |
1313 | shown = log_tree_commit(&rev, commit); |
1314 | free(commit->buffer); | |
1315 | commit->buffer = NULL; | |
add5c8a5 JH |
1316 | |
1317 | /* We put one extra blank line between formatted | |
1318 | * patches and this flag is used by log-tree code | |
1319 | * to see if it needs to emit a LF before showing | |
1320 | * the log; when using one file per patch, we do | |
1321 | * not want the extra blank line. | |
1322 | */ | |
1323 | if (!use_stdout) | |
1324 | rev.shown_one = 0; | |
698ce6f8 JS |
1325 | if (shown) { |
1326 | if (rev.mime_boundary) | |
1327 | printf("\n--%s%s--\n\n\n", | |
1328 | mime_boundary_leader, | |
1329 | rev.mime_boundary); | |
1330 | else | |
6622d9c7 | 1331 | print_signature(); |
698ce6f8 | 1332 | } |
0377db77 JS |
1333 | if (!use_stdout) |
1334 | fclose(stdout); | |
91efcf60 JH |
1335 | } |
1336 | free(list); | |
ca9e0a1b SB |
1337 | string_list_clear(&extra_to, 0); |
1338 | string_list_clear(&extra_cc, 0); | |
1339 | string_list_clear(&extra_hdr, 0); | |
5d23e133 JH |
1340 | if (ignore_if_in_upstream) |
1341 | free_patch_ids(&ids); | |
91efcf60 JH |
1342 | return 0; |
1343 | } | |
1344 | ||
e827633a RS |
1345 | static int add_pending_commit(const char *arg, struct rev_info *revs, int flags) |
1346 | { | |
1347 | unsigned char sha1[20]; | |
1348 | if (get_sha1(arg, sha1) == 0) { | |
1349 | struct commit *commit = lookup_commit_reference(sha1); | |
1350 | if (commit) { | |
1351 | commit->object.flags |= flags; | |
1352 | add_pending_object(revs, &commit->object, arg); | |
1353 | return 0; | |
1354 | } | |
1355 | } | |
1356 | return -1; | |
1357 | } | |
1358 | ||
28a53178 EFL |
1359 | static const char * const cherry_usage[] = { |
1360 | "git cherry [-v] [<upstream> [<head> [<limit>]]]", | |
1361 | NULL | |
1362 | }; | |
1363 | ||
e827633a RS |
1364 | int cmd_cherry(int argc, const char **argv, const char *prefix) |
1365 | { | |
1366 | struct rev_info revs; | |
5d23e133 | 1367 | struct patch_ids ids; |
e827633a RS |
1368 | struct commit *commit; |
1369 | struct commit_list *list = NULL; | |
f2968022 | 1370 | struct branch *current_branch; |
e827633a RS |
1371 | const char *upstream; |
1372 | const char *head = "HEAD"; | |
1373 | const char *limit = NULL; | |
28a53178 | 1374 | int verbose = 0, abbrev = 0; |
e827633a | 1375 | |
28a53178 EFL |
1376 | struct option options[] = { |
1377 | OPT__ABBREV(&abbrev), | |
1378 | OPT__VERBOSE(&verbose), | |
1379 | OPT_END() | |
1380 | }; | |
e827633a | 1381 | |
28a53178 | 1382 | argc = parse_options(argc, argv, prefix, options, cherry_usage, 0); |
fef34270 | 1383 | |
e827633a | 1384 | switch (argc) { |
e827633a | 1385 | case 3: |
28a53178 | 1386 | limit = argv[2]; |
e827633a RS |
1387 | /* FALLTHROUGH */ |
1388 | case 2: | |
28a53178 EFL |
1389 | head = argv[1]; |
1390 | /* FALLTHROUGH */ | |
1391 | case 1: | |
1392 | upstream = argv[0]; | |
e827633a RS |
1393 | break; |
1394 | default: | |
f2968022 MH |
1395 | current_branch = branch_get(NULL); |
1396 | if (!current_branch || !current_branch->merge | |
1397 | || !current_branch->merge[0] | |
1398 | || !current_branch->merge[0]->dst) { | |
1399 | fprintf(stderr, "Could not find a tracked" | |
1400 | " remote branch, please" | |
1401 | " specify <upstream> manually.\n"); | |
28a53178 | 1402 | usage_with_options(cherry_usage, options); |
f2968022 MH |
1403 | } |
1404 | ||
1405 | upstream = current_branch->merge[0]->dst; | |
e827633a RS |
1406 | } |
1407 | ||
1408 | init_revisions(&revs, prefix); | |
1409 | revs.diff = 1; | |
1410 | revs.combine_merges = 0; | |
1411 | revs.ignore_merges = 1; | |
8f67f8ae | 1412 | DIFF_OPT_SET(&revs.diffopt, RECURSIVE); |
e827633a RS |
1413 | |
1414 | if (add_pending_commit(head, &revs, 0)) | |
1415 | die("Unknown commit %s", head); | |
1416 | if (add_pending_commit(upstream, &revs, UNINTERESTING)) | |
1417 | die("Unknown commit %s", upstream); | |
1418 | ||
1419 | /* Don't say anything if head and upstream are the same. */ | |
1420 | if (revs.pending.nr == 2) { | |
1421 | struct object_array_entry *o = revs.pending.objects; | |
1422 | if (hashcmp(o[0].item->sha1, o[1].item->sha1) == 0) | |
1423 | return 0; | |
1424 | } | |
1425 | ||
5d23e133 | 1426 | get_patch_ids(&revs, &ids, prefix); |
e827633a RS |
1427 | |
1428 | if (limit && add_pending_commit(limit, &revs, UNINTERESTING)) | |
1429 | die("Unknown commit %s", limit); | |
1430 | ||
1431 | /* reverse the list of commits */ | |
3d51e1b5 MK |
1432 | if (prepare_revision_walk(&revs)) |
1433 | die("revision walk setup failed"); | |
e827633a RS |
1434 | while ((commit = get_revision(&revs)) != NULL) { |
1435 | /* ignore merges */ | |
1436 | if (commit->parents && commit->parents->next) | |
1437 | continue; | |
1438 | ||
1439 | commit_list_insert(commit, &list); | |
1440 | } | |
1441 | ||
1442 | while (list) { | |
e827633a RS |
1443 | char sign = '+'; |
1444 | ||
1445 | commit = list->item; | |
5d23e133 | 1446 | if (has_commit_patch_id(commit, &ids)) |
e827633a RS |
1447 | sign = '-'; |
1448 | ||
1449 | if (verbose) { | |
f285a2d7 | 1450 | struct strbuf buf = STRBUF_INIT; |
dd2e794a | 1451 | struct pretty_print_context ctx = {0}; |
674d1727 | 1452 | pretty_print_commit(CMIT_FMT_ONELINE, commit, |
dd2e794a | 1453 | &buf, &ctx); |
e827633a | 1454 | printf("%c %s %s\n", sign, |
28a53178 EFL |
1455 | find_unique_abbrev(commit->object.sha1, abbrev), |
1456 | buf.buf); | |
674d1727 | 1457 | strbuf_release(&buf); |
e827633a RS |
1458 | } |
1459 | else { | |
1460 | printf("%c %s\n", sign, | |
28a53178 | 1461 | find_unique_abbrev(commit->object.sha1, abbrev)); |
e827633a RS |
1462 | } |
1463 | ||
1464 | list = list->next; | |
1465 | } | |
1466 | ||
5d23e133 | 1467 | free_patch_ids(&ids); |
e827633a RS |
1468 | return 0; |
1469 | } |