15
16
# along with this program; if not, write to the Free Software
16
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19
from gi.repository import Gtk
26
21
from errors import show_bzr_error
28
from bzrlib.config import LocationConfig
29
import bzrlib.errors as errors
31
from bzrlib.plugins.gtk import _i18n
32
from dialog import error_dialog, info_dialog, question_dialog
34
from history import UrlHistory
36
class PushDialog(gtk.Dialog):
37
""" New implementation of the Push dialog. """
38
def __init__(self, repository, revid, branch=None, parent=None):
39
""" Initialize the Push dialog. """
40
gtk.Dialog.__init__(self, title="Push - Olive",
43
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
27
from bzrlib.bzrdir import BzrDir
28
from bzrlib.transport import get_transport
30
from bzrlib.plugins.gtk.dialog import (
33
from bzrlib.plugins.gtk.history import UrlHistory
34
from bzrlib.plugins.gtk.i18n import _i18n
35
from bzrlib.plugins.gtk.ui import ProgressPanel
38
class PushDialog(Gtk.Dialog):
39
"""New implementation of the Push dialog."""
41
def __init__(self, repository=None, revid=None, branch=None, parent=None):
42
"""Initialize the Push dialog. """
43
super(PushDialog, self).__init__(
44
title="Push", parent=parent, flags=0, border_width=6,
45
buttons=(Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE))
46
if repository is None:
47
repository = branch.repository
46
51
self.repository = repository
53
revid = branch.last_revision()
50
56
# Create the widgets
51
self._label_location = gtk.Label(_i18n("Location:"))
52
self._combo = gtk.ComboBoxEntry()
53
self._button_push = gtk.Button(_i18n("_Push"), use_underline=True)
54
self._hbox_location = gtk.HBox()
57
self._label_location = Gtk.Label(label=_i18n("Location:"))
58
self._combo = Gtk.ComboBox.new_with_entry()
59
self._button_push = Gtk.Button(_i18n("_Push"), use_underline=True)
60
self._hbox_location = Gtk.Box(Gtk.Orientation.HORIZONTAL, 6)
61
self._push_message = Gtk.Label(xalign=0)
62
self._progress_widget = ProgressPanel()
65
ui.ui_factory.set_progress_bar_widget(self._progress_widget)
66
self.connect('close', self._on_close_clicked)
57
67
self._button_push.connect('clicked', self._on_push_clicked)
60
self._label_location.set_alignment(0, 0.5)
61
self._hbox_location.set_spacing(3)
62
self.vbox.set_spacing(3)
70
content_area = self.get_content_area()
71
content_area.set_spacing(6)
65
self._hbox_location.pack_start(self._label_location, False, False)
66
self._hbox_location.pack_start(self._combo, True, True)
67
self.vbox.pack_start(self._hbox_location)
68
self.action_area.pack_end(self._button_push)
74
self._hbox_location.pack_start(self._label_location, False, False, 0)
75
self._hbox_location.pack_start(self._combo, False, False, 0)
76
content_area.pack_start(self._hbox_location, True, True, 0)
77
content_area.pack_start(self._progress_widget, True, True, 0)
78
content_area.pack_start(self._push_message, True, True, 0)
79
self.get_action_area().pack_end(self._button_push, True, True, 0)
82
content_area.show_all()
83
self._progress_widget.hide()
84
self._push_message.hide()
73
86
# Build location history
74
87
self._history = UrlHistory(self.branch.get_config(), 'push_history')
75
88
self._build_history()
77
90
def _build_history(self):
78
""" Build up the location history. """
79
self._combo_model = gtk.ListStore(str)
91
"""Build up the location history. """
92
self._combo_model = Gtk.ListStore(str)
80
93
for item in self._history.get_entries():
81
self._combo_model.append([ item ])
94
self._combo_model.append([item])
82
95
self._combo.set_model(self._combo_model)
83
self._combo.set_text_column(0)
96
self._combo.set_entry_text_column(0)
85
98
if self.branch is not None:
86
99
location = self.branch.get_push_location()
87
100
if location is not None:
88
101
self._combo.get_child().set_text(location)
103
def _on_close_clicked(self, widget):
104
"""Close dialog handler."""
105
ui.ui_factory.set_progress_bar_widget(None)
91
108
def _on_push_clicked(self, widget):
92
""" Push button clicked handler. """
109
"""Push button clicked handler. """
110
self._push_message.hide()
111
self._progress_widget.tick()
93
112
location = self._combo.get_child().get_text()
97
revs = do_push(self.branch, location=location, overwrite=False)
115
message = do_push(self.branch, location, overwrite=False)
98
116
except errors.DivergedBranches:
99
response = question_dialog(_i18n('Branches have been diverged'),
100
_i18n('You cannot push if branches have diverged.\nOverwrite?'))
101
if response == gtk.RESPONSE_YES:
102
revs = do_push(self.branch, location=location, overwrite=True)
104
if self.branch is not None and self.branch.get_push_location() is None:
117
response = question_dialog(
118
_i18n('Branches have been diverged'),
119
_i18n('You cannot push if branches have diverged.\n'
121
if response == Gtk.ResponseType.YES:
122
message = do_push(self.branch, location, overwrite=True)
125
self._history.add_entry(location)
126
if (self.branch is not None
127
and self.branch.get_push_location() is None):
105
128
self.branch.set_push_location(location)
107
self._history.add_entry(location)
108
info_dialog(_i18n('Push successful'),
109
_i18n("%d revision(s) pushed.") % revs)
111
self.response(gtk.RESPONSE_OK)
130
self._progress_widget.finished()
131
self._push_message.props.label = message
132
self._push_message.show()
113
135
def do_push(br_from, location, overwrite):
114
""" Update a mirror of a branch.
136
"""Update a mirror of a branch.
116
138
:param br_from: the source branch
118
139
:param location: the location of the branch that you'd like to update
120
140
:param overwrite: overwrite target location if it diverged
122
141
:return: number of revisions pushed
124
from bzrlib.bzrdir import BzrDir
125
from bzrlib.transport import get_transport
127
143
transport = get_transport(location)
128
144
location_url = transport.base
133
147
dir_to = BzrDir.open(location_url)
134
148
br_to = dir_to.open_branch()
added
removed
push.py
