548
491
ie.revision = parent_entry.revision
549
492
return self._get_delta(ie, basis_inv, path), False, None
550
493
ie.reference_revision = content_summary[3]
551
if ie.reference_revision is None:
552
raise AssertionError("invalid content_summary for nested tree: %r"
553
% (content_summary,))
554
self._add_text_to_weave(ie.file_id, '', heads, None)
495
self._add_text_to_weave(ie.file_id, lines, heads, None)
556
497
raise NotImplementedError('unknown kind')
557
498
ie.revision = self._new_revision_id
558
self._any_changes = True
559
499
return self._get_delta(ie, basis_inv, path), True, fingerprint
561
def record_iter_changes(self, tree, basis_revision_id, iter_changes,
562
_entry_factory=entry_factory):
563
"""Record a new tree via iter_changes.
565
:param tree: The tree to obtain text contents from for changed objects.
566
:param basis_revision_id: The revision id of the tree the iter_changes
567
has been generated against. Currently assumed to be the same
568
as self.parents[0] - if it is not, errors may occur.
569
:param iter_changes: An iter_changes iterator with the changes to apply
570
to basis_revision_id. The iterator must not include any items with
571
a current kind of None - missing items must be either filtered out
572
or errored-on beefore record_iter_changes sees the item.
573
:param _entry_factory: Private method to bind entry_factory locally for
575
:return: A generator of (file_id, relpath, fs_hash) tuples for use with
578
# Create an inventory delta based on deltas between all the parents and
579
# deltas between all the parent inventories. We use inventory delta's
580
# between the inventory objects because iter_changes masks
581
# last-changed-field only changes.
583
# file_id -> change map, change is fileid, paths, changed, versioneds,
584
# parents, names, kinds, executables
586
# {file_id -> revision_id -> inventory entry, for entries in parent
587
# trees that are not parents[0]
591
revtrees = list(self.repository.revision_trees(self.parents))
592
except errors.NoSuchRevision:
593
# one or more ghosts, slow path.
595
for revision_id in self.parents:
597
revtrees.append(self.repository.revision_tree(revision_id))
598
except errors.NoSuchRevision:
600
basis_revision_id = _mod_revision.NULL_REVISION
602
revtrees.append(self.repository.revision_tree(
603
_mod_revision.NULL_REVISION))
604
# The basis inventory from a repository
606
basis_inv = revtrees[0].inventory
608
basis_inv = self.repository.revision_tree(
609
_mod_revision.NULL_REVISION).inventory
610
if len(self.parents) > 0:
611
if basis_revision_id != self.parents[0] and not ghost_basis:
613
"arbitrary basis parents not yet supported with merges")
614
for revtree in revtrees[1:]:
615
for change in revtree.inventory._make_delta(basis_inv):
616
if change[1] is None:
617
# Not present in this parent.
619
if change[2] not in merged_ids:
620
if change[0] is not None:
621
basis_entry = basis_inv[change[2]]
622
merged_ids[change[2]] = [
624
basis_entry.revision,
627
parent_entries[change[2]] = {
629
basis_entry.revision:basis_entry,
631
change[3].revision:change[3],
634
merged_ids[change[2]] = [change[3].revision]
635
parent_entries[change[2]] = {change[3].revision:change[3]}
637
merged_ids[change[2]].append(change[3].revision)
638
parent_entries[change[2]][change[3].revision] = change[3]
641
# Setup the changes from the tree:
642
# changes maps file_id -> (change, [parent revision_ids])
644
for change in iter_changes:
645
# This probably looks up in basis_inv way to much.
646
if change[1][0] is not None:
647
head_candidate = [basis_inv[change[0]].revision]
650
changes[change[0]] = change, merged_ids.get(change[0],
652
unchanged_merged = set(merged_ids) - set(changes)
653
# Extend the changes dict with synthetic changes to record merges of
655
for file_id in unchanged_merged:
656
# Record a merged version of these items that did not change vs the
657
# basis. This can be either identical parallel changes, or a revert
658
# of a specific file after a merge. The recorded content will be
659
# that of the current tree (which is the same as the basis), but
660
# the per-file graph will reflect a merge.
661
# NB:XXX: We are reconstructing path information we had, this
662
# should be preserved instead.
663
# inv delta change: (file_id, (path_in_source, path_in_target),
664
# changed_content, versioned, parent, name, kind,
667
basis_entry = basis_inv[file_id]
668
except errors.NoSuchId:
669
# a change from basis->some_parents but file_id isn't in basis
670
# so was new in the merge, which means it must have changed
671
# from basis -> current, and as it hasn't the add was reverted
672
# by the user. So we discard this change.
676
(basis_inv.id2path(file_id), tree.id2path(file_id)),
678
(basis_entry.parent_id, basis_entry.parent_id),
679
(basis_entry.name, basis_entry.name),
680
(basis_entry.kind, basis_entry.kind),
681
(basis_entry.executable, basis_entry.executable))
682
changes[file_id] = (change, merged_ids[file_id])
683
# changes contains tuples with the change and a set of inventory
684
# candidates for the file.
686
# old_path, new_path, file_id, new_inventory_entry
687
seen_root = False # Is the root in the basis delta?
688
inv_delta = self._basis_delta
689
modified_rev = self._new_revision_id
690
for change, head_candidates in changes.values():
691
if change[3][1]: # versioned in target.
692
# Several things may be happening here:
693
# We may have a fork in the per-file graph
694
# - record a change with the content from tree
695
# We may have a change against < all trees
696
# - carry over the tree that hasn't changed
697
# We may have a change against all trees
698
# - record the change with the content from tree
701
entry = _entry_factory[kind](file_id, change[5][1],
703
head_set = self._heads(change[0], set(head_candidates))
706
for head_candidate in head_candidates:
707
if head_candidate in head_set:
708
heads.append(head_candidate)
709
head_set.remove(head_candidate)
712
# Could be a carry-over situation:
713
parent_entry_revs = parent_entries.get(file_id, None)
714
if parent_entry_revs:
715
parent_entry = parent_entry_revs.get(heads[0], None)
718
if parent_entry is None:
719
# The parent iter_changes was called against is the one
720
# that is the per-file head, so any change is relevant
721
# iter_changes is valid.
722
carry_over_possible = False
724
# could be a carry over situation
725
# A change against the basis may just indicate a merge,
726
# we need to check the content against the source of the
727
# merge to determine if it was changed after the merge
729
if (parent_entry.kind != entry.kind or
730
parent_entry.parent_id != entry.parent_id or
731
parent_entry.name != entry.name):
732
# Metadata common to all entries has changed
733
# against per-file parent
734
carry_over_possible = False
736
carry_over_possible = True
737
# per-type checks for changes against the parent_entry
740
# Cannot be a carry-over situation
741
carry_over_possible = False
742
# Populate the entry in the delta
744
# XXX: There is still a small race here: If someone reverts the content of a file
745
# after iter_changes examines and decides it has changed,
746
# we will unconditionally record a new version even if some
747
# other process reverts it while commit is running (with
748
# the revert happening after iter_changes did it's
751
entry.executable = True
753
entry.executable = False
754
if (carry_over_possible and
755
parent_entry.executable == entry.executable):
756
# Check the file length, content hash after reading
758
nostore_sha = parent_entry.text_sha1
761
file_obj, stat_value = tree.get_file_with_stat(file_id, change[1][1])
763
text = file_obj.read()
767
entry.text_sha1, entry.text_size = self._add_text_to_weave(
768
file_id, text, heads, nostore_sha)
769
yield file_id, change[1][1], (entry.text_sha1, stat_value)
770
except errors.ExistingContent:
771
# No content change against a carry_over parent
772
# Perhaps this should also yield a fs hash update?
774
entry.text_size = parent_entry.text_size
775
entry.text_sha1 = parent_entry.text_sha1
776
elif kind == 'symlink':
778
entry.symlink_target = tree.get_symlink_target(file_id)
779
if (carry_over_possible and
780
parent_entry.symlink_target == entry.symlink_target):
783
self._add_text_to_weave(change[0], '', heads, None)
784
elif kind == 'directory':
785
if carry_over_possible:
788
# Nothing to set on the entry.
789
# XXX: split into the Root and nonRoot versions.
790
if change[1][1] != '' or self.repository.supports_rich_root():
791
self._add_text_to_weave(change[0], '', heads, None)
792
elif kind == 'tree-reference':
793
if not self.repository._format.supports_tree_reference:
794
# This isn't quite sane as an error, but we shouldn't
795
# ever see this code path in practice: tree's don't
796
# permit references when the repo doesn't support tree
798
raise errors.UnsupportedOperation(tree.add_reference,
800
reference_revision = tree.get_reference_revision(change[0])
801
entry.reference_revision = reference_revision
802
if (carry_over_possible and
803
parent_entry.reference_revision == reference_revision):
806
self._add_text_to_weave(change[0], '', heads, None)
808
raise AssertionError('unknown kind %r' % kind)
810
entry.revision = modified_rev
812
entry.revision = parent_entry.revision
815
new_path = change[1][1]
816
inv_delta.append((change[1][0], new_path, change[0], entry))
819
self.new_inventory = None
821
# This should perhaps be guarded by a check that the basis we
822
# commit against is the basis for the commit and if not do a delta
824
self._any_changes = True
826
# housekeeping root entry changes do not affect no-change commits.
827
self._require_root_change(tree)
828
self.basis_delta_revision = basis_revision_id
830
def _add_text_to_weave(self, file_id, new_text, parents, nostore_sha):
831
parent_keys = tuple([(file_id, parent) for parent in parents])
832
return self.repository.texts._add_text(
833
(file_id, self._new_revision_id), parent_keys, new_text,
834
nostore_sha=nostore_sha, random_id=self.random_revid)[0:2]
501
def _add_text_to_weave(self, file_id, new_lines, parents, nostore_sha):
502
# Note: as we read the content directly from the tree, we know its not
503
# been turned into unicode or badly split - but a broken tree
504
# implementation could give us bad output from readlines() so this is
505
# not a guarantee of safety. What would be better is always checking
506
# the content during test suite execution. RBC 20070912
507
parent_keys = tuple((file_id, parent) for parent in parents)
508
return self.repository.texts.add_lines(
509
(file_id, self._new_revision_id), parent_keys, new_lines,
510
nostore_sha=nostore_sha, random_id=self.random_revid,
511
check_content=False)[0:2]
837
514
class RootCommitBuilder(CommitBuilder):
1185
795
# The old API returned a list, should this actually be a set?
1186
796
return parent_map.keys()
1188
def _check_inventories(self, checker):
1189
"""Check the inventories found from the revision scan.
1191
This is responsible for verifying the sha1 of inventories and
1192
creating a pending_keys set that covers data referenced by inventories.
1194
bar = ui.ui_factory.nested_progress_bar()
1196
self._do_check_inventories(checker, bar)
1200
def _do_check_inventories(self, checker, bar):
1201
"""Helper for _check_inventories."""
1203
keys = {'chk_bytes':set(), 'inventories':set(), 'texts':set()}
1204
kinds = ['chk_bytes', 'texts']
1205
count = len(checker.pending_keys)
1206
bar.update("inventories", 0, 2)
1207
current_keys = checker.pending_keys
1208
checker.pending_keys = {}
1209
# Accumulate current checks.
1210
for key in current_keys:
1211
if key[0] != 'inventories' and key[0] not in kinds:
1212
checker._report_items.append('unknown key type %r' % (key,))
1213
keys[key[0]].add(key[1:])
1214
if keys['inventories']:
1215
# NB: output order *should* be roughly sorted - topo or
1216
# inverse topo depending on repository - either way decent
1217
# to just delta against. However, pre-CHK formats didn't
1218
# try to optimise inventory layout on disk. As such the
1219
# pre-CHK code path does not use inventory deltas.
1221
for record in self.inventories.check(keys=keys['inventories']):
1222
if record.storage_kind == 'absent':
1223
checker._report_items.append(
1224
'Missing inventory {%s}' % (record.key,))
1226
last_object = self._check_record('inventories', record,
1227
checker, last_object,
1228
current_keys[('inventories',) + record.key])
1229
del keys['inventories']
1232
bar.update("texts", 1)
1233
while (checker.pending_keys or keys['chk_bytes']
1235
# Something to check.
1236
current_keys = checker.pending_keys
1237
checker.pending_keys = {}
1238
# Accumulate current checks.
1239
for key in current_keys:
1240
if key[0] not in kinds:
1241
checker._report_items.append('unknown key type %r' % (key,))
1242
keys[key[0]].add(key[1:])
1243
# Check the outermost kind only - inventories || chk_bytes || texts
1247
for record in getattr(self, kind).check(keys=keys[kind]):
1248
if record.storage_kind == 'absent':
1249
checker._report_items.append(
1250
'Missing %s {%s}' % (kind, record.key,))
1252
last_object = self._check_record(kind, record,
1253
checker, last_object, current_keys[(kind,) + record.key])
1257
def _check_record(self, kind, record, checker, last_object, item_data):
1258
"""Check a single text from this repository."""
1259
if kind == 'inventories':
1260
rev_id = record.key[0]
1261
inv = self._deserialise_inventory(rev_id,
1262
record.get_bytes_as('fulltext'))
1263
if last_object is not None:
1264
delta = inv._make_delta(last_object)
1265
for old_path, path, file_id, ie in delta:
1268
ie.check(checker, rev_id, inv)
1270
for path, ie in inv.iter_entries():
1271
ie.check(checker, rev_id, inv)
1272
if self._format.fast_deltas:
1274
elif kind == 'chk_bytes':
1275
# No code written to check chk_bytes for this repo format.
1276
checker._report_items.append(
1277
'unsupported key type chk_bytes for %s' % (record.key,))
1278
elif kind == 'texts':
1279
self._check_text(record, checker, item_data)
1281
checker._report_items.append(
1282
'unknown key type %s for %s' % (kind, record.key))
1284
def _check_text(self, record, checker, item_data):
1285
"""Check a single text."""
1286
# Check it is extractable.
1287
# TODO: check length.
1288
if record.storage_kind == 'chunked':
1289
chunks = record.get_bytes_as(record.storage_kind)
1290
sha1 = osutils.sha_strings(chunks)
1291
length = sum(map(len, chunks))
1293
content = record.get_bytes_as('fulltext')
1294
sha1 = osutils.sha_string(content)
1295
length = len(content)
1296
if item_data and sha1 != item_data[1]:
1297
checker._report_items.append(
1298
'sha1 mismatch: %s has sha1 %s expected %s referenced by %s' %
1299
(record.key, sha1, item_data[1], item_data[2]))
1302
799
def create(a_bzrdir):
1303
800
"""Construct the current default format repository in a_bzrdir."""
1602
1087
def suspend_write_group(self):
1603
1088
raise errors.UnsuspendableWriteGroup(self)
1605
def get_missing_parent_inventories(self, check_for_missing_texts=True):
1606
"""Return the keys of missing inventory parents for revisions added in
1609
A revision is not complete if the inventory delta for that revision
1610
cannot be calculated. Therefore if the parent inventories of a
1611
revision are not present, the revision is incomplete, and e.g. cannot
1612
be streamed by a smart server. This method finds missing inventory
1613
parents for revisions added in this write group.
1615
if not self._format.supports_external_lookups:
1616
# This is only an issue for stacked repositories
1618
if not self.is_in_write_group():
1619
raise AssertionError('not in a write group')
1621
# XXX: We assume that every added revision already has its
1622
# corresponding inventory, so we only check for parent inventories that
1623
# might be missing, rather than all inventories.
1624
parents = set(self.revisions._index.get_missing_parents())
1625
parents.discard(_mod_revision.NULL_REVISION)
1626
unstacked_inventories = self.inventories._index
1627
present_inventories = unstacked_inventories.get_parent_map(
1628
key[-1:] for key in parents)
1629
parents.difference_update(present_inventories)
1630
if len(parents) == 0:
1631
# No missing parent inventories.
1633
if not check_for_missing_texts:
1634
return set(('inventories', rev_id) for (rev_id,) in parents)
1635
# Ok, now we have a list of missing inventories. But these only matter
1636
# if the inventories that reference them are missing some texts they
1637
# appear to introduce.
1638
# XXX: Texts referenced by all added inventories need to be present,
1639
# but at the moment we're only checking for texts referenced by
1640
# inventories at the graph's edge.
1641
key_deps = self.revisions._index._key_dependencies
1642
key_deps.satisfy_refs_for_keys(present_inventories)
1643
referrers = frozenset(r[0] for r in key_deps.get_referrers())
1644
file_ids = self.fileids_altered_by_revision_ids(referrers)
1645
missing_texts = set()
1646
for file_id, version_ids in file_ids.iteritems():
1647
missing_texts.update(
1648
(file_id, version_id) for version_id in version_ids)
1649
present_texts = self.texts.get_parent_map(missing_texts)
1650
missing_texts.difference_update(present_texts)
1651
if not missing_texts:
1652
# No texts are missing, so all revisions and their deltas are
1655
# Alternatively the text versions could be returned as the missing
1656
# keys, but this is likely to be less data.
1657
missing_keys = set(('inventories', rev_id) for (rev_id,) in parents)
1660
1090
def refresh_data(self):
1661
1091
"""Re-read any data needed to to synchronise with disk.
1884
1305
@needs_read_lock
1885
1306
def get_revisions(self, revision_ids):
1886
"""Get many revisions at once.
1888
Repositories that need to check data on every revision read should
1889
subclass this method.
1307
"""Get many revisions at once."""
1891
1308
return self._get_revisions(revision_ids)
1893
1310
@needs_read_lock
1894
1311
def _get_revisions(self, revision_ids):
1895
1312
"""Core work logic to get many revisions without sanity checks."""
1313
for rev_id in revision_ids:
1314
if not rev_id or not isinstance(rev_id, basestring):
1315
raise errors.InvalidRevisionId(revision_id=rev_id, branch=self)
1316
keys = [(key,) for key in revision_ids]
1317
stream = self.revisions.get_record_stream(keys, 'unordered', True)
1897
for revid, rev in self._iter_revisions(revision_ids):
1899
raise errors.NoSuchRevision(self, revid)
1319
for record in stream:
1320
if record.storage_kind == 'absent':
1321
raise errors.NoSuchRevision(self, record.key[0])
1322
text = record.get_bytes_as('fulltext')
1323
rev = self._serializer.read_revision_from_string(text)
1324
revs[record.key[0]] = rev
1901
1325
return [revs[revid] for revid in revision_ids]
1903
def _iter_revisions(self, revision_ids):
1904
"""Iterate over revision objects.
1906
:param revision_ids: An iterable of revisions to examine. None may be
1907
passed to request all revisions known to the repository. Note that
1908
not all repositories can find unreferenced revisions; for those
1909
repositories only referenced ones will be returned.
1910
:return: An iterator of (revid, revision) tuples. Absent revisions (
1911
those asked for but not available) are returned as (revid, None).
1913
if revision_ids is None:
1914
revision_ids = self.all_revision_ids()
1916
for rev_id in revision_ids:
1917
if not rev_id or not isinstance(rev_id, basestring):
1918
raise errors.InvalidRevisionId(revision_id=rev_id, branch=self)
1919
keys = [(key,) for key in revision_ids]
1920
stream = self.revisions.get_record_stream(keys, 'unordered', True)
1921
for record in stream:
1922
revid = record.key[0]
1923
if record.storage_kind == 'absent':
1926
text = record.get_bytes_as('fulltext')
1927
rev = self._serializer.read_revision_from_string(text)
1930
def get_deltas_for_revisions(self, revisions, specific_fileids=None):
1328
def get_revision_xml(self, revision_id):
1329
# TODO: jam 20070210 This shouldn't be necessary since get_revision
1330
# would have already do it.
1331
# TODO: jam 20070210 Just use _serializer.write_revision_to_string()
1332
rev = self.get_revision(revision_id)
1333
rev_tmp = cStringIO.StringIO()
1334
# the current serializer..
1335
self._serializer.write_revision(rev, rev_tmp)
1337
return rev_tmp.getvalue()
1339
def get_deltas_for_revisions(self, revisions):
1931
1340
"""Produce a generator of revision deltas.
1933
1342
Note that the input is a sequence of REVISIONS, not revision_ids.
1934
1343
Trees will be held in memory until the generator exits.
1935
1344
Each delta is relative to the revision's lefthand predecessor.
1937
:param specific_fileids: if not None, the result is filtered
1938
so that only those file-ids, their parents and their
1939
children are included.
1941
# Get the revision-ids of interest
1942
1346
required_trees = set()
1943
1347
for revision in revisions:
1944
1348
required_trees.add(revision.revision_id)
1945
1349
required_trees.update(revision.parent_ids[:1])
1947
# Get the matching filtered trees. Note that it's more
1948
# efficient to pass filtered trees to changes_from() rather
1949
# than doing the filtering afterwards. changes_from() could
1950
# arguably do the filtering itself but it's path-based, not
1951
# file-id based, so filtering before or afterwards is
1953
if specific_fileids is None:
1954
trees = dict((t.get_revision_id(), t) for
1955
t in self.revision_trees(required_trees))
1957
trees = dict((t.get_revision_id(), t) for
1958
t in self._filtered_revision_trees(required_trees,
1961
# Calculate the deltas
1350
trees = dict((t.get_revision_id(), t) for
1351
t in self.revision_trees(required_trees))
1962
1352
for revision in revisions:
1963
1353
if not revision.parent_ids:
1964
1354
old_tree = self.revision_tree(_mod_revision.NULL_REVISION)
2371
1730
"""Get Inventory object by revision id."""
2372
1731
return self.iter_inventories([revision_id]).next()
2374
def iter_inventories(self, revision_ids, ordering=None):
1733
def iter_inventories(self, revision_ids):
2375
1734
"""Get many inventories by revision_ids.
2377
1736
This will buffer some or all of the texts used in constructing the
2378
1737
inventories in memory, but will only parse a single inventory at a
2381
:param revision_ids: The expected revision ids of the inventories.
2382
:param ordering: optional ordering, e.g. 'topological'. If not
2383
specified, the order of revision_ids will be preserved (by
2384
buffering if necessary).
2385
1740
:return: An iterator of inventories.
2387
1742
if ((None in revision_ids)
2388
1743
or (_mod_revision.NULL_REVISION in revision_ids)):
2389
1744
raise ValueError('cannot get null revision inventory')
2390
return self._iter_inventories(revision_ids, ordering)
1745
return self._iter_inventories(revision_ids)
2392
def _iter_inventories(self, revision_ids, ordering):
1747
def _iter_inventories(self, revision_ids):
2393
1748
"""single-document based inventory iteration."""
2394
inv_xmls = self._iter_inventory_xmls(revision_ids, ordering)
2395
for text, revision_id in inv_xmls:
2396
yield self._deserialise_inventory(revision_id, text)
1749
for text, revision_id in self._iter_inventory_xmls(revision_ids):
1750
yield self.deserialise_inventory(revision_id, text)
2398
def _iter_inventory_xmls(self, revision_ids, ordering):
2399
if ordering is None:
2400
order_as_requested = True
2401
ordering = 'unordered'
2403
order_as_requested = False
1752
def _iter_inventory_xmls(self, revision_ids):
2404
1753
keys = [(revision_id,) for revision_id in revision_ids]
2407
if order_as_requested:
2408
key_iter = iter(keys)
2409
next_key = key_iter.next()
2410
stream = self.inventories.get_record_stream(keys, ordering, True)
1754
stream = self.inventories.get_record_stream(keys, 'unordered', True)
2411
1755
text_chunks = {}
2412
1756
for record in stream:
2413
1757
if record.storage_kind != 'absent':
2414
chunks = record.get_bytes_as('chunked')
2415
if order_as_requested:
2416
text_chunks[record.key] = chunks
2418
yield ''.join(chunks), record.key[-1]
1758
text_chunks[record.key] = record.get_bytes_as('chunked')
2420
1760
raise errors.NoSuchRevision(self, record.key)
2421
if order_as_requested:
2422
# Yield as many results as we can while preserving order.
2423
while next_key in text_chunks:
2424
chunks = text_chunks.pop(next_key)
2425
yield ''.join(chunks), next_key[-1]
2427
next_key = key_iter.next()
2428
except StopIteration:
2429
# We still want to fully consume the get_record_stream,
2430
# just in case it is not actually finished at this point
1762
chunks = text_chunks.pop(key)
1763
yield ''.join(chunks), key[-1]
2434
def _deserialise_inventory(self, revision_id, xml):
1765
def deserialise_inventory(self, revision_id, xml):
2435
1766
"""Transform the xml into an inventory object.
2437
1768
:param revision_id: The expected revision id of the inventory.
2438
1769
:param xml: A serialised inventory.
2440
1771
result = self._serializer.read_inventory_from_string(xml, revision_id,
2441
entry_cache=self._inventory_entry_cache,
2442
return_from_cache=self._safe_to_return_from_cache)
1772
entry_cache=self._inventory_entry_cache)
2443
1773
if result.revision_id != revision_id:
2444
1774
raise AssertionError('revision id mismatch %s != %s' % (
2445
1775
result.revision_id, revision_id))
1778
def serialise_inventory(self, inv):
1779
return self._serializer.write_inventory_to_string(inv)
1781
def _serialise_inventory_to_lines(self, inv):
1782
return self._serializer.write_inventory_to_lines(inv)
2448
1784
def get_serializer_format(self):
2449
1785
return self._serializer.format_num
2451
1787
@needs_read_lock
2452
def _get_inventory_xml(self, revision_id):
2453
"""Get serialized inventory as a string."""
2454
texts = self._iter_inventory_xmls([revision_id], 'unordered')
1788
def get_inventory_xml(self, revision_id):
1789
"""Get inventory XML as a file object."""
1790
texts = self._iter_inventory_xmls([revision_id])
2456
1792
text, revision_id = texts.next()
2457
1793
except StopIteration:
2458
1794
raise errors.HistoryMissing(self, 'inventory', revision_id)
2461
def get_rev_id_for_revno(self, revno, known_pair):
2462
"""Return the revision id of a revno, given a later (revno, revid)
2463
pair in the same history.
2465
:return: if found (True, revid). If the available history ran out
2466
before reaching the revno, then this returns
2467
(False, (closest_revno, closest_revid)).
1798
def get_inventory_sha1(self, revision_id):
1799
"""Return the sha1 hash of the inventory entry
2469
known_revno, known_revid = known_pair
2470
partial_history = [known_revid]
2471
distance_from_known = known_revno - revno
2472
if distance_from_known < 0:
2474
'requested revno (%d) is later than given known revno (%d)'
2475
% (revno, known_revno))
2478
self, partial_history, stop_index=distance_from_known)
2479
except errors.RevisionNotPresent, err:
2480
if err.revision_id == known_revid:
2481
# The start revision (known_revid) wasn't found.
2483
# This is a stacked repository with no fallbacks, or a there's a
2484
# left-hand ghost. Either way, even though the revision named in
2485
# the error isn't in this repo, we know it's the next step in this
2486
# left-hand history.
2487
partial_history.append(err.revision_id)
2488
if len(partial_history) <= distance_from_known:
2489
# Didn't find enough history to get a revid for the revno.
2490
earliest_revno = known_revno - len(partial_history) + 1
2491
return (False, (earliest_revno, partial_history[-1]))
2492
if len(partial_history) - 1 > distance_from_known:
2493
raise AssertionError('_iter_for_revno returned too much history')
2494
return (True, partial_history[-1])
1801
return self.get_revision(revision_id).inventory_sha1
2496
1803
def iter_reverse_revision_history(self, revision_id):
2497
1804
"""Iterate backwards through revision ids in the lefthand history
3730
2977
return self.source.revision_ids_to_search_result(result_set)
3733
class InterDifferingSerializer(InterRepository):
2980
class InterPackRepo(InterSameDataRepository):
2981
"""Optimised code paths between Pack based repositories."""
2984
def _get_repo_format_to_test(self):
2985
from bzrlib.repofmt import pack_repo
2986
return pack_repo.RepositoryFormatKnitPack1()
2989
def is_compatible(source, target):
2990
"""Be compatible with known Pack formats.
2992
We don't test for the stores being of specific types because that
2993
could lead to confusing results, and there is no need to be
2996
from bzrlib.repofmt.pack_repo import RepositoryFormatPack
2998
are_packs = (isinstance(source._format, RepositoryFormatPack) and
2999
isinstance(target._format, RepositoryFormatPack))
3000
except AttributeError:
3002
return are_packs and InterRepository._same_model(source, target)
3005
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
3007
"""See InterRepository.fetch()."""
3008
if (len(self.source._fallback_repositories) > 0 or
3009
len(self.target._fallback_repositories) > 0):
3010
# The pack layer is not aware of fallback repositories, so when
3011
# fetching from a stacked repository or into a stacked repository
3012
# we use the generic fetch logic which uses the VersionedFiles
3013
# attributes on repository.
3014
from bzrlib.fetch import RepoFetcher
3015
fetcher = RepoFetcher(self.target, self.source, revision_id,
3016
pb, find_ghosts, fetch_spec=fetch_spec)
3017
if fetch_spec is not None:
3018
if len(list(fetch_spec.heads)) != 1:
3019
raise AssertionError(
3020
"InterPackRepo.fetch doesn't support "
3021
"fetching multiple heads yet.")
3022
revision_id = list(fetch_spec.heads)[0]
3024
if revision_id is None:
3026
# everything to do - use pack logic
3027
# to fetch from all packs to one without
3028
# inventory parsing etc, IFF nothing to be copied is in the target.
3030
source_revision_ids = frozenset(self.source.all_revision_ids())
3031
revision_ids = source_revision_ids - \
3032
frozenset(self.target.get_parent_map(source_revision_ids))
3033
revision_keys = [(revid,) for revid in revision_ids]
3034
index = self.target._pack_collection.revision_index.combined_index
3035
present_revision_ids = set(item[1][0] for item in
3036
index.iter_entries(revision_keys))
3037
revision_ids = set(revision_ids) - present_revision_ids
3038
# implementing the TODO will involve:
3039
# - detecting when all of a pack is selected
3040
# - avoiding as much as possible pre-selection, so the
3041
# more-core routines such as create_pack_from_packs can filter in
3042
# a just-in-time fashion. (though having a HEADS list on a
3043
# repository might make this a lot easier, because we could
3044
# sensibly detect 'new revisions' without doing a full index scan.
3045
elif _mod_revision.is_null(revision_id):
3050
revision_ids = self.search_missing_revision_ids(revision_id,
3051
find_ghosts=find_ghosts).get_keys()
3052
except errors.NoSuchRevision:
3053
raise errors.InstallFailed([revision_id])
3054
if len(revision_ids) == 0:
3056
return self._pack(self.source, self.target, revision_ids)
3058
def _pack(self, source, target, revision_ids):
3059
from bzrlib.repofmt.pack_repo import Packer
3060
packs = source._pack_collection.all_packs()
3061
pack = Packer(self.target._pack_collection, packs, '.fetch',
3062
revision_ids).pack()
3063
if pack is not None:
3064
self.target._pack_collection._save_pack_names()
3065
copied_revs = pack.get_revision_count()
3066
# Trigger an autopack. This may duplicate effort as we've just done
3067
# a pack creation, but for now it is simpler to think about as
3068
# 'upload data, then repack if needed'.
3069
self.target._pack_collection.autopack()
3070
return (copied_revs, [])
3075
def search_missing_revision_ids(self, revision_id=None, find_ghosts=True):
3076
"""See InterRepository.missing_revision_ids().
3078
:param find_ghosts: Find ghosts throughout the ancestry of
3081
if not find_ghosts and revision_id is not None:
3082
return self._walk_to_common_revisions([revision_id])
3083
elif revision_id is not None:
3084
# Find ghosts: search for revisions pointing from one repository to
3085
# the other, and vice versa, anywhere in the history of revision_id.
3086
graph = self.target.get_graph(other_repository=self.source)
3087
searcher = graph._make_breadth_first_searcher([revision_id])
3091
next_revs, ghosts = searcher.next_with_ghosts()
3092
except StopIteration:
3094
if revision_id in ghosts:
3095
raise errors.NoSuchRevision(self.source, revision_id)
3096
found_ids.update(next_revs)
3097
found_ids.update(ghosts)
3098
found_ids = frozenset(found_ids)
3099
# Double query here: should be able to avoid this by changing the
3100
# graph api further.
3101
result_set = found_ids - frozenset(
3102
self.target.get_parent_map(found_ids))
3104
source_ids = self.source.all_revision_ids()
3105
# source_ids is the worst possible case we may need to pull.
3106
# now we want to filter source_ids against what we actually
3107
# have in target, but don't try to check for existence where we know
3108
# we do not have a revision as that would be pointless.
3109
target_ids = set(self.target.all_revision_ids())
3110
result_set = set(source_ids).difference(target_ids)
3111
return self.source.revision_ids_to_search_result(result_set)
3114
class InterDifferingSerializer(InterKnitRepo):
3736
3117
def _get_repo_format_to_test(self):
3740
3121
def is_compatible(source, target):
3741
3122
"""Be compatible with Knit2 source and Knit3 target"""
3742
# This is redundant with format.check_conversion_target(), however that
3743
# raises an exception, and we just want to say "False" as in we won't
3744
# support converting between these formats.
3745
if 'IDS_never' in debug.debug_flags:
3747
if source.supports_rich_root() and not target.supports_rich_root():
3749
if (source._format.supports_tree_reference
3750
and not target._format.supports_tree_reference):
3752
if target._fallback_repositories and target._format.supports_chks:
3753
# IDS doesn't know how to copy CHKs for the parent inventories it
3754
# adds to stacked repos.
3756
if 'IDS_always' in debug.debug_flags:
3758
# Only use this code path for local source and target. IDS does far
3759
# too much IO (both bandwidth and roundtrips) over a network.
3760
if not source.bzrdir.transport.base.startswith('file:///'):
3762
if not target.bzrdir.transport.base.startswith('file:///'):
3123
if source.supports_rich_root() != target.supports_rich_root():
3125
# Ideally, we'd support fetching if the source had no tree references
3126
# even if it supported them...
3127
if (getattr(source, '_format.supports_tree_reference', False) and
3128
not getattr(target, '_format.supports_tree_reference', False)):
3766
def _get_trees(self, revision_ids, cache):
3768
for rev_id in revision_ids:
3770
possible_trees.append((rev_id, cache[rev_id]))
3772
# Not cached, but inventory might be present anyway.
3774
tree = self.source.revision_tree(rev_id)
3775
except errors.NoSuchRevision:
3776
# Nope, parent is ghost.
3779
cache[rev_id] = tree
3780
possible_trees.append((rev_id, tree))
3781
return possible_trees
3783
def _get_delta_for_revision(self, tree, parent_ids, possible_trees):
3132
def _get_delta_for_revision(self, tree, parent_ids, basis_id, cache):
3784
3133
"""Get the best delta and base for this revision.
3786
3135
:return: (basis_id, delta)
3137
possible_trees = [(parent_id, cache[parent_id])
3138
for parent_id in parent_ids
3139
if parent_id in cache]
3140
if len(possible_trees) == 0:
3141
# There either aren't any parents, or the parents aren't in the
3142
# cache, so just use the last converted tree
3143
possible_trees.append((basis_id, cache[basis_id]))
3789
# Generate deltas against each tree, to find the shortest.
3790
texts_possibly_new_in_tree = set()
3791
3145
for basis_id, basis_tree in possible_trees:
3792
3146
delta = tree.inventory._make_delta(basis_tree.inventory)
3793
for old_path, new_path, file_id, new_entry in delta:
3794
if new_path is None:
3795
# This file_id isn't present in the new rev, so we don't
3799
# Rich roots are handled elsewhere...
3801
kind = new_entry.kind
3802
if kind != 'directory' and kind != 'file':
3803
# No text record associated with this inventory entry.
3805
# This is a directory or file that has changed somehow.
3806
texts_possibly_new_in_tree.add((file_id, new_entry.revision))
3807
3147
deltas.append((len(delta), basis_id, delta))
3809
3149
return deltas[0][1:]
3811
def _fetch_parent_invs_for_stacking(self, parent_map, cache):
3812
"""Find all parent revisions that are absent, but for which the
3813
inventory is present, and copy those inventories.
3815
This is necessary to preserve correctness when the source is stacked
3816
without fallbacks configured. (Note that in cases like upgrade the
3817
source may be not have _fallback_repositories even though it is
3821
for parents in parent_map.values():
3822
parent_revs.update(parents)
3823
present_parents = self.source.get_parent_map(parent_revs)
3824
absent_parents = set(parent_revs).difference(present_parents)
3825
parent_invs_keys_for_stacking = self.source.inventories.get_parent_map(
3826
(rev_id,) for rev_id in absent_parents)
3827
parent_inv_ids = [key[-1] for key in parent_invs_keys_for_stacking]
3828
for parent_tree in self.source.revision_trees(parent_inv_ids):
3829
current_revision_id = parent_tree.get_revision_id()
3830
parents_parents_keys = parent_invs_keys_for_stacking[
3831
(current_revision_id,)]
3832
parents_parents = [key[-1] for key in parents_parents_keys]
3833
basis_id = _mod_revision.NULL_REVISION
3834
basis_tree = self.source.revision_tree(basis_id)
3835
delta = parent_tree.inventory._make_delta(basis_tree.inventory)
3836
self.target.add_inventory_by_delta(
3837
basis_id, delta, current_revision_id, parents_parents)
3838
cache[current_revision_id] = parent_tree
3840
def _fetch_batch(self, revision_ids, basis_id, cache, a_graph=None):
3151
def _fetch_batch(self, revision_ids, basis_id, cache):
3841
3152
"""Fetch across a few revisions.
3843
3154
:param revision_ids: The revisions to copy
3844
3155
:param basis_id: The revision_id of a tree that must be in cache, used
3845
3156
as a basis for delta when no other base is available
3846
3157
:param cache: A cache of RevisionTrees that we can use.
3847
:param a_graph: A Graph object to determine the heads() of the
3848
rich-root data stream.
3849
3158
:return: The revision_id of the last converted tree. The RevisionTree
3850
3159
for it will be in cache
3852
3161
# Walk though all revisions; get inventory deltas, copy referenced
3853
3162
# texts that delta references, insert the delta, revision and
3855
root_keys_to_create = set()
3856
3164
text_keys = set()
3857
3165
pending_deltas = []
3858
3166
pending_revisions = []
3859
3167
parent_map = self.source.get_parent_map(revision_ids)
3860
self._fetch_parent_invs_for_stacking(parent_map, cache)
3861
self.source._safe_to_return_from_cache = True
3862
3168
for tree in self.source.revision_trees(revision_ids):
3863
# Find a inventory delta for this revision.
3864
# Find text entries that need to be copied, too.
3865
3169
current_revision_id = tree.get_revision_id()
3866
3170
parent_ids = parent_map.get(current_revision_id, ())
3867
parent_trees = self._get_trees(parent_ids, cache)
3868
possible_trees = list(parent_trees)
3869
if len(possible_trees) == 0:
3870
# There either aren't any parents, or the parents are ghosts,
3871
# so just use the last converted tree.
3872
possible_trees.append((basis_id, cache[basis_id]))
3873
3171
basis_id, delta = self._get_delta_for_revision(tree, parent_ids,
3173
# Find text entries that need to be copied
3174
for old_path, new_path, file_id, entry in delta:
3175
if new_path is not None:
3176
if not (new_path or self.target.supports_rich_root()):
3177
# We don't copy the text for the root node unless the
3178
# target supports_rich_root.
3180
text_keys.add((file_id, entry.revision))
3875
3181
revision = self.source.get_revision(current_revision_id)
3876
3182
pending_deltas.append((basis_id, delta,
3877
3183
current_revision_id, revision.parent_ids))
3878
if self._converting_to_rich_root:
3879
self._revision_id_to_root_id[current_revision_id] = \
3881
# Determine which texts are in present in this revision but not in
3882
# any of the available parents.
3883
texts_possibly_new_in_tree = set()
3884
for old_path, new_path, file_id, entry in delta:
3885
if new_path is None:
3886
# This file_id isn't present in the new rev
3890
if not self.target.supports_rich_root():
3891
# The target doesn't support rich root, so we don't
3894
if self._converting_to_rich_root:
3895
# This can't be copied normally, we have to insert
3897
root_keys_to_create.add((file_id, entry.revision))
3900
texts_possibly_new_in_tree.add((file_id, entry.revision))
3901
for basis_id, basis_tree in possible_trees:
3902
basis_inv = basis_tree.inventory
3903
for file_key in list(texts_possibly_new_in_tree):
3904
file_id, file_revision = file_key
3906
entry = basis_inv[file_id]
3907
except errors.NoSuchId:
3909
if entry.revision == file_revision:
3910
texts_possibly_new_in_tree.remove(file_key)
3911
text_keys.update(texts_possibly_new_in_tree)
3912
3184
pending_revisions.append(revision)
3913
3185
cache[current_revision_id] = tree
3914
3186
basis_id = current_revision_id
3915
self.source._safe_to_return_from_cache = False
3916
3187
# Copy file texts
3917
3188
from_texts = self.source.texts
3918
3189
to_texts = self.target.texts
3919
if root_keys_to_create:
3920
root_stream = _mod_fetch._new_root_data_stream(
3921
root_keys_to_create, self._revision_id_to_root_id, parent_map,
3922
self.source, graph=a_graph)
3923
to_texts.insert_record_stream(root_stream)
3924
3190
to_texts.insert_record_stream(from_texts.get_record_stream(
3925
3191
text_keys, self.target._format._fetch_order,
3926
3192
not self.target._format._fetch_uses_deltas))
3927
# insert inventory deltas
3928
3194
for delta in pending_deltas:
3929
3195
self.target.add_inventory_by_delta(*delta)
3930
if self.target._fallback_repositories:
3931
# Make sure this stacked repository has all the parent inventories
3932
# for the new revisions that we are about to insert. We do this
3933
# before adding the revisions so that no revision is added until
3934
# all the inventories it may depend on are added.
3935
# Note that this is overzealous, as we may have fetched these in an
3938
revision_ids = set()
3939
for revision in pending_revisions:
3940
revision_ids.add(revision.revision_id)
3941
parent_ids.update(revision.parent_ids)
3942
parent_ids.difference_update(revision_ids)
3943
parent_ids.discard(_mod_revision.NULL_REVISION)
3944
parent_map = self.source.get_parent_map(parent_ids)
3945
# we iterate over parent_map and not parent_ids because we don't
3946
# want to try copying any revision which is a ghost
3947
for parent_tree in self.source.revision_trees(parent_map):
3948
current_revision_id = parent_tree.get_revision_id()
3949
parents_parents = parent_map[current_revision_id]
3950
possible_trees = self._get_trees(parents_parents, cache)
3951
if len(possible_trees) == 0:
3952
# There either aren't any parents, or the parents are
3953
# ghosts, so just use the last converted tree.
3954
possible_trees.append((basis_id, cache[basis_id]))
3955
basis_id, delta = self._get_delta_for_revision(parent_tree,
3956
parents_parents, possible_trees)
3957
self.target.add_inventory_by_delta(
3958
basis_id, delta, current_revision_id, parents_parents)
3959
3196
# insert signatures and revisions
3960
3197
for revision in pending_revisions:
4374
3531
# missing keys can handle suspending a write group).
4375
3532
write_group_tokens = self.target_repo.suspend_write_group()
4376
3533
return write_group_tokens, missing_keys
4377
hint = self.target_repo.commit_write_group()
4378
if (to_serializer != src_serializer and
4379
self.target_repo._format.pack_compresses):
4380
self.target_repo.pack(hint=hint)
3534
self.target_repo.commit_write_group()
4381
3535
return [], set()
4383
def _extract_and_insert_inventory_deltas(self, substream, serializer):
4384
target_rich_root = self.target_repo._format.rich_root_data
4385
target_tree_refs = self.target_repo._format.supports_tree_reference
4386
for record in substream:
4387
# Insert the delta directly
4388
inventory_delta_bytes = record.get_bytes_as('fulltext')
4389
deserialiser = inventory_delta.InventoryDeltaDeserializer()
4391
parse_result = deserialiser.parse_text_bytes(
4392
inventory_delta_bytes)
4393
except inventory_delta.IncompatibleInventoryDelta, err:
4394
trace.mutter("Incompatible delta: %s", err.msg)
4395
raise errors.IncompatibleRevision(self.target_repo._format)
4396
basis_id, new_id, rich_root, tree_refs, inv_delta = parse_result
4397
revision_id = new_id
4398
parents = [key[0] for key in record.parents]
4399
self.target_repo.add_inventory_by_delta(
4400
basis_id, inv_delta, revision_id, parents)
4402
def _extract_and_insert_inventories(self, substream, serializer,
3537
def _extract_and_insert_inventories(self, substream, serializer):
4404
3538
"""Generate a new inventory versionedfile in target, converting data.
4406
3540
The inventory is retrieved from the source, (deserializing it), and
4407
3541
stored in the target (reserializing it in a different format).
4409
target_rich_root = self.target_repo._format.rich_root_data
4410
target_tree_refs = self.target_repo._format.supports_tree_reference
4411
3543
for record in substream:
4412
# It's not a delta, so it must be a fulltext in the source
4413
# serializer's format.
4414
3544
bytes = record.get_bytes_as('fulltext')
4415
3545
revision_id = record.key[0]
4416
3546
inv = serializer.read_inventory_from_string(bytes, revision_id)
4417
3547
parents = [key[0] for key in record.parents]
4418
3548
self.target_repo.add_inventory(revision_id, inv, parents)
4419
# No need to keep holding this full inv in memory when the rest of
4420
# the substream is likely to be all deltas.
4423
3550
def _extract_and_insert_revisions(self, substream, serializer):
4424
3551
for record in substream:
4587
3699
return (not self.from_repository._format.rich_root_data and
4588
3700
self.to_format.rich_root_data)
4590
def _get_inventory_stream(self, revision_ids, missing=False):
4591
from_format = self.from_repository._format
4592
if (from_format.supports_chks and self.to_format.supports_chks and
4593
from_format.network_name() == self.to_format.network_name()):
4594
raise AssertionError(
4595
"this case should be handled by GroupCHKStreamSource")
4596
elif 'forceinvdeltas' in debug.debug_flags:
4597
return self._get_convertable_inventory_stream(revision_ids,
4598
delta_versus_null=missing)
4599
elif from_format.network_name() == self.to_format.network_name():
4601
return self._get_simple_inventory_stream(revision_ids,
4603
elif (not from_format.supports_chks and not self.to_format.supports_chks
4604
and from_format._serializer == self.to_format._serializer):
4605
# Essentially the same format.
4606
return self._get_simple_inventory_stream(revision_ids,
4609
# Any time we switch serializations, we want to use an
4610
# inventory-delta based approach.
4611
return self._get_convertable_inventory_stream(revision_ids,
4612
delta_versus_null=missing)
4614
def _get_simple_inventory_stream(self, revision_ids, missing=False):
4615
# NB: This currently reopens the inventory weave in source;
4616
# using a single stream interface instead would avoid this.
4617
from_weave = self.from_repository.inventories
4619
delta_closure = True
4621
delta_closure = not self.delta_on_metadata()
4622
yield ('inventories', from_weave.get_record_stream(
4623
[(rev_id,) for rev_id in revision_ids],
4624
self.inventory_fetch_order(), delta_closure))
4626
def _get_convertable_inventory_stream(self, revision_ids,
4627
delta_versus_null=False):
4628
# The two formats are sufficiently different that there is no fast
4629
# path, so we need to send just inventorydeltas, which any
4630
# sufficiently modern client can insert into any repository.
4631
# The StreamSink code expects to be able to
4632
# convert on the target, so we need to put bytes-on-the-wire that can
4633
# be converted. That means inventory deltas (if the remote is <1.19,
4634
# RemoteStreamSink will fallback to VFS to insert the deltas).
4635
yield ('inventory-deltas',
4636
self._stream_invs_as_deltas(revision_ids,
4637
delta_versus_null=delta_versus_null))
4639
def _stream_invs_as_deltas(self, revision_ids, delta_versus_null=False):
4640
"""Return a stream of inventory-deltas for the given rev ids.
4642
:param revision_ids: The list of inventories to transmit
4643
:param delta_versus_null: Don't try to find a minimal delta for this
4644
entry, instead compute the delta versus the NULL_REVISION. This
4645
effectively streams a complete inventory. Used for stuff like
4646
filling in missing parents, etc.
4648
from_repo = self.from_repository
4649
revision_keys = [(rev_id,) for rev_id in revision_ids]
4650
parent_map = from_repo.inventories.get_parent_map(revision_keys)
4651
# XXX: possibly repos could implement a more efficient iter_inv_deltas
4653
inventories = self.from_repository.iter_inventories(
4654
revision_ids, 'topological')
4655
format = from_repo._format
4656
invs_sent_so_far = set([_mod_revision.NULL_REVISION])
4657
inventory_cache = lru_cache.LRUCache(50)
4658
null_inventory = from_repo.revision_tree(
4659
_mod_revision.NULL_REVISION).inventory
4660
# XXX: ideally the rich-root/tree-refs flags would be per-revision, not
4661
# per-repo (e.g. streaming a non-rich-root revision out of a rich-root
4662
# repo back into a non-rich-root repo ought to be allowed)
4663
serializer = inventory_delta.InventoryDeltaSerializer(
4664
versioned_root=format.rich_root_data,
4665
tree_references=format.supports_tree_reference)
4666
for inv in inventories:
4667
key = (inv.revision_id,)
4668
parent_keys = parent_map.get(key, ())
4670
if not delta_versus_null and parent_keys:
4671
# The caller did not ask for complete inventories and we have
4672
# some parents that we can delta against. Make a delta against
4673
# each parent so that we can find the smallest.
4674
parent_ids = [parent_key[0] for parent_key in parent_keys]
4675
for parent_id in parent_ids:
4676
if parent_id not in invs_sent_so_far:
4677
# We don't know that the remote side has this basis, so
4680
if parent_id == _mod_revision.NULL_REVISION:
4681
parent_inv = null_inventory
4683
parent_inv = inventory_cache.get(parent_id, None)
4684
if parent_inv is None:
4685
parent_inv = from_repo.get_inventory(parent_id)
4686
candidate_delta = inv._make_delta(parent_inv)
4687
if (delta is None or
4688
len(delta) > len(candidate_delta)):
4689
delta = candidate_delta
4690
basis_id = parent_id
4692
# Either none of the parents ended up being suitable, or we
4693
# were asked to delta against NULL
4694
basis_id = _mod_revision.NULL_REVISION
4695
delta = inv._make_delta(null_inventory)
4696
invs_sent_so_far.add(inv.revision_id)
4697
inventory_cache[inv.revision_id] = inv
4698
delta_serialized = ''.join(
4699
serializer.delta_to_lines(basis_id, key[-1], delta))
4700
yield versionedfile.FulltextContentFactory(
4701
key, parent_keys, None, delta_serialized)
4704
def _iter_for_revno(repo, partial_history_cache, stop_index=None,
4705
stop_revision=None):
4706
"""Extend the partial history to include a given index
4708
If a stop_index is supplied, stop when that index has been reached.
4709
If a stop_revision is supplied, stop when that revision is
4710
encountered. Otherwise, stop when the beginning of history is
4713
:param stop_index: The index which should be present. When it is
4714
present, history extension will stop.
4715
:param stop_revision: The revision id which should be present. When
4716
it is encountered, history extension will stop.
4718
start_revision = partial_history_cache[-1]
4719
iterator = repo.iter_reverse_revision_history(start_revision)
4721
#skip the last revision in the list
4724
if (stop_index is not None and
4725
len(partial_history_cache) > stop_index):
4727
if partial_history_cache[-1] == stop_revision:
4729
revision_id = iterator.next()
4730
partial_history_cache.append(revision_id)
4731
except StopIteration:
added
removed
bzrlib/repository.py
