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

  • Committer: Jelmer Vernooij
  • Date: 2008-06-29 16:11:12 UTC
  • mfrom: (475.2.2 gtk)
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629161112-3j4zp0r0e7cv6cds
Merge Chad's progress bar in viz patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
94
94
        """ Push button clicked handler. """
95
95
        location = self._combo.get_child().get_text()
96
96
        revs = 0
97
 
        
 
97
        if self.branch is not None and self.branch.get_push_location() is None:
 
98
            response = question_dialog(_i18n('Set default push location'),
 
99
                                       _i18n('There is no default push location set.\nSet %r as default now?') % location)
 
100
            if response == gtk.RESPONSE_OK:
 
101
                self.branch.set_push_location(location)
 
102
 
98
103
        try:
99
104
            revs = do_push(self.branch, location=location, overwrite=False)
100
105
        except errors.DivergedBranches:
103
108
            if response == gtk.RESPONSE_YES:
104
109
                revs = do_push(self.branch, location=location, overwrite=True)
105
110
        
106
 
        if self.branch is not None and self.branch.get_push_location() is None:
107
 
            self.branch.set_push_location(location)
108
 
        
109
111
        self._history.add_entry(location)
110
112
        info_dialog(_i18n('Push successful'),
111
113
                    _i18n("%d revision(s) pushed.") % revs)