20
19
pygtk.require("2.0")
26
25
from errors import show_bzr_error
27
from bzrlib.config import LocationConfig
28
28
import bzrlib.errors as errors
30
from bzrlib.plugins.gtk.dialog import (
35
from bzrlib.plugins.gtk.history import UrlHistory
36
from bzrlib.plugins.gtk.i18n import _i18n
30
from dialog import error_dialog, info_dialog, question_dialog
32
from history import UrlHistory
39
34
class PushDialog(gtk.Dialog):
40
"""New implementation of the Push dialog."""
42
def __init__(self, repository, revid, branch=None, parent=None):
43
"""Initialize the Push dialog. """
44
gtk.Dialog.__init__(self, title="Push",
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",
47
41
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
50
self.repository = repository
52
44
self.branch = branch
54
46
# Create the widgets
55
self._label_location = gtk.Label(_i18n("Location:"))
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"),
56
55
self._combo = gtk.ComboBoxEntry()
57
self._button_push = gtk.Button(_i18n("_Push"), use_underline=True)
56
self._button_test = gtk.Button(_("_Test"), use_underline=True)
57
self._button_push = gtk.Button(_("_Push"), use_underline=True)
58
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)
61
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)
64
68
self._label_location.set_alignment(0, 0.5)
69
self._label_test.set_alignment(0, 0.5)
65
70
self._hbox_location.set_spacing(3)
71
self._hbox_test.set_spacing(3)
66
72
self.vbox.set_spacing(3)
69
75
self._hbox_location.pack_start(self._label_location, False, False)
70
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)
71
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)
72
85
self.action_area.pack_end(self._button_push)
75
88
self.vbox.show_all()
77
90
# Build location history
78
91
self._history = UrlHistory(self.branch.get_config(), 'push_history')
79
92
self._build_history()
81
94
def _build_history(self):
82
"""Build up the location history. """
95
""" Build up the location history. """
83
96
self._combo_model = gtk.ListStore(str)
84
97
for item in self._history.get_entries():
85
98
self._combo_model.append([ item ])
86
99
self._combo.set_model(self._combo_model)
87
100
self._combo.set_text_column(0)
89
if self.branch is not None:
90
location = self.branch.get_push_location()
91
if location is not None:
92
self._combo.get_child().set_text(location)
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
# FIXME: This should ask the transport or branch rather than
117
# guessing using regular expressions. JRV 20070714
118
if proto in ('sftp', 'file', 'ftp'):
119
# have write access (most probably)
120
self._image_test.set_from_stock(gtk.STOCK_YES, 4)
121
self._label_test.set_markup(_('<b>Write access is probably available</b>'))
124
self._image_test.set_from_stock(gtk.STOCK_NO, 4)
125
self._label_test.set_markup(_('<b>No write access</b>'))
128
self._image_test.set_from_stock(gtk.STOCK_DIALOG_QUESTION, 4)
129
self._label_test.set_markup(_('<b>Could not determine</b>'))
95
132
def _on_push_clicked(self, widget):
96
"""Push button clicked handler. """
133
""" Push button clicked handler. """
97
134
location = self._combo.get_child().get_text()
101
revs = do_push(self.branch, location=location, overwrite=False)
137
revs = do_push(self.branch,
139
overwrite=self._check_overwrite.get_active(),
140
remember=self._check_remember.get_active(),
141
create_prefix=self._check_prefix.get_active())
102
142
except errors.DivergedBranches:
103
response = question_dialog(_i18n('Branches have been diverged'),
104
_i18n('You cannot push if branches have diverged.\nOverwrite?'))
105
if response == gtk.RESPONSE_YES:
106
revs = do_push(self.branch, location=location, overwrite=True)
108
if self.branch is not None and self.branch.get_push_location() is None:
109
self.branch.set_push_location(location)
143
response = question_dialog(_('Branches have been diverged'),
144
_('You cannot push if branches have diverged.\nOverwrite?'))
145
if response == gtk.RESPONSE_OK:
146
revs = do_push(self.branch, overwrite=True)
111
149
self._history.add_entry(location)
112
info_dialog(_i18n('Push successful'),
113
_i18n("%d revision(s) pushed.") % revs)
150
info_dialog(_('Push successful'),
151
_("%d revision(s) pushed.") % revs)
115
153
self.response(gtk.RESPONSE_OK)
118
def do_push(br_from, location, overwrite):
119
"""Update a mirror of a branch.
121
:param br_from: the source branch
155
def do_push(branch, location=None, remember=False, overwrite=False,
156
create_prefix=False):
157
""" Update a mirror of a branch.
159
:param branch: the source branch
122
161
:param location: the location of the branch that you'd like to update
163
:param remember: if set, the location will be stored
123
165
:param overwrite: overwrite target location if it diverged
167
:param create_prefix: create the path leading up to the branch if it doesn't exist
124
169
:return: number of revisions pushed
126
171
from bzrlib.bzrdir import BzrDir
127
172
from bzrlib.transport import get_transport
176
stored_loc = br_from.get_push_location()
178
if stored_loc is None:
179
error_dialog(_('Push location is unknown'),
180
_('Please specify a location manually.'))
183
location = stored_loc
129
185
transport = get_transport(location)
130
186
location_url = transport.base
188
if br_from.get_push_location() is None or remember:
189
br_from.set_push_location(location_url)
added
removed
push.py
