Changeset - ff22ffbac5a3
Parent rev.
Child rev.
[Not reviewed]
stable
0 2 0
Mads Kiilerich - 3 years ago 2022-12-21 23:15:38
mads@kiilerich.com
repo group: clarify comments
2 files changed with 8 insertions and 12 deletions:
kallithea/model/db.py
2
2
kallithea/model/repo_group.py
6
10
0 comments (0 inline, 0 general)
kallithea/model/db.py
➞
Show inline comments
 
@@ -904,25 +904,25 @@ class Repository(meta.Base, BaseDbModel)
 
        Index('r_repo_name_idx', 'repo_name'),
 
        _table_args_default_dict,
 
    )
 

			




	
	
	
		
 
    DEFAULT_CLONE_URI = '{scheme}://{user}@{netloc}/{repo}'

			




	
	
	
		
 
    DEFAULT_CLONE_SSH = 'ssh://{system_user}@{hostname}/{repo}'

			




	
	
	
		
 

			




	
	
	
		
 
    STATE_CREATED = 'repo_state_created'

			




	
	
	
		
 
    STATE_PENDING = 'repo_state_pending'

			




	
	
	
		
 
    STATE_ERROR = 'repo_state_error'

			




	
	
	
		
 

			




	
	
	
		
 
    repo_id = Column(Integer(), primary_key=True)

			




	
	
	
		
 
    repo_name = Column(Unicode(255), nullable=False, unique=True)

			




	
	
	
		
 
    repo_name = Column(Unicode(255), nullable=False, unique=True)  # full path, must be updated (based on get_new_name) when name or path changes

			




	
	
	
		
 
    repo_state = Column(String(255), nullable=False)

			




	
	
	
		
 

			




	
	
	
		
 
    clone_uri = Column(String(255), nullable=True) # FIXME: not nullable?

			




	
	
	
		
 
    repo_type = Column(String(255), nullable=False) # 'hg' or 'git'

			




	
	
	
		
 
    owner_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False)

			




	
	
	
		
 
    private = Column(Boolean(), nullable=False)

			




	
	
	
		
 
    enable_statistics = Column("statistics", Boolean(), nullable=False, default=True)

			




	
	
	
		
 
    enable_downloads = Column("downloads", Boolean(), nullable=False, default=True)

			




	
	
	
		
 
    description = Column(Unicode(10000), nullable=False)

			




	
	
	
		
 
    created_on = Column(DateTime(timezone=False), nullable=False, default=datetime.datetime.now)

			




	
	
	
		
 
    updated_on = Column(DateTime(timezone=False), nullable=False, default=datetime.datetime.now)

			




	
	
	
		
 
    _landing_revision = Column("landing_revision", String(255), nullable=False)

			




	
	
		
 
@@ -1328,25 +1328,25 @@ class Repository(meta.Base, BaseDbModel)

			




	
	
	
		
 
        )

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class RepoGroup(meta.Base, BaseDbModel):

			




	
	
	
		
 
    __tablename__ = 'groups'

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        _table_args_default_dict,

			




	
	
	
		
 
    )

			




	
	
	
		
 

			




	
	
	
		
 
    SEP = ' » '

			




	
	
	
		
 

			




	
	
	
		
 
    group_id = Column(Integer(), primary_key=True)

			




	
	
	
		
 
    group_name = Column(Unicode(255), nullable=False, unique=True) # full path

			




	
	
	
		
 
    group_name = Column(Unicode(255), nullable=False, unique=True)  # full path, must be updated (based on get_new_name) when name or path changes

			




	
	
	
		
 
    parent_group_id = Column('group_parent_id', Integer(), ForeignKey('groups.group_id'), nullable=True)

			




	
	
	
		
 
    group_description = Column(Unicode(10000), nullable=False)

			




	
	
	
		
 
    owner_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False)

			




	
	
	
		
 
    created_on = Column(DateTime(timezone=False), nullable=False, default=datetime.datetime.now)

			




	
	
	
		
 

			




	
	
	
		
 
    repo_group_to_perm = relationship('UserRepoGroupToPerm', cascade='all', order_by='UserRepoGroupToPerm.group_to_perm_id')

			




	
	
	
		
 
    users_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')

			




	
	
	
		
 
    parent_group = relationship('RepoGroup', remote_side=group_id)

			




	
	
	
		
 
    owner = relationship('User')

			




	
	
	
		
 

			




	
	
	
		
 
    @classmethod

			




	
	
	
		
 
    def query(cls, sorted=False):

			




        

    


    
    

    

        

                

                    kallithea/model/repo_group.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -269,63 +269,59 @@ class RepoGroupModel(object):

			




	
	
	
		
 
                        _set_perm_group(obj, users_group=member, perm=perm)

			




	
	
	
		
 
            updates.append(obj)

			




	
	
	
		
 
            # if it's not recursive call for all,repos,groups

			




	
	
	
		
 
            # break the loop and don't proceed with other changes

			




	
	
	
		
 
            if recursive not in ['all', 'repos', 'groups']:

			




	
	
	
		
 
                break

			




	
	
	
		
 

			




	
	
	
		
 
        return updates

			




	
	
	
		
 

			




	
	
	
		
 
    def update(self, repo_group, repo_group_args):

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            repo_group = db.RepoGroup.guess_instance(repo_group)

			




	
	
	
		
 
            old_path = repo_group.full_path

			




	
	
	
		
 
            old_path = repo_group.full_path  # aka .group_name

			




	
	
	
		
 

			




	
	
	
		
 
            # change properties

			




	
	
	
		
 
            if 'owner' in repo_group_args:

			




	
	
	
		
 
                repo_group.owner = db.User.get_by_username(repo_group_args['owner'])

			




	
	
	
		
 
            if 'group_description' in repo_group_args:

			




	
	
	
		
 
                repo_group.group_description = repo_group_args['group_description']

			




	
	
	
		
 
            if 'parent_group_id' in repo_group_args:

			




	
	
	
		
 
                assert repo_group_args['parent_group_id'] != '-1', repo_group_args  # RepoGroupForm should have converted to None

			




	
	
	
		
 
                repo_group.parent_group = db.RepoGroup.get(repo_group_args['parent_group_id'])

			




	
	
	
		
 
                repo_group.group_name = repo_group.get_new_name(repo_group.name)

			




	
	
	
		
 
            if 'group_name' in repo_group_args:

			




	
	
	
		
 
                group_name = repo_group_args['group_name']

			




	
	
	
		
 
                if kallithea.lib.utils2.repo_name_slug(group_name) != group_name:

			




	
	
	
		
 
                    raise Exception('invalid repo group name %s' % group_name)

			




	
	
	
		
 
                repo_group.group_name = repo_group.get_new_name(group_name)

			




	
	
	
		
 
            new_path = repo_group.full_path

			




	
	
	
		
 
            meta.Session().add(repo_group)

			




	
	
	
		
 

			




	
	
	
		
 
            # iterate over all members of this groups and do fixes

			




	
	
	
		
 
            # if obj is a repoGroup also fix the name of the group according

			




	
	
	
		
 
            # to the parent

			




	
	
	
		
 
            # if obj is a Repo fix it's name

			




	
	
	
		
 
            # this can be potentially heavy operation

			




	
	
	
		
 
            # Iterate over all members of this repo group and update the full

			




	
	
	
		
 
            # path (repo_name and group_name) based on the (already updated)

			




	
	
	
		
 
            # full path of the parent.

			




	
	
	
		
 
            # This can potentially be a heavy operation.

			




	
	
	
		
 
            for obj in repo_group.recursive_groups_and_repos():

			




	
	
	
		
 
                # set the value from it's parent

			




	
	
	
		
 
                if isinstance(obj, db.RepoGroup):

			




	
	
	
		
 
                    new_name = obj.get_new_name(obj.name)

			




	
	
	
		
 
                    log.debug('Fixing group %s to new name %s'

			




	
	
	
		
 
                                % (obj.group_name, new_name))

			




	
	
	
		
 
                    obj.group_name = new_name

			




	
	
	
		
 
                elif isinstance(obj, db.Repository):

			




	
	
	
		
 
                    # we need to get all repositories from this new group and

			




	
	
	
		
 
                    # rename them accordingly to new group path

			




	
	
	
		
 
                    new_name = obj.get_new_name(obj.just_name)

			




	
	
	
		
 
                    log.debug('Fixing repo %s to new name %s'

			




	
	
	
		
 
                                % (obj.repo_name, new_name))

			




	
	
	
		
 
                    obj.repo_name = new_name

			




	
	
	
		
 

			




	
	
	
		
 
            # Rename in file system

			




	
	
	
		
 
            self._rename_group(old_path, new_path)

			




	
	
	
		
 

			




	
	
	
		
 
            return repo_group

			




	
	
	
		
 
        except Exception:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            raise

			




	
	
	
		
 

			




	
	
	
		
 
    def delete(self, repo_group, force_delete=False):

			




	
	
	
		
 
        repo_group = db.RepoGroup.guess_instance(repo_group)

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            meta.Session().delete(repo_group)

			




	
	
	
		
 
            self._delete_group(repo_group, force_delete)

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.