1
# Copyright (C) 2006-2010 Canonical Ltd
1
# Copyright (C) 2006, 2007, 2008, 2009 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
30
30
repository as _mod_repository,
32
32
revision as _mod_revision,
36
35
from bzrlib.branch import BranchReferenceFormat
37
36
from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat
38
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
37
from bzrlib.decorators import needs_read_lock, needs_write_lock
39
38
from bzrlib.errors import (
41
40
SmartProtocolError,
91
90
class RemoteBzrDir(BzrDir, _RpcHelper):
92
91
"""Control directory on a remote server, accessed via bzr:// or similar."""
94
def __init__(self, transport, format, _client=None, _force_probe=False):
93
def __init__(self, transport, format, _client=None):
95
94
"""Construct a RemoteBzrDir.
97
96
:param _client: Private parameter for testing. Disables probing and the
101
100
# this object holds a delegated bzrdir that uses file-level operations
102
101
# to talk to the other side
103
102
self._real_bzrdir = None
104
self._has_working_tree = None
105
103
# 1-shot cache for the call pattern 'create_branch; open_branch' - see
106
104
# create_branch for details.
107
105
self._next_open_branch_result = None
111
109
self._client = client._SmartClient(medium)
113
111
self._client = _client
120
return '%s(%r)' % (self.__class__.__name__, self._client)
122
def _probe_bzrdir(self):
123
medium = self._client._medium
124
114
path = self._path_for_remote_call(self._client)
125
if medium._is_remote_before((2, 1)):
129
self._rpc_open_2_1(path)
131
except errors.UnknownSmartMethod:
132
medium._remember_remote_is_before((2, 1))
135
def _rpc_open_2_1(self, path):
136
response = self._call('BzrDir.open_2.1', path)
137
if response == ('no',):
138
raise errors.NotBranchError(path=self.root_transport.base)
139
elif response[0] == 'yes':
140
if response[1] == 'yes':
141
self._has_working_tree = True
142
elif response[1] == 'no':
143
self._has_working_tree = False
145
raise errors.UnexpectedSmartServerResponse(response)
147
raise errors.UnexpectedSmartServerResponse(response)
149
def _rpc_open(self, path):
150
115
response = self._call('BzrDir.open', path)
151
116
if response not in [('yes',), ('no',)]:
152
117
raise errors.UnexpectedSmartServerResponse(response)
153
118
if response == ('no',):
154
raise errors.NotBranchError(path=self.root_transport.base)
119
raise errors.NotBranchError(path=transport.base)
156
121
def _ensure_real(self):
157
122
"""Ensure that there is a _real_bzrdir set.
159
124
Used before calls to self._real_bzrdir.
161
126
if not self._real_bzrdir:
162
if 'hpssvfs' in debug.debug_flags:
164
warning('VFS BzrDir access triggered\n%s',
165
''.join(traceback.format_stack()))
166
127
self._real_bzrdir = BzrDir.open_from_transport(
167
128
self.root_transport, _server_formats=False)
168
129
self._format._network_name = \
244
205
self._ensure_real()
245
206
self._real_bzrdir.destroy_repository()
247
def create_branch(self, name=None):
208
def create_branch(self):
248
209
# as per meta1 formats - just delegate to the format object which may
249
210
# be parameterised.
250
real_branch = self._format.get_branch_format().initialize(self,
211
real_branch = self._format.get_branch_format().initialize(self)
252
212
if not isinstance(real_branch, RemoteBranch):
253
result = RemoteBranch(self, self.find_repository(), real_branch,
213
result = RemoteBranch(self, self.find_repository(), real_branch)
256
215
result = real_branch
257
216
# BzrDir.clone_on_transport() uses the result of create_branch but does
263
222
self._next_open_branch_result = result
266
def destroy_branch(self, name=None):
225
def destroy_branch(self):
267
226
"""See BzrDir.destroy_branch"""
268
227
self._ensure_real()
269
self._real_bzrdir.destroy_branch(name=name)
228
self._real_bzrdir.destroy_branch()
270
229
self._next_open_branch_result = None
272
231
def create_workingtree(self, revision_id=None, from_branch=None):
291
250
def _get_branch_reference(self):
292
251
path = self._path_for_remote_call(self._client)
293
252
medium = self._client._medium
295
('BzrDir.open_branchV3', (2, 1)),
296
('BzrDir.open_branchV2', (1, 13)),
297
('BzrDir.open_branch', None),
299
for verb, required_version in candidate_calls:
300
if required_version and medium._is_remote_before(required_version):
253
if not medium._is_remote_before((1, 13)):
303
response = self._call(verb, path)
255
response = self._call('BzrDir.open_branchV2', path)
256
if response[0] not in ('ref', 'branch'):
257
raise errors.UnexpectedSmartServerResponse(response)
304
259
except errors.UnknownSmartMethod:
305
if required_version is None:
307
medium._remember_remote_is_before(required_version)
310
if verb == 'BzrDir.open_branch':
311
if response[0] != 'ok':
312
raise errors.UnexpectedSmartServerResponse(response)
313
if response[1] != '':
314
return ('ref', response[1])
316
return ('branch', '')
317
if response[0] not in ('ref', 'branch'):
260
medium._remember_remote_is_before((1, 13))
261
response = self._call('BzrDir.open_branch', path)
262
if response[0] != 'ok':
318
263
raise errors.UnexpectedSmartServerResponse(response)
264
if response[1] != '':
265
return ('ref', response[1])
267
return ('branch', '')
321
269
def _get_tree_branch(self):
322
270
"""See BzrDir._get_tree_branch()."""
323
271
return None, self.open_branch()
325
def open_branch(self, name=None, unsupported=False,
326
ignore_fallbacks=False):
273
def open_branch(self, _unsupported=False, ignore_fallbacks=False):
328
275
raise NotImplementedError('unsupported flag support not implemented yet.')
329
276
if self._next_open_branch_result is not None:
330
277
# See create_branch for details.
335
282
if response[0] == 'ref':
336
283
# a branch reference, use the existing BranchReference logic.
337
284
format = BranchReferenceFormat()
338
return format.open(self, name=name, _found=True,
339
location=response[1], ignore_fallbacks=ignore_fallbacks)
285
return format.open(self, _found=True, location=response[1],
286
ignore_fallbacks=ignore_fallbacks)
340
287
branch_format_name = response[1]
341
288
if not branch_format_name:
342
289
branch_format_name = None
343
290
format = RemoteBranchFormat(network_name=branch_format_name)
344
291
return RemoteBranch(self, self.find_repository(), format=format,
345
setup_stacking=not ignore_fallbacks, name=name)
292
setup_stacking=not ignore_fallbacks)
347
294
def _open_repo_v1(self, path):
348
295
verb = 'BzrDir.find_repository'
410
357
raise errors.NoRepositoryPresent(self)
412
def has_workingtree(self):
413
if self._has_working_tree is None:
415
self._has_working_tree = self._real_bzrdir.has_workingtree()
416
return self._has_working_tree
418
359
def open_workingtree(self, recommend_upgrade=True):
419
if self.has_workingtree():
361
if self._real_bzrdir.has_workingtree():
420
362
raise errors.NotLocalUrl(self.root_transport)
422
364
raise errors.NoWorkingTree(self.root_transport.base)
425
367
"""Return the path to be used for this bzrdir in a remote call."""
426
368
return client.remote_path_from_transport(self.root_transport)
428
def get_branch_transport(self, branch_format, name=None):
370
def get_branch_transport(self, branch_format):
429
371
self._ensure_real()
430
return self._real_bzrdir.get_branch_transport(branch_format, name=name)
372
return self._real_bzrdir.get_branch_transport(branch_format)
432
374
def get_repository_transport(self, repository_format):
433
375
self._ensure_real()
643
584
return self._custom_format._serializer
646
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
647
bzrdir.ControlComponent):
587
class RemoteRepository(_RpcHelper):
648
588
"""Repository accessed over rpc.
650
590
For the moment most operations are performed using local transport-backed
693
633
# Additional places to query for data.
694
634
self._fallback_repositories = []
697
def user_transport(self):
698
return self.bzrdir.user_transport
701
def control_transport(self):
702
# XXX: Normally you shouldn't directly get at the remote repository
703
# transport, but I'm not sure it's worth making this method
704
# optional -- mbp 2010-04-21
705
return self.bzrdir.get_repository_transport(None)
707
636
def __str__(self):
708
637
return "%s(%s)" % (self.__class__.__name__, self.base)
917
846
parents_provider = self._make_parents_provider(other_repository)
918
847
return graph.Graph(parents_provider)
921
def get_known_graph_ancestry(self, revision_ids):
922
"""Return the known graph for a set of revision ids and their ancestors.
924
st = static_tuple.StaticTuple
925
revision_keys = [st(r_id).intern() for r_id in revision_ids]
926
known_graph = self.revisions.get_known_graph_ancestry(revision_keys)
927
return graph.GraphThunkIdsToKeys(known_graph)
929
849
def gather_stats(self, revid=None, committers=None):
930
850
"""See Repository.gather_stats()."""
931
851
path = self.bzrdir._path_for_remote_call(self._client)
991
911
def is_write_locked(self):
992
912
return self._lock_mode == 'w'
994
def _warn_if_deprecated(self, branch=None):
995
# If we have a real repository, the check will be done there, if we
996
# don't the check will be done remotely.
999
914
def lock_read(self):
1000
915
# wrong eventually - want a local lock cache context
1001
916
if not self._lock_mode:
1002
self._note_lock('r')
1003
917
self._lock_mode = 'r'
1004
918
self._lock_count = 1
1005
919
self._unstacked_provider.enable_cache(cache_misses=True)
1246
1158
# _real_branch had its get_stacked_on_url method called), then the
1247
1159
# repository to be added may already be in the _real_repositories list.
1248
1160
if self._real_repository is not None:
1249
fallback_locations = [repo.user_url for repo in
1161
fallback_locations = [repo.bzrdir.root_transport.base for repo in
1250
1162
self._real_repository._fallback_repositories]
1251
if repository.user_url not in fallback_locations:
1163
if repository.bzrdir.root_transport.base not in fallback_locations:
1252
1164
self._real_repository.add_fallback_repository(repository)
1254
1166
def _check_fallback_repository(self, repository):
1266
1178
return self._real_repository.add_inventory(revid, inv, parents)
1268
1180
def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1269
parents, basis_inv=None, propagate_caches=False):
1270
1182
self._ensure_real()
1271
1183
return self._real_repository.add_inventory_by_delta(basis_revision_id,
1272
delta, new_revision_id, parents, basis_inv=basis_inv,
1273
propagate_caches=propagate_caches)
1184
delta, new_revision_id, parents)
1275
1186
def add_revision(self, rev_id, rev, inv=None, config=None):
1276
1187
self._ensure_real()
1535
1446
return self._real_repository.get_signature_text(revision_id)
1537
1448
@needs_read_lock
1538
def _get_inventory_xml(self, revision_id):
1540
return self._real_repository._get_inventory_xml(revision_id)
1449
def get_inventory_xml(self, revision_id):
1451
return self._real_repository.get_inventory_xml(revision_id)
1453
def deserialise_inventory(self, revision_id, xml):
1455
return self._real_repository.deserialise_inventory(revision_id, xml)
1542
1457
def reconcile(self, other=None, thorough=False):
1543
1458
self._ensure_real()
1619
1534
return self._real_repository.inventories
1621
1536
@needs_write_lock
1622
def pack(self, hint=None, clean_obsolete_packs=False):
1537
def pack(self, hint=None):
1623
1538
"""Compress the data within the repository.
1625
1540
This is not currently implemented within the smart server.
1627
1542
self._ensure_real()
1628
return self._real_repository.pack(hint=hint, clean_obsolete_packs=clean_obsolete_packs)
1543
return self._real_repository.pack(hint=hint)
1631
1546
def revisions(self):
2053
1968
self._network_name)
2055
1970
def get_format_description(self):
2057
return 'Remote: ' + self._custom_format.get_format_description()
1971
return 'Remote BZR Branch'
2059
1973
def network_name(self):
2060
1974
return self._network_name
2062
def open(self, a_bzrdir, name=None, ignore_fallbacks=False):
2063
return a_bzrdir.open_branch(name=name,
2064
ignore_fallbacks=ignore_fallbacks)
1976
def open(self, a_bzrdir, ignore_fallbacks=False):
1977
return a_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
2066
def _vfs_initialize(self, a_bzrdir, name):
1979
def _vfs_initialize(self, a_bzrdir):
2067
1980
# Initialisation when using a local bzrdir object, or a non-vfs init
2068
1981
# method is not available on the server.
2069
1982
# self._custom_format is always set - the start of initialize ensures
2071
1984
if isinstance(a_bzrdir, RemoteBzrDir):
2072
1985
a_bzrdir._ensure_real()
2073
result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
1986
result = self._custom_format.initialize(a_bzrdir._real_bzrdir)
2076
1988
# We assume the bzrdir is parameterised; it may not be.
2077
result = self._custom_format.initialize(a_bzrdir, name)
1989
result = self._custom_format.initialize(a_bzrdir)
2078
1990
if (isinstance(a_bzrdir, RemoteBzrDir) and
2079
1991
not isinstance(result, RemoteBranch)):
2080
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
1992
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
2084
def initialize(self, a_bzrdir, name=None):
1995
def initialize(self, a_bzrdir):
2085
1996
# 1) get the network name to use.
2086
1997
if self._custom_format:
2087
1998
network_name = self._custom_format.network_name()
2093
2004
network_name = reference_format.network_name()
2094
2005
# Being asked to create on a non RemoteBzrDir:
2095
2006
if not isinstance(a_bzrdir, RemoteBzrDir):
2096
return self._vfs_initialize(a_bzrdir, name=name)
2007
return self._vfs_initialize(a_bzrdir)
2097
2008
medium = a_bzrdir._client._medium
2098
2009
if medium._is_remote_before((1, 13)):
2099
return self._vfs_initialize(a_bzrdir, name=name)
2010
return self._vfs_initialize(a_bzrdir)
2100
2011
# Creating on a remote bzr dir.
2101
2012
# 2) try direct creation via RPC
2102
2013
path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
2103
if name is not None:
2104
# XXX JRV20100304: Support creating colocated branches
2105
raise errors.NoColocatedBranchSupport(self)
2106
2014
verb = 'BzrDir.create_branch'
2108
2016
response = a_bzrdir._call(verb, path, network_name)
2109
2017
except errors.UnknownSmartMethod:
2110
2018
# Fallback - use vfs methods
2111
2019
medium._remember_remote_is_before((1, 13))
2112
return self._vfs_initialize(a_bzrdir, name=name)
2020
return self._vfs_initialize(a_bzrdir)
2113
2021
if response[0] != 'ok':
2114
2022
raise errors.UnexpectedSmartServerResponse(response)
2115
2023
# Turn the response into a RemoteRepository object.
2123
2031
a_bzrdir._client)
2124
2032
remote_repo = RemoteRepository(repo_bzrdir, repo_format)
2125
2033
remote_branch = RemoteBranch(a_bzrdir, remote_repo,
2126
format=format, setup_stacking=False, name=name)
2034
format=format, setup_stacking=False)
2127
2035
# XXX: We know this is a new branch, so it must have revno 0, revid
2128
2036
# NULL_REVISION. Creating the branch locked would make this be unable
2129
2037
# to be wrong; here its simply very unlikely to be wrong. RBC 20090225
2149
2057
return self._custom_format.supports_set_append_revisions_only()
2152
class RemoteBranch(branch.Branch, _RpcHelper, lock._RelockDebugMixin):
2060
class RemoteBranch(branch.Branch, _RpcHelper):
2153
2061
"""Branch stored on a server accessed by HPSS RPC.
2155
2063
At the moment most operations are mapped down to simple file operations.
2158
2066
def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
2159
_client=None, format=None, setup_stacking=True, name=None):
2067
_client=None, format=None, setup_stacking=True):
2160
2068
"""Create a RemoteBranch instance.
2162
2070
:param real_branch: An optional local implementation of the branch
2168
2076
:param setup_stacking: If True make an RPC call to determine the
2169
2077
stacked (or not) status of the branch. If False assume the branch
2170
2078
is not stacked.
2171
:param name: Colocated branch name
2173
2080
# We intentionally don't call the parent class's __init__, because it
2174
2081
# will try to assign to self.tags, which is a property in this subclass.
2193
2100
self._real_branch = None
2194
2101
# Fill out expected attributes of branch for bzrlib API users.
2195
2102
self._clear_cached_state()
2196
# TODO: deprecate self.base in favor of user_url
2197
self.base = self.bzrdir.user_url
2103
self.base = self.bzrdir.root_transport.base
2199
2104
self._control_files = None
2200
2105
self._lock_mode = None
2201
2106
self._lock_token = None
2266
2171
'to use vfs implementation')
2267
2172
self.bzrdir._ensure_real()
2268
2173
self._real_branch = self.bzrdir._real_bzrdir.open_branch(
2269
ignore_fallbacks=self._real_ignore_fallbacks, name=self._name)
2174
ignore_fallbacks=self._real_ignore_fallbacks)
2270
2175
if self.repository._real_repository is None:
2271
2176
# Give the remote repository the matching real repo.
2272
2177
real_repo = self._real_branch.repository
2880
2782
raise NoSuchRevision(find('branch'), err.error_args[0])
2881
2783
elif err.error_verb == 'nosuchrevision':
2882
2784
raise NoSuchRevision(find('repository'), err.error_args[0])
2883
elif err.error_verb == 'nobranch':
2884
if len(err.error_args) >= 1:
2885
extra = err.error_args[0]
2888
raise errors.NotBranchError(path=find('bzrdir').root_transport.base,
2785
elif err.error_tuple == ('nobranch',):
2786
raise errors.NotBranchError(path=find('bzrdir').root_transport.base)
2890
2787
elif err.error_verb == 'norepository':
2891
2788
raise errors.NoRepositoryPresent(find('bzrdir'))
2892
2789
elif err.error_verb == 'LockContention':
added
removed
bzrlib/remote.py
