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)
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
self.diff_view = DiffFileView()
295
self.diff_view = DiffView()
296
self.pack2(self.diff_view)
334
297
self.diff_view.show()
335
self.pack2(self.diff_view)
336
for oldname, newname, patch in sections:
337
self.diff_view._diffs[newname] = str(patch)
340
self.model.append(None, [oldname, newname])
341
self.diff_view.show_diff(None)
343
299
def set_diff(self, rev_tree, parent_tree):
344
300
"""Set the differences showed by this window.
424
376
width = int(monitor.width * 0.66)
425
377
height = int(monitor.height * 0.66)
426
378
self.set_default_size(width, height)
427
self.construct(operations)
429
def construct(self, operations):
430
383
"""Construct the window contents."""
431
self.vbox = gtk.VBox()
434
hbox = self._get_button_bar(operations)
436
self.vbox.pack_start(hbox, expand=False, fill=True)
437
384
self.diff = DiffWidget()
438
self.vbox.add(self.diff)
439
386
self.diff.show_all()
441
def _get_button_bar(self, operations):
442
"""Return a button bar to use.
444
:return: None, meaning that no button bar will be used.
446
if operations is None:
448
hbox = gtk.HButtonBox()
449
hbox.set_layout(gtk.BUTTONBOX_START)
450
for title, method in operations:
451
merge_button = gtk.Button(title)
453
merge_button.set_relief(gtk.RELIEF_NONE)
454
merge_button.connect("clicked", method)
455
hbox.pack_start(merge_button, expand=False, fill=True)
459
def _get_merge_target(self):
460
d = gtk.FileChooserDialog('Merge branch', self,
461
gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
462
buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
464
gtk.RESPONSE_CANCEL,))
467
if result != gtk.RESPONSE_OK:
468
raise SelectCancelled()
469
return d.get_current_folder_uri()
473
def _merge_successful(self):
474
# No conflicts found.
475
info_dialog(_i18n('Merge successful'),
476
_i18n('All changes applied successfully.'))
478
def _conflicts(self):
479
warning_dialog(_i18n('Conflicts encountered'),
480
_i18n('Please resolve the conflicts manually'
481
' before committing.'))
483
def _handle_error(self, e):
484
error_dialog('Error', str(e))
486
def _get_save_path(self, basename):
487
d = gtk.FileChooserDialog('Save As', self,
488
gtk.FILE_CHOOSER_ACTION_SAVE,
489
buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
491
gtk.RESPONSE_CANCEL,))
492
d.set_current_name(basename)
495
if result != gtk.RESPONSE_OK:
496
raise SelectCancelled()
497
return urlutils.local_path_from_url(d.get_uri())
501
388
def set_diff(self, description, rev_tree, parent_tree):
502
389
"""Set the differences showed by this window.
511
398
self.diff.set_file(file_path)
514
class DiffController(object):
516
def __init__(self, path, patch, window=None):
520
window = DiffWindow(operations=self._provide_operations())
521
self.initialize_window(window)
524
def initialize_window(self, window):
525
window.diff.set_diff_text_sections(self.get_diff_sections())
526
window.set_title(self.path + " - diff")
528
def get_diff_sections(self):
529
yield "Complete Diff", None, ''.join(self.patch)
530
for patch in parse_patches(self.patch):
531
oldname = patch.oldname.split('\t')[0]
532
newname = patch.newname.split('\t')[0]
533
yield oldname, newname, str(patch)
535
def perform_save(self, window):
537
save_path = self.window._get_save_path(osutils.basename(self.path))
538
except SelectCancelled:
540
source = open(self.path, 'rb')
542
target = open(save_path, 'wb')
544
osutils.pumpfile(source, target)
550
def _provide_operations(self):
551
return [('Save', self.perform_save)]
554
class MergeDirectiveController(DiffController):
556
def __init__(self, path, directive, window=None):
557
DiffController.__init__(self, path, directive.patch.splitlines(True),
559
self.directive = directive
560
self.merge_target = None
562
def _provide_operations(self):
563
return [('Merge', self.perform_merge), ('Save', self.perform_save)]
565
def perform_merge(self, window):
566
if self.merge_target is None:
568
self.merge_target = self.window._get_merge_target()
569
except SelectCancelled:
571
tree = workingtree.WorkingTree.open(self.merge_target)
575
merger, verified = _mod_merge.Merger.from_mergeable(tree,
576
self.directive, progress.DummyProgress())
577
merger.check_basis(True)
578
merger.merge_type = _mod_merge.Merge3Merger
579
conflict_count = merger.do_merge()
581
if conflict_count == 0:
582
self.window._merge_successful()
584
self.window._conflicts()
585
# There are conflicts to be resolved.
586
self.window.destroy()
588
self.window._handle_error(e)
593
def iter_changes_to_status(source, target):
401
def _iter_changes_to_status(source, target):
594
402
"""Determine the differences between trees.
596
This is a wrapper around iter_changes which just yields more
404
This is a wrapper around _iter_changes which just yields more
597
405
understandable results.
599
407
:param source: The source tree (basis tree)
615
423
source.lock_read()
617
425
for (file_id, paths, changed_content, versioned, parent_ids, names,
618
kinds, executables) in target.iter_changes(source):
426
kinds, executables) in target._iter_changes(source):
620
428
# Skip the root entry if it isn't very interesting
621
429
if parent_ids == (None, None):
added
removed
diff.py
