Merge branch 'master' into next
[git.git] / builtin-log.c
blobac4822deaf2549a0a972557c8e35ea5513a901d7
1 /*
2 * Builtin "git log" and related commands (show, whatchanged)
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"
12 #include "builtin.h"
14 /* this is in builtin-diff.c */
15 void add_head(struct rev_info *revs);
17 static int cmd_log_wc(int argc, const char **argv, char **envp,
18 struct rev_info *rev)
20 struct commit *commit;
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");
26 if (rev->always_show_header) {
27 if (rev->diffopt.pickaxe || rev->diffopt.filter) {
28 rev->always_show_header = 0;
29 if (rev->diffopt.output_format == DIFF_FORMAT_RAW)
30 rev->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
34 if (argc > 1)
35 die("unrecognized argument: %s", argv[1]);
37 prepare_revision_walk(rev);
38 setup_pager();
39 while ((commit = get_revision(rev)) != NULL) {
40 log_tree_commit(rev, commit);
41 free(commit->buffer);
42 commit->buffer = NULL;
44 return 0;
47 int cmd_whatchanged(int argc, const char **argv, char **envp)
49 struct rev_info rev;
51 init_revisions(&rev);
52 rev.diff = 1;
53 rev.diffopt.recursive = 1;
54 return cmd_log_wc(argc, argv, envp, &rev);
57 int cmd_show(int argc, const char **argv, char **envp)
59 struct rev_info rev;
61 init_revisions(&rev);
62 rev.diff = 1;
63 rev.diffopt.recursive = 1;
64 rev.combine_merges = 1;
65 rev.dense_combined_merges = 1;
66 rev.always_show_header = 1;
67 rev.ignore_merges = 0;
68 rev.no_walk = 1;
69 return cmd_log_wc(argc, argv, envp, &rev);
72 int cmd_log(int argc, const char **argv, char **envp)
74 struct rev_info rev;
76 init_revisions(&rev);
77 rev.always_show_header = 1;
78 rev.diffopt.recursive = 1;
79 return cmd_log_wc(argc, argv, envp, &rev);
82 static int istitlechar(char c)
84 return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
85 (c >= '0' && c <= '9') || c == '.' || c == '_';
88 static FILE *realstdout = NULL;
89 static char *output_directory = NULL;
91 static void reopen_stdout(struct commit *commit, int nr, int keep_subject)
93 char filename[1024];
94 char *sol;
95 int len = 0;
97 if (output_directory) {
98 strncpy(filename, output_directory, 1010);
99 len = strlen(filename);
100 if (filename[len - 1] != '/')
101 filename[len++] = '/';
104 sprintf(filename + len, "%04d", nr);
105 len = strlen(filename);
107 sol = strstr(commit->buffer, "\n\n");
108 if (sol) {
109 int j, space = 1;
111 sol += 2;
112 /* strip [PATCH] or [PATCH blabla] */
113 if (!keep_subject && !strncmp(sol, "[PATCH", 6)) {
114 char *eos = strchr(sol + 6, ']');
115 if (eos) {
116 while (isspace(*eos))
117 eos++;
118 sol = eos;
122 for (j = 0; len < 1024 - 6 && sol[j] && sol[j] != '\n'; j++) {
123 if (istitlechar(sol[j])) {
124 if (space) {
125 filename[len++] = '-';
126 space = 0;
128 filename[len++] = sol[j];
129 if (sol[j] == '.')
130 while (sol[j + 1] == '.')
131 j++;
132 } else
133 space = 1;
135 while (filename[len - 1] == '.' || filename[len - 1] == '-')
136 len--;
138 strcpy(filename + len, ".txt");
139 fprintf(realstdout, "%s\n", filename);
140 freopen(filename, "w", stdout);
143 int cmd_format_patch(int argc, const char **argv, char **envp)
145 struct commit *commit;
146 struct commit **list = NULL;
147 struct rev_info rev;
148 int nr = 0, total, i, j;
149 int use_stdout = 0;
150 int numbered = 0;
151 int start_number = -1;
152 int keep_subject = 0;
153 char *add_signoff = NULL;
155 init_revisions(&rev);
156 rev.commit_format = CMIT_FMT_EMAIL;
157 rev.verbose_header = 1;
158 rev.diff = 1;
159 rev.diffopt.with_raw = 0;
160 rev.diffopt.with_stat = 1;
161 rev.combine_merges = 0;
162 rev.ignore_merges = 1;
163 rev.diffopt.output_format = DIFF_FORMAT_PATCH;
166 * Parse the arguments before setup_revisions(), or something
167 * like "git fmt-patch -o a123 HEAD^.." may fail; a123 is
168 * possibly a valid SHA1.
170 for (i = 1, j = 1; i < argc; i++) {
171 if (!strcmp(argv[i], "--stdout"))
172 use_stdout = 1;
173 else if (!strcmp(argv[i], "-n") ||
174 !strcmp(argv[i], "--numbered"))
175 numbered = 1;
176 else if (!strncmp(argv[i], "--start-number=", 15))
177 start_number = strtol(argv[i] + 15, NULL, 10);
178 else if (!strcmp(argv[i], "--start-number")) {
179 i++;
180 if (i == argc)
181 die("Need a number for --start-number");
182 start_number = strtol(argv[i], NULL, 10);
184 else if (!strcmp(argv[i], "-k") ||
185 !strcmp(argv[i], "--keep-subject")) {
186 keep_subject = 1;
187 rev.total = -1;
189 else if (!strcmp(argv[i], "-o")) {
190 if (argc < 3)
191 die ("Which directory?");
192 if (mkdir(argv[i + 1], 0777) < 0 && errno != EEXIST)
193 die("Could not create directory %s",
194 argv[i + 1]);
195 output_directory = strdup(argv[i + 1]);
196 i++;
198 else if (!strcmp(argv[i], "--signoff") ||
199 !strcmp(argv[i], "-s")) {
200 const char *committer = git_committer_info(1);
201 const char *endpos = strchr(committer, '>');
202 if (!endpos)
203 die("bogos committer info %s\n", committer);
204 add_signoff = xmalloc(endpos - committer + 2);
205 memcpy(add_signoff, committer, endpos - committer + 1);
206 add_signoff[endpos - committer + 1] = 0;
208 else if (!strcmp(argv[i], "--attach"))
209 rev.mime_boundary = git_version_string;
210 else if (!strncmp(argv[i], "--attach=", 9))
211 rev.mime_boundary = argv[i] + 9;
212 else
213 argv[j++] = argv[i];
215 argc = j;
217 if (start_number < 0)
218 start_number = 1;
219 if (numbered && keep_subject)
220 die ("-n and -k are mutually exclusive.");
222 argc = setup_revisions(argc, argv, &rev, "HEAD");
223 if (argc > 1)
224 die ("unrecognized argument: %s", argv[1]);
226 if (rev.pending_objects && rev.pending_objects->next == NULL) {
227 rev.pending_objects->item->flags |= UNINTERESTING;
228 add_head(&rev);
231 if (!use_stdout)
232 realstdout = fdopen(dup(1), "w");
234 prepare_revision_walk(&rev);
235 while ((commit = get_revision(&rev)) != NULL) {
236 /* ignore merges */
237 if (commit->parents && commit->parents->next)
238 continue;
239 nr++;
240 list = realloc(list, nr * sizeof(list[0]));
241 list[nr - 1] = commit;
243 total = nr;
244 if (numbered)
245 rev.total = total + start_number - 1;
246 rev.add_signoff = add_signoff;
247 while (0 <= --nr) {
248 int shown;
249 commit = list[nr];
250 rev.nr = total - nr + (start_number - 1);
251 if (!use_stdout)
252 reopen_stdout(commit, rev.nr, keep_subject);
253 shown = log_tree_commit(&rev, commit);
254 free(commit->buffer);
255 commit->buffer = NULL;
257 /* We put one extra blank line between formatted
258 * patches and this flag is used by log-tree code
259 * to see if it needs to emit a LF before showing
260 * the log; when using one file per patch, we do
261 * not want the extra blank line.
263 if (!use_stdout)
264 rev.shown_one = 0;
265 if (shown) {
266 if (rev.mime_boundary)
267 printf("\n--%s%s--\n\n\n",
268 mime_boundary_leader,
269 rev.mime_boundary);
270 else
271 printf("-- \n%s\n\n", git_version_string);
273 if (!use_stdout)
274 fclose(stdout);
276 if (output_directory)
277 free(output_directory);
278 free(list);
279 return 0;