329
328
# 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)
330
self.diff_view = DiffFileView()
336
331
self.diff_view.show()
337
for oldname, newname, patch in sections:
332
self.pack2(self.diff_view)
333
self.model.append(None, [ "Complete Diff", "" ])
334
self.diff_view._diffs[None] = ''.join(lines)
335
for patch in parse_patches(lines):
336
oldname = patch.oldname.split('\t')[0]
337
newname = patch.newname.split('\t')[0]
338
self.model.append(None, [oldname, newname])
338
339
self.diff_view._diffs[newname] = str(patch)
341
self.model.append(None, [oldname, newname])
342
340
self.diff_view.show_diff(None)
344
342
def set_diff(self, rev_tree, parent_tree):
427
423
width = int(monitor.width * 0.66)
428
424
height = int(monitor.height * 0.66)
429
425
self.set_default_size(width, height)
430
self.construct(operations)
432
def construct(self, operations):
433
430
"""Construct the window contents."""
434
431
self.vbox = gtk.VBox()
435
432
self.add(self.vbox)
437
hbox = self._get_button_bar(operations)
434
hbox = self._get_button_bar()
438
435
if hbox is not None:
439
436
self.vbox.pack_start(hbox, expand=False, fill=True)
440
437
self.diff = DiffWidget()
441
438
self.vbox.add(self.diff)
442
439
self.diff.show_all()
444
def _get_button_bar(self, operations):
441
def _get_button_bar(self):
445
442
"""Return a button bar to use.
447
444
:return: None, meaning that no button bar will be used.
449
if operations is None:
448
def set_diff_text(self, description, lines):
449
"""Set the diff from a text.
451
The diff must be in unified diff format, and will be parsed to
454
self.diff.set_diff_text(lines)
455
self.set_title(description + " - bzrk diff")
457
def set_diff(self, description, rev_tree, parent_tree):
458
"""Set the differences showed by this window.
460
Compares the two trees and populates the window with the
463
self.diff.set_diff(rev_tree, parent_tree)
464
self.set_title(description + " - bzrk diff")
466
def set_file(self, file_path):
467
self.diff.set_file(file_path)
470
class MergeDirectiveWindow(DiffWindow):
472
def __init__(self, directive, path):
473
DiffWindow.__init__(self, None)
474
self._merge_target = None
475
self.directive = directive
478
def _get_button_bar(self):
479
"""The button bar has only the Merge button"""
480
merge_button = gtk.Button('Merge')
482
merge_button.set_relief(gtk.RELIEF_NONE)
483
merge_button.connect("clicked", self.perform_merge)
485
save_button = gtk.Button('Save')
487
save_button.set_relief(gtk.RELIEF_NONE)
488
save_button.connect("clicked", self.perform_save)
451
490
hbox = gtk.HButtonBox()
452
491
hbox.set_layout(gtk.BUTTONBOX_START)
453
for title, method in operations:
454
merge_button = gtk.Button(title)
456
merge_button.set_relief(gtk.RELIEF_NONE)
457
merge_button.connect("clicked", method)
458
hbox.pack_start(merge_button, expand=False, fill=True)
492
hbox.pack_start(merge_button, expand=False, fill=True)
493
hbox.pack_start(save_button, expand=False, fill=True)
462
def _get_merge_target(self):
463
d = gtk.FileChooserDialog('Merge branch', self,
464
gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
465
buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
467
gtk.RESPONSE_CANCEL,))
470
if result != gtk.RESPONSE_OK:
471
raise SelectCancelled()
472
return d.get_current_folder_uri()
476
def _merge_successful(self):
477
# No conflicts found.
478
info_dialog(_i18n('Merge successful'),
479
_i18n('All changes applied successfully.'))
481
def _conflicts(self):
482
warning_dialog(_i18n('Conflicts encountered'),
483
_i18n('Please resolve the conflicts manually'
484
' before committing.'))
486
def _handle_error(self, e):
487
error_dialog('Error', str(e))
489
def _get_save_path(self, basename):
490
d = gtk.FileChooserDialog('Save As', self,
491
gtk.FILE_CHOOSER_ACTION_SAVE,
492
buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
494
gtk.RESPONSE_CANCEL,))
495
d.set_current_name(basename)
498
if result != gtk.RESPONSE_OK:
499
raise SelectCancelled()
500
return urlutils.local_path_from_url(d.get_uri())
504
def set_diff(self, description, rev_tree, parent_tree):
505
"""Set the differences showed by this window.
507
Compares the two trees and populates the window with the
510
self.diff.set_diff(rev_tree, parent_tree)
511
self.set_title(description + " - bzrk diff")
513
def set_file(self, file_path):
514
self.diff.set_file(file_path)
517
class DiffController(object):
519
def __init__(self, path, patch, window=None):
523
window = DiffWindow(operations=self._provide_operations())
524
self.initialize_window(window)
527
def initialize_window(self, window):
528
window.diff.set_diff_text_sections(self.get_diff_sections())
529
window.set_title(self.path + " - diff")
531
def get_diff_sections(self):
532
yield "Complete Diff", None, ''.join(self.patch)
533
for patch in parse_patches(self.patch):
534
oldname = patch.oldname.split('\t')[0]
535
newname = patch.newname.split('\t')[0]
536
yield oldname, newname, str(patch)
538
def perform_save(self, window):
540
save_path = self.window._get_save_path(osutils.basename(self.path))
541
except SelectCancelled:
543
source = open(self.path, 'rb')
545
target = open(save_path, 'wb')
547
osutils.pumpfile(source, target)
553
def _provide_operations(self):
554
return [('Save', self.perform_save)]
557
class MergeDirectiveController(DiffController):
559
def __init__(self, path, directive, window=None):
560
DiffController.__init__(self, path, directive.patch.splitlines(True),
562
self.directive = directive
563
self.merge_target = None
565
def _provide_operations(self):
566
return [('Merge', self.perform_merge), ('Save', self.perform_save)]
568
497
def perform_merge(self, window):
569
if self.merge_target is None:
571
self.merge_target = self.window._get_merge_target()
572
except SelectCancelled:
574
tree = workingtree.WorkingTree.open(self.merge_target)
499
tree = self._get_merge_target()
500
except SelectCancelled:
575
502
tree.lock_write()
582
509
conflict_count = merger.do_merge()
583
510
merger.set_pending()
584
511
if conflict_count == 0:
585
self.window._merge_successful()
512
# No conflicts found.
513
info_dialog(_('Merge successful'),
514
_('All changes applied successfully.'))
587
self.window._conflicts()
588
516
# There are conflicts to be resolved.
589
self.window.destroy()
517
warning_dialog(_('Conflicts encountered'),
518
_('Please resolve the conflicts manually'
519
' before committing.'))
590
521
except Exception, e:
591
self.window._handle_error(e)
522
error_dialog('Error', str(e))
596
def iter_changes_to_status(source, target):
526
def _get_merge_target(self):
527
if self._merge_target is not None:
528
return self._merge_target
529
d = gtk.FileChooserDialog('Merge branch', self,
530
gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
531
buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
533
gtk.RESPONSE_CANCEL,))
536
if result != gtk.RESPONSE_OK:
537
raise SelectCancelled()
538
uri = d.get_current_folder_uri()
541
return workingtree.WorkingTree.open(uri)
543
def perform_save(self, window):
544
d = gtk.FileChooserDialog('Save As', self,
545
gtk.FILE_CHOOSER_ACTION_SAVE,
546
buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
548
gtk.RESPONSE_CANCEL,))
549
d.set_current_name(osutils.basename(self.path))
553
if result != gtk.RESPONSE_OK:
554
raise SelectCancelled()
558
except SelectCancelled:
560
source = open(self.path, 'rb')
562
target = open(urlutils.local_path_from_url(uri), 'wb')
564
target.write(source.read())
571
def _iter_changes_to_status(source, target):
597
572
"""Determine the differences between trees.
599
This is a wrapper around iter_changes which just yields more
574
This is a wrapper around _iter_changes which just yields more
600
575
understandable results.
602
577
:param source: The source tree (basis tree)
added
removed
diff.py
