]>
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" | |
8 | #include "commit.h" | |
9 | #include "diff.h" | |
10 | #include "revision.h" | |
11 | #include "log-tree.h" | |
91efcf60 | 12 | #include "builtin.h" |
5d7eeee2 | 13 | #include "tag.h" |
cf39f54e | 14 | #include "reflog-walk.h" |
70827b15 | 15 | |
0f03ca94 PB |
16 | static int default_show_root = 1; |
17 | ||
e686eb98 JS |
18 | /* this is in builtin-diff.c */ |
19 | void add_head(struct rev_info *revs); | |
20 | ||
a633fca0 | 21 | static void cmd_log_init(int argc, const char **argv, const char *prefix, |
70827b15 LT |
22 | struct rev_info *rev) |
23 | { | |
52883fbd JH |
24 | int i; |
25 | ||
70827b15 LT |
26 | rev->abbrev = DEFAULT_ABBREV; |
27 | rev->commit_format = CMIT_FMT_DEFAULT; | |
28 | rev->verbose_header = 1; | |
0f03ca94 | 29 | rev->show_root_diff = default_show_root; |
70827b15 | 30 | argc = setup_revisions(argc, argv, rev, "HEAD"); |
9dafea26 TH |
31 | if (rev->diffopt.pickaxe || rev->diffopt.filter) |
32 | rev->always_show_header = 0; | |
52883fbd JH |
33 | for (i = 1; i < argc; i++) { |
34 | const char *arg = argv[i]; | |
cc44c765 | 35 | if (!prefixcmp(arg, "--encoding=")) { |
52883fbd | 36 | arg += 11; |
52883fbd | 37 | if (strcmp(arg, "none")) |
567fb65e | 38 | git_log_output_encoding = xstrdup(arg); |
52883fbd | 39 | else |
d2c11a38 | 40 | git_log_output_encoding = ""; |
52883fbd JH |
41 | } |
42 | else | |
43 | die("unrecognized argument: %s", arg); | |
44 | } | |
9dafea26 TH |
45 | } |
46 | ||
47 | static int cmd_log_walk(struct rev_info *rev) | |
48 | { | |
49 | struct commit *commit; | |
70827b15 LT |
50 | |
51 | prepare_revision_walk(rev); | |
70827b15 LT |
52 | while ((commit = get_revision(rev)) != NULL) { |
53 | log_tree_commit(rev, commit); | |
a6c73064 JS |
54 | if (!rev->reflog_info) { |
55 | /* we allow cycles in reflog ancestry */ | |
56 | free(commit->buffer); | |
57 | commit->buffer = NULL; | |
58 | } | |
cb115748 LT |
59 | free_commit_list(commit->parents); |
60 | commit->parents = NULL; | |
70827b15 LT |
61 | } |
62 | return 0; | |
63 | } | |
64 | ||
0f03ca94 PB |
65 | static int git_log_config(const char *var, const char *value) |
66 | { | |
67 | if (!strcmp(var, "log.showroot")) { | |
68 | default_show_root = git_config_bool(var, value); | |
69 | return 0; | |
70 | } | |
71 | return git_diff_ui_config(var, value); | |
72 | } | |
73 | ||
a633fca0 | 74 | int cmd_whatchanged(int argc, const char **argv, const char *prefix) |
70827b15 LT |
75 | { |
76 | struct rev_info rev; | |
77 | ||
0f03ca94 | 78 | git_config(git_log_config); |
db6296a5 | 79 | init_revisions(&rev, prefix); |
70827b15 LT |
80 | rev.diff = 1; |
81 | rev.diffopt.recursive = 1; | |
9202434c | 82 | rev.simplify_history = 0; |
a633fca0 | 83 | cmd_log_init(argc, argv, prefix, &rev); |
9dafea26 TH |
84 | if (!rev.diffopt.output_format) |
85 | rev.diffopt.output_format = DIFF_FORMAT_RAW; | |
86 | return cmd_log_walk(&rev); | |
70827b15 LT |
87 | } |
88 | ||
5d7eeee2 JS |
89 | static int show_object(const unsigned char *sha1, int suppress_header) |
90 | { | |
91 | unsigned long size; | |
21666f1a NP |
92 | enum object_type type; |
93 | char *buf = read_sha1_file(sha1, &type, &size); | |
5d7eeee2 JS |
94 | int offset = 0; |
95 | ||
96 | if (!buf) | |
97 | return error("Could not read object %s", sha1_to_hex(sha1)); | |
98 | ||
99 | if (suppress_header) | |
100 | while (offset < size && buf[offset++] != '\n') { | |
101 | int new_offset = offset; | |
102 | while (new_offset < size && buf[new_offset++] != '\n') | |
103 | ; /* do nothing */ | |
104 | offset = new_offset; | |
105 | } | |
106 | ||
107 | if (offset < size) | |
108 | fwrite(buf + offset, size - offset, 1, stdout); | |
109 | free(buf); | |
110 | return 0; | |
111 | } | |
112 | ||
113 | static int show_tree_object(const unsigned char *sha1, | |
114 | const char *base, int baselen, | |
115 | const char *pathname, unsigned mode, int stage) | |
116 | { | |
117 | printf("%s%s\n", pathname, S_ISDIR(mode) ? "/" : ""); | |
118 | return 0; | |
119 | } | |
120 | ||
a633fca0 | 121 | int cmd_show(int argc, const char **argv, const char *prefix) |
70827b15 LT |
122 | { |
123 | struct rev_info rev; | |
5d7eeee2 JS |
124 | struct object_array_entry *objects; |
125 | int i, count, ret = 0; | |
70827b15 | 126 | |
0f03ca94 | 127 | git_config(git_log_config); |
db6296a5 | 128 | init_revisions(&rev, prefix); |
70827b15 LT |
129 | rev.diff = 1; |
130 | rev.diffopt.recursive = 1; | |
131 | rev.combine_merges = 1; | |
132 | rev.dense_combined_merges = 1; | |
133 | rev.always_show_header = 1; | |
134 | rev.ignore_merges = 0; | |
135 | rev.no_walk = 1; | |
a633fca0 | 136 | cmd_log_init(argc, argv, prefix, &rev); |
5d7eeee2 JS |
137 | |
138 | count = rev.pending.nr; | |
139 | objects = rev.pending.objects; | |
140 | for (i = 0; i < count && !ret; i++) { | |
141 | struct object *o = objects[i].item; | |
142 | const char *name = objects[i].name; | |
143 | switch (o->type) { | |
144 | case OBJ_BLOB: | |
145 | ret = show_object(o->sha1, 0); | |
146 | break; | |
147 | case OBJ_TAG: { | |
148 | struct tag *t = (struct tag *)o; | |
149 | ||
150 | printf("%stag %s%s\n\n", | |
151 | diff_get_color(rev.diffopt.color_diff, | |
152 | DIFF_COMMIT), | |
153 | t->tag, | |
154 | diff_get_color(rev.diffopt.color_diff, | |
155 | DIFF_RESET)); | |
156 | ret = show_object(o->sha1, 1); | |
157 | objects[i].item = (struct object *)t->tagged; | |
158 | i--; | |
159 | break; | |
160 | } | |
161 | case OBJ_TREE: | |
162 | printf("%stree %s%s\n\n", | |
163 | diff_get_color(rev.diffopt.color_diff, | |
164 | DIFF_COMMIT), | |
165 | name, | |
166 | diff_get_color(rev.diffopt.color_diff, | |
167 | DIFF_RESET)); | |
168 | read_tree_recursive((struct tree *)o, "", 0, 0, NULL, | |
169 | show_tree_object); | |
170 | break; | |
171 | case OBJ_COMMIT: | |
172 | rev.pending.nr = rev.pending.alloc = 0; | |
173 | rev.pending.objects = NULL; | |
174 | add_object_array(o, name, &rev.pending); | |
175 | ret = cmd_log_walk(&rev); | |
176 | break; | |
177 | default: | |
178 | ret = error("Unknown type: %d", o->type); | |
179 | } | |
180 | } | |
181 | free(objects); | |
182 | return ret; | |
70827b15 LT |
183 | } |
184 | ||
cf39f54e LT |
185 | /* |
186 | * This is equivalent to "git log -g --abbrev-commit --pretty=oneline" | |
187 | */ | |
188 | int cmd_log_reflog(int argc, const char **argv, const char *prefix) | |
189 | { | |
190 | struct rev_info rev; | |
191 | ||
192 | git_config(git_log_config); | |
193 | init_revisions(&rev, prefix); | |
194 | init_reflog_walk(&rev.reflog_info); | |
195 | rev.abbrev_commit = 1; | |
196 | rev.verbose_header = 1; | |
197 | cmd_log_init(argc, argv, prefix, &rev); | |
198 | ||
199 | /* | |
200 | * This means that we override whatever commit format the user gave | |
201 | * on the cmd line. Sad, but cmd_log_init() currently doesn't | |
202 | * allow us to set a different default. | |
203 | */ | |
204 | rev.commit_format = CMIT_FMT_ONELINE; | |
205 | rev.always_show_header = 1; | |
206 | ||
207 | /* | |
208 | * We get called through "git reflog", so unlike the other log | |
209 | * routines, we need to set up our pager manually.. | |
210 | */ | |
211 | setup_pager(); | |
212 | ||
213 | return cmd_log_walk(&rev); | |
214 | } | |
215 | ||
a633fca0 | 216 | int cmd_log(int argc, const char **argv, const char *prefix) |
70827b15 LT |
217 | { |
218 | struct rev_info rev; | |
219 | ||
0f03ca94 | 220 | git_config(git_log_config); |
db6296a5 | 221 | init_revisions(&rev, prefix); |
70827b15 | 222 | rev.always_show_header = 1; |
a633fca0 | 223 | cmd_log_init(argc, argv, prefix, &rev); |
9dafea26 | 224 | return cmd_log_walk(&rev); |
70827b15 | 225 | } |
91efcf60 | 226 | |
c06d2daa RR |
227 | /* format-patch */ |
228 | #define FORMAT_PATCH_NAME_MAX 64 | |
229 | ||
0377db77 JS |
230 | static int istitlechar(char c) |
231 | { | |
232 | return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || | |
233 | (c >= '0' && c <= '9') || c == '.' || c == '_'; | |
234 | } | |
235 | ||
20ff0680 JS |
236 | static char *extra_headers = NULL; |
237 | static int extra_headers_size = 0; | |
917a8f89 | 238 | static const char *fmt_patch_suffix = ".patch"; |
20ff0680 JS |
239 | |
240 | static int git_format_config(const char *var, const char *value) | |
241 | { | |
242 | if (!strcmp(var, "format.headers")) { | |
d7fb91c6 JH |
243 | int len; |
244 | ||
245 | if (!value) | |
246 | die("format.headers without value"); | |
247 | len = strlen(value); | |
20ff0680 | 248 | extra_headers_size += len + 1; |
83572c1a | 249 | extra_headers = xrealloc(extra_headers, extra_headers_size); |
20ff0680 JS |
250 | extra_headers[extra_headers_size - len - 1] = 0; |
251 | strcat(extra_headers, value); | |
252 | return 0; | |
253 | } | |
03eeaeae JH |
254 | if (!strcmp(var, "format.suffix")) { |
255 | if (!value) | |
256 | die("format.suffix without value"); | |
257 | fmt_patch_suffix = xstrdup(value); | |
258 | return 0; | |
259 | } | |
a159ca0c | 260 | if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) { |
f3aafa4d RA |
261 | return 0; |
262 | } | |
0f03ca94 | 263 | return git_log_config(var, value); |
20ff0680 JS |
264 | } |
265 | ||
266 | ||
81f3a188 | 267 | static FILE *realstdout = NULL; |
efd02016 | 268 | static const char *output_directory = NULL; |
81f3a188 | 269 | |
c06d2daa | 270 | static int reopen_stdout(struct commit *commit, int nr, int keep_subject) |
0377db77 | 271 | { |
c06d2daa | 272 | char filename[PATH_MAX]; |
0377db77 | 273 | char *sol; |
2448482b | 274 | int len = 0; |
c06d2daa | 275 | int suffix_len = strlen(fmt_patch_suffix) + 1; |
0377db77 | 276 | |
2448482b | 277 | if (output_directory) { |
c06d2daa RR |
278 | if (strlen(output_directory) >= |
279 | sizeof(filename) - FORMAT_PATCH_NAME_MAX - suffix_len) | |
280 | return error("name of output directory is too long"); | |
281 | strlcpy(filename, output_directory, sizeof(filename) - suffix_len); | |
2448482b JS |
282 | len = strlen(filename); |
283 | if (filename[len - 1] != '/') | |
284 | filename[len++] = '/'; | |
285 | } | |
0377db77 | 286 | |
2448482b | 287 | sprintf(filename + len, "%04d", nr); |
0377db77 JS |
288 | len = strlen(filename); |
289 | ||
290 | sol = strstr(commit->buffer, "\n\n"); | |
291 | if (sol) { | |
292 | int j, space = 1; | |
293 | ||
294 | sol += 2; | |
295 | /* strip [PATCH] or [PATCH blabla] */ | |
cc44c765 | 296 | if (!keep_subject && !prefixcmp(sol, "[PATCH")) { |
0377db77 JS |
297 | char *eos = strchr(sol + 6, ']'); |
298 | if (eos) { | |
299 | while (isspace(*eos)) | |
300 | eos++; | |
301 | sol = eos; | |
302 | } | |
303 | } | |
304 | ||
03eeaeae | 305 | for (j = 0; |
c06d2daa RR |
306 | j < FORMAT_PATCH_NAME_MAX - suffix_len - 5 && |
307 | len < sizeof(filename) - suffix_len && | |
03eeaeae JH |
308 | sol[j] && sol[j] != '\n'; |
309 | j++) { | |
0377db77 JS |
310 | if (istitlechar(sol[j])) { |
311 | if (space) { | |
312 | filename[len++] = '-'; | |
313 | space = 0; | |
314 | } | |
315 | filename[len++] = sol[j]; | |
316 | if (sol[j] == '.') | |
317 | while (sol[j + 1] == '.') | |
318 | j++; | |
319 | } else | |
320 | space = 1; | |
321 | } | |
322 | while (filename[len - 1] == '.' || filename[len - 1] == '-') | |
323 | len--; | |
c06d2daa | 324 | filename[len] = 0; |
0377db77 | 325 | } |
c06d2daa RR |
326 | if (len + suffix_len >= sizeof(filename)) |
327 | return error("Patch pathname too long"); | |
03eeaeae | 328 | strcpy(filename + len, fmt_patch_suffix); |
81f3a188 | 329 | fprintf(realstdout, "%s\n", filename); |
c06d2daa RR |
330 | if (freopen(filename, "w", stdout) == NULL) |
331 | return error("Cannot open patch file %s",filename); | |
332 | return 0; | |
333 | ||
0377db77 JS |
334 | } |
335 | ||
9c6efa36 JS |
336 | static int get_patch_id(struct commit *commit, struct diff_options *options, |
337 | unsigned char *sha1) | |
338 | { | |
2b60356d RS |
339 | if (commit->parents) |
340 | diff_tree_sha1(commit->parents->item->object.sha1, | |
341 | commit->object.sha1, "", options); | |
342 | else | |
343 | diff_root_tree_sha1(commit->object.sha1, "", options); | |
9c6efa36 JS |
344 | diffcore_std(options); |
345 | return diff_flush_patch_id(options, sha1); | |
346 | } | |
347 | ||
a633fca0 | 348 | static void get_patch_ids(struct rev_info *rev, struct diff_options *options, const char *prefix) |
9c6efa36 JS |
349 | { |
350 | struct rev_info check_rev; | |
351 | struct commit *commit; | |
352 | struct object *o1, *o2; | |
353 | unsigned flags1, flags2; | |
354 | unsigned char sha1[20]; | |
355 | ||
356 | if (rev->pending.nr != 2) | |
357 | die("Need exactly one range."); | |
358 | ||
359 | o1 = rev->pending.objects[0].item; | |
360 | flags1 = o1->flags; | |
361 | o2 = rev->pending.objects[1].item; | |
362 | flags2 = o2->flags; | |
363 | ||
364 | if ((flags1 & UNINTERESTING) == (flags2 & UNINTERESTING)) | |
365 | die("Not a range."); | |
366 | ||
367 | diff_setup(options); | |
368 | options->recursive = 1; | |
369 | if (diff_setup_done(options) < 0) | |
370 | die("diff_setup_done failed"); | |
371 | ||
372 | /* given a range a..b get all patch ids for b..a */ | |
db6296a5 | 373 | init_revisions(&check_rev, prefix); |
9c6efa36 JS |
374 | o1->flags ^= UNINTERESTING; |
375 | o2->flags ^= UNINTERESTING; | |
376 | add_pending_object(&check_rev, o1, "o1"); | |
377 | add_pending_object(&check_rev, o2, "o2"); | |
378 | prepare_revision_walk(&check_rev); | |
379 | ||
380 | while ((commit = get_revision(&check_rev)) != NULL) { | |
381 | /* ignore merges */ | |
382 | if (commit->parents && commit->parents->next) | |
383 | continue; | |
384 | ||
385 | if (!get_patch_id(commit, options, sha1)) | |
386 | created_object(sha1, xcalloc(1, sizeof(struct object))); | |
387 | } | |
388 | ||
389 | /* reset for next revision walk */ | |
81db0941 JS |
390 | clear_commit_marks((struct commit *)o1, |
391 | SEEN | UNINTERESTING | SHOWN | ADDED); | |
392 | clear_commit_marks((struct commit *)o2, | |
393 | SEEN | UNINTERESTING | SHOWN | ADDED); | |
9c6efa36 JS |
394 | o1->flags = flags1; |
395 | o2->flags = flags2; | |
396 | } | |
397 | ||
d1566f78 JT |
398 | static void gen_message_id(char *dest, unsigned int length, char *base) |
399 | { | |
cb280e10 | 400 | const char *committer = git_committer_info(-1); |
d1566f78 JT |
401 | const char *email_start = strrchr(committer, '<'); |
402 | const char *email_end = strrchr(committer, '>'); | |
403 | if(!email_start || !email_end || email_start > email_end - 1) | |
404 | die("Could not extract email from committer identity."); | |
76af0734 JH |
405 | snprintf(dest, length, "%s.%lu.git.%.*s", base, |
406 | (unsigned long) time(NULL), | |
407 | (int)(email_end - email_start - 1), email_start + 1); | |
d1566f78 JT |
408 | } |
409 | ||
a633fca0 | 410 | int cmd_format_patch(int argc, const char **argv, const char *prefix) |
91efcf60 JH |
411 | { |
412 | struct commit *commit; | |
413 | struct commit **list = NULL; | |
414 | struct rev_info rev; | |
2448482b | 415 | int nr = 0, total, i, j; |
0377db77 | 416 | int use_stdout = 0; |
596524b3 | 417 | int numbered = 0; |
fa0f02df | 418 | int start_number = -1; |
8ac80a57 | 419 | int keep_subject = 0; |
9c6efa36 | 420 | int ignore_if_in_upstream = 0; |
cc35de84 | 421 | int thread = 0; |
76af0734 | 422 | const char *in_reply_to = NULL; |
9c6efa36 | 423 | struct diff_options patch_id_opts; |
cf2251b6 | 424 | char *add_signoff = NULL; |
d1566f78 JT |
425 | char message_id[1024]; |
426 | char ref_message_id[1024]; | |
91efcf60 | 427 | |
97beb812 | 428 | git_config(git_format_config); |
db6296a5 | 429 | init_revisions(&rev, prefix); |
91efcf60 JH |
430 | rev.commit_format = CMIT_FMT_EMAIL; |
431 | rev.verbose_header = 1; | |
432 | rev.diff = 1; | |
91efcf60 JH |
433 | rev.combine_merges = 0; |
434 | rev.ignore_merges = 1; | |
27e1b127 JH |
435 | rev.diffopt.msg_sep = ""; |
436 | rev.diffopt.recursive = 1; | |
91efcf60 | 437 | |
20ff0680 JS |
438 | rev.extra_headers = extra_headers; |
439 | ||
2448482b JS |
440 | /* |
441 | * Parse the arguments before setup_revisions(), or something | |
442 | * like "git fmt-patch -o a123 HEAD^.." may fail; a123 is | |
443 | * possibly a valid SHA1. | |
444 | */ | |
445 | for (i = 1, j = 1; i < argc; i++) { | |
446 | if (!strcmp(argv[i], "--stdout")) | |
0377db77 | 447 | use_stdout = 1; |
596524b3 JS |
448 | else if (!strcmp(argv[i], "-n") || |
449 | !strcmp(argv[i], "--numbered")) | |
450 | numbered = 1; | |
cc44c765 | 451 | else if (!prefixcmp(argv[i], "--start-number=")) |
fa0f02df JS |
452 | start_number = strtol(argv[i] + 15, NULL, 10); |
453 | else if (!strcmp(argv[i], "--start-number")) { | |
454 | i++; | |
455 | if (i == argc) | |
456 | die("Need a number for --start-number"); | |
457 | start_number = strtol(argv[i], NULL, 10); | |
cf2251b6 JH |
458 | } |
459 | else if (!strcmp(argv[i], "-k") || | |
8ac80a57 JS |
460 | !strcmp(argv[i], "--keep-subject")) { |
461 | keep_subject = 1; | |
462 | rev.total = -1; | |
cf2251b6 | 463 | } |
efd02016 JH |
464 | else if (!strcmp(argv[i], "--output-directory") || |
465 | !strcmp(argv[i], "-o")) { | |
2448482b | 466 | i++; |
efd02016 JH |
467 | if (argc <= i) |
468 | die("Which directory?"); | |
469 | if (output_directory) | |
470 | die("Two output directories?"); | |
471 | output_directory = argv[i]; | |
698ce6f8 | 472 | } |
cf2251b6 JH |
473 | else if (!strcmp(argv[i], "--signoff") || |
474 | !strcmp(argv[i], "-s")) { | |
6c4cca1c EB |
475 | const char *committer; |
476 | const char *endpos; | |
6c4cca1c EB |
477 | committer = git_committer_info(1); |
478 | endpos = strchr(committer, '>'); | |
cf2251b6 JH |
479 | if (!endpos) |
480 | die("bogos committer info %s\n", committer); | |
481 | add_signoff = xmalloc(endpos - committer + 2); | |
482 | memcpy(add_signoff, committer, endpos - committer + 1); | |
483 | add_signoff[endpos - committer + 1] = 0; | |
484 | } | |
c112f689 | 485 | else if (!strcmp(argv[i], "--attach")) { |
698ce6f8 | 486 | rev.mime_boundary = git_version_string; |
c112f689 JS |
487 | rev.no_inline = 1; |
488 | } | |
489 | else if (!prefixcmp(argv[i], "--attach=")) { | |
490 | rev.mime_boundary = argv[i] + 9; | |
491 | rev.no_inline = 1; | |
492 | } | |
493 | else if (!strcmp(argv[i], "--inline")) { | |
494 | rev.mime_boundary = git_version_string; | |
495 | rev.no_inline = 0; | |
496 | } | |
497 | else if (!prefixcmp(argv[i], "--inline=")) { | |
698ce6f8 | 498 | rev.mime_boundary = argv[i] + 9; |
c112f689 JS |
499 | rev.no_inline = 0; |
500 | } | |
9c6efa36 JS |
501 | else if (!strcmp(argv[i], "--ignore-if-in-upstream")) |
502 | ignore_if_in_upstream = 1; | |
cc35de84 JT |
503 | else if (!strcmp(argv[i], "--thread")) |
504 | thread = 1; | |
cc44c765 | 505 | else if (!prefixcmp(argv[i], "--in-reply-to=")) |
da56645d JT |
506 | in_reply_to = argv[i] + 14; |
507 | else if (!strcmp(argv[i], "--in-reply-to")) { | |
508 | i++; | |
509 | if (i == argc) | |
510 | die("Need a Message-Id for --in-reply-to"); | |
511 | in_reply_to = argv[i]; | |
512 | } | |
cc44c765 | 513 | else if (!prefixcmp(argv[i], "--suffix=")) |
03eeaeae | 514 | fmt_patch_suffix = argv[i] + 9; |
698ce6f8 | 515 | else |
2448482b | 516 | argv[j++] = argv[i]; |
0377db77 | 517 | } |
2448482b JS |
518 | argc = j; |
519 | ||
add5c8a5 | 520 | if (start_number < 0) |
fa0f02df | 521 | start_number = 1; |
63b398a4 | 522 | if (numbered && keep_subject) |
8ac80a57 JS |
523 | die ("-n and -k are mutually exclusive."); |
524 | ||
2448482b JS |
525 | argc = setup_revisions(argc, argv, &rev, "HEAD"); |
526 | if (argc > 1) | |
527 | die ("unrecognized argument: %s", argv[1]); | |
0377db77 | 528 | |
c9b5ef99 | 529 | if (!rev.diffopt.output_format) |
c261e438 | 530 | rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_SUMMARY | DIFF_FORMAT_PATCH; |
c9b5ef99 | 531 | |
e47f306d JH |
532 | if (!rev.diffopt.text) |
533 | rev.diffopt.binary = 1; | |
534 | ||
90f70a91 | 535 | if (!output_directory && !use_stdout) |
77e565d8 ML |
536 | output_directory = prefix; |
537 | ||
efd02016 JH |
538 | if (output_directory) { |
539 | if (use_stdout) | |
540 | die("standard output, or directory, which one?"); | |
541 | if (mkdir(output_directory, 0777) < 0 && errno != EEXIST) | |
542 | die("Could not create directory %s", | |
543 | output_directory); | |
544 | } | |
545 | ||
1f1e895f | 546 | if (rev.pending.nr == 1) { |
7c496280 JH |
547 | if (rev.max_count < 0) { |
548 | rev.pending.objects[0].item->flags |= UNINTERESTING; | |
549 | add_head(&rev); | |
550 | } | |
551 | /* Otherwise, it is "format-patch -22 HEAD", and | |
552 | * get_revision() would return only the specified count. | |
553 | */ | |
e686eb98 JS |
554 | } |
555 | ||
9c6efa36 | 556 | if (ignore_if_in_upstream) |
a633fca0 | 557 | get_patch_ids(&rev, &patch_id_opts, prefix); |
9c6efa36 | 558 | |
81f3a188 JS |
559 | if (!use_stdout) |
560 | realstdout = fdopen(dup(1), "w"); | |
561 | ||
91efcf60 JH |
562 | prepare_revision_walk(&rev); |
563 | while ((commit = get_revision(&rev)) != NULL) { | |
9c6efa36 JS |
564 | unsigned char sha1[20]; |
565 | ||
0377db77 JS |
566 | /* ignore merges */ |
567 | if (commit->parents && commit->parents->next) | |
568 | continue; | |
9c6efa36 JS |
569 | |
570 | if (ignore_if_in_upstream && | |
571 | !get_patch_id(commit, &patch_id_opts, sha1) && | |
572 | lookup_object(sha1)) | |
573 | continue; | |
574 | ||
91efcf60 | 575 | nr++; |
83572c1a | 576 | list = xrealloc(list, nr * sizeof(list[0])); |
91efcf60 JH |
577 | list[nr - 1] = commit; |
578 | } | |
0377db77 | 579 | total = nr; |
596524b3 | 580 | if (numbered) |
fa0f02df | 581 | rev.total = total + start_number - 1; |
cf2251b6 | 582 | rev.add_signoff = add_signoff; |
da56645d | 583 | rev.ref_message_id = in_reply_to; |
91efcf60 JH |
584 | while (0 <= --nr) { |
585 | int shown; | |
586 | commit = list[nr]; | |
add5c8a5 | 587 | rev.nr = total - nr + (start_number - 1); |
d1566f78 | 588 | /* Make the second and subsequent mails replies to the first */ |
cc35de84 JT |
589 | if (thread) { |
590 | if (nr == (total - 2)) { | |
591 | strncpy(ref_message_id, message_id, | |
592 | sizeof(ref_message_id)); | |
593 | ref_message_id[sizeof(ref_message_id)-1]='\0'; | |
594 | rev.ref_message_id = ref_message_id; | |
595 | } | |
596 | gen_message_id(message_id, sizeof(message_id), | |
597 | sha1_to_hex(commit->object.sha1)); | |
598 | rev.message_id = message_id; | |
d1566f78 | 599 | } |
0377db77 | 600 | if (!use_stdout) |
c06d2daa RR |
601 | if (reopen_stdout(commit, rev.nr, keep_subject)) |
602 | die("Failed to create output files"); | |
91efcf60 JH |
603 | shown = log_tree_commit(&rev, commit); |
604 | free(commit->buffer); | |
605 | commit->buffer = NULL; | |
add5c8a5 JH |
606 | |
607 | /* We put one extra blank line between formatted | |
608 | * patches and this flag is used by log-tree code | |
609 | * to see if it needs to emit a LF before showing | |
610 | * the log; when using one file per patch, we do | |
611 | * not want the extra blank line. | |
612 | */ | |
613 | if (!use_stdout) | |
614 | rev.shown_one = 0; | |
698ce6f8 JS |
615 | if (shown) { |
616 | if (rev.mime_boundary) | |
617 | printf("\n--%s%s--\n\n\n", | |
618 | mime_boundary_leader, | |
619 | rev.mime_boundary); | |
620 | else | |
621 | printf("-- \n%s\n\n", git_version_string); | |
622 | } | |
0377db77 JS |
623 | if (!use_stdout) |
624 | fclose(stdout); | |
91efcf60 JH |
625 | } |
626 | free(list); | |
627 | return 0; | |
628 | } | |
629 | ||
e827633a RS |
630 | static int add_pending_commit(const char *arg, struct rev_info *revs, int flags) |
631 | { | |
632 | unsigned char sha1[20]; | |
633 | if (get_sha1(arg, sha1) == 0) { | |
634 | struct commit *commit = lookup_commit_reference(sha1); | |
635 | if (commit) { | |
636 | commit->object.flags |= flags; | |
637 | add_pending_object(revs, &commit->object, arg); | |
638 | return 0; | |
639 | } | |
640 | } | |
641 | return -1; | |
642 | } | |
643 | ||
644 | static const char cherry_usage[] = | |
645 | "git-cherry [-v] <upstream> [<head>] [<limit>]"; | |
646 | int cmd_cherry(int argc, const char **argv, const char *prefix) | |
647 | { | |
648 | struct rev_info revs; | |
649 | struct diff_options patch_id_opts; | |
650 | struct commit *commit; | |
651 | struct commit_list *list = NULL; | |
652 | const char *upstream; | |
653 | const char *head = "HEAD"; | |
654 | const char *limit = NULL; | |
655 | int verbose = 0; | |
656 | ||
657 | if (argc > 1 && !strcmp(argv[1], "-v")) { | |
658 | verbose = 1; | |
659 | argc--; | |
660 | argv++; | |
661 | } | |
662 | ||
663 | switch (argc) { | |
664 | case 4: | |
665 | limit = argv[3]; | |
666 | /* FALLTHROUGH */ | |
667 | case 3: | |
668 | head = argv[2]; | |
669 | /* FALLTHROUGH */ | |
670 | case 2: | |
671 | upstream = argv[1]; | |
672 | break; | |
673 | default: | |
674 | usage(cherry_usage); | |
675 | } | |
676 | ||
677 | init_revisions(&revs, prefix); | |
678 | revs.diff = 1; | |
679 | revs.combine_merges = 0; | |
680 | revs.ignore_merges = 1; | |
681 | revs.diffopt.recursive = 1; | |
682 | ||
683 | if (add_pending_commit(head, &revs, 0)) | |
684 | die("Unknown commit %s", head); | |
685 | if (add_pending_commit(upstream, &revs, UNINTERESTING)) | |
686 | die("Unknown commit %s", upstream); | |
687 | ||
688 | /* Don't say anything if head and upstream are the same. */ | |
689 | if (revs.pending.nr == 2) { | |
690 | struct object_array_entry *o = revs.pending.objects; | |
691 | if (hashcmp(o[0].item->sha1, o[1].item->sha1) == 0) | |
692 | return 0; | |
693 | } | |
694 | ||
695 | get_patch_ids(&revs, &patch_id_opts, prefix); | |
696 | ||
697 | if (limit && add_pending_commit(limit, &revs, UNINTERESTING)) | |
698 | die("Unknown commit %s", limit); | |
699 | ||
700 | /* reverse the list of commits */ | |
701 | prepare_revision_walk(&revs); | |
702 | while ((commit = get_revision(&revs)) != NULL) { | |
703 | /* ignore merges */ | |
704 | if (commit->parents && commit->parents->next) | |
705 | continue; | |
706 | ||
707 | commit_list_insert(commit, &list); | |
708 | } | |
709 | ||
710 | while (list) { | |
711 | unsigned char sha1[20]; | |
712 | char sign = '+'; | |
713 | ||
714 | commit = list->item; | |
715 | if (!get_patch_id(commit, &patch_id_opts, sha1) && | |
716 | lookup_object(sha1)) | |
717 | sign = '-'; | |
718 | ||
719 | if (verbose) { | |
720 | static char buf[16384]; | |
721 | pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0, | |
722 | buf, sizeof(buf), 0, NULL, NULL, 0); | |
723 | printf("%c %s %s\n", sign, | |
724 | sha1_to_hex(commit->object.sha1), buf); | |
725 | } | |
726 | else { | |
727 | printf("%c %s\n", sign, | |
728 | sha1_to_hex(commit->object.sha1)); | |
729 | } | |
730 | ||
731 | list = list->next; | |
732 | } | |
733 | ||
734 | return 0; | |
735 | } |