You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/10/02 18:29:49 UTC
[5/7] git commit: [#5775] ticket:433 fixed filesize for svn repo
after copied from link
[#5775] ticket:433 fixed filesize for svn repo after copied from link
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/b1dd28a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/b1dd28a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/b1dd28a6
Branch: refs/heads/master
Commit: b1dd28a6f33d0d5b5325f0cc404880d78f4198ea
Parents: 7b9db7b
Author: Yuriy Arhipov <yu...@yandex.ru>
Authored: Tue Oct 1 16:07:44 2013 +0400
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Wed Oct 2 15:40:31 2013 +0000
----------------------------------------------------------------------
ForgeGit/forgegit/tests/functional/test_controllers.py | 11 +++++++++++
ForgeSVN/forgesvn/model/svn.py | 7 +++++--
2 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/b1dd28a6/ForgeGit/forgegit/tests/functional/test_controllers.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/functional/test_controllers.py b/ForgeGit/forgegit/tests/functional/test_controllers.py
index 919e97b..9a78579 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -590,3 +590,14 @@ class TestGitRename(TestController):
resp = self.app.get('/src-git/ci/259c77dd6ee0e6091d11e429b56c44ccbf1e64a3/log/?path=/f2.txt')
assert '<b>renamed from</b>' in resp
assert '/f.txt' in resp
+ assert '(27 Bytes)' in resp
+ assert '(19 Bytes)' in resp
+
+ resp = self.app.get('/src-git/ci/fbb0644603bb6ecee3ebb62efe8c86efc9b84ee6/log/?path=/f.txt')
+ assert '(19 Bytes)' in resp
+ assert '(10 Bytes)' in resp
+
+ resp = self.app.get('/src-git/ci/7c09182e61af959e4f1fb0e354bab49f14ef810d/tree/f.txt')
+ assert "2 lines (1 with data), 10 Bytes" in resp
+
+
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/b1dd28a6/ForgeSVN/forgesvn/model/svn.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/model/svn.py b/ForgeSVN/forgesvn/model/svn.py
index ec8d991..24e8bdd 100644
--- a/ForgeSVN/forgesvn/model/svn.py
+++ b/ForgeSVN/forgesvn/model/svn.py
@@ -565,8 +565,9 @@ class SVNImplementation(M.RepositoryImplementation):
def _map_log(self, ci, url, path=None):
revno = ci.revision.number
+ rev = pysvn.Revision(pysvn.opt_revision_kind.number, revno)
try:
- size = int(self._svn.list(url)[0][0].size)
+ size = int(self._svn.list(url, revision=rev, peg_revision=rev)[0][0].size)
except pysvn.ClientError:
size = None
rename_details = {}
@@ -606,9 +607,11 @@ class SVNImplementation(M.RepositoryImplementation):
def blob_size(self, blob):
try:
+ rev = self._revision(blob.commit._id)
data = self._svn.list(
self._url + blob.path(),
- revision=self._revision(blob.commit._id),
+ revision=rev,
+ peg_revision=rev,
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)