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 399.1.19
- compare with another revision
- download diff
- download tarball
- view history from revision 399.1.19
- Committer: Jelmer Vernooij
- Date: 2008-03-30 15:58:52 UTC
- mto: (450.1.11 trunk)
- mto: This revision was merged to the branch mainline in revision 458.
- Revision ID: jelmer@samba.org-20080330155852-0btngt3srvde5pj9
Add utility function for finding icon paths.
- files added:
- bzr-notify.desktop
- olive
- files removed:
- avatarproviders.py
- preferences
- files renamed:
- bazaar-properties.desktop.in => bazaar-properties.desktop
- 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
15
16
def linegraph(graph, start_revs, maxnum=None, broken_line_length=None,
17
graph_data=True, mainline_only=False, root_progress=None):
13
14
def linegraph(repository, start_revs, maxnum, broken_line_length = None,
15
graph_data = True, mainline_only = False):
18
16
"""Produce a directed graph of a bzr repository.
19
17
20
18
Returns a tuple of (line_graph, revid_index, columns_len) where
27
25
* revid_index is a dict of each revision with the key being the revid, and
28
26
the value the row index, and
29
27
* columns_len is the number of columns need to draw the line graph.
30
28
31
29
32
30
Node is a tuple of (column, colour) with column being a zero-indexed
33
31
column number of the graph that this revision represents and colour
43
41
It's up to you how to actually draw the nodes and lines (straight,
44
42
curved, kinked, etc.) and to pick the actual colours for each index.
45
43
"""
46
assert isinstance(start_revs, list)
47
def update_root_progress(step_number):
48
"""IFF our container received a root progress bar, then update it."""
49
if root_progress is not None:
50
root_progress.update(None, step_number)
51
44
45
graph = repository.get_graph()
52
46
graph_parents = {}
53
ghosts = set()
54
47
graph_children = {}
55
update_root_progress(1)
56
progress_bar = ui.ui_factory.nested_progress_bar()
57
try:
58
progress_bar.update("Arranging tree fragments")
59
for i, (revid, parent_revids) in enumerate(graph.iter_ancestry(start_revs)):
60
if i % 25 == 0:
61
progress_bar.tick()
62
if parent_revids is None:
63
ghosts.add(revid)
64
continue
65
if parent_revids == (NULL_REVISION,):
66
graph_parents[revid] = ()
67
else:
68
graph_parents[revid] = parent_revids
69
for parent in parent_revids:
70
graph_children.setdefault(parent, []).append(revid)
71
graph_children.setdefault(revid, [])
72
finally:
73
progress_bar.finished()
48
for (revid, parent_revids) in graph.iter_ancestry(start_revs):
49
graph_parents[revid] = parent_revids
50
graph_children[revid] = []
74
51
75
update_root_progress(2)
76
progress_bar = ui.ui_factory.nested_progress_bar()
77
try:
78
progress_bar.update("Removing ghosts", 0, len(ghosts))
79
for i, ghost in enumerate(ghosts):
80
if i % 25 == 0:
81
progress_bar.update(None, i)
82
for ghost_child in graph_children[ghost]:
83
graph_parents[ghost_child] = [p for p in graph_parents[ghost_child]
84
if p not in ghosts]
85
finally:
86
progress_bar.finished()
87
52
graph_parents["top:"] = start_revs
88
53
89
54
if len(graph_parents)>0:
93
58
generate_revno=True)
94
59
else:
95
60
merge_sorted_revisions = ()
96
61
97
62
if mainline_only:
98
63
merge_sorted_revisions = [elem for elem in merge_sorted_revisions \
99
64
if len(elem[3])==1 ]
100
65
101
66
assert merge_sorted_revisions[0][1] == "top:"
102
67
merge_sorted_revisions = merge_sorted_revisions[1:]
103
68
104
69
revid_index = {}
105
70
revno_index = {}
106
71
107
72
# This will hold an item for each "branch". For a revisions, the revsion
108
73
# number less the least significant digit is the branch_id, and used as the
109
74
# key for the dict. Hence revision with the same revsion number less the
112
77
# and these two revisions will be in the same branch line. Each value is
113
78
# a list of rev_indexes in the branch.
114
79
branch_lines = {}
115
116
linegraph = []
117
118
update_root_progress(3)
119
progress_bar = ui.ui_factory.nested_progress_bar()
120
try:
121
progress_bar.update("Finding nodes", 0, len(merge_sorted_revisions))
122
for (rev_index, (sequence_number,
123
revid,
124
merge_depth,
125
revno_sequence,
126
end_of_merge)) in enumerate(merge_sorted_revisions):
127
128
if rev_index % 25 == 0:
129
progress_bar.update(None, rev_index)
130
if maxnum and rev_index >= maxnum:
131
break
132
revid_index[revid] = rev_index
133
134
parents = graph_parents[revid]
135
linegraph.append([revid,
136
None,
137
[],
138
parents,
139
None,
140
revno_sequence])
141
142
if graph_data:
143
revno_index[revno_sequence] = rev_index
144
145
branch_id = revno_sequence[0:-1]
146
147
branch_line = None
148
if branch_id not in branch_lines:
149
branch_line = []
150
branch_lines[branch_id] = branch_line
151
else:
152
branch_line = branch_lines[branch_id]
153
154
branch_line.append(rev_index)
155
finally:
156
progress_bar.finished()
80
81
linegraph = []
82
83
for (rev_index, (sequence_number,
84
revid,
85
merge_depth,
86
revno_sequence,
87
end_of_merge)) in enumerate(merge_sorted_revisions):
88
if maxnum and rev_index >= maxnum:
89
break
90
revid_index[revid] = rev_index
91
92
parents = graph_parents[revid]
93
for parent_revid in parents:
94
graph_children[parent_revid].append(revid)
95
96
linegraph.append([revid,
97
None,
98
[],
99
parents,
100
None,
101
revno_sequence])
102
103
if graph_data:
104
revno_index[revno_sequence] = rev_index
105
106
branch_id = revno_sequence[0:-1]
107
108
branch_line = None
109
if branch_id not in branch_lines:
110
branch_line = []
111
branch_lines[branch_id] = branch_line
112
else:
113
branch_line = branch_lines[branch_id]
114
115
branch_line.append(rev_index)
157
116
158
117
if graph_data:
159
118
branch_ids = branch_lines.keys()
160
119
161
120
def branch_id_cmp(x, y):
162
121
"""Compaire branch_id's first by the number of digits, then reversed
163
122
by their value"""
166
125
if len_x == len_y:
167
126
return -cmp(x, y)
168
127
return cmp(len_x, len_y)
169
128
170
129
branch_ids.sort(branch_id_cmp)
171
130
# This will hold a tuple of (child_index, parent_index, col_index) for each
172
131
# line that needs to be drawn. If col_index is not none, then the line is
179
138
# cell allready contains a node or line. This use when deciding what column
180
139
# to place a branch line or line in, without it overlaping something else.
181
140
columns = [list(empty_column)]
182
183
184
update_root_progress(4)
185
progress_bar = ui.ui_factory.nested_progress_bar()
186
try:
187
progress_bar.update("Organizing edges", 0, len(branch_ids))
188
for i, branch_id in enumerate(branch_ids):
189
if i % 25 == 0:
190
progress_bar.update(None, i)
191
branch_line = branch_lines[branch_id]
192
193
# Find the col_index for the direct parent branch. This will be the
194
# starting point when looking for a free column.
195
parent_col_index = 0
196
parent_index = None
197
if len(branch_id) > 1:
198
parent_revno = branch_id[0:-1]
199
if parent_revno in revno_index:
200
parent_index = revno_index[parent_revno]
141
142
143
for branch_id in branch_ids:
144
branch_line = branch_lines[branch_id]
145
146
# Find the col_index for the direct parent branch. This will be the
147
# starting point when looking for a free column.
148
parent_col_index = 0
149
parent_index = None
150
if len(branch_id) > 1:
151
parent_revno = branch_id[0:-1]
152
if parent_revno in revno_index:
153
parent_index = revno_index[parent_revno]
154
parent_node = linegraph[parent_index][1]
155
if parent_node:
156
parent_col_index = parent_node[0]
157
158
159
col_search_order = _branch_line_col_search_order(columns,
160
parent_col_index)
161
color = reduce(lambda x, y: x+y, branch_id, 0)
162
cur_cont_line = []
163
164
line_range = []
165
last_rev_index = None
166
for rev_index in branch_line:
167
if last_rev_index:
168
if broken_line_length and \
169
rev_index - last_rev_index > broken_line_length:
170
line_range.append(last_rev_index+1)
171
line_range.append(rev_index-1)
172
else:
173
line_range.extend(range(last_rev_index+1, rev_index))
174
175
line_range.append(rev_index)
176
last_rev_index = rev_index
177
178
if parent_index:
179
if broken_line_length and \
180
parent_index - last_rev_index > broken_line_length:
181
line_range.append(last_rev_index+1)
182
else:
183
line_range.extend(range(last_rev_index+1, parent_index))
184
185
col_index = _find_free_column(columns,
186
empty_column,
187
col_search_order,
188
line_range)
189
node = (col_index, color)
190
for rev_index in branch_line:
191
linegraph[rev_index][1] = node
192
columns[col_index][rev_index] = True
193
194
for rev_index in branch_line:
195
(sequence_number,
196
revid,
197
merge_depth,
198
revno_sequence,
199
end_of_merge) = merge_sorted_revisions[rev_index]
200
201
linegraph[rev_index][4] = graph_children[revid]
202
col_index = linegraph[rev_index][1][0]
203
204
for parent_revid in graph_parents[revid]:
205
if parent_revid in revid_index:
206
207
parent_index = revid_index[parent_revid]
201
208
parent_node = linegraph[parent_index][1]
202
209
if parent_node:
203
210
parent_col_index = parent_node[0]
204
205
206
col_search_order = _branch_line_col_search_order(columns,
207
parent_col_index)
208
color = reduce(lambda x, y: x+y, branch_id, 0)
209
cur_cont_line = []
210
211
line_range = []
212
last_rev_index = None
213
for rev_index in branch_line:
214
if last_rev_index:
215
if broken_line_length and \
216
rev_index - last_rev_index > broken_line_length:
217
line_range.append(last_rev_index+1)
218
line_range.append(rev_index-1)
219
211
else:
220
line_range.extend(range(last_rev_index+1, rev_index))
221
222
line_range.append(rev_index)
223
last_rev_index = rev_index
224
225
if parent_index:
226
if broken_line_length and \
227
parent_index - last_rev_index > broken_line_length:
228
line_range.append(last_rev_index+1)
229
else:
230
line_range.extend(range(last_rev_index+1, parent_index))
231
232
col_index = _find_free_column(columns,
233
empty_column,
234
col_search_order,
235
line_range)
236
node = (col_index, color)
237
for rev_index in branch_line:
238
linegraph[rev_index][1] = node
239
columns[col_index][rev_index] = True
240
241
for rev_index in branch_line:
242
(sequence_number,
243
revid,
244
merge_depth,
245
revno_sequence,
246
end_of_merge) = merge_sorted_revisions[rev_index]
247
248
linegraph[rev_index][4] = graph_children[revid]
249
col_index = linegraph[rev_index][1][0]
250
251
for parent_revid in graph_parents[revid]:
252
if parent_revid in revid_index:
253
254
parent_index = revid_index[parent_revid]
255
parent_node = linegraph[parent_index][1]
256
if parent_node:
257
parent_col_index = parent_node[0]
258
else:
259
parent_col_index = None
212
parent_col_index = None
213
col_search_order = \
214
_line_col_search_order(columns,
215
parent_col_index,
216
col_index)
217
218
# If this line is really long, break it.
219
if len(branch_id) > 0 and \
220
broken_line_length and \
221
parent_index - rev_index > broken_line_length:
222
child_line_col_index = \
223
_find_free_column(columns,
224
empty_column,
225
col_search_order,
226
(rev_index + 1,))
227
_mark_column_as_used(columns,
228
child_line_col_index,
229
(rev_index + 1,))
230
231
# Recall _line_col_search_order to reset it back to
232
# the beging.
260
233
col_search_order = \
261
234
_line_col_search_order(columns,
262
235
parent_col_index,
263
236
col_index)
264
265
# If this line is really long, break it.
266
if len(branch_id) > 0 and \
267
broken_line_length and \
268
parent_index - rev_index > broken_line_length:
269
child_line_col_index = \
270
_find_free_column(columns,
271
empty_column,
272
col_search_order,
273
(rev_index + 1,))
274
_mark_column_as_used(columns,
275
child_line_col_index,
276
(rev_index + 1,))
277
278
# Recall _line_col_search_order to reset it back to
279
# the beging.
280
col_search_order = \
281
_line_col_search_order(columns,
282
parent_col_index,
283
col_index)
284
parent_col_line_index = \
285
_find_free_column(columns,
286
empty_column,
287
col_search_order,
288
(parent_index - 1,))
289
_mark_column_as_used(columns,
290
parent_col_line_index,
291
(parent_index - 1,))
292
lines.append((rev_index,
293
parent_index,
294
(child_line_col_index,
295
parent_col_line_index)))
296
else :
297
line_col_index = col_index
298
if parent_index - rev_index >1:
299
line_range = range(rev_index + 1, parent_index)
300
line_col_index = \
301
_find_free_column(columns,
302
empty_column,
303
col_search_order,
304
line_range)
305
_mark_column_as_used(columns,
306
line_col_index,
307
line_range)
308
lines.append((rev_index,
309
parent_index,
310
(line_col_index,)))
311
finally:
312
progress_bar.finished()
313
314
update_root_progress(5)
315
progress_bar = ui.ui_factory.nested_progress_bar()
316
try:
317
progress_bar.update("Prettifying graph", 0, len(lines))
318
for i, (child_index, parent_index, line_col_indexes) in enumerate(lines):
319
if i % 25 == 0:
320
progress_bar.update(None, i)
321
(child_col_index, child_color) = linegraph[child_index][1]
322
(parent_col_index, parent_color) = linegraph[parent_index][1]
323
324
if len(line_col_indexes) == 1:
325
if parent_index - child_index == 1:
326
linegraph[child_index][2].append(
327
(child_col_index,
328
parent_col_index,
329
parent_color))
330
else:
331
# line from the child's column to the lines column
332
linegraph[child_index][2].append(
333
(child_col_index,
334
line_col_indexes[0],
335
parent_color))
336
# lines down the line's column
337
for line_part_index in range(child_index+1, parent_index-1):
338
linegraph[line_part_index][2].append(
339
(line_col_indexes[0],
340
line_col_indexes[0],
341
parent_color))
342
# line from the line's column to the parent's column
343
linegraph[parent_index-1][2].append(
344
(line_col_indexes[0],
345
parent_col_index,
346
parent_color))
237
parent_col_line_index = \
238
_find_free_column(columns,
239
empty_column,
240
col_search_order,
241
(parent_index - 1,))
242
_mark_column_as_used(columns,
243
parent_col_line_index,
244
(parent_index - 1,))
245
lines.append((rev_index,
246
parent_index,
247
(child_line_col_index,
248
parent_col_line_index)))
249
else :
250
line_col_index = col_index
251
if parent_index - rev_index >1:
252
line_range = range(rev_index + 1, parent_index)
253
line_col_index = \
254
_find_free_column(columns,
255
empty_column,
256
col_search_order,
257
line_range)
258
_mark_column_as_used(columns,
259
line_col_index,
260
line_range)
261
lines.append((rev_index,
262
parent_index,
263
(line_col_index,)))
264
265
for (child_index, parent_index, line_col_indexes) in lines:
266
(child_col_index, child_color) = linegraph[child_index][1]
267
(parent_col_index, parent_color) = linegraph[parent_index][1]
268
269
if len(line_col_indexes) == 1:
270
if parent_index - child_index == 1:
271
linegraph[child_index][2].append(
272
(child_col_index,
273
parent_col_index,
274
parent_color))
347
275
else:
348
# Broken line
349
276
# line from the child's column to the lines column
350
277
linegraph[child_index][2].append(
351
278
(child_col_index,
352
279
line_col_indexes[0],
353
280
parent_color))
354
# Broken line end
355
linegraph[child_index+1][2].append(
356
(line_col_indexes[0],
357
None,
358
parent_color))
359
360
# Broken line end
361
linegraph[parent_index-2][2].append(
362
(None,
363
line_col_indexes[1],
364
parent_color))
281
# lines down the line's column
282
for line_part_index in range(child_index+1, parent_index-1):
283
linegraph[line_part_index][2].append(
284
(line_col_indexes[0],
285
line_col_indexes[0],
286
parent_color))
365
287
# line from the line's column to the parent's column
366
288
linegraph[parent_index-1][2].append(
367
(line_col_indexes[1],
289
(line_col_indexes[0],
368
290
parent_col_index,
369
291
parent_color))
370
finally:
371
progress_bar.finished()
292
else:
293
# Broken line
294
# line from the child's column to the lines column
295
linegraph[child_index][2].append(
296
(child_col_index,
297
line_col_indexes[0],
298
parent_color))
299
# Broken line end
300
linegraph[child_index+1][2].append(
301
(line_col_indexes[0],
302
None,
303
parent_color))
304
305
# Broken line end
306
linegraph[parent_index-2][2].append(
307
(None,
308
line_col_indexes[1],
309
parent_color))
310
# line from the line's column to the parent's column
311
linegraph[parent_index-1][2].append(
312
(line_col_indexes[1],
313
parent_col_index,
314
parent_color))
372
315
return (linegraph, revid_index, len(columns))
373
316
else:
374
317
return (linegraph, revid_index, 0)
375
318
376
319
377
320
def _branch_line_col_search_order(columns, parent_col_index):
378
321
for col_index in range(parent_col_index, len(columns)):
418
361
def _mark_column_as_used(columns, col_index, line_range):
419
362
column = columns[col_index]
420
363
for row_index in line_range:
421
column[row_index] = True
364
column[row_index] = True
422
365
423
366
def same_branch(a, b):
424
367
"""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