mirror of
https://github.com/git/git.git
synced 2024-11-01 14:57:52 +01:00
6af1f0192f
This is a complete rewrite of ls-tree to make it behave more like what "/bin/ls -a" does in the current working directory. Namely, the changes are: - Unlike the old ls-tree behaviour that used paths arguments to restrict output (not that it worked as intended---as pointed out in the mailing list discussion, it was quite incoherent), this rewrite uses paths arguments to specify what to show. - Without arguments, it implicitly uses the root level as its sole argument ("/bin/ls -a" behaves as if "." is given without argument). - Without -r (recursive) flag, it shows the named blob (either file or symlink), or the named tree and its immediate children. - With -r flag, it shows the named path, and recursively descends into it if it is a tree. - With -d flag, it shows the named path and does not show its children even if the path is a tree, nor descends into it recursively. This is still request-for-comments patch. There is no mailing list consensus that this proposed new behaviour is a good one. The patch to t/t3100-ls-tree-restrict.sh illustrates user-visible behaviour changes. Namely: * "git-ls-tree $tree path1 path0" lists path1 first and then path0. It used to use paths as an output restrictor and showed output in cache entry order (i.e. path0 first and then path1) regardless of the order of paths arguments. * "git-ls-tree $tree path2" lists path2 and its immediate children but having explicit paths argument does not imply recursive behaviour anymore, hence paths/baz is shown but not paths/baz/b. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
247 lines
5.6 KiB
C
247 lines
5.6 KiB
C
/*
|
|
* GIT - The information manager from hell
|
|
*
|
|
* Copyright (C) Linus Torvalds, 2005
|
|
*/
|
|
#include "cache.h"
|
|
#include "blob.h"
|
|
#include "tree.h"
|
|
|
|
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)
|
|
{
|
|
unsigned char rsha[20];
|
|
unsigned long size;
|
|
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];
|
|
|
|
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;
|
|
}
|