From: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>
"show_tree_data" is a struct that packages the necessary fields for
"show_tree()". This commit is a pre-prepared commit for supporting
"--format" option and it does not affect any existing functionality.
At the same time, we also move global "shown_fields" into "show_tree_data"
, the purpose of this is to avoid use both global variable and pass-around
struct.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>
Signed-off-by: Teng Long <dyroneteng@xxxxxxxxx>
---
builtin/ls-tree.c | 69 +++++++++++++++++++++++++++++------------------
1 file changed, 43 insertions(+), 26 deletions(-)
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index 4364416e1c..0491847b43 100644
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -23,7 +23,6 @@ static int ls_options;
static struct pathspec pathspec;
static int chomp_prefix;
static const char *ls_tree_prefix;
-static unsigned int shown_fields;
#define FIELD_PATH_NAME 1
#define FIELD_SIZE (1 << 1)
#define FIELD_OBJECT_NAME (1 << 2)
@@ -32,6 +31,15 @@ static unsigned int shown_fields;
#define FIELD_DEFAULT 29 /* 11101 size is not shown to output by default */
#define FIELD_LONG_DEFAULT (FIELD_DEFAULT | FIELD_SIZE)
+struct show_tree_data {
+ unsigned mode;
+ enum object_type type;
+ const struct object_id *oid;
+ const char *pathname;
+ struct strbuf *base;
+ unsigned int shown_fields;
+};
+
static const char * const ls_tree_usage[] = {
N_("git ls-tree [<options>] <tree-ish> [<path>...]"),
NULL
@@ -42,19 +50,19 @@ static enum ls_tree_cmdmode {
MODE_NAME_ONLY,
} cmdmode;
-static int parse_shown_fields(void)
+static int parse_shown_fields(unsigned int *shown_fields)
{
if (cmdmode == MODE_NAME_ONLY) {
- shown_fields = FIELD_PATH_NAME;
+ *shown_fields = FIELD_PATH_NAME;
return 0;
}
if (!ls_options || (ls_options & LS_RECURSIVE)
|| (ls_options & LS_SHOW_TREES)
|| (ls_options & LS_TREE_ONLY))
- shown_fields = FIELD_DEFAULT;
+ *shown_fields = FIELD_DEFAULT;
if (cmdmode == MODE_LONG)
- shown_fields = FIELD_LONG_DEFAULT;
+ *shown_fields = FIELD_LONG_DEFAULT;
return 1;
}
@@ -88,17 +96,15 @@ static int show_recursive(const char *base, size_t baselen, const char *pathname
return 0;
}
-static int show_default(const struct object_id *oid, enum object_type type,
- const char *pathname, unsigned mode,
- struct strbuf *base)
+static int show_default(struct show_tree_data *data)
{
- size_t baselen = base->len;
+ size_t baselen = data->base->len;
- if (shown_fields & FIELD_SIZE) {
+ if (data->shown_fields & FIELD_SIZE) {
char size_text[24];
- if (type == OBJ_BLOB) {
+ if (data->type == OBJ_BLOB) {
unsigned long size;
- if (oid_object_info(the_repository, oid, &size) == OBJ_BAD)
+ if (oid_object_info(the_repository, data->oid, &size) == OBJ_BAD)
xsnprintf(size_text, sizeof(size_text), "BAD");
else
xsnprintf(size_text, sizeof(size_text),
@@ -106,18 +112,18 @@ static int show_default(const struct object_id *oid, enum object_type type,
} else {
xsnprintf(size_text, sizeof(size_text), "-");
}
- printf("%06o %s %s %7s\t", mode, type_name(type),
- find_unique_abbrev(oid, abbrev), size_text);
+ printf("%06o %s %s %7s\t", data->mode, type_name(data->type),
+ find_unique_abbrev(data->oid, abbrev), size_text);
} else {
- printf("%06o %s %s\t", mode, type_name(type),
- find_unique_abbrev(oid, abbrev));
+ printf("%06o %s %s\t", data->mode, type_name(data->type),
+ find_unique_abbrev(data->oid, abbrev));
}
- baselen = base->len;
- strbuf_addstr(base, pathname);
- write_name_quoted_relative(base->buf,
+ baselen = data->base->len;
+ strbuf_addstr(data->base, data->pathname);
+ write_name_quoted_relative(data->base->buf,
chomp_prefix ? ls_tree_prefix : NULL, stdout,
line_termination);
- strbuf_setlen(base, baselen);
+ strbuf_setlen(data->base, baselen);
return 1;
}
@@ -127,6 +133,15 @@ static int show_tree(const struct object_id *oid, struct strbuf *base,
int recurse = 0;
size_t baselen;
enum object_type type = object_type(mode);
+ unsigned int shown_fields = *(unsigned int *)context;
+ struct show_tree_data data = {
+ .mode = mode,
+ .type = type,
+ .oid = oid,
+ .pathname = pathname,
+ .base = base,
+ .shown_fields = shown_fields,
+ };
if (type == OBJ_BLOB) {
if (ls_options & LS_TREE_ONLY)
@@ -148,8 +163,8 @@ static int show_tree(const struct object_id *oid, struct strbuf *base,
return recurse;
}
- if (shown_fields >= FIELD_DEFAULT)
- show_default(oid, type, pathname, mode, base);
+ if (shown_fields>= FIELD_DEFAULT)
+ show_default(&data);
return recurse;
}
@@ -159,6 +174,7 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix)
struct object_id oid;
struct tree *tree;
int i, full_tree = 0;
+ unsigned int shown_fields = 0;
const struct option ls_tree_options[] = {
OPT_BIT('d', NULL, &ls_options, N_("only show trees"),
LS_TREE_ONLY),
@@ -204,8 +220,6 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix)
if (get_oid(argv[0], &oid))
die("Not a valid object name %s", argv[0]);
- parse_shown_fields();
-
/*
* show_recursive() rolls its own matching code and is
* generally ignorant of 'struct pathspec'. The magic mask
@@ -222,6 +236,9 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix)
tree = parse_tree_indirect(&oid);
if (!tree)
die("not a tree object");
- return !!read_tree(the_repository, tree,
- &pathspec, show_tree, NULL);
+
+ parse_shown_fields(&shown_fields);
+
+ return !!read_tree(the_repository, tree, &pathspec, show_tree,
+ &shown_fields);
}
--
2.34.1.406.g2e0e55130e
