[PATCH] adjust git-deltafy-script to the new diff-tree output format

diff --git a/ls-tree.c b/ls-tree.c
index e25de016788315c3970370c2d72b91c95bb0fcd3..0f455c2e5486bf1f4755d3656d2af0b6d5270a0d 100644 (file)
--- a/ls-tree.c
+++ b/ls-tree.c
@@ -5,8 +5,8 @@
  */
 #include "cache.h"
 
-int line_termination = '\n';
-int recursive = 0;
+static int line_termination = '\n';
+static int recursive = 0;
 
 struct path_prefix {
        struct path_prefix *prev;
@@ -24,9 +24,9 @@ static void print_path_prefix(struct path_prefix *prefix)
 }
 
 static void list_recursive(void *buffer,
-                         unsigned char *type,
-                         unsigned long size,
-                         struct path_prefix *prefix)
+                          const char *type,
+                          unsigned long size,
+                          struct path_prefix *prefix)
 {
        struct path_prefix this_prefix;
        this_prefix.prev = prefix;
@@ -48,30 +48,22 @@ static void list_recursive(void *buffer,
                buffer = sha1 + 20;
                size -= namelen + 20;
 
-               /* XXX: We do some ugly mode heuristics here.
-                * It seems not worth it to read each file just to get this
-                * and the file size. -- pasky@ucw.cz
-                * ... that is, when we are not recursive -- junkio@cox.net
-                */
-               eltbuf = (recursive ? read_sha1_file(sha1, elttype, &eltsize) :
-                         NULL);
-               if (! eltbuf) {
-                       if (recursive)
-                               error("cannot read %s", sha1_to_hex(sha1));
-                       type = S_ISDIR(mode) ? "tree" : "blob";
-               }
-               else
-                       type = elttype;
-
-               printf("%03o\t%s\t%s\t", mode, type, sha1_to_hex(sha1));
+               printf("%06o\t%s\t%s\t", mode,
+                      S_ISDIR(mode) ? "tree" : "blob",
+                      sha1_to_hex(sha1));
                print_path_prefix(prefix);
                fputs(path, stdout);
                putchar(line_termination);
 
-               if (eltbuf && !strcmp(type, "tree")) {
-                       this_prefix.name = path;
-                       list_recursive(eltbuf, elttype, eltsize, &this_prefix);
+               if (! recursive || ! S_ISDIR(mode))
+                       continue;
+
+               if (! (eltbuf = read_sha1_file(sha1, elttype, &eltsize)) ) {
+                       error("cannot read %s", sha1_to_hex(sha1));
+                       continue;
                }
+               this_prefix.name = path;
+               list_recursive(eltbuf, elttype, eltsize, &this_prefix);
                free(eltbuf);
        }
 }
@@ -80,19 +72,16 @@ static int list(unsigned char *sha1)
 {
        void *buffer;
        unsigned long size;
-       char type[20];
 
-       buffer = read_sha1_file(sha1, type, &size);
+       buffer = read_object_with_reference(sha1, "tree", &size, NULL);
        if (!buffer)
                die("unable to read sha1 file");
-       list_recursive(buffer, type, size, NULL);
+       list_recursive(buffer, "tree", size, NULL);
+       free(buffer);
        return 0;
 }
 
-static void _usage(void)
-{
-       usage("ls-tree [-r] [-z] <key>");
-}
+static const char *ls_tree_usage = "git-ls-tree [-r] [-z] <key>";
 
 int main(int argc, char **argv)
 {
@@ -107,18 +96,15 @@ int main(int argc, char **argv)
                        recursive = 1;
                        break;
                default:
-                       _usage();
+                       usage(ls_tree_usage);
                }
                argc--; argv++;
        }
 
        if (argc != 2)
-               _usage();
-       if (get_sha1_hex(argv[1], sha1) < 0)
-               _usage();
-       sha1_file_directory = getenv(DB_ENVIRONMENT);
-       if (!sha1_file_directory)
-               sha1_file_directory = DEFAULT_DB_ENVIRONMENT;
+               usage(ls_tree_usage);
+       if (get_sha1(argv[1], sha1) < 0)
+               usage(ls_tree_usage);
        if (list(sha1) < 0)
                die("list failed");
        return 0;