26
from errors import show_bzr_error
28
# FIXME: This needs to be public JRV 20070714
29
from bzrlib.builtins import _create_prefix
30
from bzrlib.config import LocationConfig
31
27
import bzrlib.errors as errors
33
from dialog import error_dialog, info_dialog, question_dialog
35
from history import UrlHistory
37
class PushDialog(gtk.Dialog):
38
""" New implementation of the Push dialog. """
39
def __init__(self, repository, revid, branch=None, parent=None):
29
from olive import gladefile
30
from dialog import error_dialog, info_dialog
33
""" Display Push dialog and perform the needed actions. """
34
def __init__(self, branch):
40
35
""" Initialize the Push dialog. """
41
gtk.Dialog.__init__(self, title="Push - Olive",
44
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
36
self.glade = gtk.glade.XML(gladefile, 'window_push')
47
self.repository = repository
38
self.window = self.glade.get_widget('window_push')
49
40
self.branch = branch
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()
58
self._button_push.connect('clicked', self._on_push_clicked)
61
self._label_location.set_alignment(0, 0.5)
62
self._hbox_location.set_spacing(3)
63
self.vbox.set_spacing(3)
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)
74
# Build location history
75
self._history = UrlHistory(self.branch.get_config(), 'push_history')
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)
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)
92
def _on_push_clicked(self, widget):
93
""" Push button clicked handler. """
94
location = self._combo.get_child().get_text()
42
# Dictionary for signal_autoconnect
43
dic = { "on_button_push_push_clicked": self.push,
44
"on_button_push_cancel_clicked": self.close,
45
"on_button_push_test_clicked": self.test,
46
"on_radiobutton_push_stored_toggled": self.stored_toggled,
47
"on_radiobutton_push_specific_toggled": self.specific_toggled, }
49
# Connect the signals to the handlers
50
self.glade.signal_autoconnect(dic)
52
# Get some useful widgets
53
self.radio_stored = self.glade.get_widget('radiobutton_push_stored')
54
self.radio_specific = self.glade.get_widget('radiobutton_push_specific')
55
self.entry_stored = self.glade.get_widget('entry_push_stored')
56
self.entry_location = self.glade.get_widget('entry_push_location')
57
self.check_remember = self.glade.get_widget('checkbutton_push_remember')
58
self.check_overwrite = self.glade.get_widget('checkbutton_push_overwrite')
59
self.check_create = self.glade.get_widget('checkbutton_push_create')
60
self.label_test = self.glade.get_widget('label_push_test')
61
self.image_test = self.glade.get_widget('image_push_test')
64
self.entry_location.set_sensitive(0)
65
self.check_remember.set_sensitive(0)
66
self.check_create.set_sensitive(0)
68
self.entry_stored.set_text(branch.get_push_location())
71
""" Display the Push dialog. """
73
self.width, self.height = self.window.get_size()
75
def stored_toggled(self, widget):
76
if widget.get_active():
77
self.entry_stored.set_sensitive(1)
78
self.entry_location.set_sensitive(0)
79
self.check_remember.set_sensitive(0)
80
self.check_create.set_sensitive(0)
82
self.entry_stored.set_sensitive(0)
83
self.entry_location.set_sensitive(1)
84
self.check_remember.set_sensitive(1)
85
self.check_create.set_sensitive(1)
87
def specific_toggled(self, widget):
88
if widget.get_active():
89
self.entry_stored.set_sensitive(0)
90
self.entry_location.set_sensitive(1)
91
self.check_remember.set_sensitive(1)
92
self.check_create.set_sensitive(1)
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)
99
def push(self, widget):
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.RESPONSE_OK:
100
self.branch.set_push_location(location)
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_YES:
108
revs = do_push(self.branch, location=location, overwrite=True)
101
if self.radio_stored.get_active():
103
revs = do_push(self.branch,
104
overwrite=self.check_overwrite.get_active())
105
except errors.NotBranchError:
106
error_dialog(_('Directory is not a branch'),
107
_('You can perform this action only in a branch.'))
109
except errors.DivergedBranches:
110
error_dialog(_('Branches have been diverged'),
111
_('You cannot push if branches have diverged. Use the\noverwrite option if you want to push anyway.'))
113
elif self.radio_specific.get_active():
114
location = self.entry_location.get_text()
116
error_dialog(_('No location specified'),
117
_('Please specify a location or use the default.'))
121
revs = do_push(self.branch, location,
122
self.check_remember.get_active(),
123
self.check_overwrite.get_active(),
124
self.check_create.get_active())
125
except errors.NotBranchError:
126
error_dialog(_('Directory is not a branch'),
127
_('You can perform this action only in a branch.'))
129
except errors.DivergedBranches:
130
error_dialog(_('Branches have been diverged'),
131
_('You cannot push if branches have diverged. Use the\noverwrite option if you want to push anyway.'))
110
self._history.add_entry(location)
111
135
info_dialog(_('Push successful'),
112
_("%d revision(s) pushed.") % revs)
114
self.response(gtk.RESPONSE_OK)
136
_('%d revision(s) pushed.') % revs)
138
def test(self, widget):
139
""" Test if write access possible. """
141
_urlRE = re.compile(r'^(?P<proto>[^:/\\]+)://(?P<path>.*)$')
143
if self.radio_stored.get_active():
144
url = self.entry_stored.get_text()
145
elif self.radio_specific.get_active():
146
url = self.entry_location.get_text()
148
m = _urlRE.match(url)
150
proto = m.groupdict()['proto']
151
if (proto == 'sftp') or (proto == 'file') or (proto == 'ftp'):
152
# have write acces (most probably)
153
self.image_test.set_from_stock(gtk.STOCK_YES, 4)
154
self.label_test.set_markup(_('<b>Write access is probably available</b>'))
157
self.image_test.set_from_stock(gtk.STOCK_NO, 4)
158
self.label_test.set_markup(_('<b>No write access</b>'))
161
self.image_test.set_from_stock(gtk.STOCK_DIALOG_QUESTION, 4)
162
self.label_test.set_markup(_('<b>Could not determine</b>'))
164
def close(self, widget=None):
165
self.window.destroy()
116
def do_push(br_from, location, overwrite):
167
def do_push(branch, location=None, remember=False, overwrite=False,
168
create_prefix=False):
117
169
""" Update a mirror of a branch.
119
:param br_from: the source branch
171
:param branch: the source branch
121
173
:param location: the location of the branch that you'd like to update
175
:param remember: if set, the location will be stored
123
177
:param overwrite: overwrite target location if it diverged
179
:param create_prefix: create the path leading up to the branch if it doesn't exist
125
181
:return: number of revisions pushed
183
from bzrlib.branch import Branch
127
184
from bzrlib.bzrdir import BzrDir
128
185
from bzrlib.transport import get_transport
187
br_from = Branch.open_containing(branch)[0]
189
stored_loc = br_from.get_push_location()
191
if stored_loc is None:
192
error_dialog(_('Push location is unknown'),
193
_('Please specify a location manually.'))
196
location = stored_loc
130
198
transport = get_transport(location)
131
199
location_url = transport.base
201
if br_from.get_push_location() is None or remember:
202
br_from.set_push_location(location_url)
added
removed
olive/push.py
