ls-tree: major rewrite to do pathspec
[gitweb.git] / ls-tree.c
index 102b12555b01ca7e7855e72479b062088e9f3b29..598b729497370ef8a91477534759933d20c8a620 100644 (file)
--- a/ls-tree.c
+++ b/ls-tree.c
@@ -4,50 +4,68 @@
  * Copyright (C) Linus Torvalds, 2005
  */
 #include "cache.h"
+#include "blob.h"
+#include "tree.h"
+#include "quote.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 const char ls_tree_usage[] =
+       "git-ls-tree [-d] [-r] [-z] <tree-ish> [path...]";
+
+static int show_tree(unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage)
 {
-       void *buffer;
-       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);
+       const char *type = "blob";
+       int retval = 0;
+
+       if (S_ISDIR(mode)) {
+               type = "tree";
+               if (ls_options & LS_RECURSIVE)
+                       retval = READ_TREE_RECURSIVE;
        }
-       return 0;
+
+       printf("%06o %s %s\t%.*s%s%c", mode, type, sha1_to_hex(sha1), baselen, base, pathname, line_termination);
+       return retval;
 }
 
-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':
+                       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 = 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);
 
-       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)
-               die("list failed");
        return 0;
 }