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