← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Andrew Bennetts
  • Date: 2009-07-02 05:11:11 UTC
  • mto: (4476.3.44 inventory-delta)
  • mto: This revision was merged to the branch mainline in revision 4608.
  • Revision ID: andrew.bennetts@canonical.com-20090702051111-5skrmwxoddjc6fg3
Further reduce duplication.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
3521
3521
        deltas.sort()
3522
3522
        return deltas[0][1:]
3523
3523
 
3524
 
    def _new_root_data_stream(self, root_keys_to_create, parent_map):
3525
 
        from bzrlib.fetch import _parent_keys_for_root_version
3526
 
        g = graph.Graph(self.source.revisions)
3527
 
        for root_key in root_keys_to_create:
3528
 
            root_id, rev_id = root_key
3529
 
            parent_keys = _parent_keys_for_root_version(
3530
 
                root_id, rev_id, self._revision_id_to_root_id, parent_map, g,
3531
 
                self.source)
3532
 
            yield versionedfile.FulltextContentFactory(root_key,
3533
 
                parent_keys, None, '')
3534
 
 
3535
3524
    def _fetch_batch(self, revision_ids, basis_id, cache):
3536
3525
        """Fetch across a few revisions.
3537
3526
 
3583
3572
        from_texts = self.source.texts
3584
3573
        to_texts = self.target.texts
3585
3574
        if root_keys_to_create:
3586
 
            root_stream = self._new_root_data_stream(root_keys_to_create,
3587
 
                                                     parent_map)
 
3575
            from bzrlib.fetch import _new_root_data_stream
 
3576
            root_stream = _new_root_data_stream(
 
3577
                root_keys_to_create, self._revision_id_to_root_id, parent_map,
 
3578
                self.source)
3588
3579
            to_texts.insert_record_stream(root_stream)
3589
3580
        to_texts.insert_record_stream(from_texts.get_record_stream(
3590
3581
            text_keys, self.target._format._fetch_order,