/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: Jelmer Vernooij
  • Date: 2008-06-29 15:47:30 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629154730-xfsotoxwkiytf0ph
Pass graph object rather than full repository to linegraph.

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
 
221
228
#        self.parent_tree.lock_read()
222
229
#        self.rev_tree.lock_read()
223
230
#        try:
224
 
#            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)
225
232
#            self.path_to_status = {}
226
233
#            self.path_to_diff = {}
227
234
#            source_inv = self.parent_tree.inventory
321
328
        """
322
329
        # The diffs of the  selected file: a scrollable source or
323
330
        # text view
 
331
 
 
332
    def set_diff_text_sections(self, sections):
324
333
        self.diff_view = DiffFileView()
325
334
        self.diff_view.show()
326
335
        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]
 
336
        for oldname, newname, patch in sections:
 
337
            self.diff_view._diffs[newname] = str(patch)
 
338
            if newname is None:
 
339
                newname = ''
332
340
            self.model.append(None, [oldname, newname])
333
 
            self.diff_view._diffs[newname] = str(patch)
334
341
        self.diff_view.show_diff(None)
335
342
 
336
343
    def set_diff(self, rev_tree, parent_tree):
406
413
    differences between two revisions on a branch.
407
414
    """
408
415
 
409
 
    def __init__(self, parent=None):
 
416
    def __init__(self, parent=None, operations=None):
410
417
        Window.__init__(self, parent)
411
418
        self.set_border_width(0)
412
419
        self.set_title("bzrk diff")
417
424
        width = int(monitor.width * 0.66)
418
425
        height = int(monitor.height * 0.66)
419
426
        self.set_default_size(width, height)
420
 
 
421
 
        self.construct()
422
 
 
423
 
    def construct(self):
 
427
        self.construct(operations)
 
428
 
 
429
    def construct(self, operations):
424
430
        """Construct the window contents."""
425
431
        self.vbox = gtk.VBox()
426
432
        self.add(self.vbox)
427
433
        self.vbox.show()
428
 
        hbox = self._get_button_bar()
 
434
        hbox = self._get_button_bar(operations)
429
435
        if hbox is not None:
430
436
            self.vbox.pack_start(hbox, expand=False, fill=True)
431
437
        self.diff = DiffWidget()
432
438
        self.vbox.add(self.diff)
433
439
        self.diff.show_all()
434
440
 
435
 
    def _get_button_bar(self):
 
441
    def _get_button_bar(self, operations):
436
442
        """Return a button bar to use.
437
443
 
438
444
        :return: None, meaning that no button bar will be used.
439
445
        """
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")
 
446
        if operations is None:
 
447
            return None
 
448
        hbox = gtk.HButtonBox()
 
449
        hbox.set_layout(gtk.BUTTONBOX_START)
 
450
        for title, method in operations:
 
451
            merge_button = gtk.Button(title)
 
452
            merge_button.show()
 
453
            merge_button.set_relief(gtk.RELIEF_NONE)
 
454
            merge_button.connect("clicked", method)
 
455
            hbox.pack_start(merge_button, expand=False, fill=True)
 
456
        hbox.show()
 
457
        return hbox
 
458
 
 
459
    def _get_merge_target(self):
 
460
        d = gtk.FileChooserDialog('Merge branch', self,
 
461
                                  gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
 
462
                                  buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
 
463
                                           gtk.STOCK_CANCEL,
 
464
                                           gtk.RESPONSE_CANCEL,))
 
465
        try:
 
466
            result = d.run()
 
467
            if result != gtk.RESPONSE_OK:
 
468
                raise SelectCancelled()
 
469
            return d.get_current_folder_uri()
 
470
        finally:
 
471
            d.destroy()
 
472
 
 
473
    def _merge_successful(self):
 
474
        # No conflicts found.
 
475
        info_dialog(_i18n('Merge successful'),
 
476
                    _i18n('All changes applied successfully.'))
 
477
 
 
478
    def _conflicts(self):
 
479
        warning_dialog(_i18n('Conflicts encountered'),
 
480
                       _i18n('Please resolve the conflicts manually'
 
481
                             ' before committing.'))
 
482
 
 
483
    def _handle_error(self, e):
 
484
        error_dialog('Error', str(e))
 
485
 
 
486
    def _get_save_path(self, basename):
 
487
        d = gtk.FileChooserDialog('Save As', self,
 
488
                                  gtk.FILE_CHOOSER_ACTION_SAVE,
 
489
                                  buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
 
490
                                           gtk.STOCK_CANCEL,
 
491
                                           gtk.RESPONSE_CANCEL,))
 
492
        d.set_current_name(basename)
 
493
        try:
 
494
            result = d.run()
 
495
            if result != gtk.RESPONSE_OK:
 
496
                raise SelectCancelled()
 
497
            return urlutils.local_path_from_url(d.get_uri())
 
498
        finally:
 
499
            d.destroy()
450
500
 
451
501
    def set_diff(self, description, rev_tree, parent_tree):
452
502
        """Set the differences showed by this window.
461
511
        self.diff.set_file(file_path)
462
512
 
463
513
 
464
 
class MergeDirectiveWindow(DiffWindow):
465
 
 
466
 
    def __init__(self, directive, parent=None):
467
 
        DiffWindow.__init__(self, parent)
468
 
        self._merge_target = None
 
514
class DiffController(object):
 
515
 
 
516
    def __init__(self, path, patch, window=None):
 
517
        self.path = path
 
518
        self.patch = patch
 
519
        if window is None:
 
520
            window = DiffWindow(operations=self._provide_operations())
 
521
            self.initialize_window(window)
 
522
        self.window = window
 
523
 
 
524
    def initialize_window(self, window):
 
525
        window.diff.set_diff_text_sections(self.get_diff_sections())
 
526
        window.set_title(self.path + " - diff")
 
527
 
 
528
    def get_diff_sections(self):
 
529
        yield "Complete Diff", None, ''.join(self.patch)
 
530
        for patch in parse_patches(self.patch):
 
531
            oldname = patch.oldname.split('\t')[0]
 
532
            newname = patch.newname.split('\t')[0]
 
533
            yield oldname, newname, str(patch)
 
534
 
 
535
    def perform_save(self, window):
 
536
        try:
 
537
            save_path = self.window._get_save_path(osutils.basename(self.path))
 
538
        except SelectCancelled:
 
539
            return
 
540
        source = open(self.path, 'rb')
 
541
        try:
 
542
            target = open(save_path, 'wb')
 
543
            try:
 
544
                osutils.pumpfile(source, target)
 
545
            finally:
 
546
                target.close()
 
547
        finally:
 
548
            source.close()
 
549
 
 
550
    def _provide_operations(self):
 
551
        return [('Save', self.perform_save)]
 
552
 
 
553
 
 
554
class MergeDirectiveController(DiffController):
 
555
 
 
556
    def __init__(self, path, directive, window=None):
 
557
        DiffController.__init__(self, path, directive.patch.splitlines(True),
 
558
                                window)
469
559
        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
 
 
478
 
        hbox = gtk.HButtonBox()
479
 
        hbox.set_layout(gtk.BUTTONBOX_START)
480
 
        hbox.pack_start(merge_button, expand=False, fill=True)
481
 
        hbox.show()
482
 
        return hbox
 
560
        self.merge_target = None
 
561
 
 
562
    def _provide_operations(self):
 
563
        return [('Merge', self.perform_merge), ('Save', self.perform_save)]
483
564
 
484
565
    def perform_merge(self, window):
485
 
        try:
486
 
            tree = self._get_merge_target()
487
 
        except SelectCancelled:
488
 
            return
 
566
        if self.merge_target is None:
 
567
            try:
 
568
                self.merge_target = self.window._get_merge_target()
 
569
            except SelectCancelled:
 
570
                return
 
571
        tree = workingtree.WorkingTree.open(self.merge_target)
489
572
        tree.lock_write()
490
573
        try:
491
574
            try:
496
579
                conflict_count = merger.do_merge()
497
580
                merger.set_pending()
498
581
                if conflict_count == 0:
499
 
                    # No conflicts found.
500
 
                    info_dialog(_('Merge successful'),
501
 
                                _('All changes applied successfully.'))
 
582
                    self.window._merge_successful()
502
583
                else:
 
584
                    self.window._conflicts()
503
585
                    # There are conflicts to be resolved.
504
 
                    warning_dialog(_('Conflicts encountered'),
505
 
                                   _('Please resolve the conflicts manually'
506
 
                                     ' before committing.'))
507
 
                self.destroy()
 
586
                self.window.destroy()
508
587
            except Exception, e:
509
 
                error_dialog('Error', str(e))
 
588
                self.window._handle_error(e)
510
589
        finally:
511
590
            tree.unlock()
512
591
 
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):
 
592
 
 
593
def iter_changes_to_status(source, target):
532
594
    """Determine the differences between trees.
533
595
 
534
 
    This is a wrapper around _iter_changes which just yields more
 
596
    This is a wrapper around iter_changes which just yields more
535
597
    understandable results.
536
598
 
537
599
    :param source: The source tree (basis tree)
553
615
        source.lock_read()
554
616
        try:
555
617
            for (file_id, paths, changed_content, versioned, parent_ids, names,
556
 
                 kinds, executables) in target._iter_changes(source):
 
618
                 kinds, executables) in target.iter_changes(source):
557
619
 
558
620
                # Skip the root entry if it isn't very interesting
559
621
                if parent_ids == (None, None):