63
63
except errors.ErrorFromSmartServer, err:
64
64
self._translate_error(err, **err_context)
66
def _call_with_body_bytes(self, method, args, body_bytes, **err_context):
68
return self._client.call_with_body_bytes(method, args, body_bytes)
69
except errors.ErrorFromSmartServer, err:
70
self._translate_error(err, **err_context)
72
66
def _call_with_body_bytes_expecting_body(self, method, args, body_bytes,
113
106
self._client = client._SmartClient(medium)
115
108
self._client = _client
122
return '%s(%r)' % (self.__class__.__name__, self._client)
124
def _probe_bzrdir(self):
125
medium = self._client._medium
126
111
path = self._path_for_remote_call(self._client)
127
if medium._is_remote_before((2, 1)):
131
self._rpc_open_2_1(path)
133
except errors.UnknownSmartMethod:
134
medium._remember_remote_is_before((2, 1))
137
def _rpc_open_2_1(self, path):
138
response = self._call('BzrDir.open_2.1', path)
139
if response == ('no',):
140
raise errors.NotBranchError(path=self.root_transport.base)
141
elif response[0] == 'yes':
142
if response[1] == 'yes':
143
self._has_working_tree = True
144
elif response[1] == 'no':
145
self._has_working_tree = False
147
raise errors.UnexpectedSmartServerResponse(response)
149
raise errors.UnexpectedSmartServerResponse(response)
151
def _rpc_open(self, path):
152
112
response = self._call('BzrDir.open', path)
153
113
if response not in [('yes',), ('no',)]:
154
114
raise errors.UnexpectedSmartServerResponse(response)
155
115
if response == ('no',):
156
raise errors.NotBranchError(path=self.root_transport.base)
116
raise errors.NotBranchError(path=transport.base)
158
118
def _ensure_real(self):
159
119
"""Ensure that there is a _real_bzrdir set.
246
202
self._ensure_real()
247
203
self._real_bzrdir.destroy_repository()
249
def create_branch(self, name=None):
205
def create_branch(self):
250
206
# as per meta1 formats - just delegate to the format object which may
251
207
# be parameterised.
252
real_branch = self._format.get_branch_format().initialize(self,
208
real_branch = self._format.get_branch_format().initialize(self)
254
209
if not isinstance(real_branch, RemoteBranch):
255
result = RemoteBranch(self, self.find_repository(), real_branch,
210
result = RemoteBranch(self, self.find_repository(), real_branch)
258
212
result = real_branch
259
213
# BzrDir.clone_on_transport() uses the result of create_branch but does
265
219
self._next_open_branch_result = result
268
def destroy_branch(self, name=None):
222
def destroy_branch(self):
269
223
"""See BzrDir.destroy_branch"""
270
224
self._ensure_real()
271
self._real_bzrdir.destroy_branch(name=name)
225
self._real_bzrdir.destroy_branch()
272
226
self._next_open_branch_result = None
274
228
def create_workingtree(self, revision_id=None, from_branch=None):
275
229
raise errors.NotLocalUrl(self.transport.base)
277
def find_branch_format(self, name=None):
231
def find_branch_format(self):
278
232
"""Find the branch 'format' for this bzrdir.
280
234
This might be a synthetic object for e.g. RemoteBranch and SVN.
282
b = self.open_branch(name=name)
236
b = self.open_branch()
285
def get_branch_reference(self, name=None):
239
def get_branch_reference(self):
286
240
"""See BzrDir.get_branch_reference()."""
288
# XXX JRV20100304: Support opening colocated branches
289
raise errors.NoColocatedBranchSupport(self)
290
241
response = self._get_branch_reference()
291
242
if response[0] == 'ref':
292
243
return response[1]
296
247
def _get_branch_reference(self):
297
248
path = self._path_for_remote_call(self._client)
298
249
medium = self._client._medium
300
('BzrDir.open_branchV3', (2, 1)),
301
('BzrDir.open_branchV2', (1, 13)),
302
('BzrDir.open_branch', None),
304
for verb, required_version in candidate_calls:
305
if required_version and medium._is_remote_before(required_version):
250
if not medium._is_remote_before((1, 13)):
308
response = self._call(verb, path)
252
response = self._call('BzrDir.open_branchV2', path)
253
if response[0] not in ('ref', 'branch'):
254
raise errors.UnexpectedSmartServerResponse(response)
309
256
except errors.UnknownSmartMethod:
310
if required_version is None:
312
medium._remember_remote_is_before(required_version)
315
if verb == 'BzrDir.open_branch':
316
if response[0] != 'ok':
317
raise errors.UnexpectedSmartServerResponse(response)
318
if response[1] != '':
319
return ('ref', response[1])
321
return ('branch', '')
322
if response[0] not in ('ref', 'branch'):
257
medium._remember_remote_is_before((1, 13))
258
response = self._call('BzrDir.open_branch', path)
259
if response[0] != 'ok':
323
260
raise errors.UnexpectedSmartServerResponse(response)
261
if response[1] != '':
262
return ('ref', response[1])
264
return ('branch', '')
326
def _get_tree_branch(self, name=None):
266
def _get_tree_branch(self):
327
267
"""See BzrDir._get_tree_branch()."""
328
return None, self.open_branch(name=name)
268
return None, self.open_branch()
330
def open_branch(self, name=None, unsupported=False,
331
ignore_fallbacks=False):
270
def open_branch(self, _unsupported=False, ignore_fallbacks=False):
333
272
raise NotImplementedError('unsupported flag support not implemented yet.')
334
273
if self._next_open_branch_result is not None:
335
274
# See create_branch for details.
340
279
if response[0] == 'ref':
341
280
# a branch reference, use the existing BranchReference logic.
342
281
format = BranchReferenceFormat()
343
return format.open(self, name=name, _found=True,
344
location=response[1], ignore_fallbacks=ignore_fallbacks)
282
return format.open(self, _found=True, location=response[1],
283
ignore_fallbacks=ignore_fallbacks)
345
284
branch_format_name = response[1]
346
285
if not branch_format_name:
347
286
branch_format_name = None
348
287
format = RemoteBranchFormat(network_name=branch_format_name)
349
288
return RemoteBranch(self, self.find_repository(), format=format,
350
setup_stacking=not ignore_fallbacks, name=name)
289
setup_stacking=not ignore_fallbacks)
352
291
def _open_repo_v1(self, path):
353
292
verb = 'BzrDir.find_repository'
625
547
return self._custom_format._fetch_reconcile
627
549
def get_format_description(self):
629
return 'Remote: ' + self._custom_format.get_format_description()
550
return 'bzr remote repository'
631
552
def __eq__(self, other):
632
553
return self.__class__ is other.__class__
555
def check_conversion_target(self, target_format):
556
if self.rich_root_data and not target_format.rich_root_data:
557
raise errors.BadConversionTarget(
558
'Does not support rich root data.', target_format)
559
if (self.supports_tree_reference and
560
not getattr(target_format, 'supports_tree_reference', False)):
561
raise errors.BadConversionTarget(
562
'Does not support nested trees', target_format)
634
564
def network_name(self):
635
565
if self._network_name:
636
566
return self._network_name
762
675
return self._real_repository.get_missing_parent_inventories(
763
676
check_for_missing_texts=check_for_missing_texts)
765
def _get_rev_id_for_revno_vfs(self, revno, known_pair):
767
return self._real_repository.get_rev_id_for_revno(
770
def get_rev_id_for_revno(self, revno, known_pair):
771
"""See Repository.get_rev_id_for_revno."""
772
path = self.bzrdir._path_for_remote_call(self._client)
774
if self._client._medium._is_remote_before((1, 17)):
775
return self._get_rev_id_for_revno_vfs(revno, known_pair)
776
response = self._call(
777
'Repository.get_rev_id_for_revno', path, revno, known_pair)
778
except errors.UnknownSmartMethod:
779
self._client._medium._remember_remote_is_before((1, 17))
780
return self._get_rev_id_for_revno_vfs(revno, known_pair)
781
if response[0] == 'ok':
782
return True, response[1]
783
elif response[0] == 'history-incomplete':
784
known_pair = response[1:3]
785
for fallback in self._fallback_repositories:
786
found, result = fallback.get_rev_id_for_revno(revno, known_pair)
791
# Not found in any fallbacks
792
return False, known_pair
794
raise errors.UnexpectedSmartServerResponse(response)
796
678
def _ensure_real(self):
797
679
"""Ensure that there is a _real_repository set.
897
779
result.add(_mod_revision.NULL_REVISION)
900
def _has_same_fallbacks(self, other_repo):
901
"""Returns true if the repositories have the same fallbacks."""
902
# XXX: copied from Repository; it should be unified into a base class
903
# <https://bugs.launchpad.net/bzr/+bug/401622>
904
my_fb = self._fallback_repositories
905
other_fb = other_repo._fallback_repositories
906
if len(my_fb) != len(other_fb):
908
for f, g in zip(my_fb, other_fb):
909
if not f.has_same_location(g):
913
782
def has_same_location(self, other):
914
# TODO: Move to RepositoryBase and unify with the regular Repository
915
# one; unfortunately the tests rely on slightly different behaviour at
916
# present -- mbp 20090710
917
783
return (self.__class__ is other.__class__ and
918
784
self.bzrdir.transport.base == other.bzrdir.transport.base)
922
788
parents_provider = self._make_parents_provider(other_repository)
923
789
return graph.Graph(parents_provider)
926
def get_known_graph_ancestry(self, revision_ids):
927
"""Return the known graph for a set of revision ids and their ancestors.
929
st = static_tuple.StaticTuple
930
revision_keys = [st(r_id).intern() for r_id in revision_ids]
931
known_graph = self.revisions.get_known_graph_ancestry(revision_keys)
932
return graph.GraphThunkIdsToKeys(known_graph)
934
791
def gather_stats(self, revid=None, committers=None):
935
792
"""See Repository.gather_stats()."""
936
793
path = self.bzrdir._path_for_remote_call(self._client)
1250
1094
# state, so always add a lock here. If a caller passes us a locked
1251
1095
# repository, they are responsible for unlocking it later.
1252
1096
repository.lock_read()
1253
self._check_fallback_repository(repository)
1254
1097
self._fallback_repositories.append(repository)
1255
1098
# If self._real_repository was parameterised already (e.g. because a
1256
1099
# _real_branch had its get_stacked_on_url method called), then the
1257
1100
# repository to be added may already be in the _real_repositories list.
1258
1101
if self._real_repository is not None:
1259
fallback_locations = [repo.user_url for repo in
1102
fallback_locations = [repo.bzrdir.root_transport.base for repo in
1260
1103
self._real_repository._fallback_repositories]
1261
if repository.user_url not in fallback_locations:
1104
if repository.bzrdir.root_transport.base not in fallback_locations:
1262
1105
self._real_repository.add_fallback_repository(repository)
1264
def _check_fallback_repository(self, repository):
1265
"""Check that this repository can fallback to repository safely.
1267
Raise an error if not.
1269
:param repository: A repository to fallback to.
1271
return _mod_repository.InterRepository._assert_same_model(
1274
1107
def add_inventory(self, revid, inv, parents):
1275
1108
self._ensure_real()
1276
1109
return self._real_repository.add_inventory(revid, inv, parents)
1278
1111
def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1279
parents, basis_inv=None, propagate_caches=False):
1280
1113
self._ensure_real()
1281
1114
return self._real_repository.add_inventory_by_delta(basis_revision_id,
1282
delta, new_revision_id, parents, basis_inv=basis_inv,
1283
propagate_caches=propagate_caches)
1115
delta, new_revision_id, parents)
1285
1117
def add_revision(self, rev_id, rev, inv=None, config=None):
1286
1118
self._ensure_real()
1316
1148
return self._real_repository.make_working_trees()
1318
1150
def refresh_data(self):
1319
"""Re-read any data needed to synchronise with disk.
1151
"""Re-read any data needed to to synchronise with disk.
1321
1153
This method is intended to be called after another repository instance
1322
1154
(such as one used by a smart server) has inserted data into the
1323
repository. On all repositories this will work outside of write groups.
1324
Some repository formats (pack and newer for bzrlib native formats)
1325
support refresh_data inside write groups. If called inside a write
1326
group on a repository that does not support refreshing in a write group
1327
IsInWriteGroupError will be raised.
1155
repository. It may not be called during a write group, but may be
1156
called at any other time.
1158
if self.is_in_write_group():
1159
raise errors.InternalBzrError(
1160
"May not refresh_data while in a write group.")
1329
1161
if self._real_repository is not None:
1330
1162
self._real_repository.refresh_data()
1792
1624
def insert_stream(self, stream, src_format, resume_tokens):
1793
1625
target = self.target_repo
1794
1626
target._unstacked_provider.missing_keys.clear()
1795
candidate_calls = [('Repository.insert_stream_1.19', (1, 19))]
1796
1627
if target._lock_token:
1797
candidate_calls.append(('Repository.insert_stream_locked', (1, 14)))
1798
lock_args = (target._lock_token or '',)
1628
verb = 'Repository.insert_stream_locked'
1629
extra_args = (target._lock_token or '',)
1630
required_version = (1, 14)
1800
candidate_calls.append(('Repository.insert_stream', (1, 13)))
1632
verb = 'Repository.insert_stream'
1634
required_version = (1, 13)
1802
1635
client = target._client
1803
1636
medium = client._medium
1637
if medium._is_remote_before(required_version):
1638
# No possible way this can work.
1639
return self._insert_real(stream, src_format, resume_tokens)
1804
1640
path = target.bzrdir._path_for_remote_call(client)
1805
# Probe for the verb to use with an empty stream before sending the
1806
# real stream to it. We do this both to avoid the risk of sending a
1807
# large request that is then rejected, and because we don't want to
1808
# implement a way to buffer, rewind, or restart the stream.
1810
for verb, required_version in candidate_calls:
1811
if medium._is_remote_before(required_version):
1814
# We've already done the probing (and set _is_remote_before) on
1815
# a previous insert.
1641
if not resume_tokens:
1642
# XXX: Ugly but important for correctness, *will* be fixed during
1643
# 1.13 cycle. Pushing a stream that is interrupted results in a
1644
# fallback to the _real_repositories sink *with a partial stream*.
1645
# Thats bad because we insert less data than bzr expected. To avoid
1646
# this we do a trial push to make sure the verb is accessible, and
1647
# do not fallback when actually pushing the stream. A cleanup patch
1648
# is going to look at rewinding/restarting the stream/partial
1818
1650
byte_stream = smart_repo._stream_to_byte_stream([], src_format)
1820
1652
response = client.call_with_body_stream(
1821
(verb, path, '') + lock_args, byte_stream)
1653
(verb, path, '') + extra_args, byte_stream)
1822
1654
except errors.UnknownSmartMethod:
1823
1655
medium._remember_remote_is_before(required_version)
1829
return self._insert_real(stream, src_format, resume_tokens)
1830
self._last_inv_record = None
1831
self._last_substream = None
1832
if required_version < (1, 19):
1833
# Remote side doesn't support inventory deltas. Wrap the stream to
1834
# make sure we don't send any. If the stream contains inventory
1835
# deltas we'll interrupt the smart insert_stream request and
1837
stream = self._stop_stream_if_inventory_delta(stream)
1656
return self._insert_real(stream, src_format, resume_tokens)
1838
1657
byte_stream = smart_repo._stream_to_byte_stream(
1839
1658
stream, src_format)
1840
1659
resume_tokens = ' '.join(resume_tokens)
1841
1660
response = client.call_with_body_stream(
1842
(verb, path, resume_tokens) + lock_args, byte_stream)
1661
(verb, path, resume_tokens) + extra_args, byte_stream)
1843
1662
if response[0][0] not in ('ok', 'missing-basis'):
1844
1663
raise errors.UnexpectedSmartServerResponse(response)
1845
if self._last_substream is not None:
1846
# The stream included an inventory-delta record, but the remote
1847
# side isn't new enough to support them. So we need to send the
1848
# rest of the stream via VFS.
1849
self.target_repo.refresh_data()
1850
return self._resume_stream_with_vfs(response, src_format)
1851
1664
if response[0][0] == 'missing-basis':
1852
1665
tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1853
1666
resume_tokens = tokens
1856
1669
self.target_repo.refresh_data()
1857
1670
return [], set()
1859
def _resume_stream_with_vfs(self, response, src_format):
1860
"""Resume sending a stream via VFS, first resending the record and
1861
substream that couldn't be sent via an insert_stream verb.
1863
if response[0][0] == 'missing-basis':
1864
tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1865
# Ignore missing_keys, we haven't finished inserting yet
1868
def resume_substream():
1869
# Yield the substream that was interrupted.
1870
for record in self._last_substream:
1872
self._last_substream = None
1873
def resume_stream():
1874
# Finish sending the interrupted substream
1875
yield ('inventory-deltas', resume_substream())
1876
# Then simply continue sending the rest of the stream.
1877
for substream_kind, substream in self._last_stream:
1878
yield substream_kind, substream
1879
return self._insert_real(resume_stream(), src_format, tokens)
1881
def _stop_stream_if_inventory_delta(self, stream):
1882
"""Normally this just lets the original stream pass-through unchanged.
1884
However if any 'inventory-deltas' substream occurs it will stop
1885
streaming, and store the interrupted substream and stream in
1886
self._last_substream and self._last_stream so that the stream can be
1887
resumed by _resume_stream_with_vfs.
1890
stream_iter = iter(stream)
1891
for substream_kind, substream in stream_iter:
1892
if substream_kind == 'inventory-deltas':
1893
self._last_substream = substream
1894
self._last_stream = stream_iter
1897
yield substream_kind, substream
1900
1673
class RemoteStreamSource(repository.StreamSource):
1901
1674
"""Stream data from a remote server."""
1904
1677
if (self.from_repository._fallback_repositories and
1905
1678
self.to_format._fetch_order == 'topological'):
1906
1679
return self._real_stream(self.from_repository, search)
1909
repos = [self.from_repository]
1915
repos.extend(repo._fallback_repositories)
1916
sources.append(repo)
1917
return self.missing_parents_chain(search, sources)
1919
def get_stream_for_missing_keys(self, missing_keys):
1920
self.from_repository._ensure_real()
1921
real_repo = self.from_repository._real_repository
1922
real_source = real_repo._get_source(self.to_format)
1923
return real_source.get_stream_for_missing_keys(missing_keys)
1680
return self.missing_parents_chain(search, [self.from_repository] +
1681
self.from_repository._fallback_repositories)
1925
1683
def _real_stream(self, repo, search):
1926
1684
"""Get a stream for search from repo.
1957
1714
return self._real_stream(repo, search)
1958
1715
client = repo._client
1959
1716
medium = client._medium
1717
if medium._is_remote_before((1, 13)):
1718
# streaming was added in 1.13
1719
return self._real_stream(repo, search)
1960
1720
path = repo.bzrdir._path_for_remote_call(client)
1961
search_bytes = repo._serialise_search_result(search)
1962
args = (path, self.to_format.network_name())
1964
('Repository.get_stream_1.19', (1, 19)),
1965
('Repository.get_stream', (1, 13))]
1967
for verb, version in candidate_verbs:
1968
if medium._is_remote_before(version):
1971
response = repo._call_with_body_bytes_expecting_body(
1972
verb, args, search_bytes)
1973
except errors.UnknownSmartMethod:
1974
medium._remember_remote_is_before(version)
1976
response_tuple, response_handler = response
1722
search_bytes = repo._serialise_search_result(search)
1723
response = repo._call_with_body_bytes_expecting_body(
1724
'Repository.get_stream',
1725
(path, self.to_format.network_name()), search_bytes)
1726
response_tuple, response_handler = response
1727
except errors.UnknownSmartMethod:
1728
medium._remember_remote_is_before((1,13))
1980
1729
return self._real_stream(repo, search)
1981
1730
if response_tuple[0] != 'ok':
1982
1731
raise errors.UnexpectedSmartServerResponse(response_tuple)
1983
1732
byte_stream = response_handler.read_streamed_body()
1984
src_format, stream = smart_repo._byte_stream_to_stream(byte_stream,
1985
self._record_counter)
1733
src_format, stream = smart_repo._byte_stream_to_stream(byte_stream)
1986
1734
if src_format.network_name() != repo._format.network_name():
1987
1735
raise AssertionError(
1988
1736
"Mismatched RemoteRepository and stream src %r, %r" % (
2064
1811
self._network_name)
2066
1813
def get_format_description(self):
2068
return 'Remote: ' + self._custom_format.get_format_description()
1814
return 'Remote BZR Branch'
2070
1816
def network_name(self):
2071
1817
return self._network_name
2073
def open(self, a_bzrdir, name=None, ignore_fallbacks=False):
2074
return a_bzrdir.open_branch(name=name,
2075
ignore_fallbacks=ignore_fallbacks)
1819
def open(self, a_bzrdir, ignore_fallbacks=False):
1820
return a_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
2077
def _vfs_initialize(self, a_bzrdir, name):
1822
def _vfs_initialize(self, a_bzrdir):
2078
1823
# Initialisation when using a local bzrdir object, or a non-vfs init
2079
1824
# method is not available on the server.
2080
1825
# self._custom_format is always set - the start of initialize ensures
2082
1827
if isinstance(a_bzrdir, RemoteBzrDir):
2083
1828
a_bzrdir._ensure_real()
2084
result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
1829
result = self._custom_format.initialize(a_bzrdir._real_bzrdir)
2087
1831
# We assume the bzrdir is parameterised; it may not be.
2088
result = self._custom_format.initialize(a_bzrdir, name)
1832
result = self._custom_format.initialize(a_bzrdir)
2089
1833
if (isinstance(a_bzrdir, RemoteBzrDir) and
2090
1834
not isinstance(result, RemoteBranch)):
2091
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
1835
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
2095
def initialize(self, a_bzrdir, name=None):
1838
def initialize(self, a_bzrdir):
2096
1839
# 1) get the network name to use.
2097
1840
if self._custom_format:
2098
1841
network_name = self._custom_format.network_name()
2104
1847
network_name = reference_format.network_name()
2105
1848
# Being asked to create on a non RemoteBzrDir:
2106
1849
if not isinstance(a_bzrdir, RemoteBzrDir):
2107
return self._vfs_initialize(a_bzrdir, name=name)
1850
return self._vfs_initialize(a_bzrdir)
2108
1851
medium = a_bzrdir._client._medium
2109
1852
if medium._is_remote_before((1, 13)):
2110
return self._vfs_initialize(a_bzrdir, name=name)
1853
return self._vfs_initialize(a_bzrdir)
2111
1854
# Creating on a remote bzr dir.
2112
1855
# 2) try direct creation via RPC
2113
1856
path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
2114
if name is not None:
2115
# XXX JRV20100304: Support creating colocated branches
2116
raise errors.NoColocatedBranchSupport(self)
2117
1857
verb = 'BzrDir.create_branch'
2119
1859
response = a_bzrdir._call(verb, path, network_name)
2120
1860
except errors.UnknownSmartMethod:
2121
1861
# Fallback - use vfs methods
2122
1862
medium._remember_remote_is_before((1, 13))
2123
return self._vfs_initialize(a_bzrdir, name=name)
1863
return self._vfs_initialize(a_bzrdir)
2124
1864
if response[0] != 'ok':
2125
1865
raise errors.UnexpectedSmartServerResponse(response)
2126
1866
# Turn the response into a RemoteRepository object.
2155
1895
self._ensure_real()
2156
1896
return self._custom_format.supports_stacking()
2158
def supports_set_append_revisions_only(self):
2160
return self._custom_format.supports_set_append_revisions_only()
2163
class RemoteBranch(branch.Branch, _RpcHelper, lock._RelockDebugMixin):
1899
class RemoteBranch(branch.Branch, _RpcHelper):
2164
1900
"""Branch stored on a server accessed by HPSS RPC.
2166
1902
At the moment most operations are mapped down to simple file operations.
2169
1905
def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
2170
_client=None, format=None, setup_stacking=True, name=None):
1906
_client=None, format=None, setup_stacking=True):
2171
1907
"""Create a RemoteBranch instance.
2173
1909
:param real_branch: An optional local implementation of the branch
2179
1915
:param setup_stacking: If True make an RPC call to determine the
2180
1916
stacked (or not) status of the branch. If False assume the branch
2181
1917
is not stacked.
2182
:param name: Colocated branch name
2184
1919
# We intentionally don't call the parent class's __init__, because it
2185
1920
# will try to assign to self.tags, which is a property in this subclass.
2186
1921
# And the parent's __init__ doesn't do much anyway.
1922
self._revision_id_to_revno_cache = None
1923
self._partial_revision_id_to_revno_cache = {}
1924
self._revision_history_cache = None
1925
self._last_revision_info_cache = None
1926
self._merge_sorted_revisions_cache = None
2187
1927
self.bzrdir = remote_bzrdir
2188
1928
if _client is not None:
2189
1929
self._client = _client
2379
2112
return self._vfs_get_tags_bytes()
2380
2113
return response[0]
2382
def _vfs_set_tags_bytes(self, bytes):
2384
return self._real_branch._set_tags_bytes(bytes)
2386
def _set_tags_bytes(self, bytes):
2387
medium = self._client._medium
2388
if medium._is_remote_before((1, 18)):
2389
self._vfs_set_tags_bytes(bytes)
2393
self._remote_path(), self._lock_token, self._repo_lock_token)
2394
response = self._call_with_body_bytes(
2395
'Branch.set_tags_bytes', args, bytes)
2396
except errors.UnknownSmartMethod:
2397
medium._remember_remote_is_before((1, 18))
2398
self._vfs_set_tags_bytes(bytes)
2400
2115
def lock_read(self):
2401
"""Lock the branch for read operations.
2403
:return: A bzrlib.lock.LogicalLockResult.
2405
2116
self.repository.lock_read()
2406
2117
if not self._lock_mode:
2407
self._note_lock('r')
2408
2118
self._lock_mode = 'r'
2409
2119
self._lock_count = 1
2410
2120
if self._real_branch is not None:
2411
2121
self._real_branch.lock_read()
2413
2123
self._lock_count += 1
2414
return lock.LogicalLockResult(self.unlock)
2416
2125
def _remote_lock_write(self, token):
2417
2126
if token is None:
2418
2127
branch_token = repo_token = ''
2420
2129
branch_token = token
2421
repo_token = self.repository.lock_write().repository_token
2130
repo_token = self.repository.lock_write()
2422
2131
self.repository.unlock()
2423
2132
err_context = {'token': token}
2425
response = self._call(
2426
'Branch.lock_write', self._remote_path(), branch_token,
2427
repo_token or '', **err_context)
2428
except errors.LockContention, e:
2429
# The LockContention from the server doesn't have any
2430
# information about the lock_url. We re-raise LockContention
2431
# with valid lock_url.
2432
raise errors.LockContention('(remote lock)',
2433
self.repository.base.split('.bzr/')[0])
2133
response = self._call(
2134
'Branch.lock_write', self._remote_path(), branch_token,
2135
repo_token or '', **err_context)
2434
2136
if response[0] != 'ok':
2435
2137
raise errors.UnexpectedSmartServerResponse(response)
2436
2138
ok, branch_token, repo_token = response
2525
2229
raise NotImplementedError(self.dont_leave_lock_in_place)
2526
2230
self._leave_lock = False
2529
def get_rev_id(self, revno, history=None):
2531
return _mod_revision.NULL_REVISION
2532
last_revision_info = self.last_revision_info()
2533
ok, result = self.repository.get_rev_id_for_revno(
2534
revno, last_revision_info)
2537
missing_parent = result[1]
2538
# Either the revision named by the server is missing, or its parent
2539
# is. Call get_parent_map to determine which, so that we report a
2541
parent_map = self.repository.get_parent_map([missing_parent])
2542
if missing_parent in parent_map:
2543
missing_parent = parent_map[missing_parent]
2544
raise errors.RevisionNotPresent(missing_parent, self.repository)
2546
2232
def _last_revision_info(self):
2547
2233
response = self._call('Branch.last_revision_info', self._remote_path())
2548
2234
if response[0] != 'ok':
2797
2483
medium = self._branch._client._medium
2798
2484
if medium._is_remote_before((1, 14)):
2799
2485
return self._vfs_set_option(value, name, section)
2800
if isinstance(value, dict):
2801
if medium._is_remote_before((2, 2)):
2802
return self._vfs_set_option(value, name, section)
2803
return self._set_config_option_dict(value, name, section)
2805
return self._set_config_option(value, name, section)
2807
def _set_config_option(self, value, name, section):
2809
2487
path = self._branch._remote_path()
2810
2488
response = self._branch._client.call('Branch.set_config_option',
2811
2489
path, self._branch._lock_token, self._branch._repo_lock_token,
2812
2490
value.encode('utf8'), name, section or '')
2813
2491
except errors.UnknownSmartMethod:
2814
medium = self._branch._client._medium
2815
2492
medium._remember_remote_is_before((1, 14))
2816
2493
return self._vfs_set_option(value, name, section)
2817
2494
if response != ():
2818
2495
raise errors.UnexpectedSmartServerResponse(response)
2820
def _serialize_option_dict(self, option_dict):
2822
for key, value in option_dict.items():
2823
if isinstance(key, unicode):
2824
key = key.encode('utf8')
2825
if isinstance(value, unicode):
2826
value = value.encode('utf8')
2827
utf8_dict[key] = value
2828
return bencode.bencode(utf8_dict)
2830
def _set_config_option_dict(self, value, name, section):
2832
path = self._branch._remote_path()
2833
serialised_dict = self._serialize_option_dict(value)
2834
response = self._branch._client.call(
2835
'Branch.set_config_option_dict',
2836
path, self._branch._lock_token, self._branch._repo_lock_token,
2837
serialised_dict, name, section or '')
2838
except errors.UnknownSmartMethod:
2839
medium = self._branch._client._medium
2840
medium._remember_remote_is_before((2, 2))
2841
return self._vfs_set_option(value, name, section)
2843
raise errors.UnexpectedSmartServerResponse(response)
2845
2497
def _real_object(self):
2846
2498
self._branch._ensure_real()
2847
2499
return self._branch._real_branch
2930
2582
'Missing key %r in context %r', key_err.args[0], context)
2933
if err.error_verb == 'IncompatibleRepositories':
2934
raise errors.IncompatibleRepositories(err.error_args[0],
2935
err.error_args[1], err.error_args[2])
2936
elif err.error_verb == 'NoSuchRevision':
2585
if err.error_verb == 'NoSuchRevision':
2937
2586
raise NoSuchRevision(find('branch'), err.error_args[0])
2938
2587
elif err.error_verb == 'nosuchrevision':
2939
2588
raise NoSuchRevision(find('repository'), err.error_args[0])
2940
elif err.error_verb == 'nobranch':
2941
if len(err.error_args) >= 1:
2942
extra = err.error_args[0]
2945
raise errors.NotBranchError(path=find('bzrdir').root_transport.base,
2589
elif err.error_tuple == ('nobranch',):
2590
raise errors.NotBranchError(path=find('bzrdir').root_transport.base)
2947
2591
elif err.error_verb == 'norepository':
2948
2592
raise errors.NoRepositoryPresent(find('bzrdir'))
2949
2593
elif err.error_verb == 'LockContention':