/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/push.py

  • Committer: Jelmer Vernooij
  • Date: 2006-09-27 20:30:59 UTC
  • mto: (0.12.2 olive)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060927203059-85792ae0a81db524
Bunch of small fixes, cleanups and simplifications.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/push.py
128
128
                error_dialog(_('Branches have been diverged'),
129
129
                                         _('You cannot push if branches have diverged. Use the\noverwrite option if you want to push anyway.'))
130
130
                return
131
 
            except:
132
 
                raise
133
131
        elif self.radio_specific.get_active():
134
132
            location = self.entry_location.get_text()
135
133
            if location == '':
152
150
                                         _('You cannot push if branches have diverged. Use the\noverwrite option if you want to push anyway.'))
153
151
                self.comm.set_busy(self.window, False)
154
152
                return
155
 
            except:
156
 
                raise
157
 
        else:
158
 
            # This should really never happen
159
 
            pass
160
153
        
161
154
        self.close()
162
155
        info_dialog(_('Push successful'),