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
- browse files at revision 231
- compare with another revision
- download diff
- download tarball
- view history from revision 231
- Committer: Jelmer Vernooij
- Date: 2007-07-15 18:12:57 UTC
- Revision ID: jelmer@samba.org-20070715181257-g264qus2zyi3v39z
Add RevisionSelectionBox widget, use in TagDialog.
- files added:
- .bzrignore
- annotate
- tests
- viz
- files removed:
- COPYING.txt
- debian
- files renamed:
- TODO.txt => TODO
- olive/branch.py => branch.py
- olive/checkout.py => checkout.py
- olive/commit.py => commit.py
- olive/dialog.py => dialog.py
- olive/push.py => push.py
- olive/status.py => status.py
- olive/ui.py => ui.py
- files modified:
- cmenu.ui
added
removed
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):
117
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
160
161
self.close()
162
info_dialog(_('Push successful'),
163
_('%d revision(s) pushed.') % revs)
164
165
def test(self, widget):
166
""" Test if write access possible. """
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._label_test = gtk.Label(_("(click the Test button to check write access)"))
54
self._combo = gtk.ComboBoxEntry()
55
self._button_test = gtk.Button(_("_Test"), use_underline=True)
56
self._button_push = gtk.Button(_("_Push"), use_underline=True)
57
self._hbox_location = gtk.HBox()
58
self._hbox_test = gtk.HBox()
59
self._image_test = gtk.Image()
60
61
# Set callbacks
62
self._button_test.connect('clicked', self._on_test_clicked)
63
self._button_push.connect('clicked', self._on_push_clicked)
64
65
# Set properties
66
self._image_test.set_from_stock(gtk.STOCK_DIALOG_INFO, gtk.ICON_SIZE_BUTTON)
67
self._label_location.set_alignment(0, 0.5)
68
self._label_test.set_alignment(0, 0.5)
69
self._hbox_location.set_spacing(3)
70
self._hbox_test.set_spacing(3)
71
self.vbox.set_spacing(3)
72
73
# Pack widgets
74
self._hbox_location.pack_start(self._label_location, False, False)
75
self._hbox_location.pack_start(self._combo, True, True)
76
self._hbox_test.pack_start(self._image_test, False, False)
77
self._hbox_test.pack_start(self._label_test, True, True)
78
self.vbox.pack_start(self._hbox_location)
79
self.vbox.pack_start(self._hbox_test)
80
self.action_area.pack_start(self._button_test)
81
self.action_area.pack_end(self._button_push)
82
83
# Show the dialog
84
self.vbox.show_all()
85
86
# Build location history
87
self._history = UrlHistory(self.branch.get_config(), 'push_history')
88
self._build_history()
89
90
def _build_history(self):
91
""" Build up the location history. """
92
self._combo_model = gtk.ListStore(str)
93
for item in self._history.get_entries():
94
self._combo_model.append([ item ])
95
self._combo.set_model(self._combo_model)
96
self._combo.set_text_column(0)
97
98
if self.branch is not None:
99
location = self.branch.get_push_location()
100
if location is not None:
101
self._combo.get_child().set_text(location)
102
103
def _on_test_clicked(self, widget):
104
""" Test button clicked handler. """
167
105
import re
168
106
_urlRE = re.compile(r'^(?P<proto>[^:/\\]+)://(?P<path>.*)$')
169
107
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()
108
url = self._combo.get_child().get_text()
174
109
175
110
m = _urlRE.match(url)
176
111
if m:
177
112
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>'))
113
# FIXME: This should ask the transport or branch rather than
114
# guessing using regular expressions. JRV 20070714
115
if proto in ('sftp', 'file', 'ftp'):
116
# have write access (most probably)
117
self._image_test.set_from_stock(gtk.STOCK_YES, 4)
118
self._label_test.set_markup(_('<b>Write access is probably available</b>'))
182
119
else:
183
120
# 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>'))
121
self._image_test.set_from_stock(gtk.STOCK_NO, 4)
122
self._label_test.set_markup(_('<b>No write access</b>'))
186
123
else:
187
124
# 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>'))
125
self._image_test.set_from_stock(gtk.STOCK_DIALOG_QUESTION, 4)
126
self._label_test.set_markup(_('<b>Could not determine</b>'))
190
127
191
def close(self, widget=None):
192
self.window.destroy()
193
194
def do_push(branch, location=None, remember=False, overwrite=False,
195
create_prefix=False):
128
@show_bzr_error
129
def _on_push_clicked(self, widget):
130
""" Push button clicked handler. """
131
location = self._combo.get_child().get_text()
132
revs = 0
133
if self.branch is not None and self.branch.get_push_location() is None:
134
response = question_dialog(_('Set default push location'),
135
_('There is no default push location set.\nSet %r as default now?') % location)
136
if response == gtk.REPONSE_OK:
137
self.branch.set_push_location(location)
138
139
try:
140
revs = do_push(self.branch, location=location, overwrite=False)
141
except errors.DivergedBranches:
142
response = question_dialog(_('Branches have been diverged'),
143
_('You cannot push if branches have diverged.\nOverwrite?'))
144
if response == gtk.RESPONSE_OK:
145
revs = do_push(self.branch, location=location, overwrite=True)
146
return
147
148
self._history.add_entry(location)
149
info_dialog(_('Push successful'),
150
_("%d revision(s) pushed.") % revs)
151
152
self.response(gtk.RESPONSE_OK)
153
154
def do_push(br_from, location, overwrite):
196
155
""" Update a mirror of a branch.
197
156
198
:param branch: the source branch
157
:param br_from: the source branch
199
158
200
159
:param location: the location of the branch that you'd like to update
201
160
202
:param remember: if set, the location will be stored
203
204
161
:param overwrite: overwrite target location if it diverged
205
162
206
:param create_prefix: create the path leading up to the branch if it doesn't exist
207
208
163
:return: number of revisions pushed
209
164
"""
210
from bzrlib.branch import Branch
211
165
from bzrlib.bzrdir import BzrDir
212
166
from bzrlib.transport import get_transport
213
167
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
168
transport = get_transport(location)
226
169
location_url = transport.base
227
170
228
if br_from.get_push_location() is None or remember:
229
br_from.set_push_location(location_url)
230
231
171
old_rh = []
232
172
233
173
try:
236
176
except errors.NotBranchError:
237
177
# create a branch.
238
178
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)
179
try:
180
relurl = transport.relpath(location_url)
181
transport.mkdir(relurl)
182
except errors.NoSuchFile:
183
response = question_dialog(_('Non existing parent directory'),
184
_("The parent directory (%s)\ndoesn't exist. Create?") % location)
185
if response == gtk.RESPONSE_OK:
186
_create_prefix(transport)
187
else:
246
188
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
189
dir_to = br_from.bzrdir.clone(location_url,
264
190
revision_id=br_from.last_revision())
265
191
br_to = dir_to.open_branch()
267
193
else:
268
194
old_rh = br_to.revision_history()
269
195
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
196
tree_to = dir_to.open_workingtree()
197
except errors.NotLocalUrl:
198
# FIXME - what to do here? how should we warn the user?
199
count = br_to.pull(br_from, overwrite)
200
except errors.NoWorkingTree:
201
count = br_to.pull(br_from, overwrite)
202
else:
203
count = tree_to.pull(br_from, overwrite)
204
284
205
return count
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0