Combine To: and Cc: headers
[git/git.git] / builtin-log.c
CommitLineData
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"
5d23e133 15#include "patch-ids.h"
ca135e7a 16#include "refs.h"
a5a27c79 17#include "run-command.h"
70827b15 18
0f03ca94 19static int default_show_root = 1;
d54276f2 20static const char *fmt_patch_subject_prefix = "PATCH";
0f03ca94 21
ca135e7a
LT
22static void add_name_decoration(const char *prefix, const char *name, struct object *obj)
23{
24 int plen = strlen(prefix);
25 int nlen = strlen(name);
26 struct name_decoration *res = xmalloc(sizeof(struct name_decoration) + plen + nlen);
27 memcpy(res->name, prefix, plen);
28 memcpy(res->name + plen, name, nlen + 1);
29 res->next = add_decoration(&name_decoration, obj, res);
30}
31
32static int add_ref_decoration(const char *refname, const unsigned char *sha1, int flags, void *cb_data)
33{
34 struct object *obj = parse_object(sha1);
35 if (!obj)
36 return 0;
37 add_name_decoration("", refname, obj);
38 while (obj->type == OBJ_TAG) {
39 obj = ((struct tag *)obj)->tagged;
40 if (!obj)
41 break;
42 add_name_decoration("tag: ", refname, obj);
43 }
44 return 0;
45}
46
a633fca0 47static void cmd_log_init(int argc, const char **argv, const char *prefix,
70827b15
LT
48 struct rev_info *rev)
49{
52883fbd 50 int i;
ca135e7a 51 int decorate = 0;
52883fbd 52
70827b15
LT
53 rev->abbrev = DEFAULT_ABBREV;
54 rev->commit_format = CMIT_FMT_DEFAULT;
55 rev->verbose_header = 1;
8f67f8ae 56 DIFF_OPT_SET(&rev->diffopt, RECURSIVE);
0f03ca94 57 rev->show_root_diff = default_show_root;
d54276f2 58 rev->subject_prefix = fmt_patch_subject_prefix;
70827b15 59 argc = setup_revisions(argc, argv, rev, "HEAD");
9dafea26
TH
60 if (rev->diffopt.pickaxe || rev->diffopt.filter)
61 rev->always_show_header = 0;
8f67f8ae 62 if (DIFF_OPT_TST(&rev->diffopt, FOLLOW_RENAMES)) {
750f7b66
LT
63 rev->always_show_header = 0;
64 if (rev->diffopt.nr_paths != 1)
65 usage("git logs can only follow renames on one pathname at a time");
66 }
52883fbd
JH
67 for (i = 1; i < argc; i++) {
68 const char *arg = argv[i];
66688334 69 if (!strcmp(arg, "--decorate")) {
ca135e7a
LT
70 if (!decorate)
71 for_each_ref(add_ref_decoration, NULL);
72 decorate = 1;
73 } else
52883fbd
JH
74 die("unrecognized argument: %s", arg);
75 }
9dafea26
TH
76}
77
252a7c02
LT
78/*
79 * This gives a rough estimate for how many commits we
80 * will print out in the list.
81 */
82static int estimate_commit_count(struct rev_info *rev, struct commit_list *list)
83{
84 int n = 0;
85
86 while (list) {
87 struct commit *commit = list->item;
88 unsigned int flags = commit->object.flags;
252a7c02 89 list = list->next;
7dc0fe3b 90 if (!(flags & (TREESAME | UNINTERESTING)))
53b2c823 91 n++;
252a7c02
LT
92 }
93 return n;
94}
95
96static void show_early_header(struct rev_info *rev, const char *stage, int nr)
97{
98 if (rev->shown_one) {
99 rev->shown_one = 0;
100 if (rev->commit_format != CMIT_FMT_ONELINE)
101 putchar(rev->diffopt.line_termination);
102 }
103 printf("Final output: %d %s\n", nr, stage);
104}
105
106struct itimerval early_output_timer;
107
cdcefbc9
LT
108static void log_show_early(struct rev_info *revs, struct commit_list *list)
109{
110 int i = revs->early_output;
252a7c02 111 int show_header = 1;
cdcefbc9
LT
112
113 sort_in_topological_order(&list, revs->lifo);
114 while (list && i) {
115 struct commit *commit = list->item;
252a7c02
LT
116 switch (simplify_commit(revs, commit)) {
117 case commit_show:
118 if (show_header) {
119 int n = estimate_commit_count(revs, list);
120 show_early_header(revs, "incomplete", n);
121 show_header = 0;
122 }
123 log_tree_commit(revs, commit);
124 i--;
125 break;
126 case commit_ignore:
127 break;
128 case commit_error:
129 return;
130 }
cdcefbc9 131 list = list->next;
cdcefbc9 132 }
252a7c02
LT
133
134 /* Did we already get enough commits for the early output? */
135 if (!i)
136 return;
137
138 /*
139 * ..if no, then repeat it twice a second until we
140 * do.
141 *
142 * NOTE! We don't use "it_interval", because if the
143 * reader isn't listening, we want our output to be
144 * throttled by the writing, and not have the timer
145 * trigger every second even if we're blocked on a
146 * reader!
147 */
148 early_output_timer.it_value.tv_sec = 0;
149 early_output_timer.it_value.tv_usec = 500000;
150 setitimer(ITIMER_REAL, &early_output_timer, NULL);
cdcefbc9
LT
151}
152
153static void early_output(int signal)
154{
155 show_early_output = log_show_early;
156}
157
158static void setup_early_output(struct rev_info *rev)
159{
160 struct sigaction sa;
cdcefbc9
LT
161
162 /*
163 * Set up the signal handler, minimally intrusively:
164 * we only set a single volatile integer word (not
165 * using sigatomic_t - trying to avoid unnecessary
166 * system dependencies and headers), and using
167 * SA_RESTART.
168 */
169 memset(&sa, 0, sizeof(sa));
170 sa.sa_handler = early_output;
171 sigemptyset(&sa.sa_mask);
172 sa.sa_flags = SA_RESTART;
173 sigaction(SIGALRM, &sa, NULL);
174
175 /*
176 * If we can get the whole output in less than a
177 * tenth of a second, don't even bother doing the
178 * early-output thing..
179 *
180 * This is a one-time-only trigger.
181 */
252a7c02
LT
182 early_output_timer.it_value.tv_sec = 0;
183 early_output_timer.it_value.tv_usec = 100000;
184 setitimer(ITIMER_REAL, &early_output_timer, NULL);
cdcefbc9
LT
185}
186
187static void finish_early_output(struct rev_info *rev)
188{
252a7c02 189 int n = estimate_commit_count(rev, rev->commits);
cdcefbc9 190 signal(SIGALRM, SIG_IGN);
252a7c02 191 show_early_header(rev, "done", n);
cdcefbc9
LT
192}
193
9dafea26
TH
194static int cmd_log_walk(struct rev_info *rev)
195{
196 struct commit *commit;
70827b15 197
cdcefbc9
LT
198 if (rev->early_output)
199 setup_early_output(rev);
200
70827b15 201 prepare_revision_walk(rev);
cdcefbc9
LT
202
203 if (rev->early_output)
204 finish_early_output(rev);
205
70827b15
LT
206 while ((commit = get_revision(rev)) != NULL) {
207 log_tree_commit(rev, commit);
a6c73064
JS
208 if (!rev->reflog_info) {
209 /* we allow cycles in reflog ancestry */
210 free(commit->buffer);
211 commit->buffer = NULL;
212 }
cb115748
LT
213 free_commit_list(commit->parents);
214 commit->parents = NULL;
70827b15
LT
215 }
216 return 0;
217}
218
0f03ca94
PB
219static int git_log_config(const char *var, const char *value)
220{
d54276f2
AR
221 if (!strcmp(var, "format.subjectprefix")) {
222 if (!value)
995c4527 223 config_error_nonbool(var);
d54276f2
AR
224 fmt_patch_subject_prefix = xstrdup(value);
225 return 0;
226 }
0f03ca94
PB
227 if (!strcmp(var, "log.showroot")) {
228 default_show_root = git_config_bool(var, value);
229 return 0;
230 }
231 return git_diff_ui_config(var, value);
232}
233
a633fca0 234int cmd_whatchanged(int argc, const char **argv, const char *prefix)
70827b15
LT
235{
236 struct rev_info rev;
237
0f03ca94 238 git_config(git_log_config);
db6296a5 239 init_revisions(&rev, prefix);
70827b15 240 rev.diff = 1;
9202434c 241 rev.simplify_history = 0;
a633fca0 242 cmd_log_init(argc, argv, prefix, &rev);
9dafea26
TH
243 if (!rev.diffopt.output_format)
244 rev.diffopt.output_format = DIFF_FORMAT_RAW;
245 return cmd_log_walk(&rev);
70827b15
LT
246}
247
56122ed8
JS
248static void show_tagger(char *buf, int len, struct rev_info *rev)
249{
250 char *email_end, *p;
251 unsigned long date;
252 int tz;
253
254 email_end = memchr(buf, '>', len);
255 if (!email_end)
256 return;
257 p = ++email_end;
258 while (isspace(*p))
259 p++;
260 date = strtoul(p, &p, 10);
261 while (isspace(*p))
262 p++;
263 tz = (int)strtol(p, NULL, 10);
264 printf("Tagger: %.*s\nDate: %s\n", (int)(email_end - buf), buf,
265 show_date(date, tz, rev->date_mode));
266}
267
268static int show_object(const unsigned char *sha1, int show_tag_object,
269 struct rev_info *rev)
5d7eeee2
JS
270{
271 unsigned long size;
21666f1a
NP
272 enum object_type type;
273 char *buf = read_sha1_file(sha1, &type, &size);
5d7eeee2
JS
274 int offset = 0;
275
276 if (!buf)
277 return error("Could not read object %s", sha1_to_hex(sha1));
278
56122ed8
JS
279 if (show_tag_object)
280 while (offset < size && buf[offset] != '\n') {
281 int new_offset = offset + 1;
5d7eeee2
JS
282 while (new_offset < size && buf[new_offset++] != '\n')
283 ; /* do nothing */
56122ed8
JS
284 if (!prefixcmp(buf + offset, "tagger "))
285 show_tagger(buf + offset + 7,
286 new_offset - offset - 7, rev);
5d7eeee2
JS
287 offset = new_offset;
288 }
289
290 if (offset < size)
291 fwrite(buf + offset, size - offset, 1, stdout);
292 free(buf);
293 return 0;
294}
295
296static int show_tree_object(const unsigned char *sha1,
297 const char *base, int baselen,
298 const char *pathname, unsigned mode, int stage)
299{
300 printf("%s%s\n", pathname, S_ISDIR(mode) ? "/" : "");
301 return 0;
302}
303
a633fca0 304int cmd_show(int argc, const char **argv, const char *prefix)
70827b15
LT
305{
306 struct rev_info rev;
5d7eeee2
JS
307 struct object_array_entry *objects;
308 int i, count, ret = 0;
70827b15 309
0f03ca94 310 git_config(git_log_config);
db6296a5 311 init_revisions(&rev, prefix);
70827b15 312 rev.diff = 1;
70827b15
LT
313 rev.combine_merges = 1;
314 rev.dense_combined_merges = 1;
315 rev.always_show_header = 1;
316 rev.ignore_merges = 0;
317 rev.no_walk = 1;
a633fca0 318 cmd_log_init(argc, argv, prefix, &rev);
5d7eeee2
JS
319
320 count = rev.pending.nr;
321 objects = rev.pending.objects;
322 for (i = 0; i < count && !ret; i++) {
323 struct object *o = objects[i].item;
324 const char *name = objects[i].name;
325 switch (o->type) {
326 case OBJ_BLOB:
56122ed8 327 ret = show_object(o->sha1, 0, NULL);
5d7eeee2
JS
328 break;
329 case OBJ_TAG: {
330 struct tag *t = (struct tag *)o;
331
56122ed8 332 printf("%stag %s%s\n",
8f67f8ae 333 diff_get_color_opt(&rev.diffopt, DIFF_COMMIT),
5d7eeee2 334 t->tag,
8f67f8ae 335 diff_get_color_opt(&rev.diffopt, DIFF_RESET));
56122ed8 336 ret = show_object(o->sha1, 1, &rev);
5d7eeee2
JS
337 objects[i].item = (struct object *)t->tagged;
338 i--;
339 break;
340 }
341 case OBJ_TREE:
342 printf("%stree %s%s\n\n",
8f67f8ae 343 diff_get_color_opt(&rev.diffopt, DIFF_COMMIT),
5d7eeee2 344 name,
8f67f8ae 345 diff_get_color_opt(&rev.diffopt, DIFF_RESET));
5d7eeee2
JS
346 read_tree_recursive((struct tree *)o, "", 0, 0, NULL,
347 show_tree_object);
348 break;
349 case OBJ_COMMIT:
350 rev.pending.nr = rev.pending.alloc = 0;
351 rev.pending.objects = NULL;
352 add_object_array(o, name, &rev.pending);
353 ret = cmd_log_walk(&rev);
354 break;
355 default:
356 ret = error("Unknown type: %d", o->type);
357 }
358 }
359 free(objects);
360 return ret;
70827b15
LT
361}
362
cf39f54e
LT
363/*
364 * This is equivalent to "git log -g --abbrev-commit --pretty=oneline"
365 */
366int cmd_log_reflog(int argc, const char **argv, const char *prefix)
367{
368 struct rev_info rev;
369
370 git_config(git_log_config);
371 init_revisions(&rev, prefix);
372 init_reflog_walk(&rev.reflog_info);
373 rev.abbrev_commit = 1;
374 rev.verbose_header = 1;
375 cmd_log_init(argc, argv, prefix, &rev);
376
377 /*
378 * This means that we override whatever commit format the user gave
379 * on the cmd line. Sad, but cmd_log_init() currently doesn't
380 * allow us to set a different default.
381 */
382 rev.commit_format = CMIT_FMT_ONELINE;
383 rev.always_show_header = 1;
384
385 /*
386 * We get called through "git reflog", so unlike the other log
387 * routines, we need to set up our pager manually..
388 */
389 setup_pager();
390
391 return cmd_log_walk(&rev);
392}
393
a633fca0 394int cmd_log(int argc, const char **argv, const char *prefix)
70827b15
LT
395{
396 struct rev_info rev;
397
0f03ca94 398 git_config(git_log_config);
db6296a5 399 init_revisions(&rev, prefix);
70827b15 400 rev.always_show_header = 1;
a633fca0 401 cmd_log_init(argc, argv, prefix, &rev);
9dafea26 402 return cmd_log_walk(&rev);
70827b15 403}
91efcf60 404
c06d2daa
RR
405/* format-patch */
406#define FORMAT_PATCH_NAME_MAX 64
407
0377db77
JS
408static int istitlechar(char c)
409{
410 return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
411 (c >= '0' && c <= '9') || c == '.' || c == '_';
412}
413
917a8f89 414static const char *fmt_patch_suffix = ".patch";
49604a4d
BG
415static int numbered = 0;
416static int auto_number = 0;
20ff0680 417
3ee79d9f
DB
418static char **extra_hdr;
419static int extra_hdr_nr;
420static int extra_hdr_alloc;
421
422static char **extra_to;
423static int extra_to_nr;
424static int extra_to_alloc;
425
426static char **extra_cc;
427static int extra_cc_nr;
428static int extra_cc_alloc;
429
430static void add_header(const char *value)
431{
432 int len = strlen(value);
433 while (value[len - 1] == '\n')
434 len--;
435 if (!strncasecmp(value, "to: ", 4)) {
436 ALLOC_GROW(extra_to, extra_to_nr + 1, extra_to_alloc);
437 extra_to[extra_to_nr++] = xstrndup(value + 4, len - 4);
438 return;
439 }
440 if (!strncasecmp(value, "cc: ", 4)) {
441 ALLOC_GROW(extra_cc, extra_cc_nr + 1, extra_cc_alloc);
442 extra_cc[extra_cc_nr++] = xstrndup(value + 4, len - 4);
443 return;
444 }
445 ALLOC_GROW(extra_hdr, extra_hdr_nr + 1, extra_hdr_alloc);
446 extra_hdr[extra_hdr_nr++] = xstrndup(value, len);
447}
448
20ff0680
JS
449static int git_format_config(const char *var, const char *value)
450{
451 if (!strcmp(var, "format.headers")) {
d7fb91c6
JH
452 if (!value)
453 die("format.headers without value");
3ee79d9f 454 add_header(value);
20ff0680
JS
455 return 0;
456 }
03eeaeae
JH
457 if (!strcmp(var, "format.suffix")) {
458 if (!value)
90f5c186 459 return config_error_nonbool(var);
03eeaeae
JH
460 fmt_patch_suffix = xstrdup(value);
461 return 0;
462 }
a159ca0c 463 if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
f3aafa4d
RA
464 return 0;
465 }
49604a4d 466 if (!strcmp(var, "format.numbered")) {
90f5c186 467 if (value && !strcasecmp(value, "auto")) {
49604a4d
BG
468 auto_number = 1;
469 return 0;
470 }
49604a4d
BG
471 numbered = git_config_bool(var, value);
472 return 0;
473 }
dbd21447 474
0f03ca94 475 return git_log_config(var, value);
20ff0680
JS
476}
477
478
a5a27c79
DB
479static const char *get_oneline_for_filename(struct commit *commit,
480 int keep_subject)
481{
482 static char filename[PATH_MAX];
483 char *sol;
484 int len = 0;
485 int suffix_len = strlen(fmt_patch_suffix) + 1;
486
487 sol = strstr(commit->buffer, "\n\n");
488 if (!sol)
489 filename[0] = '\0';
490 else {
491 int j, space = 0;
492
493 sol += 2;
494 /* strip [PATCH] or [PATCH blabla] */
495 if (!keep_subject && !prefixcmp(sol, "[PATCH")) {
496 char *eos = strchr(sol + 6, ']');
497 if (eos) {
498 while (isspace(*eos))
499 eos++;
500 sol = eos;
501 }
502 }
503
504 for (j = 0;
505 j < FORMAT_PATCH_NAME_MAX - suffix_len - 5 &&
506 len < sizeof(filename) - suffix_len &&
507 sol[j] && sol[j] != '\n';
508 j++) {
509 if (istitlechar(sol[j])) {
510 if (space) {
511 filename[len++] = '-';
512 space = 0;
513 }
514 filename[len++] = sol[j];
515 if (sol[j] == '.')
516 while (sol[j + 1] == '.')
517 j++;
518 } else
519 space = 1;
520 }
521 while (filename[len - 1] == '.'
522 || filename[len - 1] == '-')
523 len--;
524 filename[len] = '\0';
525 }
526 return filename;
527}
528
81f3a188 529static FILE *realstdout = NULL;
efd02016 530static const char *output_directory = NULL;
81f3a188 531
a5a27c79 532static int reopen_stdout(const char *oneline, int nr, int total)
0377db77 533{
c06d2daa 534 char filename[PATH_MAX];
2448482b 535 int len = 0;
c06d2daa 536 int suffix_len = strlen(fmt_patch_suffix) + 1;
0377db77 537
2448482b 538 if (output_directory) {
a5a27c79
DB
539 len = snprintf(filename, sizeof(filename), "%s",
540 output_directory);
541 if (len >=
c06d2daa
RR
542 sizeof(filename) - FORMAT_PATCH_NAME_MAX - suffix_len)
543 return error("name of output directory is too long");
2448482b
JS
544 if (filename[len - 1] != '/')
545 filename[len++] = '/';
546 }
0377db77 547
a5a27c79
DB
548 if (!oneline)
549 len += sprintf(filename + len, "%d", nr);
550 else {
551 len += sprintf(filename + len, "%04d-", nr);
552 len += snprintf(filename + len, sizeof(filename) - len - 1
553 - suffix_len, "%s", oneline);
e6ff0f42 554 strcpy(filename + len, fmt_patch_suffix);
0377db77 555 }
e6ff0f42 556
81f3a188 557 fprintf(realstdout, "%s\n", filename);
c06d2daa
RR
558 if (freopen(filename, "w", stdout) == NULL)
559 return error("Cannot open patch file %s",filename);
c06d2daa 560
e6ff0f42 561 return 0;
0377db77
JS
562}
563
5d23e133 564static void get_patch_ids(struct rev_info *rev, struct patch_ids *ids, const char *prefix)
9c6efa36
JS
565{
566 struct rev_info check_rev;
567 struct commit *commit;
568 struct object *o1, *o2;
569 unsigned flags1, flags2;
9c6efa36
JS
570
571 if (rev->pending.nr != 2)
572 die("Need exactly one range.");
573
574 o1 = rev->pending.objects[0].item;
575 flags1 = o1->flags;
576 o2 = rev->pending.objects[1].item;
577 flags2 = o2->flags;
578
579 if ((flags1 & UNINTERESTING) == (flags2 & UNINTERESTING))
580 die("Not a range.");
581
5d23e133 582 init_patch_ids(ids);
9c6efa36
JS
583
584 /* given a range a..b get all patch ids for b..a */
db6296a5 585 init_revisions(&check_rev, prefix);
9c6efa36
JS
586 o1->flags ^= UNINTERESTING;
587 o2->flags ^= UNINTERESTING;
588 add_pending_object(&check_rev, o1, "o1");
589 add_pending_object(&check_rev, o2, "o2");
590 prepare_revision_walk(&check_rev);
591
592 while ((commit = get_revision(&check_rev)) != NULL) {
593 /* ignore merges */
594 if (commit->parents && commit->parents->next)
595 continue;
596
5d23e133 597 add_commit_patch_id(commit, ids);
9c6efa36
JS
598 }
599
600 /* reset for next revision walk */
81db0941
JS
601 clear_commit_marks((struct commit *)o1,
602 SEEN | UNINTERESTING | SHOWN | ADDED);
603 clear_commit_marks((struct commit *)o2,
604 SEEN | UNINTERESTING | SHOWN | ADDED);
9c6efa36
JS
605 o1->flags = flags1;
606 o2->flags = flags2;
607}
608
e1a37346 609static void gen_message_id(struct rev_info *info, char *base)
d1566f78 610{
774751a8 611 const char *committer = git_committer_info(IDENT_WARN_ON_NO_NAME);
d1566f78
JT
612 const char *email_start = strrchr(committer, '<');
613 const char *email_end = strrchr(committer, '>');
e1a37346
DB
614 struct strbuf buf;
615 if (!email_start || !email_end || email_start > email_end - 1)
d1566f78 616 die("Could not extract email from committer identity.");
e1a37346
DB
617 strbuf_init(&buf, 0);
618 strbuf_addf(&buf, "%s.%lu.git.%.*s", base,
619 (unsigned long) time(NULL),
620 (int)(email_end - email_start - 1), email_start + 1);
621 info->message_id = strbuf_detach(&buf, NULL);
d1566f78
JT
622}
623
a5a27c79
DB
624static void make_cover_letter(struct rev_info *rev,
625 int use_stdout, int numbered, int numbered_files,
626 struct commit *origin, struct commit *head)
627{
628 const char *committer;
629 const char *origin_sha1, *head_sha1;
630 const char *argv[7];
631 const char *subject_start = NULL;
632 const char *body = "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n";
633 const char *msg;
634 const char *extra_headers = rev->extra_headers;
635 struct strbuf sb;
636 const char *encoding = "utf-8";
637
638 if (rev->commit_format != CMIT_FMT_EMAIL)
639 die("Cover letter needs email format");
640
641 if (!use_stdout && reopen_stdout(numbered_files ?
642 NULL : "cover-letter", 0, rev->total))
643 return;
644
645 origin_sha1 = sha1_to_hex(origin ? origin->object.sha1 : null_sha1);
646 head_sha1 = sha1_to_hex(head->object.sha1);
647
648 log_write_email_headers(rev, head_sha1, &subject_start, &extra_headers);
649
650 committer = git_committer_info(0);
651
652 msg = body;
653 strbuf_init(&sb, 0);
654 pp_user_info(NULL, CMIT_FMT_EMAIL, &sb, committer, DATE_RFC2822,
655 encoding);
656 pp_title_line(CMIT_FMT_EMAIL, &msg, &sb, subject_start, extra_headers,
657 encoding, 0);
658 pp_remainder(CMIT_FMT_EMAIL, &msg, &sb, 0);
659 printf("%s\n", sb.buf);
660
661 strbuf_release(&sb);
662
663 /*
664 * We can only do diffstat with a unique reference point, and
665 * log is a bit tricky, so just skip it.
666 */
667 if (!origin)
668 return;
669
670 argv[0] = "shortlog";
671 argv[1] = head_sha1;
672 argv[2] = "--not";
673 argv[3] = origin_sha1;
674 argv[4] = "--";
675 argv[5] = NULL;
676 fflush(stdout);
677 run_command_v_opt(argv, RUN_GIT_CMD);
678
679 argv[0] = "diff";
680 argv[1] = "--stat";
681 argv[2] = "--summary";
682 argv[3] = head_sha1;
683 argv[4] = "--not";
684 argv[5] = origin_sha1;
685 argv[6] = "--";
686 argv[7] = NULL;
687 fflush(stdout);
688 run_command_v_opt(argv, RUN_GIT_CMD);
689
690 fflush(stdout);
691 printf("\n");
692}
693
8419d2ee
JH
694static const char *clean_message_id(const char *msg_id)
695{
696 char ch;
697 const char *a, *z, *m;
8419d2ee
JH
698
699 m = msg_id;
700 while ((ch = *m) && (isspace(ch) || (ch == '<')))
701 m++;
702 a = m;
703 z = NULL;
704 while ((ch = *m)) {
705 if (!isspace(ch) && (ch != '>'))
706 z = m;
707 m++;
708 }
709 if (!z)
710 die("insane in-reply-to: %s", msg_id);
711 if (++z == m)
712 return a;
182af834 713 return xmemdupz(a, z - a);
8419d2ee
JH
714}
715
a633fca0 716int cmd_format_patch(int argc, const char **argv, const char *prefix)
91efcf60
JH
717{
718 struct commit *commit;
719 struct commit **list = NULL;
720 struct rev_info rev;
2448482b 721 int nr = 0, total, i, j;
0377db77 722 int use_stdout = 0;
fa0f02df 723 int start_number = -1;
8ac80a57 724 int keep_subject = 0;
e6ff0f42 725 int numbered_files = 0; /* _just_ numbers */
2d9e4a47 726 int subject_prefix = 0;
9c6efa36 727 int ignore_if_in_upstream = 0;
cc35de84 728 int thread = 0;
a5a27c79
DB
729 int cover_letter = 0;
730 struct commit *origin = NULL, *head = NULL;
76af0734 731 const char *in_reply_to = NULL;
5d23e133 732 struct patch_ids ids;
cf2251b6 733 char *add_signoff = NULL;
3ee79d9f 734 struct strbuf buf;
91efcf60 735
97beb812 736 git_config(git_format_config);
db6296a5 737 init_revisions(&rev, prefix);
91efcf60
JH
738 rev.commit_format = CMIT_FMT_EMAIL;
739 rev.verbose_header = 1;
740 rev.diff = 1;
91efcf60
JH
741 rev.combine_merges = 0;
742 rev.ignore_merges = 1;
27e1b127 743 rev.diffopt.msg_sep = "";
8f67f8ae 744 DIFF_OPT_SET(&rev.diffopt, RECURSIVE);
91efcf60 745
dbd21447 746 rev.subject_prefix = fmt_patch_subject_prefix;
20ff0680 747
2448482b
JS
748 /*
749 * Parse the arguments before setup_revisions(), or something
2dc189a3 750 * like "git format-patch -o a123 HEAD^.." may fail; a123 is
2448482b
JS
751 * possibly a valid SHA1.
752 */
753 for (i = 1, j = 1; i < argc; i++) {
754 if (!strcmp(argv[i], "--stdout"))
0377db77 755 use_stdout = 1;
596524b3
JS
756 else if (!strcmp(argv[i], "-n") ||
757 !strcmp(argv[i], "--numbered"))
758 numbered = 1;
49604a4d
BG
759 else if (!strcmp(argv[i], "-N") ||
760 !strcmp(argv[i], "--no-numbered")) {
761 numbered = 0;
762 auto_number = 0;
763 }
cc44c765 764 else if (!prefixcmp(argv[i], "--start-number="))
fa0f02df 765 start_number = strtol(argv[i] + 15, NULL, 10);
e6ff0f42
JL
766 else if (!strcmp(argv[i], "--numbered-files"))
767 numbered_files = 1;
fa0f02df
JS
768 else if (!strcmp(argv[i], "--start-number")) {
769 i++;
770 if (i == argc)
771 die("Need a number for --start-number");
772 start_number = strtol(argv[i], NULL, 10);
cf2251b6
JH
773 }
774 else if (!strcmp(argv[i], "-k") ||
8ac80a57
JS
775 !strcmp(argv[i], "--keep-subject")) {
776 keep_subject = 1;
777 rev.total = -1;
cf2251b6 778 }
efd02016
JH
779 else if (!strcmp(argv[i], "--output-directory") ||
780 !strcmp(argv[i], "-o")) {
2448482b 781 i++;
efd02016
JH
782 if (argc <= i)
783 die("Which directory?");
784 if (output_directory)
785 die("Two output directories?");
786 output_directory = argv[i];
698ce6f8 787 }
cf2251b6
JH
788 else if (!strcmp(argv[i], "--signoff") ||
789 !strcmp(argv[i], "-s")) {
6c4cca1c
EB
790 const char *committer;
791 const char *endpos;
774751a8 792 committer = git_committer_info(IDENT_ERROR_ON_NO_NAME);
6c4cca1c 793 endpos = strchr(committer, '>');
cf2251b6
JH
794 if (!endpos)
795 die("bogos committer info %s\n", committer);
182af834 796 add_signoff = xmemdupz(committer, endpos - committer + 1);
cf2251b6 797 }
c112f689 798 else if (!strcmp(argv[i], "--attach")) {
698ce6f8 799 rev.mime_boundary = git_version_string;
c112f689
JS
800 rev.no_inline = 1;
801 }
802 else if (!prefixcmp(argv[i], "--attach=")) {
803 rev.mime_boundary = argv[i] + 9;
804 rev.no_inline = 1;
805 }
806 else if (!strcmp(argv[i], "--inline")) {
807 rev.mime_boundary = git_version_string;
808 rev.no_inline = 0;
809 }
810 else if (!prefixcmp(argv[i], "--inline=")) {
698ce6f8 811 rev.mime_boundary = argv[i] + 9;
c112f689
JS
812 rev.no_inline = 0;
813 }
9c6efa36
JS
814 else if (!strcmp(argv[i], "--ignore-if-in-upstream"))
815 ignore_if_in_upstream = 1;
cc35de84
JT
816 else if (!strcmp(argv[i], "--thread"))
817 thread = 1;
cc44c765 818 else if (!prefixcmp(argv[i], "--in-reply-to="))
da56645d
JT
819 in_reply_to = argv[i] + 14;
820 else if (!strcmp(argv[i], "--in-reply-to")) {
821 i++;
822 if (i == argc)
823 die("Need a Message-Id for --in-reply-to");
824 in_reply_to = argv[i];
2d9e4a47
RJ
825 } else if (!prefixcmp(argv[i], "--subject-prefix=")) {
826 subject_prefix = 1;
827 rev.subject_prefix = argv[i] + 17;
828 } else if (!prefixcmp(argv[i], "--suffix="))
03eeaeae 829 fmt_patch_suffix = argv[i] + 9;
a5a27c79
DB
830 else if (!strcmp(argv[i], "--cover-letter"))
831 cover_letter = 1;
698ce6f8 832 else
2448482b 833 argv[j++] = argv[i];
0377db77 834 }
2448482b
JS
835 argc = j;
836
3ee79d9f
DB
837 strbuf_init(&buf, 0);
838
839 for (i = 0; i < extra_hdr_nr; i++) {
840 strbuf_addstr(&buf, extra_hdr[i]);
841 strbuf_addch(&buf, '\n');
842 }
843
844 if (extra_to_nr)
845 strbuf_addstr(&buf, "To: ");
846 for (i = 0; i < extra_to_nr; i++) {
847 if (i)
848 strbuf_addstr(&buf, " ");
849 strbuf_addstr(&buf, extra_to[i]);
850 if (i + 1 < extra_to_nr)
851 strbuf_addch(&buf, ',');
852 strbuf_addch(&buf, '\n');
853 }
854
855 if (extra_cc_nr)
856 strbuf_addstr(&buf, "Cc: ");
857 for (i = 0; i < extra_cc_nr; i++) {
858 if (i)
859 strbuf_addstr(&buf, " ");
860 strbuf_addstr(&buf, extra_cc[i]);
861 if (i + 1 < extra_cc_nr)
862 strbuf_addch(&buf, ',');
863 strbuf_addch(&buf, '\n');
864 }
865
866 rev.extra_headers = strbuf_detach(&buf, 0);
867
add5c8a5 868 if (start_number < 0)
fa0f02df 869 start_number = 1;
63b398a4 870 if (numbered && keep_subject)
8ac80a57 871 die ("-n and -k are mutually exclusive.");
2d9e4a47
RJ
872 if (keep_subject && subject_prefix)
873 die ("--subject-prefix and -k are mutually exclusive.");
e6ff0f42
JL
874 if (numbered_files && use_stdout)
875 die ("--numbered-files and --stdout are mutually exclusive.");
8ac80a57 876
2448482b
JS
877 argc = setup_revisions(argc, argv, &rev, "HEAD");
878 if (argc > 1)
879 die ("unrecognized argument: %s", argv[1]);
0377db77 880
c9b5ef99 881 if (!rev.diffopt.output_format)
c261e438 882 rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_SUMMARY | DIFF_FORMAT_PATCH;
c9b5ef99 883
8f67f8ae
PH
884 if (!DIFF_OPT_TST(&rev.diffopt, TEXT))
885 DIFF_OPT_SET(&rev.diffopt, BINARY);
e47f306d 886
90f70a91 887 if (!output_directory && !use_stdout)
77e565d8
ML
888 output_directory = prefix;
889
efd02016
JH
890 if (output_directory) {
891 if (use_stdout)
892 die("standard output, or directory, which one?");
893 if (mkdir(output_directory, 0777) < 0 && errno != EEXIST)
894 die("Could not create directory %s",
895 output_directory);
896 }
897
1f1e895f 898 if (rev.pending.nr == 1) {
8a1d076e
JH
899 if (rev.max_count < 0 && !rev.show_root_diff) {
900 /*
901 * This is traditional behaviour of "git format-patch
902 * origin" that prepares what the origin side still
903 * does not have.
904 */
7c496280 905 rev.pending.objects[0].item->flags |= UNINTERESTING;
3384a2df 906 add_head_to_pending(&rev);
7c496280 907 }
8a1d076e
JH
908 /*
909 * Otherwise, it is "format-patch -22 HEAD", and/or
910 * "format-patch --root HEAD". The user wants
911 * get_revision() to do the usual traversal.
7c496280 912 */
e686eb98 913 }
a5a27c79
DB
914 if (cover_letter) {
915 /* remember the range */
916 int negative_count = 0;
917 int i;
918 for (i = 0; i < rev.pending.nr; i++) {
919 struct object *o = rev.pending.objects[i].item;
920 if (o->flags & UNINTERESTING) {
921 origin = (struct commit *)o;
922 negative_count++;
923 } else
924 head = (struct commit *)o;
925 }
926 /* Multiple origins don't work for diffstat. */
927 if (negative_count > 1)
928 origin = NULL;
929 /* We can't generate a cover letter without any patches */
930 if (!head)
931 return 0;
932 }
e686eb98 933
9c6efa36 934 if (ignore_if_in_upstream)
5d23e133 935 get_patch_ids(&rev, &ids, prefix);
9c6efa36 936
81f3a188 937 if (!use_stdout)
f5788250 938 realstdout = xfdopen(xdup(1), "w");
81f3a188 939
91efcf60
JH
940 prepare_revision_walk(&rev);
941 while ((commit = get_revision(&rev)) != NULL) {
0377db77
JS
942 /* ignore merges */
943 if (commit->parents && commit->parents->next)
944 continue;
9c6efa36
JS
945
946 if (ignore_if_in_upstream &&
5d23e133 947 has_commit_patch_id(commit, &ids))
9c6efa36
JS
948 continue;
949
91efcf60 950 nr++;
83572c1a 951 list = xrealloc(list, nr * sizeof(list[0]));
91efcf60
JH
952 list[nr - 1] = commit;
953 }
0377db77 954 total = nr;
49604a4d
BG
955 if (!keep_subject && auto_number && total > 1)
956 numbered = 1;
596524b3 957 if (numbered)
fa0f02df 958 rev.total = total + start_number - 1;
8419d2ee
JH
959 if (in_reply_to)
960 rev.ref_message_id = clean_message_id(in_reply_to);
a5a27c79
DB
961 if (cover_letter) {
962 if (thread)
963 gen_message_id(&rev, "cover");
964 make_cover_letter(&rev, use_stdout, numbered, numbered_files,
965 origin, head);
966 total++;
967 start_number--;
968 }
969 rev.add_signoff = add_signoff;
91efcf60
JH
970 while (0 <= --nr) {
971 int shown;
972 commit = list[nr];
add5c8a5 973 rev.nr = total - nr + (start_number - 1);
d1566f78 974 /* Make the second and subsequent mails replies to the first */
cc35de84 975 if (thread) {
a5a27c79 976 /* Have we already had a message ID? */
e1a37346 977 if (rev.message_id) {
a5a27c79
DB
978 /*
979 * If we've got the ID to be a reply
980 * to, discard the current ID;
981 * otherwise, make everything a reply
982 * to that.
983 */
e1a37346
DB
984 if (rev.ref_message_id)
985 free(rev.message_id);
986 else
987 rev.ref_message_id = rev.message_id;
cc35de84 988 }
e1a37346 989 gen_message_id(&rev, sha1_to_hex(commit->object.sha1));
d1566f78 990 }
a5a27c79
DB
991 if (!use_stdout && reopen_stdout(numbered_files ? NULL :
992 get_oneline_for_filename(commit, keep_subject),
993 rev.nr, rev.total))
994 die("Failed to create output files");
91efcf60
JH
995 shown = log_tree_commit(&rev, commit);
996 free(commit->buffer);
997 commit->buffer = NULL;
add5c8a5
JH
998
999 /* We put one extra blank line between formatted
1000 * patches and this flag is used by log-tree code
1001 * to see if it needs to emit a LF before showing
1002 * the log; when using one file per patch, we do
1003 * not want the extra blank line.
1004 */
1005 if (!use_stdout)
1006 rev.shown_one = 0;
698ce6f8
JS
1007 if (shown) {
1008 if (rev.mime_boundary)
1009 printf("\n--%s%s--\n\n\n",
1010 mime_boundary_leader,
1011 rev.mime_boundary);
1012 else
1013 printf("-- \n%s\n\n", git_version_string);
1014 }
0377db77
JS
1015 if (!use_stdout)
1016 fclose(stdout);
91efcf60
JH
1017 }
1018 free(list);
5d23e133
JH
1019 if (ignore_if_in_upstream)
1020 free_patch_ids(&ids);
91efcf60
JH
1021 return 0;
1022}
1023
e827633a
RS
1024static int add_pending_commit(const char *arg, struct rev_info *revs, int flags)
1025{
1026 unsigned char sha1[20];
1027 if (get_sha1(arg, sha1) == 0) {
1028 struct commit *commit = lookup_commit_reference(sha1);
1029 if (commit) {
1030 commit->object.flags |= flags;
1031 add_pending_object(revs, &commit->object, arg);
1032 return 0;
1033 }
1034 }
1035 return -1;
1036}
1037
1038static const char cherry_usage[] =
1039"git-cherry [-v] <upstream> [<head>] [<limit>]";
1040int cmd_cherry(int argc, const char **argv, const char *prefix)
1041{
1042 struct rev_info revs;
5d23e133 1043 struct patch_ids ids;
e827633a
RS
1044 struct commit *commit;
1045 struct commit_list *list = NULL;
1046 const char *upstream;
1047 const char *head = "HEAD";
1048 const char *limit = NULL;
1049 int verbose = 0;
1050
1051 if (argc > 1 && !strcmp(argv[1], "-v")) {
1052 verbose = 1;
1053 argc--;
1054 argv++;
1055 }
1056
1057 switch (argc) {
1058 case 4:
1059 limit = argv[3];
1060 /* FALLTHROUGH */
1061 case 3:
1062 head = argv[2];
1063 /* FALLTHROUGH */
1064 case 2:
1065 upstream = argv[1];
1066 break;
1067 default:
1068 usage(cherry_usage);
1069 }
1070
1071 init_revisions(&revs, prefix);
1072 revs.diff = 1;
1073 revs.combine_merges = 0;
1074 revs.ignore_merges = 1;
8f67f8ae 1075 DIFF_OPT_SET(&revs.diffopt, RECURSIVE);
e827633a
RS
1076
1077 if (add_pending_commit(head, &revs, 0))
1078 die("Unknown commit %s", head);
1079 if (add_pending_commit(upstream, &revs, UNINTERESTING))
1080 die("Unknown commit %s", upstream);
1081
1082 /* Don't say anything if head and upstream are the same. */
1083 if (revs.pending.nr == 2) {
1084 struct object_array_entry *o = revs.pending.objects;
1085 if (hashcmp(o[0].item->sha1, o[1].item->sha1) == 0)
1086 return 0;
1087 }
1088
5d23e133 1089 get_patch_ids(&revs, &ids, prefix);
e827633a
RS
1090
1091 if (limit && add_pending_commit(limit, &revs, UNINTERESTING))
1092 die("Unknown commit %s", limit);
1093
1094 /* reverse the list of commits */
1095 prepare_revision_walk(&revs);
1096 while ((commit = get_revision(&revs)) != NULL) {
1097 /* ignore merges */
1098 if (commit->parents && commit->parents->next)
1099 continue;
1100
1101 commit_list_insert(commit, &list);
1102 }
1103
1104 while (list) {
e827633a
RS
1105 char sign = '+';
1106
1107 commit = list->item;
5d23e133 1108 if (has_commit_patch_id(commit, &ids))
e827633a
RS
1109 sign = '-';
1110
1111 if (verbose) {
674d1727
PH
1112 struct strbuf buf;
1113 strbuf_init(&buf, 0);
1114 pretty_print_commit(CMIT_FMT_ONELINE, commit,
4593fb84 1115 &buf, 0, NULL, NULL, 0, 0);
e827633a 1116 printf("%c %s %s\n", sign,
674d1727
PH
1117 sha1_to_hex(commit->object.sha1), buf.buf);
1118 strbuf_release(&buf);
e827633a
RS
1119 }
1120 else {
1121 printf("%c %s\n", sign,
1122 sha1_to_hex(commit->object.sha1));
1123 }
1124
1125 list = list->next;
1126 }
1127
5d23e133 1128 free_patch_ids(&ids);
e827633a
RS
1129 return 0;
1130}