upstream/mercurial-mirror Commit - r7459:3fb5c142

color: replace effect-specific reset control codes with general purpose one

Brodie Rao -

r7459:3fb5c142 default

parent child

hgext/color.py

0 +24 -29

@@ -67,39 +67,34 b' from mercurial import cmdutil, commands,'
67	from mercurial.i18n import _	67	from mercurial.i18n import _
68		68
69	# start and stop parameters for effects	69	# start and stop parameters for effects
70	_effect_params = { 'none': (0, 0),	70	_effect_params = {'none': 0,
71	'black': (30, 39),	71	'black': 30,
72	'red': (31, 39),	72	'red': 31,
73	'green': (32, 39),	73	'green': 32,
74	'yellow': (33, 39),	74	'yellow': 33,
75	'blue': (34, 39),	75	'blue': 34,
76	'magenta': (35, 39),	76	'magenta': 35,
77	'cyan': (36, 39),	77	'cyan': 36,
78	'white': (37, 39),	78	'white': 37,
79	'bold': (1, 22),	79	'bold': 1,
80	'italic': (3, 23),	80	'italic': 3,
81	'underline': (4, 24),	81	'underline': 4,
82	'inverse': (7, 27),	82	'inverse': 7,
83	'black_background': (40, 49),	83	'black_background': 40,
84	'red_background': (41, 49),	84	'red_background': 41,
85	'green_background': (42, 49),	85	'green_background': 42,
86	'yellow_background': (43, 49),	86	'yellow_background': 43,
87	'blue_background': (44, 49),	87	'blue_background': 44,
88	'purple_background': (45, 49),	88	'purple_background': 45,
89	'cyan_background': (46, 49),	89	'cyan_background': 46,
90	'white_background': (47, 49), }	90	'white_background': 47}
91		91
92	def render_effects(text, *effects):	92	def render_effects(text, *effects):
93	'Wrap text in commands to turn on each effect.'	93	'Wrap text in commands to turn on each effect.'
94	start = [ str(_effect_params['none'][0]) ]	94	start = [str(_effect_params[e]) for e in ('none',) + effects]
95	stop = []
96	for effect in effects:
97	start.append(str(_effect_params[effect][0]))
98	stop.append(str(_effect_params[effect][1]))
99	stop.append(str(_effect_params['none'][1]))
100	start = '\033[' + ';'.join(start) + 'm'	95	start = '\033[' + ';'.join(start) + 'm'
101	stop = '\033[' + ';'.~~join~~(~~stop~~) + 'm'	96	stop = '\033[' + str(_effect_params['none']) + 'm'
102	return start + text + stop	97	return ''.join([start, text, stop])
103		98
104	def colorstatus(orig, ui, repo, pats, *opts):	99	def colorstatus(orig, ui, repo, pats, *opts):
105	'''run the status command with colored output'''	100	'''run the status command with colored output'''

tests/test-diff-color.out

0 +12 -12

             adding a
             % default context
-            [0;1mdiff -r cf9f4ba66af2 a[22;0m
+            [0;1mdiff -r cf9f4ba66af2 a[0m
-            [0;31;1m--- a/a[39;22;0m
+            [0;31;1m--- a/a[0m
-            [0;32;1m+++ b/a[39;22;0m
+            [0;32;1m+++ b/a[0m
-            [0;35m@@ -2,7 +2,7 @@[39;0m
+            [0;35m@@ -2,7 +2,7 @@[0m
              c
              a
              a
-            [0;31m-b[39;0m
+            [0;31m-b[0m
-            [0;32m+dd[39;0m
+            [0;32m+dd[0m
              a
              a
              c
             % --unified=2
-            [0;1mdiff -r cf9f4ba66af2 a[22;0m
+            [0;1mdiff -r cf9f4ba66af2 a[0m
-            [0;31;1m--- a/a[39;22;0m
+            [0;31;1m--- a/a[0m
-            [0;32;1m+++ b/a[39;22;0m
+            [0;32;1m+++ b/a[0m
-            [0;35m@@ -3,5 +3,5 @@[39;0m
+            [0;35m@@ -3,5 +3,5 @@[0m
              a
              a
-            [0;31m-b[39;0m
+            [0;31m-b[0m
-            [0;32m+dd[39;0m
+            [0;32m+dd[0m
              a
              a

tests/test-status-color.out

0 +94 -94

@@ -1,125 +1,125 b''
1	hg status in repo root:	1	hg status in repo root:
2	[0;35;1;4m? a/1/in_a_1[~~39;22;24;~~0m	2	[0;35;1;4m? a/1/in_a_1[0m
3	[0;35;1;4m? a/in_a[~~39;22;24;~~0m	3	[0;35;1;4m? a/in_a[0m
4	[0;35;1;4m? b/1/in_b_1[~~39;22;24;~~0m	4	[0;35;1;4m? b/1/in_b_1[0m
5	[0;35;1;4m? b/2/in_b_2[~~39;22;24;~~0m	5	[0;35;1;4m? b/2/in_b_2[0m
6	[0;35;1;4m? b/in_b[~~39;22;24;~~0m	6	[0;35;1;4m? b/in_b[0m
7	[0;35;1;4m? in_root[~~39;22;24;~~0m	7	[0;35;1;4m? in_root[0m
8	hg status . in repo root:	8	hg status . in repo root:
9	[0;35;1;4m? a/1/in_a_1[~~39;22;24;~~0m	9	[0;35;1;4m? a/1/in_a_1[0m
10	[0;35;1;4m? a/in_a[~~39;22;24;~~0m	10	[0;35;1;4m? a/in_a[0m
11	[0;35;1;4m? b/1/in_b_1[~~39;22;24;~~0m	11	[0;35;1;4m? b/1/in_b_1[0m
12	[0;35;1;4m? b/2/in_b_2[~~39;22;24;~~0m	12	[0;35;1;4m? b/2/in_b_2[0m
13	[0;35;1;4m? b/in_b[~~39;22;24;~~0m	13	[0;35;1;4m? b/in_b[0m
14	[0;35;1;4m? in_root[~~39;22;24;~~0m	14	[0;35;1;4m? in_root[0m
15	hg status in a:	15	hg status in a:
16	[0;35;1;4m? a/1/in_a_1[~~39;22;24;~~0m	16	[0;35;1;4m? a/1/in_a_1[0m
17	[0;35;1;4m? a/in_a[~~39;22;24;~~0m	17	[0;35;1;4m? a/in_a[0m
18	[0;35;1;4m? b/1/in_b_1[~~39;22;24;~~0m	18	[0;35;1;4m? b/1/in_b_1[0m
19	[0;35;1;4m? b/2/in_b_2[~~39;22;24;~~0m	19	[0;35;1;4m? b/2/in_b_2[0m
20	[0;35;1;4m? b/in_b[~~39;22;24;~~0m	20	[0;35;1;4m? b/in_b[0m
21	[0;35;1;4m? in_root[~~39;22;24;~~0m	21	[0;35;1;4m? in_root[0m
22	hg status . in a:	22	hg status . in a:
23	[0;35;1;4m? 1/in_a_1[~~39;22;24;~~0m	23	[0;35;1;4m? 1/in_a_1[0m
24	[0;35;1;4m? in_a[~~39;22;24;~~0m	24	[0;35;1;4m? in_a[0m
25	hg status .. in a:	25	hg status .. in a:
26	[0;35;1;4m? 1/in_a_1[~~39;22;24;~~0m	26	[0;35;1;4m? 1/in_a_1[0m
27	[0;35;1;4m? in_a[~~39;22;24;~~0m	27	[0;35;1;4m? in_a[0m
28	[0;35;1;4m? ../b/1/in_b_1[~~39;22;24;~~0m	28	[0;35;1;4m? ../b/1/in_b_1[0m
29	[0;35;1;4m? ../b/2/in_b_2[~~39;22;24;~~0m	29	[0;35;1;4m? ../b/2/in_b_2[0m
30	[0;35;1;4m? ../b/in_b[~~39;22;24;~~0m	30	[0;35;1;4m? ../b/in_b[0m
31	[0;35;1;4m? ../in_root[~~39;22;24;~~0m	31	[0;35;1;4m? ../in_root[0m
32	hg status in b:	32	hg status in b:
33	[0;35;1;4m? a/1/in_a_1[~~39;22;24;~~0m	33	[0;35;1;4m? a/1/in_a_1[0m
34	[0;35;1;4m? a/in_a[~~39;22;24;~~0m	34	[0;35;1;4m? a/in_a[0m
35	[0;35;1;4m? b/1/in_b_1[~~39;22;24;~~0m	35	[0;35;1;4m? b/1/in_b_1[0m
36	[0;35;1;4m? b/2/in_b_2[~~39;22;24;~~0m	36	[0;35;1;4m? b/2/in_b_2[0m
37	[0;35;1;4m? b/in_b[~~39;22;24;~~0m	37	[0;35;1;4m? b/in_b[0m
38	[0;35;1;4m? in_root[~~39;22;24;~~0m	38	[0;35;1;4m? in_root[0m
39	hg status . in b:	39	hg status . in b:
40	[0;35;1;4m? 1/in_b_1[~~39;22;24;~~0m	40	[0;35;1;4m? 1/in_b_1[0m
41	[0;35;1;4m? 2/in_b_2[~~39;22;24;~~0m	41	[0;35;1;4m? 2/in_b_2[0m
42	[0;35;1;4m? in_b[~~39;22;24;~~0m	42	[0;35;1;4m? in_b[0m
43	hg status .. in b:	43	hg status .. in b:
44	[0;35;1;4m? ../a/1/in_a_1[~~39;22;24;~~0m	44	[0;35;1;4m? ../a/1/in_a_1[0m
45	[0;35;1;4m? ../a/in_a[~~39;22;24;~~0m	45	[0;35;1;4m? ../a/in_a[0m
46	[0;35;1;4m? 1/in_b_1[~~39;22;24;~~0m	46	[0;35;1;4m? 1/in_b_1[0m
47	[0;35;1;4m? 2/in_b_2[~~39;22;24;~~0m	47	[0;35;1;4m? 2/in_b_2[0m
48	[0;35;1;4m? in_b[~~39;22;24;~~0m	48	[0;35;1;4m? in_b[0m
49	[0;35;1;4m? ../in_root[~~39;22;24;~~0m	49	[0;35;1;4m? ../in_root[0m
50	hg status in a/1:	50	hg status in a/1:
51	[0;35;1;4m? a/1/in_a_1[~~39;22;24;~~0m	51	[0;35;1;4m? a/1/in_a_1[0m
52	[0;35;1;4m? a/in_a[~~39;22;24;~~0m	52	[0;35;1;4m? a/in_a[0m
53	[0;35;1;4m? b/1/in_b_1[~~39;22;24;~~0m	53	[0;35;1;4m? b/1/in_b_1[0m
54	[0;35;1;4m? b/2/in_b_2[~~39;22;24;~~0m	54	[0;35;1;4m? b/2/in_b_2[0m
55	[0;35;1;4m? b/in_b[~~39;22;24;~~0m	55	[0;35;1;4m? b/in_b[0m
56	[0;35;1;4m? in_root[~~39;22;24;~~0m	56	[0;35;1;4m? in_root[0m
57	hg status . in a/1:	57	hg status . in a/1:
58	[0;35;1;4m? in_a_1[~~39;22;24;~~0m	58	[0;35;1;4m? in_a_1[0m
59	hg status .. in a/1:	59	hg status .. in a/1:
60	[0;35;1;4m? in_a_1[~~39;22;24;~~0m	60	[0;35;1;4m? in_a_1[0m
61	[0;35;1;4m? ../in_a[~~39;22;24;~~0m	61	[0;35;1;4m? ../in_a[0m
62	hg status in b/1:	62	hg status in b/1:
63	[0;35;1;4m? a/1/in_a_1[~~39;22;24;~~0m	63	[0;35;1;4m? a/1/in_a_1[0m
64	[0;35;1;4m? a/in_a[~~39;22;24;~~0m	64	[0;35;1;4m? a/in_a[0m
65	[0;35;1;4m? b/1/in_b_1[~~39;22;24;~~0m	65	[0;35;1;4m? b/1/in_b_1[0m
66	[0;35;1;4m? b/2/in_b_2[~~39;22;24;~~0m	66	[0;35;1;4m? b/2/in_b_2[0m
67	[0;35;1;4m? b/in_b[~~39;22;24;~~0m	67	[0;35;1;4m? b/in_b[0m
68	[0;35;1;4m? in_root[~~39;22;24;~~0m	68	[0;35;1;4m? in_root[0m
69	hg status . in b/1:	69	hg status . in b/1:
70	[0;35;1;4m? in_b_1[~~39;22;24;~~0m	70	[0;35;1;4m? in_b_1[0m
71	hg status .. in b/1:	71	hg status .. in b/1:
72	[0;35;1;4m? in_b_1[~~39;22;24;~~0m	72	[0;35;1;4m? in_b_1[0m
73	[0;35;1;4m? ../2/in_b_2[~~39;22;24;~~0m	73	[0;35;1;4m? ../2/in_b_2[0m
74	[0;35;1;4m? ../in_b[~~39;22;24;~~0m	74	[0;35;1;4m? ../in_b[0m
75	hg status in b/2:	75	hg status in b/2:
76	[0;35;1;4m? a/1/in_a_1[~~39;22;24;~~0m	76	[0;35;1;4m? a/1/in_a_1[0m
77	[0;35;1;4m? a/in_a[~~39;22;24;~~0m	77	[0;35;1;4m? a/in_a[0m
78	[0;35;1;4m? b/1/in_b_1[~~39;22;24;~~0m	78	[0;35;1;4m? b/1/in_b_1[0m
79	[0;35;1;4m? b/2/in_b_2[~~39;22;24;~~0m	79	[0;35;1;4m? b/2/in_b_2[0m
80	[0;35;1;4m? b/in_b[~~39;22;24;~~0m	80	[0;35;1;4m? b/in_b[0m
81	[0;35;1;4m? in_root[~~39;22;24;~~0m	81	[0;35;1;4m? in_root[0m
82	hg status . in b/2:	82	hg status . in b/2:
83	[0;35;1;4m? in_b_2[~~39;22;24;~~0m	83	[0;35;1;4m? in_b_2[0m
84	hg status .. in b/2:	84	hg status .. in b/2:
85	[0;35;1;4m? ../1/in_b_1[~~39;22;24;~~0m	85	[0;35;1;4m? ../1/in_b_1[0m
86	[0;35;1;4m? in_b_2[~~39;22;24;~~0m	86	[0;35;1;4m? in_b_2[0m
87	[0;35;1;4m? ../in_b[~~39;22;24;~~0m	87	[0;35;1;4m? ../in_b[0m
88	adding .hgignore	88	adding .hgignore
89	adding deleted	89	adding deleted
90	adding modified	90	adding modified
91	adding removed	91	adding removed
92	hg status:	92	hg status:
93	[0;32;1mA added[~~39;22;~~0m	93	[0;32;1mA added[0m
94	[0;31;1mR removed[~~39;22;~~0m	94	[0;31;1mR removed[0m
95	[0;36;1;4m! deleted[~~39;22;24;~~0m	95	[0;36;1;4m! deleted[0m
96	[0;35;1;4m? unknown[~~39;22;24;~~0m	96	[0;35;1;4m? unknown[0m
97	hg status modified added removed deleted unknown never-existed ignored:	97	hg status modified added removed deleted unknown never-existed ignored:
98	never-existed: No such file or directory	98	never-existed: No such file or directory
99	[0;32;1mA added[~~39;22;~~0m	99	[0;32;1mA added[0m
100	[0;31;1mR removed[~~39;22;~~0m	100	[0;31;1mR removed[0m
101	[0;36;1;4m! deleted[~~39;22;24;~~0m	101	[0;36;1;4m! deleted[0m
102	[0;35;1;4m? unknown[~~39;22;24;~~0m	102	[0;35;1;4m? unknown[0m
103	hg status -C:	103	hg status -C:
104	[0;32;1mA added[~~39;22;~~0m	104	[0;32;1mA added[0m
105	[0;32;1mA copied[~~39;22;~~0m	105	[0;32;1mA copied[0m
106	[0;0m modified[0;0m	106	[0;0m modified[0m
107	[0;31;1mR removed[~~39;22;~~0m	107	[0;31;1mR removed[0m
108	[0;36;1;4m! deleted[~~39;22;24;~~0m	108	[0;36;1;4m! deleted[0m
109	[0;35;1;4m? unknown[~~39;22;24;~~0m	109	[0;35;1;4m? unknown[0m
110	hg status -A:	110	hg status -A:
111	[0;32;1mA added[~~39;22;~~0m	111	[0;32;1mA added[0m
112	[0;32;1mA copied[~~39;22;~~0m	112	[0;32;1mA copied[0m
113	[0;0m modified[0;0m	113	[0;0m modified[0m
114	[0;31;1mR removed[~~39;22;~~0m	114	[0;31;1mR removed[0m
115	[0;36;1;4m! deleted[~~39;22;24;~~0m	115	[0;36;1;4m! deleted[0m
116	[0;35;1;4m? unknown[~~39;22;24;~~0m	116	[0;35;1;4m? unknown[0m
117	[0;30;1mI ignored[~~39;22;~~0m	117	[0;30;1mI ignored[0m
118	[0;0mC .hgignore[0;0m	118	[0;0mC .hgignore[0m
119	[0;0mC modified[0;0m	119	[0;0mC modified[0m
120	hg status ignoreddir/file:	120	hg status ignoreddir/file:
121	hg status -i ignoreddir/file:	121	hg status -i ignoreddir/file:
122	[0;30;1mI ignoreddir/file[~~39;22;~~0m	122	[0;30;1mI ignoreddir/file[0m
123	adding .hgignore	123	adding .hgignore
124	adding deleted	124	adding deleted
125	adding modified	125	adding modified

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages