diff -r ebd14a4b03fc -r 350d737e059d mercurial/color.py --- a/mercurial/color.py Thu Feb 16 10:52:27 2017 +0100 +++ b/mercurial/color.py Thu Dec 22 13:19:12 2016 +0100 @@ -165,14 +165,14 @@ 'Wrap text in commands to turn on each effect.' if not text: return text - if not _terminfo_params: + if _terminfo_params: + start = ''.join(_effect_str(effect) + for effect in ['none'] + effects.split()) + stop = _effect_str('none') + else: start = [str(_effects[e]) for e in ['none'] + effects.split()] start = '\033[' + ';'.join(start) + 'm' stop = '\033[' + str(_effects['none']) + 'm' - else: - start = ''.join(_effect_str(effect) - for effect in ['none'] + effects.split()) - stop = _effect_str('none') return ''.join([start, text, stop]) w32effects = None