159
103
Used before calls to self._real_bzrdir.
161
105
if not self._real_bzrdir:
162
if 'hpssvfs' in debug.debug_flags:
164
warning('VFS BzrDir access triggered\n%s',
165
''.join(traceback.format_stack()))
166
106
self._real_bzrdir = BzrDir.open_from_transport(
167
107
self.root_transport, _server_formats=False)
168
self._format._network_name = \
169
self._real_bzrdir._format.network_name()
171
109
def _translate_error(self, err, **context):
172
110
_translate_error(err, bzrdir=self, **context)
174
def break_lock(self):
175
# Prevent aliasing problems in the next_open_branch_result cache.
176
# See create_branch for rationale.
177
self._next_open_branch_result = None
178
return BzrDir.break_lock(self)
180
def _vfs_cloning_metadir(self, require_stacking=False):
112
def cloning_metadir(self, stacked=False):
181
113
self._ensure_real()
182
return self._real_bzrdir.cloning_metadir(
183
require_stacking=require_stacking)
185
def cloning_metadir(self, require_stacking=False):
186
medium = self._client._medium
187
if medium._is_remote_before((1, 13)):
188
return self._vfs_cloning_metadir(require_stacking=require_stacking)
189
verb = 'BzrDir.cloning_metadir'
194
path = self._path_for_remote_call(self._client)
196
response = self._call(verb, path, stacking)
197
except errors.UnknownSmartMethod:
198
medium._remember_remote_is_before((1, 13))
199
return self._vfs_cloning_metadir(require_stacking=require_stacking)
200
except errors.UnknownErrorFromSmartServer, err:
201
if err.error_tuple != ('BranchReference',):
203
# We need to resolve the branch reference to determine the
204
# cloning_metadir. This causes unnecessary RPCs to open the
205
# referenced branch (and bzrdir, etc) but only when the caller
206
# didn't already resolve the branch reference.
207
referenced_branch = self.open_branch()
208
return referenced_branch.bzrdir.cloning_metadir()
209
if len(response) != 3:
210
raise errors.UnexpectedSmartServerResponse(response)
211
control_name, repo_name, branch_info = response
212
if len(branch_info) != 2:
213
raise errors.UnexpectedSmartServerResponse(response)
214
branch_ref, branch_name = branch_info
215
format = bzrdir.network_format_registry.get(control_name)
217
format.repository_format = repository.network_format_registry.get(
219
if branch_ref == 'ref':
220
# XXX: we need possible_transports here to avoid reopening the
221
# connection to the referenced location
222
ref_bzrdir = BzrDir.open(branch_name)
223
branch_format = ref_bzrdir.cloning_metadir().get_branch_format()
224
format.set_branch_format(branch_format)
225
elif branch_ref == 'branch':
227
format.set_branch_format(
228
branch.network_format_registry.get(branch_name))
230
raise errors.UnexpectedSmartServerResponse(response)
114
return self._real_bzrdir.cloning_metadir(stacked)
233
116
def create_repository(self, shared=False):
234
117
# as per meta1 formats - just delegate to the format object which may
283
155
def get_branch_reference(self):
284
156
"""See BzrDir.get_branch_reference()."""
285
response = self._get_branch_reference()
286
if response[0] == 'ref':
157
path = self._path_for_remote_call(self._client)
158
response = self._call('BzrDir.open_branch', path)
159
if response[0] == 'ok':
160
if response[1] == '':
161
# branch at this location.
164
# a branch reference, use the existing BranchReference logic.
291
def _get_branch_reference(self):
292
path = self._path_for_remote_call(self._client)
293
medium = self._client._medium
295
('BzrDir.open_branchV3', (2, 1)),
296
('BzrDir.open_branchV2', (1, 13)),
297
('BzrDir.open_branch', None),
299
for verb, required_version in candidate_calls:
300
if required_version and medium._is_remote_before(required_version):
303
response = self._call(verb, path)
304
except errors.UnknownSmartMethod:
305
if required_version is None:
307
medium._remember_remote_is_before(required_version)
310
if verb == 'BzrDir.open_branch':
311
if response[0] != 'ok':
312
raise errors.UnexpectedSmartServerResponse(response)
313
if response[1] != '':
314
return ('ref', response[1])
316
return ('branch', '')
317
if response[0] not in ('ref', 'branch'):
318
167
raise errors.UnexpectedSmartServerResponse(response)
321
169
def _get_tree_branch(self):
322
170
"""See BzrDir._get_tree_branch()."""
323
171
return None, self.open_branch()
325
def open_branch(self, name=None, unsupported=False,
326
ignore_fallbacks=False):
173
def open_branch(self, _unsupported=False):
328
175
raise NotImplementedError('unsupported flag support not implemented yet.')
329
if self._next_open_branch_result is not None:
330
# See create_branch for details.
331
result = self._next_open_branch_result
332
self._next_open_branch_result = None
334
response = self._get_branch_reference()
335
if response[0] == 'ref':
176
reference_url = self.get_branch_reference()
177
if reference_url is None:
178
# branch at this location.
179
return RemoteBranch(self, self.find_repository())
336
181
# a branch reference, use the existing BranchReference logic.
337
182
format = BranchReferenceFormat()
338
return format.open(self, name=name, _found=True,
339
location=response[1], ignore_fallbacks=ignore_fallbacks)
340
branch_format_name = response[1]
341
if not branch_format_name:
342
branch_format_name = None
343
format = RemoteBranchFormat(network_name=branch_format_name)
344
return RemoteBranch(self, self.find_repository(), format=format,
345
setup_stacking=not ignore_fallbacks, name=name)
347
def _open_repo_v1(self, path):
348
verb = 'BzrDir.find_repository'
349
response = self._call(verb, path)
350
if response[0] != 'ok':
351
raise errors.UnexpectedSmartServerResponse(response)
352
# servers that only support the v1 method don't support external
355
repo = self._real_bzrdir.open_repository()
356
response = response + ('no', repo._format.network_name())
357
return response, repo
359
def _open_repo_v2(self, path):
183
return format.open(self, _found=True, location=reference_url)
185
def open_repository(self):
186
path = self._path_for_remote_call(self._client)
360
187
verb = 'BzrDir.find_repositoryV2'
361
response = self._call(verb, path)
362
if response[0] != 'ok':
363
raise errors.UnexpectedSmartServerResponse(response)
365
repo = self._real_bzrdir.open_repository()
366
response = response + (repo._format.network_name(),)
367
return response, repo
369
def _open_repo_v3(self, path):
370
verb = 'BzrDir.find_repositoryV3'
371
medium = self._client._medium
372
if medium._is_remote_before((1, 13)):
373
raise errors.UnknownSmartMethod(verb)
375
189
response = self._call(verb, path)
376
190
except errors.UnknownSmartMethod:
377
medium._remember_remote_is_before((1, 13))
379
if response[0] != 'ok':
380
raise errors.UnexpectedSmartServerResponse(response)
381
return response, None
383
def open_repository(self):
384
path = self._path_for_remote_call(self._client)
386
for probe in [self._open_repo_v3, self._open_repo_v2,
389
response, real_repo = probe(path)
391
except errors.UnknownSmartMethod:
394
raise errors.UnknownSmartMethod('BzrDir.find_repository{3,2,}')
395
if response[0] != 'ok':
396
raise errors.UnexpectedSmartServerResponse(response)
397
if len(response) != 6:
191
verb = 'BzrDir.find_repository'
192
response = self._call(verb, path)
193
if response[0] != 'ok':
194
raise errors.UnexpectedSmartServerResponse(response)
195
if verb == 'BzrDir.find_repository':
196
# servers that don't support the V2 method don't support external
198
response = response + ('no', )
199
if not (len(response) == 5):
398
200
raise SmartProtocolError('incorrect response length %s' % (response,))
399
201
if response[1] == '':
400
# repo is at this dir.
401
format = response_tuple_to_repo_format(response[2:])
202
format = RemoteRepositoryFormat()
203
format.rich_root_data = (response[2] == 'yes')
204
format.supports_tree_reference = (response[3] == 'yes')
205
# No wire format to check this yet.
206
format.supports_external_lookups = (response[4] == 'yes')
402
207
# Used to support creating a real format instance when needed.
403
208
format._creating_bzrdir = self
404
209
remote_repo = RemoteRepository(self, format)
405
210
format._creating_repo = remote_repo
406
if real_repo is not None:
407
remote_repo._set_real_repository(real_repo)
408
211
return remote_repo
410
213
raise errors.NoRepositoryPresent(self)
412
def has_workingtree(self):
413
if self._has_working_tree is None:
415
self._has_working_tree = self._real_bzrdir.has_workingtree()
416
return self._has_working_tree
418
215
def open_workingtree(self, recommend_upgrade=True):
419
if self.has_workingtree():
217
if self._real_bzrdir.has_workingtree():
420
218
raise errors.NotLocalUrl(self.root_transport)
422
220
raise errors.NoWorkingTree(self.root_transport.base)
583
337
response = a_bzrdir._call(verb, path, network_name, shared_str)
584
338
except errors.UnknownSmartMethod:
585
339
# Fallback - use vfs methods
586
medium._remember_remote_is_before((1, 13))
587
340
return self._vfs_initialize(a_bzrdir, shared)
589
342
# Turn the response into a RemoteRepository object.
590
format = response_tuple_to_repo_format(response[1:])
343
format = RemoteRepositoryFormat()
344
format.rich_root_data = (response[1] == 'yes')
345
format.supports_tree_reference = (response[2] == 'yes')
346
format.supports_external_lookups = (response[3] == 'yes')
347
format._network_name = response[4]
591
348
# Used to support creating a real format instance when needed.
592
349
format._creating_bzrdir = a_bzrdir
593
350
remote_repo = RemoteRepository(a_bzrdir, format)
594
351
format._creating_repo = remote_repo
595
352
return remote_repo
597
354
def open(self, a_bzrdir):
598
355
if not isinstance(a_bzrdir, RemoteBzrDir):
599
356
raise AssertionError('%r is not a RemoteBzrDir' % (a_bzrdir,))
600
357
return a_bzrdir.open_repository()
602
def _ensure_real(self):
603
if self._custom_format is None:
604
self._custom_format = repository.network_format_registry.get(
608
def _fetch_order(self):
610
return self._custom_format._fetch_order
613
def _fetch_uses_deltas(self):
615
return self._custom_format._fetch_uses_deltas
618
def _fetch_reconcile(self):
620
return self._custom_format._fetch_reconcile
622
359
def get_format_description(self):
624
return 'Remote: ' + self._custom_format.get_format_description()
360
return 'bzr remote repository'
626
362
def __eq__(self, other):
627
return self.__class__ is other.__class__
363
return self.__class__ == other.__class__
365
def check_conversion_target(self, target_format):
366
if self.rich_root_data and not target_format.rich_root_data:
367
raise errors.BadConversionTarget(
368
'Does not support rich root data.', target_format)
369
if (self.supports_tree_reference and
370
not getattr(target_format, 'supports_tree_reference', False)):
371
raise errors.BadConversionTarget(
372
'Does not support nested trees', target_format)
629
374
def network_name(self):
630
375
if self._network_name:
744
455
self._ensure_real()
745
456
return self._real_repository.commit_write_group()
747
def resume_write_group(self, tokens):
749
return self._real_repository.resume_write_group(tokens)
751
def suspend_write_group(self):
753
return self._real_repository.suspend_write_group()
755
def get_missing_parent_inventories(self, check_for_missing_texts=True):
757
return self._real_repository.get_missing_parent_inventories(
758
check_for_missing_texts=check_for_missing_texts)
760
def _get_rev_id_for_revno_vfs(self, revno, known_pair):
762
return self._real_repository.get_rev_id_for_revno(
765
def get_rev_id_for_revno(self, revno, known_pair):
766
"""See Repository.get_rev_id_for_revno."""
767
path = self.bzrdir._path_for_remote_call(self._client)
769
if self._client._medium._is_remote_before((1, 17)):
770
return self._get_rev_id_for_revno_vfs(revno, known_pair)
771
response = self._call(
772
'Repository.get_rev_id_for_revno', path, revno, known_pair)
773
except errors.UnknownSmartMethod:
774
self._client._medium._remember_remote_is_before((1, 17))
775
return self._get_rev_id_for_revno_vfs(revno, known_pair)
776
if response[0] == 'ok':
777
return True, response[1]
778
elif response[0] == 'history-incomplete':
779
known_pair = response[1:3]
780
for fallback in self._fallback_repositories:
781
found, result = fallback.get_rev_id_for_revno(revno, known_pair)
786
# Not found in any fallbacks
787
return False, known_pair
789
raise errors.UnexpectedSmartServerResponse(response)
791
458
def _ensure_real(self):
792
459
"""Ensure that there is a _real_repository set.
794
461
Used before calls to self._real_repository.
796
Note that _ensure_real causes many roundtrips to the server which are
797
not desirable, and prevents the use of smart one-roundtrip RPC's to
798
perform complex operations (such as accessing parent data, streaming
799
revisions etc). Adding calls to _ensure_real should only be done when
800
bringing up new functionality, adding fallbacks for smart methods that
801
require a fallback path, and never to replace an existing smart method
802
invocation. If in doubt chat to the bzr network team.
804
463
if self._real_repository is None:
805
if 'hpssvfs' in debug.debug_flags:
807
warning('VFS Repository access triggered\n%s',
808
''.join(traceback.format_stack()))
809
self._unstacked_provider.missing_keys.clear()
810
464
self.bzrdir._ensure_real()
811
465
self._set_real_repository(
812
466
self.bzrdir._real_bzrdir.open_repository())
861
520
for line in lines:
862
521
d = tuple(line.split())
863
522
revision_graph[d[0]] = d[1:]
865
524
return revision_graph
868
"""See Repository._get_sink()."""
869
return RemoteStreamSink(self)
871
def _get_source(self, to_format):
872
"""Return a source for streaming from this repository."""
873
return RemoteStreamSource(self, to_format)
876
526
def has_revision(self, revision_id):
877
"""True if this repository has a copy of the revision."""
878
# Copy of bzrlib.repository.Repository.has_revision
879
return revision_id in self.has_revisions((revision_id,))
527
"""See Repository.has_revision()."""
528
if revision_id == NULL_REVISION:
529
# The null revision is always present.
531
path = self.bzrdir._path_for_remote_call(self._client)
532
response = self._call('Repository.has_revision', path, revision_id)
533
if response[0] not in ('yes', 'no'):
534
raise errors.UnexpectedSmartServerResponse(response)
535
if response[0] == 'yes':
537
for fallback_repo in self._fallback_repositories:
538
if fallback_repo.has_revision(revision_id):
882
542
def has_revisions(self, revision_ids):
883
"""Probe to find out the presence of multiple revisions.
885
:param revision_ids: An iterable of revision_ids.
886
:return: A set of the revision_ids that were present.
888
# Copy of bzrlib.repository.Repository.has_revisions
889
parent_map = self.get_parent_map(revision_ids)
890
result = set(parent_map)
891
if _mod_revision.NULL_REVISION in revision_ids:
892
result.add(_mod_revision.NULL_REVISION)
543
"""See Repository.has_revisions()."""
544
# FIXME: This does many roundtrips, particularly when there are
545
# fallback repositories. -- mbp 20080905
547
for revision_id in revision_ids:
548
if self.has_revision(revision_id):
549
result.add(revision_id)
895
def _has_same_fallbacks(self, other_repo):
896
"""Returns true if the repositories have the same fallbacks."""
897
# XXX: copied from Repository; it should be unified into a base class
898
# <https://bugs.edge.launchpad.net/bzr/+bug/401622>
899
my_fb = self._fallback_repositories
900
other_fb = other_repo._fallback_repositories
901
if len(my_fb) != len(other_fb):
903
for f, g in zip(my_fb, other_fb):
904
if not f.has_same_location(g):
908
552
def has_same_location(self, other):
909
# TODO: Move to RepositoryBase and unify with the regular Repository
910
# one; unfortunately the tests rely on slightly different behaviour at
911
# present -- mbp 20090710
912
return (self.__class__ is other.__class__ and
553
return (self.__class__ == other.__class__ and
913
554
self.bzrdir.transport.base == other.bzrdir.transport.base)
915
556
def get_graph(self, other_repository=None):
1227
815
def add_fallback_repository(self, repository):
1228
816
"""Add a repository to use for looking up data not held locally.
1230
818
:param repository: A repository.
1232
if not self._format.supports_external_lookups:
1233
raise errors.UnstackableRepositoryFormat(
1234
self._format.network_name(), self.base)
820
# XXX: At the moment the RemoteRepository will allow fallbacks
821
# unconditionally - however, a _real_repository will usually exist,
822
# and may raise an error if it's not accommodated by the underlying
823
# format. Eventually we should check when opening the repository
824
# whether it's willing to allow them or not.
1235
826
# We need to accumulate additional repositories here, to pass them in
1236
827
# on various RPC's.
1238
if self.is_locked():
1239
# We will call fallback.unlock() when we transition to the unlocked
1240
# state, so always add a lock here. If a caller passes us a locked
1241
# repository, they are responsible for unlocking it later.
1242
repository.lock_read()
1243
self._check_fallback_repository(repository)
1244
828
self._fallback_repositories.append(repository)
1245
# If self._real_repository was parameterised already (e.g. because a
1246
# _real_branch had its get_stacked_on_url method called), then the
1247
# repository to be added may already be in the _real_repositories list.
1248
if self._real_repository is not None:
1249
fallback_locations = [repo.user_url for repo in
1250
self._real_repository._fallback_repositories]
1251
if repository.user_url not in fallback_locations:
1252
self._real_repository.add_fallback_repository(repository)
1254
def _check_fallback_repository(self, repository):
1255
"""Check that this repository can fallback to repository safely.
1257
Raise an error if not.
1259
:param repository: A repository to fallback to.
1261
return _mod_repository.InterRepository._assert_same_model(
829
# They are also seen by the fallback repository. If it doesn't exist
830
# yet they'll be added then. This implicitly copies them.
1264
833
def add_inventory(self, revid, inv, parents):
1265
834
self._ensure_real()
1266
835
return self._real_repository.add_inventory(revid, inv, parents)
1268
837
def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1269
parents, basis_inv=None, propagate_caches=False):
1270
839
self._ensure_real()
1271
840
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)
841
delta, new_revision_id, parents)
1275
843
def add_revision(self, rev_id, rev, inv=None, config=None):
1276
844
self._ensure_real()
1343
897
return repository.InterRepository.get(
1344
898
other, self).search_missing_revision_ids(revision_id, find_ghosts)
1346
def fetch(self, source, revision_id=None, pb=None, find_ghosts=False,
1348
# No base implementation to use as RemoteRepository is not a subclass
1349
# of Repository; so this is a copy of Repository.fetch().
1350
if fetch_spec is not None and revision_id is not None:
1351
raise AssertionError(
1352
"fetch_spec and revision_id are mutually exclusive.")
1353
if self.is_in_write_group():
1354
raise errors.InternalBzrError(
1355
"May not fetch while in a write group.")
1356
# fast path same-url fetch operations
1357
if (self.has_same_location(source)
1358
and fetch_spec is None
1359
and self._has_same_fallbacks(source)):
900
def fetch(self, source, revision_id=None, pb=None, find_ghosts=False):
901
# Not delegated to _real_repository so that InterRepository.get has a
902
# chance to find an InterRepository specialised for RemoteRepository.
903
if self.has_same_location(source):
1360
904
# check that last_revision is in 'from' and then return a
1362
906
if (revision_id is not None and
1363
907
not revision.is_null(revision_id)):
1364
908
self.get_revision(revision_id)
1366
# if there is no specific appropriate InterRepository, this will get
1367
# the InterRepository base class, which raises an
1368
# IncompatibleRepositories when asked to fetch.
1369
910
inter = repository.InterRepository.get(source, self)
1370
return inter.fetch(revision_id=revision_id, pb=pb,
1371
find_ghosts=find_ghosts, fetch_spec=fetch_spec)
912
return inter.fetch(revision_id=revision_id, pb=pb, find_ghosts=find_ghosts)
913
except NotImplementedError:
914
raise errors.IncompatibleRepositories(source, self)
1373
916
def create_bundle(self, target, base, fileobj, format=None):
1374
917
self._ensure_real()
1764
1310
self._ensure_real()
1765
1311
self._real_repository._pack_collection.autopack()
1313
if self._real_repository is not None:
1314
# Reset the real repository's cache of pack names.
1315
# XXX: At some point we may be able to skip this and just rely on
1316
# the automatic retry logic to do the right thing, but for now we
1317
# err on the side of being correct rather than being optimal.
1318
self._real_repository._pack_collection.reload_pack_names()
1768
1319
if response[0] != 'ok':
1769
1320
raise errors.UnexpectedSmartServerResponse(response)
1772
class RemoteStreamSink(repository.StreamSink):
1774
def _insert_real(self, stream, src_format, resume_tokens):
1775
self.target_repo._ensure_real()
1776
sink = self.target_repo._real_repository._get_sink()
1777
result = sink.insert_stream(stream, src_format, resume_tokens)
1779
self.target_repo.autopack()
1782
def insert_stream(self, stream, src_format, resume_tokens):
1783
target = self.target_repo
1784
target._unstacked_provider.missing_keys.clear()
1785
candidate_calls = [('Repository.insert_stream_1.19', (1, 19))]
1786
if target._lock_token:
1787
candidate_calls.append(('Repository.insert_stream_locked', (1, 14)))
1788
lock_args = (target._lock_token or '',)
1790
candidate_calls.append(('Repository.insert_stream', (1, 13)))
1792
client = target._client
1793
medium = client._medium
1794
path = target.bzrdir._path_for_remote_call(client)
1795
# Probe for the verb to use with an empty stream before sending the
1796
# real stream to it. We do this both to avoid the risk of sending a
1797
# large request that is then rejected, and because we don't want to
1798
# implement a way to buffer, rewind, or restart the stream.
1800
for verb, required_version in candidate_calls:
1801
if medium._is_remote_before(required_version):
1804
# We've already done the probing (and set _is_remote_before) on
1805
# a previous insert.
1808
byte_stream = smart_repo._stream_to_byte_stream([], src_format)
1810
response = client.call_with_body_stream(
1811
(verb, path, '') + lock_args, byte_stream)
1812
except errors.UnknownSmartMethod:
1813
medium._remember_remote_is_before(required_version)
1819
return self._insert_real(stream, src_format, resume_tokens)
1820
self._last_inv_record = None
1821
self._last_substream = None
1822
if required_version < (1, 19):
1823
# Remote side doesn't support inventory deltas. Wrap the stream to
1824
# make sure we don't send any. If the stream contains inventory
1825
# deltas we'll interrupt the smart insert_stream request and
1827
stream = self._stop_stream_if_inventory_delta(stream)
1828
byte_stream = smart_repo._stream_to_byte_stream(
1830
resume_tokens = ' '.join(resume_tokens)
1831
response = client.call_with_body_stream(
1832
(verb, path, resume_tokens) + lock_args, byte_stream)
1833
if response[0][0] not in ('ok', 'missing-basis'):
1834
raise errors.UnexpectedSmartServerResponse(response)
1835
if self._last_substream is not None:
1836
# The stream included an inventory-delta record, but the remote
1837
# side isn't new enough to support them. So we need to send the
1838
# rest of the stream via VFS.
1839
self.target_repo.refresh_data()
1840
return self._resume_stream_with_vfs(response, src_format)
1841
if response[0][0] == 'missing-basis':
1842
tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1843
resume_tokens = tokens
1844
return resume_tokens, set(missing_keys)
1846
self.target_repo.refresh_data()
1849
def _resume_stream_with_vfs(self, response, src_format):
1850
"""Resume sending a stream via VFS, first resending the record and
1851
substream that couldn't be sent via an insert_stream verb.
1853
if response[0][0] == 'missing-basis':
1854
tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1855
# Ignore missing_keys, we haven't finished inserting yet
1858
def resume_substream():
1859
# Yield the substream that was interrupted.
1860
for record in self._last_substream:
1862
self._last_substream = None
1863
def resume_stream():
1864
# Finish sending the interrupted substream
1865
yield ('inventory-deltas', resume_substream())
1866
# Then simply continue sending the rest of the stream.
1867
for substream_kind, substream in self._last_stream:
1868
yield substream_kind, substream
1869
return self._insert_real(resume_stream(), src_format, tokens)
1871
def _stop_stream_if_inventory_delta(self, stream):
1872
"""Normally this just lets the original stream pass-through unchanged.
1874
However if any 'inventory-deltas' substream occurs it will stop
1875
streaming, and store the interrupted substream and stream in
1876
self._last_substream and self._last_stream so that the stream can be
1877
resumed by _resume_stream_with_vfs.
1880
stream_iter = iter(stream)
1881
for substream_kind, substream in stream_iter:
1882
if substream_kind == 'inventory-deltas':
1883
self._last_substream = substream
1884
self._last_stream = stream_iter
1887
yield substream_kind, substream
1890
class RemoteStreamSource(repository.StreamSource):
1891
"""Stream data from a remote server."""
1893
def get_stream(self, search):
1894
if (self.from_repository._fallback_repositories and
1895
self.to_format._fetch_order == 'topological'):
1896
return self._real_stream(self.from_repository, search)
1899
repos = [self.from_repository]
1905
repos.extend(repo._fallback_repositories)
1906
sources.append(repo)
1907
return self.missing_parents_chain(search, sources)
1909
def get_stream_for_missing_keys(self, missing_keys):
1910
self.from_repository._ensure_real()
1911
real_repo = self.from_repository._real_repository
1912
real_source = real_repo._get_source(self.to_format)
1913
return real_source.get_stream_for_missing_keys(missing_keys)
1915
def _real_stream(self, repo, search):
1916
"""Get a stream for search from repo.
1918
This never called RemoteStreamSource.get_stream, and is a heler
1919
for RemoteStreamSource._get_stream to allow getting a stream
1920
reliably whether fallback back because of old servers or trying
1921
to stream from a non-RemoteRepository (which the stacked support
1924
source = repo._get_source(self.to_format)
1925
if isinstance(source, RemoteStreamSource):
1927
source = repo._real_repository._get_source(self.to_format)
1928
return source.get_stream(search)
1930
def _get_stream(self, repo, search):
1931
"""Core worker to get a stream from repo for search.
1933
This is used by both get_stream and the stacking support logic. It
1934
deliberately gets a stream for repo which does not need to be
1935
self.from_repository. In the event that repo is not Remote, or
1936
cannot do a smart stream, a fallback is made to the generic
1937
repository._get_stream() interface, via self._real_stream.
1939
In the event of stacking, streams from _get_stream will not
1940
contain all the data for search - this is normal (see get_stream).
1942
:param repo: A repository.
1943
:param search: A search.
1945
# Fallbacks may be non-smart
1946
if not isinstance(repo, RemoteRepository):
1947
return self._real_stream(repo, search)
1948
client = repo._client
1949
medium = client._medium
1950
path = repo.bzrdir._path_for_remote_call(client)
1951
search_bytes = repo._serialise_search_result(search)
1952
args = (path, self.to_format.network_name())
1954
('Repository.get_stream_1.19', (1, 19)),
1955
('Repository.get_stream', (1, 13))]
1957
for verb, version in candidate_verbs:
1958
if medium._is_remote_before(version):
1961
response = repo._call_with_body_bytes_expecting_body(
1962
verb, args, search_bytes)
1963
except errors.UnknownSmartMethod:
1964
medium._remember_remote_is_before(version)
1966
response_tuple, response_handler = response
1970
return self._real_stream(repo, search)
1971
if response_tuple[0] != 'ok':
1972
raise errors.UnexpectedSmartServerResponse(response_tuple)
1973
byte_stream = response_handler.read_streamed_body()
1974
src_format, stream = smart_repo._byte_stream_to_stream(byte_stream)
1975
if src_format.network_name() != repo._format.network_name():
1976
raise AssertionError(
1977
"Mismatched RemoteRepository and stream src %r, %r" % (
1978
src_format.network_name(), repo._format.network_name()))
1981
def missing_parents_chain(self, search, sources):
1982
"""Chain multiple streams together to handle stacking.
1984
:param search: The overall search to satisfy with streams.
1985
:param sources: A list of Repository objects to query.
1987
self.from_serialiser = self.from_repository._format._serializer
1988
self.seen_revs = set()
1989
self.referenced_revs = set()
1990
# If there are heads in the search, or the key count is > 0, we are not
1992
while not search.is_empty() and len(sources) > 1:
1993
source = sources.pop(0)
1994
stream = self._get_stream(source, search)
1995
for kind, substream in stream:
1996
if kind != 'revisions':
1997
yield kind, substream
1999
yield kind, self.missing_parents_rev_handler(substream)
2000
search = search.refine(self.seen_revs, self.referenced_revs)
2001
self.seen_revs = set()
2002
self.referenced_revs = set()
2003
if not search.is_empty():
2004
for kind, stream in self._get_stream(sources[0], search):
2007
def missing_parents_rev_handler(self, substream):
2008
for content in substream:
2009
revision_bytes = content.get_bytes_as('fulltext')
2010
revision = self.from_serialiser.read_revision_from_string(
2012
self.seen_revs.add(content.key[-1])
2013
self.referenced_revs.update(revision.parent_ids)
2017
1323
class RemoteBranchLockableFiles(LockableFiles):
2018
1324
"""A 'LockableFiles' implementation that talks to a smart server.
2020
1326
This is not a public interface class.
2037
1343
class RemoteBranchFormat(branch.BranchFormat):
2039
def __init__(self, network_name=None):
2040
1346
super(RemoteBranchFormat, self).__init__()
2041
1347
self._matchingbzrdir = RemoteBzrDirFormat()
2042
1348
self._matchingbzrdir.set_branch_format(self)
2043
self._custom_format = None
2044
self._network_name = network_name
2046
1350
def __eq__(self, other):
2047
return (isinstance(other, RemoteBranchFormat) and
1351
return (isinstance(other, RemoteBranchFormat) and
2048
1352
self.__dict__ == other.__dict__)
2050
def _ensure_real(self):
2051
if self._custom_format is None:
2052
self._custom_format = branch.network_format_registry.get(
2055
1354
def get_format_description(self):
2057
return 'Remote: ' + self._custom_format.get_format_description()
2059
def network_name(self):
2060
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)
2066
def _vfs_initialize(self, a_bzrdir, name):
2067
# Initialisation when using a local bzrdir object, or a non-vfs init
2068
# method is not available on the server.
2069
# self._custom_format is always set - the start of initialize ensures
2071
if isinstance(a_bzrdir, RemoteBzrDir):
1355
return 'Remote BZR Branch'
1357
def get_format_string(self):
1358
return 'Remote BZR Branch'
1360
def open(self, a_bzrdir):
1361
return a_bzrdir.open_branch()
1363
def initialize(self, a_bzrdir):
1364
# Delegate to a _real object here - the RemoteBzrDir format now
1365
# supports delegating to parameterised branch formats and as such
1366
# this RemoteBranchFormat method is only called when no specific format
1368
if not isinstance(a_bzrdir, RemoteBzrDir):
1369
result = a_bzrdir.create_branch()
2072
1371
a_bzrdir._ensure_real()
2073
result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
2076
# We assume the bzrdir is parameterised; it may not be.
2077
result = self._custom_format.initialize(a_bzrdir, name)
2078
if (isinstance(a_bzrdir, RemoteBzrDir) and
2079
not isinstance(result, RemoteBranch)):
2080
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
1372
result = a_bzrdir._real_bzrdir.create_branch()
1373
if not isinstance(result, RemoteBranch):
1374
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
2084
def initialize(self, a_bzrdir, name=None):
2085
# 1) get the network name to use.
2086
if self._custom_format:
2087
network_name = self._custom_format.network_name()
2089
# Select the current bzrlib default and ask for that.
2090
reference_bzrdir_format = bzrdir.format_registry.get('default')()
2091
reference_format = reference_bzrdir_format.get_branch_format()
2092
self._custom_format = reference_format
2093
network_name = reference_format.network_name()
2094
# Being asked to create on a non RemoteBzrDir:
2095
if not isinstance(a_bzrdir, RemoteBzrDir):
2096
return self._vfs_initialize(a_bzrdir, name=name)
2097
medium = a_bzrdir._client._medium
2098
if medium._is_remote_before((1, 13)):
2099
return self._vfs_initialize(a_bzrdir, name=name)
2100
# Creating on a remote bzr dir.
2101
# 2) try direct creation via RPC
2102
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
verb = 'BzrDir.create_branch'
2108
response = a_bzrdir._call(verb, path, network_name)
2109
except errors.UnknownSmartMethod:
2110
# Fallback - use vfs methods
2111
medium._remember_remote_is_before((1, 13))
2112
return self._vfs_initialize(a_bzrdir, name=name)
2113
if response[0] != 'ok':
2114
raise errors.UnexpectedSmartServerResponse(response)
2115
# Turn the response into a RemoteRepository object.
2116
format = RemoteBranchFormat(network_name=response[1])
2117
repo_format = response_tuple_to_repo_format(response[3:])
2118
if response[2] == '':
2119
repo_bzrdir = a_bzrdir
2121
repo_bzrdir = RemoteBzrDir(
2122
a_bzrdir.root_transport.clone(response[2]), a_bzrdir._format,
2124
remote_repo = RemoteRepository(repo_bzrdir, repo_format)
2125
remote_branch = RemoteBranch(a_bzrdir, remote_repo,
2126
format=format, setup_stacking=False, name=name)
2127
# XXX: We know this is a new branch, so it must have revno 0, revid
2128
# NULL_REVISION. Creating the branch locked would make this be unable
2129
# to be wrong; here its simply very unlikely to be wrong. RBC 20090225
2130
remote_branch._last_revision_info_cache = 0, NULL_REVISION
2131
return remote_branch
2133
def make_tags(self, branch):
2135
return self._custom_format.make_tags(branch)
2137
1377
def supports_tags(self):
2138
1378
# Remote branches might support tags, but we won't know until we
2139
1379
# access the real remote branch.
2141
return self._custom_format.supports_tags()
2143
def supports_stacking(self):
2145
return self._custom_format.supports_stacking()
2147
def supports_set_append_revisions_only(self):
2149
return self._custom_format.supports_set_append_revisions_only()
2152
class RemoteBranch(branch.Branch, _RpcHelper, lock._RelockDebugMixin):
1383
class RemoteBranch(branch.Branch, _RpcHelper):
2153
1384
"""Branch stored on a server accessed by HPSS RPC.
2155
1386
At the moment most operations are mapped down to simple file operations.
2158
1389
def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
2159
_client=None, format=None, setup_stacking=True, name=None):
2160
1391
"""Create a RemoteBranch instance.
2162
1393
:param real_branch: An optional local implementation of the branch
2163
1394
format, usually accessing the data via the VFS.
2164
1395
:param _client: Private parameter for testing.
2165
:param format: A RemoteBranchFormat object, None to create one
2166
automatically. If supplied it should have a network_name already
2168
:param setup_stacking: If True make an RPC call to determine the
2169
stacked (or not) status of the branch. If False assume the branch
2171
:param name: Colocated branch name
2173
1397
# We intentionally don't call the parent class's __init__, because it
2174
1398
# will try to assign to self.tags, which is a property in this subclass.
2175
1399
# And the parent's __init__ doesn't do much anyway.
1400
self._revision_id_to_revno_cache = None
1401
self._partial_revision_id_to_revno_cache = {}
1402
self._revision_history_cache = None
1403
self._last_revision_info_cache = None
1404
self._merge_sorted_revisions_cache = None
2176
1405
self.bzrdir = remote_bzrdir
2177
1406
if _client is not None:
2178
1407
self._client = _client
2603
1747
hook(self, rev_history)
2604
1748
self._cache_revision_history(rev_history)
1750
def get_parent(self):
1752
return self._real_branch.get_parent()
2606
1754
def _get_parent_location(self):
2607
medium = self._client._medium
2608
if medium._is_remote_before((1, 13)):
2609
return self._vfs_get_parent_location()
2611
response = self._call('Branch.get_parent', self._remote_path())
2612
except errors.UnknownSmartMethod:
2613
medium._remember_remote_is_before((1, 13))
2614
return self._vfs_get_parent_location()
2615
if len(response) != 1:
2616
raise errors.UnexpectedSmartServerResponse(response)
2617
parent_location = response[0]
2618
if parent_location == '':
2620
return parent_location
2622
def _vfs_get_parent_location(self):
1755
# Used by tests, when checking normalisation of given vs stored paths.
2623
1756
self._ensure_real()
2624
1757
return self._real_branch._get_parent_location()
1759
def set_parent(self, url):
1761
return self._real_branch.set_parent(url)
2626
1763
def _set_parent_location(self, url):
2627
medium = self._client._medium
2628
if medium._is_remote_before((1, 15)):
2629
return self._vfs_set_parent_location(url)
2631
call_url = url or ''
2632
if type(call_url) is not str:
2633
raise AssertionError('url must be a str or None (%s)' % url)
2634
response = self._call('Branch.set_parent_location',
2635
self._remote_path(), self._lock_token, self._repo_lock_token,
2637
except errors.UnknownSmartMethod:
2638
medium._remember_remote_is_before((1, 15))
2639
return self._vfs_set_parent_location(url)
2641
raise errors.UnexpectedSmartServerResponse(response)
1764
# Used by tests, to poke bad urls into branch configurations
1766
self.set_parent(url)
1769
return self._real_branch._set_parent_location(url)
1771
def set_stacked_on_url(self, stacked_location):
1772
"""Set the URL this branch is stacked against.
2643
def _vfs_set_parent_location(self, url):
1774
:raises UnstackableBranchFormat: If the branch does not support
1776
:raises UnstackableRepositoryFormat: If the repository does not support
2644
1779
self._ensure_real()
2645
return self._real_branch._set_parent_location(url)
1780
return self._real_branch.set_stacked_on_url(stacked_location)
1782
def sprout(self, to_bzrdir, revision_id=None):
1783
branch_format = to_bzrdir._format._branch_format
1784
if (branch_format is None or
1785
isinstance(branch_format, RemoteBranchFormat)):
1786
# The to_bzrdir specifies RemoteBranchFormat (or no format, which
1787
# implies the same thing), but RemoteBranches can't be created at
1788
# arbitrary URLs. So create a branch in the same format as
1789
# _real_branch instead.
1790
# XXX: if to_bzrdir is a RemoteBzrDir, this should perhaps do
1791
# to_bzrdir.create_branch to create a RemoteBranch after all...
1793
result = self._real_branch._format.initialize(to_bzrdir)
1794
self.copy_content_into(result, revision_id=revision_id)
1795
result.set_parent(self.bzrdir.root_transport.base)
1797
result = branch.Branch.sprout(
1798
self, to_bzrdir, revision_id=revision_id)
2647
1801
@needs_write_lock
2648
1802
def pull(self, source, overwrite=False, stop_revision=None,
2711
1865
self.set_revision_history(self._lefthand_history(revision_id,
2712
1866
last_rev=last_rev,other_branch=other_branch))
1871
return self._real_branch.tags
2714
1873
def set_push_location(self, location):
2715
1874
self._ensure_real()
2716
1875
return self._real_branch.set_push_location(location)
2719
class RemoteConfig(object):
2720
"""A Config that reads and writes from smart verbs.
2722
It is a low-level object that considers config data to be name/value pairs
2723
that may be associated with a section. Assigning meaning to the these
2724
values is done at higher levels like bzrlib.config.TreeConfig.
2727
def get_option(self, name, section=None, default=None):
2728
"""Return the value associated with a named option.
2730
:param name: The name of the value
2731
:param section: The section the option is in (if any)
2732
:param default: The value to return if the value is not set
2733
:return: The value or default value
1878
def update_revisions(self, other, stop_revision=None, overwrite=False,
1880
"""See Branch.update_revisions."""
2736
configobj = self._get_configobj()
2738
section_obj = configobj
1883
if stop_revision is None:
1884
stop_revision = other.last_revision()
1885
if revision.is_null(stop_revision):
1886
# if there are no commits, we're done.
1888
self.fetch(other, stop_revision)
1891
# Just unconditionally set the new revision. We don't care if
1892
# the branches have diverged.
1893
self._set_last_revision(stop_revision)
2741
section_obj = configobj[section]
2744
return section_obj.get(name, default)
2745
except errors.UnknownSmartMethod:
2746
return self._vfs_get_option(name, section, default)
2748
def _response_to_configobj(self, response):
2749
if len(response[0]) and response[0][0] != 'ok':
2750
raise errors.UnexpectedSmartServerResponse(response)
2751
lines = response[1].read_body_bytes().splitlines()
2752
return config.ConfigObj(lines, encoding='utf-8')
2755
class RemoteBranchConfig(RemoteConfig):
2756
"""A RemoteConfig for Branches."""
2758
def __init__(self, branch):
2759
self._branch = branch
2761
def _get_configobj(self):
2762
path = self._branch._remote_path()
2763
response = self._branch._client.call_expecting_body(
2764
'Branch.get_config_file', path)
2765
return self._response_to_configobj(response)
2767
def set_option(self, value, name, section=None):
2768
"""Set the value associated with a named option.
2770
:param value: The value to set
2771
:param name: The name of the value to set
2772
:param section: The section the option is in (if any)
2774
medium = self._branch._client._medium
2775
if medium._is_remote_before((1, 14)):
2776
return self._vfs_set_option(value, name, section)
2778
path = self._branch._remote_path()
2779
response = self._branch._client.call('Branch.set_config_option',
2780
path, self._branch._lock_token, self._branch._repo_lock_token,
2781
value.encode('utf8'), name, section or '')
2782
except errors.UnknownSmartMethod:
2783
medium._remember_remote_is_before((1, 14))
2784
return self._vfs_set_option(value, name, section)
2786
raise errors.UnexpectedSmartServerResponse(response)
2788
def _real_object(self):
2789
self._branch._ensure_real()
2790
return self._branch._real_branch
2792
def _vfs_set_option(self, value, name, section=None):
2793
return self._real_object()._get_config().set_option(
2794
value, name, section)
2797
class RemoteBzrDirConfig(RemoteConfig):
2798
"""A RemoteConfig for BzrDirs."""
2800
def __init__(self, bzrdir):
2801
self._bzrdir = bzrdir
2803
def _get_configobj(self):
2804
medium = self._bzrdir._client._medium
2805
verb = 'BzrDir.get_config_file'
2806
if medium._is_remote_before((1, 15)):
2807
raise errors.UnknownSmartMethod(verb)
2808
path = self._bzrdir._path_for_remote_call(self._bzrdir._client)
2809
response = self._bzrdir._call_expecting_body(
2811
return self._response_to_configobj(response)
2813
def _vfs_get_option(self, name, section, default):
2814
return self._real_object()._get_config().get_option(
2815
name, section, default)
2817
def set_option(self, value, name, section=None):
2818
"""Set the value associated with a named option.
2820
:param value: The value to set
2821
:param name: The name of the value to set
2822
:param section: The section the option is in (if any)
2824
return self._real_object()._get_config().set_option(
2825
value, name, section)
2827
def _real_object(self):
2828
self._bzrdir._ensure_real()
2829
return self._bzrdir._real_bzrdir
1895
medium = self._client._medium
1896
if not medium._is_remote_before((1, 6)):
1898
self._set_last_revision_descendant(stop_revision, other)
1900
except errors.UnknownSmartMethod:
1901
medium._remember_remote_is_before((1, 6))
1902
# Fallback for pre-1.6 servers: check for divergence
1903
# client-side, then do _set_last_revision.
1904
last_rev = revision.ensure_null(self.last_revision())
1906
graph = self.repository.get_graph()
1907
if self._check_if_descendant_or_diverged(
1908
stop_revision, last_rev, graph, other):
1909
# stop_revision is a descendant of last_rev, but we aren't
1910
# overwriting, so we're done.
1912
self._set_last_revision(stop_revision)
2833
1917
def _extract_tar(tar, to_dir):
added
removed
bzrlib/remote.py
