1
# Copyright (C) 2005-2010 Canonical Ltd
1
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
53
49
from bzrlib.testament import Testament
56
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
52
from bzrlib.decorators import needs_read_lock, needs_write_lock
57
53
from bzrlib.inter import InterObject
58
54
from bzrlib.inventory import (
64
from bzrlib.lock import _RelockDebugMixin
65
60
from bzrlib import registry
66
61
from bzrlib.trace import (
67
62
log_exception_quietly, note, mutter, mutter_callsite, warning)
210
205
# an inventory delta was accumulated without creating a new
212
207
basis_id = self.basis_delta_revision
213
# We ignore the 'inventory' returned by add_inventory_by_delta
214
# because self.new_inventory is used to hint to the rest of the
215
# system what code path was taken
216
self.inv_sha1, _ = self.repository.add_inventory_by_delta(
208
self.inv_sha1 = self.repository.add_inventory_by_delta(
217
209
basis_id, self._basis_delta, self._new_revision_id,
860
852
# versioned roots do not change unless the tree found a change.
863
class RepositoryWriteLockResult(object):
864
"""The result of write locking a repository.
866
:ivar repository_token: The token obtained from the underlying lock, or
868
:ivar unlock: A callable which will unlock the lock.
871
def __init__(self, unlock, repository_token):
872
self.repository_token = repository_token
876
855
######################################################################
880
class Repository(_RelockDebugMixin, bzrdir.ControlComponent):
859
class Repository(object):
881
860
"""Repository holding history for one or more branches.
883
862
The repository holds and retrieves historical information including
1042
1021
:seealso: add_inventory, for the contract.
1044
inv_lines = self._serializer.write_inventory_to_lines(inv)
1023
inv_lines = self._serialise_inventory_to_lines(inv)
1045
1024
return self._inventory_add_lines(revision_id, parents,
1046
1025
inv_lines, check_content=False)
1243
1222
for record in getattr(self, kind).check(keys=keys[kind]):
1244
1223
if record.storage_kind == 'absent':
1245
1224
checker._report_items.append(
1246
'Missing %s {%s}' % (kind, record.key,))
1225
'Missing inventory {%s}' % (record.key,))
1248
1227
last_object = self._check_record(kind, record,
1249
1228
checker, last_object, current_keys[(kind,) + record.key])
1254
1233
"""Check a single text from this repository."""
1255
1234
if kind == 'inventories':
1256
1235
rev_id = record.key[0]
1257
inv = self._deserialise_inventory(rev_id,
1236
inv = self.deserialise_inventory(rev_id,
1258
1237
record.get_bytes_as('fulltext'))
1259
1238
if last_object is not None:
1260
1239
delta = inv._make_delta(last_object)
1305
1284
:param _format: The format of the repository on disk.
1306
1285
:param a_bzrdir: The BzrDir of the repository.
1287
In the future we will have a single api for all stores for
1288
getting file texts, inventories and revisions, then
1289
this construct will accept instances of those things.
1308
# In the future we will have a single api for all stores for
1309
# getting file texts, inventories and revisions, then
1310
# this construct will accept instances of those things.
1311
1291
super(Repository, self).__init__()
1312
1292
self._format = _format
1313
1293
# the following are part of the public API for Repository:
1319
1299
self._reconcile_does_inventory_gc = True
1320
1300
self._reconcile_fixes_text_parents = False
1321
1301
self._reconcile_backsup_inventory = True
1302
# not right yet - should be more semantically clear ?
1304
# TODO: make sure to construct the right store classes, etc, depending
1305
# on whether escaping is required.
1306
self._warn_if_deprecated()
1322
1307
self._write_group = None
1323
1308
# Additional places to query for data.
1324
1309
self._fallback_repositories = []
1325
1310
# An InventoryEntry cache, used during deserialization
1326
1311
self._inventory_entry_cache = fifo_cache.FIFOCache(10*1024)
1327
# Is it safe to return inventory entries directly from the entry cache,
1328
# rather copying them?
1329
self._safe_to_return_from_cache = False
1332
def user_transport(self):
1333
return self.bzrdir.user_transport
1336
def control_transport(self):
1337
return self._transport
1339
1313
def __repr__(self):
1340
1314
if self._fallback_repositories:
1389
1363
data during reads, and allows a 'write_group' to be obtained. Write
1390
1364
groups must be used for actual data insertion.
1392
A token should be passed in if you know that you have locked the object
1393
some other way, and need to synchronise this object's state with that
1396
XXX: this docstring is duplicated in many places, e.g. lockable_files.py
1398
1366
:param token: if this is already locked, then lock_write will fail
1399
1367
unless the token matches the existing lock.
1400
1368
:returns: a token if this instance supports tokens, otherwise None.
1403
1371
:raises MismatchedToken: if the specified token doesn't match the token
1404
1372
of the existing lock.
1405
1373
:seealso: start_write_group.
1406
:return: A RepositoryWriteLockResult.
1375
A token should be passed in if you know that you have locked the object
1376
some other way, and need to synchronise this object's state with that
1379
XXX: this docstring is duplicated in many places, e.g. lockable_files.py
1408
1381
locked = self.is_locked()
1409
token = self.control_files.lock_write(token=token)
1382
result = self.control_files.lock_write(token=token)
1411
self._warn_if_deprecated()
1412
self._note_lock('w')
1413
1384
for repo in self._fallback_repositories:
1414
1385
# Writes don't affect fallback repos
1415
1386
repo.lock_read()
1416
1387
self._refresh_data()
1417
return RepositoryWriteLockResult(self.unlock, token)
1419
1390
def lock_read(self):
1420
"""Lock the repository for read operations.
1422
:return: An object with an unlock method which will release the lock
1425
1391
locked = self.is_locked()
1426
1392
self.control_files.lock_read()
1428
self._warn_if_deprecated()
1429
self._note_lock('r')
1430
1394
for repo in self._fallback_repositories:
1431
1395
repo.lock_read()
1432
1396
self._refresh_data()
1435
1398
def get_physical_lock_status(self):
1436
1399
return self.control_files.get_physical_lock_status()
1497
1460
# now gather global repository information
1498
1461
# XXX: This is available for many repos regardless of listability.
1499
if self.user_transport.listable():
1462
if self.bzrdir.root_transport.listable():
1500
1463
# XXX: do we want to __define len__() ?
1501
1464
# Maybe the versionedfiles object should provide a different
1502
1465
# method to get the number of keys.
1512
1475
:param using: If True, list only branches using this repository.
1514
1477
if using and not self.is_shared():
1515
return self.bzrdir.list_branches()
1479
return [self.bzrdir.open_branch()]
1480
except errors.NotBranchError:
1516
1482
class Evaluator(object):
1518
1484
def __init__(self):
1527
1493
except errors.NoRepositoryPresent:
1530
return False, ([], repository)
1496
return False, (None, repository)
1531
1497
self.first_call = False
1532
value = (bzrdir.list_branches(), None)
1499
value = (bzrdir.open_branch(), None)
1500
except errors.NotBranchError:
1501
value = (None, None)
1533
1502
return True, value
1536
for branches, repository in bzrdir.BzrDir.find_bzrdirs(
1537
self.user_transport, evaluate=Evaluator()):
1538
if branches is not None:
1539
ret.extend(branches)
1505
for branch, repository in bzrdir.BzrDir.find_bzrdirs(
1506
self.bzrdir.root_transport, evaluate=Evaluator()):
1507
if branch is not None:
1508
branches.append(branch)
1540
1509
if not using and repository is not None:
1541
ret.extend(repository.find_branches())
1510
branches.extend(repository.find_branches())
1544
1513
@needs_read_lock
1545
1514
def search_missing_revision_ids(self, other, revision_id=None, find_ghosts=True):
1635
1604
# but at the moment we're only checking for texts referenced by
1636
1605
# inventories at the graph's edge.
1637
1606
key_deps = self.revisions._index._key_dependencies
1638
key_deps.satisfy_refs_for_keys(present_inventories)
1607
key_deps.add_keys(present_inventories)
1639
1608
referrers = frozenset(r[0] for r in key_deps.get_referrers())
1640
1609
file_ids = self.fileids_altered_by_revision_ids(referrers)
1641
1610
missing_texts = set()
1923
1891
rev = self._serializer.read_revision_from_string(text)
1924
1892
yield (revid, rev)
1895
def get_revision_xml(self, revision_id):
1896
# TODO: jam 20070210 This shouldn't be necessary since get_revision
1897
# would have already do it.
1898
# TODO: jam 20070210 Just use _serializer.write_revision_to_string()
1899
# TODO: this can't just be replaced by:
1900
# return self._serializer.write_revision_to_string(
1901
# self.get_revision(revision_id))
1902
# as cStringIO preservers the encoding unlike write_revision_to_string
1903
# or some other call down the path.
1904
rev = self.get_revision(revision_id)
1905
rev_tmp = cStringIO.StringIO()
1906
# the current serializer..
1907
self._serializer.write_revision(rev, rev_tmp)
1909
return rev_tmp.getvalue()
1926
1911
def get_deltas_for_revisions(self, revisions, specific_fileids=None):
1927
1912
"""Produce a generator of revision deltas.
2171
2156
selected_keys = set((revid,) for revid in revision_ids)
2172
2157
w = _inv_weave or self.inventories
2173
return self._find_file_ids_from_xml_inventory_lines(
2174
w.iter_lines_added_or_present_in_keys(
2175
selected_keys, pb=None),
2158
pb = ui.ui_factory.nested_progress_bar()
2160
return self._find_file_ids_from_xml_inventory_lines(
2161
w.iter_lines_added_or_present_in_keys(
2162
selected_keys, pb=pb),
2178
2167
def iter_files_bytes(self, desired_files):
2179
2168
"""Iterate through file versions.
2340
2329
num_file_ids = len(file_ids)
2341
2330
for file_id, altered_versions in file_ids.iteritems():
2342
2331
if pb is not None:
2343
pb.update("Fetch texts", count, num_file_ids)
2332
pb.update("fetch texts", count, num_file_ids)
2345
2334
yield ("file", file_id, altered_versions)
2389
2378
"""single-document based inventory iteration."""
2390
2379
inv_xmls = self._iter_inventory_xmls(revision_ids, ordering)
2391
2380
for text, revision_id in inv_xmls:
2392
yield self._deserialise_inventory(revision_id, text)
2381
yield self.deserialise_inventory(revision_id, text)
2394
2383
def _iter_inventory_xmls(self, revision_ids, ordering):
2395
2384
if ordering is None:
2427
2416
next_key = None
2430
def _deserialise_inventory(self, revision_id, xml):
2419
def deserialise_inventory(self, revision_id, xml):
2431
2420
"""Transform the xml into an inventory object.
2433
2422
:param revision_id: The expected revision id of the inventory.
2434
2423
:param xml: A serialised inventory.
2436
2425
result = self._serializer.read_inventory_from_string(xml, revision_id,
2437
entry_cache=self._inventory_entry_cache,
2438
return_from_cache=self._safe_to_return_from_cache)
2426
entry_cache=self._inventory_entry_cache)
2439
2427
if result.revision_id != revision_id:
2440
2428
raise AssertionError('revision id mismatch %s != %s' % (
2441
2429
result.revision_id, revision_id))
2432
def serialise_inventory(self, inv):
2433
return self._serializer.write_inventory_to_string(inv)
2435
def _serialise_inventory_to_lines(self, inv):
2436
return self._serializer.write_inventory_to_lines(inv)
2444
2438
def get_serializer_format(self):
2445
2439
return self._serializer.format_num
2447
2441
@needs_read_lock
2448
def _get_inventory_xml(self, revision_id):
2449
"""Get serialized inventory as a string."""
2442
def get_inventory_xml(self, revision_id):
2443
"""Get inventory XML as a file object."""
2450
2444
texts = self._iter_inventory_xmls([revision_id], 'unordered')
2452
2446
text, revision_id = texts.next()
2454
2448
raise errors.HistoryMissing(self, 'inventory', revision_id)
2452
def get_inventory_sha1(self, revision_id):
2453
"""Return the sha1 hash of the inventory entry
2455
return self.get_revision(revision_id).inventory_sha1
2457
2457
def get_rev_id_for_revno(self, revno, known_pair):
2458
2458
"""Return the revision id of a revno, given a later (revno, revid)
2459
2459
pair in the same history.
2511
2511
next_id = parents[0]
2514
def get_revision_inventory(self, revision_id):
2515
"""Return inventory of a past revision."""
2516
# TODO: Unify this with get_inventory()
2517
# bzr 0.0.6 and later imposes the constraint that the inventory_id
2518
# must be the same as its revision, so this is trivial.
2519
if revision_id is None:
2520
# This does not make sense: if there is no revision,
2521
# then it is the current tree inventory surely ?!
2522
# and thus get_root_id() is something that looks at the last
2523
# commit on the branch, and the get_root_id is an inventory check.
2524
raise NotImplementedError
2525
# return Inventory(self.get_root_id())
2527
return self.get_inventory(revision_id)
2513
2529
def is_shared(self):
2514
2530
"""Return True if this repository is flagged as a shared repository."""
2515
2531
raise NotImplementedError(self.is_shared)
2549
2565
return RevisionTree(self, Inventory(root_id=None),
2550
2566
_mod_revision.NULL_REVISION)
2552
inv = self.get_inventory(revision_id)
2568
inv = self.get_revision_inventory(revision_id)
2553
2569
return RevisionTree(self, inv, revision_id)
2555
2571
def revision_trees(self, revision_ids):
2608
2624
keys = tsort.topo_sort(parent_map)
2609
2625
return [None] + list(keys)
2611
def pack(self, hint=None, clean_obsolete_packs=False):
2627
def pack(self, hint=None):
2612
2628
"""Compress the data within the repository.
2614
2630
This operation only makes sense for some repository types. For other
2624
2640
obtained from the result of commit_write_group(). Out of
2625
2641
date hints are simply ignored, because concurrent operations
2626
2642
can obsolete them rapidly.
2628
:param clean_obsolete_packs: Clean obsolete packs immediately after
2632
2645
def get_transaction(self):
2648
2661
for ((revision_id,), parent_keys) in \
2649
2662
self.revisions.get_parent_map(query_keys).iteritems():
2650
2663
if parent_keys:
2651
result[revision_id] = tuple([parent_revid
2652
for (parent_revid,) in parent_keys])
2664
result[revision_id] = tuple(parent_revid
2665
for (parent_revid,) in parent_keys)
2654
2667
result[revision_id] = (_mod_revision.NULL_REVISION,)
2657
2670
def _make_parents_provider(self):
2661
def get_known_graph_ancestry(self, revision_ids):
2662
"""Return the known graph for a set of revision ids and their ancestors.
2664
st = static_tuple.StaticTuple
2665
revision_keys = [st(r_id).intern() for r_id in revision_ids]
2666
known_graph = self.revisions.get_known_graph_ancestry(revision_keys)
2667
return graph.GraphThunkIdsToKeys(known_graph)
2669
2673
def get_graph(self, other_repository=None):
2670
2674
"""Return the graph walker for this repository format"""
2671
2675
parents_provider = self._make_parents_provider()
2766
2770
result.check(callback_refs)
2769
def _warn_if_deprecated(self, branch=None):
2773
def _warn_if_deprecated(self):
2770
2774
global _deprecation_warning_done
2771
2775
if _deprecation_warning_done:
2775
conf = config.GlobalConfig()
2777
conf = branch.get_config()
2778
if conf.suppress_warning('format_deprecation'):
2780
warning("Format %s for %s is deprecated -"
2781
" please use 'bzr upgrade' to get better performance"
2782
% (self._format, self.bzrdir.transport.base))
2784
_deprecation_warning_done = True
2777
_deprecation_warning_done = True
2778
warning("Format %s for %s is deprecated - please use 'bzr upgrade' to get better performance"
2779
% (self._format, self.bzrdir.transport.base))
2786
2781
def supports_rich_root(self):
2787
2782
return self._format.rich_root_data
3070
3065
pack_compresses = False
3071
3066
# Does the repository inventory storage understand references to trees?
3072
3067
supports_tree_reference = None
3073
# Is the format experimental ?
3074
experimental = False
3077
return "%s()" % self.__class__.__name__
3070
return "<%s>" % self.__class__.__name__
3079
3072
def __eq__(self, other):
3080
3073
# format objects are generally stateless
3095
3088
transport = a_bzrdir.get_repository_transport(None)
3096
format_string = transport.get_bytes("format")
3089
format_string = transport.get("format").read()
3097
3090
return format_registry.get(format_string)
3098
3091
except errors.NoSuchFile:
3099
3092
raise errors.NoRepositoryPresent(a_bzrdir)
3199
3192
raise NotImplementedError(self.open)
3201
def _run_post_repo_init_hooks(self, repository, a_bzrdir, shared):
3202
from bzrlib.bzrdir import BzrDir, RepoInitHookParams
3203
hooks = BzrDir.hooks['post_repo_init']
3206
params = RepoInitHookParams(repository, self, a_bzrdir, shared)
3211
3195
class MetaDirRepositoryFormat(RepositoryFormat):
3212
3196
"""Common base class for the new repositories using the metadir layout."""
3418
3402
:param revision_id: if None all content is copied, if NULL_REVISION no
3419
3403
content is copied.
3404
:param pb: optional progress bar to use for progress reports. If not
3405
provided a default one will be created.
3423
ui.ui_factory.warn_experimental_format_fetch(self)
3424
3408
from bzrlib.fetch import RepoFetcher
3425
# See <https://launchpad.net/bugs/456077> asking for a warning here
3426
if self.source._format.network_name() != self.target._format.network_name():
3427
ui.ui_factory.show_user_warning('cross_format_fetch',
3428
from_format=self.source._format,
3429
to_format=self.target._format)
3430
3409
f = RepoFetcher(to_repository=self.target,
3431
3410
from_repository=self.source,
3432
3411
last_revision=revision_id,
3433
3412
fetch_spec=fetch_spec,
3434
find_ghosts=find_ghosts)
3413
pb=pb, find_ghosts=find_ghosts)
3436
3415
def _walk_to_common_revisions(self, revision_ids):
3437
3416
"""Walk out from revision_ids in source to revisions target has.
3606
3585
self.target.texts.insert_record_stream(
3607
3586
self.source.texts.get_record_stream(
3608
3587
self.source.texts.keys(), 'topological', False))
3609
pb.update('Copying inventory', 0, 1)
3588
pb.update('copying inventory', 0, 1)
3610
3589
self.target.inventories.insert_record_stream(
3611
3590
self.source.inventories.get_record_stream(
3612
3591
self.source.inventories.keys(), 'topological', False))
3833
3812
basis_id, delta, current_revision_id, parents_parents)
3834
3813
cache[current_revision_id] = parent_tree
3836
def _fetch_batch(self, revision_ids, basis_id, cache, a_graph=None):
3815
def _fetch_batch(self, revision_ids, basis_id, cache):
3837
3816
"""Fetch across a few revisions.
3839
3818
:param revision_ids: The revisions to copy
3840
3819
:param basis_id: The revision_id of a tree that must be in cache, used
3841
3820
as a basis for delta when no other base is available
3842
3821
:param cache: A cache of RevisionTrees that we can use.
3843
:param a_graph: A Graph object to determine the heads() of the
3844
rich-root data stream.
3845
3822
:return: The revision_id of the last converted tree. The RevisionTree
3846
3823
for it will be in cache
3854
3831
pending_revisions = []
3855
3832
parent_map = self.source.get_parent_map(revision_ids)
3856
3833
self._fetch_parent_invs_for_stacking(parent_map, cache)
3857
self.source._safe_to_return_from_cache = True
3858
3834
for tree in self.source.revision_trees(revision_ids):
3859
3835
# Find a inventory delta for this revision.
3860
3836
# Find text entries that need to be copied, too.
3868
3844
possible_trees.append((basis_id, cache[basis_id]))
3869
3845
basis_id, delta = self._get_delta_for_revision(tree, parent_ids,
3870
3846
possible_trees)
3871
revision = self.source.get_revision(current_revision_id)
3872
pending_deltas.append((basis_id, delta,
3873
current_revision_id, revision.parent_ids))
3874
3847
if self._converting_to_rich_root:
3875
3848
self._revision_id_to_root_id[current_revision_id] = \
3876
3849
tree.get_root_id()
3905
3878
if entry.revision == file_revision:
3906
3879
texts_possibly_new_in_tree.remove(file_key)
3907
3880
text_keys.update(texts_possibly_new_in_tree)
3881
revision = self.source.get_revision(current_revision_id)
3882
pending_deltas.append((basis_id, delta,
3883
current_revision_id, revision.parent_ids))
3908
3884
pending_revisions.append(revision)
3909
3885
cache[current_revision_id] = tree
3910
3886
basis_id = current_revision_id
3911
self.source._safe_to_return_from_cache = False
3912
3887
# Copy file texts
3913
3888
from_texts = self.source.texts
3914
3889
to_texts = self.target.texts
3915
3890
if root_keys_to_create:
3916
root_stream = _mod_fetch._new_root_data_stream(
3891
from bzrlib.fetch import _new_root_data_stream
3892
root_stream = _new_root_data_stream(
3917
3893
root_keys_to_create, self._revision_id_to_root_id, parent_map,
3918
self.source, graph=a_graph)
3919
3895
to_texts.insert_record_stream(root_stream)
3920
3896
to_texts.insert_record_stream(from_texts.get_record_stream(
3921
3897
text_keys, self.target._format._fetch_order,
3978
3954
cache[basis_id] = basis_tree
3979
3955
del basis_tree # We don't want to hang on to it here
3981
if self._converting_to_rich_root and len(revision_ids) > 100:
3982
a_graph = _mod_fetch._get_rich_root_heads_graph(self.source,
3987
3957
for offset in range(0, len(revision_ids), batch_size):
3988
3958
self.target.start_write_group()
3990
3960
pb.update('Transferring revisions', offset,
3991
3961
len(revision_ids))
3992
3962
batch = revision_ids[offset:offset+batch_size]
3993
basis_id = self._fetch_batch(batch, basis_id, cache,
3963
basis_id = self._fetch_batch(batch, basis_id, cache)
3996
self.source._safe_to_return_from_cache = False
3997
3965
self.target.abort_write_group()
4011
3979
"""See InterRepository.fetch()."""
4012
3980
if fetch_spec is not None:
4013
3981
raise AssertionError("Not implemented yet...")
4014
ui.ui_factory.warn_experimental_format_fetch(self)
4015
3982
if (not self.source.supports_rich_root()
4016
3983
and self.target.supports_rich_root()):
4017
3984
self._converting_to_rich_root = True
4018
3985
self._revision_id_to_root_id = {}
4020
3987
self._converting_to_rich_root = False
4021
# See <https://launchpad.net/bugs/456077> asking for a warning here
4022
if self.source._format.network_name() != self.target._format.network_name():
4023
ui.ui_factory.show_user_warning('cross_format_fetch',
4024
from_format=self.source._format,
4025
to_format=self.target._format)
4026
3988
revision_ids = self.target.search_missing_revision_ids(self.source,
4027
3989
revision_id, find_ghosts=find_ghosts).get_keys()
4028
3990
if not revision_ids:
4097
4059
:param to_convert: The disk object to convert.
4098
4060
:param pb: a progress bar to use for progress information.
4100
pb = ui.ui_factory.nested_progress_bar()
4103
4065
# this is only useful with metadir layouts - separated repo content.
4104
4066
# trigger an assertion if not such
4105
4067
repo._format.get_format_string()
4106
4068
self.repo_dir = repo.bzrdir
4107
pb.update('Moving repository to repository.backup')
4069
self.step('Moving repository to repository.backup')
4108
4070
self.repo_dir.transport.move('repository', 'repository.backup')
4109
4071
backup_transport = self.repo_dir.transport.clone('repository.backup')
4110
4072
repo._format.check_conversion_target(self.target_format)
4111
4073
self.source_repo = repo._format.open(self.repo_dir,
4113
4075
_override_transport=backup_transport)
4114
pb.update('Creating new repository')
4076
self.step('Creating new repository')
4115
4077
converted = self.target_format.initialize(self.repo_dir,
4116
4078
self.source_repo.is_shared())
4117
4079
converted.lock_write()
4119
pb.update('Copying content')
4081
self.step('Copying content into repository.')
4120
4082
self.source_repo.copy_content_into(converted)
4122
4084
converted.unlock()
4123
pb.update('Deleting old repository content')
4085
self.step('Deleting old repository content.')
4124
4086
self.repo_dir.transport.delete_tree('repository.backup')
4125
ui.ui_factory.note('repository converted')
4087
self.pb.note('repository converted')
4089
def step(self, message):
4090
"""Update the pb by a step."""
4092
self.pb.update(message, self.count, self.total)
4129
4095
_unescape_map = {
4350
4316
if versioned_file is None:
4352
# TODO: key is often going to be a StaticTuple object
4353
# I don't believe we can define a method by which
4354
# (prefix,) + StaticTuple will work, though we could
4355
# define a StaticTuple.sq_concat that would allow you to
4356
# pass in either a tuple or a StaticTuple as the second
4357
# object, so instead we could have:
4358
# StaticTuple(prefix) + key here...
4359
4318
missing_keys.update((prefix,) + key for key in
4360
4319
versioned_file.get_missing_compression_parent_keys())
4361
4320
except NotImplementedError:
4473
4432
fetching the inventory weave.
4475
4434
if self._rich_root_upgrade():
4476
return _mod_fetch.Inter1and2Helper(
4436
return bzrlib.fetch.Inter1and2Helper(
4477
4437
self.from_repository).generate_root_texts(revs)
4622
4582
def _get_convertable_inventory_stream(self, revision_ids,
4623
4583
delta_versus_null=False):
4624
# The two formats are sufficiently different that there is no fast
4625
# path, so we need to send just inventorydeltas, which any
4626
# sufficiently modern client can insert into any repository.
4627
# The StreamSink code expects to be able to
4584
# The source is using CHKs, but the target either doesn't or it has a
4585
# different serializer. The StreamSink code expects to be able to
4628
4586
# convert on the target, so we need to put bytes-on-the-wire that can
4629
4587
# be converted. That means inventory deltas (if the remote is <1.19,
4630
4588
# RemoteStreamSink will fallback to VFS to insert the deltas).
added
removed
bzrlib/repository.py
