Rev 2496: Do the same renaming => py_ and c_ for _read_dirblocks in http://bzr.arbash-meinel.com/branches/bzr/0.17-dev/dirstate_pyrex

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/0.17-dev/dirstate_pyrex

------------------------------------------------------------
revno: 2496
revision-id: john at arbash-meinel.com-20070504181128-422svqlutnl3v43d
parent: john at arbash-meinel.com-20070504180557-iaitatth56jygggl
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 13:11:28 -0500
message:
  Do the same renaming => py_ and c_ for _read_dirblocks
modified:
  bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
  bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
-------------- next part --------------
=== modified file 'bzrlib/compiled/dirstate_helpers.pyx'
--- a/bzrlib/compiled/dirstate_helpers.pyx	2007-05-04 18:05:57 +0000
+++ b/bzrlib/compiled/dirstate_helpers.pyx	2007-05-04 18:11:28 +0000
@@ -182,7 +182,7 @@
     return _lo
 
 
-def _read_dirblocks(state):
+def _c_read_dirblocks(state):
     """Read in the dirblocks for the given DirState object.
 
     This is tightly bound to the DirState internal representation. It should be

=== modified file 'bzrlib/dirstate.py'
--- a/bzrlib/dirstate.py	2007-05-04 18:05:57 +0000
+++ b/bzrlib/dirstate.py	2007-05-04 18:11:28 +0000
@@ -2305,7 +2305,7 @@
 
 
 
-def _read_dirblocks(state):
+def _py_read_dirblocks(state):
     """Read in the dirblocks for the given DirState object.
 
     This is tightly bound to the DirState internal representation. It should be
@@ -2407,16 +2407,18 @@
     # state._dirblocks = sorted(state._dirblocks)
     state._dirblock_state = DirState.IN_MEMORY_UNMODIFIED
 
+_read_dirblocks = _py_read_dirblocks
 
 # Try to load the compiled form if possible
 # TODO: jam 20070503 We should have a way to run tests with and without the
 #       compiled extensions.
 try:
     from bzrlib.compiled.dirstate_helpers import (
-        _read_dirblocks,
+        _c_read_dirblocks,
         c_bisect_dirblock,
         )
 except ImportError:
     pass
 else:
+    _read_dirblocks = _c_read_dirblocks
     bisect_dirblock = c_bisect_dirblock