Rev 4574: Older pyrex compatibility. in http://bazaar.launchpad.net/~lifeless/bzr/iter-changes-partial-parents

[Robert Collins]

At http://bazaar.launchpad.net/~lifeless/bzr/iter-changes-partial-parents

------------------------------------------------------------
revno: 4574
revision-id: robertc at robertcollins.net-20090729061227-l7a8kz6ja0x25nh9
parent: robertc at robertcollins.net-20090729045750-qp1iw48rp7jyrfh2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: iter-changes-partial-parents
timestamp: Wed 2009-07-29 16:12:27 +1000
message:
  Older pyrex compatibility.
=== modified file 'bzrlib/_dirstate_helpers_pyx.pyx'
--- a/bzrlib/_dirstate_helpers_pyx.pyx	2009-07-29 04:57:50 +0000
+++ b/bzrlib/_dirstate_helpers_pyx.pyx	2009-07-29 06:12:27 +0000
@@ -1017,7 +1017,10 @@
         # nested scope. Each one is [path, file_id, entry]
         self.last_source_parent = [None, None]
         self.last_target_parent = [None, None]
-        self.include_unchanged = include_unchanged
+        if include_unchanged is None:
+            self.include_unchanged = False
+        else:
+            self.include_unchanged = include_unchanged
         self.use_filesystem_for_exec = use_filesystem_for_exec
         self.utf8_decode = cache_utf8._utf8_decode
         # for all search_indexs in each path at or under each element of
@@ -1917,7 +1920,7 @@
                             initial_key)
                         if block_index == 0:
                             # The children of the root are in block index 1.
-                            block_index +=1
+                            block_index = block_index + 1
                         current_block = None
                         if block_index < len(self.state._dirblocks):
                             current_block = self.state._dirblocks[block_index]