245
243
self._real_bzrdir.destroy_repository()
247
245
def create_branch(self, name=None):
247
raise errors.NoColocatedBranchSupport(self)
248
248
# as per meta1 formats - just delegate to the format object which may
249
249
# be parameterised.
250
real_branch = self._format.get_branch_format().initialize(self,
250
real_branch = self._format.get_branch_format().initialize(self)
252
251
if not isinstance(real_branch, RemoteBranch):
253
result = RemoteBranch(self, self.find_repository(), real_branch,
252
result = RemoteBranch(self, self.find_repository(), real_branch)
256
254
result = real_branch
257
255
# BzrDir.clone_on_transport() uses the result of create_branch but does
326
324
ignore_fallbacks=False):
328
326
raise NotImplementedError('unsupported flag support not implemented yet.')
328
raise errors.NoColocatedBranchSupport(self)
329
329
if self._next_open_branch_result is not None:
330
330
# See create_branch for details.
331
331
result = self._next_open_branch_result
335
335
if response[0] == 'ref':
336
336
# a branch reference, use the existing BranchReference logic.
337
337
format = BranchReferenceFormat()
338
return format.open(self, name=name, _found=True,
339
location=response[1], ignore_fallbacks=ignore_fallbacks)
338
return format.open(self, _found=True, location=response[1],
339
ignore_fallbacks=ignore_fallbacks)
340
340
branch_format_name = response[1]
341
341
if not branch_format_name:
342
342
branch_format_name = None
343
343
format = RemoteBranchFormat(network_name=branch_format_name)
344
344
return RemoteBranch(self, self.find_repository(), format=format,
345
setup_stacking=not ignore_fallbacks, name=name)
345
setup_stacking=not ignore_fallbacks)
347
347
def _open_repo_v1(self, path):
348
348
verb = 'BzrDir.find_repository'
425
425
"""Return the path to be used for this bzrdir in a remote call."""
426
426
return client.remote_path_from_transport(self.root_transport)
428
def get_branch_transport(self, branch_format, name=None):
428
def get_branch_transport(self, branch_format):
429
429
self._ensure_real()
430
return self._real_bzrdir.get_branch_transport(branch_format, name=name)
430
return self._real_bzrdir.get_branch_transport(branch_format)
432
432
def get_repository_transport(self, repository_format):
433
433
self._ensure_real()
643
643
return self._custom_format._serializer
646
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
647
bzrdir.ControlComponent):
646
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin):
648
647
"""Repository accessed over rpc.
650
649
For the moment most operations are performed using local transport-backed
693
692
# Additional places to query for data.
694
693
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
695
def __str__(self):
708
696
return "%s(%s)" % (self.__class__.__name__, self.base)
917
905
parents_provider = self._make_parents_provider(other_repository)
918
906
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
908
def gather_stats(self, revid=None, committers=None):
930
909
"""See Repository.gather_stats()."""
931
910
path = self.bzrdir._path_for_remote_call(self._client)
1240
1219
# state, so always add a lock here. If a caller passes us a locked
1241
1220
# repository, they are responsible for unlocking it later.
1242
1221
repository.lock_read()
1243
self._check_fallback_repository(repository)
1244
1222
self._fallback_repositories.append(repository)
1245
1223
# If self._real_repository was parameterised already (e.g. because a
1246
1224
# _real_branch had its get_stacked_on_url method called), then the
1247
1225
# repository to be added may already be in the _real_repositories list.
1248
1226
if self._real_repository is not None:
1249
fallback_locations = [repo.user_url for repo in
1227
fallback_locations = [repo.bzrdir.root_transport.base for repo in
1250
1228
self._real_repository._fallback_repositories]
1251
if repository.user_url not in fallback_locations:
1229
if repository.bzrdir.root_transport.base not in fallback_locations:
1252
1230
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
1232
def add_inventory(self, revid, inv, parents):
1265
1233
self._ensure_real()
1266
1234
return self._real_repository.add_inventory(revid, inv, parents)
1619
1587
return self._real_repository.inventories
1621
1589
@needs_write_lock
1622
def pack(self, hint=None, clean_obsolete_packs=False):
1590
def pack(self, hint=None):
1623
1591
"""Compress the data within the repository.
1625
1593
This is not currently implemented within the smart server.
1627
1595
self._ensure_real()
1628
return self._real_repository.pack(hint=hint, clean_obsolete_packs=clean_obsolete_packs)
1596
return self._real_repository.pack(hint=hint)
1631
1599
def revisions(self):
2059
2027
def network_name(self):
2060
2028
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)
2030
def open(self, a_bzrdir, ignore_fallbacks=False):
2031
return a_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
2066
def _vfs_initialize(self, a_bzrdir, name):
2033
def _vfs_initialize(self, a_bzrdir):
2067
2034
# Initialisation when using a local bzrdir object, or a non-vfs init
2068
2035
# method is not available on the server.
2069
2036
# self._custom_format is always set - the start of initialize ensures
2071
2038
if isinstance(a_bzrdir, RemoteBzrDir):
2072
2039
a_bzrdir._ensure_real()
2073
result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
2040
result = self._custom_format.initialize(a_bzrdir._real_bzrdir)
2076
2042
# We assume the bzrdir is parameterised; it may not be.
2077
result = self._custom_format.initialize(a_bzrdir, name)
2043
result = self._custom_format.initialize(a_bzrdir)
2078
2044
if (isinstance(a_bzrdir, RemoteBzrDir) and
2079
2045
not isinstance(result, RemoteBranch)):
2080
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
2046
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
2084
def initialize(self, a_bzrdir, name=None):
2049
def initialize(self, a_bzrdir):
2085
2050
# 1) get the network name to use.
2086
2051
if self._custom_format:
2087
2052
network_name = self._custom_format.network_name()
2093
2058
network_name = reference_format.network_name()
2094
2059
# Being asked to create on a non RemoteBzrDir:
2095
2060
if not isinstance(a_bzrdir, RemoteBzrDir):
2096
return self._vfs_initialize(a_bzrdir, name=name)
2061
return self._vfs_initialize(a_bzrdir)
2097
2062
medium = a_bzrdir._client._medium
2098
2063
if medium._is_remote_before((1, 13)):
2099
return self._vfs_initialize(a_bzrdir, name=name)
2064
return self._vfs_initialize(a_bzrdir)
2100
2065
# Creating on a remote bzr dir.
2101
2066
# 2) try direct creation via RPC
2102
2067
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
2068
verb = 'BzrDir.create_branch'
2108
2070
response = a_bzrdir._call(verb, path, network_name)
2109
2071
except errors.UnknownSmartMethod:
2110
2072
# Fallback - use vfs methods
2111
2073
medium._remember_remote_is_before((1, 13))
2112
return self._vfs_initialize(a_bzrdir, name=name)
2074
return self._vfs_initialize(a_bzrdir)
2113
2075
if response[0] != 'ok':
2114
2076
raise errors.UnexpectedSmartServerResponse(response)
2115
2077
# Turn the response into a RemoteRepository object.
2123
2085
a_bzrdir._client)
2124
2086
remote_repo = RemoteRepository(repo_bzrdir, repo_format)
2125
2087
remote_branch = RemoteBranch(a_bzrdir, remote_repo,
2126
format=format, setup_stacking=False, name=name)
2088
format=format, setup_stacking=False)
2127
2089
# XXX: We know this is a new branch, so it must have revno 0, revid
2128
2090
# NULL_REVISION. Creating the branch locked would make this be unable
2129
2091
# to be wrong; here its simply very unlikely to be wrong. RBC 20090225
2158
2120
def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
2159
_client=None, format=None, setup_stacking=True, name=None):
2121
_client=None, format=None, setup_stacking=True):
2160
2122
"""Create a RemoteBranch instance.
2162
2124
:param real_branch: An optional local implementation of the branch
2168
2130
:param setup_stacking: If True make an RPC call to determine the
2169
2131
stacked (or not) status of the branch. If False assume the branch
2170
2132
is not stacked.
2171
:param name: Colocated branch name
2173
2134
# We intentionally don't call the parent class's __init__, because it
2174
2135
# will try to assign to self.tags, which is a property in this subclass.
2193
2154
self._real_branch = None
2194
2155
# Fill out expected attributes of branch for bzrlib API users.
2195
2156
self._clear_cached_state()
2196
# TODO: deprecate self.base in favor of user_url
2197
self.base = self.bzrdir.user_url
2157
self.base = self.bzrdir.root_transport.base
2199
2158
self._control_files = None
2200
2159
self._lock_mode = None
2201
2160
self._lock_token = None
2266
2225
'to use vfs implementation')
2267
2226
self.bzrdir._ensure_real()
2268
2227
self._real_branch = self.bzrdir._real_bzrdir.open_branch(
2269
ignore_fallbacks=self._real_ignore_fallbacks, name=self._name)
2228
ignore_fallbacks=self._real_ignore_fallbacks)
2270
2229
if self.repository._real_repository is None:
2271
2230
# Give the remote repository the matching real repo.
2272
2231
real_repo = self._real_branch.repository
added
removed
bzrlib/remote.py
