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
13
15
def linegraph(repository, start_revs, maxnum, broken_line_length = None,
16
graph_data = True, mainline_only = False):
17
"""Produce a directed graph of a bzr repository.
14
def linegraph(branch, start, maxnum):
15
"""Produce a directed graph of a bzr branch.
18
16
19
17
Returns a tuple of (line_graph, revid_index, columns_len) where
20
18
* line_graph is a list of tuples of (revid,
43
41
curved, kinked, etc.) and to pick the actual colours for each index.
44
42
"""
45
43
46
graph = repository.get_graph()
47
graph_parents = {}
48
ghosts = set()
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)
49
51
graph_children = {}
50
for (revid, parent_revids) in graph.iter_ancestry(start_revs):
51
if parent_revids is None:
52
ghosts.add(revid)
53
continue
54
if parent_revids == (NULL_REVISION,):
55
graph_parents[revid] = ()
56
else:
57
graph_parents[revid] = parent_revids
58
for parent in parent_revids:
59
graph_children.setdefault(parent, []).append(revid)
60
graph_children.setdefault(revid, [])
61
for ghost in ghosts:
62
for ghost_child in graph_children[ghost]:
63
graph_parents[ghost_child] = [p for p in graph_parents[ghost_child]
64
if p not in ghosts]
65
graph_parents["top:"] = start_revs
66
67
if len(graph_parents)>0:
68
merge_sorted_revisions = merge_sort(
69
graph_parents,
70
"top:",
71
generate_revno=True)
72
else:
73
merge_sorted_revisions = ()
74
75
if mainline_only:
76
merge_sorted_revisions = [elem for elem in merge_sorted_revisions \
77
if len(elem[3])==1 ]
78
79
assert merge_sorted_revisions[0][1] == "top:"
80
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)
81
60
82
61
revid_index = {}
83
62
revno_index = {}
98
77
merge_depth,
99
78
revno_sequence,
100
79
end_of_merge)) in enumerate(merge_sorted_revisions):
101
if maxnum and rev_index >= maxnum:
102
break
80
103
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)
104
94
105
95
parents = graph_parents[revid]
96
for parent_revid in parents:
97
graph_children[parent_revid].append(revid)
98
106
99
linegraph.append([revid,
107
100
None,
108
101
[],
109
102
parents,
110
103
None,
111
104
revno_sequence])
112
113
if graph_data:
114
revno_index[revno_sequence] = rev_index
115
116
branch_id = revno_sequence[0:-1]
117
118
branch_line = None
119
if branch_id not in branch_lines:
120
branch_line = []
121
branch_lines[branch_id] = branch_line
105
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)
159
else:
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)
122
168
else:
123
branch_line = branch_lines[branch_id]
124
125
branch_line.append(rev_index)
126
127
if graph_data:
128
branch_ids = branch_lines.keys()
129
130
def branch_id_cmp(x, y):
131
"""Compaire branch_id's first by the number of digits, then reversed
132
by their value"""
133
len_x = len(x)
134
len_y = len(y)
135
if len_x == len_y:
136
return -cmp(x, y)
137
return cmp(len_x, len_y)
138
139
branch_ids.sort(branch_id_cmp)
140
# This will hold a tuple of (child_index, parent_index, col_index) for each
141
# line that needs to be drawn. If col_index is not none, then the line is
142
# drawn along that column, else the the line can be drawn directly between
143
# the child and parent because either the child and parent are in the same
144
# branch line, or the child and parent are 1 row apart.
145
lines = []
146
empty_column = [False for i in range(len(graph_parents))]
147
# This will hold a bit map for each cell. If the cell is true, then the
148
# cell allready contains a node or line. This use when deciding what column
149
# to place a branch line or line in, without it overlaping something else.
150
columns = [list(empty_column)]
151
152
153
for branch_id in branch_ids:
154
branch_line = branch_lines[branch_id]
155
156
# Find the col_index for the direct parent branch. This will be the
157
# starting point when looking for a free column.
158
parent_col_index = 0
159
parent_index = None
160
if len(branch_id) > 1:
161
parent_revno = branch_id[0:-1]
162
if parent_revno in revno_index:
163
parent_index = revno_index[parent_revno]
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]
164
194
parent_node = linegraph[parent_index][1]
165
195
if parent_node:
166
196
parent_col_index = parent_node[0]
167
168
169
col_search_order = _branch_line_col_search_order(columns,
170
parent_col_index)
171
color = reduce(lambda x, y: x+y, branch_id, 0)
172
cur_cont_line = []
173
174
line_range = []
175
last_rev_index = None
176
for rev_index in branch_line:
177
if last_rev_index:
178
if broken_line_length and \
179
rev_index - last_rev_index > broken_line_length:
180
line_range.append(last_rev_index+1)
181
line_range.append(rev_index-1)
182
197
else:
183
line_range.extend(range(last_rev_index+1, rev_index))
184
185
line_range.append(rev_index)
186
last_rev_index = rev_index
187
188
if parent_index:
189
if broken_line_length and \
190
parent_index - last_rev_index > broken_line_length:
191
line_range.append(last_rev_index+1)
192
else:
193
line_range.extend(range(last_rev_index+1, parent_index))
194
195
col_index = _find_free_column(columns,
196
empty_column,
197
col_search_order,
198
line_range)
199
node = (col_index, color)
200
for rev_index in branch_line:
201
linegraph[rev_index][1] = node
202
columns[col_index][rev_index] = True
203
204
for rev_index in branch_line:
205
(sequence_number,
206
revid,
207
merge_depth,
208
revno_sequence,
209
end_of_merge) = merge_sorted_revisions[rev_index]
210
211
linegraph[rev_index][4] = graph_children[revid]
212
col_index = linegraph[rev_index][1][0]
213
214
for parent_revid in graph_parents[revid]:
215
if parent_revid in revid_index:
198
parent_col_index = None
199
col_search_order = \
200
_line_col_search_order(columns,
201
parent_col_index,
202
col_index)
216
203
217
parent_index = revid_index[parent_revid]
218
parent_node = linegraph[parent_index][1]
219
if parent_node:
220
parent_col_index = parent_node[0]
221
else:
222
parent_col_index = None
223
col_search_order = \
224
_line_col_search_order(columns,
225
parent_col_index,
226
col_index)
227
228
# If this line is really long, break it.
229
if len(branch_id) > 0 and \
230
broken_line_length and \
231
parent_index - rev_index > broken_line_length:
232
child_line_col_index = \
233
_find_free_column(columns,
234
empty_column,
235
col_search_order,
236
(rev_index + 1,))
237
_mark_column_as_used(columns,
238
child_line_col_index,
239
(rev_index + 1,))
240
241
# Recall _line_col_search_order to reset it back to
242
# the beging.
243
col_search_order = \
244
_line_col_search_order(columns,
245
parent_col_index,
246
col_index)
247
parent_col_line_index = \
248
_find_free_column(columns,
249
empty_column,
250
col_search_order,
251
(parent_index - 1,))
252
_mark_column_as_used(columns,
253
parent_col_line_index,
254
(parent_index - 1,))
255
lines.append((rev_index,
256
parent_index,
257
(child_line_col_index,
258
parent_col_line_index)))
259
else :
260
line_col_index = col_index
261
if parent_index - rev_index >1:
262
line_range = range(rev_index + 1, parent_index)
263
line_col_index = \
264
_find_free_column(columns,
265
empty_column,
266
col_search_order,
267
line_range)
268
_mark_column_as_used(columns,
269
line_col_index,
270
line_range)
271
lines.append((rev_index,
272
parent_index,
273
(line_col_index,)))
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]
274
246
275
for (child_index, parent_index, line_col_indexes) in lines:
276
(child_col_index, child_color) = linegraph[child_index][1]
277
(parent_col_index, parent_color) = linegraph[parent_index][1]
278
279
if len(line_col_indexes) == 1:
280
if parent_index - child_index == 1:
281
linegraph[child_index][2].append(
282
(child_col_index,
283
parent_col_index,
284
parent_color))
285
else:
286
# line from the child's column to the lines column
287
linegraph[child_index][2].append(
288
(child_col_index,
289
line_col_indexes[0],
290
parent_color))
291
# lines down the line's column
292
for line_part_index in range(child_index+1, parent_index-1):
293
linegraph[line_part_index][2].append(
294
(line_col_indexes[0],
295
line_col_indexes[0],
296
parent_color))
297
# line from the line's column to the parent's column
298
linegraph[parent_index-1][2].append(
299
(line_col_indexes[0],
300
parent_col_index,
301
parent_color))
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))
302
253
else:
303
# Broken line
304
254
# line from the child's column to the lines column
305
255
linegraph[child_index][2].append(
306
256
(child_col_index,
307
257
line_col_indexes[0],
308
258
parent_color))
309
# Broken line end
310
linegraph[child_index+1][2].append(
311
(line_col_indexes[0],
312
None,
313
parent_color))
314
315
# Broken line end
316
linegraph[parent_index-2][2].append(
317
(None,
318
line_col_indexes[1],
319
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],
263
line_col_indexes[0],
264
parent_color))
320
265
# line from the line's column to the parent's column
321
266
linegraph[parent_index-1][2].append(
322
(line_col_indexes[1],
267
(line_col_indexes[0],
323
268
parent_col_index,
324
269
parent_color))
325
return (linegraph, revid_index, len(columns))
326
else:
327
return (linegraph, revid_index, 0)
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
328
294
295
return (linegraph, revid_index, len(columns))
329
296
330
297
def _branch_line_col_search_order(columns, parent_col_index):
331
for col_index in range(parent_col_index, len(columns)):
332
yield col_index
333
for col_index in range(parent_col_index-1, -1, -1):
334
yield col_index
298
return range(parent_col_index, len(columns)) + \
299
range(parent_col_index-1, -1, -1)
335
300
336
301
def _line_col_search_order(columns, parent_col_index, child_col_index):
302
dest_col_indexes = []
337
303
if parent_col_index is not None:
338
max_index = max(parent_col_index, child_col_index)
339
min_index = min(parent_col_index, child_col_index)
340
for col_index in range(max_index, min_index -1, -1):
341
yield col_index
304
dest_col_indexes.append(parent_col_index)
342
305
else:
343
max_index = child_col_index
344
min_index = child_col_index
345
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)
346
310
i = 1
347
while max_index + i < len(columns) or \
348
min_index - i > -1:
349
if max_index + i < len(columns):
350
yield max_index + i
351
if min_index - i > -1:
352
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)
353
317
i += 1
318
return col_search_order
354
319
355
320
def _find_free_column(columns, empty_column, col_search_order, line_range):
356
321
for col_index in col_search_order:
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0