/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz
256.2.26 by Gary van der Merwe
Use info from merge sort to draw lines. Needs work
1
# -*- coding: UTF-8 -*-
2
"""Directed graph production.
3
4
This module contains the code to produce an ordered directed graph of a
5
bzr branch, such as we display in the tree view at the top of the bzrk
6
window.
7
"""
8
9
__copyright__ = "Copyright © 2005 Canonical Ltd."
10
__author__    = "Scott James Remnant <scott@ubuntu.com>"
11
256.2.25 by Gary van der Merwe
Use Merge sort
12
from bzrlib.tsort import merge_sort
256.2.26 by Gary van der Merwe
Use info from merge sort to draw lines. Needs work
13
329 by Jelmer Vernooij
Make broken_line_length setting from higher up.
14
def linegraph(repository, start, maxnum, broken_line_length=None):
328 by Jelmer Vernooij
Use repository instead of branch in more places, to make it easier to support multiple branches in viz.
15
    """Produce a directed graph of a bzr repository.
256.2.26 by Gary van der Merwe
Use info from merge sort to draw lines. Needs work
16
256.4.1 by Gary van der Merwe
* Set a width and use ellips on Revision No column.
17
    Returns a tuple of (line_graph, revid_index, columns_len) where
18
    * line_graph is a list of tuples of (revid,
19
                                         node,
20
                                         lines,
21
                                         parents,
22
                                         children,
23
                                         revno_sequence),
24
    * revid_index is a dict of each revision with the key being the revid, and
25
      the value the row index, and
26
    * columns_len is the number of columns need to draw the line graph.
27
    
256.2.26 by Gary van der Merwe
Use info from merge sort to draw lines. Needs work
28
29
    Node is a tuple of (column, colour) with column being a zero-indexed
30
    column number of the graph that this revision represents and colour
31
    being a zero-indexed colour (which doesn't specify any actual colour
32
    in particular) to draw the node in.
33
34
    Lines is a list of tuples which represent lines you should draw away
35
    from the revision, if you also need to draw lines into the revision
36
    you should use the lines list from the previous iteration.  Each
37
    typle in the list is in the form (start, end, colour) with start and
38
    end being zero-indexed column numbers and colour as in node.
39
40
    It's up to you how to actually draw the nodes and lines (straight,
41
    curved, kinked, etc.) and to pick the actual colours for each index.
42
    """
256.2.46 by Gary van der Merwe
Store branch lines as list rather than dict.
43
    
328 by Jelmer Vernooij
Use repository instead of branch in more places, to make it easier to support multiple branches in viz.
44
    graph_parents = repository.get_revision_graph(start)
256.2.26 by Gary van der Merwe
Use info from merge sort to draw lines. Needs work
45
    graph_children = {}
256.2.42 by Gary van der Merwe
Performance improvements.
46
    for revid in graph_parents.iterkeys():
256.2.26 by Gary van der Merwe
Use info from merge sort to draw lines. Needs work
47
        graph_children[revid] = []
256.2.28 by Gary van der Merwe
Better line drawing with info from merge_sort
48
421.1.1 by Gary van der Merwe
Make viz not throw errors when there are 0 commits.
49
    if len(graph_parents)>0:
50
        merge_sorted_revisions = merge_sort(
51
            graph_parents,
52
            start,
53
            generate_revno=True)
54
    else:
55
        merge_sorted_revisions = ()
256.2.26 by Gary van der Merwe
Use info from merge sort to draw lines. Needs work
56
    
256.2.28 by Gary van der Merwe
Better line drawing with info from merge_sort
57
    revid_index = {}
256.2.48 by Gary van der Merwe
Make the line to a direct parent in the same column as the child branch line.
58
    revno_index = {}
256.2.46 by Gary van der Merwe
Store branch lines as list rather than dict.
59
    
60
    # This will hold an item for each "branch". For a revisions, the revsion
61
    # number less the least significant digit is the branch_id, and used as the
62
    # key for the dict. Hence revision with the same revsion number less the
63
    # least significant digit are considered to be in the same branch line.
64
    # e.g.: for revisions 290.12.1 and 290.12.2, the branch_id would be 290.12,
65
    # and these two revisions will be in the same branch line. Each value is
256.2.50 by Gary van der Merwe
First implementation of broken lines.
66
    # a list of rev_indexes in the branch.
256.2.28 by Gary van der Merwe
Better line drawing with info from merge_sort
67
    branch_lines = {}
256.2.46 by Gary van der Merwe
Store branch lines as list rather than dict.
68
    
256.2.28 by Gary van der Merwe
Better line drawing with info from merge_sort
69
    linegraph = []    
256.2.26 by Gary van der Merwe
Use info from merge sort to draw lines. Needs work
70
    
256.2.40 by Gary van der Merwe
Take out a whole bunch of code for better performance.
71
    for (rev_index, (sequence_number,
72
                     revid,
73
                     merge_depth,
74
                     revno_sequence,
75
                     end_of_merge)) in enumerate(merge_sorted_revisions):
256.2.55 by Gary van der Merwe
Merge vizchanges
76
        if maxnum and rev_index >= maxnum:
77
            break
256.2.40 by Gary van der Merwe
Take out a whole bunch of code for better performance.
78
        revid_index[revid] = rev_index
256.2.48 by Gary van der Merwe
Make the line to a direct parent in the same column as the child branch line.
79
        revno_index[revno_sequence] = rev_index
256.2.28 by Gary van der Merwe
Better line drawing with info from merge_sort
80
        
81
        branch_id = revno_sequence[0:-1]
82
        
256.2.33 by Gary van der Merwe
Revert fast test
83
        branch_line = None
84
        if branch_id not in branch_lines:
256.2.50 by Gary van der Merwe
First implementation of broken lines.
85
            branch_line = []
256.2.33 by Gary van der Merwe
Revert fast test
86
            branch_lines[branch_id] = branch_line
87
        else:
88
            branch_line = branch_lines[branch_id]
256.2.46 by Gary van der Merwe
Store branch lines as list rather than dict.
89
        
256.2.50 by Gary van der Merwe
First implementation of broken lines.
90
        branch_line.append(rev_index)
256.2.33 by Gary van der Merwe
Revert fast test
91
        
256.2.28 by Gary van der Merwe
Better line drawing with info from merge_sort
92
        parents = graph_parents[revid]
256.2.26 by Gary van der Merwe
Use info from merge sort to draw lines. Needs work
93
        for parent_revid in parents:
94
            graph_children[parent_revid].append(revid)
95
        
256.2.33 by Gary van der Merwe
Revert fast test
96
        linegraph.append([revid,
97
                          None,
256.2.27 by Gary van der Merwe
Show Revision No in tree
98
                          [],
99
                          parents,
256.2.33 by Gary van der Merwe
Revert fast test
100
                          None,
101
                          revno_sequence])
102
103
    branch_ids = branch_lines.keys()
256.2.46 by Gary van der Merwe
Store branch lines as list rather than dict.
104
    
256.2.39 by Gary van der Merwe
Tweek order that branch lines are processed for more understandable results.
105
    def branch_id_cmp(x, y):
256.2.46 by Gary van der Merwe
Store branch lines as list rather than dict.
106
        """Compaire branch_id's first by the number of digits, then reversed
107
        by their value"""
256.2.39 by Gary van der Merwe
Tweek order that branch lines are processed for more understandable results.
108
        len_x = len(x)
109
        len_y = len(y)
110
        if len_x == len_y:
111
            return -cmp(x, y)
112
        return cmp(len_x, len_y)
256.2.46 by Gary van der Merwe
Store branch lines as list rather than dict.
113
    
256.2.39 by Gary van der Merwe
Tweek order that branch lines are processed for more understandable results.
114
    branch_ids.sort(branch_id_cmp)
256.2.46 by Gary van der Merwe
Store branch lines as list rather than dict.
115
    # This will hold a tuple of (child_index, parent_index, col_index) for each
116
    # line that needs to be drawn. If col_index is not none, then the line is
117
    # drawn along that column, else the the line can be drawn directly between
118
    # the child and parent because either the child and parent are in the same
119
    # branch line, or the child and parent are 1 row apart.
256.2.40 by Gary van der Merwe
Take out a whole bunch of code for better performance.
120
    lines = []
256.2.42 by Gary van der Merwe
Performance improvements.
121
    empty_column = [False for i in range(len(graph_parents))]
256.2.46 by Gary van der Merwe
Store branch lines as list rather than dict.
122
    # This will hold a bit map for each cell. If the cell is true, then the
123
    # cell allready contains a node or line. This use when deciding what column
124
    # to place a branch line or line in, without it overlaping something else.
256.2.44 by Gary van der Merwe
Chose what column to place nodes and lines in better.
125
    columns = [list(empty_column)]
256.2.42 by Gary van der Merwe
Performance improvements.
126
    
256.2.38 by Gary van der Merwe
Add support for lines that go between branches.
127
    
128
    for branch_id in branch_ids:
129
        branch_line = branch_lines[branch_id]
130
        
256.2.48 by Gary van der Merwe
Make the line to a direct parent in the same column as the child branch line.
131
        # Find the col_index for the direct parent branch. This will be the
132
        # starting point when looking for a free column.
256.2.44 by Gary van der Merwe
Chose what column to place nodes and lines in better.
133
        parent_col_index = 0
256.2.50 by Gary van der Merwe
First implementation of broken lines.
134
        parent_index = None
256.2.44 by Gary van der Merwe
Chose what column to place nodes and lines in better.
135
        if len(branch_id) > 1:
256.2.48 by Gary van der Merwe
Make the line to a direct parent in the same column as the child branch line.
136
            parent_revno = branch_id[0:-1]
137
            if parent_revno in revno_index:
138
                parent_index = revno_index[parent_revno]
256.2.50 by Gary van der Merwe
First implementation of broken lines.
139
                parent_node = linegraph[parent_index][1]
140
                if parent_node:
141
                    parent_col_index = parent_node[0]
142
                
256.2.48 by Gary van der Merwe
Make the line to a direct parent in the same column as the child branch line.
143
        
144
        col_search_order = _branch_line_col_search_order(columns,
145
                                                         parent_col_index)
256.2.33 by Gary van der Merwe
Revert fast test
146
        color = reduce(lambda x, y: x+y, branch_id, 0)
256.2.50 by Gary van der Merwe
First implementation of broken lines.
147
        cur_cont_line = []
148
        
256.2.52 by Gary van der Merwe
Make branch lines that have broken lines exist only on one line.
149
        line_range = []
256.2.50 by Gary van der Merwe
First implementation of broken lines.
150
        last_rev_index = None
151
        for rev_index in branch_line:
152
            if last_rev_index:
329 by Jelmer Vernooij
Make broken_line_length setting from higher up.
153
                if broken_line_length and \
154
                   rev_index - last_rev_index > broken_line_length:
256.2.52 by Gary van der Merwe
Make branch lines that have broken lines exist only on one line.
155
                    line_range.append(last_rev_index+1)
156
                    line_range.append(rev_index-1)
157
                else:
158
                    line_range.extend(range(last_rev_index+1, rev_index))
159
            
160
            line_range.append(rev_index)
256.2.50 by Gary van der Merwe
First implementation of broken lines.
161
            last_rev_index = rev_index
256.2.52 by Gary van der Merwe
Make branch lines that have broken lines exist only on one line.
162
        
163
        if parent_index:
329 by Jelmer Vernooij
Make broken_line_length setting from higher up.
164
            if broken_line_length and \
165
               parent_index - last_rev_index > broken_line_length:
256.2.52 by Gary van der Merwe
Make branch lines that have broken lines exist only on one line.
166
                line_range.append(last_rev_index+1)
167
            else:
168
                line_range.extend(range(last_rev_index+1, parent_index))
169
        
170
        col_index = _find_free_column(columns,
171
                                      empty_column,
172
                                      col_search_order,
173
                                      line_range)
174
        node = (col_index, color)
175
        for rev_index in branch_line:
176
            linegraph[rev_index][1] = node
177
            columns[col_index][rev_index] = True
256.2.50 by Gary van der Merwe
First implementation of broken lines.
178
        
179
        for rev_index in branch_line:
256.2.33 by Gary van der Merwe
Revert fast test
180
            (sequence_number,
181
                 revid,
182
                 merge_depth,
183
                 revno_sequence,
184
                 end_of_merge) = merge_sorted_revisions[rev_index]
185
            
256.2.40 by Gary van der Merwe
Take out a whole bunch of code for better performance.
186
            linegraph[rev_index][4] = graph_children[revid]
256.2.50 by Gary van der Merwe
First implementation of broken lines.
187
            col_index = linegraph[rev_index][1][0]
256.2.40 by Gary van der Merwe
Take out a whole bunch of code for better performance.
188
            
189
            for parent_revid in graph_parents[revid]:
190
                if parent_revid in revid_index:
256.2.48 by Gary van der Merwe
Make the line to a direct parent in the same column as the child branch line.
191
                    
256.2.50 by Gary van der Merwe
First implementation of broken lines.
192
                    parent_index = revid_index[parent_revid]                            
193
                    parent_node = linegraph[parent_index][1]
194
                    if parent_node:
195
                        parent_col_index = parent_node[0]
196
                    else:
197
                        parent_col_index = None
198
                    col_search_order = \
199
                            _line_col_search_order(columns,
200
                                                   parent_col_index,
201
                                                   col_index)
202
                        
203
                    # If this line is really long, break it.
204
                    if len(branch_id) > 0 and \
329 by Jelmer Vernooij
Make broken_line_length setting from higher up.
205
                       broken_line_length and \
206
                       parent_index - rev_index > broken_line_length:
256.2.50 by Gary van der Merwe
First implementation of broken lines.
207
                        child_line_col_index = \
208
                            _find_free_column(columns,
209
                                              empty_column,
210
                                              col_search_order,
256.2.53 by Gary van der Merwe
* Revert using child color for bottom of broken line.
211
                                              (rev_index + 1,))
256.2.50 by Gary van der Merwe
First implementation of broken lines.
212
                        _mark_column_as_used(columns,
213
                                             child_line_col_index,
256.2.53 by Gary van der Merwe
* Revert using child color for bottom of broken line.
214
                                             (rev_index + 1,))
256.2.60 by Gary van der Merwe
Fix a bug with the selection of a column for a broken line.
215
                        
216
                        # Recall _line_col_search_order to reset it back to
217
                        # the beging.
218
                        col_search_order = \
219
                                _line_col_search_order(columns,
220
                                                       parent_col_index,
221
                                                       col_index)
256.2.50 by Gary van der Merwe
First implementation of broken lines.
222
                        parent_col_line_index = \
223
                            _find_free_column(columns,
224
                                              empty_column,
225
                                              col_search_order,
256.2.53 by Gary van der Merwe
* Revert using child color for bottom of broken line.
226
                                              (parent_index - 1,))
256.2.50 by Gary van der Merwe
First implementation of broken lines.
227
                        _mark_column_as_used(columns,
228
                                             parent_col_line_index,
256.2.53 by Gary van der Merwe
* Revert using child color for bottom of broken line.
229
                                             (parent_index - 1,))
256.2.50 by Gary van der Merwe
First implementation of broken lines.
230
                        lines.append((rev_index,
231
                                      parent_index,
232
                                      (child_line_col_index,
233
                                       parent_col_line_index)))
234
                    else :
235
                        line_col_index = col_index
236
                        if parent_index - rev_index >1:
237
                            line_range = range(rev_index + 1, parent_index)
238
                            line_col_index = \
239
                                _find_free_column(columns,
240
                                                  empty_column,
241
                                                  col_search_order,
242
                                                  line_range)
243
                            _mark_column_as_used(columns,
244
                                                 line_col_index,
245
                                                 line_range)
246
                        lines.append((rev_index,
247
                                      parent_index,
248
                                      (line_col_index,)))
256.2.40 by Gary van der Merwe
Take out a whole bunch of code for better performance.
249
    
256.2.50 by Gary van der Merwe
First implementation of broken lines.
250
    for (child_index, parent_index, line_col_indexes) in lines:
256.2.51 by Gary van der Merwe
Make the color of the bottom of a broken the color of the child.
251
        (child_col_index, child_color) = linegraph[child_index][1]
252
        (parent_col_index, parent_color) = linegraph[parent_index][1]
256.2.40 by Gary van der Merwe
Take out a whole bunch of code for better performance.
253
        
256.2.50 by Gary van der Merwe
First implementation of broken lines.
254
        if len(line_col_indexes) == 1:
255
            if parent_index - child_index == 1:
256
                linegraph[child_index][2].append(
257
                    (child_col_index,
258
                     parent_col_index,
256.2.51 by Gary van der Merwe
Make the color of the bottom of a broken the color of the child.
259
                     parent_color))
256.2.50 by Gary van der Merwe
First implementation of broken lines.
260
            else:
261
                # line from the child's column to the lines column
262
                linegraph[child_index][2].append(
263
                    (child_col_index,
264
                     line_col_indexes[0],
256.2.51 by Gary van der Merwe
Make the color of the bottom of a broken the color of the child.
265
                     parent_color))
256.2.50 by Gary van der Merwe
First implementation of broken lines.
266
                # lines down the line's column
267
                for line_part_index in range(child_index+1, parent_index-1):
268
                    linegraph[line_part_index][2].append(
269
                        (line_col_indexes[0],   
270
                         line_col_indexes[0],
256.2.51 by Gary van der Merwe
Make the color of the bottom of a broken the color of the child.
271
                         parent_color))
256.2.50 by Gary van der Merwe
First implementation of broken lines.
272
                # line from the line's column to the parent's column
273
                linegraph[parent_index-1][2].append(
274
                    (line_col_indexes[0],
275
                     parent_col_index,
256.2.51 by Gary van der Merwe
Make the color of the bottom of a broken the color of the child.
276
                     parent_color))
256.2.50 by Gary van der Merwe
First implementation of broken lines.
277
        else:
278
            # Broken line
256.2.48 by Gary van der Merwe
Make the line to a direct parent in the same column as the child branch line.
279
            # line from the child's column to the lines column
256.2.40 by Gary van der Merwe
Take out a whole bunch of code for better performance.
280
            linegraph[child_index][2].append(
281
                (child_col_index,
256.2.50 by Gary van der Merwe
First implementation of broken lines.
282
                 line_col_indexes[0],
256.2.51 by Gary van der Merwe
Make the color of the bottom of a broken the color of the child.
283
                 parent_color))
256.2.50 by Gary van der Merwe
First implementation of broken lines.
284
            # Broken line end
285
            linegraph[child_index+1][2].append(
286
                (line_col_indexes[0],
287
                 None,
256.2.51 by Gary van der Merwe
Make the color of the bottom of a broken the color of the child.
288
                 parent_color))
256.2.50 by Gary van der Merwe
First implementation of broken lines.
289
            
290
            # Broken line end 
291
            linegraph[parent_index-2][2].append(
292
                (None,
293
                 line_col_indexes[1],
256.2.53 by Gary van der Merwe
* Revert using child color for bottom of broken line.
294
                 parent_color))
256.2.48 by Gary van der Merwe
Make the line to a direct parent in the same column as the child branch line.
295
            # line from the line's column to the parent's column
256.2.40 by Gary van der Merwe
Take out a whole bunch of code for better performance.
296
            linegraph[parent_index-1][2].append(
256.2.50 by Gary van der Merwe
First implementation of broken lines.
297
                (line_col_indexes[1],
298
                 parent_col_index,
256.2.53 by Gary van der Merwe
* Revert using child color for bottom of broken line.
299
                 parent_color))
256.2.50 by Gary van der Merwe
First implementation of broken lines.
300
            
256.2.28 by Gary van der Merwe
Better line drawing with info from merge_sort
301
    
256.4.1 by Gary van der Merwe
* Set a width and use ellips on Revision No column.
302
    return (linegraph, revid_index, len(columns))
256.2.26 by Gary van der Merwe
Use info from merge sort to draw lines. Needs work
303
256.2.48 by Gary van der Merwe
Make the line to a direct parent in the same column as the child branch line.
304
def _branch_line_col_search_order(columns, parent_col_index):
256.2.58 by Gary van der Merwe
Improve the performance of the search order functions by making them
305
    for col_index in range(parent_col_index, len(columns)):
306
        yield col_index
307
    for col_index in range(parent_col_index-1, -1, -1):
308
        yield col_index
256.2.47 by Gary van der Merwe
Tweek the search order of columns.
309
256.2.48 by Gary van der Merwe
Make the line to a direct parent in the same column as the child branch line.
310
def _line_col_search_order(columns, parent_col_index, child_col_index):
311
    if parent_col_index is not None:
256.2.58 by Gary van der Merwe
Improve the performance of the search order functions by making them
312
        max_index = max(parent_col_index, child_col_index)
313
        min_index = min(parent_col_index, child_col_index)
314
        for col_index in range(max_index, min_index -1, -1):
315
            yield col_index
256.2.48 by Gary van der Merwe
Make the line to a direct parent in the same column as the child branch line.
316
    else:
256.2.58 by Gary van der Merwe
Improve the performance of the search order functions by making them
317
        max_index = child_col_index
318
        min_index = child_col_index
319
        yield child_col_index
256.2.47 by Gary van der Merwe
Tweek the search order of columns.
320
    i = 1
256.2.58 by Gary van der Merwe
Improve the performance of the search order functions by making them
321
    while max_index + i < len(columns) or \
322
          min_index - i > -1:
323
        if max_index + i < len(columns):
324
            yield max_index + i
325
        if min_index - i > -1:
326
            yield min_index - i
256.2.47 by Gary van der Merwe
Tweek the search order of columns.
327
        i += 1
328
256.2.50 by Gary van der Merwe
First implementation of broken lines.
329
def _find_free_column(columns, empty_column, col_search_order, line_range):
256.2.47 by Gary van der Merwe
Tweek the search order of columns.
330
    for col_index in col_search_order:
256.2.44 by Gary van der Merwe
Chose what column to place nodes and lines in better.
331
        column = columns[col_index]
256.2.40 by Gary van der Merwe
Take out a whole bunch of code for better performance.
332
        has_overlaping_line = False
256.2.42 by Gary van der Merwe
Performance improvements.
333
        for row_index in line_range:
334
            if column[row_index]:
256.2.40 by Gary van der Merwe
Take out a whole bunch of code for better performance.
335
                has_overlaping_line = True
336
                break
337
        if not has_overlaping_line:
338
            break
339
    else:
340
        col_index = len(columns)
256.2.42 by Gary van der Merwe
Performance improvements.
341
        column = list(empty_column)
342
        columns.append(column)
256.2.50 by Gary van der Merwe
First implementation of broken lines.
343
    return col_index
344
345
def _mark_column_as_used(columns, col_index, line_range):
346
    column = columns[col_index]
256.2.42 by Gary van der Merwe
Performance improvements.
347
    for row_index in line_range:
256.2.50 by Gary van der Merwe
First implementation of broken lines.
348
        column[row_index] = True    
256.2.26 by Gary van der Merwe
Use info from merge sort to draw lines. Needs work
349
350
def same_branch(a, b):
351
    """Return whether we think revisions a and b are on the same branch."""
352
    if len(a.parent_ids) == 1:
353
        # Defacto same branch if only parent
354
        return True
355
    elif a.committer == b.committer:
356
        # Same committer so may as well be
357
        return True
358
    else:
359
        return False