331
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)
334
410
class RemoteBzrDir(_mod_bzrdir.BzrDir, _RpcHelper):
335
411
"""Control directory on a remote server, accessed via bzr:// or similar."""
420
496
self._next_open_branch_result = None
421
497
return _mod_bzrdir.BzrDir.break_lock(self)
499
def _vfs_checkout_metadir(self):
501
return self._real_bzrdir.checkout_metadir()
503
def checkout_metadir(self):
504
"""Retrieve the controldir format to use for checkouts of this one.
506
medium = self._client._medium
507
if medium._is_remote_before((2, 5)):
508
return self._vfs_checkout_metadir()
509
path = self._path_for_remote_call(self._client)
511
response = self._client.call('BzrDir.checkout_metadir',
513
except errors.UnknownSmartMethod:
514
medium._remember_remote_is_before((2, 5))
515
return self._vfs_checkout_metadir()
516
if len(response) != 3:
517
raise errors.UnexpectedSmartServerResponse(response)
518
control_name, repo_name, branch_name = response
520
format = controldir.network_format_registry.get(control_name)
522
raise errors.UnknownFormatError(kind='control',
526
repo_format = _mod_repository.network_format_registry.get(
529
raise errors.UnknownFormatError(kind='repository',
531
format.repository_format = repo_format
534
format.set_branch_format(
535
branch.network_format_registry.get(branch_name))
537
raise errors.UnknownFormatError(kind='branch',
423
541
def _vfs_cloning_metadir(self, require_stacking=False):
424
542
self._ensure_real()
425
543
return self._real_bzrdir.cloning_metadir(
529
687
b = self.open_branch(name=name)
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)
532
717
def get_branch_reference(self, name=None):
533
718
"""See BzrDir.get_branch_reference()."""
535
# XXX JRV20100304: Support opening colocated branches
720
name = self._get_selected_branch()
536
722
raise errors.NoColocatedBranchSupport(self)
537
723
response = self._get_branch_reference()
538
724
if response[0] == 'ref':
574
760
"""See BzrDir._get_tree_branch()."""
575
761
return None, self.open_branch(name=name)
577
def open_branch(self, name=None, unsupported=False,
578
ignore_fallbacks=False):
580
raise NotImplementedError('unsupported flag support not implemented yet.')
581
if self._next_open_branch_result is not None:
582
# See create_branch for details.
583
result = self._next_open_branch_result
584
self._next_open_branch_result = None
586
response = self._get_branch_reference()
587
if response[0] == 'ref':
763
def _open_branch(self, name, kind, location_or_format,
764
ignore_fallbacks=False, possible_transports=None):
588
766
# a branch reference, use the existing BranchReference logic.
589
767
format = BranchReferenceFormat()
590
768
return format.open(self, name=name, _found=True,
591
location=response[1], ignore_fallbacks=ignore_fallbacks)
592
branch_format_name = response[1]
769
location=location_or_format, ignore_fallbacks=ignore_fallbacks,
770
possible_transports=possible_transports)
771
branch_format_name = location_or_format
593
772
if not branch_format_name:
594
773
branch_format_name = None
595
774
format = RemoteBranchFormat(network_name=branch_format_name)
596
775
return RemoteBranch(self, self.find_repository(), format=format,
597
setup_stacking=not ignore_fallbacks, name=name)
776
setup_stacking=not ignore_fallbacks, name=name,
777
possible_transports=possible_transports)
779
def open_branch(self, name=None, unsupported=False,
780
ignore_fallbacks=False, possible_transports=None):
782
name = self._get_selected_branch()
784
raise errors.NoColocatedBranchSupport(self)
786
raise NotImplementedError('unsupported flag support not implemented yet.')
787
if self._next_open_branch_result is not None:
788
# See create_branch for details.
789
result = self._next_open_branch_result
790
self._next_open_branch_result = None
792
response = self._get_branch_reference()
793
return self._open_branch(name, response[0], response[1],
794
possible_transports=possible_transports,
795
ignore_fallbacks=ignore_fallbacks)
599
797
def _open_repo_v1(self, path):
600
798
verb = 'BzrDir.find_repository'
1020
1249
for older plugins that don't use e.g. the CommitBuilder
1024
return self._real_repository.commit_write_group()
1252
if self._real_repository:
1254
return self._real_repository.commit_write_group()
1255
if not self.is_in_write_group():
1256
raise errors.BzrError("not in write group")
1257
path = self.bzrdir._path_for_remote_call(self._client)
1258
response = self._call('Repository.commit_write_group', path,
1259
self._lock_token, self._write_group_tokens)
1260
if response != ('ok', ):
1261
raise errors.UnexpectedSmartServerResponse(response)
1262
self._write_group_tokens = None
1263
# Refresh data after writing to the repository.
1026
1266
def resume_write_group(self, tokens):
1028
return self._real_repository.resume_write_group(tokens)
1267
if self._real_repository:
1268
return self._real_repository.resume_write_group(tokens)
1269
path = self.bzrdir._path_for_remote_call(self._client)
1271
response = self._call('Repository.check_write_group', path,
1272
self._lock_token, tokens)
1273
except errors.UnknownSmartMethod:
1275
return self._real_repository.resume_write_group(tokens)
1276
if response != ('ok', ):
1277
raise errors.UnexpectedSmartServerResponse(response)
1278
self._write_group_tokens = tokens
1030
1280
def suspend_write_group(self):
1032
return self._real_repository.suspend_write_group()
1281
if self._real_repository:
1282
return self._real_repository.suspend_write_group()
1283
ret = self._write_group_tokens or []
1284
self._write_group_tokens = None
1034
1287
def get_missing_parent_inventories(self, check_for_missing_texts=True):
1035
1288
self._ensure_real()
1480
1768
raise errors.UnexpectedSmartServerResponse(response)
1482
1771
def sprout(self, to_bzrdir, revision_id=None):
1483
# TODO: Option to control what format is created?
1485
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)
1487
1777
dest_repo.fetch(self, revision_id=revision_id)
1488
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()
1490
1793
### These methods are just thin shims to the VFS object for now.
1492
1796
def revision_tree(self, revision_id):
1494
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]
1496
1804
def get_serializer_format(self):
1498
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)
1500
1816
def get_commit_builder(self, branch, parents, config, timestamp=None,
1501
1817
timezone=None, committer=None, revprops=None,
1502
1818
revision_id=None, lossy=False):
1503
# FIXME: It ought to be possible to call this without immediately
1504
# triggering _ensure_real. For now it's the easiest thing to do.
1506
real_repo = self._real_repository
1507
builder = real_repo.get_commit_builder(branch, parents,
1508
config, timestamp=timestamp, timezone=timezone,
1509
committer=committer, revprops=revprops,
1510
revision_id=revision_id, lossy=lossy)
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()
1513
1846
def add_fallback_repository(self, repository):
1514
1847
"""Add a repository to use for looking up data not held locally.
1559
1892
delta, new_revision_id, parents, basis_inv=basis_inv,
1560
1893
propagate_caches=propagate_caches)
1562
def add_revision(self, rev_id, rev, inv=None, config=None):
1564
return self._real_repository.add_revision(
1565
rev_id, rev, inv=inv, config=config)
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)
1567
1921
@needs_read_lock
1568
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):
1569
1966
self._ensure_real()
1570
return self._real_repository.get_inventory(revision_id)
1967
return self._real_repository._iter_inventories(revision_ids, ordering)
1572
1969
def iter_inventories(self, revision_ids, ordering=None):
1574
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()
1576
2045
@needs_read_lock
1577
2046
def get_revision(self, revision_id):
1579
return self._real_repository.get_revision(revision_id)
2047
return self.get_revisions([revision_id])[0]
1581
2049
def get_transaction(self):
1582
2050
self._ensure_real()
1699
2169
return self._real_repository._get_versioned_file_checker(
1700
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)
1702
2218
def iter_files_bytes(self, desired_files):
1703
2219
"""See Repository.iter_file_bytes.
1706
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
1708
2247
def get_cached_parent_map(self, revision_ids):
1709
2248
"""See bzrlib.CachingParentsProvider.get_cached_parent_map"""
1836
2375
@needs_read_lock
1837
2376
def get_signature_text(self, revision_id):
1839
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()
1841
2396
@needs_read_lock
1842
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.
1843
2400
self._ensure_real()
1844
2401
return self._real_repository._get_inventory_xml(revision_id)
1846
2404
def reconcile(self, other=None, thorough=False):
1848
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)
1850
2429
def all_revision_ids(self):
1852
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)
1854
2460
@needs_read_lock
1855
2461
def get_deltas_for_revisions(self, revisions, specific_fileids=None):
1857
return self._real_repository.get_deltas_for_revisions(revisions,
1858
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)
1860
2497
@needs_read_lock
1861
2498
def get_revision_delta(self, revision_id, specific_fileids=None):
1863
return self._real_repository.get_revision_delta(revision_id,
1864
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]
1866
2503
@needs_read_lock
1867
2504
def revision_trees(self, revision_ids):
1869
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)
1871
2509
@needs_read_lock
1872
2510
def get_revision_reconcile(self, revision_id):
1984
2635
self._ensure_real()
1985
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))
1987
2664
@needs_read_lock
1988
2665
def get_revisions(self, revision_ids):
1990
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]
1992
2702
def supports_rich_root(self):
1993
2703
return self._format.rich_root_data
1995
@symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
1996
def iter_reverse_revision_history(self, revision_id):
1998
return self._real_repository.iter_reverse_revision_history(revision_id)
2001
2706
def _serializer(self):
2002
2707
return self._format._serializer
2004
2710
def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
2006
return self._real_repository.store_revision_signature(
2007
gpg_strategy, plaintext, revision_id)
2711
signature = gpg_strategy.sign(plaintext)
2712
self.add_signature_text(revision_id, signature)
2009
2714
def add_signature_text(self, revision_id, signature):
2011
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:]
2013
2731
def has_signature_for_revision_id(self, revision_id):
2015
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):
2017
2750
def verify_revision_signature(self, revision_id, gpg_strategy):
2019
return self._real_repository.verify_revision_signature(
2020
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)
2022
2760
def item_keys_introduced_by(self, revision_ids, _files_pb=None):
2023
2761
self._ensure_real()
2397
3142
def initialize(self, a_bzrdir, name=None, repository=None,
2398
3143
append_revisions_only=None):
3145
name = a_bzrdir._get_selected_branch()
2399
3146
# 1) get the network name to use.
2400
3147
if self._custom_format:
2401
3148
network_name = self._custom_format.network_name()
2403
3150
# Select the current bzrlib default and ask for that.
2404
reference_bzrdir_format = _mod_bzrdir.format_registry.get('default')()
3151
reference_bzrdir_format = controldir.format_registry.get('default')()
2405
3152
reference_format = reference_bzrdir_format.get_branch_format()
2406
3153
self._custom_format = reference_format
2407
3154
network_name = reference_format.network_name()
2408
3155
# Being asked to create on a non RemoteBzrDir:
2409
3156
if not isinstance(a_bzrdir, RemoteBzrDir):
2410
3157
return self._vfs_initialize(a_bzrdir, name=name,
2411
append_revisions_only=append_revisions_only)
3158
append_revisions_only=append_revisions_only,
3159
repository=repository)
2412
3160
medium = a_bzrdir._client._medium
2413
3161
if medium._is_remote_before((1, 13)):
2414
3162
return self._vfs_initialize(a_bzrdir, name=name,
2415
append_revisions_only=append_revisions_only)
3163
append_revisions_only=append_revisions_only,
3164
repository=repository)
2416
3165
# Creating on a remote bzr dir.
2417
3166
# 2) try direct creation via RPC
2418
3167
path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
2419
if name is not None:
2420
3169
# XXX JRV20100304: Support creating colocated branches
2421
3170
raise errors.NoColocatedBranchSupport(self)
2422
3171
verb = 'BzrDir.create_branch'
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)
2496
3294
class RemoteBranch(branch.Branch, _RpcHelper, lock._RelockDebugMixin):
2497
3295
"""Branch stored on a server accessed by HPSS RPC.
3037
3851
target, overwrite=overwrite, stop_revision=stop_revision, lossy=lossy,
3038
3852
_override_hook_source_branch=self)
3854
def peek_lock_mode(self):
3855
return self._lock_mode
3040
3857
def is_locked(self):
3041
3858
return self._lock_count >= 1
3043
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)
3044
3878
def revision_id_to_revno(self, revision_id):
3046
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)
3048
3896
@needs_write_lock
3049
3897
def set_last_revision_info(self, revno, revision_id):
3322
4182
'Missing key %r in context %r', key_err.args[0], context)
3325
if err.error_verb == 'NoSuchRevision':
3326
raise NoSuchRevision(find('branch'), err.error_args[0])
3327
elif err.error_verb == 'nosuchrevision':
3328
raise NoSuchRevision(find('repository'), err.error_args[0])
3329
elif err.error_verb == 'nobranch':
3330
if len(err.error_args) >= 1:
3331
extra = err.error_args[0]
3334
raise errors.NotBranchError(path=find('bzrdir').root_transport.base,
3336
elif err.error_verb == 'norepository':
3337
raise errors.NoRepositoryPresent(find('bzrdir'))
3338
elif err.error_verb == 'UnlockableTransport':
3339
raise errors.UnlockableTransport(find('bzrdir').root_transport)
3340
elif err.error_verb == 'TokenMismatch':
3341
raise errors.TokenMismatch(find('token'), '(remote token)')
3342
elif err.error_verb == 'Diverged':
3343
raise errors.DivergedBranches(find('branch'), find('other_branch'))
3344
elif err.error_verb == 'NotStacked':
3345
raise errors.NotStacked(branch=find('branch'))
3346
elif err.error_verb == 'PermissionDenied':
3348
if len(err.error_args) >= 2:
3349
extra = err.error_args[1]
3352
raise errors.PermissionDenied(path, extra=extra)
3353
elif err.error_verb == 'ReadError':
3355
raise errors.ReadError(path)
3356
elif err.error_verb == 'NoSuchFile':
3358
raise errors.NoSuchFile(path)
3359
_translate_error_without_context(err)
3362
def _translate_error_without_context(err):
3363
"""Translate any ErrorFromSmartServer values that don't require context"""
3364
if err.error_verb == 'IncompatibleRepositories':
3365
raise errors.IncompatibleRepositories(err.error_args[0],
3366
err.error_args[1], err.error_args[2])
3367
elif err.error_verb == 'LockContention':
3368
raise errors.LockContention('(remote lock)')
3369
elif err.error_verb == 'LockFailed':
3370
raise errors.LockFailed(err.error_args[0], err.error_args[1])
3371
elif err.error_verb == 'TipChangeRejected':
3372
raise errors.TipChangeRejected(err.error_args[0].decode('utf8'))
3373
elif err.error_verb == 'UnstackableBranchFormat':
3374
raise errors.UnstackableBranchFormat(*err.error_args)
3375
elif err.error_verb == 'UnstackableRepositoryFormat':
3376
raise errors.UnstackableRepositoryFormat(*err.error_args)
3377
elif err.error_verb == 'FileExists':
3378
raise errors.FileExists(err.error_args[0])
3379
elif err.error_verb == 'DirectoryNotEmpty':
3380
raise errors.DirectoryNotEmpty(err.error_args[0])
3381
elif err.error_verb == 'ShortReadvError':
3382
args = err.error_args
3383
raise errors.ShortReadvError(
3384
args[0], int(args[1]), int(args[2]), int(args[3]))
3385
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):
3386
4280
encoding = str(err.error_args[0]) # encoding must always be a string
3387
4281
val = err.error_args[1]
3388
4282
start = int(err.error_args[2])
3396
4290
raise UnicodeDecodeError(encoding, val, start, end, reason)
3397
4291
elif err.error_verb == 'UnicodeEncodeError':
3398
4292
raise UnicodeEncodeError(encoding, val, start, end, reason)
3399
elif err.error_verb == 'ReadOnlyError':
3400
raise errors.TransportNotPossible('readonly transport')
3401
elif err.error_verb == 'MemoryError':
3402
raise errors.BzrError("remote server out of memory\n"
3403
"Retry non-remotely, or contact the server admin for details.")
3404
raise errors.UnknownErrorFromSmartServer(err)
4294
no_context_error_translators.register('UnicodeEncodeError',
4295
_translate_unicode_error)
4296
no_context_error_translators.register('UnicodeDecodeError',
4297
_translate_unicode_error)
4298
no_context_error_translators.register('ReadOnlyError',
4299
lambda err: errors.TransportNotPossible('readonly transport'))
4300
no_context_error_translators.register('MemoryError',
4301
lambda err: errors.BzrError("remote server out of memory\n"
4302
"Retry non-remotely, or contact the server admin for details."))
4303
no_context_error_translators.register('RevisionNotPresent',
4304
lambda err: errors.RevisionNotPresent(err.error_args[0], err.error_args[1]))
4306
no_context_error_translators.register('BzrCheckError',
4307
lambda err: errors.BzrCheckError(msg=err.error_args[0]))
added
removed
bzrlib/remote.py
