From: Olga Telezhnaya <olyatelezhnaya@gmail.com> To: git@vger.kernel.org Subject: [PATCH v2 15/18] ref-filter: add is_cat flag Date: Wed, 10 Jan 2018 09:36:41 +0000 [thread overview] Message-ID: <01020160df6dc59f-522bf760-0897-4557-91dc-a5abb47d6215-000000@eu-west-1.amazonses.com> (raw) In-Reply-To: <01020160df6dc499-0e6d11ec-1dcd-4a71-997b-ea231f33fae4-000000@eu-west-1.amazonses.com> Add is_cat flag, further it helps to get rid of cat_file_data field in ref_format. 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 | 1 + ref-filter.c | 8 +++++--- ref-filter.h | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/builtin/cat-file.c b/builtin/cat-file.c index e11dbf88e386c..289912ab1f858 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -393,6 +393,7 @@ static int batch_objects(struct batch_options *opt) */ memset(&data, 0, sizeof(data)); opt->format->cat_file_data = &data; + opt->format->is_cat = 1; verify_ref_format(opt->format); if (opt->cmdmode) data.split_on_whitespace = 1; diff --git a/ref-filter.c b/ref-filter.c index 93248ce18152f..2c955e90bb4c9 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -101,6 +101,7 @@ static struct used_atom { } *used_atom; static int used_atom_cnt, need_tagged, need_symref; struct expand_data *cat_file_info; +static int is_cat = 0; static void color_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *color_value) { @@ -493,7 +494,7 @@ static int parse_ref_filter_atom(const struct ref_format *format, need_tagged = 1; if (!strcmp(valid_atom[i].name, "symref")) need_symref = 1; - if (cat_file_info && !strcmp(valid_atoms[i].name, "rest")) + if (is_cat && !strcmp(valid_atoms[i].name, "rest")) cat_file_info->split_on_whitespace = 1; return at; } @@ -739,6 +740,7 @@ int verify_ref_format(struct ref_format *format) const char *cp, *sp; cat_file_info = format->cat_file_data; + is_cat = format->is_cat; format->need_color_reset_at_eol = 0; for (cp = format->format; *cp && (sp = find_next(cp)); ) { const char *color, *ep = strchr(sp, ')'); @@ -748,7 +750,7 @@ int verify_ref_format(struct ref_format *format) return error(_("malformed format string %s"), sp); /* sp points at "%(" and ep points at the closing ")" */ - if (format->cat_file_data) { + if (is_cat) { at = parse_ref_filter_atom(format, valid_cat_file_atom, ARRAY_SIZE(valid_cat_file_atom), sp + 2, ep); } else { @@ -1464,7 +1466,7 @@ int populate_value(struct ref_array_item *ref) ref->symref = ""; } - if (cat_file_info) { + if (is_cat) { if (!cat_file_info->skip_object_info && sha1_object_info_extended(ref->objectname.hash, &cat_file_info->info, OBJECT_INFO_LOOKUP_REPLACE) < 0) { diff --git a/ref-filter.h b/ref-filter.h index 0c7253913735b..12a938b0aa6a3 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -126,6 +126,7 @@ struct ref_format { * hopefully would be reduced later. */ struct expand_data *cat_file_data; + int is_cat; }; #define REF_FORMAT_INIT { NULL, 0, -1 } -- https://github.com/git/git/pull/450
next prev parent reply other threads:[~2018-01-10 9:37 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 02/20] cat-file: reuse struct ref_format 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 05/20] cat-file: move struct expand_data into ref-filter Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 19/20] cat-file: move skip_object_info " Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 08/20] cat-file: remove unused code 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 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 12/20] cat-file: rename variable " 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 14/20] cat-file: make populate_value global 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 20/20] cat-file: make cat_file_info variable independent Olga Telezhnaya 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-09 13:05 ` [PATCH 17/20] cat-file: add is_cat flag in ref-filter Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 13/20] cat-file: start use ref_array_item struct Olga Telezhnaya 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 13/18] cat-file: start reusing populate_value 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 10/18] cat-file: get rid of duplicate checking 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 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 ` Olga Telezhnaya [this message] 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 09/18] cat-file: simplify expand_atom function 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 11/18] cat-file: start use ref_array_item struct 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-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=01020160df6dc59f-522bf760-0897-4557-91dc-a5abb47d6215-000000@eu-west-1.amazonses.com \ --to=olyatelezhnaya@gmail.com \ --cc=git@vger.kernel.org \ --subject='Re: [PATCH v2 15/18] ref-filter: add is_cat flag' \ /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).