Show More
@@ -1321,7 +1321,7 b' class ApiController(JSONRPCController):' | |||
|
1321 | 1321 | |
|
1322 | 1322 | if (name != repo.repo_name and |
|
1323 | 1323 | not HasPermissionAny('hg.create.repository')() |
|
1324 |
|
|
|
1324 | ): | |
|
1325 | 1325 | raise JSONRPCError('no permission to create (or move) repositories') |
|
1326 | 1326 | |
|
1327 | 1327 | if not isinstance(owner, Optional): |
@@ -206,7 +206,7 b' def create_cs_pr_comment(repo_name, revi' | |||
|
206 | 206 | h.HasPermissionAny('hg.admin')() or |
|
207 | 207 | h.HasRepoPermissionLevel('admin')(pull_request.org_repo.repo_name) or |
|
208 | 208 | h.HasRepoPermissionLevel('admin')(pull_request.other_repo.repo_name) |
|
209 |
|
|
|
209 | ) and not pull_request.is_closed(): | |
|
210 | 210 | PullRequestModel().delete(pull_request) |
|
211 | 211 | Session().commit() |
|
212 | 212 | h.flash(_('Successfully deleted pull request %s') % pull_request_id, |
@@ -90,7 +90,8 b' class AnnotateHtmlFormatter(HtmlFormatte' | |||
|
90 | 90 | self.order = order or ('ls', 'annotate', 'code') |
|
91 | 91 | headers = options.pop('headers', None) |
|
92 | 92 | if headers and not ('ls' in headers and 'annotate' in headers and |
|
93 |
'code' in headers |
|
|
93 | 'code' in headers | |
|
94 | ): | |
|
94 | 95 | raise ValueError("If headers option dict is specified it must " |
|
95 | 96 | "all 'ls', 'annotate' and 'code' keys") |
|
96 | 97 | self.headers = headers |
@@ -86,7 +86,7 b' class SimpleGit(BaseVCSController):' | |||
|
86 | 86 | def wrapper_app(environ, start_response): |
|
87 | 87 | if (parsed_request.cmd == 'info/refs' and |
|
88 | 88 | parsed_request.service == 'git-upload-pack' |
|
89 |
|
|
|
89 | ): | |
|
90 | 90 | baseui = make_ui() |
|
91 | 91 | repo = Repository.get_by_repo_name(parsed_request.repo_name) |
|
92 | 92 | scm_repo = repo.scm_instance |
@@ -126,7 +126,8 b' class Page(_Page):' | |||
|
126 | 126 | symbol_previous='<', symbol_next='>', |
|
127 | 127 | link_attr=None, |
|
128 | 128 | curpage_attr=None, |
|
129 |
dotdot_attr=None, **kwargs |
|
|
129 | dotdot_attr=None, **kwargs | |
|
130 | ): | |
|
130 | 131 | self.curpage_attr = curpage_attr or {'class': 'active'} |
|
131 | 132 | self.separator = separator |
|
132 | 133 | self.pager_kwargs = kwargs |
@@ -304,7 +304,8 b' def age(prevdate, show_short_version=Fal' | |||
|
304 | 304 | month_lengths = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31] |
|
305 | 305 | if deltas['day'] < 0: |
|
306 | 306 | if prevdate.month == 2 and (prevdate.year % 4 == 0 and |
|
307 |
(prevdate.year % 100 != 0 or prevdate.year % 400 == 0) |
|
|
307 | (prevdate.year % 100 != 0 or prevdate.year % 400 == 0) | |
|
308 | ): | |
|
308 | 309 | deltas['day'] += 29 |
|
309 | 310 | else: |
|
310 | 311 | deltas['day'] += month_lengths[prevdate.month - 1] |
@@ -95,7 +95,8 b' class GitInMemoryChangeset(BaseInMemoryC' | |||
|
95 | 95 | new_trees.append(parent) |
|
96 | 96 | # Update ancestors |
|
97 | 97 | for parent, tree, path in reversed([(a[1], b[1], b[0]) for a, b in |
|
98 |
zip(ancestors, ancestors[1:])] |
|
|
98 | zip(ancestors, ancestors[1:])] | |
|
99 | ): | |
|
99 | 100 | parent[path] = stat.S_IFDIR, tree.id |
|
100 | 101 | object_store.add_object(tree) |
|
101 | 102 |
@@ -62,7 +62,8 b' class AnnotateHtmlFormatter(HtmlFormatte' | |||
|
62 | 62 | self.order = order or ('ls', 'annotate', 'code') |
|
63 | 63 | headers = options.pop('headers', None) |
|
64 | 64 | if headers and not ('ls' in headers and 'annotate' in headers and |
|
65 |
'code' in headers |
|
|
65 | 'code' in headers | |
|
66 | ): | |
|
66 | 67 | raise ValueError("If headers option dict is specified it must " |
|
67 | 68 | "all 'ls', 'annotate' and 'code' keys") |
|
68 | 69 | self.headers = headers |
General Comments 0
You need to be logged in to leave comments.
Login now