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 viz/linegraph.py
- browse files at revision 256.2.54
- compare with another revision
- download diff
- download tarball
- view history from revision 256.2.54
- Committer: Gary van der Merwe
- Date: 2007-09-22 15:01:53 UTC
- mfrom: (256.4.1 gtk)
- mto: This revision was merged to the branch mainline in revision 289.
- Revision ID: garyvdm@gmail.com-20070922150153-zkqtq9gfj9d3pwrk
Merge viz changes
- files added:
- tests/test_viz.py
- files removed:
- branchview
- preferences
- files renamed:
- icons/bzr-icon-64.png => bzr-icon-64.png
- revisionview.py => logview.py
- preferences/__init__.py => preferences.py
- branchview/graphcell.py => viz/graphcell.py
- branchview/linegraph.py => viz/linegraph.py
- branchview/treemodel.py => viz/treemodel.py
- files modified:
- AUTHORS
added
removed
viz/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
13
12
from bzrlib.tsort import merge_sort
14
from bzrlib import ui
15
13
16
def linegraph(graph, start_revs, maxnum=None, broken_line_length=None,
17
graph_data=True, mainline_only=False, root_progress=None):
18
"""Produce a directed graph of a bzr repository.
14
def linegraph(branch, start, maxnum):
15
"""Produce a directed graph of a bzr branch.
19
16
20
17
Returns a tuple of (line_graph, revid_index, columns_len) where
21
18
* line_graph is a list of tuples of (revid,
43
40
It's up to you how to actually draw the nodes and lines (straight,
44
41
curved, kinked, etc.) and to pick the actual colours for each index.
45
42
"""
46
assert isinstance(start_revs, list)
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:
50
root_progress.update(current=step_number)
51
52
graph_parents = {}
53
ghosts = set()
43
44
# FIXME: This should be configurable
45
BROKEN_LINE_LENGTH = 32
46
47
# We get the mainline so we can pass it to merge_sort to make merge_sort
48
# run faster.
49
mainline = branch.revision_history()
50
graph_parents = branch.repository.get_revision_graph(start)
54
51
graph_children = {}
55
update_root_progress(1)
56
progress_bar = ui.ui_factory.nested_progress_bar()
57
try:
58
progress_bar.update(msg="Arranging tree fragments")
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)
71
graph_children.setdefault(revid, [])
72
finally:
73
progress_bar.finished()
74
75
update_root_progress(2)
76
progress_bar = ui.ui_factory.nested_progress_bar()
77
try:
78
progress_bar.update(msg="Removing ghosts", total=len(ghosts))
79
for i, ghost in enumerate(ghosts):
80
if i % 25 == 0:
81
progress_bar.update(current=i)
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()
87
graph_parents["top:"] = start_revs
88
89
if len(graph_parents)>0:
90
merge_sorted_revisions = merge_sort(
91
graph_parents,
92
"top:",
93
generate_revno=True)
94
else:
95
merge_sorted_revisions = ()
96
97
if mainline_only:
98
merge_sorted_revisions = [elem for elem in merge_sorted_revisions \
99
if len(elem[3])==1 ]
100
101
assert merge_sorted_revisions[0][1] == "top:"
102
merge_sorted_revisions = merge_sorted_revisions[1:]
52
for revid in graph_parents.iterkeys():
53
graph_children[revid] = []
54
55
merge_sorted_revisions = merge_sort(
56
graph_parents,
57
start,
58
mainline,
59
generate_revno=True)
103
60
104
61
revid_index = {}
105
62
revno_index = {}
115
72
116
73
linegraph = []
117
74
118
update_root_progress(3)
119
progress_bar = ui.ui_factory.nested_progress_bar()
120
try:
121
progress_bar.update(msg="Finding nodes", total=len(merge_sorted_revisions))
122
for (rev_index, (sequence_number,
123
revid,
124
merge_depth,
125
revno_sequence,
126
end_of_merge)) in enumerate(merge_sorted_revisions):
75
for (rev_index, (sequence_number,
76
revid,
77
merge_depth,
78
revno_sequence,
79
end_of_merge)) in enumerate(merge_sorted_revisions):
80
81
revid_index[revid] = rev_index
82
revno_index[revno_sequence] = rev_index
83
84
branch_id = revno_sequence[0:-1]
85
86
branch_line = None
87
if branch_id not in branch_lines:
88
branch_line = []
89
branch_lines[branch_id] = branch_line
90
else:
91
branch_line = branch_lines[branch_id]
92
93
branch_line.append(rev_index)
94
95
parents = graph_parents[revid]
96
for parent_revid in parents:
97
graph_children[parent_revid].append(revid)
98
99
linegraph.append([revid,
100
None,
101
[],
102
parents,
103
None,
104
revno_sequence])
127
105
128
if rev_index % 25 == 0:
129
progress_bar.update(current=rev_index)
130
if maxnum and rev_index >= maxnum:
131
break
132
revid_index[revid] = rev_index
133
134
parents = graph_parents[revid]
135
linegraph.append([revid,
136
None,
137
[],
138
parents,
139
None,
140
revno_sequence])
141
142
if graph_data:
143
revno_index[revno_sequence] = rev_index
144
145
branch_id = revno_sequence[0:-1]
146
147
branch_line = None
148
if branch_id not in branch_lines:
149
branch_line = []
150
branch_lines[branch_id] = branch_line
106
branch_ids = branch_lines.keys()
107
108
def branch_id_cmp(x, y):
109
"""Compaire branch_id's first by the number of digits, then reversed
110
by their value"""
111
len_x = len(x)
112
len_y = len(y)
113
if len_x == len_y:
114
return -cmp(x, y)
115
return cmp(len_x, len_y)
116
117
branch_ids.sort(branch_id_cmp)
118
# This will hold a tuple of (child_index, parent_index, col_index) for each
119
# line that needs to be drawn. If col_index is not none, then the line is
120
# drawn along that column, else the the line can be drawn directly between
121
# the child and parent because either the child and parent are in the same
122
# branch line, or the child and parent are 1 row apart.
123
lines = []
124
empty_column = [False for i in range(len(graph_parents))]
125
# This will hold a bit map for each cell. If the cell is true, then the
126
# cell allready contains a node or line. This use when deciding what column
127
# to place a branch line or line in, without it overlaping something else.
128
columns = [list(empty_column)]
129
130
131
for branch_id in branch_ids:
132
branch_line = branch_lines[branch_id]
133
134
# Find the col_index for the direct parent branch. This will be the
135
# starting point when looking for a free column.
136
parent_col_index = 0
137
parent_index = None
138
if len(branch_id) > 1:
139
parent_revno = branch_id[0:-1]
140
if parent_revno in revno_index:
141
parent_index = revno_index[parent_revno]
142
parent_node = linegraph[parent_index][1]
143
if parent_node:
144
parent_col_index = parent_node[0]
145
146
147
col_search_order = _branch_line_col_search_order(columns,
148
parent_col_index)
149
color = reduce(lambda x, y: x+y, branch_id, 0)
150
cur_cont_line = []
151
152
line_range = []
153
last_rev_index = None
154
for rev_index in branch_line:
155
if last_rev_index:
156
if rev_index - last_rev_index > BROKEN_LINE_LENGTH:
157
line_range.append(last_rev_index+1)
158
line_range.append(rev_index-1)
151
159
else:
152
branch_line = branch_lines[branch_id]
153
154
branch_line.append(rev_index)
155
finally:
156
progress_bar.finished()
157
158
if graph_data:
159
branch_ids = branch_lines.keys()
160
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)
169
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)]
182
183
184
update_root_progress(4)
185
progress_bar = ui.ui_factory.nested_progress_bar()
186
try:
187
progress_bar.update(msg="Organizing edges", total=len(branch_ids))
188
for i, branch_id in enumerate(branch_ids):
189
if i % 25 == 0:
190
progress_bar.update(current=i)
191
branch_line = branch_lines[branch_id]
192
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]
201
parent_node = linegraph[parent_index][1]
202
if parent_node:
203
parent_col_index = parent_node[0]
160
line_range.extend(range(last_rev_index+1, rev_index))
161
162
line_range.append(rev_index)
163
last_rev_index = rev_index
164
165
if parent_index:
166
if parent_index - last_rev_index > BROKEN_LINE_LENGTH:
167
line_range.append(last_rev_index+1)
168
else:
169
line_range.extend(range(last_rev_index+1, parent_index))
170
171
col_index = _find_free_column(columns,
172
empty_column,
173
col_search_order,
174
line_range)
175
node = (col_index, color)
176
for rev_index in branch_line:
177
linegraph[rev_index][1] = node
178
columns[col_index][rev_index] = True
179
180
for rev_index in branch_line:
181
(sequence_number,
182
revid,
183
merge_depth,
184
revno_sequence,
185
end_of_merge) = merge_sorted_revisions[rev_index]
186
187
linegraph[rev_index][4] = graph_children[revid]
188
col_index = linegraph[rev_index][1][0]
189
190
for parent_revid in graph_parents[revid]:
191
if parent_revid in revid_index:
192
193
parent_index = revid_index[parent_revid]
194
parent_node = linegraph[parent_index][1]
195
if parent_node:
196
parent_col_index = parent_node[0]
197
else:
198
parent_col_index = None
199
col_search_order = \
200
_line_col_search_order(columns,
201
parent_col_index,
202
col_index)
204
203
205
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 = []
210
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)
219
else:
220
line_range.extend(range(last_rev_index+1, rev_index))
221
222
line_range.append(rev_index)
223
last_rev_index = rev_index
224
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))
231
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
240
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]
247
248
linegraph[rev_index][4] = graph_children[revid]
249
col_index = linegraph[rev_index][1][0]
250
251
for parent_revid in graph_parents[revid]:
252
if parent_revid in revid_index:
253
254
parent_index = revid_index[parent_revid]
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
260
col_search_order = \
261
_line_col_search_order(columns,
262
parent_col_index,
263
col_index)
264
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,))
277
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()
204
# If this line is really long, break it.
205
if len(branch_id) > 0 and \
206
parent_index - rev_index > BROKEN_LINE_LENGTH:
207
child_line_col_index = \
208
_find_free_column(columns,
209
empty_column,
210
col_search_order,
211
(rev_index + 1,))
212
_mark_column_as_used(columns,
213
child_line_col_index,
214
(rev_index + 1,))
215
parent_col_line_index = \
216
_find_free_column(columns,
217
empty_column,
218
col_search_order,
219
(parent_index - 1,))
220
_mark_column_as_used(columns,
221
parent_col_line_index,
222
(parent_index - 1,))
223
lines.append((rev_index,
224
parent_index,
225
(child_line_col_index,
226
parent_col_line_index)))
227
else :
228
line_col_index = col_index
229
if parent_index - rev_index >1:
230
line_range = range(rev_index + 1, parent_index)
231
line_col_index = \
232
_find_free_column(columns,
233
empty_column,
234
col_search_order,
235
line_range)
236
_mark_column_as_used(columns,
237
line_col_index,
238
line_range)
239
lines.append((rev_index,
240
parent_index,
241
(line_col_index,)))
242
243
for (child_index, parent_index, line_col_indexes) in lines:
244
(child_col_index, child_color) = linegraph[child_index][1]
245
(parent_col_index, parent_color) = linegraph[parent_index][1]
313
246
314
update_root_progress(5)
315
progress_bar = ui.ui_factory.nested_progress_bar()
316
try:
317
progress_bar.update(msg="Pretifying graph", total=len(lines))
318
for i, (child_index, parent_index, line_col_indexes) in enumerate(lines):
319
if i % 25 == 0:
320
progress_bar.update(current=i)
321
(child_col_index, child_color) = linegraph[child_index][1]
322
(parent_col_index, parent_color) = linegraph[parent_index][1]
323
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(
339
(line_col_indexes[0],
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))
347
else:
348
# Broken line
349
# line from the child's column to the lines column
350
linegraph[child_index][2].append(
351
(child_col_index,
247
if len(line_col_indexes) == 1:
248
if parent_index - child_index == 1:
249
linegraph[child_index][2].append(
250
(child_col_index,
251
parent_col_index,
252
parent_color))
253
else:
254
# line from the child's column to the lines column
255
linegraph[child_index][2].append(
256
(child_col_index,
257
line_col_indexes[0],
258
parent_color))
259
# lines down the line's column
260
for line_part_index in range(child_index+1, parent_index-1):
261
linegraph[line_part_index][2].append(
262
(line_col_indexes[0],
352
263
line_col_indexes[0],
353
264
parent_color))
354
# Broken line end
355
linegraph[child_index+1][2].append(
356
(line_col_indexes[0],
357
None,
358
parent_color))
359
360
# Broken line end
361
linegraph[parent_index-2][2].append(
362
(None,
363
line_col_indexes[1],
364
parent_color))
365
# line from the line's column to the parent's column
366
linegraph[parent_index-1][2].append(
367
(line_col_indexes[1],
368
parent_col_index,
369
parent_color))
370
finally:
371
progress_bar.finished()
372
return (linegraph, revid_index, len(columns))
373
else:
374
return (linegraph, revid_index, 0)
265
# line from the line's column to the parent's column
266
linegraph[parent_index-1][2].append(
267
(line_col_indexes[0],
268
parent_col_index,
269
parent_color))
270
else:
271
# Broken line
272
# line from the child's column to the lines column
273
linegraph[child_index][2].append(
274
(child_col_index,
275
line_col_indexes[0],
276
parent_color))
277
# Broken line end
278
linegraph[child_index+1][2].append(
279
(line_col_indexes[0],
280
None,
281
parent_color))
282
283
# Broken line end
284
linegraph[parent_index-2][2].append(
285
(None,
286
line_col_indexes[1],
287
parent_color))
288
# line from the line's column to the parent's column
289
linegraph[parent_index-1][2].append(
290
(line_col_indexes[1],
291
parent_col_index,
292
parent_color))
293
375
294
295
return (linegraph, revid_index, len(columns))
376
296
377
297
def _branch_line_col_search_order(columns, parent_col_index):
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
298
return range(parent_col_index, len(columns)) + \
299
range(parent_col_index-1, -1, -1)
382
300
383
301
def _line_col_search_order(columns, parent_col_index, child_col_index):
302
dest_col_indexes = []
384
303
if parent_col_index is not None:
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
304
dest_col_indexes.append(parent_col_index)
389
305
else:
390
max_index = child_col_index
391
min_index = child_col_index
392
yield child_col_index
306
dest_col_indexes.append(child_col_index)
307
dest_col_indexes.append(child_col_index)
308
dest_col_indexes.sort()
309
col_search_order = range(dest_col_indexes[1], dest_col_indexes[0] -1, -1)
393
310
i = 1
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
311
while dest_col_indexes[1] + i < len(columns) or \
312
dest_col_indexes[0] - i > -1:
313
if dest_col_indexes[1] + i < len(columns):
314
col_search_order.append(dest_col_indexes[1] + i)
315
if dest_col_indexes[0] - i > -1:
316
col_search_order.append(dest_col_indexes[0] - i)
400
317
i += 1
318
return col_search_order
401
319
402
320
def _find_free_column(columns, empty_column, col_search_order, line_range):
403
321
for col_index in col_search_order:
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0