##// END OF EJS Templates
Merge stable with security patch.
Merge stable with security patch.

File last commit:

r31628:e86eb75e default
r32053:52902059 merge stable
Show More
color.py
656 lines | 22.6 KiB | text/x-python | PythonLexer
Jordi Gutiérrez Hermoso
color: update description of the extension...
r22771 # color.py color output for Mercurial commands
Kevin Christen
Add colored output to status and qseries commands
r5787 #
# Copyright (C) 2007 Kevin Christen <kevin.christen@gmail.com>
#
Augie Fackler
color: Use the same GPL boilerplate as most hg files
r15771 # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
Kevin Christen
Add colored output to status and qseries commands
r5787
Cédric Duval
extensions: improve the consistency of synopses...
r8894 '''colorize output from some commands
Kevin Christen
Add colored output to status and qseries commands
r5787
Jordi Gutiérrez Hermoso
color: update description of the extension...
r22771 The color extension colorizes output from several Mercurial commands.
For example, the diff command shows additions in green and deletions
in red, while the status command shows modified files in magenta. Many
other commands have analogous colors. It is possible to customize
these colors.
Georg Brandl
diff colorization: finish highlighting trailing whitespace
r7457
Jordi Gutiérrez Hermoso
color: reorganise and sectionify the help text...
r22772 Effects
-------
Martin Geisler
color: word-wrap help texts at 70 characters
r7988 Other effects in addition to color, like bold and underlined text, are
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987 also available. By default, the terminfo database is used to find the
terminal codes used to change color and effect. If terminfo is not
available, then effects are rendered with the ECMA-48 SGR control
Martin Geisler
color: don't mention internal function in docstring...
r13635 function (aka ANSI escape codes).
Kevin Christen
Add colored output to status and qseries commands
r5787
Jordi Gutiérrez Hermoso
color: reorganise and sectionify the help text...
r22772 The available effects in terminfo mode are 'blink', 'bold', 'dim',
'inverse', 'invisible', 'italic', 'standout', and 'underline'; in
ECMA-48 mode, the options are 'bold', 'inverse', 'italic', and
'underline'. How each is rendered depends on the terminal emulator.
Some may not be available for a given terminal type, and will be
silently ignored.
Danek Duvall
color: add some documentation for custom terminfo codes
r30176 If the terminfo entry for your terminal is missing codes for an effect
or has the wrong codes, you can add or override those codes in your
configuration::
[color]
terminfo.dim = \E[2m
where '\E' is substituted with an escape character.
Jordi Gutiérrez Hermoso
color: reorganise and sectionify the help text...
r22772 Labels
------
Jordi Gutiérrez Hermoso
color: document that labels are used for colorizing text...
r22462 Text receives color effects depending on the labels that it has. Many
default Mercurial commands emit labelled text. You can also define
your own labels in templates using the label function, see :hg:`help
templates`. A single portion of text may have more than one label. In
that case, effects given to the last label will override any other
effects. This includes the special "none" effect, which nullifies
other effects.
Jordi Gutiérrez Hermoso
color: enable debug option to show labels...
r22463 Labels are normally invisible. In order to see these labels and their
Jordi Gutiérrez Hermoso
color: update docstring for debug option...
r22711 position in the text, use the global --color=debug option. The same
anchor text may be associated to multiple labels, e.g.
Jordi Gutiérrez Hermoso
color: enable debug option to show labels...
r22463
Jordi Gutiérrez Hermoso
color: update docstring for debug option...
r22711 [log.changeset changeset.secret|changeset: 22611:6f0a53c8f587]
Jordi Gutiérrez Hermoso
color: enable debug option to show labels...
r22463
Jordi Gutiérrez Hermoso
color: document that labels are used for colorizing text...
r22462 The following are the default effects for some default labels. Default
effects may be overridden from your configuration file::
Kevin Christen
Add colored output to status and qseries commands
r5787
Martin Geisler
color: use reST syntax for literal block
r9206 [color]
status.modified = blue bold underline red_background
status.added = green bold
status.removed = red bold blue_background
status.deleted = cyan bold underline
status.unknown = magenta bold underline
status.ignored = black bold
Kevin Christen
Add colored output to status and qseries commands
r5787
Martin Geisler
color: use reST syntax for literal block
r9206 # 'none' turns off all effects
status.clean = none
status.copied = none
Kevin Christen
Add colored output to status and qseries commands
r5787
Martin Geisler
color: use reST syntax for literal block
r9206 qseries.applied = blue bold underline
qseries.unapplied = black bold
qseries.missing = red bold
Brodie Rao
color: diff colorization...
r7456
Martin Geisler
color: use reST syntax for literal block
r9206 diff.diffline = bold
diff.extended = cyan bold
diff.file_a = red bold
diff.file_b = green bold
diff.hunk = magenta
diff.deleted = red
diff.inserted = green
diff.changed = white
Jordi Gutiérrez Hermoso
color: document the possibility to colourise tabs in diffs...
r22710 diff.tab =
Martin Geisler
color: use reST syntax for literal block
r9206 diff.trailingwhitespace = bold red_background
David Soria Parra
color: Add support for bookmarks
r10046
Jordi Gutiérrez Hermoso
color: document that changeset phases have labels...
r22465 # Blank so it inherits the style of the surrounding label
changeset.public =
changeset.draft =
changeset.secret =
Georg Brandl
color: colorize output of hg resolve -l
r10223 resolve.unresolved = red bold
resolve.resolved = green bold
Ryan McElroy
bookmarks: name label for active bookmark correctly...
r25347 bookmarks.active = green
Steve Borho
color: add support for Windows consoles...
r10870
Jeremy Whitlock
color: enable branches support...
r11969 branches.active = none
branches.closed = black bold
branches.current = green
branches.inactive = none
Marc Simpson
color: add styles for tags
r15048 tags.normal = green
tags.local = black bold
Bryan O'Sullivan
summary: indicate if a rebase is underway
r19214 rebase.rebased = blue
rebase.remaining = red bold
David Soria Parra
shelve: add a shelve extension to save/restore working changes...
r19854 shelve.age = cyan
shelve.newest = green bold
shelve.name = blue bold
Bryan O'Sullivan
summary: add a histedit hook
r19215 histedit.remaining = red bold
Jordi Gutiérrez Hermoso
color: reorganise and sectionify the help text...
r22772 Custom colors
-------------
Brodie Rao
color: for the sake of "less -R", default to ansi in auto mode (issue2792)...
r14769
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987 Because there are only eight standard colors, this module allows you
to define color names for other color slots which might be available
for your terminal type, assuming terminfo mode. For instance::
color.brightblue = 12
color.pink = 207
color.orange = 202
to set 'brightblue' to color slot 12 (useful for 16 color terminals
that have brighter colors defined in the upper eight) and, 'pink' and
'orange' to colors in 256-color xterm's default color cube. These
defined colors may then be used as any of the pre-defined eight,
including appending '_background' to set the background to that color.
Jordi Gutiérrez Hermoso
color: reorganise and sectionify the help text...
r22772 Modes
-----
Brodie Rao
color: for the sake of "less -R", default to ansi in auto mode (issue2792)...
r14769 By default, the color extension will use ANSI mode (or win32 mode on
Windows) if it detects a terminal. To override auto mode (to enable
terminfo mode, for example), set the following configuration option::
Steve Borho
color: add support for Windows consoles...
r10870
[color]
Brodie Rao
color: for the sake of "less -R", default to ansi in auto mode (issue2792)...
r14769 mode = terminfo
Steve Borho
color: add support for Windows consoles...
r10870
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987 Any value other than 'ansi', 'win32', 'terminfo', or 'auto' will
disable color.
Jordi Gutiérrez Hermoso
color: reorganise and sectionify the help text...
r22772
Note that on some systems, terminfo mode may cause problems when using
color with the pager extension and less -R. less with the -R option
will only display ECMA-48 color codes, and terminfo mode may sometimes
emit codes that less doesn't understand. You can work around this by
either using ansi mode (or auto mode), or by using less -r (which will
pass through all terminal control codes, not just color control
codes).
Gregory Szorc
color: support a different color mode when the pager is active...
r24068
On some systems (such as MSYS in Windows), the terminal may support
a different color mode than the pager (activated via the "pager"
extension). It is possible to define separate modes depending on whether
the pager is active::
[color]
mode = auto
pagermode = ansi
If ``pagermode`` is not defined, the ``mode`` will be used.
Kevin Christen
Add colored output to status and qseries commands
r5787 '''
Pulkit Goyal
py3: make color use absolute_import
r28968 from __future__ import absolute_import
Kevin Christen
Add colored output to status and qseries commands
r5787
Yuya Nishihara
py3: move up symbol imports to enforce import-checker rules...
r29205 from mercurial.i18n import _
Pulkit Goyal
py3: make color use absolute_import
r28968 from mercurial import (
cmdutil,
Pierre-Yves David
color: move hgext.color._styles to mercurial.color.style...
r30652 color,
Pulkit Goyal
py3: make color use absolute_import
r28968 commands,
dispatch,
Pulkit Goyal
py3: replace os.environ with encoding.environ (part 5 of 5)
r30638 encoding,
Pulkit Goyal
py3: make color use absolute_import
r28968 extensions,
Pulkit Goyal
py3: replace os.name with pycompat.osname (part 2 of 2)
r30640 pycompat,
Pulkit Goyal
py3: make color use absolute_import
r28968 subrepo,
ui as uimod,
util,
)
Kevin Christen
Add colored output to status and qseries commands
r5787
Gregory Szorc
color: declare command using decorator
r21249 cmdtable = {}
command = cmdutil.command(cmdtable)
Augie Fackler
extensions: change magic "shipped with hg" string...
r29841 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
Augie Fackler
extensions: document that `testedwith = 'internal'` is special...
r25186 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified.
Augie Fackler
extensions: change magic "shipped with hg" string...
r29841 testedwith = 'ships-with-hg-core'
Augie Fackler
hgext: mark all first-party extensions as such
r16743
Kevin Christen
Add colored output to status and qseries commands
r5787 # start and stop parameters for effects
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826 _effects = {'none': 0, 'black': 30, 'red': 31, 'green': 32, 'yellow': 33,
'blue': 34, 'magenta': 35, 'cyan': 36, 'white': 37, 'bold': 1,
Sean Farley
color: add missing 'dim' in _effects...
r23925 'italic': 3, 'underline': 4, 'inverse': 7, 'dim': 2,
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826 'black_background': 40, 'red_background': 41,
'green_background': 42, 'yellow_background': 43,
'blue_background': 44, 'purple_background': 45,
'cyan_background': 46, 'white_background': 47}
Peter Arrenbrecht
color: fix --color=always when output is piped...
r14495 def _terminfosetup(ui, mode):
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987 '''Initialize terminfo data and the terminal if we're in terminfo mode.'''
# If we failed to load curses, we go ahead and return.
if not _terminfo_params:
return
# Otherwise, see what the config file says.
if mode not in ('auto', 'terminfo'):
return
Danek Duvall
color: allow for user-configurable terminfo codes for effects...
r30173 _terminfo_params.update((key[6:], (False, int(val), ''))
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987 for key, val in ui.configitems('color')
Patrick Mezard
color: code simplification
r13998 if key.startswith('color.'))
Danek Duvall
color: allow for user-configurable terminfo codes for effects...
r30173 _terminfo_params.update((key[9:], (True, '', val.replace('\\E', '\x1b')))
for key, val in ui.configitems('color')
if key.startswith('terminfo.'))
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987
try:
curses.setupterm()
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except curses.error as e:
Pierre-Yves David
color: drop use of the 'global' keyword for _terminfo_params...
r30650 _terminfo_params.clear()
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987 return
Danek Duvall
color: allow for user-configurable terminfo codes for effects...
r30173 for key, (b, e, c) in _terminfo_params.items():
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987 if not b:
continue
Danek Duvall
color: allow for user-configurable terminfo codes for effects...
r30173 if not c and not curses.tigetstr(e):
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987 # Most terminals don't support dim, invis, etc, so don't be
# noisy and use ui.debug().
ui.debug("no terminfo entry for %s\n" % e)
del _terminfo_params[key]
if not curses.tigetstr('setaf') or not curses.tigetstr('setab'):
Danek Duvall
color: be silent when falling back to ECMA-48 mode if "auto" mode was desired...
r14758 # Only warn about missing terminfo entries if we explicitly asked for
# terminfo mode.
if mode == "terminfo":
ui.warn(_("no terminfo entry for setab/setaf: reverting to "
"ECMA-48 color\n"))
Pierre-Yves David
color: drop use of the 'global' keyword for _terminfo_params...
r30650 _terminfo_params.clear()
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987
Simon Heimberg
color: only provide the required opt to _modesetup
r19297 def _modesetup(ui, coloropt):
Jordi Gutiérrez Hermoso
color: enable debug option to show labels...
r22463 if coloropt == 'debug':
return 'debug'
Pierre-Yves David
color: add parenthesis to help readability...
r21723 auto = (coloropt == 'auto')
Peter Arrenbrecht
color: fix --color=always when output is piped...
r14495 always = not auto and util.parsebool(coloropt)
if not always and not auto:
return None
Pulkit Goyal
py3: replace os.environ with encoding.environ (part 5 of 5)
r30638 formatted = (always or (encoding.environ.get('TERM') != 'dumb'
and ui.formatted()))
Peter Arrenbrecht
color: fix --color=always when output is piped...
r14495
mode = ui.config('color', 'mode', 'auto')
Gregory Szorc
color: support a different color mode when the pager is active...
r24068
# If pager is active, color.pagermode overrides color.mode.
if getattr(ui, 'pageractive', False):
mode = ui.config('color', 'pagermode', mode)
Peter Arrenbrecht
color: fix --color=always when output is piped...
r14495 realmode = mode
if mode == 'auto':
Pulkit Goyal
py3: replace os.name with pycompat.osname (part 2 of 2)
r30640 if pycompat.osname == 'nt':
Pulkit Goyal
py3: replace os.environ with encoding.environ (part 5 of 5)
r30638 term = encoding.environ.get('TERM')
Gregory Szorc
color: be more conservative about setting ANSI mode on Windows (BC)...
r24028 # TERM won't be defined in a vanilla cmd.exe environment.
# UNIX-like environments on Windows such as Cygwin and MSYS will
# set TERM. They appear to make a best effort attempt at setting it
# to something appropriate. However, not all environments with TERM
# defined support ANSI. Since "ansi" could result in terminal
# gibberish, we error on the side of selecting "win32". However, if
# w32effects is not defined, we almost certainly don't support
# "win32", so don't even try.
Matt Harbison
color: fix crash in cmd.exe...
r24535 if (term and 'xterm' in term) or not w32effects:
Gregory Szorc
color: be more conservative about setting ANSI mode on Windows (BC)...
r24028 realmode = 'ansi'
else:
realmode = 'win32'
Brodie Rao
color: for the sake of "less -R", default to ansi in auto mode (issue2792)...
r14769 else:
Peter Arrenbrecht
color: fix --color=always when output is piped...
r14495 realmode = 'ansi'
Jordi Gutiérrez Hermoso
color: consolidate cut-and-paste code...
r24266 def modewarn():
# only warn if color.mode was explicitly set and we're in
Xidorn Quan
color: show mode warning based on ui.formatted...
r30367 # a formatted terminal
if mode == realmode and ui.formatted():
Jordi Gutiérrez Hermoso
color: consolidate cut-and-paste code...
r24266 ui.warn(_('warning: failed to set color mode to %s\n') % mode)
Peter Arrenbrecht
color: fix --color=always when output is piped...
r14495 if realmode == 'win32':
Pierre-Yves David
color: drop use of the 'global' keyword for _terminfo_params...
r30650 _terminfo_params.clear()
Brodie Rao
color: fix TypeError with auto mode on win32 when colors aren't available (issue2871)...
r14768 if not w32effects:
Jordi Gutiérrez Hermoso
color: consolidate cut-and-paste code...
r24266 modewarn()
Peter Arrenbrecht
color: fix --color=always when output is piped...
r14495 return None
_effects.update(w32effects)
elif realmode == 'ansi':
Pierre-Yves David
color: drop use of the 'global' keyword for _terminfo_params...
r30650 _terminfo_params.clear()
Peter Arrenbrecht
color: fix --color=always when output is piped...
r14495 elif realmode == 'terminfo':
_terminfosetup(ui, mode)
if not _terminfo_params:
Jordi Gutiérrez Hermoso
color: consolidate cut-and-paste code...
r24266 ## FIXME Shouldn't we return None in this case too?
modewarn()
Peter Arrenbrecht
color: fix --color=always when output is piped...
r14495 realmode = 'ansi'
else:
return None
if always or (auto and formatted):
return realmode
return None
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987 try:
import curses
Danek Duvall
color: allow for user-configurable terminfo codes for effects...
r30173 # Mapping from effect name to terminfo attribute name (or raw code) or
# color number. This will also force-load the curses module.
_terminfo_params = {'none': (True, 'sgr0', ''),
'standout': (True, 'smso', ''),
'underline': (True, 'smul', ''),
'reverse': (True, 'rev', ''),
'inverse': (True, 'rev', ''),
'blink': (True, 'blink', ''),
'dim': (True, 'dim', ''),
'bold': (True, 'bold', ''),
'invisible': (True, 'invis', ''),
'italic': (True, 'sitm', ''),
'black': (False, curses.COLOR_BLACK, ''),
'red': (False, curses.COLOR_RED, ''),
'green': (False, curses.COLOR_GREEN, ''),
'yellow': (False, curses.COLOR_YELLOW, ''),
'blue': (False, curses.COLOR_BLUE, ''),
'magenta': (False, curses.COLOR_MAGENTA, ''),
'cyan': (False, curses.COLOR_CYAN, ''),
'white': (False, curses.COLOR_WHITE, '')}
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987 except ImportError:
Mads Kiilerich
color: don't fail on error messages when no curses (issue4237)...
r21227 _terminfo_params = {}
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987
def _effect_str(effect):
'''Helper function for render_effects().'''
bg = False
if effect.endswith('_background'):
bg = True
effect = effect[:-11]
Danek Duvall
color: ignore effects missing from terminfo...
r30174 try:
attr, val, termcode = _terminfo_params[effect]
except KeyError:
return ''
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987 if attr:
Danek Duvall
color: allow for user-configurable terminfo codes for effects...
r30173 if termcode:
return termcode
else:
return curses.tigetstr(val)
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987 elif bg:
return curses.tparm(curses.tigetstr('setab'), val)
else:
return curses.tparm(curses.tigetstr('setaf'), val)
Martin Geisler
color: use lists instead of tuples for effects
r8622 def render_effects(text, effects):
Kevin Christen
Add colored output to status and qseries commands
r5787 'Wrap text in commands to turn on each effect.'
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826 if not text:
return text
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987 if not _terminfo_params:
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')
Brodie Rao
color: replace effect-specific reset control codes with general purpose one
r7459 return ''.join([start, text, stop])
Kevin Christen
Add colored output to status and qseries commands
r5787
Sean Farley
color: extract method for determining a valid effect...
r20992 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
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826 def configstyles(ui):
for status, cfgeffects in ui.configitems('color'):
Danek Duvall
color: allow for user-configurable terminfo codes for effects...
r30173 if '.' not in status or status.startswith(('color.', 'terminfo.')):
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826 continue
cfgeffects = ui.configlist('color', status)
if cfgeffects:
Greg Ward
color: don't blow up if configured with unknown color (just warn).
r8945 good = []
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826 for e in cfgeffects:
Sean Farley
color: extract method for determining a valid effect...
r20992 if valideffect(e):
Greg Ward
color: don't blow up if configured with unknown color (just warn).
r8945 good.append(e)
else:
ui.warn(_("ignoring unknown color/effect %r "
"(configured in color.%s)\n")
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826 % (e, status))
Pierre-Yves David
color: move hgext.color._styles to mercurial.color.style...
r30652 color._styles[status] = ' '.join(good)
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826
Brodie Rao
color/progress: subclass ui instead of using wrapfunction (issue2096)...
r11555 class colorui(uimod.ui):
_colormode = 'ansi'
def write(self, *args, **opts):
Siddharth Agarwal
color: turn colorui functions into forwards when color is None...
r19072 if self._colormode is None:
return super(colorui, self).write(*args, **opts)
Brodie Rao
color/progress: subclass ui instead of using wrapfunction (issue2096)...
r11555 label = opts.get('label', '')
timeless
ui: add prompt argument to write (issue5154) (API)...
r28633 if self._buffers and not opts.get('prompt', False):
Gregory Szorc
color: evaluate labels at write time...
r27108 if self._bufferapplylabels:
Gregory Szorc
ui: avoid needless casting to a str...
r27110 self._buffers[-1].extend(self.label(a, label) for a in args)
Gregory Szorc
color: evaluate labels at write time...
r27108 else:
Gregory Szorc
ui: avoid needless casting to a str...
r27110 self._buffers[-1].extend(args)
Brodie Rao
color/progress: subclass ui instead of using wrapfunction (issue2096)...
r11555 elif self._colormode == 'win32':
for a in args:
Brodie Rao
color: pass write/write_err to win32print correctly (issue2312)
r11727 win32print(a, super(colorui, self).write, **opts)
Brodie Rao
color/progress: subclass ui instead of using wrapfunction (issue2096)...
r11555 else:
return super(colorui, self).write(
Gregory Szorc
ui: avoid needless casting to a str...
r27110 *[self.label(a, label) for a in args], **opts)
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826
Brodie Rao
color/progress: subclass ui instead of using wrapfunction (issue2096)...
r11555 def write_err(self, *args, **opts):
Siddharth Agarwal
color: turn colorui functions into forwards when color is None...
r19072 if self._colormode is None:
return super(colorui, self).write_err(*args, **opts)
Brodie Rao
color/progress: subclass ui instead of using wrapfunction (issue2096)...
r11555 label = opts.get('label', '')
Pierre-Yves David
ui: allow capture of subprocess output...
r24848 if self._bufferstates and self._bufferstates[-1][0]:
Yuya Nishihara
color: add missing handling of stderr capture introduced by 350dc24a553d...
r21190 return self.write(*args, **opts)
Brodie Rao
color/progress: subclass ui instead of using wrapfunction (issue2096)...
r11555 if self._colormode == 'win32':
for a in args:
Brodie Rao
color: pass write/write_err to win32print correctly (issue2312)
r11727 win32print(a, super(colorui, self).write_err, **opts)
Brodie Rao
color/progress: subclass ui instead of using wrapfunction (issue2096)...
r11555 else:
Brodie Rao
color: call correct superclass method in write_err...
r11732 return super(colorui, self).write_err(
Gregory Szorc
ui: avoid needless casting to a str...
r27110 *[self.label(a, label) for a in args], **opts)
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826
Jordi Gutiérrez Hermoso
color: enable debug option to show labels...
r22463 def showlabel(self, msg, label):
Jordi Gutiérrez Hermoso
color: omit debug label output on empty strings...
r22763 if label and msg:
if msg[-1] == '\n':
Matt Mackall
color: change the debug output format...
r22464 return "[%s|%s]\n" % (label, msg[:-1])
Jordi Gutiérrez Hermoso
color: enable debug option to show labels...
r22463 else:
Matt Mackall
color: change the debug output format...
r22464 return "[%s|%s]" % (label, msg)
Jordi Gutiérrez Hermoso
color: enable debug option to show labels...
r22463 else:
return msg
Brodie Rao
color/progress: subclass ui instead of using wrapfunction (issue2096)...
r11555 def label(self, msg, label):
Siddharth Agarwal
color: turn colorui functions into forwards when color is None...
r19072 if self._colormode is None:
return super(colorui, self).label(msg, label)
Jordi Gutiérrez Hermoso
color: enable debug option to show labels...
r22463 if self._colormode == 'debug':
return self.showlabel(msg, label)
Brodie Rao
color/progress: subclass ui instead of using wrapfunction (issue2096)...
r11555 effects = []
for l in label.split():
Pierre-Yves David
color: move hgext.color._styles to mercurial.color.style...
r30652 s = color._styles.get(l, '')
Brodie Rao
color/progress: subclass ui instead of using wrapfunction (issue2096)...
r11555 if s:
effects.append(s)
Sean Farley
color: fallback and test label as an effect...
r20993 elif valideffect(l):
effects.append(l)
Dan Villiom Podlaski Christiansen
color: fix using multiple effects
r14145 effects = ' '.join(effects)
Brodie Rao
color/progress: subclass ui instead of using wrapfunction (issue2096)...
r11555 if effects:
Augie Fackler
color: avoid shadowing a variable inside a list comprehension
r30387 return '\n'.join([render_effects(line, effects)
for line in msg.split('\n')])
Brodie Rao
color/progress: subclass ui instead of using wrapfunction (issue2096)...
r11555 return msg
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826 def uisetup(ui):
Steve Borho
color: respect HGPLAIN
r10871 if ui.plain():
return
Simon Heimberg
color: use pythons isinstance method instead of reprogramming it
r19298 if not isinstance(ui, colorui):
Simon Heimberg
color: set the ui class in reposetup, before a repo is created...
r19063 colorui.__bases__ = (ui.__class__,)
ui.__class__ = colorui
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826 def colorcmd(orig, ui_, opts, cmd, cmdfunc):
Simon Heimberg
color: only provide the required opt to _modesetup
r19297 mode = _modesetup(ui_, opts['color'])
Siddharth Agarwal
color: set _colormode to None when mode is unset (issue3895)...
r19073 colorui._colormode = mode
Jordi Gutiérrez Hermoso
color: enable debug option to show labels...
r22463 if mode and mode != 'debug':
Brodie Rao
color/progress: subclass ui instead of using wrapfunction (issue2096)...
r11555 configstyles(ui_)
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826 return orig(ui_, opts, cmd, cmdfunc)
Mathias De Maré
color: add support for colorizing git subrepo diffs
r23780 def colorgit(orig, gitsub, commands, env=None, stream=False, cwd=None):
if gitsub.ui._colormode and len(commands) and commands[0] == "diff":
# insert the argument in the front,
# the end of git diff arguments is used for paths
commands.insert(1, '--color')
return orig(gitsub, commands, env, stream, cwd)
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826 extensions.wrapfunction(dispatch, '_runcommand', colorcmd)
Mathias De Maré
color: add support for colorizing git subrepo diffs
r23780 extensions.wrapfunction(subrepo.gitsubrepo, '_gitnodir', colorgit)
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826
Brodie Rao
color: add global option in extsetup() instead of globally...
r12693 def extsetup(ui):
commands.globalopts.append(
('', 'color', 'auto',
Jordi Gutiérrez Hermoso
color: enable debug option to show labels...
r22463 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
# and should not be translated
_("when to colorize (boolean, always, auto, never, or debug)"),
Brodie Rao
color: add global option in extsetup() instead of globally...
r12693 _('TYPE')))
Steve Borho
color: add support for Windows consoles...
r10870
Pierre-Yves David
color: add the ability to display configured style to 'debugcolor'...
r30286 @command('debugcolor',
[('', 'style', None, _('show all configured styles'))],
'hg debugcolor')
Olle Lundberg
color: add debugcolor command (issue4094)...
r20455 def debugcolor(ui, repo, **opts):
Pierre-Yves David
color: add the ability to display configured style to 'debugcolor'...
r30286 """show available color, effects or style"""
Pierre-Yves David
color: extract color and effect display from 'debugcolor'...
r30284 ui.write(('color mode: %s\n') % ui._colormode)
Pierre-Yves David
color: add the ability to display configured style to 'debugcolor'...
r30286 if opts.get('style'):
return _debugdisplaystyle(ui)
else:
return _debugdisplaycolor(ui)
Pierre-Yves David
color: extract color and effect display from 'debugcolor'...
r30284
def _debugdisplaycolor(ui):
Pierre-Yves David
color: move hgext.color._styles to mercurial.color.style...
r30652 oldstyle = color._styles.copy()
Pierre-Yves David
color: restore _style global after debugcolor ran...
r30283 try:
Pierre-Yves David
color: move hgext.color._styles to mercurial.color.style...
r30652 color._styles.clear()
Pierre-Yves David
color: restore _style global after debugcolor ran...
r30283 for effect in _effects.keys():
Pierre-Yves David
color: move hgext.color._styles to mercurial.color.style...
r30652 color._styles[effect] = effect
Pierre-Yves David
color: restore _style global after debugcolor ran...
r30283 if _terminfo_params:
for k, v in ui.configitems('color'):
if k.startswith('color.'):
Pierre-Yves David
color: move hgext.color._styles to mercurial.color.style...
r30652 color._styles[k] = k[6:]
Pierre-Yves David
color: restore _style global after debugcolor ran...
r30283 elif k.startswith('terminfo.'):
Pierre-Yves David
color: move hgext.color._styles to mercurial.color.style...
r30652 color._styles[k] = k[9:]
Pierre-Yves David
color: restore _style global after debugcolor ran...
r30283 ui.write(_('available colors:\n'))
Pierre-Yves David
color: sort output of 'debugcolor'...
r30285 # sort label with a '_' after the other to group '_background' entry.
Pierre-Yves David
color: move hgext.color._styles to mercurial.color.style...
r30652 items = sorted(color._styles.items(),
Pierre-Yves David
color: sort output of 'debugcolor'...
r30285 key=lambda i: ('_' in i[0], i[0], i[1]))
for colorname, label in items:
Pierre-Yves David
color: restore _style global after debugcolor ran...
r30283 ui.write(('%s\n') % colorname, label=label)
finally:
Pierre-Yves David
color: move hgext.color._styles to mercurial.color.style...
r30652 color._styles.clear()
color._styles.update(oldstyle)
Olle Lundberg
color: add debugcolor command (issue4094)...
r20455
Pierre-Yves David
color: add the ability to display configured style to 'debugcolor'...
r30286 def _debugdisplaystyle(ui):
ui.write(_('available style:\n'))
Pierre-Yves David
color: move hgext.color._styles to mercurial.color.style...
r30652 width = max(len(s) for s in color._styles)
for label, effects in sorted(color._styles.items()):
Pierre-Yves David
color: add the ability to display configured style to 'debugcolor'...
r30286 ui.write('%s' % label, label=label)
if effects:
# 50
ui.write(': ')
ui.write(' ' * (max(0, width - len(label))))
ui.write(', '.join(ui.label(e, e) for e in effects.split()))
ui.write('\n')
Pulkit Goyal
py3: replace os.name with pycompat.osname (part 2 of 2)
r30640 if pycompat.osname != 'nt':
Adrian Buehlmann
color: port to using ctypes (issue2687)...
r13641 w32effects = None
else:
Pulkit Goyal
py3: make color use absolute_import
r28968 import ctypes
import re
Adrian Buehlmann
color: port to using ctypes (issue2687)...
r13641
_kernel32 = ctypes.windll.kernel32
_WORD = ctypes.c_ushort
_INVALID_HANDLE_VALUE = -1
class _COORD(ctypes.Structure):
_fields_ = [('X', ctypes.c_short),
('Y', ctypes.c_short)]
class _SMALL_RECT(ctypes.Structure):
_fields_ = [('Left', ctypes.c_short),
('Top', ctypes.c_short),
('Right', ctypes.c_short),
('Bottom', ctypes.c_short)]
class _CONSOLE_SCREEN_BUFFER_INFO(ctypes.Structure):
_fields_ = [('dwSize', _COORD),
('dwCursorPosition', _COORD),
('wAttributes', _WORD),
('srWindow', _SMALL_RECT),
('dwMaximumWindowSize', _COORD)]
Pulkit Goyal
py3: remove use of *L syntax...
r29890 _STD_OUTPUT_HANDLE = 0xfffffff5 # (DWORD)-11
_STD_ERROR_HANDLE = 0xfffffff4 # (DWORD)-12
Adrian Buehlmann
color: port to using ctypes (issue2687)...
r13641
_FOREGROUND_BLUE = 0x0001
_FOREGROUND_GREEN = 0x0002
_FOREGROUND_RED = 0x0004
_FOREGROUND_INTENSITY = 0x0008
_BACKGROUND_BLUE = 0x0010
_BACKGROUND_GREEN = 0x0020
_BACKGROUND_RED = 0x0040
_BACKGROUND_INTENSITY = 0x0080
_COMMON_LVB_REVERSE_VIDEO = 0x4000
_COMMON_LVB_UNDERSCORE = 0x8000
Steve Borho
color: add support for Windows consoles...
r10870
# http://msdn.microsoft.com/en-us/library/ms682088%28VS.85%29.aspx
w32effects = {
Sune Foldager
color: add win32 support for non-black background...
r12277 'none': -1,
Steve Borho
color: add support for Windows consoles...
r10870 'black': 0,
Adrian Buehlmann
color: port to using ctypes (issue2687)...
r13641 'red': _FOREGROUND_RED,
'green': _FOREGROUND_GREEN,
'yellow': _FOREGROUND_RED | _FOREGROUND_GREEN,
'blue': _FOREGROUND_BLUE,
'magenta': _FOREGROUND_BLUE | _FOREGROUND_RED,
'cyan': _FOREGROUND_BLUE | _FOREGROUND_GREEN,
'white': _FOREGROUND_RED | _FOREGROUND_GREEN | _FOREGROUND_BLUE,
'bold': _FOREGROUND_INTENSITY,
Sune Foldager
merge with stable
r12278 'black_background': 0x100, # unused value > 0x0f
Adrian Buehlmann
color: port to using ctypes (issue2687)...
r13641 'red_background': _BACKGROUND_RED,
'green_background': _BACKGROUND_GREEN,
'yellow_background': _BACKGROUND_RED | _BACKGROUND_GREEN,
'blue_background': _BACKGROUND_BLUE,
'purple_background': _BACKGROUND_BLUE | _BACKGROUND_RED,
'cyan_background': _BACKGROUND_BLUE | _BACKGROUND_GREEN,
'white_background': (_BACKGROUND_RED | _BACKGROUND_GREEN |
_BACKGROUND_BLUE),
'bold_background': _BACKGROUND_INTENSITY,
'underline': _COMMON_LVB_UNDERSCORE, # double-byte charsets only
'inverse': _COMMON_LVB_REVERSE_VIDEO, # double-byte charsets only
Steve Borho
color: add support for Windows consoles...
r10870 }
Adrian Buehlmann
color: port to using ctypes (issue2687)...
r13641 passthrough = set([_FOREGROUND_INTENSITY,
_BACKGROUND_INTENSITY,
_COMMON_LVB_UNDERSCORE,
_COMMON_LVB_REVERSE_VIDEO])
Sune Foldager
color: add win32 support for non-black background...
r12277
Adrian Buehlmann
color: port to using ctypes (issue2687)...
r13641 stdout = _kernel32.GetStdHandle(
_STD_OUTPUT_HANDLE) # don't close the handle returned
if stdout is None or stdout == _INVALID_HANDLE_VALUE:
w32effects = None
else:
csbi = _CONSOLE_SCREEN_BUFFER_INFO()
if not _kernel32.GetConsoleScreenBufferInfo(
stdout, ctypes.byref(csbi)):
# stdout may not support GetConsoleScreenBufferInfo()
# when called from subprocess or redirected
w32effects = None
else:
origattr = csbi.wAttributes
ansire = re.compile('\033\[([^m]*)m([^\033]*)(.*)',
re.MULTILINE | re.DOTALL)
Steve Borho
color: add support for Windows consoles...
r10870
def win32print(text, orig, **opts):
label = opts.get('label', '')
Sune Foldager
color: add win32 support for non-black background...
r12277 attr = origattr
def mapcolor(val, attr):
if val == -1:
return origattr
elif val in passthrough:
return attr | val
elif val > 0x0f:
return (val & 0x70) | (attr & 0x8f)
else:
return (val & 0x07) | (attr & 0xf8)
Steve Borho
color: add support for Windows consoles...
r10870
# determine console attributes based on labels
for l in label.split():
Pierre-Yves David
color: move hgext.color._styles to mercurial.color.style...
r30652 style = color._styles.get(l, '')
Steve Borho
color: add support for Windows consoles...
r10870 for effect in style.split():
Sean Farley
color: pass on key error for win32 (issue4298)...
r21991 try:
attr = mapcolor(w32effects[effect], attr)
except KeyError:
# w32effects could not have certain attributes so we skip
# them if not found
pass
Steve Borho
color: add support for Windows consoles...
r10870 # hack to ensure regexp finds data
if not text.startswith('\033['):
text = '\033[m' + text
# Look for ANSI-like codes embedded in text
m = re.match(ansire, text)
Idan Kamara
color: reset win32 console color in a finally block
r13919 try:
while m:
for sattr in m.group(1).split(';'):
if sattr:
attr = mapcolor(int(sattr), attr)
_kernel32.SetConsoleTextAttribute(stdout, attr)
orig(m.group(2), **opts)
m = re.match(ansire, m.group(3))
finally:
Mads Kiilerich
fix trivial spelling errors
r17424 # Explicitly reset original attributes
Idan Kamara
color: reset win32 console color in a finally block
r13919 _kernel32.SetConsoleTextAttribute(stdout, origattr)