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
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
242
self._ensure_real()
246
243
self._real_bzrdir.destroy_repository()
248
def create_branch(self, name=None):
245
def create_branch(self):
249
246
# as per meta1 formats - just delegate to the format object which may
250
247
# be parameterised.
251
real_branch = self._format.get_branch_format().initialize(self,
248
real_branch = self._format.get_branch_format().initialize(self)
253
249
if not isinstance(real_branch, RemoteBranch):
254
result = RemoteBranch(self, self.find_repository(), real_branch,
250
result = RemoteBranch(self, self.find_repository(), real_branch)
257
252
result = real_branch
258
253
# BzrDir.clone_on_transport() uses the result of create_branch but does
264
259
self._next_open_branch_result = result
267
def destroy_branch(self, name=None):
262
def destroy_branch(self):
268
263
"""See BzrDir.destroy_branch"""
269
264
self._ensure_real()
270
self._real_bzrdir.destroy_branch(name=name)
265
self._real_bzrdir.destroy_branch()
271
266
self._next_open_branch_result = None
273
268
def create_workingtree(self, revision_id=None, from_branch=None):
292
287
def _get_branch_reference(self):
293
288
path = self._path_for_remote_call(self._client)
294
289
medium = self._client._medium
296
('BzrDir.open_branchV3', (2, 1)),
297
('BzrDir.open_branchV2', (1, 13)),
298
('BzrDir.open_branch', None),
300
for verb, required_version in candidate_calls:
301
if required_version and medium._is_remote_before(required_version):
290
if not medium._is_remote_before((1, 13)):
304
response = self._call(verb, path)
292
response = self._call('BzrDir.open_branchV2', path)
293
if response[0] not in ('ref', 'branch'):
294
raise errors.UnexpectedSmartServerResponse(response)
305
296
except errors.UnknownSmartMethod:
306
if required_version is None:
308
medium._remember_remote_is_before(required_version)
311
if verb == 'BzrDir.open_branch':
312
if response[0] != 'ok':
313
raise errors.UnexpectedSmartServerResponse(response)
314
if response[1] != '':
315
return ('ref', response[1])
317
return ('branch', '')
318
if response[0] not in ('ref', 'branch'):
297
medium._remember_remote_is_before((1, 13))
298
response = self._call('BzrDir.open_branch', path)
299
if response[0] != 'ok':
319
300
raise errors.UnexpectedSmartServerResponse(response)
301
if response[1] != '':
302
return ('ref', response[1])
304
return ('branch', '')
322
306
def _get_tree_branch(self):
323
307
"""See BzrDir._get_tree_branch()."""
324
308
return None, self.open_branch()
326
def open_branch(self, name=None, unsupported=False,
327
ignore_fallbacks=False):
310
def open_branch(self, _unsupported=False, ignore_fallbacks=False):
329
312
raise NotImplementedError('unsupported flag support not implemented yet.')
330
313
if self._next_open_branch_result is not None:
331
314
# See create_branch for details.
336
319
if response[0] == 'ref':
337
320
# a branch reference, use the existing BranchReference logic.
338
321
format = BranchReferenceFormat()
339
return format.open(self, name=name, _found=True,
340
location=response[1], ignore_fallbacks=ignore_fallbacks)
322
return format.open(self, _found=True, location=response[1],
323
ignore_fallbacks=ignore_fallbacks)
341
324
branch_format_name = response[1]
342
325
if not branch_format_name:
343
326
branch_format_name = None
344
327
format = RemoteBranchFormat(network_name=branch_format_name)
345
328
return RemoteBranch(self, self.find_repository(), format=format,
346
setup_stacking=not ignore_fallbacks, name=name)
329
setup_stacking=not ignore_fallbacks)
348
331
def _open_repo_v1(self, path):
349
332
verb = 'BzrDir.find_repository'
426
409
"""Return the path to be used for this bzrdir in a remote call."""
427
410
return client.remote_path_from_transport(self.root_transport)
429
def get_branch_transport(self, branch_format, name=None):
412
def get_branch_transport(self, branch_format):
430
413
self._ensure_real()
431
return self._real_bzrdir.get_branch_transport(branch_format, name=name)
414
return self._real_bzrdir.get_branch_transport(branch_format)
433
416
def get_repository_transport(self, repository_format):
434
417
self._ensure_real()
644
627
return self._custom_format._serializer
647
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
648
bzrdir.ControlComponent):
630
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin):
649
631
"""Repository accessed over rpc.
651
633
For the moment most operations are performed using local transport-backed
694
676
# Additional places to query for data.
695
677
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
679
def __str__(self):
709
680
return "%s(%s)" % (self.__class__.__name__, self.base)
918
889
parents_provider = self._make_parents_provider(other_repository)
919
890
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
892
def gather_stats(self, revid=None, committers=None):
931
893
"""See Repository.gather_stats()."""
932
894
path = self.bzrdir._path_for_remote_call(self._client)
1246
1203
# state, so always add a lock here. If a caller passes us a locked
1247
1204
# repository, they are responsible for unlocking it later.
1248
1205
repository.lock_read()
1249
self._check_fallback_repository(repository)
1250
1206
self._fallback_repositories.append(repository)
1251
1207
# If self._real_repository was parameterised already (e.g. because a
1252
1208
# _real_branch had its get_stacked_on_url method called), then the
1253
1209
# repository to be added may already be in the _real_repositories list.
1254
1210
if self._real_repository is not None:
1255
fallback_locations = [repo.user_url for repo in
1211
fallback_locations = [repo.bzrdir.root_transport.base for repo in
1256
1212
self._real_repository._fallback_repositories]
1257
if repository.user_url not in fallback_locations:
1213
if repository.bzrdir.root_transport.base not in fallback_locations:
1258
1214
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
1216
def add_inventory(self, revid, inv, parents):
1271
1217
self._ensure_real()
1272
1218
return self._real_repository.add_inventory(revid, inv, parents)
1274
1220
def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1275
parents, basis_inv=None, propagate_caches=False):
1276
1222
self._ensure_real()
1277
1223
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)
1224
delta, new_revision_id, parents)
1281
1226
def add_revision(self, rev_id, rev, inv=None, config=None):
1282
1227
self._ensure_real()
1541
1486
return self._real_repository.get_signature_text(revision_id)
1543
1488
@needs_read_lock
1544
def _get_inventory_xml(self, revision_id):
1546
return self._real_repository._get_inventory_xml(revision_id)
1489
def get_inventory_xml(self, revision_id):
1491
return self._real_repository.get_inventory_xml(revision_id)
1493
def deserialise_inventory(self, revision_id, xml):
1495
return self._real_repository.deserialise_inventory(revision_id, xml)
1548
1497
def reconcile(self, other=None, thorough=False):
1549
1498
self._ensure_real()
1625
1574
return self._real_repository.inventories
1627
1576
@needs_write_lock
1628
def pack(self, hint=None, clean_obsolete_packs=False):
1577
def pack(self, hint=None):
1629
1578
"""Compress the data within the repository.
1631
1580
This is not currently implemented within the smart server.
1633
1582
self._ensure_real()
1634
return self._real_repository.pack(hint=hint, clean_obsolete_packs=clean_obsolete_packs)
1583
return self._real_repository.pack(hint=hint)
1637
1586
def revisions(self):
2065
2014
def network_name(self):
2066
2015
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)
2017
def open(self, a_bzrdir, ignore_fallbacks=False):
2018
return a_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
2072
def _vfs_initialize(self, a_bzrdir, name):
2020
def _vfs_initialize(self, a_bzrdir):
2073
2021
# Initialisation when using a local bzrdir object, or a non-vfs init
2074
2022
# method is not available on the server.
2075
2023
# self._custom_format is always set - the start of initialize ensures
2077
2025
if isinstance(a_bzrdir, RemoteBzrDir):
2078
2026
a_bzrdir._ensure_real()
2079
result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
2027
result = self._custom_format.initialize(a_bzrdir._real_bzrdir)
2082
2029
# We assume the bzrdir is parameterised; it may not be.
2083
result = self._custom_format.initialize(a_bzrdir, name)
2030
result = self._custom_format.initialize(a_bzrdir)
2084
2031
if (isinstance(a_bzrdir, RemoteBzrDir) and
2085
2032
not isinstance(result, RemoteBranch)):
2086
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
2033
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
2090
def initialize(self, a_bzrdir, name=None):
2036
def initialize(self, a_bzrdir):
2091
2037
# 1) get the network name to use.
2092
2038
if self._custom_format:
2093
2039
network_name = self._custom_format.network_name()
2099
2045
network_name = reference_format.network_name()
2100
2046
# Being asked to create on a non RemoteBzrDir:
2101
2047
if not isinstance(a_bzrdir, RemoteBzrDir):
2102
return self._vfs_initialize(a_bzrdir, name=name)
2048
return self._vfs_initialize(a_bzrdir)
2103
2049
medium = a_bzrdir._client._medium
2104
2050
if medium._is_remote_before((1, 13)):
2105
return self._vfs_initialize(a_bzrdir, name=name)
2051
return self._vfs_initialize(a_bzrdir)
2106
2052
# Creating on a remote bzr dir.
2107
2053
# 2) try direct creation via RPC
2108
2054
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
2055
verb = 'BzrDir.create_branch'
2114
2057
response = a_bzrdir._call(verb, path, network_name)
2115
2058
except errors.UnknownSmartMethod:
2116
2059
# Fallback - use vfs methods
2117
2060
medium._remember_remote_is_before((1, 13))
2118
return self._vfs_initialize(a_bzrdir, name=name)
2061
return self._vfs_initialize(a_bzrdir)
2119
2062
if response[0] != 'ok':
2120
2063
raise errors.UnexpectedSmartServerResponse(response)
2121
2064
# Turn the response into a RemoteRepository object.
2129
2072
a_bzrdir._client)
2130
2073
remote_repo = RemoteRepository(repo_bzrdir, repo_format)
2131
2074
remote_branch = RemoteBranch(a_bzrdir, remote_repo,
2132
format=format, setup_stacking=False, name=name)
2075
format=format, setup_stacking=False)
2133
2076
# XXX: We know this is a new branch, so it must have revno 0, revid
2134
2077
# NULL_REVISION. Creating the branch locked would make this be unable
2135
2078
# to be wrong; here its simply very unlikely to be wrong. RBC 20090225
2164
2107
def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
2165
_client=None, format=None, setup_stacking=True, name=None):
2108
_client=None, format=None, setup_stacking=True):
2166
2109
"""Create a RemoteBranch instance.
2168
2111
:param real_branch: An optional local implementation of the branch
2174
2117
:param setup_stacking: If True make an RPC call to determine the
2175
2118
stacked (or not) status of the branch. If False assume the branch
2176
2119
is not stacked.
2177
:param name: Colocated branch name
2179
2121
# We intentionally don't call the parent class's __init__, because it
2180
2122
# will try to assign to self.tags, which is a property in this subclass.
2199
2141
self._real_branch = None
2200
2142
# Fill out expected attributes of branch for bzrlib API users.
2201
2143
self._clear_cached_state()
2202
# TODO: deprecate self.base in favor of user_url
2203
self.base = self.bzrdir.user_url
2144
self.base = self.bzrdir.root_transport.base
2205
2145
self._control_files = None
2206
2146
self._lock_mode = None
2207
2147
self._lock_token = None
2272
2212
'to use vfs implementation')
2273
2213
self.bzrdir._ensure_real()
2274
2214
self._real_branch = self.bzrdir._real_bzrdir.open_branch(
2275
ignore_fallbacks=self._real_ignore_fallbacks, name=self._name)
2215
ignore_fallbacks=self._real_ignore_fallbacks)
2276
2216
if self.repository._real_repository is None:
2277
2217
# Give the remote repository the matching real repo.
2278
2218
real_repo = self._real_branch.repository
2406
2342
self._real_branch.lock_read()
2408
2344
self._lock_count += 1
2409
return lock.LogicalLockResult(self.unlock)
2411
2346
def _remote_lock_write(self, token):
2412
2347
if token is None:
2413
2348
branch_token = repo_token = ''
2415
2350
branch_token = token
2416
repo_token = self.repository.lock_write().repository_token
2351
repo_token = self.repository.lock_write()
2417
2352
self.repository.unlock()
2418
2353
err_context = {'token': token}
2419
2354
response = self._call(
2456
2391
self._lock_count += 1
2457
2392
# Re-lock the repository too.
2458
2393
self.repository.lock_write(self._repo_lock_token)
2459
return BranchWriteLockResult(self.unlock, self._lock_token or None)
2394
return self._lock_token or None
2461
2396
def _unlock(self, branch_token, repo_token):
2462
2397
err_context = {'token': str((branch_token, repo_token))}
2891
2826
raise NoSuchRevision(find('branch'), err.error_args[0])
2892
2827
elif err.error_verb == 'nosuchrevision':
2893
2828
raise NoSuchRevision(find('repository'), err.error_args[0])
2894
elif err.error_verb == 'nobranch':
2895
if len(err.error_args) >= 1:
2896
extra = err.error_args[0]
2899
raise errors.NotBranchError(path=find('bzrdir').root_transport.base,
2829
elif err.error_tuple == ('nobranch',):
2830
raise errors.NotBranchError(path=find('bzrdir').root_transport.base)
2901
2831
elif err.error_verb == 'norepository':
2902
2832
raise errors.NoRepositoryPresent(find('bzrdir'))
2903
2833
elif err.error_verb == 'LockContention':
added
removed
bzrlib/remote.py
