Commit: 029847379a77264d6cd1fd0ea7a54fe73d979005 - allura (git)

allura

Commit MetaInfo

• Revision: 029847379a77264d6cd1fd0ea7a54fe73d979005 (tree)
• Zeit: 2012-06-28 01:59:41
• Autor: Tim Van Steenburgh <tvansteenburgh@gmai...>
• Commiter: Tim Van Steenburgh

Log Message

[#4126] Fix scm file stats to work with new model.

Signed-off-by: Tim Van Steenburgh <[e-mail]>

Ändern Zusammenfassung

• modified: Allura/allura/model/repo.py
• modified: Allura/allura/tests/test_commands.py
• modified: ForgeGit/forgegit/model/git_repo.py
• modified: ForgeHg/forgehg/model/hg.py
• modified: ForgeSVN/forgesvn/model/svn.py

Diff

--- a/Allura/allura/model/repo.py
+++ b/Allura/allura/model/repo.py
@@ -470,6 +470,10 @@ class Blob(object):
         return iter(self.open())
 
     @LazyProperty
+    def size(self):
+        return self.repo.blob_size(self)
+
+    @LazyProperty
     def text(self):
         return self.open().read()
 

--- a/Allura/allura/tests/test_commands.py
+++ b/Allura/allura/tests/test_commands.py
@@ -1,8 +1,8 @@
 from nose.tools import assert_raises
 
 from alluratest.controller import setup_basic_test, setup_global_objects
-from allura.command import script, set_neighborhood_features, rssfeeds, \
-create_neighborhood
+from allura.command import script, set_neighborhood_features, \
+                           create_neighborhood
 from allura import model as M
 from forgeblog import model as BM
 from allura.lib.exceptions import InvalidNBFeatureValueError

--- a/ForgeGit/forgegit/model/git_repo.py
+++ b/ForgeGit/forgegit/model/git_repo.py
@@ -240,7 +240,7 @@ class GitImplementation(M.RepositoryImplementation):
             self._object(blob._id).data_stream)
 
     def blob_size(self, blob):
-        return self._object(blob.object_id).data_stream.size
+        return self._object(blob._id).data_stream.size
 
     def _setup_hooks(self):
         'Set up the git post-commit hook'

--- a/ForgeHg/forgehg/model/hg.py
+++ b/ForgeHg/forgehg/model/hg.py
@@ -230,7 +230,7 @@ class HgImplementation(M.RepositoryImplementation):
         return StringIO(fctx.data())
 
     def blob_size(self, blob):
-        fctx = self._hg[blob.commit.object_id][h.really_unicode(blob.path()).encode('utf-8')[1:]]
+        fctx = self._hg[blob.commit._id][h.really_unicode(blob.path()).encode('utf-8')[1:]]
         return fctx.size()
 
     def _setup_hooks(self):

--- a/ForgeSVN/forgesvn/model/svn.py
+++ b/ForgeSVN/forgesvn/model/svn.py
@@ -382,7 +382,7 @@ class SVNImplementation(M.RepositoryImplementation):
         try:
             data = self._svn.list(
                    self._url + blob.path(),
-                   revision=self._revision(blob.commit.object_id),
+                   revision=self._revision(blob.commit._id),
                    dirent_fields=pysvn.SVN_DIRENT_SIZE)
         except pysvn.ClientError:
             log.info('ClientError getting filesize %r %r, returning 0', blob.path(), self._repo, exc_info=True)
@@ -393,7 +393,7 @@ class SVNImplementation(M.RepositoryImplementation):
         except (IndexError, KeyError):
             log.info('Error getting filesize: bad data from svn client %r %r, returning 0', blob.path(), self._repo, exc_info=True)
             size = 0
-        
+
         return size
 
     def _setup_hooks(self):