From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-11.7 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI,T_DKIMWL_WL_MED,USER_IN_DEF_DKIM_WL shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id F27951F404 for ; Tue, 4 Sep 2018 18:06:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727688AbeIDWcq (ORCPT ); Tue, 4 Sep 2018 18:32:46 -0400 Received: from mail-vk0-f74.google.com ([209.85.213.74]:49169 "EHLO mail-vk0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726437AbeIDWcq (ORCPT ); Tue, 4 Sep 2018 18:32:46 -0400 Received: by mail-vk0-f74.google.com with SMTP id v129-v6so1708347vke.16 for ; Tue, 04 Sep 2018 11:06:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=khMjYDthrfKBYoH7UoBIm/+trs4Mfi1oqgISpEcidLE=; b=KaxjXUFvfqL9xoMgx3OyL4R7pQuc5sf30yHyOvsufX+l8WjNXcMMdNg6aDDPG8Be5q vL7x/Z3GsrSd+rtek+BGNSFBU+y1DmeR9GcIeZC/a3CFmRN++w+meQ6wpSbEtyaF3J6B IRwxjBREq0X9zoMsvS0J+GlH5XmOtB+5W+llAHn5kXyI3Zveu4jC25XZfi71tl0qdMtH 8OXnMlWGV9VGge3UbJ1c9srDNTyxFYHqOia/ZErCgbAyYbX8N/1RSgfyupvdsoIbteWN iKMqxPSjk8knasxuYaqmZtoMDFlASX/YEnmqc3SfkK6RoGhlLMxnpeERbFTM2j1tc1LY 05dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=khMjYDthrfKBYoH7UoBIm/+trs4Mfi1oqgISpEcidLE=; b=fqRg36b6yQNU+AUZYijd8fVkk0E6nusZG0IcjHZtXYF8tuXd69I18smMX0el1+215k 9+vZSnTow2nhHRLmcMcrk6/s8xYcbLQi1CSNI1nf1pOYm3lKLnswXDe1I0gmSFrnYGTK 3aaAo7pxUeRstjkAFq4mNFqBQsBPuD99ZBMSYZfOU+sghSOwbpnRGZ8l16MgGrkKeEov B+jWMiIXESAohQKICsu8S5+Qb9g5cL5H3rbjcIJubHKwRLAxjGT65HOl5Wq8WyBQWhSs YeXyMtsQiZVXCm/F+64twFjGqGaczlEOxgry+KPB37IhHtmke3vOF0TUfmq4fUNupTdM MIGQ== X-Gm-Message-State: APzg51ARZjlCQ2T4q8U/n7DH3knGf+1e750vFziFwWeyhqTmMDrL+O8R 1rqTj9NyOLFHmbCYz7CJ6R13riQPuDE= X-Google-Smtp-Source: ANB0Vdbej3wVRKgN2Iiby6UKjqPk3JP08LsaOAibC/9U1G+GHyqg4TtpSmbwCaHwBX/78PH4HqRuL40AUoTq X-Received: by 2002:a67:7b54:: with SMTP id w81-v6mr10321624vsc.4.1536084392197; Tue, 04 Sep 2018 11:06:32 -0700 (PDT) Date: Tue, 4 Sep 2018 11:05:48 -0700 In-Reply-To: Message-Id: <6ada2b97faba0ed8012ecd00477eac4e33eeb76f.1536081438.git.matvore@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.19.0.rc1.350.ge57e33dbd1-goog Subject: [PATCH v7 5/7] revision: mark non-user-given objects instead From: Matthew DeVore To: sbeller@google.com, git@vger.kernel.org Cc: Matthew DeVore , git@jeffhostetler.com, jeffhost@microsoft.com, peff@peff.net, stefanbeller@gmail.com, jonathantanmy@google.com, gitster@pobox.com, pclouds@gmail.com Content-Type: text/plain; charset="UTF-8" Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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.) Signed-off-by: Matthew DeVore --- list-objects.c | 31 ++++++++++++++++++------------- revision.c | 1 - revision.h | 10 +++++++--- 3 files changed, 25 insertions(+), 17 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 062749437..6d355b43c 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 5118aaaa9..2d381e636 100644 --- a/revision.h +++ b/revision.h @@ -8,7 +8,11 @@ #include "diff.h" #include "commit-slab-decl.h" -/* Remember to update object flag allocation in object.h */ +/* Remember to update object flag allocation in object.h + * 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 SEEN (1u<<0) #define UNINTERESTING (1u<<1) #define TREESAME (1u<<2) @@ -20,9 +24,9 @@ #define SYMMETRIC_LEFT (1u<<8) #define PATCHSAME (1u<<9) #define BOTTOM (1u<<10) -#define USER_GIVEN (1u<<25) /* given directly by the user */ +#define NOT_USER_GIVEN (1u<<25) /* tree or blob not given directly by user */ #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 -- 2.19.0.rc1.350.ge57e33dbd1-goog