Re: [PATCH RFC 04/24] cat-file: reuse struct ref_format
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jan 26, 2018, 22:18 UTC
- Message-ID
- <xmqq4ln8qn5g.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <0102016133ff3af0-0ebed14d-deb5-4744-9267-4c5b0c6a30c8-000000@eu-west-1.amazonses.com>
Olga Telezhnaya <olyatelezhnaya@gmail.com> writes:
Show 9 quoted lines
> Start using ref_format struct instead of simple char*. > Need that for further reusing of formatting logic from ref-filter. > > 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 | 15 ++++++++------- > 1 file changed, 8 insertions(+), 7 deletions(-)
OK, so at this stage we only use its .format field (which happens to be the same simple "char *"), but we can later extend the functions on the callchain this thing is passed through.
Makes sense.
Thanks.
Show 73 quoted lines
>
> diff --git a/builtin/cat-file.c b/builtin/cat-file.c
> index f783b39b9bd5c..65c300184cab8 100644
> --- a/builtin/cat-file.c
> +++ b/builtin/cat-file.c
> @@ -13,15 +13,16 @@
> #include "tree-walk.h"
> #include "sha1-array.h"
> #include "packfile.h"
> +#include "ref-filter.h"
>
> struct batch_options {
> + struct ref_format format;
> int enabled;
> int follow_symlinks;
> int print_contents;
> int buffer_output;
> int all_objects;
> int cmdmode; /* may be 'w' or 'c' for --filters or --textconv */
> - const char *format;
> };
>
> static const char *force_path;
> @@ -353,7 +354,7 @@ static void batch_object_write(const char *obj_name, struct batch_options *opt,
> return;
> }
>
> - strbuf_expand(&buf, opt->format, expand_format, data);
> + strbuf_expand(&buf, opt->format.format, expand_format, data);
> strbuf_addch(&buf, '\n');
> batch_write(opt, buf.buf, buf.len);
> strbuf_release(&buf);
> @@ -446,8 +447,8 @@ static int batch_objects(struct batch_options *opt)
> int save_warning;
> int retval = 0;
>
> - if (!opt->format)
> - opt->format = "%(objectname) %(objecttype) %(objectsize)";
> + if (!opt->format.format)
> + opt->format.format = "%(objectname) %(objecttype) %(objectsize)";
>
> /*
> * Expand once with our special mark_query flag, which will prime the
> @@ -456,7 +457,7 @@ static int batch_objects(struct batch_options *opt)
> */
> memset(&data, 0, sizeof(data));
> data.mark_query = 1;
> - strbuf_expand(&buf, opt->format, expand_format, &data);
> + strbuf_expand(&buf, opt->format.format, expand_format, &data);
> data.mark_query = 0;
> if (opt->cmdmode)
> data.split_on_whitespace = 1;
> @@ -548,7 +549,7 @@ static int batch_option_callback(const struct option *opt,
>
> bo->enabled = 1;
> bo->print_contents = !strcmp(opt->long_name, "batch");
> - bo->format = arg;
> + bo->format.format = arg;
>
> return 0;
> }
> @@ -557,7 +558,7 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
> {
> int opt = 0;
> const char *exp_type = NULL, *obj_name = NULL;
> - struct batch_options batch = {0};
> + struct batch_options batch = { REF_FORMAT_INIT };
> int unknown_type = 0;
>
> const struct option options[] = {
>
> --
> https://github.com/git/git/pull/452