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 branchview/linegraph.py
- browse files at revision 683.1.1
- compare with another revision
- download diff
- download tarball
- view history from revision 683.1.1
- Committer: Jelmer Vernooij
- Date: 2010-02-28 16:17:06 UTC
- mto: This revision was merged to the branch mainline in revision 686.
- Revision ID: jelmer@samba.org-20100228161706-of6do4olu1l7o8vb
Fix formatting.
- files added:
- bzr-notify
- files removed:
- olive.glade
- files modified:
- .bzrignore
added
removed
branchview/linegraph.py
1
# -*- coding: UTF-8 -*-
2
1
"""Directed graph production.
3
2
4
3
This module contains the code to produce an ordered directed graph of a
6
5
window.
7
6
"""
8
7
9
__copyright__ = "Copyright © 2005 Canonical Ltd."
8
__copyright__ = "Copyright 2005 Canonical Ltd."
10
9
__author__ = "Scott James Remnant <scott@ubuntu.com>"
11
10
12
11
from bzrlib.revision import NULL_REVISION
13
12
from bzrlib.tsort import merge_sort
13
from bzrlib import ui
14
14
15
def linegraph(repository, start_revs, maxnum, broken_line_length = None,
16
graph_data = True, mainline_only = False):
15
def linegraph(graph, start_revs, maxnum=None, broken_line_length=None,
16
graph_data=True, mainline_only=False, root_progress=None):
17
17
"""Produce a directed graph of a bzr repository.
18
18
19
19
Returns a tuple of (line_graph, revid_index, columns_len) where
42
42
It's up to you how to actually draw the nodes and lines (straight,
43
43
curved, kinked, etc.) and to pick the actual colours for each index.
44
44
"""
45
46
graph = repository.get_graph()
45
assert isinstance(start_revs, list)
46
def update_root_progress(step_number):
47
"""IFF our container received a root progress bar, then update it."""
48
if root_progress is not None:
49
root_progress.update(None, step_number)
50
47
51
graph_parents = {}
48
52
ghosts = set()
49
53
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]
54
update_root_progress(1)
55
progress_bar = ui.ui_factory.nested_progress_bar()
56
try:
57
progress_bar.update("Arranging tree fragments")
58
for i, (revid, parent_revids) in enumerate(graph.iter_ancestry(start_revs)):
59
if i % 25 == 0:
60
progress_bar.tick()
61
if parent_revids is None:
62
ghosts.add(revid)
63
continue
64
if parent_revids == (NULL_REVISION,):
65
graph_parents[revid] = ()
66
else:
67
graph_parents[revid] = parent_revids
68
for parent in parent_revids:
69
graph_children.setdefault(parent, []).append(revid)
70
graph_children.setdefault(revid, [])
71
finally:
72
progress_bar.finished()
73
74
update_root_progress(2)
75
progress_bar = ui.ui_factory.nested_progress_bar()
76
try:
77
progress_bar.update("Removing ghosts", 0, len(ghosts))
78
for i, ghost in enumerate(ghosts):
79
if i % 25 == 0:
80
progress_bar.update(None, i)
81
for ghost_child in graph_children[ghost]:
82
graph_parents[ghost_child] = [p for p in graph_parents[ghost_child]
83
if p not in ghosts]
84
finally:
85
progress_bar.finished()
65
86
graph_parents["top:"] = start_revs
66
87
67
88
if len(graph_parents)>0:
93
114
94
115
linegraph = []
95
116
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
104
105
parents = graph_parents[revid]
106
linegraph.append([revid,
107
None,
108
[],
109
parents,
110
None,
111
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)
117
update_root_progress(3)
118
progress_bar = ui.ui_factory.nested_progress_bar()
119
try:
120
progress_bar.update("Finding nodes", 0, len(merge_sorted_revisions))
121
for (rev_index, (sequence_number,
122
revid,
123
merge_depth,
124
revno_sequence,
125
end_of_merge)) in enumerate(merge_sorted_revisions):
126
127
if rev_index % 25 == 0:
128
progress_bar.update(None, rev_index)
129
if maxnum and rev_index >= maxnum:
130
break
131
revid_index[revid] = rev_index
132
133
parents = graph_parents[revid]
134
linegraph.append([revid,
135
None,
136
[],
137
parents,
138
None,
139
revno_sequence])
140
141
if graph_data:
142
revno_index[revno_sequence] = rev_index
143
144
branch_id = revno_sequence[0:-1]
145
146
branch_line = None
147
if branch_id not in branch_lines:
148
branch_line = []
149
branch_lines[branch_id] = branch_line
150
else:
151
branch_line = branch_lines[branch_id]
152
153
branch_line.append(rev_index)
154
finally:
155
progress_bar.finished()
126
156
127
157
if graph_data:
128
158
branch_ids = branch_lines.keys()
150
180
columns = [list(empty_column)]
151
181
152
182
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)
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]
183
update_root_progress(4)
184
progress_bar = ui.ui_factory.nested_progress_bar()
185
try:
186
progress_bar.update("Organizing edges", 0, len(branch_ids))
187
for i, branch_id in enumerate(branch_ids):
188
if i % 25 == 0:
189
progress_bar.update(None, i)
190
branch_line = branch_lines[branch_id]
191
192
# Find the col_index for the direct parent branch. This will be the
193
# starting point when looking for a free column.
194
parent_col_index = 0
195
parent_index = None
196
if len(branch_id) > 1:
197
parent_revno = branch_id[0:-1]
198
if parent_revno in revno_index:
199
parent_index = revno_index[parent_revno]
218
200
parent_node = linegraph[parent_index][1]
219
201
if parent_node:
220
202
parent_col_index = parent_node[0]
203
204
205
col_search_order = _branch_line_col_search_order(columns,
206
parent_col_index)
207
color = reduce(lambda x, y: x+y, branch_id, 0)
208
cur_cont_line = []
209
210
line_range = []
211
last_rev_index = None
212
for rev_index in branch_line:
213
if last_rev_index:
214
if broken_line_length and \
215
rev_index - last_rev_index > broken_line_length:
216
line_range.append(last_rev_index+1)
217
line_range.append(rev_index-1)
221
218
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.
219
line_range.extend(range(last_rev_index+1, rev_index))
220
221
line_range.append(rev_index)
222
last_rev_index = rev_index
223
224
if parent_index:
225
if broken_line_length and \
226
parent_index - last_rev_index > broken_line_length:
227
line_range.append(last_rev_index+1)
228
else:
229
line_range.extend(range(last_rev_index+1, parent_index))
230
231
col_index = _find_free_column(columns,
232
empty_column,
233
col_search_order,
234
line_range)
235
node = (col_index, color)
236
for rev_index in branch_line:
237
linegraph[rev_index][1] = node
238
columns[col_index][rev_index] = True
239
240
for rev_index in branch_line:
241
(sequence_number,
242
revid,
243
merge_depth,
244
revno_sequence,
245
end_of_merge) = merge_sorted_revisions[rev_index]
246
247
linegraph[rev_index][4] = graph_children[revid]
248
col_index = linegraph[rev_index][1][0]
249
250
for parent_revid in graph_parents[revid]:
251
if parent_revid in revid_index:
252
253
parent_index = revid_index[parent_revid]
254
parent_node = linegraph[parent_index][1]
255
if parent_node:
256
parent_col_index = parent_node[0]
257
else:
258
parent_col_index = None
243
259
col_search_order = \
244
260
_line_col_search_order(columns,
245
261
parent_col_index,
246
262
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,)))
263
264
# If this line is really long, break it.
265
if len(branch_id) > 0 and \
266
broken_line_length and \
267
parent_index - rev_index > broken_line_length:
268
child_line_col_index = \
269
_find_free_column(columns,
270
empty_column,
271
col_search_order,
272
(rev_index + 1,))
273
_mark_column_as_used(columns,
274
child_line_col_index,
275
(rev_index + 1,))
276
277
# Recall _line_col_search_order to reset it back to
278
# the beging.
279
col_search_order = \
280
_line_col_search_order(columns,
281
parent_col_index,
282
col_index)
283
parent_col_line_index = \
284
_find_free_column(columns,
285
empty_column,
286
col_search_order,
287
(parent_index - 1,))
288
_mark_column_as_used(columns,
289
parent_col_line_index,
290
(parent_index - 1,))
291
lines.append((rev_index,
292
parent_index,
293
(child_line_col_index,
294
parent_col_line_index)))
295
else :
296
line_col_index = col_index
297
if parent_index - rev_index >1:
298
line_range = range(rev_index + 1, parent_index)
299
line_col_index = \
300
_find_free_column(columns,
301
empty_column,
302
col_search_order,
303
line_range)
304
_mark_column_as_used(columns,
305
line_col_index,
306
line_range)
307
lines.append((rev_index,
308
parent_index,
309
(line_col_index,)))
310
finally:
311
progress_bar.finished()
274
312
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))
313
update_root_progress(5)
314
progress_bar = ui.ui_factory.nested_progress_bar()
315
try:
316
progress_bar.update("Prettifying graph", 0, len(lines))
317
for i, (child_index, parent_index, line_col_indexes) in enumerate(lines):
318
if i % 25 == 0:
319
progress_bar.update(None, i)
320
(child_col_index, child_color) = linegraph[child_index][1]
321
(parent_col_index, parent_color) = linegraph[parent_index][1]
322
323
if len(line_col_indexes) == 1:
324
if parent_index - child_index == 1:
325
linegraph[child_index][2].append(
326
(child_col_index,
327
parent_col_index,
328
parent_color))
329
else:
330
# line from the child's column to the lines column
331
linegraph[child_index][2].append(
332
(child_col_index,
333
line_col_indexes[0],
334
parent_color))
335
# lines down the line's column
336
for line_part_index in range(child_index+1, parent_index-1):
337
linegraph[line_part_index][2].append(
338
(line_col_indexes[0],
339
line_col_indexes[0],
340
parent_color))
341
# line from the line's column to the parent's column
342
linegraph[parent_index-1][2].append(
343
(line_col_indexes[0],
344
parent_col_index,
345
parent_color))
285
346
else:
347
# Broken line
286
348
# line from the child's column to the lines column
287
349
linegraph[child_index][2].append(
288
350
(child_col_index,
289
351
line_col_indexes[0],
290
352
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))
353
# Broken line end
354
linegraph[child_index+1][2].append(
355
(line_col_indexes[0],
356
None,
357
parent_color))
358
359
# Broken line end
360
linegraph[parent_index-2][2].append(
361
(None,
362
line_col_indexes[1],
363
parent_color))
297
364
# line from the line's column to the parent's column
298
365
linegraph[parent_index-1][2].append(
299
(line_col_indexes[0],
366
(line_col_indexes[1],
300
367
parent_col_index,
301
368
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))
369
finally:
370
progress_bar.finished()
325
371
return (linegraph, revid_index, len(columns))
326
372
else:
327
373
return (linegraph, revid_index, 0)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0