/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 repofmt.py

Update groupcompress to bzrlib 1.10.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repofmt.py
21
21
import time
22
22
 
23
23
from bzrlib import debug, errors, pack, repository
 
24
from bzrlib.btree_index import (
 
25
    BTreeBuilder,
 
26
    BTreeGraphIndex,
 
27
    )
24
28
from bzrlib.index import GraphIndex, GraphIndexBuilder
25
29
from bzrlib.repository import InterPackRepo
26
30
from bzrlib.plugins.groupcompress.groupcompress import (
27
31
    _GCGraphIndex,
28
32
    GroupCompressVersionedFiles,
29
33
    )
30
 
from bzrlib.plugins.index2.btree_index import (
31
 
    BTreeBuilder,
32
 
    BTreeGraphIndex,
33
 
    FixedMemoryGraphIndex,
34
 
    )
35
34
from bzrlib.osutils import rand_chars
36
35
from bzrlib.repofmt.pack_repo import (
37
36
    Pack,
38
37
    NewPack,
39
38
    KnitPackRepository,
40
39
    RepositoryPackCollection,
41
 
    RepositoryFormatPackDevelopment0,
42
 
    RepositoryFormatPackDevelopment0Subtree,
 
40
    RepositoryFormatPackDevelopment2,
 
41
    RepositoryFormatPackDevelopment2Subtree,
43
42
    RepositoryFormatKnitPack1,
44
43
    RepositoryFormatKnitPack3,
45
44
    RepositoryFormatKnitPack4,
241
240
        self._reconcile_backsup_inventory = False
242
241
 
243
242
 
244
 
class RepositoryFormatPackGCPlain(RepositoryFormatPackDevelopment0):
 
243
class RepositoryFormatPackGCPlain(RepositoryFormatPackDevelopment2):
245
244
    """A B+Tree index using pack repository."""
246
245
 
247
246
    repository_class = GCPackRepository
273
272
            ", interoperates with rich-root-pack\n")
274
273
 
275
274
 
276
 
class RepositoryFormatPackGCSubtrees(RepositoryFormatPackDevelopment0Subtree):
 
275
class RepositoryFormatPackGCSubtrees(RepositoryFormatPackDevelopment2Subtree):
277
276
    """A B+Tree index using pack repository."""
278
277
 
279
278
    repository_class = GCPackRepository