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