52
50
from bzrlib.testament import Testament
59
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
53
from bzrlib.decorators import needs_read_lock, needs_write_lock
60
54
from bzrlib.inter import InterObject
61
55
from bzrlib.inventory import (
67
from bzrlib.lock import _RelockDebugMixin, LogicalLockResult
61
from bzrlib import registry
68
62
from bzrlib.trace import (
69
63
log_exception_quietly, note, mutter, mutter_callsite, warning)
73
67
_deprecation_warning_done = False
76
class IsInWriteGroupError(errors.InternalBzrError):
78
_fmt = "May not refresh_data of repo %(repo)s while in a write group."
80
def __init__(self, repo):
81
errors.InternalBzrError.__init__(self, repo=repo)
84
70
class CommitBuilder(object):
85
71
"""Provides an interface to build up a commit.
220
206
# an inventory delta was accumulated without creating a new
222
208
basis_id = self.basis_delta_revision
223
# We ignore the 'inventory' returned by add_inventory_by_delta
224
# because self.new_inventory is used to hint to the rest of the
225
# system what code path was taken
226
self.inv_sha1, _ = self.repository.add_inventory_by_delta(
209
self.inv_sha1 = self.repository.add_inventory_by_delta(
227
210
basis_id, self._basis_delta, self._new_revision_id,
870
853
# versioned roots do not change unless the tree found a change.
873
class RepositoryWriteLockResult(LogicalLockResult):
874
"""The result of write locking a repository.
876
:ivar repository_token: The token obtained from the underlying lock, or
878
:ivar unlock: A callable which will unlock the lock.
881
def __init__(self, unlock, repository_token):
882
LogicalLockResult.__init__(self, unlock)
883
self.repository_token = repository_token
886
return "RepositoryWriteLockResult(%s, %s)" % (self.repository_token,
890
856
######################################################################
894
class Repository(_RelockDebugMixin, bzrdir.ControlComponent):
860
class Repository(object):
895
861
"""Repository holding history for one or more branches.
897
863
The repository holds and retrieves historical information including
1056
1022
:seealso: add_inventory, for the contract.
1058
inv_lines = self._serializer.write_inventory_to_lines(inv)
1024
inv_lines = self._serialise_inventory_to_lines(inv)
1059
1025
return self._inventory_add_lines(revision_id, parents,
1060
1026
inv_lines, check_content=False)
1268
1234
"""Check a single text from this repository."""
1269
1235
if kind == 'inventories':
1270
1236
rev_id = record.key[0]
1271
inv = self._deserialise_inventory(rev_id,
1237
inv = self.deserialise_inventory(rev_id,
1272
1238
record.get_bytes_as('fulltext'))
1273
1239
if last_object is not None:
1274
1240
delta = inv._make_delta(last_object)
1319
1285
:param _format: The format of the repository on disk.
1320
1286
:param a_bzrdir: The BzrDir of the repository.
1288
In the future we will have a single api for all stores for
1289
getting file texts, inventories and revisions, then
1290
this construct will accept instances of those things.
1322
# In the future we will have a single api for all stores for
1323
# getting file texts, inventories and revisions, then
1324
# this construct will accept instances of those things.
1325
1292
super(Repository, self).__init__()
1326
1293
self._format = _format
1327
1294
# the following are part of the public API for Repository:
1333
1300
self._reconcile_does_inventory_gc = True
1334
1301
self._reconcile_fixes_text_parents = False
1335
1302
self._reconcile_backsup_inventory = True
1303
# not right yet - should be more semantically clear ?
1305
# TODO: make sure to construct the right store classes, etc, depending
1306
# on whether escaping is required.
1307
self._warn_if_deprecated()
1336
1308
self._write_group = None
1337
1309
# Additional places to query for data.
1338
1310
self._fallback_repositories = []
1339
1311
# An InventoryEntry cache, used during deserialization
1340
1312
self._inventory_entry_cache = fifo_cache.FIFOCache(10*1024)
1341
# Is it safe to return inventory entries directly from the entry cache,
1342
# rather copying them?
1343
self._safe_to_return_from_cache = False
1346
def user_transport(self):
1347
return self.bzrdir.user_transport
1350
def control_transport(self):
1351
return self._transport
1353
1314
def __repr__(self):
1354
1315
if self._fallback_repositories:
1403
1364
data during reads, and allows a 'write_group' to be obtained. Write
1404
1365
groups must be used for actual data insertion.
1406
A token should be passed in if you know that you have locked the object
1407
some other way, and need to synchronise this object's state with that
1410
XXX: this docstring is duplicated in many places, e.g. lockable_files.py
1412
1367
:param token: if this is already locked, then lock_write will fail
1413
1368
unless the token matches the existing lock.
1414
1369
:returns: a token if this instance supports tokens, otherwise None.
1417
1372
:raises MismatchedToken: if the specified token doesn't match the token
1418
1373
of the existing lock.
1419
1374
:seealso: start_write_group.
1420
:return: A RepositoryWriteLockResult.
1376
A token should be passed in if you know that you have locked the object
1377
some other way, and need to synchronise this object's state with that
1380
XXX: this docstring is duplicated in many places, e.g. lockable_files.py
1422
1382
locked = self.is_locked()
1423
token = self.control_files.lock_write(token=token)
1383
result = self.control_files.lock_write(token=token)
1425
self._warn_if_deprecated()
1426
self._note_lock('w')
1427
1385
for repo in self._fallback_repositories:
1428
1386
# Writes don't affect fallback repos
1429
1387
repo.lock_read()
1430
1388
self._refresh_data()
1431
return RepositoryWriteLockResult(self.unlock, token)
1433
1391
def lock_read(self):
1434
"""Lock the repository for read operations.
1436
:return: An object with an unlock method which will release the lock
1439
1392
locked = self.is_locked()
1440
1393
self.control_files.lock_read()
1442
self._warn_if_deprecated()
1443
self._note_lock('r')
1444
1395
for repo in self._fallback_repositories:
1445
1396
repo.lock_read()
1446
1397
self._refresh_data()
1447
return LogicalLockResult(self.unlock)
1449
1399
def get_physical_lock_status(self):
1450
1400
return self.control_files.get_physical_lock_status()
1511
1461
# now gather global repository information
1512
1462
# XXX: This is available for many repos regardless of listability.
1513
if self.user_transport.listable():
1463
if self.bzrdir.root_transport.listable():
1514
1464
# XXX: do we want to __define len__() ?
1515
1465
# Maybe the versionedfiles object should provide a different
1516
1466
# method to get the number of keys.
1526
1476
:param using: If True, list only branches using this repository.
1528
1478
if using and not self.is_shared():
1529
return self.bzrdir.list_branches()
1480
return [self.bzrdir.open_branch()]
1481
except errors.NotBranchError:
1530
1483
class Evaluator(object):
1532
1485
def __init__(self):
1541
1494
except errors.NoRepositoryPresent:
1544
return False, ([], repository)
1497
return False, (None, repository)
1545
1498
self.first_call = False
1546
value = (bzrdir.list_branches(), None)
1500
value = (bzrdir.open_branch(), None)
1501
except errors.NotBranchError:
1502
value = (None, None)
1547
1503
return True, value
1550
for branches, repository in bzrdir.BzrDir.find_bzrdirs(
1551
self.user_transport, evaluate=Evaluator()):
1552
if branches is not None:
1553
ret.extend(branches)
1506
for branch, repository in bzrdir.BzrDir.find_bzrdirs(
1507
self.bzrdir.root_transport, evaluate=Evaluator()):
1508
if branch is not None:
1509
branches.append(branch)
1554
1510
if not using and repository is not None:
1555
ret.extend(repository.find_branches())
1511
branches.extend(repository.find_branches())
1558
1514
@needs_read_lock
1559
1515
def search_missing_revision_ids(self, other, revision_id=None, find_ghosts=True):
1668
1624
return missing_keys
1670
1626
def refresh_data(self):
1671
"""Re-read any data needed to synchronise with disk.
1627
"""Re-read any data needed to to synchronise with disk.
1673
1629
This method is intended to be called after another repository instance
1674
1630
(such as one used by a smart server) has inserted data into the
1675
repository. On all repositories this will work outside of write groups.
1676
Some repository formats (pack and newer for bzrlib native formats)
1677
support refresh_data inside write groups. If called inside a write
1678
group on a repository that does not support refreshing in a write group
1679
IsInWriteGroupError will be raised.
1631
repository. It may not be called during a write group, but may be
1632
called at any other time.
1634
if self.is_in_write_group():
1635
raise errors.InternalBzrError(
1636
"May not refresh_data while in a write group.")
1681
1637
self._refresh_data()
1683
1639
def resume_write_group(self, tokens):
1937
1892
rev = self._serializer.read_revision_from_string(text)
1938
1893
yield (revid, rev)
1896
def get_revision_xml(self, revision_id):
1897
# TODO: jam 20070210 This shouldn't be necessary since get_revision
1898
# would have already do it.
1899
# TODO: jam 20070210 Just use _serializer.write_revision_to_string()
1900
# TODO: this can't just be replaced by:
1901
# return self._serializer.write_revision_to_string(
1902
# self.get_revision(revision_id))
1903
# as cStringIO preservers the encoding unlike write_revision_to_string
1904
# or some other call down the path.
1905
rev = self.get_revision(revision_id)
1906
rev_tmp = cStringIO.StringIO()
1907
# the current serializer..
1908
self._serializer.write_revision(rev, rev_tmp)
1910
return rev_tmp.getvalue()
1940
1912
def get_deltas_for_revisions(self, revisions, specific_fileids=None):
1941
1913
"""Produce a generator of revision deltas.
2185
2157
selected_keys = set((revid,) for revid in revision_ids)
2186
2158
w = _inv_weave or self.inventories
2187
return self._find_file_ids_from_xml_inventory_lines(
2188
w.iter_lines_added_or_present_in_keys(
2189
selected_keys, pb=None),
2159
pb = ui.ui_factory.nested_progress_bar()
2161
return self._find_file_ids_from_xml_inventory_lines(
2162
w.iter_lines_added_or_present_in_keys(
2163
selected_keys, pb=pb),
2192
2168
def iter_files_bytes(self, desired_files):
2193
2169
"""Iterate through file versions.
2354
2330
num_file_ids = len(file_ids)
2355
2331
for file_id, altered_versions in file_ids.iteritems():
2356
2332
if pb is not None:
2357
pb.update("Fetch texts", count, num_file_ids)
2333
pb.update("fetch texts", count, num_file_ids)
2359
2335
yield ("file", file_id, altered_versions)
2403
2379
"""single-document based inventory iteration."""
2404
2380
inv_xmls = self._iter_inventory_xmls(revision_ids, ordering)
2405
2381
for text, revision_id in inv_xmls:
2406
yield self._deserialise_inventory(revision_id, text)
2382
yield self.deserialise_inventory(revision_id, text)
2408
2384
def _iter_inventory_xmls(self, revision_ids, ordering):
2409
2385
if ordering is None:
2441
2417
next_key = None
2444
def _deserialise_inventory(self, revision_id, xml):
2420
def deserialise_inventory(self, revision_id, xml):
2445
2421
"""Transform the xml into an inventory object.
2447
2423
:param revision_id: The expected revision id of the inventory.
2448
2424
:param xml: A serialised inventory.
2450
2426
result = self._serializer.read_inventory_from_string(xml, revision_id,
2451
entry_cache=self._inventory_entry_cache,
2452
return_from_cache=self._safe_to_return_from_cache)
2427
entry_cache=self._inventory_entry_cache)
2453
2428
if result.revision_id != revision_id:
2454
2429
raise AssertionError('revision id mismatch %s != %s' % (
2455
2430
result.revision_id, revision_id))
2433
def serialise_inventory(self, inv):
2434
return self._serializer.write_inventory_to_string(inv)
2436
def _serialise_inventory_to_lines(self, inv):
2437
return self._serializer.write_inventory_to_lines(inv)
2458
2439
def get_serializer_format(self):
2459
2440
return self._serializer.format_num
2461
2442
@needs_read_lock
2462
def _get_inventory_xml(self, revision_id):
2463
"""Get serialized inventory as a string."""
2443
def get_inventory_xml(self, revision_id):
2444
"""Get inventory XML as a file object."""
2464
2445
texts = self._iter_inventory_xmls([revision_id], 'unordered')
2466
2447
text, revision_id = texts.next()
2468
2449
raise errors.HistoryMissing(self, 'inventory', revision_id)
2453
def get_inventory_sha1(self, revision_id):
2454
"""Return the sha1 hash of the inventory entry
2456
return self.get_revision(revision_id).inventory_sha1
2471
2458
def get_rev_id_for_revno(self, revno, known_pair):
2472
2459
"""Return the revision id of a revno, given a later (revno, revid)
2473
2460
pair in the same history.
2525
2512
next_id = parents[0]
2515
def get_revision_inventory(self, revision_id):
2516
"""Return inventory of a past revision."""
2517
# TODO: Unify this with get_inventory()
2518
# bzr 0.0.6 and later imposes the constraint that the inventory_id
2519
# must be the same as its revision, so this is trivial.
2520
if revision_id is None:
2521
# This does not make sense: if there is no revision,
2522
# then it is the current tree inventory surely ?!
2523
# and thus get_root_id() is something that looks at the last
2524
# commit on the branch, and the get_root_id is an inventory check.
2525
raise NotImplementedError
2526
# return Inventory(self.get_root_id())
2528
return self.get_inventory(revision_id)
2527
2530
def is_shared(self):
2528
2531
"""Return True if this repository is flagged as a shared repository."""
2529
2532
raise NotImplementedError(self.is_shared)
2563
2566
return RevisionTree(self, Inventory(root_id=None),
2564
2567
_mod_revision.NULL_REVISION)
2566
inv = self.get_inventory(revision_id)
2569
inv = self.get_revision_inventory(revision_id)
2567
2570
return RevisionTree(self, inv, revision_id)
2569
2572
def revision_trees(self, revision_ids):
2622
2625
keys = tsort.topo_sort(parent_map)
2623
2626
return [None] + list(keys)
2625
def pack(self, hint=None, clean_obsolete_packs=False):
2628
def pack(self, hint=None):
2626
2629
"""Compress the data within the repository.
2628
2631
This operation only makes sense for some repository types. For other
2638
2641
obtained from the result of commit_write_group(). Out of
2639
2642
date hints are simply ignored, because concurrent operations
2640
2643
can obsolete them rapidly.
2642
:param clean_obsolete_packs: Clean obsolete packs immediately after
2646
2646
def get_transaction(self):
2662
2662
for ((revision_id,), parent_keys) in \
2663
2663
self.revisions.get_parent_map(query_keys).iteritems():
2664
2664
if parent_keys:
2665
result[revision_id] = tuple([parent_revid
2666
for (parent_revid,) in parent_keys])
2665
result[revision_id] = tuple(parent_revid
2666
for (parent_revid,) in parent_keys)
2668
2668
result[revision_id] = (_mod_revision.NULL_REVISION,)
2671
2671
def _make_parents_provider(self):
2675
def get_known_graph_ancestry(self, revision_ids):
2676
"""Return the known graph for a set of revision ids and their ancestors.
2678
st = static_tuple.StaticTuple
2679
revision_keys = [st(r_id).intern() for r_id in revision_ids]
2680
known_graph = self.revisions.get_known_graph_ancestry(revision_keys)
2681
return graph.GraphThunkIdsToKeys(known_graph)
2683
2674
def get_graph(self, other_repository=None):
2684
2675
"""Return the graph walker for this repository format"""
2685
2676
parents_provider = self._make_parents_provider()
2780
2771
result.check(callback_refs)
2783
def _warn_if_deprecated(self, branch=None):
2774
def _warn_if_deprecated(self):
2784
2775
global _deprecation_warning_done
2785
2776
if _deprecation_warning_done:
2789
conf = config.GlobalConfig()
2791
conf = branch.get_config()
2792
if conf.suppress_warning('format_deprecation'):
2794
warning("Format %s for %s is deprecated -"
2795
" please use 'bzr upgrade' to get better performance"
2796
% (self._format, self.bzrdir.transport.base))
2798
_deprecation_warning_done = True
2778
_deprecation_warning_done = True
2779
warning("Format %s for %s is deprecated - please use 'bzr upgrade' to get better performance"
2780
% (self._format, self.bzrdir.transport.base))
2800
2782
def supports_rich_root(self):
2801
2783
return self._format.rich_root_data
3084
3066
pack_compresses = False
3085
3067
# Does the repository inventory storage understand references to trees?
3086
3068
supports_tree_reference = None
3087
# Is the format experimental ?
3088
experimental = False
3091
return "%s()" % self.__class__.__name__
3071
return "<%s>" % self.__class__.__name__
3093
3073
def __eq__(self, other):
3094
3074
# format objects are generally stateless
3109
3089
transport = a_bzrdir.get_repository_transport(None)
3110
format_string = transport.get_bytes("format")
3090
format_string = transport.get("format").read()
3111
3091
return format_registry.get(format_string)
3112
3092
except errors.NoSuchFile:
3113
3093
raise errors.NoRepositoryPresent(a_bzrdir)
3213
3193
raise NotImplementedError(self.open)
3215
def _run_post_repo_init_hooks(self, repository, a_bzrdir, shared):
3216
from bzrlib.bzrdir import BzrDir, RepoInitHookParams
3217
hooks = BzrDir.hooks['post_repo_init']
3220
params = RepoInitHookParams(repository, self, a_bzrdir, shared)
3225
3196
class MetaDirRepositoryFormat(RepositoryFormat):
3226
3197
"""Common base class for the new repositories using the metadir layout."""
3432
3403
:param revision_id: if None all content is copied, if NULL_REVISION no
3433
3404
content is copied.
3405
:param pb: optional progress bar to use for progress reports. If not
3406
provided a default one will be created.
3437
ui.ui_factory.warn_experimental_format_fetch(self)
3438
3409
from bzrlib.fetch import RepoFetcher
3439
# See <https://launchpad.net/bugs/456077> asking for a warning here
3440
if self.source._format.network_name() != self.target._format.network_name():
3441
ui.ui_factory.show_user_warning('cross_format_fetch',
3442
from_format=self.source._format,
3443
to_format=self.target._format)
3444
3410
f = RepoFetcher(to_repository=self.target,
3445
3411
from_repository=self.source,
3446
3412
last_revision=revision_id,
3447
3413
fetch_spec=fetch_spec,
3448
find_ghosts=find_ghosts)
3414
pb=pb, find_ghosts=find_ghosts)
3450
3416
def _walk_to_common_revisions(self, revision_ids):
3451
3417
"""Walk out from revision_ids in source to revisions target has.
3620
3586
self.target.texts.insert_record_stream(
3621
3587
self.source.texts.get_record_stream(
3622
3588
self.source.texts.keys(), 'topological', False))
3623
pb.update('Copying inventory', 0, 1)
3589
pb.update('copying inventory', 0, 1)
3624
3590
self.target.inventories.insert_record_stream(
3625
3591
self.source.inventories.get_record_stream(
3626
3592
self.source.inventories.keys(), 'topological', False))
3847
3813
basis_id, delta, current_revision_id, parents_parents)
3848
3814
cache[current_revision_id] = parent_tree
3850
def _fetch_batch(self, revision_ids, basis_id, cache, a_graph=None):
3816
def _fetch_batch(self, revision_ids, basis_id, cache):
3851
3817
"""Fetch across a few revisions.
3853
3819
:param revision_ids: The revisions to copy
3854
3820
:param basis_id: The revision_id of a tree that must be in cache, used
3855
3821
as a basis for delta when no other base is available
3856
3822
:param cache: A cache of RevisionTrees that we can use.
3857
:param a_graph: A Graph object to determine the heads() of the
3858
rich-root data stream.
3859
3823
:return: The revision_id of the last converted tree. The RevisionTree
3860
3824
for it will be in cache
3868
3832
pending_revisions = []
3869
3833
parent_map = self.source.get_parent_map(revision_ids)
3870
3834
self._fetch_parent_invs_for_stacking(parent_map, cache)
3871
self.source._safe_to_return_from_cache = True
3872
3835
for tree in self.source.revision_trees(revision_ids):
3873
3836
# Find a inventory delta for this revision.
3874
3837
# Find text entries that need to be copied, too.
3922
3885
pending_revisions.append(revision)
3923
3886
cache[current_revision_id] = tree
3924
3887
basis_id = current_revision_id
3925
self.source._safe_to_return_from_cache = False
3926
3888
# Copy file texts
3927
3889
from_texts = self.source.texts
3928
3890
to_texts = self.target.texts
3929
3891
if root_keys_to_create:
3930
root_stream = _mod_fetch._new_root_data_stream(
3892
from bzrlib.fetch import _new_root_data_stream
3893
root_stream = _new_root_data_stream(
3931
3894
root_keys_to_create, self._revision_id_to_root_id, parent_map,
3932
self.source, graph=a_graph)
3933
3896
to_texts.insert_record_stream(root_stream)
3934
3897
to_texts.insert_record_stream(from_texts.get_record_stream(
3935
3898
text_keys, self.target._format._fetch_order,
3992
3955
cache[basis_id] = basis_tree
3993
3956
del basis_tree # We don't want to hang on to it here
3995
if self._converting_to_rich_root and len(revision_ids) > 100:
3996
a_graph = _mod_fetch._get_rich_root_heads_graph(self.source,
4001
3958
for offset in range(0, len(revision_ids), batch_size):
4002
3959
self.target.start_write_group()
4004
3961
pb.update('Transferring revisions', offset,
4005
3962
len(revision_ids))
4006
3963
batch = revision_ids[offset:offset+batch_size]
4007
basis_id = self._fetch_batch(batch, basis_id, cache,
3964
basis_id = self._fetch_batch(batch, basis_id, cache)
4010
self.source._safe_to_return_from_cache = False
4011
3966
self.target.abort_write_group()
4025
3980
"""See InterRepository.fetch()."""
4026
3981
if fetch_spec is not None:
4027
3982
raise AssertionError("Not implemented yet...")
4028
ui.ui_factory.warn_experimental_format_fetch(self)
3983
# See <https://launchpad.net/bugs/456077> asking for a warning here
3985
# nb this is only active for local-local fetches; other things using
3987
ui.ui_factory.warn_cross_format_fetch(self.source._format,
3988
self.target._format)
4029
3989
if (not self.source.supports_rich_root()
4030
3990
and self.target.supports_rich_root()):
4031
3991
self._converting_to_rich_root = True
4032
3992
self._revision_id_to_root_id = {}
4034
3994
self._converting_to_rich_root = False
4035
# See <https://launchpad.net/bugs/456077> asking for a warning here
4036
if self.source._format.network_name() != self.target._format.network_name():
4037
ui.ui_factory.show_user_warning('cross_format_fetch',
4038
from_format=self.source._format,
4039
to_format=self.target._format)
4040
3995
revision_ids = self.target.search_missing_revision_ids(self.source,
4041
3996
revision_id, find_ghosts=find_ghosts).get_keys()
4042
3997
if not revision_ids:
4111
4066
:param to_convert: The disk object to convert.
4112
4067
:param pb: a progress bar to use for progress information.
4114
pb = ui.ui_factory.nested_progress_bar()
4117
4072
# this is only useful with metadir layouts - separated repo content.
4118
4073
# trigger an assertion if not such
4119
4074
repo._format.get_format_string()
4120
4075
self.repo_dir = repo.bzrdir
4121
pb.update('Moving repository to repository.backup')
4076
self.step('Moving repository to repository.backup')
4122
4077
self.repo_dir.transport.move('repository', 'repository.backup')
4123
4078
backup_transport = self.repo_dir.transport.clone('repository.backup')
4124
4079
repo._format.check_conversion_target(self.target_format)
4125
4080
self.source_repo = repo._format.open(self.repo_dir,
4127
4082
_override_transport=backup_transport)
4128
pb.update('Creating new repository')
4083
self.step('Creating new repository')
4129
4084
converted = self.target_format.initialize(self.repo_dir,
4130
4085
self.source_repo.is_shared())
4131
4086
converted.lock_write()
4133
pb.update('Copying content')
4088
self.step('Copying content into repository.')
4134
4089
self.source_repo.copy_content_into(converted)
4136
4091
converted.unlock()
4137
pb.update('Deleting old repository content')
4092
self.step('Deleting old repository content.')
4138
4093
self.repo_dir.transport.delete_tree('repository.backup')
4139
ui.ui_factory.note('repository converted')
4094
self.pb.note('repository converted')
4096
def step(self, message):
4097
"""Update the pb by a step."""
4099
self.pb.update(message, self.count, self.total)
4143
4102
_unescape_map = {
4325
4284
self._extract_and_insert_inventories(
4326
4285
substream, src_serializer)
4327
4286
elif substream_type == 'inventory-deltas':
4287
ui.ui_factory.warn_cross_format_fetch(src_format,
4288
self.target_repo._format)
4328
4289
self._extract_and_insert_inventory_deltas(
4329
4290
substream, src_serializer)
4330
4291
elif substream_type == 'chk_bytes':
4364
4325
if versioned_file is None:
4366
# TODO: key is often going to be a StaticTuple object
4367
# I don't believe we can define a method by which
4368
# (prefix,) + StaticTuple will work, though we could
4369
# define a StaticTuple.sq_concat that would allow you to
4370
# pass in either a tuple or a StaticTuple as the second
4371
# object, so instead we could have:
4372
# StaticTuple(prefix) + key here...
4373
4327
missing_keys.update((prefix,) + key for key in
4374
4328
versioned_file.get_missing_compression_parent_keys())
4375
4329
except NotImplementedError:
4487
4441
fetching the inventory weave.
4489
4443
if self._rich_root_upgrade():
4490
return _mod_fetch.Inter1and2Helper(
4445
return bzrlib.fetch.Inter1and2Helper(
4491
4446
self.from_repository).generate_root_texts(revs)
added
removed
bzrlib/repository.py
