From patchwork Tue Jun 15 13:29:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ZheNing Hu X-Patchwork-Id: 12321395 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0AFC9C48BE8 for ; Tue, 15 Jun 2021 13:29:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E28E961465 for ; Tue, 15 Jun 2021 13:29:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231654AbhFONbz (ORCPT ); Tue, 15 Jun 2021 09:31:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231652AbhFONbY (ORCPT ); Tue, 15 Jun 2021 09:31:24 -0400 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87922C0611C0 for ; Tue, 15 Jun 2021 06:29:15 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id u5-20020a7bc0450000b02901480e40338bso1562886wmc.1 for ; Tue, 15 Jun 2021 06:29:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=UNjMfsSWVy7JXpdnafrhWW6deDtcFzBmaIHb+9KgKtI=; b=ErJmDek6PcvK+kk91Lt6/mJr0h0Q8vtUiicO/mR56+tjuSqlpobidYl3BmRTsIIKaH r8uhGr7U0NDkbHA4NJCMQL0IaIO1JvinZKxgl402MPsF8Buy5JigVjKdpUAJCFENYH0J +t/1yc68JF7oQyXdLrnlDNNb69gicBLhzLhKdd1jyIVitkzXffvVTIAyCIWDo1JDdc7P iGJXkNbL3IqZTDu6Knt+cv4XdWbHnnqJdaZuglSHoJox/9UsJmjwZndf4DtqypcUDBFR GGO/DE/oF9hcr+04uRe1UGv/0B6OMT7ISg0UrboSBvyQU4fI+iBHFkxHCaJ+++ROsp7A UpTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=UNjMfsSWVy7JXpdnafrhWW6deDtcFzBmaIHb+9KgKtI=; b=fIOIIa1B+XhsGNHQgVGZDeUO+RzQPvSc5Pa3Zr7+/VdB+SF4+f/EroD0q5T+81YAnq XwERVwdp+RQHpu9BdEbuotFsGMSsX6ngy3Q46O0JmE83IbxXFytrwt2lTfSVt2ZqDF9F oFFN+/6sDz21yAf6ottuE38EOvX+ES1IXd5CJcYCEfaNg6qwF1Us77Nauv9/SnausZz0 7LVMaELkvN55pstsq244wp8FCyy8/MH9NGml15zk0dOyW4lTm1TCYbS0eM6sWTWBHj/9 7wNVXp04aBDcQXnIblPlXeh0LfJCDQFo1ciiHfzjfhmfPpRteidfgNKn6g+qHAkITF64 43Mg== X-Gm-Message-State: AOAM530i3DaKPL0KEb9xHUZXtA7NBPOQUP+osqY5oqwuLTnKeBbcTBp7 j2Zl1lysQOY+Hm1fqjxJ6bQJyHZJoIs= X-Google-Smtp-Source: ABdhPJzXAXvhnm1W+dcS77XeZGqMu/X7TQe9hGIIXY11Nh71xgtfbrnFfNXPVKjTdCg8QsviHY1Dqw== X-Received: by 2002:a05:600c:2059:: with SMTP id p25mr22197115wmg.56.1623763754119; Tue, 15 Jun 2021 06:29:14 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id o9sm18312279wri.68.2021.06.15.06.29.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 06:29:13 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Tue, 15 Jun 2021 13:29:05 +0000 Subject: [PATCH v2 9/9] [GSOC] cat-file: re-implement --textconv, --filters options Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Christian Couder , Hariom Verma , Bagas Sanjaya , Jeff King , ZheNing Hu , ZheNing Hu Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: ZheNing Hu From: ZheNing Hu After cat-file reuses the ref-filter logic, we re-implement the functions of --textconv and --filters options. Add members `use_textconv` and `use_filters` in struct `ref_format`, and use global variables `use_filters` and `use_textconv` in `ref-filter.c`, so that we can filter the content of the object in get_object(). Use `actual_oi` to record the real expand_data: it may point to the original `oi` or the `act_oi` processed by `textconv_object()` or `convert_to_working_tree()`. `grab_values()` will grab the contents of `actual_oi` and `grab_common_values()` to grab the contents of origin `oi`, this ensures that `%(objectsize)` still uses the size of the unfiltered data. In `get_object()`, we made an optimization: Firstly, get the size and type of the object instead of directly getting the object data. If using --textconv, after successfully obtaining the filtered object data, an extra oid_object_info_extended() will be skipped, which can reduce the cost of object data copy; If using --filter, the data of the object first will be getted first, and then convert_to_working_tree() will be used to get the filtered object data. Mentored-by: Christian Couder Mentored-by: Hariom Verma Signed-off-by: ZheNing Hu --- builtin/cat-file.c | 5 ++++ ref-filter.c | 66 ++++++++++++++++++++++++++++++++++++++++++++-- ref-filter.h | 4 ++- 3 files changed, 72 insertions(+), 3 deletions(-) diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 6766efb06f41..2978b8990e8d 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -377,6 +377,11 @@ static int batch_objects(struct batch_options *opt, const struct option *options if (opt->print_contents) strbuf_addstr(&format, "\n%(raw)"); opt->format.format = format.buf; + if (opt->cmdmode == 'c') + opt->format.use_textconv = 1; + if (opt->cmdmode == 'w') + opt->format.use_filters = 1; + if (verify_ref_format(&opt->format)) usage_with_options(cat_file_usage, options); diff --git a/ref-filter.c b/ref-filter.c index 660e52f97f79..5e4aaa94db8a 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -1,3 +1,4 @@ +#define USE_THE_INDEX_COMPATIBILITY_MACROS #include "builtin.h" #include "cache.h" #include "parse-options.h" @@ -84,6 +85,9 @@ static struct expand_data { struct object_info info; } oi, oi_deref; +int use_filters; +int use_textconv; + struct ref_to_worktree_entry { struct hashmap_entry ent; struct worktree *wt; /* key is wt->head_ref */ @@ -1027,6 +1031,9 @@ int verify_ref_format(struct ref_format *format) used_atom[at].atom_type == ATOM_WORKTREEPATH))) die(_("this command reject atom %%(%.*s)"), (int)(ep - sp - 2), sp + 2); + use_filters = format->use_filters; + use_textconv = format->use_textconv; + if (format->quote_style && used_atom[at].atom_type == ATOM_RAW && used_atom[at].u.raw_data.option == RAW_BARE) die(_("--format=%.*s cannot be used with" @@ -1735,10 +1742,41 @@ static int get_object(struct ref_array_item *ref, int deref, struct object **obj { /* parse_object_buffer() will set eaten to 0 if free() will be needed */ int eaten = 1; + struct expand_data *actual_oi = oi; + struct expand_data act_oi = {0}; + if (oi->info.contentp) { /* We need to know that to use parse_object_buffer properly */ + void **temp_contentp = oi->info.contentp; + oi->info.contentp = NULL; oi->info.sizep = &oi->size; oi->info.typep = &oi->type; + + /* get the type and size */ + if (oid_object_info_extended(the_repository, &oi->oid, &oi->info, + OBJECT_INFO_LOOKUP_REPLACE)) + return strbuf_addf_ret(err, 1, _("%s missing"), + oid_to_hex(&oi->oid)); + + oi->info.sizep = NULL; + oi->info.typep = NULL; + oi->info.contentp = temp_contentp; + + if (use_textconv) { + act_oi = *oi; + + if(!ref->rest) + return strbuf_addf_ret(err, -1, _("missing path for '%s'"), + oid_to_hex(&act_oi.oid)); + if (act_oi.type == OBJ_BLOB) { + if (textconv_object(the_repository, + ref->rest, 0100644, &act_oi.oid, + 1, (char **)(&act_oi.content), &act_oi.size)) { + actual_oi = &act_oi; + goto success; + } + } + } } if (oid_object_info_extended(the_repository, &oi->oid, &oi->info, OBJECT_INFO_LOOKUP_REPLACE)) @@ -1748,19 +1786,43 @@ static int get_object(struct ref_array_item *ref, int deref, struct object **obj BUG("Object size is less than zero."); if (oi->info.contentp) { - *obj = parse_object_buffer(the_repository, &oi->oid, oi->type, oi->size, oi->content, &eaten); + if (use_filters) { + if(!ref->rest) + return strbuf_addf_ret(err, -1, _("missing path for '%s'"), + oid_to_hex(&oi->oid)); + if (oi->type == OBJ_BLOB) { + struct strbuf strbuf = STRBUF_INIT; + struct checkout_metadata meta; + act_oi = *oi; + + init_checkout_metadata(&meta, NULL, NULL, &act_oi.oid); + if (convert_to_working_tree(&the_index, ref->rest, act_oi.content, act_oi.size, &strbuf, &meta)) { + act_oi.size = strbuf.len; + act_oi.content = strbuf_detach(&strbuf, NULL); + actual_oi = &act_oi; + } else { + die("could not convert '%s' %s", + oid_to_hex(&oi->oid), ref->rest); + } + } + } + +success: + *obj = parse_object_buffer(the_repository, &actual_oi->oid, actual_oi->type, actual_oi->size, actual_oi->content, &eaten); if (!*obj) { if (!eaten) free(oi->content); return strbuf_addf_ret(err, -1, _("parse_object_buffer failed on %s for %s"), oid_to_hex(&oi->oid), ref->refname); } - grab_values(ref->value, deref, *obj, oi); + grab_values(ref->value, deref, *obj, actual_oi); } grab_common_values(ref->value, deref, oi); if (!eaten) free(oi->content); + if (actual_oi != oi) + free(actual_oi->content); return 0; } diff --git a/ref-filter.h b/ref-filter.h index 3db07729f46d..56a5ec4c9eaa 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -80,6 +80,8 @@ struct ref_format { const char *rest; int cat_file_mode; int quote_style; + int use_textconv; + int use_filters; int use_rest; int use_color; @@ -87,7 +89,7 @@ struct ref_format { int need_color_reset_at_eol; }; -#define REF_FORMAT_INIT { NULL, NULL, 0, 0, 0, -1 } +#define REF_FORMAT_INIT { NULL, NULL, 0, 0, 0, 0, 0, -1 } /* Macros for checking --merged and --no-merged options */ #define _OPT_MERGED_NO_MERGED(option, filter, h) \