##// END OF EJS Templates
whitespace cleanup
marcink -
r3394:fe2bb88b beta
parent child Browse files
Show More
@@ -141,7 +141,7 b' class PullrequestsController(BaseRepoCon'
141 c.default_other_refs, class_='refs')
141 c.default_other_refs, class_='refs')
142 }
142 }
143
143
144 # gather forks and add to this list ... even though it is rare to
144 # gather forks and add to this list ... even though it is rare to
145 # request forks to pull their parent
145 # request forks to pull their parent
146 for fork in org_repo.forks:
146 for fork in org_repo.forks:
147 c.other_repos.append((fork.repo_name, fork.repo_name))
147 c.other_repos.append((fork.repo_name, fork.repo_name))
@@ -364,7 +364,7 b' class GitChangeset(BaseChangeset):'
364 else:
364 else:
365 frmt = 'tar'
365 frmt = 'tar'
366 _git_path = rhodecode.CONFIG.get('git_path', 'git')
366 _git_path = rhodecode.CONFIG.get('git_path', 'git')
367 cmd = '%s archive --format=%s --prefix=%s/ %s' % (_git_path,
367 cmd = '%s archive --format=%s --prefix=%s/ %s' % (_git_path,
368 frmt, prefix, self.raw_id)
368 frmt, prefix, self.raw_id)
369 if kind == 'tgz':
369 if kind == 'tgz':
370 cmd += ' | gzip -9'
370 cmd += ' | gzip -9'
@@ -292,10 +292,10 b''
292 <div class="fields">
292 <div class="fields">
293 ${h.submit('remove_%s' % c.repo_info.repo_name,_('Remove this repository'),class_="ui-btn red",onclick="return confirm('"+_('Confirm to delete this repository')+"');")}
293 ${h.submit('remove_%s' % c.repo_info.repo_name,_('Remove this repository'),class_="ui-btn red",onclick="return confirm('"+_('Confirm to delete this repository')+"');")}
294 %if c.repo_info.forks.count():
294 %if c.repo_info.forks.count():
295 - ${ungettext('this repository has %s fork', 'this repository has %s forks', c.repo_info.forks.count()) % c.repo_info.forks.count()}
295 - ${ungettext('this repository has %s fork', 'this repository has %s forks', c.repo_info.forks.count()) % c.repo_info.forks.count()}
296 <input type="radio" name="forks" value="detach_forks" checked="checked"/> <label for="forks">${_('Detach forks')}</label>
296 <input type="radio" name="forks" value="detach_forks" checked="checked"/> <label for="forks">${_('Detach forks')}</label>
297 <input type="radio" name="forks" value="delete_forks" /> <label for="forks">${_('Delete forks')}</label>
297 <input type="radio" name="forks" value="delete_forks" /> <label for="forks">${_('Delete forks')}</label>
298 %endif
298 %endif
299 </div>
299 </div>
300 <div class="field" style="border:none;color:#888">
300 <div class="field" style="border:none;color:#888">
301 <ul>
301 <ul>
@@ -9,7 +9,7 b''
9 %if pull_request.is_closed():
9 %if pull_request.is_closed():
10 <img src="${h.url('/images/icons/lock_go.png')}" title="${_('Closed')}"/>
10 <img src="${h.url('/images/icons/lock_go.png')}" title="${_('Closed')}"/>
11 %endif
11 %endif
12 <img src="${h.url('/images/icons/flag_status_%s.png' % str(pull_request.last_review_status))}" />
12 <img src="${h.url('/images/icons/flag_status_%s.png' % str(pull_request.last_review_status))}" />
13 <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}">
13 <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}">
14 ${_('Pull request #%s opened on %s') % (pull_request.pull_request_id, h.fmt_date(pull_request.created_on))}
14 ${_('Pull request #%s opened on %s') % (pull_request.pull_request_id, h.fmt_date(pull_request.created_on))}
15 </a>
15 </a>
@@ -36,7 +36,7 b''
36 %if pull_request.is_closed():
36 %if pull_request.is_closed():
37 <img src="${h.url('/images/icons/lock_go.png')}" title="${_('Closed')}"/>
37 <img src="${h.url('/images/icons/lock_go.png')}" title="${_('Closed')}"/>
38 %endif
38 %endif
39 <img src="${h.url('/images/icons/flag_status_%s.png' % str(pull_request.last_review_status))}" />
39 <img src="${h.url('/images/icons/flag_status_%s.png' % str(pull_request.last_review_status))}" />
40 <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}">
40 <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}">
41 ${_('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))}
41 ${_('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))}
42 </a>
42 </a>
@@ -353,7 +353,7 b''
353 <span>${_('Admin')}</span>
353 <span>${_('Admin')}</span>
354 </a>
354 </a>
355 ${admin_menu_simple()}
355 ${admin_menu_simple()}
356 </li>
356 </li>
357 % endif
357 % endif
358 ${usermenu()}
358 ${usermenu()}
359 %endif
359 %endif
@@ -85,7 +85,7 b''
85 // routes registration
85 // routes registration
86 pyroutes.register('toggle_following', "${h.url('toggle_following')}");
86 pyroutes.register('toggle_following', "${h.url('toggle_following')}");
87 pyroutes.register('changeset_info', "${h.url('changeset_info', repo_name='%(repo_name)s', revision='%(revision)s')}", ['repo_name', 'revision']);
87 pyroutes.register('changeset_info', "${h.url('changeset_info', repo_name='%(repo_name)s', revision='%(revision)s')}", ['repo_name', 'revision']);
88 pyroutes.register('repo_size', "${h.url('repo_size', repo_name='%(repo_name)s')}", ['repo_name']);
88 pyroutes.register('repo_size', "${h.url('repo_size', repo_name='%(repo_name)s')}", ['repo_name']);
89 })
89 })
90 </script>
90 </script>
91 </%def>
91 </%def>
@@ -13,7 +13,7 b''
13 <span>${h.link_to(_('Add repository'),h.url('admin_settings_create_repository',parent_group=c.group.group_id))}</span>
13 <span>${h.link_to(_('Add repository'),h.url('admin_settings_create_repository',parent_group=c.group.group_id))}</span>
14 %if h.HasPermissionAny('hg.admin')() or h.HasReposGroupPermissionAny('group.admin')(c.group.group_name):
14 %if h.HasPermissionAny('hg.admin')() or h.HasReposGroupPermissionAny('group.admin')(c.group.group_name):
15 <span>${h.link_to(_(u'Add group'),h.url('new_repos_group', parent_group=c.group.group_id))}</span>
15 <span>${h.link_to(_(u'Add group'),h.url('new_repos_group', parent_group=c.group.group_id))}</span>
16 %endif
16 %endif
17 %else:
17 %else:
18 <span>${h.link_to(_('Add repository'),h.url('admin_settings_create_repository'))}</span>
18 <span>${h.link_to(_('Add repository'),h.url('admin_settings_create_repository'))}</span>
19 %if h.HasPermissionAny('hg.admin')():
19 %if h.HasPermissionAny('hg.admin')():
@@ -174,7 +174,7 b''
174 pyroutes.register('pullrequest_comment', "${url('pullrequest_comment',repo_name='%(repo_name)s',pull_request_id='%(pull_request_id)s')}", ['repo_name', 'pull_request_id']);
174 pyroutes.register('pullrequest_comment', "${url('pullrequest_comment',repo_name='%(repo_name)s',pull_request_id='%(pull_request_id)s')}", ['repo_name', 'pull_request_id']);
175 pyroutes.register('pullrequest_comment_delete', "${url('pullrequest_comment_delete',repo_name='%(repo_name)s',comment_id='%(comment_id)s')}", ['repo_name', 'comment_id']);
175 pyroutes.register('pullrequest_comment_delete', "${url('pullrequest_comment_delete',repo_name='%(repo_name)s',comment_id='%(comment_id)s')}", ['repo_name', 'comment_id']);
176 pyroutes.register('pullrequest_update', "${url('pullrequest_update',repo_name='%(repo_name)s',pull_request_id='%(pull_request_id)s')}", ['repo_name', 'pull_request_id']);
176 pyroutes.register('pullrequest_update', "${url('pullrequest_update',repo_name='%(repo_name)s',pull_request_id='%(pull_request_id)s')}", ['repo_name', 'pull_request_id']);
177
177
178 </script>
178 </script>
179
179
180 ## diff block
180 ## diff block
@@ -227,10 +227,10 b' class TestLibs(unittest.TestCase):'
227 ("ffffffffffff some text traalaa",
227 ("ffffffffffff some text traalaa",
228 "url[ffffffffffff] some text traalaa"),
228 "url[ffffffffffff] some text traalaa"),
229 ("""Multi line
229 ("""Multi line
230 123123123123
230 123123123123
231 some text 123123123123""",
231 some text 123123123123""",
232 """Multi line
232 """Multi line
233 url[123123123123]
233 url[123123123123]
234 some text url[123123123123]""")
234 some text url[123123123123]""")
235 ])
235 ])
236 def test_urlify_changesets(self, sample, expected):
236 def test_urlify_changesets(self, sample, expected):
General Comments 0
You need to be logged in to leave comments. Login now