]>
Commit | Line | Data |
---|---|---|
70827b15 LT |
1 | /* |
2 | * Builtin "git log" and related commands (show, whatchanged) | |
3 | * | |
4 | * (C) Copyright 2006 Linus Torvalds | |
5 | * 2006 Junio Hamano | |
6 | */ | |
7 | #include "cache.h" | |
8 | #include "commit.h" | |
9 | #include "diff.h" | |
10 | #include "revision.h" | |
11 | #include "log-tree.h" | |
91efcf60 | 12 | #include "builtin.h" |
70827b15 | 13 | |
e686eb98 JS |
14 | /* this is in builtin-diff.c */ |
15 | void add_head(struct rev_info *revs); | |
16 | ||
70827b15 LT |
17 | static int cmd_log_wc(int argc, const char **argv, char **envp, |
18 | struct rev_info *rev) | |
19 | { | |
20 | struct commit *commit; | |
21 | ||
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"); | |
582af688 SE |
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; | |
31 | } | |
32 | } | |
70827b15 LT |
33 | |
34 | if (argc > 1) | |
35 | die("unrecognized argument: %s", argv[1]); | |
36 | ||
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; | |
43 | } | |
44 | return 0; | |
45 | } | |
46 | ||
47 | int cmd_whatchanged(int argc, const char **argv, char **envp) | |
48 | { | |
49 | struct rev_info rev; | |
50 | ||
51 | init_revisions(&rev); | |
52 | rev.diff = 1; | |
53 | rev.diffopt.recursive = 1; | |
54 | return cmd_log_wc(argc, argv, envp, &rev); | |
55 | } | |
56 | ||
57 | int cmd_show(int argc, const char **argv, char **envp) | |
58 | { | |
59 | struct rev_info rev; | |
60 | ||
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); | |
70 | } | |
71 | ||
72 | int cmd_log(int argc, const char **argv, char **envp) | |
73 | { | |
74 | struct rev_info rev; | |
75 | ||
76 | init_revisions(&rev); | |
77 | rev.always_show_header = 1; | |
78 | rev.diffopt.recursive = 1; | |
79 | return cmd_log_wc(argc, argv, envp, &rev); | |
80 | } | |
91efcf60 | 81 | |
0377db77 JS |
82 | static int istitlechar(char c) |
83 | { | |
84 | return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || | |
85 | (c >= '0' && c <= '9') || c == '.' || c == '_'; | |
86 | } | |
87 | ||
20ff0680 JS |
88 | static char *extra_headers = NULL; |
89 | static int extra_headers_size = 0; | |
90 | ||
91 | static int git_format_config(const char *var, const char *value) | |
92 | { | |
93 | if (!strcmp(var, "format.headers")) { | |
94 | int len = strlen(value); | |
95 | extra_headers_size += len + 1; | |
96 | extra_headers = realloc(extra_headers, extra_headers_size); | |
97 | extra_headers[extra_headers_size - len - 1] = 0; | |
98 | strcat(extra_headers, value); | |
99 | return 0; | |
100 | } | |
101 | return git_default_config(var, value); | |
102 | } | |
103 | ||
104 | ||
81f3a188 | 105 | static FILE *realstdout = NULL; |
efd02016 | 106 | static const char *output_directory = NULL; |
81f3a188 | 107 | |
8ac80a57 | 108 | static void reopen_stdout(struct commit *commit, int nr, int keep_subject) |
0377db77 JS |
109 | { |
110 | char filename[1024]; | |
111 | char *sol; | |
2448482b | 112 | int len = 0; |
0377db77 | 113 | |
2448482b JS |
114 | if (output_directory) { |
115 | strncpy(filename, output_directory, 1010); | |
116 | len = strlen(filename); | |
117 | if (filename[len - 1] != '/') | |
118 | filename[len++] = '/'; | |
119 | } | |
0377db77 | 120 | |
2448482b | 121 | sprintf(filename + len, "%04d", nr); |
0377db77 JS |
122 | len = strlen(filename); |
123 | ||
124 | sol = strstr(commit->buffer, "\n\n"); | |
125 | if (sol) { | |
126 | int j, space = 1; | |
127 | ||
128 | sol += 2; | |
129 | /* strip [PATCH] or [PATCH blabla] */ | |
8ac80a57 | 130 | if (!keep_subject && !strncmp(sol, "[PATCH", 6)) { |
0377db77 JS |
131 | char *eos = strchr(sol + 6, ']'); |
132 | if (eos) { | |
133 | while (isspace(*eos)) | |
134 | eos++; | |
135 | sol = eos; | |
136 | } | |
137 | } | |
138 | ||
139 | for (j = 0; len < 1024 - 6 && sol[j] && sol[j] != '\n'; j++) { | |
140 | if (istitlechar(sol[j])) { | |
141 | if (space) { | |
142 | filename[len++] = '-'; | |
143 | space = 0; | |
144 | } | |
145 | filename[len++] = sol[j]; | |
146 | if (sol[j] == '.') | |
147 | while (sol[j + 1] == '.') | |
148 | j++; | |
149 | } else | |
150 | space = 1; | |
151 | } | |
152 | while (filename[len - 1] == '.' || filename[len - 1] == '-') | |
153 | len--; | |
154 | } | |
155 | strcpy(filename + len, ".txt"); | |
81f3a188 | 156 | fprintf(realstdout, "%s\n", filename); |
0377db77 JS |
157 | freopen(filename, "w", stdout); |
158 | } | |
159 | ||
91efcf60 JH |
160 | int cmd_format_patch(int argc, const char **argv, char **envp) |
161 | { | |
162 | struct commit *commit; | |
163 | struct commit **list = NULL; | |
164 | struct rev_info rev; | |
2448482b | 165 | int nr = 0, total, i, j; |
0377db77 | 166 | int use_stdout = 0; |
596524b3 | 167 | int numbered = 0; |
fa0f02df | 168 | int start_number = -1; |
8ac80a57 | 169 | int keep_subject = 0; |
cf2251b6 | 170 | char *add_signoff = NULL; |
91efcf60 JH |
171 | |
172 | init_revisions(&rev); | |
173 | rev.commit_format = CMIT_FMT_EMAIL; | |
174 | rev.verbose_header = 1; | |
175 | rev.diff = 1; | |
176 | rev.diffopt.with_raw = 0; | |
177 | rev.diffopt.with_stat = 1; | |
178 | rev.combine_merges = 0; | |
179 | rev.ignore_merges = 1; | |
180 | rev.diffopt.output_format = DIFF_FORMAT_PATCH; | |
91efcf60 | 181 | |
20ff0680 JS |
182 | git_config(git_format_config); |
183 | rev.extra_headers = extra_headers; | |
184 | ||
2448482b JS |
185 | /* |
186 | * Parse the arguments before setup_revisions(), or something | |
187 | * like "git fmt-patch -o a123 HEAD^.." may fail; a123 is | |
188 | * possibly a valid SHA1. | |
189 | */ | |
190 | for (i = 1, j = 1; i < argc; i++) { | |
191 | if (!strcmp(argv[i], "--stdout")) | |
0377db77 | 192 | use_stdout = 1; |
596524b3 JS |
193 | else if (!strcmp(argv[i], "-n") || |
194 | !strcmp(argv[i], "--numbered")) | |
195 | numbered = 1; | |
fa0f02df JS |
196 | else if (!strncmp(argv[i], "--start-number=", 15)) |
197 | start_number = strtol(argv[i] + 15, NULL, 10); | |
198 | else if (!strcmp(argv[i], "--start-number")) { | |
199 | i++; | |
200 | if (i == argc) | |
201 | die("Need a number for --start-number"); | |
202 | start_number = strtol(argv[i], NULL, 10); | |
cf2251b6 JH |
203 | } |
204 | else if (!strcmp(argv[i], "-k") || | |
8ac80a57 JS |
205 | !strcmp(argv[i], "--keep-subject")) { |
206 | keep_subject = 1; | |
207 | rev.total = -1; | |
cf2251b6 | 208 | } |
efd02016 JH |
209 | else if (!strcmp(argv[i], "--output-directory") || |
210 | !strcmp(argv[i], "-o")) { | |
2448482b | 211 | i++; |
efd02016 JH |
212 | if (argc <= i) |
213 | die("Which directory?"); | |
214 | if (output_directory) | |
215 | die("Two output directories?"); | |
216 | output_directory = argv[i]; | |
698ce6f8 | 217 | } |
cf2251b6 JH |
218 | else if (!strcmp(argv[i], "--signoff") || |
219 | !strcmp(argv[i], "-s")) { | |
220 | const char *committer = git_committer_info(1); | |
221 | const char *endpos = strchr(committer, '>'); | |
222 | if (!endpos) | |
223 | die("bogos committer info %s\n", committer); | |
224 | add_signoff = xmalloc(endpos - committer + 2); | |
225 | memcpy(add_signoff, committer, endpos - committer + 1); | |
226 | add_signoff[endpos - committer + 1] = 0; | |
227 | } | |
698ce6f8 JS |
228 | else if (!strcmp(argv[i], "--attach")) |
229 | rev.mime_boundary = git_version_string; | |
230 | else if (!strncmp(argv[i], "--attach=", 9)) | |
231 | rev.mime_boundary = argv[i] + 9; | |
232 | else | |
2448482b | 233 | argv[j++] = argv[i]; |
0377db77 | 234 | } |
2448482b JS |
235 | argc = j; |
236 | ||
add5c8a5 | 237 | if (start_number < 0) |
fa0f02df | 238 | start_number = 1; |
63b398a4 | 239 | if (numbered && keep_subject) |
8ac80a57 JS |
240 | die ("-n and -k are mutually exclusive."); |
241 | ||
2448482b JS |
242 | argc = setup_revisions(argc, argv, &rev, "HEAD"); |
243 | if (argc > 1) | |
244 | die ("unrecognized argument: %s", argv[1]); | |
0377db77 | 245 | |
efd02016 JH |
246 | if (output_directory) { |
247 | if (use_stdout) | |
248 | die("standard output, or directory, which one?"); | |
249 | if (mkdir(output_directory, 0777) < 0 && errno != EEXIST) | |
250 | die("Could not create directory %s", | |
251 | output_directory); | |
252 | } | |
253 | ||
e686eb98 JS |
254 | if (rev.pending_objects && rev.pending_objects->next == NULL) { |
255 | rev.pending_objects->item->flags |= UNINTERESTING; | |
256 | add_head(&rev); | |
257 | } | |
258 | ||
81f3a188 JS |
259 | if (!use_stdout) |
260 | realstdout = fdopen(dup(1), "w"); | |
261 | ||
91efcf60 JH |
262 | prepare_revision_walk(&rev); |
263 | while ((commit = get_revision(&rev)) != NULL) { | |
0377db77 JS |
264 | /* ignore merges */ |
265 | if (commit->parents && commit->parents->next) | |
266 | continue; | |
91efcf60 JH |
267 | nr++; |
268 | list = realloc(list, nr * sizeof(list[0])); | |
269 | list[nr - 1] = commit; | |
270 | } | |
0377db77 | 271 | total = nr; |
596524b3 | 272 | if (numbered) |
fa0f02df | 273 | rev.total = total + start_number - 1; |
cf2251b6 | 274 | rev.add_signoff = add_signoff; |
91efcf60 JH |
275 | while (0 <= --nr) { |
276 | int shown; | |
277 | commit = list[nr]; | |
add5c8a5 | 278 | rev.nr = total - nr + (start_number - 1); |
0377db77 | 279 | if (!use_stdout) |
8ac80a57 | 280 | reopen_stdout(commit, rev.nr, keep_subject); |
91efcf60 JH |
281 | shown = log_tree_commit(&rev, commit); |
282 | free(commit->buffer); | |
283 | commit->buffer = NULL; | |
add5c8a5 JH |
284 | |
285 | /* We put one extra blank line between formatted | |
286 | * patches and this flag is used by log-tree code | |
287 | * to see if it needs to emit a LF before showing | |
288 | * the log; when using one file per patch, we do | |
289 | * not want the extra blank line. | |
290 | */ | |
291 | if (!use_stdout) | |
292 | rev.shown_one = 0; | |
698ce6f8 JS |
293 | if (shown) { |
294 | if (rev.mime_boundary) | |
295 | printf("\n--%s%s--\n\n\n", | |
296 | mime_boundary_leader, | |
297 | rev.mime_boundary); | |
298 | else | |
299 | printf("-- \n%s\n\n", git_version_string); | |
300 | } | |
0377db77 JS |
301 | if (!use_stdout) |
302 | fclose(stdout); | |
91efcf60 JH |
303 | } |
304 | free(list); | |
305 | return 0; | |
306 | } | |
307 |