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
244
239
self._ensure_real()
245
240
self._real_bzrdir.destroy_repository()
247
def create_branch(self, name=None):
242
def create_branch(self):
248
243
# as per meta1 formats - just delegate to the format object which may
249
244
# be parameterised.
250
real_branch = self._format.get_branch_format().initialize(self,
245
real_branch = self._format.get_branch_format().initialize(self)
252
246
if not isinstance(real_branch, RemoteBranch):
253
result = RemoteBranch(self, self.find_repository(), real_branch,
247
result = RemoteBranch(self, self.find_repository(), real_branch)
256
249
result = real_branch
257
250
# BzrDir.clone_on_transport() uses the result of create_branch but does
263
256
self._next_open_branch_result = result
266
def destroy_branch(self, name=None):
259
def destroy_branch(self):
267
260
"""See BzrDir.destroy_branch"""
268
261
self._ensure_real()
269
self._real_bzrdir.destroy_branch(name=name)
262
self._real_bzrdir.destroy_branch()
270
263
self._next_open_branch_result = None
272
265
def create_workingtree(self, revision_id=None, from_branch=None):
291
284
def _get_branch_reference(self):
292
285
path = self._path_for_remote_call(self._client)
293
286
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):
287
if not medium._is_remote_before((1, 13)):
303
response = self._call(verb, path)
289
response = self._call('BzrDir.open_branchV2', path)
290
if response[0] not in ('ref', 'branch'):
291
raise errors.UnexpectedSmartServerResponse(response)
304
293
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'):
294
medium._remember_remote_is_before((1, 13))
295
response = self._call('BzrDir.open_branch', path)
296
if response[0] != 'ok':
318
297
raise errors.UnexpectedSmartServerResponse(response)
298
if response[1] != '':
299
return ('ref', response[1])
301
return ('branch', '')
321
303
def _get_tree_branch(self):
322
304
"""See BzrDir._get_tree_branch()."""
323
305
return None, self.open_branch()
325
def open_branch(self, name=None, unsupported=False,
326
ignore_fallbacks=False):
307
def open_branch(self, _unsupported=False, ignore_fallbacks=False):
328
309
raise NotImplementedError('unsupported flag support not implemented yet.')
329
310
if self._next_open_branch_result is not None:
330
311
# See create_branch for details.
335
316
if response[0] == 'ref':
336
317
# a branch reference, use the existing BranchReference logic.
337
318
format = BranchReferenceFormat()
338
return format.open(self, name=name, _found=True,
339
location=response[1], ignore_fallbacks=ignore_fallbacks)
319
return format.open(self, _found=True, location=response[1],
320
ignore_fallbacks=ignore_fallbacks)
340
321
branch_format_name = response[1]
341
322
if not branch_format_name:
342
323
branch_format_name = None
343
324
format = RemoteBranchFormat(network_name=branch_format_name)
344
325
return RemoteBranch(self, self.find_repository(), format=format,
345
setup_stacking=not ignore_fallbacks, name=name)
326
setup_stacking=not ignore_fallbacks)
347
328
def _open_repo_v1(self, path):
348
329
verb = 'BzrDir.find_repository'
425
406
"""Return the path to be used for this bzrdir in a remote call."""
426
407
return client.remote_path_from_transport(self.root_transport)
428
def get_branch_transport(self, branch_format, name=None):
409
def get_branch_transport(self, branch_format):
429
410
self._ensure_real()
430
return self._real_bzrdir.get_branch_transport(branch_format, name=name)
411
return self._real_bzrdir.get_branch_transport(branch_format)
432
413
def get_repository_transport(self, repository_format):
433
414
self._ensure_real()
643
624
return self._custom_format._serializer
646
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
647
bzrdir.ControlComponent):
627
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin):
648
628
"""Repository accessed over rpc.
650
630
For the moment most operations are performed using local transport-backed
693
673
# Additional places to query for data.
694
674
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
676
def __str__(self):
708
677
return "%s(%s)" % (self.__class__.__name__, self.base)
917
886
parents_provider = self._make_parents_provider(other_repository)
918
887
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
889
def gather_stats(self, revid=None, committers=None):
930
890
"""See Repository.gather_stats()."""
931
891
path = self.bzrdir._path_for_remote_call(self._client)
991
951
def is_write_locked(self):
992
952
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
954
def lock_read(self):
1000
955
# wrong eventually - want a local lock cache context
1001
956
if not self._lock_mode:
1240
1195
# state, so always add a lock here. If a caller passes us a locked
1241
1196
# repository, they are responsible for unlocking it later.
1242
1197
repository.lock_read()
1243
self._check_fallback_repository(repository)
1244
1198
self._fallback_repositories.append(repository)
1245
1199
# If self._real_repository was parameterised already (e.g. because a
1246
1200
# _real_branch had its get_stacked_on_url method called), then the
1247
1201
# repository to be added may already be in the _real_repositories list.
1248
1202
if self._real_repository is not None:
1249
fallback_locations = [repo.user_url for repo in
1203
fallback_locations = [repo.bzrdir.root_transport.base for repo in
1250
1204
self._real_repository._fallback_repositories]
1251
if repository.user_url not in fallback_locations:
1205
if repository.bzrdir.root_transport.base not in fallback_locations:
1252
1206
self._real_repository.add_fallback_repository(repository)
1254
def _check_fallback_repository(self, repository):
1255
"""Check that this repository can fallback to repository safely.
1257
Raise an error if not.
1259
:param repository: A repository to fallback to.
1261
return _mod_repository.InterRepository._assert_same_model(
1264
1208
def add_inventory(self, revid, inv, parents):
1265
1209
self._ensure_real()
1266
1210
return self._real_repository.add_inventory(revid, inv, parents)
1268
1212
def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1269
parents, basis_inv=None, propagate_caches=False):
1270
1214
self._ensure_real()
1271
1215
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)
1216
delta, new_revision_id, parents)
1275
1218
def add_revision(self, rev_id, rev, inv=None, config=None):
1276
1219
self._ensure_real()
1535
1478
return self._real_repository.get_signature_text(revision_id)
1537
1480
@needs_read_lock
1538
def _get_inventory_xml(self, revision_id):
1540
return self._real_repository._get_inventory_xml(revision_id)
1481
def get_inventory_xml(self, revision_id):
1483
return self._real_repository.get_inventory_xml(revision_id)
1485
def deserialise_inventory(self, revision_id, xml):
1487
return self._real_repository.deserialise_inventory(revision_id, xml)
1542
1489
def reconcile(self, other=None, thorough=False):
1543
1490
self._ensure_real()
1619
1566
return self._real_repository.inventories
1621
1568
@needs_write_lock
1622
def pack(self, hint=None, clean_obsolete_packs=False):
1569
def pack(self, hint=None):
1623
1570
"""Compress the data within the repository.
1625
1572
This is not currently implemented within the smart server.
1627
1574
self._ensure_real()
1628
return self._real_repository.pack(hint=hint, clean_obsolete_packs=clean_obsolete_packs)
1575
return self._real_repository.pack(hint=hint)
1631
1578
def revisions(self):
2059
2006
def network_name(self):
2060
2007
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)
2009
def open(self, a_bzrdir, ignore_fallbacks=False):
2010
return a_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
2066
def _vfs_initialize(self, a_bzrdir, name):
2012
def _vfs_initialize(self, a_bzrdir):
2067
2013
# Initialisation when using a local bzrdir object, or a non-vfs init
2068
2014
# method is not available on the server.
2069
2015
# self._custom_format is always set - the start of initialize ensures
2071
2017
if isinstance(a_bzrdir, RemoteBzrDir):
2072
2018
a_bzrdir._ensure_real()
2073
result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
2019
result = self._custom_format.initialize(a_bzrdir._real_bzrdir)
2076
2021
# We assume the bzrdir is parameterised; it may not be.
2077
result = self._custom_format.initialize(a_bzrdir, name)
2022
result = self._custom_format.initialize(a_bzrdir)
2078
2023
if (isinstance(a_bzrdir, RemoteBzrDir) and
2079
2024
not isinstance(result, RemoteBranch)):
2080
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
2025
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
2084
def initialize(self, a_bzrdir, name=None):
2028
def initialize(self, a_bzrdir):
2085
2029
# 1) get the network name to use.
2086
2030
if self._custom_format:
2087
2031
network_name = self._custom_format.network_name()
2093
2037
network_name = reference_format.network_name()
2094
2038
# Being asked to create on a non RemoteBzrDir:
2095
2039
if not isinstance(a_bzrdir, RemoteBzrDir):
2096
return self._vfs_initialize(a_bzrdir, name=name)
2040
return self._vfs_initialize(a_bzrdir)
2097
2041
medium = a_bzrdir._client._medium
2098
2042
if medium._is_remote_before((1, 13)):
2099
return self._vfs_initialize(a_bzrdir, name=name)
2043
return self._vfs_initialize(a_bzrdir)
2100
2044
# Creating on a remote bzr dir.
2101
2045
# 2) try direct creation via RPC
2102
2046
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
2047
verb = 'BzrDir.create_branch'
2108
2049
response = a_bzrdir._call(verb, path, network_name)
2109
2050
except errors.UnknownSmartMethod:
2110
2051
# Fallback - use vfs methods
2111
2052
medium._remember_remote_is_before((1, 13))
2112
return self._vfs_initialize(a_bzrdir, name=name)
2053
return self._vfs_initialize(a_bzrdir)
2113
2054
if response[0] != 'ok':
2114
2055
raise errors.UnexpectedSmartServerResponse(response)
2115
2056
# Turn the response into a RemoteRepository object.
2123
2064
a_bzrdir._client)
2124
2065
remote_repo = RemoteRepository(repo_bzrdir, repo_format)
2125
2066
remote_branch = RemoteBranch(a_bzrdir, remote_repo,
2126
format=format, setup_stacking=False, name=name)
2067
format=format, setup_stacking=False)
2127
2068
# XXX: We know this is a new branch, so it must have revno 0, revid
2128
2069
# NULL_REVISION. Creating the branch locked would make this be unable
2129
2070
# to be wrong; here its simply very unlikely to be wrong. RBC 20090225
2158
2099
def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
2159
_client=None, format=None, setup_stacking=True, name=None):
2100
_client=None, format=None, setup_stacking=True):
2160
2101
"""Create a RemoteBranch instance.
2162
2103
:param real_branch: An optional local implementation of the branch
2168
2109
:param setup_stacking: If True make an RPC call to determine the
2169
2110
stacked (or not) status of the branch. If False assume the branch
2170
2111
is not stacked.
2171
:param name: Colocated branch name
2173
2113
# We intentionally don't call the parent class's __init__, because it
2174
2114
# will try to assign to self.tags, which is a property in this subclass.
2193
2133
self._real_branch = None
2194
2134
# Fill out expected attributes of branch for bzrlib API users.
2195
2135
self._clear_cached_state()
2196
# TODO: deprecate self.base in favor of user_url
2197
self.base = self.bzrdir.user_url
2136
self.base = self.bzrdir.root_transport.base
2199
2137
self._control_files = None
2200
2138
self._lock_mode = None
2201
2139
self._lock_token = None
2266
2204
'to use vfs implementation')
2267
2205
self.bzrdir._ensure_real()
2268
2206
self._real_branch = self.bzrdir._real_bzrdir.open_branch(
2269
ignore_fallbacks=self._real_ignore_fallbacks, name=self._name)
2207
ignore_fallbacks=self._real_ignore_fallbacks)
2270
2208
if self.repository._real_repository is None:
2271
2209
# Give the remote repository the matching real repo.
2272
2210
real_repo = self._real_branch.repository
2880
2818
raise NoSuchRevision(find('branch'), err.error_args[0])
2881
2819
elif err.error_verb == 'nosuchrevision':
2882
2820
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,
2821
elif err.error_tuple == ('nobranch',):
2822
raise errors.NotBranchError(path=find('bzrdir').root_transport.base)
2890
2823
elif err.error_verb == 'norepository':
2891
2824
raise errors.NoRepositoryPresent(find('bzrdir'))
2892
2825
elif err.error_verb == 'LockContention':
added
removed
bzrlib/remote.py
