← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

  • Committer: Robert Collins
  • Date: 2009-03-11 07:59:06 UTC
  • mto: This revision was merged to the branch mainline in revision 4119.
  • Revision ID: robertc@robertcollins.net-20090311075906-lc0mj10glf1eur1f
Add a groupcompress sort order.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
99
99
    AbsentContentFactory,
100
100
    adapter_registry,
101
101
    ContentFactory,
 
102
    sort_groupcompress,
102
103
    VersionedFile,
103
104
    )
104
105
from bzrlib.weavefile import _read_weave_v5, write_weave_v5
321
322
            new_versions = tsort.topo_sort(parents)
322
323
            new_versions.extend(set(versions).difference(set(parents)))
323
324
            versions = new_versions
 
325
        elif ordering == 'groupcompress':
 
326
            parents = self.get_parent_map(versions)
 
327
            new_versions = sort_groupcompress(parents)
 
328
            new_versions.extend(set(versions).difference(set(parents)))
 
329
            versions = new_versions
324
330
        for version in versions:
325
331
            if version in self:
326
332
                yield WeaveContentFactory(version, self)