Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CC2F4107CA for ; Thu, 3 Oct 2013 18:05:22 +0000 (UTC) Received: (qmail 44596 invoked by uid 500); 3 Oct 2013 18:05:19 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 44455 invoked by uid 500); 3 Oct 2013 18:05:15 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 44162 invoked by uid 99); 3 Oct 2013 18:05:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Oct 2013 18:05:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D11A490EC9E; Thu, 3 Oct 2013 18:05:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: johnsca@apache.org To: allura-commits@incubator.apache.org Date: Thu, 03 Oct 2013 18:05:20 -0000 Message-Id: <80a3ba787dce4b9d887d68424887e022@git.apache.org> In-Reply-To: <1fd7dad3c8524965be935a72eb8d936f@git.apache.org> References: <1fd7dad3c8524965be935a72eb8d936f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/17] git commit: [#5775] ticket:433 fixed filesize after copied from link [#5775] ticket:433 fixed filesize 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/7b9db7ba Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/7b9db7ba Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/7b9db7ba Branch: refs/heads/cj/5561 Commit: 7b9db7ba20bc48d90bb32886c200628f33d9589e Parents: baed285 Author: Yuriy Arhipov Authored: Tue Oct 1 13:59:04 2013 +0400 Committer: Cory Johns Committed: Wed Oct 2 15:40:30 2013 +0000 ---------------------------------------------------------------------- ForgeGit/forgegit/model/git_repo.py | 2 ++ ForgeGit/forgegit/tests/model/test_repository.py | 2 ++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7b9db7ba/ForgeGit/forgegit/model/git_repo.py ---------------------------------------------------------------------- diff --git a/ForgeGit/forgegit/model/git_repo.py b/ForgeGit/forgegit/model/git_repo.py index fa62c23..b1c621b 100644 --- a/ForgeGit/forgegit/model/git_repo.py +++ b/ForgeGit/forgegit/model/git_repo.py @@ -326,6 +326,8 @@ class GitImplementation(M.RepositoryImplementation): size = node.size if node.type == 'blob' else None except KeyError as e: size = None + if rename_details: + path = rename_details['path'].strip('/') yield { 'id': ci.hexsha, 'message': h.really_unicode(ci.message or '--none--'), http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7b9db7ba/ForgeGit/forgegit/tests/model/test_repository.py ---------------------------------------------------------------------- diff --git a/ForgeGit/forgegit/tests/model/test_repository.py b/ForgeGit/forgegit/tests/model/test_repository.py index 365060d..a494886 100644 --- a/ForgeGit/forgegit/tests/model/test_repository.py +++ b/ForgeGit/forgegit/tests/model/test_repository.py @@ -575,6 +575,8 @@ class TestGitRename(unittest.TestCase): rename_commit['rename_details']['commit_url'], '/p/test/src-git/ci/fbb0644603bb6ecee3ebb62efe8c86efc9b84ee6/' ) + self.assertEqual(rename_commit['size'], 19) + self.assertEqual(commits[2]['size'], 19) def test_merge_commit(self): merge_sha = '13951944969cf45a701bf90f83647b309815e6d5'