Merge branch 'maint'
[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"
76af0734
JH
13#include <time.h>
14#include <sys/time.h>
70827b15 15
e686eb98
JS
16/* this is in builtin-diff.c */
17void add_head(struct rev_info *revs);
18
a633fca0 19static void cmd_log_init(int argc, const char **argv, const char *prefix,
70827b15
LT
20 struct rev_info *rev)
21{
70827b15
LT
22 rev->abbrev = DEFAULT_ABBREV;
23 rev->commit_format = CMIT_FMT_DEFAULT;
24 rev->verbose_header = 1;
25 argc = setup_revisions(argc, argv, rev, "HEAD");
9dafea26
TH
26 if (rev->diffopt.pickaxe || rev->diffopt.filter)
27 rev->always_show_header = 0;
70827b15
LT
28 if (argc > 1)
29 die("unrecognized argument: %s", argv[1]);
9dafea26
TH
30}
31
32static int cmd_log_walk(struct rev_info *rev)
33{
34 struct commit *commit;
70827b15
LT
35
36 prepare_revision_walk(rev);
70827b15
LT
37 while ((commit = get_revision(rev)) != NULL) {
38 log_tree_commit(rev, commit);
39 free(commit->buffer);
40 commit->buffer = NULL;
cb115748
LT
41 free_commit_list(commit->parents);
42 commit->parents = NULL;
70827b15
LT
43 }
44 return 0;
45}
46
a633fca0 47int cmd_whatchanged(int argc, const char **argv, const char *prefix)
70827b15
LT
48{
49 struct rev_info rev;
50
ef1d9c5a 51 git_config(git_diff_ui_config);
db6296a5 52 init_revisions(&rev, prefix);
70827b15
LT
53 rev.diff = 1;
54 rev.diffopt.recursive = 1;
9202434c 55 rev.simplify_history = 0;
a633fca0 56 cmd_log_init(argc, argv, prefix, &rev);
9dafea26
TH
57 if (!rev.diffopt.output_format)
58 rev.diffopt.output_format = DIFF_FORMAT_RAW;
59 return cmd_log_walk(&rev);
70827b15
LT
60}
61
a633fca0 62int cmd_show(int argc, const char **argv, const char *prefix)
70827b15
LT
63{
64 struct rev_info rev;
65
ef1d9c5a 66 git_config(git_diff_ui_config);
db6296a5 67 init_revisions(&rev, prefix);
70827b15
LT
68 rev.diff = 1;
69 rev.diffopt.recursive = 1;
70 rev.combine_merges = 1;
71 rev.dense_combined_merges = 1;
72 rev.always_show_header = 1;
73 rev.ignore_merges = 0;
74 rev.no_walk = 1;
a633fca0 75 cmd_log_init(argc, argv, prefix, &rev);
9dafea26 76 return cmd_log_walk(&rev);
70827b15
LT
77}
78
a633fca0 79int cmd_log(int argc, const char **argv, const char *prefix)
70827b15
LT
80{
81 struct rev_info rev;
82
ef1d9c5a 83 git_config(git_diff_ui_config);
db6296a5 84 init_revisions(&rev, prefix);
70827b15 85 rev.always_show_header = 1;
a633fca0 86 cmd_log_init(argc, argv, prefix, &rev);
9dafea26 87 return cmd_log_walk(&rev);
70827b15 88}
91efcf60 89
0377db77
JS
90static int istitlechar(char c)
91{
92 return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
93 (c >= '0' && c <= '9') || c == '.' || c == '_';
94}
95
20ff0680
JS
96static char *extra_headers = NULL;
97static int extra_headers_size = 0;
98
99static int git_format_config(const char *var, const char *value)
100{
101 if (!strcmp(var, "format.headers")) {
102 int len = strlen(value);
103 extra_headers_size += len + 1;
83572c1a 104 extra_headers = xrealloc(extra_headers, extra_headers_size);
20ff0680
JS
105 extra_headers[extra_headers_size - len - 1] = 0;
106 strcat(extra_headers, value);
107 return 0;
108 }
f3aafa4d
RA
109 if (!strcmp(var, "diff.color")) {
110 return 0;
111 }
83ad63cf 112 return git_diff_ui_config(var, value);
20ff0680
JS
113}
114
115
81f3a188 116static FILE *realstdout = NULL;
efd02016 117static const char *output_directory = NULL;
81f3a188 118
8ac80a57 119static void reopen_stdout(struct commit *commit, int nr, int keep_subject)
0377db77
JS
120{
121 char filename[1024];
122 char *sol;
2448482b 123 int len = 0;
0377db77 124
2448482b 125 if (output_directory) {
817151e6 126 strlcpy(filename, output_directory, 1010);
2448482b
JS
127 len = strlen(filename);
128 if (filename[len - 1] != '/')
129 filename[len++] = '/';
130 }
0377db77 131
2448482b 132 sprintf(filename + len, "%04d", nr);
0377db77
JS
133 len = strlen(filename);
134
135 sol = strstr(commit->buffer, "\n\n");
136 if (sol) {
137 int j, space = 1;
138
139 sol += 2;
140 /* strip [PATCH] or [PATCH blabla] */
8ac80a57 141 if (!keep_subject && !strncmp(sol, "[PATCH", 6)) {
0377db77
JS
142 char *eos = strchr(sol + 6, ']');
143 if (eos) {
144 while (isspace(*eos))
145 eos++;
146 sol = eos;
147 }
148 }
149
150 for (j = 0; len < 1024 - 6 && sol[j] && sol[j] != '\n'; j++) {
151 if (istitlechar(sol[j])) {
152 if (space) {
153 filename[len++] = '-';
154 space = 0;
155 }
156 filename[len++] = sol[j];
157 if (sol[j] == '.')
158 while (sol[j + 1] == '.')
159 j++;
160 } else
161 space = 1;
162 }
163 while (filename[len - 1] == '.' || filename[len - 1] == '-')
164 len--;
165 }
166 strcpy(filename + len, ".txt");
81f3a188 167 fprintf(realstdout, "%s\n", filename);
0377db77
JS
168 freopen(filename, "w", stdout);
169}
170
9c6efa36
JS
171static int get_patch_id(struct commit *commit, struct diff_options *options,
172 unsigned char *sha1)
173{
174 diff_tree_sha1(commit->parents->item->object.sha1, commit->object.sha1,
175 "", options);
176 diffcore_std(options);
177 return diff_flush_patch_id(options, sha1);
178}
179
a633fca0 180static void get_patch_ids(struct rev_info *rev, struct diff_options *options, const char *prefix)
9c6efa36
JS
181{
182 struct rev_info check_rev;
183 struct commit *commit;
184 struct object *o1, *o2;
185 unsigned flags1, flags2;
186 unsigned char sha1[20];
187
188 if (rev->pending.nr != 2)
189 die("Need exactly one range.");
190
191 o1 = rev->pending.objects[0].item;
192 flags1 = o1->flags;
193 o2 = rev->pending.objects[1].item;
194 flags2 = o2->flags;
195
196 if ((flags1 & UNINTERESTING) == (flags2 & UNINTERESTING))
197 die("Not a range.");
198
199 diff_setup(options);
200 options->recursive = 1;
201 if (diff_setup_done(options) < 0)
202 die("diff_setup_done failed");
203
204 /* given a range a..b get all patch ids for b..a */
db6296a5 205 init_revisions(&check_rev, prefix);
9c6efa36
JS
206 o1->flags ^= UNINTERESTING;
207 o2->flags ^= UNINTERESTING;
208 add_pending_object(&check_rev, o1, "o1");
209 add_pending_object(&check_rev, o2, "o2");
210 prepare_revision_walk(&check_rev);
211
212 while ((commit = get_revision(&check_rev)) != NULL) {
213 /* ignore merges */
214 if (commit->parents && commit->parents->next)
215 continue;
216
217 if (!get_patch_id(commit, options, sha1))
218 created_object(sha1, xcalloc(1, sizeof(struct object)));
219 }
220
221 /* reset for next revision walk */
81db0941
JS
222 clear_commit_marks((struct commit *)o1,
223 SEEN | UNINTERESTING | SHOWN | ADDED);
224 clear_commit_marks((struct commit *)o2,
225 SEEN | UNINTERESTING | SHOWN | ADDED);
9c6efa36
JS
226 o1->flags = flags1;
227 o2->flags = flags2;
228}
229
d1566f78
JT
230static void gen_message_id(char *dest, unsigned int length, char *base)
231{
232 const char *committer = git_committer_info(1);
233 const char *email_start = strrchr(committer, '<');
234 const char *email_end = strrchr(committer, '>');
235 if(!email_start || !email_end || email_start > email_end - 1)
236 die("Could not extract email from committer identity.");
76af0734
JH
237 snprintf(dest, length, "%s.%lu.git.%.*s", base,
238 (unsigned long) time(NULL),
239 (int)(email_end - email_start - 1), email_start + 1);
d1566f78
JT
240}
241
a633fca0 242int cmd_format_patch(int argc, const char **argv, const char *prefix)
91efcf60
JH
243{
244 struct commit *commit;
245 struct commit **list = NULL;
246 struct rev_info rev;
2448482b 247 int nr = 0, total, i, j;
0377db77 248 int use_stdout = 0;
596524b3 249 int numbered = 0;
fa0f02df 250 int start_number = -1;
8ac80a57 251 int keep_subject = 0;
9c6efa36 252 int ignore_if_in_upstream = 0;
cc35de84 253 int thread = 0;
76af0734 254 const char *in_reply_to = NULL;
9c6efa36 255 struct diff_options patch_id_opts;
cf2251b6 256 char *add_signoff = NULL;
d1566f78
JT
257 char message_id[1024];
258 char ref_message_id[1024];
91efcf60 259
07efc6a6 260 setup_ident();
97beb812 261 git_config(git_format_config);
db6296a5 262 init_revisions(&rev, prefix);
91efcf60
JH
263 rev.commit_format = CMIT_FMT_EMAIL;
264 rev.verbose_header = 1;
265 rev.diff = 1;
91efcf60
JH
266 rev.combine_merges = 0;
267 rev.ignore_merges = 1;
27e1b127
JH
268 rev.diffopt.msg_sep = "";
269 rev.diffopt.recursive = 1;
91efcf60 270
20ff0680
JS
271 rev.extra_headers = extra_headers;
272
2448482b
JS
273 /*
274 * Parse the arguments before setup_revisions(), or something
275 * like "git fmt-patch -o a123 HEAD^.." may fail; a123 is
276 * possibly a valid SHA1.
277 */
278 for (i = 1, j = 1; i < argc; i++) {
279 if (!strcmp(argv[i], "--stdout"))
0377db77 280 use_stdout = 1;
596524b3
JS
281 else if (!strcmp(argv[i], "-n") ||
282 !strcmp(argv[i], "--numbered"))
283 numbered = 1;
fa0f02df
JS
284 else if (!strncmp(argv[i], "--start-number=", 15))
285 start_number = strtol(argv[i] + 15, NULL, 10);
286 else if (!strcmp(argv[i], "--start-number")) {
287 i++;
288 if (i == argc)
289 die("Need a number for --start-number");
290 start_number = strtol(argv[i], NULL, 10);
cf2251b6
JH
291 }
292 else if (!strcmp(argv[i], "-k") ||
8ac80a57
JS
293 !strcmp(argv[i], "--keep-subject")) {
294 keep_subject = 1;
295 rev.total = -1;
cf2251b6 296 }
efd02016
JH
297 else if (!strcmp(argv[i], "--output-directory") ||
298 !strcmp(argv[i], "-o")) {
2448482b 299 i++;
efd02016
JH
300 if (argc <= i)
301 die("Which directory?");
302 if (output_directory)
303 die("Two output directories?");
304 output_directory = argv[i];
698ce6f8 305 }
cf2251b6
JH
306 else if (!strcmp(argv[i], "--signoff") ||
307 !strcmp(argv[i], "-s")) {
6c4cca1c
EB
308 const char *committer;
309 const char *endpos;
6c4cca1c
EB
310 committer = git_committer_info(1);
311 endpos = strchr(committer, '>');
cf2251b6
JH
312 if (!endpos)
313 die("bogos committer info %s\n", committer);
314 add_signoff = xmalloc(endpos - committer + 2);
315 memcpy(add_signoff, committer, endpos - committer + 1);
316 add_signoff[endpos - committer + 1] = 0;
317 }
698ce6f8
JS
318 else if (!strcmp(argv[i], "--attach"))
319 rev.mime_boundary = git_version_string;
320 else if (!strncmp(argv[i], "--attach=", 9))
321 rev.mime_boundary = argv[i] + 9;
9c6efa36
JS
322 else if (!strcmp(argv[i], "--ignore-if-in-upstream"))
323 ignore_if_in_upstream = 1;
cc35de84
JT
324 else if (!strcmp(argv[i], "--thread"))
325 thread = 1;
da56645d
JT
326 else if (!strncmp(argv[i], "--in-reply-to=", 14))
327 in_reply_to = argv[i] + 14;
328 else if (!strcmp(argv[i], "--in-reply-to")) {
329 i++;
330 if (i == argc)
331 die("Need a Message-Id for --in-reply-to");
332 in_reply_to = argv[i];
333 }
698ce6f8 334 else
2448482b 335 argv[j++] = argv[i];
0377db77 336 }
2448482b
JS
337 argc = j;
338
add5c8a5 339 if (start_number < 0)
fa0f02df 340 start_number = 1;
63b398a4 341 if (numbered && keep_subject)
8ac80a57
JS
342 die ("-n and -k are mutually exclusive.");
343
2448482b
JS
344 argc = setup_revisions(argc, argv, &rev, "HEAD");
345 if (argc > 1)
346 die ("unrecognized argument: %s", argv[1]);
0377db77 347
c9b5ef99
TH
348 if (!rev.diffopt.output_format)
349 rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
350
77e565d8
ML
351 if (!output_directory)
352 output_directory = prefix;
353
efd02016
JH
354 if (output_directory) {
355 if (use_stdout)
356 die("standard output, or directory, which one?");
357 if (mkdir(output_directory, 0777) < 0 && errno != EEXIST)
358 die("Could not create directory %s",
359 output_directory);
360 }
361
1f1e895f
LT
362 if (rev.pending.nr == 1) {
363 rev.pending.objects[0].item->flags |= UNINTERESTING;
e686eb98
JS
364 add_head(&rev);
365 }
366
9c6efa36 367 if (ignore_if_in_upstream)
a633fca0 368 get_patch_ids(&rev, &patch_id_opts, prefix);
9c6efa36 369
81f3a188
JS
370 if (!use_stdout)
371 realstdout = fdopen(dup(1), "w");
372
91efcf60
JH
373 prepare_revision_walk(&rev);
374 while ((commit = get_revision(&rev)) != NULL) {
9c6efa36
JS
375 unsigned char sha1[20];
376
0377db77
JS
377 /* ignore merges */
378 if (commit->parents && commit->parents->next)
379 continue;
9c6efa36
JS
380
381 if (ignore_if_in_upstream &&
382 !get_patch_id(commit, &patch_id_opts, sha1) &&
383 lookup_object(sha1))
384 continue;
385
91efcf60 386 nr++;
83572c1a 387 list = xrealloc(list, nr * sizeof(list[0]));
91efcf60
JH
388 list[nr - 1] = commit;
389 }
0377db77 390 total = nr;
596524b3 391 if (numbered)
fa0f02df 392 rev.total = total + start_number - 1;
cf2251b6 393 rev.add_signoff = add_signoff;
da56645d 394 rev.ref_message_id = in_reply_to;
91efcf60
JH
395 while (0 <= --nr) {
396 int shown;
397 commit = list[nr];
add5c8a5 398 rev.nr = total - nr + (start_number - 1);
d1566f78 399 /* Make the second and subsequent mails replies to the first */
cc35de84
JT
400 if (thread) {
401 if (nr == (total - 2)) {
402 strncpy(ref_message_id, message_id,
403 sizeof(ref_message_id));
404 ref_message_id[sizeof(ref_message_id)-1]='\0';
405 rev.ref_message_id = ref_message_id;
406 }
407 gen_message_id(message_id, sizeof(message_id),
408 sha1_to_hex(commit->object.sha1));
409 rev.message_id = message_id;
d1566f78 410 }
0377db77 411 if (!use_stdout)
8ac80a57 412 reopen_stdout(commit, rev.nr, keep_subject);
91efcf60
JH
413 shown = log_tree_commit(&rev, commit);
414 free(commit->buffer);
415 commit->buffer = NULL;
add5c8a5
JH
416
417 /* We put one extra blank line between formatted
418 * patches and this flag is used by log-tree code
419 * to see if it needs to emit a LF before showing
420 * the log; when using one file per patch, we do
421 * not want the extra blank line.
422 */
423 if (!use_stdout)
424 rev.shown_one = 0;
698ce6f8
JS
425 if (shown) {
426 if (rev.mime_boundary)
427 printf("\n--%s%s--\n\n\n",
428 mime_boundary_leader,
429 rev.mime_boundary);
430 else
431 printf("-- \n%s\n\n", git_version_string);
432 }
0377db77
JS
433 if (!use_stdout)
434 fclose(stdout);
91efcf60
JH
435 }
436 free(list);
437 return 0;
438}
439