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.3
- compare with another revision
- download diff
- download tarball
- view history from revision 511.5.3
- Committer: Jelmer Vernooij
- Date: 2008-06-29 16:11:12 UTC
- mfrom: (475.2.2 gtk)
- mto: This revision was merged to the branch mainline in revision 519.
- Revision ID: jelmer@samba.org-20080629161112-3j4zp0r0e7cv6cds
Merge Chad's progress bar in viz patch.
- files added:
- bzr-gtk.applications
- files renamed:
- handle-patch => bzr-handle-patch
- files modified:
- NEWS
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_revs, 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
if type(start_revs) != list:
46
start_revs = [start_revs]
47
48
graph = repository.get_graph()
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
49
52
graph_parents = {}
53
ghosts = set()
50
54
graph_children = {}
51
for (revid, parent_revids) in graph.iter_ancestry(start_revs):
52
graph_parents[revid] = parent_revids
53
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()
54
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()
55
87
graph_parents["top:"] = start_revs
56
88
57
89
if len(graph_parents)>0:
83
115
84
116
linegraph = []
85
117
86
for (rev_index, (sequence_number,
87
revid,
88
merge_depth,
89
revno_sequence,
90
end_of_merge)) in enumerate(merge_sorted_revisions):
91
if maxnum and rev_index >= maxnum:
92
break
93
revid_index[revid] = 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])
105
106
if graph_data:
107
revno_index[revno_sequence] = rev_index
108
109
branch_id = revno_sequence[0:-1]
110
111
branch_line = None
112
if branch_id not in branch_lines:
113
branch_line = []
114
branch_lines[branch_id] = branch_line
115
else:
116
branch_line = branch_lines[branch_id]
117
118
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=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(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
151
else:
152
branch_line = branch_lines[branch_id]
153
154
branch_line.append(rev_index)
155
finally:
156
progress_bar.finished()
119
157
120
158
if graph_data:
121
159
branch_ids = branch_lines.keys()
143
181
columns = [list(empty_column)]
144
182
145
183
146
for branch_id in branch_ids:
147
branch_line = branch_lines[branch_id]
148
149
# Find the col_index for the direct parent branch. This will be the
150
# starting point when looking for a free column.
151
parent_col_index = 0
152
parent_index = None
153
if len(branch_id) > 1:
154
parent_revno = branch_id[0:-1]
155
if parent_revno in revno_index:
156
parent_index = revno_index[parent_revno]
157
parent_node = linegraph[parent_index][1]
158
if parent_node:
159
parent_col_index = parent_node[0]
160
161
162
col_search_order = _branch_line_col_search_order(columns,
163
parent_col_index)
164
color = reduce(lambda x, y: x+y, branch_id, 0)
165
cur_cont_line = []
166
167
line_range = []
168
last_rev_index = None
169
for rev_index in branch_line:
170
if last_rev_index:
171
if broken_line_length and \
172
rev_index - last_rev_index > broken_line_length:
173
line_range.append(last_rev_index+1)
174
line_range.append(rev_index-1)
175
else:
176
line_range.extend(range(last_rev_index+1, rev_index))
177
178
line_range.append(rev_index)
179
last_rev_index = rev_index
180
181
if parent_index:
182
if broken_line_length and \
183
parent_index - last_rev_index > broken_line_length:
184
line_range.append(last_rev_index+1)
185
else:
186
line_range.extend(range(last_rev_index+1, parent_index))
187
188
col_index = _find_free_column(columns,
189
empty_column,
190
col_search_order,
191
line_range)
192
node = (col_index, color)
193
for rev_index in branch_line:
194
linegraph[rev_index][1] = node
195
columns[col_index][rev_index] = True
196
197
for rev_index in branch_line:
198
(sequence_number,
199
revid,
200
merge_depth,
201
revno_sequence,
202
end_of_merge) = merge_sorted_revisions[rev_index]
203
204
linegraph[rev_index][4] = graph_children[revid]
205
col_index = linegraph[rev_index][1][0]
206
207
for parent_revid in graph_parents[revid]:
208
if parent_revid in revid_index:
209
210
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=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]
211
201
parent_node = linegraph[parent_index][1]
212
202
if parent_node:
213
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)
214
219
else:
215
parent_col_index = None
216
col_search_order = \
217
_line_col_search_order(columns,
218
parent_col_index,
219
col_index)
220
221
# If this line is really long, break it.
222
if len(branch_id) > 0 and \
223
broken_line_length and \
224
parent_index - rev_index > broken_line_length:
225
child_line_col_index = \
226
_find_free_column(columns,
227
empty_column,
228
col_search_order,
229
(rev_index + 1,))
230
_mark_column_as_used(columns,
231
child_line_col_index,
232
(rev_index + 1,))
233
234
# Recall _line_col_search_order to reset it back to
235
# 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
236
260
col_search_order = \
237
261
_line_col_search_order(columns,
238
262
parent_col_index,
239
263
col_index)
240
parent_col_line_index = \
241
_find_free_column(columns,
242
empty_column,
243
col_search_order,
244
(parent_index - 1,))
245
_mark_column_as_used(columns,
246
parent_col_line_index,
247
(parent_index - 1,))
248
lines.append((rev_index,
249
parent_index,
250
(child_line_col_index,
251
parent_col_line_index)))
252
else :
253
line_col_index = col_index
254
if parent_index - rev_index >1:
255
line_range = range(rev_index + 1, parent_index)
256
line_col_index = \
257
_find_free_column(columns,
258
empty_column,
259
col_search_order,
260
line_range)
261
_mark_column_as_used(columns,
262
line_col_index,
263
line_range)
264
lines.append((rev_index,
265
parent_index,
266
(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()
267
313
268
for (child_index, parent_index, line_col_indexes) in lines:
269
(child_col_index, child_color) = linegraph[child_index][1]
270
(parent_col_index, parent_color) = linegraph[parent_index][1]
271
272
if len(line_col_indexes) == 1:
273
if parent_index - child_index == 1:
274
linegraph[child_index][2].append(
275
(child_col_index,
276
parent_col_index,
277
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=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))
278
347
else:
348
# Broken line
279
349
# line from the child's column to the lines column
280
350
linegraph[child_index][2].append(
281
351
(child_col_index,
282
352
line_col_indexes[0],
283
353
parent_color))
284
# lines down the line's column
285
for line_part_index in range(child_index+1, parent_index-1):
286
linegraph[line_part_index][2].append(
287
(line_col_indexes[0],
288
line_col_indexes[0],
289
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))
290
365
# line from the line's column to the parent's column
291
366
linegraph[parent_index-1][2].append(
292
(line_col_indexes[0],
367
(line_col_indexes[1],
293
368
parent_col_index,
294
369
parent_color))
295
else:
296
# Broken line
297
# line from the child's column to the lines column
298
linegraph[child_index][2].append(
299
(child_col_index,
300
line_col_indexes[0],
301
parent_color))
302
# Broken line end
303
linegraph[child_index+1][2].append(
304
(line_col_indexes[0],
305
None,
306
parent_color))
307
308
# Broken line end
309
linegraph[parent_index-2][2].append(
310
(None,
311
line_col_indexes[1],
312
parent_color))
313
# line from the line's column to the parent's column
314
linegraph[parent_index-1][2].append(
315
(line_col_indexes[1],
316
parent_col_index,
317
parent_color))
370
finally:
371
progress_bar.finished()
318
372
return (linegraph, revid_index, len(columns))
319
373
else:
320
374
return (linegraph, revid_index, 0)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0