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 449.1.2
- compare with another revision
- download diff
- download tarball
- view history from revision 449.1.2
- Committer: Jelmer Vernooij
- Date: 2008-03-14 02:19:21 UTC
- mto: (452.2.3 trunk)
- mto: This revision was merged to the branch mainline in revision 453.
- Revision ID: jelmer@samba.org-20080314021921-2dgptk62dhp7pd91
Honor child_submit_to in the submit_branch if no email address was specified.
Consistent with the changes in bzr.dev.
Consistent with the changes in bzr.dev.
- files added:
- olive.glade
- files removed:
- bzr-gtk.applications
- preferences
- files renamed:
- icons/bzr-icon-64.png => bzr-icon-64.png
- bzr-handle-patch => handle-patch
- preferences/__init__.py => preferences.py
- files modified:
- .bzrignore
added
removed
branchview/linegraph.py
1
# -*- coding: UTF-8 -*-
1
2
"""Directed graph production.
2
3
3
4
This module contains the code to produce an ordered directed graph of a
5
6
window.
6
7
"""
7
8
8
__copyright__ = "Copyright 2005 Canonical Ltd."
9
__copyright__ = "Copyright © 2005 Canonical Ltd."
9
10
__author__ = "Scott James Remnant <scott@ubuntu.com>"
10
11
11
from bzrlib.revision import NULL_REVISION
12
12
from bzrlib.tsort import merge_sort
13
from bzrlib import ui
14
13
15
def linegraph(graph, start_revs, maxnum=None, broken_line_length=None,
16
graph_data=True, mainline_only=False, root_progress=None):
14
def linegraph(repository, start, maxnum, broken_line_length = None,
15
graph_data = True, mainline_only = False):
17
16
"""Produce a directed graph of a bzr repository.
18
17
19
18
Returns a tuple of (line_graph, revid_index, columns_len) where
42
41
It's up to you how to actually draw the nodes and lines (straight,
43
42
curved, kinked, etc.) and to pick the actual colours for each index.
44
43
"""
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
51
graph_parents = {}
52
ghosts = set()
44
45
graph_parents = repository.get_revision_graph(start)
53
46
graph_children = {}
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()
86
graph_parents["top:"] = start_revs
47
for revid in graph_parents.iterkeys():
48
graph_children[revid] = []
87
49
88
50
if len(graph_parents)>0:
89
51
merge_sorted_revisions = merge_sort(
90
52
graph_parents,
91
"top:",
53
start,
92
54
generate_revno=True)
93
55
else:
94
56
merge_sorted_revisions = ()
96
58
if mainline_only:
97
59
merge_sorted_revisions = [elem for elem in merge_sorted_revisions \
98
60
if len(elem[3])==1 ]
99
100
assert merge_sorted_revisions[0][1] == "top:"
101
merge_sorted_revisions = merge_sorted_revisions[1:]
102
61
103
62
revid_index = {}
104
63
revno_index = {}
114
73
115
74
linegraph = []
116
75
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()
76
for (rev_index, (sequence_number,
77
revid,
78
merge_depth,
79
revno_sequence,
80
end_of_merge)) in enumerate(merge_sorted_revisions):
81
if maxnum and rev_index >= maxnum:
82
break
83
revid_index[revid] = rev_index
84
85
parents = graph_parents[revid]
86
for parent_revid in parents:
87
graph_children[parent_revid].append(revid)
88
89
linegraph.append([revid,
90
None,
91
[],
92
parents,
93
None,
94
revno_sequence])
95
96
if graph_data:
97
revno_index[revno_sequence] = rev_index
98
99
branch_id = revno_sequence[0:-1]
100
101
branch_line = None
102
if branch_id not in branch_lines:
103
branch_line = []
104
branch_lines[branch_id] = branch_line
105
else:
106
branch_line = branch_lines[branch_id]
107
108
branch_line.append(rev_index)
156
109
157
110
if graph_data:
158
111
branch_ids = branch_lines.keys()
180
133
columns = [list(empty_column)]
181
134
182
135
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]
136
for branch_id in branch_ids:
137
branch_line = branch_lines[branch_id]
138
139
# Find the col_index for the direct parent branch. This will be the
140
# starting point when looking for a free column.
141
parent_col_index = 0
142
parent_index = None
143
if len(branch_id) > 1:
144
parent_revno = branch_id[0:-1]
145
if parent_revno in revno_index:
146
parent_index = revno_index[parent_revno]
147
parent_node = linegraph[parent_index][1]
148
if parent_node:
149
parent_col_index = parent_node[0]
150
151
152
col_search_order = _branch_line_col_search_order(columns,
153
parent_col_index)
154
color = reduce(lambda x, y: x+y, branch_id, 0)
155
cur_cont_line = []
156
157
line_range = []
158
last_rev_index = None
159
for rev_index in branch_line:
160
if last_rev_index:
161
if broken_line_length and \
162
rev_index - last_rev_index > broken_line_length:
163
line_range.append(last_rev_index+1)
164
line_range.append(rev_index-1)
165
else:
166
line_range.extend(range(last_rev_index+1, rev_index))
167
168
line_range.append(rev_index)
169
last_rev_index = rev_index
170
171
if parent_index:
172
if broken_line_length and \
173
parent_index - last_rev_index > broken_line_length:
174
line_range.append(last_rev_index+1)
175
else:
176
line_range.extend(range(last_rev_index+1, parent_index))
177
178
col_index = _find_free_column(columns,
179
empty_column,
180
col_search_order,
181
line_range)
182
node = (col_index, color)
183
for rev_index in branch_line:
184
linegraph[rev_index][1] = node
185
columns[col_index][rev_index] = True
186
187
for rev_index in branch_line:
188
(sequence_number,
189
revid,
190
merge_depth,
191
revno_sequence,
192
end_of_merge) = merge_sorted_revisions[rev_index]
193
194
linegraph[rev_index][4] = graph_children[revid]
195
col_index = linegraph[rev_index][1][0]
196
197
for parent_revid in graph_parents[revid]:
198
if parent_revid in revid_index:
199
200
parent_index = revid_index[parent_revid]
200
201
parent_node = linegraph[parent_index][1]
201
202
if parent_node:
202
203
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)
218
204
else:
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
205
parent_col_index = None
206
col_search_order = \
207
_line_col_search_order(columns,
208
parent_col_index,
209
col_index)
210
211
# If this line is really long, break it.
212
if len(branch_id) > 0 and \
213
broken_line_length and \
214
parent_index - rev_index > broken_line_length:
215
child_line_col_index = \
216
_find_free_column(columns,
217
empty_column,
218
col_search_order,
219
(rev_index + 1,))
220
_mark_column_as_used(columns,
221
child_line_col_index,
222
(rev_index + 1,))
223
224
# Recall _line_col_search_order to reset it back to
225
# the beging.
259
226
col_search_order = \
260
227
_line_col_search_order(columns,
261
228
parent_col_index,
262
229
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()
230
parent_col_line_index = \
231
_find_free_column(columns,
232
empty_column,
233
col_search_order,
234
(parent_index - 1,))
235
_mark_column_as_used(columns,
236
parent_col_line_index,
237
(parent_index - 1,))
238
lines.append((rev_index,
239
parent_index,
240
(child_line_col_index,
241
parent_col_line_index)))
242
else :
243
line_col_index = col_index
244
if parent_index - rev_index >1:
245
line_range = range(rev_index + 1, parent_index)
246
line_col_index = \
247
_find_free_column(columns,
248
empty_column,
249
col_search_order,
250
line_range)
251
_mark_column_as_used(columns,
252
line_col_index,
253
line_range)
254
lines.append((rev_index,
255
parent_index,
256
(line_col_index,)))
312
257
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))
258
for (child_index, parent_index, line_col_indexes) in lines:
259
(child_col_index, child_color) = linegraph[child_index][1]
260
(parent_col_index, parent_color) = linegraph[parent_index][1]
261
262
if len(line_col_indexes) == 1:
263
if parent_index - child_index == 1:
264
linegraph[child_index][2].append(
265
(child_col_index,
266
parent_col_index,
267
parent_color))
346
268
else:
347
# Broken line
348
269
# line from the child's column to the lines column
349
270
linegraph[child_index][2].append(
350
271
(child_col_index,
351
272
line_col_indexes[0],
352
273
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))
274
# lines down the line's column
275
for line_part_index in range(child_index+1, parent_index-1):
276
linegraph[line_part_index][2].append(
277
(line_col_indexes[0],
278
line_col_indexes[0],
279
parent_color))
364
280
# line from the line's column to the parent's column
365
281
linegraph[parent_index-1][2].append(
366
(line_col_indexes[1],
282
(line_col_indexes[0],
367
283
parent_col_index,
368
284
parent_color))
369
finally:
370
progress_bar.finished()
285
else:
286
# Broken line
287
# line from the child's column to the lines column
288
linegraph[child_index][2].append(
289
(child_col_index,
290
line_col_indexes[0],
291
parent_color))
292
# Broken line end
293
linegraph[child_index+1][2].append(
294
(line_col_indexes[0],
295
None,
296
parent_color))
297
298
# Broken line end
299
linegraph[parent_index-2][2].append(
300
(None,
301
line_col_indexes[1],
302
parent_color))
303
# line from the line's column to the parent's column
304
linegraph[parent_index-1][2].append(
305
(line_col_indexes[1],
306
parent_col_index,
307
parent_color))
371
308
return (linegraph, revid_index, len(columns))
372
309
else:
373
310
return (linegraph, revid_index, 0)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0