65
72
method, args, body_bytes)
66
73
except errors.ErrorFromSmartServer, err:
67
74
self._translate_error(err, **err_context)
77
def response_tuple_to_repo_format(response):
78
"""Convert a response tuple describing a repository format to a format."""
79
format = RemoteRepositoryFormat()
80
format._rich_root_data = (response[0] == 'yes')
81
format._supports_tree_reference = (response[1] == 'yes')
82
format._supports_external_lookups = (response[2] == 'yes')
83
format._network_name = response[3]
69
87
# Note: RemoteBzrDirFormat is in bzrdir.py
71
89
class RemoteBzrDir(BzrDir, _RpcHelper):
72
90
"""Control directory on a remote server, accessed via bzr:// or similar."""
74
def __init__(self, transport, _client=None):
92
def __init__(self, transport, format, _client=None, _force_probe=False):
75
93
"""Construct a RemoteBzrDir.
77
95
:param _client: Private parameter for testing. Disables probing and the
78
96
use of a real bzrdir.
80
BzrDir.__init__(self, transport, RemoteBzrDirFormat())
98
BzrDir.__init__(self, transport, format)
81
99
# this object holds a delegated bzrdir that uses file-level operations
82
100
# to talk to the other side
83
101
self._real_bzrdir = None
102
self._has_working_tree = None
103
# 1-shot cache for the call pattern 'create_branch; open_branch' - see
104
# create_branch for details.
105
self._next_open_branch_result = None
85
107
if _client is None:
86
108
medium = transport.get_smart_medium()
87
109
self._client = client._SmartClient(medium)
89
111
self._client = _client
117
def _probe_bzrdir(self):
118
medium = self._client._medium
92
119
path = self._path_for_remote_call(self._client)
120
if medium._is_remote_before((2, 1)):
124
self._rpc_open_2_1(path)
126
except errors.UnknownSmartMethod:
127
medium._remember_remote_is_before((2, 1))
130
def _rpc_open_2_1(self, path):
131
response = self._call('BzrDir.open_2.1', path)
132
if response == ('no',):
133
raise errors.NotBranchError(path=self.root_transport.base)
134
elif response[0] == 'yes':
135
if response[1] == 'yes':
136
self._has_working_tree = True
137
elif response[1] == 'no':
138
self._has_working_tree = False
140
raise errors.UnexpectedSmartServerResponse(response)
142
raise errors.UnexpectedSmartServerResponse(response)
144
def _rpc_open(self, path):
93
145
response = self._call('BzrDir.open', path)
94
146
if response not in [('yes',), ('no',)]:
95
147
raise errors.UnexpectedSmartServerResponse(response)
96
148
if response == ('no',):
97
raise errors.NotBranchError(path=transport.base)
149
raise errors.NotBranchError(path=self.root_transport.base)
99
151
def _ensure_real(self):
100
152
"""Ensure that there is a _real_bzrdir set.
102
154
Used before calls to self._real_bzrdir.
104
156
if not self._real_bzrdir:
157
if 'hpssvfs' in debug.debug_flags:
159
warning('VFS BzrDir access triggered\n%s',
160
''.join(traceback.format_stack()))
105
161
self._real_bzrdir = BzrDir.open_from_transport(
106
162
self.root_transport, _server_formats=False)
163
self._format._network_name = \
164
self._real_bzrdir._format.network_name()
108
166
def _translate_error(self, err, **context):
109
167
_translate_error(err, bzrdir=self, **context)
111
def cloning_metadir(self, stacked=False):
169
def break_lock(self):
170
# Prevent aliasing problems in the next_open_branch_result cache.
171
# See create_branch for rationale.
172
self._next_open_branch_result = None
173
return BzrDir.break_lock(self)
175
def _vfs_cloning_metadir(self, require_stacking=False):
112
176
self._ensure_real()
113
return self._real_bzrdir.cloning_metadir(stacked)
177
return self._real_bzrdir.cloning_metadir(
178
require_stacking=require_stacking)
180
def cloning_metadir(self, require_stacking=False):
181
medium = self._client._medium
182
if medium._is_remote_before((1, 13)):
183
return self._vfs_cloning_metadir(require_stacking=require_stacking)
184
verb = 'BzrDir.cloning_metadir'
189
path = self._path_for_remote_call(self._client)
191
response = self._call(verb, path, stacking)
192
except errors.UnknownSmartMethod:
193
medium._remember_remote_is_before((1, 13))
194
return self._vfs_cloning_metadir(require_stacking=require_stacking)
195
except errors.UnknownErrorFromSmartServer, err:
196
if err.error_tuple != ('BranchReference',):
198
# We need to resolve the branch reference to determine the
199
# cloning_metadir. This causes unnecessary RPCs to open the
200
# referenced branch (and bzrdir, etc) but only when the caller
201
# didn't already resolve the branch reference.
202
referenced_branch = self.open_branch()
203
return referenced_branch.bzrdir.cloning_metadir()
204
if len(response) != 3:
205
raise errors.UnexpectedSmartServerResponse(response)
206
control_name, repo_name, branch_info = response
207
if len(branch_info) != 2:
208
raise errors.UnexpectedSmartServerResponse(response)
209
branch_ref, branch_name = branch_info
210
format = bzrdir.network_format_registry.get(control_name)
212
format.repository_format = repository.network_format_registry.get(
214
if branch_ref == 'ref':
215
# XXX: we need possible_transports here to avoid reopening the
216
# connection to the referenced location
217
ref_bzrdir = BzrDir.open(branch_name)
218
branch_format = ref_bzrdir.cloning_metadir().get_branch_format()
219
format.set_branch_format(branch_format)
220
elif branch_ref == 'branch':
222
format.set_branch_format(
223
branch.network_format_registry.get(branch_name))
225
raise errors.UnexpectedSmartServerResponse(response)
115
228
def create_repository(self, shared=False):
117
self._real_bzrdir.create_repository(shared=shared)
118
return self.open_repository()
229
# as per meta1 formats - just delegate to the format object which may
231
result = self._format.repository_format.initialize(self, shared)
232
if not isinstance(result, RemoteRepository):
233
return self.open_repository()
120
237
def destroy_repository(self):
121
238
"""See BzrDir.destroy_repository"""
146
276
def get_branch_reference(self):
147
277
"""See BzrDir.get_branch_reference()."""
278
response = self._get_branch_reference()
279
if response[0] == 'ref':
284
def _get_branch_reference(self):
148
285
path = self._path_for_remote_call(self._client)
286
medium = self._client._medium
287
if not medium._is_remote_before((1, 13)):
289
response = self._call('BzrDir.open_branchV2', path)
290
if response[0] not in ('ref', 'branch'):
291
raise errors.UnexpectedSmartServerResponse(response)
293
except errors.UnknownSmartMethod:
294
medium._remember_remote_is_before((1, 13))
149
295
response = self._call('BzrDir.open_branch', path)
150
if response[0] == 'ok':
151
if response[1] == '':
152
# branch at this location.
155
# a branch reference, use the existing BranchReference logic.
296
if response[0] != 'ok':
297
raise errors.UnexpectedSmartServerResponse(response)
298
if response[1] != '':
299
return ('ref', response[1])
158
raise errors.UnexpectedSmartServerResponse(response)
301
return ('branch', '')
160
303
def _get_tree_branch(self):
161
304
"""See BzrDir._get_tree_branch()."""
162
305
return None, self.open_branch()
164
def open_branch(self, _unsupported=False):
307
def open_branch(self, _unsupported=False, ignore_fallbacks=False):
166
309
raise NotImplementedError('unsupported flag support not implemented yet.')
167
reference_url = self.get_branch_reference()
168
if reference_url is None:
169
# branch at this location.
170
return RemoteBranch(self, self.find_repository())
310
if self._next_open_branch_result is not None:
311
# See create_branch for details.
312
result = self._next_open_branch_result
313
self._next_open_branch_result = None
315
response = self._get_branch_reference()
316
if response[0] == 'ref':
172
317
# a branch reference, use the existing BranchReference logic.
173
318
format = BranchReferenceFormat()
174
return format.open(self, _found=True, location=reference_url)
319
return format.open(self, _found=True, location=response[1],
320
ignore_fallbacks=ignore_fallbacks)
321
branch_format_name = response[1]
322
if not branch_format_name:
323
branch_format_name = None
324
format = RemoteBranchFormat(network_name=branch_format_name)
325
return RemoteBranch(self, self.find_repository(), format=format,
326
setup_stacking=not ignore_fallbacks)
328
def _open_repo_v1(self, path):
329
verb = 'BzrDir.find_repository'
330
response = self._call(verb, path)
331
if response[0] != 'ok':
332
raise errors.UnexpectedSmartServerResponse(response)
333
# servers that only support the v1 method don't support external
336
repo = self._real_bzrdir.open_repository()
337
response = response + ('no', repo._format.network_name())
338
return response, repo
340
def _open_repo_v2(self, path):
341
verb = 'BzrDir.find_repositoryV2'
342
response = self._call(verb, path)
343
if response[0] != 'ok':
344
raise errors.UnexpectedSmartServerResponse(response)
346
repo = self._real_bzrdir.open_repository()
347
response = response + (repo._format.network_name(),)
348
return response, repo
350
def _open_repo_v3(self, path):
351
verb = 'BzrDir.find_repositoryV3'
352
medium = self._client._medium
353
if medium._is_remote_before((1, 13)):
354
raise errors.UnknownSmartMethod(verb)
356
response = self._call(verb, path)
357
except errors.UnknownSmartMethod:
358
medium._remember_remote_is_before((1, 13))
360
if response[0] != 'ok':
361
raise errors.UnexpectedSmartServerResponse(response)
362
return response, None
176
364
def open_repository(self):
177
365
path = self._path_for_remote_call(self._client)
178
verb = 'BzrDir.find_repositoryV2'
180
response = self._call(verb, path)
181
except errors.UnknownSmartMethod:
182
verb = 'BzrDir.find_repository'
183
response = self._call(verb, path)
367
for probe in [self._open_repo_v3, self._open_repo_v2,
370
response, real_repo = probe(path)
372
except errors.UnknownSmartMethod:
375
raise errors.UnknownSmartMethod('BzrDir.find_repository{3,2,}')
184
376
if response[0] != 'ok':
185
377
raise errors.UnexpectedSmartServerResponse(response)
186
if verb == 'BzrDir.find_repository':
187
# servers that don't support the V2 method don't support external
189
response = response + ('no', )
190
if not (len(response) == 5):
378
if len(response) != 6:
191
379
raise SmartProtocolError('incorrect response length %s' % (response,))
192
380
if response[1] == '':
193
format = RemoteRepositoryFormat()
194
format.rich_root_data = (response[2] == 'yes')
195
format.supports_tree_reference = (response[3] == 'yes')
196
# No wire format to check this yet.
197
format.supports_external_lookups = (response[4] == 'yes')
381
# repo is at this dir.
382
format = response_tuple_to_repo_format(response[2:])
198
383
# Used to support creating a real format instance when needed.
199
384
format._creating_bzrdir = self
200
return RemoteRepository(self, format)
385
remote_repo = RemoteRepository(self, format)
386
format._creating_repo = remote_repo
387
if real_repo is not None:
388
remote_repo._set_real_repository(real_repo)
202
391
raise errors.NoRepositoryPresent(self)
393
def has_workingtree(self):
394
if self._has_working_tree is None:
396
self._has_working_tree = self._real_bzrdir.has_workingtree()
397
return self._has_working_tree
204
399
def open_workingtree(self, recommend_upgrade=True):
206
if self._real_bzrdir.has_workingtree():
400
if self.has_workingtree():
207
401
raise errors.NotLocalUrl(self.root_transport)
209
403
raise errors.NoWorkingTree(self.root_transport.base)
257
450
the attributes rich_root_data and supports_tree_reference are set
258
451
on a per instance basis, and are not set (and should not be) at
454
:ivar _custom_format: If set, a specific concrete repository format that
455
will be used when initializing a repository with this
456
RemoteRepositoryFormat.
457
:ivar _creating_repo: If set, the repository object that this
458
RemoteRepositoryFormat was created for: it can be called into
459
to obtain data like the network name.
262
462
_matchingbzrdir = RemoteBzrDirFormat()
264
def initialize(self, a_bzrdir, shared=False):
265
if not isinstance(a_bzrdir, RemoteBzrDir):
465
repository.RepositoryFormat.__init__(self)
466
self._custom_format = None
467
self._network_name = None
468
self._creating_bzrdir = None
469
self._supports_chks = None
470
self._supports_external_lookups = None
471
self._supports_tree_reference = None
472
self._rich_root_data = None
475
return "%s(_network_name=%r)" % (self.__class__.__name__,
479
def fast_deltas(self):
481
return self._custom_format.fast_deltas
484
def rich_root_data(self):
485
if self._rich_root_data is None:
487
self._rich_root_data = self._custom_format.rich_root_data
488
return self._rich_root_data
491
def supports_chks(self):
492
if self._supports_chks is None:
494
self._supports_chks = self._custom_format.supports_chks
495
return self._supports_chks
498
def supports_external_lookups(self):
499
if self._supports_external_lookups is None:
501
self._supports_external_lookups = \
502
self._custom_format.supports_external_lookups
503
return self._supports_external_lookups
506
def supports_tree_reference(self):
507
if self._supports_tree_reference is None:
509
self._supports_tree_reference = \
510
self._custom_format.supports_tree_reference
511
return self._supports_tree_reference
513
def _vfs_initialize(self, a_bzrdir, shared):
514
"""Helper for common code in initialize."""
515
if self._custom_format:
516
# Custom format requested
517
result = self._custom_format.initialize(a_bzrdir, shared=shared)
518
elif self._creating_bzrdir is not None:
519
# Use the format that the repository we were created to back
266
521
prior_repo = self._creating_bzrdir.open_repository()
267
522
prior_repo._ensure_real()
268
return prior_repo._real_repository._format.initialize(
523
result = prior_repo._real_repository._format.initialize(
269
524
a_bzrdir, shared=shared)
270
return a_bzrdir.create_repository(shared=shared)
526
# assume that a_bzr is a RemoteBzrDir but the smart server didn't
527
# support remote initialization.
528
# We delegate to a real object at this point (as RemoteBzrDir
529
# delegate to the repository format which would lead to infinite
530
# recursion if we just called a_bzrdir.create_repository.
531
a_bzrdir._ensure_real()
532
result = a_bzrdir._real_bzrdir.create_repository(shared=shared)
533
if not isinstance(result, RemoteRepository):
534
return self.open(a_bzrdir)
538
def initialize(self, a_bzrdir, shared=False):
539
# Being asked to create on a non RemoteBzrDir:
540
if not isinstance(a_bzrdir, RemoteBzrDir):
541
return self._vfs_initialize(a_bzrdir, shared)
542
medium = a_bzrdir._client._medium
543
if medium._is_remote_before((1, 13)):
544
return self._vfs_initialize(a_bzrdir, shared)
545
# Creating on a remote bzr dir.
546
# 1) get the network name to use.
547
if self._custom_format:
548
network_name = self._custom_format.network_name()
549
elif self._network_name:
550
network_name = self._network_name
552
# Select the current bzrlib default and ask for that.
553
reference_bzrdir_format = bzrdir.format_registry.get('default')()
554
reference_format = reference_bzrdir_format.repository_format
555
network_name = reference_format.network_name()
556
# 2) try direct creation via RPC
557
path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
558
verb = 'BzrDir.create_repository'
564
response = a_bzrdir._call(verb, path, network_name, shared_str)
565
except errors.UnknownSmartMethod:
566
# Fallback - use vfs methods
567
medium._remember_remote_is_before((1, 13))
568
return self._vfs_initialize(a_bzrdir, shared)
570
# Turn the response into a RemoteRepository object.
571
format = response_tuple_to_repo_format(response[1:])
572
# Used to support creating a real format instance when needed.
573
format._creating_bzrdir = a_bzrdir
574
remote_repo = RemoteRepository(a_bzrdir, format)
575
format._creating_repo = remote_repo
272
578
def open(self, a_bzrdir):
273
579
if not isinstance(a_bzrdir, RemoteBzrDir):
274
580
raise AssertionError('%r is not a RemoteBzrDir' % (a_bzrdir,))
275
581
return a_bzrdir.open_repository()
583
def _ensure_real(self):
584
if self._custom_format is None:
585
self._custom_format = repository.network_format_registry.get(
589
def _fetch_order(self):
591
return self._custom_format._fetch_order
594
def _fetch_uses_deltas(self):
596
return self._custom_format._fetch_uses_deltas
599
def _fetch_reconcile(self):
601
return self._custom_format._fetch_reconcile
277
603
def get_format_description(self):
278
return 'bzr remote repository'
605
return 'Remote: ' + self._custom_format.get_format_description()
280
607
def __eq__(self, other):
281
return self.__class__ == other.__class__
283
def check_conversion_target(self, target_format):
284
if self.rich_root_data and not target_format.rich_root_data:
285
raise errors.BadConversionTarget(
286
'Does not support rich root data.', target_format)
287
if (self.supports_tree_reference and
288
not getattr(target_format, 'supports_tree_reference', False)):
289
raise errors.BadConversionTarget(
290
'Does not support nested trees', target_format)
293
class RemoteRepository(_RpcHelper):
608
return self.__class__ is other.__class__
610
def network_name(self):
611
if self._network_name:
612
return self._network_name
613
self._creating_repo._ensure_real()
614
return self._creating_repo._real_repository._format.network_name()
617
def pack_compresses(self):
619
return self._custom_format.pack_compresses
622
def _serializer(self):
624
return self._custom_format._serializer
627
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin):
294
628
"""Repository accessed over rpc.
296
630
For the moment most operations are performed using local transport-backed
367
713
self._ensure_real()
368
714
return self._real_repository.commit_write_group()
716
def resume_write_group(self, tokens):
718
return self._real_repository.resume_write_group(tokens)
720
def suspend_write_group(self):
722
return self._real_repository.suspend_write_group()
724
def get_missing_parent_inventories(self, check_for_missing_texts=True):
726
return self._real_repository.get_missing_parent_inventories(
727
check_for_missing_texts=check_for_missing_texts)
729
def _get_rev_id_for_revno_vfs(self, revno, known_pair):
731
return self._real_repository.get_rev_id_for_revno(
734
def get_rev_id_for_revno(self, revno, known_pair):
735
"""See Repository.get_rev_id_for_revno."""
736
path = self.bzrdir._path_for_remote_call(self._client)
738
if self._client._medium._is_remote_before((1, 17)):
739
return self._get_rev_id_for_revno_vfs(revno, known_pair)
740
response = self._call(
741
'Repository.get_rev_id_for_revno', path, revno, known_pair)
742
except errors.UnknownSmartMethod:
743
self._client._medium._remember_remote_is_before((1, 17))
744
return self._get_rev_id_for_revno_vfs(revno, known_pair)
745
if response[0] == 'ok':
746
return True, response[1]
747
elif response[0] == 'history-incomplete':
748
known_pair = response[1:3]
749
for fallback in self._fallback_repositories:
750
found, result = fallback.get_rev_id_for_revno(revno, known_pair)
755
# Not found in any fallbacks
756
return False, known_pair
758
raise errors.UnexpectedSmartServerResponse(response)
370
760
def _ensure_real(self):
371
761
"""Ensure that there is a _real_repository set.
373
763
Used before calls to self._real_repository.
765
Note that _ensure_real causes many roundtrips to the server which are
766
not desirable, and prevents the use of smart one-roundtrip RPC's to
767
perform complex operations (such as accessing parent data, streaming
768
revisions etc). Adding calls to _ensure_real should only be done when
769
bringing up new functionality, adding fallbacks for smart methods that
770
require a fallback path, and never to replace an existing smart method
771
invocation. If in doubt chat to the bzr network team.
375
773
if self._real_repository is None:
774
if 'hpssvfs' in debug.debug_flags:
776
warning('VFS Repository access triggered\n%s',
777
''.join(traceback.format_stack()))
778
self._unstacked_provider.missing_keys.clear()
376
779
self.bzrdir._ensure_real()
377
780
self._set_real_repository(
378
781
self.bzrdir._real_bzrdir.open_repository())
432
830
for line in lines:
433
831
d = tuple(line.split())
434
832
revision_graph[d[0]] = d[1:]
436
834
return revision_graph
837
"""See Repository._get_sink()."""
838
return RemoteStreamSink(self)
840
def _get_source(self, to_format):
841
"""Return a source for streaming from this repository."""
842
return RemoteStreamSource(self, to_format)
438
845
def has_revision(self, revision_id):
439
"""See Repository.has_revision()."""
440
if revision_id == NULL_REVISION:
441
# The null revision is always present.
443
path = self.bzrdir._path_for_remote_call(self._client)
444
response = self._call('Repository.has_revision', path, revision_id)
445
if response[0] not in ('yes', 'no'):
446
raise errors.UnexpectedSmartServerResponse(response)
447
if response[0] == 'yes':
449
for fallback_repo in self._fallback_repositories:
450
if fallback_repo.has_revision(revision_id):
846
"""True if this repository has a copy of the revision."""
847
# Copy of bzrlib.repository.Repository.has_revision
848
return revision_id in self.has_revisions((revision_id,))
454
851
def has_revisions(self, revision_ids):
455
"""See Repository.has_revisions()."""
456
# FIXME: This does many roundtrips, particularly when there are
457
# fallback repositories. -- mbp 20080905
459
for revision_id in revision_ids:
460
if self.has_revision(revision_id):
461
result.add(revision_id)
852
"""Probe to find out the presence of multiple revisions.
854
:param revision_ids: An iterable of revision_ids.
855
:return: A set of the revision_ids that were present.
857
# Copy of bzrlib.repository.Repository.has_revisions
858
parent_map = self.get_parent_map(revision_ids)
859
result = set(parent_map)
860
if _mod_revision.NULL_REVISION in revision_ids:
861
result.add(_mod_revision.NULL_REVISION)
864
def _has_same_fallbacks(self, other_repo):
865
"""Returns true if the repositories have the same fallbacks."""
866
# XXX: copied from Repository; it should be unified into a base class
867
# <https://bugs.edge.launchpad.net/bzr/+bug/401622>
868
my_fb = self._fallback_repositories
869
other_fb = other_repo._fallback_repositories
870
if len(my_fb) != len(other_fb):
872
for f, g in zip(my_fb, other_fb):
873
if not f.has_same_location(g):
464
877
def has_same_location(self, other):
465
return (self.__class__ == other.__class__ and
878
# TODO: Move to RepositoryBase and unify with the regular Repository
879
# one; unfortunately the tests rely on slightly different behaviour at
880
# present -- mbp 20090710
881
return (self.__class__ is other.__class__ and
466
882
self.bzrdir.transport.base == other.bzrdir.transport.base)
468
884
def get_graph(self, other_repository=None):
809
1291
return repository.InterRepository.get(
810
1292
other, self).search_missing_revision_ids(revision_id, find_ghosts)
812
def fetch(self, source, revision_id=None, pb=None, find_ghosts=False):
813
# Not delegated to _real_repository so that InterRepository.get has a
814
# chance to find an InterRepository specialised for RemoteRepository.
815
if self.has_same_location(source):
1294
def fetch(self, source, revision_id=None, pb=None, find_ghosts=False,
1296
# No base implementation to use as RemoteRepository is not a subclass
1297
# of Repository; so this is a copy of Repository.fetch().
1298
if fetch_spec is not None and revision_id is not None:
1299
raise AssertionError(
1300
"fetch_spec and revision_id are mutually exclusive.")
1301
if self.is_in_write_group():
1302
raise errors.InternalBzrError(
1303
"May not fetch while in a write group.")
1304
# fast path same-url fetch operations
1305
if (self.has_same_location(source)
1306
and fetch_spec is None
1307
and self._has_same_fallbacks(source)):
816
1308
# check that last_revision is in 'from' and then return a
818
1310
if (revision_id is not None and
819
1311
not revision.is_null(revision_id)):
820
1312
self.get_revision(revision_id)
1314
# if there is no specific appropriate InterRepository, this will get
1315
# the InterRepository base class, which raises an
1316
# IncompatibleRepositories when asked to fetch.
822
1317
inter = repository.InterRepository.get(source, self)
824
return inter.fetch(revision_id=revision_id, pb=pb, find_ghosts=find_ghosts)
825
except NotImplementedError:
826
raise errors.IncompatibleRepositories(source, self)
1318
return inter.fetch(revision_id=revision_id, pb=pb,
1319
find_ghosts=find_ghosts, fetch_spec=fetch_spec)
828
1321
def create_bundle(self, target, base, fileobj, format=None):
829
1322
self._ensure_real()
1210
1716
self._ensure_real()
1211
1717
self._real_repository._pack_collection.autopack()
1213
if self._real_repository is not None:
1214
# Reset the real repository's cache of pack names.
1215
# XXX: At some point we may be able to skip this and just rely on
1216
# the automatic retry logic to do the right thing, but for now we
1217
# err on the side of being correct rather than being optimal.
1218
self._real_repository._pack_collection.reload_pack_names()
1219
1720
if response[0] != 'ok':
1220
1721
raise errors.UnexpectedSmartServerResponse(response)
1724
class RemoteStreamSink(repository.StreamSink):
1726
def _insert_real(self, stream, src_format, resume_tokens):
1727
self.target_repo._ensure_real()
1728
sink = self.target_repo._real_repository._get_sink()
1729
result = sink.insert_stream(stream, src_format, resume_tokens)
1731
self.target_repo.autopack()
1734
def insert_stream(self, stream, src_format, resume_tokens):
1735
target = self.target_repo
1736
target._unstacked_provider.missing_keys.clear()
1737
candidate_calls = [('Repository.insert_stream_1.19', (1, 19))]
1738
if target._lock_token:
1739
candidate_calls.append(('Repository.insert_stream_locked', (1, 14)))
1740
lock_args = (target._lock_token or '',)
1742
candidate_calls.append(('Repository.insert_stream', (1, 13)))
1744
client = target._client
1745
medium = client._medium
1746
path = target.bzrdir._path_for_remote_call(client)
1747
# Probe for the verb to use with an empty stream before sending the
1748
# real stream to it. We do this both to avoid the risk of sending a
1749
# large request that is then rejected, and because we don't want to
1750
# implement a way to buffer, rewind, or restart the stream.
1752
for verb, required_version in candidate_calls:
1753
if medium._is_remote_before(required_version):
1756
# We've already done the probing (and set _is_remote_before) on
1757
# a previous insert.
1760
byte_stream = smart_repo._stream_to_byte_stream([], src_format)
1762
response = client.call_with_body_stream(
1763
(verb, path, '') + lock_args, byte_stream)
1764
except errors.UnknownSmartMethod:
1765
medium._remember_remote_is_before(required_version)
1771
return self._insert_real(stream, src_format, resume_tokens)
1772
self._last_inv_record = None
1773
self._last_substream = None
1774
if required_version < (1, 19):
1775
# Remote side doesn't support inventory deltas. Wrap the stream to
1776
# make sure we don't send any. If the stream contains inventory
1777
# deltas we'll interrupt the smart insert_stream request and
1779
stream = self._stop_stream_if_inventory_delta(stream)
1780
byte_stream = smart_repo._stream_to_byte_stream(
1782
resume_tokens = ' '.join(resume_tokens)
1783
response = client.call_with_body_stream(
1784
(verb, path, resume_tokens) + lock_args, byte_stream)
1785
if response[0][0] not in ('ok', 'missing-basis'):
1786
raise errors.UnexpectedSmartServerResponse(response)
1787
if self._last_substream is not None:
1788
# The stream included an inventory-delta record, but the remote
1789
# side isn't new enough to support them. So we need to send the
1790
# rest of the stream via VFS.
1791
self.target_repo.refresh_data()
1792
return self._resume_stream_with_vfs(response, src_format)
1793
if response[0][0] == 'missing-basis':
1794
tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1795
resume_tokens = tokens
1796
return resume_tokens, set(missing_keys)
1798
self.target_repo.refresh_data()
1801
def _resume_stream_with_vfs(self, response, src_format):
1802
"""Resume sending a stream via VFS, first resending the record and
1803
substream that couldn't be sent via an insert_stream verb.
1805
if response[0][0] == 'missing-basis':
1806
tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1807
# Ignore missing_keys, we haven't finished inserting yet
1810
def resume_substream():
1811
# Yield the substream that was interrupted.
1812
for record in self._last_substream:
1814
self._last_substream = None
1815
def resume_stream():
1816
# Finish sending the interrupted substream
1817
yield ('inventory-deltas', resume_substream())
1818
# Then simply continue sending the rest of the stream.
1819
for substream_kind, substream in self._last_stream:
1820
yield substream_kind, substream
1821
return self._insert_real(resume_stream(), src_format, tokens)
1823
def _stop_stream_if_inventory_delta(self, stream):
1824
"""Normally this just lets the original stream pass-through unchanged.
1826
However if any 'inventory-deltas' substream occurs it will stop
1827
streaming, and store the interrupted substream and stream in
1828
self._last_substream and self._last_stream so that the stream can be
1829
resumed by _resume_stream_with_vfs.
1832
stream_iter = iter(stream)
1833
for substream_kind, substream in stream_iter:
1834
if substream_kind == 'inventory-deltas':
1835
self._last_substream = substream
1836
self._last_stream = stream_iter
1839
yield substream_kind, substream
1842
class RemoteStreamSource(repository.StreamSource):
1843
"""Stream data from a remote server."""
1845
def get_stream(self, search):
1846
if (self.from_repository._fallback_repositories and
1847
self.to_format._fetch_order == 'topological'):
1848
return self._real_stream(self.from_repository, search)
1851
repos = [self.from_repository]
1857
repos.extend(repo._fallback_repositories)
1858
sources.append(repo)
1859
return self.missing_parents_chain(search, sources)
1861
def get_stream_for_missing_keys(self, missing_keys):
1862
self.from_repository._ensure_real()
1863
real_repo = self.from_repository._real_repository
1864
real_source = real_repo._get_source(self.to_format)
1865
return real_source.get_stream_for_missing_keys(missing_keys)
1867
def _real_stream(self, repo, search):
1868
"""Get a stream for search from repo.
1870
This never called RemoteStreamSource.get_stream, and is a heler
1871
for RemoteStreamSource._get_stream to allow getting a stream
1872
reliably whether fallback back because of old servers or trying
1873
to stream from a non-RemoteRepository (which the stacked support
1876
source = repo._get_source(self.to_format)
1877
if isinstance(source, RemoteStreamSource):
1879
source = repo._real_repository._get_source(self.to_format)
1880
return source.get_stream(search)
1882
def _get_stream(self, repo, search):
1883
"""Core worker to get a stream from repo for search.
1885
This is used by both get_stream and the stacking support logic. It
1886
deliberately gets a stream for repo which does not need to be
1887
self.from_repository. In the event that repo is not Remote, or
1888
cannot do a smart stream, a fallback is made to the generic
1889
repository._get_stream() interface, via self._real_stream.
1891
In the event of stacking, streams from _get_stream will not
1892
contain all the data for search - this is normal (see get_stream).
1894
:param repo: A repository.
1895
:param search: A search.
1897
# Fallbacks may be non-smart
1898
if not isinstance(repo, RemoteRepository):
1899
return self._real_stream(repo, search)
1900
client = repo._client
1901
medium = client._medium
1902
path = repo.bzrdir._path_for_remote_call(client)
1903
search_bytes = repo._serialise_search_result(search)
1904
args = (path, self.to_format.network_name())
1906
('Repository.get_stream_1.19', (1, 19)),
1907
('Repository.get_stream', (1, 13))]
1909
for verb, version in candidate_verbs:
1910
if medium._is_remote_before(version):
1913
response = repo._call_with_body_bytes_expecting_body(
1914
verb, args, search_bytes)
1915
except errors.UnknownSmartMethod:
1916
medium._remember_remote_is_before(version)
1918
response_tuple, response_handler = response
1922
return self._real_stream(repo, search)
1923
if response_tuple[0] != 'ok':
1924
raise errors.UnexpectedSmartServerResponse(response_tuple)
1925
byte_stream = response_handler.read_streamed_body()
1926
src_format, stream = smart_repo._byte_stream_to_stream(byte_stream)
1927
if src_format.network_name() != repo._format.network_name():
1928
raise AssertionError(
1929
"Mismatched RemoteRepository and stream src %r, %r" % (
1930
src_format.network_name(), repo._format.network_name()))
1933
def missing_parents_chain(self, search, sources):
1934
"""Chain multiple streams together to handle stacking.
1936
:param search: The overall search to satisfy with streams.
1937
:param sources: A list of Repository objects to query.
1939
self.from_serialiser = self.from_repository._format._serializer
1940
self.seen_revs = set()
1941
self.referenced_revs = set()
1942
# If there are heads in the search, or the key count is > 0, we are not
1944
while not search.is_empty() and len(sources) > 1:
1945
source = sources.pop(0)
1946
stream = self._get_stream(source, search)
1947
for kind, substream in stream:
1948
if kind != 'revisions':
1949
yield kind, substream
1951
yield kind, self.missing_parents_rev_handler(substream)
1952
search = search.refine(self.seen_revs, self.referenced_revs)
1953
self.seen_revs = set()
1954
self.referenced_revs = set()
1955
if not search.is_empty():
1956
for kind, stream in self._get_stream(sources[0], search):
1959
def missing_parents_rev_handler(self, substream):
1960
for content in substream:
1961
revision_bytes = content.get_bytes_as('fulltext')
1962
revision = self.from_serialiser.read_revision_from_string(
1964
self.seen_revs.add(content.key[-1])
1965
self.referenced_revs.update(revision.parent_ids)
1223
1969
class RemoteBranchLockableFiles(LockableFiles):
1224
1970
"""A 'LockableFiles' implementation that talks to a smart server.
1226
1972
This is not a public interface class.
1243
1989
class RemoteBranchFormat(branch.BranchFormat):
1991
def __init__(self, network_name=None):
1246
1992
super(RemoteBranchFormat, self).__init__()
1247
1993
self._matchingbzrdir = RemoteBzrDirFormat()
1248
1994
self._matchingbzrdir.set_branch_format(self)
1995
self._custom_format = None
1996
self._network_name = network_name
1250
1998
def __eq__(self, other):
1251
return (isinstance(other, RemoteBranchFormat) and
1999
return (isinstance(other, RemoteBranchFormat) and
1252
2000
self.__dict__ == other.__dict__)
2002
def _ensure_real(self):
2003
if self._custom_format is None:
2004
self._custom_format = branch.network_format_registry.get(
1254
2007
def get_format_description(self):
1255
return 'Remote BZR Branch'
1257
def get_format_string(self):
1258
return 'Remote BZR Branch'
1260
def open(self, a_bzrdir):
1261
return a_bzrdir.open_branch()
2009
return 'Remote: ' + self._custom_format.get_format_description()
2011
def network_name(self):
2012
return self._network_name
2014
def open(self, a_bzrdir, ignore_fallbacks=False):
2015
return a_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
2017
def _vfs_initialize(self, a_bzrdir):
2018
# Initialisation when using a local bzrdir object, or a non-vfs init
2019
# method is not available on the server.
2020
# self._custom_format is always set - the start of initialize ensures
2022
if isinstance(a_bzrdir, RemoteBzrDir):
2023
a_bzrdir._ensure_real()
2024
result = self._custom_format.initialize(a_bzrdir._real_bzrdir)
2026
# We assume the bzrdir is parameterised; it may not be.
2027
result = self._custom_format.initialize(a_bzrdir)
2028
if (isinstance(a_bzrdir, RemoteBzrDir) and
2029
not isinstance(result, RemoteBranch)):
2030
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
1263
2033
def initialize(self, a_bzrdir):
1264
return a_bzrdir.create_branch()
2034
# 1) get the network name to use.
2035
if self._custom_format:
2036
network_name = self._custom_format.network_name()
2038
# Select the current bzrlib default and ask for that.
2039
reference_bzrdir_format = bzrdir.format_registry.get('default')()
2040
reference_format = reference_bzrdir_format.get_branch_format()
2041
self._custom_format = reference_format
2042
network_name = reference_format.network_name()
2043
# Being asked to create on a non RemoteBzrDir:
2044
if not isinstance(a_bzrdir, RemoteBzrDir):
2045
return self._vfs_initialize(a_bzrdir)
2046
medium = a_bzrdir._client._medium
2047
if medium._is_remote_before((1, 13)):
2048
return self._vfs_initialize(a_bzrdir)
2049
# Creating on a remote bzr dir.
2050
# 2) try direct creation via RPC
2051
path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
2052
verb = 'BzrDir.create_branch'
2054
response = a_bzrdir._call(verb, path, network_name)
2055
except errors.UnknownSmartMethod:
2056
# Fallback - use vfs methods
2057
medium._remember_remote_is_before((1, 13))
2058
return self._vfs_initialize(a_bzrdir)
2059
if response[0] != 'ok':
2060
raise errors.UnexpectedSmartServerResponse(response)
2061
# Turn the response into a RemoteRepository object.
2062
format = RemoteBranchFormat(network_name=response[1])
2063
repo_format = response_tuple_to_repo_format(response[3:])
2064
if response[2] == '':
2065
repo_bzrdir = a_bzrdir
2067
repo_bzrdir = RemoteBzrDir(
2068
a_bzrdir.root_transport.clone(response[2]), a_bzrdir._format,
2070
remote_repo = RemoteRepository(repo_bzrdir, repo_format)
2071
remote_branch = RemoteBranch(a_bzrdir, remote_repo,
2072
format=format, setup_stacking=False)
2073
# XXX: We know this is a new branch, so it must have revno 0, revid
2074
# NULL_REVISION. Creating the branch locked would make this be unable
2075
# to be wrong; here its simply very unlikely to be wrong. RBC 20090225
2076
remote_branch._last_revision_info_cache = 0, NULL_REVISION
2077
return remote_branch
2079
def make_tags(self, branch):
2081
return self._custom_format.make_tags(branch)
1266
2083
def supports_tags(self):
1267
2084
# Remote branches might support tags, but we won't know until we
1268
2085
# access the real remote branch.
1272
class RemoteBranch(branch.Branch, _RpcHelper):
2087
return self._custom_format.supports_tags()
2089
def supports_stacking(self):
2091
return self._custom_format.supports_stacking()
2093
def supports_set_append_revisions_only(self):
2095
return self._custom_format.supports_set_append_revisions_only()
2098
class RemoteBranch(branch.Branch, _RpcHelper, lock._RelockDebugMixin):
1273
2099
"""Branch stored on a server accessed by HPSS RPC.
1275
2101
At the moment most operations are mapped down to simple file operations.
1278
2104
def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
2105
_client=None, format=None, setup_stacking=True):
1280
2106
"""Create a RemoteBranch instance.
1282
2108
:param real_branch: An optional local implementation of the branch
1283
2109
format, usually accessing the data via the VFS.
1284
2110
:param _client: Private parameter for testing.
2111
:param format: A RemoteBranchFormat object, None to create one
2112
automatically. If supplied it should have a network_name already
2114
:param setup_stacking: If True make an RPC call to determine the
2115
stacked (or not) status of the branch. If False assume the branch
1286
2118
# We intentionally don't call the parent class's __init__, because it
1287
2119
# will try to assign to self.tags, which is a property in this subclass.
1288
2120
# And the parent's __init__ doesn't do much anyway.
1289
self._revision_id_to_revno_cache = None
1290
self._partial_revision_id_to_revno_cache = {}
1291
self._revision_history_cache = None
1292
self._last_revision_info_cache = None
1293
self._merge_sorted_revisions_cache = None
1294
2121
self.bzrdir = remote_bzrdir
1295
2122
if _client is not None:
1296
2123
self._client = _client
1613
2543
rev_id = rev_history[-1]
1614
2544
self._set_last_revision(rev_id)
2545
for hook in branch.Branch.hooks['set_rh']:
2546
hook(self, rev_history)
1615
2547
self._cache_revision_history(rev_history)
1617
def get_parent(self):
1619
return self._real_branch.get_parent()
1621
def set_parent(self, url):
1623
return self._real_branch.set_parent(url)
1625
def set_stacked_on_url(self, stacked_location):
1626
"""Set the URL this branch is stacked against.
1628
:raises UnstackableBranchFormat: If the branch does not support
1630
:raises UnstackableRepositoryFormat: If the repository does not support
1634
return self._real_branch.set_stacked_on_url(stacked_location)
1636
def sprout(self, to_bzrdir, revision_id=None):
1637
branch_format = to_bzrdir._format._branch_format
1638
if (branch_format is None or
1639
isinstance(branch_format, RemoteBranchFormat)):
1640
# The to_bzrdir specifies RemoteBranchFormat (or no format, which
1641
# implies the same thing), but RemoteBranches can't be created at
1642
# arbitrary URLs. So create a branch in the same format as
1643
# _real_branch instead.
1644
# XXX: if to_bzrdir is a RemoteBzrDir, this should perhaps do
1645
# to_bzrdir.create_branch to create a RemoteBranch after all...
1647
result = self._real_branch._format.initialize(to_bzrdir)
1648
self.copy_content_into(result, revision_id=revision_id)
1649
result.set_parent(self.bzrdir.root_transport.base)
1651
result = branch.Branch.sprout(
1652
self, to_bzrdir, revision_id=revision_id)
2549
def _get_parent_location(self):
2550
medium = self._client._medium
2551
if medium._is_remote_before((1, 13)):
2552
return self._vfs_get_parent_location()
2554
response = self._call('Branch.get_parent', self._remote_path())
2555
except errors.UnknownSmartMethod:
2556
medium._remember_remote_is_before((1, 13))
2557
return self._vfs_get_parent_location()
2558
if len(response) != 1:
2559
raise errors.UnexpectedSmartServerResponse(response)
2560
parent_location = response[0]
2561
if parent_location == '':
2563
return parent_location
2565
def _vfs_get_parent_location(self):
2567
return self._real_branch._get_parent_location()
2569
def _set_parent_location(self, url):
2570
medium = self._client._medium
2571
if medium._is_remote_before((1, 15)):
2572
return self._vfs_set_parent_location(url)
2574
call_url = url or ''
2575
if type(call_url) is not str:
2576
raise AssertionError('url must be a str or None (%s)' % url)
2577
response = self._call('Branch.set_parent_location',
2578
self._remote_path(), self._lock_token, self._repo_lock_token,
2580
except errors.UnknownSmartMethod:
2581
medium._remember_remote_is_before((1, 15))
2582
return self._vfs_set_parent_location(url)
2584
raise errors.UnexpectedSmartServerResponse(response)
2586
def _vfs_set_parent_location(self, url):
2588
return self._real_branch._set_parent_location(url)
1655
2590
@needs_write_lock
1656
2591
def pull(self, source, overwrite=False, stop_revision=None,
1711
2651
except errors.UnknownSmartMethod:
1712
2652
medium._remember_remote_is_before((1, 6))
1713
2653
self._clear_cached_state_of_remote_branch_only()
1715
self._real_branch.generate_revision_history(
1716
revision_id, last_rev=last_rev, other_branch=other_branch)
1721
return self._real_branch.tags
2654
self.set_revision_history(self._lefthand_history(revision_id,
2655
last_rev=last_rev,other_branch=other_branch))
1723
2657
def set_push_location(self, location):
1724
2658
self._ensure_real()
1725
2659
return self._real_branch.set_push_location(location)
1728
def update_revisions(self, other, stop_revision=None, overwrite=False,
1730
"""See Branch.update_revisions."""
2662
class RemoteConfig(object):
2663
"""A Config that reads and writes from smart verbs.
2665
It is a low-level object that considers config data to be name/value pairs
2666
that may be associated with a section. Assigning meaning to the these
2667
values is done at higher levels like bzrlib.config.TreeConfig.
2670
def get_option(self, name, section=None, default=None):
2671
"""Return the value associated with a named option.
2673
:param name: The name of the value
2674
:param section: The section the option is in (if any)
2675
:param default: The value to return if the value is not set
2676
:return: The value or default value
1733
if stop_revision is None:
1734
stop_revision = other.last_revision()
1735
if revision.is_null(stop_revision):
1736
# if there are no commits, we're done.
1738
self.fetch(other, stop_revision)
1741
# Just unconditionally set the new revision. We don't care if
1742
# the branches have diverged.
1743
self._set_last_revision(stop_revision)
2679
configobj = self._get_configobj()
2681
section_obj = configobj
1745
medium = self._client._medium
1746
if not medium._is_remote_before((1, 6)):
1748
self._set_last_revision_descendant(stop_revision, other)
1750
except errors.UnknownSmartMethod:
1751
medium._remember_remote_is_before((1, 6))
1752
# Fallback for pre-1.6 servers: check for divergence
1753
# client-side, then do _set_last_revision.
1754
last_rev = revision.ensure_null(self.last_revision())
1756
graph = self.repository.get_graph()
1757
if self._check_if_descendant_or_diverged(
1758
stop_revision, last_rev, graph, other):
1759
# stop_revision is a descendant of last_rev, but we aren't
1760
# overwriting, so we're done.
1762
self._set_last_revision(stop_revision)
2684
section_obj = configobj[section]
2687
return section_obj.get(name, default)
2688
except errors.UnknownSmartMethod:
2689
return self._vfs_get_option(name, section, default)
2691
def _response_to_configobj(self, response):
2692
if len(response[0]) and response[0][0] != 'ok':
2693
raise errors.UnexpectedSmartServerResponse(response)
2694
lines = response[1].read_body_bytes().splitlines()
2695
return config.ConfigObj(lines, encoding='utf-8')
2698
class RemoteBranchConfig(RemoteConfig):
2699
"""A RemoteConfig for Branches."""
2701
def __init__(self, branch):
2702
self._branch = branch
2704
def _get_configobj(self):
2705
path = self._branch._remote_path()
2706
response = self._branch._client.call_expecting_body(
2707
'Branch.get_config_file', path)
2708
return self._response_to_configobj(response)
2710
def set_option(self, value, name, section=None):
2711
"""Set the value associated with a named option.
2713
:param value: The value to set
2714
:param name: The name of the value to set
2715
:param section: The section the option is in (if any)
2717
medium = self._branch._client._medium
2718
if medium._is_remote_before((1, 14)):
2719
return self._vfs_set_option(value, name, section)
2721
path = self._branch._remote_path()
2722
response = self._branch._client.call('Branch.set_config_option',
2723
path, self._branch._lock_token, self._branch._repo_lock_token,
2724
value.encode('utf8'), name, section or '')
2725
except errors.UnknownSmartMethod:
2726
medium._remember_remote_is_before((1, 14))
2727
return self._vfs_set_option(value, name, section)
2729
raise errors.UnexpectedSmartServerResponse(response)
2731
def _real_object(self):
2732
self._branch._ensure_real()
2733
return self._branch._real_branch
2735
def _vfs_set_option(self, value, name, section=None):
2736
return self._real_object()._get_config().set_option(
2737
value, name, section)
2740
class RemoteBzrDirConfig(RemoteConfig):
2741
"""A RemoteConfig for BzrDirs."""
2743
def __init__(self, bzrdir):
2744
self._bzrdir = bzrdir
2746
def _get_configobj(self):
2747
medium = self._bzrdir._client._medium
2748
verb = 'BzrDir.get_config_file'
2749
if medium._is_remote_before((1, 15)):
2750
raise errors.UnknownSmartMethod(verb)
2751
path = self._bzrdir._path_for_remote_call(self._bzrdir._client)
2752
response = self._bzrdir._call_expecting_body(
2754
return self._response_to_configobj(response)
2756
def _vfs_get_option(self, name, section, default):
2757
return self._real_object()._get_config().get_option(
2758
name, section, default)
2760
def set_option(self, value, name, section=None):
2761
"""Set the value associated with a named option.
2763
:param value: The value to set
2764
:param name: The name of the value to set
2765
:param section: The section the option is in (if any)
2767
return self._real_object()._get_config().set_option(
2768
value, name, section)
2770
def _real_object(self):
2771
self._bzrdir._ensure_real()
2772
return self._bzrdir._real_bzrdir
1767
2776
def _extract_tar(tar, to_dir):
added
removed
bzrlib/remote.py
