/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: Gary van der Merwe
  • Date: 2007-08-10 10:45:06 UTC
  • mto: This revision was merged to the branch mainline in revision 256.
  • Revision ID: garyvdm@gmail.com-20070810104506-wo2mp9zfkh338axe
Make icon locations consistant between source and installed version. Let glade nkow where to find the icons with a project file.

Show diffs side-by-side

added added

removed removed

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