← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/knitrepo.py

  • Committer: John Arbash Meinel
  • Date: 2009-06-03 19:28:48 UTC
  • mto: This revision was merged to the branch mainline in revision 4410.
  • Revision ID: john@arbash-meinel.com-20090603192848-dsx5k8kwl611mk8h
Spend a little bit more time optimizing the read_revision_from_string loop
without removing the safety checking.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/knitrepo.py
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
24
24
    lockdir,
25
25
    osutils,
26
26
    revision as _mod_revision,
27
 
    trace,
28
27
    transactions,
29
28
    versionedfile,
30
29
    xml5,
38
37
from bzrlib.decorators import needs_read_lock, needs_write_lock
39
38
from bzrlib.repository import (
40
39
    CommitBuilder,
41
 
    IsInWriteGroupError,
42
40
    MetaDirRepository,
43
41
    MetaDirRepositoryFormat,
44
42
    RepositoryFormat,
45
43
    RootCommitBuilder,
46
44
    )
 
45
from bzrlib.trace import mutter, mutter_callsite
47
46
 
48
47
 
49
48
class _KnitParentsProvider(object):
55
54
        return 'KnitParentsProvider(%r)' % self._knit
56
55
 
57
56
    def get_parent_map(self, keys):
58
 
        """See graph.StackedParentsProvider.get_parent_map"""
 
57
        """See graph._StackedParentsProvider.get_parent_map"""
59
58
        parent_map = {}
60
59
        for revision_id in keys:
61
60
            if revision_id is None:
86
85
        return 'KnitsParentsProvider(%r)' % self._knit
87
86
 
88
87
    def get_parent_map(self, keys):
89
 
        """See graph.StackedParentsProvider.get_parent_map"""
 
88
        """See graph._StackedParentsProvider.get_parent_map"""
90
89
        parent_map = self._knit.get_parent_map(
91
90
            [self._prefix + (key,) for key in keys])
92
91
        result = {}
211
210
    def _refresh_data(self):
212
211
        if not self.is_locked():
213
212
            return
214
 
        if self.is_in_write_group():
215
 
            raise IsInWriteGroupError(self)
216
213
        # Create a new transaction to force all knits to see the scope change.
217
214
        # This is safe because we're outside a write group.
218
215
        self.control_files._finish_transaction()
232
229
    def _make_parents_provider(self):
233
230
        return _KnitsParentsProvider(self.revisions)
234
231
 
235
 
    def _find_inconsistent_revision_parents(self, revisions_iterator=None):
 
232
    def _find_inconsistent_revision_parents(self):
236
233
        """Find revisions with different parent lists in the revision object
237
234
        and in the index graph.
238
235
 
239
 
        :param revisions_iterator: None, or an iterator of (revid,
240
 
            Revision-or-None). This iterator controls the revisions checked.
241
236
        :returns: an iterator yielding tuples of (revison-id, parents-in-index,
242
237
            parents-in-revision).
243
238
        """
244
239
        if not self.is_locked():
245
240
            raise AssertionError()
246
241
        vf = self.revisions
247
 
        if revisions_iterator is None:
248
 
            revisions_iterator = self._iter_revisions(None)
249
 
        for revid, revision in revisions_iterator:
250
 
            if revision is None:
251
 
                pass
252
 
            parent_map = vf.get_parent_map([(revid,)])
 
242
        for index_version in vf.keys():
 
243
            parent_map = vf.get_parent_map([index_version])
253
244
            parents_according_to_index = tuple(parent[-1] for parent in
254
 
                parent_map[(revid,)])
 
245
                parent_map[index_version])
 
246
            revision = self.get_revision(index_version[-1])
255
247
            parents_according_to_revision = tuple(revision.parent_ids)
256
248
            if parents_according_to_index != parents_according_to_revision:
257
 
                yield (revid, parents_according_to_index,
 
249
                yield (index_version[-1], parents_according_to_index,
258
250
                    parents_according_to_revision)
259
251
 
260
252
    def _check_for_inconsistent_revision_parents(self):
345
337
        :param shared: If true the repository will be initialized as a shared
346
338
                       repository.
347
339
        """
348
 
        trace.mutter('creating repository in %s.', a_bzrdir.transport.base)
 
340
        mutter('creating repository in %s.', a_bzrdir.transport.base)
349
341
        dirs = ['knits']
350
342
        files = []
351
343
        utf8_files = [('format', self.get_format_string())]
363
355
        result.revisions.get_parent_map([('A',)])
364
356
        result.signatures.get_parent_map([('A',)])
365
357
        result.unlock()
366
 
        self._run_post_repo_init_hooks(result, a_bzrdir, shared)
367
358
        return result
368
359
 
369
360
    def open(self, a_bzrdir, _found=False, _override_transport=None):
428
419
        """See RepositoryFormat.get_format_description()."""
429
420
        return "Knit repository format 1"
430
421
 
 
422
    def check_conversion_target(self, target_format):
 
423
        pass
 
424
 
431
425
 
432
426
class RepositoryFormatKnit3(RepositoryFormatKnit):
433
427
    """Bzr repository knit format 3.
448
442
    repository_class = KnitRepository
449
443
    _commit_builder_class = RootCommitBuilder
450
444
    rich_root_data = True
451
 
    experimental = True
452
445
    supports_tree_reference = True
453
446
    @property
454
447
    def _serializer(self):
462
455
 
463
456
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
464
457
 
 
458
    def check_conversion_target(self, target_format):
 
459
        if not target_format.rich_root_data:
 
460
            raise errors.BadConversionTarget(
 
461
                'Does not support rich root data.', target_format)
 
462
        if not getattr(target_format, 'supports_tree_reference', False):
 
463
            raise errors.BadConversionTarget(
 
464
                'Does not support nested trees', target_format)
 
465
 
465
466
    def get_format_string(self):
466
467
        """See RepositoryFormat.get_format_string()."""
467
468
        return "Bazaar Knit Repository Format 3 (bzr 0.15)\n"
503
504
 
504
505
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
505
506
 
 
507
    def check_conversion_target(self, target_format):
 
508
        if not target_format.rich_root_data:
 
509
            raise errors.BadConversionTarget(
 
510
                'Does not support rich root data.', target_format)
 
511
 
506
512
    def get_format_string(self):
507
513
        """See RepositoryFormat.get_format_string()."""
508
514
        return 'Bazaar Knit Repository Format 4 (bzr 1.0)\n'