/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/clone.py

Refactored out ControlFiles and RevisionStore from _Branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/clone.py
78
78
        note("basis_branch is not supported for fast weave copy yet.")
79
79
    branch_from.lock_read()
80
80
    try:
81
 
        if not (branch_from.weave_store.listable()
82
 
                and branch_from.revision_store.listable()):
 
81
        if not (branch_from.storage.weave_store.listable()
 
82
                and branch_from.storage.revision_store.listable()):
83
83
            return copy_branch_slower(branch_from, to_location, revision,
84
84
                                      basis_branch)
85
85
        history = _get_truncated_history(branch_from, revision)
111
111
    return history[:idx+1]
112
112
 
113
113
def _copy_text_weaves(branch_from, branch_to):
114
 
    copy_all(branch_from.weave_store, branch_to.weave_store)
 
114
    copy_all(branch_from.storage.weave_store, branch_to.storage.weave_store)
115
115
 
116
116
 
117
117
def _copy_revision_store(branch_from, branch_to):
118
 
    copy_all(branch_from.revision_store, branch_to.revision_store)
 
118
    copy_all(branch_from.storage.revision_store, 
 
119
             branch_to.storage.revision_store)
119
120
 
120
121
 
121
122
def _copy_control_weaves(branch_from, branch_to):
122
 
    to_control = branch_to.control_weaves
123
 
    from_control = branch_from.control_weaves
 
123
    to_control = branch_to.storage.control_weaves
 
124
    from_control = branch_from.storage.control_weaves
124
125
    to_control.copy_multi(from_control, ['inventory'])
125
126
 
126
127