Fix up previous commit

[git.git] / diff-tree.c

diff --git a/diff-tree.c b/diff-tree.c
index d3d83bd..5559dd3 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -3,6 +3,7 @@
 #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;
@@ -10,6 +11,8 @@ static int read_stdin = 0;
 static int line_termination = '\n';
 static int generate_patch = 0;
 static int detect_rename = 0;
+static int reverse_diff = 0;
+static int diff_score_opt = 0;
 static const char *header = NULL;
 static const char *header_prefix = "";
 
@@ -83,21 +86,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)
@@ -106,7 +101,6 @@ 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);
@@ -150,17 +144,7 @@ static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns
        if (silent)
                return 0;
 
-       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);
-       }
+       diff_change(mode1, mode2, sha1, sha2, base, path1);
        return 0;
 }
 
@@ -286,14 +270,33 @@ static int diff_tree_sha1_top(const unsigned char *old,
                              const unsigned char *new, const char *base)
 {
        int ret;
-       if (generate_patch)
-               diff_setup(detect_rename, 0, 0, 0, 0);
+
+       diff_setup(detect_rename, diff_score_opt, reverse_diff,
+                  (generate_patch ? -1 : line_termination),
+                  0, 0);
        ret = diff_tree_sha1(old, new, base);
-       if (generate_patch)
-               diff_flush();
+       diff_flush();
        return ret;
 }
 
+static int diff_root_tree(const unsigned char *new, const char *base)
+{
+       int retval;
+       void *tree;
+       unsigned long size;
+
+       diff_setup(detect_rename, diff_score_opt, reverse_diff,
+                  (generate_patch ? -1 : line_termination),
+                  0, 0);
+       tree = read_object_with_reference(new, "tree", &size, 0);
+       if (!tree)
+               die("unable to read root tree (%s)", sha1_to_hex(new));
+       retval = diff_tree("", 0, tree, size, base);
+       free(tree);
+       diff_flush();
+       return retval;
+}
+
 static int get_one_line(const char *msg, unsigned long len)
 {
        int ret = 0;
@@ -372,18 +375,24 @@ static int diff_tree_commit(const unsigned char *commit, const char *name)
        if (!buf)
                return -1;
 
-       /* More than one parent? */
-       if (ignore_merges) {
-               if (!memcmp(buf + 46 + 48, "parent ", 7))
-                       return 0;
-       }
-
        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;
+       }
+
        offset = 46;
        while (offset + 48 < size && !memcmp(buf + offset, "parent ", 7)) {
                unsigned char parent[20];
@@ -421,7 +430,7 @@ static int diff_tree_stdin(char *line)
 }
 
 static char *diff_tree_usage =
-"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-m] [-s] [-v] <tree-ish> <tree-ish>";
+"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-R] [-m] [-s] [-v] <tree-ish> <tree-ish>";
 
 int main(int argc, char **argv)
 {
@@ -456,12 +465,17 @@ 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;
                        continue;
                }
-               if (!strcmp(arg, "-M")) {
+               if (!strncmp(arg, "-M", 2)) {
                        detect_rename = recursive = generate_patch = 1;
+                       diff_score_opt = diff_scoreopt_parse(arg);
                        continue;
                }
                if (!strcmp(arg, "-z")) {
@@ -485,6 +499,10 @@ int main(int argc, char **argv)
                        read_stdin = 1;
                        continue;
                }
+               if (!strcmp(arg, "--root")) {
+                       show_root_diff = 1;
+                       continue;
+               }
                usage(diff_tree_usage);
        }