/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: Adrian Wilkins
  • Date: 2008-04-24 15:26:14 UTC
  • mto: This revision was merged to the branch mainline in revision 470.
  • Revision ID: adrian.wilkins@gmail.com-20080424152614-2rnnljbro6vzqvf7
Detect the reserved null: revision in appropriate places. 

This removes a huge shower of stack traces that get dumped to console when 
you look at the bottom of a log.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
96
96
        if self.branch is not None and self.branch.get_push_location() is None:
97
97
            response = question_dialog(_('Set default push location'),
98
98
                                       _('There is no default push location set.\nSet %r as default now?') % location)
99
 
            if response == gtk.REPONSE_OK:
 
99
            if response == gtk.RESPONSE_OK:
100
100
                self.branch.set_push_location(location)
101
101
 
102
102
        try:
104
104
        except errors.DivergedBranches:
105
105
            response = question_dialog(_('Branches have been diverged'),
106
106
                                       _('You cannot push if branches have diverged.\nOverwrite?'))
107
 
            if response == gtk.RESPONSE_OK:
 
107
            if response == gtk.RESPONSE_YES:
108
108
                revs = do_push(self.branch, location=location, overwrite=True)
109
 
            return
110
109
        
111
110
        self._history.add_entry(location)
112
111
        info_dialog(_('Push successful'),