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
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
|
# Copyright (C) 2008 Canonical Ltd
#
# 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
"""Upload a working tree, incrementally.
The only bzr-related info uploaded with the working tree is the corrseponding
revision id. The uploaded working tree is not linked to any other bzr data.
The intended use is for web sites.
"""
from bzrlib import (
commands,
option,
)
class cmd_upload(commands.Command):
"""Upload a working tree, as a whole or incrementally.
If no destination is specified use the last one used.
If no revision is specified upload the changes since the last upload.
"""
takes_args = ['location?']
takes_options = [
'revision',
'remember',
option.Option('full', 'Upload the full working tree.'),
option.Option('directory',
help='Branch to upload from, '
'rather than the one containing the working directory.',
short_name='d',
type=unicode,
),
]
def run(self, location, full=False, revision=None, remember=None,
directory=None,
):
# Import the needed modules but only once we are required to run to
# avoid degrading bzr startup time
from bzrlib import (
branch,
errors,
revisionspec,
transport,
)
if directory is None:
directory = u'.'
self.branch = branch.Branch.open_containing(directory)[0]
if location is None:
stored_loc = self.get_upload_location()
if stored_loc is None:
raise errors.BzrCommandError('No upload location'
' known or specified.')
else:
display_url = urlutils.unescape_for_display(stored_loc,
self.outf.encoding)
self.outf.write("Using saved location: %s\n" % display_url)
location = stored_loc
self.to_transport = transport.get_transport(location)
if revision is None:
rev_id = self.branch.last_revision()
else:
if len(revision) != 1:
raise errors.BzrCommandError(
'bzr upload --revision takes exactly 1 argument')
rev_id = revision[0].in_history(self.branch).rev_id
self.tree = self.branch.repository.revision_tree(rev_id)
self.rev_id = rev_id
self._pending_renames = []
if full:
self.upload_full_tree()
else:
self.upload_tree()
# We uploaded successfully, remember it
if self.get_upload_location() is None or remember:
self.set_upload_location(self.to_transport.base)
def set_upload_location(self, location):
self.branch.get_config().set_user_option('upload_location', location)
def get_upload_location(self):
return self.branch.get_config().get_user_option('upload_location')
bzr_upload_revid_file_name = '.bzr-upload.revid'
def set_uploaded_revid(self, rev_id):
# XXX: Add tests for concurrent updates, etc.
self.to_transport.put_bytes(self.bzr_upload_revid_file_name, rev_id)
def get_uploaded_revid(self):
return self.to_transport.get_bytes(self.bzr_upload_revid_file_name)
def upload_file(self, relpath, id):
self.to_transport.put_bytes(relpath, self.tree.get_file_text(id))
def make_remote_dir(self, relpath):
# XXX: handle mode
self.to_transport.mkdir(relpath)
def rename_remote(self, old_relpath, new_relpath):
"""Rename a remote file or directory taking care of collisions.
To avoid collisions during bulk renames, each renamed target is
temporarily assigned a unique name. When all renames have been done,
each target get its proper name.
"""
# We generate a sufficiently random name to *assume* that
# no collisions will occur and don't worry about it (nor
# handle it).
import os
import random
import time
stamp = '.tmp.%.9f.%d.%d' % (time.time(),
os.getpid(),
random.randint(0,0x7FFFFFFF))
self.to_transport.rename(old_relpath, stamp)
self._pending_renames.append((stamp, new_relpath))
def finish_renames(self):
for (stamp, new_path) in self._pending_renames:
self.to_transport.rename(stamp, new_path)
# The following shouldn't be needed since we use it once per upload,
# but better safe than sorry ;-)
self._pending_renames = []
def upload_full_tree(self):
self.to_transport.ensure_base() # XXX: Handle errors (add
# --create-prefix option ?)
self.tree.lock_read()
try:
for dp, ie in self.tree.inventory.iter_entries():
if dp in ('', '.bzrignore'):
# skip root ('')
# .bzrignore has no meaning outside of a working tree
# so do not upload it
continue
if ie.kind == 'file':
self.upload_file(dp, ie.file_id)
elif ie.kind == 'directory':
try:
self.make_remote_dir(dp)
except errors.FileExists:
# The directory existed before the upload
pass
else:
raise NotImplementedError
self.set_uploaded_revid(self.rev_id)
finally:
self.tree.unlock()
def upload_tree(self):
# XXX: errors out if NoSuchFile and recommand --full on first upload ?
# Add tests.
rev_id = self.get_uploaded_revid()
# XXX: errors out if rev_id not in branch history (probably someone
# uploaded from a different branch).
from_tree = self.branch.repository.revision_tree(rev_id)
self.to_transport.ensure_base() # XXX: Handle errors (add
# --create-prefix option ?)
changes = self.tree.changes_from(from_tree)
self.tree.lock_read()
try:
# XXX: handle removed, kind_changed
for (old_path, new_path, id, kind,
content_change, exec_change) in changes.renamed:
self.rename_remote(old_path, new_path)
self.finish_renames()
for (path, id, kind) in changes.added:
if kind is 'file':
self.upload_file(path, id)
elif kind is 'directory':
self.make_remote_dir(path)
else:
raise NotImplementedError
# XXX: Add a test for exec_change
for (path, id, kind,
content_change, exec_change) in changes.modified:
if kind is 'file':
self.upload_file(path, id)
else:
raise NotImplementedError
self.set_uploaded_revid(self.rev_id)
finally:
self.tree.unlock()
commands.register_command(cmd_upload)
def test_suite():
from bzrlib.tests import TestUtil
suite = TestUtil.TestSuite()
loader = TestUtil.TestLoader()
testmod_names = [
'test_upload',
]
suite.addTest(loader.loadTestsFromModuleNames(
["%s.%s" % (__name__, tmn) for tmn in testmod_names]))
return suite
|