20
21
from errors import show_bzr_error
22
import bzrlib.errors as errors
27
from bzrlib.controldir import ControlDir
28
from bzrlib.push import PushResult
29
from bzrlib.transport import get_transport
24
31
from bzrlib.plugins.gtk.dialog import (
29
34
from bzrlib.plugins.gtk.history import UrlHistory
30
35
from bzrlib.plugins.gtk.i18n import _i18n
36
from bzrlib.plugins.gtk.ui import ProgressPanel
33
39
class PushDialog(Gtk.Dialog):
34
40
"""New implementation of the Push dialog."""
36
def __init__(self, repository, revid, branch=None, parent=None):
42
def __init__(self, repository=None, revid=None, branch=None, parent=None):
37
43
"""Initialize the Push dialog. """
38
GObject.GObject.__init__(self, title="Push",
41
buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
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
44
52
self.repository = repository
54
revid = branch.last_revision()
48
57
# Create the widgets
49
58
self._label_location = Gtk.Label(label=_i18n("Location:"))
50
self._combo = Gtk.ComboBoxEntry()
59
self._combo = Gtk.ComboBox.new_with_entry()
51
60
self._button_push = Gtk.Button(_i18n("_Push"), use_underline=True)
52
self._hbox_location = Gtk.HBox()
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)
55
68
self._button_push.connect('clicked', self._on_push_clicked)
58
self._label_location.set_alignment(0, 0.5)
59
self._hbox_location.set_spacing(3)
60
self.vbox.set_spacing(3)
71
content_area = self.get_content_area()
72
content_area.set_spacing(6)
63
self._hbox_location.pack_start(self._label_location, False, False)
64
self._hbox_location.pack_start(self._combo, True, True)
65
self.vbox.pack_start(self._hbox_location, True, True, 0)
66
self.action_area.pack_end(self._button_push)
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()
71
87
# Build location history
72
88
self._history = UrlHistory(self.branch.get_config(), 'push_history')
76
92
"""Build up the location history. """
77
93
self._combo_model = Gtk.ListStore(str)
78
94
for item in self._history.get_entries():
79
self._combo_model.append([ item ])
95
self._combo_model.append([item])
80
96
self._combo.set_model(self._combo_model)
81
self._combo.set_text_column(0)
97
self._combo.set_entry_text_column(0)
83
99
if self.branch is not None:
84
100
location = self.branch.get_push_location()
85
101
if location is not None:
86
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)
89
109
def _on_push_clicked(self, widget):
90
110
"""Push button clicked handler. """
111
self._push_message.hide()
112
self._progress_widget.tick()
91
113
location = self._combo.get_child().get_text()
95
revs = do_push(self.branch, location=location, overwrite=False)
116
message = do_push(self.branch, location, overwrite=False)
96
117
except errors.DivergedBranches:
97
response = question_dialog(_i18n('Branches have been diverged'),
98
_i18n('You cannot push if branches have diverged.\nOverwrite?'))
118
response = question_dialog(
119
_i18n('Branches have been diverged'),
120
_i18n('You cannot push if branches have diverged.\n'
99
122
if response == Gtk.ResponseType.YES:
100
revs = do_push(self.branch, location=location, overwrite=True)
102
if self.branch is not None and self.branch.get_push_location() is None:
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):
103
129
self.branch.set_push_location(location)
105
self._history.add_entry(location)
106
info_dialog(_i18n('Push successful'),
107
_i18n("%d revision(s) pushed.") % revs)
109
self.response(Gtk.ResponseType.OK)
131
self._progress_widget.finished()
132
self._push_message.props.label = message
133
self._push_message.show()
112
136
def do_push(br_from, location, overwrite):
117
141
:param overwrite: overwrite target location if it diverged
118
142
:return: number of revisions pushed
120
from bzrlib.bzrdir import BzrDir
121
from bzrlib.transport import get_transport
123
transport = get_transport(location)
124
location_url = transport.base
145
to_transport = get_transport(location)
129
dir_to = BzrDir.open(location_url)
130
br_to = dir_to.open_branch()
147
dir_to = ControlDir.open_from_transport(to_transport)
131
148
except errors.NotBranchError:
133
transport = transport.clone('..')
135
relurl = transport.relpath(location_url)
136
transport.mkdir(relurl)
153
br_to = br_from.create_clone_on_transport(
154
to_transport, revision_id=revision_id)
137
155
except errors.NoSuchFile:
138
response = question_dialog(_i18n('Non existing parent directory'),
139
_i18n("The parent directory (%s)\ndoesn't exist. Create?") % location)
156
response = question_dialog(
157
_i18n('Non existing parent directory'),
158
_i18n("The parent directory (%s)\ndoesn't exist. Create?") %
140
160
if response == Gtk.ResponseType.OK:
141
transport.create_prefix()
161
br_to = br_from.create_clone_on_transport(
162
to_transport, revision_id=revision_id, create_prefix=True)
144
dir_to = br_from.bzrdir.clone(location_url,
145
revision_id=br_from.last_revision())
146
br_to = dir_to.open_branch()
147
count = len(br_to.revision_history())
164
return _i18n("Push aborted.")
165
push_result = create_push_result(br_from, br_to)
149
old_rh = br_to.revision_history()
151
tree_to = dir_to.open_workingtree()
152
except errors.NotLocalUrl:
153
# FIXME - what to do here? how should we warn the user?
154
count = br_to.pull(br_from, overwrite)
155
except errors.NoWorkingTree:
156
count = br_to.pull(br_from, overwrite)
158
count = tree_to.pull(br_from, overwrite)
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
added
removed
push.py
