svn commit: r1158003 - in /subversion/branches/fs-py/subversion: libsvn_fs_py/rep-cache.c python/svn/fs/__init__.py

[hw...@apache.org]

Author: hwright
Date: Mon Aug 15 20:42:51 2011
New Revision: 1158003

URL: http://svn.apache.org/viewvc?rev=1158003&view=rev
Log:
On the fs-py branch:
Fix an attempt to reference an instance-private variable which was hid due
to Python name-mangling.

* subversion/python/svn/fs/__init__.py
  (FS.youngest_rev, FS._ensure_revision_exists, FS._create_fs, FS._open_fs):
    Update references to self._youngest_rev_cache.

* subversion/libsvn_fs_py/rep-cache.c
  (rep_hash_been_born): Update reference when fetch the youngest_rev_cache
    value.

Modified:
    subversion/branches/fs-py/subversion/libsvn_fs_py/rep-cache.c
    subversion/branches/fs-py/subversion/python/svn/fs/__init__.py

Modified: subversion/branches/fs-py/subversion/libsvn_fs_py/rep-cache.c
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/subversion/libsvn_fs_py/rep-cache.c?rev=1158003&r1=1158002&r2=1158003&view=diff
==============================================================================
--- subversion/branches/fs-py/subversion/libsvn_fs_py/rep-cache.c (original)
+++ subversion/branches/fs-py/subversion/libsvn_fs_py/rep-cache.c Mon Aug 15 20:42:51 2011
@@ -63,7 +63,7 @@ rep_has_been_born(representation_t *rep,
   SVN_ERR_ASSERT(rep);
 
   SVN_ERR(svn_fs_py__get_int_attr(&youngest, ffd->p_fs,
-                                  "__youngest_rev_cache"));
+                                  "_youngest_rev_cache"));
   if (youngest < rep->revision)
   {
     /* Stale cache. */

Modified: subversion/branches/fs-py/subversion/python/svn/fs/__init__.py
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/subversion/python/svn/fs/__init__.py?rev=1158003&r1=1158002&r2=1158003&view=diff
==============================================================================
--- subversion/branches/fs-py/subversion/python/svn/fs/__init__.py (original)
+++ subversion/branches/fs-py/subversion/python/svn/fs/__init__.py Mon Aug 15 20:42:51 2011
@@ -179,8 +179,8 @@ class FS(object):
         return int(self.__read_current()[0])
 
     def youngest_rev(self):
-        self.__youngest_rev_cache = self._get_youngest()
-        return self.__youngest_rev_cache
+        self._youngest_rev_cache = self._get_youngest()
+        return self._youngest_rev_cache
 
     def set_uuid(self, uuid_in = None):
         '''Set the UUID for the filesystem.  If UUID_IN is not given, generate
@@ -220,12 +220,12 @@ class FS(object):
                                     "Invalid revision number '%ld'" % rev)
 
         # Did the revision exist the last time we checked the current file?
-        if rev <= self.__youngest_rev_cache:
+        if rev <= self._youngest_rev_cache:
             return
 
         # Check again
-        self.__youngest_rev_cache = self._get_youngest()
-        if rev <= self.__youngest_rev_cache:
+        self._youngest_rev_cache = self._get_youngest()
+        if rev <= self._youngest_rev_cache:
             return
 
         raise svn.SubversionException(svn.err.FS_NO_SUCH_REVISION,
@@ -293,7 +293,7 @@ class FS(object):
 
     def _create_fs(self, config):
         'Create a new Subversion filesystem'
-        self.__youngest_rev_cache = 0
+        self._youngest_rev_cache = 0
         self.__min_unpacked_rev = 0
 
         # See if compatibility with older versions was explicitly requested.
@@ -369,7 +369,7 @@ class FS(object):
         if self.format >= MIN_PACKED_FORMAT:
             self.__update_min_unpacked_rev()
 
-        self.__youngest_rev_cache = self._get_youngest()
+        self._youngest_rev_cache = self._get_youngest()
 
 
     def __setup_paths(self):