ls-tree: major rewrite to do pathspec
[gitweb.git] / ls-tree.c
index d2ab02e3484efaf851c50574e603c785d713bc87..598b729497370ef8a91477534759933d20c8a620 100644 (file)
--- a/ls-tree.c
+++ b/ls-tree.c
@@ -4,95 +4,51 @@
  * Copyright (C) Linus Torvalds, 2005
  */
 #include "cache.h"
+#include "blob.h"
+#include "tree.h"
+#include "quote.h"
 
-int line_termination = '\n';
-int recursive = 0;
+static int line_termination = '\n';
+#define LS_RECURSIVE 1
+#define LS_TREE_ONLY 2
+static int ls_options = 0;
 
-struct path_prefix {
-       struct path_prefix *prev;
-       const char *name;
-};
+static const char ls_tree_usage[] =
+       "git-ls-tree [-d] [-r] [-z] <tree-ish> [path...]";
 
-static void print_path_prefix(struct path_prefix *prefix)
+static int show_tree(unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage)
 {
-       if (prefix) {
-               if (prefix->prev)
-                       print_path_prefix(prefix->prev);
-               fputs(prefix->name, stdout);
-               putchar('/');
-       }
-}
-
-static void list_recursive(void *buffer,
-                          const unsigned char *type,
-                          unsigned long size,
-                          struct path_prefix *prefix)
-{
-       struct path_prefix this_prefix;
-       this_prefix.prev = prefix;
-
-       if (strcmp(type, "tree"))
-               die("expected a 'tree' node");
+       const char *type = "blob";
+       int retval = 0;
 
-       while (size) {
-               int namelen = strlen(buffer)+1;
-               void *eltbuf;
-               char elttype[20];
-               unsigned long eltsize;
-               unsigned char *sha1 = buffer + namelen;
-               char *path = strchr(buffer, ' ') + 1;
-               unsigned int mode;
-
-               if (size < namelen + 20 || sscanf(buffer, "%o", &mode) != 1)
-                       die("corrupt 'tree' file");
-               buffer = sha1 + 20;
-               size -= namelen + 20;
-
-               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 (! 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);
+       if (S_ISDIR(mode)) {
+               type = "tree";
+               if (ls_options & LS_RECURSIVE)
+                       retval = READ_TREE_RECURSIVE;
        }
-}
 
-static int list(unsigned char *sha1)
-{
-       void *buffer;
-       unsigned long size;
-
-       buffer = read_object_with_reference(sha1, "tree", &size, 0);
-       if (!buffer)
-               die("unable to read sha1 file");
-       list_recursive(buffer, "tree", size, NULL);
-       return 0;
+       printf("%06o %s %s\t%.*s%s%c", mode, type, sha1_to_hex(sha1), baselen, base, pathname, line_termination);
+       return retval;
 }
 
-static const char *ls_tree_usage = "ls-tree [-r] [-z] <key>";
-
-int main(int argc, char **argv)
+int main(int argc, const char **argv)
 {
+       const char **path, *prefix;
        unsigned char sha1[20];
+       char *buf;
+       unsigned long size;
 
+       prefix = setup_git_directory();
        while (1 < argc && argv[1][0] == '-') {
                switch (argv[1][1]) {
                case 'z':
                        line_termination = 0;
                        break;
                case 'r':
-                       recursive = 1;
+                       ls_options |= LS_RECURSIVE;
+                       break;
+               case 'd':
+                       ls_options |= LS_TREE_ONLY;
                        break;
                default:
                        usage(ls_tree_usage);
@@ -100,14 +56,16 @@ int main(int argc, char **argv)
                argc--; argv++;
        }
 
-       if (argc != 2)
+       if (argc < 2)
                usage(ls_tree_usage);
-       if (get_sha1_hex(argv[1], sha1) < 0)
+       if (get_sha1(argv[1], sha1) < 0)
                usage(ls_tree_usage);
-       sha1_file_directory = getenv(DB_ENVIRONMENT);
-       if (!sha1_file_directory)
-               sha1_file_directory = DEFAULT_DB_ENVIRONMENT;
-       if (list(sha1) < 0)
-               die("list failed");
+
+       path = get_pathspec(prefix, argv + 2);
+       buf = read_object_with_reference(sha1, "tree", &size, NULL);
+       if (!buf)
+               die("not a tree object");
+       read_tree_recursive(buf, size, "", 0, 0, path, show_tree);
+
        return 0;
 }