# HG changeset patch # User Marcin Kuzminski # Date 2012-03-18 20:27:48 # Node ID 46b67235a8f0dad8f458a2c572916e483ce80c83 # Parent b70721d03e8477c0ef294b5ed47bf044bde13fda # Parent 8cdb243f9046980122196993be2284d28038d93b Merged in codingtony/rhodecode (pull request #36) diff --git a/requires.txt b/requires.txt --- a/requires.txt +++ b/requires.txt @@ -9,9 +9,9 @@ whoosh>=2.3.0,<2.4 celery>=2.2.5,<2.3 babel python-dateutil>=1.5.0,<2.0.0 -dulwich>=0.8.0,<0.9.0 +dulwich>=0.8.4,<0.9.0 webob==1.0.8 markdown==2.1.1 docutils==0.8.1 py-bcrypt -mercurial>=2.1,<2.2 \ No newline at end of file +mercurial>=2.1,<2.2 diff --git a/rhodecode/__init__.py b/rhodecode/__init__.py --- a/rhodecode/__init__.py +++ b/rhodecode/__init__.py @@ -57,7 +57,7 @@ requirements = [ "celery>=2.2.5,<2.3", "babel", "python-dateutil>=1.5.0,<2.0.0", - "dulwich>=0.8.0,<0.9.0", + "dulwich>=0.8.4,<0.9.0", "webob==1.0.8", "markdown==2.1.1", "docutils==0.8.1", diff --git a/rhodecode/lib/middleware/simplegit.py b/rhodecode/lib/middleware/simplegit.py --- a/rhodecode/lib/middleware/simplegit.py +++ b/rhodecode/lib/middleware/simplegit.py @@ -65,7 +65,7 @@ dulserver.DEFAULT_HANDLERS = { } from dulwich.repo import Repo -from dulwich.web import HTTPGitApplication +from dulwich.web import make_wsgi_chain from paste.httpheaders import REMOTE_USER, AUTH_TYPE @@ -205,7 +205,7 @@ class SimpleGit(BaseVCSController): """ _d = {'/' + repo_name: Repo(repo_path)} backend = dulserver.DictBackend(_d) - gitserve = HTTPGitApplication(backend) + gitserve = make_wsgi_chain(backend) return gitserve