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
- browse files at revision 511.5.6
- compare with another revision
- download diff
- download tarball
- view history from revision 511.5.6
- Committer: Jelmer Vernooij
- Date: 2008-06-29 18:12:29 UTC
- mto: This revision was merged to the branch mainline in revision 519.
- Revision ID: jelmer@samba.org-20080629181229-1l2m4cf7vvbyh8qg
Simplify progress bar code, use embedded progress bar inside viz window.
- files added:
- bzr-gtk.applications
- preferences
- files removed:
- tortoise-bzr.py
- files renamed:
- handle-patch => bzr-handle-patch
- bzr-icon-64.png => icons/bzr-icon-64.png
- preferences.py => preferences/__init__.py
- files modified:
- AUTHORS
added
removed
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
14
from bzrlib import ui
13
15
14
def linegraph(repository, start, maxnum, broken_line_length = None,
15
graph_data = True, mainline_only = False):
16
def linegraph(graph, start_revs, maxnum=None, broken_line_length=None,
17
graph_data=True, mainline_only=False, root_progress=None):
16
18
"""Produce a directed graph of a bzr repository.
17
19
18
20
Returns a tuple of (line_graph, revid_index, columns_len) where
41
43
It's up to you how to actually draw the nodes and lines (straight,
42
44
curved, kinked, etc.) and to pick the actual colours for each index.
43
45
"""
44
45
graph_parents = repository.get_revision_graph(start)
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_cnt=step_number)
51
52
graph_parents = {}
53
ghosts = set()
46
54
graph_children = {}
47
for revid in graph_parents.iterkeys():
48
graph_children[revid] = []
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_cnt=len(ghosts))
79
for i, ghost in enumerate(ghosts):
80
if i % 25 == 0:
81
progress_bar.update(None, current_cnt=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
49
88
50
89
if len(graph_parents)>0:
51
90
merge_sorted_revisions = merge_sort(
52
91
graph_parents,
53
start,
92
"top:",
54
93
generate_revno=True)
55
94
else:
56
95
merge_sorted_revisions = ()
58
97
if mainline_only:
59
98
merge_sorted_revisions = [elem for elem in merge_sorted_revisions \
60
99
if len(elem[3])==1 ]
100
101
assert merge_sorted_revisions[0][1] == "top:"
102
merge_sorted_revisions = merge_sorted_revisions[1:]
61
103
62
104
revid_index = {}
63
105
revno_index = {}
73
115
74
116
linegraph = []
75
117
76
for (rev_index, (sequence_number,
77
revid,
78
merge_depth,
79
revno_sequence,
80
end_of_merge)) in enumerate(merge_sorted_revisions):
81
if maxnum and rev_index >= maxnum:
82
break
83
revid_index[revid] = rev_index
84
85
parents = graph_parents[revid]
86
for parent_revid in parents:
87
graph_children[parent_revid].append(revid)
88
89
linegraph.append([revid,
90
None,
91
[],
92
parents,
93
None,
94
revno_sequence])
95
96
if graph_data:
97
revno_index[revno_sequence] = rev_index
98
99
branch_id = revno_sequence[0:-1]
100
101
branch_line = None
102
if branch_id not in branch_lines:
103
branch_line = []
104
branch_lines[branch_id] = branch_line
105
else:
106
branch_line = branch_lines[branch_id]
107
108
branch_line.append(rev_index)
118
update_root_progress(3)
119
progress_bar = ui.ui_factory.nested_progress_bar()
120
try:
121
progress_bar.update(msg="Finding nodes", total_cnt=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):
127
128
if rev_index % 25 == 0:
129
progress_bar.update(None, current_cnt=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
151
else:
152
branch_line = branch_lines[branch_id]
153
154
branch_line.append(rev_index)
155
finally:
156
progress_bar.finished()
109
157
110
158
if graph_data:
111
159
branch_ids = branch_lines.keys()
133
181
columns = [list(empty_column)]
134
182
135
183
136
for branch_id in branch_ids:
137
branch_line = branch_lines[branch_id]
138
139
# Find the col_index for the direct parent branch. This will be the
140
# starting point when looking for a free column.
141
parent_col_index = 0
142
parent_index = None
143
if len(branch_id) > 1:
144
parent_revno = branch_id[0:-1]
145
if parent_revno in revno_index:
146
parent_index = revno_index[parent_revno]
147
parent_node = linegraph[parent_index][1]
148
if parent_node:
149
parent_col_index = parent_node[0]
150
151
152
col_search_order = _branch_line_col_search_order(columns,
153
parent_col_index)
154
color = reduce(lambda x, y: x+y, branch_id, 0)
155
cur_cont_line = []
156
157
line_range = []
158
last_rev_index = None
159
for rev_index in branch_line:
160
if last_rev_index:
161
if broken_line_length and \
162
rev_index - last_rev_index > broken_line_length:
163
line_range.append(last_rev_index+1)
164
line_range.append(rev_index-1)
165
else:
166
line_range.extend(range(last_rev_index+1, rev_index))
167
168
line_range.append(rev_index)
169
last_rev_index = rev_index
170
171
if parent_index:
172
if broken_line_length and \
173
parent_index - last_rev_index > broken_line_length:
174
line_range.append(last_rev_index+1)
175
else:
176
line_range.extend(range(last_rev_index+1, parent_index))
177
178
col_index = _find_free_column(columns,
179
empty_column,
180
col_search_order,
181
line_range)
182
node = (col_index, color)
183
for rev_index in branch_line:
184
linegraph[rev_index][1] = node
185
columns[col_index][rev_index] = True
186
187
for rev_index in branch_line:
188
(sequence_number,
189
revid,
190
merge_depth,
191
revno_sequence,
192
end_of_merge) = merge_sorted_revisions[rev_index]
193
194
linegraph[rev_index][4] = graph_children[revid]
195
col_index = linegraph[rev_index][1][0]
196
197
for parent_revid in graph_parents[revid]:
198
if parent_revid in revid_index:
199
200
parent_index = revid_index[parent_revid]
184
update_root_progress(4)
185
progress_bar = ui.ui_factory.nested_progress_bar()
186
try:
187
progress_bar.update(msg="Organizing edges", total_cnt=len(branch_ids))
188
for i, branch_id in enumerate(branch_ids):
189
if i % 25 == 0:
190
progress_bar.update(None, current_cnt=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
201
parent_node = linegraph[parent_index][1]
202
202
if parent_node:
203
203
parent_col_index = parent_node[0]
204
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)
204
219
else:
205
parent_col_index = None
206
col_search_order = \
207
_line_col_search_order(columns,
208
parent_col_index,
209
col_index)
210
211
# If this line is really long, break it.
212
if len(branch_id) > 0 and \
213
broken_line_length and \
214
parent_index - rev_index > broken_line_length:
215
child_line_col_index = \
216
_find_free_column(columns,
217
empty_column,
218
col_search_order,
219
(rev_index + 1,))
220
_mark_column_as_used(columns,
221
child_line_col_index,
222
(rev_index + 1,))
223
224
# Recall _line_col_search_order to reset it back to
225
# the beging.
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
226
260
col_search_order = \
227
261
_line_col_search_order(columns,
228
262
parent_col_index,
229
263
col_index)
230
parent_col_line_index = \
231
_find_free_column(columns,
232
empty_column,
233
col_search_order,
234
(parent_index - 1,))
235
_mark_column_as_used(columns,
236
parent_col_line_index,
237
(parent_index - 1,))
238
lines.append((rev_index,
239
parent_index,
240
(child_line_col_index,
241
parent_col_line_index)))
242
else :
243
line_col_index = col_index
244
if parent_index - rev_index >1:
245
line_range = range(rev_index + 1, parent_index)
246
line_col_index = \
247
_find_free_column(columns,
248
empty_column,
249
col_search_order,
250
line_range)
251
_mark_column_as_used(columns,
252
line_col_index,
253
line_range)
254
lines.append((rev_index,
255
parent_index,
256
(line_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()
257
313
258
for (child_index, parent_index, line_col_indexes) in lines:
259
(child_col_index, child_color) = linegraph[child_index][1]
260
(parent_col_index, parent_color) = linegraph[parent_index][1]
261
262
if len(line_col_indexes) == 1:
263
if parent_index - child_index == 1:
264
linegraph[child_index][2].append(
265
(child_col_index,
266
parent_col_index,
267
parent_color))
314
update_root_progress(5)
315
progress_bar = ui.ui_factory.nested_progress_bar()
316
try:
317
progress_bar.update(msg="Pretifying graph", total_cnt=len(lines))
318
for i, (child_index, parent_index, line_col_indexes) in enumerate(lines):
319
if i % 25 == 0:
320
progress_bar.update(None, current_cnt=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))
268
347
else:
348
# Broken line
269
349
# line from the child's column to the lines column
270
350
linegraph[child_index][2].append(
271
351
(child_col_index,
272
352
line_col_indexes[0],
273
353
parent_color))
274
# lines down the line's column
275
for line_part_index in range(child_index+1, parent_index-1):
276
linegraph[line_part_index][2].append(
277
(line_col_indexes[0],
278
line_col_indexes[0],
279
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))
280
365
# line from the line's column to the parent's column
281
366
linegraph[parent_index-1][2].append(
282
(line_col_indexes[0],
367
(line_col_indexes[1],
283
368
parent_col_index,
284
369
parent_color))
285
else:
286
# Broken line
287
# line from the child's column to the lines column
288
linegraph[child_index][2].append(
289
(child_col_index,
290
line_col_indexes[0],
291
parent_color))
292
# Broken line end
293
linegraph[child_index+1][2].append(
294
(line_col_indexes[0],
295
None,
296
parent_color))
297
298
# Broken line end
299
linegraph[parent_index-2][2].append(
300
(None,
301
line_col_indexes[1],
302
parent_color))
303
# line from the line's column to the parent's column
304
linegraph[parent_index-1][2].append(
305
(line_col_indexes[1],
306
parent_col_index,
307
parent_color))
370
finally:
371
progress_bar.finished()
308
372
return (linegraph, revid_index, len(columns))
309
373
else:
310
374
return (linegraph, revid_index, 0)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0