This is an archive of the discontinued Mercurial Phabricator instance.

Differential D223

color: remove warnings if term is not formatted (==dumb or !ui.formatted())
ClosedPublic

Authored by spectral on Aug 3 2017, 4:02 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGf9f28ee41cac: color: remove warnings if term is not formatted (==dumb or !ui.formatted())
Summary

If the user sets color.mode=terminfo, and then runs in the shell inside of emacs
(so TERM=dumb), the previous behavior was that it would warn about no terminfo
entry for setab/setaf, and then warn about 'failed to set color mode to
terminfo'. The first warning is silenced by carrying 'formatted' through to
_terminfosetup, the second is silenced by using 'formatted' instead of
ui.formatted().

If --color=on (or ui.color=always) is specified, this will still warn, since the
formatted boolean is set to true in these cases.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

spectral created this revision.Aug 3 2017, 4:02 PM
yuja accepted this revision as: yuja.Aug 4 2017, 9:23 AM
yuja added a subscriber: yuja.

Makes sense.

Closed by commit rHGf9f28ee41cac: color: remove warnings if term is not formatted (==dumb or !ui.formatted()) (authored by spectral). · Explain WhyAug 4 2017, 9:54 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/color.py (10 lines)

Diff 528

mercurial/color.py

'status.unknown': 'magenta bold underline', 'status.unknown': 'magenta bold underline',
'tags.normal': 'green', 'tags.normal': 'green',
'tags.local': 'black bold', 'tags.local': 'black bold',
} }
def loadcolortable(ui, extname, colortable): def loadcolortable(ui, extname, colortable):
_defaultstyles.update(colortable) _defaultstyles.update(colortable)
def _terminfosetup(ui, mode): def _terminfosetup(ui, mode, formatted):
'''Initialize terminfo data and the terminal if we're in terminfo mode.''' '''Initialize terminfo data and the terminal if we're in terminfo mode.'''
# If we failed to load curses, we go ahead and return. # If we failed to load curses, we go ahead and return.
if curses is None: if curses is None:
return return
# Otherwise, see what the config file says. # Otherwise, see what the config file says.
if mode not in ('auto', 'terminfo'): if mode not in ('auto', 'terminfo'):
return return
continue continue
if not c and not curses.tigetstr(e): if not c and not curses.tigetstr(e):
# Most terminals don't support dim, invis, etc, so don't be # Most terminals don't support dim, invis, etc, so don't be
# noisy and use ui.debug(). # noisy and use ui.debug().
ui.debug("no terminfo entry for %s\n" % e) ui.debug("no terminfo entry for %s\n" % e)
del ui._terminfoparams[key] del ui._terminfoparams[key]
if not curses.tigetstr('setaf') or not curses.tigetstr('setab'): if not curses.tigetstr('setaf') or not curses.tigetstr('setab'):
# Only warn about missing terminfo entries if we explicitly asked for # Only warn about missing terminfo entries if we explicitly asked for
# terminfo mode. # terminfo mode and we're in a formatted terminal.
if mode == "terminfo": if mode == "terminfo" and formatted:
ui.warn(_("no terminfo entry for setab/setaf: reverting to " ui.warn(_("no terminfo entry for setab/setaf: reverting to "
"ECMA-48 color\n")) "ECMA-48 color\n"))
ui._terminfoparams.clear() ui._terminfoparams.clear()
def setup(ui): def setup(ui):
"""configure color on a ui """configure color on a ui
That function both set the colormode for the ui object and read That function both set the colormode for the ui object and read
elif mode == 'ansi' and w32effects and not ansienviron: elif mode == 'ansi' and w32effects and not ansienviron:
win32.enablevtmode() win32.enablevtmode()
elif mode == 'auto': elif mode == 'auto':
realmode = 'ansi' realmode = 'ansi'
def modewarn(): def modewarn():
# only warn if color.mode was explicitly set and we're in # only warn if color.mode was explicitly set and we're in
# a formatted terminal # a formatted terminal
if mode == realmode and ui.formatted(): if mode == realmode and formatted:
ui.warn(_('warning: failed to set color mode to %s\n') % mode) ui.warn(_('warning: failed to set color mode to %s\n') % mode)
if realmode == 'win32': if realmode == 'win32':
ui._terminfoparams.clear() ui._terminfoparams.clear()
if not w32effects: if not w32effects:
modewarn() modewarn()
return None return None
elif realmode == 'ansi': elif realmode == 'ansi':
ui._terminfoparams.clear() ui._terminfoparams.clear()
elif realmode == 'terminfo': elif realmode == 'terminfo':
_terminfosetup(ui, mode) _terminfosetup(ui, mode, formatted)
if not ui._terminfoparams: if not ui._terminfoparams:
## FIXME Shouldn't we return None in this case too? ## FIXME Shouldn't we return None in this case too?
modewarn() modewarn()
realmode = 'ansi' realmode = 'ansi'
else: else:
return None return None
if always or (auto and formatted): if always or (auto and formatted):