← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/knitrepo.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-08-31 00:27:39 UTC
  • mfrom: (4664.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090831002739-vd6487doda1b2k9h
(robertc) Fix bug 416732 by not adding root directories to expected
        items when checking non rich root repositories. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/knitrepo.py
12
12
#
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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
from bzrlib.lazy_import import lazy_import
18
18
lazy_import(globals(), """
19
19
from bzrlib import (
20
 
    debug,
21
 
    )
22
 
from bzrlib.store import revision
23
 
from bzrlib.store.revision.knit import KnitRevisionStore
24
 
""")
25
 
from bzrlib import (
26
20
    bzrdir,
27
21
    errors,
28
 
    knit,
 
22
    knit as _mod_knit,
29
23
    lockable_files,
30
24
    lockdir,
31
25
    osutils,
32
 
    symbol_versioning,
 
26
    revision as _mod_revision,
33
27
    transactions,
 
28
    versionedfile,
34
29
    xml5,
35
30
    xml6,
36
31
    xml7,
37
32
    )
 
33
""")
 
34
from bzrlib import (
 
35
    symbol_versioning,
 
36
    )
38
37
from bzrlib.decorators import needs_read_lock, needs_write_lock
39
 
from bzrlib.knit import KnitVersionedFiles, _KndxIndex, _KnitKeyAccess
40
38
from bzrlib.repository import (
41
39
    CommitBuilder,
42
40
    MetaDirRepository,
44
42
    RepositoryFormat,
45
43
    RootCommitBuilder,
46
44
    )
47
 
import bzrlib.revision as _mod_revision
48
 
from bzrlib.store.versioned import VersionedFileStore
49
45
from bzrlib.trace import mutter, mutter_callsite
50
 
from bzrlib.util import bencode
51
 
from bzrlib.versionedfile import ConstantMapper, HashEscapedPrefixMapper
52
46
 
53
47
 
54
48
class _KnitParentsProvider(object):
59
53
    def __repr__(self):
60
54
        return 'KnitParentsProvider(%r)' % self._knit
61
55
 
62
 
    @symbol_versioning.deprecated_method(symbol_versioning.one_one)
63
 
    def get_parents(self, revision_ids):
64
 
        """See graph._StackedParentsProvider.get_parents"""
65
 
        parent_map = self.get_parent_map(revision_ids)
66
 
        return [parent_map.get(r, None) for r in revision_ids]
67
 
 
68
56
    def get_parent_map(self, keys):
69
 
        """See graph._StackedParentsProvider.get_parent_map"""
 
57
        """See graph.StackedParentsProvider.get_parent_map"""
70
58
        parent_map = {}
71
59
        for revision_id in keys:
72
60
            if revision_id is None:
97
85
        return 'KnitsParentsProvider(%r)' % self._knit
98
86
 
99
87
    def get_parent_map(self, keys):
100
 
        """See graph._StackedParentsProvider.get_parent_map"""
 
88
        """See graph.StackedParentsProvider.get_parent_map"""
101
89
        parent_map = self._knit.get_parent_map(
102
90
            [self._prefix + (key,) for key in keys])
103
91
        result = {}
130
118
        self._commit_builder_class = _commit_builder_class
131
119
        self._serializer = _serializer
132
120
        self._reconcile_fixes_text_parents = True
133
 
        self._fetch_uses_deltas = True
134
 
        self._fetch_order = 'topological'
135
121
 
136
122
    @needs_read_lock
137
123
    def _all_revision_ids(self):
221
207
        revision_id = osutils.safe_revision_id(revision_id)
222
208
        return self.get_revision_reconcile(revision_id)
223
209
 
 
210
    def _refresh_data(self):
 
211
        if not self.is_locked():
 
212
            return
 
213
        # Create a new transaction to force all knits to see the scope change.
 
214
        # This is safe because we're outside a write group.
 
215
        self.control_files._finish_transaction()
 
216
        if self.is_write_locked():
 
217
            self.control_files._set_write_transaction()
 
218
        else:
 
219
            self.control_files._set_read_transaction()
 
220
 
224
221
    @needs_write_lock
225
222
    def reconcile(self, other=None, thorough=False):
226
223
        """Reconcile this repository."""
228
225
        reconciler = KnitReconciler(self, thorough=thorough)
229
226
        reconciler.reconcile()
230
227
        return reconciler
231
 
    
 
228
 
232
229
    def _make_parents_provider(self):
233
230
        return _KnitsParentsProvider(self.revisions)
234
231
 
235
 
    def _find_inconsistent_revision_parents(self):
 
232
    def _find_inconsistent_revision_parents(self, revisions_iterator=None):
236
233
        """Find revisions with different parent lists in the revision object
237
234
        and in the index graph.
238
235
 
 
236
        :param revisions_iterator: None, or an iterator of (revid,
 
237
            Revision-or-None). This iterator controls the revisions checked.
239
238
        :returns: an iterator yielding tuples of (revison-id, parents-in-index,
240
239
            parents-in-revision).
241
240
        """
242
241
        if not self.is_locked():
243
242
            raise AssertionError()
244
243
        vf = self.revisions
245
 
        for index_version in vf.keys():
246
 
            parent_map = vf.get_parent_map([index_version])
 
244
        if revisions_iterator is None:
 
245
            revisions_iterator = self._iter_revisions(None)
 
246
        for revid, revision in revisions_iterator:
 
247
            if revision is None:
 
248
                pass
 
249
            parent_map = vf.get_parent_map([(revid,)])
247
250
            parents_according_to_index = tuple(parent[-1] for parent in
248
 
                parent_map[index_version])
249
 
            revision = self.get_revision(index_version[-1])
 
251
                parent_map[(revid,)])
250
252
            parents_according_to_revision = tuple(revision.parent_ids)
251
253
            if parents_according_to_index != parents_according_to_revision:
252
 
                yield (index_version[-1], parents_according_to_index,
 
254
                yield (revid, parents_according_to_index,
253
255
                    parents_according_to_revision)
254
256
 
255
257
    def _check_for_inconsistent_revision_parents(self):
265
267
 
266
268
 
267
269
class RepositoryFormatKnit(MetaDirRepositoryFormat):
268
 
    """Bzr repository knit format (generalized). 
 
270
    """Bzr repository knit format (generalized).
269
271
 
270
272
    This repository format has:
271
273
     - knits for file texts and inventory
287
289
    _commit_builder_class = None
288
290
    # Set this attribute in derived clases to control the _serializer that the
289
291
    # repository objects will have passed to their constructor.
290
 
    _serializer = xml5.serializer_v5
 
292
    @property
 
293
    def _serializer(self):
 
294
        return xml5.serializer_v5
291
295
    # Knit based repositories handle ghosts reasonably well.
292
296
    supports_ghosts = True
293
297
    # External lookups are not supported in this format.
294
298
    supports_external_lookups = False
 
299
    # No CHK support.
 
300
    supports_chks = False
 
301
    _fetch_order = 'topological'
 
302
    _fetch_uses_deltas = True
 
303
    fast_deltas = False
295
304
 
296
305
    def _get_inventories(self, repo_transport, repo, name='inventory'):
297
 
        mapper = ConstantMapper(name)
298
 
        index = _KndxIndex(repo_transport, mapper, repo.get_transaction,
299
 
            repo.is_write_locked, repo.is_locked)
300
 
        access = _KnitKeyAccess(repo_transport, mapper)
301
 
        return KnitVersionedFiles(index, access, annotated=False)
 
306
        mapper = versionedfile.ConstantMapper(name)
 
307
        index = _mod_knit._KndxIndex(repo_transport, mapper,
 
308
            repo.get_transaction, repo.is_write_locked, repo.is_locked)
 
309
        access = _mod_knit._KnitKeyAccess(repo_transport, mapper)
 
310
        return _mod_knit.KnitVersionedFiles(index, access, annotated=False)
302
311
 
303
312
    def _get_revisions(self, repo_transport, repo):
304
 
        mapper = ConstantMapper('revisions')
305
 
        index = _KndxIndex(repo_transport, mapper, repo.get_transaction,
306
 
            repo.is_write_locked, repo.is_locked)
307
 
        access = _KnitKeyAccess(repo_transport, mapper)
308
 
        return KnitVersionedFiles(index, access, max_delta_chain=0,
 
313
        mapper = versionedfile.ConstantMapper('revisions')
 
314
        index = _mod_knit._KndxIndex(repo_transport, mapper,
 
315
            repo.get_transaction, repo.is_write_locked, repo.is_locked)
 
316
        access = _mod_knit._KnitKeyAccess(repo_transport, mapper)
 
317
        return _mod_knit.KnitVersionedFiles(index, access, max_delta_chain=0,
309
318
            annotated=False)
310
319
 
311
320
    def _get_signatures(self, repo_transport, repo):
312
 
        mapper = ConstantMapper('signatures')
313
 
        index = _KndxIndex(repo_transport, mapper, repo.get_transaction,
314
 
            repo.is_write_locked, repo.is_locked)
315
 
        access = _KnitKeyAccess(repo_transport, mapper)
316
 
        return KnitVersionedFiles(index, access, max_delta_chain=0,
 
321
        mapper = versionedfile.ConstantMapper('signatures')
 
322
        index = _mod_knit._KndxIndex(repo_transport, mapper,
 
323
            repo.get_transaction, repo.is_write_locked, repo.is_locked)
 
324
        access = _mod_knit._KnitKeyAccess(repo_transport, mapper)
 
325
        return _mod_knit.KnitVersionedFiles(index, access, max_delta_chain=0,
317
326
            annotated=False)
318
327
 
319
328
    def _get_texts(self, repo_transport, repo):
320
 
        mapper = HashEscapedPrefixMapper()
 
329
        mapper = versionedfile.HashEscapedPrefixMapper()
321
330
        base_transport = repo_transport.clone('knits')
322
 
        index = _KndxIndex(base_transport, mapper, repo.get_transaction,
323
 
            repo.is_write_locked, repo.is_locked)
324
 
        access = _KnitKeyAccess(base_transport, mapper)
325
 
        return KnitVersionedFiles(index, access, max_delta_chain=200,
 
331
        index = _mod_knit._KndxIndex(base_transport, mapper,
 
332
            repo.get_transaction, repo.is_write_locked, repo.is_locked)
 
333
        access = _mod_knit._KnitKeyAccess(base_transport, mapper)
 
334
        return _mod_knit.KnitVersionedFiles(index, access, max_delta_chain=200,
326
335
            annotated=True)
327
336
 
328
337
    def initialize(self, a_bzrdir, shared=False):
337
346
        dirs = ['knits']
338
347
        files = []
339
348
        utf8_files = [('format', self.get_format_string())]
340
 
        
 
349
 
341
350
        self._upload_blank_content(a_bzrdir, dirs, files, utf8_files, shared)
342
351
        repo_transport = a_bzrdir.get_repository_transport(None)
343
352
        control_files = lockable_files.LockableFiles(repo_transport,
355
364
 
356
365
    def open(self, a_bzrdir, _found=False, _override_transport=None):
357
366
        """See RepositoryFormat.open().
358
 
        
 
367
 
359
368
        :param _override_transport: INTERNAL USE ONLY. Allows opening the
360
369
                                    repository at a slightly different url
361
370
                                    than normal. I.e. during 'upgrade'.
377
386
        repo.signatures = self._get_signatures(repo_transport, repo)
378
387
        repo.inventories = self._get_inventories(repo_transport, repo)
379
388
        repo.texts = self._get_texts(repo_transport, repo)
 
389
        repo.chk_bytes = None
380
390
        repo._transport = repo_transport
381
391
        return repo
382
392
 
399
409
 
400
410
    repository_class = KnitRepository
401
411
    _commit_builder_class = CommitBuilder
402
 
    _serializer = xml5.serializer_v5
 
412
    @property
 
413
    def _serializer(self):
 
414
        return xml5.serializer_v5
403
415
 
404
416
    def __ne__(self, other):
405
417
        return self.__class__ is not other.__class__
412
424
        """See RepositoryFormat.get_format_description()."""
413
425
        return "Knit repository format 1"
414
426
 
415
 
    def check_conversion_target(self, target_format):
416
 
        pass
417
 
 
418
427
 
419
428
class RepositoryFormatKnit3(RepositoryFormatKnit):
420
429
    """Bzr repository knit format 3.
436
445
    _commit_builder_class = RootCommitBuilder
437
446
    rich_root_data = True
438
447
    supports_tree_reference = True
439
 
    _serializer = xml7.serializer_v7
 
448
    @property
 
449
    def _serializer(self):
 
450
        return xml7.serializer_v7
440
451
 
441
452
    def _get_matching_bzrdir(self):
442
453
        return bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
446
457
 
447
458
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
448
459
 
449
 
    def check_conversion_target(self, target_format):
450
 
        if not target_format.rich_root_data:
451
 
            raise errors.BadConversionTarget(
452
 
                'Does not support rich root data.', target_format)
453
 
        if not getattr(target_format, 'supports_tree_reference', False):
454
 
            raise errors.BadConversionTarget(
455
 
                'Does not support nested trees', target_format)
456
 
            
457
460
    def get_format_string(self):
458
461
        """See RepositoryFormat.get_format_string()."""
459
462
        return "Bazaar Knit Repository Format 3 (bzr 0.15)\n"
483
486
    _commit_builder_class = RootCommitBuilder
484
487
    rich_root_data = True
485
488
    supports_tree_reference = False
486
 
    _serializer = xml6.serializer_v6
 
489
    @property
 
490
    def _serializer(self):
 
491
        return xml6.serializer_v6
487
492
 
488
493
    def _get_matching_bzrdir(self):
489
494
        return bzrdir.format_registry.make_bzrdir('rich-root')
493
498
 
494
499
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
495
500
 
496
 
    def check_conversion_target(self, target_format):
497
 
        if not target_format.rich_root_data:
498
 
            raise errors.BadConversionTarget(
499
 
                'Does not support rich root data.', target_format)
500
 
 
501
501
    def get_format_string(self):
502
502
        """See RepositoryFormat.get_format_string()."""
503
503
        return 'Bazaar Knit Repository Format 4 (bzr 1.0)\n'