/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: Szilveszter Farkas (Phanatic)
  • Date: 2008-03-03 17:05:53 UTC
  • mto: (423.1.22 trunk) (435.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 435.
  • Revision ID: szilveszter.farkas@gmail.com-20080303170553-t56b61can228uqqm
Fix for #137172 (thanks to Mario del Pozo).

Show diffs side-by-side

added added

removed removed

Lines of Context:
diff.py
30
30
except ImportError:
31
31
    have_gconf = False
32
32
 
33
 
from bzrlib import (
34
 
    merge as _mod_merge,
35
 
    osutils,
36
 
    progress,
37
 
    urlutils,
38
 
    workingtree,
39
 
)
 
33
from bzrlib import merge as _mod_merge, osutils, progress, workingtree
40
34
from bzrlib.diff import show_diff_trees, internal_diff
41
35
from bzrlib.errors import NoSuchFile
42
36
from bzrlib.patches import parse_patches
43
37
from bzrlib.trace import warning
44
 
from bzrlib.plugins.gtk import _i18n
45
38
from bzrlib.plugins.gtk.window import Window
46
39
from dialog import error_dialog, info_dialog, warning_dialog
47
40
 
73
66
            self.buffer.set_language(gsl)
74
67
            self.buffer.set_highlight(True)
75
68
 
76
 
            self.sourceview = gtksourceview.SourceView(self.buffer)
 
69
            sourceview = gtksourceview.SourceView(self.buffer)
77
70
        else:
78
71
            self.buffer = gtk.TextBuffer()
79
 
            self.sourceview = gtk.TextView(self.buffer)
 
72
            sourceview = gtk.TextView(self.buffer)
80
73
 
81
 
        self.sourceview.set_editable(False)
82
 
        self.sourceview.modify_font(pango.FontDescription("Monospace"))
83
 
        self.add(self.sourceview)
84
 
        self.sourceview.show()
 
74
        sourceview.set_editable(False)
 
75
        sourceview.modify_font(pango.FontDescription("Monospace"))
 
76
        self.add(sourceview)
 
77
        sourceview.show()
85
78
 
86
79
    @staticmethod
87
80
    def apply_gedit_colors(lang):
228
221
#        self.parent_tree.lock_read()
229
222
#        self.rev_tree.lock_read()
230
223
#        try:
231
 
#            self.delta = iter_changes_to_status(self.parent_tree, self.rev_tree)
 
224
#            self.delta = _iter_changes_to_status(self.parent_tree, self.rev_tree)
232
225
#            self.path_to_status = {}
233
226
#            self.path_to_diff = {}
234
227
#            source_inv = self.parent_tree.inventory
305
298
        scrollwin.set_shadow_type(gtk.SHADOW_IN)
306
299
        self.pack1(scrollwin)
307
300
        scrollwin.show()
308
 
        
 
301
 
309
302
        self.model = gtk.TreeStore(str, str)
310
303
        self.treeview = gtk.TreeView(self.model)
311
304
        self.treeview.set_headers_visible(False)
328
321
        """
329
322
        # The diffs of the  selected file: a scrollable source or
330
323
        # text view
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)
 
324
        self.diff_view = DiffFileView()
336
325
        self.diff_view.show()
337
 
        for oldname, newname, patch in sections:
 
326
        self.pack2(self.diff_view)
 
327
        self.model.append(None, [ "Complete Diff", "" ])
 
328
        self.diff_view._diffs[None] = ''.join(lines)
 
329
        for patch in parse_patches(lines):
 
330
            oldname = patch.oldname.split('\t')[0]
 
331
            newname = patch.newname.split('\t')[0]
 
332
            self.model.append(None, [oldname, newname])
338
333
            self.diff_view._diffs[newname] = str(patch)
339
 
            if newname is None:
340
 
                newname = ''
341
 
            self.model.append(None, [oldname, newname])
342
334
        self.diff_view.show_diff(None)
343
335
 
344
336
    def set_diff(self, rev_tree, parent_tree):
347
339
        Compares the two trees and populates the window with the
348
340
        differences.
349
341
        """
350
 
        if getattr(self, 'diff_view', None) is None:
351
 
            self.diff_view = DiffView()
352
 
            self.pack2(self.diff_view)
 
342
        self.diff_view = DiffView()
 
343
        self.pack2(self.diff_view)
353
344
        self.diff_view.show()
354
345
        self.diff_view.set_trees(rev_tree, parent_tree)
355
346
        self.rev_tree = rev_tree
382
373
                self.model.append(titer, [ path, path ])
383
374
 
384
375
        self.treeview.expand_all()
385
 
        self.diff_view.show_diff(None)
386
376
 
387
377
    def set_file(self, file_path):
388
378
        """Select the current file to display"""
405
395
            return
406
396
        elif specific_files == [ "" ]:
407
397
            specific_files = None
408
 
        
 
398
 
409
399
        self.diff_view.show_diff(specific_files)
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)
 
400
 
417
401
 
418
402
class DiffWindow(Window):
419
403
    """Diff window.
422
406
    differences between two revisions on a branch.
423
407
    """
424
408
 
425
 
    def __init__(self, parent=None, operations=None):
 
409
    def __init__(self, parent=None):
426
410
        Window.__init__(self, parent)
427
411
        self.set_border_width(0)
428
412
        self.set_title("bzrk diff")
433
417
        width = int(monitor.width * 0.66)
434
418
        height = int(monitor.height * 0.66)
435
419
        self.set_default_size(width, height)
436
 
        self.construct(operations)
437
 
 
438
 
    def construct(self, operations):
 
420
 
 
421
        self.construct()
 
422
 
 
423
    def construct(self):
439
424
        """Construct the window contents."""
440
425
        self.vbox = gtk.VBox()
441
426
        self.add(self.vbox)
442
427
        self.vbox.show()
 
428
        hbox = self._get_button_bar()
 
429
        if hbox is not None:
 
430
            self.vbox.pack_start(hbox, expand=False, fill=True)
443
431
        self.diff = DiffWidget()
444
 
        self.vbox.pack_end(self.diff, True, True, 0)
 
432
        self.vbox.add(self.diff)
445
433
        self.diff.show_all()
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):
 
434
 
 
435
    def _get_button_bar(self):
471
436
        """Return a button bar to use.
472
437
 
473
438
        :return: None, meaning that no button bar will be used.
474
439
        """
475
 
        if operations is None:
476
 
            return None
 
440
        return None
 
441
 
 
442
    def set_diff_text(self, description, lines):
 
443
        """Set the diff from a text.
 
444
 
 
445
        The diff must be in unified diff format, and will be parsed to
 
446
        determine filenames.
 
447
        """
 
448
        self.diff.set_diff_text(lines)
 
449
        self.set_title(description + " - bzrk diff")
 
450
 
 
451
    def set_diff(self, description, rev_tree, parent_tree):
 
452
        """Set the differences showed by this window.
 
453
 
 
454
        Compares the two trees and populates the window with the
 
455
        differences.
 
456
        """
 
457
        self.diff.set_diff(rev_tree, parent_tree)
 
458
        self.set_title(description + " - bzrk diff")
 
459
 
 
460
    def set_file(self, file_path):
 
461
        self.diff.set_file(file_path)
 
462
 
 
463
 
 
464
class MergeDirectiveWindow(DiffWindow):
 
465
 
 
466
    def __init__(self, directive, parent=None):
 
467
        DiffWindow.__init__(self, parent)
 
468
        self._merge_target = None
 
469
        self.directive = directive
 
470
 
 
471
    def _get_button_bar(self):
 
472
        """The button bar has only the Merge button"""
 
473
        merge_button = gtk.Button('Merge')
 
474
        merge_button.show()
 
475
        merge_button.set_relief(gtk.RELIEF_NONE)
 
476
        merge_button.connect("clicked", self.perform_merge)
 
477
 
477
478
        hbox = gtk.HButtonBox()
478
479
        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)
 
480
        hbox.pack_start(merge_button, expand=False, fill=True)
485
481
        hbox.show()
486
482
        return hbox
487
483
 
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()
529
 
 
530
 
    def set_diff(self, description, rev_tree, parent_tree):
531
 
        """Set the differences showed by this window.
532
 
 
533
 
        Compares the two trees and populates the window with the
534
 
        differences.
535
 
        """
536
 
        self.diff.set_diff(rev_tree, parent_tree)
537
 
        self.set_title(description + " - bzrk diff")
538
 
 
539
 
    def set_file(self, file_path):
540
 
        self.diff.set_file(file_path)
541
 
 
542
 
 
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))
 
484
    def perform_merge(self, window):
 
485
        try:
 
486
            tree = self._get_merge_target()
567
487
        except SelectCancelled:
568
488
            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)
588
 
        self.directive = directive
589
 
        self.merge_target = None
590
 
 
591
 
    def _provide_operations(self):
592
 
        return [('Merge', self.perform_merge), ('Save', self.perform_save)]
593
 
 
594
 
    def perform_merge(self, window):
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)
601
489
        tree.lock_write()
602
490
        try:
603
491
            try:
608
496
                conflict_count = merger.do_merge()
609
497
                merger.set_pending()
610
498
                if conflict_count == 0:
611
 
                    self.window._merge_successful()
 
499
                    # No conflicts found.
 
500
                    info_dialog(_('Merge successful'),
 
501
                                _('All changes applied successfully.'))
612
502
                else:
613
 
                    self.window._conflicts()
614
503
                    # There are conflicts to be resolved.
615
 
                self.window.destroy()
 
504
                    warning_dialog(_('Conflicts encountered'),
 
505
                                   _('Please resolve the conflicts manually'
 
506
                                     ' before committing.'))
 
507
                self.destroy()
616
508
            except Exception, e:
617
 
                self.window._handle_error(e)
 
509
                error_dialog('Error', str(e))
618
510
        finally:
619
511
            tree.unlock()
620
512
 
621
 
 
622
 
def iter_changes_to_status(source, target):
 
513
    def _get_merge_target(self):
 
514
        if self._merge_target is not None:
 
515
            return self._merge_target
 
516
        d = gtk.FileChooserDialog('Merge branch', self,
 
517
                                  gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
 
518
                                  buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
 
519
                                           gtk.STOCK_CANCEL,
 
520
                                           gtk.RESPONSE_CANCEL,))
 
521
        try:
 
522
            result = d.run()
 
523
            if result != gtk.RESPONSE_OK:
 
524
                raise SelectCancelled()
 
525
            uri = d.get_current_folder_uri()
 
526
        finally:
 
527
            d.destroy()
 
528
        return workingtree.WorkingTree.open(uri)
 
529
 
 
530
 
 
531
def _iter_changes_to_status(source, target):
623
532
    """Determine the differences between trees.
624
533
 
625
 
    This is a wrapper around iter_changes which just yields more
 
534
    This is a wrapper around _iter_changes which just yields more
626
535
    understandable results.
627
536
 
628
537
    :param source: The source tree (basis tree)
644
553
        source.lock_read()
645
554
        try:
646
555
            for (file_id, paths, changed_content, versioned, parent_ids, names,
647
 
                 kinds, executables) in target.iter_changes(source):
 
556
                 kinds, executables) in target._iter_changes(source):
648
557
 
649
558
                # Skip the root entry if it isn't very interesting
650
559
                if parent_ids == (None, None):