87
# Note: RemoteBzrDirFormat is in bzrdir.py
89
class RemoteBzrDir(BzrDir, _RpcHelper):
108
# Note that RemoteBzrDirProber lives in bzrlib.bzrdir so bzrlib.remote
109
# does not have to be imported unless a remote format is involved.
111
class RemoteBzrDirFormat(_mod_bzrdir.BzrDirMetaFormat1):
112
"""Format representing bzrdirs accessed via a smart server"""
114
supports_workingtrees = False
116
colocated_branches = False
119
_mod_bzrdir.BzrDirMetaFormat1.__init__(self)
120
# XXX: It's a bit ugly that the network name is here, because we'd
121
# like to believe that format objects are stateless or at least
122
# immutable, However, we do at least avoid mutating the name after
123
# it's returned. See <https://bugs.launchpad.net/bzr/+bug/504102>
124
self._network_name = None
127
return "%s(_network_name=%r)" % (self.__class__.__name__,
130
def get_format_description(self):
131
if self._network_name:
133
real_format = controldir.network_format_registry.get(
138
return 'Remote: ' + real_format.get_format_description()
139
return 'bzr remote bzrdir'
141
def get_format_string(self):
142
raise NotImplementedError(self.get_format_string)
144
def network_name(self):
145
if self._network_name:
146
return self._network_name
148
raise AssertionError("No network name set.")
150
def initialize_on_transport(self, transport):
152
# hand off the request to the smart server
153
client_medium = transport.get_smart_medium()
154
except errors.NoSmartMedium:
155
# TODO: lookup the local format from a server hint.
156
local_dir_format = _mod_bzrdir.BzrDirMetaFormat1()
157
return local_dir_format.initialize_on_transport(transport)
158
client = _SmartClient(client_medium)
159
path = client.remote_path_from_transport(transport)
161
response = client.call('BzrDirFormat.initialize', path)
162
except errors.ErrorFromSmartServer, err:
163
_translate_error(err, path=path)
164
if response[0] != 'ok':
165
raise errors.SmartProtocolError('unexpected response code %s' % (response,))
166
format = RemoteBzrDirFormat()
167
self._supply_sub_formats_to(format)
168
return RemoteBzrDir(transport, format)
170
def parse_NoneTrueFalse(self, arg):
177
raise AssertionError("invalid arg %r" % arg)
179
def _serialize_NoneTrueFalse(self, arg):
186
def _serialize_NoneString(self, arg):
189
def initialize_on_transport_ex(self, transport, use_existing_dir=False,
190
create_prefix=False, force_new_repo=False, stacked_on=None,
191
stack_on_pwd=None, repo_format_name=None, make_working_trees=None,
194
# hand off the request to the smart server
195
client_medium = transport.get_smart_medium()
196
except errors.NoSmartMedium:
199
# Decline to open it if the server doesn't support our required
200
# version (3) so that the VFS-based transport will do it.
201
if client_medium.should_probe():
203
server_version = client_medium.protocol_version()
204
if server_version != '2':
208
except errors.SmartProtocolError:
209
# Apparently there's no usable smart server there, even though
210
# the medium supports the smart protocol.
215
client = _SmartClient(client_medium)
216
path = client.remote_path_from_transport(transport)
217
if client_medium._is_remote_before((1, 16)):
220
# TODO: lookup the local format from a server hint.
221
local_dir_format = _mod_bzrdir.BzrDirMetaFormat1()
222
self._supply_sub_formats_to(local_dir_format)
223
return local_dir_format.initialize_on_transport_ex(transport,
224
use_existing_dir=use_existing_dir, create_prefix=create_prefix,
225
force_new_repo=force_new_repo, stacked_on=stacked_on,
226
stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
227
make_working_trees=make_working_trees, shared_repo=shared_repo,
229
return self._initialize_on_transport_ex_rpc(client, path, transport,
230
use_existing_dir, create_prefix, force_new_repo, stacked_on,
231
stack_on_pwd, repo_format_name, make_working_trees, shared_repo)
233
def _initialize_on_transport_ex_rpc(self, client, path, transport,
234
use_existing_dir, create_prefix, force_new_repo, stacked_on,
235
stack_on_pwd, repo_format_name, make_working_trees, shared_repo):
237
args.append(self._serialize_NoneTrueFalse(use_existing_dir))
238
args.append(self._serialize_NoneTrueFalse(create_prefix))
239
args.append(self._serialize_NoneTrueFalse(force_new_repo))
240
args.append(self._serialize_NoneString(stacked_on))
241
# stack_on_pwd is often/usually our transport
244
stack_on_pwd = transport.relpath(stack_on_pwd)
247
except errors.PathNotChild:
249
args.append(self._serialize_NoneString(stack_on_pwd))
250
args.append(self._serialize_NoneString(repo_format_name))
251
args.append(self._serialize_NoneTrueFalse(make_working_trees))
252
args.append(self._serialize_NoneTrueFalse(shared_repo))
253
request_network_name = self._network_name or \
254
_mod_bzrdir.BzrDirFormat.get_default_format().network_name()
256
response = client.call('BzrDirFormat.initialize_ex_1.16',
257
request_network_name, path, *args)
258
except errors.UnknownSmartMethod:
259
client._medium._remember_remote_is_before((1,16))
260
local_dir_format = _mod_bzrdir.BzrDirMetaFormat1()
261
self._supply_sub_formats_to(local_dir_format)
262
return local_dir_format.initialize_on_transport_ex(transport,
263
use_existing_dir=use_existing_dir, create_prefix=create_prefix,
264
force_new_repo=force_new_repo, stacked_on=stacked_on,
265
stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
266
make_working_trees=make_working_trees, shared_repo=shared_repo,
268
except errors.ErrorFromSmartServer, err:
269
_translate_error(err, path=path)
270
repo_path = response[0]
271
bzrdir_name = response[6]
272
require_stacking = response[7]
273
require_stacking = self.parse_NoneTrueFalse(require_stacking)
274
format = RemoteBzrDirFormat()
275
format._network_name = bzrdir_name
276
self._supply_sub_formats_to(format)
277
bzrdir = RemoteBzrDir(transport, format, _client=client)
279
repo_format = response_tuple_to_repo_format(response[1:])
283
repo_bzrdir_format = RemoteBzrDirFormat()
284
repo_bzrdir_format._network_name = response[5]
285
repo_bzr = RemoteBzrDir(transport.clone(repo_path),
289
final_stack = response[8] or None
290
final_stack_pwd = response[9] or None
292
final_stack_pwd = urlutils.join(
293
transport.base, final_stack_pwd)
294
remote_repo = RemoteRepository(repo_bzr, repo_format)
295
if len(response) > 10:
296
# Updated server verb that locks remotely.
297
repo_lock_token = response[10] or None
298
remote_repo.lock_write(repo_lock_token, _skip_rpc=True)
300
remote_repo.dont_leave_lock_in_place()
302
remote_repo.lock_write()
303
policy = _mod_bzrdir.UseExistingRepository(remote_repo, final_stack,
304
final_stack_pwd, require_stacking)
305
policy.acquire_repository()
309
bzrdir._format.set_branch_format(self.get_branch_format())
311
# The repo has already been created, but we need to make sure that
312
# we'll make a stackable branch.
313
bzrdir._format.require_stacking(_skip_repo=True)
314
return remote_repo, bzrdir, require_stacking, policy
316
def _open(self, transport):
317
return RemoteBzrDir(transport, self)
319
def __eq__(self, other):
320
if not isinstance(other, RemoteBzrDirFormat):
322
return self.get_format_description() == other.get_format_description()
324
def __return_repository_format(self):
325
# Always return a RemoteRepositoryFormat object, but if a specific bzr
326
# repository format has been asked for, tell the RemoteRepositoryFormat
327
# that it should use that for init() etc.
328
result = RemoteRepositoryFormat()
329
custom_format = getattr(self, '_repository_format', None)
331
if isinstance(custom_format, RemoteRepositoryFormat):
334
# We will use the custom format to create repositories over the
335
# wire; expose its details like rich_root_data for code to
337
result._custom_format = custom_format
340
def get_branch_format(self):
341
result = _mod_bzrdir.BzrDirMetaFormat1.get_branch_format(self)
342
if not isinstance(result, RemoteBranchFormat):
343
new_result = RemoteBranchFormat()
344
new_result._custom_format = result
346
self.set_branch_format(new_result)
350
repository_format = property(__return_repository_format,
351
_mod_bzrdir.BzrDirMetaFormat1._set_repository_format) #.im_func)
354
class RemoteControlStore(_mod_config.IniFileStore):
355
"""Control store which attempts to use HPSS calls to retrieve control store.
357
Note that this is specific to bzr-based formats.
360
def __init__(self, bzrdir):
361
super(RemoteControlStore, self).__init__()
363
self._real_store = None
365
def lock_write(self, token=None):
367
return self._real_store.lock_write(token)
371
return self._real_store.unlock()
375
# We need to be able to override the undecorated implementation
376
self.save_without_locking()
378
def save_without_locking(self):
379
super(RemoteControlStore, self).save()
381
def _ensure_real(self):
382
self.bzrdir._ensure_real()
383
if self._real_store is None:
384
self._real_store = _mod_config.ControlStore(self.bzrdir)
386
def external_url(self):
387
return urlutils.join(self.branch.user_url, 'control.conf')
389
def _load_content(self):
390
medium = self.bzrdir._client._medium
391
path = self.bzrdir._path_for_remote_call(self.bzrdir._client)
393
response, handler = self.bzrdir._call_expecting_body(
394
'BzrDir.get_config_file', path)
395
except errors.UnknownSmartMethod:
397
return self._real_store._load_content()
398
if len(response) and response[0] != 'ok':
399
raise errors.UnexpectedSmartServerResponse(response)
400
return handler.read_body_bytes()
402
def _save_content(self, content):
403
# FIXME JRV 2011-11-22: Ideally this should use a
404
# HPSS call too, but at the moment it is not possible
405
# to write lock control directories.
407
return self._real_store._save_content(content)
410
class RemoteBzrDir(_mod_bzrdir.BzrDir, _RpcHelper):
90
411
"""Control directory on a remote server, accessed via bzr:// or similar."""
92
413
def __init__(self, transport, format, _client=None, _force_probe=False):
264
656
def destroy_branch(self, name=None):
265
657
"""See BzrDir.destroy_branch"""
267
self._real_bzrdir.destroy_branch(name=name)
659
name = self._get_selected_branch()
661
raise errors.NoColocatedBranchSupport(self)
662
path = self._path_for_remote_call(self._client)
668
response = self._call('BzrDir.destroy_branch', path, *args)
669
except errors.UnknownSmartMethod:
671
self._real_bzrdir.destroy_branch(name=name)
672
self._next_open_branch_result = None
268
674
self._next_open_branch_result = None
675
if response[0] != 'ok':
676
raise SmartProtocolError('unexpected response code %s' % (response,))
270
def create_workingtree(self, revision_id=None, from_branch=None):
678
def create_workingtree(self, revision_id=None, from_branch=None,
679
accelerator_tree=None, hardlink=False):
271
680
raise errors.NotLocalUrl(self.transport.base)
273
def find_branch_format(self):
682
def find_branch_format(self, name=None):
274
683
"""Find the branch 'format' for this bzrdir.
276
685
This might be a synthetic object for e.g. RemoteBranch and SVN.
278
b = self.open_branch()
687
b = self.open_branch(name=name)
281
def get_branch_reference(self):
690
def get_branches(self, possible_transports=None, ignore_fallbacks=False):
691
path = self._path_for_remote_call(self._client)
693
response, handler = self._call_expecting_body(
694
'BzrDir.get_branches', path)
695
except errors.UnknownSmartMethod:
697
return self._real_bzrdir.get_branches()
698
if response[0] != "success":
699
raise errors.UnexpectedSmartServerResponse(response)
700
body = bencode.bdecode(handler.read_body_bytes())
702
for (name, value) in body.iteritems():
703
ret[name] = self._open_branch(name, value[0], value[1],
704
possible_transports=possible_transports,
705
ignore_fallbacks=ignore_fallbacks)
708
def set_branch_reference(self, target_branch, name=None):
709
"""See BzrDir.set_branch_reference()."""
711
name = self._get_selected_branch()
713
raise errors.NoColocatedBranchSupport(self)
715
return self._real_bzrdir.set_branch_reference(target_branch, name=name)
717
def get_branch_reference(self, name=None):
282
718
"""See BzrDir.get_branch_reference()."""
720
name = self._get_selected_branch()
722
raise errors.NoColocatedBranchSupport(self)
283
723
response = self._get_branch_reference()
284
724
if response[0] == 'ref':
285
725
return response[1]
316
756
raise errors.UnexpectedSmartServerResponse(response)
319
def _get_tree_branch(self):
759
def _get_tree_branch(self, name=None):
320
760
"""See BzrDir._get_tree_branch()."""
321
return None, self.open_branch()
761
return None, self.open_branch(name=name)
763
def _open_branch(self, name, kind, location_or_format,
764
ignore_fallbacks=False, possible_transports=None):
766
# a branch reference, use the existing BranchReference logic.
767
format = BranchReferenceFormat()
768
return format.open(self, name=name, _found=True,
769
location=location_or_format, ignore_fallbacks=ignore_fallbacks,
770
possible_transports=possible_transports)
771
branch_format_name = location_or_format
772
if not branch_format_name:
773
branch_format_name = None
774
format = RemoteBranchFormat(network_name=branch_format_name)
775
return RemoteBranch(self, self.find_repository(), format=format,
776
setup_stacking=not ignore_fallbacks, name=name,
777
possible_transports=possible_transports)
323
779
def open_branch(self, name=None, unsupported=False,
324
ignore_fallbacks=False):
780
ignore_fallbacks=False, possible_transports=None):
782
name = self._get_selected_branch()
784
raise errors.NoColocatedBranchSupport(self)
326
786
raise NotImplementedError('unsupported flag support not implemented yet.')
328
raise errors.NoColocatedBranchSupport(self)
329
787
if self._next_open_branch_result is not None:
330
788
# See create_branch for details.
331
789
result = self._next_open_branch_result
332
790
self._next_open_branch_result = None
334
792
response = self._get_branch_reference()
335
if response[0] == 'ref':
336
# a branch reference, use the existing BranchReference logic.
337
format = BranchReferenceFormat()
338
return format.open(self, _found=True, location=response[1],
339
ignore_fallbacks=ignore_fallbacks)
340
branch_format_name = response[1]
341
if not branch_format_name:
342
branch_format_name = None
343
format = RemoteBranchFormat(network_name=branch_format_name)
344
return RemoteBranch(self, self.find_repository(), format=format,
345
setup_stacking=not ignore_fallbacks)
793
return self._open_branch(name, response[0], response[1],
794
possible_transports=possible_transports,
795
ignore_fallbacks=ignore_fallbacks)
347
797
def _open_repo_v1(self, path):
348
798
verb = 'BzrDir.find_repository'
1174
1768
raise errors.UnexpectedSmartServerResponse(response)
1176
1771
def sprout(self, to_bzrdir, revision_id=None):
1177
# TODO: Option to control what format is created?
1179
dest_repo = self._real_repository._format.initialize(to_bzrdir,
1772
"""Create a descendent repository for new development.
1774
Unlike clone, this does not copy the settings of the repository.
1776
dest_repo = self._create_sprouting_repo(to_bzrdir, shared=False)
1181
1777
dest_repo.fetch(self, revision_id=revision_id)
1182
1778
return dest_repo
1780
def _create_sprouting_repo(self, a_bzrdir, shared):
1781
if not isinstance(a_bzrdir._format, self.bzrdir._format.__class__):
1782
# use target default format.
1783
dest_repo = a_bzrdir.create_repository()
1785
# Most control formats need the repository to be specifically
1786
# created, but on some old all-in-one formats it's not needed
1788
dest_repo = self._format.initialize(a_bzrdir, shared=shared)
1789
except errors.UninitializableFormat:
1790
dest_repo = a_bzrdir.open_repository()
1184
1793
### These methods are just thin shims to the VFS object for now.
1186
1796
def revision_tree(self, revision_id):
1188
return self._real_repository.revision_tree(revision_id)
1797
revision_id = _mod_revision.ensure_null(revision_id)
1798
if revision_id == _mod_revision.NULL_REVISION:
1799
return InventoryRevisionTree(self,
1800
Inventory(root_id=None), _mod_revision.NULL_REVISION)
1802
return list(self.revision_trees([revision_id]))[0]
1190
1804
def get_serializer_format(self):
1192
return self._real_repository.get_serializer_format()
1805
path = self.bzrdir._path_for_remote_call(self._client)
1807
response = self._call('VersionedFileRepository.get_serializer_format',
1809
except errors.UnknownSmartMethod:
1811
return self._real_repository.get_serializer_format()
1812
if response[0] != 'ok':
1813
raise errors.UnexpectedSmartServerResponse(response)
1194
1816
def get_commit_builder(self, branch, parents, config, timestamp=None,
1195
1817
timezone=None, committer=None, revprops=None,
1197
# FIXME: It ought to be possible to call this without immediately
1198
# triggering _ensure_real. For now it's the easiest thing to do.
1200
real_repo = self._real_repository
1201
builder = real_repo.get_commit_builder(branch, parents,
1202
config, timestamp=timestamp, timezone=timezone,
1203
committer=committer, revprops=revprops, revision_id=revision_id)
1818
revision_id=None, lossy=False):
1819
"""Obtain a CommitBuilder for this repository.
1821
:param branch: Branch to commit to.
1822
:param parents: Revision ids of the parents of the new revision.
1823
:param config: Configuration to use.
1824
:param timestamp: Optional timestamp recorded for commit.
1825
:param timezone: Optional timezone for timestamp.
1826
:param committer: Optional committer to set for commit.
1827
:param revprops: Optional dictionary of revision properties.
1828
:param revision_id: Optional revision id.
1829
:param lossy: Whether to discard data that can not be natively
1830
represented, when pushing to a foreign VCS
1832
if self._fallback_repositories and not self._format.supports_chks:
1833
raise errors.BzrError("Cannot commit directly to a stacked branch"
1834
" in pre-2a formats. See "
1835
"https://bugs.launchpad.net/bzr/+bug/375013 for details.")
1836
if self._format.rich_root_data:
1837
commit_builder_kls = vf_repository.VersionedFileRootCommitBuilder
1839
commit_builder_kls = vf_repository.VersionedFileCommitBuilder
1840
result = commit_builder_kls(self, parents, config,
1841
timestamp, timezone, committer, revprops, revision_id,
1843
self.start_write_group()
1206
1846
def add_fallback_repository(self, repository):
1207
1847
"""Add a repository to use for looking up data not held locally.
1224
1866
# _real_branch had its get_stacked_on_url method called), then the
1225
1867
# repository to be added may already be in the _real_repositories list.
1226
1868
if self._real_repository is not None:
1227
fallback_locations = [repo.bzrdir.root_transport.base for repo in
1869
fallback_locations = [repo.user_url for repo in
1228
1870
self._real_repository._fallback_repositories]
1229
if repository.bzrdir.root_transport.base not in fallback_locations:
1871
if repository.user_url not in fallback_locations:
1230
1872
self._real_repository.add_fallback_repository(repository)
1874
def _check_fallback_repository(self, repository):
1875
"""Check that this repository can fallback to repository safely.
1877
Raise an error if not.
1879
:param repository: A repository to fallback to.
1881
return _mod_repository.InterRepository._assert_same_model(
1232
1884
def add_inventory(self, revid, inv, parents):
1233
1885
self._ensure_real()
1234
1886
return self._real_repository.add_inventory(revid, inv, parents)
1236
1888
def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1889
parents, basis_inv=None, propagate_caches=False):
1238
1890
self._ensure_real()
1239
1891
return self._real_repository.add_inventory_by_delta(basis_revision_id,
1240
delta, new_revision_id, parents)
1242
def add_revision(self, rev_id, rev, inv=None, config=None):
1244
return self._real_repository.add_revision(
1245
rev_id, rev, inv=inv, config=config)
1892
delta, new_revision_id, parents, basis_inv=basis_inv,
1893
propagate_caches=propagate_caches)
1895
def add_revision(self, revision_id, rev, inv=None):
1896
_mod_revision.check_not_reserved_id(revision_id)
1897
key = (revision_id,)
1898
# check inventory present
1899
if not self.inventories.get_parent_map([key]):
1901
raise errors.WeaveRevisionNotPresent(revision_id,
1904
# yes, this is not suitable for adding with ghosts.
1905
rev.inventory_sha1 = self.add_inventory(revision_id, inv,
1908
rev.inventory_sha1 = self.inventories.get_sha1s([key])[key]
1909
self._add_revision(rev)
1911
def _add_revision(self, rev):
1912
if self._real_repository is not None:
1913
return self._real_repository._add_revision(rev)
1914
text = self._serializer.write_revision_to_string(rev)
1915
key = (rev.revision_id,)
1916
parents = tuple((parent,) for parent in rev.parent_ids)
1917
self._write_group_tokens, missing_keys = self._get_sink().insert_stream(
1918
[('revisions', [FulltextContentFactory(key, parents, None, text)])],
1919
self._format, self._write_group_tokens)
1247
1921
@needs_read_lock
1248
1922
def get_inventory(self, revision_id):
1923
return list(self.iter_inventories([revision_id]))[0]
1925
def _iter_inventories_rpc(self, revision_ids, ordering):
1926
if ordering is None:
1927
ordering = 'unordered'
1928
path = self.bzrdir._path_for_remote_call(self._client)
1929
body = "\n".join(revision_ids)
1930
response_tuple, response_handler = (
1931
self._call_with_body_bytes_expecting_body(
1932
"VersionedFileRepository.get_inventories",
1933
(path, ordering), body))
1934
if response_tuple[0] != "ok":
1935
raise errors.UnexpectedSmartServerResponse(response_tuple)
1936
deserializer = inventory_delta.InventoryDeltaDeserializer()
1937
byte_stream = response_handler.read_streamed_body()
1938
decoded = smart_repo._byte_stream_to_stream(byte_stream)
1940
# no results whatsoever
1942
src_format, stream = decoded
1943
if src_format.network_name() != self._format.network_name():
1944
raise AssertionError(
1945
"Mismatched RemoteRepository and stream src %r, %r" % (
1946
src_format.network_name(), self._format.network_name()))
1947
# ignore the src format, it's not really relevant
1948
prev_inv = Inventory(root_id=None,
1949
revision_id=_mod_revision.NULL_REVISION)
1950
# there should be just one substream, with inventory deltas
1951
substream_kind, substream = stream.next()
1952
if substream_kind != "inventory-deltas":
1953
raise AssertionError(
1954
"Unexpected stream %r received" % substream_kind)
1955
for record in substream:
1956
(parent_id, new_id, versioned_root, tree_references, invdelta) = (
1957
deserializer.parse_text_bytes(record.get_bytes_as("fulltext")))
1958
if parent_id != prev_inv.revision_id:
1959
raise AssertionError("invalid base %r != %r" % (parent_id,
1960
prev_inv.revision_id))
1961
inv = prev_inv.create_by_apply_delta(invdelta, new_id)
1962
yield inv, inv.revision_id
1965
def _iter_inventories_vfs(self, revision_ids, ordering=None):
1249
1966
self._ensure_real()
1250
return self._real_repository.get_inventory(revision_id)
1967
return self._real_repository._iter_inventories(revision_ids, ordering)
1252
1969
def iter_inventories(self, revision_ids, ordering=None):
1254
return self._real_repository.iter_inventories(revision_ids, ordering)
1970
"""Get many inventories by revision_ids.
1972
This will buffer some or all of the texts used in constructing the
1973
inventories in memory, but will only parse a single inventory at a
1976
:param revision_ids: The expected revision ids of the inventories.
1977
:param ordering: optional ordering, e.g. 'topological'. If not
1978
specified, the order of revision_ids will be preserved (by
1979
buffering if necessary).
1980
:return: An iterator of inventories.
1982
if ((None in revision_ids)
1983
or (_mod_revision.NULL_REVISION in revision_ids)):
1984
raise ValueError('cannot get null revision inventory')
1985
for inv, revid in self._iter_inventories(revision_ids, ordering):
1987
raise errors.NoSuchRevision(self, revid)
1990
def _iter_inventories(self, revision_ids, ordering=None):
1991
if len(revision_ids) == 0:
1993
missing = set(revision_ids)
1994
if ordering is None:
1995
order_as_requested = True
1997
order = list(revision_ids)
1999
next_revid = order.pop()
2001
order_as_requested = False
2002
if ordering != 'unordered' and self._fallback_repositories:
2003
raise ValueError('unsupported ordering %r' % ordering)
2004
iter_inv_fns = [self._iter_inventories_rpc] + [
2005
fallback._iter_inventories for fallback in
2006
self._fallback_repositories]
2008
for iter_inv in iter_inv_fns:
2009
request = [revid for revid in revision_ids if revid in missing]
2010
for inv, revid in iter_inv(request, ordering):
2013
missing.remove(inv.revision_id)
2014
if ordering != 'unordered':
2018
if order_as_requested:
2019
# Yield as many results as we can while preserving order.
2020
while next_revid in invs:
2021
inv = invs.pop(next_revid)
2022
yield inv, inv.revision_id
2024
next_revid = order.pop()
2026
# We still want to fully consume the stream, just
2027
# in case it is not actually finished at this point
2030
except errors.UnknownSmartMethod:
2031
for inv, revid in self._iter_inventories_vfs(revision_ids, ordering):
2035
if order_as_requested:
2036
if next_revid is not None:
2037
yield None, next_revid
2040
yield invs.get(revid), revid
2043
yield None, missing.pop()
1256
2045
@needs_read_lock
1257
2046
def get_revision(self, revision_id):
1259
return self._real_repository.get_revision(revision_id)
2047
return self.get_revisions([revision_id])[0]
1261
2049
def get_transaction(self):
1262
2050
self._ensure_real()
1295
2095
included_keys = result_set.intersection(result_parents)
1296
2096
start_keys = result_set.difference(included_keys)
1297
2097
exclude_keys = result_parents.difference(result_set)
1298
result = graph.SearchResult(start_keys, exclude_keys,
2098
result = vf_search.SearchResult(start_keys, exclude_keys,
1299
2099
len(result_set), result_set)
1302
2102
@needs_read_lock
1303
def search_missing_revision_ids(self, other, revision_id=None, find_ghosts=True):
2103
def search_missing_revision_ids(self, other,
2104
revision_id=symbol_versioning.DEPRECATED_PARAMETER,
2105
find_ghosts=True, revision_ids=None, if_present_ids=None,
1304
2107
"""Return the revision ids that other has that this does not.
1306
2109
These are returned in topological order.
1308
2111
revision_id: only return revision ids included by revision_id.
1310
return repository.InterRepository.get(
1311
other, self).search_missing_revision_ids(revision_id, find_ghosts)
2113
if symbol_versioning.deprecated_passed(revision_id):
2114
symbol_versioning.warn(
2115
'search_missing_revision_ids(revision_id=...) was '
2116
'deprecated in 2.4. Use revision_ids=[...] instead.',
2117
DeprecationWarning, stacklevel=2)
2118
if revision_ids is not None:
2119
raise AssertionError(
2120
'revision_ids is mutually exclusive with revision_id')
2121
if revision_id is not None:
2122
revision_ids = [revision_id]
2123
inter_repo = _mod_repository.InterRepository.get(other, self)
2124
return inter_repo.search_missing_revision_ids(
2125
find_ghosts=find_ghosts, revision_ids=revision_ids,
2126
if_present_ids=if_present_ids, limit=limit)
1313
def fetch(self, source, revision_id=None, pb=None, find_ghosts=False,
2128
def fetch(self, source, revision_id=None, find_ghosts=False,
1314
2129
fetch_spec=None):
1315
2130
# No base implementation to use as RemoteRepository is not a subclass
1316
2131
# of Repository; so this is a copy of Repository.fetch().
1355
2169
return self._real_repository._get_versioned_file_checker(
1356
2170
revisions, revision_versions_cache)
2172
def _iter_files_bytes_rpc(self, desired_files, absent):
2173
path = self.bzrdir._path_for_remote_call(self._client)
2176
for (file_id, revid, identifier) in desired_files:
2177
lines.append("%s\0%s" % (
2178
osutils.safe_file_id(file_id),
2179
osutils.safe_revision_id(revid)))
2180
identifiers.append(identifier)
2181
(response_tuple, response_handler) = (
2182
self._call_with_body_bytes_expecting_body(
2183
"Repository.iter_files_bytes", (path, ), "\n".join(lines)))
2184
if response_tuple != ('ok', ):
2185
response_handler.cancel_read_body()
2186
raise errors.UnexpectedSmartServerResponse(response_tuple)
2187
byte_stream = response_handler.read_streamed_body()
2188
def decompress_stream(start, byte_stream, unused):
2189
decompressor = zlib.decompressobj()
2190
yield decompressor.decompress(start)
2191
while decompressor.unused_data == "":
2193
data = byte_stream.next()
2194
except StopIteration:
2196
yield decompressor.decompress(data)
2197
yield decompressor.flush()
2198
unused.append(decompressor.unused_data)
2201
while not "\n" in unused:
2202
unused += byte_stream.next()
2203
header, rest = unused.split("\n", 1)
2204
args = header.split("\0")
2205
if args[0] == "absent":
2206
absent[identifiers[int(args[3])]] = (args[1], args[2])
2209
elif args[0] == "ok":
2212
raise errors.UnexpectedSmartServerResponse(args)
2214
yield (identifiers[idx],
2215
decompress_stream(rest, byte_stream, unused_chunks))
2216
unused = "".join(unused_chunks)
1358
2218
def iter_files_bytes(self, desired_files):
1359
2219
"""See Repository.iter_file_bytes.
1362
return self._real_repository.iter_files_bytes(desired_files)
2223
for (identifier, bytes_iterator) in self._iter_files_bytes_rpc(
2224
desired_files, absent):
2225
yield identifier, bytes_iterator
2226
for fallback in self._fallback_repositories:
2229
desired_files = [(key[0], key[1], identifier) for
2230
(identifier, key) in absent.iteritems()]
2231
for (identifier, bytes_iterator) in fallback.iter_files_bytes(desired_files):
2232
del absent[identifier]
2233
yield identifier, bytes_iterator
2235
# There may be more missing items, but raise an exception
2237
missing_identifier = absent.keys()[0]
2238
missing_key = absent[missing_identifier]
2239
raise errors.RevisionNotPresent(revision_id=missing_key[1],
2240
file_id=missing_key[0])
2241
except errors.UnknownSmartMethod:
2243
for (identifier, bytes_iterator) in (
2244
self._real_repository.iter_files_bytes(desired_files)):
2245
yield identifier, bytes_iterator
2247
def get_cached_parent_map(self, revision_ids):
2248
"""See bzrlib.CachingParentsProvider.get_cached_parent_map"""
2249
return self._unstacked_provider.get_cached_parent_map(revision_ids)
1364
2251
def get_parent_map(self, revision_ids):
1365
2252
"""See bzrlib.Graph.get_parent_map()."""
1499
2375
@needs_read_lock
1500
2376
def get_signature_text(self, revision_id):
1502
return self._real_repository.get_signature_text(revision_id)
2377
path = self.bzrdir._path_for_remote_call(self._client)
2379
response_tuple, response_handler = self._call_expecting_body(
2380
'Repository.get_revision_signature_text', path, revision_id)
2381
except errors.UnknownSmartMethod:
2383
return self._real_repository.get_signature_text(revision_id)
2384
except errors.NoSuchRevision, err:
2385
for fallback in self._fallback_repositories:
2387
return fallback.get_signature_text(revision_id)
2388
except errors.NoSuchRevision:
2392
if response_tuple[0] != 'ok':
2393
raise errors.UnexpectedSmartServerResponse(response_tuple)
2394
return response_handler.read_body_bytes()
1504
2396
@needs_read_lock
1505
2397
def _get_inventory_xml(self, revision_id):
2398
# This call is used by older working tree formats,
2399
# which stored a serialized basis inventory.
1506
2400
self._ensure_real()
1507
2401
return self._real_repository._get_inventory_xml(revision_id)
1509
2404
def reconcile(self, other=None, thorough=False):
1511
return self._real_repository.reconcile(other=other, thorough=thorough)
2405
from bzrlib.reconcile import RepoReconciler
2406
path = self.bzrdir._path_for_remote_call(self._client)
2408
response, handler = self._call_expecting_body(
2409
'Repository.reconcile', path, self._lock_token)
2410
except (errors.UnknownSmartMethod, errors.TokenLockingNotSupported):
2412
return self._real_repository.reconcile(other=other, thorough=thorough)
2413
if response != ('ok', ):
2414
raise errors.UnexpectedSmartServerResponse(response)
2415
body = handler.read_body_bytes()
2416
result = RepoReconciler(self)
2417
for line in body.split('\n'):
2420
key, val_text = line.split(':')
2421
if key == "garbage_inventories":
2422
result.garbage_inventories = int(val_text)
2423
elif key == "inconsistent_parents":
2424
result.inconsistent_parents = int(val_text)
2426
mutter("unknown reconcile key %r" % key)
1513
2429
def all_revision_ids(self):
1515
return self._real_repository.all_revision_ids()
2430
path = self.bzrdir._path_for_remote_call(self._client)
2432
response_tuple, response_handler = self._call_expecting_body(
2433
"Repository.all_revision_ids", path)
2434
except errors.UnknownSmartMethod:
2436
return self._real_repository.all_revision_ids()
2437
if response_tuple != ("ok", ):
2438
raise errors.UnexpectedSmartServerResponse(response_tuple)
2439
revids = set(response_handler.read_body_bytes().splitlines())
2440
for fallback in self._fallback_repositories:
2441
revids.update(set(fallback.all_revision_ids()))
2444
def _filtered_revision_trees(self, revision_ids, file_ids):
2445
"""Return Tree for a revision on this branch with only some files.
2447
:param revision_ids: a sequence of revision-ids;
2448
a revision-id may not be None or 'null:'
2449
:param file_ids: if not None, the result is filtered
2450
so that only those file-ids, their parents and their
2451
children are included.
2453
inventories = self.iter_inventories(revision_ids)
2454
for inv in inventories:
2455
# Should we introduce a FilteredRevisionTree class rather
2456
# than pre-filter the inventory here?
2457
filtered_inv = inv.filter(file_ids)
2458
yield InventoryRevisionTree(self, filtered_inv, filtered_inv.revision_id)
1517
2460
@needs_read_lock
1518
2461
def get_deltas_for_revisions(self, revisions, specific_fileids=None):
1520
return self._real_repository.get_deltas_for_revisions(revisions,
1521
specific_fileids=specific_fileids)
2462
medium = self._client._medium
2463
if medium._is_remote_before((1, 2)):
2465
for delta in self._real_repository.get_deltas_for_revisions(
2466
revisions, specific_fileids):
2469
# Get the revision-ids of interest
2470
required_trees = set()
2471
for revision in revisions:
2472
required_trees.add(revision.revision_id)
2473
required_trees.update(revision.parent_ids[:1])
2475
# Get the matching filtered trees. Note that it's more
2476
# efficient to pass filtered trees to changes_from() rather
2477
# than doing the filtering afterwards. changes_from() could
2478
# arguably do the filtering itself but it's path-based, not
2479
# file-id based, so filtering before or afterwards is
2481
if specific_fileids is None:
2482
trees = dict((t.get_revision_id(), t) for
2483
t in self.revision_trees(required_trees))
2485
trees = dict((t.get_revision_id(), t) for
2486
t in self._filtered_revision_trees(required_trees,
2489
# Calculate the deltas
2490
for revision in revisions:
2491
if not revision.parent_ids:
2492
old_tree = self.revision_tree(_mod_revision.NULL_REVISION)
2494
old_tree = trees[revision.parent_ids[0]]
2495
yield trees[revision.revision_id].changes_from(old_tree)
1523
2497
@needs_read_lock
1524
2498
def get_revision_delta(self, revision_id, specific_fileids=None):
1526
return self._real_repository.get_revision_delta(revision_id,
1527
specific_fileids=specific_fileids)
2499
r = self.get_revision(revision_id)
2500
return list(self.get_deltas_for_revisions([r],
2501
specific_fileids=specific_fileids))[0]
1529
2503
@needs_read_lock
1530
2504
def revision_trees(self, revision_ids):
1532
return self._real_repository.revision_trees(revision_ids)
2505
inventories = self.iter_inventories(revision_ids)
2506
for inv in inventories:
2507
yield InventoryRevisionTree(self, inv, inv.revision_id)
1534
2509
@needs_read_lock
1535
2510
def get_revision_reconcile(self, revision_id):
1647
2635
self._ensure_real()
1648
2636
return self._real_repository.texts
2638
def _iter_revisions_rpc(self, revision_ids):
2639
body = "\n".join(revision_ids)
2640
path = self.bzrdir._path_for_remote_call(self._client)
2641
response_tuple, response_handler = (
2642
self._call_with_body_bytes_expecting_body(
2643
"Repository.iter_revisions", (path, ), body))
2644
if response_tuple[0] != "ok":
2645
raise errors.UnexpectedSmartServerResponse(response_tuple)
2646
serializer_format = response_tuple[1]
2647
serializer = serializer_format_registry.get(serializer_format)
2648
byte_stream = response_handler.read_streamed_body()
2649
decompressor = zlib.decompressobj()
2651
for bytes in byte_stream:
2652
chunks.append(decompressor.decompress(bytes))
2653
if decompressor.unused_data != "":
2654
chunks.append(decompressor.flush())
2655
yield serializer.read_revision_from_string("".join(chunks))
2656
unused = decompressor.unused_data
2657
decompressor = zlib.decompressobj()
2658
chunks = [decompressor.decompress(unused)]
2659
chunks.append(decompressor.flush())
2660
text = "".join(chunks)
2662
yield serializer.read_revision_from_string("".join(chunks))
1650
2664
@needs_read_lock
1651
2665
def get_revisions(self, revision_ids):
1653
return self._real_repository.get_revisions(revision_ids)
2666
if revision_ids is None:
2667
revision_ids = self.all_revision_ids()
2669
for rev_id in revision_ids:
2670
if not rev_id or not isinstance(rev_id, basestring):
2671
raise errors.InvalidRevisionId(
2672
revision_id=rev_id, branch=self)
2674
missing = set(revision_ids)
2676
for rev in self._iter_revisions_rpc(revision_ids):
2677
missing.remove(rev.revision_id)
2678
revs[rev.revision_id] = rev
2679
except errors.UnknownSmartMethod:
2681
return self._real_repository.get_revisions(revision_ids)
2682
for fallback in self._fallback_repositories:
2685
for revid in list(missing):
2686
# XXX JRV 2011-11-20: It would be nice if there was a
2687
# public method on Repository that could be used to query
2688
# for revision objects *without* failing completely if one
2689
# was missing. There is VersionedFileRepository._iter_revisions,
2690
# but unfortunately that's private and not provided by
2691
# all repository implementations.
2693
revs[revid] = fallback.get_revision(revid)
2694
except errors.NoSuchRevision:
2697
missing.remove(revid)
2699
raise errors.NoSuchRevision(self, list(missing)[0])
2700
return [revs[revid] for revid in revision_ids]
1655
2702
def supports_rich_root(self):
1656
2703
return self._format.rich_root_data
1658
def iter_reverse_revision_history(self, revision_id):
1660
return self._real_repository.iter_reverse_revision_history(revision_id)
1663
2706
def _serializer(self):
1664
2707
return self._format._serializer
1666
2710
def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
1668
return self._real_repository.store_revision_signature(
1669
gpg_strategy, plaintext, revision_id)
2711
signature = gpg_strategy.sign(plaintext)
2712
self.add_signature_text(revision_id, signature)
1671
2714
def add_signature_text(self, revision_id, signature):
1673
return self._real_repository.add_signature_text(revision_id, signature)
2715
if self._real_repository:
2716
# If there is a real repository the write group will
2717
# be in the real repository as well, so use that:
2719
return self._real_repository.add_signature_text(
2720
revision_id, signature)
2721
path = self.bzrdir._path_for_remote_call(self._client)
2722
response, handler = self._call_with_body_bytes_expecting_body(
2723
'Repository.add_signature_text', (path, self._lock_token,
2724
revision_id) + tuple(self._write_group_tokens), signature)
2725
handler.cancel_read_body()
2727
if response[0] != 'ok':
2728
raise errors.UnexpectedSmartServerResponse(response)
2729
self._write_group_tokens = response[1:]
1675
2731
def has_signature_for_revision_id(self, revision_id):
1677
return self._real_repository.has_signature_for_revision_id(revision_id)
2732
path = self.bzrdir._path_for_remote_call(self._client)
2734
response = self._call('Repository.has_signature_for_revision_id',
2736
except errors.UnknownSmartMethod:
2738
return self._real_repository.has_signature_for_revision_id(
2740
if response[0] not in ('yes', 'no'):
2741
raise SmartProtocolError('unexpected response code %s' % (response,))
2742
if response[0] == 'yes':
2744
for fallback in self._fallback_repositories:
2745
if fallback.has_signature_for_revision_id(revision_id):
2750
def verify_revision_signature(self, revision_id, gpg_strategy):
2751
if not self.has_signature_for_revision_id(revision_id):
2752
return gpg.SIGNATURE_NOT_SIGNED, None
2753
signature = self.get_signature_text(revision_id)
2755
testament = _mod_testament.Testament.from_revision(self, revision_id)
2756
plaintext = testament.as_short_text()
2758
return gpg_strategy.verify(signature, plaintext)
1679
2760
def item_keys_introduced_by(self, revision_ids, _files_pb=None):
1680
2761
self._ensure_real()
1681
2762
return self._real_repository.item_keys_introduced_by(revision_ids,
1682
2763
_files_pb=_files_pb)
1684
def revision_graph_can_have_wrong_parents(self):
1685
# The answer depends on the remote repo format.
1687
return self._real_repository.revision_graph_can_have_wrong_parents()
1689
2765
def _find_inconsistent_revision_parents(self, revisions_iterator=None):
1690
2766
self._ensure_real()
1691
2767
return self._real_repository._find_inconsistent_revision_parents(
2026
3113
def network_name(self):
2027
3114
return self._network_name
2029
def open(self, a_bzrdir, ignore_fallbacks=False):
2030
return a_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
3116
def open(self, a_bzrdir, name=None, ignore_fallbacks=False):
3117
return a_bzrdir.open_branch(name=name,
3118
ignore_fallbacks=ignore_fallbacks)
2032
def _vfs_initialize(self, a_bzrdir):
3120
def _vfs_initialize(self, a_bzrdir, name, append_revisions_only,
2033
3122
# Initialisation when using a local bzrdir object, or a non-vfs init
2034
3123
# method is not available on the server.
2035
3124
# self._custom_format is always set - the start of initialize ensures
2037
3126
if isinstance(a_bzrdir, RemoteBzrDir):
2038
3127
a_bzrdir._ensure_real()
2039
result = self._custom_format.initialize(a_bzrdir._real_bzrdir)
3128
result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
3129
name=name, append_revisions_only=append_revisions_only,
3130
repository=repository)
2041
3132
# We assume the bzrdir is parameterised; it may not be.
2042
result = self._custom_format.initialize(a_bzrdir)
3133
result = self._custom_format.initialize(a_bzrdir, name=name,
3134
append_revisions_only=append_revisions_only,
3135
repository=repository)
2043
3136
if (isinstance(a_bzrdir, RemoteBzrDir) and
2044
3137
not isinstance(result, RemoteBranch)):
2045
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
3138
result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
2048
def initialize(self, a_bzrdir):
3142
def initialize(self, a_bzrdir, name=None, repository=None,
3143
append_revisions_only=None):
3145
name = a_bzrdir._get_selected_branch()
2049
3146
# 1) get the network name to use.
2050
3147
if self._custom_format:
2051
3148
network_name = self._custom_format.network_name()
2053
3150
# Select the current bzrlib default and ask for that.
2054
reference_bzrdir_format = bzrdir.format_registry.get('default')()
3151
reference_bzrdir_format = controldir.format_registry.get('default')()
2055
3152
reference_format = reference_bzrdir_format.get_branch_format()
2056
3153
self._custom_format = reference_format
2057
3154
network_name = reference_format.network_name()
2058
3155
# Being asked to create on a non RemoteBzrDir:
2059
3156
if not isinstance(a_bzrdir, RemoteBzrDir):
2060
return self._vfs_initialize(a_bzrdir)
3157
return self._vfs_initialize(a_bzrdir, name=name,
3158
append_revisions_only=append_revisions_only,
3159
repository=repository)
2061
3160
medium = a_bzrdir._client._medium
2062
3161
if medium._is_remote_before((1, 13)):
2063
return self._vfs_initialize(a_bzrdir)
3162
return self._vfs_initialize(a_bzrdir, name=name,
3163
append_revisions_only=append_revisions_only,
3164
repository=repository)
2064
3165
# Creating on a remote bzr dir.
2065
3166
# 2) try direct creation via RPC
2066
3167
path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
3169
# XXX JRV20100304: Support creating colocated branches
3170
raise errors.NoColocatedBranchSupport(self)
2067
3171
verb = 'BzrDir.create_branch'
2069
3173
response = a_bzrdir._call(verb, path, network_name)
2070
3174
except errors.UnknownSmartMethod:
2071
3175
# Fallback - use vfs methods
2072
3176
medium._remember_remote_is_before((1, 13))
2073
return self._vfs_initialize(a_bzrdir)
3177
return self._vfs_initialize(a_bzrdir, name=name,
3178
append_revisions_only=append_revisions_only,
3179
repository=repository)
2074
3180
if response[0] != 'ok':
2075
3181
raise errors.UnexpectedSmartServerResponse(response)
2076
3182
# Turn the response into a RemoteRepository object.
2077
3183
format = RemoteBranchFormat(network_name=response[1])
2078
3184
repo_format = response_tuple_to_repo_format(response[3:])
2079
if response[2] == '':
2080
repo_bzrdir = a_bzrdir
3185
repo_path = response[2]
3186
if repository is not None:
3187
remote_repo_url = urlutils.join(a_bzrdir.user_url, repo_path)
3188
url_diff = urlutils.relative_url(repository.user_url,
3191
raise AssertionError(
3192
'repository.user_url %r does not match URL from server '
3193
'response (%r + %r)'
3194
% (repository.user_url, a_bzrdir.user_url, repo_path))
3195
remote_repo = repository
2082
repo_bzrdir = RemoteBzrDir(
2083
a_bzrdir.root_transport.clone(response[2]), a_bzrdir._format,
2085
remote_repo = RemoteRepository(repo_bzrdir, repo_format)
3198
repo_bzrdir = a_bzrdir
3200
repo_bzrdir = RemoteBzrDir(
3201
a_bzrdir.root_transport.clone(repo_path), a_bzrdir._format,
3203
remote_repo = RemoteRepository(repo_bzrdir, repo_format)
2086
3204
remote_branch = RemoteBranch(a_bzrdir, remote_repo,
2087
format=format, setup_stacking=False)
3205
format=format, setup_stacking=False, name=name)
3206
if append_revisions_only:
3207
remote_branch.set_append_revisions_only(append_revisions_only)
2088
3208
# XXX: We know this is a new branch, so it must have revno 0, revid
2089
3209
# NULL_REVISION. Creating the branch locked would make this be unable
2090
3210
# to be wrong; here its simply very unlikely to be wrong. RBC 20090225
2109
3229
self._ensure_real()
2110
3230
return self._custom_format.supports_set_append_revisions_only()
3232
def _use_default_local_heads_to_fetch(self):
3233
# If the branch format is a metadir format *and* its heads_to_fetch
3234
# implementation is not overridden vs the base class, we can use the
3235
# base class logic rather than use the heads_to_fetch RPC. This is
3236
# usually cheaper in terms of net round trips, as the last-revision and
3237
# tags info fetched is cached and would be fetched anyway.
3239
if isinstance(self._custom_format, branch.BranchFormatMetadir):
3240
branch_class = self._custom_format._branch_class()
3241
heads_to_fetch_impl = branch_class.heads_to_fetch.im_func
3242
if heads_to_fetch_impl is branch.Branch.heads_to_fetch.im_func:
3247
class RemoteBranchStore(_mod_config.IniFileStore):
3248
"""Branch store which attempts to use HPSS calls to retrieve branch store.
3250
Note that this is specific to bzr-based formats.
3253
def __init__(self, branch):
3254
super(RemoteBranchStore, self).__init__()
3255
self.branch = branch
3257
self._real_store = None
3259
def external_url(self):
3260
return urlutils.join(self.branch.user_url, 'branch.conf')
3262
def _load_content(self):
3263
path = self.branch._remote_path()
3265
response, handler = self.branch._call_expecting_body(
3266
'Branch.get_config_file', path)
3267
except errors.UnknownSmartMethod:
3269
return self._real_store._load_content()
3270
if len(response) and response[0] != 'ok':
3271
raise errors.UnexpectedSmartServerResponse(response)
3272
return handler.read_body_bytes()
3274
def _save_content(self, content):
3275
path = self.branch._remote_path()
3277
response, handler = self.branch._call_with_body_bytes_expecting_body(
3278
'Branch.put_config_file', (path,
3279
self.branch._lock_token, self.branch._repo_lock_token),
3281
except errors.UnknownSmartMethod:
3283
return self._real_store._save_content(content)
3284
handler.cancel_read_body()
3285
if response != ('ok', ):
3286
raise errors.UnexpectedSmartServerResponse(response)
3288
def _ensure_real(self):
3289
self.branch._ensure_real()
3290
if self._real_store is None:
3291
self._real_store = _mod_config.BranchStore(self.branch)
2113
3294
class RemoteBranch(branch.Branch, _RpcHelper, lock._RelockDebugMixin):
2114
3295
"""Branch stored on a server accessed by HPSS RPC.
2612
3845
_override_hook_target=self, **kwargs)
2614
3847
@needs_read_lock
2615
def push(self, target, overwrite=False, stop_revision=None):
3848
def push(self, target, overwrite=False, stop_revision=None, lossy=False):
2616
3849
self._ensure_real()
2617
3850
return self._real_branch.push(
2618
target, overwrite=overwrite, stop_revision=stop_revision,
3851
target, overwrite=overwrite, stop_revision=stop_revision, lossy=lossy,
2619
3852
_override_hook_source_branch=self)
3854
def peek_lock_mode(self):
3855
return self._lock_mode
2621
3857
def is_locked(self):
2622
3858
return self._lock_count >= 1
2624
3860
@needs_read_lock
3861
def revision_id_to_dotted_revno(self, revision_id):
3862
"""Given a revision id, return its dotted revno.
3864
:return: a tuple like (1,) or (400,1,3).
3867
response = self._call('Branch.revision_id_to_revno',
3868
self._remote_path(), revision_id)
3869
except errors.UnknownSmartMethod:
3871
return self._real_branch.revision_id_to_dotted_revno(revision_id)
3872
if response[0] == 'ok':
3873
return tuple([int(x) for x in response[1:]])
3875
raise errors.UnexpectedSmartServerResponse(response)
2625
3878
def revision_id_to_revno(self, revision_id):
2627
return self._real_branch.revision_id_to_revno(revision_id)
3879
"""Given a revision id on the branch mainline, return its revno.
3884
response = self._call('Branch.revision_id_to_revno',
3885
self._remote_path(), revision_id)
3886
except errors.UnknownSmartMethod:
3888
return self._real_branch.revision_id_to_revno(revision_id)
3889
if response[0] == 'ok':
3890
if len(response) == 2:
3891
return int(response[1])
3892
raise NoSuchRevision(self, revision_id)
3894
raise errors.UnexpectedSmartServerResponse(response)
2629
3896
@needs_write_lock
2630
3897
def set_last_revision_info(self, revno, revision_id):
2631
3898
# XXX: These should be returned by the set_last_revision_info verb
2632
3899
old_revno, old_revid = self.last_revision_info()
2633
3900
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2634
revision_id = ensure_null(revision_id)
3901
if not revision_id or not isinstance(revision_id, basestring):
3902
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2636
3904
response = self._call('Branch.set_last_revision_info',
2637
3905
self._remote_path(), self._lock_token, self._repo_lock_token,
2666
3934
except errors.UnknownSmartMethod:
2667
3935
medium._remember_remote_is_before((1, 6))
2668
3936
self._clear_cached_state_of_remote_branch_only()
2669
self.set_revision_history(self._lefthand_history(revision_id,
2670
last_rev=last_rev,other_branch=other_branch))
3937
graph = self.repository.get_graph()
3938
(last_revno, last_revid) = self.last_revision_info()
3939
known_revision_ids = [
3940
(last_revid, last_revno),
3941
(_mod_revision.NULL_REVISION, 0),
3943
if last_rev is not None:
3944
if not graph.is_ancestor(last_rev, revision_id):
3945
# our previous tip is not merged into stop_revision
3946
raise errors.DivergedBranches(self, other_branch)
3947
revno = graph.find_distance_to_null(revision_id, known_revision_ids)
3948
self.set_last_revision_info(revno, revision_id)
2672
3950
def set_push_location(self, location):
3951
self._set_config_location('push_location', location)
3953
def heads_to_fetch(self):
3954
if self._format._use_default_local_heads_to_fetch():
3955
# We recognise this format, and its heads-to-fetch implementation
3956
# is the default one (tip + tags). In this case it's cheaper to
3957
# just use the default implementation rather than a special RPC as
3958
# the tip and tags data is cached.
3959
return branch.Branch.heads_to_fetch(self)
3960
medium = self._client._medium
3961
if medium._is_remote_before((2, 4)):
3962
return self._vfs_heads_to_fetch()
3964
return self._rpc_heads_to_fetch()
3965
except errors.UnknownSmartMethod:
3966
medium._remember_remote_is_before((2, 4))
3967
return self._vfs_heads_to_fetch()
3969
def _rpc_heads_to_fetch(self):
3970
response = self._call('Branch.heads_to_fetch', self._remote_path())
3971
if len(response) != 2:
3972
raise errors.UnexpectedSmartServerResponse(response)
3973
must_fetch, if_present_fetch = response
3974
return set(must_fetch), set(if_present_fetch)
3976
def _vfs_heads_to_fetch(self):
2673
3977
self._ensure_real()
2674
return self._real_branch.set_push_location(location)
3978
return self._real_branch.heads_to_fetch()
2677
3981
class RemoteConfig(object):
2732
4046
medium = self._branch._client._medium
2733
4047
if medium._is_remote_before((1, 14)):
2734
4048
return self._vfs_set_option(value, name, section)
4049
if isinstance(value, dict):
4050
if medium._is_remote_before((2, 2)):
4051
return self._vfs_set_option(value, name, section)
4052
return self._set_config_option_dict(value, name, section)
4054
return self._set_config_option(value, name, section)
4056
def _set_config_option(self, value, name, section):
2736
4058
path = self._branch._remote_path()
2737
4059
response = self._branch._client.call('Branch.set_config_option',
2738
4060
path, self._branch._lock_token, self._branch._repo_lock_token,
2739
4061
value.encode('utf8'), name, section or '')
2740
4062
except errors.UnknownSmartMethod:
4063
medium = self._branch._client._medium
2741
4064
medium._remember_remote_is_before((1, 14))
2742
4065
return self._vfs_set_option(value, name, section)
2743
4066
if response != ():
2744
4067
raise errors.UnexpectedSmartServerResponse(response)
4069
def _serialize_option_dict(self, option_dict):
4071
for key, value in option_dict.items():
4072
if isinstance(key, unicode):
4073
key = key.encode('utf8')
4074
if isinstance(value, unicode):
4075
value = value.encode('utf8')
4076
utf8_dict[key] = value
4077
return bencode.bencode(utf8_dict)
4079
def _set_config_option_dict(self, value, name, section):
4081
path = self._branch._remote_path()
4082
serialised_dict = self._serialize_option_dict(value)
4083
response = self._branch._client.call(
4084
'Branch.set_config_option_dict',
4085
path, self._branch._lock_token, self._branch._repo_lock_token,
4086
serialised_dict, name, section or '')
4087
except errors.UnknownSmartMethod:
4088
medium = self._branch._client._medium
4089
medium._remember_remote_is_before((2, 2))
4090
return self._vfs_set_option(value, name, section)
4092
raise errors.UnexpectedSmartServerResponse(response)
2746
4094
def _real_object(self):
2747
4095
self._branch._ensure_real()
2748
4096
return self._branch._real_branch
2831
4182
'Missing key %r in context %r', key_err.args[0], context)
2834
if err.error_verb == 'IncompatibleRepositories':
2835
raise errors.IncompatibleRepositories(err.error_args[0],
2836
err.error_args[1], err.error_args[2])
2837
elif err.error_verb == 'NoSuchRevision':
2838
raise NoSuchRevision(find('branch'), err.error_args[0])
2839
elif err.error_verb == 'nosuchrevision':
2840
raise NoSuchRevision(find('repository'), err.error_args[0])
2841
elif err.error_verb == 'nobranch':
2842
if len(err.error_args) >= 1:
2843
extra = err.error_args[0]
2846
raise errors.NotBranchError(path=find('bzrdir').root_transport.base,
2848
elif err.error_verb == 'norepository':
2849
raise errors.NoRepositoryPresent(find('bzrdir'))
2850
elif err.error_verb == 'LockContention':
2851
raise errors.LockContention('(remote lock)')
2852
elif err.error_verb == 'UnlockableTransport':
2853
raise errors.UnlockableTransport(find('bzrdir').root_transport)
2854
elif err.error_verb == 'LockFailed':
2855
raise errors.LockFailed(err.error_args[0], err.error_args[1])
2856
elif err.error_verb == 'TokenMismatch':
2857
raise errors.TokenMismatch(find('token'), '(remote token)')
2858
elif err.error_verb == 'Diverged':
2859
raise errors.DivergedBranches(find('branch'), find('other_branch'))
2860
elif err.error_verb == 'TipChangeRejected':
2861
raise errors.TipChangeRejected(err.error_args[0].decode('utf8'))
2862
elif err.error_verb == 'UnstackableBranchFormat':
2863
raise errors.UnstackableBranchFormat(*err.error_args)
2864
elif err.error_verb == 'UnstackableRepositoryFormat':
2865
raise errors.UnstackableRepositoryFormat(*err.error_args)
2866
elif err.error_verb == 'NotStacked':
2867
raise errors.NotStacked(branch=find('branch'))
2868
elif err.error_verb == 'PermissionDenied':
2870
if len(err.error_args) >= 2:
2871
extra = err.error_args[1]
2874
raise errors.PermissionDenied(path, extra=extra)
2875
elif err.error_verb == 'ReadError':
2877
raise errors.ReadError(path)
2878
elif err.error_verb == 'NoSuchFile':
2880
raise errors.NoSuchFile(path)
2881
elif err.error_verb == 'FileExists':
2882
raise errors.FileExists(err.error_args[0])
2883
elif err.error_verb == 'DirectoryNotEmpty':
2884
raise errors.DirectoryNotEmpty(err.error_args[0])
2885
elif err.error_verb == 'ShortReadvError':
2886
args = err.error_args
2887
raise errors.ShortReadvError(
2888
args[0], int(args[1]), int(args[2]), int(args[3]))
2889
elif err.error_verb in ('UnicodeEncodeError', 'UnicodeDecodeError'):
4186
translator = error_translators.get(err.error_verb)
4190
raise translator(err, find, get_path)
4192
translator = no_context_error_translators.get(err.error_verb)
4194
raise errors.UnknownErrorFromSmartServer(err)
4196
raise translator(err)
4199
error_translators.register('NoSuchRevision',
4200
lambda err, find, get_path: NoSuchRevision(
4201
find('branch'), err.error_args[0]))
4202
error_translators.register('nosuchrevision',
4203
lambda err, find, get_path: NoSuchRevision(
4204
find('repository'), err.error_args[0]))
4206
def _translate_nobranch_error(err, find, get_path):
4207
if len(err.error_args) >= 1:
4208
extra = err.error_args[0]
4211
return errors.NotBranchError(path=find('bzrdir').root_transport.base,
4214
error_translators.register('nobranch', _translate_nobranch_error)
4215
error_translators.register('norepository',
4216
lambda err, find, get_path: errors.NoRepositoryPresent(
4218
error_translators.register('UnlockableTransport',
4219
lambda err, find, get_path: errors.UnlockableTransport(
4220
find('bzrdir').root_transport))
4221
error_translators.register('TokenMismatch',
4222
lambda err, find, get_path: errors.TokenMismatch(
4223
find('token'), '(remote token)'))
4224
error_translators.register('Diverged',
4225
lambda err, find, get_path: errors.DivergedBranches(
4226
find('branch'), find('other_branch')))
4227
error_translators.register('NotStacked',
4228
lambda err, find, get_path: errors.NotStacked(branch=find('branch')))
4230
def _translate_PermissionDenied(err, find, get_path):
4232
if len(err.error_args) >= 2:
4233
extra = err.error_args[1]
4236
return errors.PermissionDenied(path, extra=extra)
4238
error_translators.register('PermissionDenied', _translate_PermissionDenied)
4239
error_translators.register('ReadError',
4240
lambda err, find, get_path: errors.ReadError(get_path()))
4241
error_translators.register('NoSuchFile',
4242
lambda err, find, get_path: errors.NoSuchFile(get_path()))
4243
error_translators.register('TokenLockingNotSupported',
4244
lambda err, find, get_path: errors.TokenLockingNotSupported(
4245
find('repository')))
4246
error_translators.register('UnsuspendableWriteGroup',
4247
lambda err, find, get_path: errors.UnsuspendableWriteGroup(
4248
repository=find('repository')))
4249
error_translators.register('UnresumableWriteGroup',
4250
lambda err, find, get_path: errors.UnresumableWriteGroup(
4251
repository=find('repository'), write_groups=err.error_args[0],
4252
reason=err.error_args[1]))
4253
no_context_error_translators.register('IncompatibleRepositories',
4254
lambda err: errors.IncompatibleRepositories(
4255
err.error_args[0], err.error_args[1], err.error_args[2]))
4256
no_context_error_translators.register('LockContention',
4257
lambda err: errors.LockContention('(remote lock)'))
4258
no_context_error_translators.register('LockFailed',
4259
lambda err: errors.LockFailed(err.error_args[0], err.error_args[1]))
4260
no_context_error_translators.register('TipChangeRejected',
4261
lambda err: errors.TipChangeRejected(err.error_args[0].decode('utf8')))
4262
no_context_error_translators.register('UnstackableBranchFormat',
4263
lambda err: errors.UnstackableBranchFormat(*err.error_args))
4264
no_context_error_translators.register('UnstackableRepositoryFormat',
4265
lambda err: errors.UnstackableRepositoryFormat(*err.error_args))
4266
no_context_error_translators.register('FileExists',
4267
lambda err: errors.FileExists(err.error_args[0]))
4268
no_context_error_translators.register('DirectoryNotEmpty',
4269
lambda err: errors.DirectoryNotEmpty(err.error_args[0]))
4271
def _translate_short_readv_error(err):
4272
args = err.error_args
4273
return errors.ShortReadvError(args[0], int(args[1]), int(args[2]),
4276
no_context_error_translators.register('ShortReadvError',
4277
_translate_short_readv_error)
4279
def _translate_unicode_error(err):
2890
4280
encoding = str(err.error_args[0]) # encoding must always be a string
2891
4281
val = err.error_args[1]
2892
4282
start = int(err.error_args[2])
added
removed
bzrlib/remote.py
