/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to diff.py

  • Committer: Jasper Groenewegen
  • Date: 2008-07-27 12:01:40 UTC
  • mfrom: (576.3.2 improve-merge)
  • mto: This revision was merged to the branch mainline in revision 579.
  • Revision ID: colbrac@xs4all.nl-20080727120140-1agdlzkc9fumjk5f
Merge merge dialog improvements

Show diffs side-by-side

added added

removed removed

Lines of Context:
diff.py
41
41
from bzrlib.errors import NoSuchFile
42
42
from bzrlib.patches import parse_patches
43
43
from bzrlib.trace import warning
 
44
from bzrlib.plugins.gtk import _i18n
44
45
from bzrlib.plugins.gtk.window import Window
45
46
from dialog import error_dialog, info_dialog, warning_dialog
46
47
 
72
73
            self.buffer.set_language(gsl)
73
74
            self.buffer.set_highlight(True)
74
75
 
75
 
            sourceview = gtksourceview.SourceView(self.buffer)
 
76
            self.sourceview = gtksourceview.SourceView(self.buffer)
76
77
        else:
77
78
            self.buffer = gtk.TextBuffer()
78
 
            sourceview = gtk.TextView(self.buffer)
 
79
            self.sourceview = gtk.TextView(self.buffer)
79
80
 
80
 
        sourceview.set_editable(False)
81
 
        sourceview.modify_font(pango.FontDescription("Monospace"))
82
 
        self.add(sourceview)
83
 
        sourceview.show()
 
81
        self.sourceview.set_editable(False)
 
82
        self.sourceview.modify_font(pango.FontDescription("Monospace"))
 
83
        self.add(self.sourceview)
 
84
        self.sourceview.show()
84
85
 
85
86
    @staticmethod
86
87
    def apply_gedit_colors(lang):
304
305
        scrollwin.set_shadow_type(gtk.SHADOW_IN)
305
306
        self.pack1(scrollwin)
306
307
        scrollwin.show()
307
 
 
 
308
        
308
309
        self.model = gtk.TreeStore(str, str)
309
310
        self.treeview = gtk.TreeView(self.model)
310
311
        self.treeview.set_headers_visible(False)
327
328
        """
328
329
        # The diffs of the  selected file: a scrollable source or
329
330
        # text view
330
 
        self.diff_view = DiffFileView()
 
331
 
 
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)
331
336
        self.diff_view.show()
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]
 
337
        for oldname, newname, patch in sections:
 
338
            self.diff_view._diffs[newname] = str(patch)
 
339
            if newname is None:
 
340
                newname = ''
338
341
            self.model.append(None, [oldname, newname])
339
 
            self.diff_view._diffs[newname] = str(patch)
340
342
        self.diff_view.show_diff(None)
341
343
 
342
344
    def set_diff(self, rev_tree, parent_tree):
345
347
        Compares the two trees and populates the window with the
346
348
        differences.
347
349
        """
348
 
        self.diff_view = DiffView()
349
 
        self.pack2(self.diff_view)
 
350
        if getattr(self, 'diff_view', None) is None:
 
351
            self.diff_view = DiffView()
 
352
            self.pack2(self.diff_view)
350
353
        self.diff_view.show()
351
354
        self.diff_view.set_trees(rev_tree, parent_tree)
352
355
        self.rev_tree = rev_tree
379
382
                self.model.append(titer, [ path, path ])
380
383
 
381
384
        self.treeview.expand_all()
 
385
        self.diff_view.show_diff(None)
382
386
 
383
387
    def set_file(self, file_path):
384
388
        """Select the current file to display"""
401
405
            return
402
406
        elif specific_files == [ "" ]:
403
407
            specific_files = None
404
 
 
 
408
        
405
409
        self.diff_view.show_diff(specific_files)
406
 
 
 
410
    
 
411
    def _on_wraplines_toggled(self, widget=None, wrap=False):
 
412
        """Callback for when the wrap lines checkbutton is toggled"""
 
413
        if wrap or widget.get_active():
 
414
            self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_WORD)
 
415
        else:
 
416
            self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_NONE)
407
417
 
408
418
class DiffWindow(Window):
409
419
    """Diff window.
412
422
    differences between two revisions on a branch.
413
423
    """
414
424
 
415
 
    def __init__(self, parent=None):
 
425
    def __init__(self, parent=None, operations=None):
416
426
        Window.__init__(self, parent)
417
427
        self.set_border_width(0)
418
428
        self.set_title("bzrk diff")
423
433
        width = int(monitor.width * 0.66)
424
434
        height = int(monitor.height * 0.66)
425
435
        self.set_default_size(width, height)
426
 
 
427
 
        self.construct()
428
 
 
429
 
    def construct(self):
 
436
        self.construct(operations)
 
437
 
 
438
    def construct(self, operations):
430
439
        """Construct the window contents."""
431
440
        self.vbox = gtk.VBox()
432
441
        self.add(self.vbox)
433
442
        self.vbox.show()
434
 
        hbox = self._get_button_bar()
435
 
        if hbox is not None:
436
 
            self.vbox.pack_start(hbox, expand=False, fill=True)
437
443
        self.diff = DiffWidget()
438
 
        self.vbox.add(self.diff)
 
444
        self.vbox.pack_end(self.diff, True, True, 0)
439
445
        self.diff.show_all()
440
 
 
441
 
    def _get_button_bar(self):
 
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)
 
450
        if hbox is not None:
 
451
            self.vbox.pack_start(hbox, False, True, 0)
 
452
        
 
453
    
 
454
    def _get_menu_bar(self):
 
455
        menubar = gtk.MenuBar()
 
456
        # View menu
 
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)
 
463
        mb_view.show()
 
464
        mb_view.set_submenu(mb_view_menu)
 
465
        mb_view.show()
 
466
        menubar.append(mb_view)
 
467
        menubar.show()
 
468
        return menubar
 
469
    
 
470
    def _get_button_bar(self, operations):
442
471
        """Return a button bar to use.
443
472
 
444
473
        :return: None, meaning that no button bar will be used.
445
474
        """
446
 
        return None
447
 
 
448
 
    def set_diff_text(self, description, lines):
449
 
        """Set the diff from a text.
450
 
 
451
 
        The diff must be in unified diff format, and will be parsed to
452
 
        determine filenames.
453
 
        """
454
 
        self.diff.set_diff_text(lines)
455
 
        self.set_title(description + " - bzrk diff")
 
475
        if operations is None:
 
476
            return None
 
477
        hbox = gtk.HButtonBox()
 
478
        hbox.set_layout(gtk.BUTTONBOX_START)
 
479
        for title, method in operations:
 
480
            merge_button = gtk.Button(title)
 
481
            merge_button.show()
 
482
            merge_button.set_relief(gtk.RELIEF_NONE)
 
483
            merge_button.connect("clicked", method)
 
484
            hbox.pack_start(merge_button, expand=False, fill=True)
 
485
        hbox.show()
 
486
        return hbox
 
487
 
 
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,
 
492
                                           gtk.STOCK_CANCEL,
 
493
                                           gtk.RESPONSE_CANCEL,))
 
494
        try:
 
495
            result = d.run()
 
496
            if result != gtk.RESPONSE_OK:
 
497
                raise SelectCancelled()
 
498
            return d.get_current_folder_uri()
 
499
        finally:
 
500
            d.destroy()
 
501
 
 
502
    def _merge_successful(self):
 
503
        # No conflicts found.
 
504
        info_dialog(_i18n('Merge successful'),
 
505
                    _i18n('All changes applied successfully.'))
 
506
 
 
507
    def _conflicts(self):
 
508
        warning_dialog(_i18n('Conflicts encountered'),
 
509
                       _i18n('Please resolve the conflicts manually'
 
510
                             ' before committing.'))
 
511
 
 
512
    def _handle_error(self, e):
 
513
        error_dialog('Error', str(e))
 
514
 
 
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,
 
519
                                           gtk.STOCK_CANCEL,
 
520
                                           gtk.RESPONSE_CANCEL,))
 
521
        d.set_current_name(basename)
 
522
        try:
 
523
            result = d.run()
 
524
            if result != gtk.RESPONSE_OK:
 
525
                raise SelectCancelled()
 
526
            return urlutils.local_path_from_url(d.get_uri())
 
527
        finally:
 
528
            d.destroy()
456
529
 
457
530
    def set_diff(self, description, rev_tree, parent_tree):
458
531
        """Set the differences showed by this window.
467
540
        self.diff.set_file(file_path)
468
541
 
469
542
 
470
 
class MergeDirectiveWindow(DiffWindow):
471
 
 
472
 
    def __init__(self, directive, path):
473
 
        DiffWindow.__init__(self, None)
474
 
        self._merge_target = None
 
543
class DiffController(object):
 
544
 
 
545
    def __init__(self, path, patch, window=None):
 
546
        self.path = path
 
547
        self.patch = patch
 
548
        if window is None:
 
549
            window = DiffWindow(operations=self._provide_operations())
 
550
            self.initialize_window(window)
 
551
        self.window = window
 
552
 
 
553
    def initialize_window(self, window):
 
554
        window.diff.set_diff_text_sections(self.get_diff_sections())
 
555
        window.set_title(self.path + " - diff")
 
556
 
 
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)
 
563
 
 
564
    def perform_save(self, window):
 
565
        try:
 
566
            save_path = self.window._get_save_path(osutils.basename(self.path))
 
567
        except SelectCancelled:
 
568
            return
 
569
        source = open(self.path, 'rb')
 
570
        try:
 
571
            target = open(save_path, 'wb')
 
572
            try:
 
573
                osutils.pumpfile(source, target)
 
574
            finally:
 
575
                target.close()
 
576
        finally:
 
577
            source.close()
 
578
 
 
579
    def _provide_operations(self):
 
580
        return [('Save', self.perform_save)]
 
581
 
 
582
 
 
583
class MergeDirectiveController(DiffController):
 
584
 
 
585
    def __init__(self, path, directive, window=None):
 
586
        DiffController.__init__(self, path, directive.patch.splitlines(True),
 
587
                                window)
475
588
        self.directive = directive
476
 
        self.path = path
477
 
 
478
 
    def _get_button_bar(self):
479
 
        """The button bar has only the Merge button"""
480
 
        merge_button = gtk.Button('Merge')
481
 
        merge_button.show()
482
 
        merge_button.set_relief(gtk.RELIEF_NONE)
483
 
        merge_button.connect("clicked", self.perform_merge)
484
 
 
485
 
        save_button = gtk.Button('Save')
486
 
        save_button.show()
487
 
        save_button.set_relief(gtk.RELIEF_NONE)
488
 
        save_button.connect("clicked", self.perform_save)
489
 
 
490
 
        hbox = gtk.HButtonBox()
491
 
        hbox.set_layout(gtk.BUTTONBOX_START)
492
 
        hbox.pack_start(merge_button, expand=False, fill=True)
493
 
        hbox.pack_start(save_button, expand=False, fill=True)
494
 
        hbox.show()
495
 
        return hbox
 
589
        self.merge_target = None
 
590
 
 
591
    def _provide_operations(self):
 
592
        return [('Merge', self.perform_merge), ('Save', self.perform_save)]
496
593
 
497
594
    def perform_merge(self, window):
498
 
        try:
499
 
            tree = self._get_merge_target()
500
 
        except SelectCancelled:
501
 
            return
 
595
        if self.merge_target is None:
 
596
            try:
 
597
                self.merge_target = self.window._get_merge_target()
 
598
            except SelectCancelled:
 
599
                return
 
600
        tree = workingtree.WorkingTree.open(self.merge_target)
502
601
        tree.lock_write()
503
602
        try:
504
603
            try:
509
608
                conflict_count = merger.do_merge()
510
609
                merger.set_pending()
511
610
                if conflict_count == 0:
512
 
                    # No conflicts found.
513
 
                    info_dialog(_('Merge successful'),
514
 
                                _('All changes applied successfully.'))
 
611
                    self.window._merge_successful()
515
612
                else:
 
613
                    self.window._conflicts()
516
614
                    # There are conflicts to be resolved.
517
 
                    warning_dialog(_('Conflicts encountered'),
518
 
                                   _('Please resolve the conflicts manually'
519
 
                                     ' before committing.'))
520
 
                self.destroy()
 
615
                self.window.destroy()
521
616
            except Exception, e:
522
 
                error_dialog('Error', str(e))
 
617
                self.window._handle_error(e)
523
618
        finally:
524
619
            tree.unlock()
525
620
 
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,
532
 
                                           gtk.STOCK_CANCEL,
533
 
                                           gtk.RESPONSE_CANCEL,))
534
 
        try:
535
 
            result = d.run()
536
 
            if result != gtk.RESPONSE_OK:
537
 
                raise SelectCancelled()
538
 
            uri = d.get_current_folder_uri()
539
 
        finally:
540
 
            d.destroy()
541
 
        return workingtree.WorkingTree.open(uri)
542
 
 
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,
547
 
                                           gtk.STOCK_CANCEL,
548
 
                                           gtk.RESPONSE_CANCEL,))
549
 
        d.set_current_name(osutils.basename(self.path))
550
 
        try:
551
 
            try:
552
 
                result = d.run()
553
 
                if result != gtk.RESPONSE_OK:
554
 
                    raise SelectCancelled()
555
 
                uri = d.get_uri()
556
 
            finally:
557
 
                d.destroy()
558
 
        except SelectCancelled:
559
 
            return
560
 
        source = open(self.path, 'rb')
561
 
        try:
562
 
            target = open(urlutils.local_path_from_url(uri), 'wb')
563
 
            try:
564
 
                target.write(source.read())
565
 
            finally:
566
 
                target.close()
567
 
        finally:
568
 
            source.close()
569
 
 
570
621
 
571
622
def iter_changes_to_status(source, target):
572
623
    """Determine the differences between trees.