##// END OF EJS Templates
whitespace cleanup
marcink -
r2409:761e0038 beta
parent child Browse files
Show More
@@ -16,7 +16,7 b' def main():'
16 # rhodecode
16 # rhodecode
17 sys.exit(0)
17 sys.exit(0)
18
18
19 repo_path = os.path.abspath('.')
19 repo_path = os.path.abspath('.')
20 push_data = sys.stdin.read().strip().split(' ')
20 push_data = sys.stdin.read().strip().split(' ')
21 # os.environ is modified here by a subprocess call that
21 # os.environ is modified here by a subprocess call that
22 # runs git and later git executes this hook.
22 # runs git and later git executes this hook.
@@ -26,4 +26,4 b' def main():'
26 sys.exit(0)
26 sys.exit(0)
27
27
28 if __name__ == '__main__':
28 if __name__ == '__main__':
29 main() No newline at end of file
29 main()
@@ -196,13 +196,13 b' class SettingsController(BaseController)'
196 hgsettings4 = self.sa.query(RhodeCodeUi)\
196 hgsettings4 = self.sa.query(RhodeCodeUi)\
197 .filter(RhodeCodeUi.ui_key == RhodeCodeUi.HOOK_REPO_SIZE)\
197 .filter(RhodeCodeUi.ui_key == RhodeCodeUi.HOOK_REPO_SIZE)\
198 .one()
198 .one()
199 hgsettings4.ui_active = bool(form_result[_f('hooks_%s' %
199 hgsettings4.ui_active = bool(form_result[_f('hooks_%s' %
200 RhodeCodeUi.HOOK_REPO_SIZE)])
200 RhodeCodeUi.HOOK_REPO_SIZE)])
201
201
202 hgsettings5 = self.sa.query(RhodeCodeUi)\
202 hgsettings5 = self.sa.query(RhodeCodeUi)\
203 .filter(RhodeCodeUi.ui_key == RhodeCodeUi.HOOK_PUSH)\
203 .filter(RhodeCodeUi.ui_key == RhodeCodeUi.HOOK_PUSH)\
204 .one()
204 .one()
205 hgsettings5.ui_active = bool(form_result[_f('hooks_%s' %
205 hgsettings5.ui_active = bool(form_result[_f('hooks_%s' %
206 RhodeCodeUi.HOOK_PUSH)])
206 RhodeCodeUi.HOOK_PUSH)])
207
207
208 hgsettings6 = self.sa.query(RhodeCodeUi)\
208 hgsettings6 = self.sa.query(RhodeCodeUi)\
@@ -199,10 +199,9 b' def log_create_repository(repository_dic'
199 def handle_git_post_receive(repo_path, revs, env):
199 def handle_git_post_receive(repo_path, revs, env):
200 """
200 """
201 A really hacky method that is runned by git post-receive hook and logs
201 A really hacky method that is runned by git post-receive hook and logs
202 an push action together with pushed revisions. It's runned by subprocess
202 an push action together with pushed revisions. It's executed by subprocess
203 thus needs all info to be able to create a temp pylons enviroment, connect
203 thus needs all info to be able to create a on the fly pylons enviroment,
204 to database and run the logging code. Hacky as sh**t but works. ps.
204 connect to database and run the logging code. Hacky as sh*t but works.
205 GIT SUCKS
206
205
207 :param repo_path:
206 :param repo_path:
208 :type repo_path:
207 :type repo_path:
@@ -24,7 +24,7 b''
24 </li>
24 </li>
25 <li>
25 <li>
26 <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>
26 <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>
27 </li>
27 </li>
28 </ul>
28 </ul>
29 </div>
29 </div>
30 <div id="journal">${c.journal_data}</div>
30 <div id="journal">${c.journal_data}</div>
@@ -21,7 +21,7 b''
21 </li>
21 </li>
22 <li>
22 <li>
23 <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>
23 <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>
24 </li>
24 </li>
25 </ul>
25 </ul>
26
26
27 </div>
27 </div>
General Comments 0
You need to be logged in to leave comments. Login now