Define GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL) to known values.
[gitweb.git] / diff-tree.c
index 266528a143af6dfb3ae2e05de6c030872304ff9f..b170b03fd34da719b322b49d9718262a625df357 100644 (file)
-#include <ctype.h>
 #include "cache.h"
 #include "diff.h"
+#include "commit.h"
 
 static int show_root_diff = 0;
+static int no_commit_id = 0;
 static int verbose_header = 0;
 static int ignore_merges = 1;
-static int recursive = 0;
+static int combine_merges = 1;
+static int dense_combined_merges = 0;
 static int read_stdin = 0;
-static int diff_output_format = DIFF_FORMAT_HUMAN;
-static int detect_rename = 0;
-static int reverse_diff = 0;
-static int diff_score_opt = 0;
-static const char *pickaxe = NULL;
+static int always_show_header = 0;
+
 static const char *header = NULL;
 static const char *header_prefix = "";
+static enum cmit_fmt commit_format = CMIT_FMT_RAW;
 
-// What paths are we interested in?
-static int nr_paths = 0;
-static const char **paths = NULL;
-static int *pathlens = NULL;
-
-static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base);
-
-static void update_tree_entry(void **bufp, unsigned long *sizep)
-{
-       void *buf = *bufp;
-       unsigned long size = *sizep;
-       int len = strlen(buf) + 1 + 20;
-
-       if (size < len)
-               die("corrupt tree file");
-       *bufp = buf + len;
-       *sizep = size - len;
-}
-
-static const unsigned char *extract(void *tree, unsigned long size, const char **pathp, unsigned int *modep)
-{
-       int len = strlen(tree)+1;
-       const unsigned char *sha1 = tree + len;
-       const char *path = strchr(tree, ' ');
-
-       if (!path || size < len + 20 || sscanf(tree, "%o", modep) != 1)
-               die("corrupt tree file");
-       *pathp = path+1;
-       return sha1;
-}
-
-static char *malloc_base(const char *base, const char *path, int pathlen)
-{
-       int baselen = strlen(base);
-       char *newbase = xmalloc(baselen + pathlen + 2);
-       memcpy(newbase, base, baselen);
-       memcpy(newbase + baselen, path, pathlen);
-       memcpy(newbase + baselen + pathlen, "/", 2);
-       return newbase;
-}
-
-static void show_file(const char *prefix, void *tree, unsigned long size, const char *base);
-static void show_tree(const char *prefix, void *tree, unsigned long size, const char *base);
-
-/* A file entry went away or appeared */
-static void show_file(const char *prefix, void *tree, unsigned long size, const char *base)
-{
-       unsigned mode;
-       const char *path;
-       const unsigned char *sha1 = extract(tree, size, &path, &mode);
-
-       if (recursive && S_ISDIR(mode)) {
-               char type[20];
-               unsigned long size;
-               char *newbase = malloc_base(base, path, strlen(path));
-               void *tree;
-
-               tree = read_sha1_file(sha1, type, &size);
-               if (!tree || strcmp(type, "tree"))
-                       die("corrupt tree sha %s", sha1_to_hex(sha1));
-
-               show_tree(prefix, tree, size, newbase);
-
-               free(tree);
-               free(newbase);
-               return;
-       }
-
-       diff_addremove(prefix[0], mode, sha1, base, path);
-}
-
-static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base)
-{
-       unsigned mode1, mode2;
-       const char *path1, *path2;
-       const unsigned char *sha1, *sha2;
-       int cmp, pathlen1, pathlen2;
-
-       sha1 = extract(tree1, size1, &path1, &mode1);
-       sha2 = extract(tree2, size2, &path2, &mode2);
-
-       pathlen1 = strlen(path1);
-       pathlen2 = strlen(path2);
-       cmp = base_name_compare(path1, pathlen1, mode1, path2, pathlen2, mode2);
-       if (cmp < 0) {
-               show_file("-", tree1, size1, base);
-               return -1;
-       }
-       if (cmp > 0) {
-               show_file("+", tree2, size2, base);
-               return 1;
-       }
-       if (!memcmp(sha1, sha2, 20) && mode1 == mode2)
-               return 0;
-
-       /*
-        * If the filemode has changed to/from a directory from/to a regular
-        * file, we need to consider it a remove and an add.
-        */
-       if (S_ISDIR(mode1) != S_ISDIR(mode2)) {
-               show_file("-", tree1, size1, base);
-               show_file("+", tree2, size2, base);
-               return 0;
-       }
-
-       if (recursive && S_ISDIR(mode1)) {
-               int retval;
-               char *newbase = malloc_base(base, path1, pathlen1);
-               retval = diff_tree_sha1(sha1, sha2, newbase);
-               free(newbase);
-               return retval;
-       }
-
-       diff_change(mode1, mode2, sha1, sha2, base, path1);
-       return 0;
-}
-
-static int interesting(void *tree, unsigned long size, const char *base)
-{
-       const char *path;
-       unsigned mode;
-       int i;
-       int baselen, pathlen;
-
-       if (!nr_paths)
-               return 1;
-
-       (void)extract(tree, size, &path, &mode);
-
-       pathlen = strlen(path);
-       baselen = strlen(base);
-
-       for (i=0; i < nr_paths; i++) {
-               const char *match = paths[i];
-               int matchlen = pathlens[i];
-
-               if (baselen >= matchlen) {
-                       /* If it doesn't match, move along... */
-                       if (strncmp(base, match, matchlen))
-                               continue;
-
-                       /* The base is a subdirectory of a path which was specified. */
-                       return 1;
-               }
-
-               /* Does the base match? */
-               if (strncmp(base, match, baselen))
-                       continue;
-
-               match += baselen;
-               matchlen -= baselen;
-
-               if (pathlen > matchlen)
-                       continue;
-
-               if (matchlen > pathlen) {
-                       if (match[pathlen] != '/')
-                               continue;
-                       if (!S_ISDIR(mode))
-                               continue;
-               }
-
-               if (strncmp(path, match, pathlen))
-                       continue;
-
-               return 1;
-       }
-       return 0; /* No matches */
-}
-
-/* A whole sub-tree went away or appeared */
-static void show_tree(const char *prefix, void *tree, unsigned long size, const char *base)
-{
-       while (size) {
-               if (interesting(tree, size, base))
-                       show_file(prefix, tree, size, base);
-               update_tree_entry(&tree, &size);
-       }
-}
-
-static int diff_tree(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base)
-{
-       while (size1 | size2) {
-               if (nr_paths && size1 && !interesting(tree1, size1, base)) {
-                       update_tree_entry(&tree1, &size1);
-                       continue;
-               }
-               if (nr_paths && size2 && !interesting(tree2, size2, base)) {
-                       update_tree_entry(&tree2, &size2);
-                       continue;
-               }
-               if (!size1) {
-                       show_file("+", tree2, size2, base);
-                       update_tree_entry(&tree2, &size2);
-                       continue;
-               }
-               if (!size2) {
-                       show_file("-", tree1, size1, base);
-                       update_tree_entry(&tree1, &size1);
-                       continue;
-               }
-               switch (compare_tree_entry(tree1, size1, tree2, size2, base)) {
-               case -1:
-                       update_tree_entry(&tree1, &size1);
-                       continue;
-               case 0:
-                       update_tree_entry(&tree1, &size1);
-                       /* Fallthrough */
-               case 1:
-                       update_tree_entry(&tree2, &size2);
-                       continue;
-               }
-               die("git-diff-tree: internal error");
-       }
-       return 0;
-}
-
-static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base)
-{
-       void *tree1, *tree2;
-       unsigned long size1, size2;
-       int retval;
-
-       tree1 = read_object_with_reference(old, "tree", &size1, NULL);
-       if (!tree1)
-               die("unable to read source tree (%s)", sha1_to_hex(old));
-       tree2 = read_object_with_reference(new, "tree", &size2, NULL);
-       if (!tree2)
-               die("unable to read destination tree (%s)", sha1_to_hex(new));
-       retval = diff_tree(tree1, size1, tree2, size2, base);
-       free(tree1);
-       free(tree2);
-       return retval;
-}
-
-static void call_diff_setup(void)
-{
-       diff_setup(reverse_diff);
-}
+static struct diff_options diff_options;
 
 static int call_diff_flush(void)
 {
-       if (detect_rename)
-               diffcore_rename(detect_rename, diff_score_opt);
-       if (pickaxe)
-               diffcore_pickaxe(pickaxe);
+       diffcore_std(&diff_options);
        if (diff_queue_is_empty()) {
-               diff_flush(DIFF_FORMAT_NO_OUTPUT, 0);
+               int saved_fmt = diff_options.output_format;
+               diff_options.output_format = DIFF_FORMAT_NO_OUTPUT;
+               diff_flush(&diff_options);
+               diff_options.output_format = saved_fmt;
                return 0;
        }
-       if (nr_paths)
-               diffcore_pathspec(paths);
        if (header) {
-               if (diff_output_format == DIFF_FORMAT_MACHINE) {
-                       const char *ep, *cp;
-                       for (cp = header; *cp; cp = ep) {
-                               ep = strchr(cp, '\n');
-                               if (ep == 0) ep = cp + strlen(cp);
-                               printf("%.*s%c", ep-cp, cp, 0);
-                               if (*ep) ep++;
-                       }
-               }
-               else {
-                       printf("%s", header);
-               }
+               if (!no_commit_id)
+                       printf("%s%c", header, diff_options.line_termination);
                header = NULL;
        }
-       diff_flush(diff_output_format, 1);
+       diff_flush(&diff_options);
        return 1;
 }
 
@@ -291,8 +41,7 @@ static int diff_tree_sha1_top(const unsigned char *old,
 {
        int ret;
 
-       call_diff_setup();
-       ret = diff_tree_sha1(old, new, base);
+       ret = diff_tree_sha1(old, new, base, &diff_options);
        call_diff_flush();
        return ret;
 }
@@ -301,133 +50,86 @@ static int diff_root_tree(const unsigned char *new, const char *base)
 {
        int retval;
        void *tree;
-       unsigned long size;
+       struct tree_desc empty, real;
 
-       call_diff_setup();
-       tree = read_object_with_reference(new, "tree", &size, NULL);
+       tree = read_object_with_reference(new, "tree", &real.size, NULL);
        if (!tree)
                die("unable to read root tree (%s)", sha1_to_hex(new));
-       retval = diff_tree("", 0, tree, size, base);
+       real.buf = tree;
+
+       empty.buf = "";
+       empty.size = 0;
+       retval = diff_tree(&empty, &real, base, &diff_options);
        free(tree);
        call_diff_flush();
        return retval;
 }
 
-static int get_one_line(const char *msg, unsigned long len)
-{
-       int ret = 0;
-
-       while (len--) {
-               ret++;
-               if (*msg++ == '\n')
-                       break;
-       }
-       return ret;
-}
-
-static int add_author_info(char *buf, const char *line, int len)
-{
-       char *date;
-       unsigned int namelen;
-       unsigned long time;
-       int tz;
-
-       line += strlen("author ");
-       date = strchr(line, '>');
-       if (!date)
-               return 0;
-       namelen = ++date - line;
-       time = strtoul(date, &date, 10);
-       tz = strtol(date, NULL, 10);
-
-       return sprintf(buf, "Author: %.*s\nDate:   %s\n",
-               namelen, line,
-               show_date(time, tz));
-}
-
-static char *generate_header(const char *commit, const char *parent, const char *msg, unsigned long len)
+static const char *generate_header(const unsigned char *commit_sha1,
+                                  const unsigned char *parent_sha1,
+                                  const struct commit *commit)
 {
        static char this_header[16384];
        int offset;
-
-       offset = sprintf(this_header, "%s%s (from %s)\n", header_prefix, commit, parent);
-       if (verbose_header) {
-               int hdr = 1;
-
-               for (;;) {
-                       const char *line = msg;
-                       int linelen = get_one_line(msg, len);
-
-                       if (!linelen)
-                               break;
-
-                       /*
-                        * We want some slop for indentation and a possible
-                        * final "...". Thus the "+ 20".
-                        */
-                       if (offset + linelen + 20 > sizeof(this_header)) {
-                               memcpy(this_header + offset, "    ...\n", 8);
-                               offset += 8;
-                               break;
-                       }
-
-                       msg += linelen;
-                       len -= linelen;
-                       if (linelen == 1)
-                               hdr = 0;
-                       if (hdr) {
-                               if (!memcmp(line, "author ", 7))
-                                       offset += add_author_info(this_header + offset, line, linelen);
-                               continue;
-                       }
-                       memset(this_header + offset, ' ', 4);
-                       memcpy(this_header + offset + 4, line, linelen);
-                       offset += linelen + 4;
-               }
-               /* Make sure there is an EOLN */
-               if (this_header[offset-1] != '\n')
-                       this_header[offset++] = '\n';
-               /* Add _another_ EOLN if we are doing diff output */
-               this_header[offset++] = '\n';
-               this_header[offset] = 0;
+       unsigned long len;
+       int abbrev = diff_options.abbrev;
+       const char *msg = commit->buffer;
+
+       if (!verbose_header)
+               return sha1_to_hex(commit_sha1);
+
+       len = strlen(msg);
+
+       offset = sprintf(this_header, "%s%s ",
+                        header_prefix,
+                        diff_unique_abbrev(commit_sha1, abbrev));
+       if (commit_sha1 != parent_sha1)
+               offset += sprintf(this_header + offset, "(from %s)\n",
+                                 parent_sha1
+                                 ? diff_unique_abbrev(parent_sha1, abbrev)
+                                 : "root");
+       else
+               offset += sprintf(this_header + offset, "(from parents)\n");
+       offset += pretty_print_commit(commit_format, commit, len,
+                                     this_header + offset,
+                                     sizeof(this_header) - offset, abbrev);
+       if (always_show_header) {
+               puts(this_header);
+               return NULL;
        }
-
        return this_header;
 }
 
-static int diff_tree_commit(const unsigned char *commit, const char *name)
+static int diff_tree_commit(struct commit *commit)
 {
-       unsigned long size, offset;
-       char *buf = read_object_with_reference(commit, "commit", &size, NULL);
-
-       if (!buf)
-               return -1;
-
-       if (!name) {
-               static char commit_name[60];
-               strcpy(commit_name, sha1_to_hex(commit));
-               name = commit_name;
-       }
+       struct commit_list *parents;
+       unsigned const char *sha1 = commit->object.sha1;
 
        /* Root commit? */
-       if (show_root_diff && memcmp(buf + 46, "parent ", 7)) {
-               header = generate_header(name, "root", buf, size);
-               diff_root_tree(commit, "");
+       if (show_root_diff && !commit->parents) {
+               header = generate_header(sha1, NULL, commit);
+               diff_root_tree(sha1, "");
        }
 
        /* More than one parent? */
-       if (ignore_merges) {
-               if (!memcmp(buf + 46 + 48, "parent ", 7))
+       if (commit->parents && commit->parents->next) {
+               if (ignore_merges)
                        return 0;
+               else if (combine_merges) {
+                       header = generate_header(sha1, sha1, commit);
+                       header = diff_tree_combined_merge(sha1, header,
+                                                       dense_combined_merges,
+                                                       &diff_options);
+                       if (!header && verbose_header)
+                               header_prefix = "\ndiff-tree ";
+                       return 0;
+               }
        }
 
-       offset = 46;
-       while (offset + 48 < size && !memcmp(buf + offset, "parent ", 7)) {
-               unsigned char parent[20];
-               if (get_sha1_hex(buf + offset + 7, parent))
-                       return -1;
-               header = generate_header(name, sha1_to_hex(parent), buf, size);
-               diff_tree_sha1_top(parent, commit, "");
+       for (parents = commit->parents; parents; parents = parents->next) {
+               struct commit *parent = parents->item;
+               header = generate_header(sha1, parent->object.sha1, commit);
+               diff_tree_sha1_top(parent->object.sha1, sha1, "");
                if (!header && verbose_header) {
                        header_prefix = "\ndiff-tree ";
                        /*
@@ -435,44 +137,76 @@ static int diff_tree_commit(const unsigned char *commit, const char *name)
                         * don't print the diffs.
                         */
                }
-               offset += 48;
        }
        return 0;
 }
 
+static int diff_tree_commit_sha1(const unsigned char *sha1)
+{
+       struct commit *commit = lookup_commit_reference(sha1);
+       if (!commit)
+               return -1;
+       return diff_tree_commit(commit);
+}
+
 static int diff_tree_stdin(char *line)
 {
        int len = strlen(line);
-       unsigned char commit[20], parent[20];
-       static char this_header[1000];
+       unsigned char sha1[20];
+       struct commit *commit;
 
        if (!len || line[len-1] != '\n')
                return -1;
        line[len-1] = 0;
-       if (get_sha1_hex(line, commit))
+       if (get_sha1_hex(line, sha1))
+               return -1;
+       commit = lookup_commit(sha1);
+       if (!commit || parse_commit(commit))
                return -1;
-       if (isspace(line[40]) && !get_sha1_hex(line+41, parent)) {
-               line[40] = 0;
-               line[81] = 0;
-               sprintf(this_header, "%s (from %s)\n", line, line+41);
-               header = this_header;
-               return diff_tree_sha1_top(parent, commit, "");
+       if (isspace(line[40]) && !get_sha1_hex(line+41, sha1)) {
+               /* Graft the fake parents locally to the commit */
+               int pos = 41;
+               struct commit_list **pptr, *parents;
+
+               /* Free the real parent list */
+               for (parents = commit->parents; parents; ) {
+                       struct commit_list *tmp = parents->next;
+                       free(parents);
+                       parents = tmp;
+               }
+               commit->parents = NULL;
+               pptr = &(commit->parents);
+               while (line[pos] && !get_sha1_hex(line + pos, sha1)) {
+                       struct commit *parent = lookup_commit(sha1);
+                       if (parent) {
+                               pptr = &commit_list_insert(parent, pptr)->next;
+                       }
+                       pos += 41;
+               }
        }
-       line[40] = 0;
-       return diff_tree_commit(commit, line);
+       return diff_tree_commit(commit);
 }
 
-static char *diff_tree_usage =
-"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S<string>] [-m] [-s] [-v] <tree-ish> <tree-ish>";
+static const char diff_tree_usage[] =
+"git-diff-tree [--stdin] [-m] [-c] [--cc] [-s] [-v] [--pretty] [-t] [-r] [--root] "
+"[<common diff options>] <tree-ish> [<tree-ish>] [<path>...]\n"
+"  -r            diff recursively\n"
+"  --root        include the initial commit as diff against /dev/null\n"
+COMMON_DIFF_OPTIONS_HELP;
 
 int main(int argc, const char **argv)
 {
        int nr_sha1;
        char line[1000];
        unsigned char sha1[2][20];
+       const char *prefix = setup_git_directory();
 
+       git_config(git_diff_config);
        nr_sha1 = 0;
+       diff_setup(&diff_options);
+
        for (;;) {
+               int diff_opt_cnt;
                const char *arg;
 
                argv++;
@@ -489,53 +223,51 @@ int main(int argc, const char **argv)
                        break;
                }
 
+               diff_opt_cnt = diff_opt_parse(&diff_options, argv, argc);
+               if (diff_opt_cnt < 0)
+                       usage(diff_tree_usage);
+               else if (diff_opt_cnt) {
+                       argv += diff_opt_cnt - 1;
+                       argc -= diff_opt_cnt - 1;
+                       continue;
+               }
+
+
                if (!strcmp(arg, "--")) {
                        argv++;
                        argc--;
                        break;
                }
                if (!strcmp(arg, "-r")) {
-                       recursive = 1;
+                       diff_options.recursive = 1;
                        continue;
                }
-               if (!strcmp(arg, "-R")) {
-                       reverse_diff = 1;
+               if (!strcmp(arg, "-t")) {
+                       diff_options.recursive = 1;
+                       diff_options.tree_in_recursive = 1;
                        continue;
                }
-               if (!strcmp(arg, "-p")) {
-                       diff_output_format = DIFF_FORMAT_PATCH;
-                       recursive = 1;
-                       continue;
-               }
-               if (!strncmp(arg, "-S", 2)) {
-                       pickaxe = arg + 2;
-                       continue;
-               }
-               if (!strncmp(arg, "-M", 2)) {
-                       detect_rename = DIFF_DETECT_RENAME;
-                       diff_score_opt = diff_scoreopt_parse(arg);
-                       continue;
-               }
-               if (!strncmp(arg, "-C", 2)) {
-                       detect_rename = DIFF_DETECT_COPY;
-                       diff_score_opt = diff_scoreopt_parse(arg);
+               if (!strcmp(arg, "-m")) {
+                       combine_merges = ignore_merges = 0;
                        continue;
                }
-               if (!strcmp(arg, "-z")) {
-                       diff_output_format = DIFF_FORMAT_MACHINE;
+               if (!strcmp(arg, "-c")) {
+                       combine_merges = 1;
                        continue;
                }
-               if (!strcmp(arg, "-m")) {
-                       ignore_merges = 0;
+               if (!strcmp(arg, "--cc")) {
+                       dense_combined_merges = combine_merges = 1;
                        continue;
                }
-               if (!strcmp(arg, "-s")) {
-                       diff_output_format = DIFF_FORMAT_NO_OUTPUT;
+               if (!strcmp(arg, "-v")) {
+                       verbose_header = 1;
+                       header_prefix = "diff-tree ";
                        continue;
                }
-               if (!strcmp(arg, "-v")) {
+               if (!strncmp(arg, "--pretty", 8)) {
                        verbose_header = 1;
                        header_prefix = "diff-tree ";
+                       commit_format = get_commit_format(arg+8);
                        continue;
                }
                if (!strcmp(arg, "--stdin")) {
@@ -546,18 +278,29 @@ int main(int argc, const char **argv)
                        show_root_diff = 1;
                        continue;
                }
+               if (!strcmp(arg, "--no-commit-id")) {
+                       no_commit_id = 1;
+                       continue;
+               }
+               if (!strcmp(arg, "--always")) {
+                       always_show_header = 1;
+                       continue;
+               }
                usage(diff_tree_usage);
        }
 
-       if (argc > 0) {
-               int i;
+       if (combine_merges)
+               ignore_merges = 0;
 
-               paths = argv;
-               nr_paths = argc;
-               pathlens = xmalloc(nr_paths * sizeof(int));
-               for (i=0; i<nr_paths; i++)
-                       pathlens[i] = strlen(paths[i]);
-       }
+       /* We can only do dense combined merges with diff output */
+       if (dense_combined_merges)
+               diff_options.output_format = DIFF_FORMAT_PATCH;
+
+       if (diff_options.output_format == DIFF_FORMAT_PATCH)
+               diff_options.recursive = 1;
+
+       diff_tree_setup_paths(get_pathspec(prefix, argv));
+       diff_setup_done(&diff_options);
 
        switch (nr_sha1) {
        case 0:
@@ -565,7 +308,7 @@ int main(int argc, const char **argv)
                        usage(diff_tree_usage);
                break;
        case 1:
-               diff_tree_commit(sha1[0], NULL);
+               diff_tree_commit_sha1(sha1[0]);
                break;
        case 2:
                diff_tree_sha1_top(sha1[0], sha1[1], "");
@@ -575,6 +318,9 @@ int main(int argc, const char **argv)
        if (!read_stdin)
                return 0;
 
+       if (diff_options.detect_rename)
+               diff_options.setup |= (DIFF_SETUP_USE_SIZE_CACHE |
+                                      DIFF_SETUP_USE_CACHE);
        while (fgets(line, sizeof(line), stdin))
                diff_tree_stdin(line);