← Back to branch summary

~ubuntu-branches/debian/sid/bzr/sid

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij, Jelmer Vernooij, Max Bowsher
  • Date: 2011-07-14 15:35:42 UTC
  • mfrom: (1.5.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20110714153542-7m3m8jpt6c167g2a
Tags: 2.4.0~beta5-1
https://launchpad.net/bugs/803362
[ Jelmer Vernooij ]
* Fix typo in package description. Thanks Paul Stewart.
* Mark python-bzrlib as breaking with older versions of bzr that
  predate python-bzrlib. LP: #803362

[ Max Bowsher ]
* New upstream release.

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()