[PATCH 3 of 3] color: debugcolor should emit the user-defined colors

Yuya Nishihara yuya at tcha.org
Sat Oct 15 10:00:17 EDT 2016


On Thu, 13 Oct 2016 13:27:35 -0700, danek.duvall at oracle.com wrote:
> # HG changeset patch
> # User Danek Duvall <danek.duvall at oracle.com>
> # Date 1476389401 25200
> #      Thu Oct 13 13:10:01 2016 -0700
> # Node ID c59334b806a8f10c80c2ea196eba5f4b1b86b229
> # Parent  333e875ce30da3760c8655e303d9bea554efe7e4
> color: debugcolor should emit the user-defined colors
> 
> This also fixes a long-standing bug that reversed the sense of the color
> name and the label used to print it, which was never relevant before.
> 
> diff --git a/hgext/color.py b/hgext/color.py
> --- a/hgext/color.py
> +++ b/hgext/color.py
> @@ -524,10 +524,16 @@ def debugcolor(ui, repo, **opts):
>      _styles = {}
>      for effect in _effects.keys():
>          _styles[effect] = effect
> +    if _terminfo_params:
> +        for k, v in ui.configitems('color'):
> +            if k.startswith('color.'):
> +                _styles[k] = k[6:]
> +            elif k.startswith('terminfo.'):
> +                _styles[k] = k[9:]
>      ui.write(('color mode: %s\n') % ui._colormode)
>      ui.write(_('available colors:\n'))
> -    for label, colors in _styles.items():
> -        ui.write(('%s\n') % colors, label=label)
> +    for colorname, label in _styles.items():
> +        ui.write(('%s\n') % colorname, label=label)

I was surprised to know that a label can be a valid effect name.


More information about the Mercurial-devel mailing list