Fixes for option parsing

[git.git] / git.c

diff --git a/git.c b/git.c
index d172626..fc4e429 100644 (file)
--- a/git.c
+++ b/git.c
@@ -278,43 +278,49 @@ 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 rev_info *rev)
 {
-       struct rev_info rev;
        struct commit *commit;
        char *buf = xmalloc(LOGSIZE);
        const char *commit_prefix = "commit ";
        int shown = 0;
 
-       init_revisions(&rev);
-       rev.abbrev = DEFAULT_ABBREV;
-       argc = setup_revisions(argc, argv, &rev, "HEAD");
+       rev->abbrev = DEFAULT_ABBREV;
+       rev->commit_format = CMIT_FMT_DEFAULT;
+       argc = setup_revisions(argc, argv, rev, "HEAD");
+
        if (argc > 1)
                die("unrecognized argument: %s", argv[1]);
-
-       rev.no_commit_id = 1;
-       if (rev.commit_format == CMIT_FMT_ONELINE)
+       if (rev->commit_format == CMIT_FMT_ONELINE)
                commit_prefix = "";
 
-       prepare_revision_walk(&rev);
+       prepare_revision_walk(rev);
        setup_pager();
-       while ((commit = get_revision(&rev)) != NULL) {
-               if (shown && rev.diff && rev.commit_format != CMIT_FMT_ONELINE)
+       while ((commit = get_revision(rev)) != NULL) {
+               unsigned long ofs = 0;
+
+               if (shown && rev->diff &&
+                   rev->commit_format != CMIT_FMT_ONELINE)
                        putchar('\n');
-               fputs(commit_prefix, stdout);
-               if (rev.abbrev_commit && rev.abbrev)
-                       fputs(find_unique_abbrev(commit->object.sha1, rev.abbrev),
-                             stdout);
+
+               ofs = sprintf(buf, "%s", commit_prefix);
+               if (rev->abbrev_commit && rev->abbrev)
+                       ofs += sprintf(buf + ofs, "%s",
+                                      find_unique_abbrev(commit->object.sha1,
+                                                         rev->abbrev));
                else
-                       fputs(sha1_to_hex(commit->object.sha1), stdout);
-               if (rev.parents) {
+                       ofs += sprintf(buf + ofs, "%s",
+                                      sha1_to_hex(commit->object.sha1));
+               if (rev->parents) {
                        struct commit_list *parents = commit->parents;
                        while (parents) {
                                struct object *o = &(parents->item->object);
                                parents = parents->next;
                                if (o->flags & TMP_MARK)
                                        continue;
-                               printf(" %s", sha1_to_hex(o->sha1));
+                               ofs += sprintf(buf + ofs, " %s",
+                                              sha1_to_hex(o->sha1));
                                o->flags |= TMP_MARK;
                        }
                        /* TMP_MARK is a general purpose flag that can
@@ -326,15 +332,20 @@ static int cmd_log(int argc, const char **argv, char **envp)
                             parents = parents->next)
                                parents->item->object.flags &= ~TMP_MARK;
                }
-               if (rev.commit_format == CMIT_FMT_ONELINE)
-                       putchar(' ');
+               buf[ofs++] = 
+                       (rev->commit_format == CMIT_FMT_ONELINE) ? ' ' : '\n';
+               ofs += pretty_print_commit(rev->commit_format, commit, ~0,
+                                          buf + ofs,
+                                          LOGSIZE - ofs - 20,
+                                          rev->abbrev);
+
+               if (rev->diff) {
+                       rev->use_precomputed_header = buf;
+                       strcpy(buf + ofs, "\n---\n");
+                       log_tree_commit(rev, commit);
+               }
                else
-                       putchar('\n');
-               pretty_print_commit(rev.commit_format, commit, ~0, buf,
-                                   LOGSIZE, rev.abbrev);
-               printf("%s\n", buf);
-               if (rev.diff)
-                       log_tree_commit(&rev, commit);
+                       printf("%s\n", buf);
                shown = 1;
                free(commit->buffer);
                commit->buffer = NULL;
@@ -343,6 +354,43 @@ static int cmd_log(int argc, const char **argv, char **envp)
        return 0;
 }
 
+static int cmd_wc(int argc, const char **argv, char **envp)
+{
+       struct rev_info rev;
+
+       init_revisions(&rev);
+       rev.diff = 1;
+       rev.diffopt.recursive = 1;
+       return cmd_log_wc(argc, argv, envp, &rev);
+}
+
+static int cmd_show(int argc, const char **argv, char **envp)
+{
+       struct rev_info rev;
+
+       init_revisions(&rev);
+       rev.diff = 1;
+       rev.diffopt.recursive = 1;
+       rev.combine_merges = 1;
+       rev.dense_combined_merges = 1;
+       rev.always_show_header = 1;
+       rev.ignore_merges = 0;
+       rev.no_walk = 1;
+       return cmd_log_wc(argc, argv, envp, &rev);
+}
+
+static int cmd_log(int argc, const char **argv, char **envp)
+{
+       struct rev_info rev;
+
+       init_revisions(&rev);
+       rev.always_show_header = 1;
+       rev.diffopt.recursive = 1;
+       rev.combine_merges = 1;
+       rev.ignore_merges = 0;
+       return cmd_log_wc(argc, argv, envp, &rev);
+}
+
 static void handle_internal_command(int argc, const char **argv, char **envp)
 {
        const char *cmd = argv[0];
@@ -353,9 +401,17 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "version", cmd_version },
                { "help", cmd_help },
                { "log", cmd_log },
+               { "whatchanged", cmd_wc },
+               { "show", cmd_show },
        };
        int i;
 
+       /* Turn "git cmd --help" into "git help cmd" */
+       if (argc > 1 && !strcmp(argv[1], "--help")) {
+               argv[1] = argv[0];
+               argv[0] = cmd = "help";
+       }
+
        for (i = 0; i < ARRAY_SIZE(commands); i++) {
                struct cmd_struct *p = commands+i;
                if (strcmp(p->cmd, cmd))