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.4.1
- compare with another revision
- download diff
- download tarball
- view history from revision 256.4.1
- Committer: Gary van der Merwe
- Date: 2007-09-22 14:59:45 UTC
- mto: (256.2.54 gtk)
- mto: This revision was merged to the branch mainline in revision 289.
- Revision ID: garyvdm@gmail.com-20070922145945-b8100dvn57yvbxvb
* Set a width and use ellips on Revision No column.
* Pass the number of columns need to render the graph column from
line_graph to the graphcell so that the graphcell does not have
to work it out for each revision.
* Pass the number of columns need to render the graph column from
line_graph to the graphcell so that the graphcell does not have
to work it out for each revision.
- 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
# We get the mainline so we can pass it to merge_sort to make merge_sort
45
# run faster.
46
mainline = branch.revision_history()
47
graph_parents = branch.repository.get_revision_graph(start)
54
48
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:]
49
for revid in graph_parents.iterkeys():
50
graph_children[revid] = []
51
52
merge_sorted_revisions = merge_sort(
53
graph_parents,
54
start,
55
mainline,
56
generate_revno=True)
103
57
104
58
revid_index = {}
105
59
revno_index = {}
110
64
# least significant digit are considered to be in the same branch line.
111
65
# e.g.: for revisions 290.12.1 and 290.12.2, the branch_id would be 290.12,
112
66
# and these two revisions will be in the same branch line. Each value is
113
# a list of rev_indexes in the branch.
67
# a list of [rev_indexes, min_index, max_index, col_index].
114
68
branch_lines = {}
69
BL_REV_INDEXES = 0
70
BL_MIN_INDEX = 1
71
BL_MAX_INDEX = 2
72
BL_COL_INDEX = 3
115
73
116
74
linegraph = []
117
75
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()
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]
76
for (rev_index, (sequence_number,
77
revid,
78
merge_depth,
79
revno_sequence,
80
end_of_merge)) in enumerate(merge_sorted_revisions):
81
82
revid_index[revid] = rev_index
83
revno_index[revno_sequence] = rev_index
84
85
branch_id = revno_sequence[0:-1]
86
87
branch_line = None
88
if branch_id not in branch_lines:
89
branch_line = [[], # BL_REV_INDEXES
90
rev_index, # BL_MIN_INDEX
91
0, # BL_MAX_INDEX
92
None] # BL_COL_INDEX
93
branch_lines[branch_id] = branch_line
94
else:
95
branch_line = branch_lines[branch_id]
96
97
branch_line[BL_REV_INDEXES].append(rev_index)
98
if rev_index > branch_line[BL_MAX_INDEX]:
99
branch_line[BL_MAX_INDEX] = rev_index
100
101
parents = graph_parents[revid]
102
for parent_revid in parents:
103
graph_children[parent_revid].append(revid)
104
105
linegraph.append([revid,
106
None,
107
[],
108
parents,
109
None,
110
revno_sequence])
111
112
branch_ids = branch_lines.keys()
113
114
def branch_id_cmp(x, y):
115
"""Compaire branch_id's first by the number of digits, then reversed
116
by their value"""
117
len_x = len(x)
118
len_y = len(y)
119
if len_x == len_y:
120
return -cmp(x, y)
121
return cmp(len_x, len_y)
122
123
branch_ids.sort(branch_id_cmp)
124
# This will hold a tuple of (child_index, parent_index, col_index) for each
125
# line that needs to be drawn. If col_index is not none, then the line is
126
# drawn along that column, else the the line can be drawn directly between
127
# the child and parent because either the child and parent are in the same
128
# branch line, or the child and parent are 1 row apart.
129
lines = []
130
empty_column = [False for i in range(len(graph_parents))]
131
# This will hold a bit map for each cell. If the cell is true, then the
132
# cell allready contains a node or line. This use when deciding what column
133
# to place a branch line or line in, without it overlaping something else.
134
columns = [list(empty_column)]
135
136
137
for branch_id in branch_ids:
138
branch_line = branch_lines[branch_id]
139
140
# Find the col_index for the direct parent branch. This will be the
141
# starting point when looking for a free column.
142
parent_col_index = 0
143
if len(branch_id) > 1:
144
parent_branch_id = branch_id[0:-2]
145
parent_col_index = branch_lines[parent_branch_id][BL_COL_INDEX]
146
parent_revno = branch_id[0:-1]
147
if parent_revno in revno_index:
148
parent_index = revno_index[parent_revno]
149
branch_line[BL_MAX_INDEX] = parent_index - 1
150
151
col_search_order = _branch_line_col_search_order(columns,
152
parent_col_index)
153
branch_line[BL_COL_INDEX] = _append_line(columns,
154
(branch_line[BL_MIN_INDEX],
155
branch_line[BL_MAX_INDEX]),
156
empty_column,
157
col_search_order)
158
color = reduce(lambda x, y: x+y, branch_id, 0)
159
col_index = branch_line[BL_COL_INDEX]
160
node = (col_index, color)
161
162
for rev_index in branch_line[BL_REV_INDEXES]:
163
(sequence_number,
164
revid,
165
merge_depth,
166
revno_sequence,
167
end_of_merge) = merge_sorted_revisions[rev_index]
168
169
linegraph[rev_index][1] = node
170
linegraph[rev_index][4] = graph_children[revid]
171
172
for parent_revid in graph_parents[revid]:
173
if parent_revid in revid_index:
174
parent_index = revid_index[parent_revid]
175
parent_revno = merge_sorted_revisions[parent_index][3]
176
parent_branch_id = parent_revno[0:-1]
177
col_index = None
178
is_direct_parent_line = False
179
if len(branch_id) > 1:
180
if parent_revno == branch_id[0:-1]:
181
is_direct_parent_line = True
182
183
# A line only needs it's own column if it is going from
184
# one branch line to another, it's not the line to the
185
# direct parent, and if it is longer than one row.
186
if branch_id != parent_branch_id and \
187
parent_index - rev_index > 1 and \
188
not is_direct_parent_line:
201
189
parent_node = linegraph[parent_index][1]
202
190
if parent_node:
203
191
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)
219
192
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()
313
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,
352
line_col_indexes[0],
353
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)
375
193
parent_col_index = None
194
col_search_order = \
195
_line_col_search_order(columns,
196
parent_col_index,
197
branch_line[BL_COL_INDEX])
198
col_index = _append_line(columns,
199
(rev_index+1, parent_index-1),
200
empty_column,
201
col_search_order)
202
lines.append((rev_index, parent_index, col_index))
203
204
for (child_index, parent_index, line_col_index) in lines:
205
child_col_index = linegraph[child_index][1][0]
206
207
parent_node = linegraph[parent_index][1]
208
parent_col_index = parent_node[0]
209
color = parent_node[1]
210
211
if line_col_index:
212
# line from the child's column to the lines column
213
linegraph[child_index][2].append(
214
(child_col_index,
215
line_col_index,
216
color))
217
# lines down the line's column
218
for line_part_index in range(child_index+1, parent_index-1):
219
linegraph[line_part_index][2].append(
220
(line_col_index,
221
line_col_index,
222
color))
223
# line from the line's column to the parent's column
224
linegraph[parent_index-1][2].append(
225
(line_col_index,
226
parent_col_index,
227
color))
228
else:
229
# lines down the child's column
230
for line_part_index in range(child_index, parent_index-1):
231
linegraph[line_part_index][2].append(
232
(child_col_index,
233
child_col_index,
234
color))
235
# line from the child's column to the parent's column
236
linegraph[parent_index-1][2].append(
237
(child_col_index,
238
parent_col_index,
239
color))
240
241
return (linegraph, revid_index, len(columns))
376
242
377
243
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
244
return range(parent_col_index, len(columns)) + \
245
range(parent_col_index-1, -1, -1)
382
246
383
247
def _line_col_search_order(columns, parent_col_index, child_col_index):
248
dest_col_indexes = []
384
249
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
250
dest_col_indexes.append(parent_col_index)
389
251
else:
390
max_index = child_col_index
391
min_index = child_col_index
392
yield child_col_index
252
dest_col_indexes.append(child_col_index)
253
dest_col_indexes.append(child_col_index)
254
dest_col_indexes.sort()
255
col_search_order = range(dest_col_indexes[1], dest_col_indexes[0] -1, -1)
393
256
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
257
while dest_col_indexes[1] + i < len(columns) or \
258
dest_col_indexes[0] - i > -1:
259
if dest_col_indexes[1] + i < len(columns):
260
col_search_order.append(dest_col_indexes[1] + i)
261
if dest_col_indexes[0] - i > -1:
262
col_search_order.append(dest_col_indexes[0] - i)
400
263
i += 1
264
return col_search_order
401
265
402
def _find_free_column(columns, empty_column, col_search_order, line_range):
266
def _append_line(columns, line, empty_column, col_search_order):
267
line_range = range(line[0], line[1]+1)
268
403
269
for col_index in col_search_order:
404
270
column = columns[col_index]
405
271
has_overlaping_line = False
413
279
col_index = len(columns)
414
280
column = list(empty_column)
415
281
columns.append(column)
282
283
for row_index in line_range:
284
column[row_index] = True
416
285
return col_index
417
286
418
def _mark_column_as_used(columns, col_index, line_range):
419
column = columns[col_index]
420
for row_index in line_range:
421
column[row_index] = True
422
423
287
def same_branch(a, b):
424
288
"""Return whether we think revisions a and b are on the same branch."""
425
289
if len(a.parent_ids) == 1:
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0