65
75
method, args, body_bytes)
66
76
except errors.ErrorFromSmartServer, err:
67
77
self._translate_error(err, **err_context)
80
def response_tuple_to_repo_format(response):
81
"""Convert a response tuple describing a repository format to a format."""
82
format = RemoteRepositoryFormat()
83
format._rich_root_data = (response[0] == 'yes')
84
format._supports_tree_reference = (response[1] == 'yes')
85
format._supports_external_lookups = (response[2] == 'yes')
86
format._network_name = response[3]
69
90
# Note: RemoteBzrDirFormat is in bzrdir.py
71
92
class RemoteBzrDir(BzrDir, _RpcHelper):
72
93
"""Control directory on a remote server, accessed via bzr:// or similar."""
74
def __init__(self, transport, _client=None):
95
def __init__(self, transport, format, _client=None, _force_probe=False):
75
96
"""Construct a RemoteBzrDir.
77
98
:param _client: Private parameter for testing. Disables probing and the
78
99
use of a real bzrdir.
80
BzrDir.__init__(self, transport, RemoteBzrDirFormat())
101
BzrDir.__init__(self, transport, format)
81
102
# this object holds a delegated bzrdir that uses file-level operations
82
103
# to talk to the other side
83
104
self._real_bzrdir = None
105
self._has_working_tree = None
106
# 1-shot cache for the call pattern 'create_branch; open_branch' - see
107
# create_branch for details.
108
self._next_open_branch_result = None
85
110
if _client is None:
86
111
medium = transport.get_smart_medium()
87
112
self._client = client._SmartClient(medium)
89
114
self._client = _client
121
return '%s(%r)' % (self.__class__.__name__, self._client)
123
def _probe_bzrdir(self):
124
medium = self._client._medium
92
125
path = self._path_for_remote_call(self._client)
126
if medium._is_remote_before((2, 1)):
130
self._rpc_open_2_1(path)
132
except errors.UnknownSmartMethod:
133
medium._remember_remote_is_before((2, 1))
136
def _rpc_open_2_1(self, path):
137
response = self._call('BzrDir.open_2.1', path)
138
if response == ('no',):
139
raise errors.NotBranchError(path=self.root_transport.base)
140
elif response[0] == 'yes':
141
if response[1] == 'yes':
142
self._has_working_tree = True
143
elif response[1] == 'no':
144
self._has_working_tree = False
146
raise errors.UnexpectedSmartServerResponse(response)
148
raise errors.UnexpectedSmartServerResponse(response)
150
def _rpc_open(self, path):
93
151
response = self._call('BzrDir.open', path)
94
152
if response not in [('yes',), ('no',)]:
95
153
raise errors.UnexpectedSmartServerResponse(response)
96
154
if response == ('no',):
97
raise errors.NotBranchError(path=transport.base)
155
raise errors.NotBranchError(path=self.root_transport.base)
99
157
def _ensure_real(self):
100
158
"""Ensure that there is a _real_bzrdir set.
102
160
Used before calls to self._real_bzrdir.
104
162
if not self._real_bzrdir:
163
if 'hpssvfs' in debug.debug_flags:
165
warning('VFS BzrDir access triggered\n%s',
166
''.join(traceback.format_stack()))
105
167
self._real_bzrdir = BzrDir.open_from_transport(
106
168
self.root_transport, _server_formats=False)
169
self._format._network_name = \
170
self._real_bzrdir._format.network_name()
108
172
def _translate_error(self, err, **context):
109
173
_translate_error(err, bzrdir=self, **context)
111
def cloning_metadir(self, stacked=False):
175
def break_lock(self):
176
# Prevent aliasing problems in the next_open_branch_result cache.
177
# See create_branch for rationale.
178
self._next_open_branch_result = None
179
return BzrDir.break_lock(self)
181
def _vfs_cloning_metadir(self, require_stacking=False):
112
182
self._ensure_real()
113
return self._real_bzrdir.cloning_metadir(stacked)
183
return self._real_bzrdir.cloning_metadir(
184
require_stacking=require_stacking)
186
def cloning_metadir(self, require_stacking=False):
187
medium = self._client._medium
188
if medium._is_remote_before((1, 13)):
189
return self._vfs_cloning_metadir(require_stacking=require_stacking)
190
verb = 'BzrDir.cloning_metadir'
195
path = self._path_for_remote_call(self._client)
197
response = self._call(verb, path, stacking)
198
except errors.UnknownSmartMethod:
199
medium._remember_remote_is_before((1, 13))
200
return self._vfs_cloning_metadir(require_stacking=require_stacking)
201
except errors.UnknownErrorFromSmartServer, err:
202
if err.error_tuple != ('BranchReference',):
204
# We need to resolve the branch reference to determine the
205
# cloning_metadir. This causes unnecessary RPCs to open the
206
# referenced branch (and bzrdir, etc) but only when the caller
207
# didn't already resolve the branch reference.
208
referenced_branch = self.open_branch()
209
return referenced_branch.bzrdir.cloning_metadir()
210
if len(response) != 3:
211
raise errors.UnexpectedSmartServerResponse(response)
212
control_name, repo_name, branch_info = response
213
if len(branch_info) != 2:
214
raise errors.UnexpectedSmartServerResponse(response)
215
branch_ref, branch_name = branch_info
216
format = bzrdir.network_format_registry.get(control_name)
218
format.repository_format = repository.network_format_registry.get(
220
if branch_ref == 'ref':
221
# XXX: we need possible_transports here to avoid reopening the
222
# connection to the referenced location
223
ref_bzrdir = BzrDir.open(branch_name)
224
branch_format = ref_bzrdir.cloning_metadir().get_branch_format()
225
format.set_branch_format(branch_format)
226
elif branch_ref == 'branch':
228
format.set_branch_format(
229
branch.network_format_registry.get(branch_name))
231
raise errors.UnexpectedSmartServerResponse(response)
115
234
def create_repository(self, shared=False):
117
self._real_bzrdir.create_repository(shared=shared)
118
return self.open_repository()
235
# as per meta1 formats - just delegate to the format object which may
237
result = self._format.repository_format.initialize(self, shared)
238
if not isinstance(result, RemoteRepository):
239
return self.open_repository()
120
243
def destroy_repository(self):
121
244
"""See BzrDir.destroy_repository"""
122
245
self._ensure_real()
123
246
self._real_bzrdir.destroy_repository()
125
def create_branch(self):
127
real_branch = self._real_bzrdir.create_branch()
128
return RemoteBranch(self, self.find_repository(), real_branch)
248
def create_branch(self, name=None):
249
# as per meta1 formats - just delegate to the format object which may
251
real_branch = self._format.get_branch_format().initialize(self,
253
if not isinstance(real_branch, RemoteBranch):
254
result = RemoteBranch(self, self.find_repository(), real_branch,
258
# BzrDir.clone_on_transport() uses the result of create_branch but does
259
# not return it to its callers; we save approximately 8% of our round
260
# trips by handing the branch we created back to the first caller to
261
# open_branch rather than probing anew. Long term we need a API in
262
# bzrdir that doesn't discard result objects (like result_branch).
264
self._next_open_branch_result = result
130
def destroy_branch(self):
267
def destroy_branch(self, name=None):
131
268
"""See BzrDir.destroy_branch"""
132
269
self._ensure_real()
133
self._real_bzrdir.destroy_branch()
270
self._real_bzrdir.destroy_branch(name=name)
271
self._next_open_branch_result = None
135
273
def create_workingtree(self, revision_id=None, from_branch=None):
136
274
raise errors.NotLocalUrl(self.transport.base)
138
def find_branch_format(self):
276
def find_branch_format(self, name=None):
139
277
"""Find the branch 'format' for this bzrdir.
141
279
This might be a synthetic object for e.g. RemoteBranch and SVN.
143
b = self.open_branch()
281
b = self.open_branch(name=name)
146
def get_branch_reference(self):
284
def get_branch_reference(self, name=None):
147
285
"""See BzrDir.get_branch_reference()."""
287
# XXX JRV20100304: Support opening colocated branches
288
raise errors.NoColocatedBranchSupport(self)
289
response = self._get_branch_reference()
290
if response[0] == 'ref':
295
def _get_branch_reference(self):
148
296
path = self._path_for_remote_call(self._client)
149
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.
297
medium = self._client._medium
299
('BzrDir.open_branchV3', (2, 1)),
300
('BzrDir.open_branchV2', (1, 13)),
301
('BzrDir.open_branch', None),
303
for verb, required_version in candidate_calls:
304
if required_version and medium._is_remote_before(required_version):
307
response = self._call(verb, path)
308
except errors.UnknownSmartMethod:
309
if required_version is None:
311
medium._remember_remote_is_before(required_version)
314
if verb == 'BzrDir.open_branch':
315
if response[0] != 'ok':
316
raise errors.UnexpectedSmartServerResponse(response)
317
if response[1] != '':
318
return ('ref', response[1])
320
return ('branch', '')
321
if response[0] not in ('ref', 'branch'):
158
322
raise errors.UnexpectedSmartServerResponse(response)
160
def _get_tree_branch(self):
325
def _get_tree_branch(self, name=None):
161
326
"""See BzrDir._get_tree_branch()."""
162
return None, self.open_branch()
327
return None, self.open_branch(name=name)
164
def open_branch(self, _unsupported=False):
329
def open_branch(self, name=None, unsupported=False,
330
ignore_fallbacks=False):
166
332
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())
333
if self._next_open_branch_result is not None:
334
# See create_branch for details.
335
result = self._next_open_branch_result
336
self._next_open_branch_result = None
338
response = self._get_branch_reference()
339
if response[0] == 'ref':
172
340
# a branch reference, use the existing BranchReference logic.
173
341
format = BranchReferenceFormat()
174
return format.open(self, _found=True, location=reference_url)
342
return format.open(self, name=name, _found=True,
343
location=response[1], ignore_fallbacks=ignore_fallbacks)
344
branch_format_name = response[1]
345
if not branch_format_name:
346
branch_format_name = None
347
format = RemoteBranchFormat(network_name=branch_format_name)
348
return RemoteBranch(self, self.find_repository(), format=format,
349
setup_stacking=not ignore_fallbacks, name=name)
351
def _open_repo_v1(self, path):
352
verb = 'BzrDir.find_repository'
353
response = self._call(verb, path)
354
if response[0] != 'ok':
355
raise errors.UnexpectedSmartServerResponse(response)
356
# servers that only support the v1 method don't support external
359
repo = self._real_bzrdir.open_repository()
360
response = response + ('no', repo._format.network_name())
361
return response, repo
363
def _open_repo_v2(self, path):
364
verb = 'BzrDir.find_repositoryV2'
365
response = self._call(verb, path)
366
if response[0] != 'ok':
367
raise errors.UnexpectedSmartServerResponse(response)
369
repo = self._real_bzrdir.open_repository()
370
response = response + (repo._format.network_name(),)
371
return response, repo
373
def _open_repo_v3(self, path):
374
verb = 'BzrDir.find_repositoryV3'
375
medium = self._client._medium
376
if medium._is_remote_before((1, 13)):
377
raise errors.UnknownSmartMethod(verb)
379
response = self._call(verb, path)
380
except errors.UnknownSmartMethod:
381
medium._remember_remote_is_before((1, 13))
383
if response[0] != 'ok':
384
raise errors.UnexpectedSmartServerResponse(response)
385
return response, None
176
387
def open_repository(self):
177
388
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)
390
for probe in [self._open_repo_v3, self._open_repo_v2,
393
response, real_repo = probe(path)
395
except errors.UnknownSmartMethod:
398
raise errors.UnknownSmartMethod('BzrDir.find_repository{3,2,}')
184
399
if response[0] != 'ok':
185
400
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):
401
if len(response) != 6:
191
402
raise SmartProtocolError('incorrect response length %s' % (response,))
192
403
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')
404
# repo is at this dir.
405
format = response_tuple_to_repo_format(response[2:])
198
406
# Used to support creating a real format instance when needed.
199
407
format._creating_bzrdir = self
200
return RemoteRepository(self, format)
408
remote_repo = RemoteRepository(self, format)
409
format._creating_repo = remote_repo
410
if real_repo is not None:
411
remote_repo._set_real_repository(real_repo)
202
414
raise errors.NoRepositoryPresent(self)
416
def has_workingtree(self):
417
if self._has_working_tree is None:
419
self._has_working_tree = self._real_bzrdir.has_workingtree()
420
return self._has_working_tree
204
422
def open_workingtree(self, recommend_upgrade=True):
206
if self._real_bzrdir.has_workingtree():
423
if self.has_workingtree():
207
424
raise errors.NotLocalUrl(self.root_transport)
209
426
raise errors.NoWorkingTree(self.root_transport.base)
257
473
the attributes rich_root_data and supports_tree_reference are set
258
474
on a per instance basis, and are not set (and should not be) at
477
:ivar _custom_format: If set, a specific concrete repository format that
478
will be used when initializing a repository with this
479
RemoteRepositoryFormat.
480
:ivar _creating_repo: If set, the repository object that this
481
RemoteRepositoryFormat was created for: it can be called into
482
to obtain data like the network name.
262
485
_matchingbzrdir = RemoteBzrDirFormat()
264
def initialize(self, a_bzrdir, shared=False):
265
if not isinstance(a_bzrdir, RemoteBzrDir):
488
repository.RepositoryFormat.__init__(self)
489
self._custom_format = None
490
self._network_name = None
491
self._creating_bzrdir = None
492
self._supports_chks = None
493
self._supports_external_lookups = None
494
self._supports_tree_reference = None
495
self._rich_root_data = None
498
return "%s(_network_name=%r)" % (self.__class__.__name__,
502
def fast_deltas(self):
504
return self._custom_format.fast_deltas
507
def rich_root_data(self):
508
if self._rich_root_data is None:
510
self._rich_root_data = self._custom_format.rich_root_data
511
return self._rich_root_data
514
def supports_chks(self):
515
if self._supports_chks is None:
517
self._supports_chks = self._custom_format.supports_chks
518
return self._supports_chks
521
def supports_external_lookups(self):
522
if self._supports_external_lookups is None:
524
self._supports_external_lookups = \
525
self._custom_format.supports_external_lookups
526
return self._supports_external_lookups
529
def supports_tree_reference(self):
530
if self._supports_tree_reference is None:
532
self._supports_tree_reference = \
533
self._custom_format.supports_tree_reference
534
return self._supports_tree_reference
536
def _vfs_initialize(self, a_bzrdir, shared):
537
"""Helper for common code in initialize."""
538
if self._custom_format:
539
# Custom format requested
540
result = self._custom_format.initialize(a_bzrdir, shared=shared)
541
elif self._creating_bzrdir is not None:
542
# Use the format that the repository we were created to back
266
544
prior_repo = self._creating_bzrdir.open_repository()
267
545
prior_repo._ensure_real()
268
return prior_repo._real_repository._format.initialize(
546
result = prior_repo._real_repository._format.initialize(
269
547
a_bzrdir, shared=shared)
270
return a_bzrdir.create_repository(shared=shared)
549
# assume that a_bzr is a RemoteBzrDir but the smart server didn't
550
# support remote initialization.
551
# We delegate to a real object at this point (as RemoteBzrDir
552
# delegate to the repository format which would lead to infinite
553
# recursion if we just called a_bzrdir.create_repository.
554
a_bzrdir._ensure_real()
555
result = a_bzrdir._real_bzrdir.create_repository(shared=shared)
556
if not isinstance(result, RemoteRepository):
557
return self.open(a_bzrdir)
561
def initialize(self, a_bzrdir, shared=False):
562
# Being asked to create on a non RemoteBzrDir:
563
if not isinstance(a_bzrdir, RemoteBzrDir):
564
return self._vfs_initialize(a_bzrdir, shared)
565
medium = a_bzrdir._client._medium
566
if medium._is_remote_before((1, 13)):
567
return self._vfs_initialize(a_bzrdir, shared)
568
# Creating on a remote bzr dir.
569
# 1) get the network name to use.
570
if self._custom_format:
571
network_name = self._custom_format.network_name()
572
elif self._network_name:
573
network_name = self._network_name
575
# Select the current bzrlib default and ask for that.
576
reference_bzrdir_format = bzrdir.format_registry.get('default')()
577
reference_format = reference_bzrdir_format.repository_format
578
network_name = reference_format.network_name()
579
# 2) try direct creation via RPC
580
path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
581
verb = 'BzrDir.create_repository'
587
response = a_bzrdir._call(verb, path, network_name, shared_str)
588
except errors.UnknownSmartMethod:
589
# Fallback - use vfs methods
590
medium._remember_remote_is_before((1, 13))
591
return self._vfs_initialize(a_bzrdir, shared)
593
# Turn the response into a RemoteRepository object.
594
format = response_tuple_to_repo_format(response[1:])
595
# Used to support creating a real format instance when needed.
596
format._creating_bzrdir = a_bzrdir
597
remote_repo = RemoteRepository(a_bzrdir, format)
598
format._creating_repo = remote_repo
272
601
def open(self, a_bzrdir):
273
602
if not isinstance(a_bzrdir, RemoteBzrDir):
274
603
raise AssertionError('%r is not a RemoteBzrDir' % (a_bzrdir,))
275
604
return a_bzrdir.open_repository()
606
def _ensure_real(self):
607
if self._custom_format is None:
608
self._custom_format = repository.network_format_registry.get(
612
def _fetch_order(self):
614
return self._custom_format._fetch_order
617
def _fetch_uses_deltas(self):
619
return self._custom_format._fetch_uses_deltas
622
def _fetch_reconcile(self):
624
return self._custom_format._fetch_reconcile
277
626
def get_format_description(self):
278
return 'bzr remote repository'
628
return 'Remote: ' + self._custom_format.get_format_description()
280
630
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):
631
return self.__class__ is other.__class__
633
def network_name(self):
634
if self._network_name:
635
return self._network_name
636
self._creating_repo._ensure_real()
637
return self._creating_repo._real_repository._format.network_name()
640
def pack_compresses(self):
642
return self._custom_format.pack_compresses
645
def _serializer(self):
647
return self._custom_format._serializer
650
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
651
bzrdir.ControlComponent):
294
652
"""Repository accessed over rpc.
296
654
For the moment most operations are performed using local transport-backed
367
748
self._ensure_real()
368
749
return self._real_repository.commit_write_group()
751
def resume_write_group(self, tokens):
753
return self._real_repository.resume_write_group(tokens)
755
def suspend_write_group(self):
757
return self._real_repository.suspend_write_group()
759
def get_missing_parent_inventories(self, check_for_missing_texts=True):
761
return self._real_repository.get_missing_parent_inventories(
762
check_for_missing_texts=check_for_missing_texts)
764
def _get_rev_id_for_revno_vfs(self, revno, known_pair):
766
return self._real_repository.get_rev_id_for_revno(
769
def get_rev_id_for_revno(self, revno, known_pair):
770
"""See Repository.get_rev_id_for_revno."""
771
path = self.bzrdir._path_for_remote_call(self._client)
773
if self._client._medium._is_remote_before((1, 17)):
774
return self._get_rev_id_for_revno_vfs(revno, known_pair)
775
response = self._call(
776
'Repository.get_rev_id_for_revno', path, revno, known_pair)
777
except errors.UnknownSmartMethod:
778
self._client._medium._remember_remote_is_before((1, 17))
779
return self._get_rev_id_for_revno_vfs(revno, known_pair)
780
if response[0] == 'ok':
781
return True, response[1]
782
elif response[0] == 'history-incomplete':
783
known_pair = response[1:3]
784
for fallback in self._fallback_repositories:
785
found, result = fallback.get_rev_id_for_revno(revno, known_pair)
790
# Not found in any fallbacks
791
return False, known_pair
793
raise errors.UnexpectedSmartServerResponse(response)
370
795
def _ensure_real(self):
371
796
"""Ensure that there is a _real_repository set.
373
798
Used before calls to self._real_repository.
800
Note that _ensure_real causes many roundtrips to the server which are
801
not desirable, and prevents the use of smart one-roundtrip RPC's to
802
perform complex operations (such as accessing parent data, streaming
803
revisions etc). Adding calls to _ensure_real should only be done when
804
bringing up new functionality, adding fallbacks for smart methods that
805
require a fallback path, and never to replace an existing smart method
806
invocation. If in doubt chat to the bzr network team.
375
808
if self._real_repository is None:
809
if 'hpssvfs' in debug.debug_flags:
811
warning('VFS Repository access triggered\n%s',
812
''.join(traceback.format_stack()))
813
self._unstacked_provider.missing_keys.clear()
376
814
self.bzrdir._ensure_real()
377
815
self._set_real_repository(
378
816
self.bzrdir._real_bzrdir.open_repository())
432
865
for line in lines:
433
866
d = tuple(line.split())
434
867
revision_graph[d[0]] = d[1:]
436
869
return revision_graph
872
"""See Repository._get_sink()."""
873
return RemoteStreamSink(self)
875
def _get_source(self, to_format):
876
"""Return a source for streaming from this repository."""
877
return RemoteStreamSource(self, to_format)
438
880
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):
881
"""True if this repository has a copy of the revision."""
882
# Copy of bzrlib.repository.Repository.has_revision
883
return revision_id in self.has_revisions((revision_id,))
454
886
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)
887
"""Probe to find out the presence of multiple revisions.
889
:param revision_ids: An iterable of revision_ids.
890
:return: A set of the revision_ids that were present.
892
# Copy of bzrlib.repository.Repository.has_revisions
893
parent_map = self.get_parent_map(revision_ids)
894
result = set(parent_map)
895
if _mod_revision.NULL_REVISION in revision_ids:
896
result.add(_mod_revision.NULL_REVISION)
899
def _has_same_fallbacks(self, other_repo):
900
"""Returns true if the repositories have the same fallbacks."""
901
# XXX: copied from Repository; it should be unified into a base class
902
# <https://bugs.launchpad.net/bzr/+bug/401622>
903
my_fb = self._fallback_repositories
904
other_fb = other_repo._fallback_repositories
905
if len(my_fb) != len(other_fb):
907
for f, g in zip(my_fb, other_fb):
908
if not f.has_same_location(g):
464
912
def has_same_location(self, other):
465
return (self.__class__ == other.__class__ and
913
# TODO: Move to RepositoryBase and unify with the regular Repository
914
# one; unfortunately the tests rely on slightly different behaviour at
915
# present -- mbp 20090710
916
return (self.__class__ is other.__class__ and
466
917
self.bzrdir.transport.base == other.bzrdir.transport.base)
468
919
def get_graph(self, other_repository=None):
727
1236
def add_fallback_repository(self, repository):
728
1237
"""Add a repository to use for looking up data not held locally.
730
1239
:param repository: A repository.
732
# XXX: At the moment the RemoteRepository will allow fallbacks
733
# unconditionally - however, a _real_repository will usually exist,
734
# and may raise an error if it's not accommodated by the underlying
735
# format. Eventually we should check when opening the repository
736
# whether it's willing to allow them or not.
1241
if not self._format.supports_external_lookups:
1242
raise errors.UnstackableRepositoryFormat(
1243
self._format.network_name(), self.base)
738
1244
# We need to accumulate additional repositories here, to pass them in
739
1245
# on various RPC's.
1247
if self.is_locked():
1248
# We will call fallback.unlock() when we transition to the unlocked
1249
# state, so always add a lock here. If a caller passes us a locked
1250
# repository, they are responsible for unlocking it later.
1251
repository.lock_read()
1252
self._check_fallback_repository(repository)
740
1253
self._fallback_repositories.append(repository)
741
# They are also seen by the fallback repository. If it doesn't exist
742
# yet they'll be added then. This implicitly copies them.
1254
# If self._real_repository was parameterised already (e.g. because a
1255
# _real_branch had its get_stacked_on_url method called), then the
1256
# repository to be added may already be in the _real_repositories list.
1257
if self._real_repository is not None:
1258
fallback_locations = [repo.user_url for repo in
1259
self._real_repository._fallback_repositories]
1260
if repository.user_url not in fallback_locations:
1261
self._real_repository.add_fallback_repository(repository)
1263
def _check_fallback_repository(self, repository):
1264
"""Check that this repository can fallback to repository safely.
1266
Raise an error if not.
1268
:param repository: A repository to fallback to.
1270
return _mod_repository.InterRepository._assert_same_model(
745
1273
def add_inventory(self, revid, inv, parents):
746
1274
self._ensure_real()
747
1275
return self._real_repository.add_inventory(revid, inv, parents)
749
1277
def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1278
parents, basis_inv=None, propagate_caches=False):
751
1279
self._ensure_real()
752
1280
return self._real_repository.add_inventory_by_delta(basis_revision_id,
753
delta, new_revision_id, parents)
1281
delta, new_revision_id, parents, basis_inv=basis_inv,
1282
propagate_caches=propagate_caches)
755
1284
def add_revision(self, rev_id, rev, inv=None, config=None):
756
1285
self._ensure_real()
1210
1773
self._ensure_real()
1211
1774
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
1777
if response[0] != 'ok':
1220
1778
raise errors.UnexpectedSmartServerResponse(response)
1781
class RemoteStreamSink(repository.StreamSink):
1783
def _insert_real(self, stream, src_format, resume_tokens):
1784
self.target_repo._ensure_real()
1785
sink = self.target_repo._real_repository._get_sink()
1786
result = sink.insert_stream(stream, src_format, resume_tokens)
1788
self.target_repo.autopack()
1791
def insert_stream(self, stream, src_format, resume_tokens):
1792
target = self.target_repo
1793
target._unstacked_provider.missing_keys.clear()
1794
candidate_calls = [('Repository.insert_stream_1.19', (1, 19))]
1795
if target._lock_token:
1796
candidate_calls.append(('Repository.insert_stream_locked', (1, 14)))
1797
lock_args = (target._lock_token or '',)
1799
candidate_calls.append(('Repository.insert_stream', (1, 13)))
1801
client = target._client
1802
medium = client._medium
1803
path = target.bzrdir._path_for_remote_call(client)
1804
# Probe for the verb to use with an empty stream before sending the
1805
# real stream to it. We do this both to avoid the risk of sending a
1806
# large request that is then rejected, and because we don't want to
1807
# implement a way to buffer, rewind, or restart the stream.
1809
for verb, required_version in candidate_calls:
1810
if medium._is_remote_before(required_version):
1813
# We've already done the probing (and set _is_remote_before) on
1814
# a previous insert.
1817
byte_stream = smart_repo._stream_to_byte_stream([], src_format)
1819
response = client.call_with_body_stream(
1820
(verb, path, '') + lock_args, byte_stream)
1821
except errors.UnknownSmartMethod:
1822
medium._remember_remote_is_before(required_version)
1828
return self._insert_real(stream, src_format, resume_tokens)
1829
self._last_inv_record = None
1830
self._last_substream = None
1831
if required_version < (1, 19):
1832
# Remote side doesn't support inventory deltas. Wrap the stream to
1833
# make sure we don't send any. If the stream contains inventory
1834
# deltas we'll interrupt the smart insert_stream request and
1836
stream = self._stop_stream_if_inventory_delta(stream)
1837
byte_stream = smart_repo._stream_to_byte_stream(
1839
resume_tokens = ' '.join(resume_tokens)
1840
response = client.call_with_body_stream(
1841
(verb, path, resume_tokens) + lock_args, byte_stream)
1842
if response[0][0] not in ('ok', 'missing-basis'):
1843
raise errors.UnexpectedSmartServerResponse(response)
1844
if self._last_substream is not None:
1845
# The stream included an inventory-delta record, but the remote
1846
# side isn't new enough to support them. So we need to send the
1847
# rest of the stream via VFS.
1848
self.target_repo.refresh_data()
1849
return self._resume_stream_with_vfs(response, src_format)
1850
if response[0][0] == 'missing-basis':
1851
tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1852
resume_tokens = tokens
1853
return resume_tokens, set(missing_keys)
1855
self.target_repo.refresh_data()
1858
def _resume_stream_with_vfs(self, response, src_format):
1859
"""Resume sending a stream via VFS, first resending the record and
1860
substream that couldn't be sent via an insert_stream verb.
1862
if response[0][0] == 'missing-basis':
1863
tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1864
# Ignore missing_keys, we haven't finished inserting yet
1867
def resume_substream():
1868
# Yield the substream that was interrupted.
1869
for record in self._last_substream:
1871
self._last_substream = None
1872
def resume_stream():
1873
# Finish sending the interrupted substream
1874
yield ('inventory-deltas', resume_substream())
1875
# Then simply continue sending the rest of the stream.
1876
for substream_kind, substream in self._last_stream:
1877
yield substream_kind, substream
1878
return self._insert_real(resume_stream(), src_format, tokens)
1880
def _stop_stream_if_inventory_delta(self, stream):
1881
"""Normally this just lets the original stream pass-through unchanged.
1883
However if any 'inventory-deltas' substream occurs it will stop
1884
streaming, and store the interrupted substream and stream in
1885
self._last_substream and self._last_stream so that the stream can be
1886
resumed by _resume_stream_with_vfs.
1889
stream_iter = iter(stream)
1890
for substream_kind, substream in stream_iter:
1891
if substream_kind == 'inventory-deltas':
1892
self._last_substream = substream
1893
self._last_stream = stream_iter
1896
yield substream_kind, substream
1899
class RemoteStreamSource(repository.StreamSource):
1900
"""Stream data from a remote server."""
1902
def get_stream(self, search):
1903
if (self.from_repository._fallback_repositories and
1904
self.to_format._fetch_order == 'topological'):
1905
return self._real_stream(self.from_repository, search)
1908
repos = [self.from_repository]
1914
repos.extend(repo._fallback_repositories)
1915
sources.append(repo)
1916
return self.missing_parents_chain(search, sources)
1918
def get_stream_for_missing_keys(self, missing_keys):
1919
self.from_repository._ensure_real()
1920
real_repo = self.from_repository._real_repository
1921
real_source = real_repo._get_source(self.to_format)
1922
return real_source.get_stream_for_missing_keys(missing_keys)
1924
def _real_stream(self, repo, search):
1925
"""Get a stream for search from repo.
1927
This never called RemoteStreamSource.get_stream, and is a heler
1928
for RemoteStreamSource._get_stream to allow getting a stream
1929
reliably whether fallback back because of old servers or trying
1930
to stream from a non-RemoteRepository (which the stacked support
1933
source = repo._get_source(self.to_format)
1934
if isinstance(source, RemoteStreamSource):
1936
source = repo._real_repository._get_source(self.to_format)
1937
return source.get_stream(search)
1939
def _get_stream(self, repo, search):
1940
"""Core worker to get a stream from repo for search.
1942
This is used by both get_stream and the stacking support logic. It
1943
deliberately gets a stream for repo which does not need to be
1944
self.from_repository. In the event that repo is not Remote, or
1945
cannot do a smart stream, a fallback is made to the generic
1946
repository._get_stream() interface, via self._real_stream.
1948
In the event of stacking, streams from _get_stream will not
1949
contain all the data for search - this is normal (see get_stream).
1951
:param repo: A repository.
1952
:param search: A search.
1954
# Fallbacks may be non-smart
1955
if not isinstance(repo, RemoteRepository):
1956
return self._real_stream(repo, search)
1957
client = repo._client
1958
medium = client._medium
1959
path = repo.bzrdir._path_for_remote_call(client)
1960
search_bytes = repo._serialise_search_result(search)
1961
args = (path, self.to_format.network_name())
1963
('Repository.get_stream_1.19', (1, 19)),
1964
('Repository.get_stream', (1, 13))]
1966
for verb, version in candidate_verbs:
1967
if medium._is_remote_before(version):
1970
response = repo._call_with_body_bytes_expecting_body(
1971
verb, args, search_bytes)
1972
except errors.UnknownSmartMethod:
1973
medium._remember_remote_is_before(version)
1975
response_tuple, response_handler = response
1979
return self._real_stream(repo, search)
1980
if response_tuple[0] != 'ok':
1981
raise errors.UnexpectedSmartServerResponse(response_tuple)
1982
byte_stream = response_handler.read_streamed_body()
1983
src_format, stream = smart_repo._byte_stream_to_stream(byte_stream,
1984
self._record_counter)
1985
if src_format.network_name() != repo._format.network_name():
1986
raise AssertionError(
1987
"Mismatched RemoteRepository and stream src %r, %r" % (
1988
src_format.network_name(), repo._format.network_name()))
1991
def missing_parents_chain(self, search, sources):
1992
"""Chain multiple streams together to handle stacking.
1994
:param search: The overall search to satisfy with streams.
1995
:param sources: A list of Repository objects to query.
1997
self.from_serialiser = self.from_repository._format._serializer
1998
self.seen_revs = set()
1999
self.referenced_revs = set()
2000
# If there are heads in the search, or the key count is > 0, we are not
2002
while not search.is_empty() and len(sources) > 1:
2003
source = sources.pop(0)
2004
stream = self._get_stream(source, search)
2005
for kind, substream in stream:
2006
if kind != 'revisions':
2007
yield kind, substream
2009
yield kind, self.missing_parents_rev_handler(substream)
2010
search = search.refine(self.seen_revs, self.referenced_revs)
2011
self.seen_revs = set()
2012
self.referenced_revs = set()
2013
if not search.is_empty():
2014
for kind, stream in self._get_stream(sources[0], search):
2017
def missing_parents_rev_handler(self, substream):
2018
for content in substream:
2019
revision_bytes = content.get_bytes_as('fulltext')
2020
revision = self.from_serialiser.read_revision_from_string(
2022
self.seen_revs.add(content.key[-1])
2023
self.referenced_revs.update(revision.parent_ids)
1223
2027
class RemoteBranchLockableFiles(LockableFiles):
1224
2028
"""A 'LockableFiles' implementation that talks to a smart server.
1226
2030
This is not a public interface class.
1243
2047
class RemoteBranchFormat(branch.BranchFormat):
2049
def __init__(self, network_name=None):
1246
2050
super(RemoteBranchFormat, self).__init__()
1247
2051
self._matchingbzrdir = RemoteBzrDirFormat()
1248
2052
self._matchingbzrdir.set_branch_format(self)
2053
self._custom_format = None
2054
self._network_name = network_name
1250
2056
def __eq__(self, other):
1251
return (isinstance(other, RemoteBranchFormat) and
2057
return (isinstance(other, RemoteBranchFormat) and
1252
2058
self.__dict__ == other.__dict__)
2060
def _ensure_real(self):
2061
if self._custom_format is None:
2062
self._custom_format = branch.network_format_registry.get(
1254
2065
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()
1263
def initialize(self, a_bzrdir):
1264
return a_bzrdir.create_branch()
2067
return 'Remote: ' + self._custom_format.get_format_description()
2069
def network_name(self):
2070
return self._network_name
2072
def open(self, a_bzrdir, name=None, ignore_fallbacks=False):
2073
return a_bzrdir.open_branch(name=name,
2074
ignore_fallbacks=ignore_fallbacks)
2076
def _vfs_initialize(self, a_bzrdir, name):
2077
# Initialisation when using a local bzrdir object, or a non-vfs init
2078
# method is not available on the server.
2079
# self._custom_format is always set - the start of initialize ensures
2081
if isinstance(a_bzrdir, RemoteBzrDir):
2082
a_bzrdir._ensure_real()
2083
result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
2086
# We assume the bzrdir is parameterised; it may not be.
2087
result = self._custom_format.initialize(a_bzrdir, name)
2088
if (isinstance(a_bzrdir, RemoteBzrDir) and
2089
not isinstance(result, RemoteBranch)):
2090
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
2094
def initialize(self, a_bzrdir, name=None):
2095
# 1) get the network name to use.
2096
if self._custom_format:
2097
network_name = self._custom_format.network_name()
2099
# Select the current bzrlib default and ask for that.
2100
reference_bzrdir_format = bzrdir.format_registry.get('default')()
2101
reference_format = reference_bzrdir_format.get_branch_format()
2102
self._custom_format = reference_format
2103
network_name = reference_format.network_name()
2104
# Being asked to create on a non RemoteBzrDir:
2105
if not isinstance(a_bzrdir, RemoteBzrDir):
2106
return self._vfs_initialize(a_bzrdir, name=name)
2107
medium = a_bzrdir._client._medium
2108
if medium._is_remote_before((1, 13)):
2109
return self._vfs_initialize(a_bzrdir, name=name)
2110
# Creating on a remote bzr dir.
2111
# 2) try direct creation via RPC
2112
path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
2113
if name is not None:
2114
# XXX JRV20100304: Support creating colocated branches
2115
raise errors.NoColocatedBranchSupport(self)
2116
verb = 'BzrDir.create_branch'
2118
response = a_bzrdir._call(verb, path, network_name)
2119
except errors.UnknownSmartMethod:
2120
# Fallback - use vfs methods
2121
medium._remember_remote_is_before((1, 13))
2122
return self._vfs_initialize(a_bzrdir, name=name)
2123
if response[0] != 'ok':
2124
raise errors.UnexpectedSmartServerResponse(response)
2125
# Turn the response into a RemoteRepository object.
2126
format = RemoteBranchFormat(network_name=response[1])
2127
repo_format = response_tuple_to_repo_format(response[3:])
2128
if response[2] == '':
2129
repo_bzrdir = a_bzrdir
2131
repo_bzrdir = RemoteBzrDir(
2132
a_bzrdir.root_transport.clone(response[2]), a_bzrdir._format,
2134
remote_repo = RemoteRepository(repo_bzrdir, repo_format)
2135
remote_branch = RemoteBranch(a_bzrdir, remote_repo,
2136
format=format, setup_stacking=False, name=name)
2137
# XXX: We know this is a new branch, so it must have revno 0, revid
2138
# NULL_REVISION. Creating the branch locked would make this be unable
2139
# to be wrong; here its simply very unlikely to be wrong. RBC 20090225
2140
remote_branch._last_revision_info_cache = 0, NULL_REVISION
2141
return remote_branch
2143
def make_tags(self, branch):
2145
return self._custom_format.make_tags(branch)
1266
2147
def supports_tags(self):
1267
2148
# Remote branches might support tags, but we won't know until we
1268
2149
# access the real remote branch.
1272
class RemoteBranch(branch.Branch, _RpcHelper):
2151
return self._custom_format.supports_tags()
2153
def supports_stacking(self):
2155
return self._custom_format.supports_stacking()
2157
def supports_set_append_revisions_only(self):
2159
return self._custom_format.supports_set_append_revisions_only()
2162
class RemoteBranch(branch.Branch, _RpcHelper, lock._RelockDebugMixin):
1273
2163
"""Branch stored on a server accessed by HPSS RPC.
1275
2165
At the moment most operations are mapped down to simple file operations.
1278
2168
def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
2169
_client=None, format=None, setup_stacking=True, name=None):
1280
2170
"""Create a RemoteBranch instance.
1282
2172
:param real_branch: An optional local implementation of the branch
1283
2173
format, usually accessing the data via the VFS.
1284
2174
:param _client: Private parameter for testing.
2175
:param format: A RemoteBranchFormat object, None to create one
2176
automatically. If supplied it should have a network_name already
2178
:param setup_stacking: If True make an RPC call to determine the
2179
stacked (or not) status of the branch. If False assume the branch
2181
:param name: Colocated branch name
1286
2183
# We intentionally don't call the parent class's __init__, because it
1287
2184
# will try to assign to self.tags, which is a property in this subclass.
1288
2185
# 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
2186
self.bzrdir = remote_bzrdir
1295
2187
if _client is not None:
1296
2188
self._client = _client
1443
2356
raise errors.UnexpectedSmartServerResponse(response)
1444
2357
return response[1]
2359
def set_stacked_on_url(self, url):
2360
branch.Branch.set_stacked_on_url(self, url)
2362
self._is_stacked = False
2364
self._is_stacked = True
2366
def _vfs_get_tags_bytes(self):
2368
return self._real_branch._get_tags_bytes()
2370
def _get_tags_bytes(self):
2371
medium = self._client._medium
2372
if medium._is_remote_before((1, 13)):
2373
return self._vfs_get_tags_bytes()
2375
response = self._call('Branch.get_tags_bytes', self._remote_path())
2376
except errors.UnknownSmartMethod:
2377
medium._remember_remote_is_before((1, 13))
2378
return self._vfs_get_tags_bytes()
2381
def _vfs_set_tags_bytes(self, bytes):
2383
return self._real_branch._set_tags_bytes(bytes)
2385
def _set_tags_bytes(self, bytes):
2386
medium = self._client._medium
2387
if medium._is_remote_before((1, 18)):
2388
self._vfs_set_tags_bytes(bytes)
2392
self._remote_path(), self._lock_token, self._repo_lock_token)
2393
response = self._call_with_body_bytes(
2394
'Branch.set_tags_bytes', args, bytes)
2395
except errors.UnknownSmartMethod:
2396
medium._remember_remote_is_before((1, 18))
2397
self._vfs_set_tags_bytes(bytes)
1446
2399
def lock_read(self):
2400
"""Lock the branch for read operations.
2402
:return: A bzrlib.lock.LogicalLockResult.
1447
2404
self.repository.lock_read()
1448
2405
if not self._lock_mode:
2406
self._note_lock('r')
1449
2407
self._lock_mode = 'r'
1450
2408
self._lock_count = 1
1451
2409
if self._real_branch is not None:
1452
2410
self._real_branch.lock_read()
1454
2412
self._lock_count += 1
2413
return lock.LogicalLockResult(self.unlock)
1456
2415
def _remote_lock_write(self, token):
1457
2416
if token is None:
1458
2417
branch_token = repo_token = ''
1460
2419
branch_token = token
1461
repo_token = self.repository.lock_write()
2420
repo_token = self.repository.lock_write().repository_token
1462
2421
self.repository.unlock()
1463
2422
err_context = {'token': token}
1464
response = self._call(
1465
'Branch.lock_write', self._remote_path(), branch_token,
1466
repo_token or '', **err_context)
2424
response = self._call(
2425
'Branch.lock_write', self._remote_path(), branch_token,
2426
repo_token or '', **err_context)
2427
except errors.LockContention, e:
2428
# The LockContention from the server doesn't have any
2429
# information about the lock_url. We re-raise LockContention
2430
# with valid lock_url.
2431
raise errors.LockContention('(remote lock)',
2432
self.repository.base.split('.bzr/')[0])
1467
2433
if response[0] != 'ok':
1468
2434
raise errors.UnexpectedSmartServerResponse(response)
1469
2435
ok, branch_token, repo_token = response
1470
2436
return branch_token, repo_token
1472
2438
def lock_write(self, token=None):
1473
2439
if not self._lock_mode:
2440
self._note_lock('w')
1474
2441
# Lock the branch and repo in one remote call.
1475
2442
remote_tokens = self._remote_lock_write(token)
1476
2443
self._lock_token, self._repo_lock_token = remote_tokens
1613
2622
rev_id = rev_history[-1]
1614
2623
self._set_last_revision(rev_id)
2624
for hook in branch.Branch.hooks['set_rh']:
2625
hook(self, rev_history)
1615
2626
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)
2628
def _get_parent_location(self):
2629
medium = self._client._medium
2630
if medium._is_remote_before((1, 13)):
2631
return self._vfs_get_parent_location()
2633
response = self._call('Branch.get_parent', self._remote_path())
2634
except errors.UnknownSmartMethod:
2635
medium._remember_remote_is_before((1, 13))
2636
return self._vfs_get_parent_location()
2637
if len(response) != 1:
2638
raise errors.UnexpectedSmartServerResponse(response)
2639
parent_location = response[0]
2640
if parent_location == '':
2642
return parent_location
2644
def _vfs_get_parent_location(self):
2646
return self._real_branch._get_parent_location()
2648
def _set_parent_location(self, url):
2649
medium = self._client._medium
2650
if medium._is_remote_before((1, 15)):
2651
return self._vfs_set_parent_location(url)
2653
call_url = url or ''
2654
if type(call_url) is not str:
2655
raise AssertionError('url must be a str or None (%s)' % url)
2656
response = self._call('Branch.set_parent_location',
2657
self._remote_path(), self._lock_token, self._repo_lock_token,
2659
except errors.UnknownSmartMethod:
2660
medium._remember_remote_is_before((1, 15))
2661
return self._vfs_set_parent_location(url)
2663
raise errors.UnexpectedSmartServerResponse(response)
2665
def _vfs_set_parent_location(self, url):
2667
return self._real_branch._set_parent_location(url)
1655
2669
@needs_write_lock
1656
2670
def pull(self, source, overwrite=False, stop_revision=None,
1711
2730
except errors.UnknownSmartMethod:
1712
2731
medium._remember_remote_is_before((1, 6))
1713
2732
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
2733
self.set_revision_history(self._lefthand_history(revision_id,
2734
last_rev=last_rev,other_branch=other_branch))
1723
2736
def set_push_location(self, location):
1724
2737
self._ensure_real()
1725
2738
return self._real_branch.set_push_location(location)
1728
def update_revisions(self, other, stop_revision=None, overwrite=False,
1730
"""See Branch.update_revisions."""
2741
class RemoteConfig(object):
2742
"""A Config that reads and writes from smart verbs.
2744
It is a low-level object that considers config data to be name/value pairs
2745
that may be associated with a section. Assigning meaning to the these
2746
values is done at higher levels like bzrlib.config.TreeConfig.
2749
def get_option(self, name, section=None, default=None):
2750
"""Return the value associated with a named option.
2752
:param name: The name of the value
2753
:param section: The section the option is in (if any)
2754
:param default: The value to return if the value is not set
2755
: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)
2758
configobj = self._get_configobj()
2760
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)
2763
section_obj = configobj[section]
2766
return section_obj.get(name, default)
2767
except errors.UnknownSmartMethod:
2768
return self._vfs_get_option(name, section, default)
2770
def _response_to_configobj(self, response):
2771
if len(response[0]) and response[0][0] != 'ok':
2772
raise errors.UnexpectedSmartServerResponse(response)
2773
lines = response[1].read_body_bytes().splitlines()
2774
return config.ConfigObj(lines, encoding='utf-8')
2777
class RemoteBranchConfig(RemoteConfig):
2778
"""A RemoteConfig for Branches."""
2780
def __init__(self, branch):
2781
self._branch = branch
2783
def _get_configobj(self):
2784
path = self._branch._remote_path()
2785
response = self._branch._client.call_expecting_body(
2786
'Branch.get_config_file', path)
2787
return self._response_to_configobj(response)
2789
def set_option(self, value, name, section=None):
2790
"""Set the value associated with a named option.
2792
:param value: The value to set
2793
:param name: The name of the value to set
2794
:param section: The section the option is in (if any)
2796
medium = self._branch._client._medium
2797
if medium._is_remote_before((1, 14)):
2798
return self._vfs_set_option(value, name, section)
2799
if isinstance(value, dict):
2800
if medium._is_remote_before((2, 2)):
2801
return self._vfs_set_option(value, name, section)
2802
return self._set_config_option_dict(value, name, section)
2804
return self._set_config_option(value, name, section)
2806
def _set_config_option(self, value, name, section):
2808
path = self._branch._remote_path()
2809
response = self._branch._client.call('Branch.set_config_option',
2810
path, self._branch._lock_token, self._branch._repo_lock_token,
2811
value.encode('utf8'), name, section or '')
2812
except errors.UnknownSmartMethod:
2813
medium = self._branch._client._medium
2814
medium._remember_remote_is_before((1, 14))
2815
return self._vfs_set_option(value, name, section)
2817
raise errors.UnexpectedSmartServerResponse(response)
2819
def _serialize_option_dict(self, option_dict):
2821
for key, value in option_dict.items():
2822
if isinstance(key, unicode):
2823
key = key.encode('utf8')
2824
if isinstance(value, unicode):
2825
value = value.encode('utf8')
2826
utf8_dict[key] = value
2827
return bencode.bencode(utf8_dict)
2829
def _set_config_option_dict(self, value, name, section):
2831
path = self._branch._remote_path()
2832
serialised_dict = self._serialize_option_dict(value)
2833
response = self._branch._client.call(
2834
'Branch.set_config_option_dict',
2835
path, self._branch._lock_token, self._branch._repo_lock_token,
2836
serialised_dict, name, section or '')
2837
except errors.UnknownSmartMethod:
2838
medium = self._branch._client._medium
2839
medium._remember_remote_is_before((2, 2))
2840
return self._vfs_set_option(value, name, section)
2842
raise errors.UnexpectedSmartServerResponse(response)
2844
def _real_object(self):
2845
self._branch._ensure_real()
2846
return self._branch._real_branch
2848
def _vfs_set_option(self, value, name, section=None):
2849
return self._real_object()._get_config().set_option(
2850
value, name, section)
2853
class RemoteBzrDirConfig(RemoteConfig):
2854
"""A RemoteConfig for BzrDirs."""
2856
def __init__(self, bzrdir):
2857
self._bzrdir = bzrdir
2859
def _get_configobj(self):
2860
medium = self._bzrdir._client._medium
2861
verb = 'BzrDir.get_config_file'
2862
if medium._is_remote_before((1, 15)):
2863
raise errors.UnknownSmartMethod(verb)
2864
path = self._bzrdir._path_for_remote_call(self._bzrdir._client)
2865
response = self._bzrdir._call_expecting_body(
2867
return self._response_to_configobj(response)
2869
def _vfs_get_option(self, name, section, default):
2870
return self._real_object()._get_config().get_option(
2871
name, section, default)
2873
def set_option(self, value, name, section=None):
2874
"""Set the value associated with a named option.
2876
:param value: The value to set
2877
:param name: The name of the value to set
2878
:param section: The section the option is in (if any)
2880
return self._real_object()._get_config().set_option(
2881
value, name, section)
2883
def _real_object(self):
2884
self._bzrdir._ensure_real()
2885
return self._bzrdir._real_bzrdir
1767
2889
def _extract_tar(tar, to_dir):
added
removed
bzrlib/remote.py
