# HG changeset patch # User Sean Farley <sean.michael.farley@gmail.com> # Date 1396902826 18000 # Mon Apr 07 15:33:46 2014 -0500 # Node ID 05086b56b56406962d26719bc9689a60e7f2e0f3 # Parent a05d694599f94c14c989740272db0996633f01be color: extract method for determining a valid effect This patch is just setup work so that we can reduce code duplication and have one place to define a valid effect. diff --git a/hgext/color.py b/hgext/color.py --- a/hgext/color.py +++ b/hgext/color.py @@ -311,6 +311,15 @@ for name, ext in extensions.extensions(): _styles.update(getattr(ext, 'colortable', {})) +def valideffect(effect): + 'Determine if the effect is valid or not.' + good = False + if not _terminfo_params and effect in _effects: + good = True + elif effect in _terminfo_params or effect[:-11] in _terminfo_params: + good = True + return good + def configstyles(ui): for status, cfgeffects in ui.configitems('color'): if '.' not in status or status.startswith('color.'): @@ -319,9 +328,7 @@ if cfgeffects: good = [] for e in cfgeffects: - if not _terminfo_params and e in _effects: - good.append(e) - elif e in _terminfo_params or e[:-11] in _terminfo_params: + if valideffect(e): good.append(e) else: ui.warn(_("ignoring unknown color/effect %r "