← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/fetch.py

  • Committer: Aaron Bentley
  • Date: 2005-11-17 05:14:54 UTC
  • mto: (1185.65.14 storage)
  • mto: This revision was merged to the branch mainline in revision 1550.
  • Revision ID: aaron.bentley@utoronto.ca-20051117051454-e9ac1dd13766b978
Moved get_ancestry to RevisionStorage

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/fetch.py
150
150
        That is, every revision that's in the ancestry of the source
151
151
        branch and not in the destination branch."""
152
152
        self.pb.update('get source ancestry')
153
 
        self.from_ancestry = self.from_branch.get_ancestry(self.last_revision)
 
153
        from_storage = self.from_branch.storage
 
154
        self.from_ancestry = from_storage.get_ancestry(self.last_revision)
154
155
 
155
156
        dest_last_rev = self.to_branch.last_revision()
156
157
        self.pb.update('get destination ancestry')
157
158
        if dest_last_rev:
158
 
            dest_ancestry = self.to_branch.get_ancestry(dest_last_rev)
 
159
            to_storage = self.to_branch.storage
 
160
            dest_ancestry = to_storage.get_ancestry(dest_last_rev)
159
161
        else:
160
162
            dest_ancestry = []
161
163
        ss = set(dest_ancestry)