Merge branch 'jc/simpack' into next
[gitweb.git] / git.c
diff --git a/git.c b/git.c
index bf68daca200cee00747cec1bbcace985ff0af9d1..78ed403ed121a84c3efe3a57fa7c24486d724953 100644 (file)
--- a/git.c
+++ b/git.c
 #include <sys/ioctl.h>
 #include "git-compat-util.h"
 #include "exec_cmd.h"
+#include "common-cmds.h"
 
 #include "cache.h"
 #include "commit.h"
+#include "diff.h"
 #include "revision.h"
+#include "log-tree.h"
 
 #ifndef PATH_MAX
 # define PATH_MAX 4096
@@ -171,11 +174,29 @@ static void list_commands(const char *exec_path, const char *pattern)
        putchar('\n');
 }
 
+static void list_common_cmds_help(void)
+{
+       int i, longest = 0;
+
+       for (i = 0; i < ARRAY_SIZE(common_cmds); i++) {
+               if (longest < strlen(common_cmds[i].name))
+                       longest = strlen(common_cmds[i].name);
+       }
+
+       puts("The most commonly used git commands are:");
+       for (i = 0; i < ARRAY_SIZE(common_cmds); i++) {
+               printf("    %s", common_cmds[i].name);
+               mput_char(' ', longest - strlen(common_cmds[i].name) + 4);
+               puts(common_cmds[i].help);
+       }
+       puts("(use 'git help -a' to get a list of all installed git commands)");
+}
+
 #ifdef __GNUC__
-static void cmd_usage(const char *exec_path, const char *fmt, ...)
-       __attribute__((__format__(__printf__, 2, 3), __noreturn__));
+static void cmd_usage(int show_all, const char *exec_path, const char *fmt, ...)
+       __attribute__((__format__(__printf__, 3, 4), __noreturn__));
 #endif
-static void cmd_usage(const char *exec_path, const char *fmt, ...)
+static void cmd_usage(int show_all, const char *exec_path, const char *fmt, ...)
 {
        if (fmt) {
                va_list ap;
@@ -189,10 +210,13 @@ static void cmd_usage(const char *exec_path, const char *fmt, ...)
        else
                puts(git_usage);
 
-       putchar('\n');
-
-       if(exec_path)
-               list_commands(exec_path, "git-*");
+       if (exec_path) {
+               putchar('\n');
+               if (show_all)
+                       list_commands(exec_path, "git-*");
+               else
+                       list_common_cmds_help();
+        }
 
        exit(1);
 }
@@ -216,78 +240,76 @@ static void prepend_to_path(const char *dir, int len)
        setenv("PATH", path, 1);
 }
 
-static void show_man_page(char *git_cmd)
+static void show_man_page(const char *git_cmd)
 {
-       char *page;
+       const char *page;
 
        if (!strncmp(git_cmd, "git", 3))
                page = git_cmd;
        else {
                int page_len = strlen(git_cmd) + 4;
-
-               page = malloc(page_len + 1);
-               strcpy(page, "git-");
-               strcpy(page + 4, git_cmd);
-               page[page_len] = 0;
+               char *p = malloc(page_len + 1);
+               strcpy(p, "git-");
+               strcpy(p + 4, git_cmd);
+               p[page_len] = 0;
+               page = p;
        }
 
        execlp("man", "man", page, NULL);
 }
 
-static int cmd_version(int argc, char **argv, char **envp)
+static int cmd_version(int argc, const char **argv, char **envp)
 {
        printf("git version %s\n", GIT_VERSION);
        return 0;
 }
 
-static int cmd_help(int argc, char **argv, char **envp)
+static int cmd_help(int argc, const char **argv, char **envp)
 {
-       char *help_cmd = argv[1];
+       const char *help_cmd = argv[1];
        if (!help_cmd)
-               cmd_usage(git_exec_path(), NULL);
-       show_man_page(help_cmd);
+               cmd_usage(0, git_exec_path(), NULL);
+       else if (!strcmp(help_cmd, "--all") || !strcmp(help_cmd, "-a"))
+               cmd_usage(1, git_exec_path(), NULL);
+       else
+               show_man_page(help_cmd);
        return 0;
 }
 
 #define LOGSIZE (65536)
 
-static int cmd_log(int argc, char **argv, char **envp)
+static int cmd_log(int argc, const char **argv, char **envp)
 {
        struct rev_info rev;
        struct commit *commit;
        char *buf = xmalloc(LOGSIZE);
        static enum cmit_fmt commit_format = CMIT_FMT_DEFAULT;
        int abbrev = DEFAULT_ABBREV;
-       int show_parents = 0;
+       int abbrev_commit = 0;
        const char *commit_prefix = "commit ";
+       struct log_tree_opt opt;
+       int shown = 0;
+       int do_diff = 0;
+       int full_diff = 0;
 
+       init_log_tree_opt(&opt);
        argc = setup_revisions(argc, argv, &rev, "HEAD");
        while (1 < argc) {
-               char *arg = argv[1];
-               /* accept -<digit>, like traditilnal "head" */
-               if ((*arg == '-') && isdigit(arg[1])) {
-                       rev.max_count = atoi(arg + 1);
-               }
-               else if (!strcmp(arg, "-n")) {
-                       if (argc < 2)
-                               die("-n requires an argument");
-                       rev.max_count = atoi(argv[2]);
-                       argc--; argv++;
-               }
-               else if (!strncmp(arg,"-n",2)) {
-                       rev.max_count = atoi(arg + 2);
-               }
-               else if (!strncmp(arg, "--pretty", 8)) {
+               const char *arg = argv[1];
+               if (!strncmp(arg, "--pretty", 8)) {
                        commit_format = get_commit_format(arg + 8);
                        if (commit_format == CMIT_FMT_ONELINE)
                                commit_prefix = "";
                }
-               else if (!strcmp(arg, "--parents")) {
-                       show_parents = 1;
-               }
                else if (!strcmp(arg, "--no-abbrev")) {
                        abbrev = 0;
                }
+               else if (!strcmp(arg, "--abbrev")) {
+                       abbrev = DEFAULT_ABBREV;
+               }
+               else if (!strcmp(arg, "--abbrev-commit")) {
+                       abbrev_commit = 1;
+               }
                else if (!strncmp(arg, "--abbrev=", 9)) {
                        abbrev = strtoul(arg + 9, NULL, 10);
                        if (abbrev && abbrev < MINIMUM_ABBREV)
@@ -295,17 +317,52 @@ static int cmd_log(int argc, char **argv, char **envp)
                        else if (40 < abbrev)
                                abbrev = 40;
                }
-               else
+               else if (!strcmp(arg, "--full-diff")) {
+                       do_diff = 1;
+                       full_diff = 1;
+               }
+               else {
+                       int cnt = log_tree_opt_parse(&opt, argv+1, argc-1);
+                       if (0 < cnt) {
+                               do_diff = 1;
+                               argv += cnt;
+                               argc -= cnt;
+                               continue;
+                       }
                        die("unrecognized argument: %s", arg);
+               }
+
                argc--; argv++;
        }
 
+       if (do_diff) {
+               opt.diffopt.abbrev = abbrev;
+               opt.verbose_header = 0;
+               opt.always_show_header = 0;
+               opt.no_commit_id = 1;
+               if (opt.combine_merges)
+                       opt.ignore_merges = 0;
+               if (opt.dense_combined_merges)
+                       opt.diffopt.output_format = DIFF_FORMAT_PATCH;
+               if (opt.diffopt.output_format == DIFF_FORMAT_PATCH)
+                       opt.diffopt.recursive = 1;
+               if (!full_diff && rev.prune_data)
+                       diff_tree_setup_paths(rev.prune_data, &opt.diffopt);
+               diff_setup_done(&opt.diffopt);
+       }
+
        prepare_revision_walk(&rev);
        setup_pager();
        while ((commit = get_revision(&rev)) != NULL) {
-               printf("%s%s", commit_prefix,
-                      sha1_to_hex(commit->object.sha1));
-               if (show_parents) {
+               if (shown && do_diff && commit_format != CMIT_FMT_ONELINE)
+                       putchar('\n');
+               fputs(commit_prefix, stdout);
+               if (abbrev_commit && abbrev)
+                       fputs(find_unique_abbrev(commit->object.sha1, abbrev),
+                             stdout);
+               else
+                       fputs(sha1_to_hex(commit->object.sha1), stdout);
+               if (rev.parents) {
                        struct commit_list *parents = commit->parents;
                        while (parents) {
                                struct object *o = &(parents->item->object);
@@ -331,19 +388,22 @@ static int cmd_log(int argc, char **argv, char **envp)
                pretty_print_commit(commit_format, commit, ~0, buf,
                                    LOGSIZE, abbrev);
                printf("%s\n", buf);
+               if (do_diff)
+                       log_tree_commit(&opt, commit);
+               shown = 1;
+               free(commit->buffer);
+               commit->buffer = NULL;
        }
        free(buf);
        return 0;
 }
 
-#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
-
-static void handle_internal_command(int argc, char **argv, char **envp)
+static void handle_internal_command(int argc, const char **argv, char **envp)
 {
        const char *cmd = argv[0];
        static struct cmd_struct {
                const char *cmd;
-               int (*fn)(int, char **, char **);
+               int (*fn)(int, const char **, char **);
        } commands[] = {
                { "version", cmd_version },
                { "help", cmd_help },
@@ -359,9 +419,9 @@ static void handle_internal_command(int argc, char **argv, char **envp)
        }
 }
 
-int main(int argc, char **argv, char **envp)
+int main(int argc, const char **argv, char **envp)
 {
-       char *cmd = argv[0];
+       const char *cmd = argv[0];
        char *slash = strrchr(cmd, '/');
        char git_command[PATH_MAX + 1];
        const char *exec_path = NULL;
@@ -433,7 +493,7 @@ int main(int argc, char **argv, char **envp)
                        puts(git_exec_path());
                        exit(0);
                }
-               cmd_usage(NULL, NULL);
+               cmd_usage(0, NULL, NULL);
        }
        argv[0] = cmd;
 
@@ -456,7 +516,7 @@ int main(int argc, char **argv, char **envp)
        execv_git_cmd(argv);
 
        if (errno == ENOENT)
-               cmd_usage(exec_path, "'%s' is not a git-command", cmd);
+               cmd_usage(0, exec_path, "'%s' is not a git-command", cmd);
 
        fprintf(stderr, "Failed to run command '%s': %s\n",
                git_command, strerror(errno));