/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 bzrlib/bzrdir.py

  • Committer: Jelmer Vernooij
  • Date: 2009-04-03 15:18:15 UTC
  • mfrom: (4242 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4250.
  • Revision ID: jelmer@samba.org-20090403151815-guc4htxlhkgwehvd
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
2814
2814
                isinstance(self.target_format.workingtree_format,
2815
2815
                    workingtree_4.WorkingTreeFormat5)):
2816
2816
                workingtree_4.Converter4to5().convert(tree)
 
2817
            if (isinstance(tree, workingtree_4.DirStateWorkingTree) and
 
2818
                not isinstance(tree, workingtree_4.WorkingTree6) and
 
2819
                isinstance(self.target_format.workingtree_format,
 
2820
                    workingtree_4.WorkingTreeFormat6)):
 
2821
                workingtree_4.Converter4or5to6().convert(tree)
2817
2822
        return to_convert
2818
2823
 
2819
2824
 
3405
3410
    branch_format='bzrlib.branch.BzrBranchFormat7',
3406
3411
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3407
3412
    )
3408
 
format_registry.register_metadir('development-wt5',
 
3413
format_registry.register_metadir('1.14',
3409
3414
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6',
3410
 
    help='A working-tree format that supports views and content filtering.',
 
3415
    help='A working-tree format that supports content filtering.',
3411
3416
    branch_format='bzrlib.branch.BzrBranchFormat7',
3412
3417
    tree_format='bzrlib.workingtree.WorkingTreeFormat5',
3413
 
    experimental=True,
3414
3418
    )
3415
 
format_registry.register_metadir('development-wt5-rich-root',
 
3419
format_registry.register_metadir('1.14-rich-root',
3416
3420
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6RichRoot',
3417
 
    help='A variant of development-wt5 that supports rich-root data '
 
3421
    help='A variant of 1.14 that supports rich-root data '
3418
3422
         '(needed for bzr-svn and bzr-git).',
3419
3423
    branch_format='bzrlib.branch.BzrBranchFormat7',
3420
3424
    tree_format='bzrlib.workingtree.WorkingTreeFormat5',
3421
 
    experimental=True,
3422
3425
    )
3423
3426
# The following two formats should always just be aliases.
3424
3427
format_registry.register_metadir('development',
3470
3473
    hidden=True,
3471
3474
    experimental=True,
3472
3475
    )
 
3476
# These next two formats should be removed when the gc formats are
 
3477
# updated to use WorkingTreeFormat6 and are merged into bzr.dev
 
3478
format_registry.register_metadir('development-wt6',
 
3479
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6',
 
3480
    help='1.14 with filtered views. '
 
3481
        'Please read '
 
3482
        'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
 
3483
        'before use.',
 
3484
    branch_format='bzrlib.branch.BzrBranchFormat7',
 
3485
    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
 
3486
    hidden=True,
 
3487
    experimental=True,
 
3488
    )
 
3489
format_registry.register_metadir('development-wt6-rich-root',
 
3490
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6RichRoot',
 
3491
    help='A variant of development-wt6 that supports rich-root data '
 
3492
         '(needed for bzr-svn and bzr-git).',
 
3493
    branch_format='bzrlib.branch.BzrBranchFormat7',
 
3494
    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
 
3495
    hidden=True,
 
3496
    experimental=True,
 
3497
    )
3473
3498
# The following format should be an alias for the rich root equivalent 
3474
3499
# of the default format
3475
3500
format_registry.register_metadir('default-rich-root',