--- a/mercurial/color.py Sun Feb 19 01:16:45 2017 +0900
+++ b/mercurial/color.py Tue Feb 28 11:42:07 2017 +0100
@@ -19,105 +19,111 @@
import curses
# 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, '')}
+ _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, ''),
+ }
except ImportError:
curses = None
_terminfo_params = {}
# start and stop parameters for effects
-_effects = {'none': 0,
- 'black': 30,
- 'red': 31,
- 'green': 32,
- 'yellow': 33,
- 'blue': 34,
- 'magenta': 35,
- 'cyan': 36,
- 'white': 37,
- 'bold': 1,
- 'italic': 3,
- 'underline': 4,
- 'inverse': 7,
- 'dim': 2,
- 'black_background': 40,
- 'red_background': 41,
- 'green_background': 42,
- 'yellow_background': 43,
- 'blue_background': 44,
- 'purple_background': 45,
- 'cyan_background': 46,
- 'white_background': 47}
+_effects = {
+ 'none': 0,
+ 'black': 30,
+ 'red': 31,
+ 'green': 32,
+ 'yellow': 33,
+ 'blue': 34,
+ 'magenta': 35,
+ 'cyan': 36,
+ 'white': 37,
+ 'bold': 1,
+ 'italic': 3,
+ 'underline': 4,
+ 'inverse': 7,
+ 'dim': 2,
+ 'black_background': 40,
+ 'red_background': 41,
+ 'green_background': 42,
+ 'yellow_background': 43,
+ 'blue_background': 44,
+ 'purple_background': 45,
+ 'cyan_background': 46,
+ 'white_background': 47,
+ }
-_styles = {'grep.match': 'red bold',
- 'grep.linenumber': 'green',
- 'grep.rev': 'green',
- 'grep.change': 'green',
- 'grep.sep': 'cyan',
- 'grep.filename': 'magenta',
- 'grep.user': 'magenta',
- 'grep.date': 'magenta',
- 'bookmarks.active': 'green',
- 'branches.active': 'none',
- 'branches.closed': 'black bold',
- 'branches.current': 'green',
- 'branches.inactive': 'none',
- 'diff.changed': 'white',
- 'diff.deleted': 'red',
- 'diff.diffline': 'bold',
- 'diff.extended': 'cyan bold',
- 'diff.file_a': 'red bold',
- 'diff.file_b': 'green bold',
- 'diff.hunk': 'magenta',
- 'diff.inserted': 'green',
- 'diff.tab': '',
- 'diff.trailingwhitespace': 'bold red_background',
- 'changeset.public' : '',
- 'changeset.draft' : '',
- 'changeset.secret' : '',
- 'diffstat.deleted': 'red',
- 'diffstat.inserted': 'green',
- 'histedit.remaining': 'red bold',
- 'ui.prompt': 'yellow',
- 'log.changeset': 'yellow',
- 'patchbomb.finalsummary': '',
- 'patchbomb.from': 'magenta',
- 'patchbomb.to': 'cyan',
- 'patchbomb.subject': 'green',
- 'patchbomb.diffstats': '',
- 'rebase.rebased': 'blue',
- 'rebase.remaining': 'red bold',
- 'resolve.resolved': 'green bold',
- 'resolve.unresolved': 'red bold',
- 'shelve.age': 'cyan',
- 'shelve.newest': 'green bold',
- 'shelve.name': 'blue bold',
- 'status.added': 'green bold',
- 'status.clean': 'none',
- 'status.copied': 'none',
- 'status.deleted': 'cyan bold underline',
- 'status.ignored': 'black bold',
- 'status.modified': 'blue bold',
- 'status.removed': 'red bold',
- 'status.unknown': 'magenta bold underline',
- 'tags.normal': 'green',
- 'tags.local': 'black bold'}
+_styles = {
+ 'grep.match': 'red bold',
+ 'grep.linenumber': 'green',
+ 'grep.rev': 'green',
+ 'grep.change': 'green',
+ 'grep.sep': 'cyan',
+ 'grep.filename': 'magenta',
+ 'grep.user': 'magenta',
+ 'grep.date': 'magenta',
+ 'bookmarks.active': 'green',
+ 'branches.active': 'none',
+ 'branches.closed': 'black bold',
+ 'branches.current': 'green',
+ 'branches.inactive': 'none',
+ 'diff.changed': 'white',
+ 'diff.deleted': 'red',
+ 'diff.diffline': 'bold',
+ 'diff.extended': 'cyan bold',
+ 'diff.file_a': 'red bold',
+ 'diff.file_b': 'green bold',
+ 'diff.hunk': 'magenta',
+ 'diff.inserted': 'green',
+ 'diff.tab': '',
+ 'diff.trailingwhitespace': 'bold red_background',
+ 'changeset.public' : '',
+ 'changeset.draft' : '',
+ 'changeset.secret' : '',
+ 'diffstat.deleted': 'red',
+ 'diffstat.inserted': 'green',
+ 'histedit.remaining': 'red bold',
+ 'ui.prompt': 'yellow',
+ 'log.changeset': 'yellow',
+ 'patchbomb.finalsummary': '',
+ 'patchbomb.from': 'magenta',
+ 'patchbomb.to': 'cyan',
+ 'patchbomb.subject': 'green',
+ 'patchbomb.diffstats': '',
+ 'rebase.rebased': 'blue',
+ 'rebase.remaining': 'red bold',
+ 'resolve.resolved': 'green bold',
+ 'resolve.unresolved': 'red bold',
+ 'shelve.age': 'cyan',
+ 'shelve.newest': 'green bold',
+ 'shelve.name': 'blue bold',
+ 'status.added': 'green bold',
+ 'status.clean': 'none',
+ 'status.copied': 'none',
+ 'status.deleted': 'cyan bold underline',
+ 'status.ignored': 'black bold',
+ 'status.modified': 'blue bold',
+ 'status.removed': 'red bold',
+ 'status.unknown': 'magenta bold underline',
+ 'tags.normal': 'green',
+ 'tags.local': 'black bold',
+}
def loadcolortable(ui, extname, colortable):
_styles.update(colortable)