← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-04-01 11:16:40 UTC
  • mfrom: (4229.1.1 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090401111640-wnn3068uv1nc8lhj
1.14 formats (Ian Clatworthy)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
2751
2751
                isinstance(self.target_format.workingtree_format,
2752
2752
                    workingtree_4.WorkingTreeFormat5)):
2753
2753
                workingtree_4.Converter4to5().convert(tree)
 
2754
            if (isinstance(tree, workingtree_4.DirStateWorkingTree) and
 
2755
                not isinstance(tree, workingtree_4.WorkingTree6) and
 
2756
                isinstance(self.target_format.workingtree_format,
 
2757
                    workingtree_4.WorkingTreeFormat6)):
 
2758
                workingtree_4.Converter4or5to6().convert(tree)
2754
2759
        return to_convert
2755
2760
 
2756
2761
 
3342
3347
    branch_format='bzrlib.branch.BzrBranchFormat7',
3343
3348
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3344
3349
    )
3345
 
format_registry.register_metadir('development-wt5',
 
3350
format_registry.register_metadir('1.14',
3346
3351
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6',
3347
 
    help='A working-tree format that supports views and content filtering.',
 
3352
    help='A working-tree format that supports content filtering.',
3348
3353
    branch_format='bzrlib.branch.BzrBranchFormat7',
3349
3354
    tree_format='bzrlib.workingtree.WorkingTreeFormat5',
3350
 
    experimental=True,
3351
3355
    )
3352
 
format_registry.register_metadir('development-wt5-rich-root',
 
3356
format_registry.register_metadir('1.14-rich-root',
3353
3357
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6RichRoot',
3354
 
    help='A variant of development-wt5 that supports rich-root data '
 
3358
    help='A variant of 1.14 that supports rich-root data '
3355
3359
         '(needed for bzr-svn and bzr-git).',
3356
3360
    branch_format='bzrlib.branch.BzrBranchFormat7',
3357
3361
    tree_format='bzrlib.workingtree.WorkingTreeFormat5',
3358
 
    experimental=True,
3359
3362
    )
3360
3363
# The following two formats should always just be aliases.
3361
3364
format_registry.register_metadir('development',
3407
3410
    hidden=True,
3408
3411
    experimental=True,
3409
3412
    )
 
3413
# These next two formats should be removed when the gc formats are
 
3414
# updated to use WorkingTreeFormat6 and are merged into bzr.dev
 
3415
format_registry.register_metadir('development-wt6',
 
3416
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6',
 
3417
    help='1.14 with filtered views. '
 
3418
        'Please read '
 
3419
        'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
 
3420
        'before use.',
 
3421
    branch_format='bzrlib.branch.BzrBranchFormat7',
 
3422
    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
 
3423
    hidden=True,
 
3424
    experimental=True,
 
3425
    )
 
3426
format_registry.register_metadir('development-wt6-rich-root',
 
3427
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6RichRoot',
 
3428
    help='A variant of development-wt6 that supports rich-root data '
 
3429
         '(needed for bzr-svn and bzr-git).',
 
3430
    branch_format='bzrlib.branch.BzrBranchFormat7',
 
3431
    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
 
3432
    hidden=True,
 
3433
    experimental=True,
 
3434
    )
3410
3435
# The following format should be an alias for the rich root equivalent 
3411
3436
# of the default format
3412
3437
format_registry.register_metadir('default-rich-root',