← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/multiparent.py

Merge thread.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/multiparent.py
33
33
from bzrlib.tuned_gzip import GzipFile
34
34
 
35
35
 
 
36
def topo_iter_keys(vf, keys=None):
 
37
    if keys is None:
 
38
        keys = vf.keys()
 
39
    parents = vf.get_parent_map(keys)
 
40
    return _topo_iter(parents, keys)
 
41
 
36
42
def topo_iter(vf, versions=None):
37
 
    seen = set()
38
 
    descendants = {}
39
43
    if versions is None:
40
44
        versions = vf.versions()
41
45
    parents = vf.get_parent_map(versions)
 
46
    return _topo_iter(parents, versions)
 
47
 
 
48
def _topo_iter(parents, versions):
 
49
    seen = set()
 
50
    descendants = {}
42
51
    def pending_parents(version):
 
52
        if parents[version] is None:
 
53
            return []
43
54
        return [v for v in parents[version] if v in versions and
44
55
                v not in seen]
45
56
    for version_id in versions:
 
57
        if parents[version_id] is None:
 
58
            # parentless
 
59
            continue
46
60
        for parent_id in parents[version_id]:
47
61
            descendants.setdefault(parent_id, []).append(version_id)
48
62
    cur = [v for v in versions if len(pending_parents(v)) == 0]