From: Olga Telezhnaya <olyatelezhnaya@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH 06/20] cat-file: start migrating to ref-filter
Date: Tue, 9 Jan 2018 13:05:23 +0000 [thread overview]
Message-ID: <01020160db067b66-c22a78cb-5297-426b-9b11-a20a8c27f74e-000000@eu-west-1.amazonses.com> (raw)
In-Reply-To: <01020160db0679c9-799a0bc4-b6d1-43e2-ad3b-80be4e4c55e9-000000@eu-west-1.amazonses.com>
Start moving all formatting stuff from cat-file to ref-filter.
Start from simple moving, it would be integrated into
all ref-filter processes further.
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 | 5 ++---
ref-filter.c | 42 +++++++++++++++++++++++++++++++++++++-----
ref-filter.h | 6 ++++++
3 files changed, 45 insertions(+), 8 deletions(-)
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 7fd5b960ad698..0a3f4a47bf1ae 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -420,9 +420,8 @@ static int batch_objects(struct batch_options *opt)
* object.
*/
memset(&data, 0, sizeof(data));
- data.mark_query = 1;
- strbuf_expand(&buf, opt->format->format, expand_format, &data);
- data.mark_query = 0;
+ opt->format->cat_file_data = &data;
+ verify_ref_format(opt->format);
if (opt->cmdmode)
data.split_on_whitespace = 1;
diff --git a/ref-filter.c b/ref-filter.c
index 2d6e81fe1ab00..98bb10185ae96 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -693,6 +693,31 @@ static const char *find_next(const char *cp)
return NULL;
}
+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_into_fields(const char *atom, int len,
+ struct expand_data *data)
+{
+ if (is_atom("objectname", atom, len))
+ ; /* do nothing */
+ else if (is_atom("objecttype", atom, len))
+ data->info.typep = &data->type;
+ else if (is_atom("objectsize", atom, len))
+ data->info.sizep = &data->size;
+ else if (is_atom("objectsize:disk", atom, len))
+ data->info.disk_sizep = &data->disk_size;
+ else if (is_atom("rest", atom, len))
+ data->split_on_whitespace = 1;
+ else if (is_atom("deltabase", atom, len))
+ data->info.delta_base_sha1 = data->delta_base_oid.hash;
+ else
+ die("unknown format element: %.*s", len, atom);
+}
+
/*
* Make sure the format string is well formed, and parse out
* the used atoms.
@@ -709,12 +734,19 @@ int verify_ref_format(struct ref_format *format)
if (!ep)
return error(_("malformed format string %s"), sp);
/* sp points at "%(" and ep points at the closing ")" */
- at = parse_ref_filter_atom(format, valid_atoms,
- ARRAY_SIZE(valid_atoms), sp + 2, ep);
- cp = ep + 1;
- if (skip_prefix(used_atoms[at].name, "color:", &color))
- format->need_color_reset_at_eol = !!strcmp(color, "reset");
+ if (format->cat_file_data)
+ expand_atom_into_fields(sp + 2, ep - sp - 2,
+ format->cat_file_data);
+ else
+ {
+ at = parse_ref_filter_atom(format, valid_atoms,
+ ARRAY_SIZE(valid_atoms), sp + 2, ep);
+ if (skip_prefix(used_atoms[at].name, "color:", &color))
+ format->need_color_reset_at_eol = !!strcmp(color, "reset");
+ }
+
+ cp = ep + 1;
}
if (format->need_color_reset_at_eol && !want_color(format->use_color))
format->need_color_reset_at_eol = 0;
diff --git a/ref-filter.h b/ref-filter.h
index 16d00e4b1bded..97169548939cd 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -119,6 +119,12 @@ struct ref_format {
/* Internal state to ref-filter */
int need_color_reset_at_eol;
+
+ /*
+ * Helps to move all formatting logic from cat-file to ref-filter,
+ * hopefully would be reduced later.
+ */
+ struct expand_data *cat_file_data;
};
#define REF_FORMAT_INIT { NULL, 0, -1 }
--
https://github.com/git/git/pull/450
next prev parent reply other threads:[~2018-01-09 13:06 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-09 13:05 [PATCH 01/20] cat-file: split expand_atom into 2 functions Olga Telezhnaya
2018-01-09 13:05 ` [PATCH 17/20] cat-file: add is_cat flag in ref-filter Olga Telezhnaya
2018-01-09 13:05 ` [PATCH 19/20] cat-file: move skip_object_info into ref-filter Olga Telezhnaya
2018-01-09 13:05 ` [PATCH 10/20] cat-file: simplify expand_atom function Olga Telezhnaya
2018-01-09 13:05 ` [PATCH 13/20] cat-file: start use ref_array_item struct Olga Telezhnaya
2018-01-09 13:05 ` [PATCH 03/20] cat-file: rename variables in ref-filter Olga Telezhnaya
2018-01-09 22:04 ` Junio C Hamano
2018-01-10 7:07 ` Оля Тележная
2018-01-09 13:05 ` [PATCH 02/20] cat-file: reuse struct ref_format Olga Telezhnaya
2018-01-09 13:05 ` [PATCH 04/20] cat-file: make valid_atoms as a function parameter Olga Telezhnaya
2018-01-09 22:16 ` Junio C Hamano
2018-01-09 13:05 ` [PATCH 11/20] cat-file: get rid of duplicate checking Olga Telezhnaya
2018-01-09 13:05 ` [PATCH 20/20] cat-file: make cat_file_info variable independent Olga Telezhnaya
2018-01-09 13:05 ` [PATCH 09/20] cat-file: get rid of goto in ref-filter Olga Telezhnaya
2018-01-09 13:05 ` [PATCH 16/20] cat-file: get rid of expand_atom_into_fields Olga Telezhnaya
2018-01-09 13:05 ` [PATCH 14/20] cat-file: make populate_value global Olga Telezhnaya
2018-01-09 13:05 ` [PATCH 08/20] cat-file: remove unused code Olga Telezhnaya
2018-01-09 13:05 ` [PATCH 05/20] cat-file: move struct expand_data into ref-filter Olga Telezhnaya
2018-01-09 13:05 ` [PATCH 18/20] cat-file: add split_on_whitespace flag Olga Telezhnaya
2018-01-09 13:05 ` [PATCH 12/20] cat-file: rename variable in ref-filter Olga Telezhnaya
2018-01-09 13:05 ` Olga Telezhnaya [this message]
2018-01-09 13:05 ` [PATCH 15/20] cat-file: start reusing populate_value Olga Telezhnaya
2018-01-09 13:05 ` [PATCH 07/20] cat-file: reuse parse_ref_filter_atom Olga Telezhnaya
2018-01-09 23:32 ` Junio C Hamano
2018-01-10 9:36 ` [PATCH v2 01/18] cat-file: split expand_atom into 2 functions Olga Telezhnaya
2018-01-10 9:36 ` [PATCH v2 08/18] ref-filter: get rid of goto Olga Telezhnaya
2018-01-10 9:36 ` [PATCH v2 02/18] cat-file: reuse struct ref_format Olga Telezhnaya
2018-01-15 21:37 ` Jeff King
2018-01-16 9:45 ` Оля Тележная
2018-01-10 9:36 ` [PATCH v2 07/18] cat-file: remove unused code Olga Telezhnaya
2018-01-10 9:36 ` [PATCH v2 14/18] ref-filter: get rid of expand_atom_into_fields Olga Telezhnaya
2018-01-10 9:36 ` [PATCH v2 05/18] cat-file: start migrating to ref-filter Olga Telezhnaya
2018-01-10 9:36 ` [PATCH v2 11/18] cat-file: start use ref_array_item struct Olga Telezhnaya
2018-01-10 9:36 ` [PATCH v2 04/18] cat-file: move struct expand_data into ref-filter Olga Telezhnaya
2018-01-15 21:44 ` Jeff King
2018-01-16 7:00 ` Оля Тележная
2018-01-17 21:45 ` Jeff King
2018-01-18 5:56 ` Оля Тележная
2018-01-10 9:36 ` [PATCH v2 03/18] ref-filter: make valid_atom as function parameter Olga Telezhnaya
2018-01-15 21:42 ` Jeff King
2018-01-16 6:55 ` Оля Тележная
2018-01-17 21:43 ` Jeff King
2018-01-17 22:39 ` Christian Couder
2018-01-18 6:20 ` Оля Тележная
2018-01-18 11:49 ` Оля Тележная
2018-01-18 14:23 ` Christian Couder
2018-01-19 12:24 ` Оля Тележная
2018-01-19 15:48 ` Christian Couder
2018-01-19 17:14 ` Christian Couder
2018-01-19 17:22 ` Оля Тележная
2018-01-19 17:57 ` Christian Couder
2018-01-19 17:23 ` Jeff King
2018-01-19 17:31 ` Christian Couder
2018-01-19 18:47 ` Junio C Hamano
2018-01-19 20:12 ` Jeff King
2018-01-10 9:36 ` [PATCH v2 18/18] ref-filter: make cat_file_info independent Olga Telezhnaya
2018-01-10 9:36 ` [PATCH v2 10/18] cat-file: get rid of duplicate checking Olga Telezhnaya
2018-01-10 9:36 ` [PATCH v2 17/18] cat-file: move skip_object_info into ref-filter Olga Telezhnaya
2018-01-10 9:36 ` [PATCH v2 12/18] ref-filter: make populate_value global Olga Telezhnaya
2018-01-10 9:36 ` [PATCH v2 13/18] cat-file: start reusing populate_value Olga Telezhnaya
2018-01-10 9:36 ` [PATCH v2 16/18] ref_format: add split_on_whitespace flag Olga Telezhnaya
2018-01-10 9:36 ` [PATCH v2 15/18] ref-filter: add is_cat flag Olga Telezhnaya
2018-01-10 9:36 ` [PATCH v2 09/18] cat-file: simplify expand_atom function Olga Telezhnaya
2018-01-10 9:36 ` [PATCH v2 06/18] ref-filter: reuse parse_ref_filter_atom Olga Telezhnaya
2018-01-15 21:33 ` [PATCH v2 01/18] cat-file: split expand_atom into 2 functions Jeff King
2018-01-15 22:09 ` Jeff King
2018-01-16 7:22 ` Оля Тележная
2018-01-17 21:49 ` Jeff King
2018-01-17 23:04 ` Christian Couder
2018-01-18 6:22 ` Оля Тележная
2018-01-18 8:45 ` Christian Couder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=01020160db067b66-c22a78cb-5297-426b-9b11-a20a8c27f74e-000000@eu-west-1.amazonses.com \
--to=olyatelezhnaya@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).