/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/bundle/serializer/v4.py

  • Committer: Robert Collins
  • Date: 2008-03-19 04:39:04 UTC
  • mto: This revision was merged to the branch mainline in revision 3306.
  • Revision ID: robertc@robertcollins.net-20080319043904-7g4imzvybc7q9l8h
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/serializer/v4.py
327
327
                if revision_id in self.base_ancestry:
328
328
                    continue
329
329
                new_revision_ids.add(revision_id)
330
 
                pending.extend(vf.get_parents(revision_id))
 
330
                pending.extend(vf.get_parent_map([revision_id])[revision_id])
331
331
            yield vf, file_id, new_revision_ids
332
332
 
333
333
    def write_files(self):
376
376
        revision_ids = list(multiparent.topo_iter(vf, revision_ids))
377
377
        mpdiffs = vf.make_mpdiffs(revision_ids)
378
378
        sha1s = vf.get_sha1s(revision_ids)
 
379
        parent_map = vf.get_parent_map(revision_ids)
379
380
        for mpdiff, revision_id, sha1, in zip(mpdiffs, revision_ids, sha1s):
380
 
            parents = vf.get_parents(revision_id)
 
381
            parents = parent_map[revision_id]
381
382
            text = ''.join(mpdiff.to_patch())
382
383
            self.bundle.add_multiparent_record(text, sha1, parents, repo_kind,
383
384
                                               revision_id, file_id)