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=-2.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM,RP_MATCHES_RCVD shortcircuit=no autolearn=no 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 9B722208CD for ; Wed, 16 Aug 2017 01:04:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752494AbdHPBEg (ORCPT ); Tue, 15 Aug 2017 21:04:36 -0400 Received: from mail-pg0-f49.google.com ([74.125.83.49]:36041 "EHLO mail-pg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752412AbdHPBEf (ORCPT ); Tue, 15 Aug 2017 21:04:35 -0400 Received: by mail-pg0-f49.google.com with SMTP id i12so15767006pgr.3 for ; Tue, 15 Aug 2017 18:04:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=tNre4IYldDhEDWKcjIGmTqibfs387LQr2+Ytdmt8+vg=; b=QzNYpaesZJES1efPZbRJLlHQI0cZPSgNzp/jfDVfxAAPWahm9Mu/zvdmMNawmgG+3O l4EkKO6VrySdctRdnfKvW9fZvjAR5mNatD/3XrUo4oO4wQG7uuXyBlliUleAtb72/Je3 mspCZLcPuFDyXv6j+91XWqXV9/4vVeT9i7p7/e4bGbqn5fA7r8H/Hyge2LUoNFI3RBDf /KPVWRHYdR8tgminYyunRfn3sc7hx/yJPmALkHFeOQcq/9px4FaTYvOB21efw3BMewPo syM77a1B4XelOaDfz/mPrN0Sggmt6OKHcXzjWgHn44A7EWNvnlSPhLPsFLUGG/6X2Fdv +TiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=tNre4IYldDhEDWKcjIGmTqibfs387LQr2+Ytdmt8+vg=; b=eklHLgyWG8kxK74Oj3B7okhewRlxqgEolOHKCfM+XQK/HlSwkcPBsPJLN731fFMoQI IT5qe+a/VgDHtrZbvnjtK8u73JuD0d7nZ6xioKw1wk77Ejqy9Fw37llnc3qExLVI9O/s j5BWe2n5/y2Sq4/czMpA3YqwiV01h/0+8ogyRwMPM3tIkzm3pWqVZhgiDVOs87zBxqUf JTXukcRYRMVJIyITQaxktU7/Pv3q8OfnxaZ41pfseirQcx+k0XLnBi5x+eFW65hL7Joc p7p+gF3ApsiwHavi5nZDM6HhRtMzVzl4mA2ZBF8S8JAEc1BTx5C+7c5vzP7nAvVtF0e5 EEzw== X-Gm-Message-State: AHYfb5g8DhvE8KXn0QzGWlkN5yPNieKAE4QMvc9hTi7j7yLHzdtZ8IHO PLWABMj8+DBo0mhdnZZbSA== X-Received: by 10.84.134.36 with SMTP id 33mr34727plg.412.1502845474769; Tue, 15 Aug 2017 18:04:34 -0700 (PDT) Received: from google.com ([2620:0:100e:422:5512:b020:7a45:9843]) by smtp.gmail.com with ESMTPSA id x13sm17533355pgq.41.2017.08.15.18.04.33 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 15 Aug 2017 18:04:33 -0700 (PDT) Date: Tue, 15 Aug 2017 18:04:32 -0700 From: Brandon Williams To: Stefan Beller Cc: gitster@pobox.com, git@vger.kernel.org, jonathantanmy@google.com Subject: Re: [PATCH] convert add_to_alternates_file to use repository struct Message-ID: <20170816010432.GD21874@google.com> References: <20170816004558.6706-1-sbeller@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170816004558.6706-1-sbeller@google.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On 08/15, Stefan Beller wrote: > The long term plan is to move most functionality to be included via > the repository struct, starting somewhere, convert add_to_alternates_file > in this patch, which has link_alt_odb_entries, which is converted, too. > Any caller outside add_to_alternates_file, just uses `the_repository` > as the repository argument to keep the functionality the same. > > Signed-off-by: Stefan Beller > --- > > For the series "object store is embedded in the repository object", > I realized we have to convert sha1_file first as that is the foundation > of all the object loading and writing. However there are currently other > series in flight, such that I do not want to change all of sha1_file > as it would yield serious conflicts. > > This goes on top of origin/sb/sha1-file-cleanup and is one of the > minimum viable things to get started with converting sha1_file to > use the repository object. > > Thanks, > Stefan > > builtin/clone.c | 9 +++++---- > cache.h | 2 +- > sha1_file.c | 23 +++++++++++++++-------- > 3 files changed, 21 insertions(+), 13 deletions(-) > > diff --git a/builtin/clone.c b/builtin/clone.c > index 08b5cc433c..b8d170d055 100644 > --- a/builtin/clone.c > +++ b/builtin/clone.c > @@ -25,6 +25,7 @@ > #include "remote.h" > #include "run-command.h" > #include "connected.h" > +#include "repository.h" > > /* > * Overall FIXMEs: > @@ -327,7 +328,7 @@ static int add_one_reference(struct string_list_item *item, void *cb_data) > } else { > struct strbuf sb = STRBUF_INIT; > strbuf_addf(&sb, "%s/objects", ref_git); > - add_to_alternates_file(sb.buf); > + add_to_alternates_file(the_repository, sb.buf); > strbuf_release(&sb); > } > > @@ -369,12 +370,12 @@ static void copy_alternates(struct strbuf *src, struct strbuf *dst, > if (!line.len || line.buf[0] == '#') > continue; > if (is_absolute_path(line.buf)) { > - add_to_alternates_file(line.buf); > + add_to_alternates_file(the_repository, line.buf); > continue; > } > abs_path = mkpathdup("%s/objects/%s", src_repo, line.buf); > if (!normalize_path_copy(abs_path, abs_path)) > - add_to_alternates_file(abs_path); > + add_to_alternates_file(the_repository, abs_path); > else > warning("skipping invalid relative alternate: %s/%s", > src_repo, line.buf); > @@ -452,7 +453,7 @@ static void clone_local(const char *src_repo, const char *dest_repo) > if (option_shared) { > struct strbuf alt = STRBUF_INIT; > strbuf_addf(&alt, "%s/objects", src_repo); > - add_to_alternates_file(alt.buf); > + add_to_alternates_file(the_repository, alt.buf); > strbuf_release(&alt); > } else { > struct strbuf src = STRBUF_INIT; > diff --git a/cache.h b/cache.h > index 4109efcf24..fe1f1bc66a 100644 > --- a/cache.h > +++ b/cache.h > @@ -1565,7 +1565,7 @@ struct alternate_object_database *alloc_alt_odb(const char *dir); > * Add the directory to the on-disk alternates file; the new entry will also > * take effect in the current process. > */ > -extern void add_to_alternates_file(const char *dir); > +extern void add_to_alternates_file(struct repository *r, const char *dir); > > /* > * Add the directory to the in-memory list of alternates (along with any > diff --git a/sha1_file.c b/sha1_file.c > index 9186e2c6c7..298185f550 100644 > --- a/sha1_file.c > +++ b/sha1_file.c > @@ -22,6 +22,7 @@ > #include "pack-revindex.h" > #include "sha1-lookup.h" > #include "bulk-checkin.h" > +#include "repository.h" > #include "streaming.h" > #include "dir.h" > #include "mru.h" > @@ -422,8 +423,9 @@ static const char *parse_alt_odb_entry(const char *string, > return end; > } > > -static void link_alt_odb_entries(const char *alt, int len, int sep, > - const char *relative_base, int depth) > +static void link_alt_odb_entries(const struct repository *r, const char *alt, > + int len, int sep, const char *relative_base, > + int depth) Looks like the passed in repository 'r' isn't used in this function. Is this intentional? > { > struct strbuf objdirbuf = STRBUF_INIT; > struct strbuf entry = STRBUF_INIT; > @@ -470,7 +472,8 @@ static void read_info_alternates(const char * relative_base, int depth) > map = xmmap(NULL, mapsz, PROT_READ, MAP_PRIVATE, fd, 0); > close(fd); > > - link_alt_odb_entries(map, mapsz, '\n', relative_base, depth); > + link_alt_odb_entries(the_repository, map, mapsz, '\n', > + relative_base, depth); > > munmap(map, mapsz); > } > @@ -487,10 +490,11 @@ struct alternate_object_database *alloc_alt_odb(const char *dir) > return ent; > } > > -void add_to_alternates_file(const char *reference) > +void add_to_alternates_file(struct repository *r, const char *reference) > { > struct lock_file *lock = xcalloc(1, sizeof(struct lock_file)); > - char *alts = git_pathdup("objects/info/alternates"); > + char *alts = repo_git_path(r, "objects/info/alternates"); > + > FILE *in, *out; > > hold_lock_file_for_update(lock, alts, LOCK_DIE_ON_ERROR); > @@ -527,7 +531,8 @@ void add_to_alternates_file(const char *reference) > if (commit_lock_file(lock)) > die_errno("unable to move new alternates file into place"); > if (alt_odb_tail) > - link_alt_odb_entries(reference, strlen(reference), '\n', NULL, 0); > + link_alt_odb_entries(r, reference, strlen(reference), > + '\n', NULL, 0); > } > free(alts); > } > @@ -540,7 +545,8 @@ void add_to_alternates_memory(const char *reference) > */ > prepare_alt_odb(); > > - link_alt_odb_entries(reference, strlen(reference), '\n', NULL, 0); > + link_alt_odb_entries(the_repository, reference, strlen(reference), > + '\n', NULL, 0); > } > > /* > @@ -643,7 +649,8 @@ void prepare_alt_odb(void) > if (!alt) alt = ""; > > alt_odb_tail = &alt_odb_list; > - link_alt_odb_entries(alt, strlen(alt), PATH_SEP, NULL, 0); > + link_alt_odb_entries(the_repository, alt, strlen(alt), > + PATH_SEP, NULL, 0); > > read_info_alternates(get_object_directory(), 0); > } > -- > 2.14.0.rc0.3.g6c2e499285 > -- Brandon Williams