white space cleanup

--HG--
branch : beta

19 files changed, 37 insertions, 37 deletions

diff --git a/rhodecode/controllers/changeset.py b/rhodecode/controllers/changeset.py
index f75020a4..2e334ee0 100644
--- a/rhodecode/controllers/changeset.py
+++ b/rhodecode/controllers/changeset.py
@@ -382,7 +382,7 @@ class ChangesetController(BaseRepoController):
             revision=revision,
             f_path=request.POST.get('f_path'),
             line_no=request.POST.get('line'),
-            status_change=(ChangesetStatus.get_status_lbl(status) 
+            status_change=(ChangesetStatus.get_status_lbl(status)
                            if status and change_status else None)
         )
 
diff --git a/rhodecode/controllers/pullrequests.py b/rhodecode/controllers/pullrequests.py
index 1a10507a..4e861b1c 100644
--- a/rhodecode/controllers/pullrequests.py
+++ b/rhodecode/controllers/pullrequests.py
@@ -62,7 +62,7 @@ class PullrequestsController(BaseRepoController):
                          k, v in repo.branches.iteritems()], _("Branches"))
         bookmarks_group = ([('book:%s:%s' % (k, v), k) for
                          k, v in repo.bookmarks.iteritems()], _("Bookmarks"))
-        tags_group = ([('tag:%s:%s' % (k, v), k) for 
+        tags_group = ([('tag:%s:%s' % (k, v), k) for
                          k, v in repo.tags.iteritems()], _("Tags"))
 
         hist_l.append(bookmarks_group)
@@ -242,7 +242,7 @@ class PullrequestsController(BaseRepoController):
             pull_request=pull_request_id,
             f_path=request.POST.get('f_path'),
             line_no=request.POST.get('line'),
-            status_change=(ChangesetStatus.get_status_lbl(status) 
+            status_change=(ChangesetStatus.get_status_lbl(status)
                            if status and change_status else None)
         )
 
diff --git a/rhodecode/lib/base.py b/rhodecode/lib/base.py
index cf57a5f6..cb3cf292 100644
--- a/rhodecode/lib/base.py
+++ b/rhodecode/lib/base.py
@@ -216,4 +216,4 @@ class BaseRepoController(BaseController):
             # some globals counter for menu
             c.repository_followers = self.scm_model.get_followers(dbr)
             c.repository_forks = self.scm_model.get_forks(dbr)
-            c.repository_pull_requests = self.scm_model.get_pull_requests(dbr)
\ No newline at end of file
+            c.repository_pull_requests = self.scm_model.get_pull_requests(dbr)
diff --git a/rhodecode/lib/dbmigrate/schema/db_1_4_0.py b/rhodecode/lib/dbmigrate/schema/db_1_4_0.py
index 707ae5de..d90e8578 100644
--- a/rhodecode/lib/dbmigrate/schema/db_1_4_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_1_4_0.py
@@ -25,4 +25,4 @@
 
 #TODO: replace that will db.py content after 1.5 Release
 
-from rhodecode.model.db import *
\ No newline at end of file
+from rhodecode.model.db import *
diff --git a/rhodecode/lib/diffs.py b/rhodecode/lib/diffs.py
index af6a5553..51867674 100644
--- a/rhodecode/lib/diffs.py
+++ b/rhodecode/lib/diffs.py
@@ -566,7 +566,7 @@ class InMemoryBundleRepo(bundlerepository):
 
 def differ(org_repo, org_ref, other_repo, other_ref, discovery_data=None):
     """
-    General differ between branches, bookmarks or separate but releated 
+    General differ between branches, bookmarks or separate but releated
     repositories
 
     :param org_repo:
diff --git a/rhodecode/lib/vcs/nodes.py b/rhodecode/lib/vcs/nodes.py
index 8eba50ae..c8e360df 100644
--- a/rhodecode/lib/vcs/nodes.py
+++ b/rhodecode/lib/vcs/nodes.py
@@ -432,7 +432,7 @@ class RemovedFileNode(FileNode):
     RemovedFileNodeError.
     """
     ALLOWED_ATTRIBUTES = [
-        'name', 'path', 'state', 'is_root', 'is_file', 'is_dir', 'kind', 
+        'name', 'path', 'state', 'is_root', 'is_file', 'is_dir', 'kind',
         'added', 'changed', 'not_changed', 'removed'
     ]
 
diff --git a/rhodecode/lib/vcs/utils/hgcompat.py b/rhodecode/lib/vcs/utils/hgcompat.py
index 84794c5f..04ab0651 100644
--- a/rhodecode/lib/vcs/utils/hgcompat.py
+++ b/rhodecode/lib/vcs/utils/hgcompat.py
@@ -12,4 +12,4 @@ from mercurial.match import match
 from mercurial.mdiff import diffopts
 from mercurial.node import hex
 from mercurial.encoding import tolocal
-from mercurial import discovery
\ No newline at end of file
+from mercurial import discovery
diff --git a/rhodecode/model/changeset_status.py b/rhodecode/model/changeset_status.py
index 8f523d05..95018d16 100644
--- a/rhodecode/model/changeset_status.py
+++ b/rhodecode/model/changeset_status.py
@@ -120,7 +120,7 @@ class ChangesetStatusModel(BaseModel):
 
         if revision:
             new_status = _create_status(user=user, repo=repo, status=status,
-                           comment=comment, revision=revision, 
+                           comment=comment, revision=revision,
                            pull_request=None)
             self.sa.add(new_status)
             return new_status
diff --git a/rhodecode/model/comment.py b/rhodecode/model/comment.py
index 597f8bc7..a3f67b26 100644
--- a/rhodecode/model/comment.py
+++ b/rhodecode/model/comment.py
@@ -59,7 +59,7 @@ class ChangesetCommentsModel(BaseModel):
                f_path=None, line_no=None, status_change=None):
         """
         Creates new comment for changeset or pull request.
-        IF status_change is not none this comment is associated with a 
+        IF status_change is not none this comment is associated with a
         status change of changeset or changesets associated with pull request
 
         :param text:
diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py
index ac1a1866..855c5f18 100644
--- a/rhodecode/model/user.py
+++ b/rhodecode/model/user.py
@@ -610,4 +610,4 @@ class UserModel(BaseModel):
         user = self._get_user(user)
         obj = UserEmailMap.query().get(email_id)
         if obj:
-            self.sa.delete(obj)
\ No newline at end of file
+            self.sa.delete(obj)
diff --git a/rhodecode/templates/admin/users/user_edit.html b/rhodecode/templates/admin/users/user_edit.html
index d60fd227..e5281ad9 100644
--- a/rhodecode/templates/admin/users/user_edit.html
+++ b/rhodecode/templates/admin/users/user_edit.html
@@ -209,7 +209,7 @@
     <div class="title">
         <h5>${_('Email addresses')}</h5>
     </div>
-    
+
     <div class="emails_wrap">
       <table class="noborder">
       %for em in c.user_email_map:
@@ -221,13 +221,13 @@
                   ${h.hidden('del_email',em.email_id)}
                   ${h.submit('remove_',_('delete'),id="remove_email_%s" % em.email_id,
                   class_="delete_icon action_button", onclick="return  confirm('"+_('Confirm to delete this email: %s') % em.email+"');")}
-              ${h.end_form()}            
+              ${h.end_form()}
             </td>
         </tr>
       %endfor
       </table>
     </div>
-    
+
     ${h.form(url('user_emails', id=c.user.user_id),method='put')}
     <div class="form">
         <!-- fields -->
@@ -239,7 +239,7 @@
                 <div class="input">
                     ${h.text('new_email', class_='medium')}
                 </div>
-             </div>        
+             </div>
             <div class="buttons">
               ${h.submit('save',_('Add'),class_="ui-button")}
               ${h.reset('reset',_('Reset'),class_="ui-button")}
diff --git a/rhodecode/templates/branches/branches.html b/rhodecode/templates/branches/branches.html
index 503b151e..c237c69c 100644
--- a/rhodecode/templates/branches/branches.html
+++ b/rhodecode/templates/branches/branches.html
@@ -44,7 +44,7 @@ YUE.on('compare_branches','click',function(e){
 		                   .replace('__OTHER__',other.value);
 		window.location=u;
 	}
-	
+
 })
 // main table sorting
 var myColumnDefs = [
diff --git a/rhodecode/templates/changeset/changeset_file_comment.html b/rhodecode/templates/changeset/changeset_file_comment.html
index 0adba828..8dd9d69c 100644
--- a/rhodecode/templates/changeset/changeset_file_comment.html
+++ b/rhodecode/templates/changeset/changeset_file_comment.html
@@ -18,9 +18,9 @@
            <div  style="float:left" class="changeset-status-container">
              <div style="float:left;padding:0px 2px 0px 2px"><span style="font-size: 18px;">&rsaquo;</span></div>
              <div title="${_('Changeset status')}" class="changeset-status-lbl"> ${co.status_change.status_lbl}</div>
-             <div class="changeset-status-ico"><img src="${h.url(str('/images/icons/flag_status_%s.png' % co.status_change.status))}" /></div>             
+             <div class="changeset-status-ico"><img src="${h.url(str('/images/icons/flag_status_%s.png' % co.status_change.status))}" /></div>
            </div>
-        %endif      
+        %endif
       %if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id:
         <div class="buttons">
           <span onClick="deleteComment(${co.comment_id})" class="delete-comment ui-btn">${_('Delete')}</span>
@@ -117,15 +117,15 @@
           		_('Use @username inside this text to send notification to this RhodeCode user')))|n}
                 | <span class="tooltip" title="${_('Check this to change current status of code-review for this changeset')}"> ${_('change status')}
                   <input style="vertical-align: bottom;margin-bottom:-2px" id="show_changeset_status_box" type="checkbox" name="change_changeset_status" />
-                  </span> 
+                  </span>
             </div>
             <div id="status_block_container" class="status-block" style="display:none">
                 %for status,lbl in c.changeset_statuses:
                     <div class="">
                         <img src="${h.url('/images/icons/flag_status_%s.png' % status)}" /> <input ${'checked="checked"' if status == cur_status else ''}" type="radio" name="changeset_status" value="${status}"> <label>${lbl}</label>
-                    </div>                    
+                    </div>
                 %endfor
-            </div>                 
+            </div>
             <div class="mentions-container" id="mentions_container"></div>
              ${h.textarea('text')}
         </div>
@@ -139,17 +139,17 @@
 <script>
 YUE.onDOMReady(function () {
    MentionsAutoComplete('text', 'mentions_container', _USERS_AC_DATA, _GROUPS_AC_DATA);
-   
+
    // changeset status box listener
    YUE.on(YUD.get('show_changeset_status_box'),'change',function(e){
        if(e.currentTarget.checked){
-           YUD.setStyle('status_block_container','display','');  
+           YUD.setStyle('status_block_container','display','');
        }
        else{
            YUD.setStyle('status_block_container','display','none');
        }
    })
-   
+
 });
 </script>
 </%def>
diff --git a/rhodecode/templates/changeset/diff_block.html b/rhodecode/templates/changeset/diff_block.html
index 1b37823f..0d8fecf9 100644
--- a/rhodecode/templates/changeset/diff_block.html
+++ b/rhodecode/templates/changeset/diff_block.html
@@ -44,7 +44,7 @@
 
   %for op,filenode_path,diff in change:
     <div id="${h.FID('',filenode_path)}_target" style="clear:both;margin-top:25px"></div>
-    <div id="${h.FID('',filenode_path)}" class="diffblock  margined comm">      
+    <div id="${h.FID('',filenode_path)}" class="diffblock  margined comm">
       <div class="code-header">
           <div class="changeset_header">
               <div class="changeset_file">
@@ -58,4 +58,4 @@
         </div>
     </div>
   %endfor
-</%def>
\ No newline at end of file
+</%def>
diff --git a/rhodecode/templates/email_templates/changeset_comment.html b/rhodecode/templates/email_templates/changeset_comment.html
index 90db541b..8ef1a949 100644
--- a/rhodecode/templates/email_templates/changeset_comment.html
+++ b/rhodecode/templates/email_templates/changeset_comment.html
@@ -8,5 +8,5 @@ ${body}
 % if status_change is not None:
 <div>
     New status -> ${status_change}
-</div>    
-% endif
\ No newline at end of file
+</div>
+% endif
diff --git a/rhodecode/templates/pullrequests/pullrequest_show.html b/rhodecode/templates/pullrequests/pullrequest_show.html
index 94e42560..f3063731 100644
--- a/rhodecode/templates/pullrequests/pullrequest_show.html
+++ b/rhodecode/templates/pullrequests/pullrequest_show.html
@@ -19,20 +19,20 @@
     <div class="title">
         ${self.breadcrumbs()}
     </div>
-    
+
     <h3>${_('Title')}: ${c.pull_request.title}</h3>
     <div class="changeset-status-container" style="float:left;padding:0px 20px 20px 20px">
         %if c.current_changeset_status:
           <div title="${_('Changeset status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.current_changeset_status)}]</div>
           <div class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" /></div>
         %endif
-    </div>    
+    </div>
     <div style="padding:4px">
       <div>${h.fmt_date(c.pull_request.created_on)}</div>
     </div>
-    
+
     ##DIFF
-    
+
     <div class="table">
         <div id="body" class="diffblock">
             <div style="white-space:pre-wrap;padding:5px">${h.literal(c.pull_request.description)}</div>
@@ -72,7 +72,7 @@
     ## render comments main comments form and it status
     ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id),
                        c.current_changeset_status)}
-    
+
 </div>
 
 <script type="text/javascript">
diff --git a/rhodecode/templates/pullrequests/pullrequest_show_all.html b/rhodecode/templates/pullrequests/pullrequest_show_all.html
index 2873ee36..24f0ab71 100644
--- a/rhodecode/templates/pullrequests/pullrequest_show_all.html
+++ b/rhodecode/templates/pullrequests/pullrequest_show_all.html
@@ -19,11 +19,11 @@
     <div class="title">
         ${self.breadcrumbs()}
     </div>
-    
+
     %for pr in c.pull_requests:
         <a href="${h.url('pullrequest_show',repo_name=c.repo_name,pull_request_id=pr.pull_request_id)}">#${pr.pull_request_id}</a>
     %endfor
-    
+
 </div>
 
 <script type="text/javascript"></script>
diff --git a/rhodecode/tests/__init__.py b/rhodecode/tests/__init__.py
index aeba1336..7c7c99d7 100644
--- a/rhodecode/tests/__init__.py
+++ b/rhodecode/tests/__init__.py
@@ -28,7 +28,7 @@ from rhodecode import is_windows
 from rhodecode.model.meta import Session
 from rhodecode.model.db import User
 from rhodecode.tests.nose_parametrized import parameterized
- 
+
 import pylons.test
 
 
diff --git a/rhodecode/tests/functional/test_compare.py b/rhodecode/tests/functional/test_compare.py
index 30ebc99f..25016151 100644
--- a/rhodecode/tests/functional/test_compare.py
+++ b/rhodecode/tests/functional/test_compare.py
@@ -23,7 +23,7 @@ class TestCompareController(TestController):
         response.mustcontain('''<a href="/%s/changeset/9749bfbfc0d2eba208d7947de266303b67c87cda">r116:9749bfbfc0d2</a>''' % HG_REPO)
         response.mustcontain('''<a href="/%s/changeset/70d4cef8a37657ee4cf5aabb3bd9f68879769816">r115:70d4cef8a376</a>''' % HG_REPO)
         response.mustcontain('''<a href="/%s/changeset/c5ddebc06eaaba3010c2d66ea6ec9d074eb0f678">r112:c5ddebc06eaa</a>''' % HG_REPO)
-        
+
         ## files diff
         response.mustcontain('''<div class="node"><a href="/%s/compare/tag@%s...tag@%s#C--1c5cf9e91c12">docs/api/utils/index.rst</a></div>''' % (HG_REPO, tag1,  tag2))
         response.mustcontain('''<div class="node"><a href="/%s/compare/tag@%s...tag@%s#C--e3305437df55">test_and_report.sh</a></div>''' % (HG_REPO, tag1,  tag2))