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
revision as _mod_revision,
36
from bzrlib.branch import BranchReferenceFormat, BranchWriteLockResult
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,
62
62
except errors.ErrorFromSmartServer, err:
63
63
self._translate_error(err, **err_context)
65
def _call_with_body_bytes(self, method, args, body_bytes, **err_context):
67
return self._client.call_with_body_bytes(method, args, body_bytes)
68
except errors.ErrorFromSmartServer, err:
69
self._translate_error(err, **err_context)
71
65
def _call_with_body_bytes_expecting_body(self, method, args, body_bytes,
112
105
self._client = client._SmartClient(medium)
114
107
self._client = _client
121
return '%s(%r)' % (self.__class__.__name__, self._client)
123
def _probe_bzrdir(self):
124
medium = self._client._medium
125
110
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):
151
111
response = self._call('BzrDir.open', path)
152
112
if response not in [('yes',), ('no',)]:
153
113
raise errors.UnexpectedSmartServerResponse(response)
154
114
if response == ('no',):
155
raise errors.NotBranchError(path=self.root_transport.base)
115
raise errors.NotBranchError(path=transport.base)
157
117
def _ensure_real(self):
158
118
"""Ensure that there is a _real_bzrdir set.
245
201
self._ensure_real()
246
202
self._real_bzrdir.destroy_repository()
248
def create_branch(self, name=None):
204
def create_branch(self):
249
205
# as per meta1 formats - just delegate to the format object which may
250
206
# be parameterised.
251
real_branch = self._format.get_branch_format().initialize(self,
207
real_branch = self._format.get_branch_format().initialize(self)
253
208
if not isinstance(real_branch, RemoteBranch):
254
result = RemoteBranch(self, self.find_repository(), real_branch,
209
result = RemoteBranch(self, self.find_repository(), real_branch)
257
211
result = real_branch
258
212
# BzrDir.clone_on_transport() uses the result of create_branch but does
292
246
def _get_branch_reference(self):
293
247
path = self._path_for_remote_call(self._client)
294
248
medium = self._client._medium
296
('BzrDir.open_branchV3', (2, 1)),
297
('BzrDir.open_branchV2', (1, 13)),
298
('BzrDir.open_branch', None),
300
for verb, required_version in candidate_calls:
301
if required_version and medium._is_remote_before(required_version):
249
if not medium._is_remote_before((1, 13)):
304
response = self._call(verb, path)
251
response = self._call('BzrDir.open_branchV2', path)
252
if response[0] not in ('ref', 'branch'):
253
raise errors.UnexpectedSmartServerResponse(response)
305
255
except errors.UnknownSmartMethod:
306
if required_version is None:
308
medium._remember_remote_is_before(required_version)
311
if verb == 'BzrDir.open_branch':
312
if response[0] != 'ok':
313
raise errors.UnexpectedSmartServerResponse(response)
314
if response[1] != '':
315
return ('ref', response[1])
317
return ('branch', '')
318
if response[0] not in ('ref', 'branch'):
256
medium._remember_remote_is_before((1, 13))
257
response = self._call('BzrDir.open_branch', path)
258
if response[0] != 'ok':
319
259
raise errors.UnexpectedSmartServerResponse(response)
260
if response[1] != '':
261
return ('ref', response[1])
263
return ('branch', '')
322
265
def _get_tree_branch(self):
323
266
"""See BzrDir._get_tree_branch()."""
324
267
return None, self.open_branch()
326
def open_branch(self, name=None, unsupported=False,
327
ignore_fallbacks=False):
269
def open_branch(self, _unsupported=False, ignore_fallbacks=False):
329
271
raise NotImplementedError('unsupported flag support not implemented yet.')
330
272
if self._next_open_branch_result is not None:
331
273
# See create_branch for details.
336
278
if response[0] == 'ref':
337
279
# a branch reference, use the existing BranchReference logic.
338
280
format = BranchReferenceFormat()
339
return format.open(self, name=name, _found=True,
340
location=response[1], ignore_fallbacks=ignore_fallbacks)
281
return format.open(self, _found=True, location=response[1],
282
ignore_fallbacks=ignore_fallbacks)
341
283
branch_format_name = response[1]
342
284
if not branch_format_name:
343
285
branch_format_name = None
344
286
format = RemoteBranchFormat(network_name=branch_format_name)
345
287
return RemoteBranch(self, self.find_repository(), format=format,
346
setup_stacking=not ignore_fallbacks, name=name)
288
setup_stacking=not ignore_fallbacks)
348
290
def _open_repo_v1(self, path):
349
291
verb = 'BzrDir.find_repository'
621
545
return self._custom_format._fetch_reconcile
623
547
def get_format_description(self):
625
return 'Remote: ' + self._custom_format.get_format_description()
548
return 'bzr remote repository'
627
550
def __eq__(self, other):
628
551
return self.__class__ is other.__class__
553
def check_conversion_target(self, target_format):
554
if self.rich_root_data and not target_format.rich_root_data:
555
raise errors.BadConversionTarget(
556
'Does not support rich root data.', target_format)
557
if (self.supports_tree_reference and
558
not getattr(target_format, 'supports_tree_reference', False)):
559
raise errors.BadConversionTarget(
560
'Does not support nested trees', target_format)
630
562
def network_name(self):
631
563
if self._network_name:
632
564
return self._network_name
753
666
self._ensure_real()
754
667
return self._real_repository.suspend_write_group()
756
def get_missing_parent_inventories(self, check_for_missing_texts=True):
758
return self._real_repository.get_missing_parent_inventories(
759
check_for_missing_texts=check_for_missing_texts)
761
def _get_rev_id_for_revno_vfs(self, revno, known_pair):
763
return self._real_repository.get_rev_id_for_revno(
766
def get_rev_id_for_revno(self, revno, known_pair):
767
"""See Repository.get_rev_id_for_revno."""
768
path = self.bzrdir._path_for_remote_call(self._client)
770
if self._client._medium._is_remote_before((1, 17)):
771
return self._get_rev_id_for_revno_vfs(revno, known_pair)
772
response = self._call(
773
'Repository.get_rev_id_for_revno', path, revno, known_pair)
774
except errors.UnknownSmartMethod:
775
self._client._medium._remember_remote_is_before((1, 17))
776
return self._get_rev_id_for_revno_vfs(revno, known_pair)
777
if response[0] == 'ok':
778
return True, response[1]
779
elif response[0] == 'history-incomplete':
780
known_pair = response[1:3]
781
for fallback in self._fallback_repositories:
782
found, result = fallback.get_rev_id_for_revno(revno, known_pair)
787
# Not found in any fallbacks
788
return False, known_pair
790
raise errors.UnexpectedSmartServerResponse(response)
669
def get_missing_parent_inventories(self):
671
return self._real_repository.get_missing_parent_inventories()
792
673
def _ensure_real(self):
793
674
"""Ensure that there is a _real_repository set.
873
749
"""Return a source for streaming from this repository."""
874
750
return RemoteStreamSource(self, to_format)
877
752
def has_revision(self, revision_id):
878
"""True if this repository has a copy of the revision."""
879
# Copy of bzrlib.repository.Repository.has_revision
880
return revision_id in self.has_revisions((revision_id,))
753
"""See Repository.has_revision()."""
754
if revision_id == NULL_REVISION:
755
# The null revision is always present.
757
path = self.bzrdir._path_for_remote_call(self._client)
758
response = self._call('Repository.has_revision', path, revision_id)
759
if response[0] not in ('yes', 'no'):
760
raise errors.UnexpectedSmartServerResponse(response)
761
if response[0] == 'yes':
763
for fallback_repo in self._fallback_repositories:
764
if fallback_repo.has_revision(revision_id):
883
768
def has_revisions(self, revision_ids):
884
"""Probe to find out the presence of multiple revisions.
886
:param revision_ids: An iterable of revision_ids.
887
:return: A set of the revision_ids that were present.
889
# Copy of bzrlib.repository.Repository.has_revisions
890
parent_map = self.get_parent_map(revision_ids)
891
result = set(parent_map)
892
if _mod_revision.NULL_REVISION in revision_ids:
893
result.add(_mod_revision.NULL_REVISION)
769
"""See Repository.has_revisions()."""
770
# FIXME: This does many roundtrips, particularly when there are
771
# fallback repositories. -- mbp 20080905
773
for revision_id in revision_ids:
774
if self.has_revision(revision_id):
775
result.add(revision_id)
896
def _has_same_fallbacks(self, other_repo):
897
"""Returns true if the repositories have the same fallbacks."""
898
# XXX: copied from Repository; it should be unified into a base class
899
# <https://bugs.edge.launchpad.net/bzr/+bug/401622>
900
my_fb = self._fallback_repositories
901
other_fb = other_repo._fallback_repositories
902
if len(my_fb) != len(other_fb):
904
for f, g in zip(my_fb, other_fb):
905
if not f.has_same_location(g):
909
778
def has_same_location(self, other):
910
# TODO: Move to RepositoryBase and unify with the regular Repository
911
# one; unfortunately the tests rely on slightly different behaviour at
912
# present -- mbp 20090710
913
779
return (self.__class__ is other.__class__ and
914
780
self.bzrdir.transport.base == other.bzrdir.transport.base)
918
784
parents_provider = self._make_parents_provider(other_repository)
919
785
return graph.Graph(parents_provider)
922
def get_known_graph_ancestry(self, revision_ids):
923
"""Return the known graph for a set of revision ids and their ancestors.
925
st = static_tuple.StaticTuple
926
revision_keys = [st(r_id).intern() for r_id in revision_ids]
927
known_graph = self.revisions.get_known_graph_ancestry(revision_keys)
928
return graph.GraphThunkIdsToKeys(known_graph)
930
787
def gather_stats(self, revid=None, committers=None):
931
788
"""See Repository.gather_stats()."""
932
789
path = self.bzrdir._path_for_remote_call(self._client)
992
849
def is_write_locked(self):
993
850
return self._lock_mode == 'w'
995
def _warn_if_deprecated(self, branch=None):
996
# If we have a real repository, the check will be done there, if we
997
# don't the check will be done remotely.
1000
852
def lock_read(self):
1001
"""Lock the repository for read operations.
1003
:return: An object with an unlock method which will release the lock
1006
853
# wrong eventually - want a local lock cache context
1007
854
if not self._lock_mode:
1008
self._note_lock('r')
1009
855
self._lock_mode = 'r'
1010
856
self._lock_count = 1
1011
857
self._unstacked_provider.enable_cache(cache_misses=True)
1012
858
if self._real_repository is not None:
1013
859
self._real_repository.lock_read()
1014
for repo in self._fallback_repositories:
1017
861
self._lock_count += 1
862
for repo in self._fallback_repositories:
1020
865
def _remote_lock_write(self, token):
1021
866
path = self.bzrdir._path_for_remote_call(self._client)
1242
1080
# We need to accumulate additional repositories here, to pass them in
1243
1081
# on various RPC's.
1245
if self.is_locked():
1246
# We will call fallback.unlock() when we transition to the unlocked
1247
# state, so always add a lock here. If a caller passes us a locked
1248
# repository, they are responsible for unlocking it later.
1249
repository.lock_read()
1250
self._check_fallback_repository(repository)
1251
1083
self._fallback_repositories.append(repository)
1252
1084
# If self._real_repository was parameterised already (e.g. because a
1253
1085
# _real_branch had its get_stacked_on_url method called), then the
1254
1086
# repository to be added may already be in the _real_repositories list.
1255
1087
if self._real_repository is not None:
1256
fallback_locations = [repo.user_url for repo in
1088
fallback_locations = [repo.bzrdir.root_transport.base for repo in
1257
1089
self._real_repository._fallback_repositories]
1258
if repository.user_url not in fallback_locations:
1090
if repository.bzrdir.root_transport.base not in fallback_locations:
1259
1091
self._real_repository.add_fallback_repository(repository)
1261
def _check_fallback_repository(self, repository):
1262
"""Check that this repository can fallback to repository safely.
1264
Raise an error if not.
1266
:param repository: A repository to fallback to.
1268
return _mod_repository.InterRepository._assert_same_model(
1271
1093
def add_inventory(self, revid, inv, parents):
1272
1094
self._ensure_real()
1273
1095
return self._real_repository.add_inventory(revid, inv, parents)
1275
1097
def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1276
parents, basis_inv=None, propagate_caches=False):
1277
1099
self._ensure_real()
1278
1100
return self._real_repository.add_inventory_by_delta(basis_revision_id,
1279
delta, new_revision_id, parents, basis_inv=basis_inv,
1280
propagate_caches=propagate_caches)
1101
delta, new_revision_id, parents)
1282
1103
def add_revision(self, rev_id, rev, inv=None, config=None):
1283
1104
self._ensure_real()
1789
1610
def insert_stream(self, stream, src_format, resume_tokens):
1790
1611
target = self.target_repo
1791
target._unstacked_provider.missing_keys.clear()
1792
candidate_calls = [('Repository.insert_stream_1.19', (1, 19))]
1793
1612
if target._lock_token:
1794
candidate_calls.append(('Repository.insert_stream_locked', (1, 14)))
1795
lock_args = (target._lock_token or '',)
1613
verb = 'Repository.insert_stream_locked'
1614
extra_args = (target._lock_token or '',)
1615
required_version = (1, 14)
1797
candidate_calls.append(('Repository.insert_stream', (1, 13)))
1617
verb = 'Repository.insert_stream'
1619
required_version = (1, 13)
1799
1620
client = target._client
1800
1621
medium = client._medium
1622
if medium._is_remote_before(required_version):
1623
# No possible way this can work.
1624
return self._insert_real(stream, src_format, resume_tokens)
1801
1625
path = target.bzrdir._path_for_remote_call(client)
1802
# Probe for the verb to use with an empty stream before sending the
1803
# real stream to it. We do this both to avoid the risk of sending a
1804
# large request that is then rejected, and because we don't want to
1805
# implement a way to buffer, rewind, or restart the stream.
1807
for verb, required_version in candidate_calls:
1808
if medium._is_remote_before(required_version):
1811
# We've already done the probing (and set _is_remote_before) on
1812
# a previous insert.
1626
if not resume_tokens:
1627
# XXX: Ugly but important for correctness, *will* be fixed during
1628
# 1.13 cycle. Pushing a stream that is interrupted results in a
1629
# fallback to the _real_repositories sink *with a partial stream*.
1630
# Thats bad because we insert less data than bzr expected. To avoid
1631
# this we do a trial push to make sure the verb is accessible, and
1632
# do not fallback when actually pushing the stream. A cleanup patch
1633
# is going to look at rewinding/restarting the stream/partial
1815
1635
byte_stream = smart_repo._stream_to_byte_stream([], src_format)
1817
1637
response = client.call_with_body_stream(
1818
(verb, path, '') + lock_args, byte_stream)
1638
(verb, path, '') + extra_args, byte_stream)
1819
1639
except errors.UnknownSmartMethod:
1820
1640
medium._remember_remote_is_before(required_version)
1826
return self._insert_real(stream, src_format, resume_tokens)
1827
self._last_inv_record = None
1828
self._last_substream = None
1829
if required_version < (1, 19):
1830
# Remote side doesn't support inventory deltas. Wrap the stream to
1831
# make sure we don't send any. If the stream contains inventory
1832
# deltas we'll interrupt the smart insert_stream request and
1834
stream = self._stop_stream_if_inventory_delta(stream)
1641
return self._insert_real(stream, src_format, resume_tokens)
1835
1642
byte_stream = smart_repo._stream_to_byte_stream(
1836
1643
stream, src_format)
1837
1644
resume_tokens = ' '.join(resume_tokens)
1838
1645
response = client.call_with_body_stream(
1839
(verb, path, resume_tokens) + lock_args, byte_stream)
1646
(verb, path, resume_tokens) + extra_args, byte_stream)
1840
1647
if response[0][0] not in ('ok', 'missing-basis'):
1841
1648
raise errors.UnexpectedSmartServerResponse(response)
1842
if self._last_substream is not None:
1843
# The stream included an inventory-delta record, but the remote
1844
# side isn't new enough to support them. So we need to send the
1845
# rest of the stream via VFS.
1846
self.target_repo.refresh_data()
1847
return self._resume_stream_with_vfs(response, src_format)
1848
1649
if response[0][0] == 'missing-basis':
1849
1650
tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1850
1651
resume_tokens = tokens
1853
1654
self.target_repo.refresh_data()
1854
1655
return [], set()
1856
def _resume_stream_with_vfs(self, response, src_format):
1857
"""Resume sending a stream via VFS, first resending the record and
1858
substream that couldn't be sent via an insert_stream verb.
1860
if response[0][0] == 'missing-basis':
1861
tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1862
# Ignore missing_keys, we haven't finished inserting yet
1865
def resume_substream():
1866
# Yield the substream that was interrupted.
1867
for record in self._last_substream:
1869
self._last_substream = None
1870
def resume_stream():
1871
# Finish sending the interrupted substream
1872
yield ('inventory-deltas', resume_substream())
1873
# Then simply continue sending the rest of the stream.
1874
for substream_kind, substream in self._last_stream:
1875
yield substream_kind, substream
1876
return self._insert_real(resume_stream(), src_format, tokens)
1878
def _stop_stream_if_inventory_delta(self, stream):
1879
"""Normally this just lets the original stream pass-through unchanged.
1881
However if any 'inventory-deltas' substream occurs it will stop
1882
streaming, and store the interrupted substream and stream in
1883
self._last_substream and self._last_stream so that the stream can be
1884
resumed by _resume_stream_with_vfs.
1887
stream_iter = iter(stream)
1888
for substream_kind, substream in stream_iter:
1889
if substream_kind == 'inventory-deltas':
1890
self._last_substream = substream
1891
self._last_stream = stream_iter
1894
yield substream_kind, substream
1897
1658
class RemoteStreamSource(repository.StreamSource):
1898
1659
"""Stream data from a remote server."""
1901
1662
if (self.from_repository._fallback_repositories and
1902
1663
self.to_format._fetch_order == 'topological'):
1903
1664
return self._real_stream(self.from_repository, search)
1906
repos = [self.from_repository]
1912
repos.extend(repo._fallback_repositories)
1913
sources.append(repo)
1914
return self.missing_parents_chain(search, sources)
1916
def get_stream_for_missing_keys(self, missing_keys):
1917
self.from_repository._ensure_real()
1918
real_repo = self.from_repository._real_repository
1919
real_source = real_repo._get_source(self.to_format)
1920
return real_source.get_stream_for_missing_keys(missing_keys)
1665
return self.missing_parents_chain(search, [self.from_repository] +
1666
self.from_repository._fallback_repositories)
1922
1668
def _real_stream(self, repo, search):
1923
1669
"""Get a stream for search from repo.
1954
1699
return self._real_stream(repo, search)
1955
1700
client = repo._client
1956
1701
medium = client._medium
1702
if medium._is_remote_before((1, 13)):
1703
# streaming was added in 1.13
1704
return self._real_stream(repo, search)
1957
1705
path = repo.bzrdir._path_for_remote_call(client)
1958
search_bytes = repo._serialise_search_result(search)
1959
args = (path, self.to_format.network_name())
1961
('Repository.get_stream_1.19', (1, 19)),
1962
('Repository.get_stream', (1, 13))]
1964
for verb, version in candidate_verbs:
1965
if medium._is_remote_before(version):
1968
response = repo._call_with_body_bytes_expecting_body(
1969
verb, args, search_bytes)
1970
except errors.UnknownSmartMethod:
1971
medium._remember_remote_is_before(version)
1973
response_tuple, response_handler = response
1707
search_bytes = repo._serialise_search_result(search)
1708
response = repo._call_with_body_bytes_expecting_body(
1709
'Repository.get_stream',
1710
(path, self.to_format.network_name()), search_bytes)
1711
response_tuple, response_handler = response
1712
except errors.UnknownSmartMethod:
1713
medium._remember_remote_is_before((1,13))
1977
1714
return self._real_stream(repo, search)
1978
1715
if response_tuple[0] != 'ok':
1979
1716
raise errors.UnexpectedSmartServerResponse(response_tuple)
2060
1796
self._network_name)
2062
1798
def get_format_description(self):
2064
return 'Remote: ' + self._custom_format.get_format_description()
1799
return 'Remote BZR Branch'
2066
1801
def network_name(self):
2067
1802
return self._network_name
2069
def open(self, a_bzrdir, name=None, ignore_fallbacks=False):
2070
return a_bzrdir.open_branch(name=name,
2071
ignore_fallbacks=ignore_fallbacks)
1804
def open(self, a_bzrdir, ignore_fallbacks=False):
1805
return a_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
2073
def _vfs_initialize(self, a_bzrdir, name):
1807
def _vfs_initialize(self, a_bzrdir):
2074
1808
# Initialisation when using a local bzrdir object, or a non-vfs init
2075
1809
# method is not available on the server.
2076
1810
# self._custom_format is always set - the start of initialize ensures
2078
1812
if isinstance(a_bzrdir, RemoteBzrDir):
2079
1813
a_bzrdir._ensure_real()
2080
result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
1814
result = self._custom_format.initialize(a_bzrdir._real_bzrdir)
2083
1816
# We assume the bzrdir is parameterised; it may not be.
2084
result = self._custom_format.initialize(a_bzrdir, name)
1817
result = self._custom_format.initialize(a_bzrdir)
2085
1818
if (isinstance(a_bzrdir, RemoteBzrDir) and
2086
1819
not isinstance(result, RemoteBranch)):
2087
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
1820
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
2091
def initialize(self, a_bzrdir, name=None):
1823
def initialize(self, a_bzrdir):
2092
1824
# 1) get the network name to use.
2093
1825
if self._custom_format:
2094
1826
network_name = self._custom_format.network_name()
2100
1832
network_name = reference_format.network_name()
2101
1833
# Being asked to create on a non RemoteBzrDir:
2102
1834
if not isinstance(a_bzrdir, RemoteBzrDir):
2103
return self._vfs_initialize(a_bzrdir, name=name)
1835
return self._vfs_initialize(a_bzrdir)
2104
1836
medium = a_bzrdir._client._medium
2105
1837
if medium._is_remote_before((1, 13)):
2106
return self._vfs_initialize(a_bzrdir, name=name)
1838
return self._vfs_initialize(a_bzrdir)
2107
1839
# Creating on a remote bzr dir.
2108
1840
# 2) try direct creation via RPC
2109
1841
path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
2110
if name is not None:
2111
# XXX JRV20100304: Support creating colocated branches
2112
raise errors.NoColocatedBranchSupport(self)
2113
1842
verb = 'BzrDir.create_branch'
2115
1844
response = a_bzrdir._call(verb, path, network_name)
2116
1845
except errors.UnknownSmartMethod:
2117
1846
# Fallback - use vfs methods
2118
1847
medium._remember_remote_is_before((1, 13))
2119
return self._vfs_initialize(a_bzrdir, name=name)
1848
return self._vfs_initialize(a_bzrdir)
2120
1849
if response[0] != 'ok':
2121
1850
raise errors.UnexpectedSmartServerResponse(response)
2122
1851
# Turn the response into a RemoteRepository object.
2151
1880
self._ensure_real()
2152
1881
return self._custom_format.supports_stacking()
2154
def supports_set_append_revisions_only(self):
2156
return self._custom_format.supports_set_append_revisions_only()
2159
class RemoteBranch(branch.Branch, _RpcHelper, lock._RelockDebugMixin):
1884
class RemoteBranch(branch.Branch, _RpcHelper):
2160
1885
"""Branch stored on a server accessed by HPSS RPC.
2162
1887
At the moment most operations are mapped down to simple file operations.
2165
1890
def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
2166
_client=None, format=None, setup_stacking=True, name=None):
1891
_client=None, format=None, setup_stacking=True):
2167
1892
"""Create a RemoteBranch instance.
2169
1894
:param real_branch: An optional local implementation of the branch
2175
1900
:param setup_stacking: If True make an RPC call to determine the
2176
1901
stacked (or not) status of the branch. If False assume the branch
2177
1902
is not stacked.
2178
:param name: Colocated branch name
2180
1904
# We intentionally don't call the parent class's __init__, because it
2181
1905
# will try to assign to self.tags, which is a property in this subclass.
2182
1906
# And the parent's __init__ doesn't do much anyway.
1907
self._revision_id_to_revno_cache = None
1908
self._partial_revision_id_to_revno_cache = {}
1909
self._revision_history_cache = None
1910
self._last_revision_info_cache = None
1911
self._merge_sorted_revisions_cache = None
2183
1912
self.bzrdir = remote_bzrdir
2184
1913
if _client is not None:
2185
1914
self._client = _client
2375
2088
return self._vfs_get_tags_bytes()
2376
2089
return response[0]
2378
def _vfs_set_tags_bytes(self, bytes):
2380
return self._real_branch._set_tags_bytes(bytes)
2382
def _set_tags_bytes(self, bytes):
2383
medium = self._client._medium
2384
if medium._is_remote_before((1, 18)):
2385
self._vfs_set_tags_bytes(bytes)
2389
self._remote_path(), self._lock_token, self._repo_lock_token)
2390
response = self._call_with_body_bytes(
2391
'Branch.set_tags_bytes', args, bytes)
2392
except errors.UnknownSmartMethod:
2393
medium._remember_remote_is_before((1, 18))
2394
self._vfs_set_tags_bytes(bytes)
2396
2091
def lock_read(self):
2397
"""Lock the branch for read operations.
2399
:return: An object with an unlock method which will release the lock
2402
2092
self.repository.lock_read()
2403
2093
if not self._lock_mode:
2404
self._note_lock('r')
2405
2094
self._lock_mode = 'r'
2406
2095
self._lock_count = 1
2407
2096
if self._real_branch is not None:
2408
2097
self._real_branch.lock_read()
2410
2099
self._lock_count += 1
2413
2101
def _remote_lock_write(self, token):
2414
2102
if token is None:
2415
2103
branch_token = repo_token = ''
2417
2105
branch_token = token
2418
repo_token = self.repository.lock_write().repository_token
2106
repo_token = self.repository.lock_write()
2419
2107
self.repository.unlock()
2420
2108
err_context = {'token': token}
2421
2109
response = self._call(
2515
2205
raise NotImplementedError(self.dont_leave_lock_in_place)
2516
2206
self._leave_lock = False
2519
def get_rev_id(self, revno, history=None):
2521
return _mod_revision.NULL_REVISION
2522
last_revision_info = self.last_revision_info()
2523
ok, result = self.repository.get_rev_id_for_revno(
2524
revno, last_revision_info)
2527
missing_parent = result[1]
2528
# Either the revision named by the server is missing, or its parent
2529
# is. Call get_parent_map to determine which, so that we report a
2531
parent_map = self.repository.get_parent_map([missing_parent])
2532
if missing_parent in parent_map:
2533
missing_parent = parent_map[missing_parent]
2534
raise errors.RevisionNotPresent(missing_parent, self.repository)
2536
2208
def _last_revision_info(self):
2537
2209
response = self._call('Branch.last_revision_info', self._remote_path())
2538
2210
if response[0] != 'ok':
2636
2305
self._ensure_real()
2637
2306
return self._real_branch._get_parent_location()
2308
def set_parent(self, url):
2310
return self._real_branch.set_parent(url)
2639
2312
def _set_parent_location(self, url):
2640
medium = self._client._medium
2641
if medium._is_remote_before((1, 15)):
2642
return self._vfs_set_parent_location(url)
2644
call_url = url or ''
2645
if type(call_url) is not str:
2646
raise AssertionError('url must be a str or None (%s)' % url)
2647
response = self._call('Branch.set_parent_location',
2648
self._remote_path(), self._lock_token, self._repo_lock_token,
2650
except errors.UnknownSmartMethod:
2651
medium._remember_remote_is_before((1, 15))
2652
return self._vfs_set_parent_location(url)
2654
raise errors.UnexpectedSmartServerResponse(response)
2656
def _vfs_set_parent_location(self, url):
2658
return self._real_branch._set_parent_location(url)
2313
# Used by tests, to poke bad urls into branch configurations
2315
self.set_parent(url)
2318
return self._real_branch._set_parent_location(url)
2660
2320
@needs_write_lock
2661
2321
def pull(self, source, overwrite=False, stop_revision=None,
2729
2389
return self._real_branch.set_push_location(location)
2732
class RemoteConfig(object):
2733
"""A Config that reads and writes from smart verbs.
2392
class RemoteBranchConfig(object):
2393
"""A Config that reads from a smart branch and writes via smart methods.
2735
2395
It is a low-level object that considers config data to be name/value pairs
2736
2396
that may be associated with a section. Assigning meaning to the these
2737
2397
values is done at higher levels like bzrlib.config.TreeConfig.
2400
def __init__(self, branch):
2401
self._branch = branch
2740
2403
def get_option(self, name, section=None, default=None):
2741
2404
"""Return the value associated with a named option.
2745
2408
:param default: The value to return if the value is not set
2746
2409
:return: The value or default value
2749
configobj = self._get_configobj()
2751
section_obj = configobj
2754
section_obj = configobj[section]
2757
return section_obj.get(name, default)
2758
except errors.UnknownSmartMethod:
2759
return self._vfs_get_option(name, section, default)
2761
def _response_to_configobj(self, response):
2762
if len(response[0]) and response[0][0] != 'ok':
2763
raise errors.UnexpectedSmartServerResponse(response)
2764
lines = response[1].read_body_bytes().splitlines()
2765
return config.ConfigObj(lines, encoding='utf-8')
2768
class RemoteBranchConfig(RemoteConfig):
2769
"""A RemoteConfig for Branches."""
2771
def __init__(self, branch):
2772
self._branch = branch
2411
configobj = self._get_configobj()
2413
section_obj = configobj
2416
section_obj = configobj[section]
2419
return section_obj.get(name, default)
2774
2421
def _get_configobj(self):
2775
2422
path = self._branch._remote_path()
2776
2423
response = self._branch._client.call_expecting_body(
2777
2424
'Branch.get_config_file', path)
2778
return self._response_to_configobj(response)
2425
if response[0][0] != 'ok':
2426
raise UnexpectedSmartServerResponse(response)
2427
lines = response[1].read_body_bytes().splitlines()
2428
return config.ConfigObj(lines, encoding='utf-8')
2780
2430
def set_option(self, value, name, section=None):
2781
2431
"""Set the value associated with a named option.
2798
2448
if response != ():
2799
2449
raise errors.UnexpectedSmartServerResponse(response)
2801
def _real_object(self):
2451
def _vfs_set_option(self, value, name, section=None):
2802
2452
self._branch._ensure_real()
2803
return self._branch._real_branch
2805
def _vfs_set_option(self, value, name, section=None):
2806
return self._real_object()._get_config().set_option(
2807
value, name, section)
2810
class RemoteBzrDirConfig(RemoteConfig):
2811
"""A RemoteConfig for BzrDirs."""
2813
def __init__(self, bzrdir):
2814
self._bzrdir = bzrdir
2816
def _get_configobj(self):
2817
medium = self._bzrdir._client._medium
2818
verb = 'BzrDir.get_config_file'
2819
if medium._is_remote_before((1, 15)):
2820
raise errors.UnknownSmartMethod(verb)
2821
path = self._bzrdir._path_for_remote_call(self._bzrdir._client)
2822
response = self._bzrdir._call_expecting_body(
2824
return self._response_to_configobj(response)
2826
def _vfs_get_option(self, name, section, default):
2827
return self._real_object()._get_config().get_option(
2828
name, section, default)
2830
def set_option(self, value, name, section=None):
2831
"""Set the value associated with a named option.
2833
:param value: The value to set
2834
:param name: The name of the value to set
2835
:param section: The section the option is in (if any)
2837
return self._real_object()._get_config().set_option(
2838
value, name, section)
2840
def _real_object(self):
2841
self._bzrdir._ensure_real()
2842
return self._bzrdir._real_bzrdir
2453
return self._branch._real_branch._get_config().set_option(
2454
value, name, section)
2846
2457
def _extract_tar(tar, to_dir):
2886
2497
'Missing key %r in context %r', key_err.args[0], context)
2889
if err.error_verb == 'IncompatibleRepositories':
2890
raise errors.IncompatibleRepositories(err.error_args[0],
2891
err.error_args[1], err.error_args[2])
2892
elif err.error_verb == 'NoSuchRevision':
2500
if err.error_verb == 'NoSuchRevision':
2893
2501
raise NoSuchRevision(find('branch'), err.error_args[0])
2894
2502
elif err.error_verb == 'nosuchrevision':
2895
2503
raise NoSuchRevision(find('repository'), err.error_args[0])
2896
elif err.error_verb == 'nobranch':
2897
if len(err.error_args) >= 1:
2898
extra = err.error_args[0]
2901
raise errors.NotBranchError(path=find('bzrdir').root_transport.base,
2504
elif err.error_tuple == ('nobranch',):
2505
raise errors.NotBranchError(path=find('bzrdir').root_transport.base)
2903
2506
elif err.error_verb == 'norepository':
2904
2507
raise errors.NoRepositoryPresent(find('bzrdir'))
2905
2508
elif err.error_verb == 'LockContention':