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 |
"""Directed graph production.
|
2 |
||
3 |
This module contains the code to produce an ordered directed graph of a
|
|
4 |
bzr branch, such as we display in the tree view at the top of the bzrk
|
|
5 |
window.
|
|
6 |
"""
|
|
7 |
||
672
by Vincent Ladeuil
Thanks to lamont, we know spell Prettifying with the right number of 't'. |
8 |
__copyright__ = "Copyright 2005 Canonical Ltd." |
256.2.26
by Gary van der Merwe
Use info from merge sort to draw lines. Needs work |
9 |
__author__ = "Scott James Remnant <scott@ubuntu.com>" |
10 |
||
450.8.1
by Jelmer Vernooij
Fix regression in graph determination code. |
11 |
from bzrlib.revision import NULL_REVISION |
256.2.25
by Gary van der Merwe
Use Merge sort |
12 |
from bzrlib.tsort import merge_sort |
475.2.1
by Chad MILLER
Make "vizualize" use the GUI progress bar defined in the parent 'ui' module. |
13 |
from bzrlib import ui |
14 |
||
724
by Jelmer Vernooij
Fix formatting, imports. |
15 |
|
511.5.2
by Jelmer Vernooij
Add simple test for linegraph. |
16 |
def linegraph(graph, start_revs, maxnum=None, broken_line_length=None, |
511.5.3
by Jelmer Vernooij
Merge Chad's progress bar in viz patch. |
17 |
graph_data=True, mainline_only=False, root_progress=None): |
328
by Jelmer Vernooij
Use repository instead of branch in more places, to make it easier to support multiple branches in viz. |
18 |
"""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 |
19 |
|
256.4.1
by Gary van der Merwe
* Set a width and use ellips on Revision No column. |
20 |
Returns a tuple of (line_graph, revid_index, columns_len) where
|
21 |
* line_graph is a list of tuples of (revid,
|
|
22 |
node,
|
|
23 |
lines,
|
|
24 |
parents,
|
|
25 |
children,
|
|
26 |
revno_sequence),
|
|
27 |
* revid_index is a dict of each revision with the key being the revid, and
|
|
28 |
the value the row index, and
|
|
29 |
* columns_len is the number of columns need to draw the line graph.
|
|
724
by Jelmer Vernooij
Fix formatting, imports. |
30 |
|
256.2.26
by Gary van der Merwe
Use info from merge sort to draw lines. Needs work |
31 |
|
32 |
Node is a tuple of (column, colour) with column being a zero-indexed
|
|
33 |
column number of the graph that this revision represents and colour
|
|
34 |
being a zero-indexed colour (which doesn't specify any actual colour
|
|
35 |
in particular) to draw the node in.
|
|
36 |
||
37 |
Lines is a list of tuples which represent lines you should draw away
|
|
38 |
from the revision, if you also need to draw lines into the revision
|
|
39 |
you should use the lines list from the previous iteration. Each
|
|
40 |
typle in the list is in the form (start, end, colour) with start and
|
|
41 |
end being zero-indexed column numbers and colour as in node.
|
|
42 |
||
43 |
It's up to you how to actually draw the nodes and lines (straight,
|
|
44 |
curved, kinked, etc.) and to pick the actual colours for each index.
|
|
45 |
"""
|
|
511.5.3
by Jelmer Vernooij
Merge Chad's progress bar in viz patch. |
46 |
assert isinstance(start_revs, list) |
475.2.2
by Chad MILLER
Big diff, few changes. :( |
47 |
def update_root_progress(step_number): |
48 |
"""IFF our container received a root progress bar, then update it.""" |
|
49 |
if root_progress is not None: |
|
576.4.1
by Jelmer Vernooij
Avoid using explicit names for progress bar function arguments since they differ. |
50 |
root_progress.update(None, step_number) |
475.2.2
by Chad MILLER
Big diff, few changes. :( |
51 |
|
452.4.1
by Jelmer Vernooij
Support displaying multiple tips in viz. |
52 |
graph_parents = {} |
471.1.1
by Aaron Bentley
Get viz working on graphs with ghosts |
53 |
ghosts = set() |
471.1.2
by Aaron Bentley
Turn my_graph_children into plain graph_children |
54 |
graph_children = {} |
475.2.2
by Chad MILLER
Big diff, few changes. :( |
55 |
update_root_progress(1) |
56 |
progress_bar = ui.ui_factory.nested_progress_bar() |
|
57 |
try: |
|
576.4.1
by Jelmer Vernooij
Avoid using explicit names for progress bar function arguments since they differ. |
58 |
progress_bar.update("Arranging tree fragments") |
475.2.2
by Chad MILLER
Big diff, few changes. :( |
59 |
for i, (revid, parent_revids) in enumerate(graph.iter_ancestry(start_revs)): |
60 |
if i % 25 == 0: |
|
61 |
progress_bar.tick() |
|
62 |
if parent_revids is None: |
|
63 |
ghosts.add(revid) |
|
64 |
continue
|
|
65 |
if parent_revids == (NULL_REVISION,): |
|
66 |
graph_parents[revid] = () |
|
67 |
else: |
|
68 |
graph_parents[revid] = parent_revids |
|
69 |
for parent in parent_revids: |
|
70 |
graph_children.setdefault(parent, []).append(revid) |
|
511.5.3
by Jelmer Vernooij
Merge Chad's progress bar in viz patch. |
71 |
graph_children.setdefault(revid, []) |
475.2.2
by Chad MILLER
Big diff, few changes. :( |
72 |
finally: |
73 |
progress_bar.finished() |
|
74 |
||
75 |
update_root_progress(2) |
|
76 |
progress_bar = ui.ui_factory.nested_progress_bar() |
|
77 |
try: |
|
576.4.1
by Jelmer Vernooij
Avoid using explicit names for progress bar function arguments since they differ. |
78 |
progress_bar.update("Removing ghosts", 0, len(ghosts)) |
475.2.2
by Chad MILLER
Big diff, few changes. :( |
79 |
for i, ghost in enumerate(ghosts): |
80 |
if i % 25 == 0: |
|
576.4.1
by Jelmer Vernooij
Avoid using explicit names for progress bar function arguments since they differ. |
81 |
progress_bar.update(None, i) |
475.2.2
by Chad MILLER
Big diff, few changes. :( |
82 |
for ghost_child in graph_children[ghost]: |
83 |
graph_parents[ghost_child] = [p for p in graph_parents[ghost_child] |
|
84 |
if p not in ghosts] |
|
85 |
finally: |
|
86 |
progress_bar.finished() |
|
452.4.1
by Jelmer Vernooij
Support displaying multiple tips in viz. |
87 |
graph_parents["top:"] = start_revs |
88 |
||
421.1.1
by Gary van der Merwe
Make viz not throw errors when there are 0 commits. |
89 |
if len(graph_parents)>0: |
90 |
merge_sorted_revisions = merge_sort( |
|
91 |
graph_parents, |
|
452.4.1
by Jelmer Vernooij
Support displaying multiple tips in viz. |
92 |
"top:", |
421.1.1
by Gary van der Merwe
Make viz not throw errors when there are 0 commits. |
93 |
generate_revno=True) |
94 |
else: |
|
95 |
merge_sorted_revisions = () |
|
724
by Jelmer Vernooij
Fix formatting, imports. |
96 |
|
423.1.18
by Gary van der Merwe
Add options to viz treeview to not show the line graph, and to only show the main line. |
97 |
if mainline_only: |
98 |
merge_sorted_revisions = [elem for elem in merge_sorted_revisions \ |
|
99 |
if len(elem[3])==1 ] |
|
452.4.1
by Jelmer Vernooij
Support displaying multiple tips in viz. |
100 |
|
101 |
assert merge_sorted_revisions[0][1] == "top:" |
|
102 |
merge_sorted_revisions = merge_sorted_revisions[1:] |
|
724
by Jelmer Vernooij
Fix formatting, imports. |
103 |
|
256.2.28
by Gary van der Merwe
Better line drawing with info from merge_sort |
104 |
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. |
105 |
revno_index = {} |
724
by Jelmer Vernooij
Fix formatting, imports. |
106 |
|
256.2.46
by Gary van der Merwe
Store branch lines as list rather than dict. |
107 |
# This will hold an item for each "branch". For a revisions, the revsion
|
108 |
# number less the least significant digit is the branch_id, and used as the
|
|
109 |
# key for the dict. Hence revision with the same revsion number less the
|
|
110 |
# least significant digit are considered to be in the same branch line.
|
|
111 |
# e.g.: for revisions 290.12.1 and 290.12.2, the branch_id would be 290.12,
|
|
112 |
# 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. |
113 |
# a list of rev_indexes in the branch.
|
256.2.28
by Gary van der Merwe
Better line drawing with info from merge_sort |
114 |
branch_lines = {} |
724
by Jelmer Vernooij
Fix formatting, imports. |
115 |
|
116 |
linegraph = [] |
|
117 |
||
475.2.2
by Chad MILLER
Big diff, few changes. :( |
118 |
update_root_progress(3) |
475.2.1
by Chad MILLER
Make "vizualize" use the GUI progress bar defined in the parent 'ui' module. |
119 |
progress_bar = ui.ui_factory.nested_progress_bar() |
475.2.2
by Chad MILLER
Big diff, few changes. :( |
120 |
try: |
576.4.1
by Jelmer Vernooij
Avoid using explicit names for progress bar function arguments since they differ. |
121 |
progress_bar.update("Finding nodes", 0, len(merge_sorted_revisions)) |
475.2.2
by Chad MILLER
Big diff, few changes. :( |
122 |
for (rev_index, (sequence_number, |
123 |
revid, |
|
124 |
merge_depth, |
|
125 |
revno_sequence, |
|
126 |
end_of_merge)) in enumerate(merge_sorted_revisions): |
|
475.2.1
by Chad MILLER
Make "vizualize" use the GUI progress bar defined in the parent 'ui' module. |
127 |
|
475.2.2
by Chad MILLER
Big diff, few changes. :( |
128 |
if rev_index % 25 == 0: |
576.4.1
by Jelmer Vernooij
Avoid using explicit names for progress bar function arguments since they differ. |
129 |
progress_bar.update(None, rev_index) |
475.2.2
by Chad MILLER
Big diff, few changes. :( |
130 |
if maxnum and rev_index >= maxnum: |
131 |
break
|
|
132 |
revid_index[revid] = rev_index |
|
724
by Jelmer Vernooij
Fix formatting, imports. |
133 |
|
475.2.2
by Chad MILLER
Big diff, few changes. :( |
134 |
parents = graph_parents[revid] |
135 |
linegraph.append([revid, |
|
136 |
None, |
|
137 |
[],
|
|
138 |
parents, |
|
139 |
None, |
|
140 |
revno_sequence]) |
|
724
by Jelmer Vernooij
Fix formatting, imports. |
141 |
|
475.2.2
by Chad MILLER
Big diff, few changes. :( |
142 |
if graph_data: |
143 |
revno_index[revno_sequence] = rev_index |
|
724
by Jelmer Vernooij
Fix formatting, imports. |
144 |
|
475.2.2
by Chad MILLER
Big diff, few changes. :( |
145 |
branch_id = revno_sequence[0:-1] |
724
by Jelmer Vernooij
Fix formatting, imports. |
146 |
|
475.2.2
by Chad MILLER
Big diff, few changes. :( |
147 |
branch_line = None |
148 |
if branch_id not in branch_lines: |
|
149 |
branch_line = [] |
|
150 |
branch_lines[branch_id] = branch_line |
|
151 |
else: |
|
152 |
branch_line = branch_lines[branch_id] |
|
724
by Jelmer Vernooij
Fix formatting, imports. |
153 |
|
154 |
branch_line.append(rev_index) |
|
475.2.2
by Chad MILLER
Big diff, few changes. :( |
155 |
finally: |
156 |
progress_bar.finished() |
|
256.2.33
by Gary van der Merwe
Revert fast test |
157 |
|
423.1.18
by Gary van der Merwe
Add options to viz treeview to not show the line graph, and to only show the main line. |
158 |
if graph_data: |
159 |
branch_ids = branch_lines.keys() |
|
724
by Jelmer Vernooij
Fix formatting, imports. |
160 |
|
423.1.18
by Gary van der Merwe
Add options to viz treeview to not show the line graph, and to only show the main line. |
161 |
def branch_id_cmp(x, y): |
162 |
"""Compaire branch_id's first by the number of digits, then reversed |
|
163 |
by their value"""
|
|
164 |
len_x = len(x) |
|
165 |
len_y = len(y) |
|
166 |
if len_x == len_y: |
|
167 |
return -cmp(x, y) |
|
168 |
return cmp(len_x, len_y) |
|
724
by Jelmer Vernooij
Fix formatting, imports. |
169 |
|
423.1.18
by Gary van der Merwe
Add options to viz treeview to not show the line graph, and to only show the main line. |
170 |
branch_ids.sort(branch_id_cmp) |
171 |
# This will hold a tuple of (child_index, parent_index, col_index) for each
|
|
172 |
# line that needs to be drawn. If col_index is not none, then the line is
|
|
173 |
# drawn along that column, else the the line can be drawn directly between
|
|
174 |
# the child and parent because either the child and parent are in the same
|
|
175 |
# branch line, or the child and parent are 1 row apart.
|
|
176 |
lines = [] |
|
177 |
empty_column = [False for i in range(len(graph_parents))] |
|
178 |
# This will hold a bit map for each cell. If the cell is true, then the
|
|
179 |
# cell allready contains a node or line. This use when deciding what column
|
|
180 |
# to place a branch line or line in, without it overlaping something else.
|
|
181 |
columns = [list(empty_column)] |
|
724
by Jelmer Vernooij
Fix formatting, imports. |
182 |
|
183 |
||
475.2.2
by Chad MILLER
Big diff, few changes. :( |
184 |
update_root_progress(4) |
475.2.1
by Chad MILLER
Make "vizualize" use the GUI progress bar defined in the parent 'ui' module. |
185 |
progress_bar = ui.ui_factory.nested_progress_bar() |
475.2.2
by Chad MILLER
Big diff, few changes. :( |
186 |
try: |
576.4.2
by Jelmer Vernooij
Fix typo. |
187 |
progress_bar.update("Organizing edges", 0, len(branch_ids)) |
475.2.2
by Chad MILLER
Big diff, few changes. :( |
188 |
for i, branch_id in enumerate(branch_ids): |
189 |
if i % 25 == 0: |
|
576.4.1
by Jelmer Vernooij
Avoid using explicit names for progress bar function arguments since they differ. |
190 |
progress_bar.update(None, i) |
475.2.2
by Chad MILLER
Big diff, few changes. :( |
191 |
branch_line = branch_lines[branch_id] |
724
by Jelmer Vernooij
Fix formatting, imports. |
192 |
|
475.2.2
by Chad MILLER
Big diff, few changes. :( |
193 |
# Find the col_index for the direct parent branch. This will be the
|
194 |
# starting point when looking for a free column.
|
|
195 |
parent_col_index = 0 |
|
196 |
parent_index = None |
|
197 |
if len(branch_id) > 1: |
|
198 |
parent_revno = branch_id[0:-1] |
|
199 |
if parent_revno in revno_index: |
|
200 |
parent_index = revno_index[parent_revno] |
|
423.1.18
by Gary van der Merwe
Add options to viz treeview to not show the line graph, and to only show the main line. |
201 |
parent_node = linegraph[parent_index][1] |
202 |
if parent_node: |
|
203 |
parent_col_index = parent_node[0] |
|
724
by Jelmer Vernooij
Fix formatting, imports. |
204 |
|
205 |
||
475.2.2
by Chad MILLER
Big diff, few changes. :( |
206 |
col_search_order = _branch_line_col_search_order(columns, |
207 |
parent_col_index) |
|
208 |
color = reduce(lambda x, y: x+y, branch_id, 0) |
|
209 |
cur_cont_line = [] |
|
724
by Jelmer Vernooij
Fix formatting, imports. |
210 |
|
475.2.2
by Chad MILLER
Big diff, few changes. :( |
211 |
line_range = [] |
212 |
last_rev_index = None |
|
213 |
for rev_index in branch_line: |
|
214 |
if last_rev_index: |
|
215 |
if broken_line_length and \ |
|
216 |
rev_index - last_rev_index > broken_line_length: |
|
217 |
line_range.append(last_rev_index+1) |
|
218 |
line_range.append(rev_index-1) |
|
423.1.18
by Gary van der Merwe
Add options to viz treeview to not show the line graph, and to only show the main line. |
219 |
else: |
475.2.2
by Chad MILLER
Big diff, few changes. :( |
220 |
line_range.extend(range(last_rev_index+1, rev_index)) |
724
by Jelmer Vernooij
Fix formatting, imports. |
221 |
|
475.2.2
by Chad MILLER
Big diff, few changes. :( |
222 |
line_range.append(rev_index) |
223 |
last_rev_index = rev_index |
|
724
by Jelmer Vernooij
Fix formatting, imports. |
224 |
|
475.2.2
by Chad MILLER
Big diff, few changes. :( |
225 |
if parent_index: |
226 |
if broken_line_length and \ |
|
227 |
parent_index - last_rev_index > broken_line_length: |
|
228 |
line_range.append(last_rev_index+1) |
|
229 |
else: |
|
230 |
line_range.extend(range(last_rev_index+1, parent_index)) |
|
724
by Jelmer Vernooij
Fix formatting, imports. |
231 |
|
475.2.2
by Chad MILLER
Big diff, few changes. :( |
232 |
col_index = _find_free_column(columns, |
233 |
empty_column, |
|
234 |
col_search_order, |
|
235 |
line_range) |
|
236 |
node = (col_index, color) |
|
237 |
for rev_index in branch_line: |
|
238 |
linegraph[rev_index][1] = node |
|
239 |
columns[col_index][rev_index] = True |
|
724
by Jelmer Vernooij
Fix formatting, imports. |
240 |
|
475.2.2
by Chad MILLER
Big diff, few changes. :( |
241 |
for rev_index in branch_line: |
242 |
(sequence_number, |
|
243 |
revid, |
|
244 |
merge_depth, |
|
245 |
revno_sequence, |
|
246 |
end_of_merge) = merge_sorted_revisions[rev_index] |
|
724
by Jelmer Vernooij
Fix formatting, imports. |
247 |
|
475.2.2
by Chad MILLER
Big diff, few changes. :( |
248 |
linegraph[rev_index][4] = graph_children[revid] |
249 |
col_index = linegraph[rev_index][1][0] |
|
724
by Jelmer Vernooij
Fix formatting, imports. |
250 |
|
475.2.2
by Chad MILLER
Big diff, few changes. :( |
251 |
for parent_revid in graph_parents[revid]: |
252 |
if parent_revid in revid_index: |
|
724
by Jelmer Vernooij
Fix formatting, imports. |
253 |
|
254 |
parent_index = revid_index[parent_revid] |
|
475.2.2
by Chad MILLER
Big diff, few changes. :( |
255 |
parent_node = linegraph[parent_index][1] |
256 |
if parent_node: |
|
257 |
parent_col_index = parent_node[0] |
|
258 |
else: |
|
259 |
parent_col_index = None |
|
423.1.18
by Gary van der Merwe
Add options to viz treeview to not show the line graph, and to only show the main line. |
260 |
col_search_order = \ |
261 |
_line_col_search_order(columns, |
|
262 |
parent_col_index, |
|
263 |
col_index) |
|
724
by Jelmer Vernooij
Fix formatting, imports. |
264 |
|
475.2.2
by Chad MILLER
Big diff, few changes. :( |
265 |
# If this line is really long, break it.
|
266 |
if len(branch_id) > 0 and \ |
|
267 |
broken_line_length and \ |
|
268 |
parent_index - rev_index > broken_line_length: |
|
269 |
child_line_col_index = \ |
|
270 |
_find_free_column(columns, |
|
271 |
empty_column, |
|
272 |
col_search_order, |
|
273 |
(rev_index + 1,)) |
|
274 |
_mark_column_as_used(columns, |
|
275 |
child_line_col_index, |
|
276 |
(rev_index + 1,)) |
|
724
by Jelmer Vernooij
Fix formatting, imports. |
277 |
|
475.2.2
by Chad MILLER
Big diff, few changes. :( |
278 |
# Recall _line_col_search_order to reset it back to
|
279 |
# the beging.
|
|
280 |
col_search_order = \ |
|
281 |
_line_col_search_order(columns, |
|
282 |
parent_col_index, |
|
283 |
col_index) |
|
284 |
parent_col_line_index = \ |
|
285 |
_find_free_column(columns, |
|
286 |
empty_column, |
|
287 |
col_search_order, |
|
288 |
(parent_index - 1,)) |
|
289 |
_mark_column_as_used(columns, |
|
290 |
parent_col_line_index, |
|
291 |
(parent_index - 1,)) |
|
292 |
lines.append((rev_index, |
|
293 |
parent_index, |
|
294 |
(child_line_col_index, |
|
295 |
parent_col_line_index))) |
|
296 |
else : |
|
297 |
line_col_index = col_index |
|
298 |
if parent_index - rev_index >1: |
|
299 |
line_range = range(rev_index + 1, parent_index) |
|
300 |
line_col_index = \ |
|
301 |
_find_free_column(columns, |
|
302 |
empty_column, |
|
303 |
col_search_order, |
|
304 |
line_range) |
|
305 |
_mark_column_as_used(columns, |
|
306 |
line_col_index, |
|
307 |
line_range) |
|
308 |
lines.append((rev_index, |
|
309 |
parent_index, |
|
310 |
(line_col_index,))) |
|
311 |
finally: |
|
312 |
progress_bar.finished() |
|
724
by Jelmer Vernooij
Fix formatting, imports. |
313 |
|
475.2.2
by Chad MILLER
Big diff, few changes. :( |
314 |
update_root_progress(5) |
475.2.1
by Chad MILLER
Make "vizualize" use the GUI progress bar defined in the parent 'ui' module. |
315 |
progress_bar = ui.ui_factory.nested_progress_bar() |
475.2.2
by Chad MILLER
Big diff, few changes. :( |
316 |
try: |
672
by Vincent Ladeuil
Thanks to lamont, we know spell Prettifying with the right number of 't'. |
317 |
progress_bar.update("Prettifying graph", 0, len(lines)) |
475.2.2
by Chad MILLER
Big diff, few changes. :( |
318 |
for i, (child_index, parent_index, line_col_indexes) in enumerate(lines): |
319 |
if i % 25 == 0: |
|
576.4.1
by Jelmer Vernooij
Avoid using explicit names for progress bar function arguments since they differ. |
320 |
progress_bar.update(None, i) |
475.2.2
by Chad MILLER
Big diff, few changes. :( |
321 |
(child_col_index, child_color) = linegraph[child_index][1] |
322 |
(parent_col_index, parent_color) = linegraph[parent_index][1] |
|
724
by Jelmer Vernooij
Fix formatting, imports. |
323 |
|
475.2.2
by Chad MILLER
Big diff, few changes. :( |
324 |
if len(line_col_indexes) == 1: |
325 |
if parent_index - child_index == 1: |
|
326 |
linegraph[child_index][2].append( |
|
327 |
(child_col_index, |
|
328 |
parent_col_index, |
|
329 |
parent_color)) |
|
330 |
else: |
|
331 |
# line from the child's column to the lines column
|
|
332 |
linegraph[child_index][2].append( |
|
333 |
(child_col_index, |
|
334 |
line_col_indexes[0], |
|
335 |
parent_color)) |
|
336 |
# lines down the line's column
|
|
337 |
for line_part_index in range(child_index+1, parent_index-1): |
|
338 |
linegraph[line_part_index][2].append( |
|
724
by Jelmer Vernooij
Fix formatting, imports. |
339 |
(line_col_indexes[0], |
475.2.2
by Chad MILLER
Big diff, few changes. :( |
340 |
line_col_indexes[0], |
341 |
parent_color)) |
|
342 |
# line from the line's column to the parent's column
|
|
343 |
linegraph[parent_index-1][2].append( |
|
344 |
(line_col_indexes[0], |
|
345 |
parent_col_index, |
|
346 |
parent_color)) |
|
423.1.18
by Gary van der Merwe
Add options to viz treeview to not show the line graph, and to only show the main line. |
347 |
else: |
475.2.2
by Chad MILLER
Big diff, few changes. :( |
348 |
# Broken line
|
423.1.18
by Gary van der Merwe
Add options to viz treeview to not show the line graph, and to only show the main line. |
349 |
# line from the child's column to the lines column
|
350 |
linegraph[child_index][2].append( |
|
351 |
(child_col_index, |
|
352 |
line_col_indexes[0], |
|
353 |
parent_color)) |
|
475.2.2
by Chad MILLER
Big diff, few changes. :( |
354 |
# Broken line end
|
355 |
linegraph[child_index+1][2].append( |
|
356 |
(line_col_indexes[0], |
|
357 |
None, |
|
358 |
parent_color)) |
|
724
by Jelmer Vernooij
Fix formatting, imports. |
359 |
|
475.2.2
by Chad MILLER
Big diff, few changes. :( |
360 |
# Broken line end
|
361 |
linegraph[parent_index-2][2].append( |
|
362 |
(None, |
|
363 |
line_col_indexes[1], |
|
364 |
parent_color)) |
|
423.1.18
by Gary van der Merwe
Add options to viz treeview to not show the line graph, and to only show the main line. |
365 |
# line from the line's column to the parent's column
|
366 |
linegraph[parent_index-1][2].append( |
|
475.2.2
by Chad MILLER
Big diff, few changes. :( |
367 |
(line_col_indexes[1], |
423.1.18
by Gary van der Merwe
Add options to viz treeview to not show the line graph, and to only show the main line. |
368 |
parent_col_index, |
369 |
parent_color)) |
|
475.2.2
by Chad MILLER
Big diff, few changes. :( |
370 |
finally: |
371 |
progress_bar.finished() |
|
423.1.18
by Gary van der Merwe
Add options to viz treeview to not show the line graph, and to only show the main line. |
372 |
return (linegraph, revid_index, len(columns)) |
373 |
else: |
|
374 |
return (linegraph, revid_index, 0) |
|
724
by Jelmer Vernooij
Fix formatting, imports. |
375 |
|
256.2.26
by Gary van der Merwe
Use info from merge sort to draw lines. Needs work |
376 |
|
256.2.48
by Gary van der Merwe
Make the line to a direct parent in the same column as the child branch line. |
377 |
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 |
378 |
for col_index in range(parent_col_index, len(columns)): |
379 |
yield col_index |
|
380 |
for col_index in range(parent_col_index-1, -1, -1): |
|
381 |
yield col_index |
|
256.2.47
by Gary van der Merwe
Tweek the search order of columns. |
382 |
|
256.2.48
by Gary van der Merwe
Make the line to a direct parent in the same column as the child branch line. |
383 |
def _line_col_search_order(columns, parent_col_index, child_col_index): |
384 |
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 |
385 |
max_index = max(parent_col_index, child_col_index) |
386 |
min_index = min(parent_col_index, child_col_index) |
|
387 |
for col_index in range(max_index, min_index -1, -1): |
|
388 |
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. |
389 |
else: |
256.2.58
by Gary van der Merwe
Improve the performance of the search order functions by making them |
390 |
max_index = child_col_index |
391 |
min_index = child_col_index |
|
392 |
yield child_col_index |
|
256.2.47
by Gary van der Merwe
Tweek the search order of columns. |
393 |
i = 1 |
256.2.58
by Gary van der Merwe
Improve the performance of the search order functions by making them |
394 |
while max_index + i < len(columns) or \ |
395 |
min_index - i > -1: |
|
396 |
if max_index + i < len(columns): |
|
397 |
yield max_index + i |
|
398 |
if min_index - i > -1: |
|
399 |
yield min_index - i |
|
256.2.47
by Gary van der Merwe
Tweek the search order of columns. |
400 |
i += 1 |
401 |
||
256.2.50
by Gary van der Merwe
First implementation of broken lines. |
402 |
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. |
403 |
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. |
404 |
column = columns[col_index] |
256.2.40
by Gary van der Merwe
Take out a whole bunch of code for better performance. |
405 |
has_overlaping_line = False |
256.2.42
by Gary van der Merwe
Performance improvements. |
406 |
for row_index in line_range: |
407 |
if column[row_index]: |
|
256.2.40
by Gary van der Merwe
Take out a whole bunch of code for better performance. |
408 |
has_overlaping_line = True |
409 |
break
|
|
410 |
if not has_overlaping_line: |
|
411 |
break
|
|
412 |
else: |
|
413 |
col_index = len(columns) |
|
256.2.42
by Gary van der Merwe
Performance improvements. |
414 |
column = list(empty_column) |
415 |
columns.append(column) |
|
256.2.50
by Gary van der Merwe
First implementation of broken lines. |
416 |
return col_index |
417 |
||
418 |
def _mark_column_as_used(columns, col_index, line_range): |
|
419 |
column = columns[col_index] |
|
256.2.42
by Gary van der Merwe
Performance improvements. |
420 |
for row_index in line_range: |
724
by Jelmer Vernooij
Fix formatting, imports. |
421 |
column[row_index] = True |
256.2.26
by Gary van der Merwe
Use info from merge sort to draw lines. Needs work |
422 |
|
423 |
def same_branch(a, b): |
|
424 |
"""Return whether we think revisions a and b are on the same branch.""" |
|
425 |
if len(a.parent_ids) == 1: |
|
426 |
# Defacto same branch if only parent
|
|
427 |
return True |
|
428 |
elif a.committer == b.committer: |
|
429 |
# Same committer so may as well be
|
|
430 |
return True |
|
431 |
else: |
|
432 |
return False |