← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: INADA Naoki
  • Date: 2011-05-14 09:58:36 UTC
  • mfrom: (5830.2.22 i18n-msgextract)
  • mto: This revision was merged to the branch mainline in revision 5891.
  • Revision ID: songofacandy@gmail.com-20110514095836-38l651fp8bmb4bni
merge from i18n-msgextract

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
49
49
    ui,
50
50
    urlutils,
51
51
    win32utils,
52
 
    workingtree,
 
52
    workingtree_3,
53
53
    workingtree_4,
54
54
    )
55
55
from bzrlib.repofmt import knitpack_repo
1883
1883
        else:
1884
1884
            # TODO: conversions of Branch and Tree should be done by
1885
1885
            # InterXFormat lookups
1886
 
            if (isinstance(tree, workingtree.WorkingTree3) and
 
1886
            if (isinstance(tree, workingtree_3.WorkingTree3) and
1887
1887
                not isinstance(tree, workingtree_4.DirStateWorkingTree) and
1888
1888
                isinstance(self.target_format.workingtree_format,
1889
1889
                    workingtree_4.DirStateWorkingTreeFormat)):
2110
2110
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
2111
2111
    'Format using knits.  Recommended for interoperation with bzr <= 0.14.',
2112
2112
    branch_format='bzrlib.branch.BzrBranchFormat5',
2113
 
    tree_format='bzrlib.workingtree.WorkingTreeFormat3',
 
2113
    tree_format='bzrlib.workingtree_3.WorkingTreeFormat3',
2114
2114
    hidden=True,
2115
2115
    deprecated=True)
2116
2116
register_metadir(controldir.format_registry, 'dirstate',