292
277
self.buffer.set_text(decoded.encode('UTF-8'))
295
class DiffWidget(gtk.HPaned):
280
class DiffWindow(Window):
283
This object represents and manages a single window containing the
284
differences between two revisions on a branch.
300
super(DiffWidget, self).__init__()
287
def __init__(self, parent=None):
288
Window.__init__(self, parent)
289
self.set_border_width(0)
290
self.set_title("bzrk diff")
292
# Use two thirds of the screen by default
293
screen = self.get_screen()
294
monitor = screen.get_monitor_geometry(0)
295
width = int(monitor.width * 0.66)
296
height = int(monitor.height * 0.66)
297
self.set_default_size(width, height)
301
def _get_button_bar(self):
305
"""Construct the window contents."""
306
# The window consists of a pane containing: the
307
# hierarchical list of files on the left, and the diff
308
# for the currently selected file on the right.
309
self.vbox = gtk.VBox()
312
self.pane = gtk.HPaned()
313
self.vbox.pack_end(self.pane, expand=True, fill=True)
314
hbox = self._get_button_bar()
316
self.vbox.pack_start(hbox, expand=False, fill=True)
302
319
# The file hierarchy: a scrollable treeview
303
320
scrollwin = gtk.ScrolledWindow()
304
321
scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
305
322
scrollwin.set_shadow_type(gtk.SHADOW_IN)
306
self.pack1(scrollwin)
323
self.pane.pack1(scrollwin)
309
326
self.model = gtk.TreeStore(str, str)
321
338
column.add_attribute(cell, "text", 0)
322
339
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
341
def set_diff_text(self, description, lines):
329
342
# The diffs of the selected file: a scrollable source or
332
def set_diff_text_sections(self, sections):
333
344
self.diff_view = DiffFileView()
334
345
self.diff_view.show()
335
self.pack2(self.diff_view)
336
for oldname, newname, patch in sections:
346
self.pane.pack2(self.diff_view)
347
self.model.append(None, [ "Complete Diff", "" ])
348
self.diff_view._diffs[None] = ''.join(lines)
349
for patch in parse_patches(lines):
350
oldname = patch.oldname.split('\t')[0]
351
newname = patch.newname.split('\t')[0]
352
self.model.append(None, [oldname, newname])
337
353
self.diff_view._diffs[newname] = str(patch)
340
self.model.append(None, [oldname, newname])
341
354
self.diff_view.show_diff(None)
343
def set_diff(self, rev_tree, parent_tree):
356
def set_diff(self, description, rev_tree, parent_tree):
344
357
"""Set the differences showed by this window.
346
359
Compares the two trees and populates the window with the
362
# The diffs of the selected file: a scrollable source or
349
364
self.diff_view = DiffView()
350
self.pack2(self.diff_view)
365
self.pane.pack2(self.diff_view)
351
366
self.diff_view.show()
352
367
self.diff_view.set_trees(rev_tree, parent_tree)
353
368
self.rev_tree = rev_tree
406
422
self.diff_view.show_diff(specific_files)
409
class DiffWindow(Window):
412
This object represents and manages a single window containing the
413
differences between two revisions on a branch.
416
def __init__(self, parent=None, operations=None):
417
Window.__init__(self, parent)
418
self.set_border_width(0)
419
self.set_title("bzrk diff")
421
# Use two thirds of the screen by default
422
screen = self.get_screen()
423
monitor = screen.get_monitor_geometry(0)
424
width = int(monitor.width * 0.66)
425
height = int(monitor.height * 0.66)
426
self.set_default_size(width, height)
427
self.construct(operations)
429
def construct(self, operations):
430
"""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
self.diff = DiffWidget()
438
self.vbox.add(self.diff)
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:
425
class MergeDirectiveWindow(DiffWindow):
427
def _get_button_bar(self):
428
merge_button = gtk.Button('Merge')
430
merge_button.set_relief(gtk.RELIEF_NONE)
448
431
hbox = gtk.HButtonBox()
449
432
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)
433
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
def set_diff(self, description, rev_tree, parent_tree):
502
"""Set the differences showed by this window.
504
Compares the two trees and populates the window with the
507
self.diff.set_diff(rev_tree, parent_tree)
508
self.set_title(description + " - bzrk diff")
510
def set_file(self, file_path):
511
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):
438
def _iter_changes_to_status(source, target):
594
439
"""Determine the differences between trees.
596
This is a wrapper around iter_changes which just yields more
441
This is a wrapper around _iter_changes which just yields more
597
442
understandable results.
599
444
:param source: The source tree (basis tree)
added
removed
diff.py
