← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/fetch.py

  • Committer: Robert Collins
  • Date: 2005-10-06 22:15:52 UTC
  • mfrom: (1185.13.2)
  • mto: This revision was merged to the branch mainline in revision 1420.
  • Revision ID: robertc@robertcollins.net-20051006221552-9b15c96fa504e0ad
merge from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/fetch.py
190
190
            if not self.to_branch.has_revision(parent):
191
191
                parents.pop(parents.index(parent))
192
192
        self._copy_inventory(rev_id, inv_xml, parents)
193
 
        self._copy_ancestry(rev_id, parents)
194
193
        self.to_branch.revision_store.add(StringIO(rev_xml), rev_id)
195
194
        mutter('copied revision %s', rev_id)
196
195
 
199
198
        self.to_control.add_text('inventory', rev_id,
200
199
                                split_lines(inv_xml), parent_ids)
201
200
 
202
 
 
203
 
    def _copy_ancestry(self, rev_id, parent_ids):
204
 
        ancestry_lines = self.from_control.get_lines('ancestry', rev_id)
205
 
        self.to_control.add_text('ancestry', rev_id, ancestry_lines,
206
 
                                 parent_ids)
207
 
 
208
 
        
209
201
    def _copy_new_texts(self, rev_id, inv):
210
202
        """Copy any new texts occuring in this revision."""
211
203
        # TODO: Rather than writing out weaves every time, hold them