--- a/mercurial/color.py Tue May 02 20:01:54 2017 +0200
+++ b/mercurial/color.py Tue May 02 20:19:09 2017 +0200
@@ -195,8 +195,9 @@
auto = (config == 'auto')
always = False
if not auto and util.parsebool(config):
- # we want the config to behave like a boolean, "on" is actually auto
- if ui.configsource('ui', 'color') == '--color':
+ # We want the config to behave like a boolean, "on" is actually auto,
+ # but "always" value is treated as a special case to reduce confusion.
+ if ui.configsource('ui', 'color') == '--color' or config == 'always':
always = True
else:
auto = True