From: Patrick Steinhardt <ps@pks.im>
To: git@vger.kernel.org
Cc: "Jeff King" <peff@peff.net>,
"Christian Couder" <christian.couder@gmail.com>,
"Taylor Blau" <me@ttaylorr.com>,
"Philip Oakley" <philipoakley@iee.email>,
"Ramsay Jones" <ramsay@ramsayjones.plus.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v5 0/8] rev-list: implement object type filter
Date: Mon, 19 Apr 2021 13:46:32 +0200 [thread overview]
Message-ID: <cover.1618832437.git.ps@pks.im> (raw)
In-Reply-To: <cover.1618234575.git.ps@pks.im>
[-- Attachment #1: Type: text/plain, Size: 5559 bytes --]
Hi,
this is the fifth version of my patch series which implements a new
`object:type` filter for git-rev-list(1) and git-upload-pack(1) and
extends support for bitmap indices to work with combined filters.
Changes compared to v4:
- I'm now explicitly passing `strlen(v0)` to
`type_from_string_gently()` to be prepared for the future
semantics change here.
- The error message printed in case the user passes in invalid
object type to `--filter=object:type=` now prints the wrong
value passed by the user.
- Fixed missing header in list-objects-filter-options.h.
- Tests now use test_create_repo and test_commit.
- Removed a needless subshell in the tests.
I hope that this catches all feedback and that I didn't misunderstand or
miss something. If I did, please give me a shout!
Patrick
Patrick Steinhardt (8):
uploadpack.txt: document implication of `uploadpackfilter.allow`
revision: mark commit parents as NOT_USER_GIVEN
list-objects: move tag processing into its own function
list-objects: support filtering by tag and commit
list-objects: implement object type filter
pack-bitmap: implement object type filter
pack-bitmap: implement combined filter
rev-list: allow filtering of provided items
Documentation/config/uploadpack.txt | 9 ++-
Documentation/rev-list-options.txt | 8 ++
builtin/pack-objects.c | 2 +-
builtin/rev-list.c | 36 ++++++---
list-objects-filter-options.c | 15 ++++
list-objects-filter-options.h | 3 +
list-objects-filter.c | 116 ++++++++++++++++++++++++++++
list-objects-filter.h | 2 +
list-objects.c | 30 ++++++-
pack-bitmap.c | 45 +++++++++--
pack-bitmap.h | 3 +-
reachable.c | 2 +-
revision.c | 4 +-
revision.h | 3 -
t/t6112-rev-list-filters-objects.sh | 72 +++++++++++++++++
t/t6113-rev-list-bitmap-filters.sh | 68 +++++++++++++++-
16 files changed, 388 insertions(+), 30 deletions(-)
Range-diff against v4:
1: f80b9570d4 = 1: bcc81336b1 uploadpack.txt: document implication of `uploadpackfilter.allow`
2: 46c1952405 = 2: ffe8e2bf73 revision: mark commit parents as NOT_USER_GIVEN
3: 3d792f6339 = 3: 21d7f06d0a list-objects: move tag processing into its own function
4: 674da0f9ac = 4: b5d6ab6b4a list-objects: support filtering by tag and commit
5: d22a5fd37d ! 5: f462745290 list-objects: implement object type filter
@@ list-objects-filter-options.c: static int gently_parse_list_objects_filter(
return 1;
+ } else if (skip_prefix(arg, "object:type=", &v0)) {
-+ int type = type_from_string_gently(v0, -1, 1);
++ int type = type_from_string_gently(v0, strlen(v0), 1);
+ if (type < 0) {
-+ strbuf_addstr(errbuf, _("expected 'object:type=<type>'"));
++ strbuf_addf(errbuf, _("'%s' for 'object:type=<type>' is"
++ "not a valid object type"), v0);
+ return 1;
+ }
+
@@ list-objects-filter-options.c: static int gently_parse_list_objects_filter(
## list-objects-filter-options.h ##
+@@
+ #ifndef LIST_OBJECTS_FILTER_OPTIONS_H
+ #define LIST_OBJECTS_FILTER_OPTIONS_H
+
++#include "cache.h"
+ #include "parse-options.h"
+ #include "string-list.h"
+
@@ list-objects-filter-options.h: enum list_objects_filter_choice {
LOFC_BLOB_LIMIT,
LOFC_TREE_DEPTH,
@@ t/t6112-rev-list-filters-objects.sh: test_expect_success 'verify blob:limit=1m'
+# Test object:type=<type> 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 &&
++ test_create_repo object-type &&
++ test_commit --no-tag -C object-type message blob &&
+ git -C object-type tag tag -m tag-message
+'
+
@@ t/t6112-rev-list-filters-objects.sh: test_expect_success 'verify blob:limit=1m'
+'
+
+test_expect_success 'verify object:type=blob 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-parse HEAD >expected &&
++ printf "%s blob\n" $(git -C object-type rev-parse HEAD:blob) >>expected &&
+ git -C object-type rev-list --objects --filter=object:type=blob HEAD >actual &&
+ test_cmp expected actual
+'
6: 17c9f66bbc = 6: 90c80c1efa pack-bitmap: implement object type filter
7: 759ac54bb2 = 7: 9726e69861 pack-bitmap: implement combined filter
8: c779d222cf ! 8: fce3551e48 rev-list: allow filtering of provided items
@@ pack-bitmap.c: struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs,
## pack-bitmap.h ##
@@ pack-bitmap.h: void traverse_bitmap_commit_list(struct bitmap_index *,
- show_reachable_fn show_reachable);
void test_bitmap_walk(struct rev_info *revs);
+ int test_bitmap_commits(struct repository *r);
struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs,
- struct list_objects_filter_options *filter);
+ struct list_objects_filter_options *filter,
--
2.31.1
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2021-04-19 11:47 UTC|newest]
Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-01 12:20 [PATCH 0/7] rev-parse: implement object type filter Patrick Steinhardt
2021-03-01 12:20 ` [PATCH 1/7] revision: mark commit parents as NOT_USER_GIVEN Patrick Steinhardt
2021-03-01 12:20 ` [PATCH 2/7] list-objects: move tag processing into its own function Patrick Steinhardt
2021-03-01 12:20 ` [PATCH 3/7] list-objects: support filtering by tag and commit Patrick Steinhardt
2021-03-01 12:20 ` [PATCH 4/7] list-objects: implement object type filter Patrick Steinhardt
2021-03-01 12:20 ` [PATCH 5/7] pack-bitmap: " Patrick Steinhardt
2021-03-01 12:20 ` [PATCH 6/7] pack-bitmap: implement combined filter Patrick Steinhardt
2021-03-01 12:21 ` [PATCH 7/7] rev-list: allow filtering of provided items Patrick Steinhardt
2021-03-10 21:39 ` [PATCH 0/7] rev-parse: implement object type filter Jeff King
2021-03-11 14:38 ` Patrick Steinhardt
2021-03-11 17:54 ` Jeff King
2021-03-15 11:25 ` Patrick Steinhardt
2021-03-10 21:58 ` Taylor Blau
2021-03-10 22:19 ` Jeff King
2021-03-11 14:43 ` Patrick Steinhardt
2021-03-11 17:56 ` Jeff King
2021-03-15 13:14 ` [PATCH v2 0/8] " Patrick Steinhardt
2021-03-15 13:14 ` [PATCH v2 1/8] uploadpack.txt: document implication of `uploadpackfilter.allow` Patrick Steinhardt
2021-04-06 17:17 ` Jeff King
2021-03-15 13:14 ` [PATCH v2 2/8] revision: mark commit parents as NOT_USER_GIVEN Patrick Steinhardt
2021-04-06 17:30 ` Jeff King
2021-04-09 10:19 ` Patrick Steinhardt
2021-03-15 13:14 ` [PATCH v2 3/8] list-objects: move tag processing into its own function Patrick Steinhardt
2021-04-06 17:39 ` Jeff King
2021-03-15 13:14 ` [PATCH v2 4/8] list-objects: support filtering by tag and commit Patrick Steinhardt
2021-03-15 13:14 ` [PATCH v2 5/8] list-objects: implement object type filter Patrick Steinhardt
2021-04-06 17:42 ` Jeff King
2021-03-15 13:14 ` [PATCH v2 6/8] pack-bitmap: " Patrick Steinhardt
2021-04-06 17:48 ` Jeff King
2021-03-15 13:14 ` [PATCH v2 7/8] pack-bitmap: implement combined filter Patrick Steinhardt
2021-04-06 17:54 ` Jeff King
2021-04-09 10:31 ` Patrick Steinhardt
2021-04-09 15:53 ` Jeff King
2021-04-09 11:17 ` Patrick Steinhardt
2021-04-09 15:55 ` Jeff King
2021-03-15 13:15 ` [PATCH v2 8/8] rev-list: allow filtering of provided items Patrick Steinhardt
2021-04-06 18:04 ` Jeff King
2021-04-09 10:59 ` Patrick Steinhardt
2021-04-09 15:58 ` Jeff King
2021-03-20 21:10 ` [PATCH v2 0/8] rev-parse: implement object type filter Junio C Hamano
2021-04-06 18:08 ` Jeff King
2021-04-09 11:14 ` Patrick Steinhardt
2021-04-09 16:05 ` Jeff King
2021-04-09 11:27 ` [PATCH v3 " Patrick Steinhardt
2021-04-09 11:27 ` [PATCH v3 1/8] uploadpack.txt: document implication of `uploadpackfilter.allow` Patrick Steinhardt
2021-04-09 11:27 ` [PATCH v3 2/8] revision: mark commit parents as NOT_USER_GIVEN Patrick Steinhardt
2021-04-09 11:28 ` [PATCH v3 3/8] list-objects: move tag processing into its own function Patrick Steinhardt
2021-04-09 11:28 ` [PATCH v3 4/8] list-objects: support filtering by tag and commit Patrick Steinhardt
2021-04-11 6:49 ` Junio C Hamano
2021-04-09 11:28 ` [PATCH v3 5/8] list-objects: implement object type filter Patrick Steinhardt
2021-04-09 11:28 ` [PATCH v3 6/8] pack-bitmap: " Patrick Steinhardt
2021-04-09 11:28 ` [PATCH v3 7/8] pack-bitmap: implement combined filter Patrick Steinhardt
2021-04-09 11:28 ` [PATCH v3 8/8] rev-list: allow filtering of provided items Patrick Steinhardt
2021-04-09 11:32 ` [RESEND PATCH " Patrick Steinhardt
2021-04-09 15:00 ` [PATCH " Philip Oakley
2021-04-12 13:15 ` Patrick Steinhardt
2021-04-11 6:02 ` [PATCH v3 0/8] rev-parse: implement object type filter Junio C Hamano
2021-04-12 13:12 ` Patrick Steinhardt
2021-04-12 13:37 ` [PATCH v4 0/8] rev-list: " Patrick Steinhardt
2021-04-12 13:37 ` [PATCH v4 1/8] uploadpack.txt: document implication of `uploadpackfilter.allow` Patrick Steinhardt
2021-04-12 13:37 ` [PATCH v4 2/8] revision: mark commit parents as NOT_USER_GIVEN Patrick Steinhardt
2021-04-12 13:37 ` [PATCH v4 3/8] list-objects: move tag processing into its own function Patrick Steinhardt
2021-04-12 13:37 ` [PATCH v4 4/8] list-objects: support filtering by tag and commit Patrick Steinhardt
2021-04-12 13:37 ` [PATCH v4 5/8] list-objects: implement object type filter Patrick Steinhardt
2021-04-13 9:57 ` Ævar Arnfjörð Bjarmason
2021-04-13 10:43 ` Andreas Schwab
2021-04-14 11:32 ` Patrick Steinhardt
2021-04-12 13:37 ` [PATCH v4 6/8] pack-bitmap: " Patrick Steinhardt
2021-04-12 13:37 ` [PATCH v4 7/8] pack-bitmap: implement combined filter Patrick Steinhardt
2021-04-12 13:37 ` [PATCH v4 8/8] rev-list: allow filtering of provided items Patrick Steinhardt
2021-04-13 7:45 ` [PATCH v4 0/8] rev-list: implement object type filter Jeff King
2021-04-13 8:06 ` Patrick Steinhardt
2021-04-15 9:42 ` Jeff King
2021-04-16 22:06 ` Junio C Hamano
2021-04-16 23:15 ` Junio C Hamano
2021-04-17 1:17 ` Ramsay Jones
2021-04-17 9:01 ` Jeff King
2021-04-17 21:45 ` Junio C Hamano
2021-04-13 21:03 ` Junio C Hamano
2021-04-14 11:59 ` Patrick Steinhardt
2021-04-14 21:07 ` Junio C Hamano
2021-04-15 9:57 ` Jeff King
2021-04-15 17:53 ` Junio C Hamano
2021-04-15 17:57 ` Junio C Hamano
2021-04-17 8:58 ` Jeff King
2021-04-19 11:46 ` Patrick Steinhardt [this message]
2021-04-19 11:46 ` [PATCH v5 1/8] uploadpack.txt: document implication of `uploadpackfilter.allow` Patrick Steinhardt
2021-04-19 11:46 ` [PATCH v5 2/8] revision: mark commit parents as NOT_USER_GIVEN Patrick Steinhardt
2021-04-19 11:46 ` [PATCH v5 3/8] list-objects: move tag processing into its own function Patrick Steinhardt
2021-04-19 11:46 ` [PATCH v5 4/8] list-objects: support filtering by tag and commit Patrick Steinhardt
2021-04-19 11:46 ` [PATCH v5 5/8] list-objects: implement object type filter Patrick Steinhardt
2021-04-19 11:46 ` [PATCH v5 6/8] pack-bitmap: " Patrick Steinhardt
2021-04-19 11:47 ` [PATCH v5 7/8] pack-bitmap: implement combined filter Patrick Steinhardt
2021-04-19 11:47 ` [PATCH v5 8/8] rev-list: allow filtering of provided items Patrick Steinhardt
2021-04-19 23:16 ` [PATCH v5 0/8] rev-list: implement object type filter Junio C Hamano
2021-04-23 9:13 ` Jeff King
2021-04-28 2:18 ` Junio C Hamano
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=cover.1618832437.git.ps@pks.im \
--to=ps@pks.im \
--cc=avarab@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
--cc=philipoakley@iee.email \
--cc=ramsay@ramsayjones.plus.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public 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).