kallithea Changeset - 46b67235a8f0

Changeset - 46b67235a8f0

Parent rev.

Child rev.

[Not reviewed]

Merge beta

0 3 0

Marcin Kuzminski - 14 years ago 2012-03-18 20:27:48
marcin@python-works.com

Merged in codingtony/rhodecode (pull request #36)

3 files changed with 5 insertions and 5 deletions:

requires.txt

rhodecode/__init__.py

rhodecode/lib/middleware/simplegit.py

0 comments (0 inline, 0 general)

requires.txt

➞

Show inline comments

@@ @@ -6,12 +6,12 @@ SQLAlchemy==0.7.6 @@
 Mako==0.6.2
 pygments>=1.4
 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

rhodecode/__init__.py

➞

Show inline comments

@@ @@ -54,13 +54,13 @@ requirements = [ @@
     "Mako==0.6.2",
     "pygments>=1.4",
     "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",
+]
 if __py_version__ < (2, 6):

rhodecode/lib/middleware/simplegit.py

➞

Show inline comments

@@ @@ -62,13 +62,13 @@ class SimpleGitUploadPackHandler(dulserv @@
 dulserver.DEFAULT_HANDLERS = {
   'git-upload-pack': SimpleGitUploadPackHandler,
   'git-receive-pack': dulserver.ReceivePackHandler,
+}
 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
 from rhodecode.lib.utils2 import safe_str
 from rhodecode.lib.base import BaseVCSController
 from rhodecode.lib.auth import get_container_username
@@ @@ -202,13 +202,13 @@ class SimpleGit(BaseVCSController): @@
         :param repo_name: name of the repository
         :param repo_path: full path to the repository
         """
         _d = {'/' + repo_name: Repo(repo_path)}
         backend = dulserver.DictBackend(_d)
-        gitserve = HTTPGitApplication(backend)
+        gitserve = make_wsgi_chain(backend)
         return gitserve
     def __get_repository(self, environ):
         """
         Get's repository name out of PATH_INFO header

0 comments (0 inline, 0 general)