/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: 2007-07-15 15:05:06 UTC
  • Revision ID: jelmer@samba.org-20070715150506-1uemecr5kt7d4kvg
Fix whitespace, add comment.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
import sys
18
 
 
19
17
try:
20
18
    import pygtk
21
19
    pygtk.require("2.0")
22
20
except:
23
21
    pass
24
 
try:
25
 
    import gtk
26
 
    import gtk.gdk
27
 
    import gtk.glade
28
 
except:
29
 
    sys.exit(1)
30
 
 
 
22
    
 
23
import gtk
 
24
 
 
25
from errors import show_bzr_error
 
26
 
 
27
from bzrlib.config import LocationConfig
31
28
import bzrlib.errors as errors
32
29
 
33
 
class OlivePush:
34
 
    """ Display Push dialog and perform the needed actions. """
35
 
    def __init__(self, gladefile, comm, dialog):
 
30
from dialog import error_dialog, info_dialog, question_dialog
 
31
 
 
32
from history import UrlHistory
 
33
 
 
34
class PushDialog(gtk.Dialog):
 
35
    """ New implementation of the Push dialog. """
 
36
    def __init__(self, branch, parent=None):
36
37
        """ Initialize the Push dialog. """
37
 
        self.gladefile = gladefile
38
 
        self.glade = gtk.glade.XML(self.gladefile, 'window_push')
39
 
        
40
 
        # Communication object
41
 
        self.comm = comm
42
 
        # Dialog object
43
 
        self.dialog = dialog
44
 
        
45
 
        self.window = self.glade.get_widget('window_push')
46
 
        
47
 
        # Dictionary for signal_autoconnect
48
 
        dic = { "on_button_push_push_clicked": self.push,
49
 
                "on_button_push_cancel_clicked": self.close,
50
 
                "on_button_push_test_clicked": self.test,
51
 
                "on_radiobutton_push_stored_toggled": self.stored_toggled,
52
 
                "on_radiobutton_push_specific_toggled": self.specific_toggled, }
53
 
        
54
 
        # Connect the signals to the handlers
55
 
        self.glade.signal_autoconnect(dic)
56
 
        
57
 
        # Get some useful widgets
58
 
        self.radio_stored = self.glade.get_widget('radiobutton_push_stored')
59
 
        self.radio_specific = self.glade.get_widget('radiobutton_push_specific')
60
 
        self.entry_stored = self.glade.get_widget('entry_push_stored')
61
 
        self.entry_location = self.glade.get_widget('entry_push_location')
62
 
        self.check_remember = self.glade.get_widget('checkbutton_push_remember')
63
 
        self.check_overwrite = self.glade.get_widget('checkbutton_push_overwrite')
64
 
        self.check_create = self.glade.get_widget('checkbutton_push_create')
65
 
        self.label_test = self.glade.get_widget('label_push_test')
66
 
        self.image_test = self.glade.get_widget('image_push_test')
67
 
        
68
 
        # Set initial state
69
 
        self.entry_location.set_sensitive(0)
70
 
        self.check_remember.set_sensitive(0)
71
 
        self.check_create.set_sensitive(0)
72
 
                
73
 
        # Get stored location
74
 
        self.notbranch = False
75
 
        try:
76
 
            from bzrlib.branch import Branch
77
 
    
78
 
            branch = Branch.open_containing(self.comm.get_path())[0]
79
 
    
80
 
            self.entry_stored.set_text(branch.get_push_location())
81
 
        except errors.NotBranchError:
82
 
            self.notbranch = True
83
 
            return
84
 
    
85
 
    def display(self):
86
 
        """ Display the Push dialog. """
87
 
        if self.notbranch:
88
 
            self.dialog.error_dialog(_('Directory is not a branch'),
89
 
                                     _('You can perform this action only in a branch.'))
90
 
            self.close()
91
 
        else:
92
 
            self.window.show()
93
 
            self.width, self.height = self.window.get_size()
94
 
    
95
 
    def stored_toggled(self, widget):
96
 
        if widget.get_active():
97
 
            self.entry_stored.set_sensitive(1)
98
 
            self.entry_location.set_sensitive(0)
99
 
            self.check_remember.set_sensitive(0)
100
 
            self.check_create.set_sensitive(0)
101
 
        else:
102
 
            self.entry_stored.set_sensitive(0)
103
 
            self.entry_location.set_sensitive(1)
104
 
            self.check_remember.set_sensitive(1)
105
 
            self.check_create.set_sensitive(1)
106
 
    
107
 
    def specific_toggled(self, widget):
108
 
        if widget.get_active():
109
 
            self.entry_stored.set_sensitive(0)
110
 
            self.entry_location.set_sensitive(1)
111
 
            self.check_remember.set_sensitive(1)
112
 
            self.check_create.set_sensitive(1)
113
 
        else:
114
 
            self.entry_stored.set_sensitive(1)
115
 
            self.entry_location.set_sensitive(0)
116
 
            self.check_remember.set_sensitive(0)
117
 
            self.check_create.set_sensitive(0)
118
 
    
119
 
    def push(self, widget):
120
 
        revs = 0
121
 
        self.comm.set_busy(self.window)
122
 
        if self.radio_stored.get_active():
123
 
            try:
124
 
                revs = do_push(self.comm.get_path(),
125
 
                               overwrite=self.check_overwrite.get_active())
126
 
            except errors.NotBranchError:
127
 
                self.dialog.error_dialog(_('Directory is not a branch'),
128
 
                                         _('You can perform this action only in a branch.'))
129
 
                return
130
 
            except errors.DivergedBranches:
131
 
                self.dialog.error_dialog(_('Branches have been diverged'),
132
 
                                         _('You cannot push if branches have diverged. Use the\noverwrite option if you want to push anyway.'))
133
 
                return
134
 
            except:
135
 
                raise
136
 
        elif self.radio_specific.get_active():
137
 
            location = self.entry_location.get_text()
138
 
            if location == '':
139
 
                self.dialog.error_dialog(_('No location specified'),
140
 
                                         _('Please specify a location or use the default.'))
141
 
                return
142
 
            
143
 
            try:
144
 
                revs = do_push(self.comm.get_path(), location,
145
 
                               self.check_remember.get_active(),
146
 
                               self.check_overwrite.get_active(),
147
 
                               self.check_create.get_active())
148
 
            except errors.NotBranchError:
149
 
                self.dialog.error_dialog(_('Directory is not a branch'),
150
 
                                         _('You can perform this action only in a branch.'))
151
 
                self.comm.set_busy(self.window, False)
152
 
                return
153
 
            except errors.DivergedBranches:
154
 
                self.dialog.error_dialog(_('Branches have been diverged'),
155
 
                                         _('You cannot push if branches have diverged. Use the\noverwrite option if you want to push anyway.'))
156
 
                self.comm.set_busy(self.window, False)
157
 
                return
158
 
            except:
159
 
                raise
160
 
        else:
161
 
            # This should really never happen
162
 
            pass
163
 
        
164
 
        self.close()
165
 
        self.dialog.info_dialog(_('Push successful'),
166
 
                                _('%d revision(s) pushed.') % revs)
167
 
    
168
 
    def test(self, widget):
169
 
        """ Test if write access possible. """
 
38
        gtk.Dialog.__init__(self, title="Push - Olive",
 
39
                                  parent=parent,
 
40
                                  flags=0,
 
41
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
 
42
        
 
43
        # Get arguments
 
44
        self.branch = branch
 
45
        
 
46
        # Create the widgets
 
47
        self._label_location = gtk.Label(_("Location:"))
 
48
        self._label_test = gtk.Label(_("(click the Test button to check write access)"))
 
49
        self._check_remember = gtk.CheckButton(_("_Remember as default location"),
 
50
                                               use_underline=True)
 
51
        self._check_prefix = gtk.CheckButton(_("Create the path _leading up to the location"),
 
52
                                             use_underline=True)
 
53
        self._check_overwrite = gtk.CheckButton(_("_Overwrite target if diverged"),
 
54
                                                use_underline=True)
 
55
        self._combo = gtk.ComboBoxEntry()
 
56
        self._button_test = gtk.Button(_("_Test"), use_underline=True)
 
57
        self._button_push = gtk.Button(_("_Push"), use_underline=True)
 
58
        self._hbox_location = gtk.HBox()
 
59
        self._hbox_test = gtk.HBox()
 
60
        self._image_test = gtk.Image()
 
61
        
 
62
        # Set callbacks
 
63
        self._button_test.connect('clicked', self._on_test_clicked)
 
64
        self._button_push.connect('clicked', self._on_push_clicked)
 
65
        
 
66
        # Set properties
 
67
        self._image_test.set_from_stock(gtk.STOCK_DIALOG_INFO, gtk.ICON_SIZE_BUTTON)
 
68
        self._label_location.set_alignment(0, 0.5)
 
69
        self._label_test.set_alignment(0, 0.5)
 
70
        self._hbox_location.set_spacing(3)
 
71
        self._hbox_test.set_spacing(3)
 
72
        self.vbox.set_spacing(3)
 
73
        
 
74
        # Pack widgets
 
75
        self._hbox_location.pack_start(self._label_location, False, False)
 
76
        self._hbox_location.pack_start(self._combo, True, True)
 
77
        self._hbox_test.pack_start(self._image_test, False, False)
 
78
        self._hbox_test.pack_start(self._label_test, True, True)
 
79
        self.vbox.pack_start(self._hbox_location)
 
80
        self.vbox.pack_start(self._check_remember)
 
81
        self.vbox.pack_start(self._check_prefix)
 
82
        self.vbox.pack_start(self._check_overwrite)
 
83
        self.vbox.pack_start(self._hbox_test)
 
84
        self.action_area.pack_start(self._button_test)
 
85
        self.action_area.pack_end(self._button_push)
 
86
        
 
87
        # Show the dialog
 
88
        self.vbox.show_all()
 
89
        
 
90
        # Build location history
 
91
        self._history = UrlHistory(self.branch.get_config(), 'push_history')
 
92
        self._build_history()
 
93
        
 
94
    def _build_history(self):
 
95
        """ Build up the location history. """
 
96
        self._combo_model = gtk.ListStore(str)
 
97
        for item in self._history.get_entries():
 
98
            self._combo_model.append([ item ])
 
99
        self._combo.set_model(self._combo_model)
 
100
        self._combo.set_text_column(0)
 
101
        
 
102
        location = self.branch.get_push_location()
 
103
        if location:
 
104
            self._combo.get_child().set_text(location)
 
105
    
 
106
    def _on_test_clicked(self, widget):
 
107
        """ Test button clicked handler. """
170
108
        import re
171
109
        _urlRE = re.compile(r'^(?P<proto>[^:/\\]+)://(?P<path>.*)$')
172
110
        
173
 
        if self.radio_stored.get_active():
174
 
            url = self.entry_stored.get_text()
175
 
        elif self.radio_specific.get_active():
176
 
            url = self.entry_location.get_text()
 
111
        url = self._combo.get_child().get_text()
177
112
        
178
113
        m = _urlRE.match(url)
179
114
        if m:
180
115
            proto = m.groupdict()['proto']
181
 
            if (proto == 'sftp') or (proto == 'file') or (proto == 'ftp'):
182
 
                # have write acces (most probably)
183
 
                self.image_test.set_from_stock(gtk.STOCK_YES, 4)
184
 
                self.label_test.set_markup(_('<b>Write access is probably available</b>'))
 
116
            # FIXME: This should ask the transport or branch rather than 
 
117
            # guessing using regular expressions. JRV 20070714
 
118
            if proto in ('sftp', 'file', 'ftp'):
 
119
                # have write access (most probably)
 
120
                self._image_test.set_from_stock(gtk.STOCK_YES, 4)
 
121
                self._label_test.set_markup(_('<b>Write access is probably available</b>'))
185
122
            else:
186
123
                # no write access
187
 
                self.image_test.set_from_stock(gtk.STOCK_NO, 4)
188
 
                self.label_test.set_markup(_('<b>No write access</b>'))
 
124
                self._image_test.set_from_stock(gtk.STOCK_NO, 4)
 
125
                self._label_test.set_markup(_('<b>No write access</b>'))
189
126
        else:
190
127
            # couldn't determine
191
 
            self.image_test.set_from_stock(gtk.STOCK_DIALOG_QUESTION, 4)
192
 
            self.label_test.set_markup(_('<b>Could not determine</b>'))
 
128
            self._image_test.set_from_stock(gtk.STOCK_DIALOG_QUESTION, 4)
 
129
            self._label_test.set_markup(_('<b>Could not determine</b>'))
193
130
    
194
 
    def close(self, widget=None):
195
 
        self.window.destroy()
 
131
    @show_bzr_error
 
132
    def _on_push_clicked(self, widget):
 
133
        """ Push button clicked handler. """
 
134
        location = self._combo.get_child().get_text()
 
135
        revs = 0
 
136
        try:
 
137
            revs = do_push(self.branch,
 
138
                           location=location,
 
139
                           overwrite=self._check_overwrite.get_active(),
 
140
                           remember=self._check_remember.get_active(),
 
141
                           create_prefix=self._check_prefix.get_active())
 
142
        except errors.DivergedBranches:
 
143
            response = question_dialog(_('Branches have been diverged'),
 
144
                                       _('You cannot push if branches have diverged.\nOverwrite?'))
 
145
            if response == gtk.RESPONSE_OK:
 
146
                revs = do_push(self.branch, overwrite=True)
 
147
            return
 
148
        
 
149
        self._history.add_entry(location)
 
150
        info_dialog(_('Push successful'),
 
151
                    _("%d revision(s) pushed.") % revs)
 
152
        
 
153
        self.response(gtk.RESPONSE_OK)
196
154
 
197
155
def do_push(branch, location=None, remember=False, overwrite=False,
198
156
         create_prefix=False):
210
168
    
211
169
    :return: number of revisions pushed
212
170
    """
213
 
    from bzrlib.branch import Branch
214
171
    from bzrlib.bzrdir import BzrDir
215
172
    from bzrlib.transport import get_transport
216
173
        
217
 
    br_from = Branch.open_containing(branch)[0]
 
174
    br_from = branch
218
175
    
219
176
    stored_loc = br_from.get_push_location()
220
177
    if location is None:
221
178
        if stored_loc is None:
222
 
            self.dialog.error_dialog(_('Push location is unknown'),
223
 
                                     _('Please specify a location manually.'))
 
179
            error_dialog(_('Push location is unknown'),
 
180
                         _('Please specify a location manually.'))
224
181
            return
225
182
        else:
226
183
            location = stored_loc
244
201
                relurl = transport.relpath(location_url)
245
202
                transport.mkdir(relurl)
246
203
            except errors.NoSuchFile:
247
 
                self.dialog.error_dialog(_('Non existing parent directory'),
248
 
                                         _("The parent directory (%s)\ndoesn't exist.") % location)
 
204
                error_dialog(_('Non existing parent directory'),
 
205
                             _("The parent directory (%s)\ndoesn't exist.") % location)
249
206
                return
250
207
        else:
251
208
            current = transport.base
260
217
                    needed.append((new_transport,
261
218
                                   new_transport.relpath(transport.base)))
262
219
                    if new_transport.base == transport.base:
263
 
                        self.dialog.error_dialog(_('Path prefix not created'),
264
 
                                                 _("The path leading up to the specified location couldn't\nbe created."))
 
220
                        error_dialog(_('Path prefix not created'),
 
221
                                     _("The path leading up to the specified location couldn't\nbe created."))
265
222
                        return
266
223
        dir_to = br_from.bzrdir.clone(location_url,
267
224
            revision_id=br_from.last_revision())
270
227
    else:
271
228
        old_rh = br_to.revision_history()
272
229
        try:
273
 
            try:
274
 
                tree_to = dir_to.open_workingtree()
275
 
            except errors.NotLocalUrl:
276
 
                # FIXME - what to do here? how should we warn the user?
277
 
                #warning('This transport does not update the working '
278
 
                #        'tree of: %s' % (br_to.base,))
279
 
                count = br_to.pull(br_from, overwrite)
280
 
            except errors.NoWorkingTree:
281
 
                count = br_to.pull(br_from, overwrite)
282
 
            else:
283
 
                count = tree_to.pull(br_from, overwrite)
284
 
        except errors.DivergedBranches:
285
 
            raise
286
 
    
 
230
            tree_to = dir_to.open_workingtree()
 
231
        except errors.NotLocalUrl:
 
232
            # FIXME - what to do here? how should we warn the user?
 
233
            #warning('This transport does not update the working '
 
234
            #        'tree of: %s' % (br_to.base,))
 
235
            count = br_to.pull(br_from, overwrite)
 
236
        except errors.NoWorkingTree:
 
237
            count = br_to.pull(br_from, overwrite)
 
238
        else:
 
239
            count = tree_to.pull(br_from, overwrite)
 
240
 
287
241
    return count