/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:13:34 UTC
  • Revision ID: jelmer@samba.org-20070715151334-2t0g8fmpgj6vnqa7
Add icon for Bazaar preferences.

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):
 
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
 
        
43
 
        self.window = self.glade.get_widget('window_push')
44
 
        
45
 
        # Dictionary for signal_autoconnect
46
 
        dic = { "on_button_push_push_clicked": self.push,
47
 
                "on_button_push_cancel_clicked": self.close,
48
 
                "on_button_push_test_clicked": self.test,
49
 
                "on_radiobutton_push_stored_toggled": self.stored_toggled,
50
 
                "on_radiobutton_push_specific_toggled": self.specific_toggled, }
51
 
        
52
 
        # Connect the signals to the handlers
53
 
        self.glade.signal_autoconnect(dic)
54
 
        
55
 
        # Get some useful widgets
56
 
        self.radio_stored = self.glade.get_widget('radiobutton_push_stored')
57
 
        self.radio_specific = self.glade.get_widget('radiobutton_push_specific')
58
 
        self.entry_stored = self.glade.get_widget('entry_push_stored')
59
 
        self.entry_location = self.glade.get_widget('entry_push_location')
60
 
        self.check_remember = self.glade.get_widget('checkbutton_push_remember')
61
 
        self.check_overwrite = self.glade.get_widget('checkbutton_push_overwrite')
62
 
        self.check_create = self.glade.get_widget('checkbutton_push_create')
63
 
        self.label_test = self.glade.get_widget('label_push_test')
64
 
        self.image_test = self.glade.get_widget('image_push_test')
65
 
        
66
 
        # Set initial state
67
 
        self.entry_location.set_sensitive(0)
68
 
        self.check_remember.set_sensitive(0)
69
 
        self.check_create.set_sensitive(0)
70
 
        
71
 
        # Get stored location
72
 
        self.notbranch = False
73
 
        try:
74
 
            from bzrlib.branch import Branch
75
 
    
76
 
            branch = Branch.open_containing(self.comm.get_path())[0]
77
 
    
78
 
            self.entry_stored.set_text(branch.get_push_location())
79
 
        except errors.NotBranchError:
80
 
            self.notbranch = True
81
 
            return
82
 
    
83
 
    def display(self):
84
 
        """ Display the Push dialog. """
85
 
        if self.notbranch:
86
 
            error_dialog(_('Directory is not a branch'),
87
 
                                     _('You can perform this action only in a branch.'))
88
 
            self.close()
89
 
        else:
90
 
            self.window.show()
91
 
            self.width, self.height = self.window.get_size()
92
 
    
93
 
    def stored_toggled(self, widget):
94
 
        if widget.get_active():
95
 
            self.entry_stored.set_sensitive(1)
96
 
            self.entry_location.set_sensitive(0)
97
 
            self.check_remember.set_sensitive(0)
98
 
            self.check_create.set_sensitive(0)
99
 
        else:
100
 
            self.entry_stored.set_sensitive(0)
101
 
            self.entry_location.set_sensitive(1)
102
 
            self.check_remember.set_sensitive(1)
103
 
            self.check_create.set_sensitive(1)
104
 
    
105
 
    def specific_toggled(self, widget):
106
 
        if widget.get_active():
107
 
            self.entry_stored.set_sensitive(0)
108
 
            self.entry_location.set_sensitive(1)
109
 
            self.check_remember.set_sensitive(1)
110
 
            self.check_create.set_sensitive(1)
111
 
        else:
112
 
            self.entry_stored.set_sensitive(1)
113
 
            self.entry_location.set_sensitive(0)
114
 
            self.check_remember.set_sensitive(0)
115
 
            self.check_create.set_sensitive(0)
116
 
    
117
 
    def push(self, widget):
118
 
        revs = 0
119
 
        self.comm.set_busy(self.window)
120
 
        if self.radio_stored.get_active():
121
 
            try:
122
 
                revs = do_push(self.comm.get_path(),
123
 
                               overwrite=self.check_overwrite.get_active())
124
 
            except errors.NotBranchError:
125
 
                error_dialog(_('Directory is not a branch'),
126
 
                                         _('You can perform this action only in a branch.'))
127
 
                return
128
 
            except errors.DivergedBranches:
129
 
                error_dialog(_('Branches have been diverged'),
130
 
                                         _('You cannot push if branches have diverged. Use the\noverwrite option if you want to push anyway.'))
131
 
                return
132
 
            except:
133
 
                raise
134
 
        elif self.radio_specific.get_active():
135
 
            location = self.entry_location.get_text()
136
 
            if location == '':
137
 
                error_dialog(_('No location specified'),
138
 
                                         _('Please specify a location or use the default.'))
139
 
                return
140
 
            
141
 
            try:
142
 
                revs = do_push(self.comm.get_path(), location,
143
 
                               self.check_remember.get_active(),
144
 
                               self.check_overwrite.get_active(),
145
 
                               self.check_create.get_active())
146
 
            except errors.NotBranchError:
147
 
                error_dialog(_('Directory is not a branch'),
148
 
                                         _('You can perform this action only in a branch.'))
149
 
                self.comm.set_busy(self.window, False)
150
 
                return
151
 
            except errors.DivergedBranches:
152
 
                error_dialog(_('Branches have been diverged'),
153
 
                                         _('You cannot push if branches have diverged. Use the\noverwrite option if you want to push anyway.'))
154
 
                self.comm.set_busy(self.window, False)
155
 
                return
156
 
            except:
157
 
                raise
158
 
        else:
159
 
            # This should really never happen
160
 
            pass
161
 
        
162
 
        self.close()
163
 
        info_dialog(_('Push successful'),
164
 
                                _('%d revision(s) pushed.') % revs)
165
 
    
166
 
    def test(self, widget):
167
 
        """ 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. """
168
108
        import re
169
109
        _urlRE = re.compile(r'^(?P<proto>[^:/\\]+)://(?P<path>.*)$')
170
110
        
171
 
        if self.radio_stored.get_active():
172
 
            url = self.entry_stored.get_text()
173
 
        elif self.radio_specific.get_active():
174
 
            url = self.entry_location.get_text()
 
111
        url = self._combo.get_child().get_text()
175
112
        
176
113
        m = _urlRE.match(url)
177
114
        if m:
178
115
            proto = m.groupdict()['proto']
179
 
            if (proto == 'sftp') or (proto == 'file') or (proto == 'ftp'):
180
 
                # have write acces (most probably)
181
 
                self.image_test.set_from_stock(gtk.STOCK_YES, 4)
182
 
                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>'))
183
122
            else:
184
123
                # no write access
185
 
                self.image_test.set_from_stock(gtk.STOCK_NO, 4)
186
 
                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>'))
187
126
        else:
188
127
            # couldn't determine
189
 
            self.image_test.set_from_stock(gtk.STOCK_DIALOG_QUESTION, 4)
190
 
            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>'))
191
130
    
192
 
    def close(self, widget=None):
193
 
        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)
194
154
 
195
155
def do_push(branch, location=None, remember=False, overwrite=False,
196
156
         create_prefix=False):
208
168
    
209
169
    :return: number of revisions pushed
210
170
    """
211
 
    from bzrlib.branch import Branch
212
171
    from bzrlib.bzrdir import BzrDir
213
172
    from bzrlib.transport import get_transport
214
173
        
215
 
    br_from = Branch.open_containing(branch)[0]
 
174
    br_from = branch
216
175
    
217
176
    stored_loc = br_from.get_push_location()
218
177
    if location is None:
219
178
        if stored_loc is None:
220
179
            error_dialog(_('Push location is unknown'),
221
 
                                     _('Please specify a location manually.'))
 
180
                         _('Please specify a location manually.'))
222
181
            return
223
182
        else:
224
183
            location = stored_loc
243
202
                transport.mkdir(relurl)
244
203
            except errors.NoSuchFile:
245
204
                error_dialog(_('Non existing parent directory'),
246
 
                                         _("The parent directory (%s)\ndoesn't exist.") % location)
 
205
                             _("The parent directory (%s)\ndoesn't exist.") % location)
247
206
                return
248
207
        else:
249
208
            current = transport.base
259
218
                                   new_transport.relpath(transport.base)))
260
219
                    if new_transport.base == transport.base:
261
220
                        error_dialog(_('Path prefix not created'),
262
 
                                                 _("The path leading up to the specified location couldn't\nbe created."))
 
221
                                     _("The path leading up to the specified location couldn't\nbe created."))
263
222
                        return
264
223
        dir_to = br_from.bzrdir.clone(location_url,
265
224
            revision_id=br_from.last_revision())
268
227
    else:
269
228
        old_rh = br_to.revision_history()
270
229
        try:
271
 
            try:
272
 
                tree_to = dir_to.open_workingtree()
273
 
            except errors.NotLocalUrl:
274
 
                # FIXME - what to do here? how should we warn the user?
275
 
                #warning('This transport does not update the working '
276
 
                #        'tree of: %s' % (br_to.base,))
277
 
                count = br_to.pull(br_from, overwrite)
278
 
            except errors.NoWorkingTree:
279
 
                count = br_to.pull(br_from, overwrite)
280
 
            else:
281
 
                count = tree_to.pull(br_from, overwrite)
282
 
        except errors.DivergedBranches:
283
 
            raise
284
 
    
 
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
 
285
241
    return count