From: Emily Shaffer <emilyshaffer@google.com>
To: git@vger.kernel.org
Cc: Emily Shaffer <emilyshaffer@google.com>,
Matthew Rogers <mattr94@gmail.com>,
Philip Oakley <philipoakley@iee.email>
Subject: [PATCH] config: add string mapping for enum config_scope
Date: Wed, 11 Dec 2019 14:09:33 -0800 [thread overview]
Message-ID: <20191211220933.48678-1-emilyshaffer@google.com> (raw)
If a user is interacting with their config files primarily by the 'git
config' command, using the location flags (--global, --system, etc) then
they may be more interested to see the scope of the config file they are
editing, rather than the filepath.
Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
---
Note: This commit has been cherry-picked out of the "configuration-based
hook management" topic, at
lore.kernel.org/git/20191210023335.49987-1-emilyshaffer@google.com
It turned out that I wanted to use it for git-bugreport as well - to
explain the origin of the configs we are printing in the bugreport,
without directly exposing the user's home directory path.
This seems to have similar work to https://github.com/gitgitgadget/git/pull/478
which I believe hasn't been mailed yet; but that change is targeted
towards the builtin config command, rather than the config library.
Since I wanted to use the library, I'm sending on my own now. Maybe
this commit will be useful to that change's author.
- Emily
config.c | 17 +++++++++++++++++
config.h | 1 +
2 files changed, 18 insertions(+)
diff --git a/config.c b/config.c
index e7052b3977..a20110e016 100644
--- a/config.c
+++ b/config.c
@@ -3312,6 +3312,23 @@ enum config_scope current_config_scope(void)
return current_parsing_scope;
}
+const char *config_scope_to_string(enum config_scope scope)
+{
+ switch (scope) {
+ case CONFIG_SCOPE_SYSTEM:
+ return _("system");
+ case CONFIG_SCOPE_GLOBAL:
+ return _("global");
+ case CONFIG_SCOPE_REPO:
+ return _("repo");
+ case CONFIG_SCOPE_CMDLINE:
+ return _("cmdline");
+ case CONFIG_SCOPE_UNKNOWN:
+ default:
+ return _("unknown");
+ }
+}
+
int lookup_config(const char **mapping, int nr_mapping, const char *var)
{
int i;
diff --git a/config.h b/config.h
index 91fd4c5e96..c8bf296dcc 100644
--- a/config.h
+++ b/config.h
@@ -303,6 +303,7 @@ enum config_scope {
};
enum config_scope current_config_scope(void);
+const char *config_scope_to_string(enum config_scope);
const char *current_config_origin_type(void);
const char *current_config_name(void);
--
2.24.0.525.g8f36a354ae-goog
next reply other threads:[~2019-12-11 22:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-11 22:09 Emily Shaffer [this message]
2019-12-11 22:19 ` [PATCH] config: add string mapping for enum config_scope Junio C Hamano
2019-12-11 23:11 ` Emily Shaffer
2019-12-11 23:14 ` Matt Rogers
2019-12-11 23:27 ` Emily Shaffer
2019-12-11 23:25 ` Emily Shaffer
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=20191211220933.48678-1-emilyshaffer@google.com \
--to=emilyshaffer@google.com \
--cc=git@vger.kernel.org \
--cc=mattr94@gmail.com \
--cc=philipoakley@iee.email \
/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).