← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

Merge up bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
209
209
        except errors.NotBranchError:
210
210
            pass
211
211
        try:
212
 
            self.open_workingtree().clone(result)
213
 
        except (errors.NoWorkingTree, errors.NotLocalUrl):
214
 
            pass
 
212
            result_repo = result.find_repository()
 
213
        except errors.NoRepositoryPresent:
 
214
            result_repo = None
 
215
        if result_repo is None or result_repo.make_working_trees():
 
216
            try:
 
217
                self.open_workingtree().clone(result)
 
218
            except (errors.NoWorkingTree, errors.NotLocalUrl):
 
219
                pass
215
220
        return result
216
221
 
217
222
    # TODO: This should be given a Transport, and should chdir up; otherwise
2482
2487
    branch_format='bzrlib.branch.BzrBranchFormat6',
2483
2488
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2484
2489
    )
 
2490
format_registry.register_metadir('rich-root',
 
2491
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit4',
 
2492
    help='New in 1.0.  Better handling of tree roots.  Incompatible with'
 
2493
        ' bzr < 1.0',
 
2494
    branch_format='bzrlib.branch.BzrBranchFormat6',
 
2495
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
 
2496
    hidden=False,
 
2497
    )
2485
2498
format_registry.register_metadir('dirstate-with-subtree',
2486
2499
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
2487
2500
    help='New in 0.15: Fast local operations and improved scaling for '