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 34125108BA for ; Tue, 23 Jul 2013 22:36:18 +0000 (UTC) Received: (qmail 69346 invoked by uid 500); 23 Jul 2013 22:36:18 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 69329 invoked by uid 500); 23 Jul 2013 22:36:18 -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 69294 invoked by uid 99); 23 Jul 2013 22:36:18 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Jul 2013 22:36:18 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DD3538B2CB4; Tue, 23 Jul 2013 22:36:17 +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: Tue, 23 Jul 2013 22:36:32 -0000 Message-Id: In-Reply-To: <93658d91c1b94fa9b2b08eecb557849c@git.apache.org> References: <93658d91c1b94fa9b2b08eecb557849c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [16/27] git commit: [#6463] Change svn co url and default mount options [#6463] Change svn co url and default mount options Signed-off-by: Tim Van Steenburgh Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/0475acc2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/0475acc2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/0475acc2 Branch: refs/heads/cj/6456 Commit: 0475acc2619cb42bdba382e38ea60e9e65a3ce0d Parents: 62099e2 Author: Tim Van Steenburgh Authored: Tue Jul 23 20:18:00 2013 +0000 Committer: Tim Van Steenburgh Committed: Tue Jul 23 20:18:00 2013 +0000 ---------------------------------------------------------------------- ForgeImporters/forgeimporters/google/code.py | 6 +++--- ForgeImporters/forgeimporters/google/tests/test_code.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/0475acc2/ForgeImporters/forgeimporters/google/code.py ---------------------------------------------------------------------- diff --git a/ForgeImporters/forgeimporters/google/code.py b/ForgeImporters/forgeimporters/google/code.py index 29951a6..1ce51de 100644 --- a/ForgeImporters/forgeimporters/google/code.py +++ b/ForgeImporters/forgeimporters/google/code.py @@ -53,7 +53,7 @@ except ImportError: pass REPO_URLS = { - 'svn': 'http://{0}.googlecode.com/svn/trunk/', + 'svn': 'http://{0}.googlecode.com/svn/', 'git': 'https://code.google.com/p/{0}/', 'hg': 'https://code.google.com/p/{0}/', } @@ -113,7 +113,7 @@ class GoogleRepoImporter(ToolImporter): 'project_name'), repo_type) return project.install_app( REPO_ENTRY_POINTS[repo_type], - mount_point=mount_point or 'source', - mount_label=mount_label or 'Source', + mount_point=mount_point or 'code', + mount_label=mount_label or 'Code', init_from_url=repo_url, ) http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/0475acc2/ForgeImporters/forgeimporters/google/tests/test_code.py ---------------------------------------------------------------------- diff --git a/ForgeImporters/forgeimporters/google/tests/test_code.py b/ForgeImporters/forgeimporters/google/tests/test_code.py index a2d9a54..660bc83 100644 --- a/ForgeImporters/forgeimporters/google/tests/test_code.py +++ b/ForgeImporters/forgeimporters/google/tests/test_code.py @@ -15,7 +15,7 @@ class TestGetRepoUrl(TestCase): def test_svn(self): r = get_repo_url('projname', 'svn') - self.assertEqual(r, 'http://projname.googlecode.com/svn/trunk/') + self.assertEqual(r, 'http://projname.googlecode.com/svn/') def test_git(self): r = get_repo_url('projname', 'git') @@ -41,8 +41,8 @@ class TestGoogleRepoImporter(TestCase): p = self._make_project(gc_proj_name='myproject') GoogleRepoImporter().import_tool(p) p.install_app.assert_called_once_with('Git', - mount_point='source', - mount_label='Source', + mount_point='code', + mount_label='Code', init_from_url='http://remote/clone/url/', )