diff --git a/rhodecode/controllers/feed.py b/rhodecode/controllers/feed.py --- a/rhodecode/controllers/feed.py +++ b/rhodecode/controllers/feed.py @@ -180,4 +180,3 @@ class FeedController(BaseRepoController) region_invalidate(_get_feed_from_cache, None, key) CacheInvalidation.set_valid(inv.cache_key) return _get_feed_from_cache(key) - diff --git a/rhodecode/lib/diffs.py b/rhodecode/lib/diffs.py --- a/rhodecode/lib/diffs.py +++ b/rhodecode/lib/diffs.py @@ -765,4 +765,4 @@ def differ(org_repo, org_ref, other_repo node2=org_repo[org_ref].node(), opts=opts)) - return '' \ No newline at end of file + return '' diff --git a/rhodecode/lib/ext_json.py b/rhodecode/lib/ext_json.py --- a/rhodecode/lib/ext_json.py +++ b/rhodecode/lib/ext_json.py @@ -119,4 +119,4 @@ if simplejson: elif stdlibjson: json = _json else: - raise ImportError('Could not find any json modules') \ No newline at end of file + raise ImportError('Could not find any json modules') diff --git a/rhodecode/templates/admin/repos/repo_edit.html b/rhodecode/templates/admin/repos/repo_edit.html --- a/rhodecode/templates/admin/repos/repo_edit.html +++ b/rhodecode/templates/admin/repos/repo_edit.html @@ -204,7 +204,7 @@ %for cache in c.repo_info.cache_keys: - ${cache.prefix or '-'} + ${cache.prefix or '-'} ${cache.cache_key} ${h.bool2icon(cache.cache_active)} diff --git a/rhodecode/templates/admin/users_groups/users_group_edit.html b/rhodecode/templates/admin/users_groups/users_group_edit.html --- a/rhodecode/templates/admin/users_groups/users_group_edit.html +++ b/rhodecode/templates/admin/users_groups/users_group_edit.html @@ -161,7 +161,7 @@ %else: ${_('No members yet')} - %endif + %endif diff --git a/rhodecode/templates/changelog/changelog.html b/rhodecode/templates/changelog/changelog.html --- a/rhodecode/templates/changelog/changelog.html +++ b/rhodecode/templates/changelog/changelog.html @@ -161,7 +161,7 @@ if(checked_checkboxes.length>0){ // modify open pull request to show we have selected cs YUD.get('open_new_pr').innerHTML = _TM['Open new pull request for selected changesets']; - + }else{ YUD.get('open_new_pr').innerHTML = _TM['Open new pull request']; } @@ -204,7 +204,7 @@ YUD.setStyle('rev_range_clear','display',''); YUD.get('open_new_pr').href += '?rev_start={0}&rev_end={1}'.format(rev_start,rev_end); - + } else{ YUD.setStyle('rev_range_container','display','none'); diff --git a/rhodecode/templates/compare/compare_diff.html b/rhodecode/templates/compare/compare_diff.html --- a/rhodecode/templates/compare/compare_diff.html +++ b/rhodecode/templates/compare/compare_diff.html @@ -39,13 +39,13 @@ ## FILES
- + % if c.limited_diff: ${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)} % else: ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.files)) % (len(c.files),c.lines_added,c.lines_deleted)}: %endif - +
%if not c.files: @@ -60,7 +60,7 @@
% if c.limited_diff:
${_('Changeset was too big and was cut off...')}
- % endif + % endif diff --git a/rhodecode/templates/files/files.html b/rhodecode/templates/files/files.html --- a/rhodecode/templates/files/files.html +++ b/rhodecode/templates/files/files.html @@ -91,7 +91,7 @@ var callbacks = function(State){ ypjax_links(); tooltip_activate(); fileBrowserListeners(State.url, State.data.node_list_url, State.data.url_base); - + if(YUD.get('hlcode')){ YUE.on('hlcode', 'mouseup', getSelectionLink); } diff --git a/rhodecode/templates/files/files_history_box.html b/rhodecode/templates/files/files_history_box.html --- a/rhodecode/templates/files/files_history_box.html +++ b/rhodecode/templates/files/files_history_box.html @@ -22,4 +22,4 @@
- \ No newline at end of file + diff --git a/rhodecode/templates/files/files_source.html b/rhodecode/templates/files/files_source.html --- a/rhodecode/templates/files/files_source.html +++ b/rhodecode/templates/files/files_source.html @@ -106,8 +106,8 @@ YUE.onDOMReady(function(){ ypjax(_url, 'node_history', function(o){ tooltip_activate(); }) - }); + }); }); - + diff --git a/rhodecode/templates/pullrequests/pullrequest.html b/rhodecode/templates/pullrequests/pullrequest.html --- a/rhodecode/templates/pullrequests/pullrequest.html +++ b/rhodecode/templates/pullrequests/pullrequest.html @@ -23,7 +23,7 @@
- + ##ORG
diff --git a/rhodecode/templates/pullrequests/pullrequest_show.html b/rhodecode/templates/pullrequests/pullrequest_show.html --- a/rhodecode/templates/pullrequests/pullrequest_show.html +++ b/rhodecode/templates/pullrequests/pullrequest_show.html @@ -68,16 +68,16 @@ ##CS
${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}
<%include file="/compare/compare_cs.html" /> - + ## FILES
- + % if c.limited_diff: ${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)} % else: ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.files)) % (len(c.files),c.lines_added,c.lines_deleted)}: %endif - +
%if not c.files: @@ -92,7 +92,7 @@
% if c.limited_diff:
${_('Changeset was too big and was cut off...')}
- % endif + % endif
## REVIEWERS diff --git a/rhodecode/templates/tags/tags.html b/rhodecode/templates/tags/tags.html --- a/rhodecode/templates/tags/tags.html +++ b/rhodecode/templates/tags/tags.html @@ -27,7 +27,7 @@ %if c.repo_tags:
${_('Compare tags')}
- %endif + %endif
<%include file='tags_data.html'/>
@@ -54,7 +54,7 @@ var myColumnDefs = [ {key:"author",label:"${_('Author')}",sortable:true}, {key:"revision",label:"${_('Revision')}",sortable:true, sortOptions: { sortFunction: revisionSort }}, - {key:"compare",label:"${_('Compare')}",sortable:false,}, + {key:"compare",label:"${_('Compare')}",sortable:false,}, ]; var myDataSource = new YAHOO.util.DataSource(YUD.get("tags_data")); diff --git a/rhodecode/templates/tags/tags_data.html b/rhodecode/templates/tags/tags_data.html --- a/rhodecode/templates/tags/tags_data.html +++ b/rhodecode/templates/tags/tags_data.html @@ -29,7 +29,7 @@ - + %endfor diff --git a/rhodecode/tests/functional/test_compare.py b/rhodecode/tests/functional/test_compare.py --- a/rhodecode/tests/functional/test_compare.py +++ b/rhodecode/tests/functional/test_compare.py @@ -113,7 +113,7 @@ class TestCompareController(TestControll finally: RepoModel().delete(r2_id) RepoModel().delete(r1_id) - + def test_compare_forks_on_branch_extra_commits_origin_has_incomming_hg(self): self.log_user()