From: Felipe Contreras <felipe.contreras@xxxxxxxxx> We already colorize tools traditionally not colorized by default, like diff and grep. Let's do the same for man, but only if `color.man` is explicitly set to "true". Unlike other `color.*` output this colorization is not enabled by `color.ui` being true, the user needs to explicitly set the `color.man` variable to `true. When it was proposed to treat `color.man` like any other `color.*` variable some thought that git opting in coloring for an external program such as man(1) was a step too far[1], even if the user invoked it via the "git help <topic>" wrapper. So let's make this explicitly opt-in for now. As noted in the documentation we're leaving ourselves an out to turn this on by default in the future, or e.g. putting it under the feature.experimental umbrella. We probably won't, but let's not promise users that `color.man` will forever be a special-case. As for what this actually does the effect of having this enabled is that a documentation blurb like (some parts elided with "[...]"): NAME ---- git-config - Get and set [...] SYNOPSIS -------- [...] 'git config' [<file-option>] [...] [...] The `--type=<type>` option instructs 'git config' to ensure [...] Will have "NAME" and "SECTION" shown as BOLD RED instead of BOLD, "git config" and other '-quoted parts in BLUE UNDERLINE instead of UNDERLINE, and `--type=<type>` and other `-quoted parts in RED BOLD instead of BOLD. The "Standout" setting is then used for the user's own search bar (invoked with "/") and prompt. See [2] for more examples Normally check_auto_color() would check the value of `color.pager`, but in this particular case it's not git the one executing the pager, but man. Therefore we need to check pager_use_color ourselves. We do not need to support `color.man` being set to `always`; The `git help` command is always run for a tty (it would be very strange for a user to do `git help $page > output`, but in fact, that works anyway, we don't even need to check if stdout is a tty, but just to be consistent we do). So it's simply a boolean in our case. So, in order for this change to have any effect: 1. color.man=true must be set in the config 2. The user must use less 3. Not have the same LESS_TERMCAP variables set (we call setenv(3) with overwrite=0) 4. Have color.ui enabled 5. Not have color.pager disabled 6. Not have git with stdout directed to a file 1. https://lore.kernel.org/git/87tun1qp91.fsf@xxxxxxxxxxxxxxxxxxx/ 2. https://unix.stackexchange.com/questions/119/colors-in-man-pages/147 Suggested-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> --- On Tue, Jun 08 2021, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> writes: > >> I've been running with this on my personal git build since May 26th. I >> haven't had any issues with it, and I like the new coloring. >> ... >> I think this is a good example of a change that we're better off just >> merging down and then reverting if the wider audience of git users hates >> it, rather than trying to come to some perfect consensus here >> on-list. > > My impression was tht we already had a rough consensus here on-list > that it may be good to educate users who like this "new coloring" > like you do to configure their "less", so that they consistently get > the "new coloring" they like whether they are doing "git help git", > "man git", or even "man ls", and the approach the posted patch takes > will not help (it only affects "git help git" among these). > > I'd rather not to take it. Fair enough, here's a version I think you and others will find acceptable then. It allows users like me who like this to explicitly opt-in via color.man=true. I also took the liberty of making some changes to the commit message to reword it for this new behavior, and to show an example of the sort of colors that change with this patch. The only change to the patch itself is that now color_man is set to 0 by default, not 1. I also moved its declaration so that it's with the one other config variable, insted of with the other command-line options to "git help". Range-diff against v6: 1: e021ca1da21 ! 1: a950ef49e28 help: colorize man pages @@ Metadata Author: Felipe Contreras <felipe.contreras@xxxxxxxxx> ## Commit message ## - help: colorize man pages + help: colorize man pages if man.color=true under less(1) We already colorize tools traditionally not colorized by default, like - diff and grep. Let's do the same for man. - - Our man pages don't contain many useful colors (just blue links), - moreover, many people have groff SGR disabled, so they don't see any - colors with man pages. - - We can set LESS_TERMCAP variables to render bold and underlined text - with colors in the pager; a common trick[1]. - - Bold is rendered as red, underlined as blue, and standout (prompt and - highlighted search) as inverse cyan. - - Obviously this only works when the less pager is used. - - If the user already has LESS_TERMCAP variables set in his/her - environment, those are respected and nothing changes. - - A new color configuration is added: `color.man` for the people that want - to turn this feature off, otherwise `color.ui` is respected. - Additionally, if color.pager is not enabled, this is disregarded. + diff and grep. Let's do the same for man, but only if `color.man` is + explicitly set to "true". + + Unlike other `color.*` output this colorization is not enabled by + `color.ui` being true, the user needs to explicitly set the + `color.man` variable to `true. + + When it was proposed to treat `color.man` like any other `color.*` + variable some thought that git opting in coloring for an external + program such as man(1) was a step too far[1], even if the user invoked + it via the "git help <topic>" wrapper. + + So let's make this explicitly opt-in for now. As noted in the + documentation we're leaving ourselves an out to turn this on by + default in the future, or e.g. putting it under the + feature.experimental umbrella. We probably won't, but let's not + promise users that `color.man` will forever be a special-case. + + As for what this actually does the effect of having this enabled is + that a documentation blurb like (some parts elided with "[...]"): + + NAME + ---- + git-config - Get and set [...] + + SYNOPSIS + -------- + [...] + 'git config' [<file-option>] [...] + [...] + The `--type=<type>` option instructs 'git config' to ensure [...] + + Will have "NAME" and "SECTION" shown as BOLD RED instead of BOLD, "git + config" and other '-quoted parts in BLUE UNDERLINE instead of + UNDERLINE, and `--type=<type>` and other `-quoted parts in RED BOLD + instead of BOLD. The "Standout" setting is then used for the user's + own search bar (invoked with "/") and prompt. See [2] for more + examples Normally check_auto_color() would check the value of `color.pager`, but in this particular case it's not git the one executing the pager, but man. Therefore we need to check pager_use_color ourselves. - Also--unlike other color.* configurations--color.man=always does not - make any sense here; `git help` is always run for a tty (it would be very - strange for a user to do `git help $page > output`, but in fact, that - works anyway, we don't even need to check if stdout is a tty, but just - to be consistent we do). So it's simply a boolean in our case. + We do not need to support `color.man` being set to `always`; The `git + help` command is always run for a tty (it would be very strange for a + user to do `git help $page > output`, but in fact, that works anyway, + we don't even need to check if stdout is a tty, but just to be + consistent we do). So it's simply a boolean in our case. So, in order for this change to have any effect: - 1. The user must use less - 2. Not have the same LESS_TERMCAP variables set - 3. Have color.ui enabled - 4. Not have color.pager disabled - 5. Not have color.man disabled - 7. Not have git with stdout directed to a file - - Fortunately the vast majority of our users meet all of the above, and - anybody who doesn't would not be affected negatively (plus very likely - comprises a very tiny minority). + 1. color.man=true must be set in the config + 2. The user must use less + 3. Not have the same LESS_TERMCAP variables set (we call setenv(3) with overwrite=0) + 4. Have color.ui enabled + 5. Not have color.pager disabled + 6. Not have git with stdout directed to a file - [1] https://unix.stackexchange.com/questions/119/colors-in-man-pages/147 + 1. https://lore.kernel.org/git/87tun1qp91.fsf@xxxxxxxxxxxxxxxxxxx/ + 2. https://unix.stackexchange.com/questions/119/colors-in-man-pages/147 Suggested-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> - Phillip Wood <phillip.wood123@xxxxxxxxx> - Comments-by: Jeff King <peff@xxxxxxxx> Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx> + Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> ## Documentation/config/color.txt ## @@ Documentation/config/color.txt: color.interactive.<slot>:: @@ Documentation/config/color.txt: color.interactive.<slot>:: interactive commands. +color.man:: -+ This flag can be used to disable the automatic colorizaton of man -+ pages when using the less pager. It's activated only when color.ui -+ allows it, and also when color.pager is on. (`true` by default). ++ This flag can be used to enable the automatic colorizaton of man ++ pages when using the less pager, `false` by default. When set to ++ `true` it's activated only when `color.ui` allows it, and if ++ `color.pager` enable (which it is by default). + color.pager:: - A boolean to enable/disable colored output when the pager is in - use (default is true). + A boolean to specify whether `auto` color modes should colorize + output going to the pager. Defaults to true; set this to false +@@ Documentation/config/color.txt: color.ui:: + output not intended for machine consumption to use color, to + `true` or `auto` (this is the default since Git 1.8.4) if you + want such output to use color when written to the terminal. +++ ++When set to `true` certain other `color.*` variables may still not be ++turned on unless explicitly enabled. Currently this only applies to ++`color.man`, see above. Such opt-in variables may be moved under the ++default `color.ui` umbrella in the future. ## builtin/help.c ## @@ @@ builtin/help.c #ifndef DEFAULT_HELP_FORMAT #define DEFAULT_HELP_FORMAT "man" -@@ builtin/help.c: static int verbose = 1; - static unsigned int colopts; - static enum help_format help_format = HELP_FORMAT_NONE; - static int exclude_guides; -+static int man_color = 1; - static struct option builtin_help_options[] = { - OPT_BOOL('a', "all", &show_all, N_("print all available commands")), - OPT_HIDDEN_BOOL(0, "exclude-guides", &exclude_guides, N_("exclude guides")), +@@ builtin/help.c: enum help_format { + HELP_FORMAT_WEB + }; + ++static int man_color; + static const char *html_path; + + static int show_all = 0; @@ builtin/help.c: static void exec_man_konqueror(const char *path, const char *page) } } Documentation/config/color.txt | 11 +++++++++++ builtin/help.c | 32 +++++++++++++++++++++++++++++++- color.h | 1 + 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/Documentation/config/color.txt b/Documentation/config/color.txt index e05d520a867..2f12ae3386d 100644 --- a/Documentation/config/color.txt +++ b/Documentation/config/color.txt @@ -126,6 +126,12 @@ color.interactive.<slot>:: or `error`, for four distinct types of normal output from interactive commands. +color.man:: + This flag can be used to enable the automatic colorizaton of man + pages when using the less pager, `false` by default. When set to + `true` it's activated only when `color.ui` allows it, and if + `color.pager` enable (which it is by default). + color.pager:: A boolean to specify whether `auto` color modes should colorize output going to the pager. Defaults to true; set this to false @@ -200,3 +206,8 @@ color.ui:: output not intended for machine consumption to use color, to `true` or `auto` (this is the default since Git 1.8.4) if you want such output to use color when written to the terminal. ++ +When set to `true` certain other `color.*` variables may still not be +turned on unless explicitly enabled. Currently this only applies to +`color.man`, see above. Such opt-in variables may be moved under the +default `color.ui` umbrella in the future. diff --git a/builtin/help.c b/builtin/help.c index bb339f0fc80..c607da88d78 100644 --- a/builtin/help.c +++ b/builtin/help.c @@ -11,6 +11,7 @@ #include "config-list.h" #include "help.h" #include "alias.h" +#include "color.h" #ifndef DEFAULT_HELP_FORMAT #define DEFAULT_HELP_FORMAT "man" @@ -34,6 +35,7 @@ enum help_format { HELP_FORMAT_WEB }; +static int man_color; static const char *html_path; static int show_all = 0; @@ -253,10 +255,33 @@ static void exec_man_konqueror(const char *path, const char *page) } } +static void colorize_man(void) +{ + if (!man_color || !want_color(GIT_COLOR_UNKNOWN) || !pager_use_color) + return; + + /* Disable groff colors */ + setenv("GROFF_NO_SGR", "1", 0); + + /* Bold */ + setenv("LESS_TERMCAP_md", GIT_COLOR_BOLD_RED, 0); + setenv("LESS_TERMCAP_me", GIT_COLOR_RESET, 0); + + /* Underline */ + setenv("LESS_TERMCAP_us", GIT_COLOR_BLUE GIT_COLOR_UNDERLINE, 0); + setenv("LESS_TERMCAP_ue", GIT_COLOR_RESET, 0); + + /* Standout */ + setenv("LESS_TERMCAP_so", GIT_COLOR_CYAN GIT_COLOR_REVERSE, 0); + setenv("LESS_TERMCAP_se", GIT_COLOR_RESET, 0); +} + static void exec_man_man(const char *path, const char *page) { if (!path) path = "man"; + + colorize_man(); execlp(path, "man", page, (char *)NULL); warning_errno(_("failed to exec '%s'"), path); } @@ -264,6 +289,7 @@ static void exec_man_man(const char *path, const char *page) static void exec_man_cmd(const char *cmd, const char *page) { struct strbuf shell_cmd = STRBUF_INIT; + colorize_man(); strbuf_addf(&shell_cmd, "%s %s", cmd, page); execl(SHELL_PATH, SHELL_PATH, "-c", shell_cmd.buf, (char *)NULL); warning(_("failed to exec '%s'"), cmd); @@ -371,8 +397,12 @@ static int git_help_config(const char *var, const char *value, void *cb) } if (starts_with(var, "man.")) return add_man_viewer_info(var, value); + if (!strcmp(var, "color.man")) { + man_color = git_config_bool(var, value); + return 0; + } - return git_default_config(var, value, cb); + return git_color_default_config(var, value, cb); } static struct cmdnames main_cmds, other_cmds; diff --git a/color.h b/color.h index 98894d6a175..d012add4e8a 100644 --- a/color.h +++ b/color.h @@ -51,6 +51,7 @@ struct strbuf; #define GIT_COLOR_FAINT "\033[2m" #define GIT_COLOR_FAINT_ITALIC "\033[2;3m" #define GIT_COLOR_REVERSE "\033[7m" +#define GIT_COLOR_UNDERLINE "\033[4m" /* A special value meaning "no color selected" */ #define GIT_COLOR_NIL "NIL" -- 2.32.0.599.g672d808136f
