1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
|
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
# Copyright (C) 2007 by Jelmer Vernooij <jelmer@samba.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
try:
import pygtk
pygtk.require("2.0")
except:
pass
import gtk
from errors import show_bzr_error
# FIXME: This needs to be public JRV 20070714
from bzrlib.builtins import _create_prefix
from bzrlib.config import LocationConfig
import bzrlib.errors as errors
from dialog import error_dialog, info_dialog, question_dialog
from history import UrlHistory
class PushDialog(gtk.Dialog):
""" New implementation of the Push dialog. """
def __init__(self, repository, revid, branch=None, parent=None):
""" Initialize the Push dialog. """
gtk.Dialog.__init__(self, title="Push - Olive",
parent=parent,
flags=0,
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
# Get arguments
self.repository = repository
self.revid = revid
self.branch = branch
# Create the widgets
self._label_location = gtk.Label(_("Location:"))
self._combo = gtk.ComboBoxEntry()
self._button_push = gtk.Button(_("_Push"), use_underline=True)
self._hbox_location = gtk.HBox()
# Set callbacks
self._button_push.connect('clicked', self._on_push_clicked)
# Set properties
self._label_location.set_alignment(0, 0.5)
self._hbox_location.set_spacing(3)
self.vbox.set_spacing(3)
# Pack widgets
self._hbox_location.pack_start(self._label_location, False, False)
self._hbox_location.pack_start(self._combo, True, True)
self.vbox.pack_start(self._hbox_location)
self.action_area.pack_end(self._button_push)
# Show the dialog
self.vbox.show_all()
# Build location history
self._history = UrlHistory(self.branch.get_config(), 'push_history')
self._build_history()
def _build_history(self):
""" Build up the location history. """
self._combo_model = gtk.ListStore(str)
for item in self._history.get_entries():
self._combo_model.append([ item ])
self._combo.set_model(self._combo_model)
self._combo.set_text_column(0)
if self.branch is not None:
location = self.branch.get_push_location()
if location is not None:
self._combo.get_child().set_text(location)
@show_bzr_error
def _on_push_clicked(self, widget):
""" Push button clicked handler. """
location = self._combo.get_child().get_text()
revs = 0
if self.branch is not None and self.branch.get_push_location() is None:
response = question_dialog(_('Set default push location'),
_('There is no default push location set.\nSet %r as default now?') % location)
if response == gtk.RESPONSE_OK:
self.branch.set_push_location(location)
try:
revs = do_push(self.branch, location=location, overwrite=False)
except errors.DivergedBranches:
response = question_dialog(_('Branches have been diverged'),
_('You cannot push if branches have diverged.\nOverwrite?'))
if response == gtk.RESPONSE_OK:
revs = do_push(self.branch, location=location, overwrite=True)
return
self._history.add_entry(location)
info_dialog(_('Push successful'),
_("%d revision(s) pushed.") % revs)
self.response(gtk.RESPONSE_OK)
def do_push(br_from, location, overwrite):
""" Update a mirror of a branch.
:param br_from: the source branch
:param location: the location of the branch that you'd like to update
:param overwrite: overwrite target location if it diverged
:return: number of revisions pushed
"""
from bzrlib.bzrdir import BzrDir
from bzrlib.transport import get_transport
transport = get_transport(location)
location_url = transport.base
old_rh = []
try:
dir_to = BzrDir.open(location_url)
br_to = dir_to.open_branch()
except errors.NotBranchError:
# create a branch.
transport = transport.clone('..')
try:
relurl = transport.relpath(location_url)
transport.mkdir(relurl)
except errors.NoSuchFile:
response = question_dialog(_('Non existing parent directory'),
_("The parent directory (%s)\ndoesn't exist. Create?") % location)
if response == gtk.RESPONSE_OK:
_create_prefix(transport)
else:
return
dir_to = br_from.bzrdir.clone(location_url,
revision_id=br_from.last_revision())
br_to = dir_to.open_branch()
count = len(br_to.revision_history())
else:
old_rh = br_to.revision_history()
try:
tree_to = dir_to.open_workingtree()
except errors.NotLocalUrl:
# FIXME - what to do here? how should we warn the user?
count = br_to.pull(br_from, overwrite)
except errors.NoWorkingTree:
count = br_to.pull(br_from, overwrite)
else:
count = tree_to.pull(br_from, overwrite)
return count
|