/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to processors/generic_processor.py

Support both locations for KnitPackRepository.

Show diffs side-by-side

added added

removed removed

Lines of Context:
processors/generic_processor.py
25
25
    osutils,
26
26
    progress,
27
27
    )
28
 
from bzrlib.repofmt import knitpack_repo
 
28
try:
 
29
    from bzrlib.repofmt.knitpack_repo import KnitPackRepository
 
30
except ImportError:
 
31
    from bzrlib.repofmt.pack_repo import KnitPackRepository
29
32
from bzrlib.trace import (
30
33
    mutter,
31
34
    note,
173
176
 
174
177
        # Disable autopacking if the repo format supports it.
175
178
        # THIS IS A HACK - there is no sanctioned way of doing this yet.
176
 
        if isinstance(self.repo, knitpack_repo.KnitPackRepository):
 
179
        if isinstance(self.repo, KnitPackRepository):
177
180
            self._original_max_pack_count = \
178
181
                self.repo._pack_collection._max_pack_count
179
182
            def _max_pack_count_for_import(total_revisions):