← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Refactored out ControlFiles and RevisionStore from _Branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
244
244
    else:
245
245
        if local_branch is not None:
246
246
            greedy_fetch(local_branch, branch, revision)
247
 
            base_tree = local_branch.revision_tree(revision)
 
247
            base_tree = local_branch.storage.revision_tree(revision)
248
248
        else:
249
 
            base_tree = branch.revision_tree(revision)
 
249
            base_tree = branch.storage.revision_tree(revision)
250
250
    return base_tree
251
251
 
252
252
 
378
378
                                                     other_tree)
379
379
 
380
380
    def revision_tree(self, revision_id):
381
 
        return self.this_branch.revision_tree(revision_id)
 
381
        return self.this_branch.storage.revision_tree(revision_id)
382
382
 
383
383
    def ensure_revision_trees(self):
384
384
        if self.this_revision_tree is None:
385
 
            self.this_basis_tree = self.this_branch.revision_tree(
 
385
            self.this_basis_tree = self.this_branch.storage.revision_tree(
386
386
                self.this_basis)
387
387
            if self.this_basis == self.this_rev_id:
388
388
                self.this_revision_tree = self.this_basis_tree
500
500
            try:
501
501
                self.base_rev_id = common_ancestor(self.this_basis, 
502
502
                                                   self.other_basis, 
503
 
                                                   self.this_branch)
 
503
                                                   self.this_branch.storage)
504
504
            except NoCommonAncestor:
505
505
                raise UnrelatedBranches()
506
506
            self.base_tree = get_revid_tree(self.this_branch, self.base_rev_id,