kallithea Changeset - 758f64f3fbda

Changeset - 758f64f3fbda

Parent rev.

Child rev.

[Not reviewed]

beta

0 11 0

Marcin Kuzminski - 15 years ago 2010-11-05 21:55:30
marcin@python-works.com

extended repo creation by repo type. fixed fork creation to maintain repo type.

11 files changed with 59 insertions and 22 deletions:

rhodecode/controllers/settings.py

rhodecode/lib/base.py

rhodecode/lib/celerylib/tasks.py

rhodecode/lib/utils.py

rhodecode/model/forms.py

rhodecode/model/repo.py

rhodecode/templates/admin/repos/repo_add.html

rhodecode/templates/admin/repos/repo_add_create_repository.html

rhodecode/templates/admin/repos/repo_edit.html

rhodecode/templates/settings/repo_fork.html

rhodecode/tests/functional/test_login.py

0 comments (0 inline, 0 general)

rhodecode/controllers/settings.py

➞

Show inline comments

@@ @@ -148,13 +148,13 @@ class SettingsController(BaseController) @@
     def fork_create(self, repo_name):
         repo_model = RepoModel()
         c.repo_info = repo_model.get(repo_name)
         _form = RepoForkForm()()
+        _form = RepoForkForm(old_data={'repo_type':c.repo_info.repo_type})()
         form_result = {}
         try:
             form_result = _form.to_python(dict(request.POST))
             form_result.update({'repo_name':repo_name})
             repo_model.create_fork(form_result, c.rhodecode_user)
             h.flash(_('fork %s repository as %s task added') \

rhodecode/lib/base.py

➞

Show inline comments

@@ @@ -8,22 +8,22 @@ from pylons.templating import render_mak @@
 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.hg import _get_repos_cached, \
     _get_repos_switcher_cached
+from vcs import BACKENDS
 class BaseController(WSGIController):
     def __before__(self):
         c.rhodecode_version = __version__
         c.rhodecode_name = config['rhodecode_title']
         c.repo_name = get_repo_slug(request)
         c.cached_repo_list = _get_repos_cached()
         c.repo_switcher_list = _get_repos_switcher_cached(c.cached_repo_list)
+        c.backends = BACKENDS.keys()
         if c.repo_name:
             cached_repo = c.cached_repo_list.get(c.repo_name)
             if cached_repo:
                 c.repository_tags = cached_repo.tags
                 c.repository_branches = cached_repo.branches

rhodecode/lib/celerylib/tasks.py

➞

Show inline comments

@@ @@ -286,24 +286,26 @@ def send_email(recipients, subject, body @@
         log.error(traceback.format_exc())
         return False
     return True
 @task
 def create_repo_fork(form_data, cur_user):
     import os
     from rhodecode.model.repo import RepoModel
     from vcs import get_backend
     log = create_repo_fork.get_logger()
     repo_model = RepoModel(get_session())
     repo_model.create(form_data, cur_user, just_db=True, fork=True)
     repos_path = get_hg_ui_settings()['paths_root_path'].replace('*', '')
     repo_path = os.path.join(repos_path, form_data['repo_name'])
     repo_name = form_data['repo_name']
     repos_path = get_hg_ui_settings()['paths_root_path']
     repo_path = os.path.join(repos_path, repo_name)
     repo_fork_path = os.path.join(repos_path, form_data['fork_name'])
     alias = form_data['repo_type']
     MercurialRepository(str(repo_fork_path), True, clone_url=str(repo_path))
     log.info('creating repo fork %s as %s', repo_name, repo_path)
     backend = get_backend(alias)
     backend(str(repo_fork_path), create=True, src_url=str(repo_path))
 def __get_codes_stats(repo_name):
     LANGUAGES_EXTENSIONS = ['action', 'adp', 'ashx', 'asmx',
     'aspx', 'asx', 'axd', 'c', 'cfg', 'cfm', 'cpp', 'cs', 'diff', 'do', 'el',
     'erl', 'h', 'java', 'js', 'jsp', 'jspx', 'lisp', 'lua', 'm', 'mako', 'ml',
     'pas', 'patch', 'php', 'php3', 'php4', 'phtml', 'pm', 'py', 'rb', 'rst',

rhodecode/lib/utils.py

➞

Show inline comments

@@ @@ -342,14 +342,15 @@ def repo2db_mapper(initial_repo_list, re @@
         if not rm.get(name, cache=False):
             log.info('repository %s not found creating default', name)
             form_data = {
                          'repo_name':name,
                          'repo_type':repo.alias,
                          'description':repo.description if repo.description != 'unknown' else \
                                         'auto description for %s' % name,
                          'description':repo.description \
                             if repo.description != 'unknown' else \
                                         '%s repository' % name,
                          'private':False
+                         }
             rm.create(form_data, user, just_db=True)
     if remove_obsolete:

rhodecode/model/forms.py

➞

Show inline comments

@@ @@ -27,12 +27,13 @@ from pylons.i18n.translation import _ @@
 from rhodecode.lib.auth import check_password, get_crypt_password
 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
 import formencode
 import logging
 import os
 import rhodecode.lib.helpers as h
 log = logging.getLogger(__name__)
@@ @@ -144,12 +145,21 @@ def ValidRepoName(edit, old_data): @@
                                              value, state)
             return slug
     return _ValidRepoName
 def ValidForkType(old_data):
     class _ValidForkType(formencode.validators.FancyValidator):
         def to_python(self, value, state):
             if old_data['repo_type'] != value:
                 raise formencode.Invalid(_('Fork have to be the same type as original'), value, state)
             return value
     return _ValidForkType
 class ValidPerms(formencode.validators.FancyValidator):
     messages = {'perm_new_user_name':_('This username is not valid')}
     def to_python(self, value, state):
         perms_update = []
         perms_new = []
@@ @@ -289,13 +299,13 @@ def RepoForm(edit=False, old_data={}): @@
     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())
         if edit:
             user = All(Int(not_empty=True), ValidRepoUser)
         chained_validators = [ValidPerms]
     return _RepoForm
@@ @@ -303,13 +313,13 @@ def RepoForkForm(edit=False, old_data={} @@
     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()))
     return _RepoForkForm
 def RepoSettingsForm(edit=False, old_data={}):
     class _RepoForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False

rhodecode/model/repo.py

➞

Show inline comments

@@ @@ -18,13 +18,13 @@ @@
 # MA  02110-1301, USA.
 """
 Created on Jun 5, 2010
 model for handling repositories actions
 :author: marcink
 """
+from vcs.backends import get_repo, get_backend
 from datetime import datetime
 from pylons import app_globals as g
 from rhodecode.model.db import Repository, RepoToPerm, User, Permission
 from rhodecode.model.meta import Session
 from rhodecode.model.user import UserModel
 from rhodecode.model.caching_query import FromCache
@@ @@ -148,13 +148,13 @@ class RepoModel(object): @@
             repo_to_perm.repository_id = new_repo.repo_id
             repo_to_perm.user_id = UserModel(self.sa).get_by_username('default', cache=False).user_id
             self.sa.add(repo_to_perm)
             self.sa.commit()
             if not just_db:
                 self.__create_repo(repo_name)
+                self.__create_repo(repo_name, form_data['repo_type'])
         except:
             log.error(traceback.format_exc())
             self.sa.rollback()
             raise
     def create_fork(self, form_data, cur_user):
@@ @@ -179,19 +179,19 @@ class RepoModel(object): @@
             self.sa.commit()
         except:
             log.error(traceback.format_exc())
             self.sa.rollback()
             raise
     def __create_repo(self, repo_name):
+    def __create_repo(self, repo_name, alias):
         from rhodecode.lib.utils import check_repo
         repo_path = os.path.join(g.base_path, repo_name)
         if check_repo(repo_name, g.base_path):
             log.info('creating repo %s in %s', repo_name, repo_path)
             from vcs.backends.hg import MercurialRepository
             MercurialRepository(repo_path, create=True)
             backend = get_backend(alias)
             backend(repo_path, create=True)
     def __rename_repo(self, old, new):
         log.info('renaming repo from %s to %s', old, new)
         old_path = os.path.join(g.base_path, old)
         new_path = os.path.join(g.base_path, new)

rhodecode/templates/admin/repos/repo_add.html

➞

Show inline comments

@@ @@ -32,12 +32,20 @@ @@
 	            </div>
 	            <div class="input">
 	                ${h.text('repo_name',c.new_repo,class_="small")}
 	            </div>
              </div>
             <div class="field">
                 <div class="label">
                     <label for="repo_type">${_('Type')}:</label>
                 </div>
                 <div class="input">
                     ${h.select('repo_type','hg',c.backends,class_="small")}
                 </div>
              </div>
             <div class="field">
                 <div class="label label-textarea">
                     <label for="description">${_('Description')}:</label>
                 </div>
                 <div class="textarea text-area editor">
                     ${h.textarea('description',cols=23,rows=5)}
                 </div>

rhodecode/templates/admin/repos/repo_add_create_repository.html

➞

Show inline comments

@@ @@ -29,12 +29,20 @@ @@
 	            <div class="input">
 	                ${h.text('repo_name',c.new_repo,class_="small")}
 	                ${h.hidden('user_created','True')}
 	            </div>
              </div>
             <div class="field">
                 <div class="label">
                     <label for="repo_type">${_('Type')}:</label>
                 </div>
                 <div class="input">
                     ${h.select('repo_type','hg',c.backends,class_="small")}
                 </div>
              </div>
             <div class="field">
                 <div class="label label-textarea">
                     <label for="description">${_('Description')}:</label>
                 </div>
                 <div class="textarea text-area editor">
                     ${h.textarea('description',cols=23,rows=5)}
                 </div>

rhodecode/templates/admin/repos/repo_edit.html

➞

Show inline comments

@@ @@ -32,13 +32,20 @@ @@
                     <label for="repo_name">${_('Name')}:</label>
                 </div>
                 <div class="input input-medium">
                     ${h.text('repo_name',class_="small")}
                 </div>
              </div>
             <div class="field">
                 <div class="label">
                     <label for="repo_type">${_('Type')}:</label>
                 </div>
                 <div class="input">
                     ${h.select('repo_type','hg',c.backends,class_="small")}
                 </div>
              </div>
             <div class="field">
                 <div class="label label-textarea">
                     <label for="description">${_('Description')}:</label>
                 </div>
                 <div class="textarea text-area editor">
                     ${h.textarea('description',cols=23,rows=5)}

rhodecode/templates/settings/repo_fork.html

➞

Show inline comments

@@ @@ -27,12 +27,13 @@ @@
             <div class="field">
 	            <div class="label">
 	                <label for="repo_name">${_('Fork name')}:</label>
 	            </div>
 	            <div class="input">
 	                ${h.text('fork_name',class_="small")}
 	                ${h.hidden('repo_type',c.repo_info.repo_type)}
 	            </div>
              </div>
             <div class="field">
                 <div class="label label-textarea">
                     <label for="description">${_('Description')}:</label>
                 </div>

rhodecode/tests/functional/test_login.py

➞

Show inline comments

@@ @@ -14,23 +14,23 @@ class TestLoginController(TestController @@
         response = self.app.post(url(controller='login', action='index'),
                                  {'username':'test_admin',
                                   'password':'test12'})
         assert response.status == '302 Found', 'Wrong response code from login got %s' % response.status
         assert response.session['rhodecode_user'].username == 'test_admin', 'wrong logged in user'
         response = response.follow()
-        assert 'auto description for vcs_test' in response.body
+        assert 'vcs_test repository' in response.body
     def test_login_regular_ok(self):
         response = self.app.post(url(controller='login', action='index'),
                                  {'username':'test_regular',
                                   'password':'test12'})
         print response
         assert response.status == '302 Found', 'Wrong response code from login got %s' % response.status
         assert response.session['rhodecode_user'].username == 'test_regular', 'wrong logged in user'
         response = response.follow()
-        assert 'auto description for vcs_test' in response.body
+        assert 'vcs_test repository' in response.body
         assert '<a title="Admin" href="/_admin">' not in response.body
     def test_login_ok_came_from(self):
         test_came_from = '/_admin/users'
         response = self.app.post(url(controller='login', action='index', came_from=test_came_from),
                                  {'username':'test_admin',

0 comments (0 inline, 0 general)