kallithea Changeset - e2f3c8e6939d

Changeset - e2f3c8e6939d

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 0

Marcin Kuzminski - 15 years ago 2010-11-18 02:41:38
marcin@python-works.com

Disable git support due to large problems with dulwich.
Added one point of controll over supported backends in rhodecode.BACKENDS

4 files changed with 15 insertions and 8 deletions:

rhodecode/__init__.py

rhodecode/lib/base.py

rhodecode/model/forms.py

rhodecode/model/scm.py

0 comments (0 inline, 0 general)

rhodecode/__init__.py

➞

Show inline comments

@@ @@ -30,6 +30,11 @@ __version__ = '.'.join((str(each) for ea @@
 def get_version():
     """
     Returns shorter version (digit parts only) as string.
     """
     return '.'.join((str(each) for each in VERSION[:3]))
 BACKENDS = {
     'hg': 'Mercurial repository',
    #'git': 'Git repository',
+}

rhodecode/lib/base.py

➞

Show inline comments

@@ @@ -7,13 +7,13 @@ from pylons.controllers import WSGIContr @@
 from pylons.templating import render_mako as render
 from rhodecode import __version__
 from rhodecode.lib import auth
 from rhodecode.lib.utils import get_repo_slug
 from rhodecode.model import meta
 from rhodecode.model.scm import ScmModel
-from vcs import BACKENDS
+from rhodecode import BACKENDS
 class BaseController(WSGIController):
     def __before__(self):
         c.rhodecode_version = __version__
         c.rhodecode_name = config['rhodecode_title']

rhodecode/model/forms.py

➞

Show inline comments

@@ @@ -28,13 +28,13 @@ from rhodecode.lib.auth import authfunc, @@
 from rhodecode.lib.exceptions import LdapImportError
 from rhodecode.model import meta
 from rhodecode.model.user import UserModel
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.db import User
 from webhelpers.pylonslib.secure_form import authentication_token
-from vcs import BACKENDS
+from rhodecode import BACKENDS
 import formencode
 import logging
 import os
 import rhodecode.lib.helpers as h
 log = logging.getLogger(__name__)
@@ @@ -298,34 +298,34 @@ def PasswordResetForm(): @@
     class _PasswordResetForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
         email = All(ValidSystemEmail(), Email(not_empty=True))
     return _PasswordResetForm
 def RepoForm(edit=False, old_data={}):
+def RepoForm(edit=False, old_data={}, supported_backends=BACKENDS.keys()):
     class _RepoForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         repo_name = All(UnicodeString(strip=True, min=1, not_empty=True), ValidRepoName(edit, old_data))
         description = UnicodeString(strip=True, min=1, not_empty=True)
         private = StringBoolean(if_missing=False)
-        repo_type = OneOf(BACKENDS.keys())
+        repo_type = OneOf(supported_backends)
         if edit:
             user = All(Int(not_empty=True), ValidRepoUser)
         chained_validators = [ValidPerms]
     return _RepoForm
 def RepoForkForm(edit=False, old_data={}):
+def RepoForkForm(edit=False, old_data={}, supported_backends=BACKENDS.keys()):
     class _RepoForkForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         fork_name = All(UnicodeString(strip=True, min=1, not_empty=True), ValidRepoName(edit, old_data))
         description = UnicodeString(strip=True, min=1, not_empty=True)
         private = StringBoolean(if_missing=False)
-        repo_type = All(ValidForkType(old_data), OneOf(BACKENDS.keys()))
+        repo_type = All(ValidForkType(old_data), OneOf(supported_backends))
     return _RepoForkForm
 def RepoSettingsForm(edit=False, old_data={}):
     class _RepoForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False

rhodecode/model/scm.py

➞

Show inline comments

@@ @@ -21,12 +21,13 @@ @@
 Created on April 9, 2010
 Model for RhodeCode
 @author: marcink
 """
 from beaker.cache import cache_region, region_invalidate
 from mercurial import ui
 from rhodecode import BACKENDS
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import HasRepoPermissionAny
 from rhodecode.lib.utils import get_repos
 from rhodecode.model import meta
 from rhodecode.model.db import Repository, User, RhodeCodeUi, CacheInvalidation
 from rhodecode.model.caching_query import FromCache
@@ @@ -81,16 +82,16 @@ class ScmModel(object): @@
                     raise RepositoryError('Duplicate repository name %s '
                                     'found in %s' % (name, path))
                 else:
                     klass = get_backend(path[0])
                     if path[0] == 'hg':
+                    if path[0] == 'hg' and path[0] in BACKENDS.keys():
                         repos_list[name] = klass(path[1], baseui=baseui)
                     if path[0] == 'git':
+                    if path[0] == 'git' and path[0] in BACKENDS.keys():
                         repos_list[name] = klass(path[1])
             except OSError:
                 continue
         return repos_list
@@ @@ -149,12 +150,13 @@ class ScmModel(object): @@
             repo_path = os.path.join(self.repos_path, repo_name)
             alias = get_scm(repo_path)[0]
             log.debug('Creating instance of %s repository', alias)
             backend = get_backend(alias)
             #TODO: get the baseui from somewhere for this
             if alias == 'hg':
                 repo = backend(repo_path, create=False, baseui=None)
                 #skip hidden web repository
                 if repo._get_hidden():
                     return
             else:

0 comments (0 inline, 0 general)