/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: Aaron Bentley
  • Date: 2008-02-23 06:39:14 UTC
  • Revision ID: aaron@aaronbentley.com-20080223063914-49gdt7ed630rug9b
Add handle-patch script

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
 
52
45
 
53
46
 
54
47
class DiffFileView(gtk.ScrolledWindow):
55
 
    """Window for displaying diffs from a diff file"""
56
48
 
57
49
    def __init__(self):
58
50
        gtk.ScrolledWindow.__init__(self)
73
65
            self.buffer.set_language(gsl)
74
66
            self.buffer.set_highlight(True)
75
67
 
76
 
            self.sourceview = gtksourceview.SourceView(self.buffer)
 
68
            sourceview = gtksourceview.SourceView(self.buffer)
77
69
        else:
78
70
            self.buffer = gtk.TextBuffer()
79
 
            self.sourceview = gtk.TextView(self.buffer)
 
71
            sourceview = gtk.TextView(self.buffer)
80
72
 
81
 
        self.sourceview.set_editable(False)
82
 
        self.sourceview.modify_font(pango.FontDescription("Monospace"))
83
 
        self.add(self.sourceview)
84
 
        self.sourceview.show()
 
73
        sourceview.set_editable(False)
 
74
        sourceview.modify_font(pango.FontDescription("Monospace"))
 
75
        self.add(sourceview)
 
76
        sourceview.show()
85
77
 
86
78
    @staticmethod
87
79
    def apply_gedit_colors(lang):
228
220
#        self.parent_tree.lock_read()
229
221
#        self.rev_tree.lock_read()
230
222
#        try:
231
 
#            self.delta = iter_changes_to_status(self.parent_tree, self.rev_tree)
 
223
#            self.delta = _iter_changes_to_status(self.parent_tree, self.rev_tree)
232
224
#            self.path_to_status = {}
233
225
#            self.path_to_diff = {}
234
226
#            source_inv = self.parent_tree.inventory
267
259
        self.parent_tree = None
268
260
 
269
261
    def show_diff(self, specific_files):
270
 
        """Show the diff for the specified files"""
271
262
        s = StringIO()
272
263
        show_diff_trees(self.parent_tree, self.rev_tree, s, specific_files,
273
264
                        old_label='', new_label='',
305
296
        scrollwin.set_shadow_type(gtk.SHADOW_IN)
306
297
        self.pack1(scrollwin)
307
298
        scrollwin.show()
308
 
        
 
299
 
309
300
        self.model = gtk.TreeStore(str, str)
310
301
        self.treeview = gtk.TreeView(self.model)
311
302
        self.treeview.set_headers_visible(False)
322
313
        self.treeview.append_column(column)
323
314
 
324
315
    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
 
        """
329
316
        # The diffs of the  selected file: a scrollable source or
330
317
        # 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)
 
318
        self.diff_view = DiffFileView()
336
319
        self.diff_view.show()
337
 
        for oldname, newname, patch in sections:
 
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]
 
326
            self.model.append(None, [oldname, newname])
338
327
            self.diff_view._diffs[newname] = str(patch)
339
 
            if newname is None:
340
 
                newname = ''
341
 
            self.model.append(None, [oldname, newname])
342
328
        self.diff_view.show_diff(None)
343
329
 
344
330
    def set_diff(self, rev_tree, parent_tree):
347
333
        Compares the two trees and populates the window with the
348
334
        differences.
349
335
        """
350
 
        if getattr(self, 'diff_view', None) is None:
351
 
            self.diff_view = DiffView()
352
 
            self.pack2(self.diff_view)
 
336
        self.diff_view = DiffView()
 
337
        self.pack2(self.diff_view)
353
338
        self.diff_view.show()
354
339
        self.diff_view.set_trees(rev_tree, parent_tree)
355
340
        self.rev_tree = rev_tree
382
367
                self.model.append(titer, [ path, path ])
383
368
 
384
369
        self.treeview.expand_all()
385
 
        self.diff_view.show_diff(None)
386
370
 
387
371
    def set_file(self, file_path):
388
 
        """Select the current file to display"""
389
372
        tv_path = None
390
373
        for data in self.model:
391
374
            for child in data.iterchildren():
405
388
            return
406
389
        elif specific_files == [ "" ]:
407
390
            specific_files = None
408
 
        
 
391
 
409
392
        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)
 
393
 
417
394
 
418
395
class DiffWindow(Window):
419
396
    """Diff window.
422
399
    differences between two revisions on a branch.
423
400
    """
424
401
 
425
 
    def __init__(self, parent=None, operations=None):
 
402
    def __init__(self, parent=None):
426
403
        Window.__init__(self, parent)
427
404
        self.set_border_width(0)
428
405
        self.set_title("bzrk diff")
433
410
        width = int(monitor.width * 0.66)
434
411
        height = int(monitor.height * 0.66)
435
412
        self.set_default_size(width, height)
436
 
        self.construct(operations)
437
 
 
438
 
    def construct(self, operations):
 
413
 
 
414
        self.construct()
 
415
 
 
416
    def construct(self):
439
417
        """Construct the window contents."""
440
418
        self.vbox = gtk.VBox()
441
419
        self.add(self.vbox)
442
420
        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)
443
424
        self.diff = DiffWidget()
444
 
        self.vbox.pack_end(self.diff, True, True, 0)
 
425
        self.vbox.add(self.diff)
445
426
        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):
471
 
        """Return a button bar to use.
472
 
 
473
 
        :return: None, meaning that no button bar will be used.
 
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")
 
434
 
 
435
    def set_diff(self, description, rev_tree, parent_tree):
 
436
        """Set the differences showed by this window.
 
437
 
 
438
        Compares the two trees and populates the window with the
 
439
        differences.
474
440
        """
475
 
        if operations is None:
476
 
            return None
 
441
        self.diff.set_diff(rev_tree, parent_tree)
 
442
        self.set_title(description + " - bzrk diff")
 
443
 
 
444
    def set_file(self, file_path):
 
445
        self.diff.set_file(file_path)
 
446
 
 
447
 
 
448
class MergeDirectiveWindow(DiffWindow):
 
449
 
 
450
    def __init__(self, directive, parent=None):
 
451
        DiffWindow.__init__(self, parent)
 
452
        self._merge_target = None
 
453
        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
 
477
461
        hbox = gtk.HButtonBox()
478
462
        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)
 
463
        hbox.pack_start(merge_button, expand=False, fill=True)
485
464
        hbox.show()
486
465
        return hbox
487
466
 
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))
 
467
    def perform_merge(self, window):
 
468
        try:
 
469
            tree = self._get_merge_target()
567
470
        except SelectCancelled:
568
471
            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
472
        tree.lock_write()
602
473
        try:
603
474
            try:
608
479
                conflict_count = merger.do_merge()
609
480
                merger.set_pending()
610
481
                if conflict_count == 0:
611
 
                    self.window._merge_successful()
 
482
                    # No conflicts found.
 
483
                    info_dialog(_('Merge successful'),
 
484
                                _('All changes applied successfully.'))
612
485
                else:
613
 
                    self.window._conflicts()
614
486
                    # There are conflicts to be resolved.
615
 
                self.window.destroy()
 
487
                    warning_dialog(_('Conflicts encountered'),
 
488
                                   _('Please resolve the conflicts manually'
 
489
                                     ' before committing.'))
 
490
                self.destroy()
616
491
            except Exception, e:
617
 
                self.window._handle_error(e)
 
492
                error_dialog('Error', str(e))
618
493
        finally:
619
494
            tree.unlock()
620
495
 
621
 
 
622
 
def iter_changes_to_status(source, target):
 
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):
623
516
    """Determine the differences between trees.
624
517
 
625
 
    This is a wrapper around iter_changes which just yields more
 
518
    This is a wrapper around _iter_changes which just yields more
626
519
    understandable results.
627
520
 
628
521
    :param source: The source tree (basis tree)
644
537
        source.lock_read()
645
538
        try:
646
539
            for (file_id, paths, changed_content, versioned, parent_ids, names,
647
 
                 kinds, executables) in target.iter_changes(source):
 
540
                 kinds, executables) in target._iter_changes(source):
648
541
 
649
542
                # Skip the root entry if it isn't very interesting
650
543
                if parent_ids == (None, None):