help: add "-a --verbose" to list all commands with synopsis

This lists all recognized commands [1] by category. The group order
follows closely git.txt.

[1] We may actually show commands that are not built (e.g. if you set
NO_PERL you don't have git-instaweb but it's still listed here). I
ignore the problem because on Linux a git package could be split
anyway. The "git-core" package may not contain git-instaweb even if
it's built because it may end up in a separate package. We can't know
anyway.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt
index 40d328a4b3e7e03720cbefc5100ee8e752f6a586..a40fc38d8b425fae0a1ca074ecc8d603efc80f14 100644 (file)
--- a/Documentation/git-help.txt
+++ b/Documentation/git-help.txt
@@ -8,7 +8,7 @@ git-help - Display help information about Git
 SYNOPSIS
 --------
 [verse]
 SYNOPSIS
 --------
 [verse]

-'git help' [-a|--all] [-g|--guide]
+'git help' [-a|--all [--verbose]] [-g|--guide]

           [-i|--info|-m|--man|-w|--web] [COMMAND|GUIDE]
 
 DESCRIPTION
           [-i|--info|-m|--man|-w|--web] [COMMAND|GUIDE]
 
 DESCRIPTION


@@ -42,6 +42,8 @@ OPTIONS
 --all::
        Prints all the available commands on the standard output. This
        option overrides any given command or guide name.
 --all::
        Prints all the available commands on the standard output. This
        option overrides any given command or guide name.

+       When used with `--verbose` print description for all recognized
+       commands.

 
 -g::
 --guides::
 
 -g::
 --guides::

diff --git a/builtin/help.c b/builtin/help.c
index 598867cfea40c6e0df25111c5484dde5d2cd8b47..0e0af8426ac41473c9d365f67d226eaa496bb1ee 100644 (file)
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -36,6 +36,7 @@ static const char *html_path;
 
 static int show_all = 0;
 static int show_guides = 0;
 
 static int show_all = 0;
 static int show_guides = 0;

+static int verbose;

 static unsigned int colopts;
 static enum help_format help_format = HELP_FORMAT_NONE;
 static int exclude_guides;
 static unsigned int colopts;
 static enum help_format help_format = HELP_FORMAT_NONE;
 static int exclude_guides;


@@ -48,6 +49,7 @@ static struct option builtin_help_options[] = {
                        HELP_FORMAT_WEB),
        OPT_SET_INT('i', "info", &help_format, N_("show info page"),
                        HELP_FORMAT_INFO),
                        HELP_FORMAT_WEB),
        OPT_SET_INT('i', "info", &help_format, N_("show info page"),
                        HELP_FORMAT_INFO),

+       OPT__VERBOSE(&verbose, N_("print command description")),

        OPT_END(),
 };
 
        OPT_END(),
 };
 


@@ -463,6 +465,11 @@ int cmd_help(int argc, const char **argv, const char *prefix)
 
        if (show_all) {
                git_config(git_help_config, NULL);
 
        if (show_all) {
                git_config(git_help_config, NULL);

+               if (verbose) {
+                       setup_pager();
+                       list_all_cmds_help();
+                       return 0;
+               }

                printf(_("usage: %s%s"), _(git_usage_string), "\n\n");
                load_command_list("git-", &main_cmds, &other_cmds);
                list_commands(colopts, &main_cmds, &other_cmds);
                printf(_("usage: %s%s"), _(git_usage_string), "\n\n");
                load_command_list("git-", &main_cmds, &other_cmds);
                list_commands(colopts, &main_cmds, &other_cmds);

diff --git a/help.c b/help.c
index 1117f7d1d1f7b4ba439e5f9d1a08cffd5ff6ecad..c7df1d233884ad7276aab23c9ba2c1a90039c9f8 100644 (file)
--- a/help.c
+++ b/help.c
@@ -27,6 +27,17 @@ static struct category_description common_categories[] = {
        { CAT_remote, N_("collaborate (see also: git help workflows)") },
        { 0, NULL }
 };
        { CAT_remote, N_("collaborate (see also: git help workflows)") },
        { 0, NULL }
 };

+static struct category_description main_categories[] = {
+       { CAT_mainporcelain, N_("Main Porcelain Commands") },
+       { CAT_ancillarymanipulators, N_("Ancillary Commands / Manipulators") },
+       { CAT_ancillaryinterrogators, N_("Ancillary Commands / Interrogators") },
+       { CAT_foreignscminterface, N_("Interacting with Others") },
+       { CAT_plumbingmanipulators, N_("Low-level Commands / Manipulators") },
+       { CAT_plumbinginterrogators, N_("Low-level Commands / Interrogators") },
+       { CAT_synchingrepositories, N_("Low-level Commands / Synching Repositories") },
+       { CAT_purehelpers, N_("Low-level Commands / Internal Helpers") },
+       { 0, NULL }
+};

 
 static const char *drop_prefix(const char *name)
 {
 
 static const char *drop_prefix(const char *name)
 {


@@ -352,6 +363,11 @@ void list_cmds_by_category(struct string_list *list,
        }
 }
 
        }
 }
 

+void list_all_cmds_help(void)
+{
+       print_cmd_by_category(main_categories);
+}
+

 int is_in_cmdlist(struct cmdnames *c, const char *s)
 {
        int i;
 int is_in_cmdlist(struct cmdnames *c, const char *s)
 {
        int i;

diff --git a/help.h b/help.h
index 734bba32d3f17a87af43da0a7e0434c381b032bd..40917fc38ce0008c1c718470bd2b859aacdeea5e 100644 (file)
--- a/help.h
+++ b/help.h
@@ -19,6 +19,8 @@ static inline void mput_char(char c, unsigned int num)
 }
 
 extern void list_common_cmds_help(void);
 }
 
 extern void list_common_cmds_help(void);

+extern void list_all_cmds_help(void);
+

 extern void list_all_main_cmds(struct string_list *list);
 extern void list_all_other_cmds(struct string_list *list);
 extern void list_cmds_by_category(struct string_list *list,
 extern void list_all_main_cmds(struct string_list *list);
 extern void list_all_other_cmds(struct string_list *list);
 extern void list_cmds_by_category(struct string_list *list,

diff --git a/t/t0012-help.sh b/t/t0012-help.sh
index 3c91a9024aad84a1e9f8ad50c52ec5e53b7359f1..060df24c2d99f433b0aa24288b93b108255a0afa 100755 (executable)
--- a/t/t0012-help.sh
+++ b/t/t0012-help.sh
@@ -25,6 +25,15 @@ test_expect_success "setup" '
        EOF
 '
 
        EOF
 '
 

+# make sure to exercise these code paths, the output is a bit tricky
+# to verify
+test_expect_success 'basic help commands' '
+       git help >/dev/null &&
+       git help -a >/dev/null &&
+       git help -g >/dev/null &&
+       git help -av >/dev/null
+'
+

 test_expect_success "works for commands and guides by default" '
        configure_help &&
        git help status &&
 test_expect_success "works for commands and guides by default" '
        configure_help &&
        git help status &&