/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 21:05:19 UTC
  • mto: (0.12.2 olive)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060927210519-7bc2662211808af5
Bunch of other small updates, add more items to 
the TODO list.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/push.py
115
115
    
116
116
    def push(self, widget):
117
117
        revs = 0
118
 
        self.comm.set_busy(self.window)
119
118
        if self.radio_stored.get_active():
120
119
            try:
121
120
                revs = do_push(self.comm.get_path(),
143
142
            except errors.NotBranchError:
144
143
                error_dialog(_('Directory is not a branch'),
145
144
                                         _('You can perform this action only in a branch.'))
146
 
                self.comm.set_busy(self.window, False)
147
145
                return
148
146
            except errors.DivergedBranches:
149
147
                error_dialog(_('Branches have been diverged'),
150
148
                                         _('You cannot push if branches have diverged. Use the\noverwrite option if you want to push anyway.'))
151
 
                self.comm.set_busy(self.window, False)
152
149
                return
153
150
        
154
151
        self.close()
271
268
                count = br_to.pull(br_from, overwrite)
272
269
            else:
273
270
                count = tree_to.pull(br_from, overwrite)
274
 
        except errors.DivergedBranches:
275
 
            raise
276
271
    
277
272
    return count