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.45
- compare with another revision
- download diff
- download tarball
- view history from revision 256.2.45
- Committer: Gary van der Merwe
- Date: 2007-09-20 21:57:46 UTC
- mfrom: (278 trunk)
- mto: (256.2.54 gtk)
- mto: This revision was merged to the branch mainline in revision 289.
- Revision ID: garyvdm@gmail.com-20070920215746-l2pcdqlj73q4luug
Merge 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
- 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
Returns a tuple of (line_graph, revid_index, columns_len) where
20
* line_graph is a list of tuples of (revid,
21
node,
22
lines,
23
parents,
24
children,
25
revno_sequence),
26
* revid_index is a dict of each revision with the key being the revid, and
27
the value the row index, and
28
* columns_len is the number of columns need to draw the line graph.
29
17
Returns a list of tuples of (revid,
18
node,
19
lines,
20
parents,
21
children,
22
revno_sequence).
30
23
31
24
Node is a tuple of (column, colour) with column being a zero-indexed
32
25
column number of the graph that this revision represents and colour
42
35
It's up to you how to actually draw the nodes and lines (straight,
43
36
curved, kinked, etc.) and to pick the actual colours for each index.
44
37
"""
45
46
graph = repository.get_graph()
47
graph_parents = {}
48
ghosts = set()
38
39
mainline = branch.revision_history()
40
graph_parents = branch.repository.get_revision_graph(start)
49
41
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:]
42
for revid in graph_parents.iterkeys():
43
graph_children[revid] = []
44
45
merge_sorted_revisions = merge_sort(
46
graph_parents,
47
start,
48
mainline,
49
generate_revno=True)
81
50
82
51
revid_index = {}
83
revno_index = {}
84
85
# This will hold an item for each "branch". For a revisions, the revsion
86
# number less the least significant digit is the branch_id, and used as the
87
# key for the dict. Hence revision with the same revsion number less the
88
# least significant digit are considered to be in the same branch line.
89
# e.g.: for revisions 290.12.1 and 290.12.2, the branch_id would be 290.12,
90
# and these two revisions will be in the same branch line. Each value is
91
# a list of rev_indexes in the branch.
92
52
branch_lines = {}
93
94
53
linegraph = []
95
54
96
55
for (rev_index, (sequence_number,
98
57
merge_depth,
99
58
revno_sequence,
100
59
end_of_merge)) in enumerate(merge_sorted_revisions):
101
if maxnum and rev_index >= maxnum:
102
break
60
103
61
revid_index[revid] = rev_index
104
62
63
branch_id = revno_sequence[0:-1]
64
65
branch_line = None
66
if branch_id not in branch_lines:
67
branch_line = {"branch_id": branch_id,
68
"rev_indexes": [],
69
"min_index": rev_index,
70
"max_index": 0}
71
branch_lines[branch_id] = branch_line
72
else:
73
branch_line = branch_lines[branch_id]
74
branch_line["rev_indexes"].append(rev_index)
75
if rev_index > branch_line["max_index"]:
76
branch_line["max_index"] = rev_index
77
105
78
parents = graph_parents[revid]
79
for parent_revid in parents:
80
graph_children[parent_revid].append(revid)
81
106
82
linegraph.append([revid,
107
83
None,
108
84
[],
109
85
parents,
110
86
None,
111
87
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
122
else:
123
branch_line = branch_lines[branch_id]
124
125
branch_line.append(rev_index)
126
88
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]
164
parent_node = linegraph[parent_index][1]
165
if parent_node:
166
parent_col_index = parent_node[0]
89
branch_ids = branch_lines.keys()
90
def branch_id_cmp(x, y):
91
len_x = len(x)
92
len_y = len(y)
93
if len_x == len_y:
94
return -cmp(x, y)
95
return cmp(len_x, len_y)
96
97
branch_ids.sort(branch_id_cmp)
98
lines = []
99
empty_column = [False for i in range(len(graph_parents))]
100
columns = [list(empty_column)]
101
102
103
for branch_id in branch_ids:
104
branch_line = branch_lines[branch_id]
105
106
parent_col_index = 0
107
if len(branch_id) > 1:
108
parent_branch_id = branch_id[0:-2]
109
parent_col_index = branch_lines[parent_branch_id]["col_index"]
110
111
branch_line["col_index"] = append_line(columns,
112
(branch_line["min_index"],
113
branch_line["max_index"]),
114
empty_column,
115
parent_col_index)
116
color = reduce(lambda x, y: x+y, branch_id, 0)
117
col_index = branch_line["col_index"]
118
node = (col_index, color)
119
120
for rev_index in branch_line["rev_indexes"]:
121
(sequence_number,
122
revid,
123
merge_depth,
124
revno_sequence,
125
end_of_merge) = merge_sorted_revisions[rev_index]
126
127
linegraph[rev_index][1] = node
128
linegraph[rev_index][4] = graph_children[revid]
129
130
for parent_revid in graph_parents[revid]:
131
if parent_revid in revid_index:
132
parent_index = revid_index[parent_revid]
133
parent_revno = merge_sorted_revisions[parent_index][3]
134
parent_branch_id = parent_revno[0:-1]
135
col_index = None
136
if branch_id != parent_branch_id and \
137
parent_index - rev_index > 1:
138
col_index = append_line(columns,
139
(rev_index+1, parent_index-1),
140
empty_column,
141
branch_line["col_index"])
142
lines.append((rev_index, parent_index, col_index))
143
144
for (child_index, parent_index, line_col_index) in lines:
145
child_col_index = linegraph[child_index][1][0]
146
147
parent_node = linegraph[parent_index][1]
148
parent_col_index = parent_node[0]
149
color = parent_node[1]
150
151
if line_col_index:
152
linegraph[child_index][2].append(
153
(child_col_index,
154
line_col_index,
155
color))
156
for line_part_index in range(child_index+1, parent_index-1):
157
linegraph[line_part_index][2].append(
158
(line_col_index,
159
line_col_index,
160
color))
161
linegraph[parent_index-1][2].append(
162
(line_col_index,
163
parent_col_index,
164
color))
165
else:
166
linegraph[child_index][2].append(
167
(child_col_index,
168
parent_col_index,
169
color))
170
for line_part_index in range(child_index+1, parent_index):
171
linegraph[line_part_index][2].append(
172
(parent_col_index,
173
parent_col_index,
174
color))
167
175
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
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:
216
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,)))
274
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))
302
else:
303
# Broken line
304
# line from the child's column to the lines column
305
linegraph[child_index][2].append(
306
(child_col_index,
307
line_col_indexes[0],
308
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))
320
# line from the line's column to the parent's column
321
linegraph[parent_index-1][2].append(
322
(line_col_indexes[1],
323
parent_col_index,
324
parent_color))
325
return (linegraph, revid_index, len(columns))
326
else:
327
return (linegraph, revid_index, 0)
328
176
329
330
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
335
336
def _line_col_search_order(columns, parent_col_index, child_col_index):
337
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
342
else:
343
max_index = child_col_index
344
min_index = child_col_index
345
yield child_col_index
346
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
353
i += 1
354
355
def _find_free_column(columns, empty_column, col_search_order, line_range):
356
for col_index in col_search_order:
177
return (linegraph, revid_index)
178
179
def append_line(columns, line, empty_column, starting_col_index):
180
line_range = range(line[0], line[1]+1)
181
col_order = range(starting_col_index, -1, -1) + \
182
range(starting_col_index+1, len(columns))
183
for col_index in col_order:
357
184
column = columns[col_index]
358
185
has_overlaping_line = False
359
186
for row_index in line_range:
366
193
col_index = len(columns)
367
194
column = list(empty_column)
368
195
columns.append(column)
196
197
for row_index in line_range:
198
column[row_index] = True
369
199
return col_index
370
200
371
def _mark_column_as_used(columns, col_index, line_range):
372
column = columns[col_index]
373
for row_index in line_range:
374
column[row_index] = True
375
376
201
def same_branch(a, b):
377
202
"""Return whether we think revisions a and b are on the same branch."""
378
203
if len(a.parent_ids) == 1:
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0