Rev 4618: finish getting the revno numbers working correctly. in http://bazaar.launchpad.net/~jameinel/bzr/1.19-known-graph-sorted

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/1.19-known-graph-sorted

------------------------------------------------------------
revno: 4618
revision-id: john at arbash-meinel.com-20090814213338-nsmgen0ancx1h7rn
parent: john at arbash-meinel.com-20090814213309-nkysroljd3wizane
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.19-known-graph-sorted
timestamp: Fri 2009-08-14 16:33:38 -0500
message:
  finish getting the revno numbers working correctly.
-------------- next part --------------
=== modified file 'bzrlib/_known_graph_pyx.pyx'
--- a/bzrlib/_known_graph_pyx.pyx	2009-08-14 20:12:35 +0000
+++ b/bzrlib/_known_graph_pyx.pyx	2009-08-14 21:33:38 +0000
@@ -480,6 +480,7 @@
             parent_node = _get_parent(ms_node.node.parents, 0)
             ms_parent_node = self._ms_nodes[parent_node.key]
             if not ms_node.is_first_child:
+                # Not the first child, make a new branch
                 base_revno = ms_parent_node.revno[0]
                 branch_count = self._revno_to_branch_count.get(base_revno, 0)
                 branch_count = branch_count + 1
@@ -487,17 +488,16 @@
                 revno = (base_revno, branch_count, 1)
             else:
                 # First child just increments the final digit
-                revno = ms_parent_node.revno[:-1] + (ms_parent_node.revno[-1] +
-                                                        1,)
+                final = ms_parent_node.revno[-1] + 1
+                revno = ms_parent_node.revno[:-1] + (final,)
         else:
-            root_count = self._revno_to_branch_count.get(0, 0)
-            if root_count == 0:
+            root_count = self._revno_to_branch_count.get(0, -1)
+            root_count = root_count + 1
+            if root_count:
+                revno = (0, root_count, 1)
+            else:
                 revno = (1,)
-            else:
-                revno = (0, root_count, 1)
-            root_count = root_count + 1
             self._revno_to_branch_count[0] = root_count
-            print ms_node, root_count
         ms_node.revno = revno
         self._completed_node_names.add(ms_node.node.key)
         self._scheduled_nodes.append(ms_node)