2005-04-13 09:02:34 +00:00
|
|
|
/*
|
|
|
|
* GIT - The information manager from hell
|
|
|
|
*
|
|
|
|
* Copyright (C) Linus Torvalds, 2005
|
|
|
|
*/
|
|
|
|
#include "cache.h"
|
2017-06-14 18:07:36 +00:00
|
|
|
#include "config.h"
|
[PATCH] Rewrite ls-tree to behave more like "/bin/ls -a"
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>
2005-05-28 07:05:38 +00:00
|
|
|
#include "blob.h"
|
|
|
|
#include "tree.h"
|
2007-04-10 04:20:29 +00:00
|
|
|
#include "commit.h"
|
2005-10-15 04:56:46 +00:00
|
|
|
#include "quote.h"
|
2006-05-23 12:15:30 +00:00
|
|
|
#include "builtin.h"
|
2009-11-14 04:34:08 +00:00
|
|
|
#include "parse-options.h"
|
2013-07-14 08:35:25 +00:00
|
|
|
#include "pathspec.h"
|
2005-04-13 09:02:34 +00:00
|
|
|
|
2005-05-20 18:46:10 +00:00
|
|
|
static int line_termination = '\n';
|
[PATCH] Rewrite ls-tree to behave more like "/bin/ls -a"
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>
2005-05-28 07:05:38 +00:00
|
|
|
#define LS_RECURSIVE 1
|
|
|
|
#define LS_TREE_ONLY 2
|
2005-12-01 18:35:51 +00:00
|
|
|
#define LS_SHOW_TREES 4
|
2005-12-01 22:54:00 +00:00
|
|
|
#define LS_NAME_ONLY 8
|
2007-05-19 20:08:11 +00:00
|
|
|
#define LS_SHOW_SIZE 16
|
2006-08-15 17:23:48 +00:00
|
|
|
static int abbrev;
|
|
|
|
static int ls_options;
|
2011-03-25 09:34:19 +00:00
|
|
|
static struct pathspec pathspec;
|
2006-08-15 17:23:48 +00:00
|
|
|
static int chomp_prefix;
|
2006-07-29 05:44:25 +00:00
|
|
|
static const char *ls_tree_prefix;
|
2005-04-15 15:37:05 +00:00
|
|
|
|
2009-11-14 04:34:08 +00:00
|
|
|
static const char * const ls_tree_usage[] = {
|
2012-08-20 12:32:21 +00:00
|
|
|
N_("git ls-tree [<options>] <tree-ish> [<path>...]"),
|
2009-11-14 04:34:08 +00:00
|
|
|
NULL
|
|
|
|
};
|
2005-12-01 18:35:51 +00:00
|
|
|
|
|
|
|
static int show_recursive(const char *base, int baselen, const char *pathname)
|
|
|
|
{
|
2017-01-04 18:03:59 +00:00
|
|
|
int i;
|
2005-12-01 18:35:51 +00:00
|
|
|
|
|
|
|
if (ls_options & LS_RECURSIVE)
|
|
|
|
return 1;
|
|
|
|
|
2017-01-04 18:03:59 +00:00
|
|
|
if (!pathspec.nr)
|
2005-12-01 18:35:51 +00:00
|
|
|
return 0;
|
|
|
|
|
2017-01-04 18:03:59 +00:00
|
|
|
for (i = 0; i < pathspec.nr; i++) {
|
|
|
|
const char *spec = pathspec.items[i].match;
|
2005-12-01 18:35:51 +00:00
|
|
|
int len, speclen;
|
|
|
|
|
|
|
|
if (strncmp(base, spec, baselen))
|
|
|
|
continue;
|
|
|
|
len = strlen(pathname);
|
|
|
|
spec += baselen;
|
|
|
|
speclen = strlen(spec);
|
|
|
|
if (speclen <= len)
|
|
|
|
continue;
|
2010-09-11 18:47:09 +00:00
|
|
|
if (spec[len] && spec[len] != '/')
|
|
|
|
continue;
|
2005-12-01 18:35:51 +00:00
|
|
|
if (memcmp(pathname, spec, len))
|
|
|
|
continue;
|
|
|
|
return 1;
|
|
|
|
}
|
2017-01-04 18:03:59 +00:00
|
|
|
return 0;
|
2005-12-01 18:35:51 +00:00
|
|
|
}
|
2005-04-15 15:37:05 +00:00
|
|
|
|
2018-03-12 02:27:26 +00:00
|
|
|
static int show_tree(const struct object_id *oid, struct strbuf *base,
|
2008-07-14 19:22:12 +00:00
|
|
|
const char *pathname, unsigned mode, int stage, void *context)
|
[PATCH] Rewrite ls-tree to behave more like "/bin/ls -a"
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>
2005-05-28 07:05:38 +00:00
|
|
|
{
|
2005-12-01 18:35:51 +00:00
|
|
|
int retval = 0;
|
2014-11-30 09:05:01 +00:00
|
|
|
int baselen;
|
2006-04-02 12:44:09 +00:00
|
|
|
const char *type = blob_type;
|
2005-10-07 23:54:06 +00:00
|
|
|
|
2007-05-21 20:08:28 +00:00
|
|
|
if (S_ISGITLINK(mode)) {
|
2007-04-10 04:20:29 +00:00
|
|
|
/*
|
|
|
|
* Maybe we want to have some recursive version here?
|
|
|
|
*
|
2008-08-04 10:18:40 +00:00
|
|
|
* Something similar to this incomplete example:
|
2007-04-10 04:20:29 +00:00
|
|
|
*
|
2009-01-25 00:52:05 +00:00
|
|
|
if (show_subprojects(base, baselen, pathname))
|
|
|
|
retval = READ_TREE_RECURSIVE;
|
2007-04-10 04:20:29 +00:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
type = commit_type;
|
|
|
|
} else if (S_ISDIR(mode)) {
|
2014-11-30 09:05:00 +00:00
|
|
|
if (show_recursive(base->buf, base->len, pathname)) {
|
2005-12-01 18:35:51 +00:00
|
|
|
retval = READ_TREE_RECURSIVE;
|
|
|
|
if (!(ls_options & LS_SHOW_TREES))
|
|
|
|
return retval;
|
ls-tree: further tweaks of the rewrite
It modifies the selection a bit, so that a pathspec that is a superset of
a particular tree path will always cause it to recurse into that tree.
As an example, let's say that we do
git-ls-tree HEAD drivers/char
_without_ the "-r". What will happen is that it will start out doing all
the base tree, and for "drivers" it will notice that it's a proper subset
of "drivers/char", so it will always recurse into _that_ tree (but not
into other trees).
Then, it will not match anything else than "char" in that subdirectory,
and because that's not a proper superset (it's an exact match), it will
_not_ recurse into it, so you get:
[torvalds@g5 linux]$ ~/git/git-ls-tree HEAD drivers/char
040000 tree 9568cda453aae205bb58983747fa73b9696d9d51 drivers/char
which is what you got with the old git-ls-tree too.
But interestingly, if you add the slash, it will become a proper superset
and it will recurse into _that_ subdirectory (but no deeper: so if you
want all subdirectories _below_ drivers/char/, you still need to give
"-r"):
[torvalds@g5 linux]$ ~/git/git-ls-tree HEAD drivers/char/
100644 blob 2b6b1d772ed776fff87927fc34adc2e40500218e drivers/char/.gitignore
100644 blob 56b8a2e76ab10a5c21787cb7068a846075cbaffd drivers/char/ChangeLog
100644 blob 970f70d498f4c814e1cf3362e33d7e23ac53c299 drivers/char/Kconfig
...
See? This is on top of the previous two diffs, holler if you want a whole
new "everything combined" version..
It hasn't gotten lots of testing, but it should work.
Linus
2005-11-28 06:48:08 +00:00
|
|
|
}
|
2006-04-02 12:44:09 +00:00
|
|
|
type = tree_type;
|
[PATCH] Rewrite ls-tree to behave more like "/bin/ls -a"
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>
2005-05-28 07:05:38 +00:00
|
|
|
}
|
2005-12-01 21:15:20 +00:00
|
|
|
else if (ls_options & LS_TREE_ONLY)
|
|
|
|
return 0;
|
2005-10-07 23:54:06 +00:00
|
|
|
|
2007-05-19 20:08:11 +00:00
|
|
|
if (!(ls_options & LS_NAME_ONLY)) {
|
|
|
|
if (ls_options & LS_SHOW_SIZE) {
|
2009-03-19 22:54:29 +00:00
|
|
|
char size_text[24];
|
2007-05-19 20:08:11 +00:00
|
|
|
if (!strcmp(type, blob_type)) {
|
2009-03-19 22:54:29 +00:00
|
|
|
unsigned long size;
|
sha1_file: convert sha1_object_info* to object_id
Convert sha1_object_info and sha1_object_info_extended to take pointers
to struct object_id and rename them to use "oid" instead of "sha1" in
their names. Update the declaration and definition and apply the
following semantic patch, plus the standard object_id transforms:
@@
expression E1, E2;
@@
- sha1_object_info(E1.hash, E2)
+ oid_object_info(&E1, E2)
@@
expression E1, E2;
@@
- sha1_object_info(E1->hash, E2)
+ oid_object_info(E1, E2)
@@
expression E1, E2, E3;
@@
- sha1_object_info_extended(E1.hash, E2, E3)
+ oid_object_info_extended(&E1, E2, E3)
@@
expression E1, E2, E3;
@@
- sha1_object_info_extended(E1->hash, E2, E3)
+ oid_object_info_extended(E1, E2, E3)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-03-12 02:27:46 +00:00
|
|
|
if (oid_object_info(oid, &size) == OBJ_BAD)
|
2015-09-24 21:06:08 +00:00
|
|
|
xsnprintf(size_text, sizeof(size_text),
|
|
|
|
"BAD");
|
2009-03-19 22:54:29 +00:00
|
|
|
else
|
2015-09-24 21:06:08 +00:00
|
|
|
xsnprintf(size_text, sizeof(size_text),
|
|
|
|
"%lu", size);
|
2007-05-19 20:08:11 +00:00
|
|
|
} else
|
2015-09-24 21:06:08 +00:00
|
|
|
xsnprintf(size_text, sizeof(size_text), "-");
|
2009-03-19 22:54:29 +00:00
|
|
|
printf("%06o %s %s %7s\t", mode, type,
|
2018-03-12 02:27:30 +00:00
|
|
|
find_unique_abbrev(oid, abbrev),
|
2009-03-19 22:54:29 +00:00
|
|
|
size_text);
|
2007-05-19 20:08:11 +00:00
|
|
|
} else
|
|
|
|
printf("%06o %s %s\t", mode, type,
|
2018-03-12 02:27:30 +00:00
|
|
|
find_unique_abbrev(oid, abbrev));
|
2007-05-19 20:08:11 +00:00
|
|
|
}
|
2014-11-30 09:05:01 +00:00
|
|
|
baselen = base->len;
|
|
|
|
strbuf_addstr(base, pathname);
|
|
|
|
write_name_quoted_relative(base->buf,
|
|
|
|
chomp_prefix ? ls_tree_prefix : NULL,
|
|
|
|
stdout, line_termination);
|
|
|
|
strbuf_setlen(base, baselen);
|
2005-12-01 18:35:51 +00:00
|
|
|
return retval;
|
[PATCH] Rewrite ls-tree to behave more like "/bin/ls -a"
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>
2005-05-28 07:05:38 +00:00
|
|
|
}
|
2005-04-16 20:57:39 +00:00
|
|
|
|
2006-07-29 05:44:25 +00:00
|
|
|
int cmd_ls_tree(int argc, const char **argv, const char *prefix)
|
[PATCH] Rewrite ls-tree to behave more like "/bin/ls -a"
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>
2005-05-28 07:05:38 +00:00
|
|
|
{
|
2017-05-06 22:10:34 +00:00
|
|
|
struct object_id oid;
|
2006-01-26 06:13:36 +00:00
|
|
|
struct tree *tree;
|
2011-03-25 09:34:19 +00:00
|
|
|
int i, full_tree = 0;
|
2009-11-14 04:34:08 +00:00
|
|
|
const struct option ls_tree_options[] = {
|
2012-08-20 12:32:21 +00:00
|
|
|
OPT_BIT('d', NULL, &ls_options, N_("only show trees"),
|
2009-11-14 04:34:08 +00:00
|
|
|
LS_TREE_ONLY),
|
2012-08-20 12:32:21 +00:00
|
|
|
OPT_BIT('r', NULL, &ls_options, N_("recurse into subtrees"),
|
2009-11-14 04:34:08 +00:00
|
|
|
LS_RECURSIVE),
|
2012-08-20 12:32:21 +00:00
|
|
|
OPT_BIT('t', NULL, &ls_options, N_("show trees when recursing"),
|
2009-11-14 04:34:08 +00:00
|
|
|
LS_SHOW_TREES),
|
|
|
|
OPT_SET_INT('z', NULL, &line_termination,
|
2012-08-20 12:32:21 +00:00
|
|
|
N_("terminate entries with NUL byte"), 0),
|
|
|
|
OPT_BIT('l', "long", &ls_options, N_("include object size"),
|
2009-11-14 04:34:08 +00:00
|
|
|
LS_SHOW_SIZE),
|
2012-08-20 12:32:21 +00:00
|
|
|
OPT_BIT(0, "name-only", &ls_options, N_("list only filenames"),
|
2009-11-14 04:34:08 +00:00
|
|
|
LS_NAME_ONLY),
|
2012-08-20 12:32:21 +00:00
|
|
|
OPT_BIT(0, "name-status", &ls_options, N_("list only filenames"),
|
2009-11-14 04:34:08 +00:00
|
|
|
LS_NAME_ONLY),
|
|
|
|
OPT_SET_INT(0, "full-name", &chomp_prefix,
|
2012-08-20 12:32:21 +00:00
|
|
|
N_("use full path names"), 0),
|
2013-08-03 11:51:19 +00:00
|
|
|
OPT_BOOL(0, "full-tree", &full_tree,
|
|
|
|
N_("list entire tree; not just current directory "
|
|
|
|
"(implies --full-name)")),
|
2009-11-14 04:34:08 +00:00
|
|
|
OPT__ABBREV(&abbrev),
|
|
|
|
OPT_END()
|
|
|
|
};
|
2005-04-13 09:02:34 +00:00
|
|
|
|
2008-05-14 17:46:53 +00:00
|
|
|
git_config(git_default_config, NULL);
|
2006-07-29 05:44:25 +00:00
|
|
|
ls_tree_prefix = prefix;
|
ls-tree: chomp leading directories when run from a subdirectory
When run from a subdirectory, even though we filtered the output
based on where we were using pathspec, we wrote out the
repository relative paths, not subtree relative paths. This
changes things so that it shows only the current subdirectory
relative paths.
For example, in Documentation subdirectory of git itself, this
used to be the case:
$ git-ls-tree --name-only HEAD | grep how
Documentation/git-show-branch.txt
Documentation/git-show-index.txt
Documentation/howto-index.sh
Documentation/howto
But now it does this instead:
$ git-ls-tree --name-only HEAD | grep how
git-show-branch.txt
git-show-index.txt
howto-index.sh
howto
There are two things to keep in mind.
1. This shows nothing.
$ git-ls-tree --name-only HEAD ../ppc/
This is to make things consistent with ls-files, which
refuses relative path that goes uplevel.
2. These show things in full repository relative paths. In this
case, paths outside the current subdirectory are also shown.
$ git-ls-tree --name-only --full-name HEAD | grep how
Documentation/git-show-branch.txt
Documentation/git-show-index.txt
Documentation/howto-index.sh
Documentation/howto
$ git-ls-tree --name-only --full-name HEAD ../ppc/
ppc/sha1.c
ppc/sha1.h
ppc/sha1ppc.S
The flag --full-name gives the same behaviour as 1.0, so it
ought to be the default if we really care about the backward
compatibility, but in practice no Porcelain runs ls-tree from a
subdirectory yet, and without --full-name is more human
friendly, so hopefully the default being not --full-name would
be acceptable.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-23 21:39:30 +00:00
|
|
|
if (prefix && *prefix)
|
|
|
|
chomp_prefix = strlen(prefix);
|
2009-11-14 04:34:08 +00:00
|
|
|
|
|
|
|
argc = parse_options(argc, argv, prefix, ls_tree_options,
|
|
|
|
ls_tree_usage, 0);
|
|
|
|
if (full_tree) {
|
|
|
|
ls_tree_prefix = prefix = NULL;
|
|
|
|
chomp_prefix = 0;
|
2005-04-15 15:37:05 +00:00
|
|
|
}
|
2005-12-01 21:15:20 +00:00
|
|
|
/* -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;
|
2005-04-15 15:37:05 +00:00
|
|
|
|
2009-11-14 04:34:08 +00:00
|
|
|
if (argc < 1)
|
|
|
|
usage_with_options(ls_tree_usage, ls_tree_options);
|
2017-05-06 22:10:34 +00:00
|
|
|
if (get_oid(argv[0], &oid))
|
2009-11-14 04:34:08 +00:00
|
|
|
die("Not a valid object name %s", argv[0]);
|
[PATCH] Rewrite ls-tree to behave more like "/bin/ls -a"
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>
2005-05-28 07:05:38 +00:00
|
|
|
|
2013-07-14 08:35:31 +00:00
|
|
|
/*
|
|
|
|
* show_recursive() rolls its own matching code and is
|
|
|
|
* generally ignorant of 'struct pathspec'. The magic mask
|
|
|
|
* cannot be lifted until it is converted to use
|
2014-01-24 13:40:30 +00:00
|
|
|
* match_pathspec() or tree_entry_interesting()
|
2013-07-14 08:35:31 +00:00
|
|
|
*/
|
2017-01-04 18:03:59 +00:00
|
|
|
parse_pathspec(&pathspec, PATHSPEC_ALL_MAGIC &
|
|
|
|
~(PATHSPEC_FROMTOP | PATHSPEC_LITERAL),
|
2013-07-14 08:35:31 +00:00
|
|
|
PATHSPEC_PREFER_CWD,
|
|
|
|
prefix, argv + 1);
|
2011-03-25 09:34:19 +00:00
|
|
|
for (i = 0; i < pathspec.nr; i++)
|
2012-11-18 09:13:06 +00:00
|
|
|
pathspec.items[i].nowildcard_len = pathspec.items[i].len;
|
2011-04-05 16:30:36 +00:00
|
|
|
pathspec.has_wildcard = 0;
|
2017-05-06 22:10:37 +00:00
|
|
|
tree = parse_tree_indirect(&oid);
|
2006-01-26 06:13:36 +00:00
|
|
|
if (!tree)
|
2005-11-26 17:38:20 +00:00
|
|
|
die("not a tree object");
|
2011-07-24 14:59:14 +00:00
|
|
|
return !!read_tree_recursive(tree, "", 0, 0, &pathspec, show_tree, NULL);
|
2005-04-13 09:02:34 +00:00
|
|
|
}
|