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