kallithea Changeset - 685ebc84c2e9

Changeset - 685ebc84c2e9

Parent rev.

Child rev.

[Not reviewed]

beta

0 15 0

Marcin Kuzminski - 13 years ago 2012-11-26 20:14:40
marcin@python-works.com

White space cleanup

15 files changed with 22 insertions and 23 deletions:

rhodecode/controllers/feed.py

rhodecode/lib/diffs.py

rhodecode/lib/ext_json.py

rhodecode/templates/admin/repos/repo_edit.html

rhodecode/templates/admin/users_groups/users_group_edit.html

rhodecode/templates/changelog/changelog.html

rhodecode/templates/compare/compare_diff.html

rhodecode/templates/files/files.html

rhodecode/templates/files/files_history_box.html

rhodecode/templates/files/files_source.html

rhodecode/templates/pullrequests/pullrequest.html

rhodecode/templates/pullrequests/pullrequest_show.html

rhodecode/templates/tags/tags.html

rhodecode/templates/tags/tags_data.html

rhodecode/tests/functional/test_compare.py

0 comments (0 inline, 0 general)

rhodecode/controllers/feed.py

➞

Show inline comments

@@ @@ -177,7 +177,6 @@ class FeedController(BaseRepoController) @@
         key = repo_name + '_RSS'
         inv = CacheInvalidation.invalidate(key)
         if inv is not None:
             region_invalidate(_get_feed_from_cache, None, key)
             CacheInvalidation.set_valid(inv.cache_key)
         return _get_feed_from_cache(key)

rhodecode/lib/diffs.py

➞

Show inline comments

@@ @@ -762,7 +762,7 @@ def differ(org_repo, org_ref, other_repo @@
             return ''.join(patch.diff(bundlerepo,
                                       node1=other_repo[other_ref].node(),
                                       node2=org_repo[org_ref].node(),
                                       opts=opts))
     return ''
@@ \ No newline at end of file @@
     return ''

rhodecode/lib/ext_json.py

➞

Show inline comments

@@ @@ -116,7 +116,7 @@ except ImportError: @@
 # set all available json modules
 if simplejson:
     json = _sj
 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')

rhodecode/templates/admin/repos/repo_edit.html

➞

Show inline comments

@@ @@ -201,13 +201,13 @@ @@
                     <th>${_('Prefix')}</th>
                     <th>${_('Key')}</th>
                     <th>${_('Active')}</th>
                     </tr>
                   %for cache in c.repo_info.cache_keys:
                       <tr>
-                        <td>${cache.prefix or '-'}</td>
                         <td>${cache.prefix or '-'}</td>
                         <td>${cache.cache_key}</td>
                         <td>${h.bool2icon(cache.cache_active)}</td>
                       </tr>
                   %endfor
                   </table>
               </div>

rhodecode/templates/admin/users_groups/users_group_edit.html

➞

Show inline comments

@@ @@ -158,13 +158,13 @@ ${h.end_form()} @@
           </div>
         </li>
       %endfor
       </ul>
       %else:
         <span class="empty_data">${_('No members yet')}</span>
-      %endif
       %endif
     </div>
 </div>
 <div class="box box-left">
     <!-- box / title -->
     <div class="title">

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -158,13 +158,13 @@ ${_('%s Changelog') % c.repo_name} - ${c @@
+                            }
+                        }
                         if(YUD.get('open_new_pr')){
                           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'];
+                          }
+                        }
                         if(checked_checkboxes.length>1){
@@ @@ -201,13 +201,13 @@ ${_('%s Changelog') % c.repo_name} - ${c @@
                             YUD.get('rev_range_container').href = url;
                             YUD.get('rev_range_container').innerHTML = link;
                             YUD.setStyle('rev_range_container','display','');
                             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');
                         	YUD.setStyle('rev_range_clear','display','none');
+                        }
                     });

rhodecode/templates/compare/compare_diff.html

➞

Show inline comments

@@ @@ -36,19 +36,19 @@ @@
             ##CS
             <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}</div>
             <%include file="compare_cs.html" />
             ## FILES
             <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">
             % 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
             </div>
             <div class="cs_files">
               %if not c.files:
                  <span class="empty_data">${_('No files')}</span>
               %endif
               %for fid, change, f, stat in c.files:
@@ @@ -57,13 +57,13 @@ @@
                     <div class="changes">${h.fancy_file_stats(stat)}</div>
                   </div>
               %endfor
             </div>
             % if c.limited_diff:
               <h5>${_('Changeset was too big and was cut off...')}</h5>
-            % endif
             % endif
         </div>
     </div>
     ## diff block
     <%namespace name="diff_block" file="/changeset/diff_block.html"/>
     %for fid, change, f, stat in c.files:

rhodecode/templates/files/files.html

➞

Show inline comments

@@ @@ -88,13 +88,13 @@ var ypjax_links = function(){ @@
+}
 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);
+    }
     //console.log(State);
     if(YUD.get('load_node_history')){
       //remove all listeners due to problems of history state

rhodecode/templates/files/files_history_box.html

➞

Show inline comments

@@ @@ -19,7 +19,7 @@ @@
                   </div>
                 %endfor
             </div>
         </div>
         <div style="clear:both"></div>
     </dd>
 </dl>
@@ \ No newline at end of file @@
 </dl>

rhodecode/templates/files/files_source.html

➞

Show inline comments

@@ @@ -103,11 +103,11 @@ YUE.onDOMReady(function(){ @@
     //load history of file
     YUE.on('load_node_history', 'click', function(e){
         var _url = node_history_url.replace('__REV__','${c.file_changeset.raw_id}').replace('__FPATH__', '${c.f_path}');
         ypjax(_url, 'node_history', function(o){
         	tooltip_activate();
         })
-    });
     });
    });
 </script>

rhodecode/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -20,13 +20,13 @@ @@
         ${self.breadcrumbs()}
     </div>
     ${h.form(url('pullrequest', repo_name=c.repo_name), method='post', id='pull_request_form')}
     <div style="float:left;padding:0px 30px 30px 30px">
         <input type="hidden" name="rev_start" value="${request.GET.get('rev_start')}" />
         <input type="hidden" name="rev_end" value="${request.GET.get('rev_end')}" />
         ##ORG
         <div style="float:left">
             <div class="fork_user">
                 <div class="gravatar">
                     <img alt="gravatar" src="${h.gravatar_url(c.rhodecode_db_repo.user.email,24)}"/>
                 </div>

rhodecode/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -65,22 +65,22 @@ @@
               <div style="white-space:pre-wrap;padding:5px">${_('Compare view')}</div>
           </div>
           <div id="changeset_compare_view_content">
               ##CS
               <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}</div>
               <%include file="/compare/compare_cs.html" />
               ## FILES
               <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">
               % 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
               </div>
               <div class="cs_files">
                 %if not c.files:
                    <span class="empty_data">${_('No files')}</span>
                 %endif
                 %for fid, change, f, stat in c.files:
@@ @@ -89,13 +89,13 @@ @@
                       <div class="changes">${h.fancy_file_stats(stat)}</div>
                     </div>
                 %endfor
               </div>
               % if c.limited_diff:
                 <h5>${_('Changeset was too big and was cut off...')}</h5>
-              % endif
               % endif
           </div>
       </div>
       ## REVIEWERS
        <div style="float:left; border-left:1px dashed #eee">
        <h4>${_('Pull request reviewers')}</h4>
         <div id="reviewers" style="padding:0px 0px 5px 10px">

rhodecode/templates/tags/tags.html

➞

Show inline comments

@@ @@ -24,13 +24,13 @@ @@
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     %if c.repo_tags:
     <div class="info_box" id="compare_tags" style="clear: both;padding: 10px 19px;vertical-align: right;text-align: right;"><a href="#" class="ui-btn small">${_('Compare tags')}</a></div>
-    %endif
     %endif
     <div class="table">
         <%include file='tags_data.html'/>
     </div>
 </div>
 <script type="text/javascript">
 YUE.on('compare_tags','click',function(e){
@@ @@ -51,13 +51,13 @@ var myColumnDefs = [ @@
     {key:"name",label:"${_('Name')}",sortable:true},
     {key:"date",label:"${_('Date')}",sortable:true,
         sortOptions: { sortFunction: dateSort }},
     {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"));
 myDataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE;

rhodecode/templates/tags/tags_data.html

➞

Show inline comments

@@ @@ -26,13 +26,13 @@ @@
                     <pre><a href="${h.url('files_home',repo_name=c.repo_name,revision=tag[1].raw_id)}">r${tag[1].revision}:${h.short_id(tag[1].raw_id)}</a></pre>
                 </div>
             </td>
             <td>
                 <input class="branch-compare" type="radio" name="compare_org" value="${tag[0]}"/>
                 <input class="branch-compare" type="radio" name="compare_other" value="${tag[0]}"/>
-            </td>
             </td>
 		</tr>
 		%endfor
     </table>
    </div>
 %else:
 	${_('There are no tags yet')}

rhodecode/tests/functional/test_compare.py

➞

Show inline comments

@@ @@ -110,13 +110,13 @@ class TestCompareController(TestControll @@
             ## files
             response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s#C--826e8142e6ba">file1</a>""" % (repo2.repo_name, rev1, rev2))
         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()
         repo1 = RepoModel().create_repo(repo_name='one', repo_type='hg',
                                         description='diff-test',

0 comments (0 inline, 0 general)