15
14
# along with this program; if not, write to the Free Software
16
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
from gi.repository import GObject
19
from gi.repository import Gtk
21
25
from errors import show_bzr_error
27
from bzrlib.config import LocationConfig
23
28
import bzrlib.errors as errors
25
from bzrlib.plugins.gtk.dialog import (
30
from bzrlib.plugins.gtk.history import UrlHistory
31
from bzrlib.plugins.gtk.i18n import _i18n
34
class PushDialog(Gtk.Dialog):
35
"""New implementation of the Push dialog."""
37
def __init__(self, repository, revid, branch=None, parent=None):
38
"""Initialize the Push dialog. """
39
super(PushDialog, self).__init__(
40
title="Push", parent=parent, flags=0,
41
buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
30
from dialog import error_dialog, info_dialog, question_dialog
32
from history import UrlHistory
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))
45
self.repository = repository
47
44
self.branch = branch
49
46
# Create the widgets
50
self._label_location = Gtk.Label(label=_i18n("Location:"))
51
self._combo = Gtk.ComboBox.new_with_entry()
52
self._button_push = Gtk.Button(_i18n("_Push"), use_underline=True)
53
self._hbox_location = Gtk.HBox()
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()
63
self._button_test.connect('clicked', self._on_test_clicked)
56
64
self._button_push.connect('clicked', self._on_push_clicked)
67
self._image_test.set_from_stock(gtk.STOCK_DIALOG_INFO, gtk.ICON_SIZE_BUTTON)
59
68
self._label_location.set_alignment(0, 0.5)
69
self._label_test.set_alignment(0, 0.5)
60
70
self._hbox_location.set_spacing(3)
61
self.get_content_area().set_spacing(3)
71
self._hbox_test.set_spacing(3)
72
self.vbox.set_spacing(3)
64
self._hbox_location.pack_start(
65
self._label_location, False, False, 0)
66
self._hbox_location.pack_start(self._combo, True, True, 0)
67
self.get_content_area().pack_start(self._hbox_location, True, True, 0)
68
# XXX sinzui 2011-08-12: maybe False, False, 0
69
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)
72
self.get_content_area().show_all()
74
90
# Build location history
75
91
self._history = UrlHistory(self.branch.get_config(), 'push_history')
76
92
self._build_history()
78
94
def _build_history(self):
79
"""Build up the location history. """
80
self._combo_model = Gtk.ListStore(str)
95
""" Build up the location history. """
96
self._combo_model = gtk.ListStore(str)
81
97
for item in self._history.get_entries():
82
98
self._combo_model.append([ item ])
83
99
self._combo.set_model(self._combo_model)
84
self._combo.set_entry_text_column(0)
86
if self.branch is not None:
87
location = self.branch.get_push_location()
88
if location is not None:
89
self._combo.get_child().set_text(location)
100
self._combo.set_text_column(0)
102
location = self.branch.get_push_location()
104
self._combo.get_child().set_text(location)
106
def _on_test_clicked(self, widget):
107
""" Test button clicked handler. """
109
_urlRE = re.compile(r'^(?P<proto>[^:/\\]+)://(?P<path>.*)$')
111
url = self._combo.get_child().get_text()
113
m = _urlRE.match(url)
115
proto = m.groupdict()['proto']
116
if (proto == 'sftp') or (proto == 'file') or (proto == 'ftp'):
117
# have write acces (most probably)
118
self._image_test.set_from_stock(gtk.STOCK_YES, 4)
119
self._label_test.set_markup(_('<b>Write access is probably available</b>'))
122
self._image_test.set_from_stock(gtk.STOCK_NO, 4)
123
self._label_test.set_markup(_('<b>No write access</b>'))
126
self._image_test.set_from_stock(gtk.STOCK_DIALOG_QUESTION, 4)
127
self._label_test.set_markup(_('<b>Could not determine</b>'))
92
130
def _on_push_clicked(self, widget):
93
"""Push button clicked handler. """
131
""" Push button clicked handler. """
94
132
location = self._combo.get_child().get_text()
98
revs = do_push(self.branch, location=location, overwrite=False)
135
revs = do_push(self.branch,
137
overwrite=self._check_overwrite.get_active(),
138
remember=self._check_remember.get_active(),
139
create_prefix=self._check_prefix.get_active())
99
140
except errors.DivergedBranches:
100
response = question_dialog(_i18n('Branches have been diverged'),
101
_i18n('You cannot push if branches have diverged.\nOverwrite?'))
102
if response == Gtk.ResponseType.YES:
103
revs = do_push(self.branch, location=location, overwrite=True)
105
if self.branch is not None and self.branch.get_push_location() is None:
106
self.branch.set_push_location(location)
141
response = question_dialog(_('Branches have been diverged'),
142
_('You cannot push if branches have diverged.\nOverwrite?'))
143
if response == gtk.RESPONSE_OK:
144
revs = do_push(self.branch, overwrite=True)
108
147
self._history.add_entry(location)
109
info_dialog(_i18n('Push successful'),
110
_i18n("%d revision(s) pushed.") % revs)
112
self.response(Gtk.ResponseType.OK)
115
def do_push(br_from, location, overwrite):
116
"""Update a mirror of a branch.
118
:param br_from: the source branch
148
info_dialog(_('Push successful'),
149
_("%d revision(s) pushed.") % revs)
151
self.response(gtk.RESPONSE_OK)
153
def do_push(branch, location=None, remember=False, overwrite=False,
154
create_prefix=False):
155
""" Update a mirror of a branch.
157
:param branch: the source branch
119
159
:param location: the location of the branch that you'd like to update
161
:param remember: if set, the location will be stored
120
163
:param overwrite: overwrite target location if it diverged
165
:param create_prefix: create the path leading up to the branch if it doesn't exist
121
167
:return: number of revisions pushed
123
169
from bzrlib.bzrdir import BzrDir
124
170
from bzrlib.transport import get_transport
174
stored_loc = br_from.get_push_location()
176
if stored_loc is None:
177
error_dialog(_('Push location is unknown'),
178
_('Please specify a location manually.'))
181
location = stored_loc
126
183
transport = get_transport(location)
127
184
location_url = transport.base
186
if br_from.get_push_location() is None or remember:
187
br_from.set_push_location(location_url)
added
removed
push.py
