You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2013/09/10 15:34:43 UTC
[1/3] git commit: [#6626] ticket:427 Returned use of url_for_commit()
in controller
Updated Branches:
refs/heads/master 6bfdafddc -> 5445e8403
[#6626] ticket:427 Returned use of url_for_commit() in controller
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/307921ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/307921ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/307921ba
Branch: refs/heads/master
Commit: 307921bad476db88eb8a06b238638c162d944e23
Parents: 43f055c
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue Sep 10 12:14:43 2013 +0300
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Tue Sep 10 13:34:15 2013 +0000
----------------------------------------------------------------------
ForgeSVN/forgesvn/controllers.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/307921ba/ForgeSVN/forgesvn/controllers.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/controllers.py b/ForgeSVN/forgesvn/controllers.py
index 62f3d55..44d1a69 100644
--- a/ForgeSVN/forgesvn/controllers.py
+++ b/ForgeSVN/forgesvn/controllers.py
@@ -38,8 +38,9 @@ class BranchBrowser(repository.BranchBrowser, FeedController):
latest = c.app.repo.latest(branch=self._branch)
if is_empty or not latest:
return dict(allow_fork=False, log=[], is_empty=is_empty)
- redirect('%s/tree/' % c.app.default_branch_name)
+ redirect(c.app.repo.url_for_commit(c.app.default_branch_name) + 'tree/')
@expose()
def _lookup(self, rev, *remainder):
return repository.CommitBrowser(rev), remainder
+
[2/3] git commit: [#6626] ticket:427 Use HEAD revision as default for
SVN
Posted by tv...@apache.org.
[#6626] ticket:427 Use HEAD revision as default for SVN
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/43f055ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/43f055ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/43f055ca
Branch: refs/heads/master
Commit: 43f055caac9cd5e1e049922f2db27d3f73f4b0e9
Parents: 6bfdafd
Author: Yuriy Arhipov <yu...@yandex.ru>
Authored: Mon Sep 9 13:52:29 2013 +0400
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Tue Sep 10 13:34:15 2013 +0000
----------------------------------------------------------------------
ForgeSVN/forgesvn/controllers.py | 3 +--
ForgeSVN/forgesvn/tests/functional/test_controllers.py | 5 +++++
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/43f055ca/ForgeSVN/forgesvn/controllers.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/controllers.py b/ForgeSVN/forgesvn/controllers.py
index 44d1a69..62f3d55 100644
--- a/ForgeSVN/forgesvn/controllers.py
+++ b/ForgeSVN/forgesvn/controllers.py
@@ -38,9 +38,8 @@ class BranchBrowser(repository.BranchBrowser, FeedController):
latest = c.app.repo.latest(branch=self._branch)
if is_empty or not latest:
return dict(allow_fork=False, log=[], is_empty=is_empty)
- redirect(c.app.repo.url_for_commit(c.app.default_branch_name) + 'tree/')
+ redirect('%s/tree/' % c.app.default_branch_name)
@expose()
def _lookup(self, rev, *remainder):
return repository.CommitBrowser(rev), remainder
-
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/43f055ca/ForgeSVN/forgesvn/tests/functional/test_controllers.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/tests/functional/test_controllers.py b/ForgeSVN/forgesvn/tests/functional/test_controllers.py
index ae8c86d..691bd2e 100644
--- a/ForgeSVN/forgesvn/tests/functional/test_controllers.py
+++ b/ForgeSVN/forgesvn/tests/functional/test_controllers.py
@@ -59,6 +59,11 @@ class SVNTestController(TestController):
class TestRootController(SVNTestController):
+
+ def test_head(self):
+ r = self.app.get('/src/')
+ assert r.location.endswith('/src/HEAD/tree/')
+
def test_status(self):
resp = self.app.get('/src/status')
d = json.loads(resp.body)
[3/3] git commit: [#6626] ticket:427 Handle HEAD in url_for_commit
for svn
Posted by tv...@apache.org.
[#6626] ticket:427 Handle HEAD in url_for_commit for svn
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/5445e840
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/5445e840
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/5445e840
Branch: refs/heads/master
Commit: 5445e8403ca9ed4a61973b207a7f91ec0c5762a6
Parents: 307921b
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue Sep 10 12:47:15 2013 +0300
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Tue Sep 10 13:34:16 2013 +0000
----------------------------------------------------------------------
ForgeSVN/forgesvn/model/svn.py | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5445e840/ForgeSVN/forgesvn/model/svn.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/model/svn.py b/ForgeSVN/forgesvn/model/svn.py
index 3e6ea25..089572c 100644
--- a/ForgeSVN/forgesvn/model/svn.py
+++ b/ForgeSVN/forgesvn/model/svn.py
@@ -171,6 +171,8 @@ class SVNImplementation(M.RepositoryImplementation):
def url_for_commit(self, commit, url_type=None):
if hasattr(commit, '_id'):
object_id = commit._id
+ elif commit == self._repo.app.default_branch_name:
+ object_id = commit
else:
object_id = self.rev_parse(commit)
if ':' in object_id: