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
245
239
self._ensure_real()
246
240
self._real_bzrdir.destroy_repository()
248
def create_branch(self, name=None):
242
def create_branch(self):
249
243
# as per meta1 formats - just delegate to the format object which may
250
244
# be parameterised.
251
real_branch = self._format.get_branch_format().initialize(self,
245
real_branch = self._format.get_branch_format().initialize(self)
253
246
if not isinstance(real_branch, RemoteBranch):
254
result = RemoteBranch(self, self.find_repository(), real_branch,
247
result = RemoteBranch(self, self.find_repository(), real_branch)
257
249
result = real_branch
258
250
# BzrDir.clone_on_transport() uses the result of create_branch but does
264
256
self._next_open_branch_result = result
267
def destroy_branch(self, name=None):
259
def destroy_branch(self):
268
260
"""See BzrDir.destroy_branch"""
269
261
self._ensure_real()
270
self._real_bzrdir.destroy_branch(name=name)
262
self._real_bzrdir.destroy_branch()
271
263
self._next_open_branch_result = None
273
265
def create_workingtree(self, revision_id=None, from_branch=None):
274
266
raise errors.NotLocalUrl(self.transport.base)
276
def find_branch_format(self, name=None):
268
def find_branch_format(self):
277
269
"""Find the branch 'format' for this bzrdir.
279
271
This might be a synthetic object for e.g. RemoteBranch and SVN.
281
b = self.open_branch(name=name)
273
b = self.open_branch()
284
def get_branch_reference(self, name=None):
276
def get_branch_reference(self):
285
277
"""See BzrDir.get_branch_reference()."""
287
# XXX JRV20100304: Support opening colocated branches
288
raise errors.NoColocatedBranchSupport(self)
289
278
response = self._get_branch_reference()
290
279
if response[0] == 'ref':
291
280
return response[1]
295
284
def _get_branch_reference(self):
296
285
path = self._path_for_remote_call(self._client)
297
286
medium = self._client._medium
299
('BzrDir.open_branchV3', (2, 1)),
300
('BzrDir.open_branchV2', (1, 13)),
301
('BzrDir.open_branch', None),
303
for verb, required_version in candidate_calls:
304
if required_version and medium._is_remote_before(required_version):
287
if not medium._is_remote_before((1, 13)):
307
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)
308
293
except errors.UnknownSmartMethod:
309
if required_version is None:
311
medium._remember_remote_is_before(required_version)
314
if verb == 'BzrDir.open_branch':
315
if response[0] != 'ok':
316
raise errors.UnexpectedSmartServerResponse(response)
317
if response[1] != '':
318
return ('ref', response[1])
320
return ('branch', '')
321
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':
322
297
raise errors.UnexpectedSmartServerResponse(response)
298
if response[1] != '':
299
return ('ref', response[1])
301
return ('branch', '')
325
def _get_tree_branch(self, name=None):
303
def _get_tree_branch(self):
326
304
"""See BzrDir._get_tree_branch()."""
327
return None, self.open_branch(name=name)
305
return None, self.open_branch()
329
def open_branch(self, name=None, unsupported=False,
330
ignore_fallbacks=False):
307
def open_branch(self, _unsupported=False, ignore_fallbacks=False):
332
309
raise NotImplementedError('unsupported flag support not implemented yet.')
333
310
if self._next_open_branch_result is not None:
334
311
# See create_branch for details.
339
316
if response[0] == 'ref':
340
317
# a branch reference, use the existing BranchReference logic.
341
318
format = BranchReferenceFormat()
342
return format.open(self, name=name, _found=True,
343
location=response[1], ignore_fallbacks=ignore_fallbacks)
319
return format.open(self, _found=True, location=response[1],
320
ignore_fallbacks=ignore_fallbacks)
344
321
branch_format_name = response[1]
345
322
if not branch_format_name:
346
323
branch_format_name = None
347
324
format = RemoteBranchFormat(network_name=branch_format_name)
348
325
return RemoteBranch(self, self.find_repository(), format=format,
349
setup_stacking=not ignore_fallbacks, name=name)
326
setup_stacking=not ignore_fallbacks)
351
328
def _open_repo_v1(self, path):
352
329
verb = 'BzrDir.find_repository'
429
406
"""Return the path to be used for this bzrdir in a remote call."""
430
407
return client.remote_path_from_transport(self.root_transport)
432
def get_branch_transport(self, branch_format, name=None):
409
def get_branch_transport(self, branch_format):
433
410
self._ensure_real()
434
return self._real_bzrdir.get_branch_transport(branch_format, name=name)
411
return self._real_bzrdir.get_branch_transport(branch_format)
436
413
def get_repository_transport(self, repository_format):
437
414
self._ensure_real()
647
624
return self._custom_format._serializer
650
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
651
bzrdir.ControlComponent):
627
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin):
652
628
"""Repository accessed over rpc.
654
630
For the moment most operations are performed using local transport-backed
697
673
# Additional places to query for data.
698
674
self._fallback_repositories = []
701
def user_transport(self):
702
return self.bzrdir.user_transport
705
def control_transport(self):
706
# XXX: Normally you shouldn't directly get at the remote repository
707
# transport, but I'm not sure it's worth making this method
708
# optional -- mbp 2010-04-21
709
return self.bzrdir.get_repository_transport(None)
711
676
def __str__(self):
712
677
return "%s(%s)" % (self.__class__.__name__, self.base)
921
886
parents_provider = self._make_parents_provider(other_repository)
922
887
return graph.Graph(parents_provider)
925
def get_known_graph_ancestry(self, revision_ids):
926
"""Return the known graph for a set of revision ids and their ancestors.
928
st = static_tuple.StaticTuple
929
revision_keys = [st(r_id).intern() for r_id in revision_ids]
930
known_graph = self.revisions.get_known_graph_ancestry(revision_keys)
931
return graph.GraphThunkIdsToKeys(known_graph)
933
889
def gather_stats(self, revid=None, committers=None):
934
890
"""See Repository.gather_stats()."""
935
891
path = self.bzrdir._path_for_remote_call(self._client)
995
951
def is_write_locked(self):
996
952
return self._lock_mode == 'w'
998
def _warn_if_deprecated(self, branch=None):
999
# If we have a real repository, the check will be done there, if we
1000
# don't the check will be done remotely.
1003
954
def lock_read(self):
1004
"""Lock the repository for read operations.
1006
:return: A bzrlib.lock.LogicalLockResult.
1008
955
# wrong eventually - want a local lock cache context
1009
956
if not self._lock_mode:
1010
957
self._note_lock('r')
1249
1195
# state, so always add a lock here. If a caller passes us a locked
1250
1196
# repository, they are responsible for unlocking it later.
1251
1197
repository.lock_read()
1252
self._check_fallback_repository(repository)
1253
1198
self._fallback_repositories.append(repository)
1254
1199
# If self._real_repository was parameterised already (e.g. because a
1255
1200
# _real_branch had its get_stacked_on_url method called), then the
1256
1201
# repository to be added may already be in the _real_repositories list.
1257
1202
if self._real_repository is not None:
1258
fallback_locations = [repo.user_url for repo in
1203
fallback_locations = [repo.bzrdir.root_transport.base for repo in
1259
1204
self._real_repository._fallback_repositories]
1260
if repository.user_url not in fallback_locations:
1205
if repository.bzrdir.root_transport.base not in fallback_locations:
1261
1206
self._real_repository.add_fallback_repository(repository)
1263
def _check_fallback_repository(self, repository):
1264
"""Check that this repository can fallback to repository safely.
1266
Raise an error if not.
1268
:param repository: A repository to fallback to.
1270
return _mod_repository.InterRepository._assert_same_model(
1273
1208
def add_inventory(self, revid, inv, parents):
1274
1209
self._ensure_real()
1275
1210
return self._real_repository.add_inventory(revid, inv, parents)
1277
1212
def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1278
parents, basis_inv=None, propagate_caches=False):
1279
1214
self._ensure_real()
1280
1215
return self._real_repository.add_inventory_by_delta(basis_revision_id,
1281
delta, new_revision_id, parents, basis_inv=basis_inv,
1282
propagate_caches=propagate_caches)
1216
delta, new_revision_id, parents)
1284
1218
def add_revision(self, rev_id, rev, inv=None, config=None):
1285
1219
self._ensure_real()
1315
1249
return self._real_repository.make_working_trees()
1317
1251
def refresh_data(self):
1318
"""Re-read any data needed to synchronise with disk.
1252
"""Re-read any data needed to to synchronise with disk.
1320
1254
This method is intended to be called after another repository instance
1321
1255
(such as one used by a smart server) has inserted data into the
1322
repository. On all repositories this will work outside of write groups.
1323
Some repository formats (pack and newer for bzrlib native formats)
1324
support refresh_data inside write groups. If called inside a write
1325
group on a repository that does not support refreshing in a write group
1326
IsInWriteGroupError will be raised.
1256
repository. It may not be called during a write group, but may be
1257
called at any other time.
1259
if self.is_in_write_group():
1260
raise errors.InternalBzrError(
1261
"May not refresh_data while in a write group.")
1328
1262
if self._real_repository is not None:
1329
1263
self._real_repository.refresh_data()
1544
1478
return self._real_repository.get_signature_text(revision_id)
1546
1480
@needs_read_lock
1547
def _get_inventory_xml(self, revision_id):
1549
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)
1551
1489
def reconcile(self, other=None, thorough=False):
1552
1490
self._ensure_real()
1628
1566
return self._real_repository.inventories
1630
1568
@needs_write_lock
1631
def pack(self, hint=None, clean_obsolete_packs=False):
1569
def pack(self, hint=None):
1632
1570
"""Compress the data within the repository.
1634
1572
This is not currently implemented within the smart server.
1636
1574
self._ensure_real()
1637
return self._real_repository.pack(hint=hint, clean_obsolete_packs=clean_obsolete_packs)
1575
return self._real_repository.pack(hint=hint)
1640
1578
def revisions(self):
2068
2006
def network_name(self):
2069
2007
return self._network_name
2071
def open(self, a_bzrdir, name=None, ignore_fallbacks=False):
2072
return a_bzrdir.open_branch(name=name,
2073
ignore_fallbacks=ignore_fallbacks)
2009
def open(self, a_bzrdir, ignore_fallbacks=False):
2010
return a_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
2075
def _vfs_initialize(self, a_bzrdir, name):
2012
def _vfs_initialize(self, a_bzrdir):
2076
2013
# Initialisation when using a local bzrdir object, or a non-vfs init
2077
2014
# method is not available on the server.
2078
2015
# self._custom_format is always set - the start of initialize ensures
2080
2017
if isinstance(a_bzrdir, RemoteBzrDir):
2081
2018
a_bzrdir._ensure_real()
2082
result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
2019
result = self._custom_format.initialize(a_bzrdir._real_bzrdir)
2085
2021
# We assume the bzrdir is parameterised; it may not be.
2086
result = self._custom_format.initialize(a_bzrdir, name)
2022
result = self._custom_format.initialize(a_bzrdir)
2087
2023
if (isinstance(a_bzrdir, RemoteBzrDir) and
2088
2024
not isinstance(result, RemoteBranch)):
2089
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
2025
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
2093
def initialize(self, a_bzrdir, name=None):
2028
def initialize(self, a_bzrdir):
2094
2029
# 1) get the network name to use.
2095
2030
if self._custom_format:
2096
2031
network_name = self._custom_format.network_name()
2102
2037
network_name = reference_format.network_name()
2103
2038
# Being asked to create on a non RemoteBzrDir:
2104
2039
if not isinstance(a_bzrdir, RemoteBzrDir):
2105
return self._vfs_initialize(a_bzrdir, name=name)
2040
return self._vfs_initialize(a_bzrdir)
2106
2041
medium = a_bzrdir._client._medium
2107
2042
if medium._is_remote_before((1, 13)):
2108
return self._vfs_initialize(a_bzrdir, name=name)
2043
return self._vfs_initialize(a_bzrdir)
2109
2044
# Creating on a remote bzr dir.
2110
2045
# 2) try direct creation via RPC
2111
2046
path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
2112
if name is not None:
2113
# XXX JRV20100304: Support creating colocated branches
2114
raise errors.NoColocatedBranchSupport(self)
2115
2047
verb = 'BzrDir.create_branch'
2117
2049
response = a_bzrdir._call(verb, path, network_name)
2118
2050
except errors.UnknownSmartMethod:
2119
2051
# Fallback - use vfs methods
2120
2052
medium._remember_remote_is_before((1, 13))
2121
return self._vfs_initialize(a_bzrdir, name=name)
2053
return self._vfs_initialize(a_bzrdir)
2122
2054
if response[0] != 'ok':
2123
2055
raise errors.UnexpectedSmartServerResponse(response)
2124
2056
# Turn the response into a RemoteRepository object.
2132
2064
a_bzrdir._client)
2133
2065
remote_repo = RemoteRepository(repo_bzrdir, repo_format)
2134
2066
remote_branch = RemoteBranch(a_bzrdir, remote_repo,
2135
format=format, setup_stacking=False, name=name)
2067
format=format, setup_stacking=False)
2136
2068
# XXX: We know this is a new branch, so it must have revno 0, revid
2137
2069
# NULL_REVISION. Creating the branch locked would make this be unable
2138
2070
# to be wrong; here its simply very unlikely to be wrong. RBC 20090225
2167
2099
def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
2168
_client=None, format=None, setup_stacking=True, name=None):
2100
_client=None, format=None, setup_stacking=True):
2169
2101
"""Create a RemoteBranch instance.
2171
2103
:param real_branch: An optional local implementation of the branch
2177
2109
:param setup_stacking: If True make an RPC call to determine the
2178
2110
stacked (or not) status of the branch. If False assume the branch
2179
2111
is not stacked.
2180
:param name: Colocated branch name
2182
2113
# We intentionally don't call the parent class's __init__, because it
2183
2114
# will try to assign to self.tags, which is a property in this subclass.
2202
2133
self._real_branch = None
2203
2134
# Fill out expected attributes of branch for bzrlib API users.
2204
2135
self._clear_cached_state()
2205
# TODO: deprecate self.base in favor of user_url
2206
self.base = self.bzrdir.user_url
2136
self.base = self.bzrdir.root_transport.base
2208
2137
self._control_files = None
2209
2138
self._lock_mode = None
2210
2139
self._lock_token = None
2275
2204
'to use vfs implementation')
2276
2205
self.bzrdir._ensure_real()
2277
2206
self._real_branch = self.bzrdir._real_bzrdir.open_branch(
2278
ignore_fallbacks=self._real_ignore_fallbacks, name=self._name)
2207
ignore_fallbacks=self._real_ignore_fallbacks)
2279
2208
if self.repository._real_repository is None:
2280
2209
# Give the remote repository the matching real repo.
2281
2210
real_repo = self._real_branch.repository
2409
2334
self._real_branch.lock_read()
2411
2336
self._lock_count += 1
2412
return lock.LogicalLockResult(self.unlock)
2414
2338
def _remote_lock_write(self, token):
2415
2339
if token is None:
2416
2340
branch_token = repo_token = ''
2418
2342
branch_token = token
2419
repo_token = self.repository.lock_write().repository_token
2343
repo_token = self.repository.lock_write()
2420
2344
self.repository.unlock()
2421
2345
err_context = {'token': token}
2422
2346
response = self._call(
2459
2383
self._lock_count += 1
2460
2384
# Re-lock the repository too.
2461
2385
self.repository.lock_write(self._repo_lock_token)
2462
return BranchWriteLockResult(self.unlock, self._lock_token or None)
2386
return self._lock_token or None
2464
2388
def _unlock(self, branch_token, repo_token):
2465
2389
err_context = {'token': str((branch_token, repo_token))}
2894
2818
raise NoSuchRevision(find('branch'), err.error_args[0])
2895
2819
elif err.error_verb == 'nosuchrevision':
2896
2820
raise NoSuchRevision(find('repository'), err.error_args[0])
2897
elif err.error_verb == 'nobranch':
2898
if len(err.error_args) >= 1:
2899
extra = err.error_args[0]
2902
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)
2904
2823
elif err.error_verb == 'norepository':
2905
2824
raise errors.NoRepositoryPresent(find('bzrdir'))
2906
2825
elif err.error_verb == 'LockContention':
added
removed
bzrlib/remote.py
