20
20
pygtk.require("2.0")
26
26
from errors import show_bzr_error
28
# FIXME: This needs to be public JRV 20070714
29
from bzrlib.builtins import _create_prefix
30
from bzrlib.config import LocationConfig
31
28
import bzrlib.errors as errors
33
from dialog import error_dialog, info_dialog, question_dialog
30
from bzrlib.plugins.gtk import _i18n
31
from bzrlib.plugins.gtk.dialog import (
35
from history import UrlHistory
36
from bzrlib.plugins.gtk.history import UrlHistory
37
38
class PushDialog(gtk.Dialog):
38
39
""" New implementation of the Push dialog. """
39
41
def __init__(self, repository, revid, branch=None, parent=None):
40
42
""" Initialize the Push dialog. """
41
43
gtk.Dialog.__init__(self, title="Push - Olive",
44
46
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
47
49
self.repository = repository
49
51
self.branch = branch
51
53
# Create the widgets
52
self._label_location = gtk.Label(_("Location:"))
54
self._label_location = gtk.Label(_i18n("Location:"))
53
55
self._combo = gtk.ComboBoxEntry()
54
self._button_push = gtk.Button(_("_Push"), use_underline=True)
56
self._button_push = gtk.Button(_i18n("_Push"), use_underline=True)
55
57
self._hbox_location = gtk.HBox()
58
60
self._button_push.connect('clicked', self._on_push_clicked)
61
63
self._label_location.set_alignment(0, 0.5)
62
64
self._hbox_location.set_spacing(3)
63
65
self.vbox.set_spacing(3)
66
68
self._hbox_location.pack_start(self._label_location, False, False)
67
69
self._hbox_location.pack_start(self._combo, True, True)
68
70
self.vbox.pack_start(self._hbox_location)
69
71
self.action_area.pack_end(self._button_push)
72
74
self.vbox.show_all()
74
76
# Build location history
75
77
self._history = UrlHistory(self.branch.get_config(), 'push_history')
76
78
self._build_history()
78
80
def _build_history(self):
79
81
""" Build up the location history. """
80
82
self._combo_model = gtk.ListStore(str)
82
84
self._combo_model.append([ item ])
83
85
self._combo.set_model(self._combo_model)
84
86
self._combo.set_text_column(0)
86
88
if self.branch is not None:
87
89
location = self.branch.get_push_location()
88
90
if location is not None:
89
91
self._combo.get_child().set_text(location)
92
94
def _on_push_clicked(self, widget):
93
95
""" Push button clicked handler. """
94
96
location = self._combo.get_child().get_text()
96
if self.branch is not None and self.branch.get_push_location() is None:
97
response = question_dialog(_('Set default push location'),
98
_('There is no default push location set.\nSet %r as default now?') % location)
99
if response == gtk.REPONSE_OK:
100
self.branch.set_push_location(location)
103
100
revs = do_push(self.branch, location=location, overwrite=False)
104
101
except errors.DivergedBranches:
105
response = question_dialog(_('Branches have been diverged'),
106
_('You cannot push if branches have diverged.\nOverwrite?'))
107
if response == gtk.RESPONSE_OK:
102
response = question_dialog(_i18n('Branches have been diverged'),
103
_i18n('You cannot push if branches have diverged.\nOverwrite?'))
104
if response == gtk.RESPONSE_YES:
108
105
revs = do_push(self.branch, location=location, overwrite=True)
107
if self.branch is not None and self.branch.get_push_location() is None:
108
self.branch.set_push_location(location)
111
110
self._history.add_entry(location)
112
info_dialog(_('Push successful'),
113
_("%d revision(s) pushed.") % revs)
111
info_dialog(_i18n('Push successful'),
112
_i18n("%d revision(s) pushed.") % revs)
115
114
self.response(gtk.RESPONSE_OK)
117
117
def do_push(br_from, location, overwrite):
118
118
""" Update a mirror of a branch.
120
120
:param br_from: the source branch
122
121
:param location: the location of the branch that you'd like to update
124
122
:param overwrite: overwrite target location if it diverged
126
123
:return: number of revisions pushed
128
125
from bzrlib.bzrdir import BzrDir
129
126
from bzrlib.transport import get_transport
131
128
transport = get_transport(location)
132
129
location_url = transport.base
143
140
relurl = transport.relpath(location_url)
144
141
transport.mkdir(relurl)
145
142
except errors.NoSuchFile:
146
response = question_dialog(_('Non existing parent directory'),
147
_("The parent directory (%s)\ndoesn't exist. Create?") % location)
143
response = question_dialog(_i18n('Non existing parent directory'),
144
_i18n("The parent directory (%s)\ndoesn't exist. Create?") % location)
148
145
if response == gtk.RESPONSE_OK:
149
_create_prefix(transport)
146
transport.create_prefix()
152
149
dir_to = br_from.bzrdir.clone(location_url,
added
removed
push.py
