1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
|
# Copyright (C) 2006 Aaron Bentley
# <aaron.bentley@utoronto.ca>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
import sys
from os.path import expanduser
from bzrlib.commands import get_cmd_object
from bzrlib.patches import (hunk_from_header, InsertLine, RemoveLine,
ContextLine, Hunk)
import terminal
class LineParser(object):
def parse_line(self, line):
if line.startswith("@"):
return hunk_from_header(line)
elif line.startswith("+"):
return InsertLine(line[1:])
elif line.startswith("-"):
return RemoveLine(line[1:])
elif line.startswith(" "):
return ContextLine(line[1:])
else:
return line
class DiffWriter(object):
colors = {
'metaline': 'darkyellow',
'plain': 'darkwhite',
'newtext': 'darkblue',
'oldtext': 'darkred',
'diffstuff': 'darkgreen'
}
def __init__(self, target):
self.target = target
self.lp = LineParser()
self.chunks = []
self._read_colordiffrc()
def _read_colordiffrc(self):
path = expanduser('~/.colordiffrc')
try:
f = open(path, 'r')
except IOError:
return
for line in f.readlines():
try:
key, val = line.split('=')
except ValueError:
continue
key = key.strip()
val = val.strip()
tmp = val
if val.startswith('dark'):
tmp = val[4:]
if tmp not in terminal.colors:
continue
self.colors[key] = val
def colorstring(self, type, string):
color = self.colors[type]
if color is not None:
string = terminal.colorstring(str(string), color)
self.target.write(string)
def write(self, text):
newstuff = text.split('\n')
for newchunk in newstuff[:-1]:
self._writeline(''.join(self.chunks + [newchunk, '\n']))
self.chunks = []
self.chunks = [newstuff[-1]]
def _writeline(self, line):
item = self.lp.parse_line(line)
if isinstance(item, Hunk):
line_class = 'diffstuff'
elif isinstance(item, InsertLine):
line_class = 'newtext'
elif isinstance(item, RemoveLine):
line_class = 'oldtext'
elif isinstance(item, basestring) and item.startswith('==='):
line_class = 'metaline'
else:
line_class = 'plain'
self.colorstring(line_class, str(item))
def flush(self):
self.target.flush()
def colordiff(self, *args, **kwargs):
real_stdout = sys.stdout
sys.stdout = DiffWriter(real_stdout)
try:
get_cmd_object('diff').run(*args, **kwargs)
finally:
sys.stdout = real_stdout
|