]> asedeno.scripts.mit.edu Git - git.git/blob - builtin-log.c
Add msg_sep to diff_options
[git.git] / builtin-log.c
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"
12 #include "builtin.h"
13
14 /* this is in builtin-diff.c */
15 void add_head(struct rev_info *revs);
16
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");
26         if (rev->always_show_header) {
27                 if (rev->diffopt.pickaxe || rev->diffopt.filter)
28                         rev->always_show_header = 0;
29         }
30
31         if (argc > 1)
32                 die("unrecognized argument: %s", argv[1]);
33
34         prepare_revision_walk(rev);
35         setup_pager();
36         while ((commit = get_revision(rev)) != NULL) {
37                 log_tree_commit(rev, commit);
38                 free(commit->buffer);
39                 commit->buffer = NULL;
40                 free_commit_list(commit->parents);
41                 commit->parents = NULL;
42         }
43         return 0;
44 }
45
46 int cmd_whatchanged(int argc, const char **argv, char **envp)
47 {
48         struct rev_info rev;
49
50         init_revisions(&rev);
51         rev.diff = 1;
52         rev.diffopt.recursive = 1;
53         rev.simplify_history = 0;
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 }
81
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
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
105 static FILE *realstdout = NULL;
106 static const char *output_directory = NULL;
107
108 static void reopen_stdout(struct commit *commit, int nr, int keep_subject)
109 {
110         char filename[1024];
111         char *sol;
112         int len = 0;
113
114         if (output_directory) {
115                 strlcpy(filename, output_directory, 1010);
116                 len = strlen(filename);
117                 if (filename[len - 1] != '/')
118                         filename[len++] = '/';
119         }
120
121         sprintf(filename + len, "%04d", nr);
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] */
130                 if (!keep_subject && !strncmp(sol, "[PATCH", 6)) {
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");
156         fprintf(realstdout, "%s\n", filename);
157         freopen(filename, "w", stdout);
158 }
159
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;
165         int nr = 0, total, i, j;
166         int use_stdout = 0;
167         int numbered = 0;
168         int start_number = -1;
169         int keep_subject = 0;
170         char *add_signoff = NULL;
171
172         init_revisions(&rev);
173         rev.commit_format = CMIT_FMT_EMAIL;
174         rev.verbose_header = 1;
175         rev.diff = 1;
176         rev.combine_merges = 0;
177         rev.ignore_merges = 1;
178         rev.diffopt.msg_sep = "---\n";
179
180         git_config(git_format_config);
181         rev.extra_headers = extra_headers;
182
183         /*
184          * Parse the arguments before setup_revisions(), or something
185          * like "git fmt-patch -o a123 HEAD^.." may fail; a123 is
186          * possibly a valid SHA1.
187          */
188         for (i = 1, j = 1; i < argc; i++) {
189                 if (!strcmp(argv[i], "--stdout"))
190                         use_stdout = 1;
191                 else if (!strcmp(argv[i], "-n") ||
192                                 !strcmp(argv[i], "--numbered"))
193                         numbered = 1;
194                 else if (!strncmp(argv[i], "--start-number=", 15))
195                         start_number = strtol(argv[i] + 15, NULL, 10);
196                 else if (!strcmp(argv[i], "--start-number")) {
197                         i++;
198                         if (i == argc)
199                                 die("Need a number for --start-number");
200                         start_number = strtol(argv[i], NULL, 10);
201                 }
202                 else if (!strcmp(argv[i], "-k") ||
203                                 !strcmp(argv[i], "--keep-subject")) {
204                         keep_subject = 1;
205                         rev.total = -1;
206                 }
207                 else if (!strcmp(argv[i], "--output-directory") ||
208                          !strcmp(argv[i], "-o")) {
209                         i++;
210                         if (argc <= i)
211                                 die("Which directory?");
212                         if (output_directory)
213                                 die("Two output directories?");
214                         output_directory = argv[i];
215                 }
216                 else if (!strcmp(argv[i], "--signoff") ||
217                          !strcmp(argv[i], "-s")) {
218                         const char *committer;
219                         const char *endpos;
220                         setup_ident();
221                         committer = git_committer_info(1);
222                         endpos = strchr(committer, '>');
223                         if (!endpos)
224                                 die("bogos committer info %s\n", committer);
225                         add_signoff = xmalloc(endpos - committer + 2);
226                         memcpy(add_signoff, committer, endpos - committer + 1);
227                         add_signoff[endpos - committer + 1] = 0;
228                 }
229                 else if (!strcmp(argv[i], "--attach"))
230                         rev.mime_boundary = git_version_string;
231                 else if (!strncmp(argv[i], "--attach=", 9))
232                         rev.mime_boundary = argv[i] + 9;
233                 else
234                         argv[j++] = argv[i];
235         }
236         argc = j;
237
238         if (start_number < 0)
239                 start_number = 1;
240         if (numbered && keep_subject)
241                 die ("-n and -k are mutually exclusive.");
242
243         argc = setup_revisions(argc, argv, &rev, "HEAD");
244         if (argc > 1)
245                 die ("unrecognized argument: %s", argv[1]);
246
247         if (!rev.diffopt.output_format)
248                 rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
249
250         if (output_directory) {
251                 if (use_stdout)
252                         die("standard output, or directory, which one?");
253                 if (mkdir(output_directory, 0777) < 0 && errno != EEXIST)
254                         die("Could not create directory %s",
255                             output_directory);
256         }
257
258         if (rev.pending.nr == 1) {
259                 rev.pending.objects[0].item->flags |= UNINTERESTING;
260                 add_head(&rev);
261         }
262
263         if (!use_stdout)
264                 realstdout = fdopen(dup(1), "w");
265
266         prepare_revision_walk(&rev);
267         while ((commit = get_revision(&rev)) != NULL) {
268                 /* ignore merges */
269                 if (commit->parents && commit->parents->next)
270                         continue;
271                 nr++;
272                 list = realloc(list, nr * sizeof(list[0]));
273                 list[nr - 1] = commit;
274         }
275         total = nr;
276         if (numbered)
277                 rev.total = total + start_number - 1;
278         rev.add_signoff = add_signoff;
279         while (0 <= --nr) {
280                 int shown;
281                 commit = list[nr];
282                 rev.nr = total - nr + (start_number - 1);
283                 if (!use_stdout)
284                         reopen_stdout(commit, rev.nr, keep_subject);
285                 shown = log_tree_commit(&rev, commit);
286                 free(commit->buffer);
287                 commit->buffer = NULL;
288
289                 /* We put one extra blank line between formatted
290                  * patches and this flag is used by log-tree code
291                  * to see if it needs to emit a LF before showing
292                  * the log; when using one file per patch, we do
293                  * not want the extra blank line.
294                  */
295                 if (!use_stdout)
296                         rev.shown_one = 0;
297                 if (shown) {
298                         if (rev.mime_boundary)
299                                 printf("\n--%s%s--\n\n\n",
300                                        mime_boundary_leader,
301                                        rev.mime_boundary);
302                         else
303                                 printf("-- \n%s\n\n", git_version_string);
304                 }
305                 if (!use_stdout)
306                         fclose(stdout);
307         }
308         free(list);
309         return 0;
310 }
311