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 461.1.1
- compare with another revision
- download diff
- download tarball
- view history from revision 461.1.1
- Committer: Daniel Schierbeck
- Date: 2008-04-07 20:34:51 UTC
- mfrom: (450.6.13 bugs)
- mto: (463.2.1 bug.78765)
- mto: This revision was merged to the branch mainline in revision 462.
- Revision ID: daniel.schierbeck@gmail.com-20080407203451-2i6el7jf9t0k9y64
Merged bug page improvements.
- files added:
- .bzrignore
- branchview
- icons
- olive
- po
- preferences
- tests
- files removed:
- .bzrignore
- files renamed:
- viz/graphcell.py => branchview/graphcell.py
- viz/graph.py => branchview/linegraph.py
- viz/diffwin.py => diff.py
- annotate/logview.py => revisionview.py
- files modified:
- AUTHORS
added
removed
branchview/linegraph.py
1
#!/usr/bin/python
2
# -*- coding: UTF-8 -*-
3
"""Directed graph production.
4
5
This module contains the code to produce an ordered directed graph of a
6
bzr branch, such as we display in the tree view at the top of the bzrk
7
window.
8
"""
9
10
__copyright__ = "Copyright © 2005 Canonical Ltd."
11
__author__ = "Scott James Remnant <scott@ubuntu.com>"
12
13
14
from bzrlib.tsort import merge_sort
15
16
17
class DummyRevision(object):
18
"""Dummy bzr revision.
19
20
Sometimes, especially in older bzr branches, a revision is referenced
21
as the parent of another but not actually present in the branch's store.
22
When this happens we use an instance of this class instead of the real
23
Revision object (which we can't get).
24
"""
25
26
def __init__(self, revid):
27
self.revision_id = revid
28
self.parent_ids = []
29
self.committer = None
30
self.message = self.revision_id
31
32
33
class RevisionProxy(object):
34
"""A revision proxy object.
35
36
This will demand load the revision it represents when the committer or
37
message attributes are accessed in order to populate them. It is
38
constructed with the revision id and parent_ids list and a repository
39
object to request the revision from when needed.
40
"""
41
42
def __init__(self, revid, parent_ids, repository):
43
self.revision_id = revid
44
self.parent_ids = parent_ids
45
self._repository = repository
46
self._revision = None
47
48
def _get_attribute_getter(attr):
49
def get_attribute(self):
50
if self._revision is None:
51
self._load()
52
return getattr(self._revision, attr)
53
return get_attribute
54
committer = property(_get_attribute_getter('committer'))
55
message = property(_get_attribute_getter('message'))
56
properties = property(_get_attribute_getter('properties'))
57
timestamp = property(_get_attribute_getter('timestamp'))
58
timezone = property(_get_attribute_getter('timezone'))
59
60
def _load(self):
61
"""Load the revision object."""
62
self._revision = self._repository.get_revision(self.revision_id)
63
64
65
class DistanceMethod(object):
66
67
def __init__(self, branch, start):
68
self.branch = branch
69
self.start = start
70
self.revisions = {}
71
self.children = {}
72
self.children_of_id = {start: set()}
73
self.parent_ids_of = {}
74
self.colours = { start: 0 }
75
self.last_colour = 0
76
self.direct_parent_of = {}
77
self.graph = {}
78
79
def fill_caches(self):
80
graph = self.branch.repository.get_revision_graph_with_ghosts([self.start])
81
for revid in graph.ghosts:
82
self.cache_revision(DummyRevision(revid))
83
for revid, parents in graph.get_ancestors().items():
84
self.cache_revision(RevisionProxy(revid, parents, self.branch.repository))
85
86
def cache_revision(self, revision):
87
"Set the caches for a newly retrieved revision."""
88
revid = revision.revision_id
89
# Build a revision cache
90
self.revisions[revid] = revision
91
# Build a children dictionary
92
for parent_id in revision.parent_ids:
93
self.children_of_id.setdefault(parent_id, set()).add(revision)
94
# Build a parents dictionnary, where redundant parents will be removed,
95
# and that will be passed along tothe rest of program.
96
if len(revision.parent_ids) != len(set(revision.parent_ids)):
97
# fix the parent_ids list.
98
parent_ids = []
99
parent_ids_set = set()
100
for parent_id in revision.parent_ids:
101
if parent_id in parent_ids_set:
102
continue
103
parent_ids.append(parent_id)
104
parent_ids_set.add(parent_id)
105
revision.parent_ids = parent_ids
106
self.parent_ids_of[revision] = list(revision.parent_ids)
107
self.graph[revid] = revision.parent_ids
108
109
def make_children_map(self):
110
revisions = self.revisions
111
return dict((revisions[revid], c)
112
for (revid, c) in self.children_of_id.iteritems())
113
114
def sort_revisions(self, sorted_revids, maxnum):
115
revisions = self.revisions
116
parent_ids_of = self.parent_ids_of
117
children_of_id = self.children_of_id
118
# Try to compact sequences of revisions on the same branch.
119
distances = {}
120
skipped_revids = []
121
expected_id = sorted_revids[0]
122
pending_ids = []
123
while True:
124
revid = sorted_revids.pop(0)
125
if revid != expected_id:
126
skipped_revids.append(revid)
127
continue
128
revision = revisions[revid]
129
for child in children_of_id[revid]:
130
# postpone if any child is missing
131
if child.revision_id not in distances:
132
if expected_id not in pending_ids:
133
pending_ids.append(expected_id)
134
expected_id = pending_ids.pop(0)
135
skipped_revids.append(revid)
136
sorted_revids[:0] = skipped_revids
137
del skipped_revids[:]
138
break
139
else:
140
# all children are here, push!
141
distances[revid] = len(distances)
142
if maxnum is not None and len(distances) > maxnum:
143
# bail out early if a limit was specified
144
sorted_revids[:0] = skipped_revids
145
for revid in sorted_revids:
146
distances[revid] = len(distances)
147
break
148
# all parents will need to be pushed as soon as possible
149
for parent in parent_ids_of[revision]:
150
if parent not in pending_ids:
151
pending_ids.insert(0, parent)
152
if not pending_ids:
153
break
154
expected_id = pending_ids.pop(0)
155
# if the next expected revid has already been skipped, requeue
156
# the skipped ids, except those that would go right back to the
157
# skipped list.
158
if expected_id in skipped_revids:
159
pos = skipped_revids.index(expected_id)
160
sorted_revids[:0] = skipped_revids[pos:]
161
del skipped_revids[pos:]
162
self.distances = distances
163
return sorted(distances, key=distances.get)
164
165
def choose_colour(self, revid):
166
revision = self.revisions[revid]
167
children_of_id = self.children_of_id
168
parent_ids_of = self.parent_ids_of
169
colours = self.colours
170
# choose colour
171
the_children = children_of_id[revid]
172
if len(the_children) == 1:
173
[child] = the_children
174
if len(parent_ids_of[child]) == 1:
175
# one-one relationship between parent and child, same
176
# colour
177
colours[revid] = colours[child.revision_id]
178
else:
179
self.choose_colour_one_child(revision, child)
180
else:
181
self.choose_colour_many_children(revision, the_children)
182
183
def choose_colour_one_child(self, revision, child):
184
revid = revision.revision_id
185
direct_parent_of = self.direct_parent_of
186
revisions = self.revisions
187
# one child with multiple parents, the first parent with
188
# the same committer gets the colour
189
direct_parent = direct_parent_of.get(child)
190
if direct_parent is None:
191
# if it has not been found yet, find it now and remember
192
for parent_id in self.parent_ids_of[child]:
193
parent_revision = revisions[parent_id]
194
if parent_revision.committer == child.committer:
195
# found the first parent with the same committer
196
direct_parent = parent_revision
197
direct_parent_of[child] = direct_parent
198
break
199
if direct_parent == revision:
200
self.colours[revid] = self.colours[child.revision_id]
201
else:
202
self.colours[revid] = self.last_colour = self.last_colour + 1
203
204
def choose_colour_many_children(self, revision, the_children):
205
"""Colour revision revision."""
206
revid = revision.revision_id
207
direct_parent_of = self.direct_parent_of
208
# multiple children, get the colour of the last displayed child
209
# with the same committer which does not already have its colour
210
# taken
211
available = {}
212
for child in the_children:
213
if child.committer != revision.committer:
214
continue
215
direct_parent = direct_parent_of.get(child)
216
if direct_parent == revision:
217
self.colours[revid] = self.colours[child.revision_id]
218
break
219
# FIXME: Colouring based on whats been displayed MUST be done with
220
# knowledge of the revisions being output.
221
# until the refactoring to fold graph() into this more compactly is
222
# done, I've disabled this reuse. RBC 20060403
223
# if direct_parent is None:
224
# available[child] = distances[child.revision_id]
225
# .. it will be something like available[child] = \
226
# revs[child.revision_id][0] - which is the sequence number
227
else:
228
if available:
229
sorted_children = sorted(available, key=available.get)
230
child = sorted_children[-1]
231
direct_parent_of[child] = revision
232
self.colours[revid] = self.colours[child.revision_id]
233
else:
234
# no candidate children is available, pick the next
235
# colour
236
self.colours[revid] = self.last_colour = self.last_colour + 1
237
238
239
def distances(branch, start):
240
"""Sort the revisions.
241
242
Traverses the branch revision tree starting at start and produces an
243
ordered list of revisions such that a revision always comes after
244
any revision it is the parent of.
245
246
Returns a tuple of (revids, revisions, colours, children)
247
"""
248
distance = DistanceMethod(branch, start)
249
distance.fill_caches()
250
distance.merge_sorted = merge_sort(distance.graph, distance.start)
251
children = distance.make_children_map()
252
253
for seq, revid, merge_depth, end_of_merge in distance.merge_sorted:
254
distance.choose_colour(revid)
255
256
revisions = distance.revisions
257
colours = distance.colours
258
parent_ids_of = distance.parent_ids_of
259
return (revisions, colours, children, parent_ids_of, distance.merge_sorted)
260
261
262
def graph(revisions, colours, merge_sorted):
263
"""Produce a directed graph of a bzr branch.
264
265
For each revision it then yields a tuple of (revision, node, lines).
266
If the revision is only referenced in the branch and not present in the
267
store, revision will be a DummyRevision object, otherwise it is the bzr
268
Revision object with the meta-data for the revision.
269
270
Node is a tuple of (column, colour) with column being a zero-indexed
271
column number of the graph that this revision represents and colour
272
being a zero-indexed colour (which doesn't specify any actual colour
273
in particular) to draw the node in.
274
275
Lines is a list of tuples which represent lines you should draw away
276
from the revision, if you also need to draw lines into the revision
277
you should use the lines list from the previous iteration. Each
278
typle in the list is in the form (start, end, colour) with start and
279
end being zero-indexed column numbers and colour as in node.
280
281
It's up to you how to actually draw the nodes and lines (straight,
282
curved, kinked, etc.) and to pick the actual colours for each index.
283
"""
284
if not len(merge_sorted):
285
return
286
# split merge_sorted into a map:
287
revs = {}
288
# FIXME: get a hint on this from the merge_sorted data rather than
289
# calculating it ourselves
290
# mapping from rev_id to the sequence number of the next lowest rev
291
next_lower_rev = {}
292
# mapping from rev_id to next-in-branch-revid - may be None for end
293
# of branch
294
next_branch_revid = {}
295
# the stack we are in in the sorted data for determining which
296
# next_lower_rev to set. It is a stack which has one list at each
297
# depth - the ids at that depth that need the same id allocated.
298
current_stack = [[]]
299
for seq, revid, indent, end_merge in merge_sorted:
300
revs[revid] = (seq, indent, end_merge)
301
if indent == len(current_stack):
302
# new merge group starts
303
current_stack.append([revid])
304
elif indent == len(current_stack) - 1:
305
# part of the current merge group
306
current_stack[-1].append(revid)
307
else:
308
# end of a merge group
309
while current_stack[-1]:
310
stack_rev_id = current_stack[-1].pop()
311
# record the next lower rev for this rev:
312
next_lower_rev[stack_rev_id] = seq
313
# if this followed a non-end-merge rev in this group note that
314
if len(current_stack[-1]):
315
if not revs[current_stack[-1][-1]][2]:
316
next_branch_revid[current_stack[-1][-1]] = stack_rev_id
317
current_stack.pop()
318
# append to the now-current merge group
319
current_stack[-1].append(revid)
320
# assign a value to all the depth 0 revisions
321
while current_stack[-1]:
322
stack_rev_id = current_stack[-1].pop()
323
# record the next lower rev for this rev:
324
next_lower_rev[stack_rev_id] = len(merge_sorted)
325
# if this followed a non-end-merge rev in this group note that
326
if len(current_stack[-1]):
327
if not revs[current_stack[-1][-1]][2]:
328
next_branch_revid[current_stack[-1][-1]] = stack_rev_id
329
330
# a list of the current revisions we are drawing lines TO indicating
331
# the sequence of their lines on the screen.
332
# i.e. [A, B, C] means that the line to A, to B, and to C are in
333
# (respectively), 0, 1, 2 on the screen.
334
hanging = [merge_sorted[0][1]]
335
for seq, revid, indent, end_merge in merge_sorted:
336
# a list of the lines to draw: their position in the
337
# previous row, their position in this row, and the colour
338
# (which is the colour they are routing to).
339
lines = []
340
341
new_hanging = []
342
343
for h_idx, hang in enumerate(hanging):
344
# one of these will be the current lines node:
345
# we are drawing a line. h_idx
346
if hang == revid:
347
# we have found the current lines node
348
node = (h_idx, colours[revid])
349
350
# note that we might have done the main parent
351
drawn_parents = set()
352
353
def draw_line(from_idx, to_idx, revision_id):
354
try:
355
n_idx = new_hanging.index(revision_id)
356
except ValueError:
357
# force this to be vertical at the place this rev was
358
# drawn.
359
new_hanging.insert(to_idx, revision_id)
360
n_idx = to_idx
361
lines.append((from_idx, n_idx, colours[revision_id]))
362
363
364
# we want to draw a line to the next commit on 'this' branch
365
if not end_merge:
366
# drop this line first.
367
parent_id = next_branch_revid[revid]
368
draw_line(h_idx, h_idx, parent_id)
369
# we have drawn this parent
370
drawn_parents.add(parent_id)
371
else:
372
# this is the last revision in a 'merge', show where it came from
373
if len(revisions[revid].parent_ids) > 1:
374
# having > 1
375
# parents means this commit was a merge, and being
376
# the end point of a merge group means that all
377
# the parent revisions were merged into branches
378
# to the left of this before this was committed
379
# - so we want to show this as a new branch from
380
# those revisions.
381
# to do this, we show the parent with the lowest
382
# sequence number, which is the one that this
383
# branch 'spawned from', and no others.
384
# If this sounds like a problem, remember that:
385
# if the parent was not already in our mainline
386
# it would show up as a merge into this making
387
# this not the end of a merge-line.
388
lowest = len(merge_sorted)
389
for parent_id in revisions[revid].parent_ids:
390
if revs[parent_id][0] < lowest:
391
lowest = revs[parent_id][0]
392
assert lowest != len(merge_sorted)
393
draw_line(h_idx, len(new_hanging), merge_sorted[lowest][1])
394
drawn_parents.add(merge_sorted[lowest][1])
395
elif len(revisions[revid].parent_ids) == 1:
396
# only one parent, must show this link to be useful.
397
parent_id = revisions[revid].parent_ids[0]
398
draw_line(h_idx, len(new_hanging), parent_id)
399
drawn_parents.add(parent_id)
400
401
# what do we want to draw lines to from here:
402
# each parent IF its relevant.
403
#
404
# Now we need to hang its parents, we put them at the point
405
# the old column was so anything to the right of this has
406
# to move outwards to make room. We also try and collapse
407
# hangs to keep the graph small.
408
# RBC: we do not draw lines to parents that were already merged
409
# unless its the last revision in a merge group.
410
for parent_id in revisions[revid].parent_ids:
411
if parent_id in drawn_parents:
412
continue
413
parent_seq = revs[parent_id][0]
414
parent_depth = revs[parent_id][1]
415
if parent_depth == indent + 1:
416
# The parent was a merge into this branch determine if
417
# it was already merged into the mainline via a
418
# different merge: if all revisions between us and
419
# parent_seq have a indent greater than there are no
420
# revisions with a lower indent than us.
421
# We do not use 'parent_depth < indent' because that
422
# would allow un-uniqueified merges to show up, and
423
# merge_sorted should take care of that for us (but
424
# does not trim the values)
425
if parent_seq < next_lower_rev[revid]:
426
draw_line(h_idx, len(new_hanging), parent_id)
427
elif parent_depth == indent and parent_seq == seq + 1:
428
# part of this branch
429
draw_line(h_idx, len(new_hanging), parent_id)
430
else:
431
# draw a line from the previous position of this line to the
432
# new position.
433
# h_idx is the old position.
434
# new_indent is the new position.
435
draw_line(h_idx, len(new_hanging), hang)
436
# we've calculated the row, assign new_hanging to hanging to setup for
437
# the next row
438
hanging = new_hanging
439
440
yield (revisions[revid], node, lines)
441
442
443
def same_branch(a, b):
444
"""Return whether we think revisions a and b are on the same branch."""
445
if len(a.parent_ids) == 1:
446
# Defacto same branch if only parent
447
return True
448
elif a.committer == b.committer:
449
# Same committer so may as well be
450
return True
451
else:
452
return False
1
# -*- coding: UTF-8 -*-
2
"""Directed graph production.
3
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
6
window.
7
"""
8
9
__copyright__ = "Copyright © 2005 Canonical Ltd."
10
__author__ = "Scott James Remnant <scott@ubuntu.com>"
11
12
from bzrlib.tsort import merge_sort
13
14
def linegraph(repository, start_revs, maxnum, broken_line_length = None,
15
graph_data = True, mainline_only = False):
16
"""Produce a directed graph of a bzr repository.
17
18
Returns a tuple of (line_graph, revid_index, columns_len) where
19
* line_graph is a list of tuples of (revid,
20
node,
21
lines,
22
parents,
23
children,
24
revno_sequence),
25
* revid_index is a dict of each revision with the key being the revid, and
26
the value the row index, and
27
* columns_len is the number of columns need to draw the line graph.
28
29
30
Node is a tuple of (column, colour) with column being a zero-indexed
31
column number of the graph that this revision represents and colour
32
being a zero-indexed colour (which doesn't specify any actual colour
33
in particular) to draw the node in.
34
35
Lines is a list of tuples which represent lines you should draw away
36
from the revision, if you also need to draw lines into the revision
37
you should use the lines list from the previous iteration. Each
38
typle in the list is in the form (start, end, colour) with start and
39
end being zero-indexed column numbers and colour as in node.
40
41
It's up to you how to actually draw the nodes and lines (straight,
42
curved, kinked, etc.) and to pick the actual colours for each index.
43
"""
44
45
graph = repository.get_graph()
46
graph_parents = {}
47
graph_children = {}
48
for (revid, parent_revids) in graph.iter_ancestry(start_revs):
49
graph_parents[revid] = parent_revids
50
graph_children[revid] = []
51
52
graph_parents["top:"] = start_revs
53
54
if len(graph_parents)>0:
55
merge_sorted_revisions = merge_sort(
56
graph_parents,
57
"top:",
58
generate_revno=True)
59
else:
60
merge_sorted_revisions = ()
61
62
if mainline_only:
63
merge_sorted_revisions = [elem for elem in merge_sorted_revisions \
64
if len(elem[3])==1 ]
65
66
assert merge_sorted_revisions[0][1] == "top:"
67
merge_sorted_revisions = merge_sorted_revisions[1:]
68
69
revid_index = {}
70
revno_index = {}
71
72
# This will hold an item for each "branch". For a revisions, the revsion
73
# number less the least significant digit is the branch_id, and used as the
74
# key for the dict. Hence revision with the same revsion number less the
75
# least significant digit are considered to be in the same branch line.
76
# e.g.: for revisions 290.12.1 and 290.12.2, the branch_id would be 290.12,
77
# and these two revisions will be in the same branch line. Each value is
78
# a list of rev_indexes in the branch.
79
branch_lines = {}
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)
116
117
if graph_data:
118
branch_ids = branch_lines.keys()
119
120
def branch_id_cmp(x, y):
121
"""Compaire branch_id's first by the number of digits, then reversed
122
by their value"""
123
len_x = len(x)
124
len_y = len(y)
125
if len_x == len_y:
126
return -cmp(x, y)
127
return cmp(len_x, len_y)
128
129
branch_ids.sort(branch_id_cmp)
130
# This will hold a tuple of (child_index, parent_index, col_index) for each
131
# line that needs to be drawn. If col_index is not none, then the line is
132
# drawn along that column, else the the line can be drawn directly between
133
# the child and parent because either the child and parent are in the same
134
# branch line, or the child and parent are 1 row apart.
135
lines = []
136
empty_column = [False for i in range(len(graph_parents))]
137
# This will hold a bit map for each cell. If the cell is true, then the
138
# cell allready contains a node or line. This use when deciding what column
139
# to place a branch line or line in, without it overlaping something else.
140
columns = [list(empty_column)]
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]
208
parent_node = linegraph[parent_index][1]
209
if parent_node:
210
parent_col_index = parent_node[0]
211
else:
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.
233
col_search_order = \
234
_line_col_search_order(columns,
235
parent_col_index,
236
col_index)
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))
275
else:
276
# line from the child's column to the lines column
277
linegraph[child_index][2].append(
278
(child_col_index,
279
line_col_indexes[0],
280
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))
287
# line from the line's column to the parent's column
288
linegraph[parent_index-1][2].append(
289
(line_col_indexes[0],
290
parent_col_index,
291
parent_color))
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))
315
return (linegraph, revid_index, len(columns))
316
else:
317
return (linegraph, revid_index, 0)
318
319
320
def _branch_line_col_search_order(columns, parent_col_index):
321
for col_index in range(parent_col_index, len(columns)):
322
yield col_index
323
for col_index in range(parent_col_index-1, -1, -1):
324
yield col_index
325
326
def _line_col_search_order(columns, parent_col_index, child_col_index):
327
if parent_col_index is not None:
328
max_index = max(parent_col_index, child_col_index)
329
min_index = min(parent_col_index, child_col_index)
330
for col_index in range(max_index, min_index -1, -1):
331
yield col_index
332
else:
333
max_index = child_col_index
334
min_index = child_col_index
335
yield child_col_index
336
i = 1
337
while max_index + i < len(columns) or \
338
min_index - i > -1:
339
if max_index + i < len(columns):
340
yield max_index + i
341
if min_index - i > -1:
342
yield min_index - i
343
i += 1
344
345
def _find_free_column(columns, empty_column, col_search_order, line_range):
346
for col_index in col_search_order:
347
column = columns[col_index]
348
has_overlaping_line = False
349
for row_index in line_range:
350
if column[row_index]:
351
has_overlaping_line = True
352
break
353
if not has_overlaping_line:
354
break
355
else:
356
col_index = len(columns)
357
column = list(empty_column)
358
columns.append(column)
359
return col_index
360
361
def _mark_column_as_used(columns, col_index, line_range):
362
column = columns[col_index]
363
for row_index in line_range:
364
column[row_index] = True
365
366
def same_branch(a, b):
367
"""Return whether we think revisions a and b are on the same branch."""
368
if len(a.parent_ids) == 1:
369
# Defacto same branch if only parent
370
return True
371
elif a.committer == b.committer:
372
# Same committer so may as well be
373
return True
374
else:
375
return False
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0