##// END OF EJS Templates
color: add support for record extension
TK Soh -
r9550:3bcb2813 default
parent child Browse files
Show More
@@ -1,273 +1,280 b''
1 # color.py color output for the status and qseries commands
1 # color.py color output for the status and qseries commands
2 #
2 #
3 # Copyright (C) 2007 Kevin Christen <kevin.christen@gmail.com>
3 # Copyright (C) 2007 Kevin Christen <kevin.christen@gmail.com>
4 #
4 #
5 # This program is free software; you can redistribute it and/or modify it
5 # This program is free software; you can redistribute it and/or modify it
6 # under the terms of the GNU General Public License as published by the
6 # under the terms of the GNU General Public License as published by the
7 # Free Software Foundation; either version 2 of the License, or (at your
7 # Free Software Foundation; either version 2 of the License, or (at your
8 # option) any later version.
8 # option) any later version.
9 #
9 #
10 # This program is distributed in the hope that it will be useful, but
10 # This program is distributed in the hope that it will be useful, but
11 # WITHOUT ANY WARRANTY; without even the implied warranty of
11 # WITHOUT ANY WARRANTY; without even the implied warranty of
12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
13 # Public License for more details.
13 # Public License for more details.
14 #
14 #
15 # You should have received a copy of the GNU General Public License along
15 # You should have received a copy of the GNU General Public License along
16 # with this program; if not, write to the Free Software Foundation, Inc.,
16 # with this program; if not, write to the Free Software Foundation, Inc.,
17 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18
18
19 '''colorize output from some commands
19 '''colorize output from some commands
20
20
21 This extension modifies the status command to add color to its output
21 This extension modifies the status command to add color to its output
22 to reflect file status, the qseries command to add color to reflect
22 to reflect file status, the qseries command to add color to reflect
23 patch status (applied, unapplied, missing), and to diff-related
23 patch status (applied, unapplied, missing), and to diff-related
24 commands to highlight additions, removals, diff headers, and trailing
24 commands to highlight additions, removals, diff headers, and trailing
25 whitespace.
25 whitespace.
26
26
27 Other effects in addition to color, like bold and underlined text, are
27 Other effects in addition to color, like bold and underlined text, are
28 also available. Effects are rendered with the ECMA-48 SGR control
28 also available. Effects are rendered with the ECMA-48 SGR control
29 function (aka ANSI escape codes). This module also provides the
29 function (aka ANSI escape codes). This module also provides the
30 render_text function, which can be used to add effects to any text.
30 render_text function, which can be used to add effects to any text.
31
31
32 Default effects may be overridden from the .hgrc file::
32 Default effects may be overridden from the .hgrc file::
33
33
34 [color]
34 [color]
35 status.modified = blue bold underline red_background
35 status.modified = blue bold underline red_background
36 status.added = green bold
36 status.added = green bold
37 status.removed = red bold blue_background
37 status.removed = red bold blue_background
38 status.deleted = cyan bold underline
38 status.deleted = cyan bold underline
39 status.unknown = magenta bold underline
39 status.unknown = magenta bold underline
40 status.ignored = black bold
40 status.ignored = black bold
41
41
42 # 'none' turns off all effects
42 # 'none' turns off all effects
43 status.clean = none
43 status.clean = none
44 status.copied = none
44 status.copied = none
45
45
46 qseries.applied = blue bold underline
46 qseries.applied = blue bold underline
47 qseries.unapplied = black bold
47 qseries.unapplied = black bold
48 qseries.missing = red bold
48 qseries.missing = red bold
49
49
50 diff.diffline = bold
50 diff.diffline = bold
51 diff.extended = cyan bold
51 diff.extended = cyan bold
52 diff.file_a = red bold
52 diff.file_a = red bold
53 diff.file_b = green bold
53 diff.file_b = green bold
54 diff.hunk = magenta
54 diff.hunk = magenta
55 diff.deleted = red
55 diff.deleted = red
56 diff.inserted = green
56 diff.inserted = green
57 diff.changed = white
57 diff.changed = white
58 diff.trailingwhitespace = bold red_background
58 diff.trailingwhitespace = bold red_background
59 '''
59 '''
60
60
61 import os, sys
61 import os, sys
62
62
63 from mercurial import cmdutil, commands, extensions, error
63 from mercurial import cmdutil, commands, extensions, error
64 from mercurial.i18n import _
64 from mercurial.i18n import _
65
65
66 # start and stop parameters for effects
66 # start and stop parameters for effects
67 _effect_params = {'none': 0,
67 _effect_params = {'none': 0,
68 'black': 30,
68 'black': 30,
69 'red': 31,
69 'red': 31,
70 'green': 32,
70 'green': 32,
71 'yellow': 33,
71 'yellow': 33,
72 'blue': 34,
72 'blue': 34,
73 'magenta': 35,
73 'magenta': 35,
74 'cyan': 36,
74 'cyan': 36,
75 'white': 37,
75 'white': 37,
76 'bold': 1,
76 'bold': 1,
77 'italic': 3,
77 'italic': 3,
78 'underline': 4,
78 'underline': 4,
79 'inverse': 7,
79 'inverse': 7,
80 'black_background': 40,
80 'black_background': 40,
81 'red_background': 41,
81 'red_background': 41,
82 'green_background': 42,
82 'green_background': 42,
83 'yellow_background': 43,
83 'yellow_background': 43,
84 'blue_background': 44,
84 'blue_background': 44,
85 'purple_background': 45,
85 'purple_background': 45,
86 'cyan_background': 46,
86 'cyan_background': 46,
87 'white_background': 47}
87 'white_background': 47}
88
88
89 def render_effects(text, effects):
89 def render_effects(text, effects):
90 'Wrap text in commands to turn on each effect.'
90 'Wrap text in commands to turn on each effect.'
91 start = [str(_effect_params[e]) for e in ['none'] + effects]
91 start = [str(_effect_params[e]) for e in ['none'] + effects]
92 start = '\033[' + ';'.join(start) + 'm'
92 start = '\033[' + ';'.join(start) + 'm'
93 stop = '\033[' + str(_effect_params['none']) + 'm'
93 stop = '\033[' + str(_effect_params['none']) + 'm'
94 return ''.join([start, text, stop])
94 return ''.join([start, text, stop])
95
95
96 def colorstatus(orig, ui, repo, *pats, **opts):
96 def colorstatus(orig, ui, repo, *pats, **opts):
97 '''run the status command with colored output'''
97 '''run the status command with colored output'''
98
98
99 delimiter = opts['print0'] and '\0' or '\n'
99 delimiter = opts['print0'] and '\0' or '\n'
100
100
101 nostatus = opts.get('no_status')
101 nostatus = opts.get('no_status')
102 opts['no_status'] = False
102 opts['no_status'] = False
103 # run status and capture its output
103 # run status and capture its output
104 ui.pushbuffer()
104 ui.pushbuffer()
105 retval = orig(ui, repo, *pats, **opts)
105 retval = orig(ui, repo, *pats, **opts)
106 # filter out empty strings
106 # filter out empty strings
107 lines_with_status = [ line for line in ui.popbuffer().split(delimiter) if line ]
107 lines_with_status = [ line for line in ui.popbuffer().split(delimiter) if line ]
108
108
109 if nostatus:
109 if nostatus:
110 lines = [l[2:] for l in lines_with_status]
110 lines = [l[2:] for l in lines_with_status]
111 else:
111 else:
112 lines = lines_with_status
112 lines = lines_with_status
113
113
114 # apply color to output and display it
114 # apply color to output and display it
115 for i in xrange(len(lines)):
115 for i in xrange(len(lines)):
116 status = _status_abbreviations[lines_with_status[i][0]]
116 status = _status_abbreviations[lines_with_status[i][0]]
117 effects = _status_effects[status]
117 effects = _status_effects[status]
118 if effects:
118 if effects:
119 lines[i] = render_effects(lines[i], effects)
119 lines[i] = render_effects(lines[i], effects)
120 ui.write(lines[i] + delimiter)
120 ui.write(lines[i] + delimiter)
121 return retval
121 return retval
122
122
123 _status_abbreviations = { 'M': 'modified',
123 _status_abbreviations = { 'M': 'modified',
124 'A': 'added',
124 'A': 'added',
125 'R': 'removed',
125 'R': 'removed',
126 '!': 'deleted',
126 '!': 'deleted',
127 '?': 'unknown',
127 '?': 'unknown',
128 'I': 'ignored',
128 'I': 'ignored',
129 'C': 'clean',
129 'C': 'clean',
130 ' ': 'copied', }
130 ' ': 'copied', }
131
131
132 _status_effects = { 'modified': ['blue', 'bold'],
132 _status_effects = { 'modified': ['blue', 'bold'],
133 'added': ['green', 'bold'],
133 'added': ['green', 'bold'],
134 'removed': ['red', 'bold'],
134 'removed': ['red', 'bold'],
135 'deleted': ['cyan', 'bold', 'underline'],
135 'deleted': ['cyan', 'bold', 'underline'],
136 'unknown': ['magenta', 'bold', 'underline'],
136 'unknown': ['magenta', 'bold', 'underline'],
137 'ignored': ['black', 'bold'],
137 'ignored': ['black', 'bold'],
138 'clean': ['none'],
138 'clean': ['none'],
139 'copied': ['none'], }
139 'copied': ['none'], }
140
140
141 def colorqseries(orig, ui, repo, *dummy, **opts):
141 def colorqseries(orig, ui, repo, *dummy, **opts):
142 '''run the qseries command with colored output'''
142 '''run the qseries command with colored output'''
143 ui.pushbuffer()
143 ui.pushbuffer()
144 retval = orig(ui, repo, **opts)
144 retval = orig(ui, repo, **opts)
145 patchlines = ui.popbuffer().splitlines()
145 patchlines = ui.popbuffer().splitlines()
146 patchnames = repo.mq.series
146 patchnames = repo.mq.series
147
147
148 for patch, patchname in zip(patchlines, patchnames):
148 for patch, patchname in zip(patchlines, patchnames):
149 if opts['missing']:
149 if opts['missing']:
150 effects = _patch_effects['missing']
150 effects = _patch_effects['missing']
151 # Determine if patch is applied.
151 # Determine if patch is applied.
152 elif [ applied for applied in repo.mq.applied
152 elif [ applied for applied in repo.mq.applied
153 if patchname == applied.name ]:
153 if patchname == applied.name ]:
154 effects = _patch_effects['applied']
154 effects = _patch_effects['applied']
155 else:
155 else:
156 effects = _patch_effects['unapplied']
156 effects = _patch_effects['unapplied']
157
157
158 patch = patch.replace(patchname, render_effects(patchname, effects), 1)
158 patch = patch.replace(patchname, render_effects(patchname, effects), 1)
159 ui.write(patch + '\n')
159 ui.write(patch + '\n')
160 return retval
160 return retval
161
161
162 _patch_effects = { 'applied': ['blue', 'bold', 'underline'],
162 _patch_effects = { 'applied': ['blue', 'bold', 'underline'],
163 'missing': ['red', 'bold'],
163 'missing': ['red', 'bold'],
164 'unapplied': ['black', 'bold'], }
164 'unapplied': ['black', 'bold'], }
165 def colorwrap(orig, s):
165 def colorwrap(orig, s):
166 '''wrap ui.write for colored diff output'''
166 '''wrap ui.write for colored diff output'''
167 lines = s.split('\n')
167 lines = s.split('\n')
168 for i, line in enumerate(lines):
168 for i, line in enumerate(lines):
169 stripline = line
169 stripline = line
170 if line and line[0] in '+-':
170 if line and line[0] in '+-':
171 # highlight trailing whitespace, but only in changed lines
171 # highlight trailing whitespace, but only in changed lines
172 stripline = line.rstrip()
172 stripline = line.rstrip()
173 for prefix, style in _diff_prefixes:
173 for prefix, style in _diff_prefixes:
174 if stripline.startswith(prefix):
174 if stripline.startswith(prefix):
175 lines[i] = render_effects(stripline, _diff_effects[style])
175 lines[i] = render_effects(stripline, _diff_effects[style])
176 break
176 break
177 if line != stripline:
177 if line != stripline:
178 lines[i] += render_effects(
178 lines[i] += render_effects(
179 line[len(stripline):], _diff_effects['trailingwhitespace'])
179 line[len(stripline):], _diff_effects['trailingwhitespace'])
180 orig('\n'.join(lines))
180 orig('\n'.join(lines))
181
181
182 def colorshowpatch(orig, self, node):
182 def colorshowpatch(orig, self, node):
183 '''wrap cmdutil.changeset_printer.showpatch with colored output'''
183 '''wrap cmdutil.changeset_printer.showpatch with colored output'''
184 oldwrite = extensions.wrapfunction(self.ui, 'write', colorwrap)
184 oldwrite = extensions.wrapfunction(self.ui, 'write', colorwrap)
185 try:
185 try:
186 orig(self, node)
186 orig(self, node)
187 finally:
187 finally:
188 self.ui.write = oldwrite
188 self.ui.write = oldwrite
189
189
190 def colordiff(orig, ui, repo, *pats, **opts):
190 def colordiff(orig, ui, repo, *pats, **opts):
191 '''run the diff command with colored output'''
191 '''run the diff command with colored output'''
192 oldwrite = extensions.wrapfunction(ui, 'write', colorwrap)
192 oldwrite = extensions.wrapfunction(ui, 'write', colorwrap)
193 try:
193 try:
194 orig(ui, repo, *pats, **opts)
194 orig(ui, repo, *pats, **opts)
195 finally:
195 finally:
196 ui.write = oldwrite
196 ui.write = oldwrite
197
197
198 _diff_prefixes = [('diff', 'diffline'),
198 _diff_prefixes = [('diff', 'diffline'),
199 ('copy', 'extended'),
199 ('copy', 'extended'),
200 ('rename', 'extended'),
200 ('rename', 'extended'),
201 ('old', 'extended'),
201 ('old', 'extended'),
202 ('new', 'extended'),
202 ('new', 'extended'),
203 ('deleted', 'extended'),
203 ('deleted', 'extended'),
204 ('---', 'file_a'),
204 ('---', 'file_a'),
205 ('+++', 'file_b'),
205 ('+++', 'file_b'),
206 ('@', 'hunk'),
206 ('@', 'hunk'),
207 ('-', 'deleted'),
207 ('-', 'deleted'),
208 ('+', 'inserted')]
208 ('+', 'inserted')]
209
209
210 _diff_effects = {'diffline': ['bold'],
210 _diff_effects = {'diffline': ['bold'],
211 'extended': ['cyan', 'bold'],
211 'extended': ['cyan', 'bold'],
212 'file_a': ['red', 'bold'],
212 'file_a': ['red', 'bold'],
213 'file_b': ['green', 'bold'],
213 'file_b': ['green', 'bold'],
214 'hunk': ['magenta'],
214 'hunk': ['magenta'],
215 'deleted': ['red'],
215 'deleted': ['red'],
216 'inserted': ['green'],
216 'inserted': ['green'],
217 'changed': ['white'],
217 'changed': ['white'],
218 'trailingwhitespace': ['bold', 'red_background']}
218 'trailingwhitespace': ['bold', 'red_background']}
219
219
220 def uisetup(ui):
220 def uisetup(ui):
221 '''Initialize the extension.'''
221 '''Initialize the extension.'''
222 _setupcmd(ui, 'diff', commands.table, colordiff, _diff_effects)
222 _setupcmd(ui, 'diff', commands.table, colordiff, _diff_effects)
223 _setupcmd(ui, 'incoming', commands.table, None, _diff_effects)
223 _setupcmd(ui, 'incoming', commands.table, None, _diff_effects)
224 _setupcmd(ui, 'log', commands.table, None, _diff_effects)
224 _setupcmd(ui, 'log', commands.table, None, _diff_effects)
225 _setupcmd(ui, 'outgoing', commands.table, None, _diff_effects)
225 _setupcmd(ui, 'outgoing', commands.table, None, _diff_effects)
226 _setupcmd(ui, 'tip', commands.table, None, _diff_effects)
226 _setupcmd(ui, 'tip', commands.table, None, _diff_effects)
227 _setupcmd(ui, 'status', commands.table, colorstatus, _status_effects)
227 _setupcmd(ui, 'status', commands.table, colorstatus, _status_effects)
228
228
229 try:
229 try:
230 mq = extensions.find('mq')
230 mq = extensions.find('mq')
231 _setupcmd(ui, 'qdiff', mq.cmdtable, colordiff, _diff_effects)
231 _setupcmd(ui, 'qdiff', mq.cmdtable, colordiff, _diff_effects)
232 _setupcmd(ui, 'qseries', mq.cmdtable, colorqseries, _patch_effects)
232 _setupcmd(ui, 'qseries', mq.cmdtable, colorqseries, _patch_effects)
233 except KeyError:
233 except KeyError:
234 # The mq extension is not enabled
234 # The mq extension is not enabled
235 pass
235 pass
236
236
237 try:
238 rec = extensions.find('record')
239 _setupcmd(ui, 'record', rec.cmdtable, colordiff, _diff_effects)
240 except KeyError:
241 # The record extension is not enabled
242 pass
243
237 def _setupcmd(ui, cmd, table, func, effectsmap):
244 def _setupcmd(ui, cmd, table, func, effectsmap):
238 '''patch in command to command table and load effect map'''
245 '''patch in command to command table and load effect map'''
239 def nocolor(orig, *args, **opts):
246 def nocolor(orig, *args, **opts):
240
247
241 if (opts['no_color'] or opts['color'] == 'never' or
248 if (opts['no_color'] or opts['color'] == 'never' or
242 (opts['color'] == 'auto' and (os.environ.get('TERM') == 'dumb'
249 (opts['color'] == 'auto' and (os.environ.get('TERM') == 'dumb'
243 or not sys.__stdout__.isatty()))):
250 or not sys.__stdout__.isatty()))):
244 return orig(*args, **opts)
251 return orig(*args, **opts)
245
252
246 oldshowpatch = extensions.wrapfunction(cmdutil.changeset_printer,
253 oldshowpatch = extensions.wrapfunction(cmdutil.changeset_printer,
247 'showpatch', colorshowpatch)
254 'showpatch', colorshowpatch)
248 try:
255 try:
249 if func is not None:
256 if func is not None:
250 return func(orig, *args, **opts)
257 return func(orig, *args, **opts)
251 return orig(*args, **opts)
258 return orig(*args, **opts)
252 finally:
259 finally:
253 cmdutil.changeset_printer.showpatch = oldshowpatch
260 cmdutil.changeset_printer.showpatch = oldshowpatch
254
261
255 entry = extensions.wrapcommand(table, cmd, nocolor)
262 entry = extensions.wrapcommand(table, cmd, nocolor)
256 entry[1].extend([
263 entry[1].extend([
257 ('', 'color', 'auto', _("when to colorize (always, auto, or never)")),
264 ('', 'color', 'auto', _("when to colorize (always, auto, or never)")),
258 ('', 'no-color', None, _("don't colorize output (DEPRECATED)")),
265 ('', 'no-color', None, _("don't colorize output (DEPRECATED)")),
259 ])
266 ])
260
267
261 for status in effectsmap:
268 for status in effectsmap:
262 configkey = cmd + '.' + status
269 configkey = cmd + '.' + status
263 effects = ui.configlist('color', configkey)
270 effects = ui.configlist('color', configkey)
264 if effects:
271 if effects:
265 good = []
272 good = []
266 for e in effects:
273 for e in effects:
267 if e in _effect_params:
274 if e in _effect_params:
268 good.append(e)
275 good.append(e)
269 else:
276 else:
270 ui.warn(_("ignoring unknown color/effect %r "
277 ui.warn(_("ignoring unknown color/effect %r "
271 "(configured in color.%s)\n")
278 "(configured in color.%s)\n")
272 % (e, configkey))
279 % (e, configkey))
273 effectsmap[status] = good
280 effectsmap[status] = good
General Comments 0
You need to be logged in to leave comments. Login now