From: Junio C Hamano <gitster@pobox.com>
To: Matthew DeVore <matvore@google.com>
Cc: sbeller@google.com, git@vger.kernel.org, git@jeffhostetler.com,
jeffhost@microsoft.com, peff@peff.net, stefanbeller@gmail.com,
jonathantanmy@google.com, pclouds@gmail.com
Subject: Re: [PATCH v8 5/7] revision: mark non-user-given objects instead
Date: Fri, 14 Sep 2018 10:23:09 -0700 [thread overview]
Message-ID: <xmqqzhwkat8i.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <ca25f5914a98455cb6908a34146c10101d3529b0.1536885967.git.matvore@google.com> (Matthew DeVore's message of "Thu, 13 Sep 2018 17:55:25 -0700")
Matthew DeVore <matvore@google.com> writes:
> Currently, list-objects.c incorrectly treats all root trees of commits
> as USER_GIVEN. Also, it would be easier to mark objects that are
> non-user-given instead of user-given, since the places in the code
> where we access an object through a reference are more obvious than
> the places where we access an object that was given by the user.
>
> Resolve these two problems by introducing a flag NOT_USER_GIVEN that
> marks blobs and trees that are non-user-given, replacing USER_GIVEN.
> (Only blobs and trees are marked because this mark is only used when
> filtering objects, and filtering of other types of objects is not
> supported yet.)
>
> This fixes a bug in that git rev-list behaved differently from git
> pack-objects. pack-objects would *not* filter objects given explicitly
> on the command line and rev-list would filter. This was because the two
> commands used a different function to add objects to the rev_info
> struct. This seems to have been an oversight, and pack-objects has the
> correct behavior, so I added a test to make sure that rev-list now
> behaves properly.
>
> Signed-off-by: Matthew DeVore <matvore@google.com>
>
> fixup of 6defd70de
That's probably meant to go below "---".
> ---
> list-objects.c | 31 +++++++++++++++++------------
> revision.c | 1 -
> revision.h | 11 ++++++++--
> t/t6112-rev-list-filters-objects.sh | 10 ++++++++++
> 4 files changed, 37 insertions(+), 16 deletions(-)
>
> diff --git a/list-objects.c b/list-objects.c
> index 243192af5..7a1a0929d 100644
> --- a/list-objects.c
> +++ b/list-objects.c
> @@ -53,7 +53,7 @@ static void process_blob(struct traversal_context *ctx,
>
> pathlen = path->len;
> strbuf_addstr(path, name);
> - if (!(obj->flags & USER_GIVEN) && ctx->filter_fn)
> + if ((obj->flags & NOT_USER_GIVEN) && ctx->filter_fn)
> r = ctx->filter_fn(LOFS_BLOB, obj,
> path->buf, &path->buf[pathlen],
> ctx->filter_data);
> @@ -120,17 +120,19 @@ static void process_tree_contents(struct traversal_context *ctx,
> continue;
> }
>
> - if (S_ISDIR(entry.mode))
> - process_tree(ctx,
> - lookup_tree(the_repository, entry.oid),
> - base, entry.path);
> + if (S_ISDIR(entry.mode)) {
> + struct tree *t = lookup_tree(the_repository, entry.oid);
> + t->object.flags |= NOT_USER_GIVEN;
> + process_tree(ctx, t, base, entry.path);
> + }
> else if (S_ISGITLINK(entry.mode))
> process_gitlink(ctx, entry.oid->hash,
> base, entry.path);
> - else
> - process_blob(ctx,
> - lookup_blob(the_repository, entry.oid),
> - base, entry.path);
> + else {
> + struct blob *b = lookup_blob(the_repository, entry.oid);
> + b->object.flags |= NOT_USER_GIVEN;
> + process_blob(ctx, b, base, entry.path);
> + }
> }
> }
>
> @@ -171,7 +173,7 @@ static void process_tree(struct traversal_context *ctx,
> }
>
> strbuf_addstr(base, name);
> - if (!(obj->flags & USER_GIVEN) && ctx->filter_fn)
> + if ((obj->flags & NOT_USER_GIVEN) && ctx->filter_fn)
> r = ctx->filter_fn(LOFS_BEGIN_TREE, obj,
> base->buf, &base->buf[baselen],
> ctx->filter_data);
> @@ -185,7 +187,7 @@ static void process_tree(struct traversal_context *ctx,
> if (!failed_parse)
> process_tree_contents(ctx, tree, base);
>
> - if (!(obj->flags & USER_GIVEN) && ctx->filter_fn) {
> + if ((obj->flags & NOT_USER_GIVEN) && ctx->filter_fn) {
> r = ctx->filter_fn(LOFS_END_TREE, obj,
> base->buf, &base->buf[baselen],
> ctx->filter_data);
> @@ -301,8 +303,11 @@ static void do_traverse(struct traversal_context *ctx)
> * an uninteresting boundary commit may not have its tree
> * parsed yet, but we are not going to show them anyway
> */
> - if (get_commit_tree(commit))
> - add_pending_tree(ctx->revs, get_commit_tree(commit));
> + if (get_commit_tree(commit)) {
> + struct tree *tree = get_commit_tree(commit);
> + tree->object.flags |= NOT_USER_GIVEN;
> + add_pending_tree(ctx->revs, tree);
> + }
> ctx->show_commit(commit, ctx->show_data);
>
> if (ctx->revs->tree_blobs_in_commit_order)
> diff --git a/revision.c b/revision.c
> index de4dce600..72d48a17f 100644
> --- a/revision.c
> +++ b/revision.c
> @@ -175,7 +175,6 @@ static void add_pending_object_with_path(struct rev_info *revs,
> strbuf_release(&buf);
> return; /* do not add the commit itself */
> }
> - obj->flags |= USER_GIVEN;
> add_object_array_with_path(obj, name, &revs->pending, mode, path);
> }
>
> diff --git a/revision.h b/revision.h
> index 5910613cb..83e164039 100644
> --- a/revision.h
> +++ b/revision.h
> @@ -21,9 +21,16 @@
> #define SYMMETRIC_LEFT (1u<<8)
> #define PATCHSAME (1u<<9)
> #define BOTTOM (1u<<10)
> -#define USER_GIVEN (1u<<25) /* given directly by the user */
> +/*
> + * Indicates object was reached by traversal. i.e. not given by user on
> + * command-line or stdin.
> + * NEEDSWORK: NOT_USER_GIVEN doesn't apply to commits because we only support
> + * filtering trees and blobs, but it may be useful to support filtering commits
> + * in the future.
> + */
> +#define NOT_USER_GIVEN (1u<<25)
> #define TRACK_LINEAR (1u<<26)
> -#define ALL_REV_FLAGS (((1u<<11)-1) | USER_GIVEN | TRACK_LINEAR)
> +#define ALL_REV_FLAGS (((1u<<11)-1) | NOT_USER_GIVEN | TRACK_LINEAR)
>
> #define DECORATE_SHORT_REFS 1
> #define DECORATE_FULL_REFS 2
> diff --git a/t/t6112-rev-list-filters-objects.sh b/t/t6112-rev-list-filters-objects.sh
> index c662c97db..2e07dadf0 100755
> --- a/t/t6112-rev-list-filters-objects.sh
> +++ b/t/t6112-rev-list-filters-objects.sh
> @@ -30,6 +30,16 @@ test_expect_success 'verify blob:none omits all 5 blobs' '
> test_cmp observed expected
> '
>
> +test_expect_success 'specify blob explicitly prevents filtering' '
> + file_3=$(git -C r1 ls-files -s file.3 \
> + | awk -f print_2.awk) &&
> + file_4=$(git -C r1 ls-files -s file.4 \
> + | awk -f print_2.awk) &&
> + git -C r1 rev-list HEAD --objects --filter=blob:none HEAD $file_3 >observed &&
> + grep -q "$file_3" observed &&
> + test_must_fail grep -q "$file_4" observed
> +'
> +
> test_expect_success 'verify emitted+omitted == all' '
> git -C r1 rev-list HEAD --objects \
> | awk -f print_1.awk \
next prev parent reply other threads:[~2018-09-14 17:23 UTC|newest]
Thread overview: 151+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-09 22:44 [RFC PATCH 0/5] filter: support for excluding all trees and blobs Matthew DeVore
2018-08-09 22:45 ` [PATCH 1/5] revision: invert meaning of the USER_GIVEN flag Matthew DeVore
2018-08-10 18:43 ` Jonathan Tan
2018-08-09 22:45 ` [PATCH 2/5] list-objects-filter: implement filter only:commits Matthew DeVore
2018-08-10 0:14 ` Jonathan Tan
2018-08-09 22:45 ` [PATCH 3/5] list-objects: store common func args in struct Matthew DeVore
2018-08-09 22:45 ` [PATCH 4/5] list-objects: refactor to process_tree_contents Matthew DeVore
2018-08-09 22:45 ` [PATCH 5/5] rev-list: handle missing tree objects properly Matthew DeVore
2018-08-10 0:24 ` Jonathan Tan
2018-08-10 19:03 ` [RFC PATCH 0/5] filter: support for excluding all trees and blobs Jonathan Tan
2018-08-10 23:06 ` [PATCH v2 " Matthew DeVore
2018-08-10 23:06 ` [PATCH v2 1/5] list-objects: store common func args in struct Matthew DeVore
2018-08-10 23:06 ` [PATCH v2 2/5] list-objects: refactor to process_tree_contents Matthew DeVore
2018-08-10 23:06 ` [PATCH v2 3/5] rev-list: handle missing tree objects properly Matthew DeVore
2018-08-13 18:20 ` Jonathan Tan
2018-08-14 0:22 ` Matthew DeVore
2018-08-14 16:03 ` Jonathan Tan
2018-08-10 23:06 ` [PATCH v2 4/5] revision: mark non-user-given objects instead Matthew DeVore
2018-08-10 23:06 ` [PATCH v2 5/5] list-objects-filter: implement filter tree:none Matthew DeVore
2018-08-13 16:38 ` Jeff Hostetler
2018-08-14 0:57 ` Matthew DeVore
2018-08-13 18:29 ` Jonathan Tan
2018-08-14 0:55 ` Matthew DeVore
2018-08-13 18:14 ` [PATCH v3 0/5] filter: support for excluding all trees and blobs Matthew DeVore
2018-08-13 18:14 ` [PATCH v3 1/5] list-objects: store common func args in struct Matthew DeVore
2018-08-13 18:14 ` [PATCH v3 2/5] list-objects: refactor to process_tree_contents Matthew DeVore
2018-08-13 18:14 ` [PATCH v3 3/5] rev-list: handle missing tree objects properly Matthew DeVore
2018-08-13 18:14 ` [PATCH v3 4/5] revision: mark non-user-given objects instead Matthew DeVore
2018-08-13 18:14 ` [PATCH v3 5/5] list-objects-filter: implement filter tree:0 Matthew DeVore
2018-08-14 15:13 ` Jeff Hostetler
2018-08-14 17:25 ` Matthew DeVore
2018-10-03 19:00 ` Matthew DeVore
2018-08-14 17:28 ` [PATCH v4 0/6] filter: support for excluding all trees and blobs Matthew DeVore
2018-08-14 17:28 ` [PATCH v4 1/6] list-objects: store common func args in struct Matthew DeVore
2018-08-14 17:28 ` [PATCH v4 2/6] list-objects: refactor to process_tree_contents Matthew DeVore
2018-08-14 17:28 ` [PATCH v4 3/6] list-objects: always parse trees gently Matthew DeVore
2018-08-14 17:28 ` [PATCH v4 4/6] rev-list: handle missing tree objects properly Matthew DeVore
2018-08-14 18:06 ` Jonathan Tan
2018-08-14 22:43 ` Matthew DeVore
2018-08-14 22:56 ` Jonathan Tan
2018-08-14 23:14 ` Jonathan Tan
2018-08-14 17:28 ` [PATCH v4 5/6] revision: mark non-user-given objects instead Matthew DeVore
2018-08-14 17:28 ` [PATCH v4 6/6] list-objects-filter: implement filter tree:0 Matthew DeVore
2018-08-14 18:18 ` Jonathan Tan
2018-08-14 20:00 ` Matthew DeVore
2018-08-14 20:19 ` Jonathan Tan
2018-08-14 20:55 ` Junio C Hamano
2018-08-14 23:30 ` Matthew DeVore
2018-08-15 16:14 ` Junio C Hamano
2018-08-15 16:37 ` Matthew DeVore
2018-08-14 20:01 ` Jeff King
2018-08-14 23:55 ` Matthew DeVore
2018-08-15 1:22 ` Jeff King
2018-08-15 16:17 ` Junio C Hamano
2018-08-15 17:54 ` Matthew DeVore
2018-08-15 0:22 ` [PATCH v5 0/6] filter: support for excluding all trees and blobs Matthew DeVore
2018-08-15 0:22 ` [PATCH v5 1/6] list-objects: store common func args in struct Matthew DeVore
2018-08-15 0:22 ` [PATCH v5 2/6] list-objects: refactor to process_tree_contents Matthew DeVore
2018-08-15 0:22 ` [PATCH v5 3/6] list-objects: always parse trees gently Matthew DeVore
2018-08-15 0:22 ` [PATCH v5 4/6] rev-list: handle missing tree objects properly Matthew DeVore
2018-08-15 0:22 ` [PATCH v5 5/6] revision: mark non-user-given objects instead Matthew DeVore
2018-08-15 0:22 ` [PATCH v5 6/6] list-objects-filter: implement filter tree:0 Matthew DeVore
2018-08-15 23:19 ` [PATCH v6 0/6] filter: support for excluding all trees and blobs Matthew DeVore
2018-08-15 23:19 ` [PATCH v6 1/6] list-objects: store common func args in struct Matthew DeVore
2018-08-15 23:19 ` [PATCH v6 2/6] list-objects: refactor to process_tree_contents Matthew DeVore
2018-08-15 23:19 ` [PATCH v6 3/6] list-objects: always parse trees gently Matthew DeVore
2018-08-15 23:19 ` [PATCH v6 4/6] rev-list: handle missing tree objects properly Matthew DeVore
2018-08-15 23:19 ` [PATCH v6 5/6] revision: mark non-user-given objects instead Matthew DeVore
2018-08-15 23:19 ` [PATCH v6 6/6] list-objects-filter: implement filter tree:0 Matthew DeVore
2018-08-17 21:42 ` Stefan Beller
2018-08-17 22:19 ` Matthew DeVore
2018-08-17 22:28 ` Stefan Beller
2018-08-20 23:30 ` Matthew DeVore
2018-08-21 0:29 ` Stefan Beller
2018-08-21 21:46 ` Junio C Hamano
2018-08-22 18:00 ` Stefan Beller
2018-08-18 16:17 ` Duy Nguyen
2018-08-20 13:04 ` Matthew DeVore
2018-08-20 18:38 ` Stefan Beller
2018-08-20 23:20 ` Matthew DeVore
2018-08-21 0:36 ` Stefan Beller
2018-08-21 15:50 ` Duy Nguyen
2018-09-04 18:05 ` [PATCH v7 0/7] filter: support for excluding all trees and blobs Matthew DeVore
2018-09-04 18:05 ` [PATCH v7 1/7] list-objects: store common func args in struct Matthew DeVore
2018-09-04 18:05 ` [PATCH v7 2/7] list-objects: refactor to process_tree_contents Matthew DeVore
2018-09-04 18:05 ` [PATCH v7 3/7] list-objects: always parse trees gently Matthew DeVore
2018-09-04 18:05 ` [PATCH v7 4/7] rev-list: handle missing tree objects properly Matthew DeVore
2018-09-04 18:05 ` [PATCH v7 5/7] revision: mark non-user-given objects instead Matthew DeVore
2018-09-04 20:31 ` Junio C Hamano
2018-09-05 18:00 ` Matthew DeVore
2018-09-04 18:05 ` [PATCH v7 6/7] list-objects-filter: use BUG rather than die Matthew DeVore
2018-09-04 20:32 ` Junio C Hamano
2018-09-04 18:05 ` [PATCH v7 7/7] list-objects-filter: implement filter tree:0 Matthew DeVore
2018-09-04 20:44 ` Junio C Hamano
2018-09-06 0:08 ` Matthew DeVore
2018-09-04 18:41 ` [PATCH v7 0/7] filter: support for excluding all trees and blobs Stefan Beller
2018-09-14 0:55 ` [PATCH v8 " Matthew DeVore
2018-09-14 0:55 ` [PATCH v8 1/7] list-objects: store common func args in struct Matthew DeVore
2018-09-14 0:55 ` [PATCH v8 2/7] list-objects: refactor to process_tree_contents Matthew DeVore
2018-09-14 0:55 ` [PATCH v8 3/7] list-objects: always parse trees gently Matthew DeVore
2018-09-14 0:55 ` [PATCH v8 4/7] rev-list: handle missing tree objects properly Matthew DeVore
2018-09-14 0:55 ` [PATCH v8 5/7] revision: mark non-user-given objects instead Matthew DeVore
2018-09-14 17:23 ` Junio C Hamano [this message]
2018-09-14 20:08 ` Matthew DeVore
2018-09-14 0:55 ` [PATCH v8 6/7] list-objects-filter: use BUG rather than die Matthew DeVore
2018-09-14 0:55 ` [PATCH v8 7/7] list-objects-filter: implement filter tree:0 Matthew DeVore
2018-09-14 17:39 ` Junio C Hamano
2018-09-14 17:47 ` Junio C Hamano
2018-09-15 0:41 ` Matthew DeVore
2018-09-21 20:31 ` [PATCH v9 0/8] filter: support for excluding all trees and blobs Matthew DeVore
2018-09-21 20:31 ` [PATCH v9 1/8] list-objects: store common func args in struct Matthew DeVore
2018-09-21 20:31 ` [PATCH v9 2/8] list-objects: refactor to process_tree_contents Matthew DeVore
2018-09-21 20:31 ` [PATCH v9 3/8] list-objects: always parse trees gently Matthew DeVore
2018-09-21 20:32 ` [PATCH v9 4/8] rev-list: handle missing tree objects properly Matthew DeVore
2018-09-21 20:32 ` [PATCH v9 5/8] revision: mark non-user-given objects instead Matthew DeVore
2018-09-21 20:32 ` [PATCH v9 6/8] list-objects-filter: use BUG rather than die Matthew DeVore
2018-09-21 20:32 ` [PATCH v9 7/8] list-objects-filter-options: do not over-strbuf_init Matthew DeVore
2018-09-21 20:32 ` [PATCH v9 8/8] list-objects-filter: implement filter tree:0 Matthew DeVore
2018-10-03 19:52 ` [PATCH v10 0/8] filter: support for excluding all trees and blobs Matthew DeVore
2018-10-03 19:52 ` [PATCH v10 1/8] list-objects: store common func args in struct Matthew DeVore
2018-10-03 19:52 ` [PATCH v10 2/8] list-objects: refactor to process_tree_contents Matthew DeVore
2018-10-03 19:52 ` [PATCH v10 3/8] list-objects: always parse trees gently Matthew DeVore
2018-10-03 19:52 ` [PATCH v10 4/8] rev-list: handle missing tree objects properly Matthew DeVore
2018-10-03 19:52 ` [PATCH v10 5/8] revision: mark non-user-given objects instead Matthew DeVore
2018-10-03 19:52 ` [PATCH v10 6/8] list-objects-filter: use BUG rather than die Matthew DeVore
2018-10-03 19:52 ` [PATCH v10 7/8] list-objects-filter-options: do not over-strbuf_init Matthew DeVore
2018-10-03 19:52 ` [PATCH v10 8/8] list-objects-filter: implement filter tree:0 Matthew DeVore
2018-10-03 23:08 ` [PATCH v10 0/8] filter: support for excluding all trees and blobs Matthew DeVore
2018-10-05 21:31 ` [PATCH v11 " Matthew DeVore
2018-10-05 21:31 ` [PATCH v11 1/8] list-objects: store common func args in struct Matthew DeVore
2018-10-05 21:31 ` [PATCH v11 2/8] list-objects: refactor to process_tree_contents Matthew DeVore
2018-10-05 21:31 ` [PATCH v11 3/8] list-objects: always parse trees gently Matthew DeVore
2018-10-05 21:31 ` [PATCH v11 4/8] rev-list: handle missing tree objects properly Matthew DeVore
2018-10-05 21:31 ` [PATCH v11 5/8] revision: mark non-user-given objects instead Matthew DeVore
2018-10-05 21:31 ` [PATCH v11 6/8] list-objects-filter: use BUG rather than die Matthew DeVore
2018-10-05 21:31 ` [PATCH v11 7/8] list-objects-filter-options: do not over-strbuf_init Matthew DeVore
2018-10-05 21:31 ` [PATCH v11 8/8] list-objects-filter: implement filter tree:0 Matthew DeVore
2018-10-07 0:10 ` Junio C Hamano
2018-10-08 17:23 ` Matthew DeVore
2018-10-12 20:01 ` [PATCH v12 0/8] filter: support for excluding all trees and blobs Matthew DeVore
2018-10-12 20:01 ` [PATCH v12 1/8] list-objects: store common func args in struct Matthew DeVore
2018-10-12 20:01 ` [PATCH v12 2/8] list-objects: refactor to process_tree_contents Matthew DeVore
2018-10-12 20:01 ` [PATCH v12 3/8] list-objects: always parse trees gently Matthew DeVore
2018-10-12 20:01 ` [PATCH v12 4/8] rev-list: handle missing tree objects properly Matthew DeVore
2018-10-12 20:01 ` [PATCH v12 5/8] revision: mark non-user-given objects instead Matthew DeVore
2018-10-12 20:01 ` [PATCH v12 6/8] list-objects-filter: use BUG rather than die Matthew DeVore
2018-10-12 20:01 ` [PATCH v12 7/8] list-objects-filter-options: do not over-strbuf_init Matthew DeVore
2018-10-12 20:01 ` [PATCH v12 8/8] list-objects-filter: implement filter tree:0 Matthew DeVore
2018-10-15 2:37 ` [PATCH v12 0/8] filter: support for excluding all trees and blobs Junio C Hamano
2018-10-15 3:42 ` Junio C Hamano
2018-10-16 15:00 ` Matthew DeVore
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqzhwkat8i.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--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.
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 NNTP newsgroup(s).