← 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 05:13:21 UTC
  • mfrom: (1393.3.3)
  • Revision ID: robertc@robertcollins.net-20051006051321-88f1053c3bf1ca4a
merge in an adjusted version of Jelmer's empty-log detection patch.

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)
193
194
        self.to_branch.revision_store.add(StringIO(rev_xml), rev_id)
194
195
        mutter('copied revision %s', rev_id)
195
196
 
198
199
        self.to_control.add_text('inventory', rev_id,
199
200
                                split_lines(inv_xml), parent_ids)
200
201
 
 
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
        
201
209
    def _copy_new_texts(self, rev_id, inv):
202
210
        """Copy any new texts occuring in this revision."""
203
211
        # TODO: Rather than writing out weaves every time, hold them