/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to branchview/linegraph.py

  • Committer: Jelmer Vernooij
  • Date: 2008-06-29 18:31:29 UTC
  • mto: This revision was merged to the branch mainline in revision 518.
  • Revision ID: jelmer@samba.org-20080629183129-syqvz3xm5gqagzsx
https://launchpad.net/bugs/244025
Fix use of smart_add.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branchview/linegraph.py
9
9
__copyright__ = "Copyright © 2005 Canonical Ltd."
10
10
__author__    = "Scott James Remnant <scott@ubuntu.com>"
11
11
 
 
12
from bzrlib.revision import NULL_REVISION
12
13
from bzrlib.tsort import merge_sort
13
14
 
14
 
def linegraph(repository, start, maxnum, broken_line_length = None,
 
15
def linegraph(repository, start_revs, maxnum, broken_line_length = None,
15
16
              graph_data = True, mainline_only = False):
16
17
    """Produce a directed graph of a bzr repository.
17
18
 
42
43
    curved, kinked, etc.) and to pick the actual colours for each index.
43
44
    """
44
45
    
45
 
    graph_parents = repository.get_revision_graph(start)
 
46
    graph = repository.get_graph()
 
47
    graph_parents = {}
 
48
    ghosts = set()
46
49
    graph_children = {}
47
 
    for revid in graph_parents.iterkeys():
48
 
        graph_children[revid] = []
 
50
    for (revid, parent_revids) in graph.iter_ancestry(start_revs):
 
51
        if parent_revids is None:
 
52
            ghosts.add(revid)
 
53
            continue
 
54
        if parent_revids == (NULL_REVISION,):
 
55
            graph_parents[revid] = ()
 
56
        else:
 
57
            graph_parents[revid] = parent_revids
 
58
        for parent in parent_revids:
 
59
            graph_children.setdefault(parent, []).append(revid)
 
60
        graph_children.setdefault(revid, [])
 
61
    for ghost in ghosts:
 
62
        for ghost_child in graph_children[ghost]:
 
63
            graph_parents[ghost_child] = [p for p in graph_parents[ghost_child]
 
64
                                          if p not in ghosts]
 
65
    graph_parents["top:"] = start_revs
49
66
 
50
67
    if len(graph_parents)>0:
51
68
        merge_sorted_revisions = merge_sort(
52
69
            graph_parents,
53
 
            start,
 
70
            "top:",
54
71
            generate_revno=True)
55
72
    else:
56
73
        merge_sorted_revisions = ()
58
75
    if mainline_only:
59
76
        merge_sorted_revisions = [elem for elem in merge_sorted_revisions \
60
77
                                  if len(elem[3])==1 ]
 
78
 
 
79
    assert merge_sorted_revisions[0][1] == "top:"
 
80
    merge_sorted_revisions = merge_sorted_revisions[1:]
61
81
    
62
82
    revid_index = {}
63
83
    revno_index = {}
83
103
        revid_index[revid] = rev_index
84
104
        
85
105
        parents = graph_parents[revid]
86
 
        for parent_revid in parents:
87
 
            graph_children[parent_revid].append(revid)
88
 
        
89
106
        linegraph.append([revid,
90
107
                          None,
91
108
                          [],