/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/frontend/gtk/branch.py

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2006-07-31 18:17:48 UTC
  • mto: (0.14.1 main) (93.1.1 win32.bialix)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: Szilveszter.Farkas@gmail.com-20060731181748-02e1970a99f30150
2006-07-31  Szilveszter Farkas <Szilveszter.Farkas@gmail.com>

    * Back from holiday.
    * olive.glade: separated branch and checkout dialogs (Fixed: #54019)
    * olive/frontend/gtk/checkout.py: file added respectively
    * olive/frontend/gtk/branch.py: removed checkout options
    * olive/frontend/gtk/handler.py: modified handler names + added checkout
    * olive/frontend/gtk/push.py: window gets properly resized (Fixed: #54676)

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/frontend/gtk/branch.py
73
73
        if revno == 0:
74
74
            revno = None
75
75
        
76
 
        checkbutton_checkout = self.glade.get_widget('checkbutton_branch_checkout')
77
 
        if checkbutton_checkout.get_active() == True:
78
 
            # Need to do a checkout
79
 
            checkbutton_lightweight = self.glade.get_widget('checkbutton_branch_lightweight')
80
 
            lightweight = checkbutton_lightweight.get_active()
81
 
            try:
82
 
                self.comm.set_statusbar('Checkout in progress, please wait...')
83
 
                init.checkout(location, destination, revno, lightweight)
84
 
                self.comm.clear_statusbar()
85
 
            except errors.NotBranchError, errmsg:
86
 
                dialog.error_dialog('Not a branch: %s' % errmsg)
87
 
                self.comm.clear_statusbar()
88
 
                return
89
 
            except errors.TargetAlreadyExists, errmsg:
90
 
                dialog.error_dialog('Target already exists: %s' % errmsg)
91
 
                self.comm.clear_statusbar()
92
 
                return
93
 
            except errors.NonExistingParent, errmsg:
94
 
                dialog.error_dialog('Parent directory doesn\'t exist: %s' % errmsg)
95
 
                self.comm.clear_statusbar()
96
 
                return
97
 
            except:
98
 
                raise
99
 
        else:
100
 
            try:
101
 
                self.comm.set_statusbar('Branching in progress, please wait...')
102
 
                init.branch(location, destination, revno)
103
 
                self.comm.clear_statusbar()
104
 
            except errors.NonExistingSource, errmsg:
105
 
                dialog.error_dialog('Non existing source: %s' % errmsg)
106
 
                self.comm.clear_statusbar()
107
 
                return
108
 
            except errors.TargetAlreadyExists, errmsg:
109
 
                dialog.error_dialog('Target already exists: %s' % errmsg)
110
 
                self.comm.clear_statusbar()
111
 
                return
112
 
            except errors.NonExistingParent, errmsg:
113
 
                dialog.error_dialog('Parent directory doesn\'t exist: %s' % errmsg)
114
 
                self.comm.clear_statusbar()
115
 
                return
116
 
            except errors.NonExistingRevision:
117
 
                dialog.error_dialog('The given revision doesn\'t exist.')
118
 
                self.comm.clear_statusbar()
119
 
                return
120
 
            except errors.NotBranchError, errmsg:
121
 
                dialog.error_dialog('Not a branch: %s' % errmsg)
122
 
                self.comm.clear_statusbar()
123
 
                return
124
 
            except:
125
 
                raise
 
76
        try:
 
77
            self.comm.set_statusbar('Branching in progress, please wait...')
 
78
            init.branch(location, destination, revno)
 
79
            self.comm.clear_statusbar()
 
80
        except errors.NonExistingSource, errmsg:
 
81
            dialog.error_dialog('Non existing source: %s' % errmsg)
 
82
            self.comm.clear_statusbar()
 
83
            return
 
84
        except errors.TargetAlreadyExists, errmsg:
 
85
            dialog.error_dialog('Target already exists: %s' % errmsg)
 
86
            self.comm.clear_statusbar()
 
87
            return
 
88
        except errors.NonExistingParent, errmsg:
 
89
            dialog.error_dialog('Parent directory doesn\'t exist: %s' % errmsg)
 
90
            self.comm.clear_statusbar()
 
91
            return
 
92
        except errors.NonExistingRevision:
 
93
            dialog.error_dialog('The given revision doesn\'t exist.')
 
94
            self.comm.clear_statusbar()
 
95
            return
 
96
        except errors.NotBranchError, errmsg:
 
97
            dialog.error_dialog('Not a branch: %s' % errmsg)
 
98
            self.comm.clear_statusbar()
 
99
            return
 
100
        except:
 
101
            raise
126
102
        
127
103
        self.close()
128
104
        self.comm.refresh_right()