To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz
« back to all changes in this revision
Viewing changes to diff.py
- browse files at revision 511.5.5
- compare with another revision
- download diff
- download tarball
- view history from revision 511.5.5
- Committer: Jelmer Vernooij
- Date: 2008-06-29 16:24:24 UTC
- mto: This revision was merged to the branch mainline in revision 519.
- Revision ID: jelmer@samba.org-20080629162424-48a6rrjmmpejfcyr
Stop emitting no longer used revisions-loaded message.
- files added:
- olive.glade
- files removed:
- bzr-notify
- files modified:
- .bzrignore
added
removed
diff.py
1
# -*- coding: UTF-8 -*-
1
2
"""Difference window.
2
3
3
4
This module contains the code to manage the diff window which shows
4
5
the changes made between two revisions on a branch.
5
6
"""
6
7
7
__copyright__ = "Copyright 2005 Canonical Ltd."
8
__copyright__ = "Copyright © 2005 Canonical Ltd."
8
9
__author__ = "Scott James Remnant <scott@ubuntu.com>"
9
10
10
11
17
18
import os
18
19
import re
19
20
import sys
20
from xml.etree.ElementTree import Element, SubElement, tostring
21
21
22
22
try:
23
import gtksourceview2
23
import gtksourceview
24
24
have_gtksourceview = True
25
25
except ImportError:
26
26
have_gtksourceview = False
64
64
self.set_shadow_type(gtk.SHADOW_IN)
65
65
66
66
if have_gtksourceview:
67
self.buffer = gtksourceview2.Buffer()
68
slm = gtksourceview2.LanguageManager()
69
gsl = slm.guess_language(content_type="text/x-patch")
67
self.buffer = gtksourceview.SourceBuffer()
68
slm = gtksourceview.SourceLanguagesManager()
69
gsl = slm.get_language_from_mime_type("text/x-patch")
70
70
if have_gconf:
71
self.apply_gedit_colors(self.buffer)
72
self.apply_colordiff_colors(self.buffer)
71
self.apply_gedit_colors(gsl)
72
self.apply_colordiff_colors(gsl)
73
73
self.buffer.set_language(gsl)
74
self.buffer.set_highlight_syntax(True)
74
self.buffer.set_highlight(True)
75
75
76
self.sourceview = gtksourceview2.View(self.buffer)
76
sourceview = gtksourceview.SourceView(self.buffer)
77
77
else:
78
78
self.buffer = gtk.TextBuffer()
79
self.sourceview = gtk.TextView(self.buffer)
79
sourceview = gtk.TextView(self.buffer)
80
80
81
self.sourceview.set_editable(False)
82
self.sourceview.modify_font(pango.FontDescription("Monospace"))
83
self.add(self.sourceview)
84
self.sourceview.show()
81
sourceview.set_editable(False)
82
sourceview.modify_font(pango.FontDescription("Monospace"))
83
self.add(sourceview)
84
sourceview.show()
85
85
86
86
@staticmethod
87
def apply_gedit_colors(buf):
88
"""Set style to that specified in gedit configuration.
87
def apply_gedit_colors(lang):
88
"""Set style for lang to that specified in gedit configuration.
89
89
90
90
This method needs the gconf module.
91
91
92
:param buf: a gtksourceview2.Buffer object.
92
:param lang: a gtksourceview.SourceLanguage object.
93
93
"""
94
GEDIT_SCHEME_PATH = '/apps/gedit-2/preferences/editor/colors/scheme'
94
GEDIT_SYNTAX_PATH = '/apps/gedit-2/preferences/syntax_highlighting'
95
GEDIT_LANG_PATH = GEDIT_SYNTAX_PATH + '/' + lang.get_id()
95
96
96
97
client = gconf.client_get_default()
97
style_scheme_name = client.get_string(GEDIT_SCHEME_PATH)
98
style_scheme = gtksourceview2.StyleSchemeManager().get_scheme(style_scheme_name)
99
100
buf.set_style_scheme(style_scheme)
98
client.add_dir(GEDIT_LANG_PATH, gconf.CLIENT_PRELOAD_NONE)
99
100
for tag in lang.get_tags():
101
tag_id = tag.get_id()
102
gconf_key = GEDIT_LANG_PATH + '/' + tag_id
103
style_string = client.get_string(gconf_key)
104
105
if style_string is None:
106
continue
107
108
# function to get a bool from a string that's either '0' or '1'
109
string_bool = lambda x: bool(int(x))
110
111
# style_string is a string like "2/#FFCCAA/#000000/0/1/0/0"
112
# values are: mask, fg, bg, italic, bold, underline, strike
113
# this packs them into (str_value, attr_name, conv_func) tuples
114
items = zip(style_string.split('/'), ['mask', 'foreground',
115
'background', 'italic', 'bold', 'underline', 'strikethrough' ],
116
[ int, gtk.gdk.color_parse, gtk.gdk.color_parse, string_bool,
117
string_bool, string_bool, string_bool ]
118
)
119
120
style = gtksourceview.SourceTagStyle()
121
122
# XXX The mask attribute controls whether the present values of
123
# foreground and background color should in fact be used. Ideally
124
# (and that's what gedit does), one could set all three attributes,
125
# and let the TagStyle object figure out which colors to use.
126
# However, in the GtkSourceview python bindings, the mask attribute
127
# is read-only, and it's derived instead from the colors being
128
# set or not. This means that we have to sometimes refrain from
129
# setting fg or bg colors, depending on the value of the mask.
130
# This code could go away if mask were writable.
131
mask = int(items[0][0])
132
if not (mask & 1): # GTK_SOURCE_TAG_STYLE_USE_BACKGROUND
133
items[2:3] = []
134
if not (mask & 2): # GTK_SOURCE_TAG_STYLE_USE_FOREGROUND
135
items[1:2] = []
136
items[0:1] = [] # skip the mask unconditionally
137
138
for value, attr, func in items:
139
try:
140
value = func(value)
141
except ValueError:
142
warning('gconf key %s contains an invalid value: %s'
143
% gconf_key, value)
144
else:
145
setattr(style, attr, value)
146
147
lang.set_tag_style(tag_id, style)
101
148
102
149
@classmethod
103
def apply_colordiff_colors(klass, buf):
150
def apply_colordiff_colors(klass, lang):
104
151
"""Set style colors for lang using the colordiff configuration file.
105
152
106
153
Both ~/.colordiffrc and ~/.colordiffrc.bzr-gtk are read.
107
154
108
:param buf: a "Diff" gtksourceview2.Buffer object.
155
:param lang: a "Diff" gtksourceview.SourceLanguage object.
109
156
"""
110
scheme_manager = gtksourceview2.StyleSchemeManager()
111
style_scheme = scheme_manager.get_scheme('colordiff')
112
113
# if style scheme not found, we'll generate it from colordiffrc
114
# TODO: reload if colordiffrc has changed.
115
if style_scheme is None:
116
colors = {}
117
118
for f in ('~/.colordiffrc', '~/.colordiffrc.bzr-gtk'):
119
f = os.path.expanduser(f)
120
if os.path.exists(f):
121
try:
122
f = file(f)
123
except IOError, e:
124
warning('could not open file %s: %s' % (f, str(e)))
125
else:
126
colors.update(klass.parse_colordiffrc(f))
127
f.close()
128
129
if not colors:
130
# ~/.colordiffrc does not exist
131
return
132
133
mapping = {
134
# map GtkSourceView2 scheme styles to colordiff names
157
colors = {}
158
159
for f in ('~/.colordiffrc', '~/.colordiffrc.bzr-gtk'):
160
f = os.path.expanduser(f)
161
if os.path.exists(f):
162
try:
163
f = file(f)
164
except IOError, e:
165
warning('could not open file %s: %s' % (f, str(e)))
166
else:
167
colors.update(klass.parse_colordiffrc(f))
168
f.close()
169
170
if not colors:
171
# ~/.colordiffrc does not exist
172
return
173
174
mapping = {
175
# map GtkSourceView tags to colordiff names
135
176
# since GSV is richer, accept new names for extra bits,
136
177
# defaulting to old names if they're not present
137
'diff:added-line': ['newtext'],
138
'diff:removed-line': ['oldtext'],
139
'diff:location': ['location', 'diffstuff'],
140
'diff:file': ['file', 'diffstuff'],
141
'diff:special-case': ['specialcase', 'diffstuff'],
142
}
143
144
converted_colors = {}
145
for name, values in mapping.items():
146
color = None
147
for value in values:
148
color = colors.get(value, None)
149
if color is not None:
150
break
151
if color is None:
152
continue
153
converted_colors[name] = color
154
155
# some xml magic to produce needed style scheme description
156
e_style_scheme = Element('style-scheme')
157
e_style_scheme.set('id', 'colordiff')
158
e_style_scheme.set('_name', 'ColorDiff')
159
e_style_scheme.set('version', '1.0')
160
for name, color in converted_colors.items():
161
style = SubElement(e_style_scheme, 'style')
162
style.set('name', name)
163
style.set('foreground', '#%s' % color)
164
165
scheme_xml = tostring(e_style_scheme, 'UTF-8')
166
if not os.path.exists(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles')):
167
os.makedirs(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles'))
168
file(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles/colordiff.xml'), 'w').write(scheme_xml)
169
170
scheme_manager.force_rescan()
171
style_scheme = scheme_manager.get_scheme('colordiff')
172
173
buf.set_style_scheme(style_scheme)
178
'Added@32@line': ['newtext'],
179
'Removed@32@line': ['oldtext'],
180
'Location': ['location', 'diffstuff'],
181
'Diff@32@file': ['file', 'diffstuff'],
182
'Special@32@case': ['specialcase', 'diffstuff'],
183
}
184
185
for tag in lang.get_tags():
186
tag_id = tag.get_id()
187
keys = mapping.get(tag_id, [])
188
color = None
189
190
for key in keys:
191
color = colors.get(key, None)
192
if color is not None:
193
break
194
195
if color is None:
196
continue
197
198
style = gtksourceview.SourceTagStyle()
199
try:
200
style.foreground = gtk.gdk.color_parse(color)
201
except ValueError:
202
warning('not a valid color: %s' % color)
203
else:
204
lang.set_tag_style(tag_id, style)
174
205
175
206
@staticmethod
176
207
def parse_colordiffrc(fileobj):
274
305
scrollwin.set_shadow_type(gtk.SHADOW_IN)
275
306
self.pack1(scrollwin)
276
307
scrollwin.show()
277
308
278
309
self.model = gtk.TreeStore(str, str)
279
310
self.treeview = gtk.TreeView(self.model)
280
311
self.treeview.set_headers_visible(False)
299
330
# text view
300
331
301
332
def set_diff_text_sections(self, sections):
302
if getattr(self, 'diff_view', None) is None:
303
self.diff_view = DiffFileView()
304
self.pack2(self.diff_view)
333
self.diff_view = DiffFileView()
305
334
self.diff_view.show()
335
self.pack2(self.diff_view)
306
336
for oldname, newname, patch in sections:
307
337
self.diff_view._diffs[newname] = str(patch)
308
338
if newname is None:
316
346
Compares the two trees and populates the window with the
317
347
differences.
318
348
"""
319
if getattr(self, 'diff_view', None) is None:
320
self.diff_view = DiffView()
321
self.pack2(self.diff_view)
349
self.diff_view = DiffView()
350
self.pack2(self.diff_view)
322
351
self.diff_view.show()
323
352
self.diff_view.set_trees(rev_tree, parent_tree)
324
353
self.rev_tree = rev_tree
351
380
self.model.append(titer, [ path, path ])
352
381
353
382
self.treeview.expand_all()
354
self.diff_view.show_diff(None)
355
383
356
384
def set_file(self, file_path):
357
385
"""Select the current file to display"""
374
402
return
375
403
elif specific_files == [ "" ]:
376
404
specific_files = None
377
405
378
406
self.diff_view.show_diff(specific_files)
379
380
def _on_wraplines_toggled(self, widget=None, wrap=False):
381
"""Callback for when the wrap lines checkbutton is toggled"""
382
if wrap or widget.get_active():
383
self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_WORD)
384
else:
385
self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_NONE)
407
386
408
387
409
class DiffWindow(Window):
388
410
"""Diff window.
409
431
self.vbox = gtk.VBox()
410
432
self.add(self.vbox)
411
433
self.vbox.show()
434
hbox = self._get_button_bar(operations)
435
if hbox is not None:
436
self.vbox.pack_start(hbox, expand=False, fill=True)
412
437
self.diff = DiffWidget()
413
self.vbox.pack_end(self.diff, True, True, 0)
438
self.vbox.add(self.diff)
414
439
self.diff.show_all()
415
# Build after DiffWidget to connect signals
416
menubar = self._get_menu_bar()
417
self.vbox.pack_start(menubar, False, False, 0)
418
hbox = self._get_button_bar(operations)
419
if hbox is not None:
420
self.vbox.pack_start(hbox, False, True, 0)
421
422
423
def _get_menu_bar(self):
424
menubar = gtk.MenuBar()
425
# View menu
426
mb_view = gtk.MenuItem(_i18n("_View"))
427
mb_view_menu = gtk.Menu()
428
mb_view_wrapsource = gtk.CheckMenuItem(_i18n("Wrap _Long Lines"))
429
mb_view_wrapsource.connect('activate', self.diff._on_wraplines_toggled)
430
mb_view_wrapsource.show()
431
mb_view_menu.append(mb_view_wrapsource)
432
mb_view.show()
433
mb_view.set_submenu(mb_view_menu)
434
mb_view.show()
435
menubar.append(mb_view)
436
menubar.show()
437
return menubar
438
440
439
441
def _get_button_bar(self, operations):
440
442
"""Return a button bar to use.
441
443
604
606
renamed_and_modified = 'renamed and modified'
605
607
modified = 'modified'
606
608
kind_changed = 'kind changed'
607
missing = 'missing'
608
609
609
610
# TODO: Handle metadata changes
610
611
625
626
source_marker = ''
626
627
else:
627
628
source_marker = osutils.kind_marker(kinds[0])
628
629
629
if kinds[1] is None:
630
if kinds[0] is None:
631
# We assume bzr will flag only files in that case,
632
# there may be a bzr bug there as only files seems to
633
# not receive any kind.
634
marker = osutils.kind_marker('file')
635
else:
636
marker = osutils.kind_marker(kinds[0])
630
assert kinds[0] is not None
631
marker = osutils.kind_marker(kinds[0])
637
632
else:
638
633
marker = osutils.kind_marker(kinds[1])
639
634
641
636
if real_path is None:
642
637
real_path = paths[0]
643
638
assert real_path is not None
639
display_path = real_path + marker
644
640
645
641
present_source = versioned[0] and kinds[0] is not None
646
642
present_target = versioned[1] and kinds[1] is not None
647
643
648
if kinds[0] is None and kinds[1] is None:
649
change_type = missing
650
display_path = real_path + marker
651
elif present_source != present_target:
644
if present_source != present_target:
652
645
if present_target:
653
646
change_type = added
654
647
else:
655
648
assert present_source
656
649
change_type = removed
657
display_path = real_path + marker
658
650
elif names[0] != names[1] or parent_ids[0] != parent_ids[1]:
659
651
# Renamed
660
652
if changed_content or executables[0] != executables[1]:
668
660
change_type = kind_changed
669
661
display_path = (paths[0] + source_marker
670
662
+ ' => ' + paths[1] + marker)
671
elif changed_content or executables[0] != executables[1]:
663
elif changed_content is True or executables[0] != executables[1]:
672
664
change_type = modified
673
display_path = real_path + marker
674
665
else:
675
666
assert False, "How did we get here?"
676
667
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0