244
243
self._ensure_real()
245
244
self._real_bzrdir.destroy_repository()
247
def create_branch(self, name=None):
246
def create_branch(self):
248
247
# as per meta1 formats - just delegate to the format object which may
249
248
# be parameterised.
250
real_branch = self._format.get_branch_format().initialize(self,
249
real_branch = self._format.get_branch_format().initialize(self)
252
250
if not isinstance(real_branch, RemoteBranch):
253
result = RemoteBranch(self, self.find_repository(), real_branch,
251
result = RemoteBranch(self, self.find_repository(), real_branch)
256
253
result = real_branch
257
254
# BzrDir.clone_on_transport() uses the result of create_branch but does
263
260
self._next_open_branch_result = result
266
def destroy_branch(self, name=None):
263
def destroy_branch(self):
267
264
"""See BzrDir.destroy_branch"""
268
265
self._ensure_real()
269
self._real_bzrdir.destroy_branch(name=name)
266
self._real_bzrdir.destroy_branch()
270
267
self._next_open_branch_result = None
272
269
def create_workingtree(self, revision_id=None, from_branch=None):
322
319
"""See BzrDir._get_tree_branch()."""
323
320
return None, self.open_branch()
325
def open_branch(self, name=None, unsupported=False,
326
ignore_fallbacks=False):
322
def open_branch(self, _unsupported=False, ignore_fallbacks=False):
328
324
raise NotImplementedError('unsupported flag support not implemented yet.')
329
325
if self._next_open_branch_result is not None:
330
326
# See create_branch for details.
335
331
if response[0] == 'ref':
336
332
# a branch reference, use the existing BranchReference logic.
337
333
format = BranchReferenceFormat()
338
return format.open(self, name=name, _found=True,
339
location=response[1], ignore_fallbacks=ignore_fallbacks)
334
return format.open(self, _found=True, location=response[1],
335
ignore_fallbacks=ignore_fallbacks)
340
336
branch_format_name = response[1]
341
337
if not branch_format_name:
342
338
branch_format_name = None
343
339
format = RemoteBranchFormat(network_name=branch_format_name)
344
340
return RemoteBranch(self, self.find_repository(), format=format,
345
setup_stacking=not ignore_fallbacks, name=name)
341
setup_stacking=not ignore_fallbacks)
347
343
def _open_repo_v1(self, path):
348
344
verb = 'BzrDir.find_repository'
425
421
"""Return the path to be used for this bzrdir in a remote call."""
426
422
return client.remote_path_from_transport(self.root_transport)
428
def get_branch_transport(self, branch_format, name=None):
424
def get_branch_transport(self, branch_format):
429
425
self._ensure_real()
430
return self._real_bzrdir.get_branch_transport(branch_format, name=name)
426
return self._real_bzrdir.get_branch_transport(branch_format)
432
428
def get_repository_transport(self, repository_format):
433
429
self._ensure_real()
643
639
return self._custom_format._serializer
646
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
647
bzrdir.ControlComponent):
642
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin):
648
643
"""Repository accessed over rpc.
650
645
For the moment most operations are performed using local transport-backed
693
688
# Additional places to query for data.
694
689
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
691
def __str__(self):
708
692
return "%s(%s)" % (self.__class__.__name__, self.base)
917
901
parents_provider = self._make_parents_provider(other_repository)
918
902
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
904
def gather_stats(self, revid=None, committers=None):
930
905
"""See Repository.gather_stats()."""
931
906
path = self.bzrdir._path_for_remote_call(self._client)
1246
1221
# _real_branch had its get_stacked_on_url method called), then the
1247
1222
# repository to be added may already be in the _real_repositories list.
1248
1223
if self._real_repository is not None:
1249
fallback_locations = [repo.user_url for repo in
1224
fallback_locations = [repo.bzrdir.root_transport.base for repo in
1250
1225
self._real_repository._fallback_repositories]
1251
if repository.user_url not in fallback_locations:
1226
if repository.bzrdir.root_transport.base not in fallback_locations:
1252
1227
self._real_repository.add_fallback_repository(repository)
1254
1229
def _check_fallback_repository(self, repository):
1266
1241
return self._real_repository.add_inventory(revid, inv, parents)
1268
1243
def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1269
parents, basis_inv=None, propagate_caches=False):
1270
1245
self._ensure_real()
1271
1246
return self._real_repository.add_inventory_by_delta(basis_revision_id,
1272
delta, new_revision_id, parents, basis_inv=basis_inv,
1273
propagate_caches=propagate_caches)
1247
delta, new_revision_id, parents)
1275
1249
def add_revision(self, rev_id, rev, inv=None, config=None):
1276
1250
self._ensure_real()
1535
1509
return self._real_repository.get_signature_text(revision_id)
1537
1511
@needs_read_lock
1538
def _get_inventory_xml(self, revision_id):
1540
return self._real_repository._get_inventory_xml(revision_id)
1512
def get_inventory_xml(self, revision_id):
1514
return self._real_repository.get_inventory_xml(revision_id)
1516
def deserialise_inventory(self, revision_id, xml):
1518
return self._real_repository.deserialise_inventory(revision_id, xml)
1542
1520
def reconcile(self, other=None, thorough=False):
1543
1521
self._ensure_real()
1619
1597
return self._real_repository.inventories
1621
1599
@needs_write_lock
1622
def pack(self, hint=None, clean_obsolete_packs=False):
1600
def pack(self, hint=None):
1623
1601
"""Compress the data within the repository.
1625
1603
This is not currently implemented within the smart server.
1627
1605
self._ensure_real()
1628
return self._real_repository.pack(hint=hint, clean_obsolete_packs=clean_obsolete_packs)
1606
return self._real_repository.pack(hint=hint)
1631
1609
def revisions(self):
2059
2037
def network_name(self):
2060
2038
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)
2040
def open(self, a_bzrdir, ignore_fallbacks=False):
2041
return a_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
2066
def _vfs_initialize(self, a_bzrdir, name):
2043
def _vfs_initialize(self, a_bzrdir):
2067
2044
# Initialisation when using a local bzrdir object, or a non-vfs init
2068
2045
# method is not available on the server.
2069
2046
# self._custom_format is always set - the start of initialize ensures
2071
2048
if isinstance(a_bzrdir, RemoteBzrDir):
2072
2049
a_bzrdir._ensure_real()
2073
result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
2050
result = self._custom_format.initialize(a_bzrdir._real_bzrdir)
2076
2052
# We assume the bzrdir is parameterised; it may not be.
2077
result = self._custom_format.initialize(a_bzrdir, name)
2053
result = self._custom_format.initialize(a_bzrdir)
2078
2054
if (isinstance(a_bzrdir, RemoteBzrDir) and
2079
2055
not isinstance(result, RemoteBranch)):
2080
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
2056
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
2084
def initialize(self, a_bzrdir, name=None):
2059
def initialize(self, a_bzrdir):
2085
2060
# 1) get the network name to use.
2086
2061
if self._custom_format:
2087
2062
network_name = self._custom_format.network_name()
2093
2068
network_name = reference_format.network_name()
2094
2069
# Being asked to create on a non RemoteBzrDir:
2095
2070
if not isinstance(a_bzrdir, RemoteBzrDir):
2096
return self._vfs_initialize(a_bzrdir, name=name)
2071
return self._vfs_initialize(a_bzrdir)
2097
2072
medium = a_bzrdir._client._medium
2098
2073
if medium._is_remote_before((1, 13)):
2099
return self._vfs_initialize(a_bzrdir, name=name)
2074
return self._vfs_initialize(a_bzrdir)
2100
2075
# Creating on a remote bzr dir.
2101
2076
# 2) try direct creation via RPC
2102
2077
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
2078
verb = 'BzrDir.create_branch'
2108
2080
response = a_bzrdir._call(verb, path, network_name)
2109
2081
except errors.UnknownSmartMethod:
2110
2082
# Fallback - use vfs methods
2111
2083
medium._remember_remote_is_before((1, 13))
2112
return self._vfs_initialize(a_bzrdir, name=name)
2084
return self._vfs_initialize(a_bzrdir)
2113
2085
if response[0] != 'ok':
2114
2086
raise errors.UnexpectedSmartServerResponse(response)
2115
2087
# Turn the response into a RemoteRepository object.
2123
2095
a_bzrdir._client)
2124
2096
remote_repo = RemoteRepository(repo_bzrdir, repo_format)
2125
2097
remote_branch = RemoteBranch(a_bzrdir, remote_repo,
2126
format=format, setup_stacking=False, name=name)
2098
format=format, setup_stacking=False)
2127
2099
# XXX: We know this is a new branch, so it must have revno 0, revid
2128
2100
# NULL_REVISION. Creating the branch locked would make this be unable
2129
2101
# to be wrong; here its simply very unlikely to be wrong. RBC 20090225
2158
2130
def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
2159
_client=None, format=None, setup_stacking=True, name=None):
2131
_client=None, format=None, setup_stacking=True):
2160
2132
"""Create a RemoteBranch instance.
2162
2134
:param real_branch: An optional local implementation of the branch
2168
2140
:param setup_stacking: If True make an RPC call to determine the
2169
2141
stacked (or not) status of the branch. If False assume the branch
2170
2142
is not stacked.
2171
:param name: Colocated branch name
2173
2144
# We intentionally don't call the parent class's __init__, because it
2174
2145
# will try to assign to self.tags, which is a property in this subclass.
2193
2164
self._real_branch = None
2194
2165
# Fill out expected attributes of branch for bzrlib API users.
2195
2166
self._clear_cached_state()
2196
# TODO: deprecate self.base in favor of user_url
2197
self.base = self.bzrdir.user_url
2167
self.base = self.bzrdir.root_transport.base
2199
2168
self._control_files = None
2200
2169
self._lock_mode = None
2201
2170
self._lock_token = None
2266
2235
'to use vfs implementation')
2267
2236
self.bzrdir._ensure_real()
2268
2237
self._real_branch = self.bzrdir._real_bzrdir.open_branch(
2269
ignore_fallbacks=self._real_ignore_fallbacks, name=self._name)
2238
ignore_fallbacks=self._real_ignore_fallbacks)
2270
2239
if self.repository._real_repository is None:
2271
2240
# Give the remote repository the matching real repo.
2272
2241
real_repo = self._real_branch.repository
added
removed
bzrlib/remote.py
