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
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
|
# Copyright (C) 2006, 2007 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
# TODO: At some point, handle upgrades by just passing the whole request
# across to run on the server.
from cStringIO import StringIO
from urlparse import urlparse
from bzrlib import branch, errors, repository
from bzrlib.branch import BranchReferenceFormat
from bzrlib.bzrdir import BzrDir, BzrDirFormat, RemoteBzrDirFormat
from bzrlib.revision import NULL_REVISION
from bzrlib.smart import client, vfs
from bzrlib.urlutils import unescape
# Note: RemoteBzrDirFormat is in bzrdir.py
class RemoteBzrDir(BzrDir):
"""Control directory on a remote server, accessed by HPSS."""
def __init__(self, transport, _client=None):
"""Construct a RemoteBzrDir.
:param _client: Private parameter for testing. Disables probing and the
use of a real bzrdir.
"""
BzrDir.__init__(self, transport, RemoteBzrDirFormat())
if _client is not None:
self.client = _client
return
self.client = transport.get_smart_client()
# this object holds a delegated bzrdir that uses file-level operations
# to talk to the other side
# XXX: We should go into find_format, but not allow it to find
# RemoteBzrDirFormat and make sure it finds the real underlying format.
# THIS IS A COMPLETE AND UTTER LIE.
# XXX: XXX: XXX: must be removed before merging to mainline
# SMART_SERVER_MERGE_BLOCKER
default_format = BzrDirFormat.get_default_format()
self._real_bzrdir = default_format.open(transport, _found=True)
smartclient = client.SmartClient(self.client)
path = self._path_for_remote_call(smartclient)
#self._real_bzrdir._format.probe_transport(transport)
response = smartclient.call('probe_dont_use', path)
if response == ('no',):
raise errors.NotBranchError(path=transport.base)
def create_repository(self, shared=False):
return RemoteRepository(
self, self._real_bzrdir.create_repository(shared=shared))
def create_branch(self):
real_branch = self._real_bzrdir.create_branch()
real_repository = real_branch.repository
remote_repository = RemoteRepository(self, real_repository)
return RemoteBranch(self, remote_repository, real_branch)
def create_workingtree(self, revision_id=None):
real_workingtree = self._real_bzrdir.create_workingtree(revision_id=revision_id)
return RemoteWorkingTree(self, real_workingtree)
def open_branch(self, _unsupported=False):
assert _unsupported == False, 'unsupported flag support not implemented yet.'
smartclient = client.SmartClient(self.client)
path = self._path_for_remote_call(smartclient)
response = smartclient.call('BzrDir.open_branch', path)
assert response[0] == 'ok', 'unexpected response code %s' % (response,)
if response[0] != 'ok':
# this should probably be a regular translate no ?
raise errors.NotBranchError(path=self.root_transport.base)
if response[1] == '':
# branch at this location.
if vfs.vfs_enabled():
# if the VFS is enabled, create a local object using the VFS.
real_branch = self._real_bzrdir.open_branch(unsupported=_unsupported)
# This branch accessed through the smart server, so wrap the
# file-level objects.
real_repository = real_branch.repository
assert isinstance(real_repository.bzrdir, RemoteBzrDir)
remote_repository = RemoteRepository(real_repository.bzrdir, real_repository)
return RemoteBranch(self, remote_repository, real_branch)
else:
# otherwise just create a proxy for the branch.
return RemoteBranch(self, self.find_repository())
else:
# a branch reference, use the existing BranchReference logic.
format = BranchReferenceFormat()
return format.open(self, _found=True, location=response[1])
def open_repository(self):
smartclient = client.SmartClient(self.client)
path = self._path_for_remote_call(smartclient)
response = smartclient.call('BzrDir.find_repository', path)
assert response[0] in ('ok', 'norepository'), \
'unexpected response code %s' % (response,)
if response[0] == 'norepository':
raise errors.NoRepositoryPresent(self)
if response[1] == '':
if vfs.vfs_enabled():
return RemoteRepository(self, self._real_bzrdir.open_repository())
else:
return RemoteRepository(self)
else:
raise errors.NoRepositoryPresent(self)
def open_workingtree(self):
return RemoteWorkingTree(self, self._real_bzrdir.open_workingtree())
def _path_for_remote_call(self, client):
"""Return the path to be used for this bzrdir in a remote call."""
return client.remote_path_from_transport(self.root_transport)
def get_branch_transport(self, branch_format):
return self._real_bzrdir.get_branch_transport(branch_format)
def get_repository_transport(self, repository_format):
return self._real_bzrdir.get_repository_transport(repository_format)
def get_workingtree_transport(self, workingtree_format):
return self._real_bzrdir.get_workingtree_transport(workingtree_format)
def can_convert_format(self):
"""Upgrading of remote bzrdirs is not supported yet."""
return False
def needs_format_conversion(self, format=None):
"""Upgrading of remote bzrdirs is not supported yet."""
return False
class RemoteRepositoryFormat(repository.RepositoryFormat):
"""Format for repositories accessed over rpc.
Instances of this repository are represented by RemoteRepository
instances.
"""
_matchingbzrdir = RemoteBzrDirFormat
def initialize(self, a_bzrdir, shared=False):
assert isinstance(a_bzrdir, RemoteBzrDir)
return a_bzrdir.create_repository(shared=shared)
def open(self, a_bzrdir):
assert isinstance(a_bzrdir, RemoteBzrDir)
return a_bzrdir.open_repository()
def get_format_description(self):
return 'bzr remote repository'
def __eq__(self, other):
return self.__class__ == other.__class__
rich_root_data = False
class RemoteRepository(object):
"""Repository accessed over rpc.
For the moment everything is delegated to IO-like operations over
the transport.
"""
def __init__(self, remote_bzrdir, real_repository=None, _client=None):
"""Create a RemoteRepository instance.
:param remote_bzrdir: The bzrdir hosting this repository.
:param real_repository: If not None, a local implementation of the
repository logic for the repository, usually accessing the data
via the VFS.
:param _client: Private testing parameter - override the smart client
to be used by the repository.
"""
if real_repository:
self._real_repository = real_repository
self.bzrdir = remote_bzrdir
if _client is None:
self._client = client.SmartClient(self.bzrdir.client)
else:
self._client = _client
self._format = RemoteRepositoryFormat()
def has_revision(self, revision_id):
"""See Repository.has_revision()."""
path = self.bzrdir._path_for_remote_call(self._client)
response = self._client.call('Repository.has_revision', path, revision_id.encode('utf8'))
assert response[0] in ('ok', 'no'), 'unexpected response code %s' % (response,)
return response[0] == 'ok'
def gather_stats(self, revid, committers=None):
"""See Repository.gather_stats()."""
# SMART_SERVER_MERGE_BLOCKER
return self._real_repository.gather_stats(revid, committers)
def get_physical_lock_status(self):
"""See Repository.get_physical_lock_status()."""
return False
def is_shared(self):
"""See Repository.is_shared()."""
path = self.bzrdir._path_for_remote_call(self._client)
response = self._client.call('Repository.is_shared', path)
assert response[0] in ('yes', 'no'), 'unexpected response code %s' % (response,)
return response[0] == 'yes'
def lock_read(self):
# wrong eventually - want a local lock cache context
return self._real_repository.lock_read()
def lock_write(self):
# definately wrong: want to check if there is a real repo
# and not thunk through if not
return self._real_repository.lock_write()
def unlock(self):
# should free cache context.
return self._real_repository.unlock()
def break_lock(self):
# should hand off to the network - or better yet, we should not
# allow stale network locks ?
return self._real_repository.break_lock()
class RemoteBranchLockableFiles(object):
"""A 'LockableFiles' implementation that talks to a smart server.
This is not a public interface class.
"""
def __init__(self, bzrdir, _client):
self.bzrdir = bzrdir
self._client = _client
def get(self, path):
"""'get' a remote path as per the LockableFiles interface.
:param path: the file to 'get'. If this is 'branch.conf', we do not
just retrieve a file, instead we ask the smart server to generate
a configuration for us - which is retrieved as an INI file.
"""
assert path == 'branch.conf'
path = self.bzrdir._path_for_remote_call(self._client)
response = self._client.call2('Branch.get_config_file', path)
assert response[0][0] == 'ok', 'unexpected response code %s' % (response[0],)
return StringIO(response[1].read_body_bytes())
class RemoteBranchFormat(branch.BranchFormat):
def get_format_description(self):
return 'Remote BZR Branch'
def open(self, a_bzrdir):
assert isinstance(a_bzrdir, RemoteBzrDir)
return a_bzrdir.open_branch()
def initialize(self, a_bzrdir):
assert isinstance(a_bzrdir, RemoteBzrDir)
return a_bzrdir.create_branch()
class RemoteBranch(branch.Branch):
"""Branch stored on a server accessed by HPSS RPC.
At the moment most operations are mapped down to simple file operations.
"""
def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
_client=None):
"""Create a RemoteBranch instance.
:param real_branch: An optional local implementation of the branch
format, usually accessing the data via the VFS.
:param _client: Private parameter for testing.
"""
self.bzrdir = remote_bzrdir
if _client is not None:
self._client = _client
else:
self._client = client.SmartClient(self.bzrdir.client)
self.repository = remote_repository
if real_branch is not None:
self._real_branch = real_branch
# Fill out expected attributes of branch for bzrlib api users.
self._format = RemoteBranchFormat()
self.base = self.bzrdir.root_transport.base
self.control_files = RemoteBranchLockableFiles(self.bzrdir, self._client)
def get_physical_lock_status(self):
"""See Branch.get_physical_lock_status()."""
# should be an API call to the server, as branches must be lockable.
return self._real_branch.get_physical_lock_status()
def lock_read(self):
return self._real_branch.lock_read()
def lock_write(self):
return self._real_branch.lock_write()
def unlock(self):
return self._real_branch.unlock()
def break_lock(self):
return self._real_branch.break_lock()
def last_revision_info(self):
"""See Branch.last_revision_info()."""
path = self.bzrdir._path_for_remote_call(self._client)
response = self._client.call('Branch.last_revision_info', path)
assert response[0] == 'ok', 'unexpected response code %s' % (response,)
revno = int(response[1])
last_revision = response[2].decode('utf8')
if last_revision == '':
last_revision = NULL_REVISION
return (revno, last_revision)
def revision_history(self):
"""See Branch.revision_history()."""
# XXX: TODO: this does not cache the revision history for the duration
# of a lock, which is a bug - see the code for regular branches
# for details.
path = self.bzrdir._path_for_remote_call(self._client)
response = self._client.call2('Branch.revision_history', path)
assert response[0][0] == 'ok', 'unexpected response code %s' % (response[0],)
result = response[1].read_body_bytes().decode('utf8').split('\x00')
if result == ['']:
return []
return result
def set_revision_history(self, rev_history):
return self._real_branch.set_revision_history(rev_history)
def get_parent(self):
return self._real_branch.get_parent()
def set_parent(self, url):
return self._real_branch.set_parent(url)
class RemoteWorkingTree(object):
def __init__(self, remote_bzrdir, real_workingtree):
self.real_workingtree = real_workingtree
self.bzrdir = remote_bzrdir
def __getattr__(self, name):
# XXX: temporary way to lazily delegate everything to the real
# workingtree
return getattr(self.real_workingtree, name)
|