[PATCH] Diffcore updates.
[git.git] / diff-tree.c
index 9e15b70..0b629d2 100644 (file)
@@ -2,15 +2,23 @@
 #include "cache.h"
 #include "diff.h"
 
+static int silent = 0;
+static int show_root_diff = 0;
+static int verbose_header = 0;
 static int ignore_merges = 1;
 static int recursive = 0;
 static int read_stdin = 0;
-static int line_termination = '\n';
-static int generate_patch = 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 const char *header = NULL;
+static const char *header_prefix = "";
 
 // What paths are we interested in?
 static int nr_paths = 0;
-static char **paths = NULL;
+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);
@@ -50,15 +58,7 @@ static char *malloc_base(const char *base, const char *path, int pathlen)
 }
 
 static void show_file(const char *prefix, void *tree, unsigned long size, const char *base);
-
-/* 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) {
-               show_file(prefix, tree, size, base);
-               update_tree_entry(&tree, &size);
-       }
-}
+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)
@@ -67,6 +67,9 @@ static void show_file(const char *prefix, void *tree, unsigned long size, const
        const char *path;
        const unsigned char *sha1 = extract(tree, size, &path, &mode);
 
+       if (silent)
+               return;
+
        if (recursive && S_ISDIR(mode)) {
                char type[20];
                unsigned long size;
@@ -78,21 +81,13 @@ static void show_file(const char *prefix, void *tree, unsigned long size, const
                        die("corrupt tree sha %s", sha1_to_hex(sha1));
 
                show_tree(prefix, tree, size, newbase);
-               
+
                free(tree);
                free(newbase);
                return;
        }
 
-       if (generate_patch) {
-               if (!S_ISDIR(mode))
-                       diff_addremove(prefix[0], mode, sha1, base, path);
-       }
-       else
-               printf("%s%06o\t%s\t%s\t%s%s%c", prefix, mode,
-                      S_ISDIR(mode) ? "tree" : "blob",
-                      sha1_to_hex(sha1), base, path,
-                      line_termination);
+       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)
@@ -101,14 +96,13 @@ static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns
        const char *path1, *path2;
        const unsigned char *sha1, *sha2;
        int cmp, pathlen1, pathlen2;
-       char old_sha1_hex[50];
 
        sha1 = extract(tree1, size1, &path1, &mode1);
        sha2 = extract(tree2, size2, &path2, &mode2);
 
        pathlen1 = strlen(path1);
        pathlen2 = strlen(path2);
-       cmp = cache_name_compare(path1, pathlen1, path2, pathlen2);
+       cmp = base_name_compare(path1, pathlen1, mode1, path2, pathlen2, mode2);
        if (cmp < 0) {
                show_file("-", tree1, size1, base);
                return -1;
@@ -138,17 +132,10 @@ static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns
                return retval;
        }
 
-       if (generate_patch) {
-               if (!S_ISDIR(mode1))
-                       diff_change(mode1, mode2, sha1, sha2, base, path1);
-       }
-       else {
-               strcpy(old_sha1_hex, sha1_to_hex(sha1));
-               printf("*%06o->%06o\t%s\t%s->%s\t%s%s%c", mode1, mode2,
-                      S_ISDIR(mode1) ? "tree" : "blob",
-                      old_sha1_hex, sha1_to_hex(sha2), base, path1,
-                      line_termination);
-       }
+       if (silent)
+               return 0;
+
+       diff_change(mode1, mode2, sha1, sha2, base, path1);
        return 0;
 }
 
@@ -190,6 +177,13 @@ static int interesting(void *tree, unsigned long size, const char *base)
                if (pathlen > matchlen)
                        continue;
 
+               if (matchlen > pathlen) {
+                       if (match[pathlen] != '/')
+                               continue;
+                       if (!S_ISDIR(mode))
+                               continue;
+               }
+
                if (strncmp(path, match, pathlen))
                        continue;
 
@@ -198,6 +192,16 @@ static int interesting(void *tree, unsigned long size, const char *base)
        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) {
@@ -230,7 +234,7 @@ static int diff_tree(void *tree1, unsigned long size1, void *tree2, unsigned lon
                        update_tree_entry(&tree2, &size2);
                        continue;
                }
-               die("diff-tree: internal error");
+               die("git-diff-tree: internal error");
        }
        return 0;
 }
@@ -241,10 +245,10 @@ static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, co
        unsigned long size1, size2;
        int retval;
 
-       tree1 = read_object_with_reference(old, "tree", &size1, 0);
+       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, 0);
+       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);
@@ -253,63 +257,240 @@ static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, co
        return retval;
 }
 
-static int diff_tree_stdin(char *line)
+static void call_diff_setup(void)
 {
-       int len = strlen(line);
-       unsigned char commit[20], parent[20];
-       unsigned long size, offset;
-       char *buf;
+       diff_setup(reverse_diff);
+}
 
-       if (!len || line[len-1] != '\n')
-               return -1;
-       line[len-1] = 0;
-       if (get_sha1_hex(line, commit))
-               return -1;
-       if (isspace(line[40]) && !get_sha1_hex(line+41, parent)) {
-               line[40] = ' ';
-               line[81] = 0;
-               printf("%s:\n", line);
-               return diff_tree_sha1(parent, commit, "");
+static int call_diff_flush()
+{
+       if (detect_rename)
+               diffcore_rename(detect_rename, diff_score_opt);
+       diffcore_prune();
+       if (pickaxe) {
+               diffcore_pickaxe(pickaxe);
+               if (diff_queue_is_empty()) {
+                       diff_flush(DIFF_FORMAT_NO_OUTPUT);
+                       return 0;
+               }
+       }
+       if (nr_paths)
+               diffcore_pathspec(paths);
+       if (header) {
+               printf("%s", header);
+               header = NULL;
        }
-       buf = read_object_with_reference(commit, "commit", &size, NULL);
+       diff_flush(diff_output_format);
+       return 1;
+}
+
+static int diff_tree_sha1_top(const unsigned char *old,
+                             const unsigned char *new, const char *base)
+{
+       int ret;
+
+       call_diff_setup();
+       ret = diff_tree_sha1(old, new, base);
+       call_diff_flush();
+       return ret;
+}
+
+static int diff_root_tree(const unsigned char *new, const char *base)
+{
+       int retval;
+       void *tree;
+       unsigned long size;
+
+       call_diff_setup();
+       tree = read_object_with_reference(new, "tree", &size, NULL);
+       if (!tree)
+               die("unable to read root tree (%s)", sha1_to_hex(new));
+       retval = diff_tree("", 0, tree, size, base);
+       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 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 */
+               if (!silent)
+                       this_header[offset++] = '\n';
+               this_header[offset] = 0;
+       }
+
+       return this_header;
+}
+
+static int diff_tree_commit(const unsigned char *commit, const char *name)
+{
+       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;
+       }
+
+       /* Root commit? */
+       if (show_root_diff && memcmp(buf + 46, "parent ", 7)) {
+               header = generate_header(name, "root", buf, size);
+               diff_root_tree(commit, "");
+       }
+
        /* More than one parent? */
        if (ignore_merges) {
                if (!memcmp(buf + 46 + 48, "parent ", 7))
                        return 0;
        }
 
-       line[40] = 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;
-               printf("%s %s:\n", line, sha1_to_hex(parent));
-               diff_tree_sha1(parent, commit, "");
+               header = generate_header(name, sha1_to_hex(parent), buf, size);
+               diff_tree_sha1_top(parent, commit, "");
+               if (!header && verbose_header) {
+                       header_prefix = "\ndiff-tree ";
+                       /*
+                        * Don't print multiple merge entries if we
+                        * don't print the diffs.
+                        */
+                       if (silent)
+                               break;
+               }
                offset += 48;
        }
-       return -1;
+       return 0;
+}
+
+static int diff_tree_stdin(char *line)
+{
+       int len = strlen(line);
+       unsigned char commit[20], parent[20];
+       static char this_header[1000];
+
+       if (!len || line[len-1] != '\n')
+               return -1;
+       line[len-1] = 0;
+       if (get_sha1_hex(line, 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, "");
+       }
+       line[40] = 0;
+       return diff_tree_commit(commit, line);
 }
 
-static char *diff_tree_usage = "diff-tree [-p] [-r] [-z] <tree sha1> <tree sha1>";
+static char *diff_tree_usage =
+"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S<string>] [-m] [-s] [-v] <tree-ish> <tree-ish>";
 
-int main(int argc, char **argv)
+int main(int argc, const char **argv)
 {
+       int nr_sha1;
        char line[1000];
-       unsigned char old[20], new[20];
+       unsigned char sha1[2][20];
 
+       nr_sha1 = 0;
        for (;;) {
-               char *arg;
+               const char *arg;
 
                argv++;
                argc--;
                arg = *argv;
-               if (!arg || *arg != '-')
+               if (!arg)
+                       break;
+
+               if (*arg != '-') {
+                       if (nr_sha1 < 2 && !get_sha1(arg, sha1[nr_sha1])) {
+                               nr_sha1++;
+                               continue;
+                       }
                        break;
+               }
 
-               if (!strcmp(arg, "-")) {
+               if (!strcmp(arg, "--")) {
                        argv++;
                        argc--;
                        break;
@@ -318,32 +499,57 @@ int main(int argc, char **argv)
                        recursive = 1;
                        continue;
                }
+               if (!strcmp(arg, "-R")) {
+                       reverse_diff = 1;
+                       continue;
+               }
                if (!strcmp(arg, "-p")) {
-                       recursive = generate_patch = 1;
+                       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);
                        continue;
                }
                if (!strcmp(arg, "-z")) {
-                       line_termination = '\0';
+                       diff_output_format = DIFF_FORMAT_MACHINE;
                        continue;
                }
                if (!strcmp(arg, "-m")) {
                        ignore_merges = 0;
                        continue;
                }
+               if (!strcmp(arg, "-s")) {
+                       silent = 1;
+                       continue;
+               }
+               if (!strcmp(arg, "-v")) {
+                       verbose_header = 1;
+                       header_prefix = "diff-tree ";
+                       continue;
+               }
                if (!strcmp(arg, "--stdin")) {
                        read_stdin = 1;
                        continue;
                }
+               if (!strcmp(arg, "--root")) {
+                       show_root_diff = 1;
+                       continue;
+               }
                usage(diff_tree_usage);
        }
 
-       if (!read_stdin) {
-               if (argc < 2 || get_sha1(argv[0], old) || get_sha1(argv[1], new))
-                       usage(diff_tree_usage);
-               argv += 2;
-               argc -= 2;
-       }
-
        if (argc > 0) {
                int i;
 
@@ -354,8 +560,21 @@ int main(int argc, char **argv)
                        pathlens[i] = strlen(paths[i]);
        }
 
+       switch (nr_sha1) {
+       case 0:
+               if (!read_stdin)
+                       usage(diff_tree_usage);
+               break;
+       case 1:
+               diff_tree_commit(sha1[0], NULL);
+               break;
+       case 2:
+               diff_tree_sha1_top(sha1[0], sha1[1], "");
+               break;
+       }
+
        if (!read_stdin)
-               return diff_tree_sha1(old, new, "");
+               return 0;
 
        while (fgets(line, sizeof(line), stdin))
                diff_tree_stdin(line);