14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
# TODO: At some point, handle upgrades by just passing the whole request
18
# across to run on the server.
19
22
from bzrlib import (
30
repository as _mod_repository,
32
33
revision as _mod_revision,
36
36
from bzrlib.branch import BranchReferenceFormat
37
37
from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat
38
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
38
from bzrlib.decorators import needs_read_lock, needs_write_lock
39
39
from bzrlib.errors import (
41
41
SmartProtocolError,
61
61
except errors.ErrorFromSmartServer, err:
62
62
self._translate_error(err, **err_context)
64
def _call_with_body_bytes(self, method, args, body_bytes, **err_context):
66
return self._client.call_with_body_bytes(method, args, body_bytes)
67
except errors.ErrorFromSmartServer, err:
68
self._translate_error(err, **err_context)
70
64
def _call_with_body_bytes_expecting_body(self, method, args, body_bytes,
91
85
class RemoteBzrDir(BzrDir, _RpcHelper):
92
86
"""Control directory on a remote server, accessed via bzr:// or similar."""
94
def __init__(self, transport, format, _client=None, _force_probe=False):
88
def __init__(self, transport, format, _client=None):
95
89
"""Construct a RemoteBzrDir.
97
91
:param _client: Private parameter for testing. Disables probing and the
101
95
# this object holds a delegated bzrdir that uses file-level operations
102
96
# to talk to the other side
103
97
self._real_bzrdir = None
104
self._has_working_tree = None
105
98
# 1-shot cache for the call pattern 'create_branch; open_branch' - see
106
99
# create_branch for details.
107
100
self._next_open_branch_result = None
111
104
self._client = client._SmartClient(medium)
113
106
self._client = _client
120
return '%s(%r)' % (self.__class__.__name__, self._client)
122
def _probe_bzrdir(self):
123
medium = self._client._medium
124
109
path = self._path_for_remote_call(self._client)
125
if medium._is_remote_before((2, 1)):
129
self._rpc_open_2_1(path)
131
except errors.UnknownSmartMethod:
132
medium._remember_remote_is_before((2, 1))
135
def _rpc_open_2_1(self, path):
136
response = self._call('BzrDir.open_2.1', path)
137
if response == ('no',):
138
raise errors.NotBranchError(path=self.root_transport.base)
139
elif response[0] == 'yes':
140
if response[1] == 'yes':
141
self._has_working_tree = True
142
elif response[1] == 'no':
143
self._has_working_tree = False
145
raise errors.UnexpectedSmartServerResponse(response)
147
raise errors.UnexpectedSmartServerResponse(response)
149
def _rpc_open(self, path):
150
110
response = self._call('BzrDir.open', path)
151
111
if response not in [('yes',), ('no',)]:
152
112
raise errors.UnexpectedSmartServerResponse(response)
153
113
if response == ('no',):
154
raise errors.NotBranchError(path=self.root_transport.base)
114
raise errors.NotBranchError(path=transport.base)
156
116
def _ensure_real(self):
157
117
"""Ensure that there is a _real_bzrdir set.
159
119
Used before calls to self._real_bzrdir.
161
121
if not self._real_bzrdir:
162
if 'hpssvfs' in debug.debug_flags:
164
warning('VFS BzrDir access triggered\n%s',
165
''.join(traceback.format_stack()))
166
122
self._real_bzrdir = BzrDir.open_from_transport(
167
123
self.root_transport, _server_formats=False)
168
124
self._format._network_name = \
244
200
self._ensure_real()
245
201
self._real_bzrdir.destroy_repository()
247
def create_branch(self, name=None):
203
def create_branch(self):
248
204
# as per meta1 formats - just delegate to the format object which may
249
205
# be parameterised.
250
real_branch = self._format.get_branch_format().initialize(self,
206
real_branch = self._format.get_branch_format().initialize(self)
252
207
if not isinstance(real_branch, RemoteBranch):
253
result = RemoteBranch(self, self.find_repository(), real_branch,
208
result = RemoteBranch(self, self.find_repository(), real_branch)
256
210
result = real_branch
257
211
# BzrDir.clone_on_transport() uses the result of create_branch but does
263
217
self._next_open_branch_result = result
266
def destroy_branch(self, name=None):
220
def destroy_branch(self):
267
221
"""See BzrDir.destroy_branch"""
268
222
self._ensure_real()
269
self._real_bzrdir.destroy_branch(name=name)
223
self._real_bzrdir.destroy_branch()
270
224
self._next_open_branch_result = None
272
226
def create_workingtree(self, revision_id=None, from_branch=None):
291
245
def _get_branch_reference(self):
292
246
path = self._path_for_remote_call(self._client)
293
247
medium = self._client._medium
295
('BzrDir.open_branchV3', (2, 1)),
296
('BzrDir.open_branchV2', (1, 13)),
297
('BzrDir.open_branch', None),
299
for verb, required_version in candidate_calls:
300
if required_version and medium._is_remote_before(required_version):
248
if not medium._is_remote_before((1, 13)):
303
response = self._call(verb, path)
250
response = self._call('BzrDir.open_branchV2', path)
251
if response[0] not in ('ref', 'branch'):
252
raise errors.UnexpectedSmartServerResponse(response)
304
254
except errors.UnknownSmartMethod:
305
if required_version is None:
307
medium._remember_remote_is_before(required_version)
310
if verb == 'BzrDir.open_branch':
311
if response[0] != 'ok':
312
raise errors.UnexpectedSmartServerResponse(response)
313
if response[1] != '':
314
return ('ref', response[1])
316
return ('branch', '')
317
if response[0] not in ('ref', 'branch'):
255
medium._remember_remote_is_before((1, 13))
256
response = self._call('BzrDir.open_branch', path)
257
if response[0] != 'ok':
318
258
raise errors.UnexpectedSmartServerResponse(response)
259
if response[1] != '':
260
return ('ref', response[1])
262
return ('branch', '')
321
264
def _get_tree_branch(self):
322
265
"""See BzrDir._get_tree_branch()."""
323
266
return None, self.open_branch()
325
def open_branch(self, name=None, unsupported=False,
326
ignore_fallbacks=False):
268
def open_branch(self, _unsupported=False, ignore_fallbacks=False):
328
270
raise NotImplementedError('unsupported flag support not implemented yet.')
329
271
if self._next_open_branch_result is not None:
330
272
# See create_branch for details.
335
277
if response[0] == 'ref':
336
278
# a branch reference, use the existing BranchReference logic.
337
279
format = BranchReferenceFormat()
338
return format.open(self, name=name, _found=True,
339
location=response[1], ignore_fallbacks=ignore_fallbacks)
280
return format.open(self, _found=True, location=response[1],
281
ignore_fallbacks=ignore_fallbacks)
340
282
branch_format_name = response[1]
341
283
if not branch_format_name:
342
284
branch_format_name = None
343
285
format = RemoteBranchFormat(network_name=branch_format_name)
344
286
return RemoteBranch(self, self.find_repository(), format=format,
345
setup_stacking=not ignore_fallbacks, name=name)
287
setup_stacking=not ignore_fallbacks)
347
289
def _open_repo_v1(self, path):
348
290
verb = 'BzrDir.find_repository'
410
352
raise errors.NoRepositoryPresent(self)
412
def has_workingtree(self):
413
if self._has_working_tree is None:
415
self._has_working_tree = self._real_bzrdir.has_workingtree()
416
return self._has_working_tree
418
354
def open_workingtree(self, recommend_upgrade=True):
419
if self.has_workingtree():
356
if self._real_bzrdir.has_workingtree():
420
357
raise errors.NotLocalUrl(self.root_transport)
422
359
raise errors.NoWorkingTree(self.root_transport.base)
425
362
"""Return the path to be used for this bzrdir in a remote call."""
426
363
return client.remote_path_from_transport(self.root_transport)
428
def get_branch_transport(self, branch_format, name=None):
365
def get_branch_transport(self, branch_format):
429
366
self._ensure_real()
430
return self._real_bzrdir.get_branch_transport(branch_format, name=name)
367
return self._real_bzrdir.get_branch_transport(branch_format)
432
369
def get_repository_transport(self, repository_format):
433
370
self._ensure_real()
620
553
return self._custom_format._fetch_reconcile
622
555
def get_format_description(self):
624
return 'Remote: ' + self._custom_format.get_format_description()
556
return 'bzr remote repository'
626
558
def __eq__(self, other):
627
559
return self.__class__ is other.__class__
561
def check_conversion_target(self, target_format):
562
if self.rich_root_data and not target_format.rich_root_data:
563
raise errors.BadConversionTarget(
564
'Does not support rich root data.', target_format)
565
if (self.supports_tree_reference and
566
not getattr(target_format, 'supports_tree_reference', False)):
567
raise errors.BadConversionTarget(
568
'Does not support nested trees', target_format)
629
570
def network_name(self):
630
571
if self._network_name:
631
572
return self._network_name
642
583
self._ensure_real()
643
584
return self._custom_format._serializer
646
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
647
bzrdir.ControlComponent):
587
def repository_class(self):
589
return self._custom_format.repository_class
592
class RemoteRepository(_RpcHelper):
648
593
"""Repository accessed over rpc.
650
595
For the moment most operations are performed using local transport-backed
693
638
# Additional places to query for data.
694
639
self._fallback_repositories = []
697
def user_transport(self):
698
return self.bzrdir.user_transport
701
def control_transport(self):
702
# XXX: Normally you shouldn't directly get at the remote repository
703
# transport, but I'm not sure it's worth making this method
704
# optional -- mbp 2010-04-21
705
return self.bzrdir.get_repository_transport(None)
707
641
def __str__(self):
708
642
return "%s(%s)" % (self.__class__.__name__, self.base)
892
826
result.add(_mod_revision.NULL_REVISION)
895
def _has_same_fallbacks(self, other_repo):
896
"""Returns true if the repositories have the same fallbacks."""
897
# XXX: copied from Repository; it should be unified into a base class
898
# <https://bugs.edge.launchpad.net/bzr/+bug/401622>
899
my_fb = self._fallback_repositories
900
other_fb = other_repo._fallback_repositories
901
if len(my_fb) != len(other_fb):
903
for f, g in zip(my_fb, other_fb):
904
if not f.has_same_location(g):
908
829
def has_same_location(self, other):
909
# TODO: Move to RepositoryBase and unify with the regular Repository
910
# one; unfortunately the tests rely on slightly different behaviour at
911
# present -- mbp 20090710
912
830
return (self.__class__ is other.__class__ and
913
831
self.bzrdir.transport.base == other.bzrdir.transport.base)
917
835
parents_provider = self._make_parents_provider(other_repository)
918
836
return graph.Graph(parents_provider)
921
def get_known_graph_ancestry(self, revision_ids):
922
"""Return the known graph for a set of revision ids and their ancestors.
924
st = static_tuple.StaticTuple
925
revision_keys = [st(r_id).intern() for r_id in revision_ids]
926
known_graph = self.revisions.get_known_graph_ancestry(revision_keys)
927
return graph.GraphThunkIdsToKeys(known_graph)
929
838
def gather_stats(self, revid=None, committers=None):
930
839
"""See Repository.gather_stats()."""
931
840
path = self.bzrdir._path_for_remote_call(self._client)
991
900
def is_write_locked(self):
992
901
return self._lock_mode == 'w'
994
def _warn_if_deprecated(self, branch=None):
995
# If we have a real repository, the check will be done there, if we
996
# don't the check will be done remotely.
999
903
def lock_read(self):
1000
904
# wrong eventually - want a local lock cache context
1001
905
if not self._lock_mode:
1002
self._note_lock('r')
1003
906
self._lock_mode = 'r'
1004
907
self._lock_count = 1
1005
908
self._unstacked_provider.enable_cache(cache_misses=True)
1240
1141
# state, so always add a lock here. If a caller passes us a locked
1241
1142
# repository, they are responsible for unlocking it later.
1242
1143
repository.lock_read()
1243
self._check_fallback_repository(repository)
1244
1144
self._fallback_repositories.append(repository)
1245
1145
# If self._real_repository was parameterised already (e.g. because a
1246
1146
# _real_branch had its get_stacked_on_url method called), then the
1247
1147
# repository to be added may already be in the _real_repositories list.
1248
1148
if self._real_repository is not None:
1249
fallback_locations = [repo.user_url for repo in
1149
fallback_locations = [repo.bzrdir.root_transport.base for repo in
1250
1150
self._real_repository._fallback_repositories]
1251
if repository.user_url not in fallback_locations:
1151
if repository.bzrdir.root_transport.base not in fallback_locations:
1252
1152
self._real_repository.add_fallback_repository(repository)
1254
def _check_fallback_repository(self, repository):
1255
"""Check that this repository can fallback to repository safely.
1257
Raise an error if not.
1259
:param repository: A repository to fallback to.
1261
return _mod_repository.InterRepository._assert_same_model(
1264
1154
def add_inventory(self, revid, inv, parents):
1265
1155
self._ensure_real()
1266
1156
return self._real_repository.add_inventory(revid, inv, parents)
1268
1158
def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1269
parents, basis_inv=None, propagate_caches=False):
1270
1160
self._ensure_real()
1271
1161
return self._real_repository.add_inventory_by_delta(basis_revision_id,
1272
delta, new_revision_id, parents, basis_inv=basis_inv,
1273
propagate_caches=propagate_caches)
1162
delta, new_revision_id, parents)
1275
1164
def add_revision(self, rev_id, rev, inv=None, config=None):
1276
1165
self._ensure_real()
1282
1171
self._ensure_real()
1283
1172
return self._real_repository.get_inventory(revision_id)
1285
def iter_inventories(self, revision_ids, ordering=None):
1174
def iter_inventories(self, revision_ids, ordering='unordered'):
1286
1175
self._ensure_real()
1287
1176
return self._real_repository.iter_inventories(revision_ids, ordering)
1354
1243
raise errors.InternalBzrError(
1355
1244
"May not fetch while in a write group.")
1356
1245
# fast path same-url fetch operations
1357
if (self.has_same_location(source)
1358
and fetch_spec is None
1359
and self._has_same_fallbacks(source)):
1246
if self.has_same_location(source) and fetch_spec is None:
1360
1247
# check that last_revision is in 'from' and then return a
1361
1248
# no-operation.
1362
1249
if (revision_id is not None and
1535
1422
return self._real_repository.get_signature_text(revision_id)
1537
1424
@needs_read_lock
1538
def _get_inventory_xml(self, revision_id):
1540
return self._real_repository._get_inventory_xml(revision_id)
1425
def get_inventory_xml(self, revision_id):
1427
return self._real_repository.get_inventory_xml(revision_id)
1429
def deserialise_inventory(self, revision_id, xml):
1431
return self._real_repository.deserialise_inventory(revision_id, xml)
1542
1433
def reconcile(self, other=None, thorough=False):
1543
1434
self._ensure_real()
1570
1461
return self._real_repository.get_revision_reconcile(revision_id)
1572
1463
@needs_read_lock
1573
def check(self, revision_ids=None, callback_refs=None, check_repo=True):
1464
def check(self, revision_ids=None):
1574
1465
self._ensure_real()
1575
return self._real_repository.check(revision_ids=revision_ids,
1576
callback_refs=callback_refs, check_repo=check_repo)
1466
return self._real_repository.check(revision_ids=revision_ids)
1578
1468
def copy_content_into(self, destination, revision_id=None):
1579
1469
self._ensure_real()
1619
1509
return self._real_repository.inventories
1621
1511
@needs_write_lock
1622
def pack(self, hint=None, clean_obsolete_packs=False):
1512
def pack(self, hint=None):
1623
1513
"""Compress the data within the repository.
1625
1515
This is not currently implemented within the smart server.
1627
1517
self._ensure_real()
1628
return self._real_repository.pack(hint=hint, clean_obsolete_packs=clean_obsolete_packs)
1518
return self._real_repository.pack(hint=hint)
1631
1521
def revisions(self):
1719
1609
self._ensure_real()
1720
1610
return self._real_repository.revision_graph_can_have_wrong_parents()
1722
def _find_inconsistent_revision_parents(self, revisions_iterator=None):
1612
def _find_inconsistent_revision_parents(self):
1723
1613
self._ensure_real()
1724
return self._real_repository._find_inconsistent_revision_parents(
1614
return self._real_repository._find_inconsistent_revision_parents()
1727
1616
def _check_for_inconsistent_revision_parents(self):
1728
1617
self._ensure_real()
1772
1661
class RemoteStreamSink(repository.StreamSink):
1663
def __init__(self, target_repo):
1664
repository.StreamSink.__init__(self, target_repo)
1774
1666
def _insert_real(self, stream, src_format, resume_tokens):
1775
1667
self.target_repo._ensure_real()
1776
1668
sink = self.target_repo._real_repository._get_sink()
1782
1674
def insert_stream(self, stream, src_format, resume_tokens):
1783
1675
target = self.target_repo
1784
1676
target._unstacked_provider.missing_keys.clear()
1785
candidate_calls = [('Repository.insert_stream_1.19', (1, 19))]
1677
candidate_calls = [('Repository.insert_stream_1.18', (1, 18))]
1786
1678
if target._lock_token:
1787
1679
candidate_calls.append(('Repository.insert_stream_locked', (1, 14)))
1788
1680
lock_args = (target._lock_token or '',)
1792
1684
client = target._client
1793
1685
medium = client._medium
1794
1686
path = target.bzrdir._path_for_remote_call(client)
1795
# Probe for the verb to use with an empty stream before sending the
1796
# real stream to it. We do this both to avoid the risk of sending a
1797
# large request that is then rejected, and because we don't want to
1798
# implement a way to buffer, rewind, or restart the stream.
1799
1687
found_verb = False
1800
1688
for verb, required_version in candidate_calls:
1801
1689
if medium._is_remote_before(required_version):
1819
1707
return self._insert_real(stream, src_format, resume_tokens)
1820
1708
self._last_inv_record = None
1821
1709
self._last_substream = None
1822
if required_version < (1, 19):
1710
if required_version < (1, 18):
1823
1711
# Remote side doesn't support inventory deltas. Wrap the stream to
1824
1712
# make sure we don't send any. If the stream contains inventory
1825
1713
# deltas we'll interrupt the smart insert_stream request and
1832
1720
(verb, path, resume_tokens) + lock_args, byte_stream)
1833
1721
if response[0][0] not in ('ok', 'missing-basis'):
1834
1722
raise errors.UnexpectedSmartServerResponse(response)
1835
if self._last_substream is not None:
1723
if self._last_inv_record is not None:
1836
1724
# The stream included an inventory-delta record, but the remote
1837
1725
# side isn't new enough to support them. So we need to send the
1838
1726
# rest of the stream via VFS.
1839
self.target_repo.refresh_data()
1840
1727
return self._resume_stream_with_vfs(response, src_format)
1841
1728
if response[0][0] == 'missing-basis':
1842
1729
tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1858
1745
def resume_substream():
1859
# Yield the substream that was interrupted.
1746
# First yield the record we stopped at.
1747
yield self._last_inv_record
1748
self._last_inv_record = None
1749
# Then yield the rest of the substream that was interrupted.
1860
1750
for record in self._last_substream:
1862
1752
self._last_substream = None
1863
1753
def resume_stream():
1864
1754
# Finish sending the interrupted substream
1865
yield ('inventory-deltas', resume_substream())
1755
yield ('inventories', resume_substream())
1866
1756
# Then simply continue sending the rest of the stream.
1867
1757
for substream_kind, substream in self._last_stream:
1868
1758
yield substream_kind, substream
1871
1761
def _stop_stream_if_inventory_delta(self, stream):
1872
1762
"""Normally this just lets the original stream pass-through unchanged.
1874
However if any 'inventory-deltas' substream occurs it will stop
1875
streaming, and store the interrupted substream and stream in
1876
self._last_substream and self._last_stream so that the stream can be
1877
resumed by _resume_stream_with_vfs.
1764
However if any 'inventories' substream includes an inventory-delta
1765
record it will stop streaming, and store the interrupted record,
1766
substream and stream in self._last_inv_record, self._last_substream and
1767
self._last_stream so that the stream can be resumed by
1768
_resume_stream_with_vfs.
1770
def filter_inv_substream(inv_substream):
1771
substream_iter = iter(inv_substream)
1772
for record in substream_iter:
1773
if record.storage_kind == 'inventory-delta':
1774
self._last_inv_record = record
1775
self._last_substream = substream_iter
1880
1780
stream_iter = iter(stream)
1881
1781
for substream_kind, substream in stream_iter:
1882
if substream_kind == 'inventory-deltas':
1883
self._last_substream = substream
1884
self._last_stream = stream_iter
1782
if substream_kind == 'inventories':
1783
yield substream_kind, filter_inv_substream(substream)
1784
if self._last_inv_record is not None:
1785
self._last_stream = stream_iter
1887
1788
yield substream_kind, substream
1894
1795
if (self.from_repository._fallback_repositories and
1895
1796
self.to_format._fetch_order == 'topological'):
1896
1797
return self._real_stream(self.from_repository, search)
1899
repos = [self.from_repository]
1905
repos.extend(repo._fallback_repositories)
1906
sources.append(repo)
1907
return self.missing_parents_chain(search, sources)
1798
return self.missing_parents_chain(search, [self.from_repository] +
1799
self.from_repository._fallback_repositories)
1909
1801
def get_stream_for_missing_keys(self, missing_keys):
1910
1802
self.from_repository._ensure_real()
1924
1816
source = repo._get_source(self.to_format)
1925
1817
if isinstance(source, RemoteStreamSource):
1927
source = repo._real_repository._get_source(self.to_format)
1818
return repository.StreamSource.get_stream(source, search)
1928
1819
return source.get_stream(search)
1930
1821
def _get_stream(self, repo, search):
1951
1842
search_bytes = repo._serialise_search_result(search)
1952
1843
args = (path, self.to_format.network_name())
1953
1844
candidate_verbs = [
1954
('Repository.get_stream_1.19', (1, 19)),
1845
('Repository.get_stream_1.18', (1, 18)),
1955
1846
('Repository.get_stream', (1, 13))]
1956
1847
found_verb = False
1957
1848
for verb, version in candidate_verbs:
1984
1875
:param search: The overall search to satisfy with streams.
1985
1876
:param sources: A list of Repository objects to query.
1987
self.from_serialiser = self.from_repository._format._serializer
1878
self.serialiser = self.to_format._serializer
1988
1879
self.seen_revs = set()
1989
1880
self.referenced_revs = set()
1990
1881
# If there are heads in the search, or the key count is > 0, we are not
2007
1898
def missing_parents_rev_handler(self, substream):
2008
1899
for content in substream:
2009
1900
revision_bytes = content.get_bytes_as('fulltext')
2010
revision = self.from_serialiser.read_revision_from_string(
1901
revision = self.serialiser.read_revision_from_string(revision_bytes)
2012
1902
self.seen_revs.add(content.key[-1])
2013
1903
self.referenced_revs.update(revision.parent_ids)
2053
1943
self._network_name)
2055
1945
def get_format_description(self):
2057
return 'Remote: ' + self._custom_format.get_format_description()
1946
return 'Remote BZR Branch'
2059
1948
def network_name(self):
2060
1949
return self._network_name
2062
def open(self, a_bzrdir, name=None, ignore_fallbacks=False):
2063
return a_bzrdir.open_branch(name=name,
2064
ignore_fallbacks=ignore_fallbacks)
1951
def open(self, a_bzrdir, ignore_fallbacks=False):
1952
return a_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
2066
def _vfs_initialize(self, a_bzrdir, name):
1954
def _vfs_initialize(self, a_bzrdir):
2067
1955
# Initialisation when using a local bzrdir object, or a non-vfs init
2068
1956
# method is not available on the server.
2069
1957
# self._custom_format is always set - the start of initialize ensures
2071
1959
if isinstance(a_bzrdir, RemoteBzrDir):
2072
1960
a_bzrdir._ensure_real()
2073
result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
1961
result = self._custom_format.initialize(a_bzrdir._real_bzrdir)
2076
1963
# We assume the bzrdir is parameterised; it may not be.
2077
result = self._custom_format.initialize(a_bzrdir, name)
1964
result = self._custom_format.initialize(a_bzrdir)
2078
1965
if (isinstance(a_bzrdir, RemoteBzrDir) and
2079
1966
not isinstance(result, RemoteBranch)):
2080
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
1967
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
2084
def initialize(self, a_bzrdir, name=None):
1970
def initialize(self, a_bzrdir):
2085
1971
# 1) get the network name to use.
2086
1972
if self._custom_format:
2087
1973
network_name = self._custom_format.network_name()
2093
1979
network_name = reference_format.network_name()
2094
1980
# Being asked to create on a non RemoteBzrDir:
2095
1981
if not isinstance(a_bzrdir, RemoteBzrDir):
2096
return self._vfs_initialize(a_bzrdir, name=name)
1982
return self._vfs_initialize(a_bzrdir)
2097
1983
medium = a_bzrdir._client._medium
2098
1984
if medium._is_remote_before((1, 13)):
2099
return self._vfs_initialize(a_bzrdir, name=name)
1985
return self._vfs_initialize(a_bzrdir)
2100
1986
# Creating on a remote bzr dir.
2101
1987
# 2) try direct creation via RPC
2102
1988
path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
2103
if name is not None:
2104
# XXX JRV20100304: Support creating colocated branches
2105
raise errors.NoColocatedBranchSupport(self)
2106
1989
verb = 'BzrDir.create_branch'
2108
1991
response = a_bzrdir._call(verb, path, network_name)
2109
1992
except errors.UnknownSmartMethod:
2110
1993
# Fallback - use vfs methods
2111
1994
medium._remember_remote_is_before((1, 13))
2112
return self._vfs_initialize(a_bzrdir, name=name)
1995
return self._vfs_initialize(a_bzrdir)
2113
1996
if response[0] != 'ok':
2114
1997
raise errors.UnexpectedSmartServerResponse(response)
2115
1998
# Turn the response into a RemoteRepository object.
2123
2006
a_bzrdir._client)
2124
2007
remote_repo = RemoteRepository(repo_bzrdir, repo_format)
2125
2008
remote_branch = RemoteBranch(a_bzrdir, remote_repo,
2126
format=format, setup_stacking=False, name=name)
2009
format=format, setup_stacking=False)
2127
2010
# XXX: We know this is a new branch, so it must have revno 0, revid
2128
2011
# NULL_REVISION. Creating the branch locked would make this be unable
2129
2012
# to be wrong; here its simply very unlikely to be wrong. RBC 20090225
2149
2032
return self._custom_format.supports_set_append_revisions_only()
2152
class RemoteBranch(branch.Branch, _RpcHelper, lock._RelockDebugMixin):
2035
class RemoteBranch(branch.Branch, _RpcHelper):
2153
2036
"""Branch stored on a server accessed by HPSS RPC.
2155
2038
At the moment most operations are mapped down to simple file operations.
2158
2041
def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
2159
_client=None, format=None, setup_stacking=True, name=None):
2042
_client=None, format=None, setup_stacking=True):
2160
2043
"""Create a RemoteBranch instance.
2162
2045
:param real_branch: An optional local implementation of the branch
2168
2051
:param setup_stacking: If True make an RPC call to determine the
2169
2052
stacked (or not) status of the branch. If False assume the branch
2170
2053
is not stacked.
2171
:param name: Colocated branch name
2173
2055
# We intentionally don't call the parent class's __init__, because it
2174
2056
# will try to assign to self.tags, which is a property in this subclass.
2193
2075
self._real_branch = None
2194
2076
# Fill out expected attributes of branch for bzrlib API users.
2195
2077
self._clear_cached_state()
2196
# TODO: deprecate self.base in favor of user_url
2197
self.base = self.bzrdir.user_url
2078
self.base = self.bzrdir.root_transport.base
2199
2079
self._control_files = None
2200
2080
self._lock_mode = None
2201
2081
self._lock_token = None
2212
2092
self._real_branch._format.network_name()
2214
2094
self._format = format
2215
# when we do _ensure_real we may need to pass ignore_fallbacks to the
2216
# branch.open_branch method.
2217
self._real_ignore_fallbacks = not setup_stacking
2218
2095
if not self._format._network_name:
2219
2096
# Did not get from open_branchV2 - old server.
2220
2097
self._ensure_real()
2265
2142
raise AssertionError('smart server vfs must be enabled '
2266
2143
'to use vfs implementation')
2267
2144
self.bzrdir._ensure_real()
2268
self._real_branch = self.bzrdir._real_bzrdir.open_branch(
2269
ignore_fallbacks=self._real_ignore_fallbacks, name=self._name)
2145
self._real_branch = self.bzrdir._real_bzrdir.open_branch()
2270
2146
if self.repository._real_repository is None:
2271
2147
# Give the remote repository the matching real repo.
2272
2148
real_repo = self._real_branch.repository
2368
2244
return self._vfs_get_tags_bytes()
2369
2245
return response[0]
2371
def _vfs_set_tags_bytes(self, bytes):
2373
return self._real_branch._set_tags_bytes(bytes)
2375
def _set_tags_bytes(self, bytes):
2376
medium = self._client._medium
2377
if medium._is_remote_before((1, 18)):
2378
self._vfs_set_tags_bytes(bytes)
2382
self._remote_path(), self._lock_token, self._repo_lock_token)
2383
response = self._call_with_body_bytes(
2384
'Branch.set_tags_bytes', args, bytes)
2385
except errors.UnknownSmartMethod:
2386
medium._remember_remote_is_before((1, 18))
2387
self._vfs_set_tags_bytes(bytes)
2389
2247
def lock_read(self):
2390
2248
self.repository.lock_read()
2391
2249
if not self._lock_mode:
2392
self._note_lock('r')
2393
2250
self._lock_mode = 'r'
2394
2251
self._lock_count = 1
2395
2252
if self._real_branch is not None:
2447
2303
self.repository.lock_write(self._repo_lock_token)
2448
2304
return self._lock_token or None
2306
def _set_tags_bytes(self, bytes):
2308
return self._real_branch._set_tags_bytes(bytes)
2450
2310
def _unlock(self, branch_token, repo_token):
2451
2311
err_context = {'token': str((branch_token, repo_token))}
2452
2312
response = self._call(
2873
2731
'Missing key %r in context %r', key_err.args[0], context)
2876
if err.error_verb == 'IncompatibleRepositories':
2877
raise errors.IncompatibleRepositories(err.error_args[0],
2878
err.error_args[1], err.error_args[2])
2879
elif err.error_verb == 'NoSuchRevision':
2734
if err.error_verb == 'NoSuchRevision':
2880
2735
raise NoSuchRevision(find('branch'), err.error_args[0])
2881
2736
elif err.error_verb == 'nosuchrevision':
2882
2737
raise NoSuchRevision(find('repository'), err.error_args[0])
2883
elif err.error_verb == 'nobranch':
2884
if len(err.error_args) >= 1:
2885
extra = err.error_args[0]
2888
raise errors.NotBranchError(path=find('bzrdir').root_transport.base,
2738
elif err.error_tuple == ('nobranch',):
2739
raise errors.NotBranchError(path=find('bzrdir').root_transport.base)
2890
2740
elif err.error_verb == 'norepository':
2891
2741
raise errors.NoRepositoryPresent(find('bzrdir'))
2892
2742
elif err.error_verb == 'LockContention':
added
removed
bzrlib/remote.py
