From: Brandon Williams <bmwill@google.com>
To: git@vger.kernel.org
Cc: Johannes.Schindelin@gmx.de, gitster@pobox.com, peff@peff.net,
sbeller@google.com, jrnieder@gmail.com, pclouds@gmail.com,
Brandon Williams <bmwill@google.com>
Subject: [WIP/RFC 19/23] repo: add per repo config
Date: Thu, 18 May 2017 16:21:30 -0700 [thread overview]
Message-ID: <20170518232134.163059-20-bmwill@google.com> (raw)
In-Reply-To: <20170518232134.163059-1-bmwill@google.com>
Signed-off-by: Brandon Williams <bmwill@google.com>
---
cache.h | 1 +
config.c | 2 +-
repo.c | 27 ++++++++++++++++++++++++++-
repo.h | 2 ++
4 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/cache.h b/cache.h
index 175e58f01..af9ae1173 100644
--- a/cache.h
+++ b/cache.h
@@ -2015,6 +2015,7 @@ struct config_set {
};
extern void git_configset_init(struct config_set *cs);
+extern int config_set_callback(const char *key, const char *value, void *cb);
extern int git_configset_add_file(struct config_set *cs, const char *filename);
extern int git_configset_get_value(struct config_set *cs, const char *key, const char **value);
extern const struct string_list *git_configset_get_value_multi(struct config_set *cs, const char *key);
diff --git a/config.c b/config.c
index b4a3205da..d24baec50 100644
--- a/config.c
+++ b/config.c
@@ -1765,7 +1765,7 @@ void git_configset_clear(struct config_set *cs)
cs->list.items = NULL;
}
-static int config_set_callback(const char *key, const char *value, void *cb)
+int config_set_callback(const char *key, const char *value, void *cb)
{
struct config_set *cs = cb;
configset_add_value(cs, key, value);
diff --git a/repo.c b/repo.c
index 7e5c03ac5..223adf4c8 100644
--- a/repo.c
+++ b/repo.c
@@ -1,10 +1,16 @@
#include "cache.h"
#include "repo.h"
+char *
+repo_git_pathdup(const struct repo *repo, const char *file)
+{
+ return xstrfmt("%s/%s", repo->gitdir, file);
+}
+
int
repo_read_index(struct repo *repo, const char *index_file)
{
- char *index_path = xstrfmt("%s/index", repo->gitdir);
+ char *index_path = repo_git_pathdup(repo, "index");
const char *file = index_file ? index_file : index_path;
repo->index = xcalloc(1, sizeof(struct index_state));
@@ -16,6 +22,18 @@ repo_read_index(struct repo *repo, const char *index_file)
}
int
+repo_read_config(struct repo *repo)
+{
+ struct config_options opts = { 1, repo->gitdir };
+
+ repo->config = xcalloc(1, sizeof(struct config_set));
+ git_configset_init(repo->config);
+
+ return git_config_with_options(config_set_callback, repo->config,
+ NULL, &opts);
+}
+
+int
repo_init(struct repo *repo, const char *gitdir, const char *worktree)
{
int error = 0;
@@ -40,6 +58,8 @@ repo_init(struct repo *repo, const char *gitdir, const char *worktree)
/* Maybe need a check to verify that a worktree is indeed a worktree? */
repo->worktree = xstrdup_or_null(worktree);
+ repo_read_config(repo);
+
free(abspath);
free(suspect);
@@ -58,4 +78,9 @@ repo_clear(struct repo *repo)
discard_index(repo->index);
free(repo->index);
}
+
+ if (repo->config) {
+ git_configset_clear(repo->config);
+ free(repo->config);
+ }
}
diff --git a/repo.h b/repo.h
index 15a0bdee9..b4df774c3 100644
--- a/repo.h
+++ b/repo.h
@@ -2,12 +2,14 @@
#define REPO_H
struct index_state;
+struct config_set;
struct repo {
char *gitdir;
char *worktree;
const char *submodule_prefix;
struct index_state *index;
+ struct config_set *config;
};
extern int repo_read_index(struct repo *repo, const char *index_file);
--
2.13.0.303.g4ebf302169-goog
next prev parent reply other threads:[~2017-05-18 23:23 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-18 23:21 [WIP/RFC 00/23] repository object Brandon Williams
2017-05-18 23:21 ` [WIP/RFC 01/23] convert: convert get_cached_convert_stats_ascii to take an index Brandon Williams
2017-05-18 23:21 ` [WIP/RFC 02/23] convert: convert crlf_to_git " Brandon Williams
2017-05-18 23:21 ` [WIP/RFC 03/23] convert: convert convert_to_git_filter_fd " Brandon Williams
2017-05-18 23:21 ` [WIP/RFC 04/23] convert: convert convert_to_git " Brandon Williams
2017-05-18 23:21 ` [WIP/RFC 05/23] convert: convert renormalize_buffer " Brandon Williams
2017-05-18 23:21 ` [WIP/RFC 06/23] tree: convert read_tree to take an index parameter Brandon Williams
2017-05-18 23:21 ` [WIP/RFC 07/23] ls-files: convert overlay_tree_on_cache to take an index Brandon Williams
2017-05-18 23:21 ` [WIP/RFC 08/23] ls-files: convert write_eolinfo " Brandon Williams
2017-05-18 23:21 ` [WIP/RFC 09/23] ls-files: convert show_killed_files " Brandon Williams
2017-05-18 23:21 ` [WIP/RFC 10/23] ls-files: convert show_other_files " Brandon Williams
2017-05-18 23:21 ` [WIP/RFC 11/23] ls-files: convert show_ru_info " Brandon Williams
2017-05-18 23:21 ` [WIP/RFC 12/23] ls-files: convert ce_excluded " Brandon Williams
2017-05-18 23:21 ` [WIP/RFC 13/23] ls-files: convert prune_cache " Brandon Williams
2017-05-18 23:21 ` [WIP/RFC 14/23] ls-files: convert show_files " Brandon Williams
2017-05-18 23:21 ` [WIP/RFC 15/23] ls-files: factor out debug info into a function Brandon Williams
2017-05-18 23:21 ` [WIP/RFC 16/23] ls-files: factor out tag calculation Brandon Williams
2017-05-18 23:21 ` [WIP/RFC 17/23] repo: introduce new repository object Brandon Williams
2017-05-20 21:25 ` Stefan Beller
2017-05-23 17:35 ` Brandon Williams
2017-05-18 23:21 ` [WIP/RFC 18/23] repo: add index_state to struct repo Brandon Williams
2017-05-20 21:27 ` Stefan Beller
2017-05-18 23:21 ` Brandon Williams [this message]
2017-05-18 23:21 ` [WIP/RFC 20/23] submodule-config: refactor to allow for multiple submodule_cache's Brandon Williams
2017-05-18 23:21 ` [WIP/RFC 21/23] repo: add repo_read_gitmodules Brandon Williams
2017-05-18 23:21 ` [WIP/RFC 22/23] submodule: add is_submodule_active Brandon Williams
2017-05-18 23:21 ` [WIP/RFC 23/23] ls-files: use repository object Brandon Williams
2017-05-19 12:25 ` [WIP/RFC 00/23] " Jeff Hostetler
2017-05-19 18:28 ` Ben Peart
2017-05-23 17:29 ` Brandon Williams
2017-05-20 21:37 ` Stefan Beller
2017-05-22 13:03 ` Johannes Schindelin
2017-05-21 8:23 ` Jacob Keller
2017-05-21 16:28 ` brian m. carlson
2017-05-22 19:35 ` Jeff King
2017-05-23 17:26 ` Brandon Williams
2017-05-24 1:57 ` Junio C Hamano
2017-05-29 10:36 ` Duy Nguyen
2017-05-29 11:23 ` Ævar Arnfjörð Bjarmason
2017-05-29 11:31 ` Duy Nguyen
2017-05-30 17:12 ` Brandon Williams
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170518232134.163059-20-bmwill@google.com \
--to=bmwill@google.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=sbeller@google.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).