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 412.1.12
- compare with another revision
- download diff
- download tarball
- view history from revision 412.1.12
- Committer: Daniel Schierbeck
- Date: 2007-12-06 23:37:06 UTC
- mto: This revision was merged to the branch mainline in revision 417.
- Revision ID: daniel.schierbeck@gmail.com-20071206233706-eeinks66w86r3gfm
Fixed bug in gmissing.
- files added:
- olive.glade
- files removed:
- branchview
- preferences
- files renamed:
- icons/bzr-icon-64.png => bzr-icon-64.png
- preferences/__init__.py => preferences.py
- branchview/graphcell.py => viz/graphcell.py
- branchview/linegraph.py => viz/linegraph.py
- branchview/treemodel.py => viz/treemodel.py
- branchview/treeview.py => viz/treeview.py
- 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
29
30
except ImportError:
30
31
have_gconf = False
31
32
32
from bzrlib import (
33
merge as _mod_merge,
34
osutils,
35
progress,
36
urlutils,
37
workingtree,
38
)
33
from bzrlib import osutils
39
34
from bzrlib.diff import show_diff_trees, internal_diff
40
35
from bzrlib.errors import NoSuchFile
41
from bzrlib.patches import parse_patches
42
36
from bzrlib.trace import warning
43
from bzrlib.plugins.gtk import _i18n
44
37
from bzrlib.plugins.gtk.window import Window
45
from dialog import error_dialog, info_dialog, warning_dialog
46
47
48
class SelectCancelled(Exception):
49
50
pass
51
52
53
class DiffFileView(gtk.ScrolledWindow):
54
"""Window for displaying diffs from a diff file"""
38
39
40
class DiffView(gtk.ScrolledWindow):
41
"""This is the soft and chewy filling for a DiffWindow."""
55
42
56
43
def __init__(self):
57
44
gtk.ScrolledWindow.__init__(self)
45
58
46
self.construct()
59
self._diffs = {}
47
self.rev_tree = None
48
self.parent_tree = None
60
49
61
50
def construct(self):
62
51
self.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
72
61
self.buffer.set_language(gsl)
73
62
self.buffer.set_highlight(True)
74
63
75
self.sourceview = gtksourceview.SourceView(self.buffer)
64
sourceview = gtksourceview.SourceView(self.buffer)
76
65
else:
77
66
self.buffer = gtk.TextBuffer()
78
self.sourceview = gtk.TextView(self.buffer)
67
sourceview = gtk.TextView(self.buffer)
79
68
80
self.sourceview.set_editable(False)
81
self.sourceview.modify_font(pango.FontDescription("Monospace"))
82
self.add(self.sourceview)
83
self.sourceview.show()
69
sourceview.set_editable(False)
70
sourceview.modify_font(pango.FontDescription("Monospace"))
71
self.add(sourceview)
72
sourceview.show()
84
73
85
74
@staticmethod
86
75
def apply_gedit_colors(lang):
145
134
146
135
lang.set_tag_style(tag_id, style)
147
136
148
@classmethod
149
def apply_colordiff_colors(klass, lang):
137
@staticmethod
138
def apply_colordiff_colors(lang):
150
139
"""Set style colors for lang using the colordiff configuration file.
151
140
152
141
Both ~/.colordiffrc and ~/.colordiffrc.bzr-gtk are read.
163
152
except IOError, e:
164
153
warning('could not open file %s: %s' % (f, str(e)))
165
154
else:
166
colors.update(klass.parse_colordiffrc(f))
155
colors.update(DiffView.parse_colordiffrc(f))
167
156
f.close()
168
157
169
158
if not colors:
227
216
# self.parent_tree.lock_read()
228
217
# self.rev_tree.lock_read()
229
218
# try:
230
# self.delta = iter_changes_to_status(self.parent_tree, self.rev_tree)
219
# self.delta = _iter_changes_to_status(self.parent_tree, self.rev_tree)
231
220
# self.path_to_status = {}
232
221
# self.path_to_diff = {}
233
222
# source_inv = self.parent_tree.inventory
248
237
# self.parent_tree.unlock()
249
238
250
239
def show_diff(self, specific_files):
251
sections = []
252
if specific_files is None:
253
self.buffer.set_text(self._diffs[None])
254
else:
255
for specific_file in specific_files:
256
sections.append(self._diffs[specific_file])
257
self.buffer.set_text(''.join(sections))
258
259
260
class DiffView(DiffFileView):
261
"""This is the soft and chewy filling for a DiffWindow."""
262
263
def __init__(self):
264
DiffFileView.__init__(self)
265
self.rev_tree = None
266
self.parent_tree = None
267
268
def show_diff(self, specific_files):
269
"""Show the diff for the specified files"""
270
240
s = StringIO()
271
241
show_diff_trees(self.parent_tree, self.rev_tree, s, specific_files,
272
242
old_label='', new_label='',
291
261
self.buffer.set_text(decoded.encode('UTF-8'))
292
262
293
263
294
class DiffWidget(gtk.HPaned):
295
"""Diff widget
264
class DiffWindow(Window):
265
"""Diff window.
296
266
267
This object represents and manages a single window containing the
268
differences between two revisions on a branch.
297
269
"""
298
def __init__(self):
299
super(DiffWidget, self).__init__()
270
271
def __init__(self, parent=None):
272
Window.__init__(self, parent)
273
self.set_border_width(0)
274
self.set_title("bzrk diff")
275
276
# Use two thirds of the screen by default
277
screen = self.get_screen()
278
monitor = screen.get_monitor_geometry(0)
279
width = int(monitor.width * 0.66)
280
height = int(monitor.height * 0.66)
281
self.set_default_size(width, height)
282
283
self.construct()
284
285
def construct(self):
286
"""Construct the window contents."""
287
# The window consists of a pane containing: the
288
# hierarchical list of files on the left, and the diff
289
# for the currently selected file on the right.
290
pane = gtk.HPaned()
291
self.add(pane)
292
pane.show()
300
293
301
294
# The file hierarchy: a scrollable treeview
302
295
scrollwin = gtk.ScrolledWindow()
303
296
scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
304
297
scrollwin.set_shadow_type(gtk.SHADOW_IN)
305
self.pack1(scrollwin)
298
pane.pack1(scrollwin)
306
299
scrollwin.show()
307
300
308
301
self.model = gtk.TreeStore(str, str)
309
302
self.treeview = gtk.TreeView(self.model)
310
303
self.treeview.set_headers_visible(False)
320
313
column.add_attribute(cell, "text", 0)
321
314
self.treeview.append_column(column)
322
315
323
def set_diff_text(self, lines):
324
"""Set the current diff from a list of lines
325
326
:param lines: The diff to show, in unified diff format
327
"""
328
316
# The diffs of the selected file: a scrollable source or
329
317
# text view
330
331
def set_diff_text_sections(self, sections):
332
if getattr(self, 'diff_view', None) is None:
333
self.diff_view = DiffFileView()
334
self.pack2(self.diff_view)
318
self.diff_view = DiffView()
319
pane.pack2(self.diff_view)
335
320
self.diff_view.show()
336
for oldname, newname, patch in sections:
337
self.diff_view._diffs[newname] = str(patch)
338
if newname is None:
339
newname = ''
340
self.model.append(None, [oldname, newname])
341
self.diff_view.show_diff(None)
342
321
343
def set_diff(self, rev_tree, parent_tree):
322
def set_diff(self, description, rev_tree, parent_tree):
344
323
"""Set the differences showed by this window.
345
324
346
325
Compares the two trees and populates the window with the
347
326
differences.
348
327
"""
349
if getattr(self, 'diff_view', None) is None:
350
self.diff_view = DiffView()
351
self.pack2(self.diff_view)
352
self.diff_view.show()
353
328
self.diff_view.set_trees(rev_tree, parent_tree)
354
329
self.rev_tree = rev_tree
355
330
self.parent_tree = parent_tree
381
356
self.model.append(titer, [ path, path ])
382
357
383
358
self.treeview.expand_all()
384
self.diff_view.show_diff(None)
359
self.set_title(description + " - bzrk diff")
385
360
386
361
def set_file(self, file_path):
387
"""Select the current file to display"""
388
362
tv_path = None
389
363
for data in self.model:
390
364
for child in data.iterchildren():
404
378
return
405
379
elif specific_files == [ "" ]:
406
380
specific_files = None
407
381
408
382
self.diff_view.show_diff(specific_files)
409
410
def _on_wraplines_toggled(self, widget=None, wrap=False):
411
"""Callback for when the wrap lines checkbutton is toggled"""
412
if wrap or widget.get_active():
413
self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_WORD)
414
else:
415
self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_NONE)
416
417
class DiffWindow(Window):
418
"""Diff window.
419
420
This object represents and manages a single window containing the
421
differences between two revisions on a branch.
422
"""
423
424
def __init__(self, parent=None, operations=None):
425
Window.__init__(self, parent)
426
self.set_border_width(0)
427
self.set_title("bzrk diff")
428
429
# Use two thirds of the screen by default
430
screen = self.get_screen()
431
monitor = screen.get_monitor_geometry(0)
432
width = int(monitor.width * 0.66)
433
height = int(monitor.height * 0.66)
434
self.set_default_size(width, height)
435
self.construct(operations)
436
437
def construct(self, operations):
438
"""Construct the window contents."""
439
self.vbox = gtk.VBox()
440
self.add(self.vbox)
441
self.vbox.show()
442
self.diff = DiffWidget()
443
self.vbox.pack_end(self.diff, True, True, 0)
444
self.diff.show_all()
445
# Build after DiffWidget to connect signals
446
menubar = self._get_menu_bar()
447
self.vbox.pack_start(menubar, False, False, 0)
448
hbox = self._get_button_bar(operations)
449
if hbox is not None:
450
self.vbox.pack_start(hbox, False, True, 0)
451
452
453
def _get_menu_bar(self):
454
menubar = gtk.MenuBar()
455
# View menu
456
mb_view = gtk.MenuItem(_i18n("_View"))
457
mb_view_menu = gtk.Menu()
458
mb_view_wrapsource = gtk.CheckMenuItem(_i18n("Wrap _Long Lines"))
459
mb_view_wrapsource.connect('activate', self.diff._on_wraplines_toggled)
460
mb_view_wrapsource.show()
461
mb_view_menu.append(mb_view_wrapsource)
462
mb_view.show()
463
mb_view.set_submenu(mb_view_menu)
464
mb_view.show()
465
menubar.append(mb_view)
466
menubar.show()
467
return menubar
468
469
def _get_button_bar(self, operations):
470
"""Return a button bar to use.
471
472
:return: None, meaning that no button bar will be used.
473
"""
474
if operations is None:
475
return None
476
hbox = gtk.HButtonBox()
477
hbox.set_layout(gtk.BUTTONBOX_START)
478
for title, method in operations:
479
merge_button = gtk.Button(title)
480
merge_button.show()
481
merge_button.set_relief(gtk.RELIEF_NONE)
482
merge_button.connect("clicked", method)
483
hbox.pack_start(merge_button, expand=False, fill=True)
484
hbox.show()
485
return hbox
486
487
def _get_merge_target(self):
488
d = gtk.FileChooserDialog('Merge branch', self,
489
gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
490
buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
491
gtk.STOCK_CANCEL,
492
gtk.RESPONSE_CANCEL,))
493
try:
494
result = d.run()
495
if result != gtk.RESPONSE_OK:
496
raise SelectCancelled()
497
return d.get_current_folder_uri()
498
finally:
499
d.destroy()
500
501
def _merge_successful(self):
502
# No conflicts found.
503
info_dialog(_i18n('Merge successful'),
504
_i18n('All changes applied successfully.'))
505
506
def _conflicts(self):
507
warning_dialog(_i18n('Conflicts encountered'),
508
_i18n('Please resolve the conflicts manually'
509
' before committing.'))
510
511
def _handle_error(self, e):
512
error_dialog('Error', str(e))
513
514
def _get_save_path(self, basename):
515
d = gtk.FileChooserDialog('Save As', self,
516
gtk.FILE_CHOOSER_ACTION_SAVE,
517
buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
518
gtk.STOCK_CANCEL,
519
gtk.RESPONSE_CANCEL,))
520
d.set_current_name(basename)
521
try:
522
result = d.run()
523
if result != gtk.RESPONSE_OK:
524
raise SelectCancelled()
525
return urlutils.local_path_from_url(d.get_uri())
526
finally:
527
d.destroy()
528
529
def set_diff(self, description, rev_tree, parent_tree):
530
"""Set the differences showed by this window.
531
532
Compares the two trees and populates the window with the
533
differences.
534
"""
535
self.diff.set_diff(rev_tree, parent_tree)
536
self.set_title(description + " - bzrk diff")
537
538
def set_file(self, file_path):
539
self.diff.set_file(file_path)
540
541
542
class DiffController(object):
543
544
def __init__(self, path, patch, window=None):
545
self.path = path
546
self.patch = patch
547
if window is None:
548
window = DiffWindow(operations=self._provide_operations())
549
self.initialize_window(window)
550
self.window = window
551
552
def initialize_window(self, window):
553
window.diff.set_diff_text_sections(self.get_diff_sections())
554
window.set_title(self.path + " - diff")
555
556
def get_diff_sections(self):
557
yield "Complete Diff", None, ''.join(self.patch)
558
for patch in parse_patches(self.patch):
559
oldname = patch.oldname.split('\t')[0]
560
newname = patch.newname.split('\t')[0]
561
yield oldname, newname, str(patch)
562
563
def perform_save(self, window):
564
try:
565
save_path = self.window._get_save_path(osutils.basename(self.path))
566
except SelectCancelled:
567
return
568
source = open(self.path, 'rb')
569
try:
570
target = open(save_path, 'wb')
571
try:
572
osutils.pumpfile(source, target)
573
finally:
574
target.close()
575
finally:
576
source.close()
577
578
def _provide_operations(self):
579
return [('Save', self.perform_save)]
580
581
582
class MergeDirectiveController(DiffController):
583
584
def __init__(self, path, directive, window=None):
585
DiffController.__init__(self, path, directive.patch.splitlines(True),
586
window)
587
self.directive = directive
588
self.merge_target = None
589
590
def _provide_operations(self):
591
return [('Merge', self.perform_merge), ('Save', self.perform_save)]
592
593
def perform_merge(self, window):
594
if self.merge_target is None:
595
try:
596
self.merge_target = self.window._get_merge_target()
597
except SelectCancelled:
598
return
599
tree = workingtree.WorkingTree.open(self.merge_target)
600
tree.lock_write()
601
try:
602
try:
603
merger, verified = _mod_merge.Merger.from_mergeable(tree,
604
self.directive, progress.DummyProgress())
605
merger.check_basis(True)
606
merger.merge_type = _mod_merge.Merge3Merger
607
conflict_count = merger.do_merge()
608
merger.set_pending()
609
if conflict_count == 0:
610
self.window._merge_successful()
611
else:
612
self.window._conflicts()
613
# There are conflicts to be resolved.
614
self.window.destroy()
615
except Exception, e:
616
self.window._handle_error(e)
617
finally:
618
tree.unlock()
619
620
621
def iter_changes_to_status(source, target):
383
384
385
def _iter_changes_to_status(source, target):
622
386
"""Determine the differences between trees.
623
387
624
This is a wrapper around iter_changes which just yields more
388
This is a wrapper around _iter_changes which just yields more
625
389
understandable results.
626
390
627
391
:param source: The source tree (basis tree)
634
398
renamed_and_modified = 'renamed and modified'
635
399
modified = 'modified'
636
400
kind_changed = 'kind changed'
637
missing = 'missing'
638
401
639
402
# TODO: Handle metadata changes
640
403
644
407
source.lock_read()
645
408
try:
646
409
for (file_id, paths, changed_content, versioned, parent_ids, names,
647
kinds, executables) in target.iter_changes(source):
410
kinds, executables) in target._iter_changes(source):
648
411
649
412
# Skip the root entry if it isn't very interesting
650
413
if parent_ids == (None, None):
655
418
source_marker = ''
656
419
else:
657
420
source_marker = osutils.kind_marker(kinds[0])
658
659
421
if kinds[1] is None:
660
if kinds[0] is None:
661
# We assume bzr will flag only files in that case,
662
# there may be a bzr bug there as only files seems to
663
# not receive any kind.
664
marker = osutils.kind_marker('file')
665
else:
666
marker = osutils.kind_marker(kinds[0])
422
assert kinds[0] is not None
423
marker = osutils.kind_marker(kinds[0])
667
424
else:
668
425
marker = osutils.kind_marker(kinds[1])
669
426
671
428
if real_path is None:
672
429
real_path = paths[0]
673
430
assert real_path is not None
431
display_path = real_path + marker
674
432
675
433
present_source = versioned[0] and kinds[0] is not None
676
434
present_target = versioned[1] and kinds[1] is not None
677
435
678
if kinds[0] is None and kinds[1] is None:
679
change_type = missing
680
display_path = real_path + marker
681
elif present_source != present_target:
436
if present_source != present_target:
682
437
if present_target:
683
438
change_type = added
684
439
else:
685
440
assert present_source
686
441
change_type = removed
687
display_path = real_path + marker
688
442
elif names[0] != names[1] or parent_ids[0] != parent_ids[1]:
689
443
# Renamed
690
444
if changed_content or executables[0] != executables[1]:
698
452
change_type = kind_changed
699
453
display_path = (paths[0] + source_marker
700
454
+ ' => ' + paths[1] + marker)
701
elif changed_content or executables[0] != executables[1]:
455
elif changed_content is True or executables[0] != executables[1]:
702
456
change_type = modified
703
display_path = real_path + marker
704
457
else:
705
458
assert False, "How did we get here?"
706
459
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0