Separate the raw diff and patch with a newline
[gitweb.git] / ls-tree.c
index e25de016788315c3970370c2d72b91c95bb0fcd3..e4ef200985030e8dee6f23dbe723bfa476160db0 100644 (file)
--- a/ls-tree.c
+++ b/ls-tree.c
  * Copyright (C) Linus Torvalds, 2005
  */
 #include "cache.h"
-
-int line_termination = '\n';
-int recursive = 0;
-
-struct path_prefix {
-       struct path_prefix *prev;
-       const char *name;
-};
-
-static void print_path_prefix(struct path_prefix *prefix)
+#include "blob.h"
+#include "tree.h"
+#include "quote.h"
+
+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 abbrev = 0;
+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] [--abbrev[=<n>]] <tree-ish> [path...]";
+
+static int show_recursive(const char *base, int baselen, const char *pathname)
 {
-       if (prefix) {
-               if (prefix->prev)
-                       print_path_prefix(prefix->prev);
-               fputs(prefix->name, stdout);
-               putchar('/');
+       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;
        }
 }
 
-static void list_recursive(void *buffer,
-                         unsigned char *type,
-                         unsigned long size,
-                         struct path_prefix *prefix)
+static int show_tree(unsigned char *sha1, const char *base, int baselen,
+                    const char *pathname, unsigned mode, int stage)
 {
-       struct path_prefix this_prefix;
-       this_prefix.prev = prefix;
-
-       if (strcmp(type, "tree"))
-               die("expected a 'tree' node");
-
-       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;
-
-               /* 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));
-               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);
+       int retval = 0;
+       const char *type = blob_type;
+
+       if (S_ISDIR(mode)) {
+               if (show_recursive(base, baselen, pathname)) {
+                       retval = READ_TREE_RECURSIVE;
+                       if (!(ls_options & LS_SHOW_TREES))
+                               return retval;
                }
-               free(eltbuf);
+               type = tree_type;
        }
+       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,
+                               abbrev ? find_unique_abbrev(sha1,abbrev)
+                                       : sha1_to_hex(sha1));
+       write_name_quoted(base + chomp_prefix, baselen - chomp_prefix,
+                         pathname,
+                         line_termination, stdout);
+       putchar(line_termination);
+       return retval;
 }
 
-static int list(unsigned char *sha1)
-{
-       void *buffer;
-       unsigned long size;
-       char type[20];
-
-       buffer = read_sha1_file(sha1, type, &size);
-       if (!buffer)
-               die("unable to read sha1 file");
-       list_recursive(buffer, type, size, NULL);
-       return 0;
-}
-
-static void _usage(void)
-{
-       usage("ls-tree [-r] [-z] <key>");
-}
-
-int main(int argc, char **argv)
+int main(int argc, const char **argv)
 {
        unsigned char sha1[20];
+       struct tree *tree;
 
+       prefix = setup_git_directory();
+       git_config(git_default_config);
+       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':
-                       recursive = 1;
+                       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;
+                       }
+                       if (!strncmp(argv[1]+2, "abbrev=",7)) {
+                               abbrev = strtoul(argv[1]+9, NULL, 10);
+                               if (abbrev && abbrev < MINIMUM_ABBREV)
+                                       abbrev = MINIMUM_ABBREV;
+                               else if (abbrev > 40)
+                                       abbrev = 40;
+                               break;
+                       }
+                       if (!strcmp(argv[1]+2, "abbrev")) {
+                               abbrev = DEFAULT_ABBREV;
+                               break;
+                       }
+                       /* otherwise fallthru */
                default:
-                       _usage();
+                       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();
-       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;
-       if (list(sha1) < 0)
-               die("list failed");
        return 0;
 }