[PATCH RFC 17/24] cat-file: reuse printing logic from ref-filter
Reuse code from ref-filter to print resulting message.
Signed-off-by: Olga Telezhnaia <olyatelezhnaya@gmail.com>
Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored by: Jeff King <peff@peff.net>
---
builtin/cat-file.c | 52 +++++-----------------------------------------------
ref-filter.c | 30 +++++++++++++++++++++++++++---
2 files changed, 32 insertions(+), 50 deletions(-)
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index bd803856537b8..26b35bef4ba02 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -176,45 +176,6 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
return 0;
}
-static int is_atom(const char *atom, const char *s, int slen)
-{
- int alen = strlen(atom);
- return alen == slen && !memcmp(atom, s, alen);
-}
-
-static void expand_atom(struct strbuf *sb, const char *atom, int len,
- struct ref_array_item *item)
-{
- if (is_atom("objectname", atom, len))
- strbuf_addstr(sb, oid_to_hex(&item->objectname));
- else if (is_atom("objecttype", atom, len))
- strbuf_addstr(sb, typename(item->type));
- else if (is_atom("objectsize", atom, len))
- strbuf_addf(sb, "%lu", item->size);
- else if (is_atom("objectsize:disk", atom, len))
- strbuf_addf(sb, "%"PRIuMAX, (uintmax_t)item->disk_size);
- else if (is_atom("rest", atom, len)) {
- if (item->rest)
- strbuf_addstr(sb, item->rest);
- } else if (is_atom("deltabase", atom, len))
- strbuf_addstr(sb, oid_to_hex(item->delta_base_oid));
-}
-
-static size_t expand_format(struct strbuf *sb, const char *start, void *data)
-{
- const char *end;
- struct ref_array_item *item = data;
-
- if (*start != '(')
- return 0;
- end = strchr(start + 1, ')');
- if (!end)
- die("format element '%s' does not end in ')'", start);
-
- expand_atom(sb, start + 1, end - start - 1, item);
- return end - start + 1;
-}
-
static void batch_write(struct batch_options *opt, const void *data, int len)
{
if (opt->buffer_output) {
@@ -282,22 +243,19 @@ static void print_object_or_die(struct batch_options *opt, struct expand_data *d
static void batch_object_write(const char *obj_name, struct batch_options *opt,
struct expand_data *data)
{
- struct strbuf buf = STRBUF_INIT;
struct ref_array_item item = {0};
item.objectname = data->oid;
item.rest = data->rest;
item.start_of_request = obj_name;
- if (populate_value(&item)) return;
- data->type = item.type;
-
- strbuf_expand(&buf, opt->format.format, expand_format, &item);
- strbuf_addch(&buf, '\n');
- batch_write(opt, buf.buf, buf.len);
- strbuf_release(&buf);
+ if (show_ref_array_item(&item, &opt->format))
+ return;
+ if (!opt->buffer_output)
+ fflush(stdout);
if (opt->print_contents) {
+ data->type = item.type;
print_object_or_die(opt, data);
batch_write(opt, "\n", 1);
}
diff --git a/ref-filter.c b/ref-filter.c
index 906a5344949f7..bfbc7c83fdd47 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1522,7 +1522,21 @@ int populate_value(struct ref_array_item *ref)
name++;
}
- if (starts_with(name, "refname"))
+ if (is_cat) {
+ if (starts_with(name, "objectname"))
+ v->s = oid_to_hex(&ref->objectname);
+ else if (starts_with(name, "objecttype"))
+ v->s = typename(ref->type);
+ else if (starts_with(name, "objectsize")) {
+ v->s = xstrfmt("%lu", ref->size);
+ } else if (starts_with(name, "objectsize:disk")) {
+ v->s = xstrfmt("%"PRIuMAX, (uintmax_t)ref->disk_size);
+ } else if (starts_with(name, "rest"))
+ v->s = ref->rest;
+ else if (starts_with(name, "deltabase"))
+ v->s = xstrdup(oid_to_hex(ref->delta_base_oid));
+ continue;
+ } else if (starts_with(name, "refname"))
refname = get_refname(atom, ref);
else if (starts_with(name, "symref"))
refname = get_symref(atom, ref);
@@ -2219,6 +2233,7 @@ int format_ref_array_item(struct ref_array_item *info,
{
const char *cp, *sp, *ep;
struct ref_formatting_state state = REF_FORMATTING_STATE_INIT;
+ int retval = 0;
state.quote_style = format->quote_style;
push_stack_element(&state.stack);
@@ -2229,13 +2244,22 @@ int format_ref_array_item(struct ref_array_item *info,
ep = strchr(sp, ')');
if (cp < sp)
append_literal(cp, sp, &state);
- get_ref_atom_value(info,
+ if (is_cat) {
+ if(get_ref_atom_value(info,
+ parse_ref_filter_atom(format, valid_cat_file_atom,
+ ARRAY_SIZE(valid_cat_file_atom), sp + 2, ep),
+ &atomv))
+ return -1;
+ } else
+ get_ref_atom_value(info,
parse_ref_filter_atom(format, valid_atom,
ARRAY_SIZE(valid_atom),
sp + 2, ep),
&atomv);
atomv->handler(atomv, &state);
}
+ if (is_cat && strlen(format->format) == 0)
+ retval = check_and_fill_for_cat(info);
if (*cp) {
sp = cp + strlen(cp);
append_literal(cp, sp, &state);
@@ -2249,7 +2273,7 @@ int format_ref_array_item(struct ref_array_item *info,
die(_("format: %%(end) atom missing"));
strbuf_addbuf(final_buf, &state.stack->output);
pop_stack_element(&state.stack);
- return 0;
+ return retval;
}
int show_ref_array_item(struct ref_array_item *info,
--
https://github.com/git/git/pull/452
Olga Telezhnaya <olyatelezhnaya@gmail.com>