From: Olga Telezhnaya <olyatelezhnaya@gmail.com> To: git@vger.kernel.org Subject: [PATCH 05/20] cat-file: move struct expand_data into ref-filter Date: Tue, 9 Jan 2018 13:05:23 +0000 [thread overview] Message-ID: <01020160db067ae4-79bd5ef7-3402-4333-93c1-c9ae8059680c-000000@eu-west-1.amazonses.com> (raw) In-Reply-To: <01020160db0679c9-799a0bc4-b6d1-43e2-ad3b-80be4e4c55e9-000000@eu-west-1.amazonses.com> Need that for further reusing of formatting logic in cat-file. Have plans to get rid of using expand_data in cat-file at all, and use it only in ref-filter for collecting, formatting and printing needed data. 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 | 36 ------------------------------------ ref-filter.h | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 7655a9a726773..7fd5b960ad698 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -176,42 +176,6 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name, return 0; } -struct expand_data { - struct object_id oid; - enum object_type type; - unsigned long size; - off_t disk_size; - const char *rest; - struct object_id delta_base_oid; - - /* - * If mark_query is true, we do not expand anything, but rather - * just mark the object_info with items we wish to query. - */ - int mark_query; - - /* - * Whether to split the input on whitespace before feeding it to - * get_sha1; this is decided during the mark_query phase based on - * whether we have a %(rest) token in our format. - */ - int split_on_whitespace; - - /* - * After a mark_query run, this object_info is set up to be - * passed to sha1_object_info_extended. It will point to the data - * elements above, so you can retrieve the response from there. - */ - struct object_info info; - - /* - * This flag will be true if the requested batch format and options - * don't require us to call sha1_object_info, which can then be - * optimized out. - */ - unsigned skip_object_info : 1; -}; - static int is_atom(const char *atom, const char *s, int slen) { int alen = strlen(atom); diff --git a/ref-filter.h b/ref-filter.h index 0d98342b34319..16d00e4b1bded 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -72,6 +72,42 @@ struct ref_filter { verbose; }; +struct expand_data { + struct object_id oid; + enum object_type type; + unsigned long size; + off_t disk_size; + const char *rest; + struct object_id delta_base_oid; + + /* + * If mark_query is true, we do not expand anything, but rather + * just mark the object_info with items we wish to query. + */ + int mark_query; + + /* + * Whether to split the input on whitespace before feeding it to + * get_sha1; this is decided during the mark_query phase based on + * whether we have a %(rest) token in our format. + */ + int split_on_whitespace; + + /* + * After a mark_query run, this object_info is set up to be + * passed to sha1_object_info_extended. It will point to the data + * elements above, so you can retrieve the response from there. + */ + struct object_info info; + + /* + * This flag will be true if the requested batch format and options + * don't require us to call sha1_object_info, which can then be + * optimized out. + */ + unsigned skip_object_info : 1; +}; + struct ref_format { /* * Set these to define the format; make sure you call -- 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 16/20] cat-file: get rid of expand_atom_into_fields Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 08/20] cat-file: remove unused code 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 09/20] cat-file: get rid of goto in ref-filter Olga Telezhnaya 2018-01-09 13:05 ` Olga Telezhnaya [this message] 2018-01-09 13:05 ` [PATCH 02/20] cat-file: reuse struct ref_format Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 06/20] cat-file: start migrating to ref-filter Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 12/20] cat-file: rename variable in ref-filter Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 11/20] cat-file: get rid of duplicate checking 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 15/20] cat-file: start reusing populate_value 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 18/20] cat-file: add split_on_whitespace flag Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 10/20] cat-file: simplify expand_atom function 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 14/20] cat-file: make populate_value global 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 17/20] cat-file: add is_cat flag in ref-filter 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 06/18] ref-filter: reuse parse_ref_filter_atom 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 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 10/18] cat-file: get rid of duplicate checking 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 18/18] ref-filter: make cat_file_info independent 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 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 17/18] cat-file: move skip_object_info into 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 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 09/18] cat-file: simplify expand_atom function 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 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 15/18] ref-filter: add is_cat flag 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=01020160db067ae4-79bd5ef7-3402-4333-93c1-c9ae8059680c-000000@eu-west-1.amazonses.com \ --to=olyatelezhnaya@gmail.com \ --cc=git@vger.kernel.org \ --subject='Re: [PATCH 05/20] cat-file: move struct expand_data into ref-filter' \ /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
Code repositories for project(s) associated with this 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).