« back to all changes in this revision
Viewing changes to bzrlib/remote.py
- browse files at revision 5085
- compare with another revision
- compare with revision 6170
- download diff
- download tarball
- view history from revision 5085
- Committer: Canonical.com Patch Queue Manager
- Date: 2010-03-11 13:47:06 UTC
- mfrom: (5051.3.16 use-branch-open)
- Revision ID: pqm@pqm.ubuntu.com-20100311134706-kaerqhx3lf7xn6rh
(Jelmer) Pass colocated branch names further down the call stack.
- files modified:
- NEWS
added
removed
bzrlib/remote.py
243
243
self._real_bzrdir.destroy_repository()
244
244
245
245
def create_branch(self, name=None):
246
if name is not None:
247
raise errors.NoColocatedBranchSupport(self)
248
246
# as per meta1 formats - just delegate to the format object which may
249
247
# be parameterised.
250
real_branch = self._format.get_branch_format().initialize(self)
248
real_branch = self._format.get_branch_format().initialize(self,
249
name=name)
251
250
if not isinstance(real_branch, RemoteBranch):
252
result = RemoteBranch(self, self.find_repository(), real_branch)
251
result = RemoteBranch(self, self.find_repository(), real_branch,
252
name=name)
253
253
else:
254
254
result = real_branch
255
255
# BzrDir.clone_on_transport() uses the result of create_branch but does
324
324
ignore_fallbacks=False):
325
325
if unsupported:
326
326
raise NotImplementedError('unsupported flag support not implemented yet.')
327
if name is not None:
328
raise errors.NoColocatedBranchSupport(self)
329
327
if self._next_open_branch_result is not None:
330
328
# See create_branch for details.
331
329
result = self._next_open_branch_result
335
333
if response[0] == 'ref':
336
334
# a branch reference, use the existing BranchReference logic.
337
335
format = BranchReferenceFormat()
338
return format.open(self, _found=True, location=response[1],
339
ignore_fallbacks=ignore_fallbacks)
336
return format.open(self, name=name, _found=True,
337
location=response[1], ignore_fallbacks=ignore_fallbacks)
340
338
branch_format_name = response[1]
341
339
if not branch_format_name:
342
340
branch_format_name = None
343
341
format = RemoteBranchFormat(network_name=branch_format_name)
344
342
return RemoteBranch(self, self.find_repository(), format=format,
345
setup_stacking=not ignore_fallbacks)
343
setup_stacking=not ignore_fallbacks, name=name)
346
344
347
345
def _open_repo_v1(self, path):
348
346
verb = 'BzrDir.find_repository'
425
423
"""Return the path to be used for this bzrdir in a remote call."""
426
424
return client.remote_path_from_transport(self.root_transport)
427
425
428
def get_branch_transport(self, branch_format):
426
def get_branch_transport(self, branch_format, name=None):
429
427
self._ensure_real()
430
return self._real_bzrdir.get_branch_transport(branch_format)
428
return self._real_bzrdir.get_branch_transport(branch_format, name=name)
431
429
432
430
def get_repository_transport(self, repository_format):
433
431
self._ensure_real()
2027
2025
def network_name(self):
2028
2026
return self._network_name
2029
2027
2030
def open(self, a_bzrdir, ignore_fallbacks=False):
2031
return a_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
2028
def open(self, a_bzrdir, name=None, ignore_fallbacks=False):
2029
return a_bzrdir.open_branch(name=name,
2030
ignore_fallbacks=ignore_fallbacks)
2032
2031
2033
def _vfs_initialize(self, a_bzrdir):
2032
def _vfs_initialize(self, a_bzrdir, name):
2034
2033
# Initialisation when using a local bzrdir object, or a non-vfs init
2035
2034
# method is not available on the server.
2036
2035
# self._custom_format is always set - the start of initialize ensures
2037
2036
# that.
2038
2037
if isinstance(a_bzrdir, RemoteBzrDir):
2039
2038
a_bzrdir._ensure_real()
2040
result = self._custom_format.initialize(a_bzrdir._real_bzrdir)
2039
result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
2040
name)
2041
2041
else:
2042
2042
# We assume the bzrdir is parameterised; it may not be.
2043
result = self._custom_format.initialize(a_bzrdir)
2043
result = self._custom_format.initialize(a_bzrdir, name)
2044
2044
if (isinstance(a_bzrdir, RemoteBzrDir) and
2045
2045
not isinstance(result, RemoteBranch)):
2046
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
2046
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
2047
name=name)
2047
2048
return result
2048
2049
2049
def initialize(self, a_bzrdir):
2050
def initialize(self, a_bzrdir, name=None):
2050
2051
# 1) get the network name to use.
2051
2052
if self._custom_format:
2052
2053
network_name = self._custom_format.network_name()
2058
2059
network_name = reference_format.network_name()
2059
2060
# Being asked to create on a non RemoteBzrDir:
2060
2061
if not isinstance(a_bzrdir, RemoteBzrDir):
2061
return self._vfs_initialize(a_bzrdir)
2062
return self._vfs_initialize(a_bzrdir, name=name)
2062
2063
medium = a_bzrdir._client._medium
2063
2064
if medium._is_remote_before((1, 13)):
2064
return self._vfs_initialize(a_bzrdir)
2065
return self._vfs_initialize(a_bzrdir, name=name)
2065
2066
# Creating on a remote bzr dir.
2066
2067
# 2) try direct creation via RPC
2067
2068
path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
2069
if name is not None:
2070
# XXX JRV20100304: Support creating colocated branches
2071
raise errors.NoColocatedBranchSupport(self)
2068
2072
verb = 'BzrDir.create_branch'
2069
2073
try:
2070
2074
response = a_bzrdir._call(verb, path, network_name)
2071
2075
except errors.UnknownSmartMethod:
2072
2076
# Fallback - use vfs methods
2073
2077
medium._remember_remote_is_before((1, 13))
2074
return self._vfs_initialize(a_bzrdir)
2078
return self._vfs_initialize(a_bzrdir, name=name)
2075
2079
if response[0] != 'ok':
2076
2080
raise errors.UnexpectedSmartServerResponse(response)
2077
2081
# Turn the response into a RemoteRepository object.
2085
2089
a_bzrdir._client)
2086
2090
remote_repo = RemoteRepository(repo_bzrdir, repo_format)
2087
2091
remote_branch = RemoteBranch(a_bzrdir, remote_repo,
2088
format=format, setup_stacking=False)
2092
format=format, setup_stacking=False, name=name)
2089
2093
# XXX: We know this is a new branch, so it must have revno 0, revid
2090
2094
# NULL_REVISION. Creating the branch locked would make this be unable
2091
2095
# to be wrong; here its simply very unlikely to be wrong. RBC 20090225
2118
2122
"""
2119
2123
2120
2124
def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
2121
_client=None, format=None, setup_stacking=True):
2125
_client=None, format=None, setup_stacking=True, name=None):
2122
2126
"""Create a RemoteBranch instance.
2123
2127
2124
2128
:param real_branch: An optional local implementation of the branch
2130
2134
:param setup_stacking: If True make an RPC call to determine the
2131
2135
stacked (or not) status of the branch. If False assume the branch
2132
2136
is not stacked.
2137
:param name: Colocated branch name
2133
2138
"""
2134
2139
# We intentionally don't call the parent class's __init__, because it
2135
2140
# will try to assign to self.tags, which is a property in this subclass.
2155
2160
# Fill out expected attributes of branch for bzrlib API users.
2156
2161
self._clear_cached_state()
2157
2162
self.base = self.bzrdir.root_transport.base
2163
self._name = name
2158
2164
self._control_files = None
2159
2165
self._lock_mode = None
2160
2166
self._lock_token = None
2225
2231
'to use vfs implementation')
2226
2232
self.bzrdir._ensure_real()
2227
2233
self._real_branch = self.bzrdir._real_bzrdir.open_branch(
2228
ignore_fallbacks=self._real_ignore_fallbacks)
2234
ignore_fallbacks=self._real_ignore_fallbacks, name=self._name)
2229
2235
if self.repository._real_repository is None:
2230
2236
# Give the remote repository the matching real repo.
2231
2237
real_repo = self._real_branch.repository
Loggerhead is a web-based interface for Breezy
Version: 2.0.1