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 793.1.1
- compare with another revision
- download diff
- download tarball
- view history from revision 793.1.1
- Committer: Jelmer Vernooij
- Date: 2012-07-09 15:23:26 UTC
- mto: This revision was merged to the branch mainline in revision 794.
- Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
Remove bzr-notify.
- files added:
- avatarproviders.py
- files removed:
- bzr-notify
- olive
- files renamed:
- bazaar-properties.desktop => bazaar-properties.desktop.in
- bzr-handle-patch.desktop => bzr-handle-patch.desktop.in
- files modified:
- .bzrignore
added
removed
diff.py
5
5
"""
6
6
7
7
__copyright__ = "Copyright 2005 Canonical Ltd."
8
__author__ = "Scott James Remnant <scott@ubuntu.com>"
8
__author__ = "Scott James Remnant <scott@ubuntu.com>"
9
9
10
10
11
11
from cStringIO import StringIO
12
12
13
import pygtk
14
pygtk.require("2.0")
15
import gtk
16
import pango
17
import os
18
import re
19
13
import sys
20
from xml.etree.ElementTree import Element, SubElement, tostring
14
import inspect
21
15
16
from gi.repository import Gtk
17
from gi.repository import Pango
22
18
try:
23
import gtksourceview2
19
from gi.repository import GtkSource
24
20
have_gtksourceview = True
25
21
except ImportError:
26
22
have_gtksourceview = False
27
try:
28
import gconf
29
have_gconf = True
30
except ImportError:
31
have_gconf = False
32
23
33
24
from bzrlib import (
25
errors,
34
26
merge as _mod_merge,
35
27
osutils,
36
progress,
37
28
urlutils,
38
29
workingtree,
39
)
40
from bzrlib.diff import show_diff_trees, internal_diff
41
from bzrlib.errors import NoSuchFile
30
)
31
from bzrlib.diff import show_diff_trees
42
32
from bzrlib.patches import parse_patches
43
from bzrlib.trace import warning
44
from bzrlib.plugins.gtk import _i18n
33
from bzrlib.plugins.gtk.dialog import (
34
error_dialog,
35
info_dialog,
36
warning_dialog,
37
)
38
from bzrlib.plugins.gtk.i18n import _i18n
45
39
from bzrlib.plugins.gtk.window import Window
46
from dialog import error_dialog, info_dialog, warning_dialog
40
41
42
def fallback_guess_language(slm, content_type):
43
for lang_id in slm.get_language_ids():
44
lang = slm.get_language(lang_id)
45
if "text/x-patch" in lang.get_mime_types():
46
return lang
47
return None
47
48
48
49
49
50
class SelectCancelled(Exception):
51
52
pass
52
53
53
54
54
class DiffFileView(gtk.ScrolledWindow):
55
class DiffFileView(Gtk.ScrolledWindow):
55
56
"""Window for displaying diffs from a diff file"""
56
57
58
SHOW_WIDGETS = True
59
57
60
def __init__(self):
58
gtk.ScrolledWindow.__init__(self)
61
super(DiffFileView, self).__init__()
59
62
self.construct()
60
63
self._diffs = {}
61
64
62
65
def construct(self):
63
self.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
64
self.set_shadow_type(gtk.SHADOW_IN)
66
self.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
67
self.set_shadow_type(Gtk.ShadowType.IN)
65
68
66
69
if have_gtksourceview:
67
self.buffer = gtksourceview2.Buffer()
68
slm = gtksourceview2.LanguageManager()
69
gsl = slm.guess_language(content_type="text/x-patch")
70
if have_gconf:
71
self.apply_gedit_colors(self.buffer)
72
self.apply_colordiff_colors(self.buffer)
73
self.buffer.set_language(gsl)
70
self.buffer = GtkSource.Buffer()
71
lang_manager = GtkSource.LanguageManager.get_default()
72
language = lang_manager.guess_language(None, "text/x-patch")
73
self.buffer.set_language(language)
74
74
self.buffer.set_highlight_syntax(True)
75
76
self.sourceview = gtksourceview2.View(self.buffer)
75
self.sourceview = GtkSource.View(buffer=self.buffer)
77
76
else:
78
self.buffer = gtk.TextBuffer()
79
self.sourceview = gtk.TextView(self.buffer)
77
self.buffer = Gtk.TextBuffer()
78
self.sourceview = Gtk.TextView(self.buffer)
80
79
81
80
self.sourceview.set_editable(False)
82
self.sourceview.modify_font(pango.FontDescription("Monospace"))
81
self.sourceview.override_font(Pango.FontDescription("Monospace"))
83
82
self.add(self.sourceview)
84
self.sourceview.show()
85
86
@staticmethod
87
def apply_gedit_colors(buf):
88
"""Set style to that specified in gedit configuration.
89
90
This method needs the gconf module.
91
92
:param buf: a gtksourceview2.Buffer object.
93
"""
94
GEDIT_SCHEME_PATH = '/apps/gedit-2/preferences/editor/colors/scheme'
95
96
client = gconf.client_get_default()
97
style_scheme_name = client.get_string(GEDIT_SCHEME_PATH)
98
if style_scheme_name is not None:
99
style_scheme = gtksourceview2.StyleSchemeManager().get_scheme(style_scheme_name)
100
101
buf.set_style_scheme(style_scheme)
102
103
@classmethod
104
def apply_colordiff_colors(klass, buf):
105
"""Set style colors for lang using the colordiff configuration file.
106
107
Both ~/.colordiffrc and ~/.colordiffrc.bzr-gtk are read.
108
109
:param buf: a "Diff" gtksourceview2.Buffer object.
110
"""
111
scheme_manager = gtksourceview2.StyleSchemeManager()
112
style_scheme = scheme_manager.get_scheme('colordiff')
113
114
# if style scheme not found, we'll generate it from colordiffrc
115
# TODO: reload if colordiffrc has changed.
116
if style_scheme is None:
117
colors = {}
118
119
for f in ('~/.colordiffrc', '~/.colordiffrc.bzr-gtk'):
120
f = os.path.expanduser(f)
121
if os.path.exists(f):
122
try:
123
f = file(f)
124
except IOError, e:
125
warning('could not open file %s: %s' % (f, str(e)))
126
else:
127
colors.update(klass.parse_colordiffrc(f))
128
f.close()
129
130
if not colors:
131
# ~/.colordiffrc does not exist
132
return
133
134
mapping = {
135
# map GtkSourceView2 scheme styles to colordiff names
136
# since GSV is richer, accept new names for extra bits,
137
# defaulting to old names if they're not present
138
'diff:added-line': ['newtext'],
139
'diff:removed-line': ['oldtext'],
140
'diff:location': ['location', 'diffstuff'],
141
'diff:file': ['file', 'diffstuff'],
142
'diff:special-case': ['specialcase', 'diffstuff'],
143
}
144
145
converted_colors = {}
146
for name, values in mapping.items():
147
color = None
148
for value in values:
149
color = colors.get(value, None)
150
if color is not None:
151
break
152
if color is None:
153
continue
154
converted_colors[name] = color
155
156
# some xml magic to produce needed style scheme description
157
e_style_scheme = Element('style-scheme')
158
e_style_scheme.set('id', 'colordiff')
159
e_style_scheme.set('_name', 'ColorDiff')
160
e_style_scheme.set('version', '1.0')
161
for name, color in converted_colors.items():
162
style = SubElement(e_style_scheme, 'style')
163
style.set('name', name)
164
style.set('foreground', '#%s' % color)
165
166
scheme_xml = tostring(e_style_scheme, 'UTF-8')
167
if not os.path.exists(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles')):
168
os.makedirs(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles'))
169
file(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles/colordiff.xml'), 'w').write(scheme_xml)
170
171
scheme_manager.force_rescan()
172
style_scheme = scheme_manager.get_scheme('colordiff')
173
174
buf.set_style_scheme(style_scheme)
175
176
@staticmethod
177
def parse_colordiffrc(fileobj):
178
"""Parse fileobj as a colordiff configuration file.
179
180
:return: A dict with the key -> value pairs.
181
"""
182
colors = {}
183
for line in fileobj:
184
if re.match(r'^\s*#', line):
185
continue
186
if '=' not in line:
187
continue
188
key, val = line.split('=', 1)
189
colors[key.strip()] = val.strip()
190
return colors
83
if self.SHOW_WIDGETS:
84
self.sourceview.show()
191
85
192
86
def set_trees(self, rev_tree, parent_tree):
193
87
self.rev_tree = rev_tree
198
92
# self.parent_tree.lock_read()
199
93
# self.rev_tree.lock_read()
200
94
# try:
201
# self.delta = iter_changes_to_status(self.parent_tree, self.rev_tree)
95
# self.delta = iter_changes_to_status(
96
# self.parent_tree, self.rev_tree)
202
97
# self.path_to_status = {}
203
98
# self.path_to_diff = {}
204
99
# source_inv = self.parent_tree.inventory
205
100
# target_inv = self.rev_tree.inventory
206
101
# for (file_id, real_path, change_type, display_path) in self.delta:
207
# self.path_to_status[real_path] = u'=== %s %s' % (change_type, display_path)
102
# self.path_to_status[real_path] = u'=== %s %s' % (
103
# change_type, display_path)
208
104
# if change_type in ('modified', 'renamed and modified'):
209
105
# source_ie = source_inv[file_id]
210
106
# target_ie = target_inv[file_id]
212
108
# source_ie.diff(internal_diff, *old path, *old_tree,
213
109
# *new_path, target_ie, self.rev_tree,
214
110
# sio)
215
# self.path_to_diff[real_path] =
111
# self.path_to_diff[real_path] =
216
112
#
217
113
# finally:
218
114
# self.rev_tree.unlock()
232
128
"""This is the soft and chewy filling for a DiffWindow."""
233
129
234
130
def __init__(self):
235
DiffFileView.__init__(self)
131
super(DiffView, self).__init__()
236
132
self.rev_tree = None
237
133
self.parent_tree = None
238
134
262
158
self.buffer.set_text(decoded.encode('UTF-8'))
263
159
264
160
265
class DiffWidget(gtk.HPaned):
161
class DiffWidget(Gtk.HPaned):
266
162
"""Diff widget
267
163
268
164
"""
165
166
SHOW_WIDGETS = True
167
269
168
def __init__(self):
270
169
super(DiffWidget, self).__init__()
271
170
272
171
# The file hierarchy: a scrollable treeview
273
scrollwin = gtk.ScrolledWindow()
274
scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
275
scrollwin.set_shadow_type(gtk.SHADOW_IN)
172
scrollwin = Gtk.ScrolledWindow()
173
scrollwin.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
174
scrollwin.set_shadow_type(Gtk.ShadowType.IN)
276
175
self.pack1(scrollwin)
277
scrollwin.show()
278
279
self.model = gtk.TreeStore(str, str)
280
self.treeview = gtk.TreeView(self.model)
176
if self.SHOW_WIDGETS:
177
scrollwin.show()
178
179
self.model = Gtk.TreeStore(str, str)
180
self.treeview = Gtk.TreeView(model=self.model)
281
181
self.treeview.set_headers_visible(False)
282
182
self.treeview.set_search_column(1)
283
183
self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
284
184
scrollwin.add(self.treeview)
285
self.treeview.show()
185
if self.SHOW_WIDGETS:
186
self.treeview.show()
286
187
287
cell = gtk.CellRendererText()
188
cell = Gtk.CellRendererText()
288
189
cell.set_property("width-chars", 20)
289
column = gtk.TreeViewColumn()
290
column.pack_start(cell, expand=True)
190
column = Gtk.TreeViewColumn()
191
column.pack_start(cell, True)
291
192
column.add_attribute(cell, "text", 0)
292
193
self.treeview.append_column(column)
293
194
303
204
if getattr(self, 'diff_view', None) is None:
304
205
self.diff_view = DiffFileView()
305
206
self.pack2(self.diff_view)
306
self.diff_view.show()
207
if self.SHOW_WIDGETS:
208
self.diff_view.show()
307
209
for oldname, newname, patch in sections:
308
210
self.diff_view._diffs[newname] = str(patch)
309
211
if newname is None:
320
222
if getattr(self, 'diff_view', None) is None:
321
223
self.diff_view = DiffView()
322
224
self.pack2(self.diff_view)
323
self.diff_view.show()
225
if self.SHOW_WIDGETS:
226
self.diff_view.show()
324
227
self.diff_view.set_trees(rev_tree, parent_tree)
325
228
self.rev_tree = rev_tree
326
229
self.parent_tree = parent_tree
328
231
self.model.clear()
329
232
delta = self.rev_tree.changes_from(self.parent_tree)
330
233
331
self.model.append(None, [ "Complete Diff", "" ])
234
self.model.append(None, ["Complete Diff", ""])
332
235
333
236
if len(delta.added):
334
titer = self.model.append(None, [ "Added", None ])
237
titer = self.model.append(None, ["Added", None])
335
238
for path, id, kind in delta.added:
336
self.model.append(titer, [ path, path ])
239
self.model.append(titer, [path, path])
337
240
338
241
if len(delta.removed):
339
titer = self.model.append(None, [ "Removed", None ])
242
titer = self.model.append(None, ["Removed", None])
340
243
for path, id, kind in delta.removed:
341
self.model.append(titer, [ path, path ])
244
self.model.append(titer, [path, path])
342
245
343
246
if len(delta.renamed):
344
titer = self.model.append(None, [ "Renamed", None ])
247
titer = self.model.append(None, ["Renamed", None])
345
248
for oldpath, newpath, id, kind, text_modified, meta_modified \
346
249
in delta.renamed:
347
self.model.append(titer, [ oldpath, newpath ])
250
self.model.append(titer, [oldpath, newpath])
348
251
349
252
if len(delta.modified):
350
titer = self.model.append(None, [ "Modified", None ])
253
titer = self.model.append(None, ["Modified", None])
351
254
for path, id, kind, text_modified, meta_modified in delta.modified:
352
self.model.append(titer, [ path, path ])
255
self.model.append(titer, [path, path])
353
256
354
257
self.treeview.expand_all()
355
258
self.diff_view.show_diff(None)
363
266
tv_path = child.path
364
267
break
365
268
if tv_path is None:
366
raise NoSuchFile(file_path)
367
self.treeview.set_cursor(tv_path)
269
raise errors.NoSuchFile(file_path)
270
self.treeview.set_cursor(tv_path, None, False)
368
271
self.treeview.scroll_to_cell(tv_path)
369
272
370
273
def _treeview_cursor_cb(self, *args):
371
274
"""Callback for when the treeview cursor changes."""
372
275
(path, col) = self.treeview.get_cursor()
373
specific_files = [ self.model[path][1] ]
374
if specific_files == [ None ]:
375
return
376
elif specific_files == [ "" ]:
276
if path is None:
277
return
278
specific_files = [self.model[path][1]]
279
if specific_files == [None]:
280
return
281
elif specific_files == [""]:
377
282
specific_files = None
378
283
379
284
self.diff_view.show_diff(specific_files)
380
285
381
286
def _on_wraplines_toggled(self, widget=None, wrap=False):
382
287
"""Callback for when the wrap lines checkbutton is toggled"""
383
288
if wrap or widget.get_active():
384
self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_WORD)
289
self.diff_view.sourceview.set_wrap_mode(Gtk.WrapMode.WORD)
385
290
else:
386
self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_NONE)
291
self.diff_view.sourceview.set_wrap_mode(Gtk.WrapMode.NONE)
292
387
293
388
294
class DiffWindow(Window):
389
295
"""Diff window.
392
298
differences between two revisions on a branch.
393
299
"""
394
300
301
SHOW_WIDGETS = True
302
395
303
def __init__(self, parent=None, operations=None):
396
Window.__init__(self, parent)
304
super(DiffWindow, self).__init__(parent=parent)
397
305
self.set_border_width(0)
398
self.set_title("bzrk diff")
306
self.set_title("bzr diff")
399
307
400
308
# Use two thirds of the screen by default
401
309
screen = self.get_screen()
407
315
408
316
def construct(self, operations):
409
317
"""Construct the window contents."""
410
self.vbox = gtk.VBox()
318
self.vbox = Gtk.VBox()
411
319
self.add(self.vbox)
412
self.vbox.show()
320
if self.SHOW_WIDGETS:
321
self.vbox.show()
413
322
self.diff = DiffWidget()
414
323
self.vbox.pack_end(self.diff, True, True, 0)
415
self.diff.show_all()
324
if self.SHOW_WIDGETS:
325
self.diff.show_all()
416
326
# Build after DiffWidget to connect signals
417
327
menubar = self._get_menu_bar()
418
328
self.vbox.pack_start(menubar, False, False, 0)
419
329
hbox = self._get_button_bar(operations)
420
330
if hbox is not None:
421
331
self.vbox.pack_start(hbox, False, True, 0)
422
423
332
424
333
def _get_menu_bar(self):
425
menubar = gtk.MenuBar()
334
menubar = Gtk.MenuBar()
426
335
# View menu
427
mb_view = gtk.MenuItem(_i18n("_View"))
428
mb_view_menu = gtk.Menu()
429
mb_view_wrapsource = gtk.CheckMenuItem(_i18n("Wrap _Long Lines"))
336
mb_view = Gtk.MenuItem.new_with_mnemonic(_i18n("_View"))
337
mb_view_menu = Gtk.Menu()
338
mb_view_wrapsource = Gtk.CheckMenuItem.new_with_mnemonic(
339
_i18n("Wrap _Long Lines"))
430
340
mb_view_wrapsource.connect('activate', self.diff._on_wraplines_toggled)
431
mb_view_wrapsource.show()
432
341
mb_view_menu.append(mb_view_wrapsource)
433
mb_view.show()
434
342
mb_view.set_submenu(mb_view_menu)
435
mb_view.show()
436
343
menubar.append(mb_view)
437
menubar.show()
344
if self.SHOW_WIDGETS:
345
menubar.show_all()
438
346
return menubar
439
347
440
348
def _get_button_bar(self, operations):
441
349
"""Return a button bar to use.
442
350
444
352
"""
445
353
if operations is None:
446
354
return None
447
hbox = gtk.HButtonBox()
448
hbox.set_layout(gtk.BUTTONBOX_START)
355
hbox = Gtk.HButtonBox()
356
hbox.set_layout(Gtk.ButtonBoxStyle.START)
449
357
for title, method in operations:
450
merge_button = gtk.Button(title)
451
merge_button.show()
452
merge_button.set_relief(gtk.RELIEF_NONE)
358
merge_button = Gtk.Button(title)
359
if self.SHOW_WIDGETS:
360
merge_button.show()
361
merge_button.set_relief(Gtk.ReliefStyle.NONE)
453
362
merge_button.connect("clicked", method)
454
hbox.pack_start(merge_button, expand=False, fill=True)
455
hbox.show()
363
hbox.pack_start(merge_button, False, True, 0)
364
if self.SHOW_WIDGETS:
365
hbox.show()
456
366
return hbox
457
367
458
368
def _get_merge_target(self):
459
d = gtk.FileChooserDialog('Merge branch', self,
460
gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
461
buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
462
gtk.STOCK_CANCEL,
463
gtk.RESPONSE_CANCEL,))
369
d = Gtk.FileChooserDialog('Merge branch', self,
370
Gtk.FileChooserAction.SELECT_FOLDER,
371
buttons=(Gtk.STOCK_OK, Gtk.ResponseType.OK,
372
Gtk.STOCK_CANCEL,
373
Gtk.ResponseType.CANCEL,))
464
374
try:
465
375
result = d.run()
466
if result != gtk.RESPONSE_OK:
376
if result != Gtk.ResponseType.OK:
467
377
raise SelectCancelled()
468
378
return d.get_current_folder_uri()
469
379
finally:
483
393
error_dialog('Error', str(e))
484
394
485
395
def _get_save_path(self, basename):
486
d = gtk.FileChooserDialog('Save As', self,
487
gtk.FILE_CHOOSER_ACTION_SAVE,
488
buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
489
gtk.STOCK_CANCEL,
490
gtk.RESPONSE_CANCEL,))
396
d = Gtk.FileChooserDialog('Save As', self,
397
Gtk.FileChooserAction.SAVE,
398
buttons=(Gtk.STOCK_OK, Gtk.ResponseType.OK,
399
Gtk.STOCK_CANCEL,
400
Gtk.ResponseType.CANCEL,))
491
401
d.set_current_name(basename)
492
402
try:
493
403
result = d.run()
494
if result != gtk.RESPONSE_OK:
404
if result != Gtk.ResponseType.OK:
495
405
raise SelectCancelled()
496
406
return urlutils.local_path_from_url(d.get_uri())
497
407
finally:
512
422
513
423
class DiffController(object):
514
424
515
def __init__(self, path, patch, window=None):
425
def __init__(self, path, patch, window=None, allow_dirty=False):
516
426
self.path = path
517
427
self.patch = patch
428
self.allow_dirty = allow_dirty
518
429
if window is None:
519
430
window = DiffWindow(operations=self._provide_operations())
520
431
self.initialize_window(window)
526
437
527
438
def get_diff_sections(self):
528
439
yield "Complete Diff", None, ''.join(self.patch)
529
for patch in parse_patches(self.patch):
440
# allow_dirty was added to parse_patches in bzrlib 2.2b1
441
if 'allow_dirty' in inspect.getargspec(parse_patches).args:
442
patches = parse_patches(self.patch, allow_dirty=self.allow_dirty)
443
else:
444
patches = parse_patches(self.patch)
445
for patch in patches:
530
446
oldname = patch.oldname.split('\t')[0]
531
447
newname = patch.newname.split('\t')[0]
532
448
yield oldname, newname, str(patch)
553
469
class MergeDirectiveController(DiffController):
554
470
555
471
def __init__(self, path, directive, window=None):
556
DiffController.__init__(self, path, directive.patch.splitlines(True),
557
window)
472
super(MergeDirectiveController, self).__init__(
473
path, directive.patch.splitlines(True), window)
558
474
self.directive = directive
559
475
self.merge_target = None
560
476
571
487
tree.lock_write()
572
488
try:
573
489
try:
574
merger, verified = _mod_merge.Merger.from_mergeable(tree,
575
self.directive, progress.DummyProgress())
576
merger.check_basis(True)
490
if tree.has_changes():
491
raise errors.UncommittedChanges(tree)
492
merger, verified = _mod_merge.Merger.from_mergeable(
493
tree, self.directive, pb=None)
577
494
merger.merge_type = _mod_merge.Merge3Merger
578
495
conflict_count = merger.do_merge()
579
496
merger.set_pending()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0