292
261
self.buffer.set_text(decoded.encode('UTF-8'))
295
class DiffWidget(gtk.HPaned):
264
class DiffWindow(Window):
267
This object represents and manages a single window containing the
268
differences between two revisions on a branch.
300
super(DiffWidget, self).__init__()
271
def __init__(self, parent=None):
272
Window.__init__(self, parent)
273
self.set_border_width(0)
274
self.set_title("bzrk diff")
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)
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.
302
294
# The file hierarchy: a scrollable treeview
303
295
scrollwin = gtk.ScrolledWindow()
304
296
scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
305
297
scrollwin.set_shadow_type(gtk.SHADOW_IN)
306
self.pack1(scrollwin)
298
pane.pack1(scrollwin)
309
301
self.model = gtk.TreeStore(str, str)
321
313
column.add_attribute(cell, "text", 0)
322
314
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
316
# 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)
318
self.diff_view = DiffView()
319
pane.pack2(self.diff_view)
336
320
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
def set_diff(self, rev_tree, parent_tree):
322
def set_diff(self, description, rev_tree, parent_tree):
345
323
"""Set the differences showed by this window.
347
325
Compares the two trees and populates the window with the
350
if getattr(self, 'diff_view', None) is None:
351
self.diff_view = DiffView()
352
self.pack2(self.diff_view)
353
self.diff_view.show()
354
328
self.diff_view.set_trees(rev_tree, parent_tree)
355
329
self.rev_tree = rev_tree
356
330
self.parent_tree = parent_tree
409
382
self.diff_view.show_diff(specific_files)
412
class DiffWindow(Window):
415
This object represents and manages a single window containing the
416
differences between two revisions on a branch.
419
def __init__(self, parent=None, operations=None):
420
Window.__init__(self, parent)
421
self.set_border_width(0)
422
self.set_title("bzrk diff")
424
# Use two thirds of the screen by default
425
screen = self.get_screen()
426
monitor = screen.get_monitor_geometry(0)
427
width = int(monitor.width * 0.66)
428
height = int(monitor.height * 0.66)
429
self.set_default_size(width, height)
430
self.construct(operations)
432
def construct(self, operations):
433
"""Construct the window contents."""
434
self.vbox = gtk.VBox()
437
hbox = self._get_button_bar(operations)
439
self.vbox.pack_start(hbox, expand=False, fill=True)
440
self.diff = DiffWidget()
441
self.vbox.add(self.diff)
444
def _get_button_bar(self, operations):
445
"""Return a button bar to use.
447
:return: None, meaning that no button bar will be used.
449
if operations is None:
451
hbox = gtk.HButtonBox()
452
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)
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
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)
578
merger, verified = _mod_merge.Merger.from_mergeable(tree,
579
self.directive, progress.DummyProgress())
580
merger.check_basis(True)
581
merger.merge_type = _mod_merge.Merge3Merger
582
conflict_count = merger.do_merge()
584
if conflict_count == 0:
585
self.window._merge_successful()
587
self.window._conflicts()
588
# There are conflicts to be resolved.
589
self.window.destroy()
591
self.window._handle_error(e)
596
def iter_changes_to_status(source, target):
385
def _iter_changes_to_status(source, target):
597
386
"""Determine the differences between trees.
599
This is a wrapper around iter_changes which just yields more
388
This is a wrapper around _iter_changes which just yields more
600
389
understandable results.
602
391
:param source: The source tree (basis tree)
added
removed
diff.py
