2 * Builtin "git log" and related commands (show, whatchanged)
4 * (C) Copyright 2006 Linus Torvalds
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
,
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;
32 die("unrecognized argument: %s", argv
[1]);
34 prepare_revision_walk(rev
);
36 while ((commit
= get_revision(rev
)) != NULL
) {
37 log_tree_commit(rev
, commit
);
39 commit
->buffer
= NULL
;
40 free_commit_list(commit
->parents
);
41 commit
->parents
= NULL
;
46 int cmd_whatchanged(int argc
, const char **argv
, char **envp
)
52 rev
.diffopt
.recursive
= 1;
53 rev
.simplify_history
= 0;
54 return cmd_log_wc(argc
, argv
, envp
, &rev
);
57 int cmd_show(int argc
, const char **argv
, char **envp
)
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;
69 return cmd_log_wc(argc
, argv
, envp
, &rev
);
72 int cmd_log(int argc
, const char **argv
, char **envp
)
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 char *extra_headers
= NULL
;
89 static int extra_headers_size
= 0;
91 static int git_format_config(const char *var
, const char *value
)
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
);
101 return git_default_config(var
, value
);
105 static FILE *realstdout
= NULL
;
106 static const char *output_directory
= NULL
;
108 static void reopen_stdout(struct commit
*commit
, int nr
, int keep_subject
)
114 if (output_directory
) {
115 strlcpy(filename
, output_directory
, 1010);
116 len
= strlen(filename
);
117 if (filename
[len
- 1] != '/')
118 filename
[len
++] = '/';
121 sprintf(filename
+ len
, "%04d", nr
);
122 len
= strlen(filename
);
124 sol
= strstr(commit
->buffer
, "\n\n");
129 /* strip [PATCH] or [PATCH blabla] */
130 if (!keep_subject
&& !strncmp(sol
, "[PATCH", 6)) {
131 char *eos
= strchr(sol
+ 6, ']');
133 while (isspace(*eos
))
139 for (j
= 0; len
< 1024 - 6 && sol
[j
] && sol
[j
] != '\n'; j
++) {
140 if (istitlechar(sol
[j
])) {
142 filename
[len
++] = '-';
145 filename
[len
++] = sol
[j
];
147 while (sol
[j
+ 1] == '.')
152 while (filename
[len
- 1] == '.' || filename
[len
- 1] == '-')
155 strcpy(filename
+ len
, ".txt");
156 fprintf(realstdout
, "%s\n", filename
);
157 freopen(filename
, "w", stdout
);
160 int cmd_format_patch(int argc
, const char **argv
, char **envp
)
162 struct commit
*commit
;
163 struct commit
**list
= NULL
;
165 int nr
= 0, total
, i
, j
;
168 int start_number
= -1;
169 int keep_subject
= 0;
170 char *add_signoff
= NULL
;
172 init_revisions(&rev
);
173 rev
.commit_format
= CMIT_FMT_EMAIL
;
174 rev
.verbose_header
= 1;
176 rev
.combine_merges
= 0;
177 rev
.ignore_merges
= 1;
178 rev
.diffopt
.msg_sep
= "---\n";
180 git_config(git_format_config
);
181 rev
.extra_headers
= extra_headers
;
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.
188 for (i
= 1, j
= 1; i
< argc
; i
++) {
189 if (!strcmp(argv
[i
], "--stdout"))
191 else if (!strcmp(argv
[i
], "-n") ||
192 !strcmp(argv
[i
], "--numbered"))
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")) {
199 die("Need a number for --start-number");
200 start_number
= strtol(argv
[i
], NULL
, 10);
202 else if (!strcmp(argv
[i
], "-k") ||
203 !strcmp(argv
[i
], "--keep-subject")) {
207 else if (!strcmp(argv
[i
], "--output-directory") ||
208 !strcmp(argv
[i
], "-o")) {
211 die("Which directory?");
212 if (output_directory
)
213 die("Two output directories?");
214 output_directory
= argv
[i
];
216 else if (!strcmp(argv
[i
], "--signoff") ||
217 !strcmp(argv
[i
], "-s")) {
218 const char *committer
;
221 committer
= git_committer_info(1);
222 endpos
= strchr(committer
, '>');
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;
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;
238 if (start_number
< 0)
240 if (numbered
&& keep_subject
)
241 die ("-n and -k are mutually exclusive.");
243 argc
= setup_revisions(argc
, argv
, &rev
, "HEAD");
245 die ("unrecognized argument: %s", argv
[1]);
247 if (!rev
.diffopt
.output_format
)
248 rev
.diffopt
.output_format
= DIFF_FORMAT_DIFFSTAT
| DIFF_FORMAT_PATCH
;
250 if (output_directory
) {
252 die("standard output, or directory, which one?");
253 if (mkdir(output_directory
, 0777) < 0 && errno
!= EEXIST
)
254 die("Could not create directory %s",
258 if (rev
.pending
.nr
== 1) {
259 rev
.pending
.objects
[0].item
->flags
|= UNINTERESTING
;
264 realstdout
= fdopen(dup(1), "w");
266 prepare_revision_walk(&rev
);
267 while ((commit
= get_revision(&rev
)) != NULL
) {
269 if (commit
->parents
&& commit
->parents
->next
)
272 list
= realloc(list
, nr
* sizeof(list
[0]));
273 list
[nr
- 1] = commit
;
277 rev
.total
= total
+ start_number
- 1;
278 rev
.add_signoff
= add_signoff
;
282 rev
.nr
= total
- nr
+ (start_number
- 1);
284 reopen_stdout(commit
, rev
.nr
, keep_subject
);
285 shown
= log_tree_commit(&rev
, commit
);
286 free(commit
->buffer
);
287 commit
->buffer
= NULL
;
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.
298 if (rev
.mime_boundary
)
299 printf("\n--%s%s--\n\n\n",
300 mime_boundary_leader
,
303 printf("-- \n%s\n\n", git_version_string
);