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 322.1.1
- compare with another revision
- download diff
- download tarball
- view history from revision 322.1.1
- Committer: Jelmer Vernooij
- Date: 2007-10-26 16:18:50 UTC
- mfrom: (278.1.35 with_file_info)
- mto: (278.1.36 gtk)
- mto: This revision was merged to the branch mainline in revision 368.
- Revision ID: jelmer@samba.org-20071026161850-d7qxxc0i10hg7xnf
Merge Johns' gcommit improvements and fix conflicts against trunk.
- 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
- branchview/treeview.py => viz/treeview.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(graph, 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_parents = {}
47
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 = [None]
50
mainline.extend(branch.revision_history())
51
graph_parents = branch.repository.get_revision_graph(start)
48
52
graph_children = {}
49
for (revid, parent_revids) in graph.iter_ancestry(start_revs):
50
if parent_revids is None:
51
ghosts.add(revid)
52
continue
53
if parent_revids == (NULL_REVISION,):
54
graph_parents[revid] = ()
55
else:
56
graph_parents[revid] = parent_revids
57
for parent in parent_revids:
58
graph_children.setdefault(parent, []).append(revid)
59
graph_children.setdefault(revid, [])
60
for ghost in ghosts:
61
for ghost_child in graph_children[ghost]:
62
graph_parents[ghost_child] = [p for p in graph_parents[ghost_child]
63
if p not in ghosts]
64
graph_parents["top:"] = start_revs
65
66
if len(graph_parents)>0:
67
merge_sorted_revisions = merge_sort(
68
graph_parents,
69
"top:",
70
generate_revno=True)
71
else:
72
merge_sorted_revisions = ()
73
74
if mainline_only:
75
merge_sorted_revisions = [elem for elem in merge_sorted_revisions \
76
if len(elem[3])==1 ]
77
78
assert merge_sorted_revisions[0][1] == "top:"
79
merge_sorted_revisions = merge_sorted_revisions[1:]
53
for revid in graph_parents.iterkeys():
54
graph_children[revid] = []
55
56
merge_sorted_revisions = merge_sort(
57
graph_parents,
58
start,
59
mainline,
60
generate_revno=True)
80
61
81
62
revid_index = {}
82
63
revno_index = {}
100
81
if maxnum and rev_index >= maxnum:
101
82
break
102
83
revid_index[revid] = rev_index
84
revno_index[revno_sequence] = rev_index
85
86
branch_id = revno_sequence[0:-1]
87
88
branch_line = None
89
if branch_id not in branch_lines:
90
branch_line = []
91
branch_lines[branch_id] = branch_line
92
else:
93
branch_line = branch_lines[branch_id]
94
95
branch_line.append(rev_index)
103
96
104
97
parents = graph_parents[revid]
98
for parent_revid in parents:
99
graph_children[parent_revid].append(revid)
100
105
101
linegraph.append([revid,
106
102
None,
107
103
[],
108
104
parents,
109
105
None,
110
106
revno_sequence])
111
112
if graph_data:
113
revno_index[revno_sequence] = rev_index
114
115
branch_id = revno_sequence[0:-1]
116
117
branch_line = None
118
if branch_id not in branch_lines:
119
branch_line = []
120
branch_lines[branch_id] = branch_line
107
108
branch_ids = branch_lines.keys()
109
110
def branch_id_cmp(x, y):
111
"""Compaire branch_id's first by the number of digits, then reversed
112
by their value"""
113
len_x = len(x)
114
len_y = len(y)
115
if len_x == len_y:
116
return -cmp(x, y)
117
return cmp(len_x, len_y)
118
119
branch_ids.sort(branch_id_cmp)
120
# This will hold a tuple of (child_index, parent_index, col_index) for each
121
# line that needs to be drawn. If col_index is not none, then the line is
122
# drawn along that column, else the the line can be drawn directly between
123
# the child and parent because either the child and parent are in the same
124
# branch line, or the child and parent are 1 row apart.
125
lines = []
126
empty_column = [False for i in range(len(graph_parents))]
127
# This will hold a bit map for each cell. If the cell is true, then the
128
# cell allready contains a node or line. This use when deciding what column
129
# to place a branch line or line in, without it overlaping something else.
130
columns = [list(empty_column)]
131
132
133
for branch_id in branch_ids:
134
branch_line = branch_lines[branch_id]
135
136
# Find the col_index for the direct parent branch. This will be the
137
# starting point when looking for a free column.
138
parent_col_index = 0
139
parent_index = None
140
if len(branch_id) > 1:
141
parent_revno = branch_id[0:-1]
142
if parent_revno in revno_index:
143
parent_index = revno_index[parent_revno]
144
parent_node = linegraph[parent_index][1]
145
if parent_node:
146
parent_col_index = parent_node[0]
147
148
149
col_search_order = _branch_line_col_search_order(columns,
150
parent_col_index)
151
color = reduce(lambda x, y: x+y, branch_id, 0)
152
cur_cont_line = []
153
154
line_range = []
155
last_rev_index = None
156
for rev_index in branch_line:
157
if last_rev_index:
158
if BROKEN_LINE_LENGTH and \
159
rev_index - last_rev_index > BROKEN_LINE_LENGTH:
160
line_range.append(last_rev_index+1)
161
line_range.append(rev_index-1)
162
else:
163
line_range.extend(range(last_rev_index+1, rev_index))
164
165
line_range.append(rev_index)
166
last_rev_index = rev_index
167
168
if parent_index:
169
if BROKEN_LINE_LENGTH and \
170
parent_index - last_rev_index > BROKEN_LINE_LENGTH:
171
line_range.append(last_rev_index+1)
121
172
else:
122
branch_line = branch_lines[branch_id]
123
124
branch_line.append(rev_index)
125
126
if graph_data:
127
branch_ids = branch_lines.keys()
128
129
def branch_id_cmp(x, y):
130
"""Compaire branch_id's first by the number of digits, then reversed
131
by their value"""
132
len_x = len(x)
133
len_y = len(y)
134
if len_x == len_y:
135
return -cmp(x, y)
136
return cmp(len_x, len_y)
137
138
branch_ids.sort(branch_id_cmp)
139
# This will hold a tuple of (child_index, parent_index, col_index) for each
140
# line that needs to be drawn. If col_index is not none, then the line is
141
# drawn along that column, else the the line can be drawn directly between
142
# the child and parent because either the child and parent are in the same
143
# branch line, or the child and parent are 1 row apart.
144
lines = []
145
empty_column = [False for i in range(len(graph_parents))]
146
# This will hold a bit map for each cell. If the cell is true, then the
147
# cell allready contains a node or line. This use when deciding what column
148
# to place a branch line or line in, without it overlaping something else.
149
columns = [list(empty_column)]
150
151
152
for branch_id in branch_ids:
153
branch_line = branch_lines[branch_id]
154
155
# Find the col_index for the direct parent branch. This will be the
156
# starting point when looking for a free column.
157
parent_col_index = 0
158
parent_index = None
159
if len(branch_id) > 1:
160
parent_revno = branch_id[0:-1]
161
if parent_revno in revno_index:
162
parent_index = revno_index[parent_revno]
173
line_range.extend(range(last_rev_index+1, parent_index))
174
175
col_index = _find_free_column(columns,
176
empty_column,
177
col_search_order,
178
line_range)
179
node = (col_index, color)
180
for rev_index in branch_line:
181
linegraph[rev_index][1] = node
182
columns[col_index][rev_index] = True
183
184
for rev_index in branch_line:
185
(sequence_number,
186
revid,
187
merge_depth,
188
revno_sequence,
189
end_of_merge) = merge_sorted_revisions[rev_index]
190
191
linegraph[rev_index][4] = graph_children[revid]
192
col_index = linegraph[rev_index][1][0]
193
194
for parent_revid in graph_parents[revid]:
195
if parent_revid in revid_index:
196
197
parent_index = revid_index[parent_revid]
163
198
parent_node = linegraph[parent_index][1]
164
199
if parent_node:
165
200
parent_col_index = parent_node[0]
166
167
168
col_search_order = _branch_line_col_search_order(columns,
169
parent_col_index)
170
color = reduce(lambda x, y: x+y, branch_id, 0)
171
cur_cont_line = []
172
173
line_range = []
174
last_rev_index = None
175
for rev_index in branch_line:
176
if last_rev_index:
177
if broken_line_length and \
178
rev_index - last_rev_index > broken_line_length:
179
line_range.append(last_rev_index+1)
180
line_range.append(rev_index-1)
181
201
else:
182
line_range.extend(range(last_rev_index+1, rev_index))
183
184
line_range.append(rev_index)
185
last_rev_index = rev_index
186
187
if parent_index:
188
if broken_line_length and \
189
parent_index - last_rev_index > broken_line_length:
190
line_range.append(last_rev_index+1)
191
else:
192
line_range.extend(range(last_rev_index+1, parent_index))
193
194
col_index = _find_free_column(columns,
195
empty_column,
196
col_search_order,
197
line_range)
198
node = (col_index, color)
199
for rev_index in branch_line:
200
linegraph[rev_index][1] = node
201
columns[col_index][rev_index] = True
202
203
for rev_index in branch_line:
204
(sequence_number,
205
revid,
206
merge_depth,
207
revno_sequence,
208
end_of_merge) = merge_sorted_revisions[rev_index]
209
210
linegraph[rev_index][4] = graph_children[revid]
211
col_index = linegraph[rev_index][1][0]
212
213
for parent_revid in graph_parents[revid]:
214
if parent_revid in revid_index:
215
216
parent_index = revid_index[parent_revid]
217
parent_node = linegraph[parent_index][1]
218
if parent_node:
219
parent_col_index = parent_node[0]
220
else:
221
parent_col_index = None
202
parent_col_index = None
203
col_search_order = \
204
_line_col_search_order(columns,
205
parent_col_index,
206
col_index)
207
208
# If this line is really long, break it.
209
if len(branch_id) > 0 and \
210
BROKEN_LINE_LENGTH and \
211
parent_index - rev_index > BROKEN_LINE_LENGTH:
212
child_line_col_index = \
213
_find_free_column(columns,
214
empty_column,
215
col_search_order,
216
(rev_index + 1,))
217
_mark_column_as_used(columns,
218
child_line_col_index,
219
(rev_index + 1,))
220
221
# Recall _line_col_search_order to reset it back to
222
# the beging.
222
223
col_search_order = \
223
224
_line_col_search_order(columns,
224
225
parent_col_index,
225
226
col_index)
226
227
# If this line is really long, break it.
228
if len(branch_id) > 0 and \
229
broken_line_length and \
230
parent_index - rev_index > broken_line_length:
231
child_line_col_index = \
232
_find_free_column(columns,
233
empty_column,
234
col_search_order,
235
(rev_index + 1,))
236
_mark_column_as_used(columns,
237
child_line_col_index,
238
(rev_index + 1,))
239
240
# Recall _line_col_search_order to reset it back to
241
# the beging.
242
col_search_order = \
243
_line_col_search_order(columns,
244
parent_col_index,
245
col_index)
246
parent_col_line_index = \
247
_find_free_column(columns,
248
empty_column,
249
col_search_order,
250
(parent_index - 1,))
251
_mark_column_as_used(columns,
252
parent_col_line_index,
253
(parent_index - 1,))
254
lines.append((rev_index,
255
parent_index,
256
(child_line_col_index,
257
parent_col_line_index)))
258
else :
259
line_col_index = col_index
260
if parent_index - rev_index >1:
261
line_range = range(rev_index + 1, parent_index)
262
line_col_index = \
263
_find_free_column(columns,
264
empty_column,
265
col_search_order,
266
line_range)
267
_mark_column_as_used(columns,
268
line_col_index,
269
line_range)
270
lines.append((rev_index,
271
parent_index,
272
(line_col_index,)))
227
parent_col_line_index = \
228
_find_free_column(columns,
229
empty_column,
230
col_search_order,
231
(parent_index - 1,))
232
_mark_column_as_used(columns,
233
parent_col_line_index,
234
(parent_index - 1,))
235
lines.append((rev_index,
236
parent_index,
237
(child_line_col_index,
238
parent_col_line_index)))
239
else :
240
line_col_index = col_index
241
if parent_index - rev_index >1:
242
line_range = range(rev_index + 1, parent_index)
243
line_col_index = \
244
_find_free_column(columns,
245
empty_column,
246
col_search_order,
247
line_range)
248
_mark_column_as_used(columns,
249
line_col_index,
250
line_range)
251
lines.append((rev_index,
252
parent_index,
253
(line_col_index,)))
254
255
for (child_index, parent_index, line_col_indexes) in lines:
256
(child_col_index, child_color) = linegraph[child_index][1]
257
(parent_col_index, parent_color) = linegraph[parent_index][1]
273
258
274
for (child_index, parent_index, line_col_indexes) in lines:
275
(child_col_index, child_color) = linegraph[child_index][1]
276
(parent_col_index, parent_color) = linegraph[parent_index][1]
277
278
if len(line_col_indexes) == 1:
279
if parent_index - child_index == 1:
280
linegraph[child_index][2].append(
281
(child_col_index,
282
parent_col_index,
283
parent_color))
284
else:
285
# line from the child's column to the lines column
286
linegraph[child_index][2].append(
287
(child_col_index,
288
line_col_indexes[0],
289
parent_color))
290
# lines down the line's column
291
for line_part_index in range(child_index+1, parent_index-1):
292
linegraph[line_part_index][2].append(
293
(line_col_indexes[0],
294
line_col_indexes[0],
295
parent_color))
296
# line from the line's column to the parent's column
297
linegraph[parent_index-1][2].append(
298
(line_col_indexes[0],
299
parent_col_index,
300
parent_color))
259
if len(line_col_indexes) == 1:
260
if parent_index - child_index == 1:
261
linegraph[child_index][2].append(
262
(child_col_index,
263
parent_col_index,
264
parent_color))
301
265
else:
302
# Broken line
303
266
# line from the child's column to the lines column
304
267
linegraph[child_index][2].append(
305
268
(child_col_index,
306
269
line_col_indexes[0],
307
270
parent_color))
308
# Broken line end
309
linegraph[child_index+1][2].append(
310
(line_col_indexes[0],
311
None,
312
parent_color))
313
314
# Broken line end
315
linegraph[parent_index-2][2].append(
316
(None,
317
line_col_indexes[1],
318
parent_color))
271
# lines down the line's column
272
for line_part_index in range(child_index+1, parent_index-1):
273
linegraph[line_part_index][2].append(
274
(line_col_indexes[0],
275
line_col_indexes[0],
276
parent_color))
319
277
# line from the line's column to the parent's column
320
278
linegraph[parent_index-1][2].append(
321
(line_col_indexes[1],
279
(line_col_indexes[0],
322
280
parent_col_index,
323
281
parent_color))
324
return (linegraph, revid_index, len(columns))
325
else:
326
return (linegraph, revid_index, 0)
282
else:
283
# Broken line
284
# line from the child's column to the lines column
285
linegraph[child_index][2].append(
286
(child_col_index,
287
line_col_indexes[0],
288
parent_color))
289
# Broken line end
290
linegraph[child_index+1][2].append(
291
(line_col_indexes[0],
292
None,
293
parent_color))
294
295
# Broken line end
296
linegraph[parent_index-2][2].append(
297
(None,
298
line_col_indexes[1],
299
parent_color))
300
# line from the line's column to the parent's column
301
linegraph[parent_index-1][2].append(
302
(line_col_indexes[1],
303
parent_col_index,
304
parent_color))
305
327
306
307
return (linegraph, revid_index, len(columns))
328
308
329
309
def _branch_line_col_search_order(columns, parent_col_index):
330
310
for col_index in range(parent_col_index, len(columns)):
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0