30
repository as _mod_repository,
32
31
revision as _mod_revision,
36
from bzrlib.branch import BranchReferenceFormat, BranchWriteLockResult
34
from bzrlib.branch import BranchReferenceFormat
37
35
from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat
38
36
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
39
37
from bzrlib.errors import (
43
41
from bzrlib.lockable_files import LockableFiles
44
42
from bzrlib.smart import client, vfs, repository as smart_repo
45
43
from bzrlib.revision import ensure_null, NULL_REVISION
46
from bzrlib.repository import RepositoryWriteLockResult
47
44
from bzrlib.trace import mutter, note, warning
246
243
self._real_bzrdir.destroy_repository()
248
245
def create_branch(self, name=None):
247
raise errors.NoColocatedBranchSupport(self)
249
248
# as per meta1 formats - just delegate to the format object which may
250
249
# be parameterised.
251
real_branch = self._format.get_branch_format().initialize(self,
250
real_branch = self._format.get_branch_format().initialize(self)
253
251
if not isinstance(real_branch, RemoteBranch):
254
result = RemoteBranch(self, self.find_repository(), real_branch,
252
result = RemoteBranch(self, self.find_repository(), real_branch)
257
254
result = real_branch
258
255
# BzrDir.clone_on_transport() uses the result of create_branch but does
327
324
ignore_fallbacks=False):
329
326
raise NotImplementedError('unsupported flag support not implemented yet.')
328
raise errors.NoColocatedBranchSupport(self)
330
329
if self._next_open_branch_result is not None:
331
330
# See create_branch for details.
332
331
result = self._next_open_branch_result
336
335
if response[0] == 'ref':
337
336
# a branch reference, use the existing BranchReference logic.
338
337
format = BranchReferenceFormat()
339
return format.open(self, name=name, _found=True,
340
location=response[1], ignore_fallbacks=ignore_fallbacks)
338
return format.open(self, _found=True, location=response[1],
339
ignore_fallbacks=ignore_fallbacks)
341
340
branch_format_name = response[1]
342
341
if not branch_format_name:
343
342
branch_format_name = None
344
343
format = RemoteBranchFormat(network_name=branch_format_name)
345
344
return RemoteBranch(self, self.find_repository(), format=format,
346
setup_stacking=not ignore_fallbacks, name=name)
345
setup_stacking=not ignore_fallbacks)
348
347
def _open_repo_v1(self, path):
349
348
verb = 'BzrDir.find_repository'
426
425
"""Return the path to be used for this bzrdir in a remote call."""
427
426
return client.remote_path_from_transport(self.root_transport)
429
def get_branch_transport(self, branch_format, name=None):
428
def get_branch_transport(self, branch_format):
430
429
self._ensure_real()
431
return self._real_bzrdir.get_branch_transport(branch_format, name=name)
430
return self._real_bzrdir.get_branch_transport(branch_format)
433
432
def get_repository_transport(self, repository_format):
434
433
self._ensure_real()
644
643
return self._custom_format._serializer
647
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
648
bzrdir.ControlComponent):
646
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin):
649
647
"""Repository accessed over rpc.
651
649
For the moment most operations are performed using local transport-backed
694
692
# Additional places to query for data.
695
693
self._fallback_repositories = []
698
def user_transport(self):
699
return self.bzrdir.user_transport
702
def control_transport(self):
703
# XXX: Normally you shouldn't directly get at the remote repository
704
# transport, but I'm not sure it's worth making this method
705
# optional -- mbp 2010-04-21
706
return self.bzrdir.get_repository_transport(None)
708
695
def __str__(self):
709
696
return "%s(%s)" % (self.__class__.__name__, self.base)
918
905
parents_provider = self._make_parents_provider(other_repository)
919
906
return graph.Graph(parents_provider)
922
def get_known_graph_ancestry(self, revision_ids):
923
"""Return the known graph for a set of revision ids and their ancestors.
925
st = static_tuple.StaticTuple
926
revision_keys = [st(r_id).intern() for r_id in revision_ids]
927
known_graph = self.revisions.get_known_graph_ancestry(revision_keys)
928
return graph.GraphThunkIdsToKeys(known_graph)
930
908
def gather_stats(self, revid=None, committers=None):
931
909
"""See Repository.gather_stats()."""
932
910
path = self.bzrdir._path_for_remote_call(self._client)
1246
1219
# state, so always add a lock here. If a caller passes us a locked
1247
1220
# repository, they are responsible for unlocking it later.
1248
1221
repository.lock_read()
1249
self._check_fallback_repository(repository)
1250
1222
self._fallback_repositories.append(repository)
1251
1223
# If self._real_repository was parameterised already (e.g. because a
1252
1224
# _real_branch had its get_stacked_on_url method called), then the
1253
1225
# repository to be added may already be in the _real_repositories list.
1254
1226
if self._real_repository is not None:
1255
fallback_locations = [repo.user_url for repo in
1227
fallback_locations = [repo.bzrdir.root_transport.base for repo in
1256
1228
self._real_repository._fallback_repositories]
1257
if repository.user_url not in fallback_locations:
1229
if repository.bzrdir.root_transport.base not in fallback_locations:
1258
1230
self._real_repository.add_fallback_repository(repository)
1260
def _check_fallback_repository(self, repository):
1261
"""Check that this repository can fallback to repository safely.
1263
Raise an error if not.
1265
:param repository: A repository to fallback to.
1267
return _mod_repository.InterRepository._assert_same_model(
1270
1232
def add_inventory(self, revid, inv, parents):
1271
1233
self._ensure_real()
1272
1234
return self._real_repository.add_inventory(revid, inv, parents)
1274
1236
def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1275
parents, basis_inv=None, propagate_caches=False):
1276
1238
self._ensure_real()
1277
1239
return self._real_repository.add_inventory_by_delta(basis_revision_id,
1278
delta, new_revision_id, parents, basis_inv=basis_inv,
1279
propagate_caches=propagate_caches)
1240
delta, new_revision_id, parents)
1281
1242
def add_revision(self, rev_id, rev, inv=None, config=None):
1282
1243
self._ensure_real()
1625
1586
return self._real_repository.inventories
1627
1588
@needs_write_lock
1628
def pack(self, hint=None, clean_obsolete_packs=False):
1589
def pack(self, hint=None):
1629
1590
"""Compress the data within the repository.
1631
1592
This is not currently implemented within the smart server.
1633
1594
self._ensure_real()
1634
return self._real_repository.pack(hint=hint, clean_obsolete_packs=clean_obsolete_packs)
1595
return self._real_repository.pack(hint=hint)
1637
1598
def revisions(self):
2065
2026
def network_name(self):
2066
2027
return self._network_name
2068
def open(self, a_bzrdir, name=None, ignore_fallbacks=False):
2069
return a_bzrdir.open_branch(name=name,
2070
ignore_fallbacks=ignore_fallbacks)
2029
def open(self, a_bzrdir, ignore_fallbacks=False):
2030
return a_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
2072
def _vfs_initialize(self, a_bzrdir, name):
2032
def _vfs_initialize(self, a_bzrdir):
2073
2033
# Initialisation when using a local bzrdir object, or a non-vfs init
2074
2034
# method is not available on the server.
2075
2035
# self._custom_format is always set - the start of initialize ensures
2077
2037
if isinstance(a_bzrdir, RemoteBzrDir):
2078
2038
a_bzrdir._ensure_real()
2079
result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
2039
result = self._custom_format.initialize(a_bzrdir._real_bzrdir)
2082
2041
# We assume the bzrdir is parameterised; it may not be.
2083
result = self._custom_format.initialize(a_bzrdir, name)
2042
result = self._custom_format.initialize(a_bzrdir)
2084
2043
if (isinstance(a_bzrdir, RemoteBzrDir) and
2085
2044
not isinstance(result, RemoteBranch)):
2086
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
2045
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
2090
def initialize(self, a_bzrdir, name=None):
2048
def initialize(self, a_bzrdir):
2091
2049
# 1) get the network name to use.
2092
2050
if self._custom_format:
2093
2051
network_name = self._custom_format.network_name()
2099
2057
network_name = reference_format.network_name()
2100
2058
# Being asked to create on a non RemoteBzrDir:
2101
2059
if not isinstance(a_bzrdir, RemoteBzrDir):
2102
return self._vfs_initialize(a_bzrdir, name=name)
2060
return self._vfs_initialize(a_bzrdir)
2103
2061
medium = a_bzrdir._client._medium
2104
2062
if medium._is_remote_before((1, 13)):
2105
return self._vfs_initialize(a_bzrdir, name=name)
2063
return self._vfs_initialize(a_bzrdir)
2106
2064
# Creating on a remote bzr dir.
2107
2065
# 2) try direct creation via RPC
2108
2066
path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
2109
if name is not None:
2110
# XXX JRV20100304: Support creating colocated branches
2111
raise errors.NoColocatedBranchSupport(self)
2112
2067
verb = 'BzrDir.create_branch'
2114
2069
response = a_bzrdir._call(verb, path, network_name)
2115
2070
except errors.UnknownSmartMethod:
2116
2071
# Fallback - use vfs methods
2117
2072
medium._remember_remote_is_before((1, 13))
2118
return self._vfs_initialize(a_bzrdir, name=name)
2073
return self._vfs_initialize(a_bzrdir)
2119
2074
if response[0] != 'ok':
2120
2075
raise errors.UnexpectedSmartServerResponse(response)
2121
2076
# Turn the response into a RemoteRepository object.
2129
2084
a_bzrdir._client)
2130
2085
remote_repo = RemoteRepository(repo_bzrdir, repo_format)
2131
2086
remote_branch = RemoteBranch(a_bzrdir, remote_repo,
2132
format=format, setup_stacking=False, name=name)
2087
format=format, setup_stacking=False)
2133
2088
# XXX: We know this is a new branch, so it must have revno 0, revid
2134
2089
# NULL_REVISION. Creating the branch locked would make this be unable
2135
2090
# to be wrong; here its simply very unlikely to be wrong. RBC 20090225
2164
2119
def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
2165
_client=None, format=None, setup_stacking=True, name=None):
2120
_client=None, format=None, setup_stacking=True):
2166
2121
"""Create a RemoteBranch instance.
2168
2123
:param real_branch: An optional local implementation of the branch
2174
2129
:param setup_stacking: If True make an RPC call to determine the
2175
2130
stacked (or not) status of the branch. If False assume the branch
2176
2131
is not stacked.
2177
:param name: Colocated branch name
2179
2133
# We intentionally don't call the parent class's __init__, because it
2180
2134
# will try to assign to self.tags, which is a property in this subclass.
2199
2153
self._real_branch = None
2200
2154
# Fill out expected attributes of branch for bzrlib API users.
2201
2155
self._clear_cached_state()
2202
# TODO: deprecate self.base in favor of user_url
2203
self.base = self.bzrdir.user_url
2156
self.base = self.bzrdir.root_transport.base
2205
2157
self._control_files = None
2206
2158
self._lock_mode = None
2207
2159
self._lock_token = None
2272
2224
'to use vfs implementation')
2273
2225
self.bzrdir._ensure_real()
2274
2226
self._real_branch = self.bzrdir._real_bzrdir.open_branch(
2275
ignore_fallbacks=self._real_ignore_fallbacks, name=self._name)
2227
ignore_fallbacks=self._real_ignore_fallbacks)
2276
2228
if self.repository._real_repository is None:
2277
2229
# Give the remote repository the matching real repo.
2278
2230
real_repo = self._real_branch.repository
2406
2354
self._real_branch.lock_read()
2408
2356
self._lock_count += 1
2409
return lock.LogicalLockResult(self.unlock)
2411
2358
def _remote_lock_write(self, token):
2412
2359
if token is None:
2413
2360
branch_token = repo_token = ''
2415
2362
branch_token = token
2416
repo_token = self.repository.lock_write().repository_token
2363
repo_token = self.repository.lock_write()
2417
2364
self.repository.unlock()
2418
2365
err_context = {'token': token}
2419
2366
response = self._call(
2456
2403
self._lock_count += 1
2457
2404
# Re-lock the repository too.
2458
2405
self.repository.lock_write(self._repo_lock_token)
2459
return BranchWriteLockResult(self.unlock, self._lock_token or None)
2406
return self._lock_token or None
2461
2408
def _unlock(self, branch_token, repo_token):
2462
2409
err_context = {'token': str((branch_token, repo_token))}
added
removed
bzrlib/remote.py
