kallithea Changeset - fe2bb88bf7ac

Changeset - fe2bb88bf7ac

Parent rev.

Child rev.

[Not reviewed]

beta

0 9 0

Marcin Kuzminski - 13 years ago 2013-02-21 02:31:21
marcin@python-works.com

whitespace cleanup

9 files changed with 12 insertions and 12 deletions:

rhodecode/controllers/pullrequests.py

rhodecode/lib/vcs/backends/git/changeset.py

rhodecode/templates/admin/repos/repo_edit.html

rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html

rhodecode/templates/base/base.html

rhodecode/templates/base/root.html

rhodecode/templates/index_base.html

rhodecode/templates/pullrequests/pullrequest_show.html

rhodecode/tests/test_libs.py

0 comments (0 inline, 0 general)

rhodecode/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -141,7 +141,7 @@ class PullrequestsController(BaseRepoCon @@
                              c.default_other_refs, class_='refs')
+        }
-        # gather forks and add to this list ... even though it is rare to
         # gather forks and add to this list ... even though it is rare to
         # request forks to pull their parent
         for fork in org_repo.forks:
             c.other_repos.append((fork.repo_name, fork.repo_name))

rhodecode/lib/vcs/backends/git/changeset.py

➞

Show inline comments

@@ @@ -364,7 +364,7 @@ class GitChangeset(BaseChangeset): @@
         else:
             frmt = 'tar'
         _git_path = rhodecode.CONFIG.get('git_path', 'git')
-        cmd = '%s archive --format=%s --prefix=%s/ %s' % (_git_path,
         cmd = '%s archive --format=%s --prefix=%s/ %s' % (_git_path,
                                                 frmt, prefix, self.raw_id)
         if kind == 'tgz':
             cmd += ' | gzip -9'

rhodecode/templates/admin/repos/repo_edit.html

➞

Show inline comments

@@ @@ -292,10 +292,10 @@ @@
            <div class="fields">
                ${h.submit('remove_%s' % c.repo_info.repo_name,_('Remove this repository'),class_="ui-btn red",onclick="return confirm('"+_('Confirm to delete this repository')+"');")}
               %if c.repo_info.forks.count():
-                    - ${ungettext('this repository has %s fork', 'this repository has %s forks', c.repo_info.forks.count()) % c.repo_info.forks.count()}
                     - ${ungettext('this repository has %s fork', 'this repository has %s forks', c.repo_info.forks.count()) % c.repo_info.forks.count()}
                     <input type="radio" name="forks" value="detach_forks" checked="checked"/> <label for="forks">${_('Detach forks')}</label>
                     <input type="radio" name="forks" value="delete_forks" /> <label for="forks">${_('Delete forks')}</label>
-              %endif
               %endif
            </div>
            <div class="field" style="border:none;color:#888">
            <ul>

rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html

➞

Show inline comments

@@ @@ -9,7 +9,7 @@ @@
           %if pull_request.is_closed():
               <img src="${h.url('/images/icons/lock_go.png')}" title="${_('Closed')}"/>
           %endif
-          <img src="${h.url('/images/icons/flag_status_%s.png' % str(pull_request.last_review_status))}" />
           <img src="${h.url('/images/icons/flag_status_%s.png' % str(pull_request.last_review_status))}" />
           <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}">
           ${_('Pull request #%s opened on %s') % (pull_request.pull_request_id, h.fmt_date(pull_request.created_on))}
           </a>
@@ @@ -36,7 +36,7 @@ @@
         %if pull_request.is_closed():
             <img src="${h.url('/images/icons/lock_go.png')}" title="${_('Closed')}"/>
         %endif
-        <img src="${h.url('/images/icons/flag_status_%s.png' % str(pull_request.last_review_status))}" />
         <img src="${h.url('/images/icons/flag_status_%s.png' % str(pull_request.last_review_status))}" />
         <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}">
         ${_('Pull request #%s opened by %s on %s') % (pull_request.pull_request_id, pull_request.author.full_name, h.fmt_date(pull_request.created_on))}
         </a>

rhodecode/templates/base/base.html

➞

Show inline comments

@@ @@ -353,7 +353,7 @@ @@
                <span>${_('Admin')}</span>
                </a>
                 ${admin_menu_simple()}
-            </li>
             </li>
             % endif
             ${usermenu()}
         %endif

rhodecode/templates/base/root.html

➞

Show inline comments

@@ @@ -85,7 +85,7 @@ @@
               // routes registration
               pyroutes.register('toggle_following', "${h.url('toggle_following')}");
               pyroutes.register('changeset_info', "${h.url('changeset_info', repo_name='%(repo_name)s', revision='%(revision)s')}", ['repo_name', 'revision']);
-              pyroutes.register('repo_size', "${h.url('repo_size', repo_name='%(repo_name)s')}", ['repo_name']);
               pyroutes.register('repo_size', "${h.url('repo_size', repo_name='%(repo_name)s')}", ['repo_name']);
            })
             </script>
         </%def>

rhodecode/templates/index_base.html

➞

Show inline comments

@@ @@ -13,7 +13,7 @@ @@
                         <span>${h.link_to(_('Add repository'),h.url('admin_settings_create_repository',parent_group=c.group.group_id))}</span>
                         %if h.HasPermissionAny('hg.admin')() or h.HasReposGroupPermissionAny('group.admin')(c.group.group_name):
                          <span>${h.link_to(_(u'Add group'),h.url('new_repos_group', parent_group=c.group.group_id))}</span>
-                        %endif
                         %endif
                   %else:
                     <span>${h.link_to(_('Add repository'),h.url('admin_settings_create_repository'))}</span>
                     %if h.HasPermissionAny('hg.admin')():

rhodecode/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -174,7 +174,7 @@ @@
     pyroutes.register('pullrequest_comment', "${url('pullrequest_comment',repo_name='%(repo_name)s',pull_request_id='%(pull_request_id)s')}", ['repo_name', 'pull_request_id']);
     pyroutes.register('pullrequest_comment_delete', "${url('pullrequest_comment_delete',repo_name='%(repo_name)s',comment_id='%(comment_id)s')}", ['repo_name', 'comment_id']);
     pyroutes.register('pullrequest_update', "${url('pullrequest_update',repo_name='%(repo_name)s',pull_request_id='%(pull_request_id)s')}", ['repo_name', 'pull_request_id']);
     </script>
     ## diff block

rhodecode/tests/test_libs.py

➞

Show inline comments

@@ @@ -227,10 +227,10 @@ class TestLibs(unittest.TestCase): @@
       ("ffffffffffff some text traalaa",
        "url[ffffffffffff] some text traalaa"),
        ("""Multi line
-       123123123123
        123123123123
        some text 123123123123""",
        """Multi line
-       url[123123123123]
        url[123123123123]
        some text url[123123123123]""")
     ])
     def test_urlify_changesets(self, sample, expected):

0 comments (0 inline, 0 general)