/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: 2007-01-30 18:29:07 UTC
  • mfrom: (126.1.12 bzr-gtk)
  • Revision ID: jelmer@samba.org-20070130182907-joz7srz9rjyso6hm
Merge fixes from Szilvester.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/__init__.py
32
32
import gtk.glade
33
33
 
34
34
from bzrlib.branch import Branch
35
 
import bzrlib.errors as errors
 
35
import bzrlib.errors as bzrerrors
36
36
from bzrlib.workingtree import WorkingTree
37
37
 
38
 
from dialog import error_dialog, info_dialog
 
38
from dialog import error_dialog, info_dialog, warning_dialog
39
39
from errors import show_bzr_error
40
40
from guifiles import GLADEFILENAME
41
41
 
94
94
        self.menuitem_branch_checkout = self.toplevel.get_widget('menuitem_branch_checkout')
95
95
        self.menuitem_branch_pull = self.toplevel.get_widget('menuitem_branch_pull')
96
96
        self.menuitem_branch_push = self.toplevel.get_widget('menuitem_branch_push')
 
97
        self.menuitem_branch_revert = self.toplevel.get_widget('menuitem_branch_revert')
97
98
        self.menuitem_branch_merge = self.toplevel.get_widget('menuitem_branch_merge')
98
99
        self.menuitem_branch_commit = self.toplevel.get_widget('menuitem_branch_commit')
99
100
        self.menuitem_branch_status = self.toplevel.get_widget('menuitem_branch_status')
131
132
                "on_menuitem_branch_initialize_activate": self.on_menuitem_branch_initialize_activate,
132
133
                "on_menuitem_branch_get_activate": self.on_menuitem_branch_get_activate,
133
134
                "on_menuitem_branch_checkout_activate": self.on_menuitem_branch_checkout_activate,
 
135
                "on_menuitem_branch_revert_activate": self.on_menuitem_branch_revert_activate,
134
136
                "on_menuitem_branch_merge_activate": self.on_menuitem_branch_merge_activate,
135
137
                "on_menuitem_branch_commit_activate": self.on_menuitem_branch_commit_activate,
136
138
                "on_menuitem_branch_push_activate": self.on_menuitem_branch_push_activate,
198
200
        
199
201
        try:
200
202
            self.wt, self.wtpath = WorkingTree.open_containing(self.path)
201
 
        except (errors.NotBranchError, errors.NoWorkingTree):
 
203
        except (bzrerrors.NotBranchError, bzrerrors.NoWorkingTree):
202
204
            self.notbranch = True
203
205
        
204
206
        self.statusbar.push(self.context_id, path)
307
309
        push = OlivePush(self.wt.branch)
308
310
        push.display()
309
311
    
 
312
    @show_bzr_error
 
313
    def on_menuitem_branch_revert_activate(self, widget):
 
314
        """ Branch/Revert all changes menu handler. """
 
315
        ret = self.wt.revert([])
 
316
        if ret:
 
317
            warning_dialog(_('Conflicts detected'),
 
318
                           _('Please have a look at the working tree before continuing.'))
 
319
        else:
 
320
            info_dialog(_('Revert successful'),
 
321
                        _('All files reverted to last revision.'))
 
322
        self.refresh_right()
 
323
    
310
324
    def on_menuitem_branch_status_activate(self, widget):
311
325
        """ Branch/Status... menu handler. """
312
326
        from status import OliveStatus
323
337
 
324
338
        try:
325
339
            existing_bzrdir = bzrdir.BzrDir.open(self.path)
326
 
        except errors.NotBranchError:
 
340
        except bzrerrors.NotBranchError:
327
341
            bzrdir.BzrDir.create_branch_convenience(self.path)
328
342
        else:
329
343
            if existing_bzrdir.has_branch():
330
344
                if existing_bzrdir.has_workingtree():
331
 
                    raise errors.AlreadyBranchError(self.path)
 
345
                    raise bzrerrors.AlreadyBranchError(self.path)
332
346
                else:
333
 
                    raise errors.BranchExistsWithoutWorkingTree(self.path)
 
347
                    raise bzrerrors.BranchExistsWithoutWorkingTree(self.path)
334
348
            else:
335
349
                existing_bzrdir.create_branch()
336
350
                existing_bzrdir.create_workingtree()
464
478
            m_add = menu.ui.get_widget('/context_right/add')
465
479
            m_remove = menu.ui.get_widget('/context_right/remove')
466
480
            m_rename = menu.ui.get_widget('/context_right/rename')
 
481
            m_revert = menu.ui.get_widget('/context_right/revert')
467
482
            m_commit = menu.ui.get_widget('/context_right/commit')
468
483
            m_diff = menu.ui.get_widget('/context_right/diff')
469
484
            # check if we're in a branch
473
488
                m_add.set_sensitive(True)
474
489
                m_remove.set_sensitive(True)
475
490
                m_rename.set_sensitive(True)
 
491
                m_revert.set_sensitive(True)
476
492
                m_commit.set_sensitive(True)
477
493
                m_diff.set_sensitive(True)
478
 
            except errors.NotBranchError:
 
494
            except bzrerrors.NotBranchError:
479
495
                m_add.set_sensitive(False)
480
496
                m_remove.set_sensitive(False)
481
497
                m_rename.set_sensitive(False)
 
498
                m_revert.set_sensitive(False)
482
499
                m_commit.set_sensitive(False)
483
500
                m_diff.set_sensitive(False)
484
501
 
700
717
        self.menuitem_branch_checkout.set_sensitive(self.notbranch)
701
718
        self.menuitem_branch_pull.set_sensitive(not self.notbranch)
702
719
        self.menuitem_branch_push.set_sensitive(not self.notbranch)
 
720
        self.menuitem_branch_revert.set_sensitive(not self.notbranch)
703
721
        self.menuitem_branch_merge.set_sensitive(not self.notbranch)
704
722
        self.menuitem_branch_commit.set_sensitive(not self.notbranch)
705
723
        self.menuitem_branch_status.set_sensitive(not self.notbranch)
782
800
        notbranch = False
783
801
        try:
784
802
            tree1 = WorkingTree.open_containing(path)[0]
785
 
        except (errors.NotBranchError, errors.NoWorkingTree):
 
803
        except (bzrerrors.NotBranchError, bzrerrors.NoWorkingTree):
786
804
            notbranch = True
787
805
        
788
806
        if not notbranch: