On Sat, Apr 12, 2008 at 6:31 AM, Junio C Hamano <junio@xxxxxxxxx> wrote:
> int git_config_bool_or_int(const char *name, const char *value, int *is_bool)
> {
> *is_bool = 1;
> if (!value)
> return 1;
> if (!*value)
> return 0;
> if (!strcasecmp(value, "true") || !strcasecmp(value, "yes"))
> return 1;
> if (!strcasecmp(value, "false") || !strcasecmp(value, "no"))
> return 0;
> *is_bool = 0;
> return git_config_int(name, value) != 0;
> }
>
> With that, your configuration parser can do something like:
>
>
> if (!strcmp(k, "status.submodulesummary")) {
> int is_bool, val;
> val = git_config_bool_or_int(k, v, &b);
> if (is_bool || val <= 0) {
> wt_status_submodule_summary_enabled = val;
> } else {
> wt_status_submodule_summary = val;
> wt_status_submodule_summary_enabled = 1;
> }
> }
>
> and skip the call to wt_status_print_submodule_summary() when not
> enabled.
>
>
> > int wt_status_relative_paths = 1;
> > int wt_status_use_color = -1;
> > +int wt_status_submodule_summary = -1; /* unspecified */
> +int wt_status_submodule_summary_enabled;
>
> The call site in wt_status_print() would look like:
>
> ...
>
> wt_status_print_changed(s);
> if (wt_status_submodule_summary_enabled > 0)
>
> wt_status_print_submodule_summary(s);
> wt_status_print_untracked(s);
> ...
>
How about the following?
diff --git a/config.c b/config.c
index 0624494..e614456 100644
--- a/config.c
+++ b/config.c
@@ -316,6 +316,21 @@ int git_config_bool(const char *name, const char *value)
return git_config_int(name, value) != 0;
}
+int git_config_bool_or_int(const char *name, const char *value, int *is_bool)
+{
+ *is_bool = 1;
+ if (!value)
+ return 1;
+ if (!*value)
+ return 0;
+ if (!strcasecmp(value, "true") || !strcasecmp(value, "yes"))
+ return 1;
+ if (!strcasecmp(value, "false") || !strcasecmp(value, "no"))
+ return 0;
+ *is_bool = 0;
+ return git_config_int(name, value);
+}
+
int git_config_string(const char **dest, const char *var, const char *value)
{
if (!value)
diff --git a/wt-status.c b/wt-status.c
index 22385f5..3baa128 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -366,7 +366,10 @@ void wt_status_print(struct wt_status *s)
int git_status_config(const char *k, const char *v)
{
if (!strcmp(k, "status.submodulesummary")) {
- wt_status_submodule_summary = atoi(v);
+ int is_bool;
+ wt_status_submodule_summary = git_config_bool_or_int(k, v, &is_bool);
+ if (is_bool && wt_status_submodule_summary)
+ wt_status_submodule_summary = -1;
return 0;
}
if (!strcmp(k, "status.color") || !strcmp(k, "color.status")) {
--
Ping Yin
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
