Built-in git-whatchanged

Now "git log" is in reusable shape, add "git whatchanged" which
essentially is a synonym with different default for people whose
fingers are already trained.

There is a subtle difference from the shell-script version; the
first line of each entry is now "commit <object name>", instead
of "diff-tree <object name> (from <object name>)."  I suspect
that showing the parent name that way is useful, so this may be
something we would want to fix (the user can say --pretty=raw to
get that information but that is a bit ugly).

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git.c b/git.c
index 22fec3d79f979627684594e3cd464fa72f55dcab..939a34caf935b8cdb7ea6b3340f5657fddd8dd89 100644 (file)
--- a/git.c
+++ b/git.c
@@ -278,21 +278,19 @@ static int cmd_help(int argc, const char **argv, char **envp)
 
 #define LOGSIZE (65536)
 
 
 #define LOGSIZE (65536)
 

-static int cmd_log(int argc, const char **argv, char **envp)
+static int cmd_log_wc(int argc, const char **argv, char **envp,
+                     struct whatchanged_opt *wcopt)

 {
 {

-       struct whatchanged_opt wcopt;

        struct commit *commit;
        char *buf = xmalloc(LOGSIZE);
        const char *commit_prefix = "commit ";
        int shown = 0;
        struct commit *commit;
        char *buf = xmalloc(LOGSIZE);
        const char *commit_prefix = "commit ";
        int shown = 0;

-       struct rev_info *rev = &wcopt.revopt;
-       struct log_tree_opt *opt = &wcopt.logopt;
+       struct rev_info *rev = &wcopt->revopt;
+       struct log_tree_opt *opt = &wcopt->logopt;

 
 

-       memset(&wcopt, 0, sizeof(wcopt));
-       init_log_tree_opt(&wcopt.logopt);

        opt->commit_format = CMIT_FMT_DEFAULT;
        opt->commit_format = CMIT_FMT_DEFAULT;

-       wcopt.abbrev = DEFAULT_ABBREV;
-       argc = parse_whatchanged_opt(argc, argv, &wcopt);
+       wcopt->abbrev = DEFAULT_ABBREV;
+       argc = parse_whatchanged_opt(argc, argv, wcopt);

 
        if (opt->commit_format == CMIT_FMT_ONELINE)
                commit_prefix = "";
 
        if (opt->commit_format == CMIT_FMT_ONELINE)
                commit_prefix = "";


@@ -300,12 +298,12 @@ static int cmd_log(int argc, const char **argv, char **envp)
        prepare_revision_walk(rev);
        setup_pager();
        while ((commit = get_revision(rev)) != NULL) {
        prepare_revision_walk(rev);
        setup_pager();
        while ((commit = get_revision(rev)) != NULL) {

-               if (shown && wcopt.do_diff &&
+               if (shown && wcopt->do_diff &&

                    opt->commit_format != CMIT_FMT_ONELINE)
                        putchar('\n');
                fputs(commit_prefix, stdout);
                    opt->commit_format != CMIT_FMT_ONELINE)
                        putchar('\n');
                fputs(commit_prefix, stdout);

-               if (wcopt.abbrev_commit && wcopt.abbrev)
-                       fputs(find_unique_abbrev(commit->object.sha1, wcopt.abbrev),
+               if (wcopt->abbrev_commit && wcopt->abbrev)
+                       fputs(find_unique_abbrev(commit->object.sha1, wcopt->abbrev),

                              stdout);
                else
                        fputs(sha1_to_hex(commit->object.sha1), stdout);
                              stdout);
                else
                        fputs(sha1_to_hex(commit->object.sha1), stdout);


@@ -333,9 +331,9 @@ static int cmd_log(int argc, const char **argv, char **envp)
                else
                        putchar('\n');
                pretty_print_commit(opt->commit_format, commit, ~0, buf,
                else
                        putchar('\n');
                pretty_print_commit(opt->commit_format, commit, ~0, buf,

-                                   LOGSIZE, wcopt.abbrev);
+                                   LOGSIZE, wcopt->abbrev);

                printf("%s\n", buf);
                printf("%s\n", buf);

-               if (wcopt.do_diff)
+               if (wcopt->do_diff)

                        log_tree_commit(opt, commit);
                shown = 1;
                free(commit->buffer);
                        log_tree_commit(opt, commit);
                shown = 1;
                free(commit->buffer);


@@ -345,6 +343,26 @@ static int cmd_log(int argc, const char **argv, char **envp)
        return 0;
 }
 
        return 0;
 }
 

+static int cmd_log(int ac, const char **av, char **ep)
+{
+       struct whatchanged_opt wcopt;
+
+       memset(&wcopt, 0, sizeof(wcopt));
+       init_log_tree_opt(&wcopt.logopt);
+       return cmd_log_wc(ac, av, ep, &wcopt);
+}
+
+static int cmd_whatchanged(int ac, const char **av, char **ep)
+{
+       struct whatchanged_opt wcopt;
+
+       memset(&wcopt, 0, sizeof(wcopt));
+       wcopt.do_diff = 1;
+       init_log_tree_opt(&wcopt.logopt);
+       wcopt.logopt.diffopt.recursive = 1;
+       return cmd_log_wc(ac, av, ep, &wcopt);
+}
+

 static void handle_internal_command(int argc, const char **argv, char **envp)
 {
        const char *cmd = argv[0];
 static void handle_internal_command(int argc, const char **argv, char **envp)
 {
        const char *cmd = argv[0];


@@ -355,6 +373,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "version", cmd_version },
                { "help", cmd_help },
                { "log", cmd_log },
                { "version", cmd_version },
                { "help", cmd_help },
                { "log", cmd_log },

+               { "whatchanged", cmd_whatchanged },

        };
        int i;
 
        };
        int i;