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
25
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
27
from bzrlib.config import LocationConfig
28
import bzrlib.errors as errors
30
from dialog import error_dialog, info_dialog, question_dialog
32
from olive import delimiter
34
class PushDialog(gtk.Dialog):
35
""" New implementation of the Push dialog. """
36
def __init__(self, branch, parent=None):
37
""" Initialize the Push dialog. """
38
gtk.Dialog.__init__(self, title="Push - Olive",
41
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
49
44
self.branch = branch
52
self.repository = repository
54
revid = branch.last_revision()
57
46
# Create the widgets
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()
47
self._label_location = gtk.Label(_("Location:"))
48
self._label_test = gtk.Label(_("(click the Test button to check write access)"))
49
self._check_remember = gtk.CheckButton(_("_Remember as default location"),
51
self._check_prefix = gtk.CheckButton(_("Create the path _leading up to the location"),
53
self._check_overwrite = gtk.CheckButton(_("_Overwrite target if diverged"),
55
self._combo = gtk.ComboBoxEntry()
56
self._button_test = gtk.Button(_("_Test"), use_underline=True)
57
self._button_push = gtk.Button(_("_Push"), use_underline=True)
58
self._hbox_location = gtk.HBox()
59
self._hbox_test = gtk.HBox()
60
self._image_test = gtk.Image()
66
ui.ui_factory.set_progress_bar_widget(self._progress_widget)
67
self.connect('close', self._on_close_clicked)
63
self._button_test.connect('clicked', self._on_test_clicked)
68
64
self._button_push.connect('clicked', self._on_push_clicked)
71
content_area = self.get_content_area()
72
content_area.set_spacing(6)
67
self._image_test.set_from_stock(gtk.STOCK_DIALOG_INFO, gtk.ICON_SIZE_BUTTON)
68
self._label_location.set_alignment(0, 0.5)
69
self._label_test.set_alignment(0, 0.5)
70
self._hbox_location.set_spacing(3)
71
self._hbox_test.set_spacing(3)
72
self.vbox.set_spacing(3)
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)
75
self._hbox_location.pack_start(self._label_location, False, False)
76
self._hbox_location.pack_start(self._combo, True, True)
77
self._hbox_test.pack_start(self._image_test, False, False)
78
self._hbox_test.pack_start(self._label_test, True, True)
79
self.vbox.pack_start(self._hbox_location)
80
self.vbox.pack_start(self._check_remember)
81
self.vbox.pack_start(self._check_prefix)
82
self.vbox.pack_start(self._check_overwrite)
83
self.vbox.pack_start(self._hbox_test)
84
self.action_area.pack_start(self._button_test)
85
self.action_area.pack_end(self._button_push)
83
content_area.show_all()
84
self._progress_widget.hide()
85
self._push_message.hide()
87
90
# Build location history
88
self._history = UrlHistory(self.branch.get_config(), 'push_history')
89
91
self._build_history()
91
93
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)
94
""" Build up the location history. """
95
config = LocationConfig(self.branch.base)
96
history = config.get_user_option('gpush_history')
97
if history is not None:
98
self._combo_model = gtk.ListStore(str)
99
for item in history.split(delimiter):
100
self._combo_model.append([ item ])
101
self._combo.set_model(self._combo_model)
102
self._combo.set_text_column(0)
104
location = self.branch.get_push_location()
106
self._combo.get_child().set_text(location)
108
def _add_to_history(self, location):
109
""" Add specified location to the history (if not yet added). """
110
config = LocationConfig(self.branch.base)
111
history = config.get_user_option('gpush_history')
113
config.set_user_option('gpush_history', location)
115
h = history.split(delimiter)
116
if location not in h:
118
config.set_user_option('gpush_history', delimiter.join(h))
120
def _on_test_clicked(self, widget):
121
""" Test button clicked handler. """
123
_urlRE = re.compile(r'^(?P<proto>[^:/\\]+)://(?P<path>.*)$')
125
url = self._combo.get_child().get_text()
127
m = _urlRE.match(url)
129
proto = m.groupdict()['proto']
130
if (proto == 'sftp') or (proto == 'file') or (proto == 'ftp'):
131
# have write acces (most probably)
132
self._image_test.set_from_stock(gtk.STOCK_YES, 4)
133
self._label_test.set_markup(_('<b>Write access is probably available</b>'))
136
self._image_test.set_from_stock(gtk.STOCK_NO, 4)
137
self._label_test.set_markup(_('<b>No write access</b>'))
140
self._image_test.set_from_stock(gtk.STOCK_DIALOG_QUESTION, 4)
141
self._label_test.set_markup(_('<b>Could not determine</b>'))
109
144
def _on_push_clicked(self, widget):
110
"""Push button clicked handler. """
111
self._push_message.hide()
112
self._progress_widget.tick()
145
""" Push button clicked handler. """
113
146
location = self._combo.get_child().get_text()
116
message = do_push(self.branch, location, overwrite=False)
149
revs = do_push(self.branch,
151
overwrite=self._check_overwrite.get_active(),
152
remember=self._check_remember.get_active(),
153
create_prefix=self._check_prefix.get_active())
117
154
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)
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
155
response = question_dialog(_('Branches have been diverged'),
156
_('You cannot push if branches have diverged.\nOverwrite?'))
157
if response == gtk.RESPONSE_OK:
158
revs = do_push(self.branch, overwrite=True)
161
self._add_to_history(location)
162
info_dialog(_('Push successful'),
163
_("%d revision(s) pushed.") % revs)
165
self.response(gtk.RESPONSE_OK)
167
def do_push(branch, location=None, remember=False, overwrite=False,
168
create_prefix=False):
169
""" Update a mirror of a branch.
171
:param branch: the source branch
140
173
:param location: the location of the branch that you'd like to update
175
:param remember: if set, the location will be stored
141
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
142
181
:return: number of revisions pushed
145
to_transport = get_transport(location)
183
from bzrlib.bzrdir import BzrDir
184
from bzrlib.transport import get_transport
188
stored_loc = br_from.get_push_location()
190
if stored_loc is None:
191
error_dialog(_('Push location is unknown'),
192
_('Please specify a location manually.'))
195
location = stored_loc
197
transport = get_transport(location)
198
location_url = transport.base
200
if br_from.get_push_location() is None or remember:
201
br_from.set_push_location(location_url)
147
dir_to = ControlDir.open_from_transport(to_transport)
206
dir_to = BzrDir.open(location_url)
207
br_to = dir_to.open_branch()
148
208
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)
210
transport = transport.clone('..')
211
if not create_prefix:
213
relurl = transport.relpath(location_url)
214
transport.mkdir(relurl)
215
except errors.NoSuchFile:
216
error_dialog(_('Non existing parent directory'),
217
_("The parent directory (%s)\ndoesn't exist.") % location)
220
current = transport.base
221
needed = [(transport, transport.relpath(location_url))]
224
transport, relpath = needed[-1]
225
transport.mkdir(relpath)
227
except errors.NoSuchFile:
228
new_transport = transport.clone('..')
229
needed.append((new_transport,
230
new_transport.relpath(transport.base)))
231
if new_transport.base == transport.base:
232
error_dialog(_('Path prefix not created'),
233
_("The path leading up to the specified location couldn't\nbe created."))
235
dir_to = br_from.bzrdir.clone(location_url,
236
revision_id=br_from.last_revision())
237
br_to = dir_to.open_branch()
238
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
240
old_rh = br_to.revision_history()
242
tree_to = dir_to.open_workingtree()
243
except errors.NotLocalUrl:
244
# FIXME - what to do here? how should we warn the user?
245
#warning('This transport does not update the working '
246
# 'tree of: %s' % (br_to.base,))
247
count = br_to.pull(br_from, overwrite)
248
except errors.NoWorkingTree:
249
count = br_to.pull(br_from, overwrite)
251
count = tree_to.pull(br_from, overwrite)
added
removed
push.py
