[PATCH] Rewrite ls-tree to behave more like "/bin/ls -a"
[git.git] / ls-tree.c
index 102b125..d2a57d0 100644 (file)
--- a/ls-tree.c
+++ b/ls-tree.c
  * Copyright (C) Linus Torvalds, 2005
  */
 #include "cache.h"
+#include "blob.h"
+#include "tree.h"
 
-static int list(unsigned char *sha1)
+static int line_termination = '\n';
+#define LS_RECURSIVE 1
+#define LS_TREE_ONLY 2
+static int ls_options = 0;
+
+static struct tree_entry_list root_entry;
+
+static void prepare_root(unsigned char *sha1)
 {
-       void *buffer;
+       unsigned char rsha[20];
        unsigned long size;
-       char type[20];
-
-       buffer = read_sha1_file(sha1, type, &size);
-       if (!buffer)
-               die("unable to read sha1 file");
-       if (strcmp(type, "tree"))
-               die("expected a 'tree' node");
-       while (size) {
-               int len = strlen(buffer)+1;
-               unsigned char *sha1 = buffer + len;
-               char *path = strchr(buffer, ' ')+1;
-               unsigned int mode;
-               unsigned char *type;
-
-               if (size < len + 20 || sscanf(buffer, "%o", &mode) != 1)
-                       die("corrupt 'tree' file");
-               buffer = sha1 + 20;
-               size -= len + 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 */
-               type = S_ISDIR(mode) ? "tree" : "blob";
-               printf("%03o\t%s\t%s\t%s\n", mode, type, sha1_to_hex(sha1), path);
+       void *buf;
+       struct tree *root_tree;
+
+       buf = read_object_with_reference(sha1, "tree", &size, rsha);
+       free(buf);
+       if (!buf)
+               die("Could not read %s", sha1_to_hex(sha1));
+
+       root_tree = lookup_tree(rsha);
+       if (!root_tree)
+               die("Could not read %s", sha1_to_hex(sha1));
+
+       /* Prepare a fake entry */
+       root_entry.directory = 1;
+       root_entry.executable = root_entry.symlink = 0;
+       root_entry.mode = S_IFDIR;
+       root_entry.name = "";
+       root_entry.item.tree = root_tree;
+       root_entry.parent = NULL;
+}
+
+static int prepare_children(struct tree_entry_list *elem)
+{
+       if (!elem->directory)
+               return -1;
+       if (!elem->item.tree->object.parsed) {
+               struct tree_entry_list *e;
+               if (parse_tree(elem->item.tree))
+                       return -1;
+               /* Set up the parent link */
+               for (e = elem->item.tree->entries; e; e = e->next)
+                       e->parent = elem;
        }
        return 0;
 }
 
+static struct tree_entry_list *find_entry_0(struct tree_entry_list *elem,
+                                           const char *path,
+                                           const char *path_end)
+{
+       const char *ep;
+       int len;
+
+       while (path < path_end) {
+               if (prepare_children(elem))
+                       return NULL;
+
+               /* In elem->tree->entries, find the one that has name
+                * that matches what is between path and ep.
+                */
+               elem = elem->item.tree->entries;
+
+               ep = strchr(path, '/');
+               if (!ep || path_end <= ep)
+                       ep = path_end;
+               len = ep - path;
+
+               while (elem) {
+                       if ((strlen(elem->name) == len) &&
+                           !strncmp(elem->name, path, len))
+                               break;
+                       elem = elem->next;
+               }
+               if (path_end <= ep || !elem)
+                       return elem;
+               while (*ep == '/' && ep < path_end)
+                       ep++;
+               path = ep;
+       }
+       return NULL;
+}
+
+static struct tree_entry_list *find_entry(const char *path,
+                                         const char *path_end)
+{
+       /* Find tree element, descending from root, that
+        * corresponds to the named path, lazily expanding
+        * the tree if possible.
+        */
+       if (path == path_end) {
+               /* Special.  This is the root level */
+               return &root_entry;
+       }
+       return find_entry_0(&root_entry, path, path_end);
+}
+
+static void show_entry_name(struct tree_entry_list *e)
+{
+       /* This is yucky.  The root level is there for
+        * our convenience but we really want to do a
+        * forest.
+        */
+       if (e->parent && e->parent != &root_entry) {
+               show_entry_name(e->parent);
+               putchar('/');
+       }
+       printf("%s", e->name);
+}
+
+static const char *entry_type(struct tree_entry_list *e)
+{
+       return (e->directory ? "tree" : "blob");
+}
+
+static const char *entry_hex(struct tree_entry_list *e)
+{
+       return sha1_to_hex(e->directory
+                          ? e->item.tree->object.sha1
+                          : e->item.blob->object.sha1);
+}
+
+/* forward declaration for mutually recursive routines */
+static int show_entry(struct tree_entry_list *, int);
+
+static int show_children(struct tree_entry_list *e, int level)
+{
+       if (prepare_children(e))
+               die("internal error: ls-tree show_children called with non tree");
+       e = e->item.tree->entries;
+       while (e) {
+               show_entry(e, level);
+               e = e->next;
+       }
+       return 0;
+}
+
+static int show_entry(struct tree_entry_list *e, int level)
+{
+       int err = 0; 
+
+       if (e != &root_entry) {
+               printf("%06o %s %s      ", e->mode, entry_type(e),
+                      entry_hex(e));
+               show_entry_name(e);
+               putchar(line_termination);
+       }
+
+       if (e->directory) {
+               /* If this is a directory, we have the following cases:
+                * (1) This is the top-level request (explicit path from the
+                *     command line, or "root" if there is no command line).
+                *  a. Without any flag.  We show direct children.  We do not 
+                *     recurse into them.
+                *  b. With -r.  We do recurse into children.
+                *  c. With -d.  We do not recurse into children.
+                * (2) We came here because our caller is either (1-a) or
+                *     (1-b).
+                *  a. Without any flag.  We do not show our children (which
+                *     are grandchildren for the original request).
+                *  b. With -r.  We continue to recurse into our children.
+                *  c. With -d.  We should not have come here to begin with.
+                */
+               if (level == 0 && !(ls_options & LS_TREE_ONLY))
+                       /* case (1)-a and (1)-b */
+                       err = err | show_children(e, level+1);
+               else if (level && ls_options & LS_RECURSIVE)
+                       /* case (2)-b */
+                       err = err | show_children(e, level+1);
+       }
+       return err;
+}
+
+static int list_one(const char *path, const char *path_end)
+{
+       int err = 0;
+       struct tree_entry_list *e = find_entry(path, path_end);
+       if (!e) {
+               /* traditionally ls-tree does not complain about
+                * missing path.  We may change this later to match
+                * what "/bin/ls -a" does, which is to complain.
+                */
+               return err;
+       }
+       err = err | show_entry(e, 0);
+       return err;
+}
+
+static int list(char **path)
+{
+       int i;
+       int err = 0;
+       for (i = 0; path[i]; i++) {
+               int len = strlen(path[i]);
+               while (0 <= len && path[i][len] == '/')
+                       len--;
+               err = err | list_one(path[i], path[i] + len);
+       }
+       return err;
+}
+
+static const char *ls_tree_usage =
+       "git-ls-tree [-d] [-r] [-z] <tree-ish> [path...]";
+
 int main(int argc, char **argv)
 {
+       static char *path0[] = { "", NULL };
+       char **path;
        unsigned char sha1[20];
 
-       if (argc != 2)
-               usage("ls-tree <key>");
-       if (get_sha1_hex(argv[1], sha1) < 0)
-               usage("ls-tree <key>");
-       sha1_file_directory = getenv(DB_ENVIRONMENT);
-       if (!sha1_file_directory)
-               sha1_file_directory = DEFAULT_DB_ENVIRONMENT;
-       if (list(sha1) < 0)
+       while (1 < argc && argv[1][0] == '-') {
+               switch (argv[1][1]) {
+               case 'z':
+                       line_termination = 0;
+                       break;
+               case 'r':
+                       ls_options |= LS_RECURSIVE;
+                       break;
+               case 'd':
+                       ls_options |= LS_TREE_ONLY;
+                       break;
+               default:
+                       usage(ls_tree_usage);
+               }
+               argc--; argv++;
+       }
+
+       if (argc < 2)
+               usage(ls_tree_usage);
+       if (get_sha1(argv[1], sha1) < 0)
+               usage(ls_tree_usage);
+
+       path = (argc == 2) ? path0 : (argv + 2);
+       prepare_root(sha1);
+       if (list(path) < 0)
                die("list failed");
        return 0;
 }