Merge branch 'jc/logopt' into next

* jc/logopt: (37 commits)
1fc70b6
Author: Junio C Hamano <junkio@cox.net>
Date:   Sat Apr 15 04:15:07 2006 -0700

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>
:100644 100644 22fec3d... 939a34c... M	git.c
...

diff --git a/git.c b/git.c
index 0741c5a36d4a5a0b4cf9b055ecc4d8bc95bf806a..939a34caf935b8cdb7ea6b3340f5657fddd8dd89 100644 (file)
--- a/git.c
+++ b/git.c
@@ -278,33 +278,32 @@ static int cmd_help(int argc, const char **argv, char **envp)
 
 #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 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;
 
-       init_log_tree_opt(&wcopt.logopt);
-       wcopt.commit_format = CMIT_FMT_DEFAULT;
-       wcopt.abbrev = DEFAULT_ABBREV;
-       argc = parse_whatchanged_opt(argc, argv, &wcopt);
+       opt->commit_format = CMIT_FMT_DEFAULT;
+       wcopt->abbrev = DEFAULT_ABBREV;
+       argc = parse_whatchanged_opt(argc, argv, wcopt);
 
-       if (wcopt.logopt.commit_format == CMIT_FMT_ONELINE)
+       if (opt->commit_format == CMIT_FMT_ONELINE)
                commit_prefix = "";
 
        prepare_revision_walk(rev);
        setup_pager();
        while ((commit = get_revision(rev)) != NULL) {
-               if (shown && wcopt.do_diff &&
-                   wcopt.commit_format != CMIT_FMT_ONELINE)
+               if (shown && wcopt->do_diff &&
+                   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);
@@ -327,14 +326,14 @@ static int cmd_log(int argc, const char **argv, char **envp)
                             parents = parents->next)
                                parents->item->object.flags &= ~TMP_MARK;
                }
-               if (wcopt.commit_format == CMIT_FMT_ONELINE)
+               if (opt->commit_format == CMIT_FMT_ONELINE)
                        putchar(' ');
                else
                        putchar('\n');
-               pretty_print_commit(wcopt.commit_format, commit, ~0, buf,
-                                   LOGSIZE, wcopt.abbrev);
+               pretty_print_commit(opt->commit_format, commit, ~0, buf,
+                                   LOGSIZE, wcopt->abbrev);
                printf("%s\n", buf);
-               if (wcopt.do_diff)
+               if (wcopt->do_diff)
                        log_tree_commit(opt, commit);
                shown = 1;
                free(commit->buffer);
@@ -344,6 +343,26 @@ static int cmd_log(int argc, const char **argv, char **envp)
        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];
@@ -354,6 +373,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "version", cmd_version },
                { "help", cmd_help },
                { "log", cmd_log },
+               { "whatchanged", cmd_whatchanged },
        };
        int i;
 

diff --git a/log-tree.h b/log-tree.h
index 50cbfb3012af1f663923bf6b064980f6c3962515..8d8f6f14589fed87a8e77455a7eb4ef814f2d40b 100644 (file)
--- a/log-tree.h
+++ b/log-tree.h
@@ -25,7 +25,6 @@ int log_tree_opt_parse(struct log_tree_opt *, const char **, int);
 struct whatchanged_opt {
        struct rev_info revopt;
        struct log_tree_opt logopt;
-       enum cmit_fmt commit_format;
        int abbrev;
        int abbrev_commit;
        int do_diff;