16
14
# along with this program; if not, write to the Free Software
17
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19
from gi.repository import Gtk
21
from errors import show_bzr_error
27
from bzrlib.controldir import ControlDir
28
from bzrlib.push import PushResult
29
from bzrlib.transport import get_transport
31
from bzrlib.plugins.gtk.dialog import (
34
from bzrlib.plugins.gtk.history import UrlHistory
35
from bzrlib.plugins.gtk.i18n import _i18n
36
from bzrlib.plugins.gtk.ui import ProgressPanel
39
class PushDialog(Gtk.Dialog):
40
"""New implementation of the Push dialog."""
42
def __init__(self, repository=None, revid=None, branch=None, parent=None):
43
"""Initialize the Push dialog. """
44
super(PushDialog, self).__init__(
45
title="Push", parent=parent, flags=0, border_width=6,
46
buttons=(Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE))
47
if repository is None:
48
repository = branch.repository
52
self.repository = repository
54
revid = branch.last_revision()
58
self._label_location = Gtk.Label(label=_i18n("Location:"))
59
self._combo = Gtk.ComboBox.new_with_entry()
60
self._button_push = Gtk.Button(_i18n("_Push"), use_underline=True)
61
self._hbox_location = Gtk.Box(Gtk.Orientation.HORIZONTAL, 6)
62
self._push_message = Gtk.Label(xalign=0)
63
self._progress_widget = ProgressPanel()
66
ui.ui_factory.set_progress_bar_widget(self._progress_widget)
67
self.connect('close', self._on_close_clicked)
68
self._button_push.connect('clicked', self._on_push_clicked)
71
content_area = self.get_content_area()
72
content_area.set_spacing(6)
75
self._hbox_location.pack_start(self._label_location, False, False, 0)
76
self._hbox_location.pack_start(self._combo, False, False, 0)
77
content_area.pack_start(self._hbox_location, True, True, 0)
78
content_area.pack_start(self._progress_widget, True, True, 0)
79
content_area.pack_start(self._push_message, True, True, 0)
80
self.get_action_area().pack_end(self._button_push, True, True, 0)
83
content_area.show_all()
84
self._progress_widget.hide()
85
self._push_message.hide()
87
# Build location history
88
self._history = UrlHistory(self.branch.get_config(), 'push_history')
91
def _build_history(self):
92
"""Build up the location history. """
93
self._combo_model = Gtk.ListStore(str)
94
for item in self._history.get_entries():
95
self._combo_model.append([item])
96
self._combo.set_model(self._combo_model)
97
self._combo.set_entry_text_column(0)
99
if self.branch is not None:
100
location = self.branch.get_push_location()
101
if location is not None:
102
self._combo.get_child().set_text(location)
104
def _on_close_clicked(self, widget):
105
"""Close dialog handler."""
106
ui.ui_factory.set_progress_bar_widget(None)
109
def _on_push_clicked(self, widget):
110
"""Push button clicked handler. """
111
self._push_message.hide()
112
self._progress_widget.tick()
113
location = self._combo.get_child().get_text()
29
import bzrlib.errors as errors
31
from olive import gladefile
34
""" Display Push dialog and perform the needed actions. """
35
def __init__(self, comm):
36
""" Initialize the Push dialog. """
37
self.glade = gtk.glade.XML(gladefile, 'window_push')
39
# Communication object
42
self.window = self.glade.get_widget('window_push')
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, }
51
# Connect the signals to the handlers
52
self.glade.signal_autoconnect(dic)
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')
66
self.entry_location.set_sensitive(0)
67
self.check_remember.set_sensitive(0)
68
self.check_create.set_sensitive(0)
71
self.notbranch = False
116
message = do_push(self.branch, location, overwrite=False)
117
except errors.DivergedBranches:
118
response = question_dialog(
119
_i18n('Branches have been diverged'),
120
_i18n('You cannot push if branches have diverged.\n'
122
if response == Gtk.ResponseType.YES:
123
message = do_push(self.branch, location, overwrite=True)
73
from bzrlib.branch import Branch
75
branch = Branch.open_containing(self.comm.get_path())[0]
77
self.entry_stored.set_text(branch.get_push_location())
78
except errors.NotBranchError:
83
""" Display the Push dialog. """
85
error_dialog(_('Directory is not a branch'),
86
_('You can perform this action only in a branch.'))
90
self.width, self.height = self.window.get_size()
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)
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)
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)
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)
116
def push(self, widget):
118
self.comm.set_busy(self.window)
119
if self.radio_stored.get_active():
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.'))
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.'))
131
elif self.radio_specific.get_active():
132
location = self.entry_location.get_text()
134
error_dialog(_('No location specified'),
135
_('Please specify a location or use the default.'))
139
revs = do_push(self.comm.get_path(), location,
140
self.check_remember.get_active(),
141
self.check_overwrite.get_active(),
142
self.check_create.get_active())
143
except errors.NotBranchError:
144
error_dialog(_('Directory is not a branch'),
145
_('You can perform this action only in a branch.'))
146
self.comm.set_busy(self.window, False)
148
except errors.DivergedBranches:
149
error_dialog(_('Branches have been diverged'),
150
_('You cannot push if branches have diverged. Use the\noverwrite option if you want to push anyway.'))
151
self.comm.set_busy(self.window, False)
155
info_dialog(_('Push successful'),
156
_('%d revision(s) pushed.') % revs)
158
def test(self, widget):
159
""" Test if write access possible. """
161
_urlRE = re.compile(r'^(?P<proto>[^:/\\]+)://(?P<path>.*)$')
163
if self.radio_stored.get_active():
164
url = self.entry_stored.get_text()
165
elif self.radio_specific.get_active():
166
url = self.entry_location.get_text()
168
m = _urlRE.match(url)
170
proto = m.groupdict()['proto']
171
if (proto == 'sftp') or (proto == 'file') or (proto == 'ftp'):
172
# have write acces (most probably)
173
self.image_test.set_from_stock(gtk.STOCK_YES, 4)
174
self.label_test.set_markup(_('<b>Write access is probably available</b>'))
126
self._history.add_entry(location)
127
if (self.branch is not None
128
and self.branch.get_push_location() is None):
129
self.branch.set_push_location(location)
131
self._progress_widget.finished()
132
self._push_message.props.label = message
133
self._push_message.show()
136
def do_push(br_from, location, overwrite):
137
"""Update a mirror of a branch.
139
:param br_from: the source branch
177
self.image_test.set_from_stock(gtk.STOCK_NO, 4)
178
self.label_test.set_markup(_('<b>No write access</b>'))
181
self.image_test.set_from_stock(gtk.STOCK_DIALOG_QUESTION, 4)
182
self.label_test.set_markup(_('<b>Could not determine</b>'))
184
def close(self, widget=None):
185
self.window.destroy()
187
def do_push(branch, location=None, remember=False, overwrite=False,
188
create_prefix=False):
189
""" Update a mirror of a branch.
191
:param branch: the source branch
140
193
:param location: the location of the branch that you'd like to update
195
:param remember: if set, the location will be stored
141
197
:param overwrite: overwrite target location if it diverged
199
:param create_prefix: create the path leading up to the branch if it doesn't exist
142
201
:return: number of revisions pushed
145
to_transport = get_transport(location)
203
from bzrlib.branch import Branch
204
from bzrlib.bzrdir import BzrDir
205
from bzrlib.transport import get_transport
207
br_from = Branch.open_containing(branch)[0]
209
stored_loc = br_from.get_push_location()
211
if stored_loc is None:
212
error_dialog(_('Push location is unknown'),
213
_('Please specify a location manually.'))
216
location = stored_loc
218
transport = get_transport(location)
219
location_url = transport.base
221
if br_from.get_push_location() is None or remember:
222
br_from.set_push_location(location_url)
147
dir_to = ControlDir.open_from_transport(to_transport)
227
dir_to = BzrDir.open(location_url)
228
br_to = dir_to.open_branch()
148
229
except errors.NotBranchError:
153
br_to = br_from.create_clone_on_transport(
154
to_transport, revision_id=revision_id)
155
except errors.NoSuchFile:
156
response = question_dialog(
157
_i18n('Non existing parent directory'),
158
_i18n("The parent directory (%s)\ndoesn't exist. Create?") %
160
if response == Gtk.ResponseType.OK:
161
br_to = br_from.create_clone_on_transport(
162
to_transport, revision_id=revision_id, create_prefix=True)
164
return _i18n("Push aborted.")
165
push_result = create_push_result(br_from, br_to)
231
transport = transport.clone('..')
232
if not create_prefix:
234
relurl = transport.relpath(location_url)
235
transport.mkdir(relurl)
236
except errors.NoSuchFile:
237
error_dialog(_('Non existing parent directory'),
238
_("The parent directory (%s)\ndoesn't exist.") % location)
241
current = transport.base
242
needed = [(transport, transport.relpath(location_url))]
245
transport, relpath = needed[-1]
246
transport.mkdir(relpath)
248
except errors.NoSuchFile:
249
new_transport = transport.clone('..')
250
needed.append((new_transport,
251
new_transport.relpath(transport.base)))
252
if new_transport.base == transport.base:
253
error_dialog(_('Path prefix not created'),
254
_("The path leading up to the specified location couldn't\nbe created."))
256
dir_to = br_from.bzrdir.clone(location_url,
257
revision_id=br_from.last_revision())
258
br_to = dir_to.open_branch()
259
count = len(br_to.revision_history())
167
push_result = dir_to.push_branch(br_from, revision_id, overwrite)
168
message = create_push_message(br_from, push_result)
172
def create_push_message(br_from, push_result):
173
"""Return a mesage explaining what happened during the push."""
175
rev_count = br_from.revno() - push_result.old_revno
176
messages.append(_i18n("%d revision(s) pushed.") % rev_count)
177
if push_result.stacked_on is not None:
178
messages.append(_i18n("Stacked on %s.") % push_result.stacked_on)
179
if push_result.workingtree_updated is False:
180
messages.append(_i18n(
181
"\nThe working tree was not updated:"
182
"\nSee 'bzr help working-trees' for more information."))
183
return '\n'.join(messages)
186
def create_push_result(br_from, br_to):
187
"""Return a PushResult like one created by ControlDir.push_branch()."""
188
push_result = PushResult()
189
push_result.source_branch = br_from
190
push_result.target_branch = br_to
191
push_result.branch_push_result = None
192
push_result.master_branch = None
193
push_result.old_revno = 0
194
push_result.old_revid = br_to.last_revision()
195
push_result.workingtree_updated = None # Not applicable to this case.
197
push_result.stacked_on = br_to.get_stacked_on_url()
198
except (errors.UnstackableBranchFormat,
199
errors.UnstackableRepositoryFormat,
201
push_result.stacked_on = None
261
old_rh = br_to.revision_history()
264
tree_to = dir_to.open_workingtree()
265
except errors.NotLocalUrl:
266
# FIXME - what to do here? how should we warn the user?
267
#warning('This transport does not update the working '
268
# 'tree of: %s' % (br_to.base,))
269
count = br_to.pull(br_from, overwrite)
270
except errors.NoWorkingTree:
271
count = br_to.pull(br_from, overwrite)
273
count = tree_to.pull(br_from, overwrite)
274
except errors.DivergedBranches:
added
removed
olive/push.py
