13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
from cStringIO import StringIO
17
19
from bzrlib.lazy_import import lazy_import
18
20
lazy_import(globals(), """
23
25
from bzrlib import (
42
37
revision as _mod_revision,
49
from bzrlib.bundle import serializer
50
42
from bzrlib.revisiontree import RevisionTree
51
43
from bzrlib.store.versioned import VersionedFileStore
44
from bzrlib.store.text import TextStore
52
45
from bzrlib.testament import Testament
55
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
49
from bzrlib.decorators import needs_read_lock, needs_write_lock
56
50
from bzrlib.inter import InterObject
57
from bzrlib.inventory import (
63
from bzrlib.lock import _RelockDebugMixin
64
from bzrlib import registry
65
from bzrlib.trace import (
66
log_exception_quietly, note, mutter, mutter_callsite, warning)
51
from bzrlib.inventory import Inventory, InventoryDirectory, ROOT_ID
52
from bzrlib.symbol_versioning import (
56
from bzrlib.trace import mutter, note, warning
69
59
# Old formats display a warning, but only once
70
60
_deprecation_warning_done = False
73
class CommitBuilder(object):
74
"""Provides an interface to build up a commit.
76
This allows describing a tree to be committed without needing to
77
know the internals of the format of the repository.
80
# all clients should supply tree roots.
81
record_root_entry = True
82
# the default CommitBuilder does not manage trees whose root is versioned.
83
_versioned_root = False
85
def __init__(self, repository, parents, config, timestamp=None,
86
timezone=None, committer=None, revprops=None,
88
"""Initiate a CommitBuilder.
90
:param repository: Repository to commit to.
91
:param parents: Revision ids of the parents of the new revision.
92
:param config: Configuration to use.
93
:param timestamp: Optional timestamp recorded for commit.
94
:param timezone: Optional timezone for timestamp.
95
:param committer: Optional committer to set for commit.
96
:param revprops: Optional dictionary of revision properties.
97
:param revision_id: Optional revision id.
101
if committer is None:
102
self._committer = self._config.username()
104
self._committer = committer
106
self.new_inventory = Inventory(None)
107
self._new_revision_id = revision_id
108
self.parents = parents
109
self.repository = repository
112
if revprops is not None:
113
self._validate_revprops(revprops)
114
self._revprops.update(revprops)
116
if timestamp is None:
117
timestamp = time.time()
118
# Restrict resolution to 1ms
119
self._timestamp = round(timestamp, 3)
122
self._timezone = osutils.local_time_offset()
124
self._timezone = int(timezone)
126
self._generate_revision_if_needed()
127
self.__heads = graph.HeadsCache(repository.get_graph()).heads
128
self._basis_delta = []
129
# API compatibility, older code that used CommitBuilder did not call
130
# .record_delete(), which means the delta that is computed would not be
131
# valid. Callers that will call record_delete() should call
132
# .will_record_deletes() to indicate that.
133
self._recording_deletes = False
134
# memo'd check for no-op commits.
135
self._any_changes = False
137
def any_changes(self):
138
"""Return True if any entries were changed.
140
This includes merge-only changes. It is the core for the --unchanged
143
:return: True if any changes have occured.
145
return self._any_changes
147
def _validate_unicode_text(self, text, context):
148
"""Verify things like commit messages don't have bogus characters."""
150
raise ValueError('Invalid value for %s: %r' % (context, text))
152
def _validate_revprops(self, revprops):
153
for key, value in revprops.iteritems():
154
# We know that the XML serializers do not round trip '\r'
155
# correctly, so refuse to accept them
156
if not isinstance(value, basestring):
157
raise ValueError('revision property (%s) is not a valid'
158
' (unicode) string: %r' % (key, value))
159
self._validate_unicode_text(value,
160
'revision property (%s)' % (key,))
162
def commit(self, message):
163
"""Make the actual commit.
165
:return: The revision id of the recorded revision.
167
self._validate_unicode_text(message, 'commit message')
168
rev = _mod_revision.Revision(
169
timestamp=self._timestamp,
170
timezone=self._timezone,
171
committer=self._committer,
173
inventory_sha1=self.inv_sha1,
174
revision_id=self._new_revision_id,
175
properties=self._revprops)
176
rev.parent_ids = self.parents
177
self.repository.add_revision(self._new_revision_id, rev,
178
self.new_inventory, self._config)
179
self.repository.commit_write_group()
180
return self._new_revision_id
183
"""Abort the commit that is being built.
185
self.repository.abort_write_group()
187
def revision_tree(self):
188
"""Return the tree that was just committed.
190
After calling commit() this can be called to get a RevisionTree
191
representing the newly committed tree. This is preferred to
192
calling Repository.revision_tree() because that may require
193
deserializing the inventory, while we already have a copy in
196
if self.new_inventory is None:
197
self.new_inventory = self.repository.get_inventory(
198
self._new_revision_id)
199
return RevisionTree(self.repository, self.new_inventory,
200
self._new_revision_id)
202
def finish_inventory(self):
203
"""Tell the builder that the inventory is finished.
205
:return: The inventory id in the repository, which can be used with
206
repository.get_inventory.
208
if self.new_inventory is None:
209
# an inventory delta was accumulated without creating a new
211
basis_id = self.basis_delta_revision
212
# We ignore the 'inventory' returned by add_inventory_by_delta
213
# because self.new_inventory is used to hint to the rest of the
214
# system what code path was taken
215
self.inv_sha1, _ = self.repository.add_inventory_by_delta(
216
basis_id, self._basis_delta, self._new_revision_id,
219
if self.new_inventory.root is None:
220
raise AssertionError('Root entry should be supplied to'
221
' record_entry_contents, as of bzr 0.10.')
222
self.new_inventory.add(InventoryDirectory(ROOT_ID, '', None))
223
self.new_inventory.revision_id = self._new_revision_id
224
self.inv_sha1 = self.repository.add_inventory(
225
self._new_revision_id,
229
return self._new_revision_id
231
def _gen_revision_id(self):
232
"""Return new revision-id."""
233
return generate_ids.gen_revision_id(self._config.username(),
236
def _generate_revision_if_needed(self):
237
"""Create a revision id if None was supplied.
239
If the repository can not support user-specified revision ids
240
they should override this function and raise CannotSetRevisionId
241
if _new_revision_id is not None.
243
:raises: CannotSetRevisionId
245
if self._new_revision_id is None:
246
self._new_revision_id = self._gen_revision_id()
247
self.random_revid = True
249
self.random_revid = False
251
def _heads(self, file_id, revision_ids):
252
"""Calculate the graph heads for revision_ids in the graph of file_id.
254
This can use either a per-file graph or a global revision graph as we
255
have an identity relationship between the two graphs.
257
return self.__heads(revision_ids)
259
def _check_root(self, ie, parent_invs, tree):
260
"""Helper for record_entry_contents.
262
:param ie: An entry being added.
263
:param parent_invs: The inventories of the parent revisions of the
265
:param tree: The tree that is being committed.
267
# In this revision format, root entries have no knit or weave When
268
# serializing out to disk and back in root.revision is always
270
ie.revision = self._new_revision_id
272
def _require_root_change(self, tree):
273
"""Enforce an appropriate root object change.
275
This is called once when record_iter_changes is called, if and only if
276
the root was not in the delta calculated by record_iter_changes.
278
:param tree: The tree which is being committed.
280
# NB: if there are no parents then this method is not called, so no
281
# need to guard on parents having length.
282
entry = entry_factory['directory'](tree.path2id(''), '',
284
entry.revision = self._new_revision_id
285
self._basis_delta.append(('', '', entry.file_id, entry))
287
def _get_delta(self, ie, basis_inv, path):
288
"""Get a delta against the basis inventory for ie."""
289
if ie.file_id not in basis_inv:
291
result = (None, path, ie.file_id, ie)
292
self._basis_delta.append(result)
294
elif ie != basis_inv[ie.file_id]:
296
# TODO: avoid tis id2path call.
297
result = (basis_inv.id2path(ie.file_id), path, ie.file_id, ie)
298
self._basis_delta.append(result)
304
def get_basis_delta(self):
305
"""Return the complete inventory delta versus the basis inventory.
307
This has been built up with the calls to record_delete and
308
record_entry_contents. The client must have already called
309
will_record_deletes() to indicate that they will be generating a
312
:return: An inventory delta, suitable for use with apply_delta, or
313
Repository.add_inventory_by_delta, etc.
315
if not self._recording_deletes:
316
raise AssertionError("recording deletes not activated.")
317
return self._basis_delta
319
def record_delete(self, path, file_id):
320
"""Record that a delete occured against a basis tree.
322
This is an optional API - when used it adds items to the basis_delta
323
being accumulated by the commit builder. It cannot be called unless the
324
method will_record_deletes() has been called to inform the builder that
325
a delta is being supplied.
327
:param path: The path of the thing deleted.
328
:param file_id: The file id that was deleted.
330
if not self._recording_deletes:
331
raise AssertionError("recording deletes not activated.")
332
delta = (path, None, file_id, None)
333
self._basis_delta.append(delta)
334
self._any_changes = True
337
def will_record_deletes(self):
338
"""Tell the commit builder that deletes are being notified.
340
This enables the accumulation of an inventory delta; for the resulting
341
commit to be valid, deletes against the basis MUST be recorded via
342
builder.record_delete().
344
self._recording_deletes = True
346
basis_id = self.parents[0]
348
basis_id = _mod_revision.NULL_REVISION
349
self.basis_delta_revision = basis_id
351
def record_entry_contents(self, ie, parent_invs, path, tree,
353
"""Record the content of ie from tree into the commit if needed.
355
Side effect: sets ie.revision when unchanged
357
:param ie: An inventory entry present in the commit.
358
:param parent_invs: The inventories of the parent revisions of the
360
:param path: The path the entry is at in the tree.
361
:param tree: The tree which contains this entry and should be used to
363
:param content_summary: Summary data from the tree about the paths
364
content - stat, length, exec, sha/link target. This is only
365
accessed when the entry has a revision of None - that is when it is
366
a candidate to commit.
367
:return: A tuple (change_delta, version_recorded, fs_hash).
368
change_delta is an inventory_delta change for this entry against
369
the basis tree of the commit, or None if no change occured against
371
version_recorded is True if a new version of the entry has been
372
recorded. For instance, committing a merge where a file was only
373
changed on the other side will return (delta, False).
374
fs_hash is either None, or the hash details for the path (currently
375
a tuple of the contents sha1 and the statvalue returned by
376
tree.get_file_with_stat()).
378
if self.new_inventory.root is None:
379
if ie.parent_id is not None:
380
raise errors.RootMissing()
381
self._check_root(ie, parent_invs, tree)
382
if ie.revision is None:
383
kind = content_summary[0]
385
# ie is carried over from a prior commit
387
# XXX: repository specific check for nested tree support goes here - if
388
# the repo doesn't want nested trees we skip it ?
389
if (kind == 'tree-reference' and
390
not self.repository._format.supports_tree_reference):
391
# mismatch between commit builder logic and repository:
392
# this needs the entry creation pushed down into the builder.
393
raise NotImplementedError('Missing repository subtree support.')
394
self.new_inventory.add(ie)
396
# TODO: slow, take it out of the inner loop.
398
basis_inv = parent_invs[0]
400
basis_inv = Inventory(root_id=None)
402
# ie.revision is always None if the InventoryEntry is considered
403
# for committing. We may record the previous parents revision if the
404
# content is actually unchanged against a sole head.
405
if ie.revision is not None:
406
if not self._versioned_root and path == '':
407
# repositories that do not version the root set the root's
408
# revision to the new commit even when no change occurs (more
409
# specifically, they do not record a revision on the root; and
410
# the rev id is assigned to the root during deserialisation -
411
# this masks when a change may have occurred against the basis.
412
# To match this we always issue a delta, because the revision
413
# of the root will always be changing.
414
if ie.file_id in basis_inv:
415
delta = (basis_inv.id2path(ie.file_id), path,
419
delta = (None, path, ie.file_id, ie)
420
self._basis_delta.append(delta)
421
return delta, False, None
423
# we don't need to commit this, because the caller already
424
# determined that an existing revision of this file is
425
# appropriate. If its not being considered for committing then
426
# it and all its parents to the root must be unaltered so
427
# no-change against the basis.
428
if ie.revision == self._new_revision_id:
429
raise AssertionError("Impossible situation, a skipped "
430
"inventory entry (%r) claims to be modified in this "
431
"commit (%r).", (ie, self._new_revision_id))
432
return None, False, None
433
# XXX: Friction: parent_candidates should return a list not a dict
434
# so that we don't have to walk the inventories again.
435
parent_candiate_entries = ie.parent_candidates(parent_invs)
436
head_set = self._heads(ie.file_id, parent_candiate_entries.keys())
438
for inv in parent_invs:
439
if ie.file_id in inv:
440
old_rev = inv[ie.file_id].revision
441
if old_rev in head_set:
442
heads.append(inv[ie.file_id].revision)
443
head_set.remove(inv[ie.file_id].revision)
446
# now we check to see if we need to write a new record to the
448
# We write a new entry unless there is one head to the ancestors, and
449
# the kind-derived content is unchanged.
451
# Cheapest check first: no ancestors, or more the one head in the
452
# ancestors, we write a new node.
456
# There is a single head, look it up for comparison
457
parent_entry = parent_candiate_entries[heads[0]]
458
# if the non-content specific data has changed, we'll be writing a
460
if (parent_entry.parent_id != ie.parent_id or
461
parent_entry.name != ie.name):
463
# now we need to do content specific checks:
465
# if the kind changed the content obviously has
466
if kind != parent_entry.kind:
468
# Stat cache fingerprint feedback for the caller - None as we usually
469
# don't generate one.
472
if content_summary[2] is None:
473
raise ValueError("Files must not have executable = None")
475
# We can't trust a check of the file length because of content
477
if (# if the exec bit has changed we have to store:
478
parent_entry.executable != content_summary[2]):
480
elif parent_entry.text_sha1 == content_summary[3]:
481
# all meta and content is unchanged (using a hash cache
482
# hit to check the sha)
483
ie.revision = parent_entry.revision
484
ie.text_size = parent_entry.text_size
485
ie.text_sha1 = parent_entry.text_sha1
486
ie.executable = parent_entry.executable
487
return self._get_delta(ie, basis_inv, path), False, None
489
# Either there is only a hash change(no hash cache entry,
490
# or same size content change), or there is no change on
492
# Provide the parent's hash to the store layer, so that the
493
# content is unchanged we will not store a new node.
494
nostore_sha = parent_entry.text_sha1
496
# We want to record a new node regardless of the presence or
497
# absence of a content change in the file.
499
ie.executable = content_summary[2]
500
file_obj, stat_value = tree.get_file_with_stat(ie.file_id, path)
502
text = file_obj.read()
506
ie.text_sha1, ie.text_size = self._add_text_to_weave(
507
ie.file_id, text, heads, nostore_sha)
508
# Let the caller know we generated a stat fingerprint.
509
fingerprint = (ie.text_sha1, stat_value)
510
except errors.ExistingContent:
511
# Turns out that the file content was unchanged, and we were
512
# only going to store a new node if it was changed. Carry over
514
ie.revision = parent_entry.revision
515
ie.text_size = parent_entry.text_size
516
ie.text_sha1 = parent_entry.text_sha1
517
ie.executable = parent_entry.executable
518
return self._get_delta(ie, basis_inv, path), False, None
519
elif kind == 'directory':
521
# all data is meta here, nothing specific to directory, so
523
ie.revision = parent_entry.revision
524
return self._get_delta(ie, basis_inv, path), False, None
525
self._add_text_to_weave(ie.file_id, '', heads, None)
526
elif kind == 'symlink':
527
current_link_target = content_summary[3]
529
# symlink target is not generic metadata, check if it has
531
if current_link_target != parent_entry.symlink_target:
534
# unchanged, carry over.
535
ie.revision = parent_entry.revision
536
ie.symlink_target = parent_entry.symlink_target
537
return self._get_delta(ie, basis_inv, path), False, None
538
ie.symlink_target = current_link_target
539
self._add_text_to_weave(ie.file_id, '', heads, None)
540
elif kind == 'tree-reference':
542
if content_summary[3] != parent_entry.reference_revision:
545
# unchanged, carry over.
546
ie.reference_revision = parent_entry.reference_revision
547
ie.revision = parent_entry.revision
548
return self._get_delta(ie, basis_inv, path), False, None
549
ie.reference_revision = content_summary[3]
550
if ie.reference_revision is None:
551
raise AssertionError("invalid content_summary for nested tree: %r"
552
% (content_summary,))
553
self._add_text_to_weave(ie.file_id, '', heads, None)
555
raise NotImplementedError('unknown kind')
556
ie.revision = self._new_revision_id
557
self._any_changes = True
558
return self._get_delta(ie, basis_inv, path), True, fingerprint
560
def record_iter_changes(self, tree, basis_revision_id, iter_changes,
561
_entry_factory=entry_factory):
562
"""Record a new tree via iter_changes.
564
:param tree: The tree to obtain text contents from for changed objects.
565
:param basis_revision_id: The revision id of the tree the iter_changes
566
has been generated against. Currently assumed to be the same
567
as self.parents[0] - if it is not, errors may occur.
568
:param iter_changes: An iter_changes iterator with the changes to apply
569
to basis_revision_id. The iterator must not include any items with
570
a current kind of None - missing items must be either filtered out
571
or errored-on beefore record_iter_changes sees the item.
572
:param _entry_factory: Private method to bind entry_factory locally for
574
:return: A generator of (file_id, relpath, fs_hash) tuples for use with
577
# Create an inventory delta based on deltas between all the parents and
578
# deltas between all the parent inventories. We use inventory delta's
579
# between the inventory objects because iter_changes masks
580
# last-changed-field only changes.
582
# file_id -> change map, change is fileid, paths, changed, versioneds,
583
# parents, names, kinds, executables
585
# {file_id -> revision_id -> inventory entry, for entries in parent
586
# trees that are not parents[0]
590
revtrees = list(self.repository.revision_trees(self.parents))
591
except errors.NoSuchRevision:
592
# one or more ghosts, slow path.
594
for revision_id in self.parents:
596
revtrees.append(self.repository.revision_tree(revision_id))
597
except errors.NoSuchRevision:
599
basis_revision_id = _mod_revision.NULL_REVISION
601
revtrees.append(self.repository.revision_tree(
602
_mod_revision.NULL_REVISION))
603
# The basis inventory from a repository
605
basis_inv = revtrees[0].inventory
607
basis_inv = self.repository.revision_tree(
608
_mod_revision.NULL_REVISION).inventory
609
if len(self.parents) > 0:
610
if basis_revision_id != self.parents[0] and not ghost_basis:
612
"arbitrary basis parents not yet supported with merges")
613
for revtree in revtrees[1:]:
614
for change in revtree.inventory._make_delta(basis_inv):
615
if change[1] is None:
616
# Not present in this parent.
618
if change[2] not in merged_ids:
619
if change[0] is not None:
620
basis_entry = basis_inv[change[2]]
621
merged_ids[change[2]] = [
623
basis_entry.revision,
626
parent_entries[change[2]] = {
628
basis_entry.revision:basis_entry,
630
change[3].revision:change[3],
633
merged_ids[change[2]] = [change[3].revision]
634
parent_entries[change[2]] = {change[3].revision:change[3]}
636
merged_ids[change[2]].append(change[3].revision)
637
parent_entries[change[2]][change[3].revision] = change[3]
640
# Setup the changes from the tree:
641
# changes maps file_id -> (change, [parent revision_ids])
643
for change in iter_changes:
644
# This probably looks up in basis_inv way to much.
645
if change[1][0] is not None:
646
head_candidate = [basis_inv[change[0]].revision]
649
changes[change[0]] = change, merged_ids.get(change[0],
651
unchanged_merged = set(merged_ids) - set(changes)
652
# Extend the changes dict with synthetic changes to record merges of
654
for file_id in unchanged_merged:
655
# Record a merged version of these items that did not change vs the
656
# basis. This can be either identical parallel changes, or a revert
657
# of a specific file after a merge. The recorded content will be
658
# that of the current tree (which is the same as the basis), but
659
# the per-file graph will reflect a merge.
660
# NB:XXX: We are reconstructing path information we had, this
661
# should be preserved instead.
662
# inv delta change: (file_id, (path_in_source, path_in_target),
663
# changed_content, versioned, parent, name, kind,
666
basis_entry = basis_inv[file_id]
667
except errors.NoSuchId:
668
# a change from basis->some_parents but file_id isn't in basis
669
# so was new in the merge, which means it must have changed
670
# from basis -> current, and as it hasn't the add was reverted
671
# by the user. So we discard this change.
675
(basis_inv.id2path(file_id), tree.id2path(file_id)),
677
(basis_entry.parent_id, basis_entry.parent_id),
678
(basis_entry.name, basis_entry.name),
679
(basis_entry.kind, basis_entry.kind),
680
(basis_entry.executable, basis_entry.executable))
681
changes[file_id] = (change, merged_ids[file_id])
682
# changes contains tuples with the change and a set of inventory
683
# candidates for the file.
685
# old_path, new_path, file_id, new_inventory_entry
686
seen_root = False # Is the root in the basis delta?
687
inv_delta = self._basis_delta
688
modified_rev = self._new_revision_id
689
for change, head_candidates in changes.values():
690
if change[3][1]: # versioned in target.
691
# Several things may be happening here:
692
# We may have a fork in the per-file graph
693
# - record a change with the content from tree
694
# We may have a change against < all trees
695
# - carry over the tree that hasn't changed
696
# We may have a change against all trees
697
# - record the change with the content from tree
700
entry = _entry_factory[kind](file_id, change[5][1],
702
head_set = self._heads(change[0], set(head_candidates))
705
for head_candidate in head_candidates:
706
if head_candidate in head_set:
707
heads.append(head_candidate)
708
head_set.remove(head_candidate)
711
# Could be a carry-over situation:
712
parent_entry_revs = parent_entries.get(file_id, None)
713
if parent_entry_revs:
714
parent_entry = parent_entry_revs.get(heads[0], None)
717
if parent_entry is None:
718
# The parent iter_changes was called against is the one
719
# that is the per-file head, so any change is relevant
720
# iter_changes is valid.
721
carry_over_possible = False
723
# could be a carry over situation
724
# A change against the basis may just indicate a merge,
725
# we need to check the content against the source of the
726
# merge to determine if it was changed after the merge
728
if (parent_entry.kind != entry.kind or
729
parent_entry.parent_id != entry.parent_id or
730
parent_entry.name != entry.name):
731
# Metadata common to all entries has changed
732
# against per-file parent
733
carry_over_possible = False
735
carry_over_possible = True
736
# per-type checks for changes against the parent_entry
739
# Cannot be a carry-over situation
740
carry_over_possible = False
741
# Populate the entry in the delta
743
# XXX: There is still a small race here: If someone reverts the content of a file
744
# after iter_changes examines and decides it has changed,
745
# we will unconditionally record a new version even if some
746
# other process reverts it while commit is running (with
747
# the revert happening after iter_changes did it's
750
entry.executable = True
752
entry.executable = False
753
if (carry_over_possible and
754
parent_entry.executable == entry.executable):
755
# Check the file length, content hash after reading
757
nostore_sha = parent_entry.text_sha1
760
file_obj, stat_value = tree.get_file_with_stat(file_id, change[1][1])
762
text = file_obj.read()
766
entry.text_sha1, entry.text_size = self._add_text_to_weave(
767
file_id, text, heads, nostore_sha)
768
yield file_id, change[1][1], (entry.text_sha1, stat_value)
769
except errors.ExistingContent:
770
# No content change against a carry_over parent
771
# Perhaps this should also yield a fs hash update?
773
entry.text_size = parent_entry.text_size
774
entry.text_sha1 = parent_entry.text_sha1
775
elif kind == 'symlink':
777
entry.symlink_target = tree.get_symlink_target(file_id)
778
if (carry_over_possible and
779
parent_entry.symlink_target == entry.symlink_target):
782
self._add_text_to_weave(change[0], '', heads, None)
783
elif kind == 'directory':
784
if carry_over_possible:
787
# Nothing to set on the entry.
788
# XXX: split into the Root and nonRoot versions.
789
if change[1][1] != '' or self.repository.supports_rich_root():
790
self._add_text_to_weave(change[0], '', heads, None)
791
elif kind == 'tree-reference':
792
if not self.repository._format.supports_tree_reference:
793
# This isn't quite sane as an error, but we shouldn't
794
# ever see this code path in practice: tree's don't
795
# permit references when the repo doesn't support tree
797
raise errors.UnsupportedOperation(tree.add_reference,
799
reference_revision = tree.get_reference_revision(change[0])
800
entry.reference_revision = reference_revision
801
if (carry_over_possible and
802
parent_entry.reference_revision == reference_revision):
805
self._add_text_to_weave(change[0], '', heads, None)
807
raise AssertionError('unknown kind %r' % kind)
809
entry.revision = modified_rev
811
entry.revision = parent_entry.revision
814
new_path = change[1][1]
815
inv_delta.append((change[1][0], new_path, change[0], entry))
818
self.new_inventory = None
820
# This should perhaps be guarded by a check that the basis we
821
# commit against is the basis for the commit and if not do a delta
823
self._any_changes = True
825
# housekeeping root entry changes do not affect no-change commits.
826
self._require_root_change(tree)
827
self.basis_delta_revision = basis_revision_id
829
def _add_text_to_weave(self, file_id, new_text, parents, nostore_sha):
830
parent_keys = tuple([(file_id, parent) for parent in parents])
831
return self.repository.texts._add_text(
832
(file_id, self._new_revision_id), parent_keys, new_text,
833
nostore_sha=nostore_sha, random_id=self.random_revid)[0:2]
836
class RootCommitBuilder(CommitBuilder):
837
"""This commitbuilder actually records the root id"""
839
# the root entry gets versioned properly by this builder.
840
_versioned_root = True
842
def _check_root(self, ie, parent_invs, tree):
843
"""Helper for record_entry_contents.
845
:param ie: An entry being added.
846
:param parent_invs: The inventories of the parent revisions of the
848
:param tree: The tree that is being committed.
851
def _require_root_change(self, tree):
852
"""Enforce an appropriate root object change.
854
This is called once when record_iter_changes is called, if and only if
855
the root was not in the delta calculated by record_iter_changes.
857
:param tree: The tree which is being committed.
859
# versioned roots do not change unless the tree found a change.
862
63
######################################################################
866
class Repository(_RelockDebugMixin):
66
class Repository(object):
867
67
"""Repository holding history for one or more branches.
869
69
The repository holds and retrieves historical information including
870
70
revisions and file history. It's normally accessed only by the Branch,
871
71
which views a particular line of development through that history.
873
The Repository builds on top of some byte storage facilies (the revisions,
874
signatures, inventories, texts and chk_bytes attributes) and a Transport,
875
which respectively provide byte storage and a means to access the (possibly
73
The Repository builds on top of Stores and a Transport, which respectively
74
describe the disk data format and the way of accessing the (possibly
878
The byte storage facilities are addressed via tuples, which we refer to
879
as 'keys' throughout the code base. Revision_keys, inventory_keys and
880
signature_keys are all 1-tuples: (revision_id,). text_keys are two-tuples:
881
(file_id, revision_id). chk_bytes uses CHK keys - a 1-tuple with a single
882
byte string made up of a hash identifier and a hash value.
883
We use this interface because it allows low friction with the underlying
884
code that implements disk indices, network encoding and other parts of
887
:ivar revisions: A bzrlib.versionedfile.VersionedFiles instance containing
888
the serialised revisions for the repository. This can be used to obtain
889
revision graph information or to access raw serialised revisions.
890
The result of trying to insert data into the repository via this store
891
is undefined: it should be considered read-only except for implementors
893
:ivar signatures: A bzrlib.versionedfile.VersionedFiles instance containing
894
the serialised signatures for the repository. This can be used to
895
obtain access to raw serialised signatures. The result of trying to
896
insert data into the repository via this store is undefined: it should
897
be considered read-only except for implementors of repositories.
898
:ivar inventories: A bzrlib.versionedfile.VersionedFiles instance containing
899
the serialised inventories for the repository. This can be used to
900
obtain unserialised inventories. The result of trying to insert data
901
into the repository via this store is undefined: it should be
902
considered read-only except for implementors of repositories.
903
:ivar texts: A bzrlib.versionedfile.VersionedFiles instance containing the
904
texts of files and directories for the repository. This can be used to
905
obtain file texts or file graphs. Note that Repository.iter_file_bytes
906
is usually a better interface for accessing file texts.
907
The result of trying to insert data into the repository via this store
908
is undefined: it should be considered read-only except for implementors
910
:ivar chk_bytes: A bzrlib.versionedfile.VersionedFiles instance containing
911
any data the repository chooses to store or have indexed by its hash.
912
The result of trying to insert data into the repository via this store
913
is undefined: it should be considered read-only except for implementors
915
:ivar _transport: Transport for file access to repository, typically
916
pointing to .bzr/repository.
919
# What class to use for a CommitBuilder. Often its simpler to change this
920
# in a Repository class subclass rather than to override
921
# get_commit_builder.
922
_commit_builder_class = CommitBuilder
923
# The search regex used by xml based repositories to determine what things
924
# where changed in a single commit.
925
78
_file_ids_altered_regex = lazy_regex.lazy_compile(
926
79
r'file_id="(?P<file_id>[^"]+)"'
927
r'.* revision="(?P<revision_id>[^"]+)"'
80
r'.*revision="(?P<revision_id>[^"]+)"'
930
def abort_write_group(self, suppress_errors=False):
931
"""Commit the contents accrued within the current write group.
933
:param suppress_errors: if true, abort_write_group will catch and log
934
unexpected errors that happen during the abort, rather than
935
allowing them to propagate. Defaults to False.
937
:seealso: start_write_group.
939
if self._write_group is not self.get_transaction():
940
# has an unlock or relock occured ?
943
'(suppressed) mismatched lock context and write group. %r, %r',
944
self._write_group, self.get_transaction())
946
raise errors.BzrError(
947
'mismatched lock context and write group. %r, %r' %
948
(self._write_group, self.get_transaction()))
950
self._abort_write_group()
951
except Exception, exc:
952
self._write_group = None
953
if not suppress_errors:
955
mutter('abort_write_group failed')
956
log_exception_quietly()
957
note('bzr: ERROR (ignored): %s', exc)
958
self._write_group = None
960
def _abort_write_group(self):
961
"""Template method for per-repository write group cleanup.
963
This is called during abort before the write group is considered to be
964
finished and should cleanup any internal state accrued during the write
965
group. There is no requirement that data handed to the repository be
966
*not* made available - this is not a rollback - but neither should any
967
attempt be made to ensure that data added is fully commited. Abort is
968
invoked when an error has occured so futher disk or network operations
969
may not be possible or may error and if possible should not be
973
def add_fallback_repository(self, repository):
974
"""Add a repository to use for looking up data not held locally.
976
:param repository: A repository.
978
if not self._format.supports_external_lookups:
979
raise errors.UnstackableRepositoryFormat(self._format, self.base)
981
# This repository will call fallback.unlock() when we transition to
982
# the unlocked state, so we make sure to increment the lock count
983
repository.lock_read()
984
self._check_fallback_repository(repository)
985
self._fallback_repositories.append(repository)
986
self.texts.add_fallback_versioned_files(repository.texts)
987
self.inventories.add_fallback_versioned_files(repository.inventories)
988
self.revisions.add_fallback_versioned_files(repository.revisions)
989
self.signatures.add_fallback_versioned_files(repository.signatures)
990
if self.chk_bytes is not None:
991
self.chk_bytes.add_fallback_versioned_files(repository.chk_bytes)
993
def _check_fallback_repository(self, repository):
994
"""Check that this repository can fallback to repository safely.
996
Raise an error if not.
998
:param repository: A repository to fallback to.
1000
return InterRepository._assert_same_model(self, repository)
1002
84
def add_inventory(self, revision_id, inv, parents):
1003
85
"""Add the inventory inv to the repository as revision_id.
1005
87
:param parents: The revision ids of the parents that revision_id
1006
88
is known to have and are in the repository already.
1008
:returns: The validator(which is a sha1 digest, though what is sha'd is
1009
repository format specific) of the serialized inventory.
90
returns the sha1 of the serialized inventory.
1011
if not self.is_in_write_group():
1012
raise AssertionError("%r not in write group" % (self,))
92
revision_id = osutils.safe_revision_id(revision_id)
1013
93
_mod_revision.check_not_reserved_id(revision_id)
1014
if not (inv.revision_id is None or inv.revision_id == revision_id):
1015
raise AssertionError(
1016
"Mismatch between inventory revision"
1017
" id and insertion revid (%r, %r)"
1018
% (inv.revision_id, revision_id))
1019
if inv.root is None:
1020
raise AssertionError()
1021
return self._add_inventory_checked(revision_id, inv, parents)
1023
def _add_inventory_checked(self, revision_id, inv, parents):
1024
"""Add inv to the repository after checking the inputs.
1026
This function can be overridden to allow different inventory styles.
1028
:seealso: add_inventory, for the contract.
1030
inv_lines = self._serialise_inventory_to_lines(inv)
1031
return self._inventory_add_lines(revision_id, parents,
1032
inv_lines, check_content=False)
1034
def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1035
parents, basis_inv=None, propagate_caches=False):
1036
"""Add a new inventory expressed as a delta against another revision.
1038
See the inventory developers documentation for the theory behind
1041
:param basis_revision_id: The inventory id the delta was created
1042
against. (This does not have to be a direct parent.)
1043
:param delta: The inventory delta (see Inventory.apply_delta for
1045
:param new_revision_id: The revision id that the inventory is being
1047
:param parents: The revision ids of the parents that revision_id is
1048
known to have and are in the repository already. These are supplied
1049
for repositories that depend on the inventory graph for revision
1050
graph access, as well as for those that pun ancestry with delta
1052
:param basis_inv: The basis inventory if it is already known,
1054
:param propagate_caches: If True, the caches for this inventory are
1055
copied to and updated for the result if possible.
1057
:returns: (validator, new_inv)
1058
The validator(which is a sha1 digest, though what is sha'd is
1059
repository format specific) of the serialized inventory, and the
1060
resulting inventory.
1062
if not self.is_in_write_group():
1063
raise AssertionError("%r not in write group" % (self,))
1064
_mod_revision.check_not_reserved_id(new_revision_id)
1065
basis_tree = self.revision_tree(basis_revision_id)
1066
basis_tree.lock_read()
1068
# Note that this mutates the inventory of basis_tree, which not all
1069
# inventory implementations may support: A better idiom would be to
1070
# return a new inventory, but as there is no revision tree cache in
1071
# repository this is safe for now - RBC 20081013
1072
if basis_inv is None:
1073
basis_inv = basis_tree.inventory
1074
basis_inv.apply_delta(delta)
1075
basis_inv.revision_id = new_revision_id
1076
return (self.add_inventory(new_revision_id, basis_inv, parents),
1081
def _inventory_add_lines(self, revision_id, parents, lines,
1082
check_content=True):
1083
"""Store lines in inv_vf and return the sha1 of the inventory."""
1084
parents = [(parent,) for parent in parents]
1085
result = self.inventories.add_lines((revision_id,), parents, lines,
1086
check_content=check_content)[0]
1087
self.inventories._access.flush()
94
assert inv.revision_id is None or inv.revision_id == revision_id, \
95
"Mismatch between inventory revision" \
96
" id and insertion revid (%r, %r)" % (inv.revision_id, revision_id)
97
assert inv.root is not None
98
inv_text = self.serialise_inventory(inv)
99
inv_sha1 = osutils.sha_string(inv_text)
100
inv_vf = self.control_weaves.get_weave('inventory',
101
self.get_transaction())
102
self._inventory_add_lines(inv_vf, revision_id, parents,
103
osutils.split_lines(inv_text))
106
def _inventory_add_lines(self, inv_vf, revision_id, parents, lines):
108
for parent in parents:
110
final_parents.append(parent)
112
inv_vf.add_lines(revision_id, final_parents, lines)
1090
115
def add_revision(self, revision_id, rev, inv=None, config=None):
1091
116
"""Add rev to the revision store as revision_id.
1800
369
# Most control formats need the repository to be specifically
1801
370
# created, but on some old all-in-one formats it's not needed
1803
dest_repo = self._format.initialize(a_bzrdir, shared=shared)
372
dest_repo = self._format.initialize(a_bzrdir, shared=self.is_shared())
1804
373
except errors.UninitializableFormat:
1805
374
dest_repo = a_bzrdir.open_repository()
375
self.copy_content_into(dest_repo, revision_id)
1806
376
return dest_repo
1808
def _get_sink(self):
1809
"""Return a sink for streaming into this repository."""
1810
return StreamSink(self)
1812
def _get_source(self, to_format):
1813
"""Return a source for streaming from this repository."""
1814
return StreamSource(self, to_format)
1816
378
@needs_read_lock
1817
379
def has_revision(self, revision_id):
1818
380
"""True if this repository has a copy of the revision."""
1819
return revision_id in self.has_revisions((revision_id,))
1822
def has_revisions(self, revision_ids):
1823
"""Probe to find out the presence of multiple revisions.
1825
:param revision_ids: An iterable of revision_ids.
1826
:return: A set of the revision_ids that were present.
1828
parent_map = self.revisions.get_parent_map(
1829
[(rev_id,) for rev_id in revision_ids])
1831
if _mod_revision.NULL_REVISION in revision_ids:
1832
result.add(_mod_revision.NULL_REVISION)
1833
result.update([key[0] for key in parent_map])
1837
def get_revision(self, revision_id):
1838
"""Return the Revision object for a named revision."""
1839
return self.get_revisions([revision_id])[0]
381
revision_id = osutils.safe_revision_id(revision_id)
382
return self._revision_store.has_revision_id(revision_id,
383
self.get_transaction())
1841
385
@needs_read_lock
1842
386
def get_revision_reconcile(self, revision_id):
1843
387
"""'reconcile' helper routine that allows access to a revision always.
1845
389
This variant of get_revision does not cross check the weave graph
1846
390
against the revision one as get_revision does: but it should only
1847
391
be used by reconcile, or reconcile-alike commands that are correcting
1848
392
or testing the revision graph.
1850
return self._get_revisions([revision_id])[0]
394
if not revision_id or not isinstance(revision_id, basestring):
395
raise errors.InvalidRevisionId(revision_id=revision_id,
397
return self.get_revisions([revision_id])[0]
1852
399
@needs_read_lock
1853
400
def get_revisions(self, revision_ids):
1854
"""Get many revisions at once.
1856
Repositories that need to check data on every revision read should
1857
subclass this method.
1859
return self._get_revisions(revision_ids)
1862
def _get_revisions(self, revision_ids):
1863
"""Core work logic to get many revisions without sanity checks."""
1865
for revid, rev in self._iter_revisions(revision_ids):
1867
raise errors.NoSuchRevision(self, revid)
1869
return [revs[revid] for revid in revision_ids]
1871
def _iter_revisions(self, revision_ids):
1872
"""Iterate over revision objects.
1874
:param revision_ids: An iterable of revisions to examine. None may be
1875
passed to request all revisions known to the repository. Note that
1876
not all repositories can find unreferenced revisions; for those
1877
repositories only referenced ones will be returned.
1878
:return: An iterator of (revid, revision) tuples. Absent revisions (
1879
those asked for but not available) are returned as (revid, None).
1881
if revision_ids is None:
1882
revision_ids = self.all_revision_ids()
1884
for rev_id in revision_ids:
1885
if not rev_id or not isinstance(rev_id, basestring):
1886
raise errors.InvalidRevisionId(revision_id=rev_id, branch=self)
1887
keys = [(key,) for key in revision_ids]
1888
stream = self.revisions.get_record_stream(keys, 'unordered', True)
1889
for record in stream:
1890
revid = record.key[0]
1891
if record.storage_kind == 'absent':
1894
text = record.get_bytes_as('fulltext')
1895
rev = self._serializer.read_revision_from_string(text)
401
revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
402
revs = self._revision_store.get_revisions(revision_ids,
403
self.get_transaction())
405
assert not isinstance(rev.revision_id, unicode)
406
for parent_id in rev.parent_ids:
407
assert not isinstance(parent_id, unicode)
1898
410
@needs_read_lock
1899
411
def get_revision_xml(self, revision_id):
1900
412
# TODO: jam 20070210 This shouldn't be necessary since get_revision
1901
413
# would have already do it.
1902
414
# TODO: jam 20070210 Just use _serializer.write_revision_to_string()
1903
# TODO: this can't just be replaced by:
1904
# return self._serializer.write_revision_to_string(
1905
# self.get_revision(revision_id))
1906
# as cStringIO preservers the encoding unlike write_revision_to_string
1907
# or some other call down the path.
415
revision_id = osutils.safe_revision_id(revision_id)
1908
416
rev = self.get_revision(revision_id)
1909
rev_tmp = cStringIO.StringIO()
1910
418
# the current serializer..
1911
self._serializer.write_revision(rev, rev_tmp)
419
self._revision_store._serializer.write_revision(rev, rev_tmp)
1913
421
return rev_tmp.getvalue()
1915
def get_deltas_for_revisions(self, revisions, specific_fileids=None):
424
def get_revision(self, revision_id):
425
"""Return the Revision object for a named revision"""
426
# TODO: jam 20070210 get_revision_reconcile should do this for us
427
revision_id = osutils.safe_revision_id(revision_id)
428
r = self.get_revision_reconcile(revision_id)
429
# weave corruption can lead to absent revision markers that should be
431
# the following test is reasonably cheap (it needs a single weave read)
432
# and the weave is cached in read transactions. In write transactions
433
# it is not cached but typically we only read a small number of
434
# revisions. For knits when they are introduced we will probably want
435
# to ensure that caching write transactions are in use.
436
inv = self.get_inventory_weave()
437
self._check_revision_parents(r, inv)
441
def get_deltas_for_revisions(self, revisions):
1916
442
"""Produce a generator of revision deltas.
1918
444
Note that the input is a sequence of REVISIONS, not revision_ids.
1919
445
Trees will be held in memory until the generator exits.
1920
446
Each delta is relative to the revision's lefthand predecessor.
1922
:param specific_fileids: if not None, the result is filtered
1923
so that only those file-ids, their parents and their
1924
children are included.
1926
# Get the revision-ids of interest
1927
448
required_trees = set()
1928
449
for revision in revisions:
1929
450
required_trees.add(revision.revision_id)
1930
451
required_trees.update(revision.parent_ids[:1])
1932
# Get the matching filtered trees. Note that it's more
1933
# efficient to pass filtered trees to changes_from() rather
1934
# than doing the filtering afterwards. changes_from() could
1935
# arguably do the filtering itself but it's path-based, not
1936
# file-id based, so filtering before or afterwards is
1938
if specific_fileids is None:
1939
trees = dict((t.get_revision_id(), t) for
1940
t in self.revision_trees(required_trees))
1942
trees = dict((t.get_revision_id(), t) for
1943
t in self._filtered_revision_trees(required_trees,
1946
# Calculate the deltas
452
trees = dict((t.get_revision_id(), t) for
453
t in self.revision_trees(required_trees))
1947
454
for revision in revisions:
1948
455
if not revision.parent_ids:
1949
old_tree = self.revision_tree(_mod_revision.NULL_REVISION)
456
old_tree = self.revision_tree(None)
1951
458
old_tree = trees[revision.parent_ids[0]]
1952
459
yield trees[revision.revision_id].changes_from(old_tree)
1954
461
@needs_read_lock
1955
def get_revision_delta(self, revision_id, specific_fileids=None):
462
def get_revision_delta(self, revision_id):
1956
463
"""Return the delta for one revision.
1958
465
The delta is relative to the left-hand predecessor of the
1961
:param specific_fileids: if not None, the result is filtered
1962
so that only those file-ids, their parents and their
1963
children are included.
1965
468
r = self.get_revision(revision_id)
1966
return list(self.get_deltas_for_revisions([r],
1967
specific_fileids=specific_fileids))[0]
469
return list(self.get_deltas_for_revisions([r]))[0]
471
def _check_revision_parents(self, revision, inventory):
472
"""Private to Repository and Fetch.
474
This checks the parentage of revision in an inventory weave for
475
consistency and is only applicable to inventory-weave-for-ancestry
476
using repository formats & fetchers.
478
weave_parents = inventory.get_parents(revision.revision_id)
479
weave_names = inventory.versions()
480
for parent_id in revision.parent_ids:
481
if parent_id in weave_names:
482
# this parent must not be a ghost.
483
if not parent_id in weave_parents:
485
raise errors.CorruptRepository(self)
1969
487
@needs_write_lock
1970
488
def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
489
revision_id = osutils.safe_revision_id(revision_id)
1971
490
signature = gpg_strategy.sign(plaintext)
1972
self.add_signature_text(revision_id, signature)
1975
def add_signature_text(self, revision_id, signature):
1976
self.signatures.add_lines((revision_id,), (),
1977
osutils.split_lines(signature))
1979
def find_text_key_references(self):
1980
"""Find the text key references within the repository.
1982
:return: A dictionary mapping text keys ((fileid, revision_id) tuples)
1983
to whether they were referred to by the inventory of the
1984
revision_id that they contain. The inventory texts from all present
1985
revision ids are assessed to generate this report.
1987
revision_keys = self.revisions.keys()
1988
w = self.inventories
1989
pb = ui.ui_factory.nested_progress_bar()
1991
return self._find_text_key_references_from_xml_inventory_lines(
1992
w.iter_lines_added_or_present_in_keys(revision_keys, pb=pb))
1996
def _find_text_key_references_from_xml_inventory_lines(self,
1998
"""Core routine for extracting references to texts from inventories.
2000
This performs the translation of xml lines to revision ids.
2002
:param line_iterator: An iterator of lines, origin_version_id
2003
:return: A dictionary mapping text keys ((fileid, revision_id) tuples)
2004
to whether they were referred to by the inventory of the
2005
revision_id that they contain. Note that if that revision_id was
2006
not part of the line_iterator's output then False will be given -
2007
even though it may actually refer to that key.
2009
if not self._serializer.support_altered_by_hack:
2010
raise AssertionError(
2011
"_find_text_key_references_from_xml_inventory_lines only "
2012
"supported for branches which store inventory as unnested xml"
2013
", not on %r" % self)
491
self._revision_store.add_revision_signature_text(revision_id,
493
self.get_transaction())
495
def fileids_altered_by_revision_ids(self, revision_ids):
496
"""Find the file ids and versions affected by revisions.
498
:param revisions: an iterable containing revision ids.
499
:return: a dictionary mapping altered file-ids to an iterable of
500
revision_ids. Each altered file-ids has the exact revision_ids that
501
altered it listed explicitly.
503
assert self._serializer.support_altered_by_hack, \
504
("fileids_altered_by_revision_ids only supported for branches "
505
"which store inventory as unnested xml, not on %r" % self)
506
selected_revision_ids = set(osutils.safe_revision_id(r)
507
for r in revision_ids)
508
w = self.get_inventory_weave()
2016
511
# this code needs to read every new line in every inventory for the
2017
512
# inventories [revision_ids]. Seeing a line twice is ok. Seeing a line
2018
# not present in one of those inventories is unnecessary but not
513
# not present in one of those inventories is unnecessary but not
2019
514
# harmful because we are filtering by the revision id marker in the
2020
# inventory lines : we only select file ids altered in one of those
515
# inventory lines : we only select file ids altered in one of those
2021
516
# revisions. We don't need to see all lines in the inventory because
2022
517
# only those added in an inventory in rev X can contain a revision=X
2032
527
search = self._file_ids_altered_regex.search
2033
528
unescape = _unescape_xml
2034
529
setdefault = result.setdefault
2035
for line, line_key in line_iterator:
2036
match = search(line)
2039
# One call to match.group() returning multiple items is quite a
2040
# bit faster than 2 calls to match.group() each returning 1
2041
file_id, revision_id = match.group('file_id', 'revision_id')
2043
# Inlining the cache lookups helps a lot when you make 170,000
2044
# lines and 350k ids, versus 8.4 unique ids.
2045
# Using a cache helps in 2 ways:
2046
# 1) Avoids unnecessary decoding calls
2047
# 2) Re-uses cached strings, which helps in future set and
2049
# (2) is enough that removing encoding entirely along with
2050
# the cache (so we are using plain strings) results in no
2051
# performance improvement.
2053
revision_id = unescape_revid_cache[revision_id]
2055
unescaped = unescape(revision_id)
2056
unescape_revid_cache[revision_id] = unescaped
2057
revision_id = unescaped
2059
# Note that unconditionally unescaping means that we deserialise
2060
# every fileid, which for general 'pull' is not great, but we don't
2061
# really want to have some many fulltexts that this matters anyway.
2064
file_id = unescape_fileid_cache[file_id]
2066
unescaped = unescape(file_id)
2067
unescape_fileid_cache[file_id] = unescaped
2070
key = (file_id, revision_id)
2071
setdefault(key, False)
2072
if revision_id == line_key[-1]:
2076
def _inventory_xml_lines_for_keys(self, keys):
2077
"""Get a line iterator of the sort needed for findind references.
2079
Not relevant for non-xml inventory repositories.
2081
Ghosts in revision_keys are ignored.
2083
:param revision_keys: The revision keys for the inventories to inspect.
2084
:return: An iterator over (inventory line, revid) for the fulltexts of
2085
all of the xml inventories specified by revision_keys.
2087
stream = self.inventories.get_record_stream(keys, 'unordered', True)
2088
for record in stream:
2089
if record.storage_kind != 'absent':
2090
chunks = record.get_bytes_as('chunked')
2091
revid = record.key[-1]
2092
lines = osutils.chunks_to_lines(chunks)
2096
def _find_file_ids_from_xml_inventory_lines(self, line_iterator,
2098
"""Helper routine for fileids_altered_by_revision_ids.
2100
This performs the translation of xml lines to revision ids.
2102
:param line_iterator: An iterator of lines, origin_version_id
2103
:param revision_keys: The revision ids to filter for. This should be a
2104
set or other type which supports efficient __contains__ lookups, as
2105
the revision key from each parsed line will be looked up in the
2106
revision_keys filter.
2107
:return: a dictionary mapping altered file-ids to an iterable of
2108
revision_ids. Each altered file-ids has the exact revision_ids that
2109
altered it listed explicitly.
2111
seen = set(self._find_text_key_references_from_xml_inventory_lines(
2112
line_iterator).iterkeys())
2113
parent_keys = self._find_parent_keys_of_revisions(revision_keys)
2114
parent_seen = set(self._find_text_key_references_from_xml_inventory_lines(
2115
self._inventory_xml_lines_for_keys(parent_keys)))
2116
new_keys = seen - parent_seen
2118
setdefault = result.setdefault
2119
for key in new_keys:
2120
setdefault(key[0], set()).add(key[-1])
2123
def _find_parent_ids_of_revisions(self, revision_ids):
2124
"""Find all parent ids that are mentioned in the revision graph.
2126
:return: set of revisions that are parents of revision_ids which are
2127
not part of revision_ids themselves
2129
parent_map = self.get_parent_map(revision_ids)
2131
map(parent_ids.update, parent_map.itervalues())
2132
parent_ids.difference_update(revision_ids)
2133
parent_ids.discard(_mod_revision.NULL_REVISION)
2136
def _find_parent_keys_of_revisions(self, revision_keys):
2137
"""Similar to _find_parent_ids_of_revisions, but used with keys.
2139
:param revision_keys: An iterable of revision_keys.
2140
:return: The parents of all revision_keys that are not already in
2143
parent_map = self.revisions.get_parent_map(revision_keys)
2145
map(parent_keys.update, parent_map.itervalues())
2146
parent_keys.difference_update(revision_keys)
2147
parent_keys.discard(_mod_revision.NULL_REVISION)
2150
def fileids_altered_by_revision_ids(self, revision_ids, _inv_weave=None):
2151
"""Find the file ids and versions affected by revisions.
2153
:param revisions: an iterable containing revision ids.
2154
:param _inv_weave: The inventory weave from this repository or None.
2155
If None, the inventory weave will be opened automatically.
2156
:return: a dictionary mapping altered file-ids to an iterable of
2157
revision_ids. Each altered file-ids has the exact revision_ids that
2158
altered it listed explicitly.
2160
selected_keys = set((revid,) for revid in revision_ids)
2161
w = _inv_weave or self.inventories
2162
return self._find_file_ids_from_xml_inventory_lines(
2163
w.iter_lines_added_or_present_in_keys(
2164
selected_keys, pb=None),
2167
def iter_files_bytes(self, desired_files):
2168
"""Iterate through file versions.
2170
Files will not necessarily be returned in the order they occur in
2171
desired_files. No specific order is guaranteed.
2173
Yields pairs of identifier, bytes_iterator. identifier is an opaque
2174
value supplied by the caller as part of desired_files. It should
2175
uniquely identify the file version in the caller's context. (Examples:
2176
an index number or a TreeTransform trans_id.)
2178
bytes_iterator is an iterable of bytestrings for the file. The
2179
kind of iterable and length of the bytestrings are unspecified, but for
2180
this implementation, it is a list of bytes produced by
2181
VersionedFile.get_record_stream().
2183
:param desired_files: a list of (file_id, revision_id, identifier)
2187
for file_id, revision_id, callable_data in desired_files:
2188
text_keys[(file_id, revision_id)] = callable_data
2189
for record in self.texts.get_record_stream(text_keys, 'unordered', True):
2190
if record.storage_kind == 'absent':
2191
raise errors.RevisionNotPresent(record.key, self)
2192
yield text_keys[record.key], record.get_bytes_as('chunked')
2194
def _generate_text_key_index(self, text_key_references=None,
2196
"""Generate a new text key index for the repository.
2198
This is an expensive function that will take considerable time to run.
2200
:return: A dict mapping text keys ((file_id, revision_id) tuples) to a
2201
list of parents, also text keys. When a given key has no parents,
2202
the parents list will be [NULL_REVISION].
2204
# All revisions, to find inventory parents.
2205
if ancestors is None:
2206
graph = self.get_graph()
2207
ancestors = graph.get_parent_map(self.all_revision_ids())
2208
if text_key_references is None:
2209
text_key_references = self.find_text_key_references()
2210
530
pb = ui.ui_factory.nested_progress_bar()
2212
return self._do_generate_text_key_index(ancestors,
2213
text_key_references, pb)
532
for line in w.iter_lines_added_or_present_in_versions(
533
selected_revision_ids, pb=pb):
537
# One call to match.group() returning multiple items is quite a
538
# bit faster than 2 calls to match.group() each returning 1
539
file_id, revision_id = match.group('file_id', 'revision_id')
541
# Inlining the cache lookups helps a lot when you make 170,000
542
# lines and 350k ids, versus 8.4 unique ids.
543
# Using a cache helps in 2 ways:
544
# 1) Avoids unnecessary decoding calls
545
# 2) Re-uses cached strings, which helps in future set and
547
# (2) is enough that removing encoding entirely along with
548
# the cache (so we are using plain strings) results in no
549
# performance improvement.
551
revision_id = unescape_revid_cache[revision_id]
553
unescaped = unescape(revision_id)
554
unescape_revid_cache[revision_id] = unescaped
555
revision_id = unescaped
557
if revision_id in selected_revision_ids:
559
file_id = unescape_fileid_cache[file_id]
561
unescaped = unescape(file_id)
562
unescape_fileid_cache[file_id] = unescaped
564
setdefault(file_id, set()).add(revision_id)
2217
def _do_generate_text_key_index(self, ancestors, text_key_references, pb):
2218
"""Helper for _generate_text_key_index to avoid deep nesting."""
2219
revision_order = tsort.topo_sort(ancestors)
2220
invalid_keys = set()
2222
for revision_id in revision_order:
2223
revision_keys[revision_id] = set()
2224
text_count = len(text_key_references)
2225
# a cache of the text keys to allow reuse; costs a dict of all the
2226
# keys, but saves a 2-tuple for every child of a given key.
2228
for text_key, valid in text_key_references.iteritems():
2230
invalid_keys.add(text_key)
2232
revision_keys[text_key[1]].add(text_key)
2233
text_key_cache[text_key] = text_key
2234
del text_key_references
2236
text_graph = graph.Graph(graph.DictParentsProvider(text_index))
2237
NULL_REVISION = _mod_revision.NULL_REVISION
2238
# Set a cache with a size of 10 - this suffices for bzr.dev but may be
2239
# too small for large or very branchy trees. However, for 55K path
2240
# trees, it would be easy to use too much memory trivially. Ideally we
2241
# could gauge this by looking at available real memory etc, but this is
2242
# always a tricky proposition.
2243
inventory_cache = lru_cache.LRUCache(10)
2244
batch_size = 10 # should be ~150MB on a 55K path tree
2245
batch_count = len(revision_order) / batch_size + 1
2247
pb.update("Calculating text parents", processed_texts, text_count)
2248
for offset in xrange(batch_count):
2249
to_query = revision_order[offset * batch_size:(offset + 1) *
2253
for revision_id in to_query:
2254
parent_ids = ancestors[revision_id]
2255
for text_key in revision_keys[revision_id]:
2256
pb.update("Calculating text parents", processed_texts)
2257
processed_texts += 1
2258
candidate_parents = []
2259
for parent_id in parent_ids:
2260
parent_text_key = (text_key[0], parent_id)
2262
check_parent = parent_text_key not in \
2263
revision_keys[parent_id]
2265
# the parent parent_id is a ghost:
2266
check_parent = False
2267
# truncate the derived graph against this ghost.
2268
parent_text_key = None
2270
# look at the parent commit details inventories to
2271
# determine possible candidates in the per file graph.
2274
inv = inventory_cache[parent_id]
2276
inv = self.revision_tree(parent_id).inventory
2277
inventory_cache[parent_id] = inv
2279
parent_entry = inv[text_key[0]]
2280
except (KeyError, errors.NoSuchId):
2282
if parent_entry is not None:
2284
text_key[0], parent_entry.revision)
2286
parent_text_key = None
2287
if parent_text_key is not None:
2288
candidate_parents.append(
2289
text_key_cache[parent_text_key])
2290
parent_heads = text_graph.heads(candidate_parents)
2291
new_parents = list(parent_heads)
2292
new_parents.sort(key=lambda x:candidate_parents.index(x))
2293
if new_parents == []:
2294
new_parents = [NULL_REVISION]
2295
text_index[text_key] = new_parents
2297
for text_key in invalid_keys:
2298
text_index[text_key] = [NULL_REVISION]
2301
def item_keys_introduced_by(self, revision_ids, _files_pb=None):
2302
"""Get an iterable listing the keys of all the data introduced by a set
2305
The keys will be ordered so that the corresponding items can be safely
2306
fetched and inserted in that order.
2308
:returns: An iterable producing tuples of (knit-kind, file-id,
2309
versions). knit-kind is one of 'file', 'inventory', 'signatures',
2310
'revisions'. file-id is None unless knit-kind is 'file'.
2312
for result in self._find_file_keys_to_fetch(revision_ids, _files_pb):
2315
for result in self._find_non_file_keys_to_fetch(revision_ids):
2318
def _find_file_keys_to_fetch(self, revision_ids, pb):
2319
# XXX: it's a bit weird to control the inventory weave caching in this
2320
# generator. Ideally the caching would be done in fetch.py I think. Or
2321
# maybe this generator should explicitly have the contract that it
2322
# should not be iterated until the previously yielded item has been
2324
inv_w = self.inventories
2326
# file ids that changed
2327
file_ids = self.fileids_altered_by_revision_ids(revision_ids, inv_w)
2329
num_file_ids = len(file_ids)
2330
for file_id, altered_versions in file_ids.iteritems():
2332
pb.update("Fetch texts", count, num_file_ids)
2334
yield ("file", file_id, altered_versions)
2336
def _find_non_file_keys_to_fetch(self, revision_ids):
2338
yield ("inventory", None, revision_ids)
2341
# XXX: Note ATM no callers actually pay attention to this return
2342
# instead they just use the list of revision ids and ignore
2343
# missing sigs. Consider removing this work entirely
2344
revisions_with_signatures = set(self.signatures.get_parent_map(
2345
[(r,) for r in revision_ids]))
2346
revisions_with_signatures = set(
2347
[r for (r,) in revisions_with_signatures])
2348
revisions_with_signatures.intersection_update(revision_ids)
2349
yield ("signatures", None, revisions_with_signatures)
2352
yield ("revisions", None, revision_ids)
570
def get_inventory_weave(self):
571
return self.control_weaves.get_weave('inventory',
572
self.get_transaction())
2354
574
@needs_read_lock
2355
575
def get_inventory(self, revision_id):
2356
"""Get Inventory object by revision id."""
2357
return self.iter_inventories([revision_id]).next()
2359
def iter_inventories(self, revision_ids, ordering=None):
2360
"""Get many inventories by revision_ids.
2362
This will buffer some or all of the texts used in constructing the
2363
inventories in memory, but will only parse a single inventory at a
2366
:param revision_ids: The expected revision ids of the inventories.
2367
:param ordering: optional ordering, e.g. 'topological'. If not
2368
specified, the order of revision_ids will be preserved (by
2369
buffering if necessary).
2370
:return: An iterator of inventories.
2372
if ((None in revision_ids)
2373
or (_mod_revision.NULL_REVISION in revision_ids)):
2374
raise ValueError('cannot get null revision inventory')
2375
return self._iter_inventories(revision_ids, ordering)
2377
def _iter_inventories(self, revision_ids, ordering):
2378
"""single-document based inventory iteration."""
2379
inv_xmls = self._iter_inventory_xmls(revision_ids, ordering)
2380
for text, revision_id in inv_xmls:
2381
yield self._deserialise_inventory(revision_id, text)
2383
def _iter_inventory_xmls(self, revision_ids, ordering):
2384
if ordering is None:
2385
order_as_requested = True
2386
ordering = 'unordered'
2388
order_as_requested = False
2389
keys = [(revision_id,) for revision_id in revision_ids]
2392
if order_as_requested:
2393
key_iter = iter(keys)
2394
next_key = key_iter.next()
2395
stream = self.inventories.get_record_stream(keys, ordering, True)
2397
for record in stream:
2398
if record.storage_kind != 'absent':
2399
chunks = record.get_bytes_as('chunked')
2400
if order_as_requested:
2401
text_chunks[record.key] = chunks
2403
yield ''.join(chunks), record.key[-1]
2405
raise errors.NoSuchRevision(self, record.key)
2406
if order_as_requested:
2407
# Yield as many results as we can while preserving order.
2408
while next_key in text_chunks:
2409
chunks = text_chunks.pop(next_key)
2410
yield ''.join(chunks), next_key[-1]
2412
next_key = key_iter.next()
2413
except StopIteration:
2414
# We still want to fully consume the get_record_stream,
2415
# just in case it is not actually finished at this point
2419
def _deserialise_inventory(self, revision_id, xml):
2420
"""Transform the xml into an inventory object.
576
"""Get Inventory object by hash."""
577
# TODO: jam 20070210 Technically we don't need to sanitize, since all
578
# called functions must sanitize.
579
revision_id = osutils.safe_revision_id(revision_id)
580
return self.deserialise_inventory(
581
revision_id, self.get_inventory_xml(revision_id))
583
def deserialise_inventory(self, revision_id, xml):
584
"""Transform the xml into an inventory object.
2422
586
:param revision_id: The expected revision id of the inventory.
2423
587
:param xml: A serialised inventory.
2425
result = self._serializer.read_inventory_from_string(xml, revision_id,
2426
entry_cache=self._inventory_entry_cache,
2427
return_from_cache=self._safe_to_return_from_cache)
2428
if result.revision_id != revision_id:
2429
raise AssertionError('revision id mismatch %s != %s' % (
2430
result.revision_id, revision_id))
589
revision_id = osutils.safe_revision_id(revision_id)
590
result = self._serializer.read_inventory_from_string(xml)
591
result.root.revision = revision_id
2433
def _serialise_inventory(self, inv):
594
def serialise_inventory(self, inv):
2434
595
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)
2439
def get_serializer_format(self):
2440
return self._serializer.format_num
2442
597
@needs_read_lock
2443
def _get_inventory_xml(self, revision_id):
2444
"""Get serialized inventory as a string."""
2445
texts = self._iter_inventory_xmls([revision_id], 'unordered')
598
def get_inventory_xml(self, revision_id):
599
"""Get inventory XML as a file object."""
600
revision_id = osutils.safe_revision_id(revision_id)
2447
text, revision_id = texts.next()
2448
except StopIteration:
602
assert isinstance(revision_id, str), type(revision_id)
603
iw = self.get_inventory_weave()
604
return iw.get_text(revision_id)
2449
606
raise errors.HistoryMissing(self, 'inventory', revision_id)
2452
def get_rev_id_for_revno(self, revno, known_pair):
2453
"""Return the revision id of a revno, given a later (revno, revid)
2454
pair in the same history.
2456
:return: if found (True, revid). If the available history ran out
2457
before reaching the revno, then this returns
2458
(False, (closest_revno, closest_revid)).
2460
known_revno, known_revid = known_pair
2461
partial_history = [known_revid]
2462
distance_from_known = known_revno - revno
2463
if distance_from_known < 0:
2465
'requested revno (%d) is later than given known revno (%d)'
2466
% (revno, known_revno))
2469
self, partial_history, stop_index=distance_from_known)
2470
except errors.RevisionNotPresent, err:
2471
if err.revision_id == known_revid:
2472
# The start revision (known_revid) wasn't found.
2474
# This is a stacked repository with no fallbacks, or a there's a
2475
# left-hand ghost. Either way, even though the revision named in
2476
# the error isn't in this repo, we know it's the next step in this
2477
# left-hand history.
2478
partial_history.append(err.revision_id)
2479
if len(partial_history) <= distance_from_known:
2480
# Didn't find enough history to get a revid for the revno.
2481
earliest_revno = known_revno - len(partial_history) + 1
2482
return (False, (earliest_revno, partial_history[-1]))
2483
if len(partial_history) - 1 > distance_from_known:
2484
raise AssertionError('_iter_for_revno returned too much history')
2485
return (True, partial_history[-1])
609
def get_inventory_sha1(self, revision_id):
610
"""Return the sha1 hash of the inventory entry
612
# TODO: jam 20070210 Shouldn't this be deprecated / removed?
613
revision_id = osutils.safe_revision_id(revision_id)
614
return self.get_revision(revision_id).inventory_sha1
617
def get_revision_graph(self, revision_id=None):
618
"""Return a dictionary containing the revision graph.
620
:param revision_id: The revision_id to get a graph from. If None, then
621
the entire revision graph is returned. This is a deprecated mode of
622
operation and will be removed in the future.
623
:return: a dictionary of revision_id->revision_parents_list.
625
# special case NULL_REVISION
626
if revision_id == _mod_revision.NULL_REVISION:
628
revision_id = osutils.safe_revision_id(revision_id)
629
a_weave = self.get_inventory_weave()
630
all_revisions = self._eliminate_revisions_not_present(
632
entire_graph = dict([(node, a_weave.get_parents(node)) for
633
node in all_revisions])
634
if revision_id is None:
636
elif revision_id not in entire_graph:
637
raise errors.NoSuchRevision(self, revision_id)
639
# add what can be reached from revision_id
641
pending = set([revision_id])
642
while len(pending) > 0:
644
result[node] = entire_graph[node]
645
for revision_id in result[node]:
646
if revision_id not in result:
647
pending.add(revision_id)
651
def get_revision_graph_with_ghosts(self, revision_ids=None):
652
"""Return a graph of the revisions with ghosts marked as applicable.
654
:param revision_ids: an iterable of revisions to graph or None for all.
655
:return: a Graph object with the graph reachable from revision_ids.
657
result = graph.Graph()
659
pending = set(self.all_revision_ids())
662
pending = set(osutils.safe_revision_id(r) for r in revision_ids)
663
# special case NULL_REVISION
664
if _mod_revision.NULL_REVISION in pending:
665
pending.remove(_mod_revision.NULL_REVISION)
666
required = set(pending)
669
revision_id = pending.pop()
671
rev = self.get_revision(revision_id)
672
except errors.NoSuchRevision:
673
if revision_id in required:
676
result.add_ghost(revision_id)
678
for parent_id in rev.parent_ids:
679
# is this queued or done ?
680
if (parent_id not in pending and
681
parent_id not in done):
683
pending.add(parent_id)
684
result.add_node(revision_id, rev.parent_ids)
685
done.add(revision_id)
688
def _get_history_vf(self):
689
"""Get a versionedfile whose history graph reflects all revisions.
691
For weave repositories, this is the inventory weave.
693
return self.get_inventory_weave()
2487
695
def iter_reverse_revision_history(self, revision_id):
2488
696
"""Iterate backwards through revision ids in the lefthand history
2532
739
reconciler = RepoReconciler(self, thorough=thorough)
2533
740
reconciler.reconcile()
2534
741
return reconciler
2536
def _refresh_data(self):
2537
"""Helper called from lock_* to ensure coherency with disk.
2539
The default implementation does nothing; it is however possible
2540
for repositories to maintain loaded indices across multiple locks
2541
by checking inside their implementation of this method to see
2542
whether their indices are still valid. This depends of course on
2543
the disk format being validatable in this manner. This method is
2544
also called by the refresh_data() public interface to cause a refresh
2545
to occur while in a write lock so that data inserted by a smart server
2546
push operation is visible on the client's instance of the physical
2550
743
@needs_read_lock
2551
744
def revision_tree(self, revision_id):
2552
745
"""Return Tree for a revision on this branch.
2554
`revision_id` may be NULL_REVISION for the empty tree revision.
747
`revision_id` may be None for the empty tree revision.
2556
revision_id = _mod_revision.ensure_null(revision_id)
2557
749
# TODO: refactor this to use an existing revision object
2558
750
# so we don't need to read it in twice.
2559
if revision_id == _mod_revision.NULL_REVISION:
2560
return RevisionTree(self, Inventory(root_id=None),
751
if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
752
return RevisionTree(self, Inventory(root_id=None),
2561
753
_mod_revision.NULL_REVISION)
755
revision_id = osutils.safe_revision_id(revision_id)
2563
756
inv = self.get_revision_inventory(revision_id)
2564
757
return RevisionTree(self, inv, revision_id)
2566
760
def revision_trees(self, revision_ids):
2567
"""Return Trees for revisions in this repository.
2569
:param revision_ids: a sequence of revision-ids;
2570
a revision-id may not be None or 'null:'
2572
inventories = self.iter_inventories(revision_ids)
2573
for inv in inventories:
2574
yield RevisionTree(self, inv, inv.revision_id)
2576
def _filtered_revision_trees(self, revision_ids, file_ids):
2577
"""Return Tree for a revision on this branch with only some files.
2579
:param revision_ids: a sequence of revision-ids;
2580
a revision-id may not be None or 'null:'
2581
:param file_ids: if not None, the result is filtered
2582
so that only those file-ids, their parents and their
2583
children are included.
2585
inventories = self.iter_inventories(revision_ids)
2586
for inv in inventories:
2587
# Should we introduce a FilteredRevisionTree class rather
2588
# than pre-filter the inventory here?
2589
filtered_inv = inv.filter(file_ids)
2590
yield RevisionTree(self, filtered_inv, filtered_inv.revision_id)
761
"""Return Tree for a revision on this branch.
763
`revision_id` may not be None or 'null:'"""
764
assert None not in revision_ids
765
assert _mod_revision.NULL_REVISION not in revision_ids
766
texts = self.get_inventory_weave().get_texts(revision_ids)
767
for text, revision_id in zip(texts, revision_ids):
768
inv = self.deserialise_inventory(revision_id, text)
769
yield RevisionTree(self, inv, revision_id)
2592
771
@needs_read_lock
2593
def get_ancestry(self, revision_id, topo_sorted=True):
772
def get_ancestry(self, revision_id):
2594
773
"""Return a list of revision-ids integrated by a revision.
2596
The first element of the list is always None, indicating the origin
2597
revision. This might change when we have history horizons, or
775
The first element of the list is always None, indicating the origin
776
revision. This might change when we have history horizons, or
2598
777
perhaps we should have a new API.
2600
779
This is topologically sorted.
2602
if _mod_revision.is_null(revision_id):
781
if revision_id is None:
783
revision_id = osutils.safe_revision_id(revision_id)
2604
784
if not self.has_revision(revision_id):
2605
785
raise errors.NoSuchRevision(self, revision_id)
2606
graph = self.get_graph()
2608
search = graph._make_breadth_first_searcher([revision_id])
2611
found, ghosts = search.next_with_ghosts()
2612
except StopIteration:
2615
if _mod_revision.NULL_REVISION in keys:
2616
keys.remove(_mod_revision.NULL_REVISION)
2618
parent_map = graph.get_parent_map(keys)
2619
keys = tsort.topo_sort(parent_map)
2620
return [None] + list(keys)
2622
def pack(self, hint=None):
2623
"""Compress the data within the repository.
2625
This operation only makes sense for some repository types. For other
2626
types it should be a no-op that just returns.
2628
This stub method does not require a lock, but subclasses should use
2629
@needs_write_lock as this is a long running call its reasonable to
2630
implicitly lock for the user.
2632
:param hint: If not supplied, the whole repository is packed.
2633
If supplied, the repository may use the hint parameter as a
2634
hint for the parts of the repository to pack. A hint can be
2635
obtained from the result of commit_write_group(). Out of
2636
date hints are simply ignored, because concurrent operations
2637
can obsolete them rapidly.
786
w = self.get_inventory_weave()
787
candidates = w.get_ancestry(revision_id)
788
return [None] + candidates # self._eliminate_revisions_not_present(candidates)
791
def print_file(self, file, revision_id):
792
"""Print `file` to stdout.
794
FIXME RBC 20060125 as John Meinel points out this is a bad api
795
- it writes to stdout, it assumes that that is valid etc. Fix
796
by creating a new more flexible convenience function.
798
revision_id = osutils.safe_revision_id(revision_id)
799
tree = self.revision_tree(revision_id)
800
# use inventory as it was in that revision
801
file_id = tree.inventory.path2id(file)
803
# TODO: jam 20060427 Write a test for this code path
804
# it had a bug in it, and was raising the wrong
806
raise errors.BzrError("%r is not present in revision %s" % (file, revision_id))
807
tree.print_file(file_id)
2640
809
def get_transaction(self):
2641
810
return self.control_files.get_transaction()
2643
def get_parent_map(self, revision_ids):
2644
"""See graph.StackedParentsProvider.get_parent_map"""
2645
# revisions index works in keys; this just works in revisions
2646
# therefore wrap and unwrap
2649
for revision_id in revision_ids:
2650
if revision_id == _mod_revision.NULL_REVISION:
2651
result[revision_id] = ()
2652
elif revision_id is None:
2653
raise ValueError('get_parent_map(None) is not valid')
2655
query_keys.append((revision_id ,))
2656
for ((revision_id,), parent_keys) in \
2657
self.revisions.get_parent_map(query_keys).iteritems():
2659
result[revision_id] = tuple([parent_revid
2660
for (parent_revid,) in parent_keys])
2662
result[revision_id] = (_mod_revision.NULL_REVISION,)
2665
def _make_parents_provider(self):
2668
def get_graph(self, other_repository=None):
2669
"""Return the graph walker for this repository format"""
2670
parents_provider = self._make_parents_provider()
2671
if (other_repository is not None and
2672
not self.has_same_location(other_repository)):
2673
parents_provider = graph.StackedParentsProvider(
2674
[parents_provider, other_repository._make_parents_provider()])
2675
return graph.Graph(parents_provider)
2677
def _get_versioned_file_checker(self, text_key_references=None,
2679
"""Return an object suitable for checking versioned files.
2681
:param text_key_references: if non-None, an already built
2682
dictionary mapping text keys ((fileid, revision_id) tuples)
2683
to whether they were referred to by the inventory of the
2684
revision_id that they contain. If None, this will be
2686
:param ancestors: Optional result from
2687
self.get_graph().get_parent_map(self.all_revision_ids()) if already
2690
return _VersionedFileChecker(self,
2691
text_key_references=text_key_references, ancestors=ancestors)
2693
def revision_ids_to_search_result(self, result_set):
2694
"""Convert a set of revision ids to a graph SearchResult."""
2695
result_parents = set()
2696
for parents in self.get_graph().get_parent_map(
2697
result_set).itervalues():
2698
result_parents.update(parents)
2699
included_keys = result_set.intersection(result_parents)
2700
start_keys = result_set.difference(included_keys)
2701
exclude_keys = result_parents.difference(result_set)
2702
result = graph.SearchResult(start_keys, exclude_keys,
2703
len(result_set), result_set)
812
def revision_parents(self, revision_id):
813
revision_id = osutils.safe_revision_id(revision_id)
814
return self.get_inventory_weave().parent_names(revision_id)
2706
816
@needs_write_lock
2707
817
def set_make_working_trees(self, new_value):
3378
1280
InterRepository.get(other).method_name(parameters).
3381
_walk_to_common_revisions_batch_size = 50
3382
1283
_optimisers = []
3383
1284
"""The available optimised InterRepository types."""
3386
1286
def copy_content(self, revision_id=None):
3387
"""Make a complete copy of the content in self into destination.
3389
This is a destructive operation! Do not use it on existing
3392
:param revision_id: Only copy the content needed to construct
3393
revision_id and its parents.
3396
self.target.set_make_working_trees(self.source.make_working_trees())
3397
except NotImplementedError:
3399
self.target.fetch(self.source, revision_id=revision_id)
3402
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
1287
raise NotImplementedError(self.copy_content)
1289
def fetch(self, revision_id=None, pb=None):
3404
1290
"""Fetch the content required to construct revision_id.
3406
1292
The content is copied from self.source to self.target.
3408
1294
:param revision_id: if None all content is copied, if NULL_REVISION no
3409
1295
content is copied.
3413
ui.ui_factory.warn_experimental_format_fetch(self)
3414
f = _mod_fetch.RepoFetcher(to_repository=self.target,
3415
from_repository=self.source,
3416
last_revision=revision_id,
3417
fetch_spec=fetch_spec,
3418
find_ghosts=find_ghosts)
3420
def _walk_to_common_revisions(self, revision_ids):
3421
"""Walk out from revision_ids in source to revisions target has.
3423
:param revision_ids: The start point for the search.
3424
:return: A set of revision ids.
3426
target_graph = self.target.get_graph()
3427
revision_ids = frozenset(revision_ids)
3428
missing_revs = set()
3429
source_graph = self.source.get_graph()
3430
# ensure we don't pay silly lookup costs.
3431
searcher = source_graph._make_breadth_first_searcher(revision_ids)
3432
null_set = frozenset([_mod_revision.NULL_REVISION])
3433
searcher_exhausted = False
3437
# Iterate the searcher until we have enough next_revs
3438
while len(next_revs) < self._walk_to_common_revisions_batch_size:
3440
next_revs_part, ghosts_part = searcher.next_with_ghosts()
3441
next_revs.update(next_revs_part)
3442
ghosts.update(ghosts_part)
3443
except StopIteration:
3444
searcher_exhausted = True
3446
# If there are ghosts in the source graph, and the caller asked for
3447
# them, make sure that they are present in the target.
3448
# We don't care about other ghosts as we can't fetch them and
3449
# haven't been asked to.
3450
ghosts_to_check = set(revision_ids.intersection(ghosts))
3451
revs_to_get = set(next_revs).union(ghosts_to_check)
3453
have_revs = set(target_graph.get_parent_map(revs_to_get))
3454
# we always have NULL_REVISION present.
3455
have_revs = have_revs.union(null_set)
3456
# Check if the target is missing any ghosts we need.
3457
ghosts_to_check.difference_update(have_revs)
3459
# One of the caller's revision_ids is a ghost in both the
3460
# source and the target.
3461
raise errors.NoSuchRevision(
3462
self.source, ghosts_to_check.pop())
3463
missing_revs.update(next_revs - have_revs)
3464
# Because we may have walked past the original stop point, make
3465
# sure everything is stopped
3466
stop_revs = searcher.find_seen_ancestors(have_revs)
3467
searcher.stop_searching_any(stop_revs)
3468
if searcher_exhausted:
3470
return searcher.get_result()
1296
:param pb: optional progress bar to use for progress reports. If not
1297
provided a default one will be created.
1299
Returns the copied revision count and the failed revisions in a tuple:
1302
raise NotImplementedError(self.fetch)
3472
1304
@needs_read_lock
3473
def search_missing_revision_ids(self, revision_id=None, find_ghosts=True):
1305
def missing_revision_ids(self, revision_id=None):
3474
1306
"""Return the revision ids that source has that target does not.
1308
These are returned in topological order.
3476
1310
:param revision_id: only return revision ids included by this
3478
:param find_ghosts: If True find missing revisions in deep history
3479
rather than just finding the surface difference.
3480
:return: A bzrlib.graph.SearchResult.
3482
# stop searching at found target revisions.
3483
if not find_ghosts and revision_id is not None:
3484
return self._walk_to_common_revisions([revision_id])
3485
1313
# generic, possibly worst case, slow code path.
3486
1314
target_ids = set(self.target.all_revision_ids())
3487
1315
if revision_id is not None:
1316
# TODO: jam 20070210 InterRepository is internal enough that it
1317
# should assume revision_ids are already utf-8
1318
revision_id = osutils.safe_revision_id(revision_id)
3488
1319
source_ids = self.source.get_ancestry(revision_id)
3489
if source_ids[0] is not None:
3490
raise AssertionError()
1320
assert source_ids[0] is None
3491
1321
source_ids.pop(0)
3493
1323
source_ids = self.source.all_revision_ids()
3494
1324
result_set = set(source_ids).difference(target_ids)
3495
return self.source.revision_ids_to_search_result(result_set)
3498
def _same_model(source, target):
3499
"""True if source and target have the same data representation.
3501
Note: this is always called on the base class; overriding it in a
3502
subclass will have no effect.
3505
InterRepository._assert_same_model(source, target)
3507
except errors.IncompatibleRepositories, e:
3511
def _assert_same_model(source, target):
3512
"""Raise an exception if two repositories do not use the same model.
3514
if source.supports_rich_root() != target.supports_rich_root():
3515
raise errors.IncompatibleRepositories(source, target,
3516
"different rich-root support")
3517
if source._serializer != target._serializer:
3518
raise errors.IncompatibleRepositories(source, target,
3519
"different serializers")
1325
# this may look like a no-op: its not. It preserves the ordering
1326
# other_ids had while only returning the members from other_ids
1327
# that we've decided we need.
1328
return [rev_id for rev_id in source_ids if rev_id in result_set]
3522
1331
class InterSameDataRepository(InterRepository):
3523
1332
"""Code for converting between repositories that represent the same data.
3525
1334
Data format and model must match for this to work.
3529
1338
def _get_repo_format_to_test(self):
3530
"""Repository format for testing with.
3532
InterSameData can pull from subtree to subtree and from non-subtree to
3533
non-subtree, so we test this with the richest repository format.
3535
from bzrlib.repofmt import knitrepo
3536
return knitrepo.RepositoryFormatKnit3()
1339
"""Repository format for testing with."""
1340
return RepositoryFormat.get_default_format()
3539
1343
def is_compatible(source, target):
3540
return InterRepository._same_model(source, target)
1344
if source.supports_rich_root() != target.supports_rich_root():
1346
if source._serializer != target._serializer:
1351
def copy_content(self, revision_id=None):
1352
"""Make a complete copy of the content in self into destination.
1354
This is a destructive operation! Do not use it on existing
1357
:param revision_id: Only copy the content needed to construct
1358
revision_id and its parents.
1361
self.target.set_make_working_trees(self.source.make_working_trees())
1362
except NotImplementedError:
1364
# TODO: jam 20070210 This is fairly internal, so we should probably
1365
# just assert that revision_id is not unicode.
1366
revision_id = osutils.safe_revision_id(revision_id)
1367
# but don't bother fetching if we have the needed data now.
1368
if (revision_id not in (None, _mod_revision.NULL_REVISION) and
1369
self.target.has_revision(revision_id)):
1371
self.target.fetch(self.source, revision_id=revision_id)
1374
def fetch(self, revision_id=None, pb=None):
1375
"""See InterRepository.fetch()."""
1376
from bzrlib.fetch import GenericRepoFetcher
1377
mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
1378
self.source, self.source._format, self.target,
1379
self.target._format)
1380
# TODO: jam 20070210 This should be an assert, not a translate
1381
revision_id = osutils.safe_revision_id(revision_id)
1382
f = GenericRepoFetcher(to_repository=self.target,
1383
from_repository=self.source,
1384
last_revision=revision_id,
1386
return f.count_copied, f.failed_revisions
3543
1389
class InterWeaveRepo(InterSameDataRepository):
3544
"""Optimised code paths between Weave based repositories.
3546
This should be in bzrlib/repofmt/weaverepo.py but we have not yet
3547
implemented lazy inter-object optimisation.
1390
"""Optimised code paths between Weave based repositories."""
3551
1393
def _get_repo_format_to_test(self):
3720
1583
def is_compatible(source, target):
3721
"""Be compatible with Knit2 source and Knit3 target"""
3722
# This is redundant with format.check_conversion_target(), however that
3723
# raises an exception, and we just want to say "False" as in we won't
3724
# support converting between these formats.
3725
if 'IDS_never' in debug.debug_flags:
3727
if source.supports_rich_root() and not target.supports_rich_root():
3729
if (source._format.supports_tree_reference
3730
and not target._format.supports_tree_reference):
3732
if target._fallback_repositories and target._format.supports_chks:
3733
# IDS doesn't know how to copy CHKs for the parent inventories it
3734
# adds to stacked repos.
3736
if 'IDS_always' in debug.debug_flags:
1584
if not source.supports_rich_root() and target.supports_rich_root():
3738
# Only use this code path for local source and target. IDS does far
3739
# too much IO (both bandwidth and roundtrips) over a network.
3740
if not source.bzrdir.transport.base.startswith('file:///'):
3742
if not target.bzrdir.transport.base.startswith('file:///'):
3746
def _get_trees(self, revision_ids, cache):
3748
for rev_id in revision_ids:
3750
possible_trees.append((rev_id, cache[rev_id]))
3752
# Not cached, but inventory might be present anyway.
3754
tree = self.source.revision_tree(rev_id)
3755
except errors.NoSuchRevision:
3756
# Nope, parent is ghost.
3759
cache[rev_id] = tree
3760
possible_trees.append((rev_id, tree))
3761
return possible_trees
3763
def _get_delta_for_revision(self, tree, parent_ids, possible_trees):
3764
"""Get the best delta and base for this revision.
3766
:return: (basis_id, delta)
3769
# Generate deltas against each tree, to find the shortest.
3770
texts_possibly_new_in_tree = set()
3771
for basis_id, basis_tree in possible_trees:
3772
delta = tree.inventory._make_delta(basis_tree.inventory)
3773
for old_path, new_path, file_id, new_entry in delta:
3774
if new_path is None:
3775
# This file_id isn't present in the new rev, so we don't
3779
# Rich roots are handled elsewhere...
3781
kind = new_entry.kind
3782
if kind != 'directory' and kind != 'file':
3783
# No text record associated with this inventory entry.
3785
# This is a directory or file that has changed somehow.
3786
texts_possibly_new_in_tree.add((file_id, new_entry.revision))
3787
deltas.append((len(delta), basis_id, delta))
3789
return deltas[0][1:]
3791
def _fetch_parent_invs_for_stacking(self, parent_map, cache):
3792
"""Find all parent revisions that are absent, but for which the
3793
inventory is present, and copy those inventories.
3795
This is necessary to preserve correctness when the source is stacked
3796
without fallbacks configured. (Note that in cases like upgrade the
3797
source may be not have _fallback_repositories even though it is
3801
for parents in parent_map.values():
3802
parent_revs.update(parents)
3803
present_parents = self.source.get_parent_map(parent_revs)
3804
absent_parents = set(parent_revs).difference(present_parents)
3805
parent_invs_keys_for_stacking = self.source.inventories.get_parent_map(
3806
(rev_id,) for rev_id in absent_parents)
3807
parent_inv_ids = [key[-1] for key in parent_invs_keys_for_stacking]
3808
for parent_tree in self.source.revision_trees(parent_inv_ids):
3809
current_revision_id = parent_tree.get_revision_id()
3810
parents_parents_keys = parent_invs_keys_for_stacking[
3811
(current_revision_id,)]
3812
parents_parents = [key[-1] for key in parents_parents_keys]
3813
basis_id = _mod_revision.NULL_REVISION
3814
basis_tree = self.source.revision_tree(basis_id)
3815
delta = parent_tree.inventory._make_delta(basis_tree.inventory)
3816
self.target.add_inventory_by_delta(
3817
basis_id, delta, current_revision_id, parents_parents)
3818
cache[current_revision_id] = parent_tree
3820
def _fetch_batch(self, revision_ids, basis_id, cache, a_graph=None):
3821
"""Fetch across a few revisions.
3823
:param revision_ids: The revisions to copy
3824
:param basis_id: The revision_id of a tree that must be in cache, used
3825
as a basis for delta when no other base is available
3826
:param cache: A cache of RevisionTrees that we can use.
3827
:param a_graph: A Graph object to determine the heads() of the
3828
rich-root data stream.
3829
:return: The revision_id of the last converted tree. The RevisionTree
3830
for it will be in cache
3832
# Walk though all revisions; get inventory deltas, copy referenced
3833
# texts that delta references, insert the delta, revision and
3835
root_keys_to_create = set()
3838
pending_revisions = []
3839
parent_map = self.source.get_parent_map(revision_ids)
3840
self._fetch_parent_invs_for_stacking(parent_map, cache)
3841
self.source._safe_to_return_from_cache = True
3842
for tree in self.source.revision_trees(revision_ids):
3843
# Find a inventory delta for this revision.
3844
# Find text entries that need to be copied, too.
3845
current_revision_id = tree.get_revision_id()
3846
parent_ids = parent_map.get(current_revision_id, ())
3847
parent_trees = self._get_trees(parent_ids, cache)
3848
possible_trees = list(parent_trees)
3849
if len(possible_trees) == 0:
3850
# There either aren't any parents, or the parents are ghosts,
3851
# so just use the last converted tree.
3852
possible_trees.append((basis_id, cache[basis_id]))
3853
basis_id, delta = self._get_delta_for_revision(tree, parent_ids,
3855
revision = self.source.get_revision(current_revision_id)
3856
pending_deltas.append((basis_id, delta,
3857
current_revision_id, revision.parent_ids))
3858
if self._converting_to_rich_root:
3859
self._revision_id_to_root_id[current_revision_id] = \
3861
# Determine which texts are in present in this revision but not in
3862
# any of the available parents.
3863
texts_possibly_new_in_tree = set()
3864
for old_path, new_path, file_id, entry in delta:
3865
if new_path is None:
3866
# This file_id isn't present in the new rev
3870
if not self.target.supports_rich_root():
3871
# The target doesn't support rich root, so we don't
3874
if self._converting_to_rich_root:
3875
# This can't be copied normally, we have to insert
3877
root_keys_to_create.add((file_id, entry.revision))
3880
texts_possibly_new_in_tree.add((file_id, entry.revision))
3881
for basis_id, basis_tree in possible_trees:
3882
basis_inv = basis_tree.inventory
3883
for file_key in list(texts_possibly_new_in_tree):
3884
file_id, file_revision = file_key
3886
entry = basis_inv[file_id]
3887
except errors.NoSuchId:
3889
if entry.revision == file_revision:
3890
texts_possibly_new_in_tree.remove(file_key)
3891
text_keys.update(texts_possibly_new_in_tree)
3892
pending_revisions.append(revision)
3893
cache[current_revision_id] = tree
3894
basis_id = current_revision_id
3895
self.source._safe_to_return_from_cache = False
3897
from_texts = self.source.texts
3898
to_texts = self.target.texts
3899
if root_keys_to_create:
3900
root_stream = _mod_fetch._new_root_data_stream(
3901
root_keys_to_create, self._revision_id_to_root_id, parent_map,
3902
self.source, graph=a_graph)
3903
to_texts.insert_record_stream(root_stream)
3904
to_texts.insert_record_stream(from_texts.get_record_stream(
3905
text_keys, self.target._format._fetch_order,
3906
not self.target._format._fetch_uses_deltas))
3907
# insert inventory deltas
3908
for delta in pending_deltas:
3909
self.target.add_inventory_by_delta(*delta)
3910
if self.target._fallback_repositories:
3911
# Make sure this stacked repository has all the parent inventories
3912
# for the new revisions that we are about to insert. We do this
3913
# before adding the revisions so that no revision is added until
3914
# all the inventories it may depend on are added.
3915
# Note that this is overzealous, as we may have fetched these in an
3918
revision_ids = set()
3919
for revision in pending_revisions:
3920
revision_ids.add(revision.revision_id)
3921
parent_ids.update(revision.parent_ids)
3922
parent_ids.difference_update(revision_ids)
3923
parent_ids.discard(_mod_revision.NULL_REVISION)
3924
parent_map = self.source.get_parent_map(parent_ids)
3925
# we iterate over parent_map and not parent_ids because we don't
3926
# want to try copying any revision which is a ghost
3927
for parent_tree in self.source.revision_trees(parent_map):
3928
current_revision_id = parent_tree.get_revision_id()
3929
parents_parents = parent_map[current_revision_id]
3930
possible_trees = self._get_trees(parents_parents, cache)
3931
if len(possible_trees) == 0:
3932
# There either aren't any parents, or the parents are
3933
# ghosts, so just use the last converted tree.
3934
possible_trees.append((basis_id, cache[basis_id]))
3935
basis_id, delta = self._get_delta_for_revision(parent_tree,
3936
parents_parents, possible_trees)
3937
self.target.add_inventory_by_delta(
3938
basis_id, delta, current_revision_id, parents_parents)
3939
# insert signatures and revisions
3940
for revision in pending_revisions:
3942
signature = self.source.get_signature_text(
3943
revision.revision_id)
3944
self.target.add_signature_text(revision.revision_id,
3946
except errors.NoSuchRevision:
3948
self.target.add_revision(revision.revision_id, revision)
3951
def _fetch_all_revisions(self, revision_ids, pb):
3952
"""Fetch everything for the list of revisions.
3954
:param revision_ids: The list of revisions to fetch. Must be in
3956
:param pb: A ProgressTask
3959
basis_id, basis_tree = self._get_basis(revision_ids[0])
3961
cache = lru_cache.LRUCache(100)
3962
cache[basis_id] = basis_tree
3963
del basis_tree # We don't want to hang on to it here
3965
if self._converting_to_rich_root and len(revision_ids) > 100:
3966
a_graph = _mod_fetch._get_rich_root_heads_graph(self.source,
3971
for offset in range(0, len(revision_ids), batch_size):
3972
self.target.start_write_group()
3974
pb.update('Transferring revisions', offset,
3976
batch = revision_ids[offset:offset+batch_size]
3977
basis_id = self._fetch_batch(batch, basis_id, cache,
3980
self.source._safe_to_return_from_cache = False
3981
self.target.abort_write_group()
3984
hint = self.target.commit_write_group()
3987
if hints and self.target._format.pack_compresses:
3988
self.target.pack(hint=hints)
3989
pb.update('Transferring revisions', len(revision_ids),
3993
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
3995
"""See InterRepository.fetch()."""
3996
if fetch_spec is not None:
3997
raise AssertionError("Not implemented yet...")
3998
# See <https://launchpad.net/bugs/456077> asking for a warning here
4000
# nb this is only active for local-local fetches; other things using
4002
ui.ui_factory.warn_cross_format_fetch(self.source._format,
4003
self.target._format)
4004
ui.ui_factory.warn_experimental_format_fetch(self)
4005
if (not self.source.supports_rich_root()
4006
and self.target.supports_rich_root()):
4007
self._converting_to_rich_root = True
4008
self._revision_id_to_root_id = {}
4010
self._converting_to_rich_root = False
4011
revision_ids = self.target.search_missing_revision_ids(self.source,
4012
revision_id, find_ghosts=find_ghosts).get_keys()
4013
if not revision_ids:
4015
revision_ids = tsort.topo_sort(
4016
self.source.get_graph().get_parent_map(revision_ids))
4017
if not revision_ids:
4019
# Walk though all revisions; get inventory deltas, copy referenced
4020
# texts that delta references, insert the delta, revision and
4023
my_pb = ui.ui_factory.nested_progress_bar()
4026
symbol_versioning.warn(
4027
symbol_versioning.deprecated_in((1, 14, 0))
4028
% "pb parameter to fetch()")
4031
self._fetch_all_revisions(revision_ids, pb)
4033
if my_pb is not None:
4035
return len(revision_ids), 0
4037
def _get_basis(self, first_revision_id):
4038
"""Get a revision and tree which exists in the target.
4040
This assumes that first_revision_id is selected for transmission
4041
because all other ancestors are already present. If we can't find an
4042
ancestor we fall back to NULL_REVISION since we know that is safe.
4044
:return: (basis_id, basis_tree)
4046
first_rev = self.source.get_revision(first_revision_id)
4048
basis_id = first_rev.parent_ids[0]
4049
# only valid as a basis if the target has it
4050
self.target.get_revision(basis_id)
4051
# Try to get a basis tree - if its a ghost it will hit the
4052
# NoSuchRevision case.
4053
basis_tree = self.source.revision_tree(basis_id)
4054
except (IndexError, errors.NoSuchRevision):
4055
basis_id = _mod_revision.NULL_REVISION
4056
basis_tree = self.source.revision_tree(basis_id)
4057
return basis_id, basis_tree
4060
InterRepository.register_optimiser(InterDifferingSerializer)
1590
def fetch(self, revision_id=None, pb=None):
1591
"""See InterRepository.fetch()."""
1592
from bzrlib.fetch import Model1toKnit2Fetcher
1593
# TODO: jam 20070210 This should be an assert, not a translate
1594
revision_id = osutils.safe_revision_id(revision_id)
1595
f = Model1toKnit2Fetcher(to_repository=self.target,
1596
from_repository=self.source,
1597
last_revision=revision_id,
1599
return f.count_copied, f.failed_revisions
1602
def copy_content(self, revision_id=None):
1603
"""Make a complete copy of the content in self into destination.
1605
This is a destructive operation! Do not use it on existing
1608
:param revision_id: Only copy the content needed to construct
1609
revision_id and its parents.
1612
self.target.set_make_working_trees(self.source.make_working_trees())
1613
except NotImplementedError:
1615
# TODO: jam 20070210 Internal, assert, don't translate
1616
revision_id = osutils.safe_revision_id(revision_id)
1617
# but don't bother fetching if we have the needed data now.
1618
if (revision_id not in (None, _mod_revision.NULL_REVISION) and
1619
self.target.has_revision(revision_id)):
1621
self.target.fetch(self.source, revision_id=revision_id)
1624
class InterKnit1and2(InterKnitRepo):
1627
def _get_repo_format_to_test(self):
1631
def is_compatible(source, target):
1632
"""Be compatible with Knit1 source and Knit3 target"""
1633
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit3
1635
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit1, \
1636
RepositoryFormatKnit3
1637
return (isinstance(source._format, (RepositoryFormatKnit1)) and
1638
isinstance(target._format, (RepositoryFormatKnit3)))
1639
except AttributeError:
1643
def fetch(self, revision_id=None, pb=None):
1644
"""See InterRepository.fetch()."""
1645
from bzrlib.fetch import Knit1to2Fetcher
1646
mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
1647
self.source, self.source._format, self.target,
1648
self.target._format)
1649
# TODO: jam 20070210 This should be an assert, not a translate
1650
revision_id = osutils.safe_revision_id(revision_id)
1651
f = Knit1to2Fetcher(to_repository=self.target,
1652
from_repository=self.source,
1653
last_revision=revision_id,
1655
return f.count_copied, f.failed_revisions
4061
1658
InterRepository.register_optimiser(InterSameDataRepository)
4062
1659
InterRepository.register_optimiser(InterWeaveRepo)
4063
1660
InterRepository.register_optimiser(InterKnitRepo)
1661
InterRepository.register_optimiser(InterModel1and2)
1662
InterRepository.register_optimiser(InterKnit1and2)
1665
class RepositoryTestProviderAdapter(object):
1666
"""A tool to generate a suite testing multiple repository formats at once.
1668
This is done by copying the test once for each transport and injecting
1669
the transport_server, transport_readonly_server, and bzrdir_format and
1670
repository_format classes into each copy. Each copy is also given a new id()
1671
to make it easy to identify.
1674
def __init__(self, transport_server, transport_readonly_server, formats):
1675
self._transport_server = transport_server
1676
self._transport_readonly_server = transport_readonly_server
1677
self._formats = formats
1679
def adapt(self, test):
1680
result = unittest.TestSuite()
1681
for repository_format, bzrdir_format in self._formats:
1682
from copy import deepcopy
1683
new_test = deepcopy(test)
1684
new_test.transport_server = self._transport_server
1685
new_test.transport_readonly_server = self._transport_readonly_server
1686
new_test.bzrdir_format = bzrdir_format
1687
new_test.repository_format = repository_format
1688
def make_new_test_id():
1689
new_id = "%s(%s)" % (new_test.id(), repository_format.__class__.__name__)
1690
return lambda: new_id
1691
new_test.id = make_new_test_id()
1692
result.addTest(new_test)
1696
class InterRepositoryTestProviderAdapter(object):
1697
"""A tool to generate a suite testing multiple inter repository formats.
1699
This is done by copying the test once for each interrepo provider and injecting
1700
the transport_server, transport_readonly_server, repository_format and
1701
repository_to_format classes into each copy.
1702
Each copy is also given a new id() to make it easy to identify.
1705
def __init__(self, transport_server, transport_readonly_server, formats):
1706
self._transport_server = transport_server
1707
self._transport_readonly_server = transport_readonly_server
1708
self._formats = formats
1710
def adapt(self, test):
1711
result = unittest.TestSuite()
1712
for interrepo_class, repository_format, repository_format_to in self._formats:
1713
from copy import deepcopy
1714
new_test = deepcopy(test)
1715
new_test.transport_server = self._transport_server
1716
new_test.transport_readonly_server = self._transport_readonly_server
1717
new_test.interrepo_class = interrepo_class
1718
new_test.repository_format = repository_format
1719
new_test.repository_format_to = repository_format_to
1720
def make_new_test_id():
1721
new_id = "%s(%s)" % (new_test.id(), interrepo_class.__name__)
1722
return lambda: new_id
1723
new_test.id = make_new_test_id()
1724
result.addTest(new_test)
1728
def default_test_list():
1729
"""Generate the default list of interrepo permutations to test."""
1730
from bzrlib.repofmt import knitrepo, weaverepo
1732
# test the default InterRepository between format 6 and the current
1734
# XXX: robertc 20060220 reinstate this when there are two supported
1735
# formats which do not have an optimal code path between them.
1736
#result.append((InterRepository,
1737
# RepositoryFormat6(),
1738
# RepositoryFormatKnit1()))
1739
for optimiser_class in InterRepository._optimisers:
1740
format_to_test = optimiser_class._get_repo_format_to_test()
1741
if format_to_test is not None:
1742
result.append((optimiser_class,
1743
format_to_test, format_to_test))
1744
# if there are specific combinations we want to use, we can add them
1746
result.append((InterModel1and2,
1747
weaverepo.RepositoryFormat5(),
1748
knitrepo.RepositoryFormatKnit3()))
1749
result.append((InterKnit1and2,
1750
knitrepo.RepositoryFormatKnit1(),
1751
knitrepo.RepositoryFormatKnit3()))
4066
1755
class CopyConverter(object):
4067
1756
"""A repository conversion tool which just performs a copy of the content.
4069
1758
This is slow but quite reliable.
4075
1764
:param target_format: The format the resulting repository should be.
4077
1766
self.target_format = target_format
4079
1768
def convert(self, repo, pb):
4080
1769
"""Perform the conversion of to_convert, giving feedback via pb.
4082
1771
:param to_convert: The disk object to convert.
4083
1772
:param pb: a progress bar to use for progress information.
4085
pb = ui.ui_factory.nested_progress_bar()
4088
1777
# this is only useful with metadir layouts - separated repo content.
4089
1778
# trigger an assertion if not such
4090
1779
repo._format.get_format_string()
4091
1780
self.repo_dir = repo.bzrdir
4092
pb.update('Moving repository to repository.backup')
1781
self.step('Moving repository to repository.backup')
4093
1782
self.repo_dir.transport.move('repository', 'repository.backup')
4094
1783
backup_transport = self.repo_dir.transport.clone('repository.backup')
4095
1784
repo._format.check_conversion_target(self.target_format)
4096
1785
self.source_repo = repo._format.open(self.repo_dir,
4098
1787
_override_transport=backup_transport)
4099
pb.update('Creating new repository')
1788
self.step('Creating new repository')
4100
1789
converted = self.target_format.initialize(self.repo_dir,
4101
1790
self.source_repo.is_shared())
4102
1791
converted.lock_write()
4104
pb.update('Copying content')
1793
self.step('Copying content into repository.')
4105
1794
self.source_repo.copy_content_into(converted)
4107
1796
converted.unlock()
4108
pb.update('Deleting old repository content')
1797
self.step('Deleting old repository content.')
4109
1798
self.repo_dir.transport.delete_tree('repository.backup')
4110
ui.ui_factory.note('repository converted')
1799
self.pb.note('repository converted')
1801
def step(self, message):
1802
"""Update the pb by a step."""
1804
self.pb.update(message, self.count, self.total)
1807
class CommitBuilder(object):
1808
"""Provides an interface to build up a commit.
1810
This allows describing a tree to be committed without needing to
1811
know the internals of the format of the repository.
1814
record_root_entry = False
1815
def __init__(self, repository, parents, config, timestamp=None,
1816
timezone=None, committer=None, revprops=None,
1818
"""Initiate a CommitBuilder.
1820
:param repository: Repository to commit to.
1821
:param parents: Revision ids of the parents of the new revision.
1822
:param config: Configuration to use.
1823
:param timestamp: Optional timestamp recorded for commit.
1824
:param timezone: Optional timezone for timestamp.
1825
:param committer: Optional committer to set for commit.
1826
:param revprops: Optional dictionary of revision properties.
1827
:param revision_id: Optional revision id.
1829
self._config = config
1831
if committer is None:
1832
self._committer = self._config.username()
1834
assert isinstance(committer, basestring), type(committer)
1835
self._committer = committer
1837
self.new_inventory = Inventory(None)
1838
self._new_revision_id = osutils.safe_revision_id(revision_id)
1839
self.parents = parents
1840
self.repository = repository
1843
if revprops is not None:
1844
self._revprops.update(revprops)
1846
if timestamp is None:
1847
timestamp = time.time()
1848
# Restrict resolution to 1ms
1849
self._timestamp = round(timestamp, 3)
1851
if timezone is None:
1852
self._timezone = osutils.local_time_offset()
1854
self._timezone = int(timezone)
1856
self._generate_revision_if_needed()
1858
def commit(self, message):
1859
"""Make the actual commit.
1861
:return: The revision id of the recorded revision.
1863
rev = _mod_revision.Revision(
1864
timestamp=self._timestamp,
1865
timezone=self._timezone,
1866
committer=self._committer,
1868
inventory_sha1=self.inv_sha1,
1869
revision_id=self._new_revision_id,
1870
properties=self._revprops)
1871
rev.parent_ids = self.parents
1872
self.repository.add_revision(self._new_revision_id, rev,
1873
self.new_inventory, self._config)
1874
return self._new_revision_id
1876
def revision_tree(self):
1877
"""Return the tree that was just committed.
1879
After calling commit() this can be called to get a RevisionTree
1880
representing the newly committed tree. This is preferred to
1881
calling Repository.revision_tree() because that may require
1882
deserializing the inventory, while we already have a copy in
1885
return RevisionTree(self.repository, self.new_inventory,
1886
self._new_revision_id)
1888
def finish_inventory(self):
1889
"""Tell the builder that the inventory is finished."""
1890
if self.new_inventory.root is None:
1891
symbol_versioning.warn('Root entry should be supplied to'
1892
' record_entry_contents, as of bzr 0.10.',
1893
DeprecationWarning, stacklevel=2)
1894
self.new_inventory.add(InventoryDirectory(ROOT_ID, '', None))
1895
self.new_inventory.revision_id = self._new_revision_id
1896
self.inv_sha1 = self.repository.add_inventory(
1897
self._new_revision_id,
1902
def _gen_revision_id(self):
1903
"""Return new revision-id."""
1904
return generate_ids.gen_revision_id(self._config.username(),
1907
def _generate_revision_if_needed(self):
1908
"""Create a revision id if None was supplied.
1910
If the repository can not support user-specified revision ids
1911
they should override this function and raise CannotSetRevisionId
1912
if _new_revision_id is not None.
1914
:raises: CannotSetRevisionId
1916
if self._new_revision_id is None:
1917
self._new_revision_id = self._gen_revision_id()
1919
def record_entry_contents(self, ie, parent_invs, path, tree):
1920
"""Record the content of ie from tree into the commit if needed.
1922
Side effect: sets ie.revision when unchanged
1924
:param ie: An inventory entry present in the commit.
1925
:param parent_invs: The inventories of the parent revisions of the
1927
:param path: The path the entry is at in the tree.
1928
:param tree: The tree which contains this entry and should be used to
1931
if self.new_inventory.root is None and ie.parent_id is not None:
1932
symbol_versioning.warn('Root entry should be supplied to'
1933
' record_entry_contents, as of bzr 0.10.',
1934
DeprecationWarning, stacklevel=2)
1935
self.record_entry_contents(tree.inventory.root.copy(), parent_invs,
1937
self.new_inventory.add(ie)
1939
# ie.revision is always None if the InventoryEntry is considered
1940
# for committing. ie.snapshot will record the correct revision
1941
# which may be the sole parent if it is untouched.
1942
if ie.revision is not None:
1945
# In this revision format, root entries have no knit or weave
1946
if ie is self.new_inventory.root:
1947
# When serializing out to disk and back in
1948
# root.revision is always _new_revision_id
1949
ie.revision = self._new_revision_id
1951
previous_entries = ie.find_previous_heads(
1953
self.repository.weave_store,
1954
self.repository.get_transaction())
1955
# we are creating a new revision for ie in the history store
1957
ie.snapshot(self._new_revision_id, path, previous_entries, tree, self)
1959
def modified_directory(self, file_id, file_parents):
1960
"""Record the presence of a symbolic link.
1962
:param file_id: The file_id of the link to record.
1963
:param file_parents: The per-file parent revision ids.
1965
self._add_text_to_weave(file_id, [], file_parents.keys())
1967
def modified_reference(self, file_id, file_parents):
1968
"""Record the modification of a reference.
1970
:param file_id: The file_id of the link to record.
1971
:param file_parents: The per-file parent revision ids.
1973
self._add_text_to_weave(file_id, [], file_parents.keys())
1975
def modified_file_text(self, file_id, file_parents,
1976
get_content_byte_lines, text_sha1=None,
1978
"""Record the text of file file_id
1980
:param file_id: The file_id of the file to record the text of.
1981
:param file_parents: The per-file parent revision ids.
1982
:param get_content_byte_lines: A callable which will return the byte
1984
:param text_sha1: Optional SHA1 of the file contents.
1985
:param text_size: Optional size of the file contents.
1987
# mutter('storing text of file {%s} in revision {%s} into %r',
1988
# file_id, self._new_revision_id, self.repository.weave_store)
1989
# special case to avoid diffing on renames or
1991
if (len(file_parents) == 1
1992
and text_sha1 == file_parents.values()[0].text_sha1
1993
and text_size == file_parents.values()[0].text_size):
1994
previous_ie = file_parents.values()[0]
1995
versionedfile = self.repository.weave_store.get_weave(file_id,
1996
self.repository.get_transaction())
1997
versionedfile.clone_text(self._new_revision_id,
1998
previous_ie.revision, file_parents.keys())
1999
return text_sha1, text_size
2001
new_lines = get_content_byte_lines()
2002
# TODO: Rather than invoking sha_strings here, _add_text_to_weave
2003
# should return the SHA1 and size
2004
self._add_text_to_weave(file_id, new_lines, file_parents.keys())
2005
return osutils.sha_strings(new_lines), \
2006
sum(map(len, new_lines))
2008
def modified_link(self, file_id, file_parents, link_target):
2009
"""Record the presence of a symbolic link.
2011
:param file_id: The file_id of the link to record.
2012
:param file_parents: The per-file parent revision ids.
2013
:param link_target: Target location of this link.
2015
self._add_text_to_weave(file_id, [], file_parents.keys())
2017
def _add_text_to_weave(self, file_id, new_lines, parents):
2018
versionedfile = self.repository.weave_store.get_weave_or_empty(
2019
file_id, self.repository.get_transaction())
2020
versionedfile.add_lines(self._new_revision_id, parents, new_lines)
2021
versionedfile.clear_cache()
2024
class _CommitBuilder(CommitBuilder):
2025
"""Temporary class so old CommitBuilders are detected properly
2027
Note: CommitBuilder works whether or not root entry is recorded.
2030
record_root_entry = True
2033
class RootCommitBuilder(CommitBuilder):
2034
"""This commitbuilder actually records the root id"""
2036
record_root_entry = True
2038
def record_entry_contents(self, ie, parent_invs, path, tree):
2039
"""Record the content of ie from tree into the commit if needed.
2041
Side effect: sets ie.revision when unchanged
2043
:param ie: An inventory entry present in the commit.
2044
:param parent_invs: The inventories of the parent revisions of the
2046
:param path: The path the entry is at in the tree.
2047
:param tree: The tree which contains this entry and should be used to
2050
assert self.new_inventory.root is not None or ie.parent_id is None
2051
self.new_inventory.add(ie)
2053
# ie.revision is always None if the InventoryEntry is considered
2054
# for committing. ie.snapshot will record the correct revision
2055
# which may be the sole parent if it is untouched.
2056
if ie.revision is not None:
2059
previous_entries = ie.find_previous_heads(
2061
self.repository.weave_store,
2062
self.repository.get_transaction())
2063
# we are creating a new revision for ie in the history store
2065
ie.snapshot(self._new_revision_id, path, previous_entries, tree, self)
4114
2068
_unescape_map = {
4139
2093
if _unescape_re is None:
4140
2094
_unescape_re = re.compile('\&([^;]*);')
4141
2095
return _unescape_re.sub(_unescaper, data)
4144
class _VersionedFileChecker(object):
4146
def __init__(self, repository, text_key_references=None, ancestors=None):
4147
self.repository = repository
4148
self.text_index = self.repository._generate_text_key_index(
4149
text_key_references=text_key_references, ancestors=ancestors)
4151
def calculate_file_version_parents(self, text_key):
4152
"""Calculate the correct parents for a file version according to
4155
parent_keys = self.text_index[text_key]
4156
if parent_keys == [_mod_revision.NULL_REVISION]:
4158
return tuple(parent_keys)
4160
def check_file_version_parents(self, texts, progress_bar=None):
4161
"""Check the parents stored in a versioned file are correct.
4163
It also detects file versions that are not referenced by their
4164
corresponding revision's inventory.
4166
:returns: A tuple of (wrong_parents, dangling_file_versions).
4167
wrong_parents is a dict mapping {revision_id: (stored_parents,
4168
correct_parents)} for each revision_id where the stored parents
4169
are not correct. dangling_file_versions is a set of (file_id,
4170
revision_id) tuples for versions that are present in this versioned
4171
file, but not used by the corresponding inventory.
4173
local_progress = None
4174
if progress_bar is None:
4175
local_progress = ui.ui_factory.nested_progress_bar()
4176
progress_bar = local_progress
4178
return self._check_file_version_parents(texts, progress_bar)
4181
local_progress.finished()
4183
def _check_file_version_parents(self, texts, progress_bar):
4184
"""See check_file_version_parents."""
4186
self.file_ids = set([file_id for file_id, _ in
4187
self.text_index.iterkeys()])
4188
# text keys is now grouped by file_id
4189
n_versions = len(self.text_index)
4190
progress_bar.update('loading text store', 0, n_versions)
4191
parent_map = self.repository.texts.get_parent_map(self.text_index)
4192
# On unlistable transports this could well be empty/error...
4193
text_keys = self.repository.texts.keys()
4194
unused_keys = frozenset(text_keys) - set(self.text_index)
4195
for num, key in enumerate(self.text_index.iterkeys()):
4196
progress_bar.update('checking text graph', num, n_versions)
4197
correct_parents = self.calculate_file_version_parents(key)
4199
knit_parents = parent_map[key]
4200
except errors.RevisionNotPresent:
4203
if correct_parents != knit_parents:
4204
wrong_parents[key] = (knit_parents, correct_parents)
4205
return wrong_parents, unused_keys
4208
def _old_get_graph(repository, revision_id):
4209
"""DO NOT USE. That is all. I'm serious."""
4210
graph = repository.get_graph()
4211
revision_graph = dict(((key, value) for key, value in
4212
graph.iter_ancestry([revision_id]) if value is not None))
4213
return _strip_NULL_ghosts(revision_graph)
4216
def _strip_NULL_ghosts(revision_graph):
4217
"""Also don't use this. more compatibility code for unmigrated clients."""
4218
# Filter ghosts, and null:
4219
if _mod_revision.NULL_REVISION in revision_graph:
4220
del revision_graph[_mod_revision.NULL_REVISION]
4221
for key, parents in revision_graph.items():
4222
revision_graph[key] = tuple(parent for parent in parents if parent
4224
return revision_graph
4227
class StreamSink(object):
4228
"""An object that can insert a stream into a repository.
4230
This interface handles the complexity of reserialising inventories and
4231
revisions from different formats, and allows unidirectional insertion into
4232
stacked repositories without looking for the missing basis parents
4236
def __init__(self, target_repo):
4237
self.target_repo = target_repo
4239
def insert_stream(self, stream, src_format, resume_tokens):
4240
"""Insert a stream's content into the target repository.
4242
:param src_format: a bzr repository format.
4244
:return: a list of resume tokens and an iterable of keys additional
4245
items required before the insertion can be completed.
4247
self.target_repo.lock_write()
4250
self.target_repo.resume_write_group(resume_tokens)
4253
self.target_repo.start_write_group()
4256
# locked_insert_stream performs a commit|suspend.
4257
return self._locked_insert_stream(stream, src_format, is_resume)
4259
self.target_repo.abort_write_group(suppress_errors=True)
4262
self.target_repo.unlock()
4264
def _locked_insert_stream(self, stream, src_format, is_resume):
4265
to_serializer = self.target_repo._format._serializer
4266
src_serializer = src_format._serializer
4268
if to_serializer == src_serializer:
4269
# If serializers match and the target is a pack repository, set the
4270
# write cache size on the new pack. This avoids poor performance
4271
# on transports where append is unbuffered (such as
4272
# RemoteTransport). This is safe to do because nothing should read
4273
# back from the target repository while a stream with matching
4274
# serialization is being inserted.
4275
# The exception is that a delta record from the source that should
4276
# be a fulltext may need to be expanded by the target (see
4277
# test_fetch_revisions_with_deltas_into_pack); but we take care to
4278
# explicitly flush any buffered writes first in that rare case.
4280
new_pack = self.target_repo._pack_collection._new_pack
4281
except AttributeError:
4282
# Not a pack repository
4285
new_pack.set_write_cache_size(1024*1024)
4286
for substream_type, substream in stream:
4287
if 'stream' in debug.debug_flags:
4288
mutter('inserting substream: %s', substream_type)
4289
if substream_type == 'texts':
4290
self.target_repo.texts.insert_record_stream(substream)
4291
elif substream_type == 'inventories':
4292
if src_serializer == to_serializer:
4293
self.target_repo.inventories.insert_record_stream(
4296
self._extract_and_insert_inventories(
4297
substream, src_serializer)
4298
elif substream_type == 'inventory-deltas':
4299
ui.ui_factory.warn_cross_format_fetch(src_format,
4300
self.target_repo._format)
4301
self._extract_and_insert_inventory_deltas(
4302
substream, src_serializer)
4303
elif substream_type == 'chk_bytes':
4304
# XXX: This doesn't support conversions, as it assumes the
4305
# conversion was done in the fetch code.
4306
self.target_repo.chk_bytes.insert_record_stream(substream)
4307
elif substream_type == 'revisions':
4308
# This may fallback to extract-and-insert more often than
4309
# required if the serializers are different only in terms of
4311
if src_serializer == to_serializer:
4312
self.target_repo.revisions.insert_record_stream(
4315
self._extract_and_insert_revisions(substream,
4317
elif substream_type == 'signatures':
4318
self.target_repo.signatures.insert_record_stream(substream)
4320
raise AssertionError('kaboom! %s' % (substream_type,))
4321
# Done inserting data, and the missing_keys calculations will try to
4322
# read back from the inserted data, so flush the writes to the new pack
4323
# (if this is pack format).
4324
if new_pack is not None:
4325
new_pack._write_data('', flush=True)
4326
# Find all the new revisions (including ones from resume_tokens)
4327
missing_keys = self.target_repo.get_missing_parent_inventories(
4328
check_for_missing_texts=is_resume)
4330
for prefix, versioned_file in (
4331
('texts', self.target_repo.texts),
4332
('inventories', self.target_repo.inventories),
4333
('revisions', self.target_repo.revisions),
4334
('signatures', self.target_repo.signatures),
4335
('chk_bytes', self.target_repo.chk_bytes),
4337
if versioned_file is None:
4339
# TODO: key is often going to be a StaticTuple object
4340
# I don't believe we can define a method by which
4341
# (prefix,) + StaticTuple will work, though we could
4342
# define a StaticTuple.sq_concat that would allow you to
4343
# pass in either a tuple or a StaticTuple as the second
4344
# object, so instead we could have:
4345
# StaticTuple(prefix) + key here...
4346
missing_keys.update((prefix,) + key for key in
4347
versioned_file.get_missing_compression_parent_keys())
4348
except NotImplementedError:
4349
# cannot even attempt suspending, and missing would have failed
4350
# during stream insertion.
4351
missing_keys = set()
4354
# suspend the write group and tell the caller what we is
4355
# missing. We know we can suspend or else we would not have
4356
# entered this code path. (All repositories that can handle
4357
# missing keys can handle suspending a write group).
4358
write_group_tokens = self.target_repo.suspend_write_group()
4359
return write_group_tokens, missing_keys
4360
hint = self.target_repo.commit_write_group()
4361
if (to_serializer != src_serializer and
4362
self.target_repo._format.pack_compresses):
4363
self.target_repo.pack(hint=hint)
4366
def _extract_and_insert_inventory_deltas(self, substream, serializer):
4367
target_rich_root = self.target_repo._format.rich_root_data
4368
target_tree_refs = self.target_repo._format.supports_tree_reference
4369
for record in substream:
4370
# Insert the delta directly
4371
inventory_delta_bytes = record.get_bytes_as('fulltext')
4372
deserialiser = inventory_delta.InventoryDeltaDeserializer()
4374
parse_result = deserialiser.parse_text_bytes(
4375
inventory_delta_bytes)
4376
except inventory_delta.IncompatibleInventoryDelta, err:
4377
trace.mutter("Incompatible delta: %s", err.msg)
4378
raise errors.IncompatibleRevision(self.target_repo._format)
4379
basis_id, new_id, rich_root, tree_refs, inv_delta = parse_result
4380
revision_id = new_id
4381
parents = [key[0] for key in record.parents]
4382
self.target_repo.add_inventory_by_delta(
4383
basis_id, inv_delta, revision_id, parents)
4385
def _extract_and_insert_inventories(self, substream, serializer,
4387
"""Generate a new inventory versionedfile in target, converting data.
4389
The inventory is retrieved from the source, (deserializing it), and
4390
stored in the target (reserializing it in a different format).
4392
target_rich_root = self.target_repo._format.rich_root_data
4393
target_tree_refs = self.target_repo._format.supports_tree_reference
4394
for record in substream:
4395
# It's not a delta, so it must be a fulltext in the source
4396
# serializer's format.
4397
bytes = record.get_bytes_as('fulltext')
4398
revision_id = record.key[0]
4399
inv = serializer.read_inventory_from_string(bytes, revision_id)
4400
parents = [key[0] for key in record.parents]
4401
self.target_repo.add_inventory(revision_id, inv, parents)
4402
# No need to keep holding this full inv in memory when the rest of
4403
# the substream is likely to be all deltas.
4406
def _extract_and_insert_revisions(self, substream, serializer):
4407
for record in substream:
4408
bytes = record.get_bytes_as('fulltext')
4409
revision_id = record.key[0]
4410
rev = serializer.read_revision_from_string(bytes)
4411
if rev.revision_id != revision_id:
4412
raise AssertionError('wtf: %s != %s' % (rev, revision_id))
4413
self.target_repo.add_revision(revision_id, rev)
4416
if self.target_repo._format._fetch_reconcile:
4417
self.target_repo.reconcile()
4420
class StreamSource(object):
4421
"""A source of a stream for fetching between repositories."""
4423
def __init__(self, from_repository, to_format):
4424
"""Create a StreamSource streaming from from_repository."""
4425
self.from_repository = from_repository
4426
self.to_format = to_format
4428
def delta_on_metadata(self):
4429
"""Return True if delta's are permitted on metadata streams.
4431
That is on revisions and signatures.
4433
src_serializer = self.from_repository._format._serializer
4434
target_serializer = self.to_format._serializer
4435
return (self.to_format._fetch_uses_deltas and
4436
src_serializer == target_serializer)
4438
def _fetch_revision_texts(self, revs):
4439
# fetch signatures first and then the revision texts
4440
# may need to be a InterRevisionStore call here.
4441
from_sf = self.from_repository.signatures
4442
# A missing signature is just skipped.
4443
keys = [(rev_id,) for rev_id in revs]
4444
signatures = versionedfile.filter_absent(from_sf.get_record_stream(
4446
self.to_format._fetch_order,
4447
not self.to_format._fetch_uses_deltas))
4448
# If a revision has a delta, this is actually expanded inside the
4449
# insert_record_stream code now, which is an alternate fix for
4451
from_rf = self.from_repository.revisions
4452
revisions = from_rf.get_record_stream(
4454
self.to_format._fetch_order,
4455
not self.delta_on_metadata())
4456
return [('signatures', signatures), ('revisions', revisions)]
4458
def _generate_root_texts(self, revs):
4459
"""This will be called by get_stream between fetching weave texts and
4460
fetching the inventory weave.
4462
if self._rich_root_upgrade():
4463
return _mod_fetch.Inter1and2Helper(
4464
self.from_repository).generate_root_texts(revs)
4468
def get_stream(self, search):
4470
revs = search.get_keys()
4471
graph = self.from_repository.get_graph()
4472
revs = tsort.topo_sort(graph.get_parent_map(revs))
4473
data_to_fetch = self.from_repository.item_keys_introduced_by(revs)
4475
for knit_kind, file_id, revisions in data_to_fetch:
4476
if knit_kind != phase:
4478
# Make a new progress bar for this phase
4479
if knit_kind == "file":
4480
# Accumulate file texts
4481
text_keys.extend([(file_id, revision) for revision in
4483
elif knit_kind == "inventory":
4484
# Now copy the file texts.
4485
from_texts = self.from_repository.texts
4486
yield ('texts', from_texts.get_record_stream(
4487
text_keys, self.to_format._fetch_order,
4488
not self.to_format._fetch_uses_deltas))
4489
# Cause an error if a text occurs after we have done the
4492
# Before we process the inventory we generate the root
4493
# texts (if necessary) so that the inventories references
4495
for _ in self._generate_root_texts(revs):
4497
# we fetch only the referenced inventories because we do not
4498
# know for unselected inventories whether all their required
4499
# texts are present in the other repository - it could be
4501
for info in self._get_inventory_stream(revs):
4503
elif knit_kind == "signatures":
4504
# Nothing to do here; this will be taken care of when
4505
# _fetch_revision_texts happens.
4507
elif knit_kind == "revisions":
4508
for record in self._fetch_revision_texts(revs):
4511
raise AssertionError("Unknown knit kind %r" % knit_kind)
4513
def get_stream_for_missing_keys(self, missing_keys):
4514
# missing keys can only occur when we are byte copying and not
4515
# translating (because translation means we don't send
4516
# unreconstructable deltas ever).
4518
keys['texts'] = set()
4519
keys['revisions'] = set()
4520
keys['inventories'] = set()
4521
keys['chk_bytes'] = set()
4522
keys['signatures'] = set()
4523
for key in missing_keys:
4524
keys[key[0]].add(key[1:])
4525
if len(keys['revisions']):
4526
# If we allowed copying revisions at this point, we could end up
4527
# copying a revision without copying its required texts: a
4528
# violation of the requirements for repository integrity.
4529
raise AssertionError(
4530
'cannot copy revisions to fill in missing deltas %s' % (
4531
keys['revisions'],))
4532
for substream_kind, keys in keys.iteritems():
4533
vf = getattr(self.from_repository, substream_kind)
4534
if vf is None and keys:
4535
raise AssertionError(
4536
"cannot fill in keys for a versioned file we don't"
4537
" have: %s needs %s" % (substream_kind, keys))
4539
# No need to stream something we don't have
4541
if substream_kind == 'inventories':
4542
# Some missing keys are genuinely ghosts, filter those out.
4543
present = self.from_repository.inventories.get_parent_map(keys)
4544
revs = [key[0] for key in present]
4545
# Get the inventory stream more-or-less as we do for the
4546
# original stream; there's no reason to assume that records
4547
# direct from the source will be suitable for the sink. (Think
4548
# e.g. 2a -> 1.9-rich-root).
4549
for info in self._get_inventory_stream(revs, missing=True):
4553
# Ask for full texts always so that we don't need more round trips
4554
# after this stream.
4555
# Some of the missing keys are genuinely ghosts, so filter absent
4556
# records. The Sink is responsible for doing another check to
4557
# ensure that ghosts don't introduce missing data for future
4559
stream = versionedfile.filter_absent(vf.get_record_stream(keys,
4560
self.to_format._fetch_order, True))
4561
yield substream_kind, stream
4563
def inventory_fetch_order(self):
4564
if self._rich_root_upgrade():
4565
return 'topological'
4567
return self.to_format._fetch_order
4569
def _rich_root_upgrade(self):
4570
return (not self.from_repository._format.rich_root_data and
4571
self.to_format.rich_root_data)
4573
def _get_inventory_stream(self, revision_ids, missing=False):
4574
from_format = self.from_repository._format
4575
if (from_format.supports_chks and self.to_format.supports_chks and
4576
from_format.network_name() == self.to_format.network_name()):
4577
raise AssertionError(
4578
"this case should be handled by GroupCHKStreamSource")
4579
elif 'forceinvdeltas' in debug.debug_flags:
4580
return self._get_convertable_inventory_stream(revision_ids,
4581
delta_versus_null=missing)
4582
elif from_format.network_name() == self.to_format.network_name():
4584
return self._get_simple_inventory_stream(revision_ids,
4586
elif (not from_format.supports_chks and not self.to_format.supports_chks
4587
and from_format._serializer == self.to_format._serializer):
4588
# Essentially the same format.
4589
return self._get_simple_inventory_stream(revision_ids,
4592
# Any time we switch serializations, we want to use an
4593
# inventory-delta based approach.
4594
return self._get_convertable_inventory_stream(revision_ids,
4595
delta_versus_null=missing)
4597
def _get_simple_inventory_stream(self, revision_ids, missing=False):
4598
# NB: This currently reopens the inventory weave in source;
4599
# using a single stream interface instead would avoid this.
4600
from_weave = self.from_repository.inventories
4602
delta_closure = True
4604
delta_closure = not self.delta_on_metadata()
4605
yield ('inventories', from_weave.get_record_stream(
4606
[(rev_id,) for rev_id in revision_ids],
4607
self.inventory_fetch_order(), delta_closure))
4609
def _get_convertable_inventory_stream(self, revision_ids,
4610
delta_versus_null=False):
4611
# The two formats are sufficiently different that there is no fast
4612
# path, so we need to send just inventorydeltas, which any
4613
# sufficiently modern client can insert into any repository.
4614
# The StreamSink code expects to be able to
4615
# convert on the target, so we need to put bytes-on-the-wire that can
4616
# be converted. That means inventory deltas (if the remote is <1.19,
4617
# RemoteStreamSink will fallback to VFS to insert the deltas).
4618
yield ('inventory-deltas',
4619
self._stream_invs_as_deltas(revision_ids,
4620
delta_versus_null=delta_versus_null))
4622
def _stream_invs_as_deltas(self, revision_ids, delta_versus_null=False):
4623
"""Return a stream of inventory-deltas for the given rev ids.
4625
:param revision_ids: The list of inventories to transmit
4626
:param delta_versus_null: Don't try to find a minimal delta for this
4627
entry, instead compute the delta versus the NULL_REVISION. This
4628
effectively streams a complete inventory. Used for stuff like
4629
filling in missing parents, etc.
4631
from_repo = self.from_repository
4632
revision_keys = [(rev_id,) for rev_id in revision_ids]
4633
parent_map = from_repo.inventories.get_parent_map(revision_keys)
4634
# XXX: possibly repos could implement a more efficient iter_inv_deltas
4636
inventories = self.from_repository.iter_inventories(
4637
revision_ids, 'topological')
4638
format = from_repo._format
4639
invs_sent_so_far = set([_mod_revision.NULL_REVISION])
4640
inventory_cache = lru_cache.LRUCache(50)
4641
null_inventory = from_repo.revision_tree(
4642
_mod_revision.NULL_REVISION).inventory
4643
# XXX: ideally the rich-root/tree-refs flags would be per-revision, not
4644
# per-repo (e.g. streaming a non-rich-root revision out of a rich-root
4645
# repo back into a non-rich-root repo ought to be allowed)
4646
serializer = inventory_delta.InventoryDeltaSerializer(
4647
versioned_root=format.rich_root_data,
4648
tree_references=format.supports_tree_reference)
4649
for inv in inventories:
4650
key = (inv.revision_id,)
4651
parent_keys = parent_map.get(key, ())
4653
if not delta_versus_null and parent_keys:
4654
# The caller did not ask for complete inventories and we have
4655
# some parents that we can delta against. Make a delta against
4656
# each parent so that we can find the smallest.
4657
parent_ids = [parent_key[0] for parent_key in parent_keys]
4658
for parent_id in parent_ids:
4659
if parent_id not in invs_sent_so_far:
4660
# We don't know that the remote side has this basis, so
4663
if parent_id == _mod_revision.NULL_REVISION:
4664
parent_inv = null_inventory
4666
parent_inv = inventory_cache.get(parent_id, None)
4667
if parent_inv is None:
4668
parent_inv = from_repo.get_inventory(parent_id)
4669
candidate_delta = inv._make_delta(parent_inv)
4670
if (delta is None or
4671
len(delta) > len(candidate_delta)):
4672
delta = candidate_delta
4673
basis_id = parent_id
4675
# Either none of the parents ended up being suitable, or we
4676
# were asked to delta against NULL
4677
basis_id = _mod_revision.NULL_REVISION
4678
delta = inv._make_delta(null_inventory)
4679
invs_sent_so_far.add(inv.revision_id)
4680
inventory_cache[inv.revision_id] = inv
4681
delta_serialized = ''.join(
4682
serializer.delta_to_lines(basis_id, key[-1], delta))
4683
yield versionedfile.FulltextContentFactory(
4684
key, parent_keys, None, delta_serialized)
4687
def _iter_for_revno(repo, partial_history_cache, stop_index=None,
4688
stop_revision=None):
4689
"""Extend the partial history to include a given index
4691
If a stop_index is supplied, stop when that index has been reached.
4692
If a stop_revision is supplied, stop when that revision is
4693
encountered. Otherwise, stop when the beginning of history is
4696
:param stop_index: The index which should be present. When it is
4697
present, history extension will stop.
4698
:param stop_revision: The revision id which should be present. When
4699
it is encountered, history extension will stop.
4701
start_revision = partial_history_cache[-1]
4702
iterator = repo.iter_reverse_revision_history(start_revision)
4704
#skip the last revision in the list
4707
if (stop_index is not None and
4708
len(partial_history_cache) > stop_index):
4710
if partial_history_cache[-1] == stop_revision:
4712
revision_id = iterator.next()
4713
partial_history_cache.append(revision_id)
4714
except StopIteration:
added
removed
bzrlib/repository.py
