112
110
self._client = client._SmartClient(medium)
114
112
self._client = _client
121
return '%s(%r)' % (self.__class__.__name__, self._client)
123
def _probe_bzrdir(self):
124
medium = self._client._medium
125
115
path = self._path_for_remote_call(self._client)
126
if medium._is_remote_before((2, 1)):
130
self._rpc_open_2_1(path)
132
except errors.UnknownSmartMethod:
133
medium._remember_remote_is_before((2, 1))
136
def _rpc_open_2_1(self, path):
137
response = self._call('BzrDir.open_2.1', path)
138
if response == ('no',):
139
raise errors.NotBranchError(path=self.root_transport.base)
140
elif response[0] == 'yes':
141
if response[1] == 'yes':
142
self._has_working_tree = True
143
elif response[1] == 'no':
144
self._has_working_tree = False
146
raise errors.UnexpectedSmartServerResponse(response)
148
raise errors.UnexpectedSmartServerResponse(response)
150
def _rpc_open(self, path):
151
116
response = self._call('BzrDir.open', path)
152
117
if response not in [('yes',), ('no',)]:
153
118
raise errors.UnexpectedSmartServerResponse(response)
154
119
if response == ('no',):
155
raise errors.NotBranchError(path=self.root_transport.base)
120
raise errors.NotBranchError(path=transport.base)
157
122
def _ensure_real(self):
158
123
"""Ensure that there is a _real_bzrdir set.
245
206
self._ensure_real()
246
207
self._real_bzrdir.destroy_repository()
248
def create_branch(self, name=None):
209
def create_branch(self):
249
210
# as per meta1 formats - just delegate to the format object which may
250
211
# be parameterised.
251
real_branch = self._format.get_branch_format().initialize(self,
212
real_branch = self._format.get_branch_format().initialize(self)
253
213
if not isinstance(real_branch, RemoteBranch):
254
result = RemoteBranch(self, self.find_repository(), real_branch,
214
result = RemoteBranch(self, self.find_repository(), real_branch)
257
216
result = real_branch
258
217
# BzrDir.clone_on_transport() uses the result of create_branch but does
292
251
def _get_branch_reference(self):
293
252
path = self._path_for_remote_call(self._client)
294
253
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):
254
if not medium._is_remote_before((1, 13)):
304
response = self._call(verb, path)
256
response = self._call('BzrDir.open_branchV2', path)
257
if response[0] not in ('ref', 'branch'):
258
raise errors.UnexpectedSmartServerResponse(response)
305
260
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'):
261
medium._remember_remote_is_before((1, 13))
262
response = self._call('BzrDir.open_branch', path)
263
if response[0] != 'ok':
319
264
raise errors.UnexpectedSmartServerResponse(response)
265
if response[1] != '':
266
return ('ref', response[1])
268
return ('branch', '')
322
270
def _get_tree_branch(self):
323
271
"""See BzrDir._get_tree_branch()."""
324
272
return None, self.open_branch()
326
def open_branch(self, name=None, unsupported=False,
327
ignore_fallbacks=False):
274
def open_branch(self, _unsupported=False, ignore_fallbacks=False):
329
276
raise NotImplementedError('unsupported flag support not implemented yet.')
330
277
if self._next_open_branch_result is not None:
331
278
# See create_branch for details.
336
283
if response[0] == 'ref':
337
284
# a branch reference, use the existing BranchReference logic.
338
285
format = BranchReferenceFormat()
339
return format.open(self, name=name, _found=True,
340
location=response[1], ignore_fallbacks=ignore_fallbacks)
286
return format.open(self, _found=True, location=response[1],
287
ignore_fallbacks=ignore_fallbacks)
341
288
branch_format_name = response[1]
342
289
if not branch_format_name:
343
290
branch_format_name = None
344
291
format = RemoteBranchFormat(network_name=branch_format_name)
345
292
return RemoteBranch(self, self.find_repository(), format=format,
346
setup_stacking=not ignore_fallbacks, name=name)
293
setup_stacking=not ignore_fallbacks)
348
295
def _open_repo_v1(self, path):
349
296
verb = 'BzrDir.find_repository'
621
551
return self._custom_format._fetch_reconcile
623
553
def get_format_description(self):
625
return 'Remote: ' + self._custom_format.get_format_description()
554
return 'bzr remote repository'
627
556
def __eq__(self, other):
628
557
return self.__class__ is other.__class__
559
def check_conversion_target(self, target_format):
560
if self.rich_root_data and not target_format.rich_root_data:
561
raise errors.BadConversionTarget(
562
'Does not support rich root data.', target_format)
563
if (self.supports_tree_reference and
564
not getattr(target_format, 'supports_tree_reference', False)):
565
raise errors.BadConversionTarget(
566
'Does not support nested trees', target_format)
630
568
def network_name(self):
631
569
if self._network_name:
632
570
return self._network_name
893
819
result.add(_mod_revision.NULL_REVISION)
896
def _has_same_fallbacks(self, other_repo):
897
"""Returns true if the repositories have the same fallbacks."""
898
# XXX: copied from Repository; it should be unified into a base class
899
# <https://bugs.edge.launchpad.net/bzr/+bug/401622>
900
my_fb = self._fallback_repositories
901
other_fb = other_repo._fallback_repositories
902
if len(my_fb) != len(other_fb):
904
for f, g in zip(my_fb, other_fb):
905
if not f.has_same_location(g):
909
822
def has_same_location(self, other):
910
# TODO: Move to RepositoryBase and unify with the regular Repository
911
# one; unfortunately the tests rely on slightly different behaviour at
912
# present -- mbp 20090710
913
823
return (self.__class__ is other.__class__ and
914
824
self.bzrdir.transport.base == other.bzrdir.transport.base)
918
828
parents_provider = self._make_parents_provider(other_repository)
919
829
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
831
def gather_stats(self, revid=None, committers=None):
931
832
"""See Repository.gather_stats()."""
932
833
path = self.bzrdir._path_for_remote_call(self._client)
1247
1134
# state, so always add a lock here. If a caller passes us a locked
1248
1135
# repository, they are responsible for unlocking it later.
1249
1136
repository.lock_read()
1250
self._check_fallback_repository(repository)
1251
1137
self._fallback_repositories.append(repository)
1252
1138
# If self._real_repository was parameterised already (e.g. because a
1253
1139
# _real_branch had its get_stacked_on_url method called), then the
1254
1140
# repository to be added may already be in the _real_repositories list.
1255
1141
if self._real_repository is not None:
1256
fallback_locations = [repo.user_url for repo in
1142
fallback_locations = [repo.bzrdir.root_transport.base for repo in
1257
1143
self._real_repository._fallback_repositories]
1258
if repository.user_url not in fallback_locations:
1144
if repository.bzrdir.root_transport.base not in fallback_locations:
1259
1145
self._real_repository.add_fallback_repository(repository)
1261
def _check_fallback_repository(self, repository):
1262
"""Check that this repository can fallback to repository safely.
1264
Raise an error if not.
1266
:param repository: A repository to fallback to.
1268
return _mod_repository.InterRepository._assert_same_model(
1271
1147
def add_inventory(self, revid, inv, parents):
1272
1148
self._ensure_real()
1273
1149
return self._real_repository.add_inventory(revid, inv, parents)
1275
1151
def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1276
parents, basis_inv=None, propagate_caches=False):
1277
1153
self._ensure_real()
1278
1154
return self._real_repository.add_inventory_by_delta(basis_revision_id,
1279
delta, new_revision_id, parents, basis_inv=basis_inv,
1280
propagate_caches=propagate_caches)
1155
delta, new_revision_id, parents)
1282
1157
def add_revision(self, rev_id, rev, inv=None, config=None):
1283
1158
self._ensure_real()
1789
1664
def insert_stream(self, stream, src_format, resume_tokens):
1790
1665
target = self.target_repo
1791
1666
target._unstacked_provider.missing_keys.clear()
1792
candidate_calls = [('Repository.insert_stream_1.19', (1, 19))]
1793
1667
if target._lock_token:
1794
candidate_calls.append(('Repository.insert_stream_locked', (1, 14)))
1795
lock_args = (target._lock_token or '',)
1668
verb = 'Repository.insert_stream_locked'
1669
extra_args = (target._lock_token or '',)
1670
required_version = (1, 14)
1797
candidate_calls.append(('Repository.insert_stream', (1, 13)))
1672
verb = 'Repository.insert_stream'
1674
required_version = (1, 13)
1799
1675
client = target._client
1800
1676
medium = client._medium
1677
if medium._is_remote_before(required_version):
1678
# No possible way this can work.
1679
return self._insert_real(stream, src_format, resume_tokens)
1801
1680
path = target.bzrdir._path_for_remote_call(client)
1802
# Probe for the verb to use with an empty stream before sending the
1803
# real stream to it. We do this both to avoid the risk of sending a
1804
# large request that is then rejected, and because we don't want to
1805
# implement a way to buffer, rewind, or restart the stream.
1807
for verb, required_version in candidate_calls:
1808
if medium._is_remote_before(required_version):
1811
# We've already done the probing (and set _is_remote_before) on
1812
# a previous insert.
1681
if not resume_tokens:
1682
# XXX: Ugly but important for correctness, *will* be fixed during
1683
# 1.13 cycle. Pushing a stream that is interrupted results in a
1684
# fallback to the _real_repositories sink *with a partial stream*.
1685
# Thats bad because we insert less data than bzr expected. To avoid
1686
# this we do a trial push to make sure the verb is accessible, and
1687
# do not fallback when actually pushing the stream. A cleanup patch
1688
# is going to look at rewinding/restarting the stream/partial
1815
1690
byte_stream = smart_repo._stream_to_byte_stream([], src_format)
1817
1692
response = client.call_with_body_stream(
1818
(verb, path, '') + lock_args, byte_stream)
1693
(verb, path, '') + extra_args, byte_stream)
1819
1694
except errors.UnknownSmartMethod:
1820
1695
medium._remember_remote_is_before(required_version)
1826
return self._insert_real(stream, src_format, resume_tokens)
1827
self._last_inv_record = None
1828
self._last_substream = None
1829
if required_version < (1, 19):
1830
# Remote side doesn't support inventory deltas. Wrap the stream to
1831
# make sure we don't send any. If the stream contains inventory
1832
# deltas we'll interrupt the smart insert_stream request and
1834
stream = self._stop_stream_if_inventory_delta(stream)
1696
return self._insert_real(stream, src_format, resume_tokens)
1835
1697
byte_stream = smart_repo._stream_to_byte_stream(
1836
1698
stream, src_format)
1837
1699
resume_tokens = ' '.join(resume_tokens)
1838
1700
response = client.call_with_body_stream(
1839
(verb, path, resume_tokens) + lock_args, byte_stream)
1701
(verb, path, resume_tokens) + extra_args, byte_stream)
1840
1702
if response[0][0] not in ('ok', 'missing-basis'):
1841
1703
raise errors.UnexpectedSmartServerResponse(response)
1842
if self._last_substream is not None:
1843
# The stream included an inventory-delta record, but the remote
1844
# side isn't new enough to support them. So we need to send the
1845
# rest of the stream via VFS.
1846
self.target_repo.refresh_data()
1847
return self._resume_stream_with_vfs(response, src_format)
1848
1704
if response[0][0] == 'missing-basis':
1849
1705
tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1850
1706
resume_tokens = tokens
1853
1709
self.target_repo.refresh_data()
1854
1710
return [], set()
1856
def _resume_stream_with_vfs(self, response, src_format):
1857
"""Resume sending a stream via VFS, first resending the record and
1858
substream that couldn't be sent via an insert_stream verb.
1860
if response[0][0] == 'missing-basis':
1861
tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1862
# Ignore missing_keys, we haven't finished inserting yet
1865
def resume_substream():
1866
# Yield the substream that was interrupted.
1867
for record in self._last_substream:
1869
self._last_substream = None
1870
def resume_stream():
1871
# Finish sending the interrupted substream
1872
yield ('inventory-deltas', resume_substream())
1873
# Then simply continue sending the rest of the stream.
1874
for substream_kind, substream in self._last_stream:
1875
yield substream_kind, substream
1876
return self._insert_real(resume_stream(), src_format, tokens)
1878
def _stop_stream_if_inventory_delta(self, stream):
1879
"""Normally this just lets the original stream pass-through unchanged.
1881
However if any 'inventory-deltas' substream occurs it will stop
1882
streaming, and store the interrupted substream and stream in
1883
self._last_substream and self._last_stream so that the stream can be
1884
resumed by _resume_stream_with_vfs.
1887
stream_iter = iter(stream)
1888
for substream_kind, substream in stream_iter:
1889
if substream_kind == 'inventory-deltas':
1890
self._last_substream = substream
1891
self._last_stream = stream_iter
1894
yield substream_kind, substream
1897
1713
class RemoteStreamSource(repository.StreamSource):
1898
1714
"""Stream data from a remote server."""
1901
1717
if (self.from_repository._fallback_repositories and
1902
1718
self.to_format._fetch_order == 'topological'):
1903
1719
return self._real_stream(self.from_repository, search)
1906
repos = [self.from_repository]
1912
repos.extend(repo._fallback_repositories)
1913
sources.append(repo)
1914
return self.missing_parents_chain(search, sources)
1916
def get_stream_for_missing_keys(self, missing_keys):
1917
self.from_repository._ensure_real()
1918
real_repo = self.from_repository._real_repository
1919
real_source = real_repo._get_source(self.to_format)
1920
return real_source.get_stream_for_missing_keys(missing_keys)
1720
return self.missing_parents_chain(search, [self.from_repository] +
1721
self.from_repository._fallback_repositories)
1922
1723
def _real_stream(self, repo, search):
1923
1724
"""Get a stream for search from repo.
1954
1754
return self._real_stream(repo, search)
1955
1755
client = repo._client
1956
1756
medium = client._medium
1757
if medium._is_remote_before((1, 13)):
1758
# streaming was added in 1.13
1759
return self._real_stream(repo, search)
1957
1760
path = repo.bzrdir._path_for_remote_call(client)
1958
search_bytes = repo._serialise_search_result(search)
1959
args = (path, self.to_format.network_name())
1961
('Repository.get_stream_1.19', (1, 19)),
1962
('Repository.get_stream', (1, 13))]
1964
for verb, version in candidate_verbs:
1965
if medium._is_remote_before(version):
1968
response = repo._call_with_body_bytes_expecting_body(
1969
verb, args, search_bytes)
1970
except errors.UnknownSmartMethod:
1971
medium._remember_remote_is_before(version)
1973
response_tuple, response_handler = response
1762
search_bytes = repo._serialise_search_result(search)
1763
response = repo._call_with_body_bytes_expecting_body(
1764
'Repository.get_stream',
1765
(path, self.to_format.network_name()), search_bytes)
1766
response_tuple, response_handler = response
1767
except errors.UnknownSmartMethod:
1768
medium._remember_remote_is_before((1,13))
1977
1769
return self._real_stream(repo, search)
1978
1770
if response_tuple[0] != 'ok':
1979
1771
raise errors.UnexpectedSmartServerResponse(response_tuple)
2060
1851
self._network_name)
2062
1853
def get_format_description(self):
2064
return 'Remote: ' + self._custom_format.get_format_description()
1854
return 'Remote BZR Branch'
2066
1856
def network_name(self):
2067
1857
return self._network_name
2069
def open(self, a_bzrdir, name=None, ignore_fallbacks=False):
2070
return a_bzrdir.open_branch(name=name,
2071
ignore_fallbacks=ignore_fallbacks)
1859
def open(self, a_bzrdir, ignore_fallbacks=False):
1860
return a_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
2073
def _vfs_initialize(self, a_bzrdir, name):
1862
def _vfs_initialize(self, a_bzrdir):
2074
1863
# Initialisation when using a local bzrdir object, or a non-vfs init
2075
1864
# method is not available on the server.
2076
1865
# self._custom_format is always set - the start of initialize ensures
2078
1867
if isinstance(a_bzrdir, RemoteBzrDir):
2079
1868
a_bzrdir._ensure_real()
2080
result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
1869
result = self._custom_format.initialize(a_bzrdir._real_bzrdir)
2083
1871
# We assume the bzrdir is parameterised; it may not be.
2084
result = self._custom_format.initialize(a_bzrdir, name)
1872
result = self._custom_format.initialize(a_bzrdir)
2085
1873
if (isinstance(a_bzrdir, RemoteBzrDir) and
2086
1874
not isinstance(result, RemoteBranch)):
2087
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
1875
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
2091
def initialize(self, a_bzrdir, name=None):
1878
def initialize(self, a_bzrdir):
2092
1879
# 1) get the network name to use.
2093
1880
if self._custom_format:
2094
1881
network_name = self._custom_format.network_name()
2100
1887
network_name = reference_format.network_name()
2101
1888
# Being asked to create on a non RemoteBzrDir:
2102
1889
if not isinstance(a_bzrdir, RemoteBzrDir):
2103
return self._vfs_initialize(a_bzrdir, name=name)
1890
return self._vfs_initialize(a_bzrdir)
2104
1891
medium = a_bzrdir._client._medium
2105
1892
if medium._is_remote_before((1, 13)):
2106
return self._vfs_initialize(a_bzrdir, name=name)
1893
return self._vfs_initialize(a_bzrdir)
2107
1894
# Creating on a remote bzr dir.
2108
1895
# 2) try direct creation via RPC
2109
1896
path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
2110
if name is not None:
2111
# XXX JRV20100304: Support creating colocated branches
2112
raise errors.NoColocatedBranchSupport(self)
2113
1897
verb = 'BzrDir.create_branch'
2115
1899
response = a_bzrdir._call(verb, path, network_name)
2116
1900
except errors.UnknownSmartMethod:
2117
1901
# Fallback - use vfs methods
2118
1902
medium._remember_remote_is_before((1, 13))
2119
return self._vfs_initialize(a_bzrdir, name=name)
1903
return self._vfs_initialize(a_bzrdir)
2120
1904
if response[0] != 'ok':
2121
1905
raise errors.UnexpectedSmartServerResponse(response)
2122
1906
# Turn the response into a RemoteRepository object.
2156
1940
return self._custom_format.supports_set_append_revisions_only()
2159
class RemoteBranch(branch.Branch, _RpcHelper, lock._RelockDebugMixin):
1943
class RemoteBranch(branch.Branch, _RpcHelper):
2160
1944
"""Branch stored on a server accessed by HPSS RPC.
2162
1946
At the moment most operations are mapped down to simple file operations.
2165
1949
def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
2166
_client=None, format=None, setup_stacking=True, name=None):
1950
_client=None, format=None, setup_stacking=True):
2167
1951
"""Create a RemoteBranch instance.
2169
1953
:param real_branch: An optional local implementation of the branch
2886
2652
'Missing key %r in context %r', key_err.args[0], context)
2889
if err.error_verb == 'IncompatibleRepositories':
2890
raise errors.IncompatibleRepositories(err.error_args[0],
2891
err.error_args[1], err.error_args[2])
2892
elif err.error_verb == 'NoSuchRevision':
2655
if err.error_verb == 'NoSuchRevision':
2893
2656
raise NoSuchRevision(find('branch'), err.error_args[0])
2894
2657
elif err.error_verb == 'nosuchrevision':
2895
2658
raise NoSuchRevision(find('repository'), err.error_args[0])
2896
elif err.error_verb == 'nobranch':
2897
if len(err.error_args) >= 1:
2898
extra = err.error_args[0]
2901
raise errors.NotBranchError(path=find('bzrdir').root_transport.base,
2659
elif err.error_tuple == ('nobranch',):
2660
raise errors.NotBranchError(path=find('bzrdir').root_transport.base)
2903
2661
elif err.error_verb == 'norepository':
2904
2662
raise errors.NoRepositoryPresent(find('bzrdir'))
2905
2663
elif err.error_verb == 'LockContention':