← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/fetch.py

Merge from aaron. Whee, we are synced. Yay. Begone the foul demons of merge conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/fetch.py
151
151
        That is, every revision that's in the ancestry of the source
152
152
        branch and not in the destination branch."""
153
153
        self.pb.update('get source ancestry')
154
 
        self.from_ancestry = self.from_branch.get_ancestry(self.last_revision)
 
154
        from_storage = self.from_branch.storage
 
155
        self.from_ancestry = from_storage.get_ancestry(self.last_revision)
155
156
 
156
157
        dest_last_rev = self.to_branch.last_revision()
157
158
        self.pb.update('get destination ancestry')
158
159
        if dest_last_rev:
159
 
            dest_ancestry = self.to_branch.get_ancestry(dest_last_rev)
 
160
            to_storage = self.to_branch.storage
 
161
            dest_ancestry = to_storage.get_ancestry(dest_last_rev)
160
162
        else:
161
163
            dest_ancestry = []
162
164
        ss = set(dest_ancestry)
224
226
        if text_revision in to_weave:
225
227
            return
226
228
        from_weave = self.from_weaves.get_weave(file_id,
227
 
            self.from_branch.get_transaction())
 
229
            self.from_branch.storage.get_transaction())
228
230
        if text_revision not in from_weave:
229
231
            raise MissingText(self.from_branch, text_revision, file_id)
230
232
        mutter('copy file {%s} modified in {%s}', file_id, rev_id)