From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx>
Support for this config setting was deprecated in the last commit
so print some advice to help the user update their config settings
when they are using this setting. The advice message explains that the
setting is deprecated and will be removed in future. It also shows the
commands that the user needs to run to either unset core.commentChar
and core.commentString completely or to change the current setting
to a fixed comment string.
In order to generate this advice we need to parse the config with a
callback that records each file where either of the keys is set and
whether a key occurs more that once in a given file. This lets us
generate the list of commands to remove all the keys and also tells us
which key the "auto" setting comes from. The hard coding of some
filenames in add_config_scope_arg() is unfortunate but as this temporary
code that will be removed when Git 3.0 is released I decided it wasn't
worth adding functions to get the name of the local and worktree config
files.
As we want the user to update their config we do not provide a way for
this advice to be disabled other than changing the value of
core.commentChar or core.commentString.
Signed-off-by: Phillip Wood <phillip.wood@xxxxxxxxxxxxx>
---
builtin/commit.c | 188 ++++++++++++++++++++++++++++++++++++
t/t7502-commit-porcelain.sh | 28 +++++-
2 files changed, 215 insertions(+), 1 deletion(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index 8794b24572b..21839db7fce 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -41,6 +41,8 @@
#include "commit-reach.h"
#include "commit-graph.h"
#include "pretty.h"
+#include "quote.h"
+#include "strmap.h"
#include "trailer.h"
static const char * const builtin_commit_usage[] = {
@@ -684,12 +686,198 @@ static int author_date_is_interesting(void)
}
#ifndef WITH_BREAKING_CHANGES
+struct comment_char_cfg {
+ unsigned last_key_id;
+ int auto_set_in_file;
+ struct strintmap key_flags;
+ size_t alloc, nr;
+ struct comment_char_cfg_item {
+ unsigned key_id;
+ char *path;
+ enum config_scope scope;
+ } *item;
+};
+
+#define COMMENT_CHAR_CFG_INIT { .key_flags = STRINTMAP_INIT }
+
+static void comment_char_cfg_release(struct comment_char_cfg *cfg)
+{
+ strintmap_clear(&cfg->key_flags);
+ for (size_t i = 0; i < cfg->nr; i++)
+ free(cfg->item[i].path);
+ free(cfg->item);
+}
+
+/* Used to track whether the key occurs more than once in a given file */
+#define KEY_SEEN_ONCE 1u
+#define KEY_SEEN_TWICE 2u
+#define COMMENT_KEY_SHIFT(id) (2 * (id))
+#define COMMENT_KEY_MASK(id) (3u << COMMENT_KEY_SHIFT(id))
+
+static void set_comment_key_flags(struct comment_char_cfg *cfg,
+ const char *path, unsigned id, unsigned value)
+{
+ unsigned old = strintmap_get(&cfg->key_flags, path);
+ unsigned new = (old & ~COMMENT_KEY_MASK(id)) |
+ value << COMMENT_KEY_SHIFT(id);
+
+ strintmap_set(&cfg->key_flags, path, new);
+}
+
+static unsigned get_comment_key_flags(struct comment_char_cfg *cfg,
+ const char *path, unsigned id)
+{
+ unsigned value = strintmap_get(&cfg->key_flags, path);
+
+ return (value & COMMENT_KEY_MASK(id)) >> COMMENT_KEY_SHIFT(id);
+}
+
+static const char* comment_key_name(unsigned id)
+{
+ static const char *name[] = {
+ "core.commentChar", "core.commentString",
+ };
+
+ if (id >= ARRAY_SIZE(name))
+ BUG("invalid comment key id");
+
+ return name[id];
+}
+
+static int comment_char_config_cb(const char *key, const char *value,
+ const struct config_context *ctx, void *data)
+{
+ struct comment_char_cfg *cfg = data;
+ const struct key_value_info *kvi = ctx->kvi;
+ unsigned key_id;
+
+ if (!strcmp(key, "core.commentchar"))
+ key_id = 0;
+ else if (!strcmp(key, "core.commentstring"))
+ key_id = 1;
+ else
+ return 0;
+
+ cfg->last_key_id = key_id;
+ if (!kvi->path) {
+ return 0;
+ } else if (get_comment_key_flags(cfg, kvi->path, key_id)) {
+ set_comment_key_flags(cfg, kvi->path, key_id, KEY_SEEN_TWICE);
+ } else {
+ struct comment_char_cfg_item *item;
+
+ ALLOC_GROW_BY(cfg->item, cfg->nr, 1, cfg->alloc);
+ item = &cfg->item[cfg->nr - 1];
+ item->key_id = key_id;
+ item->scope = kvi->scope;
+ item->path = xstrdup(kvi->path);
+ set_comment_key_flags(cfg, kvi->path, key_id, KEY_SEEN_ONCE);
+ }
+ cfg->auto_set_in_file = value && !strcmp(value, "auto");
+
+ return 0;
+}
+
+static void add_config_scope_arg(struct strbuf *buf,
+ struct comment_char_cfg_item *item)
+{
+ char *global_config = git_global_config();
+ char *system_config = git_system_config();
+
+ if (fspatheq(item->path, system_config)) {
+ strbuf_addstr(buf, "--system ");
+ } else if (fspatheq(item->path, global_config)) {
+ strbuf_addstr(buf, "--global ");
+ } else if (fspatheq(item->path,
+ mkpath("%s/config",
+ repo_get_git_dir(the_repository)))) {
+ ; /* --local is the default */
+ } else if (fspatheq(item->path,
+ mkpath("%s/config.worktree",
+ repo_get_common_dir(the_repository)))) {
+ strbuf_addstr(buf, "--worktree ");
+ } else {
+ const char *path = item->path;
+ const char *home = getenv("HOME");
+
+ strbuf_addstr(buf, "--file ");
+ if (home && !fspathncmp(path, home, strlen(home))) {
+ path += strlen(home);
+ if (!fspathncmp(path, "/", 1))
+ path++;
+ strbuf_addstr(buf, "~/");
+ }
+ sq_quote_buf_pretty(buf, path);
+ strbuf_addch(buf, ' ');
+ }
+
+ free(global_config);
+ free(system_config);
+}
+
+static void add_optional_comment_char_advice(struct comment_char_cfg *cfg)
+{
+ struct strbuf buf = STRBUF_INIT;
+ struct comment_char_cfg_item *item;
+ /* TRANSLATORS this is a place holder for the value of core.commentString */
+ const char *placeholder = _("<comment string>");
+
+ /*
+ * If auto is set in the last file that we saw advise the user how to
+ * update their config.
+ */
+ if (!cfg->auto_set_in_file)
+ return;
+
+ for (size_t i = 0; i < cfg->nr; i++) {
+ item = &cfg->item[i];
+
+ strbuf_addstr(&buf, " git config unset ");
+ add_config_scope_arg(&buf, item);
+ if (get_comment_key_flags(cfg, item->path, item->key_id) == KEY_SEEN_TWICE)
+ strbuf_addstr(&buf, "--all ");
+ strbuf_addf(&buf, "%s\n", comment_key_name(item->key_id));
+ }
+ advise(_("\nTo use the default comment string (#) please run\n\n%s"),
+ buf.buf);
+
+ item = &cfg->item[cfg->nr - 1];
+ strbuf_reset(&buf);
+ strbuf_addstr(&buf, " git config set ");
+ add_config_scope_arg(&buf, item);
+ strbuf_addf(&buf, "%s %s\n", comment_key_name(item->key_id),
+ placeholder);
+ advise(_("\nTo set a custom comment string please run\n\n"
+ "%s\nwhere '%s' is the string you wish to use.\n"),
+ buf.buf, placeholder);
+ strbuf_release(&buf);
+}
+
+static void advise_auto_comment_char(void)
+{
+ struct comment_char_cfg cfg = COMMENT_CHAR_CFG_INIT;
+ struct config_options opts = {
+ .commondir = repo_get_common_dir(the_repository),
+ .git_dir = repo_get_git_dir(the_repository),
+ .respect_includes = 1,
+ };
+
+ config_with_options(comment_char_config_cb, &cfg, NULL, the_repository,
+ &opts);
+ advise(_("Support for '%s=auto' is deprecated and will be removed in "
+ "git 3.0\n"), comment_key_name(cfg.last_key_id));
+ add_optional_comment_char_advice(&cfg);
+ comment_char_cfg_release(&cfg);
+}
+
static void adjust_comment_line_char(const struct strbuf *sb)
{
char candidates[] = "#;@!$%^&|:";
char *candidate;
const char *p;
+ advise_auto_comment_char();
+
if (!memchr(sb->buf, candidates[0], sb->len)) {
free(comment_line_str_to_free);
comment_line_str = comment_line_str_to_free =
diff --git a/t/t7502-commit-porcelain.sh b/t/t7502-commit-porcelain.sh
index 65b4519a715..c8c00d316be 100755
--- a/t/t7502-commit-porcelain.sh
+++ b/t/t7502-commit-porcelain.sh
@@ -958,7 +958,33 @@ test_expect_success 'commit --status with custom comment character' '
test_expect_success !WITH_BREAKING_CHANGES 'switch core.commentchar' '
test_commit "#foo" foo &&
- GIT_EDITOR=.git/FAKE_EDITOR git -c core.commentChar=auto commit --amend &&
+ cat >config-include <<-\EOF &&
+ [core]
+ commentString=:
+ commentString=%
+ commentChar=auto
+ EOF
+ test_when_finished "rm config-include" &&
+ test_config include.path "$(pwd)/config-include" &&
+ test_config core.commentChar ! &&
+ GIT_EDITOR=.git/FAKE_EDITOR git commit --amend 2>err &&
+ sed -n "/^hint: *\$/s///p; /^hint: /s///p" err >actual &&
+ cat >expect <<-EOF &&
+ Support for ${SQ}core.commentChar=auto${SQ} is deprecated and will be removed in git 3.0
+
+ To use the default comment string (#) please run
+
+ git config unset core.commentChar
+ git config unset --file ~/config-include --all core.commentString
+ git config unset --file ~/config-include core.commentChar
+
+ To set a custom comment string please run
+
+ git config set --file ~/config-include core.commentChar <comment string>
+
+ where ${SQ}<comment string>${SQ} is the string you wish to use.
+ EOF
+ test_cmp expect actual &&
test_grep "^; Changes to be committed:" .git/COMMIT_EDITMSG
'
--
2.49.0.897.gfad3eb7d210
