1
# -*- coding: UTF-8 -*-
2
"""Directed graph production.
4
This module contains the code to produce an ordered directed graph of a
5
bzr branch, such as we display in the tree view at the top of the bzrk
9
__copyright__ = "Copyright © 2005 Canonical Ltd."
10
__author__ = "Scott James Remnant <scott@ubuntu.com>"
12
from bzrlib.tsort import merge_sort
14
def linegraph(branch, start, maxnum):
15
"""Produce a directed graph of a bzr branch.
17
Returns a tuple of (line_graph, revid_index, columns_len) where
18
* line_graph is a list of tuples of (revid,
24
* revid_index is a dict of each revision with the key being the revid, and
25
the value the row index, and
26
* columns_len is the number of columns need to draw the line graph.
29
Node is a tuple of (column, colour) with column being a zero-indexed
30
column number of the graph that this revision represents and colour
31
being a zero-indexed colour (which doesn't specify any actual colour
32
in particular) to draw the node in.
34
Lines is a list of tuples which represent lines you should draw away
35
from the revision, if you also need to draw lines into the revision
36
you should use the lines list from the previous iteration. Each
37
typle in the list is in the form (start, end, colour) with start and
38
end being zero-indexed column numbers and colour as in node.
40
It's up to you how to actually draw the nodes and lines (straight,
41
curved, kinked, etc.) and to pick the actual colours for each index.
44
# FIXME: This should be configurable
45
BROKEN_LINE_LENGTH = 32
47
# We get the mainline so we can pass it to merge_sort to make merge_sort
50
mainline.extend(branch.revision_history())
51
graph_parents = branch.repository.get_revision_graph(start)
53
for revid in graph_parents.iterkeys():
54
graph_children[revid] = []
56
merge_sorted_revisions = merge_sort(
65
# This will hold an item for each "branch". For a revisions, the revsion
66
# number less the least significant digit is the branch_id, and used as the
67
# key for the dict. Hence revision with the same revsion number less the
68
# least significant digit are considered to be in the same branch line.
69
# e.g.: for revisions 290.12.1 and 290.12.2, the branch_id would be 290.12,
70
# and these two revisions will be in the same branch line. Each value is
71
# a list of rev_indexes in the branch.
76
for (rev_index, (sequence_number,
80
end_of_merge)) in enumerate(merge_sorted_revisions):
81
if maxnum and rev_index >= maxnum:
83
revid_index[revid] = rev_index
84
revno_index[revno_sequence] = rev_index
86
branch_id = revno_sequence[0:-1]
89
if branch_id not in branch_lines:
91
branch_lines[branch_id] = branch_line
93
branch_line = branch_lines[branch_id]
95
branch_line.append(rev_index)
97
parents = graph_parents[revid]
98
for parent_revid in parents:
99
graph_children[parent_revid].append(revid)
101
linegraph.append([revid,
108
branch_ids = branch_lines.keys()
110
def branch_id_cmp(x, y):
111
"""Compaire branch_id's first by the number of digits, then reversed
117
return cmp(len_x, len_y)
119
branch_ids.sort(branch_id_cmp)
120
# This will hold a tuple of (child_index, parent_index, col_index) for each
121
# line that needs to be drawn. If col_index is not none, then the line is
122
# drawn along that column, else the the line can be drawn directly between
123
# the child and parent because either the child and parent are in the same
124
# branch line, or the child and parent are 1 row apart.
126
empty_column = [False for i in range(len(graph_parents))]
127
# This will hold a bit map for each cell. If the cell is true, then the
128
# cell allready contains a node or line. This use when deciding what column
129
# to place a branch line or line in, without it overlaping something else.
130
columns = [list(empty_column)]
133
for branch_id in branch_ids:
134
branch_line = branch_lines[branch_id]
136
# Find the col_index for the direct parent branch. This will be the
137
# starting point when looking for a free column.
140
if len(branch_id) > 1:
141
parent_revno = branch_id[0:-1]
142
if parent_revno in revno_index:
143
parent_index = revno_index[parent_revno]
144
parent_node = linegraph[parent_index][1]
146
parent_col_index = parent_node[0]
149
col_search_order = _branch_line_col_search_order(columns,
151
color = reduce(lambda x, y: x+y, branch_id, 0)
155
last_rev_index = None
156
for rev_index in branch_line:
158
if BROKEN_LINE_LENGTH and \
159
rev_index - last_rev_index > BROKEN_LINE_LENGTH:
160
line_range.append(last_rev_index+1)
161
line_range.append(rev_index-1)
163
line_range.extend(range(last_rev_index+1, rev_index))
165
line_range.append(rev_index)
166
last_rev_index = rev_index
169
if BROKEN_LINE_LENGTH and \
170
parent_index - last_rev_index > BROKEN_LINE_LENGTH:
171
line_range.append(last_rev_index+1)
173
line_range.extend(range(last_rev_index+1, parent_index))
175
col_index = _find_free_column(columns,
179
node = (col_index, color)
180
for rev_index in branch_line:
181
linegraph[rev_index][1] = node
182
columns[col_index][rev_index] = True
184
for rev_index in branch_line:
189
end_of_merge) = merge_sorted_revisions[rev_index]
191
linegraph[rev_index][4] = graph_children[revid]
192
col_index = linegraph[rev_index][1][0]
194
for parent_revid in graph_parents[revid]:
195
if parent_revid in revid_index:
197
parent_index = revid_index[parent_revid]
198
parent_node = linegraph[parent_index][1]
200
parent_col_index = parent_node[0]
202
parent_col_index = None
204
_line_col_search_order(columns,
208
# If this line is really long, break it.
209
if len(branch_id) > 0 and \
210
BROKEN_LINE_LENGTH and \
211
parent_index - rev_index > BROKEN_LINE_LENGTH:
212
child_line_col_index = \
213
_find_free_column(columns,
217
_mark_column_as_used(columns,
218
child_line_col_index,
221
# Recall _line_col_search_order to reset it back to
224
_line_col_search_order(columns,
227
parent_col_line_index = \
228
_find_free_column(columns,
232
_mark_column_as_used(columns,
233
parent_col_line_index,
235
lines.append((rev_index,
237
(child_line_col_index,
238
parent_col_line_index)))
240
line_col_index = col_index
241
if parent_index - rev_index >1:
242
line_range = range(rev_index + 1, parent_index)
244
_find_free_column(columns,
248
_mark_column_as_used(columns,
251
lines.append((rev_index,
255
for (child_index, parent_index, line_col_indexes) in lines:
256
(child_col_index, child_color) = linegraph[child_index][1]
257
(parent_col_index, parent_color) = linegraph[parent_index][1]
259
if len(line_col_indexes) == 1:
260
if parent_index - child_index == 1:
261
linegraph[child_index][2].append(
266
# line from the child's column to the lines column
267
linegraph[child_index][2].append(
271
# lines down the line's column
272
for line_part_index in range(child_index+1, parent_index-1):
273
linegraph[line_part_index][2].append(
274
(line_col_indexes[0],
277
# line from the line's column to the parent's column
278
linegraph[parent_index-1][2].append(
279
(line_col_indexes[0],
284
# line from the child's column to the lines column
285
linegraph[child_index][2].append(
290
linegraph[child_index+1][2].append(
291
(line_col_indexes[0],
296
linegraph[parent_index-2][2].append(
300
# line from the line's column to the parent's column
301
linegraph[parent_index-1][2].append(
302
(line_col_indexes[1],
307
return (linegraph, revid_index, len(columns))
309
def _branch_line_col_search_order(columns, parent_col_index):
310
for col_index in range(parent_col_index, len(columns)):
312
for col_index in range(parent_col_index-1, -1, -1):
315
def _line_col_search_order(columns, parent_col_index, child_col_index):
316
if parent_col_index is not None:
317
max_index = max(parent_col_index, child_col_index)
318
min_index = min(parent_col_index, child_col_index)
319
for col_index in range(max_index, min_index -1, -1):
322
max_index = child_col_index
323
min_index = child_col_index
324
yield child_col_index
326
while max_index + i < len(columns) or \
328
if max_index + i < len(columns):
330
if min_index - i > -1:
334
def _find_free_column(columns, empty_column, col_search_order, line_range):
335
for col_index in col_search_order:
336
column = columns[col_index]
337
has_overlaping_line = False
338
for row_index in line_range:
339
if column[row_index]:
340
has_overlaping_line = True
342
if not has_overlaping_line:
345
col_index = len(columns)
346
column = list(empty_column)
347
columns.append(column)
350
def _mark_column_as_used(columns, col_index, line_range):
351
column = columns[col_index]
352
for row_index in line_range:
353
column[row_index] = True
355
def same_branch(a, b):
356
"""Return whether we think revisions a and b are on the same branch."""
357
if len(a.parent_ids) == 1:
358
# Defacto same branch if only parent
360
elif a.committer == b.committer:
361
# Same committer so may as well be
added
removed
viz/linegraph.py
