/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/weave.py

merge bzr.dev r4164

Show diffs side-by-side

added added

removed removed

Lines of Context:
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)
575
581
            version_ids = self.versions()
576
582
        version_ids = set(version_ids)
577
583
        for lineno, inserted, deletes, line in self._walk_internal(version_ids):
578
 
            # if inserted not in version_ids then it was inserted before the
579
 
            # versions we care about, but because weaves cannot represent ghosts
580
 
            # properly, we do not filter down to that
581
 
            # if inserted not in version_ids: continue
 
584
            if inserted not in version_ids: continue
582
585
            if line[-1] != '\n':
583
586
                yield line + '\n', inserted
584
587
            else: