Changeset - eb489bf9d7c7
[Not reviewed]
beta
0 1 0
Marcin Kuzminski - 14 years ago 2011-05-26 01:38:40
marcin@python-works.com
#47 fixed group aware on adding new repo
1 file changed with 18 insertions and 3 deletions:
0 comments (0 inline, 0 general)
rhodecode/model/repo.py
Show inline comments
 
@@ -202,12 +202,15 @@ class RepoModel(BaseModel):
 
                org_name = repo_name = str(form_data['repo_name'])
 
            new_repo = Repository()
 
            new_repo.enable_statistics = False
 
            for k, v in form_data.items():
 
                if k == 'repo_name':
 
                    v = repo_name
 
                if k == 'repo_group':
 
                    k = 'group_id'
 

	
 
                setattr(new_repo, k, v)
 

	
 
            if fork:
 
                parent_repo = self.sa.query(Repository)\
 
                        .filter(Repository.repo_name == org_name).scalar()
 
                new_repo.fork = parent_repo
 
@@ -235,12 +238,13 @@ class RepoModel(BaseModel):
 
                .get_by_username('default', cache=False).user_id
 

	
 
            self.sa.add(repo_to_perm)
 

	
 
            if not just_db:
 
                self.__create_repo(repo_name, form_data['repo_type'],
 
                                   form_data['repo_group'],
 
                                   form_data['clone_uri'])
 

	
 
            self.sa.commit()
 

	
 
            #now automatically start following this repository as owner
 
            from rhodecode.model.scm import ScmModel
 
@@ -299,21 +303,32 @@ class RepoModel(BaseModel):
 
            self.sa.commit()
 
        except:
 
            log.error(traceback.format_exc())
 
            self.sa.rollback()
 
            raise
 

	
 
    def __create_repo(self, repo_name, alias, clone_uri=False):
 
    def __create_repo(self, repo_name, alias, new_parent_id, clone_uri=False):
 
        """
 
        makes repository on filesystem
 
        makes repository on filesystem it's group aware
 

	
 
        :param repo_name:
 
        :param alias:
 
        :param parent_id:
 
        :param clone_uri:
 
        """
 
        from rhodecode.lib.utils import check_repo
 
        repo_path = os.path.join(self.repos_path, repo_name)
 

	
 

	
 
        if new_parent_id:
 
            paths = Group.get(new_parent_id).full_path.split(Group.url_sep())
 
            new_parent_path = os.sep.join(paths)
 
        else:
 
            new_parent_path = ''
 

	
 
        repo_path = os.path.join(self.repos_path, new_parent_path, repo_name)
 

	
 
        if check_repo(repo_name, self.repos_path):
 
            log.info('creating repo %s in %s @ %s', repo_name, repo_path,
 
                    clone_uri)
 
            backend = get_backend(alias)
 
            backend(repo_path, create=True, src_url=clone_uri)
 

	
0 comments (0 inline, 0 general)