1
# Copyright (C) 2006, 2007 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
# TODO: At some point, handle upgrades by just passing the whole request
18
# across to run on the server.
20
from cStringIO import StringIO
30
from bzrlib.branch import BranchReferenceFormat
31
from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat
32
from bzrlib.config import BranchConfig, TreeConfig
33
from bzrlib.decorators import needs_read_lock, needs_write_lock
34
from bzrlib.errors import NoSuchRevision
35
from bzrlib.lockable_files import LockableFiles
36
from bzrlib.pack import ContainerPushParser
37
from bzrlib.smart import client, vfs
38
from bzrlib.symbol_versioning import (
42
from bzrlib.revision import NULL_REVISION
43
from bzrlib.trace import note
45
# Note: RemoteBzrDirFormat is in bzrdir.py
47
class RemoteBzrDir(BzrDir):
48
"""Control directory on a remote server, accessed via bzr:// or similar."""
50
def __init__(self, transport, _client=None):
51
"""Construct a RemoteBzrDir.
53
:param _client: Private parameter for testing. Disables probing and the
56
BzrDir.__init__(self, transport, RemoteBzrDirFormat())
57
# this object holds a delegated bzrdir that uses file-level operations
58
# to talk to the other side
59
self._real_bzrdir = None
62
self._shared_medium = transport.get_shared_medium()
63
self._client = client._SmartClient(self._shared_medium)
65
self._client = _client
66
self._shared_medium = None
69
path = self._path_for_remote_call(self._client)
70
response = self._client.call('BzrDir.open', path)
71
if response not in [('yes',), ('no',)]:
72
raise errors.UnexpectedSmartServerResponse(response)
73
if response == ('no',):
74
raise errors.NotBranchError(path=transport.base)
76
def _ensure_real(self):
77
"""Ensure that there is a _real_bzrdir set.
79
Used before calls to self._real_bzrdir.
81
if not self._real_bzrdir:
82
self._real_bzrdir = BzrDir.open_from_transport(
83
self.root_transport, _server_formats=False)
85
def create_repository(self, shared=False):
87
self._real_bzrdir.create_repository(shared=shared)
88
return self.open_repository()
90
def destroy_repository(self):
91
"""See BzrDir.destroy_repository"""
93
self._real_bzrdir.destroy_repository()
95
def create_branch(self):
97
real_branch = self._real_bzrdir.create_branch()
98
return RemoteBranch(self, self.find_repository(), real_branch)
100
def destroy_branch(self):
101
"""See BzrDir.destroy_branch"""
103
self._real_bzrdir.destroy_branch()
105
def create_workingtree(self, revision_id=None, from_branch=None):
106
raise errors.NotLocalUrl(self.transport.base)
108
def find_branch_format(self):
109
"""Find the branch 'format' for this bzrdir.
111
This might be a synthetic object for e.g. RemoteBranch and SVN.
113
b = self.open_branch()
116
def get_branch_reference(self):
117
"""See BzrDir.get_branch_reference()."""
118
path = self._path_for_remote_call(self._client)
119
response = self._client.call('BzrDir.open_branch', path)
120
if response[0] == 'ok':
121
if response[1] == '':
122
# branch at this location.
125
# a branch reference, use the existing BranchReference logic.
127
elif response == ('nobranch',):
128
raise errors.NotBranchError(path=self.root_transport.base)
130
raise errors.UnexpectedSmartServerResponse(response)
132
def open_branch(self, _unsupported=False):
133
assert _unsupported == False, 'unsupported flag support not implemented yet.'
134
reference_url = self.get_branch_reference()
135
if reference_url is None:
136
# branch at this location.
137
return RemoteBranch(self, self.find_repository())
139
# a branch reference, use the existing BranchReference logic.
140
format = BranchReferenceFormat()
141
return format.open(self, _found=True, location=reference_url)
143
def open_repository(self):
144
path = self._path_for_remote_call(self._client)
145
response = self._client.call('BzrDir.find_repository', path)
146
assert response[0] in ('ok', 'norepository'), \
147
'unexpected response code %s' % (response,)
148
if response[0] == 'norepository':
149
raise errors.NoRepositoryPresent(self)
150
assert len(response) == 4, 'incorrect response length %s' % (response,)
151
if response[1] == '':
152
format = RemoteRepositoryFormat()
153
format.rich_root_data = (response[2] == 'yes')
154
format.supports_tree_reference = (response[3] == 'yes')
155
return RemoteRepository(self, format)
157
raise errors.NoRepositoryPresent(self)
159
def open_workingtree(self, recommend_upgrade=True):
161
if self._real_bzrdir.has_workingtree():
162
raise errors.NotLocalUrl(self.root_transport)
164
raise errors.NoWorkingTree(self.root_transport.base)
166
def _path_for_remote_call(self, client):
167
"""Return the path to be used for this bzrdir in a remote call."""
168
return client.remote_path_from_transport(self.root_transport)
170
def get_branch_transport(self, branch_format):
172
return self._real_bzrdir.get_branch_transport(branch_format)
174
def get_repository_transport(self, repository_format):
176
return self._real_bzrdir.get_repository_transport(repository_format)
178
def get_workingtree_transport(self, workingtree_format):
180
return self._real_bzrdir.get_workingtree_transport(workingtree_format)
182
def can_convert_format(self):
183
"""Upgrading of remote bzrdirs is not supported yet."""
186
def needs_format_conversion(self, format=None):
187
"""Upgrading of remote bzrdirs is not supported yet."""
190
def clone(self, url, revision_id=None, force_new_repo=False):
192
return self._real_bzrdir.clone(url, revision_id=revision_id,
193
force_new_repo=force_new_repo)
196
class RemoteRepositoryFormat(repository.RepositoryFormat):
197
"""Format for repositories accessed over a _SmartClient.
199
Instances of this repository are represented by RemoteRepository
202
The RemoteRepositoryFormat is parameterized during construction
203
to reflect the capabilities of the real, remote format. Specifically
204
the attributes rich_root_data and supports_tree_reference are set
205
on a per instance basis, and are not set (and should not be) at
209
_matchingbzrdir = RemoteBzrDirFormat
211
def initialize(self, a_bzrdir, shared=False):
212
assert isinstance(a_bzrdir, RemoteBzrDir), \
213
'%r is not a RemoteBzrDir' % (a_bzrdir,)
214
return a_bzrdir.create_repository(shared=shared)
216
def open(self, a_bzrdir):
217
assert isinstance(a_bzrdir, RemoteBzrDir)
218
return a_bzrdir.open_repository()
220
def get_format_description(self):
221
return 'bzr remote repository'
223
def __eq__(self, other):
224
return self.__class__ == other.__class__
226
def check_conversion_target(self, target_format):
227
if self.rich_root_data and not target_format.rich_root_data:
228
raise errors.BadConversionTarget(
229
'Does not support rich root data.', target_format)
230
if (self.supports_tree_reference and
231
not getattr(target_format, 'supports_tree_reference', False)):
232
raise errors.BadConversionTarget(
233
'Does not support nested trees', target_format)
236
class RemoteRepository(object):
237
"""Repository accessed over rpc.
239
For the moment most operations are performed using local transport-backed
243
def __init__(self, remote_bzrdir, format, real_repository=None, _client=None):
244
"""Create a RemoteRepository instance.
246
:param remote_bzrdir: The bzrdir hosting this repository.
247
:param format: The RemoteFormat object to use.
248
:param real_repository: If not None, a local implementation of the
249
repository logic for the repository, usually accessing the data
251
:param _client: Private testing parameter - override the smart client
252
to be used by the repository.
255
self._real_repository = real_repository
257
self._real_repository = None
258
self.bzrdir = remote_bzrdir
260
self._client = client._SmartClient(self.bzrdir._shared_medium)
262
self._client = _client
263
self._format = format
264
self._lock_mode = None
265
self._lock_token = None
267
self._leave_lock = False
268
# A cache of looked up revision parent data; reset at unlock time.
269
self._parents_map = None
271
# These depend on the actual remote format, so force them off for
272
# maximum compatibility. XXX: In future these should depend on the
273
# remote repository instance, but this is irrelevant until we perform
274
# reconcile via an RPC call.
275
self._reconcile_does_inventory_gc = False
276
self._reconcile_fixes_text_parents = False
277
self._reconcile_backsup_inventory = False
278
self.base = self.bzrdir.transport.base
281
return "%s(%s)" % (self.__class__.__name__, self.base)
285
def abort_write_group(self):
286
"""Complete a write group on the decorated repository.
288
Smart methods peform operations in a single step so this api
289
is not really applicable except as a compatibility thunk
290
for older plugins that don't use e.g. the CommitBuilder
294
return self._real_repository.abort_write_group()
296
def commit_write_group(self):
297
"""Complete a write group on the decorated repository.
299
Smart methods peform operations in a single step so this api
300
is not really applicable except as a compatibility thunk
301
for older plugins that don't use e.g. the CommitBuilder
305
return self._real_repository.commit_write_group()
307
def _ensure_real(self):
308
"""Ensure that there is a _real_repository set.
310
Used before calls to self._real_repository.
312
if not self._real_repository:
313
self.bzrdir._ensure_real()
314
#self._real_repository = self.bzrdir._real_bzrdir.open_repository()
315
self._set_real_repository(self.bzrdir._real_bzrdir.open_repository())
317
def find_text_key_references(self):
318
"""Find the text key references within the repository.
320
:return: a dictionary mapping (file_id, revision_id) tuples to altered file-ids to an iterable of
321
revision_ids. Each altered file-ids has the exact revision_ids that
322
altered it listed explicitly.
323
:return: A dictionary mapping text keys ((fileid, revision_id) tuples)
324
to whether they were referred to by the inventory of the
325
revision_id that they contain. The inventory texts from all present
326
revision ids are assessed to generate this report.
329
return self._real_repository.find_text_key_references()
331
def _generate_text_key_index(self):
332
"""Generate a new text key index for the repository.
334
This is an expensive function that will take considerable time to run.
336
:return: A dict mapping (file_id, revision_id) tuples to a list of
337
parents, also (file_id, revision_id) tuples.
340
return self._real_repository._generate_text_key_index()
342
def get_revision_graph(self, revision_id=None):
343
"""See Repository.get_revision_graph()."""
344
if revision_id is None:
346
elif revision.is_null(revision_id):
349
path = self.bzrdir._path_for_remote_call(self._client)
350
assert type(revision_id) is str
351
response = self._client.call_expecting_body(
352
'Repository.get_revision_graph', path, revision_id)
353
if response[0][0] not in ['ok', 'nosuchrevision']:
354
raise errors.UnexpectedSmartServerResponse(response[0])
355
if response[0][0] == 'ok':
356
coded = response[1].read_body_bytes()
358
# no revisions in this repository!
360
lines = coded.split('\n')
363
d = tuple(line.split())
364
revision_graph[d[0]] = d[1:]
366
return revision_graph
368
response_body = response[1].read_body_bytes()
369
assert response_body == ''
370
raise NoSuchRevision(self, revision_id)
372
def has_revision(self, revision_id):
373
"""See Repository.has_revision()."""
374
if revision_id == NULL_REVISION:
375
# The null revision is always present.
377
path = self.bzrdir._path_for_remote_call(self._client)
378
response = self._client.call('Repository.has_revision', path, revision_id)
379
assert response[0] in ('yes', 'no'), 'unexpected response code %s' % (response,)
380
return response[0] == 'yes'
382
def has_revisions(self, revision_ids):
383
"""See Repository.has_revisions()."""
385
for revision_id in revision_ids:
386
if self.has_revision(revision_id):
387
result.add(revision_id)
390
def has_same_location(self, other):
391
return (self.__class__ == other.__class__ and
392
self.bzrdir.transport.base == other.bzrdir.transport.base)
394
def get_graph(self, other_repository=None):
395
"""Return the graph for this repository format"""
396
parents_provider = self
397
if (other_repository is not None and
398
other_repository.bzrdir.transport.base !=
399
self.bzrdir.transport.base):
400
parents_provider = graph._StackedParentsProvider(
401
[parents_provider, other_repository._make_parents_provider()])
402
return graph.Graph(parents_provider)
404
def gather_stats(self, revid=None, committers=None):
405
"""See Repository.gather_stats()."""
406
path = self.bzrdir._path_for_remote_call(self._client)
407
# revid can be None to indicate no revisions, not just NULL_REVISION
408
if revid is None or revision.is_null(revid):
412
if committers is None or not committers:
413
fmt_committers = 'no'
415
fmt_committers = 'yes'
416
response = self._client.call_expecting_body(
417
'Repository.gather_stats', path, fmt_revid, fmt_committers)
418
assert response[0][0] == 'ok', \
419
'unexpected response code %s' % (response[0],)
421
body = response[1].read_body_bytes()
423
for line in body.split('\n'):
426
key, val_text = line.split(':')
427
if key in ('revisions', 'size', 'committers'):
428
result[key] = int(val_text)
429
elif key in ('firstrev', 'latestrev'):
430
values = val_text.split(' ')[1:]
431
result[key] = (float(values[0]), long(values[1]))
435
def find_branches(self, using=False):
436
"""See Repository.find_branches()."""
437
# should be an API call to the server.
439
return self._real_repository.find_branches(using=using)
441
def get_physical_lock_status(self):
442
"""See Repository.get_physical_lock_status()."""
443
# should be an API call to the server.
445
return self._real_repository.get_physical_lock_status()
447
def is_in_write_group(self):
448
"""Return True if there is an open write group.
450
write groups are only applicable locally for the smart server..
452
if self._real_repository:
453
return self._real_repository.is_in_write_group()
456
return self._lock_count >= 1
459
"""See Repository.is_shared()."""
460
path = self.bzrdir._path_for_remote_call(self._client)
461
response = self._client.call('Repository.is_shared', path)
462
assert response[0] in ('yes', 'no'), 'unexpected response code %s' % (response,)
463
return response[0] == 'yes'
465
def is_write_locked(self):
466
return self._lock_mode == 'w'
469
# wrong eventually - want a local lock cache context
470
if not self._lock_mode:
471
self._lock_mode = 'r'
473
self._parents_map = {}
474
if self._real_repository is not None:
475
self._real_repository.lock_read()
477
self._lock_count += 1
479
def _remote_lock_write(self, token):
480
path = self.bzrdir._path_for_remote_call(self._client)
483
response = self._client.call('Repository.lock_write', path, token)
484
if response[0] == 'ok':
487
elif response[0] == 'LockContention':
488
raise errors.LockContention('(remote lock)')
489
elif response[0] == 'UnlockableTransport':
490
raise errors.UnlockableTransport(self.bzrdir.root_transport)
491
elif response[0] == 'LockFailed':
492
raise errors.LockFailed(response[1], response[2])
494
raise errors.UnexpectedSmartServerResponse(response)
496
def lock_write(self, token=None):
497
if not self._lock_mode:
498
self._lock_token = self._remote_lock_write(token)
499
# if self._lock_token is None, then this is something like packs or
500
# svn where we don't get to lock the repo, or a weave style repository
501
# where we cannot lock it over the wire and attempts to do so will
503
if self._real_repository is not None:
504
self._real_repository.lock_write(token=self._lock_token)
505
if token is not None:
506
self._leave_lock = True
508
self._leave_lock = False
509
self._lock_mode = 'w'
511
self._parents_map = {}
512
elif self._lock_mode == 'r':
513
raise errors.ReadOnlyError(self)
515
self._lock_count += 1
516
return self._lock_token or None
518
def leave_lock_in_place(self):
519
if not self._lock_token:
520
raise NotImplementedError(self.leave_lock_in_place)
521
self._leave_lock = True
523
def dont_leave_lock_in_place(self):
524
if not self._lock_token:
525
raise NotImplementedError(self.dont_leave_lock_in_place)
526
self._leave_lock = False
528
def _set_real_repository(self, repository):
529
"""Set the _real_repository for this repository.
531
:param repository: The repository to fallback to for non-hpss
532
implemented operations.
534
assert not isinstance(repository, RemoteRepository)
535
self._real_repository = repository
536
if self._lock_mode == 'w':
537
# if we are already locked, the real repository must be able to
538
# acquire the lock with our token.
539
self._real_repository.lock_write(self._lock_token)
540
elif self._lock_mode == 'r':
541
self._real_repository.lock_read()
543
def start_write_group(self):
544
"""Start a write group on the decorated repository.
546
Smart methods peform operations in a single step so this api
547
is not really applicable except as a compatibility thunk
548
for older plugins that don't use e.g. the CommitBuilder
552
return self._real_repository.start_write_group()
554
def _unlock(self, token):
555
path = self.bzrdir._path_for_remote_call(self._client)
557
# with no token the remote repository is not persistently locked.
559
response = self._client.call('Repository.unlock', path, token)
560
if response == ('ok',):
562
elif response[0] == 'TokenMismatch':
563
raise errors.TokenMismatch(token, '(remote token)')
565
raise errors.UnexpectedSmartServerResponse(response)
568
self._lock_count -= 1
569
if self._lock_count > 0:
571
self._parents_map = None
572
old_mode = self._lock_mode
573
self._lock_mode = None
575
# The real repository is responsible at present for raising an
576
# exception if it's in an unfinished write group. However, it
577
# normally will *not* actually remove the lock from disk - that's
578
# done by the server on receiving the Repository.unlock call.
579
# This is just to let the _real_repository stay up to date.
580
if self._real_repository is not None:
581
self._real_repository.unlock()
583
# The rpc-level lock should be released even if there was a
584
# problem releasing the vfs-based lock.
586
# Only write-locked repositories need to make a remote method
587
# call to perfom the unlock.
588
old_token = self._lock_token
589
self._lock_token = None
590
if not self._leave_lock:
591
self._unlock(old_token)
593
def break_lock(self):
594
# should hand off to the network
596
return self._real_repository.break_lock()
598
def _get_tarball(self, compression):
599
"""Return a TemporaryFile containing a repository tarball.
601
Returns None if the server does not support sending tarballs.
604
path = self.bzrdir._path_for_remote_call(self._client)
605
response, protocol = self._client.call_expecting_body(
606
'Repository.tarball', path, compression)
607
if response[0] == 'ok':
608
# Extract the tarball and return it
609
t = tempfile.NamedTemporaryFile()
610
# TODO: rpc layer should read directly into it...
611
t.write(protocol.read_body_bytes())
614
if (response == ('error', "Generic bzr smart protocol error: "
615
"bad request 'Repository.tarball'") or
616
response == ('error', "Generic bzr smart protocol error: "
617
"bad request u'Repository.tarball'")):
618
protocol.cancel_read_body()
620
raise errors.UnexpectedSmartServerResponse(response)
622
def sprout(self, to_bzrdir, revision_id=None):
623
# TODO: Option to control what format is created?
625
dest_repo = self._real_repository._format.initialize(to_bzrdir,
627
dest_repo.fetch(self, revision_id=revision_id)
630
### These methods are just thin shims to the VFS object for now.
632
def revision_tree(self, revision_id):
634
return self._real_repository.revision_tree(revision_id)
636
def get_serializer_format(self):
638
return self._real_repository.get_serializer_format()
640
def get_commit_builder(self, branch, parents, config, timestamp=None,
641
timezone=None, committer=None, revprops=None,
643
# FIXME: It ought to be possible to call this without immediately
644
# triggering _ensure_real. For now it's the easiest thing to do.
646
builder = self._real_repository.get_commit_builder(branch, parents,
647
config, timestamp=timestamp, timezone=timezone,
648
committer=committer, revprops=revprops, revision_id=revision_id)
652
def add_inventory(self, revid, inv, parents):
654
return self._real_repository.add_inventory(revid, inv, parents)
657
def add_revision(self, rev_id, rev, inv=None, config=None):
659
return self._real_repository.add_revision(
660
rev_id, rev, inv=inv, config=config)
663
def get_inventory(self, revision_id):
665
return self._real_repository.get_inventory(revision_id)
667
def iter_inventories(self, revision_ids):
669
return self._real_repository.iter_inventories(revision_ids)
672
def get_revision(self, revision_id):
674
return self._real_repository.get_revision(revision_id)
677
def weave_store(self):
679
return self._real_repository.weave_store
681
def get_transaction(self):
683
return self._real_repository.get_transaction()
686
def clone(self, a_bzrdir, revision_id=None):
688
return self._real_repository.clone(a_bzrdir, revision_id=revision_id)
690
def make_working_trees(self):
691
"""RemoteRepositories never create working trees by default."""
694
def fetch(self, source, revision_id=None, pb=None):
695
if self.has_same_location(source):
696
# check that last_revision is in 'from' and then return a
698
if (revision_id is not None and
699
not revision.is_null(revision_id)):
700
self.get_revision(revision_id)
703
return self._real_repository.fetch(
704
source, revision_id=revision_id, pb=pb)
706
def create_bundle(self, target, base, fileobj, format=None):
708
self._real_repository.create_bundle(target, base, fileobj, format)
711
def control_weaves(self):
713
return self._real_repository.control_weaves
716
def get_ancestry(self, revision_id, topo_sorted=True):
718
return self._real_repository.get_ancestry(revision_id, topo_sorted)
721
def get_inventory_weave(self):
723
return self._real_repository.get_inventory_weave()
725
def fileids_altered_by_revision_ids(self, revision_ids):
727
return self._real_repository.fileids_altered_by_revision_ids(revision_ids)
729
def _get_versioned_file_checker(self, revisions, revision_versions_cache):
731
return self._real_repository._get_versioned_file_checker(
732
revisions, revision_versions_cache)
734
def iter_files_bytes(self, desired_files):
735
"""See Repository.iter_file_bytes.
738
return self._real_repository.iter_files_bytes(desired_files)
740
def get_parent_map(self, keys):
741
"""See bzrlib.Graph.get_parent_map()."""
742
# Hack to build up the caching logic.
743
ancestry = self._parents_map
744
missing_revisions = set(key for key in keys if key not in ancestry)
745
if missing_revisions:
746
self._parents_map.update(self._get_parent_map(missing_revisions))
747
return dict((k, ancestry[k]) for k in keys if k in ancestry)
749
def _get_parent_map(self, keys):
750
"""Helper for get_parent_map that performs the RPC."""
752
if NULL_REVISION in keys:
753
keys.discard(NULL_REVISION)
754
found_parents = {NULL_REVISION:()}
759
path = self.bzrdir._path_for_remote_call(self._client)
761
assert type(key) is str
762
response = self._client.call_expecting_body(
763
'Repository.get_parent_map', path, *keys)
764
if response[0][0] not in ['ok']:
765
raise errors.UnexpectedSmartServerResponse(response[0])
766
if response[0][0] == 'ok':
767
coded = response[1].read_body_bytes()
771
lines = coded.split('\n')
774
d = tuple(line.split())
776
revision_graph[d[0]] = d[1:]
778
# No parents - so give the Graph result (NULL_REVISION,).
779
revision_graph[d[0]] = (NULL_REVISION,)
780
return revision_graph
783
def get_signature_text(self, revision_id):
785
return self._real_repository.get_signature_text(revision_id)
788
def get_revision_graph_with_ghosts(self, revision_ids=None):
790
return self._real_repository.get_revision_graph_with_ghosts(
791
revision_ids=revision_ids)
794
def get_inventory_xml(self, revision_id):
796
return self._real_repository.get_inventory_xml(revision_id)
798
def deserialise_inventory(self, revision_id, xml):
800
return self._real_repository.deserialise_inventory(revision_id, xml)
802
def reconcile(self, other=None, thorough=False):
804
return self._real_repository.reconcile(other=other, thorough=thorough)
806
def all_revision_ids(self):
808
return self._real_repository.all_revision_ids()
811
def get_deltas_for_revisions(self, revisions):
813
return self._real_repository.get_deltas_for_revisions(revisions)
816
def get_revision_delta(self, revision_id):
818
return self._real_repository.get_revision_delta(revision_id)
821
def revision_trees(self, revision_ids):
823
return self._real_repository.revision_trees(revision_ids)
826
def get_revision_reconcile(self, revision_id):
828
return self._real_repository.get_revision_reconcile(revision_id)
831
def check(self, revision_ids=None):
833
return self._real_repository.check(revision_ids=revision_ids)
835
def copy_content_into(self, destination, revision_id=None):
837
return self._real_repository.copy_content_into(
838
destination, revision_id=revision_id)
840
def _copy_repository_tarball(self, to_bzrdir, revision_id=None):
841
# get a tarball of the remote repository, and copy from that into the
843
from bzrlib import osutils
846
# TODO: Maybe a progress bar while streaming the tarball?
847
note("Copying repository content as tarball...")
848
tar_file = self._get_tarball('bz2')
851
destination = to_bzrdir.create_repository()
853
tar = tarfile.open('repository', fileobj=tar_file,
855
tmpdir = tempfile.mkdtemp()
857
_extract_tar(tar, tmpdir)
858
tmp_bzrdir = BzrDir.open(tmpdir)
859
tmp_repo = tmp_bzrdir.open_repository()
860
tmp_repo.copy_content_into(destination, revision_id)
862
osutils.rmtree(tmpdir)
866
# TODO: Suggestion from john: using external tar is much faster than
867
# python's tarfile library, but it may not work on windows.
871
"""Compress the data within the repository.
873
This is not currently implemented within the smart server.
876
return self._real_repository.pack()
878
def set_make_working_trees(self, new_value):
879
raise NotImplementedError(self.set_make_working_trees)
882
def sign_revision(self, revision_id, gpg_strategy):
884
return self._real_repository.sign_revision(revision_id, gpg_strategy)
887
def get_revisions(self, revision_ids):
889
return self._real_repository.get_revisions(revision_ids)
891
def supports_rich_root(self):
893
return self._real_repository.supports_rich_root()
895
def iter_reverse_revision_history(self, revision_id):
897
return self._real_repository.iter_reverse_revision_history(revision_id)
900
def _serializer(self):
902
return self._real_repository._serializer
904
def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
906
return self._real_repository.store_revision_signature(
907
gpg_strategy, plaintext, revision_id)
909
def add_signature_text(self, revision_id, signature):
911
return self._real_repository.add_signature_text(revision_id, signature)
913
def has_signature_for_revision_id(self, revision_id):
915
return self._real_repository.has_signature_for_revision_id(revision_id)
917
def get_data_stream(self, revision_ids):
918
REQUEST_NAME = 'Repository.stream_revisions_chunked'
919
path = self.bzrdir._path_for_remote_call(self._client)
920
response, protocol = self._client.call_expecting_body(
921
REQUEST_NAME, path, *revision_ids)
923
if response == ('ok',):
924
return self._deserialise_stream(protocol)
925
elif (response == ('error', "Generic bzr smart protocol error: "
926
"bad request '%s'" % REQUEST_NAME) or
927
response == ('error', "Generic bzr smart protocol error: "
928
"bad request u'%s'" % REQUEST_NAME)):
929
protocol.cancel_read_body()
931
return self._real_repository.get_data_stream(revision_ids)
933
raise errors.UnexpectedSmartServerResponse(response)
935
def _deserialise_stream(self, protocol):
936
stream = protocol.read_streamed_body()
937
container_parser = ContainerPushParser()
939
container_parser.accept_bytes(bytes)
940
records = container_parser.read_pending_records()
941
for record_names, record_bytes in records:
942
if len(record_names) != 1:
943
# These records should have only one name, and that name
944
# should be a one-element tuple.
945
raise errors.SmartProtocolError(
946
'Repository data stream had invalid record name %r'
948
name_tuple = record_names[0]
949
yield name_tuple, record_bytes
951
def insert_data_stream(self, stream):
953
self._real_repository.insert_data_stream(stream)
955
def item_keys_introduced_by(self, revision_ids, _files_pb=None):
957
return self._real_repository.item_keys_introduced_by(revision_ids,
960
def revision_graph_can_have_wrong_parents(self):
961
# The answer depends on the remote repo format.
963
return self._real_repository.revision_graph_can_have_wrong_parents()
965
def _find_inconsistent_revision_parents(self):
967
return self._real_repository._find_inconsistent_revision_parents()
969
def _check_for_inconsistent_revision_parents(self):
971
return self._real_repository._check_for_inconsistent_revision_parents()
973
def _make_parents_provider(self):
977
class RemoteBranchLockableFiles(LockableFiles):
978
"""A 'LockableFiles' implementation that talks to a smart server.
980
This is not a public interface class.
983
def __init__(self, bzrdir, _client):
985
self._client = _client
986
self._need_find_modes = True
987
LockableFiles.__init__(
988
self, bzrdir.get_branch_transport(None),
989
'lock', lockdir.LockDir)
991
def _find_modes(self):
992
# RemoteBranches don't let the client set the mode of control files.
993
self._dir_mode = None
994
self._file_mode = None
997
"""'get' a remote path as per the LockableFiles interface.
999
:param path: the file to 'get'. If this is 'branch.conf', we do not
1000
just retrieve a file, instead we ask the smart server to generate
1001
a configuration for us - which is retrieved as an INI file.
1003
if path == 'branch.conf':
1004
path = self.bzrdir._path_for_remote_call(self._client)
1005
response = self._client.call_expecting_body(
1006
'Branch.get_config_file', path)
1007
assert response[0][0] == 'ok', \
1008
'unexpected response code %s' % (response[0],)
1009
return StringIO(response[1].read_body_bytes())
1012
return LockableFiles.get(self, path)
1015
class RemoteBranchFormat(branch.BranchFormat):
1017
def __eq__(self, other):
1018
return (isinstance(other, RemoteBranchFormat) and
1019
self.__dict__ == other.__dict__)
1021
def get_format_description(self):
1022
return 'Remote BZR Branch'
1024
def get_format_string(self):
1025
return 'Remote BZR Branch'
1027
def open(self, a_bzrdir):
1028
assert isinstance(a_bzrdir, RemoteBzrDir)
1029
return a_bzrdir.open_branch()
1031
def initialize(self, a_bzrdir):
1032
assert isinstance(a_bzrdir, RemoteBzrDir)
1033
return a_bzrdir.create_branch()
1035
def supports_tags(self):
1036
# Remote branches might support tags, but we won't know until we
1037
# access the real remote branch.
1041
class RemoteBranch(branch.Branch):
1042
"""Branch stored on a server accessed by HPSS RPC.
1044
At the moment most operations are mapped down to simple file operations.
1047
def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
1049
"""Create a RemoteBranch instance.
1051
:param real_branch: An optional local implementation of the branch
1052
format, usually accessing the data via the VFS.
1053
:param _client: Private parameter for testing.
1055
# We intentionally don't call the parent class's __init__, because it
1056
# will try to assign to self.tags, which is a property in this subclass.
1057
# And the parent's __init__ doesn't do much anyway.
1058
self._revision_id_to_revno_cache = None
1059
self._revision_history_cache = None
1060
self.bzrdir = remote_bzrdir
1061
if _client is not None:
1062
self._client = _client
1064
self._client = client._SmartClient(self.bzrdir._shared_medium)
1065
self.repository = remote_repository
1066
if real_branch is not None:
1067
self._real_branch = real_branch
1068
# Give the remote repository the matching real repo.
1069
real_repo = self._real_branch.repository
1070
if isinstance(real_repo, RemoteRepository):
1071
real_repo._ensure_real()
1072
real_repo = real_repo._real_repository
1073
self.repository._set_real_repository(real_repo)
1074
# Give the branch the remote repository to let fast-pathing happen.
1075
self._real_branch.repository = self.repository
1077
self._real_branch = None
1078
# Fill out expected attributes of branch for bzrlib api users.
1079
self._format = RemoteBranchFormat()
1080
self.base = self.bzrdir.root_transport.base
1081
self._control_files = None
1082
self._lock_mode = None
1083
self._lock_token = None
1084
self._lock_count = 0
1085
self._leave_lock = False
1088
return "%s(%s)" % (self.__class__.__name__, self.base)
1092
def _ensure_real(self):
1093
"""Ensure that there is a _real_branch set.
1095
Used before calls to self._real_branch.
1097
if not self._real_branch:
1098
assert vfs.vfs_enabled()
1099
self.bzrdir._ensure_real()
1100
self._real_branch = self.bzrdir._real_bzrdir.open_branch()
1101
# Give the remote repository the matching real repo.
1102
real_repo = self._real_branch.repository
1103
if isinstance(real_repo, RemoteRepository):
1104
real_repo._ensure_real()
1105
real_repo = real_repo._real_repository
1106
self.repository._set_real_repository(real_repo)
1107
# Give the branch the remote repository to let fast-pathing happen.
1108
self._real_branch.repository = self.repository
1109
# XXX: deal with _lock_mode == 'w'
1110
if self._lock_mode == 'r':
1111
self._real_branch.lock_read()
1114
def control_files(self):
1115
# Defer actually creating RemoteBranchLockableFiles until its needed,
1116
# because it triggers an _ensure_real that we otherwise might not need.
1117
if self._control_files is None:
1118
self._control_files = RemoteBranchLockableFiles(
1119
self.bzrdir, self._client)
1120
return self._control_files
1122
def _get_checkout_format(self):
1124
return self._real_branch._get_checkout_format()
1126
def get_physical_lock_status(self):
1127
"""See Branch.get_physical_lock_status()."""
1128
# should be an API call to the server, as branches must be lockable.
1130
return self._real_branch.get_physical_lock_status()
1132
def lock_read(self):
1133
if not self._lock_mode:
1134
self._lock_mode = 'r'
1135
self._lock_count = 1
1136
if self._real_branch is not None:
1137
self._real_branch.lock_read()
1139
self._lock_count += 1
1141
def _remote_lock_write(self, token):
1143
branch_token = repo_token = ''
1145
branch_token = token
1146
repo_token = self.repository.lock_write()
1147
self.repository.unlock()
1148
path = self.bzrdir._path_for_remote_call(self._client)
1149
response = self._client.call('Branch.lock_write', path, branch_token,
1151
if response[0] == 'ok':
1152
ok, branch_token, repo_token = response
1153
return branch_token, repo_token
1154
elif response[0] == 'LockContention':
1155
raise errors.LockContention('(remote lock)')
1156
elif response[0] == 'TokenMismatch':
1157
raise errors.TokenMismatch(token, '(remote token)')
1158
elif response[0] == 'UnlockableTransport':
1159
raise errors.UnlockableTransport(self.bzrdir.root_transport)
1160
elif response[0] == 'ReadOnlyError':
1161
raise errors.ReadOnlyError(self)
1162
elif response[0] == 'LockFailed':
1163
raise errors.LockFailed(response[1], response[2])
1165
raise errors.UnexpectedSmartServerResponse(response)
1167
def lock_write(self, token=None):
1168
if not self._lock_mode:
1169
remote_tokens = self._remote_lock_write(token)
1170
self._lock_token, self._repo_lock_token = remote_tokens
1171
assert self._lock_token, 'Remote server did not return a token!'
1172
# TODO: We really, really, really don't want to call _ensure_real
1173
# here, but it's the easiest way to ensure coherency between the
1174
# state of the RemoteBranch and RemoteRepository objects and the
1175
# physical locks. If we don't materialise the real objects here,
1176
# then getting everything in the right state later is complex, so
1177
# for now we just do it the lazy way.
1178
# -- Andrew Bennetts, 2007-02-22.
1180
if self._real_branch is not None:
1181
self._real_branch.repository.lock_write(
1182
token=self._repo_lock_token)
1184
self._real_branch.lock_write(token=self._lock_token)
1186
self._real_branch.repository.unlock()
1187
if token is not None:
1188
self._leave_lock = True
1190
# XXX: this case seems to be unreachable; token cannot be None.
1191
self._leave_lock = False
1192
self._lock_mode = 'w'
1193
self._lock_count = 1
1194
elif self._lock_mode == 'r':
1195
raise errors.ReadOnlyTransaction
1197
if token is not None:
1198
# A token was given to lock_write, and we're relocking, so check
1199
# that the given token actually matches the one we already have.
1200
if token != self._lock_token:
1201
raise errors.TokenMismatch(token, self._lock_token)
1202
self._lock_count += 1
1203
return self._lock_token or None
1205
def _unlock(self, branch_token, repo_token):
1206
path = self.bzrdir._path_for_remote_call(self._client)
1207
response = self._client.call('Branch.unlock', path, branch_token,
1209
if response == ('ok',):
1211
elif response[0] == 'TokenMismatch':
1212
raise errors.TokenMismatch(
1213
str((branch_token, repo_token)), '(remote tokens)')
1215
raise errors.UnexpectedSmartServerResponse(response)
1218
self._lock_count -= 1
1219
if not self._lock_count:
1220
self._clear_cached_state()
1221
mode = self._lock_mode
1222
self._lock_mode = None
1223
if self._real_branch is not None:
1224
if (not self._leave_lock and mode == 'w' and
1225
self._repo_lock_token):
1226
# If this RemoteBranch will remove the physical lock for the
1227
# repository, make sure the _real_branch doesn't do it
1228
# first. (Because the _real_branch's repository is set to
1229
# be the RemoteRepository.)
1230
self._real_branch.repository.leave_lock_in_place()
1231
self._real_branch.unlock()
1233
# Only write-locked branched need to make a remote method call
1234
# to perfom the unlock.
1236
assert self._lock_token, 'Locked, but no token!'
1237
branch_token = self._lock_token
1238
repo_token = self._repo_lock_token
1239
self._lock_token = None
1240
self._repo_lock_token = None
1241
if not self._leave_lock:
1242
self._unlock(branch_token, repo_token)
1244
def break_lock(self):
1246
return self._real_branch.break_lock()
1248
def leave_lock_in_place(self):
1249
if not self._lock_token:
1250
raise NotImplementedError(self.leave_lock_in_place)
1251
self._leave_lock = True
1253
def dont_leave_lock_in_place(self):
1254
if not self._lock_token:
1255
raise NotImplementedError(self.dont_leave_lock_in_place)
1256
self._leave_lock = False
1258
def last_revision_info(self):
1259
"""See Branch.last_revision_info()."""
1260
path = self.bzrdir._path_for_remote_call(self._client)
1261
response = self._client.call('Branch.last_revision_info', path)
1262
assert response[0] == 'ok', 'unexpected response code %s' % (response,)
1263
revno = int(response[1])
1264
last_revision = response[2]
1265
return (revno, last_revision)
1267
def _gen_revision_history(self):
1268
"""See Branch._gen_revision_history()."""
1269
path = self.bzrdir._path_for_remote_call(self._client)
1270
response = self._client.call_expecting_body(
1271
'Branch.revision_history', path)
1272
assert response[0][0] == 'ok', ('unexpected response code %s'
1274
result = response[1].read_body_bytes().split('\x00')
1280
def set_revision_history(self, rev_history):
1281
# Send just the tip revision of the history; the server will generate
1282
# the full history from that. If the revision doesn't exist in this
1283
# branch, NoSuchRevision will be raised.
1284
path = self.bzrdir._path_for_remote_call(self._client)
1285
if rev_history == []:
1288
rev_id = rev_history[-1]
1289
self._clear_cached_state()
1290
response = self._client.call('Branch.set_last_revision',
1291
path, self._lock_token, self._repo_lock_token, rev_id)
1292
if response[0] == 'NoSuchRevision':
1293
raise NoSuchRevision(self, rev_id)
1295
assert response == ('ok',), (
1296
'unexpected response code %r' % (response,))
1297
self._cache_revision_history(rev_history)
1299
def get_parent(self):
1301
return self._real_branch.get_parent()
1303
def set_parent(self, url):
1305
return self._real_branch.set_parent(url)
1307
def get_config(self):
1308
return RemoteBranchConfig(self)
1310
def sprout(self, to_bzrdir, revision_id=None):
1311
# Like Branch.sprout, except that it sprouts a branch in the default
1312
# format, because RemoteBranches can't be created at arbitrary URLs.
1313
# XXX: if to_bzrdir is a RemoteBranch, this should perhaps do
1314
# to_bzrdir.create_branch...
1316
result = self._real_branch._format.initialize(to_bzrdir)
1317
self.copy_content_into(result, revision_id=revision_id)
1318
result.set_parent(self.bzrdir.root_transport.base)
1322
def pull(self, source, overwrite=False, stop_revision=None,
1324
# FIXME: This asks the real branch to run the hooks, which means
1325
# they're called with the wrong target branch parameter.
1326
# The test suite specifically allows this at present but it should be
1327
# fixed. It should get a _override_hook_target branch,
1328
# as push does. -- mbp 20070405
1330
self._real_branch.pull(
1331
source, overwrite=overwrite, stop_revision=stop_revision,
1335
def push(self, target, overwrite=False, stop_revision=None):
1337
return self._real_branch.push(
1338
target, overwrite=overwrite, stop_revision=stop_revision,
1339
_override_hook_source_branch=self)
1341
def is_locked(self):
1342
return self._lock_count >= 1
1344
def set_last_revision_info(self, revno, revision_id):
1346
self._clear_cached_state()
1347
return self._real_branch.set_last_revision_info(revno, revision_id)
1349
def generate_revision_history(self, revision_id, last_rev=None,
1352
return self._real_branch.generate_revision_history(
1353
revision_id, last_rev=last_rev, other_branch=other_branch)
1358
return self._real_branch.tags
1360
def set_push_location(self, location):
1362
return self._real_branch.set_push_location(location)
1364
def update_revisions(self, other, stop_revision=None, overwrite=False):
1366
return self._real_branch.update_revisions(
1367
other, stop_revision=stop_revision, overwrite=overwrite)
1370
class RemoteBranchConfig(BranchConfig):
1373
self.branch._ensure_real()
1374
return self.branch._real_branch.get_config().username()
1376
def _get_branch_data_config(self):
1377
self.branch._ensure_real()
1378
if self._branch_data_config is None:
1379
self._branch_data_config = TreeConfig(self.branch._real_branch)
1380
return self._branch_data_config
1383
def _extract_tar(tar, to_dir):
1384
"""Extract all the contents of a tarfile object.
1386
A replacement for extractall, which is not present in python2.4
1389
tar.extract(tarinfo, to_dir)
added
removed
bzrlib/remote.py
