← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2005-12-25 00:38:48 UTC
  • mto: (1185.67.11 bzr.revision-storage)
  • mto: This revision was merged to the branch mainline in revision 1550.
  • Revision ID: aaron.bentley@utoronto.ca-20051225003848-111ac71170cb2605
Renamed Branch.storage to Branch.repository

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
251
251
    else:
252
252
        if local_branch is not None:
253
253
            greedy_fetch(local_branch, branch, revision)
254
 
            base_tree = local_branch.storage.revision_tree(revision)
 
254
            base_tree = local_branch.repository.revision_tree(revision)
255
255
        else:
256
 
            base_tree = branch.storage.revision_tree(revision)
 
256
            base_tree = branch.repository.revision_tree(revision)
257
257
    return base_tree
258
258
 
259
259
 
395
395
                                                     other_tree)
396
396
 
397
397
    def revision_tree(self, revision_id):
398
 
        return self.this_branch.storage.revision_tree(revision_id)
 
398
        return self.this_branch.repository.revision_tree(revision_id)
399
399
 
400
400
    def ensure_revision_trees(self):
401
401
        if self.this_revision_tree is None:
402
 
            self.this_basis_tree = self.this_branch.storage.revision_tree(
 
402
            self.this_basis_tree = self.this_branch.repository.revision_tree(
403
403
                self.this_basis)
404
404
            if self.this_basis == self.this_rev_id:
405
405
                self.this_revision_tree = self.this_basis_tree
495
495
            return
496
496
        if self.other_rev_id is None:
497
497
            return
498
 
        ancestry = self.this_branch.storage.get_ancestry(self.this_basis)
 
498
        ancestry = self.this_branch.repository.get_ancestry(self.this_basis)
499
499
        if self.other_rev_id in ancestry:
500
500
            return
501
501
        self.this_branch.working_tree().add_pending_merge(self.other_rev_id)
525
525
            try:
526
526
                self.base_rev_id = common_ancestor(self.this_basis, 
527
527
                                                   self.other_basis, 
528
 
                                                   self.this_branch.storage)
 
528
                                                   self.this_branch.repository)
529
529
            except NoCommonAncestor:
530
530
                raise UnrelatedBranches()
531
531
            self.base_tree = get_revid_tree(self.this_branch, self.base_rev_id,