From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-11.2 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.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id AC05D1F42D for ; Wed, 30 May 2018 00:48:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968515AbeE3Asa (ORCPT ); Tue, 29 May 2018 20:48:30 -0400 Received: from mail-pg0-f43.google.com ([74.125.83.43]:44842 "EHLO mail-pg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S968490AbeE3AsY (ORCPT ); Tue, 29 May 2018 20:48:24 -0400 Received: by mail-pg0-f43.google.com with SMTP id p21-v6so7323411pgd.11 for ; Tue, 29 May 2018 17:48:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=A9vuShHNOBjjfgkzalnUnnYI1ndNem3dLfJ5tOUWLfQ=; b=J0LnyuZ/Kr8U0Nc9Ct3nGGnUjkAognFCC+mjap1CmAAaNS5TC2TX31yfTU8RVtxImb Qd2lB6xIdvf5GoUzxjY6sDnQyRV5FpyPD2Uc3Xc1KAZqXsFbryNITLWH8FLkzmrY+4YF efRMvP1X7tXRdX9aP6wKPQ1CTcLqaDSyNfd2S3EDx7JtK25PJzsvvRxUo+2WdYmux2ym QhA9+J9SRrdxOVECEGBGzdEhKweIysO2YJbvTaHKjM8Cg2sibCMEpNXN8wQPcZZuW7qc Nxqwn+cYi9/N/HGeRqiHhzl3sJ0JyOVxgSWMvl5FIVV65LsfDtoak8r1eeKB8eTrCEQg JuUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=A9vuShHNOBjjfgkzalnUnnYI1ndNem3dLfJ5tOUWLfQ=; b=Wd1UMvjemOa6aglyxV1NOrWsq3ae+mNpAFGyFVvd63Kl69G36wvde0DYWIS3v8jQMM jxLxzy0QPjvKyaWY0ax3cazMN6YtV87Vk+dJigRsTrwxkG+5uRr79z4BIUR9QSlqdMlo ezZmnMffWJiv6w3al+uQfXiVME4jC4mO/ClAxY03j5v4eyNOeH7wP23EKNWWmP+r8ec3 p8gjGZ8LCCaBc2AeF7VzKy19ACYVylDbeGqtUyQv97KgZxpKHq0045d2EWv/kzF03pOg iOw9HcTbOr7bThijggWgU6cMI8U5l1a3vUda7Bus4igegZzYAavgl8C2CGy24k4PVy47 0LgQ== X-Gm-Message-State: ALKqPwcykHEvLp8bqpjHn5uiRGgeZSseQqYUcEpfoYcYt/8ktoUrzPj5 yoAotbePEUeqx3ewT+Vz3EiHkFefcKk= X-Google-Smtp-Source: ADUXVKKm05BPDambM4PHkcQRcx+TMWOlK9TEcq+FF0zSb6h9PC9xTAfixpoIm4+4OKhfoLqf9QrWrA== X-Received: by 2002:a65:608c:: with SMTP id t12-v6mr475271pgu.182.1527641302643; Tue, 29 May 2018 17:48:22 -0700 (PDT) Received: from localhost ([2620:0:100e:422:ea58:fa52:fa77:9b41]) by smtp.gmail.com with ESMTPSA id m23-v6sm10316486pgc.37.2018.05.29.17.48.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 May 2018 17:48:21 -0700 (PDT) From: Stefan Beller To: git@vger.kernel.org Cc: Stefan Beller Subject: [PATCH 02/35] object: add repository argument to lookup_object Date: Tue, 29 May 2018 17:47:37 -0700 Message-Id: <20180530004810.30076-3-sbeller@google.com> X-Mailer: git-send-email 2.17.0.582.gccdcbd54c44.dirty In-Reply-To: <20180530004810.30076-1-sbeller@google.com> References: <20180530004810.30076-1-sbeller@google.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Add a repository argument to allow callers of lookup_object to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch callers passing a repository other than the_repository at compile time. Signed-off-by: Stefan Beller --- blob.c | 2 +- builtin/fast-export.c | 5 +++-- builtin/fsck.c | 5 +++-- builtin/name-rev.c | 3 ++- builtin/prune.c | 2 +- builtin/unpack-objects.c | 2 +- commit.c | 2 +- fetch-pack.c | 13 +++++++------ http-push.c | 2 +- object.c | 8 ++++---- object.h | 3 ++- reachable.c | 4 ++-- tag.c | 2 +- tree.c | 2 +- upload-pack.c | 2 +- 15 files changed, 31 insertions(+), 26 deletions(-) diff --git a/blob.c b/blob.c index 458dafa811e..75b737a761e 100644 --- a/blob.c +++ b/blob.c @@ -7,7 +7,7 @@ const char *blob_type = "blob"; struct blob *lookup_blob(const struct object_id *oid) { - struct object *obj = lookup_object(oid->hash); + struct object *obj = lookup_object(the_repository, oid->hash); if (!obj) return create_object(the_repository, oid->hash, alloc_blob_node(the_repository)); diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 0da875b58c9..24d42842f9d 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -231,7 +231,7 @@ static void export_blob(const struct object_id *oid) if (is_null_oid(oid)) return; - object = lookup_object(oid->hash); + object = lookup_object(the_repository, oid->hash); if (object && object->flags & SHOWN) return; @@ -403,7 +403,8 @@ static void show_filemodify(struct diff_queue_struct *q, anonymize_sha1(&spec->oid) : spec->oid.hash)); else { - struct object *object = lookup_object(spec->oid.hash); + struct object *object = lookup_object(the_repository, + spec->oid.hash); printf("M %06o :%d ", spec->mode, get_object_mark(object)); } diff --git a/builtin/fsck.c b/builtin/fsck.c index 4b410cba54e..98fdeef5407 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -410,7 +410,7 @@ static void fsck_handle_reflog_oid(const char *refname, struct object_id *oid, struct object *obj; if (!is_null_oid(oid)) { - obj = lookup_object(oid->hash); + obj = lookup_object(the_repository, oid->hash); if (obj && (obj->flags & HAS_OBJ)) { if (timestamp && name_objects) add_decoration(fsck_walk_options.object_names, @@ -762,7 +762,8 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) const char *arg = argv[i]; struct object_id oid; if (!get_oid(arg, &oid)) { - struct object *obj = lookup_object(oid.hash); + struct object *obj = lookup_object(the_repository, + oid.hash); if (!obj || !(obj->flags & HAS_OBJ)) { if (is_promisor_object(&oid)) diff --git a/builtin/name-rev.c b/builtin/name-rev.c index de54fa93e4f..f6eb419a029 100644 --- a/builtin/name-rev.c +++ b/builtin/name-rev.c @@ -379,7 +379,8 @@ static void name_rev_line(char *p, struct name_ref_data *data) *(p+1) = 0; if (!get_oid(p - (GIT_SHA1_HEXSZ - 1), &oid)) { struct object *o = - lookup_object(oid.hash); + lookup_object(the_repository, + oid.hash); if (o) name = get_rev_name(o, &buf); } diff --git a/builtin/prune.c b/builtin/prune.c index 70ec35aa058..72b0621b768 100644 --- a/builtin/prune.c +++ b/builtin/prune.c @@ -40,7 +40,7 @@ static int prune_object(const struct object_id *oid, const char *fullpath, * Do we know about this object? * It must have been reachable */ - if (lookup_object(oid->hash)) + if (lookup_object(the_repository, oid->hash)) return 0; if (lstat(fullpath, &st)) { diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c index ded798b72ff..9a4d2708123 100644 --- a/builtin/unpack-objects.c +++ b/builtin/unpack-objects.c @@ -331,7 +331,7 @@ static int resolve_against_held(unsigned nr, const struct object_id *base, { struct object *obj; struct obj_buffer *obj_buffer; - obj = lookup_object(base->hash); + obj = lookup_object(the_repository, base->hash); if (!obj) return 0; obj_buffer = lookup_object_buffer(obj); diff --git a/commit.c b/commit.c index 11db72e9db2..97b4ccde8f0 100644 --- a/commit.c +++ b/commit.c @@ -53,7 +53,7 @@ struct commit *lookup_commit_or_die(const struct object_id *oid, const char *ref struct commit *lookup_commit(const struct object_id *oid) { - struct object *obj = lookup_object(oid->hash); + struct object *obj = lookup_object(the_repository, oid->hash); if (!obj) return create_object(the_repository, oid->hash, alloc_commit_node(the_repository)); diff --git a/fetch-pack.c b/fetch-pack.c index fa39ada77ee..4523e25ff4e 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -362,7 +362,7 @@ static int find_common(struct fetch_pack_args *args, * interested in the case we *know* the object is * reachable and we have already scanned it. */ - if (((o = lookup_object(remote->hash)) != NULL) && + if (((o = lookup_object(the_repository, remote->hash)) != NULL) && (o->flags & COMPLETE)) { continue; } @@ -436,7 +436,7 @@ static int find_common(struct fetch_pack_args *args, if (skip_prefix(line, "unshallow ", &arg)) { if (get_oid_hex(arg, &oid)) die(_("invalid unshallow line: %s"), line); - if (!lookup_object(oid.hash)) + if (!lookup_object(the_repository, oid.hash)) die(_("object not found: %s"), line); /* make sure that it is parsed as shallow */ if (!parse_object(the_repository, &oid)) @@ -801,7 +801,8 @@ static int everything_local(struct fetch_pack_args *args, * Don't mark them common yet; the server has to be told so first. */ for (ref = *refs; ref; ref = ref->next) { - struct object *o = deref_tag(lookup_object(ref->old_oid.hash), + struct object *o = deref_tag(lookup_object(the_repository, + ref->old_oid.hash), NULL, 0); if (!o || o->type != OBJ_COMMIT || !(o->flags & COMPLETE)) @@ -821,7 +822,7 @@ static int everything_local(struct fetch_pack_args *args, const struct object_id *remote = &ref->old_oid; struct object *o; - o = lookup_object(remote->hash); + o = lookup_object(the_repository, remote->hash); if (!o || !(o->flags & COMPLETE)) { retval = 0; print_verbose(args, "want %s (%s)", oid_to_hex(remote), @@ -1120,7 +1121,7 @@ static void add_wants(const struct ref *wants, struct strbuf *req_buf) * interested in the case we *know* the object is * reachable and we have already scanned it. */ - if (((o = lookup_object(remote->hash)) != NULL) && + if (((o = lookup_object(the_repository, remote->hash)) != NULL) && (o->flags & COMPLETE)) { continue; } @@ -1295,7 +1296,7 @@ static void receive_shallow_info(struct fetch_pack_args *args, if (skip_prefix(reader->line, "unshallow ", &arg)) { if (get_oid_hex(arg, &oid)) die(_("invalid unshallow line: %s"), reader->line); - if (!lookup_object(oid.hash)) + if (!lookup_object(the_repository, oid.hash)) die(_("object not found: %s"), reader->line); /* make sure that it is parsed as shallow */ if (!parse_object(the_repository, &oid)) diff --git a/http-push.c b/http-push.c index 311b6295359..2615c823d60 100644 --- a/http-push.c +++ b/http-push.c @@ -722,7 +722,7 @@ static void one_remote_object(const struct object_id *oid) { struct object *obj; - obj = lookup_object(oid->hash); + obj = lookup_object(the_repository, oid->hash); if (!obj) obj = parse_object(the_repository, oid); diff --git a/object.c b/object.c index 469e6126286..4de4fa58d59 100644 --- a/object.c +++ b/object.c @@ -84,7 +84,7 @@ static void insert_obj_hash(struct object *obj, struct object **hash, unsigned i * Look up the record for the given sha1 in the hash map stored in * obj_hash. Return NULL if it was not found. */ -struct object *lookup_object(const unsigned char *sha1) +struct object *lookup_object_the_repository(const unsigned char *sha1) { unsigned int i, first; struct object *obj; @@ -179,7 +179,7 @@ void *object_as_type(struct object *obj, enum object_type type, int quiet) struct object *lookup_unknown_object(const unsigned char *sha1) { - struct object *obj = lookup_object(sha1); + struct object *obj = lookup_object(the_repository, sha1); if (!obj) obj = create_object(the_repository, sha1, alloc_object_node(the_repository)); @@ -255,7 +255,7 @@ struct object *parse_object_the_repository(const struct object_id *oid) void *buffer; struct object *obj; - obj = lookup_object(oid->hash); + obj = lookup_object(the_repository, oid->hash); if (obj && obj->parsed) return obj; @@ -267,7 +267,7 @@ struct object *parse_object_the_repository(const struct object_id *oid) return NULL; } parse_blob_buffer(lookup_blob(oid), NULL, 0); - return lookup_object(oid->hash); + return lookup_object(the_repository, oid->hash); } buffer = read_object_file(oid, &type, &size); diff --git a/object.h b/object.h index f69095d3dde..fa41d711f44 100644 --- a/object.h +++ b/object.h @@ -110,7 +110,8 @@ extern struct object *get_indexed_object(unsigned int); * half-initialised objects, the caller is expected to initialize them * by calling parse_object() on them. */ -struct object *lookup_object(const unsigned char *sha1); +#define lookup_object(r, s) lookup_object_##r(s) +struct object *lookup_object_the_repository(const unsigned char *sha1); extern void *create_object(struct repository *r, const unsigned char *sha1, void *obj); diff --git a/reachable.c b/reachable.c index ffb976c33c6..2ee55695595 100644 --- a/reachable.c +++ b/reachable.c @@ -108,7 +108,7 @@ static int add_recent_loose(const struct object_id *oid, const char *path, void *data) { struct stat st; - struct object *obj = lookup_object(oid->hash); + struct object *obj = lookup_object(the_repository, oid->hash); if (obj && obj->flags & SEEN) return 0; @@ -133,7 +133,7 @@ static int add_recent_packed(const struct object_id *oid, struct packed_git *p, uint32_t pos, void *data) { - struct object *obj = lookup_object(oid->hash); + struct object *obj = lookup_object(the_repository, oid->hash); if (obj && obj->flags & SEEN) return 0; diff --git a/tag.c b/tag.c index 7d282df0697..1b95eb9f07f 100644 --- a/tag.c +++ b/tag.c @@ -94,7 +94,7 @@ struct object *deref_tag_noverify(struct object *o) struct tag *lookup_tag(const struct object_id *oid) { - struct object *obj = lookup_object(oid->hash); + struct object *obj = lookup_object(the_repository, oid->hash); if (!obj) return create_object(the_repository, oid->hash, alloc_tag_node(the_repository)); diff --git a/tree.c b/tree.c index 1033e69b590..47ecc85f90a 100644 --- a/tree.c +++ b/tree.c @@ -197,7 +197,7 @@ int read_tree(struct tree *tree, int stage, struct pathspec *match, struct tree *lookup_tree(const struct object_id *oid) { - struct object *obj = lookup_object(oid->hash); + struct object *obj = lookup_object(the_repository, oid->hash); if (!obj) return create_object(the_repository, oid->hash, alloc_tree_node(the_repository)); diff --git a/upload-pack.c b/upload-pack.c index afe997c89ec..20e61180e48 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -568,7 +568,7 @@ static int get_reachable_list(struct object_array *src, if (namebuf[40] != '\n' || get_oid_hex(namebuf, &sha1)) break; - o = lookup_object(sha1.hash); + o = lookup_object(the_repository, sha1.hash); if (o && o->type == OBJ_COMMIT) { o->flags &= ~TMP_MARK; } -- 2.17.0.582.gccdcbd54c44.dirty