From: Matthew DeVore <matvore@comcast.net>
To: Jonathan Tan <jonathantanmy@google.com>, matvore@google.com
Cc: git@vger.kernel.org, sbeller@google.com, git@jeffhostetler.com,
jeffhost@microsoft.com, peff@peff.net, stefanbeller@gmail.com,
pclouds@gmail.com
Subject: Re: [PATCH v2 2/2] tree:<depth>: skip some trees even when collecting omits
Date: Tue, 8 Jan 2019 16:29:52 -0800 [thread overview]
Message-ID: <8cb0dd36-4c49-228e-17ad-538fb377ffe4@comcast.net> (raw)
In-Reply-To: <20190108020034.23648-1-jonathantanmy@google.com>
Thank you for the review :) See below.
On 2019/01/07 18:00, Jonathan Tan wrote:
>> -static void filter_trees_update_omits(
>> +static int filter_trees_update_omits(
>> struct object *obj,
>> struct filter_trees_depth_data *filter_data,
>> int include_it)
>> {
>> if (!filter_data->omits)
>> - return;
>> + return 1;
>>
>> if (include_it)
>> - oidset_remove(filter_data->omits, &obj->oid);
>> + return oidset_remove(filter_data->omits, &obj->oid);
>> else
>> - oidset_insert(filter_data->omits, &obj->oid);
>> + return oidset_insert(filter_data->omits, &obj->oid);
>> }
> I think this function is getting too magical - if filter_data->omits is
> not set, we pretend that we have omitted the tree, because we want the
> same behavior when not needing omits and when the tree is omitted. Could
> this be done another way?
Yes, returning a manipulative lie when omits is NULL is rather
confusing. So I changed it to this (interdiff):
+/* Returns 1 if the oid was in the omits set before it was invoked. */
static int filter_trees_update_omits(
struct object *obj,
struct filter_trees_depth_data *filter_data,
int include_it)
{
if (!filter_data->omits)
- return 1;
+ return 0;
if (include_it)
return oidset_remove(filter_data->omits, &obj->oid);
@@ -177,7 +178,7 @@ static enum list_objects_filter_result
filter_trees_depth(
if (include_it)
filter_res = LOFR_DO_SHOW;
- else if (!been_omitted)
+ else if (filter_data->omits && !been_omitted)
/*
* Must update omit information of children
* recursively; they have not been omitted yet.
next prev parent reply other threads:[~2019-01-09 0:30 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-10 23:40 [PATCH v2 0/2] support for filtering trees and blobs based on depth Matthew DeVore
2018-12-10 23:40 ` [PATCH v2 1/2] list-objects-filter: teach tree:# how to handle >0 Matthew DeVore
2019-01-08 1:56 ` Jonathan Tan
2019-01-08 19:22 ` Matthew DeVore
2019-01-08 23:19 ` Jonathan Tan
2019-01-08 23:36 ` Junio C Hamano
2019-01-08 23:41 ` Jonathan Tan
2019-01-08 23:39 ` Junio C Hamano
2019-01-09 2:43 ` MATTHEW DEVORE
2018-12-10 23:40 ` [PATCH v2 2/2] tree:<depth>: skip some trees even when collecting omits Matthew DeVore
2019-01-08 2:00 ` Jonathan Tan
2019-01-08 23:22 ` Jonathan Tan
2019-01-09 2:47 ` MATTHEW DEVORE
2019-01-09 0:29 ` Matthew DeVore [this message]
2018-12-11 8:45 ` [PATCH v2 0/2] support for filtering trees and blobs based on depth Junio C Hamano
2019-01-08 0:56 ` Matthew DeVore
2019-01-09 2:59 ` [PATCH v3 " Matthew DeVore
2019-01-09 2:59 ` [PATCH v3 1/2] list-objects-filter: teach tree:# how to handle >0 Matthew DeVore
2019-01-09 2:59 ` [PATCH v3 2/2] tree:<depth>: skip some trees even when collecting omits Matthew DeVore
2019-01-09 18:06 ` [PATCH v3 0/2] support for filtering trees and blobs based on depth Jonathan Tan
2019-01-15 23:35 ` Junio C Hamano
2019-01-15 23:41 ` Junio C Hamano
2019-01-17 0:14 ` Matthew DeVore
2019-01-17 18:44 ` 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=8cb0dd36-4c49-228e-17ad-538fb377ffe4@comcast.net \
--to=matvore@comcast.net \
--cc=git@jeffhostetler.com \
--cc=git@vger.kernel.org \
--cc=jeffhost@microsoft.com \
--cc=jonathantanmy@google.com \
--cc=matvore@google.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=sbeller@google.com \
--cc=stefanbeller@gmail.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).