2152
2152
repo_format = response_tuple_to_repo_format(response[3:])
2153
2153
repo_path = response[2]
2154
2154
if repository is not None:
2155
remote_repo_url = urlutils.join(medium.base, repo_path)
2155
remote_repo_url = urlutils.join(a_bzrdir.user_url, repo_path)
2156
2156
url_diff = urlutils.relative_url(repository.user_url,
2157
2157
remote_repo_url)
2158
2158
if url_diff != '.':
2159
2159
raise AssertionError(
2160
2160
'repository.user_url %r does not match URL from server '
2161
2161
'response (%r + %r)'
2162
% (repository.user_url, medium.base, repo_path))
2162
% (repository.user_url, a_bzrdir.user_url, repo_path))
2163
2163
remote_repo = repository
2165
2165
if repo_path == '':
2195
2195
self._ensure_real()
2196
2196
return self._custom_format.supports_set_append_revisions_only()
2198
def _use_default_local_heads_to_fetch(self):
2199
# If the branch format is a metadir format *and* its heads_to_fetch
2200
# implementation is not overridden vs the base class, we can use the
2201
# base class logic rather than use the heads_to_fetch RPC. This is
2202
# usually cheaper in terms of net round trips, as the last-revision and
2203
# tags info fetched is cached and would be fetched anyway.
2205
if isinstance(self._custom_format, branch.BranchFormatMetadir):
2206
branch_class = self._custom_format._branch_class()
2207
heads_to_fetch_impl = branch_class.heads_to_fetch.im_func
2208
if heads_to_fetch_impl is branch.Branch.heads_to_fetch.im_func:
2199
2212
class RemoteBranch(branch.Branch, _RpcHelper, lock._RelockDebugMixin):
2200
2213
"""Branch stored on a server accessed by HPSS RPC.
2782
2795
self._ensure_real()
2783
2796
return self._real_branch.set_push_location(location)
2798
def heads_to_fetch(self):
2799
if self._format._use_default_local_heads_to_fetch():
2800
# We recognise this format, and its heads-to-fetch implementation
2801
# is the default one (tip + tags). In this case it's cheaper to
2802
# just use the default implementation rather than a special RPC as
2803
# the tip and tags data is cached.
2804
return branch.Branch.heads_to_fetch(self)
2805
medium = self._client._medium
2806
if medium._is_remote_before((2, 4)):
2807
return self._vfs_heads_to_fetch()
2809
return self._rpc_heads_to_fetch()
2810
except errors.UnknownSmartMethod:
2811
medium._remember_remote_is_before((2, 4))
2812
return self._vfs_heads_to_fetch()
2814
def _rpc_heads_to_fetch(self):
2815
response = self._call('Branch.heads_to_fetch', self._remote_path())
2816
if len(response) != 2:
2817
raise errors.UnexpectedSmartServerResponse(response)
2818
must_fetch, if_present_fetch = response
2819
return set(must_fetch), set(if_present_fetch)
2821
def _vfs_heads_to_fetch(self):
2823
return self._real_branch.heads_to_fetch()
2786
2826
class RemoteConfig(object):
2787
2827
"""A Config that reads and writes from smart verbs.
2974
3014
'Missing key %r in context %r', key_err.args[0], context)
2977
if err.error_verb == 'IncompatibleRepositories':
2978
raise errors.IncompatibleRepositories(err.error_args[0],
2979
err.error_args[1], err.error_args[2])
2980
elif err.error_verb == 'NoSuchRevision':
3017
if err.error_verb == 'NoSuchRevision':
2981
3018
raise NoSuchRevision(find('branch'), err.error_args[0])
2982
3019
elif err.error_verb == 'nosuchrevision':
2983
3020
raise NoSuchRevision(find('repository'), err.error_args[0])
2991
3028
elif err.error_verb == 'norepository':
2992
3029
raise errors.NoRepositoryPresent(find('bzrdir'))
2993
elif err.error_verb == 'LockContention':
2994
raise errors.LockContention('(remote lock)')
2995
3030
elif err.error_verb == 'UnlockableTransport':
2996
3031
raise errors.UnlockableTransport(find('bzrdir').root_transport)
2997
elif err.error_verb == 'LockFailed':
2998
raise errors.LockFailed(err.error_args[0], err.error_args[1])
2999
3032
elif err.error_verb == 'TokenMismatch':
3000
3033
raise errors.TokenMismatch(find('token'), '(remote token)')
3001
3034
elif err.error_verb == 'Diverged':
3002
3035
raise errors.DivergedBranches(find('branch'), find('other_branch'))
3003
elif err.error_verb == 'TipChangeRejected':
3004
raise errors.TipChangeRejected(err.error_args[0].decode('utf8'))
3005
elif err.error_verb == 'UnstackableBranchFormat':
3006
raise errors.UnstackableBranchFormat(*err.error_args)
3007
elif err.error_verb == 'UnstackableRepositoryFormat':
3008
raise errors.UnstackableRepositoryFormat(*err.error_args)
3009
3036
elif err.error_verb == 'NotStacked':
3010
3037
raise errors.NotStacked(branch=find('branch'))
3011
3038
elif err.error_verb == 'PermissionDenied':
3021
3048
elif err.error_verb == 'NoSuchFile':
3022
3049
path = get_path()
3023
3050
raise errors.NoSuchFile(path)
3051
_translate_error_without_context(err)
3054
def _translate_error_without_context(err):
3055
"""Translate any ErrorFromSmartServer values that don't require context"""
3056
if err.error_verb == 'IncompatibleRepositories':
3057
raise errors.IncompatibleRepositories(err.error_args[0],
3058
err.error_args[1], err.error_args[2])
3059
elif err.error_verb == 'LockContention':
3060
raise errors.LockContention('(remote lock)')
3061
elif err.error_verb == 'LockFailed':
3062
raise errors.LockFailed(err.error_args[0], err.error_args[1])
3063
elif err.error_verb == 'TipChangeRejected':
3064
raise errors.TipChangeRejected(err.error_args[0].decode('utf8'))
3065
elif err.error_verb == 'UnstackableBranchFormat':
3066
raise errors.UnstackableBranchFormat(*err.error_args)
3067
elif err.error_verb == 'UnstackableRepositoryFormat':
3068
raise errors.UnstackableRepositoryFormat(*err.error_args)
3024
3069
elif err.error_verb == 'FileExists':
3025
3070
raise errors.FileExists(err.error_args[0])
3026
3071
elif err.error_verb == 'DirectoryNotEmpty':
3045
3090
raise UnicodeEncodeError(encoding, val, start, end, reason)
3046
3091
elif err.error_verb == 'ReadOnlyError':
3047
3092
raise errors.TransportNotPossible('readonly transport')
3093
elif err.error_verb == 'MemoryError':
3094
raise errors.BzrError("remote server out of memory\n"
3095
"Retry non-remotely, or contact the server admin for details.")
3048
3096
raise errors.UnknownErrorFromSmartServer(err)
added
removed
bzrlib/remote.py
