tar-tree: Remove obsolete code

[git.git] / ls-tree.c

diff --git a/ls-tree.c b/ls-tree.c
index 102b125..d005643 100644 (file)
--- a/ls-tree.c
+++ b/ls-tree.c
@@ -4,50 +4,136 @@
  * 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
+#define LS_SHOW_TREES 4
+#define LS_NAME_ONLY 8
+static int ls_options = 0;
+const char **pathspec;
+static int chomp_prefix = 0;
+static const char *prefix;
+
+static const char ls_tree_usage[] =
+       "git-ls-tree [-d] [-r] [-t] [-z] [--name-only] [--name-status] [--full-name] <tree-ish> [path...]";
+
+static int show_recursive(const char *base, int baselen, const char *pathname)
 {
-       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 **s;
+
+       if (ls_options & LS_RECURSIVE)
+               return 1;
+
+       s = pathspec;
+       if (!s)
+               return 0;
+
+       for (;;) {
+               const char *spec = *s++;
+               int len, speclen;
+
+               if (!spec)
+                       return 0;
+               if (strncmp(base, spec, baselen))
+                       continue;
+               len = strlen(pathname);
+               spec += baselen;
+               speclen = strlen(spec);
+               if (speclen <= len)
+                       continue;
+               if (memcmp(pathname, spec, len))
+                       continue;
+               return 1;
        }
-       return 0;
 }
 
-int main(int argc, char **argv)
+static int show_tree(unsigned char *sha1, const char *base, int baselen,
+                    const char *pathname, unsigned mode, int stage)
+{
+       int retval = 0;
+       const char *type = "blob";
+
+       if (S_ISDIR(mode)) {
+               if (show_recursive(base, baselen, pathname)) {
+                       retval = READ_TREE_RECURSIVE;
+                       if (!(ls_options & LS_SHOW_TREES))
+                               return retval;
+               }
+               type = "tree";
+       }
+       else if (ls_options & LS_TREE_ONLY)
+               return 0;
+
+       if (chomp_prefix &&
+           (baselen < chomp_prefix || memcmp(prefix, base, chomp_prefix)))
+               return 0;
+
+       if (!(ls_options & LS_NAME_ONLY))
+               printf("%06o %s %s\t", mode, type, sha1_to_hex(sha1));
+       write_name_quoted(base + chomp_prefix, baselen - chomp_prefix,
+                         pathname,
+                         line_termination, stdout);
+       putchar(line_termination);
+       return retval;
+}
+
+int main(int argc, const char **argv)
 {
        unsigned char sha1[20];
+       struct tree *tree;
+
+       prefix = setup_git_directory();
+       if (prefix && *prefix)
+               chomp_prefix = strlen(prefix);
+       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;
+               case 't':
+                       ls_options |= LS_SHOW_TREES;
+                       break;
+               case '-':
+                       if (!strcmp(argv[1]+2, "name-only") ||
+                           !strcmp(argv[1]+2, "name-status")) {
+                               ls_options |= LS_NAME_ONLY;
+                               break;
+                       }
+                       if (!strcmp(argv[1]+2, "full-name")) {
+                               chomp_prefix = 0;
+                               break;
+                       }
+                       /* otherwise fallthru */
+               default:
+                       usage(ls_tree_usage);
+               }
+               argc--; argv++;
+       }
+       /* -d -r should imply -t, but -d by itself should not have to. */
+       if ( (LS_TREE_ONLY|LS_RECURSIVE) ==
+           ((LS_TREE_ONLY|LS_RECURSIVE) & ls_options))
+               ls_options |= LS_SHOW_TREES;
+
+       if (argc < 2)
+               usage(ls_tree_usage);
+       if (get_sha1(argv[1], sha1) < 0)
+               usage(ls_tree_usage);
+
+       pathspec = get_pathspec(prefix, argv + 2);
+       tree = parse_tree_indirect(sha1);
+       if (!tree)
+               die("not a tree object");
+       read_tree_recursive(tree, "", 0, 0, pathspec, 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;
 }