06fa4db3f7
When a git_config() call was added indbfae68969(help: reuse print_columns() for help -a, 2012-04-13) to read the column config we'd always use the resulting "colopts" variable. Then in63eae83f8f(help: add "-a --verbose" to list all commands with synopsis, 2018-05-20) we started only using the "colopts" config under "--all" if "--no-verbose" was also given, but the "git_config()" call was not moved inside the "verbose" branch of the code. This change effectively does that, we'll only call list_commands() under "--all --no-verbose", so let's have it look up the config it needs. See26c7d06783(help -a: improve and make --verbose default, 2018-09-29) for another case in help.c where we look up config. The get_colopts() function is named for consistency with the existing get_alias() function added in26c7d06783. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
91 lines
3.2 KiB
C
91 lines
3.2 KiB
C
#ifndef HELP_H
|
|
#define HELP_H
|
|
|
|
#include "string-list.h"
|
|
#include "strbuf.h"
|
|
|
|
struct cmdnames {
|
|
int alloc;
|
|
int cnt;
|
|
struct cmdname {
|
|
size_t len; /* also used for similarity index in help.c */
|
|
char name[FLEX_ARRAY];
|
|
} **names;
|
|
};
|
|
|
|
static inline void mput_char(char c, unsigned int num)
|
|
{
|
|
while (num--)
|
|
putchar(c);
|
|
}
|
|
|
|
void list_common_cmds_help(void);
|
|
void list_all_cmds_help(void);
|
|
void list_guides_help(void);
|
|
|
|
void list_all_main_cmds(struct string_list *list);
|
|
void list_all_other_cmds(struct string_list *list);
|
|
void list_cmds_by_category(struct string_list *list,
|
|
const char *category);
|
|
void list_cmds_by_config(struct string_list *list);
|
|
const char *help_unknown_cmd(const char *cmd);
|
|
void load_command_list(const char *prefix,
|
|
struct cmdnames *main_cmds,
|
|
struct cmdnames *other_cmds);
|
|
void load_builtin_commands(const char *prefix, struct cmdnames *cmds);
|
|
void add_cmdname(struct cmdnames *cmds, const char *name, int len);
|
|
/* Here we require that excludes is a sorted list. */
|
|
void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes);
|
|
int is_in_cmdlist(struct cmdnames *cmds, const char *name);
|
|
void list_commands(struct cmdnames *main_cmds, struct cmdnames *other_cmds);
|
|
void get_version_info(struct strbuf *buf, int show_build_options);
|
|
|
|
/*
|
|
* call this to die(), when it is suspected that the user mistyped a
|
|
* ref to the command, to give suggested "correct" refs.
|
|
*/
|
|
NORETURN void help_unknown_ref(const char *ref, const char *cmd, const char *error);
|
|
|
|
static inline void list_config_item(struct string_list *list,
|
|
const char *prefix,
|
|
const char *str)
|
|
{
|
|
string_list_append_nodup(list, xstrfmt("%s.%s", prefix, str));
|
|
}
|
|
|
|
#define define_list_config_array(array) \
|
|
void list_config_##array(struct string_list *list, const char *prefix) \
|
|
{ \
|
|
int i; \
|
|
for (i = 0; i < ARRAY_SIZE(array); i++) \
|
|
if (array[i]) \
|
|
list_config_item(list, prefix, array[i]); \
|
|
} \
|
|
struct string_list
|
|
|
|
#define define_list_config_array_extra(array, values) \
|
|
void list_config_##array(struct string_list *list, const char *prefix) \
|
|
{ \
|
|
int i; \
|
|
static const char *extra[] = values; \
|
|
for (i = 0; i < ARRAY_SIZE(extra); i++) \
|
|
list_config_item(list, prefix, extra[i]); \
|
|
for (i = 0; i < ARRAY_SIZE(array); i++) \
|
|
if (array[i]) \
|
|
list_config_item(list, prefix, array[i]); \
|
|
} \
|
|
struct string_list
|
|
|
|
/* These are actually scattered over many C files */
|
|
void list_config_advices(struct string_list *list, const char *prefix);
|
|
void list_config_color_branch_slots(struct string_list *list, const char *prefix);
|
|
void list_config_color_decorate_slots(struct string_list *list, const char *prefix);
|
|
void list_config_color_diff_slots(struct string_list *list, const char *prefix);
|
|
void list_config_color_grep_slots(struct string_list *list, const char *prefix);
|
|
void list_config_color_interactive_slots(struct string_list *list, const char *prefix);
|
|
void list_config_color_status_slots(struct string_list *list, const char *prefix);
|
|
void list_config_color_sideband_slots(struct string_list *list, const char *prefix);
|
|
void list_config_fsck_msg_ids(struct string_list *list, const char *prefix);
|
|
|
|
#endif /* HELP_H */
|