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.29
- compare with another revision
- download diff
- download tarball
- view history from revision 256.2.29
- Committer: Gary van der Merwe
- Date: 2007-09-09 17:52:49 UTC
- mto: (256.2.37 gtk)
- mto: This revision was merged to the branch mainline in revision 289.
- Revision ID: garyvdm@gmail.com-20070909175249-c9jz52xlc98lsvve
Implement a TreeModel that loads revisions incrementaly.
- files added:
- tests/test_viz.py
- files removed:
- branchbox.py
- 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:
- .bzrignore
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.keys():
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
52
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
53
branch_lines = {}
93
94
54
linegraph = []
95
55
96
for (rev_index, (sequence_number,
97
revid,
98
merge_depth,
99
revno_sequence,
100
end_of_merge)) in enumerate(merge_sorted_revisions):
101
if maxnum and rev_index >= maxnum:
102
break
103
revid_index[revid] = rev_index
56
for (index, (sequence_number,
57
revid,
58
merge_depth,
59
revno_sequence,
60
end_of_merge)) in enumerate(merge_sorted_revisions):
61
62
revid_index[revid] = index
63
revno_index[revno_sequence] = index
64
65
branch_id = revno_sequence[0:-1]
66
67
branch_line = None
68
if branch_id not in branch_lines:
69
branch_line = {}
70
branch_lines[branch_id] = branch_line
71
branch_line["rev_indexes"] = []
72
branch_line["min_index"] = index - 1
73
branch_line["max_index"] = 0
74
else:
75
branch_line = branch_lines[branch_id]
76
branch_line["rev_indexes"].append(index)
104
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()
89
branch_ids = branch_lines.keys()
90
branch_ids.sort()
91
columns = []
129
92
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]
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)
93
for branch_id in branch_ids:
94
branch_line = branch_lines[branch_id]
95
branch_line["inward_line_ends"] = []
96
for rev_index in branch_line["rev_indexes"]:
97
(sequence_number,
98
revid,
99
merge_depth,
100
revno_sequence,
101
end_of_merge) = merge_sorted_revisions[rev_index]
102
for parent_revid in graph_parents[revid]:
103
if parent_revid in revid_index:
104
parent_index = revid_index[parent_revid]
105
parent_merge_depth = merge_sorted_revisions[parent_index][2]
106
if parent_merge_depth < merge_depth:
107
branch_line["inward_line_ends"].append(parent_index)
108
if branch_line["max_index"] < parent_index:
109
branch_line["max_index"] =parent_index
110
111
for child_revid in graph_children[revid]:
112
if child_revid in revid_index:
113
child_index = revid_index[child_revid]
114
child_merge_depth = merge_sorted_revisions[child_index][2]
115
if child_merge_depth < merge_depth:
116
branch_line["inward_line_ends"].append(child_index)
117
118
col_index = None
119
start_col_index = 0
120
if branch_id:
121
start_col_index = branch_lines[branch_id[0:-2]]["col_index"]+1
122
for col_search_index in range(start_col_index,len(columns)):
123
column = columns[col_search_index]
124
clashing_lines = []
125
for line in column:
126
if (line["min_index"] <= branch_line["min_index"] and \
127
line["max_index"] > branch_line["min_index"]) or \
128
(line["max_index"] >= branch_line["max_index"] and \
129
line["min_index"] < branch_line["max_index"]):
130
clashing_lines.append(line)
131
132
if not clashing_lines:
133
col_index = col_search_index
134
break
135
136
if not col_index:
137
col_index = len(columns)
138
columns.append([])
139
140
columns[col_index].append(branch_line)
141
branch_line["col_index"] = col_index
142
143
144
for branch_id in branch_ids:
145
branch_line = branch_lines[branch_id]
146
color = reduce(lambda x, y: x+y, branch_id, 0)
147
col_index = branch_line["col_index"]
148
node = (col_index, color)
149
150
for rev_index in branch_line["rev_indexes"]:
151
(sequence_number,
152
revid,
153
merge_depth,
154
revno_sequence,
155
end_of_merge) = merge_sorted_revisions[rev_index]
156
children = graph_children[revid]
157
158
linegraph[rev_index][1] = node
159
linegraph[rev_index][4] = children
160
for child_revid in children:
161
if child_revid in revid_index:
162
child_index = revid_index[child_revid]
163
child_revno_sequence = \
164
merge_sorted_revisions[child_index][3]
165
child_merge_depth = merge_sorted_revisions[child_index][2]
166
child_branch_id = child_revno_sequence[0:-1]
167
child_col_index = branch_lines[child_branch_id]["col_index"]
168
if child_merge_depth < merge_depth:
169
#out from the child to line
170
linegraph[child_index][2].append(
171
(child_col_index,
172
col_index,
173
color))
174
for line_part_index in range(child_index+1, rev_index):
175
linegraph[line_part_index][2].append(
176
(col_index,
177
col_index,
178
color))
182
179
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)
180
for line_part_index in range(child_index, rev_index-1):
181
linegraph[line_part_index][2].append(
182
(child_col_index,
183
child_col_index,
184
color))
185
186
linegraph[rev_index-1][2].append(
187
(child_col_index,
188
col_index,
189
color))
328
190
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:
357
column = columns[col_index]
358
has_overlaping_line = False
359
for row_index in line_range:
360
if column[row_index]:
361
has_overlaping_line = True
362
break
363
if not has_overlaping_line:
364
break
365
else:
366
col_index = len(columns)
367
column = list(empty_column)
368
columns.append(column)
369
return col_index
370
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
191
return (linegraph, revid_index)
192
375
193
376
194
def same_branch(a, b):
377
195
"""Return whether we think revisions a and b are on the same branch."""
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0