From patchwork Thu Jul 25 02:23:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain via GitGitGadget X-Patchwork-Id: 11057817 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6BAAD112C for ; Thu, 25 Jul 2019 02:23:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5014C286C1 for ; Thu, 25 Jul 2019 02:23:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 43C1C28891; Thu, 25 Jul 2019 02:23:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 768D928978 for ; Thu, 25 Jul 2019 02:23:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388086AbfGYCXS (ORCPT ); Wed, 24 Jul 2019 22:23:18 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:54058 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387891AbfGYCXS (ORCPT ); Wed, 24 Jul 2019 22:23:18 -0400 Received: by mail-wm1-f65.google.com with SMTP id x15so43477757wmj.3 for ; Wed, 24 Jul 2019 19:23:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=QTdg6VwW3R+WGE2Fh7CSuYzkFulUqcJMSNMpAwx7qD4=; b=Yxr5HTvesgfaIb5KgC6L6lYMfUKoeXPLOJJn8hRUDvfcFgzkglYXRKmnJQZ+LppR9N MqP93Wat4sxmlaNjDh5bLpJ8jhq62usfyIqeCTaUgzSL5qI1jQ4bmaUdvixliUWn5NJK tubY/K07QNuAJROFzrqUPt8MxtZNUBPtvzWczxcAdmWgLoEqoGa2U/0PCqxHRyYfmiw7 8KA+1i2KxCix5/087tAYwyiRKfdWeiDqheDU+I83WRT7T5wDM3/TePSoWBiCG20e6s0y qeUbSNaH4Uoq1cf8NFRkLw+IL5N3SScsYAAHcmsUqFasSY9UETtf2b5uf08XMtFOGuiA SLrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=QTdg6VwW3R+WGE2Fh7CSuYzkFulUqcJMSNMpAwx7qD4=; b=RELgDqCCPM9xAaElJ2kWn8DH08TehJkph9IkLV8BPSNL6D+nOqlBS2AiLmxg6rIuMn 4oPes92CXbtAyor55CbG7ViPvjSCmaVizFZ6rmdb6nyLD5sCjULSrdeSn2NAUrpjNnll 9hQDxT1fDfyqFUylHA0X22hk2sxRf9uliJ+3kJFSgJ1yS+G/AjqUouMoXsbh38xEK2Hu XmrNHiGC3ENez5rXONmmaNC0pHE+f6Qih6mvUKMuhvVfBUfIPpyRk0El9Bv07hYa4BoB dYHdUz92b0SBFsq+Z7Gr4p3P9pV7v9zeTgTa/ZNIh0cKIOlpRC5k9BfX66HOr0QjtsYp B2TA== X-Gm-Message-State: APjAAAUCMO8uQDItK61Z+dh0Uqc+rXqtZgYgKk5WKs64h0z8iLMdnVIe tUYj4n6tAZhxryVtMCnpFm3eM/vu X-Google-Smtp-Source: APXvYqyItxFr7c69s7Cq5dKKU0XSF2GSOsY/8998Poy+/oOv9enK45EBbeqcQspUCvLV0nCZy4KVDw== X-Received: by 2002:a1c:6a17:: with SMTP id f23mr14965860wmc.91.1564021395439; Wed, 24 Jul 2019 19:23:15 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id e19sm64571807wra.71.2019.07.24.19.23.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jul 2019 19:23:15 -0700 (PDT) Date: Wed, 24 Jul 2019 19:23:15 -0700 (PDT) X-Google-Original-Date: Thu, 25 Jul 2019 02:23:08 GMT Message-Id: <597ab7d621983b5ad35006a2530aa70b452e895f.1564021392.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Derrick Stolee via GitGitGadget" Subject: [PATCH v2 1/5] repo-settings: consolidate some config settings Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes.Schindelin@gmx.de, peff@peff.net, jnareb@gmail.com, pclouds@gmail.com, carenas@gmail.com, avarab@gmail.com, Junio C Hamano , Derrick Stolee Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Derrick Stolee There are a few important config settings that are not loaded during git_default_config. These are instead loaded on-demand. Centralize these config options to a single scan, and store all of the values in a repo_settings struct. The values for each setting are initialized as negative to indicate "unset". This centralization will be particularly important in a later change to introduce "meta" config settings that change the defaults for these config settings. Signed-off-by: Derrick Stolee --- Makefile | 1 + builtin/gc.c | 13 ++++++------- builtin/pack-objects.c | 9 +++++---- commit-graph.c | 7 ++++--- read-cache.c | 12 +++++++----- repo-settings.c | 28 ++++++++++++++++++++++++++++ repo-settings.h | 17 +++++++++++++++++ repository.h | 5 +++++ 8 files changed, 73 insertions(+), 19 deletions(-) create mode 100644 repo-settings.c create mode 100644 repo-settings.h diff --git a/Makefile b/Makefile index 11ccea4071..032fe9b5f9 100644 --- a/Makefile +++ b/Makefile @@ -964,6 +964,7 @@ LIB_OBJS += refspec.o LIB_OBJS += ref-filter.o LIB_OBJS += remote.o LIB_OBJS += replace-object.o +LIB_OBJS += repo-settings.o LIB_OBJS += repository.o LIB_OBJS += rerere.o LIB_OBJS += resolve-undo.o diff --git a/builtin/gc.c b/builtin/gc.c index c18efadda5..5e365049aa 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -27,6 +27,7 @@ #include "pack-objects.h" #include "blob.h" #include "tree.h" +#include "repo-settings.h" #define FAILED_RUN "failed to run %s" @@ -41,7 +42,6 @@ static int aggressive_depth = 50; static int aggressive_window = 250; static int gc_auto_threshold = 6700; static int gc_auto_pack_limit = 50; -static int gc_write_commit_graph; static int detach_auto = 1; static timestamp_t gc_log_expire_time; static const char *gc_log_expire = "1.day.ago"; @@ -148,7 +148,6 @@ static void gc_config(void) git_config_get_int("gc.aggressivedepth", &aggressive_depth); git_config_get_int("gc.auto", &gc_auto_threshold); git_config_get_int("gc.autopacklimit", &gc_auto_pack_limit); - git_config_get_bool("gc.writecommitgraph", &gc_write_commit_graph); git_config_get_bool("gc.autodetach", &detach_auto); git_config_get_expiry("gc.pruneexpire", &prune_expire); git_config_get_expiry("gc.worktreepruneexpire", &prune_worktrees_expire); @@ -685,11 +684,11 @@ int cmd_gc(int argc, const char **argv, const char *prefix) clean_pack_garbage(); } - if (gc_write_commit_graph && - write_commit_graph_reachable(get_object_directory(), - !quiet && !daemonized ? COMMIT_GRAPH_PROGRESS : 0, - NULL)) - return 1; + prepare_repo_settings(the_repository); + if (the_repository->settings.gc_write_commit_graph == 1) + write_commit_graph_reachable(get_object_directory(), + !quiet && !daemonized ? COMMIT_GRAPH_PROGRESS : 0, + NULL); if (auto_gc && too_many_loose_objects()) warning(_("There are too many unreachable loose objects; " diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 267c562b1f..20bcd57033 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -34,6 +34,7 @@ #include "dir.h" #include "midx.h" #include "trace2.h" +#include "repo-settings.h" #define IN_PACK(obj) oe_in_pack(&to_pack, obj) #define SIZE(obj) oe_size(&to_pack, obj) @@ -2709,10 +2710,6 @@ static int git_pack_config(const char *k, const char *v, void *cb) use_bitmap_index_default = git_config_bool(k, v); return 0; } - if (!strcmp(k, "pack.usesparse")) { - sparse = git_config_bool(k, v); - return 0; - } if (!strcmp(k, "pack.threads")) { delta_search_threads = git_config_int(k, v); if (delta_search_threads < 0) @@ -3332,6 +3329,10 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) read_replace_refs = 0; sparse = git_env_bool("GIT_TEST_PACK_SPARSE", 0); + prepare_repo_settings(the_repository); + if (!sparse && the_repository->settings.pack_use_sparse != -1) + sparse = the_repository->settings.pack_use_sparse; + reset_pack_idx_option(&pack_idx_opts); git_config(git_pack_config, NULL); diff --git a/commit-graph.c b/commit-graph.c index b3c4de79b6..0c2dadab9b 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -16,6 +16,7 @@ #include "hashmap.h" #include "replace-object.h" #include "progress.h" +#include "repo-settings.h" #define GRAPH_SIGNATURE 0x43475048 /* "CGPH" */ #define GRAPH_CHUNKID_OIDFANOUT 0x4f494446 /* "OIDF" */ @@ -466,7 +467,6 @@ static void prepare_commit_graph_one(struct repository *r, const char *obj_dir) static int prepare_commit_graph(struct repository *r) { struct object_directory *odb; - int config_value; if (git_env_bool(GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD, 0)) die("dying as requested by the '%s' variable on commit-graph load!", @@ -476,9 +476,10 @@ static int prepare_commit_graph(struct repository *r) return !!r->objects->commit_graph; r->objects->commit_graph_attempted = 1; + prepare_repo_settings(r); + if (!git_env_bool(GIT_TEST_COMMIT_GRAPH, 0) && - (repo_config_get_bool(r, "core.commitgraph", &config_value) || - !config_value)) + r->settings.core_commit_graph != 1) /* * This repository is not configured to use commit graphs, so * do not load one. (But report commit_graph_attempted anyway diff --git a/read-cache.c b/read-cache.c index c701f7f8b8..bda665a25a 100644 --- a/read-cache.c +++ b/read-cache.c @@ -25,6 +25,7 @@ #include "fsmonitor.h" #include "thread-utils.h" #include "progress.h" +#include "repo-settings.h" /* Mask for the name length in ce_flags in the on-disk index */ @@ -1599,16 +1600,17 @@ struct cache_entry *refresh_cache_entry(struct index_state *istate, #define INDEX_FORMAT_DEFAULT 3 -static unsigned int get_index_format_default(void) +static unsigned int get_index_format_default(struct repository *r) { char *envversion = getenv("GIT_INDEX_VERSION"); char *endp; - int value; unsigned int version = INDEX_FORMAT_DEFAULT; if (!envversion) { - if (!git_config_get_int("index.version", &value)) - version = value; + prepare_repo_settings(r); + + if (r->settings.index_version >= 0) + version = r->settings.index_version; if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) { warning(_("index.version set, but the value is invalid.\n" "Using version %i"), INDEX_FORMAT_DEFAULT); @@ -2765,7 +2767,7 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile, } if (!istate->version) { - istate->version = get_index_format_default(); + istate->version = get_index_format_default(the_repository); if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0)) init_split_index(istate); } diff --git a/repo-settings.c b/repo-settings.c new file mode 100644 index 0000000000..2c33810cc6 --- /dev/null +++ b/repo-settings.c @@ -0,0 +1,28 @@ +#include "cache.h" +#include "repository.h" +#include "config.h" +#include "repo-settings.h" + +void prepare_repo_settings(struct repository *r) +{ + int value; + + if (r->settings_initialized) + return; + + /* Defaults */ + memset(&r->settings, -1, sizeof(r->settings)); + + if (!repo_config_get_bool(r, "core.commitgraph", &value)) + r->settings.core_commit_graph = value; + if (!repo_config_get_bool(r, "gc.writecommitgraph", &value)) + r->settings.gc_write_commit_graph = value; + + if (!repo_config_get_bool(r, "index.version", &value)) + r->settings.index_version = value; + + if (!repo_config_get_bool(r, "pack.usesparse", &value)) + r->settings.pack_use_sparse = value; + + r->settings_initialized = 1; +} diff --git a/repo-settings.h b/repo-settings.h new file mode 100644 index 0000000000..89fb0159bf --- /dev/null +++ b/repo-settings.h @@ -0,0 +1,17 @@ +#ifndef REPO_SETTINGS_H +#define REPO_SETTINGS_H + +struct repo_settings { + int core_commit_graph; + int gc_write_commit_graph; + + int index_version; + + int pack_use_sparse; +}; + +struct repository; + +void prepare_repo_settings(struct repository *r); + +#endif /* REPO_SETTINGS_H */ diff --git a/repository.h b/repository.h index 4fb6a5885f..a817486825 100644 --- a/repository.h +++ b/repository.h @@ -2,8 +2,10 @@ #define REPOSITORY_H #include "path.h" +#include "repo-settings.h" struct config_set; +struct repo_settings; struct git_hash_algo; struct index_state; struct lock_file; @@ -72,6 +74,9 @@ struct repository { */ char *submodule_prefix; + int settings_initialized; + struct repo_settings settings; + /* Subsystems */ /* * Repository's config which contains key-value pairs from the usual