/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz
1 by Scott James Remnant
Commit the first version of bzrk.
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
37.1.2 by Robert Collins
Make revision sorting and linking use merge_sorted from latest bzr.dev. This
14
from bzrlib.tsort import merge_sort
1 by Scott James Remnant
Commit the first version of bzrk.
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
37.1.3 by Robert Collins
Some more tweaking on the graph stuff - reducing duplicate effort and leveraging bzrlib more.
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
27 by David Allouche
refactor distances
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 = {}
37.1.3 by Robert Collins
Some more tweaking on the graph stuff - reducing duplicate effort and leveraging bzrlib more.
77
        self.graph = {}
27 by David Allouche
refactor distances
78
28 by David Allouche
optimise by filling caches first
79
    def fill_caches(self):
37.1.2 by Robert Collins
Make revision sorting and linking use merge_sorted from latest bzr.dev. This
80
        # FIXME: look at using repository.get_revision_graph_with_ghosts - RBC.
37.1.3 by Robert Collins
Some more tweaking on the graph stuff - reducing duplicate effort and leveraging bzrlib more.
81
        graph = self.branch.repository.get_revision_graph_with_ghosts([self.start])
82
        for revid in graph.ghosts:
83
            self.cache_revision(DummyRevision(revid))
84
        for revid, parents in graph.get_ancestors().items():
85
            self.cache_revision(RevisionProxy(revid, parents, self.branch.repository))
27 by David Allouche
refactor distances
86
37.1.3 by Robert Collins
Some more tweaking on the graph stuff - reducing duplicate effort and leveraging bzrlib more.
87
    def cache_revision(self, revision):
27 by David Allouche
refactor distances
88
        "Set the caches for a newly retrieved revision."""
37.1.3 by Robert Collins
Some more tweaking on the graph stuff - reducing duplicate effort and leveraging bzrlib more.
89
        revid = revision.revision_id
27 by David Allouche
refactor distances
90
        # Build a revision cache
91
        self.revisions[revid] = revision
37.1.3 by Robert Collins
Some more tweaking on the graph stuff - reducing duplicate effort and leveraging bzrlib more.
92
        # Build a children dictionary
1 by Scott James Remnant
Commit the first version of bzrk.
93
        for parent_id in revision.parent_ids:
27 by David Allouche
refactor distances
94
            self.children_of_id.setdefault(parent_id, set()).add(revision)
95
        # Build a parents dictionnary, where redundant parents will be removed,
96
        # and that will be passed along tothe rest of program.
37.1.3 by Robert Collins
Some more tweaking on the graph stuff - reducing duplicate effort and leveraging bzrlib more.
97
        if len(revision.parent_ids) != len(set(revision.parent_ids)):
98
            # fix the parent_ids list.
20 by David Allouche
ignore redundent parents
99
            parent_ids = []
100
            parent_ids_set = set()
101
            for parent_id in revision.parent_ids:
102
                if parent_id in parent_ids_set:
103
                    continue
104
                parent_ids.append(parent_id)
105
                parent_ids_set.add(parent_id)
37.1.3 by Robert Collins
Some more tweaking on the graph stuff - reducing duplicate effort and leveraging bzrlib more.
106
            revision.parent_ids = parent_ids
107
        self.parent_ids_of[revision] = list(revision.parent_ids)
108
        self.graph[revid] = revision.parent_ids
27 by David Allouche
refactor distances
109
110
    def make_children_map(self):
111
        revisions = self.revisions
112
        return dict((revisions[revid], c)
113
                    for (revid, c) in self.children_of_id.iteritems())
114
37 by David Allouche
early exit accurate sorting when maxnum is set
115
    def sort_revisions(self, sorted_revids, maxnum):
27 by David Allouche
refactor distances
116
        revisions = self.revisions
117
        parent_ids_of = self.parent_ids_of
118
        children_of_id = self.children_of_id
119
        # Try to compact sequences of revisions on the same branch.
120
        distances = {}
121
        skipped_revids = []
122
        expected_id = sorted_revids[0]
123
        pending_ids = []
124
        while True:
125
            revid = sorted_revids.pop(0)
126
            if revid != expected_id:
127
                skipped_revids.append(revid)
128
                continue
129
            revision = revisions[revid]
130
            for child in children_of_id[revid]:
131
                # postpone if any child is missing
132
                if child.revision_id not in distances:
133
                    if expected_id not in pending_ids:
134
                        pending_ids.append(expected_id)
135
                    expected_id = pending_ids.pop(0)
136
                    skipped_revids.append(revid)
137
                    sorted_revids[:0] = skipped_revids
30 by David Allouche
separate sorting and colouring
138
                    del skipped_revids[:]
27 by David Allouche
refactor distances
139
                    break
140
            else:
141
                # all children are here, push!
142
                distances[revid] = len(distances)
37 by David Allouche
early exit accurate sorting when maxnum is set
143
                if maxnum is not None and len(distances) > maxnum:
144
                    # bail out early if a limit was specified
145
                    sorted_revids[:0] = skipped_revids
146
                    for revid in sorted_revids:
147
                        distances[revid] = len(distances)
148
                    break
27 by David Allouche
refactor distances
149
                # all parents will need to be pushed as soon as possible
150
                for parent in parent_ids_of[revision]:
151
                    if parent not in pending_ids:
152
                        pending_ids.insert(0, parent)
153
                if not pending_ids:
154
                    break
22 by David Allouche
sort revisions to be grouped by branch
155
                expected_id = pending_ids.pop(0)
27 by David Allouche
refactor distances
156
                # if the next expected revid has already been skipped, requeue
31 by David Allouche
fix a bug with fast sorting
157
                # the skipped ids, except those that would go right back to the
158
                # skipped list.
27 by David Allouche
refactor distances
159
                if expected_id in skipped_revids:
160
                    pos = skipped_revids.index(expected_id)
161
                    sorted_revids[:0] = skipped_revids[pos:]
162
                    del skipped_revids[pos:]
30 by David Allouche
separate sorting and colouring
163
        self.distances = distances
27 by David Allouche
refactor distances
164
        return sorted(distances, key=distances.get)
165
30 by David Allouche
separate sorting and colouring
166
    def choose_colour(self, revid):
167
        revision = self.revisions[revid]
27 by David Allouche
refactor distances
168
        children_of_id = self.children_of_id
169
        parent_ids_of = self.parent_ids_of
170
        colours = self.colours
171
        # choose colour
172
        the_children = children_of_id[revid]
173
        if len(the_children) == 1:
174
            [child] = the_children
175
            if len(parent_ids_of[child]) == 1:
176
                # one-one relationship between parent and child, same
177
                # colour
178
                colours[revid] = colours[child.revision_id]
179
            else:
180
                self.choose_colour_one_child(revision, child)
181
        else:
30 by David Allouche
separate sorting and colouring
182
            self.choose_colour_many_children(revision, the_children)
27 by David Allouche
refactor distances
183
184
    def choose_colour_one_child(self, revision, child):
185
        revid = revision.revision_id
186
        direct_parent_of = self.direct_parent_of
187
        revisions = self.revisions
188
        # one child with multiple parents, the first parent with
189
        # the same committer gets the colour
190
        direct_parent = direct_parent_of.get(child)
191
        if direct_parent is None:
192
            # if it has not been found yet, find it now and remember
193
            for parent_id in self.parent_ids_of[child]:
194
                parent_revision = revisions[parent_id]
195
                if parent_revision.committer == child.committer:
196
                    # found the first parent with the same committer
197
                    direct_parent = parent_revision
198
                    direct_parent_of[child] = direct_parent
199
                    break
200
        if direct_parent == revision:
201
            self.colours[revid] = self.colours[child.revision_id]
202
        else:
203
            self.colours[revid] = self.last_colour = self.last_colour + 1
204
30 by David Allouche
separate sorting and colouring
205
    def choose_colour_many_children(self, revision, the_children):
37.1.3 by Robert Collins
Some more tweaking on the graph stuff - reducing duplicate effort and leveraging bzrlib more.
206
        """Colour revision revision."""
27 by David Allouche
refactor distances
207
        revid = revision.revision_id
208
        direct_parent_of = self.direct_parent_of
209
        # multiple children, get the colour of the last displayed child
210
        # with the same committer which does not already have its colour
211
        # taken
212
        available = {}
213
        for child in the_children:
214
            if child.committer != revision.committer:
215
                continue
216
            direct_parent = direct_parent_of.get(child)
217
            if direct_parent == revision:
218
                self.colours[revid] = self.colours[child.revision_id]
219
                break
37.1.3 by Robert Collins
Some more tweaking on the graph stuff - reducing duplicate effort and leveraging bzrlib more.
220
            # FIXME: Colouring based on whats been displayed MUST be done with 
221
            # knowledge of the revisions being output.
222
            # until the refactoring to fold graph() into this more compactly is
223
            # done, I've disabled this reuse. RBC 20060403
224
            # if direct_parent is None:
225
            #     available[child] = distances[child.revision_id] 
226
            #   .. it will be something like available[child] =  \
227
            #  revs[child.revision_id][0] - which is the sequence number
27 by David Allouche
refactor distances
228
        else:
229
            if available:
230
                sorted_children = sorted(available, key=available.get)
231
                child = sorted_children[-1]
232
                direct_parent_of[child] = revision
233
                self.colours[revid] = self.colours[child.revision_id]
234
            else:
235
                # no candidate children is available, pick the next
236
                # colour
237
                self.colours[revid] = self.last_colour = self.last_colour + 1
238
239
40 by David Allouche
remove --robust, pyflakes fixes, update README
240
def distances(branch, start, maxnum):
27 by David Allouche
refactor distances
241
    """Sort the revisions.
242
243
    Traverses the branch revision tree starting at start and produces an
244
    ordered list of revisions such that a revision always comes after
245
    any revision it is the parent of.
246
247
    Returns a tuple of (revids, revisions, colours, children)
248
    """
28 by David Allouche
optimise by filling caches first
249
    distance = DistanceMethod(branch, start)
250
    distance.fill_caches()
37.1.3 by Robert Collins
Some more tweaking on the graph stuff - reducing duplicate effort and leveraging bzrlib more.
251
    distance.merge_sorted = merge_sort(distance.graph, distance.start)
29 by David Allouche
optimise initial sorting
252
    children = distance.make_children_map()
37.1.2 by Robert Collins
Make revision sorting and linking use merge_sorted from latest bzr.dev. This
253
    
254
    for seq, revid, merge_depth, end_of_merge in distance.merge_sorted:
30 by David Allouche
separate sorting and colouring
255
        distance.choose_colour(revid)
27 by David Allouche
refactor distances
256
33 by David Allouche
add --maxnum option to cut-off long histories
257
    if maxnum is not None:
37.1.2 by Robert Collins
Make revision sorting and linking use merge_sorted from latest bzr.dev. This
258
        print 'FIXME: maxnum disabled.'
33 by David Allouche
add --maxnum option to cut-off long histories
259
28 by David Allouche
optimise by filling caches first
260
    revisions = distance.revisions
261
    colours = distance.colours
262
    parent_ids_of = distance.parent_ids_of
37.1.2 by Robert Collins
Make revision sorting and linking use merge_sorted from latest bzr.dev. This
263
    return (revisions, colours, children, parent_ids_of, distance.merge_sorted)
20 by David Allouche
ignore redundent parents
264
37.1.3 by Robert Collins
Some more tweaking on the graph stuff - reducing duplicate effort and leveraging bzrlib more.
265
def graph(revisions, colours, merge_sorted):
3 by Scott James Remnant
Split the display in two with a pane, we'll use the bottom half to show
266
    """Produce a directed graph of a bzr branch.
267
268
    For each revision it then yields a tuple of (revision, node, lines).
269
    If the revision is only referenced in the branch and not present in the
270
    store, revision will be a DummyRevision object, otherwise it is the bzr
271
    Revision object with the meta-data for the revision.
272
273
    Node is a tuple of (column, colour) with column being a zero-indexed
274
    column number of the graph that this revision represents and colour
275
    being a zero-indexed colour (which doesn't specify any actual colour
276
    in particular) to draw the node in.
277
278
    Lines is a list of tuples which represent lines you should draw away
279
    from the revision, if you also need to draw lines into the revision
280
    you should use the lines list from the previous iteration.  Each
281
    typle in the list is in the form (start, end, colour) with start and
282
    end being zero-indexed column numbers and colour as in node.
283
284
    It's up to you how to actually draw the nodes and lines (straight,
285
    curved, kinked, etc.) and to pick the actual colours for each index.
286
    """
37.1.2 by Robert Collins
Make revision sorting and linking use merge_sorted from latest bzr.dev. This
287
    if not len(merge_sorted):
288
        return
289
    # split merge_sorted into a map:
290
    revs = {}
291
    # FIXME: get a hint on this from the merge_sorted data rather than
292
    # calculating it ourselves
293
    # mapping from rev_id to the sequence number of the next lowest rev
294
    next_lower_rev = {}
295
    # mapping from rev_id to next-in-branch-revid - may be None for end
296
    # of branch
297
    next_branch_revid = {}
298
    # the stack we are in in the sorted data for determining which 
299
    # next_lower_rev to set. It is a stack which has one list at each
300
    # depth - the ids at that depth that need the same id allocated.
301
    current_stack = [[]]
302
    for seq, revid, indent, end_merge in merge_sorted:
303
        revs[revid] = (seq, indent, end_merge)
304
        if indent == len(current_stack):
305
            # new merge group starts
306
            current_stack.append([revid])
307
        elif indent == len(current_stack) - 1:
308
            # part of the current merge group
309
            current_stack[-1].append(revid)
310
        else:
311
            # end of a merge group
312
            while current_stack[-1]:
313
                stack_rev_id = current_stack[-1].pop()
314
                # record the next lower rev for this rev:
315
                next_lower_rev[stack_rev_id] = seq
316
                # if this followed a non-end-merge rev in this group note that
317
                if len(current_stack[-1]):
318
                    if not revs[current_stack[-1][-1]][2]:
319
                        next_branch_revid[current_stack[-1][-1]] = stack_rev_id
320
            current_stack.pop()
321
            # append to the now-current merge group
322
            current_stack[-1].append(revid)
323
    # assign a value to all the depth 0 revisions
324
    while current_stack[-1]:
325
        stack_rev_id = current_stack[-1].pop()
326
        # record the next lower rev for this rev:
327
        next_lower_rev[stack_rev_id] = len(merge_sorted)
328
        # if this followed a non-end-merge rev in this group note that
329
        if len(current_stack[-1]):
330
            if not revs[current_stack[-1][-1]][2]:
331
                next_branch_revid[current_stack[-1][-1]] = stack_rev_id
332
333
    # a list of the current revisions we are drawing lines TO indicating
334
    # the sequence of their lines on the screen.
335
    # i.e. [A, B, C] means that the line to A, to B, and to C are in
336
    # (respectively), 0, 1, 2 on the screen.
337
    hanging = [merge_sorted[0][1]]
338
    for seq, revid, indent, end_merge in merge_sorted:
339
        # a list of the lines to draw: their position in the
340
        # previous row, their position in this row, and the colour
341
        # (which is the colour they are routing to).
1 by Scott James Remnant
Commit the first version of bzrk.
342
        lines = []
343
344
        new_hanging = []
37.1.2 by Robert Collins
Make revision sorting and linking use merge_sorted from latest bzr.dev. This
345
1 by Scott James Remnant
Commit the first version of bzrk.
346
        for h_idx, hang in enumerate(hanging):
37.1.2 by Robert Collins
Make revision sorting and linking use merge_sorted from latest bzr.dev. This
347
            # one of these will be the current lines node:
348
            # we are drawing a line. h_idx 
1 by Scott James Remnant
Commit the first version of bzrk.
349
            if hang == revid:
37.1.2 by Robert Collins
Make revision sorting and linking use merge_sorted from latest bzr.dev. This
350
                # we have found the current lines node
1 by Scott James Remnant
Commit the first version of bzrk.
351
                node = (h_idx, colours[revid])
352
37.1.2 by Robert Collins
Make revision sorting and linking use merge_sorted from latest bzr.dev. This
353
                # note that we might have done the main parent
354
                drawn_parents = set()
355
356
                def draw_line(from_idx, to_idx, revision_id):
357
                    try:
358
                        n_idx = new_hanging.index(revision_id)
359
                    except ValueError:
360
                        # force this to be vertical at the place this rev was
361
                        # drawn.
362
                        new_hanging.insert(to_idx, revision_id)
363
                        n_idx = to_idx
364
                    lines.append((from_idx, n_idx, colours[revision_id]))
365
366
                
367
                # we want to draw a line to the next commit on 'this' branch
368
                if not end_merge:
369
                    # drop this line first.
370
                    parent_id = next_branch_revid[revid]
371
                    draw_line(h_idx, h_idx, parent_id)
372
                    # we have drawn this parent
373
                    drawn_parents.add(parent_id)
374
                else:
375
                    # this is the last revision in a 'merge', show where it came from
37.1.3 by Robert Collins
Some more tweaking on the graph stuff - reducing duplicate effort and leveraging bzrlib more.
376
                    if len(revisions[revid].parent_ids) > 1:
37.1.2 by Robert Collins
Make revision sorting and linking use merge_sorted from latest bzr.dev. This
377
                        # having > 1
378
                        # parents means this commit was a merge, and being
379
                        # the end point of a merge group means that all
380
                        # the parent revisions were merged into branches
381
                        # to the left of this before this was committed
382
                        # - so we want to show this as a new branch from
383
                        # those revisions.
384
                        # to do this, we show the parent with the lowest
385
                        # sequence number, which is the one that this
386
                        # branch 'spawned from', and no others.
387
                        # If this sounds like a problem, remember that:
388
                        # if the parent was not already in our mainline
389
                        # it would show up as a merge into this making
390
                        # this not the end of a merge-line.
391
                        lowest = len(merge_sorted)
37.1.3 by Robert Collins
Some more tweaking on the graph stuff - reducing duplicate effort and leveraging bzrlib more.
392
                        for parent_id in revisions[revid].parent_ids:
37.1.2 by Robert Collins
Make revision sorting and linking use merge_sorted from latest bzr.dev. This
393
                            if revs[parent_id][0] < lowest:
394
                                lowest = revs[parent_id][0]
395
                        assert lowest != len(merge_sorted)
396
                        draw_line(h_idx, len(new_hanging), merge_sorted[lowest][1])
397
                        drawn_parents.add(merge_sorted[lowest][1])
37.1.3 by Robert Collins
Some more tweaking on the graph stuff - reducing duplicate effort and leveraging bzrlib more.
398
                    elif len(revisions[revid].parent_ids) == 1:
37.1.2 by Robert Collins
Make revision sorting and linking use merge_sorted from latest bzr.dev. This
399
                        # only one parent, must show this link to be useful.
37.1.3 by Robert Collins
Some more tweaking on the graph stuff - reducing duplicate effort and leveraging bzrlib more.
400
                        parent_id = revisions[revid].parent_ids[0]
37.1.2 by Robert Collins
Make revision sorting and linking use merge_sorted from latest bzr.dev. This
401
                        draw_line(h_idx, len(new_hanging), parent_id)
402
                        drawn_parents.add(parent_id)
403
                
404
                # what do we want to draw lines to from here:
405
                # each parent IF its relevant.
406
                #
1 by Scott James Remnant
Commit the first version of bzrk.
407
                # Now we need to hang its parents, we put them at the point
408
                # the old column was so anything to the right of this has
409
                # to move outwards to make room.  We also try and collapse
410
                # hangs to keep the graph small.
37.1.2 by Robert Collins
Make revision sorting and linking use merge_sorted from latest bzr.dev. This
411
                # RBC: we do not draw lines to parents that were already merged
412
                # unless its the last revision in a merge group.
37.1.3 by Robert Collins
Some more tweaking on the graph stuff - reducing duplicate effort and leveraging bzrlib more.
413
                for parent_id in revisions[revid].parent_ids:
37.1.2 by Robert Collins
Make revision sorting and linking use merge_sorted from latest bzr.dev. This
414
                    if parent_id in drawn_parents:
415
                        continue
416
                    parent_seq = revs[parent_id][0]
417
                    parent_depth = revs[parent_id][1]
418
                    if parent_depth == indent + 1:
419
                        # the parent was a merge into this branch
420
                        # determine if it was already merged into the mainline
421
                        # via a different merge:
422
                        # if all revisions between us and parent_seq have a 
423
                        # indent greater than there are no revisions with a lower indent than
424
                        # us.
425
                        # we do not use 'parent_depth < indent' because that would allow
426
                        # un-uniqueified merges to show up, and merge_sorted should take
427
                        # care of that for us (but does not trim the values)
428
                        if parent_seq < next_lower_rev[revid]:
429
                            draw_line(h_idx, len(new_hanging), parent_id)
430
                    elif parent_depth == indent and parent_seq == seq + 1:
431
                        # part of this branch
432
                        draw_line(h_idx, len(new_hanging), parent_id)
1 by Scott James Remnant
Commit the first version of bzrk.
433
            else:
37.1.2 by Robert Collins
Make revision sorting and linking use merge_sorted from latest bzr.dev. This
434
                # draw a line from the previous position of this line to the 
435
                # new position.
436
                # h_idx is the old position.
437
                # new_indent is the new position. 
438
                draw_line(h_idx, len(new_hanging), hang)
439
        # we've calculated the row, assign new_hanging to hanging to setup for
440
        # the next row
1 by Scott James Remnant
Commit the first version of bzrk.
441
        hanging = new_hanging
442
443
        yield (revisions[revid], node, lines)
2 by Scott James Remnant
Split the same branch functionality out into a separate function so
444
27 by David Allouche
refactor distances
445
2 by Scott James Remnant
Split the same branch functionality out into a separate function so
446
def same_branch(a, b):
447
    """Return whether we think revisions a and b are on the same branch."""
448
    if len(a.parent_ids) == 1:
449
        # Defacto same branch if only parent
450
        return True
451
    elif a.committer == b.committer:
452
        # Same committer so may as well be
453
        return True
454
    else:
455
        return False