/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 olive/__init__.py

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2007-05-17 16:12:27 UTC
  • mto: This revision was merged to the branch mainline in revision 201.
  • Revision ID: szilveszter.farkas@gmail.com-20070517161227-9e37lj2rm2t0cwj6
Some small modifications to Branch, Checkout and Info to support remote branches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/__init__.py
326
326
    def on_menuitem_branch_get_activate(self, widget):
327
327
        """ Branch/Get... menu handler. """
328
328
        from bzrlib.plugins.gtk.branch import BranchDialog
329
 
        branch = BranchDialog(self.get_path(), self.window)
 
329
        
 
330
        if self.remote:
 
331
            branch = BranchDialog(os.getcwd(), self.window, self.remote_branch.base)
 
332
        else:
 
333
            branch = BranchDialog(self.get_path(), self.window)
330
334
        response = branch.run()
331
335
        if response != gtk.RESPONSE_NONE:
332
336
            branch.hide()
333
 
        
 
337
            
334
338
            if response == gtk.RESPONSE_OK:
335
339
                self.refresh_right()
336
340
            
339
343
    def on_menuitem_branch_checkout_activate(self, widget):
340
344
        """ Branch/Checkout... menu handler. """
341
345
        from bzrlib.plugins.gtk.checkout import CheckoutDialog
342
 
        checkout = CheckoutDialog(self.get_path(), self.window)
 
346
        
 
347
        if self.remote:
 
348
            checkout = CheckoutDialog(os.getcwd(), self.window, self.remote_branch.base)
 
349
        else:
 
350
            checkout = CheckoutDialog(self.get_path(), self.window)
343
351
        response = checkout.run()
344
352
        if response != gtk.RESPONSE_NONE:
345
353
            checkout.hide()
421
429
        if branch_to.get_parent() is None:
422
430
            branch_to.set_parent(branch_from.base)
423
431
 
424
 
        #old_rh = branch_to.revision_history()
425
 
        #if tree_to is not None:
426
 
        #    tree_to.pull(branch_from)
427
 
        #else:
428
 
        #    branch_to.pull(branch_from)
429
432
        ret = branch_to.pull(branch_from)
430
433
        
431
434
        info_dialog(_('Pull successful'), _('%d revision(s) pulled.') % ret)
472
475
    def on_menuitem_branch_tags_activate(self, widget):
473
476
        """ Branch/Tags... menu handler. """
474
477
        from bzrlib.plugins.gtk.tags import TagsWindow
475
 
        window = TagsWindow(self.wt.branch, self.window)
 
478
        if not self.remote:
 
479
            window = TagsWindow(self.wt.branch, self.window)
 
480
        else:
 
481
            window = TagsWindow(self.remote_branch, self.window)
476
482
        window.show()
477
483
    
478
484
    def on_menuitem_file_annotate_activate(self, widget):
540
546
    def on_menuitem_stats_infos_activate(self, widget):
541
547
        """ Statistics/Informations... menu handler. """
542
548
        from info import OliveInfo
543
 
        info = OliveInfo(self.wt)
 
549
        if self.remote:
 
550
            info = OliveInfo(self.remote_branch)
 
551
        else:
 
552
            info = OliveInfo(self.wt.branch)
544
553
        info.display()
545
554
    
546
555
    def on_menuitem_stats_log_activate(self, widget):
601
610
                             selected=self.get_selected_right(),
602
611
                             app=self)
603
612
            # get the menu items
 
613
            m_open = menu.ui.get_widget('/context_right/open')
604
614
            m_add = menu.ui.get_widget('/context_right/add')
605
615
            m_remove = menu.ui.get_widget('/context_right/remove')
606
616
            m_rename = menu.ui.get_widget('/context_right/rename')
607
617
            m_revert = menu.ui.get_widget('/context_right/revert')
608
618
            m_commit = menu.ui.get_widget('/context_right/commit')
 
619
            m_annotate = menu.ui.get_widget('/context_right/annotate')
609
620
            m_diff = menu.ui.get_widget('/context_right/diff')
610
621
            # check if we're in a branch
611
622
            try:
612
623
                from bzrlib.branch import Branch
613
624
                Branch.open_containing(self.get_path())
614
 
                m_add.set_sensitive(True)
615
 
                m_remove.set_sensitive(True)
616
 
                m_rename.set_sensitive(True)
617
 
                m_revert.set_sensitive(True)
618
 
                m_commit.set_sensitive(True)
619
 
                m_diff.set_sensitive(True)
 
625
                if self.remote:
 
626
                    m_open.set_sensitive(False)
 
627
                    m_add.set_sensitive(False)
 
628
                    m_remove.set_sensitive(False)
 
629
                    m_rename.set_sensitive(False)
 
630
                    m_revert.set_sensitive(False)
 
631
                    m_commit.set_sensitive(False)
 
632
                    m_annotate.set_sensitive(False)
 
633
                    m_diff.set_sensitive(False)
 
634
                else:
 
635
                    m_open.set_sensitive(True)
 
636
                    m_add.set_sensitive(True)
 
637
                    m_remove.set_sensitive(True)
 
638
                    m_rename.set_sensitive(True)
 
639
                    m_revert.set_sensitive(True)
 
640
                    m_commit.set_sensitive(True)
 
641
                    m_annotate.set_sensitive(True)
 
642
                    m_diff.set_sensitive(True)
620
643
            except bzrerrors.NotBranchError:
 
644
                m_open.set_sensitive(True)
621
645
                m_add.set_sensitive(False)
622
646
                m_remove.set_sensitive(False)
623
647
                m_rename.set_sensitive(False)
624
648
                m_revert.set_sensitive(False)
625
649
                m_commit.set_sensitive(False)
 
650
                m_annotate.set_sensitive(False)
626
651
                m_diff.set_sensitive(False)
627
652
 
628
653
            menu.right_context_menu().popup(None, None, None, 0,
849
874
    
850
875
    def set_sensitivity(self):
851
876
        """ Set menu and toolbar sensitivity. """
852
 
        self.menuitem_branch_init.set_sensitive(self.notbranch)
853
 
        self.menuitem_branch_get.set_sensitive(self.notbranch)
854
 
        self.menuitem_branch_checkout.set_sensitive(self.notbranch)
855
 
        self.menuitem_branch_pull.set_sensitive(not self.notbranch)
856
 
        self.menuitem_branch_push.set_sensitive(not self.notbranch)
857
 
        self.menuitem_branch_revert.set_sensitive(not self.notbranch)
858
 
        self.menuitem_branch_merge.set_sensitive(not self.notbranch)
859
 
        self.menuitem_branch_commit.set_sensitive(not self.notbranch)
860
 
        self.menuitem_branch_tags.set_sensitive(not self.notbranch)
861
 
        self.menuitem_branch_status.set_sensitive(not self.notbranch)
862
 
        self.menuitem_branch_missing.set_sensitive(not self.notbranch)
863
 
        self.menuitem_branch_conflicts.set_sensitive(not self.notbranch)
864
 
        self.menuitem_stats.set_sensitive(not self.notbranch)
865
 
        self.menuitem_add_files.set_sensitive(not self.notbranch)
866
 
        self.menuitem_remove_files.set_sensitive(not self.notbranch)
867
 
        self.menuitem_file_make_directory.set_sensitive(not self.notbranch)
868
 
        self.menuitem_file_rename.set_sensitive(not self.notbranch)
869
 
        self.menuitem_file_move.set_sensitive(not self.notbranch)
870
 
        self.menuitem_file_annotate.set_sensitive(not self.notbranch)
871
 
        #self.menutoolbutton_diff.set_sensitive(True)
872
 
        self.toolbutton_diff.set_sensitive(not self.notbranch)
873
 
        self.toolbutton_log.set_sensitive(not self.notbranch)
874
 
        self.toolbutton_commit.set_sensitive(not self.notbranch)
875
 
        self.toolbutton_pull.set_sensitive(not self.notbranch)
876
 
        self.toolbutton_push.set_sensitive(not self.notbranch)
 
877
        if not self.remote:
 
878
            # We're local
 
879
            self.menuitem_branch_init.set_sensitive(self.notbranch)
 
880
            self.menuitem_branch_get.set_sensitive(self.notbranch)
 
881
            self.menuitem_branch_checkout.set_sensitive(self.notbranch)
 
882
            self.menuitem_branch_pull.set_sensitive(not self.notbranch)
 
883
            self.menuitem_branch_push.set_sensitive(not self.notbranch)
 
884
            self.menuitem_branch_revert.set_sensitive(not self.notbranch)
 
885
            self.menuitem_branch_merge.set_sensitive(not self.notbranch)
 
886
            self.menuitem_branch_commit.set_sensitive(not self.notbranch)
 
887
            self.menuitem_branch_tags.set_sensitive(not self.notbranch)
 
888
            self.menuitem_branch_status.set_sensitive(not self.notbranch)
 
889
            self.menuitem_branch_missing.set_sensitive(not self.notbranch)
 
890
            self.menuitem_branch_conflicts.set_sensitive(not self.notbranch)
 
891
            self.menuitem_stats.set_sensitive(not self.notbranch)
 
892
            self.menuitem_stats_diff.set_sensitive(not self.notbranch)
 
893
            self.menuitem_add_files.set_sensitive(not self.notbranch)
 
894
            self.menuitem_remove_files.set_sensitive(not self.notbranch)
 
895
            self.menuitem_file_make_directory.set_sensitive(not self.notbranch)
 
896
            self.menuitem_file_rename.set_sensitive(not self.notbranch)
 
897
            self.menuitem_file_move.set_sensitive(not self.notbranch)
 
898
            self.menuitem_file_annotate.set_sensitive(not self.notbranch)
 
899
            #self.menutoolbutton_diff.set_sensitive(True)
 
900
            self.toolbutton_diff.set_sensitive(not self.notbranch)
 
901
            self.toolbutton_log.set_sensitive(not self.notbranch)
 
902
            self.toolbutton_commit.set_sensitive(not self.notbranch)
 
903
            self.toolbutton_pull.set_sensitive(not self.notbranch)
 
904
            self.toolbutton_push.set_sensitive(not self.notbranch)
 
905
        else:
 
906
            # We're remote
 
907
            self.menuitem_branch_init.set_sensitive(False)
 
908
            self.menuitem_branch_get.set_sensitive(True)
 
909
            self.menuitem_branch_checkout.set_sensitive(True)
 
910
            self.menuitem_branch_pull.set_sensitive(False)
 
911
            self.menuitem_branch_push.set_sensitive(False)
 
912
            self.menuitem_branch_revert.set_sensitive(False)
 
913
            self.menuitem_branch_merge.set_sensitive(False)
 
914
            self.menuitem_branch_commit.set_sensitive(False)
 
915
            self.menuitem_branch_tags.set_sensitive(True)
 
916
            self.menuitem_branch_status.set_sensitive(False)
 
917
            self.menuitem_branch_missing.set_sensitive(False)
 
918
            self.menuitem_branch_conflicts.set_sensitive(False)
 
919
            self.menuitem_stats.set_sensitive(True)
 
920
            self.menuitem_stats_diff.set_sensitive(False)
 
921
            self.menuitem_add_files.set_sensitive(False)
 
922
            self.menuitem_remove_files.set_sensitive(False)
 
923
            self.menuitem_file_make_directory.set_sensitive(False)
 
924
            self.menuitem_file_rename.set_sensitive(False)
 
925
            self.menuitem_file_move.set_sensitive(False)
 
926
            self.menuitem_file_annotate.set_sensitive(False)
 
927
            #self.menutoolbutton_diff.set_sensitive(True)
 
928
            self.toolbutton_diff.set_sensitive(False)
 
929
            self.toolbutton_log.set_sensitive(True)
 
930
            self.toolbutton_commit.set_sensitive(False)
 
931
            self.toolbutton_pull.set_sensitive(False)
 
932
            self.toolbutton_push.set_sensitive(False)
877
933
    
878
934
    def refresh_left(self):
879
935
        """ Refresh the bookmark list. """