From: Scott Chacon <schacon@xxxxxxxxx>
A help.autocorrect value of 1 is currently interpreted as "wait 1
decisecond", which can be confusing to users who believe they are setting a
boolean value to turn the autocorrect feature on.
Interpret the value of help.autocorrect as either one of the accepted list
of special values ("never", "immediate", ...), a boolean or an integer. If
the value is 1, it is no longer interpreted as a decisecond value of 0.1s
but as a true boolean, the equivalent of "immediate". If the value is 2 or
more, continue treating it as a decisecond wait time.
False boolean string values ("off", "false", "no") are now equivalent to
"never", meaning that guessed values are still shown but nothing is
executed. True boolean string values are interpreted as "immediate".
Signed-off-by: Scott Chacon <schacon@xxxxxxxxx>
---
help: interpret boolean string values for help.autocorrect
Basically just using Junio's suggested code from the ML, splitting most
of the logic out into a parse_autocorrect method and then special casing
a 1 integer as "immediate". I reverted to interpreting false boolean
values as NEVER rather than 0, which means they no longer show guesses,
which the last patch did.
Changes since v2:
* split out most logic into parse_autocorrect
* interpret false boolean values as NEVER rather than 0
* Update the help.txt documentation
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1869%2Fschacon%2Fmaster-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1869/schacon/master-v3
Pull-Request: https://github.com/git/git/pull/1869
Range-diff vs v2:
1: 07b47b70ded ! 1: 4ce7652d19e help: interpret boolean string values for help.autocorrect
@@ Commit message
but as a true boolean, the equivalent of "immediate". If the value is 2 or
more, continue treating it as a decisecond wait time.
- False boolean string values ("off", "false", "no") are now equivalent to 0,
- meaning that guessed values are still shown but nothing is executed (as
- opposed to "never", which does not show the guesses). True boolean string
- values are interpreted as "immediate".
+ False boolean string values ("off", "false", "no") are now equivalent to
+ "never", meaning that guessed values are still shown but nothing is
+ executed. True boolean string values are interpreted as "immediate".
Signed-off-by: Scott Chacon <schacon@xxxxxxxxx>
@@ Documentation/config/help.txt: help.autoCorrect::
run the suggestion automatically. Possible config values are:
- - 0 (default): show the suggested command.
- - positive number: run the suggested command after specified
-+ - 0, false boolean string: show the suggested command (default).
-+ - 1, true boolean string: run the suggested command immediately.
++ - 0: show the suggested command (default).
++ - 1, "true", "on", "yes": run the suggested command immediately.
+ - positive number > 1: run the suggested command after specified
deciseconds (0.1 sec).
- "immediate": run the suggested command immediately.
- "prompt": show the suggestion and prompt for confirmation to run
+ the command.
+- - "never": don't run or show any suggested command.
++ - "false", "off", "no", "never": don't run or show any suggested command.
+
+ help.htmlPath::
+ Specify the path where the HTML documentation resides. File system paths
## help.c ##
+@@ help.c: struct help_unknown_cmd_config {
+ #define AUTOCORRECT_NEVER (-2)
+ #define AUTOCORRECT_IMMEDIATELY (-1)
+
++static int parse_autocorrect(const char *value)
++{
++ switch (git_parse_maybe_bool_text(value)) {
++ case 1:
++ return AUTOCORRECT_IMMEDIATELY;
++ case 0:
++ return AUTOCORRECT_NEVER;
++ default: /* other random text */
++ break;
++ }
++
++ if (!strcmp(value, "prompt"))
++ return AUTOCORRECT_PROMPT;
++ if (!strcmp(value, "never"))
++ return AUTOCORRECT_NEVER;
++ if (!strcmp(value, "immediate"))
++ return AUTOCORRECT_IMMEDIATELY;
++
++ return 0;
++}
++
+ static int git_unknown_cmd_config(const char *var, const char *value,
+ const struct config_context *ctx,
+ void *cb)
@@ help.c: static int git_unknown_cmd_config(const char *var, const char *value,
- } else if (!strcmp(value, "prompt")) {
- cfg->autocorrect = AUTOCORRECT_PROMPT;
- } else {
+ const char *p;
+
+ if (!strcmp(var, "help.autocorrect")) {
+- if (!value)
+- return config_error_nonbool(var);
+- if (!strcmp(value, "never")) {
+- cfg->autocorrect = AUTOCORRECT_NEVER;
+- } else if (!strcmp(value, "immediate")) {
+- cfg->autocorrect = AUTOCORRECT_IMMEDIATELY;
+- } else if (!strcmp(value, "prompt")) {
+- cfg->autocorrect = AUTOCORRECT_PROMPT;
+- } else {
- int v = git_config_int(var, value, ctx->kvi);
- cfg->autocorrect = (v < 0)
- ? AUTOCORRECT_IMMEDIATELY : v;
-+ int is_bool;
-+ int v = git_config_bool_or_int(var, value, ctx->kvi, &is_bool);
-+ if (is_bool) {
-+ if (v == 0) {
-+ cfg->autocorrect = 0;
-+ } else {
-+ cfg->autocorrect = AUTOCORRECT_IMMEDIATELY;
-+ }
-+ } else {
-+ if (v < 0 || v == 1) {
-+ cfg->autocorrect = AUTOCORRECT_IMMEDIATELY;
-+ } else {
-+ cfg->autocorrect = v;
-+ }
-+ }
++ int v = parse_autocorrect(value);
++
++ if (!v) {
++ v = git_config_int(var, value, ctx->kvi);
++ if (v < 0 || v == 1)
++ v = AUTOCORRECT_IMMEDIATELY;
}
++
++ cfg->autocorrect = v;
}
++
/* Also use aliases for command lookup */
+ if (skip_prefix(var, "alias.", &p))
+ add_cmdname(&cfg->aliases, p, strlen(p));
Documentation/config/help.txt | 7 +++---
help.c | 42 +++++++++++++++++++++++++----------
2 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/Documentation/config/help.txt b/Documentation/config/help.txt
index 610701f9a37..16b124b1c17 100644
--- a/Documentation/config/help.txt
+++ b/Documentation/config/help.txt
@@ -11,13 +11,14 @@ help.autoCorrect::
If git detects typos and can identify exactly one valid command similar
to the error, git will try to suggest the correct command or even
run the suggestion automatically. Possible config values are:
- - 0 (default): show the suggested command.
- - positive number: run the suggested command after specified
+ - 0: show the suggested command (default).
+ - 1, "true", "on", "yes": run the suggested command immediately.
+ - positive number > 1: run the suggested command after specified
deciseconds (0.1 sec).
- "immediate": run the suggested command immediately.
- "prompt": show the suggestion and prompt for confirmation to run
the command.
- - "never": don't run or show any suggested command.
+ - "false", "off", "no", "never": don't run or show any suggested command.
help.htmlPath::
Specify the path where the HTML documentation resides. File system paths
diff --git a/help.c b/help.c
index 5483ea8fd29..7148963e468 100644
--- a/help.c
+++ b/help.c
@@ -556,6 +556,27 @@ struct help_unknown_cmd_config {
#define AUTOCORRECT_NEVER (-2)
#define AUTOCORRECT_IMMEDIATELY (-1)
+static int parse_autocorrect(const char *value)
+{
+ switch (git_parse_maybe_bool_text(value)) {
+ case 1:
+ return AUTOCORRECT_IMMEDIATELY;
+ case 0:
+ return AUTOCORRECT_NEVER;
+ default: /* other random text */
+ break;
+ }
+
+ if (!strcmp(value, "prompt"))
+ return AUTOCORRECT_PROMPT;
+ if (!strcmp(value, "never"))
+ return AUTOCORRECT_NEVER;
+ if (!strcmp(value, "immediate"))
+ return AUTOCORRECT_IMMEDIATELY;
+
+ return 0;
+}
+
static int git_unknown_cmd_config(const char *var, const char *value,
const struct config_context *ctx,
void *cb)
@@ -564,20 +585,17 @@ static int git_unknown_cmd_config(const char *var, const char *value,
const char *p;
if (!strcmp(var, "help.autocorrect")) {
- if (!value)
- return config_error_nonbool(var);
- if (!strcmp(value, "never")) {
- cfg->autocorrect = AUTOCORRECT_NEVER;
- } else if (!strcmp(value, "immediate")) {
- cfg->autocorrect = AUTOCORRECT_IMMEDIATELY;
- } else if (!strcmp(value, "prompt")) {
- cfg->autocorrect = AUTOCORRECT_PROMPT;
- } else {
- int v = git_config_int(var, value, ctx->kvi);
- cfg->autocorrect = (v < 0)
- ? AUTOCORRECT_IMMEDIATELY : v;
+ int v = parse_autocorrect(value);
+
+ if (!v) {
+ v = git_config_int(var, value, ctx->kvi);
+ if (v < 0 || v == 1)
+ v = AUTOCORRECT_IMMEDIATELY;
}
+
+ cfg->autocorrect = v;
}
+
/* Also use aliases for command lookup */
if (skip_prefix(var, "alias.", &p))
add_cmdname(&cfg->aliases, p, strlen(p));
base-commit: fbe8d3079d4a96aeb4e4529cc93cc0043b759a05
--
gitgitgadget
