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 bzrlib.plugins.gtk import _i18n
34
from dialog import error_dialog, info_dialog, question_dialog
36
from history import UrlHistory
38
class PushDialog(gtk.Dialog):
39
""" New implementation of the Push dialog. """
40
def __init__(self, repository, revid, branch=None, parent=None):
29
from dialog import error_dialog, info_dialog
30
from guifiles import GLADEFILENAME
34
""" Display Push dialog and perform the needed actions. """
35
def __init__(self, branch):
41
36
""" Initialize the Push dialog. """
42
gtk.Dialog.__init__(self, title="Push - Olive",
45
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
37
self.glade = gtk.glade.XML(GLADEFILENAME, 'window_push')
48
self.repository = repository
39
self.window = self.glade.get_widget('window_push')
50
41
self.branch = branch
53
self._label_location = gtk.Label(_i18n("Location:"))
54
self._combo = gtk.ComboBoxEntry()
55
self._button_push = gtk.Button(_i18n("_Push"), use_underline=True)
56
self._hbox_location = gtk.HBox()
59
self._button_push.connect('clicked', self._on_push_clicked)
62
self._label_location.set_alignment(0, 0.5)
63
self._hbox_location.set_spacing(3)
64
self.vbox.set_spacing(3)
67
self._hbox_location.pack_start(self._label_location, False, False)
68
self._hbox_location.pack_start(self._combo, True, True)
69
self.vbox.pack_start(self._hbox_location)
70
self.action_area.pack_end(self._button_push)
75
# Build location history
76
self._history = UrlHistory(self.branch.get_config(), 'push_history')
79
def _build_history(self):
80
""" Build up the location history. """
81
self._combo_model = gtk.ListStore(str)
82
for item in self._history.get_entries():
83
self._combo_model.append([ item ])
84
self._combo.set_model(self._combo_model)
85
self._combo.set_text_column(0)
87
if self.branch is not None:
88
location = self.branch.get_push_location()
89
if location is not None:
90
self._combo.get_child().set_text(location)
93
def _on_push_clicked(self, widget):
94
""" Push button clicked handler. """
95
location = self._combo.get_child().get_text()
43
# Dictionary for signal_autoconnect
44
dic = { "on_button_push_push_clicked": self.push,
45
"on_button_push_cancel_clicked": self.close,
46
"on_button_push_test_clicked": self.test,
47
"on_radiobutton_push_stored_toggled": self.stored_toggled,
48
"on_radiobutton_push_specific_toggled": self.specific_toggled, }
50
# Connect the signals to the handlers
51
self.glade.signal_autoconnect(dic)
53
# Get some useful widgets
54
self.radio_stored = self.glade.get_widget('radiobutton_push_stored')
55
self.radio_specific = self.glade.get_widget('radiobutton_push_specific')
56
self.entry_stored = self.glade.get_widget('entry_push_stored')
57
self.entry_location = self.glade.get_widget('entry_push_location')
58
self.check_remember = self.glade.get_widget('checkbutton_push_remember')
59
self.check_overwrite = self.glade.get_widget('checkbutton_push_overwrite')
60
self.check_create = self.glade.get_widget('checkbutton_push_create')
61
self.label_test = self.glade.get_widget('label_push_test')
62
self.image_test = self.glade.get_widget('image_push_test')
65
self.entry_location.set_sensitive(0)
66
self.check_remember.set_sensitive(0)
67
self.check_create.set_sensitive(0)
69
self.entry_stored.set_text(branch.get_push_location() or '')
72
""" Display the Push dialog. """
74
self.width, self.height = self.window.get_size()
76
def stored_toggled(self, widget):
77
if widget.get_active():
78
self.entry_stored.set_sensitive(1)
79
self.entry_location.set_sensitive(0)
80
self.check_remember.set_sensitive(0)
81
self.check_create.set_sensitive(0)
83
self.entry_stored.set_sensitive(0)
84
self.entry_location.set_sensitive(1)
85
self.check_remember.set_sensitive(1)
86
self.check_create.set_sensitive(1)
88
def specific_toggled(self, widget):
89
if widget.get_active():
90
self.entry_stored.set_sensitive(0)
91
self.entry_location.set_sensitive(1)
92
self.check_remember.set_sensitive(1)
93
self.check_create.set_sensitive(1)
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)
100
def push(self, widget):
99
revs = do_push(self.branch, location=location, overwrite=False)
100
except errors.DivergedBranches:
101
response = question_dialog(_i18n('Branches have been diverged'),
102
_i18n('You cannot push if branches have diverged.\nOverwrite?'))
103
if response == gtk.RESPONSE_YES:
104
revs = do_push(self.branch, location=location, overwrite=True)
106
if self.branch is not None and self.branch.get_push_location() is None:
107
self.branch.set_push_location(location)
109
self._history.add_entry(location)
110
info_dialog(_i18n('Push successful'),
111
_i18n("%d revision(s) pushed.") % revs)
113
self.response(gtk.RESPONSE_OK)
102
if self.radio_stored.get_active():
104
revs = do_push(self.branch,
105
overwrite=self.check_overwrite.get_active())
106
except errors.DivergedBranches:
107
response = question_dialog(_('Branches have been diverged'),
108
_('You cannot push if branches have diverged. \nOverwrite?'))
109
if response == gtk.RESPONSE_OK:
110
revs = do_push(self.branch, overwrite=True)
112
elif self.radio_specific.get_active():
113
location = self.entry_location.get_text()
115
error_dialog(_('No location specified'),
116
_('Please specify a location or use the default.'))
120
revs = do_push(self.branch, location,
121
self.check_remember.get_active(),
123
self.check_create.get_active())
124
except errors.DivergedBranches:
125
response = question_dialog(_('Branches have been diverged'),
126
_('You cannot push if branches have diverged. \nOverwrite?'))
127
if response == gtk.RESPONSE_OK:
128
revs = do_push(self.branch, location,
129
self.check_remember.get_active(),
131
self.check_create.get_active())
136
info_dialog(_('Push successful'),
137
_('%d revision(s) pushed.') % revs)
139
def test(self, widget):
140
""" Test if write access possible. """
142
_urlRE = re.compile(r'^(?P<proto>[^:/\\]+)://(?P<path>.*)$')
144
if self.radio_stored.get_active():
145
url = self.entry_stored.get_text()
146
elif self.radio_specific.get_active():
147
url = self.entry_location.get_text()
149
m = _urlRE.match(url)
151
proto = m.groupdict()['proto']
152
if (proto == 'sftp') or (proto == 'file') or (proto == 'ftp'):
153
# have write acces (most probably)
154
self.image_test.set_from_stock(gtk.STOCK_YES, 4)
155
self.label_test.set_markup(_('<b>Write access is probably available</b>'))
158
self.image_test.set_from_stock(gtk.STOCK_NO, 4)
159
self.label_test.set_markup(_('<b>No write access</b>'))
162
self.image_test.set_from_stock(gtk.STOCK_DIALOG_QUESTION, 4)
163
self.label_test.set_markup(_('<b>Could not determine</b>'))
165
def close(self, widget=None):
166
self.window.destroy()
115
def do_push(br_from, location, overwrite):
168
def do_push(branch, location=None, remember=False, overwrite=False,
169
create_prefix=False):
116
170
""" Update a mirror of a branch.
118
:param br_from: the source branch
172
:param branch: the source branch
120
174
:param location: the location of the branch that you'd like to update
176
:param remember: if set, the location will be stored
122
178
:param overwrite: overwrite target location if it diverged
180
:param create_prefix: create the path leading up to the branch if it doesn't exist
124
182
:return: number of revisions pushed
184
from bzrlib.branch import Branch
126
185
from bzrlib.bzrdir import BzrDir
127
186
from bzrlib.transport import get_transport
190
stored_loc = br_from.get_push_location()
192
if stored_loc is None:
193
error_dialog(_('Push location is unknown'),
194
_('Please specify a location manually.'))
197
location = stored_loc
129
199
transport = get_transport(location)
130
200
location_url = transport.base
202
if br_from.get_push_location() is None or remember:
203
br_from.set_push_location(location_url)
added
removed
olive/push.py
