← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/pack_repo.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-05-08 07:05:00 UTC
  • mfrom: (3376.2.15 no-asserts)
  • Revision ID: pqm@pqm.ubuntu.com-20080508070500-9zyyvsk0eev20t4w
(mbp) remove and disallow assert statements

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/pack_repo.py
1
 
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008 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
61
61
    CommitBuilder,
62
62
    MetaDirRepository,
63
63
    MetaDirRepositoryFormat,
 
64
    RepositoryFormat,
64
65
    RootCommitBuilder,
65
66
    )
66
67
import bzrlib.revision as _mod_revision
67
68
from bzrlib.store.revision.knit import KnitRevisionStore
68
69
from bzrlib.store.versioned import VersionedFileStore
69
 
from bzrlib.trace import mutter, note, warning
 
70
from bzrlib.trace import (
 
71
    mutter,
 
72
    mutter_callsite,
 
73
    note,
 
74
    warning,
 
75
    )
70
76
 
71
77
 
72
78
class PackCommitBuilder(CommitBuilder):
198
204
            signature_index)
199
205
        self.name = name
200
206
        self.pack_transport = pack_transport
201
 
        assert None not in (revision_index, inventory_index, text_index,
202
 
            signature_index, name, pack_transport)
 
207
        if None in (revision_index, inventory_index, text_index,
 
208
                signature_index, name, pack_transport):
 
209
            raise AssertionError()
203
210
 
204
211
    def __eq__(self, other):
205
212
        return self.__dict__ == other.__dict__
322
329
 
323
330
    def access_tuple(self):
324
331
        """Return a tuple (transport, name) for the pack content."""
325
 
        assert self._state in ('open', 'finished')
326
332
        if self._state == 'finished':
327
333
            return Pack.access_tuple(self)
328
 
        else:
 
334
        elif self._state == 'open':
329
335
            return self.upload_transport, self.random_name
 
336
        else:
 
337
            raise AssertionError(self._state)
330
338
 
331
339
    def data_inserted(self):
332
340
        """True if data has been added to this pack."""
495
503
        :param index: An index from the pack parameter.
496
504
        :param pack: A Pack instance.
497
505
        """
498
 
        assert self.add_callback is None, \
499
 
            "%s already has a writable index through %s" % \
500
 
            (self, self.add_callback)
 
506
        if self.add_callback is not None:
 
507
            raise AssertionError(
 
508
                "%s already has a writable index through %s" % \
 
509
                (self, self.add_callback))
501
510
        # allow writing: queue writes to a new index
502
511
        self.add_index(index, pack)
503
512
        # Updates the index to packs mapping as a side effect,
1093
1102
        missing_text_keys = self.new_pack._external_compression_parents_of_texts()
1094
1103
        if missing_text_keys:
1095
1104
            raise errors.BzrError('Reference to missing compression parents %r'
1096
 
                % (refs - keys,))
 
1105
                % (missing_text_keys,))
1097
1106
        self._log_copied_texts()
1098
1107
 
1099
1108
    def _use_pack(self, new_pack):
1149
1158
        
1150
1159
        :param pack: A Pack object.
1151
1160
        """
1152
 
        assert pack.name not in self._packs_by_name
 
1161
        if pack.name in self._packs_by_name:
 
1162
            raise AssertionError()
1153
1163
        self.packs.append(pack)
1154
1164
        self._packs_by_name[pack.name] = pack
1155
1165
        self.revision_index.add_index(pack.revision_index, pack)
2169
2179
        """
2170
2180
        if not _found:
2171
2181
            format = RepositoryFormat.find_format(a_bzrdir)
2172
 
            assert format.__class__ ==  self.__class__
2173
2182
        if _override_transport is not None:
2174
2183
            repo_transport = _override_transport
2175
2184
        else: