From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Patrick Steinhardt <ps@pks.im>,
git@vger.kernel.org,
Christian Couder <christian.couder@gmail.com>,
Taylor Blau <me@ttaylorr.com>,
Philip Oakley <philipoakley@iee.email>
Subject: Re: [PATCH v4 0/8] rev-list: implement object type filter
Date: Thu, 15 Apr 2021 10:53:45 -0700 [thread overview]
Message-ID: <xmqqczuvsac6.fsf@gitster.g> (raw)
In-Reply-To: <YHgOCUI++AY/7zwX@coredump.intra.peff.net> (Jeff King's message of "Thu, 15 Apr 2021 05:57:29 -0400")
Jeff King <peff@peff.net> writes:
> Yeah, as somebody who has added or touched a lot of those paths, I've
> often wondered this myself: what would break if you asked for blobs but
> not trees? I think it does not work like you'd expect, because
> list-objects.c:process_tree() will not recurse the trees at all (and
> hence you'd never see any blob).
Ah, OK, that much I figured. I was wondering if it is worth
"fixing", IOW, if we see blobs being asked without trees being
asked, perhaps process_tree() should be taught to descend---even if
it won't show the trees themselves, blobs contained within would.
>> And, the above led to the question---the patches in your series
>> apparently do a lot more (even if we discount the option parsing
>> part), and I was wondering if that is because the independence
>> between these three bits the existing code aspires to maintain is
>> broken.
> ...
> Anyway. I do think this all could be done using the existing bits in
> rev_info. But there is value in making it all part of the modular
> filtering system.
Yes, I do not have a problem with the approach to add new features
as part of the "modular filtering system". But that leads me to
wonder into a different direction---coalesce (tag|tree|blob)_objects
members into a single bit, say all_objects, have "--objects" and
friends set that single bit, and update places like these to check
that single bit.
The patch is for illustration purposes; I didn't even aim to cover
the entirety of these two files.
builtin/rev-list.c | 9 ++++-----
pack-bitmap.c | 4 +---
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git c/builtin/rev-list.c w/builtin/rev-list.c
index 7677b1af5a..b6f0d7e9a3 100644
--- c/builtin/rev-list.c
+++ w/builtin/rev-list.c
@@ -424,8 +424,7 @@ static int try_bitmap_count(struct rev_info *revs,
* commits to traverse, since we don't know which objects go with which
* commit.
*/
- if (revs->max_count >= 0 &&
- (revs->tag_objects || revs->tree_objects || revs->blob_objects))
+ if (revs->max_count >= 0 && revs->all_objects)
return -1;
/*
@@ -439,9 +438,9 @@ static int try_bitmap_count(struct rev_info *revs,
return -1;
count_bitmap_commit_list(bitmap_git, &commit_count,
- revs->tree_objects ? &tree_count : NULL,
- revs->blob_objects ? &blob_count : NULL,
- revs->tag_objects ? &tag_count : NULL);
+ revs->all_objects ? &tree_count : NULL,
+ revs->all_objects ? &blob_count : NULL,
+ revs->all_objects ? &tag_count : NULL);
if (max_count >= 0 && max_count < commit_count)
commit_count = max_count;
diff --git c/pack-bitmap.c w/pack-bitmap.c
index d7e9f14f92..918c80a391 100644
--- c/pack-bitmap.c
+++ w/pack-bitmap.c
@@ -801,9 +801,7 @@ static void show_extended_objects(struct bitmap_index *bitmap_git,
continue;
obj = eindex->objects[i];
- if ((obj->type == OBJ_BLOB && !revs->blob_objects) ||
- (obj->type == OBJ_TREE && !revs->tree_objects) ||
- (obj->type == OBJ_TAG && !revs->tag_objects))
+ if (!revs->all_objects && obj->type != OBJ_COMMIT)
continue;
show_reach(&obj->oid, obj->type, 0, eindex->hashes[i], NULL, 0);
next prev parent reply other threads:[~2021-04-15 17:53 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 [this message]
2021-04-15 17:57 ` Junio C Hamano
2021-04-17 8:58 ` Jeff King
2021-04-19 11:46 ` [PATCH v5 " Patrick Steinhardt
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=xmqqczuvsac6.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
--cc=philipoakley@iee.email \
--cc=ps@pks.im \
/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).