Built-in git-whatchanged.
Split internal "git log" into reusable piece and add "git whatchanged". This is based on the option parsing unification work Linus did. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Apr 16, 2006 at 00:07 UTC
5b84f4d87a1bd58c7540e9ea82ee3673ecddbad5
1 file changed
+43
-19
git.c
+43
-19
@@ -278,36 +278,33 @@ static int cmd_help(int argc, const char **argv, char **envp)
278
279
#define LOGSIZE (65536)
280
281
-static int cmd_log(int argc, const char **argv, char **envp)
281
+static int cmd_log_wc(int argc, const char **argv, char **envp,
282
+ struct rev_info *rev)
283
{
283
- struct rev_info rev;
284
struct commit *commit;
285
char *buf = xmalloc(LOGSIZE);
286
const char *commit_prefix = "commit ";
287
int shown = 0;
288
289
- init_revisions(&rev);
290
- rev.abbrev = DEFAULT_ABBREV;
291
- argc = setup_revisions(argc, argv, &rev, "HEAD");
289
if (argc > 1)
290
die("unrecognized argument: %s", argv[1]);
294
-
295
- rev.no_commit_id = 1;
296
- if (rev.commit_format == CMIT_FMT_ONELINE)
291
+ if (rev->commit_format == CMIT_FMT_ONELINE)
292
commit_prefix = "";
293
299
- prepare_revision_walk(&rev);
294
+ prepare_revision_walk(rev);
295
setup_pager();
301
- while ((commit = get_revision(&rev)) != NULL) {
302
- if (shown && rev.diff && rev.commit_format != CMIT_FMT_ONELINE)
296
+ while ((commit = get_revision(rev)) != NULL) {
297
+ if (shown && rev->diff &&
298
+ rev->commit_format != CMIT_FMT_ONELINE)
299
putchar('\n');
300
fputs(commit_prefix, stdout);
305
- if (rev.abbrev_commit && rev.abbrev)
306
- fputs(find_unique_abbrev(commit->object.sha1, rev.abbrev),
301
+ if (rev->abbrev_commit && rev->abbrev)
302
+ fputs(find_unique_abbrev(commit->object.sha1,
303
+ rev->abbrev),
304
stdout);
305
else
306
fputs(sha1_to_hex(commit->object.sha1), stdout);
310
- if (rev.parents) {
307
+ if (rev->parents) {
308
struct commit_list *parents = commit->parents;
309
while (parents) {
310
struct object *o = &(parents->item->object);
@@ -326,15 +323,15 @@ static int cmd_log(int argc, const char **argv, char **envp)
323
parents = parents->next)
324
parents->item->object.flags &= ~TMP_MARK;
325
}
329
- if (rev.commit_format == CMIT_FMT_ONELINE)
326
+ if (rev->commit_format == CMIT_FMT_ONELINE)
327
putchar(' ');
328
else
329
putchar('\n');
333
- pretty_print_commit(rev.commit_format, commit, ~0, buf,
334
- LOGSIZE, rev.abbrev);
330
+ pretty_print_commit(rev->commit_format, commit, ~0, buf,
331
+ LOGSIZE, rev->abbrev);
332
printf("%s\n", buf);
336
- if (rev.diff)
337
- log_tree_commit(&rev, commit);
333
+ if (rev->diff)
334
+ log_tree_commit(rev, commit);
335
shown = 1;
336
free(commit->buffer);
337
commit->buffer = NULL;
@@ -343,6 +340,32 @@ static int cmd_log(int argc, const char **argv, char **envp)
340
return 0;
341
}
342
343
+static int cmd_wc(int argc, const char **argv, char **envp)
344
+{
345
+ struct rev_info rev;
346
+
347
+ init_revisions(&rev);
348
+ rev.abbrev = DEFAULT_ABBREV;
349
+ rev.no_commit_id = 1;
350
+ rev.commit_format = CMIT_FMT_DEFAULT;
351
+ rev.diff = 1;
352
+ rev.diffopt.recursive = 1;
353
+ argc = setup_revisions(argc, argv, &rev, "HEAD");
354
+ return cmd_log_wc(argc, argv, envp, &rev);
355
+}
356
+
357
+static int cmd_log(int argc, const char **argv, char **envp)
358
+{
359
+ struct rev_info rev;
360
+
361
+ init_revisions(&rev);
362
+ rev.abbrev = DEFAULT_ABBREV;
363
+ rev.no_commit_id = 1;
364
+ rev.commit_format = CMIT_FMT_DEFAULT;
365
+ argc = setup_revisions(argc, argv, &rev, "HEAD");
366
+ return cmd_log_wc(argc, argv, envp, &rev);
367
+}
368
+
369
static void handle_internal_command(int argc, const char **argv, char **envp)
370
{
371
const char *cmd = argv[0];
@@ -353,6 +376,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
376
{ "version", cmd_version },
377
{ "help", cmd_help },
378
{ "log", cmd_log },
379
+ { "whatchanged", cmd_wc },
380
};
381
int i;
382