Mercurial > kallithea

changeset 2150:a8c9c0094ddf beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
White space cleanup
author Marcin Kuzminski <marcin@python-works.com>
date Wed, 21 Mar 2012 19:19:22 +0200
parents 50aa7cb78cfe
children 12ceeda33339
files rhodecode/model/comment.py rhodecode/model/db.py rhodecode/model/user.py rhodecode/templates/admin/repos/repo_edit_perms.html rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html rhodecode/templates/index_base.html rhodecode/tests/functional/test_changeset_comments.py
diffstat 7 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/model/comment.py	Wed Mar 21 19:19:00 2012 +0200
+++ b/rhodecode/model/comment.py	Wed Mar 21 19:19:22 2012 +0200
@@ -63,6 +63,7 @@
         :param f_path:
         :param line_no:
         """
+
         if text:
             repo = Repository.get(repo_id)
             cs = repo.scm_instance.get_changeset(revision)
@@ -78,7 +79,6 @@
 
             self.sa.add(comment)
             self.sa.flush()
-
             # make notification
             line = ''
             if line_no:
--- a/rhodecode/model/db.py	Wed Mar 21 19:19:00 2012 +0200
+++ b/rhodecode/model/db.py	Wed Mar 21 19:19:22 2012 +0200
@@ -299,7 +299,7 @@
     user_followers = relationship('UserFollowing', primaryjoin='UserFollowing.follows_user_id==User.user_id', cascade='all')
     repo_to_perm = relationship('UserRepoToPerm', primaryjoin='UserRepoToPerm.user_id==User.user_id', cascade='all')
     repo_group_to_perm = relationship('UserRepoGroupToPerm', primaryjoin='UserRepoGroupToPerm.user_id==User.user_id', cascade='all')
-    
+
     group_member = relationship('UsersGroupMember', cascade='all')
 
     notifications = relationship('UserNotification',)
@@ -967,7 +967,7 @@
     __tablename__ = 'users_group_to_perm'
     __table_args__ = (
         UniqueConstraint('users_group_id', 'permission_id',),
-        {'extend_existing': True, 'mysql_engine':'InnoDB',  
+        {'extend_existing': True, 'mysql_engine':'InnoDB',
          'mysql_charset': 'utf8'}
     )
     users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
@@ -982,7 +982,7 @@
     __tablename__ = 'user_repo_group_to_perm'
     __table_args__ = (
         UniqueConstraint('user_id', 'group_id', 'permission_id'),
-        {'extend_existing': True, 'mysql_engine':'InnoDB',  
+        {'extend_existing': True, 'mysql_engine':'InnoDB',
          'mysql_charset': 'utf8'}
     )
 
@@ -1017,8 +1017,8 @@
 class Statistics(Base, BaseModel):
     __tablename__ = 'statistics'
     __table_args__ = (
-         UniqueConstraint('repository_id'), 
-         {'extend_existing': True, 'mysql_engine':'InnoDB',  
+         UniqueConstraint('repository_id'),
+         {'extend_existing': True, 'mysql_engine':'InnoDB',
           'mysql_charset': 'utf8'}
     )
     stat_id = Column("stat_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
--- a/rhodecode/model/user.py	Wed Mar 21 19:19:00 2012 +0200
+++ b/rhodecode/model/user.py	Wed Mar 21 19:19:22 2012 +0200
@@ -526,7 +526,7 @@
              .join((UsersGroupMember, UsersGroupRepoGroupToPerm.users_group_id == UsersGroupMember.users_group_id))\
              .filter(UsersGroupMember.user_id == uid)\
              .all()
-            
+
             for perm in user_repo_group_perms_from_users_groups:
                 g_k = perm.UsersGroupRepoGroupToPerm.group.group_name
                 print perm, g_k
--- a/rhodecode/templates/admin/repos/repo_edit_perms.html	Wed Mar 21 19:19:00 2012 +0200
+++ b/rhodecode/templates/admin/repos/repo_edit_perms.html	Wed Mar 21 19:19:22 2012 +0200
@@ -122,7 +122,7 @@
     		  ${c.users_groups_array|n},
     		  "${_('Group')}",
     		  "${_('members')}"
-    		);    
+    		);
 });
 
 </script>
--- a/rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html	Wed Mar 21 19:19:00 2012 +0200
+++ b/rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html	Wed Mar 21 19:19:22 2012 +0200
@@ -111,7 +111,7 @@
             ${c.users_groups_array|n},
             "${_('Group')}",
             "${_('members')}"
-          );    
+          );
 });
 
 </script>
--- a/rhodecode/templates/index_base.html	Wed Mar 21 19:19:00 2012 +0200
+++ b/rhodecode/templates/index_base.html	Wed Mar 21 19:19:22 2012 +0200
@@ -13,7 +13,7 @@
                     <span>${h.link_to(_('ADD REPOSITORY'),h.url('admin_settings_create_repository',parent_group=c.group.group_id))}</span>
                   %else:
                     <span>${h.link_to(_('ADD REPOSITORY'),h.url('admin_settings_create_repository'))}</span>
-                  %endif  
+                  %endif
                   </li>
                 </ul>
                 %endif
--- a/rhodecode/tests/functional/test_changeset_comments.py	Wed Mar 21 19:19:00 2012 +0200
+++ b/rhodecode/tests/functional/test_changeset_comments.py	Wed Mar 21 19:19:22 2012 +0200
@@ -49,7 +49,7 @@
         notification = Notification.query().all()[0]
 
         ID = ChangesetComment.query().first().comment_id
-        self.assertEqual(notification.type_, 
+        self.assertEqual(notification.type_,
                          Notification.TYPE_CHANGESET_COMMENT)
         sbj = (u'/vcs_test_hg/changeset/'
                '27cd5cce30c96924232dffcd24178a07ffeb5dfc#comment-%s' % ID)
@@ -86,7 +86,7 @@
 
         notification = Notification.query().all()[0]
         ID = ChangesetComment.query().first().comment_id
-        self.assertEqual(notification.type_, 
+        self.assertEqual(notification.type_,
                          Notification.TYPE_CHANGESET_COMMENT)
         sbj = (u'/vcs_test_hg/changeset/'
                '27cd5cce30c96924232dffcd24178a07ffeb5dfc#comment-%s' % ID)