← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to graph.py

  • Committer: Aaron Bentley
  • Date: 2007-06-18 23:52:33 UTC
  • Revision ID: abentley@panoramicfeedback.com-20070618235233-7ick9errjikvy4di
Fix no-collapse behavior

Show diffs side-by-side

added added

removed removed

Lines of Context:
graph.py
228
228
                                                  self.ancestors,
229
229
                                                  exceptions)
230
230
        else:
231
 
            visible_ancestors = self.ancestors
 
231
            visible_ancestors = {}
 
232
            for revision, parents in self.ancestors.iteritems():
 
233
                visible_ancestors[revision] = dict((p, 0) for p in parents)
232
234
        if max_distance is not None:
233
235
            min_distance = max(self.distances.values()) - max_distance
234
 
            visible_ancestors = dict((n, p) for n, p in visible_ancestors.iteritems() if
235
 
                    self.distances[n] >= min_distance)
 
236
            visible_ancestors = dict((n, p) for n, p in
 
237
                                     visible_ancestors.iteritems() if
 
238
                                     self.distances[n] >= min_distance)
236
239
        for node, parents in visible_ancestors.iteritems():
237
240
            if node not in dot_nodes:
238
241
                dot_nodes[node] = self.dot_node(node, num)
239
242
                num += 1
240
 
            if visible_ancestors is self.ancestors:
241
 
                parent_iter = ((f, 0) for f in parents)
242
 
            else:
243
 
                parent_iter = (f for f in parents.iteritems())
244
 
            for parent, skipped in parent_iter:
 
243
            for parent, skipped in parents.iteritems():
245
244
                if parent not in dot_nodes:
246
245
                    dot_nodes[parent] = self.dot_node(parent, num)
247
246
                    num += 1