From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 698B51F4B4 for ; Fri, 9 Apr 2021 11:28:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233569AbhDIL22 (ORCPT ); Fri, 9 Apr 2021 07:28:28 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:49877 "EHLO out3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233603AbhDIL21 (ORCPT ); Fri, 9 Apr 2021 07:28:27 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 7A5A75C004A; Fri, 9 Apr 2021 07:28:14 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Fri, 09 Apr 2021 07:28:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=date :from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm3; bh=NaE5sJtg/a8SZ+Bk4Oi1ZUve2NY 4FXWVwwjyP9hwQdc=; b=h6KTQNb/EDssBXUuoFxhCbMpIDCTrt0zS3ZL0ynk7bq R/bjsvzVLGtPvXBA4/rhlw+BJEYWlpes+OQ7q2FJF7oBzmglTeFUuBkro3bbqrR7 eaVMuz9IkWpZwpupbX+MXkVQ4ixGQdz+pnk6qEKkO3gfdFmzgf9d7g3r/rI39ke0 m0ILF1ran7xBqOlIRm3Hpn1yQjPxKqHRRZZxiBFvqA4k883cot8nw0gJUT8KtDbX YkORUEJgm75NoKIDuQI4o+P2lU+HxTzFfOrY3ZQkbFojx2Fi5geWK5pc70RLQECL PiAB1YSj+EwQ5ur66tZHfqdGIz07G/nOdHKVTlQDLtQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=NaE5sJ tg/a8SZ+Bk4Oi1ZUve2NY4FXWVwwjyP9hwQdc=; b=mctvTlRADMErvjGRlxp7Fd g4wL4Q8LTTWMIew2yoVS48rb/g5sb+8/eBcDN4Jprh8te9tv73+U9TWcUHNh2avi t52jeOT5eA+S/a9tV/VjZBh11a5mJZWQ5S4GQVx0RMQiPUlSYBO0YsgmA8WvgZ/m Jv2LwpLcS0x07WNrFK6yio2jTzgISKOZ3oi/yEP87VFdESaDJNqVQiqlgbczmdeb O34WdX6YzSrssrKeVsBkX9o2COC6byg4Gx1RyFdZMR58Yy7dI8jqsOuA3ch+yuve UGoiGMKbQnc2nWNJdVE52TbkUk07/B0apMJgI2DDVp3szT3srPAHOLd3eecSym3A == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudekuddggeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefrrghtrhhi tghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrh hnpeehgefhtdefueffheekgfffudelffejtdfhvdejkedthfehvdelgfetgfdvtedthfen ucfkphepjeejrdduledurdekrdduieelnecuvehluhhsthgvrhfuihiivgeptdenucfrrg hrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimh X-ME-Proxy: Received: from vm-mail.pks.im (x4dbf08a9.dyn.telefonica.de [77.191.8.169]) by mail.messagingengine.com (Postfix) with ESMTPA id CDB7D24005C; Fri, 9 Apr 2021 07:28:13 -0400 (EDT) Received: from localhost (ncase [10.192.0.11]) by vm-mail.pks.im (OpenSMTPD) with ESMTPSA id 399ed0e1 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 9 Apr 2021 11:28:12 +0000 (UTC) Date: Fri, 9 Apr 2021 13:28:11 +0200 From: Patrick Steinhardt To: git@vger.kernel.org Cc: Jeff King , Christian Couder , Taylor Blau Subject: [PATCH v3 5/8] list-objects: implement object type filter Message-ID: References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="EHe+KPFVGhX/ZfU0" Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org --EHe+KPFVGhX/ZfU0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable While it already is possible to filter objects by some criteria in git-rev-list(1), it is not yet possible to filter out only a specific type of objects. This makes some filters less useful. The `blob:limit` filter for example filters blobs such that only those which are smaller than the given limit are returned. But it is unfit to ask only for these smallish blobs, given that git-rev-list(1) will continue to print tags, commits and trees. Now that we have the infrastructure in place to also filter tags and commits, we can improve this situation by implementing a new filter which selects objects based on their type. Above query can thus trivially be implemented with the following command: $ git rev-list --objects --filter=3Dobject:type=3Dblob \ --filter=3Dblob:limit=3D200 Furthermore, this filter allows to optimize for certain other cases: if for example only tags or commits have been selected, there is no need to walk down trees. The new filter is not yet supported in bitmaps. This is going to be implemented in a subsequent commit. Signed-off-by: Patrick Steinhardt --- Documentation/config/uploadpack.txt | 6 +-- Documentation/rev-list-options.txt | 3 ++ list-objects-filter-options.c | 14 ++++++ list-objects-filter-options.h | 2 + list-objects-filter.c | 76 +++++++++++++++++++++++++++++ t/t6112-rev-list-filters-objects.sh | 48 ++++++++++++++++++ 6 files changed, 146 insertions(+), 3 deletions(-) diff --git a/Documentation/config/uploadpack.txt b/Documentation/config/upl= oadpack.txt index 6729a072ea..32fad5bbe8 100644 --- a/Documentation/config/uploadpack.txt +++ b/Documentation/config/uploadpack.txt @@ -66,9 +66,9 @@ uploadpackfilter.allow:: uploadpackfilter..allow:: Explicitly allow or ban the object filter corresponding to ``, where `` may be one of: `blob:none`, - `blob:limit`, `tree`, `sparse:oid`, or `combine`. If using - combined filters, both `combine` and all of the nested filter - kinds must be allowed. Defaults to `uploadpackfilter.allow`. + `blob:limit`, `object:type`, `tree`, `sparse:oid`, or `combine`. + If using combined filters, both `combine` and all of the nested + filter kinds must be allowed. Defaults to `uploadpackfilter.allow`. =20 uploadpackfilter.tree.maxDepth:: Only allow `--filter=3Dtree:` when `` is no more than the value of diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-op= tions.txt index b1c8f86c6e..3afa8fffbd 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -892,6 +892,9 @@ or units. n may be zero. The suffixes k, m, and g can= be used to name units in KiB, MiB, or GiB. For example, 'blob:limit=3D1k' is the same as 'blob:limit=3D1024'. + +The form '--filter=3Dobject:type=3D(tag|commit|tree|blob)' omits all objec= ts +which are not of the requested type. ++ The form '--filter=3Dsparse:oid=3D' uses a sparse-checkout specification contained in the blob (or blob-expression) '' to omit blobs that would not be not required for a sparse checkout on diff --git a/list-objects-filter-options.c b/list-objects-filter-options.c index d2d1c81caf..bb6f6577d5 100644 --- a/list-objects-filter-options.c +++ b/list-objects-filter-options.c @@ -29,6 +29,8 @@ const char *list_object_filter_config_name(enum list_obje= cts_filter_choice c) return "tree"; case LOFC_SPARSE_OID: return "sparse:oid"; + case LOFC_OBJECT_TYPE: + return "object:type"; case LOFC_COMBINE: return "combine"; case LOFC__COUNT: @@ -97,6 +99,18 @@ static int gently_parse_list_objects_filter( } return 1; =20 + } else if (skip_prefix(arg, "object:type=3D", &v0)) { + int type =3D type_from_string_gently(v0, -1, 1); + if (type < 0) { + strbuf_addstr(errbuf, _("expected 'object:type=3D'")); + return 1; + } + + filter_options->object_type =3D type; + filter_options->choice =3D LOFC_OBJECT_TYPE; + + return 0; + } else if (skip_prefix(arg, "combine:", &v0)) { return parse_combine_filter(filter_options, v0, errbuf); =20 diff --git a/list-objects-filter-options.h b/list-objects-filter-options.h index 01767c3c96..4d0d0588cc 100644 --- a/list-objects-filter-options.h +++ b/list-objects-filter-options.h @@ -13,6 +13,7 @@ enum list_objects_filter_choice { LOFC_BLOB_LIMIT, LOFC_TREE_DEPTH, LOFC_SPARSE_OID, + LOFC_OBJECT_TYPE, LOFC_COMBINE, LOFC__COUNT /* must be last */ }; @@ -54,6 +55,7 @@ struct list_objects_filter_options { char *sparse_oid_name; unsigned long blob_limit_value; unsigned long tree_exclude_depth; + enum object_type object_type; =20 /* LOFC_COMBINE values */ =20 diff --git a/list-objects-filter.c b/list-objects-filter.c index 0ebfa52966..1c1ee3d1bb 100644 --- a/list-objects-filter.c +++ b/list-objects-filter.c @@ -545,6 +545,81 @@ static void filter_sparse_oid__init( filter->free_fn =3D filter_sparse_free; } =20 +/* + * A filter for list-objects to omit large blobs. + * And to OPTIONALLY collect a list of the omitted OIDs. + */ +struct filter_object_type_data { + enum object_type object_type; +}; + +static enum list_objects_filter_result filter_object_type( + struct repository *r, + enum list_objects_filter_situation filter_situation, + struct object *obj, + const char *pathname, + const char *filename, + struct oidset *omits, + void *filter_data_) +{ + struct filter_object_type_data *filter_data =3D filter_data_; + + switch (filter_situation) { + default: + BUG("unknown filter_situation: %d", filter_situation); + + case LOFS_TAG: + assert(obj->type =3D=3D OBJ_TAG); + if (filter_data->object_type =3D=3D OBJ_TAG) + return LOFR_MARK_SEEN | LOFR_DO_SHOW; + return LOFR_MARK_SEEN; + + case LOFS_COMMIT: + assert(obj->type =3D=3D OBJ_COMMIT); + if (filter_data->object_type =3D=3D OBJ_COMMIT) + return LOFR_MARK_SEEN | LOFR_DO_SHOW; + return LOFR_MARK_SEEN; + + case LOFS_BEGIN_TREE: + assert(obj->type =3D=3D OBJ_TREE); + + /* + * If we only want to show commits or tags, then there is no + * need to walk down trees. + */ + if (filter_data->object_type =3D=3D OBJ_COMMIT || + filter_data->object_type =3D=3D OBJ_TAG) + return LOFR_SKIP_TREE; + + if (filter_data->object_type =3D=3D OBJ_TREE) + return LOFR_MARK_SEEN | LOFR_DO_SHOW; + + return LOFR_MARK_SEEN; + + case LOFS_BLOB: + assert(obj->type =3D=3D OBJ_BLOB); + + if (filter_data->object_type =3D=3D OBJ_BLOB) + return LOFR_MARK_SEEN | LOFR_DO_SHOW; + return LOFR_MARK_SEEN; + + case LOFS_END_TREE: + return LOFR_ZERO; + } +} + +static void filter_object_type__init( + struct list_objects_filter_options *filter_options, + struct filter *filter) +{ + struct filter_object_type_data *d =3D xcalloc(1, sizeof(*d)); + d->object_type =3D filter_options->object_type; + + filter->filter_data =3D d; + filter->filter_object_fn =3D filter_object_type; + filter->free_fn =3D free; +} + /* A filter which only shows objects shown by all sub-filters. */ struct combine_filter_data { struct subfilter *sub; @@ -691,6 +766,7 @@ static filter_init_fn s_filters[] =3D { filter_blobs_limit__init, filter_trees_depth__init, filter_sparse_oid__init, + filter_object_type__init, filter_combine__init, }; =20 diff --git a/t/t6112-rev-list-filters-objects.sh b/t/t6112-rev-list-filters= -objects.sh index 31457d13b9..c79ec04060 100755 --- a/t/t6112-rev-list-filters-objects.sh +++ b/t/t6112-rev-list-filters-objects.sh @@ -159,6 +159,54 @@ test_expect_success 'verify blob:limit=3D1m' ' test_must_be_empty observed ' =20 +# Test object:type=3D filter. + +test_expect_success 'setup object-type' ' + git init object-type && + echo contents >object-type/blob && + git -C object-type add blob && + git -C object-type commit -m commit-message && + git -C object-type tag tag -m tag-message +' + +test_expect_success 'verify object:type=3D fails with invalid type' ' + test_must_fail git -C object-type rev-list --objects --filter=3Dobject:ty= pe=3D HEAD && + test_must_fail git -C object-type rev-list --objects --filter=3Dobject:ty= pe=3Dinvalid HEAD +' + +test_expect_success 'verify object:type=3Dblob prints blob and commit' ' + ( + git -C object-type rev-parse HEAD && + printf "%s blob\n" $(git -C object-type rev-parse HEAD:blob) + ) >expected && + git -C object-type rev-list --objects --filter=3Dobject:type=3Dblob HEAD = >actual && + test_cmp expected actual +' + +test_expect_success 'verify object:type=3Dtree prints tree and commit' ' + ( + git -C object-type rev-parse HEAD && + printf "%s \n" $(git -C object-type rev-parse HEAD^{tree}) + ) >expected && + git -C object-type rev-list --objects --filter=3Dobject:type=3Dtree HEAD = >actual && + test_cmp expected actual +' + +test_expect_success 'verify object:type=3Dcommit prints commit' ' + git -C object-type rev-parse HEAD >expected && + git -C object-type rev-list --objects --filter=3Dobject:type=3Dcommit HEA= D >actual && + test_cmp expected actual +' + +test_expect_success 'verify object:type=3Dtag prints tag' ' + ( + git -C object-type rev-parse HEAD && + printf "%s tag\n" $(git -C object-type rev-parse tag) + ) >expected && + git -C object-type rev-list --objects --filter=3Dobject:type=3Dtag tag >a= ctual && + test_cmp expected actual +' + # Test sparse:path=3D filter. # !!!! # NOTE: sparse:path filter support has been dropped for security reasons, --=20 2.31.1 --EHe+KPFVGhX/ZfU0 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAmBwOkoACgkQVbJhu7ck PpSZPxAAhXhUJFstfL2llRleddMtDMpqchMpbai9ZW9y6IvD4MhTm/Gxb7wP+z87 fHknHs7u5NKYiLFfxv5PV95nYfAoXCK/lhuAgO2IrWu0UoTNvh3S8L0RZzt29Ei5 M+TPaeKpNadO6c1t2PuIYniyPxARAqvY3fbq2a4h7k4J6Y1CQqhHXg1AstcMpU55 8OGTdp943WHHI0yYtQDwGy536i3zaq4UBbtNioYYesbiJpXwjN+8WmUaAyp9ON6z 6gO3Iwc6RH1KZujx6Yfxlm49kJIeoH+YinpgAnDzn7MQwvohJCjQZHlyFUmv2JkQ +5Yzo/wpFi7ZfdMqca1HL7cqtSz9EW8Tn8FyY+N/F0DTJdnh8HkXMfNOD4Jdel3g BorIS1Ys/umyX9+OpJp9kQGPhzUVDUh3M5qaqi4hP9cbLgPh9LfA8lWxVTVryPRm KWCQisEEw9qyEE11had0GC9ci+jMZJn7gILSDnwCAYewg5FaGKhy417r1q3R7DDC J3fkYgZoUnxlVa50imcGu7OlzpADJQu+g3lAMuBZUGAJAk5K4lMW7dlW570gOah3 sbmF2qRqoLzK3enkrLNuZy+PwxSVCniy1ZBUZTL063WsfknO6rnZCFVI4nRTV+Oc CO9JCLGc1DrsZA8LPbGywKfSFBcRHqfHFlmkZtsz5D3qJkBYQuc= =OalD -----END PGP SIGNATURE----- --EHe+KPFVGhX/ZfU0--