← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jonathan Riddell
  • Date: 2011-06-21 11:34:52 UTC
  • mfrom: (5989 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6003.
  • Revision ID: jriddell@canonical.com-20110621113452-ktj67zy52th919c8
merge in trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/serializer/__init__.py
159
159
        forced_bases = {revision_id:base_revision_id}
160
160
        if base_revision_id is NULL_REVISION:
161
161
            base_revision_id = None
162
 
        revision_ids = set(repository.get_ancestry(revision_id,
163
 
                           topo_sorted=False))
164
 
        revision_ids.difference_update(repository.get_ancestry(
165
 
            base_revision_id, topo_sorted=False))
 
162
        graph = repository.get_graph()
 
163
        revision_ids = graph.find_unique_ancestors(revision_id,
 
164
            [base_revision_id])
166
165
        revision_ids = list(repository.get_graph().iter_topo_order(
167
166
            revision_ids))
168
167
        revision_ids.reverse()