30
30
except ImportError:
33
from bzrlib import osutils
40
34
from bzrlib.diff import show_diff_trees, internal_diff
41
35
from bzrlib.errors import NoSuchFile
42
from bzrlib.patches import parse_patches
43
36
from bzrlib.trace import warning
44
from bzrlib.plugins.gtk import _i18n
45
37
from bzrlib.plugins.gtk.window import Window
46
from dialog import error_dialog, info_dialog, warning_dialog
49
class SelectCancelled(Exception):
54
class DiffFileView(gtk.ScrolledWindow):
55
"""Window for displaying diffs from a diff file"""
40
class DiffView(gtk.ScrolledWindow):
41
"""This is the soft and chewy filling for a DiffWindow."""
57
43
def __init__(self):
58
44
gtk.ScrolledWindow.__init__(self)
48
self.parent_tree = None
62
50
def construct(self):
63
51
self.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
73
61
self.buffer.set_language(gsl)
74
62
self.buffer.set_highlight(True)
76
self.sourceview = gtksourceview.SourceView(self.buffer)
64
sourceview = gtksourceview.SourceView(self.buffer)
78
66
self.buffer = gtk.TextBuffer()
79
self.sourceview = gtk.TextView(self.buffer)
67
sourceview = gtk.TextView(self.buffer)
81
self.sourceview.set_editable(False)
82
self.sourceview.modify_font(pango.FontDescription("Monospace"))
83
self.add(self.sourceview)
84
self.sourceview.show()
69
sourceview.set_editable(False)
70
sourceview.modify_font(pango.FontDescription("Monospace"))
87
75
def apply_gedit_colors(lang):
249
237
# self.parent_tree.unlock()
251
239
def show_diff(self, specific_files):
253
if specific_files is None:
254
self.buffer.set_text(self._diffs[None])
256
for specific_file in specific_files:
257
sections.append(self._diffs[specific_file])
258
self.buffer.set_text(''.join(sections))
261
class DiffView(DiffFileView):
262
"""This is the soft and chewy filling for a DiffWindow."""
265
DiffFileView.__init__(self)
267
self.parent_tree = None
269
def show_diff(self, specific_files):
270
"""Show the diff for the specified files"""
272
241
show_diff_trees(self.parent_tree, self.rev_tree, s, specific_files,
273
242
old_label='', new_label='',
321
290
column.add_attribute(cell, "text", 0)
322
291
self.treeview.append_column(column)
324
def set_diff_text(self, lines):
325
"""Set the current diff from a list of lines
327
:param lines: The diff to show, in unified diff format
329
293
# The diffs of the selected file: a scrollable source or
332
def set_diff_text_sections(self, sections):
333
if getattr(self, 'diff_view', None) is None:
334
self.diff_view = DiffFileView()
335
self.pack2(self.diff_view)
295
self.diff_view = DiffView()
296
self.pack2(self.diff_view)
336
297
self.diff_view.show()
337
for oldname, newname, patch in sections:
338
self.diff_view._diffs[newname] = str(patch)
341
self.model.append(None, [oldname, newname])
342
self.diff_view.show_diff(None)
344
299
def set_diff(self, rev_tree, parent_tree):
345
300
"""Set the differences showed by this window.
433
376
width = int(monitor.width * 0.66)
434
377
height = int(monitor.height * 0.66)
435
378
self.set_default_size(width, height)
436
self.construct(operations)
438
def construct(self, operations):
439
383
"""Construct the window contents."""
440
self.vbox = gtk.VBox()
443
384
self.diff = DiffWidget()
444
self.vbox.pack_end(self.diff, True, True, 0)
445
386
self.diff.show_all()
446
# Build after DiffWidget to connect signals
447
menubar = self._get_menu_bar()
448
self.vbox.pack_start(menubar, False, False, 0)
449
hbox = self._get_button_bar(operations)
451
self.vbox.pack_start(hbox, False, True, 0)
454
def _get_menu_bar(self):
455
menubar = gtk.MenuBar()
457
mb_view = gtk.MenuItem(_i18n("_View"))
458
mb_view_menu = gtk.Menu()
459
mb_view_wrapsource = gtk.CheckMenuItem(_i18n("Wrap _Long Lines"))
460
mb_view_wrapsource.connect('activate', self.diff._on_wraplines_toggled)
461
mb_view_wrapsource.show()
462
mb_view_menu.append(mb_view_wrapsource)
464
mb_view.set_submenu(mb_view_menu)
466
menubar.append(mb_view)
470
def _get_button_bar(self, operations):
471
"""Return a button bar to use.
473
:return: None, meaning that no button bar will be used.
475
if operations is None:
477
hbox = gtk.HButtonBox()
478
hbox.set_layout(gtk.BUTTONBOX_START)
479
for title, method in operations:
480
merge_button = gtk.Button(title)
482
merge_button.set_relief(gtk.RELIEF_NONE)
483
merge_button.connect("clicked", method)
484
hbox.pack_start(merge_button, expand=False, fill=True)
488
def _get_merge_target(self):
489
d = gtk.FileChooserDialog('Merge branch', self,
490
gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
491
buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
493
gtk.RESPONSE_CANCEL,))
496
if result != gtk.RESPONSE_OK:
497
raise SelectCancelled()
498
return d.get_current_folder_uri()
502
def _merge_successful(self):
503
# No conflicts found.
504
info_dialog(_i18n('Merge successful'),
505
_i18n('All changes applied successfully.'))
507
def _conflicts(self):
508
warning_dialog(_i18n('Conflicts encountered'),
509
_i18n('Please resolve the conflicts manually'
510
' before committing.'))
512
def _handle_error(self, e):
513
error_dialog('Error', str(e))
515
def _get_save_path(self, basename):
516
d = gtk.FileChooserDialog('Save As', self,
517
gtk.FILE_CHOOSER_ACTION_SAVE,
518
buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
520
gtk.RESPONSE_CANCEL,))
521
d.set_current_name(basename)
524
if result != gtk.RESPONSE_OK:
525
raise SelectCancelled()
526
return urlutils.local_path_from_url(d.get_uri())
530
388
def set_diff(self, description, rev_tree, parent_tree):
531
389
"""Set the differences showed by this window.
540
398
self.diff.set_file(file_path)
543
class DiffController(object):
545
def __init__(self, path, patch, window=None):
549
window = DiffWindow(operations=self._provide_operations())
550
self.initialize_window(window)
553
def initialize_window(self, window):
554
window.diff.set_diff_text_sections(self.get_diff_sections())
555
window.set_title(self.path + " - diff")
557
def get_diff_sections(self):
558
yield "Complete Diff", None, ''.join(self.patch)
559
for patch in parse_patches(self.patch):
560
oldname = patch.oldname.split('\t')[0]
561
newname = patch.newname.split('\t')[0]
562
yield oldname, newname, str(patch)
564
def perform_save(self, window):
566
save_path = self.window._get_save_path(osutils.basename(self.path))
567
except SelectCancelled:
569
source = open(self.path, 'rb')
571
target = open(save_path, 'wb')
573
osutils.pumpfile(source, target)
579
def _provide_operations(self):
580
return [('Save', self.perform_save)]
583
class MergeDirectiveController(DiffController):
585
def __init__(self, path, directive, window=None):
586
DiffController.__init__(self, path, directive.patch.splitlines(True),
588
self.directive = directive
589
self.merge_target = None
591
def _provide_operations(self):
592
return [('Merge', self.perform_merge), ('Save', self.perform_save)]
594
def perform_merge(self, window):
595
if self.merge_target is None:
597
self.merge_target = self.window._get_merge_target()
598
except SelectCancelled:
600
tree = workingtree.WorkingTree.open(self.merge_target)
604
merger, verified = _mod_merge.Merger.from_mergeable(tree,
605
self.directive, progress.DummyProgress())
606
merger.check_basis(True)
607
merger.merge_type = _mod_merge.Merge3Merger
608
conflict_count = merger.do_merge()
610
if conflict_count == 0:
611
self.window._merge_successful()
613
self.window._conflicts()
614
# There are conflicts to be resolved.
615
self.window.destroy()
617
self.window._handle_error(e)
622
def iter_changes_to_status(source, target):
401
def _iter_changes_to_status(source, target):
623
402
"""Determine the differences between trees.
625
This is a wrapper around iter_changes which just yields more
404
This is a wrapper around _iter_changes which just yields more
626
405
understandable results.
628
407
:param source: The source tree (basis tree)
added
removed
diff.py
