kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

help: convert git_cmd to page in one place 

Depending on the chosen format of help pages, git-help uses function
show_man_page, show_info_page, or show_html_page.  The first thing all
three functions do is to convert given `git_cmd` to a `page` using
function cmd_to_page.

Move the common part of these three functions to function cmd_help to
avoid code duplication.

Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>
Reviewed-by: Felipe Contreras <felipe.contreras@gmail.com>
Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Andrei Rybak 2021-07-04 17:39:12 +02:00 committed by Junio C Hamano
parent 670b81a890
commit d5659f856f
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
builtin/help.c
View File

@ -436,10 +436,9 @@ static void exec_viewer(const char *name, const char *page)
warning(_("'%s': unknown man viewer."), name); warning(_("'%s': unknown man viewer."), name);
} }


static void show_man_page(const char *git_cmd) static void show_man_page(const char *page)
{ {
struct man_viewer_list *viewer; struct man_viewer_list *viewer;
const char *page = cmd_to_page(git_cmd);
const char *fallback = getenv("GIT_MAN_VIEWER"); const char *fallback = getenv("GIT_MAN_VIEWER");


setup_man_path(); setup_man_path();
@ -453,9 +452,8 @@ static void show_man_page(const char *git_cmd)
die(_("no man viewer handled the request")); die(_("no man viewer handled the request"));
} }


static void show_info_page(const char *git_cmd) static void show_info_page(const char *page)
{ {
const char *page = cmd_to_page(git_cmd);
setenv("INFOPATH", system_path(GIT_INFO_PATH), 1); setenv("INFOPATH", system_path(GIT_INFO_PATH), 1);
execlp("info", "info", "gitman", page, (char *)NULL); execlp("info", "info", "gitman", page, (char *)NULL);
die(_("no info viewer handled the request")); die(_("no info viewer handled the request"));
@ -486,9 +484,8 @@ static void open_html(const char *path)
execl_git_cmd("web--browse", "-c", "help.browser", path, (char *)NULL); execl_git_cmd("web--browse", "-c", "help.browser", path, (char *)NULL);
} }


static void show_html_page(const char *git_cmd) static void show_html_page(const char *page)
{ {
const char *page = cmd_to_page(git_cmd);
struct strbuf page_path; /* it leaks but we exec bellow */ struct strbuf page_path; /* it leaks but we exec bellow */


get_html_page_path(&page_path, page); get_html_page_path(&page_path, page);
@ -548,6 +545,7 @@ int cmd_help(int argc, const char **argv, const char *prefix)
{ {
int nongit; int nongit;
enum help_format parsed_help_format; enum help_format parsed_help_format;
const char *page;


argc = parse_options(argc, argv, prefix, builtin_help_options, argc = parse_options(argc, argv, prefix, builtin_help_options,
builtin_help_usage, 0); builtin_help_usage, 0);
@ -606,16 +604,17 @@ int cmd_help(int argc, const char **argv, const char *prefix)


argv[0] = check_git_cmd(argv[0]); argv[0] = check_git_cmd(argv[0]);


page = cmd_to_page(argv[0]);
switch (help_format) { switch (help_format) {
case HELP_FORMAT_NONE: case HELP_FORMAT_NONE:
case HELP_FORMAT_MAN: case HELP_FORMAT_MAN:
show_man_page(argv[0]); show_man_page(page);
break; break;
case HELP_FORMAT_INFO: case HELP_FORMAT_INFO:
show_info_page(argv[0]); show_info_page(page);
break; break;
case HELP_FORMAT_WEB: case HELP_FORMAT_WEB:
show_html_page(argv[0]); show_html_page(page);
break; break;
} }