← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Robert Collins
  • Date: 2007-03-06 05:10:23 UTC
  • mto: (2321.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: robertc@robertcollins.net-20070306051023-3bd91ashnq3ppdkh
Remove circular imports in bzrdir format definitions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
2245
2245
    'Format using knits.  Recommended for interoperation with bzr <= 0.14.',
2246
2246
    branch_format='bzrlib.branch.BzrBranchFormat5',
2247
2247
    tree_format='bzrlib.workingtree.WorkingTreeFormat3')
2248
 
format_registry.set_default('knit')
2249
2248
format_registry.register_metadir('metaweave',
2250
2249
    'bzrlib.repofmt.weaverepo.RepositoryFormat7',
2251
2250
    'Transitional format in 0.8.  Slower than knit.',
2252
2251
    branch_format='bzrlib.branch.BzrBranchFormat5',
2253
 
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat3',
 
2252
    tree_format='bzrlib.workingtree.WorkingTreeFormat3',
2254
2253
    deprecated=True)
2255
 
format_registry.register_metadir('experimental-knit2',
2256
 
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit2',
2257
 
    'Experimental successor to knit.  Use at your own risk.',
2258
 
    branch_format='bzrlib.branch.BzrBranchFormat5',
2259
 
    tree_format='bzrlib.workingtree.WorkingTreeFormat3'
2260
 
    )
2261
 
format_registry.register_metadir('experimental-branch6',
2262
 
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
2263
 
    'Experimental successor to knit.  Use at your own risk.',
2264
 
    branch_format='bzrlib.branch.BzrBranchFormat6',
2265
 
    tree_format='bzrlib.workingtree.WorkingTreeFormat3')
2266
 
 
2267
 
format_registry.register_metadir('experimental-reference-dirstate',
2268
 
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
2269
 
    help='Experimental: dirstate working tree, Branch6, and reference-tree '
2270
 
    'support.  Proposed default for bzr 0.15',
2271
 
    branch_format='bzrlib.branch.BzrBranchFormat6',
2272
 
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
2273
 
    )
2274
2254
format_registry.register_metadir('dirstate',
2275
2255
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
2276
2256
    help='New in 0.15: Fast local operations. Compatible with bzr 0.8 and '
2277
2257
        'above when accessed over the network.',
2278
2258
    branch_format='bzrlib.branch.BzrBranchFormat5',
2279
 
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
 
2259
    # this uses bzrlib.workingtree.WorkingTreeFormat4 because importing
 
2260
    # directly from workingtree_4 triggers a circular import.
 
2261
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2280
2262
    )
2281
2263
format_registry.register_metadir('dirstate-with-subtree',
2282
2264
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
2284
2266
        'network operations. Additionally adds support for versioning nested '
2285
2267
        'bzr branches. Incompatible with bzr < 0.15.',
2286
2268
    branch_format='bzrlib.branch.BzrBranchFormat6',
2287
 
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
 
2269
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2288
2270
    )
 
2271
format_registry.set_default('dirstate')