another major refactoring with session management

--HG--
branch : beta

6 files changed, 5 insertions, 36 deletions

diff --git a/rhodecode/model/comment.py b/rhodecode/model/comment.py
index e835469f..d0fdcef8 100644
--- a/rhodecode/model/comment.py
+++ b/rhodecode/model/comment.py
@@ -109,7 +109,6 @@ class ChangesetCommentsModel(BaseModel):
                                     recipients=mention_recipients,
                                     type_=Notification.TYPE_CHANGESET_COMMENT)
 
-            self.sa.commit()
             return comment
 
     def delete(self, comment):
diff --git a/rhodecode/model/permission.py b/rhodecode/model/permission.py
index c4899f53..d330e6bf 100644
--- a/rhodecode/model/permission.py
+++ b/rhodecode/model/permission.py
@@ -70,8 +70,8 @@ class PermissionModel(BaseModel):
 
     def update(self, form_result):
         perm_user = self.sa.query(User)\
-                .filter(User.username ==
-                        form_result['perm_user_name']).scalar()
+                        .filter(User.username ==
+                                form_result['perm_user_name']).scalar()
         u2p = self.sa.query(UserToPerm).filter(UserToPerm.user ==
                                                perm_user).all()
         if len(u2p) != 3:
@@ -110,8 +110,6 @@ class PermissionModel(BaseModel):
                 perm_user.active = bool(form_result['anonymous'])
                 self.sa.add(perm_user)
 
-            self.sa.commit()
         except (DatabaseError,):
             log.error(traceback.format_exc())
-            self.sa.rollback()
             raise
diff --git a/rhodecode/model/repo_permission.py b/rhodecode/model/repo_permission.py
index a1e9cd94..45ebd011 100644
--- a/rhodecode/model/repo_permission.py
+++ b/rhodecode/model/repo_permission.py
@@ -50,13 +50,11 @@ class RepositoryPermissionModel(BaseModel):
             p.repository = repository
             p.permission = permission
             self.sa.add(p)
-        self.sa.commit()
 
     def delete_user_permission(self, repository, user):
         current = self.get_user_permission(repository, user)
         if current:
             self.sa.delete(current)
-            self.sa.commit()
 
     def update_or_delete_user_permission(self, repository, user, permission):
         if permission:
diff --git a/rhodecode/model/repos_group.py b/rhodecode/model/repos_group.py
index 7bf8122f..7dcf8d79 100644
--- a/rhodecode/model/repos_group.py
+++ b/rhodecode/model/repos_group.py
@@ -111,14 +111,12 @@ class ReposGroupModel(BaseModel):
             new_repos_group.group_name = new_repos_group.get_new_name(form_data['group_name'])
 
             self.sa.add(new_repos_group)
-
+            self.sa.flush()
             self.__create_group(new_repos_group.group_name)
 
-            self.sa.commit()
             return new_repos_group
         except:
             log.error(traceback.format_exc())
-            self.sa.rollback()
             raise
 
     def update(self, repos_group_id, form_data):
@@ -126,7 +124,7 @@ class ReposGroupModel(BaseModel):
         try:
             repos_group = RepoGroup.get(repos_group_id)
             old_path = repos_group.full_path
-                
+
             # change properties
             repos_group.group_description = form_data['group_description']
             repos_group.parent_group = RepoGroup.get(form_data['group_parent_id'])
@@ -144,11 +142,9 @@ class ReposGroupModel(BaseModel):
                 r.repo_name = r.get_new_name(r.just_name)
                 self.sa.add(r)
 
-            self.sa.commit()
             return repos_group
         except:
             log.error(traceback.format_exc())
-            self.sa.rollback()
             raise
 
     def delete(self, users_group_id):
@@ -156,8 +152,6 @@ class ReposGroupModel(BaseModel):
             users_group = RepoGroup.get(users_group_id)
             self.sa.delete(users_group)
             self.__delete_group(users_group)
-            self.sa.commit()
         except:
             log.error(traceback.format_exc())
-            self.sa.rollback()
             raise
diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py
index a48127bd..7912ac28 100644
--- a/rhodecode/model/user.py
+++ b/rhodecode/model/user.py
@@ -129,13 +129,10 @@ class UserModel(BaseModel):
             new_user.ldap_dn = safe_unicode(ldap_dn) if ldap_dn else None
             new_user.name = name
             new_user.lastname = lastname
-
             self.sa.add(new_user)
-            self.sa.commit()
             return new_user
         except (DatabaseError,):
             log.error(traceback.format_exc())
-            self.sa.rollback()
             raise
 
 
diff --git a/rhodecode/model/users_group.py b/rhodecode/model/users_group.py
index 00d84264..e7d4a63b 100644
--- a/rhodecode/model/users_group.py
+++ b/rhodecode/model/users_group.py
@@ -43,22 +43,7 @@ class UsersGroupModel(BaseModel):
     def get_by_name(self, name, cache=False, case_insensitive=False):
         return UsersGroup.get_by_group_name(name, cache, case_insensitive)
 
-    def create(self, form_data):
-        try:
-            new_users_group = UsersGroup()
-            for k, v in form_data.items():
-                setattr(new_users_group, k, v)
-
-            self.sa.add(new_users_group)
-            self.sa.commit()
-            return new_users_group
-        except:
-            log.error(traceback.format_exc())
-            self.sa.rollback()
-            raise
-
-
-    def create_(self, name, active=True):
+    def create(self, name, active=True):
         new = UsersGroup()
         new.users_group_name = name
         new.users_group_active = active
@@ -84,9 +69,7 @@ class UsersGroupModel(BaseModel):
             user.group_member.append(users_group_member)
 
             self.sa.add(users_group_member)
-            self.sa.commit()
             return users_group_member
         except:
             log.error(traceback.format_exc())
-            self.sa.rollback()
             raise