Mercurial > kallithea
changeset 2409:761e00380370 beta
whitespace cleanup
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Wed, 06 Jun 2012 23:33:27 +0200 |
| parents | 89875fb6739a |
| children | a1595b6e1445 |
| files | rhodecode/config/pre_receive_tmpl.py rhodecode/controllers/admin/settings.py rhodecode/lib/hooks.py rhodecode/templates/journal/journal.html rhodecode/templates/journal/public_journal.html |
| diffstat | 5 files changed, 9 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/config/pre_receive_tmpl.py Wed Jun 06 23:31:52 2012 +0200 +++ b/rhodecode/config/pre_receive_tmpl.py Wed Jun 06 23:33:27 2012 +0200 @@ -16,7 +16,7 @@ # rhodecode sys.exit(0) - repo_path = os.path.abspath('.') + repo_path = os.path.abspath('.') push_data = sys.stdin.read().strip().split(' ') # os.environ is modified here by a subprocess call that # runs git and later git executes this hook. @@ -26,4 +26,4 @@ sys.exit(0) if __name__ == '__main__': - main() \ No newline at end of file + main()
--- a/rhodecode/controllers/admin/settings.py Wed Jun 06 23:31:52 2012 +0200 +++ b/rhodecode/controllers/admin/settings.py Wed Jun 06 23:33:27 2012 +0200 @@ -196,13 +196,13 @@ hgsettings4 = self.sa.query(RhodeCodeUi)\ .filter(RhodeCodeUi.ui_key == RhodeCodeUi.HOOK_REPO_SIZE)\ .one() - hgsettings4.ui_active = bool(form_result[_f('hooks_%s' % + hgsettings4.ui_active = bool(form_result[_f('hooks_%s' % RhodeCodeUi.HOOK_REPO_SIZE)]) hgsettings5 = self.sa.query(RhodeCodeUi)\ .filter(RhodeCodeUi.ui_key == RhodeCodeUi.HOOK_PUSH)\ .one() - hgsettings5.ui_active = bool(form_result[_f('hooks_%s' % + hgsettings5.ui_active = bool(form_result[_f('hooks_%s' % RhodeCodeUi.HOOK_PUSH)]) hgsettings6 = self.sa.query(RhodeCodeUi)\
--- a/rhodecode/lib/hooks.py Wed Jun 06 23:31:52 2012 +0200 +++ b/rhodecode/lib/hooks.py Wed Jun 06 23:33:27 2012 +0200 @@ -199,10 +199,9 @@ def handle_git_post_receive(repo_path, revs, env): """ A really hacky method that is runned by git post-receive hook and logs - an push action together with pushed revisions. It's runned by subprocess - thus needs all info to be able to create a temp pylons enviroment, connect - to database and run the logging code. Hacky as sh**t but works. ps. - GIT SUCKS + an push action together with pushed revisions. It's executed by subprocess + thus needs all info to be able to create a on the fly pylons enviroment, + connect to database and run the logging code. Hacky as sh*t but works. :param repo_path: :type repo_path:
--- a/rhodecode/templates/journal/journal.html Wed Jun 06 23:31:52 2012 +0200 +++ b/rhodecode/templates/journal/journal.html Wed Jun 06 23:33:27 2012 +0200 @@ -24,7 +24,7 @@ </li> <li> <span><a href="${h.url('journal_atom')}"><img class="icon" title="${_('ATOM feed')}" alt="${_('ATOM feed')}" src="${h.url('/images/icons/rss_16.png')}"/></a></span> - </li> + </li> </ul> </div> <div id="journal">${c.journal_data}</div>
--- a/rhodecode/templates/journal/public_journal.html Wed Jun 06 23:31:52 2012 +0200 +++ b/rhodecode/templates/journal/public_journal.html Wed Jun 06 23:33:27 2012 +0200 @@ -21,7 +21,7 @@ </li> <li> <span><a href="${h.url('public_journal_atom')}"><img class="icon" title="${_('ATOM feed')}" alt="${_('ATOM feed')}" src="${h.url('/images/icons/rss_16.png')}"/></a></span> - </li> + </li> </ul> </div>