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
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
62
except errors.ErrorFromSmartServer, err:
62
63
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
65
def _call_with_body_bytes_expecting_body(self, method, args, body_bytes,
111
105
self._client = client._SmartClient(medium)
113
107
self._client = _client
120
return '%s(%r)' % (self.__class__.__name__, self._client)
122
def _probe_bzrdir(self):
123
medium = self._client._medium
124
110
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
111
response = self._call('BzrDir.open', path)
151
112
if response not in [('yes',), ('no',)]:
152
113
raise errors.UnexpectedSmartServerResponse(response)
153
114
if response == ('no',):
154
raise errors.NotBranchError(path=self.root_transport.base)
115
raise errors.NotBranchError(path=transport.base)
156
117
def _ensure_real(self):
157
118
"""Ensure that there is a _real_bzrdir set.
244
201
self._ensure_real()
245
202
self._real_bzrdir.destroy_repository()
247
def create_branch(self, name=None):
204
def create_branch(self):
248
205
# as per meta1 formats - just delegate to the format object which may
249
206
# be parameterised.
250
real_branch = self._format.get_branch_format().initialize(self,
207
real_branch = self._format.get_branch_format().initialize(self)
252
208
if not isinstance(real_branch, RemoteBranch):
253
result = RemoteBranch(self, self.find_repository(), real_branch,
209
result = RemoteBranch(self, self.find_repository(), real_branch)
256
211
result = real_branch
257
212
# BzrDir.clone_on_transport() uses the result of create_branch but does
291
246
def _get_branch_reference(self):
292
247
path = self._path_for_remote_call(self._client)
293
248
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):
249
if not medium._is_remote_before((1, 13)):
303
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)
304
255
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'):
256
medium._remember_remote_is_before((1, 13))
257
response = self._call('BzrDir.open_branch', path)
258
if response[0] != 'ok':
318
259
raise errors.UnexpectedSmartServerResponse(response)
260
if response[1] != '':
261
return ('ref', response[1])
263
return ('branch', '')
321
265
def _get_tree_branch(self):
322
266
"""See BzrDir._get_tree_branch()."""
323
267
return None, self.open_branch()
325
def open_branch(self, name=None, unsupported=False,
326
ignore_fallbacks=False):
269
def open_branch(self, _unsupported=False, ignore_fallbacks=False):
328
271
raise NotImplementedError('unsupported flag support not implemented yet.')
329
272
if self._next_open_branch_result is not None:
330
273
# See create_branch for details.
335
278
if response[0] == 'ref':
336
279
# a branch reference, use the existing BranchReference logic.
337
280
format = BranchReferenceFormat()
338
return format.open(self, name=name, _found=True,
339
location=response[1], ignore_fallbacks=ignore_fallbacks)
281
return format.open(self, _found=True, location=response[1],
282
ignore_fallbacks=ignore_fallbacks)
340
283
branch_format_name = response[1]
341
284
if not branch_format_name:
342
285
branch_format_name = None
343
286
format = RemoteBranchFormat(network_name=branch_format_name)
344
287
return RemoteBranch(self, self.find_repository(), format=format,
345
setup_stacking=not ignore_fallbacks, name=name)
288
setup_stacking=not ignore_fallbacks)
347
290
def _open_repo_v1(self, path):
348
291
verb = 'BzrDir.find_repository'
620
546
return self._custom_format._fetch_reconcile
622
548
def get_format_description(self):
624
return 'Remote: ' + self._custom_format.get_format_description()
549
return 'bzr remote repository'
626
551
def __eq__(self, other):
627
552
return self.__class__ is other.__class__
554
def check_conversion_target(self, target_format):
555
if self.rich_root_data and not target_format.rich_root_data:
556
raise errors.BadConversionTarget(
557
'Does not support rich root data.', target_format)
558
if (self.supports_tree_reference and
559
not getattr(target_format, 'supports_tree_reference', False)):
560
raise errors.BadConversionTarget(
561
'Does not support nested trees', target_format)
629
563
def network_name(self):
630
564
if self._network_name:
631
565
return self._network_name
752
667
self._ensure_real()
753
668
return self._real_repository.suspend_write_group()
755
def get_missing_parent_inventories(self, check_for_missing_texts=True):
757
return self._real_repository.get_missing_parent_inventories(
758
check_for_missing_texts=check_for_missing_texts)
760
def _get_rev_id_for_revno_vfs(self, revno, known_pair):
762
return self._real_repository.get_rev_id_for_revno(
765
def get_rev_id_for_revno(self, revno, known_pair):
766
"""See Repository.get_rev_id_for_revno."""
767
path = self.bzrdir._path_for_remote_call(self._client)
769
if self._client._medium._is_remote_before((1, 17)):
770
return self._get_rev_id_for_revno_vfs(revno, known_pair)
771
response = self._call(
772
'Repository.get_rev_id_for_revno', path, revno, known_pair)
773
except errors.UnknownSmartMethod:
774
self._client._medium._remember_remote_is_before((1, 17))
775
return self._get_rev_id_for_revno_vfs(revno, known_pair)
776
if response[0] == 'ok':
777
return True, response[1]
778
elif response[0] == 'history-incomplete':
779
known_pair = response[1:3]
780
for fallback in self._fallback_repositories:
781
found, result = fallback.get_rev_id_for_revno(revno, known_pair)
786
# Not found in any fallbacks
787
return False, known_pair
789
raise errors.UnexpectedSmartServerResponse(response)
791
670
def _ensure_real(self):
792
671
"""Ensure that there is a _real_repository set.
872
746
"""Return a source for streaming from this repository."""
873
747
return RemoteStreamSource(self, to_format)
876
749
def has_revision(self, revision_id):
877
"""True if this repository has a copy of the revision."""
878
# Copy of bzrlib.repository.Repository.has_revision
879
return revision_id in self.has_revisions((revision_id,))
750
"""See Repository.has_revision()."""
751
if revision_id == NULL_REVISION:
752
# The null revision is always present.
754
path = self.bzrdir._path_for_remote_call(self._client)
755
response = self._call('Repository.has_revision', path, revision_id)
756
if response[0] not in ('yes', 'no'):
757
raise errors.UnexpectedSmartServerResponse(response)
758
if response[0] == 'yes':
760
for fallback_repo in self._fallback_repositories:
761
if fallback_repo.has_revision(revision_id):
882
765
def has_revisions(self, revision_ids):
883
"""Probe to find out the presence of multiple revisions.
885
:param revision_ids: An iterable of revision_ids.
886
:return: A set of the revision_ids that were present.
888
# Copy of bzrlib.repository.Repository.has_revisions
889
parent_map = self.get_parent_map(revision_ids)
890
result = set(parent_map)
891
if _mod_revision.NULL_REVISION in revision_ids:
892
result.add(_mod_revision.NULL_REVISION)
766
"""See Repository.has_revisions()."""
767
# FIXME: This does many roundtrips, particularly when there are
768
# fallback repositories. -- mbp 20080905
770
for revision_id in revision_ids:
771
if self.has_revision(revision_id):
772
result.add(revision_id)
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
775
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
776
return (self.__class__ is other.__class__ and
913
777
self.bzrdir.transport.base == other.bzrdir.transport.base)
917
781
parents_provider = self._make_parents_provider(other_repository)
918
782
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
784
def gather_stats(self, revid=None, committers=None):
930
785
"""See Repository.gather_stats()."""
931
786
path = self.bzrdir._path_for_remote_call(self._client)
991
846
def is_write_locked(self):
992
847
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
849
def lock_read(self):
1000
850
# wrong eventually - want a local lock cache context
1001
851
if not self._lock_mode:
1002
self._note_lock('r')
1003
852
self._lock_mode = 'r'
1004
853
self._lock_count = 1
1005
854
self._unstacked_provider.enable_cache(cache_misses=True)
1006
855
if self._real_repository is not None:
1007
856
self._real_repository.lock_read()
1008
for repo in self._fallback_repositories:
1011
858
self._lock_count += 1
859
for repo in self._fallback_repositories:
1013
862
def _remote_lock_write(self, token):
1014
863
path = self.bzrdir._path_for_remote_call(self._client)
1235
1077
# We need to accumulate additional repositories here, to pass them in
1236
1078
# on various RPC's.
1238
if self.is_locked():
1239
# We will call fallback.unlock() when we transition to the unlocked
1240
# state, so always add a lock here. If a caller passes us a locked
1241
# repository, they are responsible for unlocking it later.
1242
repository.lock_read()
1243
self._check_fallback_repository(repository)
1244
1080
self._fallback_repositories.append(repository)
1245
1081
# If self._real_repository was parameterised already (e.g. because a
1246
1082
# _real_branch had its get_stacked_on_url method called), then the
1247
1083
# repository to be added may already be in the _real_repositories list.
1248
1084
if self._real_repository is not None:
1249
fallback_locations = [repo.user_url for repo in
1085
fallback_locations = [repo.bzrdir.root_transport.base for repo in
1250
1086
self._real_repository._fallback_repositories]
1251
if repository.user_url not in fallback_locations:
1087
if repository.bzrdir.root_transport.base not in fallback_locations:
1252
1088
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
1090
def add_inventory(self, revid, inv, parents):
1265
1091
self._ensure_real()
1266
1092
return self._real_repository.add_inventory(revid, inv, parents)
1268
1094
def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1269
parents, basis_inv=None, propagate_caches=False):
1270
1096
self._ensure_real()
1271
1097
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)
1098
delta, new_revision_id, parents)
1275
1100
def add_revision(self, rev_id, rev, inv=None, config=None):
1276
1101
self._ensure_real()
1782
1607
def insert_stream(self, stream, src_format, resume_tokens):
1783
1608
target = self.target_repo
1784
target._unstacked_provider.missing_keys.clear()
1785
candidate_calls = [('Repository.insert_stream_1.19', (1, 19))]
1786
1609
if target._lock_token:
1787
candidate_calls.append(('Repository.insert_stream_locked', (1, 14)))
1788
lock_args = (target._lock_token or '',)
1610
verb = 'Repository.insert_stream_locked'
1611
extra_args = (target._lock_token or '',)
1612
required_version = (1, 14)
1790
candidate_calls.append(('Repository.insert_stream', (1, 13)))
1614
verb = 'Repository.insert_stream'
1616
required_version = (1, 13)
1792
1617
client = target._client
1793
1618
medium = client._medium
1619
if medium._is_remote_before(required_version):
1620
# No possible way this can work.
1621
return self._insert_real(stream, src_format, resume_tokens)
1794
1622
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.
1800
for verb, required_version in candidate_calls:
1801
if medium._is_remote_before(required_version):
1804
# We've already done the probing (and set _is_remote_before) on
1805
# a previous insert.
1623
if not resume_tokens:
1624
# XXX: Ugly but important for correctness, *will* be fixed during
1625
# 1.13 cycle. Pushing a stream that is interrupted results in a
1626
# fallback to the _real_repositories sink *with a partial stream*.
1627
# Thats bad because we insert less data than bzr expected. To avoid
1628
# this we do a trial push to make sure the verb is accessible, and
1629
# do not fallback when actually pushing the stream. A cleanup patch
1630
# is going to look at rewinding/restarting the stream/partial
1808
1632
byte_stream = smart_repo._stream_to_byte_stream([], src_format)
1810
1634
response = client.call_with_body_stream(
1811
(verb, path, '') + lock_args, byte_stream)
1635
(verb, path, '') + extra_args, byte_stream)
1812
1636
except errors.UnknownSmartMethod:
1813
1637
medium._remember_remote_is_before(required_version)
1819
return self._insert_real(stream, src_format, resume_tokens)
1820
self._last_inv_record = None
1821
self._last_substream = None
1822
if required_version < (1, 19):
1823
# Remote side doesn't support inventory deltas. Wrap the stream to
1824
# make sure we don't send any. If the stream contains inventory
1825
# deltas we'll interrupt the smart insert_stream request and
1827
stream = self._stop_stream_if_inventory_delta(stream)
1638
return self._insert_real(stream, src_format, resume_tokens)
1828
1639
byte_stream = smart_repo._stream_to_byte_stream(
1829
1640
stream, src_format)
1830
1641
resume_tokens = ' '.join(resume_tokens)
1831
1642
response = client.call_with_body_stream(
1832
(verb, path, resume_tokens) + lock_args, byte_stream)
1643
(verb, path, resume_tokens) + extra_args, byte_stream)
1833
1644
if response[0][0] not in ('ok', 'missing-basis'):
1834
1645
raise errors.UnexpectedSmartServerResponse(response)
1835
if self._last_substream is not None:
1836
# The stream included an inventory-delta record, but the remote
1837
# side isn't new enough to support them. So we need to send the
1838
# rest of the stream via VFS.
1839
self.target_repo.refresh_data()
1840
return self._resume_stream_with_vfs(response, src_format)
1841
1646
if response[0][0] == 'missing-basis':
1842
1647
tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1843
1648
resume_tokens = tokens
1846
1651
self.target_repo.refresh_data()
1847
1652
return [], set()
1849
def _resume_stream_with_vfs(self, response, src_format):
1850
"""Resume sending a stream via VFS, first resending the record and
1851
substream that couldn't be sent via an insert_stream verb.
1853
if response[0][0] == 'missing-basis':
1854
tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1855
# Ignore missing_keys, we haven't finished inserting yet
1858
def resume_substream():
1859
# Yield the substream that was interrupted.
1860
for record in self._last_substream:
1862
self._last_substream = None
1863
def resume_stream():
1864
# Finish sending the interrupted substream
1865
yield ('inventory-deltas', resume_substream())
1866
# Then simply continue sending the rest of the stream.
1867
for substream_kind, substream in self._last_stream:
1868
yield substream_kind, substream
1869
return self._insert_real(resume_stream(), src_format, tokens)
1871
def _stop_stream_if_inventory_delta(self, stream):
1872
"""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.
1880
stream_iter = iter(stream)
1881
for substream_kind, substream in stream_iter:
1882
if substream_kind == 'inventory-deltas':
1883
self._last_substream = substream
1884
self._last_stream = stream_iter
1887
yield substream_kind, substream
1890
1655
class RemoteStreamSource(repository.StreamSource):
1891
1656
"""Stream data from a remote server."""
1894
1659
if (self.from_repository._fallback_repositories and
1895
1660
self.to_format._fetch_order == 'topological'):
1896
1661
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)
1909
def get_stream_for_missing_keys(self, missing_keys):
1910
self.from_repository._ensure_real()
1911
real_repo = self.from_repository._real_repository
1912
real_source = real_repo._get_source(self.to_format)
1913
return real_source.get_stream_for_missing_keys(missing_keys)
1662
return self.missing_parents_chain(search, [self.from_repository] +
1663
self.from_repository._fallback_repositories)
1915
1665
def _real_stream(self, repo, search):
1916
1666
"""Get a stream for search from repo.
1947
1696
return self._real_stream(repo, search)
1948
1697
client = repo._client
1949
1698
medium = client._medium
1699
if medium._is_remote_before((1, 13)):
1700
# streaming was added in 1.13
1701
return self._real_stream(repo, search)
1950
1702
path = repo.bzrdir._path_for_remote_call(client)
1951
search_bytes = repo._serialise_search_result(search)
1952
args = (path, self.to_format.network_name())
1954
('Repository.get_stream_1.19', (1, 19)),
1955
('Repository.get_stream', (1, 13))]
1957
for verb, version in candidate_verbs:
1958
if medium._is_remote_before(version):
1961
response = repo._call_with_body_bytes_expecting_body(
1962
verb, args, search_bytes)
1963
except errors.UnknownSmartMethod:
1964
medium._remember_remote_is_before(version)
1966
response_tuple, response_handler = response
1704
search_bytes = repo._serialise_search_result(search)
1705
response = repo._call_with_body_bytes_expecting_body(
1706
'Repository.get_stream',
1707
(path, self.to_format.network_name()), search_bytes)
1708
response_tuple, response_handler = response
1709
except errors.UnknownSmartMethod:
1710
medium._remember_remote_is_before((1,13))
1970
1711
return self._real_stream(repo, search)
1971
1712
if response_tuple[0] != 'ok':
1972
1713
raise errors.UnexpectedSmartServerResponse(response_tuple)
2053
1793
self._network_name)
2055
1795
def get_format_description(self):
2057
return 'Remote: ' + self._custom_format.get_format_description()
1796
return 'Remote BZR Branch'
2059
1798
def network_name(self):
2060
1799
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)
1801
def open(self, a_bzrdir, ignore_fallbacks=False):
1802
return a_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
2066
def _vfs_initialize(self, a_bzrdir, name):
1804
def _vfs_initialize(self, a_bzrdir):
2067
1805
# Initialisation when using a local bzrdir object, or a non-vfs init
2068
1806
# method is not available on the server.
2069
1807
# self._custom_format is always set - the start of initialize ensures
2071
1809
if isinstance(a_bzrdir, RemoteBzrDir):
2072
1810
a_bzrdir._ensure_real()
2073
result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
1811
result = self._custom_format.initialize(a_bzrdir._real_bzrdir)
2076
1813
# We assume the bzrdir is parameterised; it may not be.
2077
result = self._custom_format.initialize(a_bzrdir, name)
1814
result = self._custom_format.initialize(a_bzrdir)
2078
1815
if (isinstance(a_bzrdir, RemoteBzrDir) and
2079
1816
not isinstance(result, RemoteBranch)):
2080
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
1817
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
2084
def initialize(self, a_bzrdir, name=None):
1820
def initialize(self, a_bzrdir):
2085
1821
# 1) get the network name to use.
2086
1822
if self._custom_format:
2087
1823
network_name = self._custom_format.network_name()
2093
1829
network_name = reference_format.network_name()
2094
1830
# Being asked to create on a non RemoteBzrDir:
2095
1831
if not isinstance(a_bzrdir, RemoteBzrDir):
2096
return self._vfs_initialize(a_bzrdir, name=name)
1832
return self._vfs_initialize(a_bzrdir)
2097
1833
medium = a_bzrdir._client._medium
2098
1834
if medium._is_remote_before((1, 13)):
2099
return self._vfs_initialize(a_bzrdir, name=name)
1835
return self._vfs_initialize(a_bzrdir)
2100
1836
# Creating on a remote bzr dir.
2101
1837
# 2) try direct creation via RPC
2102
1838
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
1839
verb = 'BzrDir.create_branch'
2108
1841
response = a_bzrdir._call(verb, path, network_name)
2109
1842
except errors.UnknownSmartMethod:
2110
1843
# Fallback - use vfs methods
2111
1844
medium._remember_remote_is_before((1, 13))
2112
return self._vfs_initialize(a_bzrdir, name=name)
1845
return self._vfs_initialize(a_bzrdir)
2113
1846
if response[0] != 'ok':
2114
1847
raise errors.UnexpectedSmartServerResponse(response)
2115
1848
# Turn the response into a RemoteRepository object.
2144
1877
self._ensure_real()
2145
1878
return self._custom_format.supports_stacking()
2147
def supports_set_append_revisions_only(self):
2149
return self._custom_format.supports_set_append_revisions_only()
2152
class RemoteBranch(branch.Branch, _RpcHelper, lock._RelockDebugMixin):
1881
class RemoteBranch(branch.Branch, _RpcHelper):
2153
1882
"""Branch stored on a server accessed by HPSS RPC.
2155
1884
At the moment most operations are mapped down to simple file operations.
2158
1887
def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
2159
_client=None, format=None, setup_stacking=True, name=None):
1888
_client=None, format=None, setup_stacking=True):
2160
1889
"""Create a RemoteBranch instance.
2162
1891
:param real_branch: An optional local implementation of the branch
2168
1897
:param setup_stacking: If True make an RPC call to determine the
2169
1898
stacked (or not) status of the branch. If False assume the branch
2170
1899
is not stacked.
2171
:param name: Colocated branch name
2173
1901
# We intentionally don't call the parent class's __init__, because it
2174
1902
# will try to assign to self.tags, which is a property in this subclass.
2175
1903
# And the parent's __init__ doesn't do much anyway.
1904
self._revision_id_to_revno_cache = None
1905
self._partial_revision_id_to_revno_cache = {}
1906
self._revision_history_cache = None
1907
self._last_revision_info_cache = None
1908
self._merge_sorted_revisions_cache = None
2176
1909
self.bzrdir = remote_bzrdir
2177
1910
if _client is not None:
2178
1911
self._client = _client
2368
2085
return self._vfs_get_tags_bytes()
2369
2086
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
2088
def lock_read(self):
2390
2089
self.repository.lock_read()
2391
2090
if not self._lock_mode:
2392
self._note_lock('r')
2393
2091
self._lock_mode = 'r'
2394
2092
self._lock_count = 1
2395
2093
if self._real_branch is not None:
2502
2202
raise NotImplementedError(self.dont_leave_lock_in_place)
2503
2203
self._leave_lock = False
2506
def get_rev_id(self, revno, history=None):
2508
return _mod_revision.NULL_REVISION
2509
last_revision_info = self.last_revision_info()
2510
ok, result = self.repository.get_rev_id_for_revno(
2511
revno, last_revision_info)
2514
missing_parent = result[1]
2515
# Either the revision named by the server is missing, or its parent
2516
# is. Call get_parent_map to determine which, so that we report a
2518
parent_map = self.repository.get_parent_map([missing_parent])
2519
if missing_parent in parent_map:
2520
missing_parent = parent_map[missing_parent]
2521
raise errors.RevisionNotPresent(missing_parent, self.repository)
2523
2205
def _last_revision_info(self):
2524
2206
response = self._call('Branch.last_revision_info', self._remote_path())
2525
2207
if response[0] != 'ok':
2873
2552
'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':
2555
if err.error_verb == 'NoSuchRevision':
2880
2556
raise NoSuchRevision(find('branch'), err.error_args[0])
2881
2557
elif err.error_verb == 'nosuchrevision':
2882
2558
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,
2559
elif err.error_tuple == ('nobranch',):
2560
raise errors.NotBranchError(path=find('bzrdir').root_transport.base)
2890
2561
elif err.error_verb == 'norepository':
2891
2562
raise errors.NoRepositoryPresent(find('bzrdir'))
2892
2563
elif err.error_verb == 'LockContention':
added
removed
bzrlib/remote.py
