1
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
2
# Copyright (C) 2007 by Jelmer Vernooij <jelmer@samba.org>
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
# GNU General Public License for more details.
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
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
import bzrlib.errors as errors
33
from bzrlib.plugins.gtk import _i18n
34
from dialog import error_dialog, info_dialog, question_dialog
36
from history import UrlHistory
38
class PushDialog(gtk.Dialog):
39
""" New implementation of the Push dialog. """
40
def __init__(self, repository, revid, branch=None, parent=None):
41
""" Initialize the Push dialog. """
42
gtk.Dialog.__init__(self, title="Push - Olive",
45
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
48
self.repository = repository
53
self._label_location = gtk.Label(_i18n("Location:"))
54
self._combo = gtk.ComboBoxEntry()
55
self._button_push = gtk.Button(_i18n("_Push"), use_underline=True)
56
self._hbox_location = gtk.HBox()
59
self._button_push.connect('clicked', self._on_push_clicked)
62
self._label_location.set_alignment(0, 0.5)
63
self._hbox_location.set_spacing(3)
64
self.vbox.set_spacing(3)
67
self._hbox_location.pack_start(self._label_location, False, False)
68
self._hbox_location.pack_start(self._combo, True, True)
69
self.vbox.pack_start(self._hbox_location)
70
self.action_area.pack_end(self._button_push)
75
# Build location history
76
self._history = UrlHistory(self.branch.get_config(), 'push_history')
79
def _build_history(self):
80
""" Build up the location history. """
81
self._combo_model = gtk.ListStore(str)
82
for item in self._history.get_entries():
83
self._combo_model.append([ item ])
84
self._combo.set_model(self._combo_model)
85
self._combo.set_text_column(0)
87
if self.branch is not None:
88
location = self.branch.get_push_location()
89
if location is not None:
90
self._combo.get_child().set_text(location)
93
def _on_push_clicked(self, widget):
94
""" Push button clicked handler. """
95
location = self._combo.get_child().get_text()
99
revs = do_push(self.branch, location=location, overwrite=False)
100
except errors.DivergedBranches:
101
response = question_dialog(_i18n('Branches have been diverged'),
102
_i18n('You cannot push if branches have diverged.\nOverwrite?'))
103
if response == gtk.RESPONSE_YES:
104
revs = do_push(self.branch, location=location, overwrite=True)
106
if self.branch is not None and self.branch.get_push_location() is None:
107
self.branch.set_push_location(location)
109
self._history.add_entry(location)
110
info_dialog(_i18n('Push successful'),
111
_i18n("%d revision(s) pushed.") % revs)
113
self.response(gtk.RESPONSE_OK)
115
def do_push(br_from, location, overwrite):
116
""" Update a mirror of a branch.
118
:param br_from: the source branch
120
:param location: the location of the branch that you'd like to update
122
:param overwrite: overwrite target location if it diverged
124
:return: number of revisions pushed
126
from bzrlib.bzrdir import BzrDir
127
from bzrlib.transport import get_transport
129
transport = get_transport(location)
130
location_url = transport.base
135
dir_to = BzrDir.open(location_url)
136
br_to = dir_to.open_branch()
137
except errors.NotBranchError:
139
transport = transport.clone('..')
141
relurl = transport.relpath(location_url)
142
transport.mkdir(relurl)
143
except errors.NoSuchFile:
144
response = question_dialog(_i18n('Non existing parent directory'),
145
_i18n("The parent directory (%s)\ndoesn't exist. Create?") % location)
146
if response == gtk.RESPONSE_OK:
147
_create_prefix(transport)
150
dir_to = br_from.bzrdir.clone(location_url,
151
revision_id=br_from.last_revision())
152
br_to = dir_to.open_branch()
153
count = len(br_to.revision_history())
155
old_rh = br_to.revision_history()
157
tree_to = dir_to.open_workingtree()
158
except errors.NotLocalUrl:
159
# FIXME - what to do here? how should we warn the user?
160
count = br_to.pull(br_from, overwrite)
161
except errors.NoWorkingTree:
162
count = br_to.pull(br_from, overwrite)
164
count = tree_to.pull(br_from, overwrite)
added
removed
push.py
