/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: Jelmer Vernooij
  • Date: 2006-09-06 00:22:31 UTC
  • mto: (0.8.83 merge)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060906002231-c94c6bd9d195713f
Fix a few more bits that I broke earlier.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/__init__.py
230
230
        
231
231
        # Check if current directory is versioned
232
232
        try:
 
233
            from bzrlib.branch import Branch
233
234
            Branch.open_containing(self.comm.get_path())
234
235
            # Activate some items
235
236
            self.comm.menuitem_branch_init.set_sensitive(False)
252
253
            self.comm.toolbutton_commit.set_sensitive(True)
253
254
            self.comm.toolbutton_pull.set_sensitive(True)
254
255
            self.comm.toolbutton_push.set_sensitive(True)
255
 
        except NotBranchError:
 
256
        except errors.NotBranchError:
256
257
            # Deactivate some items
257
258
            self.comm.menuitem_branch_init.set_sensitive(True)
258
259
            self.comm.menuitem_branch_get.set_sensitive(False)
450
451
        
451
452
        # Check if current directory is a branch
452
453
        try:
453
 
            br = is_branch(self.get_path())
454
 
        except errors.PermissionDenied:
455
 
            pass
456
 
        else:
457
 
            if br:
458
 
                # Activate some items
459
 
                self.menuitem_branch_init.set_sensitive(False)
460
 
                self.menuitem_branch_get.set_sensitive(True)
461
 
                self.menuitem_branch_checkout.set_sensitive(True)
462
 
                self.menuitem_branch_pull.set_sensitive(True)
463
 
                self.menuitem_branch_push.set_sensitive(True)
464
 
                self.menuitem_branch_commit.set_sensitive(True)
465
 
                self.menuitem_branch_status.set_sensitive(True)
466
 
                self.menuitem_branch_missing.set_sensitive(True)
467
 
                self.menuitem_stats.set_sensitive(True)
468
 
                self.menuitem_add_files.set_sensitive(True)
469
 
                self.menuitem_remove_files.set_sensitive(True)
470
 
                self.menuitem_file_make_directory.set_sensitive(True)
471
 
                self.menuitem_file_rename.set_sensitive(True)
472
 
                self.menuitem_file_move.set_sensitive(True)
473
 
                #self.menutoolbutton_diff.set_sensitive(True)
474
 
                self.toolbutton_diff.set_sensitive(True)
475
 
                self.toolbutton_log.set_sensitive(True)
476
 
                self.toolbutton_commit.set_sensitive(True)
477
 
                self.toolbutton_pull.set_sensitive(True)
478
 
                self.toolbutton_push.set_sensitive(True)
479
 
            else:
480
 
                # Deactivate some items
481
 
                self.menuitem_branch_init.set_sensitive(True)
482
 
                self.menuitem_branch_get.set_sensitive(False)
483
 
                self.menuitem_branch_checkout.set_sensitive(False)
484
 
                self.menuitem_branch_pull.set_sensitive(False)
485
 
                self.menuitem_branch_push.set_sensitive(False)
486
 
                self.menuitem_branch_commit.set_sensitive(False)
487
 
                self.menuitem_branch_status.set_sensitive(False)
488
 
                self.menuitem_branch_missing.set_sensitive(False)
489
 
                self.menuitem_stats.set_sensitive(False)
490
 
                self.menuitem_add_files.set_sensitive(False)
491
 
                self.menuitem_remove_files.set_sensitive(False)
492
 
                self.menuitem_file_make_directory.set_sensitive(False)
493
 
                self.menuitem_file_rename.set_sensitive(False)
494
 
                self.menuitem_file_move.set_sensitive(False)
495
 
                #self.menutoolbutton_diff.set_sensitive(False)
496
 
                self.toolbutton_diff.set_sensitive(False)
497
 
                self.toolbutton_log.set_sensitive(False)
498
 
                self.toolbutton_commit.set_sensitive(False)
499
 
                self.toolbutton_pull.set_sensitive(False)
500
 
                self.toolbutton_push.set_sensitive(False)
 
454
            from bzrlib.branch import Branch
 
455
            Branch.open_containing(self.get_path())
 
456
            # Activate some items
 
457
            self.menuitem_branch_init.set_sensitive(False)
 
458
            self.menuitem_branch_get.set_sensitive(True)
 
459
            self.menuitem_branch_checkout.set_sensitive(True)
 
460
            self.menuitem_branch_pull.set_sensitive(True)
 
461
            self.menuitem_branch_push.set_sensitive(True)
 
462
            self.menuitem_branch_commit.set_sensitive(True)
 
463
            self.menuitem_branch_status.set_sensitive(True)
 
464
            self.menuitem_branch_missing.set_sensitive(True)
 
465
            self.menuitem_stats.set_sensitive(True)
 
466
            self.menuitem_add_files.set_sensitive(True)
 
467
            self.menuitem_remove_files.set_sensitive(True)
 
468
            self.menuitem_file_make_directory.set_sensitive(True)
 
469
            self.menuitem_file_rename.set_sensitive(True)
 
470
            self.menuitem_file_move.set_sensitive(True)
 
471
            #self.menutoolbutton_diff.set_sensitive(True)
 
472
            self.toolbutton_diff.set_sensitive(True)
 
473
            self.toolbutton_log.set_sensitive(True)
 
474
            self.toolbutton_commit.set_sensitive(True)
 
475
            self.toolbutton_pull.set_sensitive(True)
 
476
            self.toolbutton_push.set_sensitive(True)
 
477
        except errors.NotBranchError:
 
478
            # Deactivate some items
 
479
            self.menuitem_branch_init.set_sensitive(True)
 
480
            self.menuitem_branch_get.set_sensitive(False)
 
481
            self.menuitem_branch_checkout.set_sensitive(False)
 
482
            self.menuitem_branch_pull.set_sensitive(False)
 
483
            self.menuitem_branch_push.set_sensitive(False)
 
484
            self.menuitem_branch_commit.set_sensitive(False)
 
485
            self.menuitem_branch_status.set_sensitive(False)
 
486
            self.menuitem_branch_missing.set_sensitive(False)
 
487
            self.menuitem_stats.set_sensitive(False)
 
488
            self.menuitem_add_files.set_sensitive(False)
 
489
            self.menuitem_remove_files.set_sensitive(False)
 
490
            self.menuitem_file_make_directory.set_sensitive(False)
 
491
            self.menuitem_file_rename.set_sensitive(False)
 
492
            self.menuitem_file_move.set_sensitive(False)
 
493
            #self.menutoolbutton_diff.set_sensitive(False)
 
494
            self.toolbutton_diff.set_sensitive(False)
 
495
            self.toolbutton_log.set_sensitive(False)
 
496
            self.toolbutton_commit.set_sensitive(False)
 
497
            self.toolbutton_pull.set_sensitive(False)
 
498
            self.toolbutton_push.set_sensitive(False)
501
499
        
502
500
        self.set_busy(self.treeview_right, False)
503
501
 
638
636
    
639
637
    try:
640
638
        tree1 = WorkingTree.open_containing(filename)[0]
641
 
    except NotBranchError:
 
639
    except errors.NotBranchError:
642
640
        return 'unknown'
643
641
    
644
642
    branch = tree1.branch