Rev 468: Merge fix for regression in linegraph. in file:///data/jelmer/bzr-gtk/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-gtk/trunk/

------------------------------------------------------------
revno: 468
revision-id: jelmer at samba.org-20080425195456-odfm2gf6g6qbfhyj
parent: jelmer at samba.org-20080425194806-n13oipwwyk5tg6a0
parent: jelmer at samba.org-20080405052458-340xolat1r5275xr
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2008-04-25 20:54:56 +0100
message:
  Merge fix for regression in linegraph.
modified:
  branchview/linegraph.py        graph.py-20051016214152-ebf565808c860cf7
    ------------------------------------------------------------
    revno: 450.8.1
    revision-id: jelmer at samba.org-20080405052458-340xolat1r5275xr
    parent: daniel.schierbeck at gmail.com-20080403140220-p7xdlod3y045gauh
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Sat 2008-04-05 07:24:58 +0200
    message:
      Fix regression in graph determination code.
    modified:
      branchview/linegraph.py        graph.py-20051016214152-ebf565808c860cf7
=== modified file 'branchview/linegraph.py'
--- a/branchview/linegraph.py	2008-04-25 19:41:23 +0000
+++ b/branchview/linegraph.py	2008-04-25 19:54:56 +0000
@@ -9,6 +9,7 @@
 __copyright__ = "Copyright © 2005 Canonical Ltd."
 __author__    = "Scott James Remnant <scott at ubuntu.com>"
 
+from bzrlib.revision import NULL_REVISION
 from bzrlib.tsort import merge_sort
 
 def linegraph(repository, start_revs, maxnum, broken_line_length = None,
@@ -46,7 +47,10 @@
     graph_parents = {}
     graph_children = {}
     for (revid, parent_revids) in graph.iter_ancestry(start_revs):
-        graph_parents[revid] = parent_revids
+        if parent_revids == (NULL_REVISION,):
+            graph_parents[revid] = ()
+        else:
+            graph_parents[revid] = parent_revids
         graph_children[revid] = []
 
     graph_parents["top:"] = start_revs