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