##// END OF EJS Templates
comments: properly show version of pull request into added comments....
marcink -
r1286:e783fdd1 default
parent child Browse files
Show More
@@ -1,468 +1,470 b''
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2
2
3 # Copyright (C) 2010-2017 RhodeCode GmbH
3 # Copyright (C) 2010-2017 RhodeCode GmbH
4 #
4 #
5 # This program is free software: you can redistribute it and/or modify
5 # This program is free software: you can redistribute it and/or modify
6 # it under the terms of the GNU Affero General Public License, version 3
6 # it under the terms of the GNU Affero General Public License, version 3
7 # (only), as published by the Free Software Foundation.
7 # (only), as published by the Free Software Foundation.
8 #
8 #
9 # This program is distributed in the hope that it will be useful,
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
12 # GNU General Public License for more details.
13 #
13 #
14 # You should have received a copy of the GNU Affero General Public License
14 # You should have received a copy of the GNU Affero General Public License
15 # along with this program. If not, see <http://www.gnu.org/licenses/>.
15 # along with this program. If not, see <http://www.gnu.org/licenses/>.
16 #
16 #
17 # This program is dual-licensed. If you wish to learn more about the
17 # This program is dual-licensed. If you wish to learn more about the
18 # RhodeCode Enterprise Edition, including its added features, Support services,
18 # RhodeCode Enterprise Edition, including its added features, Support services,
19 # and proprietary license terms, please see https://rhodecode.com/licenses/
19 # and proprietary license terms, please see https://rhodecode.com/licenses/
20
20
21 """
21 """
22 commit controller for RhodeCode showing changes between commits
22 commit controller for RhodeCode showing changes between commits
23 """
23 """
24
24
25 import logging
25 import logging
26
26
27 from collections import defaultdict
27 from collections import defaultdict
28 from webob.exc import HTTPForbidden, HTTPBadRequest, HTTPNotFound
28 from webob.exc import HTTPForbidden, HTTPBadRequest, HTTPNotFound
29
29
30 from pylons import tmpl_context as c, request, response
30 from pylons import tmpl_context as c, request, response
31 from pylons.i18n.translation import _
31 from pylons.i18n.translation import _
32 from pylons.controllers.util import redirect
32 from pylons.controllers.util import redirect
33
33
34 from rhodecode.lib import auth
34 from rhodecode.lib import auth
35 from rhodecode.lib import diffs, codeblocks
35 from rhodecode.lib import diffs, codeblocks
36 from rhodecode.lib.auth import (
36 from rhodecode.lib.auth import (
37 LoginRequired, HasRepoPermissionAnyDecorator, NotAnonymous)
37 LoginRequired, HasRepoPermissionAnyDecorator, NotAnonymous)
38 from rhodecode.lib.base import BaseRepoController, render
38 from rhodecode.lib.base import BaseRepoController, render
39 from rhodecode.lib.compat import OrderedDict
39 from rhodecode.lib.compat import OrderedDict
40 from rhodecode.lib.exceptions import StatusChangeOnClosedPullRequestError
40 from rhodecode.lib.exceptions import StatusChangeOnClosedPullRequestError
41 import rhodecode.lib.helpers as h
41 import rhodecode.lib.helpers as h
42 from rhodecode.lib.utils import action_logger, jsonify
42 from rhodecode.lib.utils import action_logger, jsonify
43 from rhodecode.lib.utils2 import safe_unicode
43 from rhodecode.lib.utils2 import safe_unicode
44 from rhodecode.lib.vcs.backends.base import EmptyCommit
44 from rhodecode.lib.vcs.backends.base import EmptyCommit
45 from rhodecode.lib.vcs.exceptions import (
45 from rhodecode.lib.vcs.exceptions import (
46 RepositoryError, CommitDoesNotExistError, NodeDoesNotExistError)
46 RepositoryError, CommitDoesNotExistError, NodeDoesNotExistError)
47 from rhodecode.model.db import ChangesetComment, ChangesetStatus
47 from rhodecode.model.db import ChangesetComment, ChangesetStatus
48 from rhodecode.model.changeset_status import ChangesetStatusModel
48 from rhodecode.model.changeset_status import ChangesetStatusModel
49 from rhodecode.model.comment import ChangesetCommentsModel
49 from rhodecode.model.comment import ChangesetCommentsModel
50 from rhodecode.model.meta import Session
50 from rhodecode.model.meta import Session
51 from rhodecode.model.repo import RepoModel
51 from rhodecode.model.repo import RepoModel
52
52
53
53
54 log = logging.getLogger(__name__)
54 log = logging.getLogger(__name__)
55
55
56
56
57 def _update_with_GET(params, GET):
57 def _update_with_GET(params, GET):
58 for k in ['diff1', 'diff2', 'diff']:
58 for k in ['diff1', 'diff2', 'diff']:
59 params[k] += GET.getall(k)
59 params[k] += GET.getall(k)
60
60
61
61
62 def get_ignore_ws(fid, GET):
62 def get_ignore_ws(fid, GET):
63 ig_ws_global = GET.get('ignorews')
63 ig_ws_global = GET.get('ignorews')
64 ig_ws = filter(lambda k: k.startswith('WS'), GET.getall(fid))
64 ig_ws = filter(lambda k: k.startswith('WS'), GET.getall(fid))
65 if ig_ws:
65 if ig_ws:
66 try:
66 try:
67 return int(ig_ws[0].split(':')[-1])
67 return int(ig_ws[0].split(':')[-1])
68 except Exception:
68 except Exception:
69 pass
69 pass
70 return ig_ws_global
70 return ig_ws_global
71
71
72
72
73 def _ignorews_url(GET, fileid=None):
73 def _ignorews_url(GET, fileid=None):
74 fileid = str(fileid) if fileid else None
74 fileid = str(fileid) if fileid else None
75 params = defaultdict(list)
75 params = defaultdict(list)
76 _update_with_GET(params, GET)
76 _update_with_GET(params, GET)
77 label = _('Show whitespace')
77 label = _('Show whitespace')
78 tooltiplbl = _('Show whitespace for all diffs')
78 tooltiplbl = _('Show whitespace for all diffs')
79 ig_ws = get_ignore_ws(fileid, GET)
79 ig_ws = get_ignore_ws(fileid, GET)
80 ln_ctx = get_line_ctx(fileid, GET)
80 ln_ctx = get_line_ctx(fileid, GET)
81
81
82 if ig_ws is None:
82 if ig_ws is None:
83 params['ignorews'] += [1]
83 params['ignorews'] += [1]
84 label = _('Ignore whitespace')
84 label = _('Ignore whitespace')
85 tooltiplbl = _('Ignore whitespace for all diffs')
85 tooltiplbl = _('Ignore whitespace for all diffs')
86 ctx_key = 'context'
86 ctx_key = 'context'
87 ctx_val = ln_ctx
87 ctx_val = ln_ctx
88
88
89 # if we have passed in ln_ctx pass it along to our params
89 # if we have passed in ln_ctx pass it along to our params
90 if ln_ctx:
90 if ln_ctx:
91 params[ctx_key] += [ctx_val]
91 params[ctx_key] += [ctx_val]
92
92
93 if fileid:
93 if fileid:
94 params['anchor'] = 'a_' + fileid
94 params['anchor'] = 'a_' + fileid
95 return h.link_to(label, h.url.current(**params), title=tooltiplbl, class_='tooltip')
95 return h.link_to(label, h.url.current(**params), title=tooltiplbl, class_='tooltip')
96
96
97
97
98 def get_line_ctx(fid, GET):
98 def get_line_ctx(fid, GET):
99 ln_ctx_global = GET.get('context')
99 ln_ctx_global = GET.get('context')
100 if fid:
100 if fid:
101 ln_ctx = filter(lambda k: k.startswith('C'), GET.getall(fid))
101 ln_ctx = filter(lambda k: k.startswith('C'), GET.getall(fid))
102 else:
102 else:
103 _ln_ctx = filter(lambda k: k.startswith('C'), GET)
103 _ln_ctx = filter(lambda k: k.startswith('C'), GET)
104 ln_ctx = GET.get(_ln_ctx[0]) if _ln_ctx else ln_ctx_global
104 ln_ctx = GET.get(_ln_ctx[0]) if _ln_ctx else ln_ctx_global
105 if ln_ctx:
105 if ln_ctx:
106 ln_ctx = [ln_ctx]
106 ln_ctx = [ln_ctx]
107
107
108 if ln_ctx:
108 if ln_ctx:
109 retval = ln_ctx[0].split(':')[-1]
109 retval = ln_ctx[0].split(':')[-1]
110 else:
110 else:
111 retval = ln_ctx_global
111 retval = ln_ctx_global
112
112
113 try:
113 try:
114 return int(retval)
114 return int(retval)
115 except Exception:
115 except Exception:
116 return 3
116 return 3
117
117
118
118
119 def _context_url(GET, fileid=None):
119 def _context_url(GET, fileid=None):
120 """
120 """
121 Generates a url for context lines.
121 Generates a url for context lines.
122
122
123 :param fileid:
123 :param fileid:
124 """
124 """
125
125
126 fileid = str(fileid) if fileid else None
126 fileid = str(fileid) if fileid else None
127 ig_ws = get_ignore_ws(fileid, GET)
127 ig_ws = get_ignore_ws(fileid, GET)
128 ln_ctx = (get_line_ctx(fileid, GET) or 3) * 2
128 ln_ctx = (get_line_ctx(fileid, GET) or 3) * 2
129
129
130 params = defaultdict(list)
130 params = defaultdict(list)
131 _update_with_GET(params, GET)
131 _update_with_GET(params, GET)
132
132
133 if ln_ctx > 0:
133 if ln_ctx > 0:
134 params['context'] += [ln_ctx]
134 params['context'] += [ln_ctx]
135
135
136 if ig_ws:
136 if ig_ws:
137 ig_ws_key = 'ignorews'
137 ig_ws_key = 'ignorews'
138 ig_ws_val = 1
138 ig_ws_val = 1
139 params[ig_ws_key] += [ig_ws_val]
139 params[ig_ws_key] += [ig_ws_val]
140
140
141 lbl = _('Increase context')
141 lbl = _('Increase context')
142 tooltiplbl = _('Increase context for all diffs')
142 tooltiplbl = _('Increase context for all diffs')
143
143
144 if fileid:
144 if fileid:
145 params['anchor'] = 'a_' + fileid
145 params['anchor'] = 'a_' + fileid
146 return h.link_to(lbl, h.url.current(**params), title=tooltiplbl, class_='tooltip')
146 return h.link_to(lbl, h.url.current(**params), title=tooltiplbl, class_='tooltip')
147
147
148
148
149 class ChangesetController(BaseRepoController):
149 class ChangesetController(BaseRepoController):
150
150
151 def __before__(self):
151 def __before__(self):
152 super(ChangesetController, self).__before__()
152 super(ChangesetController, self).__before__()
153 c.affected_files_cut_off = 60
153 c.affected_files_cut_off = 60
154
154
155 def _index(self, commit_id_range, method):
155 def _index(self, commit_id_range, method):
156 c.ignorews_url = _ignorews_url
156 c.ignorews_url = _ignorews_url
157 c.context_url = _context_url
157 c.context_url = _context_url
158 c.fulldiff = fulldiff = request.GET.get('fulldiff')
158 c.fulldiff = fulldiff = request.GET.get('fulldiff')
159
159
160 # fetch global flags of ignore ws or context lines
160 # fetch global flags of ignore ws or context lines
161 context_lcl = get_line_ctx('', request.GET)
161 context_lcl = get_line_ctx('', request.GET)
162 ign_whitespace_lcl = get_ignore_ws('', request.GET)
162 ign_whitespace_lcl = get_ignore_ws('', request.GET)
163
163
164 # diff_limit will cut off the whole diff if the limit is applied
164 # diff_limit will cut off the whole diff if the limit is applied
165 # otherwise it will just hide the big files from the front-end
165 # otherwise it will just hide the big files from the front-end
166 diff_limit = self.cut_off_limit_diff
166 diff_limit = self.cut_off_limit_diff
167 file_limit = self.cut_off_limit_file
167 file_limit = self.cut_off_limit_file
168
168
169 # get ranges of commit ids if preset
169 # get ranges of commit ids if preset
170 commit_range = commit_id_range.split('...')[:2]
170 commit_range = commit_id_range.split('...')[:2]
171
171
172 try:
172 try:
173 pre_load = ['affected_files', 'author', 'branch', 'date',
173 pre_load = ['affected_files', 'author', 'branch', 'date',
174 'message', 'parents']
174 'message', 'parents']
175
175
176 if len(commit_range) == 2:
176 if len(commit_range) == 2:
177 commits = c.rhodecode_repo.get_commits(
177 commits = c.rhodecode_repo.get_commits(
178 start_id=commit_range[0], end_id=commit_range[1],
178 start_id=commit_range[0], end_id=commit_range[1],
179 pre_load=pre_load)
179 pre_load=pre_load)
180 commits = list(commits)
180 commits = list(commits)
181 else:
181 else:
182 commits = [c.rhodecode_repo.get_commit(
182 commits = [c.rhodecode_repo.get_commit(
183 commit_id=commit_id_range, pre_load=pre_load)]
183 commit_id=commit_id_range, pre_load=pre_load)]
184
184
185 c.commit_ranges = commits
185 c.commit_ranges = commits
186 if not c.commit_ranges:
186 if not c.commit_ranges:
187 raise RepositoryError(
187 raise RepositoryError(
188 'The commit range returned an empty result')
188 'The commit range returned an empty result')
189 except CommitDoesNotExistError:
189 except CommitDoesNotExistError:
190 msg = _('No such commit exists for this repository')
190 msg = _('No such commit exists for this repository')
191 h.flash(msg, category='error')
191 h.flash(msg, category='error')
192 raise HTTPNotFound()
192 raise HTTPNotFound()
193 except Exception:
193 except Exception:
194 log.exception("General failure")
194 log.exception("General failure")
195 raise HTTPNotFound()
195 raise HTTPNotFound()
196
196
197 c.changes = OrderedDict()
197 c.changes = OrderedDict()
198 c.lines_added = 0
198 c.lines_added = 0
199 c.lines_deleted = 0
199 c.lines_deleted = 0
200
200
201 # auto collapse if we have more than limit
201 # auto collapse if we have more than limit
202 collapse_limit = diffs.DiffProcessor._collapse_commits_over
202 collapse_limit = diffs.DiffProcessor._collapse_commits_over
203 c.collapse_all_commits = len(c.commit_ranges) > collapse_limit
203 c.collapse_all_commits = len(c.commit_ranges) > collapse_limit
204
204
205 c.commit_statuses = ChangesetStatus.STATUSES
205 c.commit_statuses = ChangesetStatus.STATUSES
206 c.inline_comments = []
206 c.inline_comments = []
207 c.files = []
207 c.files = []
208
208
209 c.statuses = []
209 c.statuses = []
210 c.comments = []
210 c.comments = []
211 if len(c.commit_ranges) == 1:
211 if len(c.commit_ranges) == 1:
212 commit = c.commit_ranges[0]
212 commit = c.commit_ranges[0]
213 c.comments = ChangesetCommentsModel().get_comments(
213 c.comments = ChangesetCommentsModel().get_comments(
214 c.rhodecode_db_repo.repo_id,
214 c.rhodecode_db_repo.repo_id,
215 revision=commit.raw_id)
215 revision=commit.raw_id)
216 c.statuses.append(ChangesetStatusModel().get_status(
216 c.statuses.append(ChangesetStatusModel().get_status(
217 c.rhodecode_db_repo.repo_id, commit.raw_id))
217 c.rhodecode_db_repo.repo_id, commit.raw_id))
218 # comments from PR
218 # comments from PR
219 statuses = ChangesetStatusModel().get_statuses(
219 statuses = ChangesetStatusModel().get_statuses(
220 c.rhodecode_db_repo.repo_id, commit.raw_id,
220 c.rhodecode_db_repo.repo_id, commit.raw_id,
221 with_revisions=True)
221 with_revisions=True)
222 prs = set(st.pull_request for st in statuses
222 prs = set(st.pull_request for st in statuses
223 if st.pull_request is not None)
223 if st.pull_request is not None)
224 # from associated statuses, check the pull requests, and
224 # from associated statuses, check the pull requests, and
225 # show comments from them
225 # show comments from them
226 for pr in prs:
226 for pr in prs:
227 c.comments.extend(pr.comments)
227 c.comments.extend(pr.comments)
228
228
229 # Iterate over ranges (default commit view is always one commit)
229 # Iterate over ranges (default commit view is always one commit)
230 for commit in c.commit_ranges:
230 for commit in c.commit_ranges:
231 c.changes[commit.raw_id] = []
231 c.changes[commit.raw_id] = []
232
232
233 commit2 = commit
233 commit2 = commit
234 commit1 = commit.parents[0] if commit.parents else EmptyCommit()
234 commit1 = commit.parents[0] if commit.parents else EmptyCommit()
235
235
236 _diff = c.rhodecode_repo.get_diff(
236 _diff = c.rhodecode_repo.get_diff(
237 commit1, commit2,
237 commit1, commit2,
238 ignore_whitespace=ign_whitespace_lcl, context=context_lcl)
238 ignore_whitespace=ign_whitespace_lcl, context=context_lcl)
239 diff_processor = diffs.DiffProcessor(
239 diff_processor = diffs.DiffProcessor(
240 _diff, format='newdiff', diff_limit=diff_limit,
240 _diff, format='newdiff', diff_limit=diff_limit,
241 file_limit=file_limit, show_full_diff=fulldiff)
241 file_limit=file_limit, show_full_diff=fulldiff)
242
242
243 commit_changes = OrderedDict()
243 commit_changes = OrderedDict()
244 if method == 'show':
244 if method == 'show':
245 _parsed = diff_processor.prepare()
245 _parsed = diff_processor.prepare()
246 c.limited_diff = isinstance(_parsed, diffs.LimitedDiffContainer)
246 c.limited_diff = isinstance(_parsed, diffs.LimitedDiffContainer)
247
247
248 _parsed = diff_processor.prepare()
248 _parsed = diff_processor.prepare()
249
249
250 def _node_getter(commit):
250 def _node_getter(commit):
251 def get_node(fname):
251 def get_node(fname):
252 try:
252 try:
253 return commit.get_node(fname)
253 return commit.get_node(fname)
254 except NodeDoesNotExistError:
254 except NodeDoesNotExistError:
255 return None
255 return None
256 return get_node
256 return get_node
257
257
258 inline_comments = ChangesetCommentsModel().get_inline_comments(
258 inline_comments = ChangesetCommentsModel().get_inline_comments(
259 c.rhodecode_db_repo.repo_id, revision=commit.raw_id)
259 c.rhodecode_db_repo.repo_id, revision=commit.raw_id)
260 c.inline_cnt = ChangesetCommentsModel().get_inline_comments_count(
260 c.inline_cnt = ChangesetCommentsModel().get_inline_comments_count(
261 inline_comments)
261 inline_comments)
262
262
263 diffset = codeblocks.DiffSet(
263 diffset = codeblocks.DiffSet(
264 repo_name=c.repo_name,
264 repo_name=c.repo_name,
265 source_node_getter=_node_getter(commit1),
265 source_node_getter=_node_getter(commit1),
266 target_node_getter=_node_getter(commit2),
266 target_node_getter=_node_getter(commit2),
267 comments=inline_comments
267 comments=inline_comments
268 ).render_patchset(_parsed, commit1.raw_id, commit2.raw_id)
268 ).render_patchset(_parsed, commit1.raw_id, commit2.raw_id)
269 c.changes[commit.raw_id] = diffset
269 c.changes[commit.raw_id] = diffset
270 else:
270 else:
271 # downloads/raw we only need RAW diff nothing else
271 # downloads/raw we only need RAW diff nothing else
272 diff = diff_processor.as_raw()
272 diff = diff_processor.as_raw()
273 c.changes[commit.raw_id] = [None, None, None, None, diff, None, None]
273 c.changes[commit.raw_id] = [None, None, None, None, diff, None, None]
274
274
275 # sort comments by how they were generated
275 # sort comments by how they were generated
276 c.comments = sorted(c.comments, key=lambda x: x.comment_id)
276 c.comments = sorted(c.comments, key=lambda x: x.comment_id)
277
277
278
278
279 if len(c.commit_ranges) == 1:
279 if len(c.commit_ranges) == 1:
280 c.commit = c.commit_ranges[0]
280 c.commit = c.commit_ranges[0]
281 c.parent_tmpl = ''.join(
281 c.parent_tmpl = ''.join(
282 '# Parent %s\n' % x.raw_id for x in c.commit.parents)
282 '# Parent %s\n' % x.raw_id for x in c.commit.parents)
283 if method == 'download':
283 if method == 'download':
284 response.content_type = 'text/plain'
284 response.content_type = 'text/plain'
285 response.content_disposition = (
285 response.content_disposition = (
286 'attachment; filename=%s.diff' % commit_id_range[:12])
286 'attachment; filename=%s.diff' % commit_id_range[:12])
287 return diff
287 return diff
288 elif method == 'patch':
288 elif method == 'patch':
289 response.content_type = 'text/plain'
289 response.content_type = 'text/plain'
290 c.diff = safe_unicode(diff)
290 c.diff = safe_unicode(diff)
291 return render('changeset/patch_changeset.mako')
291 return render('changeset/patch_changeset.mako')
292 elif method == 'raw':
292 elif method == 'raw':
293 response.content_type = 'text/plain'
293 response.content_type = 'text/plain'
294 return diff
294 return diff
295 elif method == 'show':
295 elif method == 'show':
296 if len(c.commit_ranges) == 1:
296 if len(c.commit_ranges) == 1:
297 return render('changeset/changeset.mako')
297 return render('changeset/changeset.mako')
298 else:
298 else:
299 c.ancestor = None
299 c.ancestor = None
300 c.target_repo = c.rhodecode_db_repo
300 c.target_repo = c.rhodecode_db_repo
301 return render('changeset/changeset_range.mako')
301 return render('changeset/changeset_range.mako')
302
302
303 @LoginRequired()
303 @LoginRequired()
304 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
304 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
305 'repository.admin')
305 'repository.admin')
306 def index(self, revision, method='show'):
306 def index(self, revision, method='show'):
307 return self._index(revision, method=method)
307 return self._index(revision, method=method)
308
308
309 @LoginRequired()
309 @LoginRequired()
310 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
310 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
311 'repository.admin')
311 'repository.admin')
312 def changeset_raw(self, revision):
312 def changeset_raw(self, revision):
313 return self._index(revision, method='raw')
313 return self._index(revision, method='raw')
314
314
315 @LoginRequired()
315 @LoginRequired()
316 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
316 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
317 'repository.admin')
317 'repository.admin')
318 def changeset_patch(self, revision):
318 def changeset_patch(self, revision):
319 return self._index(revision, method='patch')
319 return self._index(revision, method='patch')
320
320
321 @LoginRequired()
321 @LoginRequired()
322 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
322 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
323 'repository.admin')
323 'repository.admin')
324 def changeset_download(self, revision):
324 def changeset_download(self, revision):
325 return self._index(revision, method='download')
325 return self._index(revision, method='download')
326
326
327 @LoginRequired()
327 @LoginRequired()
328 @NotAnonymous()
328 @NotAnonymous()
329 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
329 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
330 'repository.admin')
330 'repository.admin')
331 @auth.CSRFRequired()
331 @auth.CSRFRequired()
332 @jsonify
332 @jsonify
333 def comment(self, repo_name, revision):
333 def comment(self, repo_name, revision):
334 commit_id = revision
334 commit_id = revision
335 status = request.POST.get('changeset_status', None)
335 status = request.POST.get('changeset_status', None)
336 text = request.POST.get('text')
336 text = request.POST.get('text')
337 if status:
337 if status:
338 text = text or (_('Status change %(transition_icon)s %(status)s')
338 text = text or (_('Status change %(transition_icon)s %(status)s')
339 % {'transition_icon': '>',
339 % {'transition_icon': '>',
340 'status': ChangesetStatus.get_status_lbl(status)})
340 'status': ChangesetStatus.get_status_lbl(status)})
341
341
342 multi_commit_ids = filter(
342 multi_commit_ids = filter(
343 lambda s: s not in ['', None],
343 lambda s: s not in ['', None],
344 request.POST.get('commit_ids', '').split(','),)
344 request.POST.get('commit_ids', '').split(','),)
345
345
346 commit_ids = multi_commit_ids or [commit_id]
346 commit_ids = multi_commit_ids or [commit_id]
347 comment = None
347 comment = None
348 for current_id in filter(None, commit_ids):
348 for current_id in filter(None, commit_ids):
349 c.co = comment = ChangesetCommentsModel().create(
349 c.co = comment = ChangesetCommentsModel().create(
350 text=text,
350 text=text,
351 repo=c.rhodecode_db_repo.repo_id,
351 repo=c.rhodecode_db_repo.repo_id,
352 user=c.rhodecode_user.user_id,
352 user=c.rhodecode_user.user_id,
353 revision=current_id,
353 revision=current_id,
354 f_path=request.POST.get('f_path'),
354 f_path=request.POST.get('f_path'),
355 line_no=request.POST.get('line'),
355 line_no=request.POST.get('line'),
356 status_change=(ChangesetStatus.get_status_lbl(status)
356 status_change=(ChangesetStatus.get_status_lbl(status)
357 if status else None),
357 if status else None),
358 status_change_type=status
358 status_change_type=status
359 )
359 )
360 c.inline_comment = True if comment.line_no else False
361
360 # get status if set !
362 # get status if set !
361 if status:
363 if status:
362 # if latest status was from pull request and it's closed
364 # if latest status was from pull request and it's closed
363 # disallow changing status !
365 # disallow changing status !
364 # dont_allow_on_closed_pull_request = True !
366 # dont_allow_on_closed_pull_request = True !
365
367
366 try:
368 try:
367 ChangesetStatusModel().set_status(
369 ChangesetStatusModel().set_status(
368 c.rhodecode_db_repo.repo_id,
370 c.rhodecode_db_repo.repo_id,
369 status,
371 status,
370 c.rhodecode_user.user_id,
372 c.rhodecode_user.user_id,
371 comment,
373 comment,
372 revision=current_id,
374 revision=current_id,
373 dont_allow_on_closed_pull_request=True
375 dont_allow_on_closed_pull_request=True
374 )
376 )
375 except StatusChangeOnClosedPullRequestError:
377 except StatusChangeOnClosedPullRequestError:
376 msg = _('Changing the status of a commit associated with '
378 msg = _('Changing the status of a commit associated with '
377 'a closed pull request is not allowed')
379 'a closed pull request is not allowed')
378 log.exception(msg)
380 log.exception(msg)
379 h.flash(msg, category='warning')
381 h.flash(msg, category='warning')
380 return redirect(h.url(
382 return redirect(h.url(
381 'changeset_home', repo_name=repo_name,
383 'changeset_home', repo_name=repo_name,
382 revision=current_id))
384 revision=current_id))
383
385
384 # finalize, commit and redirect
386 # finalize, commit and redirect
385 Session().commit()
387 Session().commit()
386
388
387 data = {
389 data = {
388 'target_id': h.safeid(h.safe_unicode(request.POST.get('f_path'))),
390 'target_id': h.safeid(h.safe_unicode(request.POST.get('f_path'))),
389 }
391 }
390 if comment:
392 if comment:
391 data.update(comment.get_dict())
393 data.update(comment.get_dict())
392 data.update({'rendered_text':
394 data.update({'rendered_text':
393 render('changeset/changeset_comment_block.mako')})
395 render('changeset/changeset_comment_block.mako')})
394
396
395 return data
397 return data
396
398
397 @LoginRequired()
399 @LoginRequired()
398 @NotAnonymous()
400 @NotAnonymous()
399 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
401 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
400 'repository.admin')
402 'repository.admin')
401 @auth.CSRFRequired()
403 @auth.CSRFRequired()
402 def preview_comment(self):
404 def preview_comment(self):
403 # Technically a CSRF token is not needed as no state changes with this
405 # Technically a CSRF token is not needed as no state changes with this
404 # call. However, as this is a POST is better to have it, so automated
406 # call. However, as this is a POST is better to have it, so automated
405 # tools don't flag it as potential CSRF.
407 # tools don't flag it as potential CSRF.
406 # Post is required because the payload could be bigger than the maximum
408 # Post is required because the payload could be bigger than the maximum
407 # allowed by GET.
409 # allowed by GET.
408 if not request.environ.get('HTTP_X_PARTIAL_XHR'):
410 if not request.environ.get('HTTP_X_PARTIAL_XHR'):
409 raise HTTPBadRequest()
411 raise HTTPBadRequest()
410 text = request.POST.get('text')
412 text = request.POST.get('text')
411 renderer = request.POST.get('renderer') or 'rst'
413 renderer = request.POST.get('renderer') or 'rst'
412 if text:
414 if text:
413 return h.render(text, renderer=renderer, mentions=True)
415 return h.render(text, renderer=renderer, mentions=True)
414 return ''
416 return ''
415
417
416 @LoginRequired()
418 @LoginRequired()
417 @NotAnonymous()
419 @NotAnonymous()
418 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
420 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
419 'repository.admin')
421 'repository.admin')
420 @auth.CSRFRequired()
422 @auth.CSRFRequired()
421 @jsonify
423 @jsonify
422 def delete_comment(self, repo_name, comment_id):
424 def delete_comment(self, repo_name, comment_id):
423 comment = ChangesetComment.get(comment_id)
425 comment = ChangesetComment.get(comment_id)
424 owner = (comment.author.user_id == c.rhodecode_user.user_id)
426 owner = (comment.author.user_id == c.rhodecode_user.user_id)
425 is_repo_admin = h.HasRepoPermissionAny('repository.admin')(c.repo_name)
427 is_repo_admin = h.HasRepoPermissionAny('repository.admin')(c.repo_name)
426 if h.HasPermissionAny('hg.admin')() or is_repo_admin or owner:
428 if h.HasPermissionAny('hg.admin')() or is_repo_admin or owner:
427 ChangesetCommentsModel().delete(comment=comment)
429 ChangesetCommentsModel().delete(comment=comment)
428 Session().commit()
430 Session().commit()
429 return True
431 return True
430 else:
432 else:
431 raise HTTPForbidden()
433 raise HTTPForbidden()
432
434
433 @LoginRequired()
435 @LoginRequired()
434 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
436 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
435 'repository.admin')
437 'repository.admin')
436 @jsonify
438 @jsonify
437 def changeset_info(self, repo_name, revision):
439 def changeset_info(self, repo_name, revision):
438 if request.is_xhr:
440 if request.is_xhr:
439 try:
441 try:
440 return c.rhodecode_repo.get_commit(commit_id=revision)
442 return c.rhodecode_repo.get_commit(commit_id=revision)
441 except CommitDoesNotExistError as e:
443 except CommitDoesNotExistError as e:
442 return EmptyCommit(message=str(e))
444 return EmptyCommit(message=str(e))
443 else:
445 else:
444 raise HTTPBadRequest()
446 raise HTTPBadRequest()
445
447
446 @LoginRequired()
448 @LoginRequired()
447 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
449 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
448 'repository.admin')
450 'repository.admin')
449 @jsonify
451 @jsonify
450 def changeset_children(self, repo_name, revision):
452 def changeset_children(self, repo_name, revision):
451 if request.is_xhr:
453 if request.is_xhr:
452 commit = c.rhodecode_repo.get_commit(commit_id=revision)
454 commit = c.rhodecode_repo.get_commit(commit_id=revision)
453 result = {"results": commit.children}
455 result = {"results": commit.children}
454 return result
456 return result
455 else:
457 else:
456 raise HTTPBadRequest()
458 raise HTTPBadRequest()
457
459
458 @LoginRequired()
460 @LoginRequired()
459 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
461 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
460 'repository.admin')
462 'repository.admin')
461 @jsonify
463 @jsonify
462 def changeset_parents(self, repo_name, revision):
464 def changeset_parents(self, repo_name, revision):
463 if request.is_xhr:
465 if request.is_xhr:
464 commit = c.rhodecode_repo.get_commit(commit_id=revision)
466 commit = c.rhodecode_repo.get_commit(commit_id=revision)
465 result = {"results": commit.parents}
467 result = {"results": commit.parents}
466 return result
468 return result
467 else:
469 else:
468 raise HTTPBadRequest()
470 raise HTTPBadRequest()
@@ -1,1020 +1,1024 b''
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2
2
3 # Copyright (C) 2012-2017 RhodeCode GmbH
3 # Copyright (C) 2012-2017 RhodeCode GmbH
4 #
4 #
5 # This program is free software: you can redistribute it and/or modify
5 # This program is free software: you can redistribute it and/or modify
6 # it under the terms of the GNU Affero General Public License, version 3
6 # it under the terms of the GNU Affero General Public License, version 3
7 # (only), as published by the Free Software Foundation.
7 # (only), as published by the Free Software Foundation.
8 #
8 #
9 # This program is distributed in the hope that it will be useful,
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
12 # GNU General Public License for more details.
13 #
13 #
14 # You should have received a copy of the GNU Affero General Public License
14 # You should have received a copy of the GNU Affero General Public License
15 # along with this program. If not, see <http://www.gnu.org/licenses/>.
15 # along with this program. If not, see <http://www.gnu.org/licenses/>.
16 #
16 #
17 # This program is dual-licensed. If you wish to learn more about the
17 # This program is dual-licensed. If you wish to learn more about the
18 # RhodeCode Enterprise Edition, including its added features, Support services,
18 # RhodeCode Enterprise Edition, including its added features, Support services,
19 # and proprietary license terms, please see https://rhodecode.com/licenses/
19 # and proprietary license terms, please see https://rhodecode.com/licenses/
20
20
21 """
21 """
22 pull requests controller for rhodecode for initializing pull requests
22 pull requests controller for rhodecode for initializing pull requests
23 """
23 """
24 import types
24 import types
25
25
26 import peppercorn
26 import peppercorn
27 import formencode
27 import formencode
28 import logging
28 import logging
29 import collections
29 import collections
30
30
31 from webob.exc import HTTPNotFound, HTTPForbidden, HTTPBadRequest
31 from webob.exc import HTTPNotFound, HTTPForbidden, HTTPBadRequest
32 from pylons import request, tmpl_context as c, url
32 from pylons import request, tmpl_context as c, url
33 from pylons.controllers.util import redirect
33 from pylons.controllers.util import redirect
34 from pylons.i18n.translation import _
34 from pylons.i18n.translation import _
35 from pyramid.threadlocal import get_current_registry
35 from pyramid.threadlocal import get_current_registry
36 from sqlalchemy.sql import func
36 from sqlalchemy.sql import func
37 from sqlalchemy.sql.expression import or_
37 from sqlalchemy.sql.expression import or_
38
38
39 from rhodecode import events
39 from rhodecode import events
40 from rhodecode.lib import auth, diffs, helpers as h, codeblocks
40 from rhodecode.lib import auth, diffs, helpers as h, codeblocks
41 from rhodecode.lib.ext_json import json
41 from rhodecode.lib.ext_json import json
42 from rhodecode.lib.base import (
42 from rhodecode.lib.base import (
43 BaseRepoController, render, vcs_operation_context)
43 BaseRepoController, render, vcs_operation_context)
44 from rhodecode.lib.auth import (
44 from rhodecode.lib.auth import (
45 LoginRequired, HasRepoPermissionAnyDecorator, NotAnonymous,
45 LoginRequired, HasRepoPermissionAnyDecorator, NotAnonymous,
46 HasAcceptedRepoType, XHRRequired)
46 HasAcceptedRepoType, XHRRequired)
47 from rhodecode.lib.channelstream import channelstream_request
47 from rhodecode.lib.channelstream import channelstream_request
48 from rhodecode.lib.utils import jsonify
48 from rhodecode.lib.utils import jsonify
49 from rhodecode.lib.utils2 import (
49 from rhodecode.lib.utils2 import (
50 safe_int, safe_str, str2bool, safe_unicode)
50 safe_int, safe_str, str2bool, safe_unicode)
51 from rhodecode.lib.vcs.backends.base import (
51 from rhodecode.lib.vcs.backends.base import (
52 EmptyCommit, UpdateFailureReason, EmptyRepository)
52 EmptyCommit, UpdateFailureReason, EmptyRepository)
53 from rhodecode.lib.vcs.exceptions import (
53 from rhodecode.lib.vcs.exceptions import (
54 EmptyRepositoryError, CommitDoesNotExistError, RepositoryRequirementError,
54 EmptyRepositoryError, CommitDoesNotExistError, RepositoryRequirementError,
55 NodeDoesNotExistError)
55 NodeDoesNotExistError)
56
56
57 from rhodecode.model.changeset_status import ChangesetStatusModel
57 from rhodecode.model.changeset_status import ChangesetStatusModel
58 from rhodecode.model.comment import ChangesetCommentsModel
58 from rhodecode.model.comment import ChangesetCommentsModel
59 from rhodecode.model.db import (PullRequest, ChangesetStatus, ChangesetComment,
59 from rhodecode.model.db import (PullRequest, ChangesetStatus, ChangesetComment,
60 Repository, PullRequestVersion)
60 Repository, PullRequestVersion)
61 from rhodecode.model.forms import PullRequestForm
61 from rhodecode.model.forms import PullRequestForm
62 from rhodecode.model.meta import Session
62 from rhodecode.model.meta import Session
63 from rhodecode.model.pull_request import PullRequestModel
63 from rhodecode.model.pull_request import PullRequestModel
64
64
65 log = logging.getLogger(__name__)
65 log = logging.getLogger(__name__)
66
66
67
67
68 class PullrequestsController(BaseRepoController):
68 class PullrequestsController(BaseRepoController):
69 def __before__(self):
69 def __before__(self):
70 super(PullrequestsController, self).__before__()
70 super(PullrequestsController, self).__before__()
71
71
72 def _load_compare_data(self, pull_request, inline_comments):
72 def _load_compare_data(self, pull_request, inline_comments):
73 """
73 """
74 Load context data needed for generating compare diff
74 Load context data needed for generating compare diff
75
75
76 :param pull_request: object related to the request
76 :param pull_request: object related to the request
77 :param enable_comments: flag to determine if comments are included
77 :param enable_comments: flag to determine if comments are included
78 """
78 """
79 source_repo = pull_request.source_repo
79 source_repo = pull_request.source_repo
80 source_ref_id = pull_request.source_ref_parts.commit_id
80 source_ref_id = pull_request.source_ref_parts.commit_id
81
81
82 target_repo = pull_request.target_repo
82 target_repo = pull_request.target_repo
83 target_ref_id = pull_request.target_ref_parts.commit_id
83 target_ref_id = pull_request.target_ref_parts.commit_id
84
84
85 # despite opening commits for bookmarks/branches/tags, we always
85 # despite opening commits for bookmarks/branches/tags, we always
86 # convert this to rev to prevent changes after bookmark or branch change
86 # convert this to rev to prevent changes after bookmark or branch change
87 c.source_ref_type = 'rev'
87 c.source_ref_type = 'rev'
88 c.source_ref = source_ref_id
88 c.source_ref = source_ref_id
89
89
90 c.target_ref_type = 'rev'
90 c.target_ref_type = 'rev'
91 c.target_ref = target_ref_id
91 c.target_ref = target_ref_id
92
92
93 c.source_repo = source_repo
93 c.source_repo = source_repo
94 c.target_repo = target_repo
94 c.target_repo = target_repo
95
95
96 c.fulldiff = bool(request.GET.get('fulldiff'))
96 c.fulldiff = bool(request.GET.get('fulldiff'))
97
97
98 # diff_limit is the old behavior, will cut off the whole diff
98 # diff_limit is the old behavior, will cut off the whole diff
99 # if the limit is applied otherwise will just hide the
99 # if the limit is applied otherwise will just hide the
100 # big files from the front-end
100 # big files from the front-end
101 diff_limit = self.cut_off_limit_diff
101 diff_limit = self.cut_off_limit_diff
102 file_limit = self.cut_off_limit_file
102 file_limit = self.cut_off_limit_file
103
103
104 pre_load = ["author", "branch", "date", "message"]
104 pre_load = ["author", "branch", "date", "message"]
105
105
106 c.commit_ranges = []
106 c.commit_ranges = []
107 source_commit = EmptyCommit()
107 source_commit = EmptyCommit()
108 target_commit = EmptyCommit()
108 target_commit = EmptyCommit()
109 c.missing_requirements = False
109 c.missing_requirements = False
110 try:
110 try:
111 c.commit_ranges = [
111 c.commit_ranges = [
112 source_repo.get_commit(commit_id=rev, pre_load=pre_load)
112 source_repo.get_commit(commit_id=rev, pre_load=pre_load)
113 for rev in pull_request.revisions]
113 for rev in pull_request.revisions]
114
114
115 c.statuses = source_repo.statuses(
115 c.statuses = source_repo.statuses(
116 [x.raw_id for x in c.commit_ranges])
116 [x.raw_id for x in c.commit_ranges])
117
117
118 target_commit = source_repo.get_commit(
118 target_commit = source_repo.get_commit(
119 commit_id=safe_str(target_ref_id))
119 commit_id=safe_str(target_ref_id))
120 source_commit = source_repo.get_commit(
120 source_commit = source_repo.get_commit(
121 commit_id=safe_str(source_ref_id))
121 commit_id=safe_str(source_ref_id))
122 except RepositoryRequirementError:
122 except RepositoryRequirementError:
123 c.missing_requirements = True
123 c.missing_requirements = True
124
124
125 # auto collapse if we have more than limit
125 # auto collapse if we have more than limit
126 collapse_limit = diffs.DiffProcessor._collapse_commits_over
126 collapse_limit = diffs.DiffProcessor._collapse_commits_over
127 c.collapse_all_commits = len(c.commit_ranges) > collapse_limit
127 c.collapse_all_commits = len(c.commit_ranges) > collapse_limit
128
128
129 c.changes = {}
129 c.changes = {}
130 c.missing_commits = False
130 c.missing_commits = False
131 if (c.missing_requirements or
131 if (c.missing_requirements or
132 isinstance(source_commit, EmptyCommit) or
132 isinstance(source_commit, EmptyCommit) or
133 source_commit == target_commit):
133 source_commit == target_commit):
134 _parsed = []
134 _parsed = []
135 c.missing_commits = True
135 c.missing_commits = True
136 else:
136 else:
137 vcs_diff = PullRequestModel().get_diff(pull_request)
137 vcs_diff = PullRequestModel().get_diff(pull_request)
138 diff_processor = diffs.DiffProcessor(
138 diff_processor = diffs.DiffProcessor(
139 vcs_diff, format='newdiff', diff_limit=diff_limit,
139 vcs_diff, format='newdiff', diff_limit=diff_limit,
140 file_limit=file_limit, show_full_diff=c.fulldiff)
140 file_limit=file_limit, show_full_diff=c.fulldiff)
141
141
142 _parsed = diff_processor.prepare()
142 _parsed = diff_processor.prepare()
143 c.limited_diff = isinstance(_parsed, diffs.LimitedDiffContainer)
143 c.limited_diff = isinstance(_parsed, diffs.LimitedDiffContainer)
144
144
145 included_files = {}
145 included_files = {}
146 for f in _parsed:
146 for f in _parsed:
147 included_files[f['filename']] = f['stats']
147 included_files[f['filename']] = f['stats']
148
148
149 c.deleted_files = [fname for fname in inline_comments if
149 c.deleted_files = [fname for fname in inline_comments if
150 fname not in included_files]
150 fname not in included_files]
151
151
152 c.deleted_files_comments = collections.defaultdict(dict)
152 c.deleted_files_comments = collections.defaultdict(dict)
153 for fname, per_line_comments in inline_comments.items():
153 for fname, per_line_comments in inline_comments.items():
154 if fname in c.deleted_files:
154 if fname in c.deleted_files:
155 c.deleted_files_comments[fname]['stats'] = 0
155 c.deleted_files_comments[fname]['stats'] = 0
156 c.deleted_files_comments[fname]['comments'] = list()
156 c.deleted_files_comments[fname]['comments'] = list()
157 for lno, comments in per_line_comments.items():
157 for lno, comments in per_line_comments.items():
158 c.deleted_files_comments[fname]['comments'].extend(comments)
158 c.deleted_files_comments[fname]['comments'].extend(comments)
159
159
160 def _node_getter(commit):
160 def _node_getter(commit):
161 def get_node(fname):
161 def get_node(fname):
162 try:
162 try:
163 return commit.get_node(fname)
163 return commit.get_node(fname)
164 except NodeDoesNotExistError:
164 except NodeDoesNotExistError:
165 return None
165 return None
166 return get_node
166 return get_node
167
167
168 c.diffset = codeblocks.DiffSet(
168 c.diffset = codeblocks.DiffSet(
169 repo_name=c.repo_name,
169 repo_name=c.repo_name,
170 source_repo_name=c.source_repo.repo_name,
170 source_repo_name=c.source_repo.repo_name,
171 source_node_getter=_node_getter(target_commit),
171 source_node_getter=_node_getter(target_commit),
172 target_node_getter=_node_getter(source_commit),
172 target_node_getter=_node_getter(source_commit),
173 comments=inline_comments
173 comments=inline_comments
174 ).render_patchset(_parsed, target_commit.raw_id, source_commit.raw_id)
174 ).render_patchset(_parsed, target_commit.raw_id, source_commit.raw_id)
175
175
176 def _extract_ordering(self, request):
176 def _extract_ordering(self, request):
177 column_index = safe_int(request.GET.get('order[0][column]'))
177 column_index = safe_int(request.GET.get('order[0][column]'))
178 order_dir = request.GET.get('order[0][dir]', 'desc')
178 order_dir = request.GET.get('order[0][dir]', 'desc')
179 order_by = request.GET.get(
179 order_by = request.GET.get(
180 'columns[%s][data][sort]' % column_index, 'name_raw')
180 'columns[%s][data][sort]' % column_index, 'name_raw')
181 return order_by, order_dir
181 return order_by, order_dir
182
182
183 @LoginRequired()
183 @LoginRequired()
184 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
184 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
185 'repository.admin')
185 'repository.admin')
186 @HasAcceptedRepoType('git', 'hg')
186 @HasAcceptedRepoType('git', 'hg')
187 def show_all(self, repo_name):
187 def show_all(self, repo_name):
188 # filter types
188 # filter types
189 c.active = 'open'
189 c.active = 'open'
190 c.source = str2bool(request.GET.get('source'))
190 c.source = str2bool(request.GET.get('source'))
191 c.closed = str2bool(request.GET.get('closed'))
191 c.closed = str2bool(request.GET.get('closed'))
192 c.my = str2bool(request.GET.get('my'))
192 c.my = str2bool(request.GET.get('my'))
193 c.awaiting_review = str2bool(request.GET.get('awaiting_review'))
193 c.awaiting_review = str2bool(request.GET.get('awaiting_review'))
194 c.awaiting_my_review = str2bool(request.GET.get('awaiting_my_review'))
194 c.awaiting_my_review = str2bool(request.GET.get('awaiting_my_review'))
195 c.repo_name = repo_name
195 c.repo_name = repo_name
196
196
197 opened_by = None
197 opened_by = None
198 if c.my:
198 if c.my:
199 c.active = 'my'
199 c.active = 'my'
200 opened_by = [c.rhodecode_user.user_id]
200 opened_by = [c.rhodecode_user.user_id]
201
201
202 statuses = [PullRequest.STATUS_NEW, PullRequest.STATUS_OPEN]
202 statuses = [PullRequest.STATUS_NEW, PullRequest.STATUS_OPEN]
203 if c.closed:
203 if c.closed:
204 c.active = 'closed'
204 c.active = 'closed'
205 statuses = [PullRequest.STATUS_CLOSED]
205 statuses = [PullRequest.STATUS_CLOSED]
206
206
207 if c.awaiting_review and not c.source:
207 if c.awaiting_review and not c.source:
208 c.active = 'awaiting'
208 c.active = 'awaiting'
209 if c.source and not c.awaiting_review:
209 if c.source and not c.awaiting_review:
210 c.active = 'source'
210 c.active = 'source'
211 if c.awaiting_my_review:
211 if c.awaiting_my_review:
212 c.active = 'awaiting_my'
212 c.active = 'awaiting_my'
213
213
214 data = self._get_pull_requests_list(
214 data = self._get_pull_requests_list(
215 repo_name=repo_name, opened_by=opened_by, statuses=statuses)
215 repo_name=repo_name, opened_by=opened_by, statuses=statuses)
216 if not request.is_xhr:
216 if not request.is_xhr:
217 c.data = json.dumps(data['data'])
217 c.data = json.dumps(data['data'])
218 c.records_total = data['recordsTotal']
218 c.records_total = data['recordsTotal']
219 return render('/pullrequests/pullrequests.mako')
219 return render('/pullrequests/pullrequests.mako')
220 else:
220 else:
221 return json.dumps(data)
221 return json.dumps(data)
222
222
223 def _get_pull_requests_list(self, repo_name, opened_by, statuses):
223 def _get_pull_requests_list(self, repo_name, opened_by, statuses):
224 # pagination
224 # pagination
225 start = safe_int(request.GET.get('start'), 0)
225 start = safe_int(request.GET.get('start'), 0)
226 length = safe_int(request.GET.get('length'), c.visual.dashboard_items)
226 length = safe_int(request.GET.get('length'), c.visual.dashboard_items)
227 order_by, order_dir = self._extract_ordering(request)
227 order_by, order_dir = self._extract_ordering(request)
228
228
229 if c.awaiting_review:
229 if c.awaiting_review:
230 pull_requests = PullRequestModel().get_awaiting_review(
230 pull_requests = PullRequestModel().get_awaiting_review(
231 repo_name, source=c.source, opened_by=opened_by,
231 repo_name, source=c.source, opened_by=opened_by,
232 statuses=statuses, offset=start, length=length,
232 statuses=statuses, offset=start, length=length,
233 order_by=order_by, order_dir=order_dir)
233 order_by=order_by, order_dir=order_dir)
234 pull_requests_total_count = PullRequestModel(
234 pull_requests_total_count = PullRequestModel(
235 ).count_awaiting_review(
235 ).count_awaiting_review(
236 repo_name, source=c.source, statuses=statuses,
236 repo_name, source=c.source, statuses=statuses,
237 opened_by=opened_by)
237 opened_by=opened_by)
238 elif c.awaiting_my_review:
238 elif c.awaiting_my_review:
239 pull_requests = PullRequestModel().get_awaiting_my_review(
239 pull_requests = PullRequestModel().get_awaiting_my_review(
240 repo_name, source=c.source, opened_by=opened_by,
240 repo_name, source=c.source, opened_by=opened_by,
241 user_id=c.rhodecode_user.user_id, statuses=statuses,
241 user_id=c.rhodecode_user.user_id, statuses=statuses,
242 offset=start, length=length, order_by=order_by,
242 offset=start, length=length, order_by=order_by,
243 order_dir=order_dir)
243 order_dir=order_dir)
244 pull_requests_total_count = PullRequestModel(
244 pull_requests_total_count = PullRequestModel(
245 ).count_awaiting_my_review(
245 ).count_awaiting_my_review(
246 repo_name, source=c.source, user_id=c.rhodecode_user.user_id,
246 repo_name, source=c.source, user_id=c.rhodecode_user.user_id,
247 statuses=statuses, opened_by=opened_by)
247 statuses=statuses, opened_by=opened_by)
248 else:
248 else:
249 pull_requests = PullRequestModel().get_all(
249 pull_requests = PullRequestModel().get_all(
250 repo_name, source=c.source, opened_by=opened_by,
250 repo_name, source=c.source, opened_by=opened_by,
251 statuses=statuses, offset=start, length=length,
251 statuses=statuses, offset=start, length=length,
252 order_by=order_by, order_dir=order_dir)
252 order_by=order_by, order_dir=order_dir)
253 pull_requests_total_count = PullRequestModel().count_all(
253 pull_requests_total_count = PullRequestModel().count_all(
254 repo_name, source=c.source, statuses=statuses,
254 repo_name, source=c.source, statuses=statuses,
255 opened_by=opened_by)
255 opened_by=opened_by)
256
256
257 from rhodecode.lib.utils import PartialRenderer
257 from rhodecode.lib.utils import PartialRenderer
258 _render = PartialRenderer('data_table/_dt_elements.mako')
258 _render = PartialRenderer('data_table/_dt_elements.mako')
259 data = []
259 data = []
260 for pr in pull_requests:
260 for pr in pull_requests:
261 comments = ChangesetCommentsModel().get_all_comments(
261 comments = ChangesetCommentsModel().get_all_comments(
262 c.rhodecode_db_repo.repo_id, pull_request=pr)
262 c.rhodecode_db_repo.repo_id, pull_request=pr)
263
263
264 data.append({
264 data.append({
265 'name': _render('pullrequest_name',
265 'name': _render('pullrequest_name',
266 pr.pull_request_id, pr.target_repo.repo_name),
266 pr.pull_request_id, pr.target_repo.repo_name),
267 'name_raw': pr.pull_request_id,
267 'name_raw': pr.pull_request_id,
268 'status': _render('pullrequest_status',
268 'status': _render('pullrequest_status',
269 pr.calculated_review_status()),
269 pr.calculated_review_status()),
270 'title': _render(
270 'title': _render(
271 'pullrequest_title', pr.title, pr.description),
271 'pullrequest_title', pr.title, pr.description),
272 'description': h.escape(pr.description),
272 'description': h.escape(pr.description),
273 'updated_on': _render('pullrequest_updated_on',
273 'updated_on': _render('pullrequest_updated_on',
274 h.datetime_to_time(pr.updated_on)),
274 h.datetime_to_time(pr.updated_on)),
275 'updated_on_raw': h.datetime_to_time(pr.updated_on),
275 'updated_on_raw': h.datetime_to_time(pr.updated_on),
276 'created_on': _render('pullrequest_updated_on',
276 'created_on': _render('pullrequest_updated_on',
277 h.datetime_to_time(pr.created_on)),
277 h.datetime_to_time(pr.created_on)),
278 'created_on_raw': h.datetime_to_time(pr.created_on),
278 'created_on_raw': h.datetime_to_time(pr.created_on),
279 'author': _render('pullrequest_author',
279 'author': _render('pullrequest_author',
280 pr.author.full_contact, ),
280 pr.author.full_contact, ),
281 'author_raw': pr.author.full_name,
281 'author_raw': pr.author.full_name,
282 'comments': _render('pullrequest_comments', len(comments)),
282 'comments': _render('pullrequest_comments', len(comments)),
283 'comments_raw': len(comments),
283 'comments_raw': len(comments),
284 'closed': pr.is_closed(),
284 'closed': pr.is_closed(),
285 })
285 })
286 # json used to render the grid
286 # json used to render the grid
287 data = ({
287 data = ({
288 'data': data,
288 'data': data,
289 'recordsTotal': pull_requests_total_count,
289 'recordsTotal': pull_requests_total_count,
290 'recordsFiltered': pull_requests_total_count,
290 'recordsFiltered': pull_requests_total_count,
291 })
291 })
292 return data
292 return data
293
293
294 @LoginRequired()
294 @LoginRequired()
295 @NotAnonymous()
295 @NotAnonymous()
296 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
296 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
297 'repository.admin')
297 'repository.admin')
298 @HasAcceptedRepoType('git', 'hg')
298 @HasAcceptedRepoType('git', 'hg')
299 def index(self):
299 def index(self):
300 source_repo = c.rhodecode_db_repo
300 source_repo = c.rhodecode_db_repo
301
301
302 try:
302 try:
303 source_repo.scm_instance().get_commit()
303 source_repo.scm_instance().get_commit()
304 except EmptyRepositoryError:
304 except EmptyRepositoryError:
305 h.flash(h.literal(_('There are no commits yet')),
305 h.flash(h.literal(_('There are no commits yet')),
306 category='warning')
306 category='warning')
307 redirect(url('summary_home', repo_name=source_repo.repo_name))
307 redirect(url('summary_home', repo_name=source_repo.repo_name))
308
308
309 commit_id = request.GET.get('commit')
309 commit_id = request.GET.get('commit')
310 branch_ref = request.GET.get('branch')
310 branch_ref = request.GET.get('branch')
311 bookmark_ref = request.GET.get('bookmark')
311 bookmark_ref = request.GET.get('bookmark')
312
312
313 try:
313 try:
314 source_repo_data = PullRequestModel().generate_repo_data(
314 source_repo_data = PullRequestModel().generate_repo_data(
315 source_repo, commit_id=commit_id,
315 source_repo, commit_id=commit_id,
316 branch=branch_ref, bookmark=bookmark_ref)
316 branch=branch_ref, bookmark=bookmark_ref)
317 except CommitDoesNotExistError as e:
317 except CommitDoesNotExistError as e:
318 log.exception(e)
318 log.exception(e)
319 h.flash(_('Commit does not exist'), 'error')
319 h.flash(_('Commit does not exist'), 'error')
320 redirect(url('pullrequest_home', repo_name=source_repo.repo_name))
320 redirect(url('pullrequest_home', repo_name=source_repo.repo_name))
321
321
322 default_target_repo = source_repo
322 default_target_repo = source_repo
323
323
324 if source_repo.parent:
324 if source_repo.parent:
325 parent_vcs_obj = source_repo.parent.scm_instance()
325 parent_vcs_obj = source_repo.parent.scm_instance()
326 if parent_vcs_obj and not parent_vcs_obj.is_empty():
326 if parent_vcs_obj and not parent_vcs_obj.is_empty():
327 # change default if we have a parent repo
327 # change default if we have a parent repo
328 default_target_repo = source_repo.parent
328 default_target_repo = source_repo.parent
329
329
330 target_repo_data = PullRequestModel().generate_repo_data(
330 target_repo_data = PullRequestModel().generate_repo_data(
331 default_target_repo)
331 default_target_repo)
332
332
333 selected_source_ref = source_repo_data['refs']['selected_ref']
333 selected_source_ref = source_repo_data['refs']['selected_ref']
334
334
335 title_source_ref = selected_source_ref.split(':', 2)[1]
335 title_source_ref = selected_source_ref.split(':', 2)[1]
336 c.default_title = PullRequestModel().generate_pullrequest_title(
336 c.default_title = PullRequestModel().generate_pullrequest_title(
337 source=source_repo.repo_name,
337 source=source_repo.repo_name,
338 source_ref=title_source_ref,
338 source_ref=title_source_ref,
339 target=default_target_repo.repo_name
339 target=default_target_repo.repo_name
340 )
340 )
341
341
342 c.default_repo_data = {
342 c.default_repo_data = {
343 'source_repo_name': source_repo.repo_name,
343 'source_repo_name': source_repo.repo_name,
344 'source_refs_json': json.dumps(source_repo_data),
344 'source_refs_json': json.dumps(source_repo_data),
345 'target_repo_name': default_target_repo.repo_name,
345 'target_repo_name': default_target_repo.repo_name,
346 'target_refs_json': json.dumps(target_repo_data),
346 'target_refs_json': json.dumps(target_repo_data),
347 }
347 }
348 c.default_source_ref = selected_source_ref
348 c.default_source_ref = selected_source_ref
349
349
350 return render('/pullrequests/pullrequest.mako')
350 return render('/pullrequests/pullrequest.mako')
351
351
352 @LoginRequired()
352 @LoginRequired()
353 @NotAnonymous()
353 @NotAnonymous()
354 @XHRRequired()
354 @XHRRequired()
355 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
355 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
356 'repository.admin')
356 'repository.admin')
357 @jsonify
357 @jsonify
358 def get_repo_refs(self, repo_name, target_repo_name):
358 def get_repo_refs(self, repo_name, target_repo_name):
359 repo = Repository.get_by_repo_name(target_repo_name)
359 repo = Repository.get_by_repo_name(target_repo_name)
360 if not repo:
360 if not repo:
361 raise HTTPNotFound
361 raise HTTPNotFound
362 return PullRequestModel().generate_repo_data(repo)
362 return PullRequestModel().generate_repo_data(repo)
363
363
364 @LoginRequired()
364 @LoginRequired()
365 @NotAnonymous()
365 @NotAnonymous()
366 @XHRRequired()
366 @XHRRequired()
367 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
367 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
368 'repository.admin')
368 'repository.admin')
369 @jsonify
369 @jsonify
370 def get_repo_destinations(self, repo_name):
370 def get_repo_destinations(self, repo_name):
371 repo = Repository.get_by_repo_name(repo_name)
371 repo = Repository.get_by_repo_name(repo_name)
372 if not repo:
372 if not repo:
373 raise HTTPNotFound
373 raise HTTPNotFound
374 filter_query = request.GET.get('query')
374 filter_query = request.GET.get('query')
375
375
376 query = Repository.query() \
376 query = Repository.query() \
377 .order_by(func.length(Repository.repo_name)) \
377 .order_by(func.length(Repository.repo_name)) \
378 .filter(or_(
378 .filter(or_(
379 Repository.repo_name == repo.repo_name,
379 Repository.repo_name == repo.repo_name,
380 Repository.fork_id == repo.repo_id))
380 Repository.fork_id == repo.repo_id))
381
381
382 if filter_query:
382 if filter_query:
383 ilike_expression = u'%{}%'.format(safe_unicode(filter_query))
383 ilike_expression = u'%{}%'.format(safe_unicode(filter_query))
384 query = query.filter(
384 query = query.filter(
385 Repository.repo_name.ilike(ilike_expression))
385 Repository.repo_name.ilike(ilike_expression))
386
386
387 add_parent = False
387 add_parent = False
388 if repo.parent:
388 if repo.parent:
389 if filter_query in repo.parent.repo_name:
389 if filter_query in repo.parent.repo_name:
390 parent_vcs_obj = repo.parent.scm_instance()
390 parent_vcs_obj = repo.parent.scm_instance()
391 if parent_vcs_obj and not parent_vcs_obj.is_empty():
391 if parent_vcs_obj and not parent_vcs_obj.is_empty():
392 add_parent = True
392 add_parent = True
393
393
394 limit = 20 - 1 if add_parent else 20
394 limit = 20 - 1 if add_parent else 20
395 all_repos = query.limit(limit).all()
395 all_repos = query.limit(limit).all()
396 if add_parent:
396 if add_parent:
397 all_repos += [repo.parent]
397 all_repos += [repo.parent]
398
398
399 repos = []
399 repos = []
400 for obj in self.scm_model.get_repos(all_repos):
400 for obj in self.scm_model.get_repos(all_repos):
401 repos.append({
401 repos.append({
402 'id': obj['name'],
402 'id': obj['name'],
403 'text': obj['name'],
403 'text': obj['name'],
404 'type': 'repo',
404 'type': 'repo',
405 'obj': obj['dbrepo']
405 'obj': obj['dbrepo']
406 })
406 })
407
407
408 data = {
408 data = {
409 'more': False,
409 'more': False,
410 'results': [{
410 'results': [{
411 'text': _('Repositories'),
411 'text': _('Repositories'),
412 'children': repos
412 'children': repos
413 }] if repos else []
413 }] if repos else []
414 }
414 }
415 return data
415 return data
416
416
417 @LoginRequired()
417 @LoginRequired()
418 @NotAnonymous()
418 @NotAnonymous()
419 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
419 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
420 'repository.admin')
420 'repository.admin')
421 @HasAcceptedRepoType('git', 'hg')
421 @HasAcceptedRepoType('git', 'hg')
422 @auth.CSRFRequired()
422 @auth.CSRFRequired()
423 def create(self, repo_name):
423 def create(self, repo_name):
424 repo = Repository.get_by_repo_name(repo_name)
424 repo = Repository.get_by_repo_name(repo_name)
425 if not repo:
425 if not repo:
426 raise HTTPNotFound
426 raise HTTPNotFound
427
427
428 controls = peppercorn.parse(request.POST.items())
428 controls = peppercorn.parse(request.POST.items())
429
429
430 try:
430 try:
431 _form = PullRequestForm(repo.repo_id)().to_python(controls)
431 _form = PullRequestForm(repo.repo_id)().to_python(controls)
432 except formencode.Invalid as errors:
432 except formencode.Invalid as errors:
433 if errors.error_dict.get('revisions'):
433 if errors.error_dict.get('revisions'):
434 msg = 'Revisions: %s' % errors.error_dict['revisions']
434 msg = 'Revisions: %s' % errors.error_dict['revisions']
435 elif errors.error_dict.get('pullrequest_title'):
435 elif errors.error_dict.get('pullrequest_title'):
436 msg = _('Pull request requires a title with min. 3 chars')
436 msg = _('Pull request requires a title with min. 3 chars')
437 else:
437 else:
438 msg = _('Error creating pull request: {}').format(errors)
438 msg = _('Error creating pull request: {}').format(errors)
439 log.exception(msg)
439 log.exception(msg)
440 h.flash(msg, 'error')
440 h.flash(msg, 'error')
441
441
442 # would rather just go back to form ...
442 # would rather just go back to form ...
443 return redirect(url('pullrequest_home', repo_name=repo_name))
443 return redirect(url('pullrequest_home', repo_name=repo_name))
444
444
445 source_repo = _form['source_repo']
445 source_repo = _form['source_repo']
446 source_ref = _form['source_ref']
446 source_ref = _form['source_ref']
447 target_repo = _form['target_repo']
447 target_repo = _form['target_repo']
448 target_ref = _form['target_ref']
448 target_ref = _form['target_ref']
449 commit_ids = _form['revisions'][::-1]
449 commit_ids = _form['revisions'][::-1]
450 reviewers = [
450 reviewers = [
451 (r['user_id'], r['reasons']) for r in _form['review_members']]
451 (r['user_id'], r['reasons']) for r in _form['review_members']]
452
452
453 # find the ancestor for this pr
453 # find the ancestor for this pr
454 source_db_repo = Repository.get_by_repo_name(_form['source_repo'])
454 source_db_repo = Repository.get_by_repo_name(_form['source_repo'])
455 target_db_repo = Repository.get_by_repo_name(_form['target_repo'])
455 target_db_repo = Repository.get_by_repo_name(_form['target_repo'])
456
456
457 source_scm = source_db_repo.scm_instance()
457 source_scm = source_db_repo.scm_instance()
458 target_scm = target_db_repo.scm_instance()
458 target_scm = target_db_repo.scm_instance()
459
459
460 source_commit = source_scm.get_commit(source_ref.split(':')[-1])
460 source_commit = source_scm.get_commit(source_ref.split(':')[-1])
461 target_commit = target_scm.get_commit(target_ref.split(':')[-1])
461 target_commit = target_scm.get_commit(target_ref.split(':')[-1])
462
462
463 ancestor = source_scm.get_common_ancestor(
463 ancestor = source_scm.get_common_ancestor(
464 source_commit.raw_id, target_commit.raw_id, target_scm)
464 source_commit.raw_id, target_commit.raw_id, target_scm)
465
465
466 target_ref_type, target_ref_name, __ = _form['target_ref'].split(':')
466 target_ref_type, target_ref_name, __ = _form['target_ref'].split(':')
467 target_ref = ':'.join((target_ref_type, target_ref_name, ancestor))
467 target_ref = ':'.join((target_ref_type, target_ref_name, ancestor))
468
468
469 pullrequest_title = _form['pullrequest_title']
469 pullrequest_title = _form['pullrequest_title']
470 title_source_ref = source_ref.split(':', 2)[1]
470 title_source_ref = source_ref.split(':', 2)[1]
471 if not pullrequest_title:
471 if not pullrequest_title:
472 pullrequest_title = PullRequestModel().generate_pullrequest_title(
472 pullrequest_title = PullRequestModel().generate_pullrequest_title(
473 source=source_repo,
473 source=source_repo,
474 source_ref=title_source_ref,
474 source_ref=title_source_ref,
475 target=target_repo
475 target=target_repo
476 )
476 )
477
477
478 description = _form['pullrequest_desc']
478 description = _form['pullrequest_desc']
479 try:
479 try:
480 pull_request = PullRequestModel().create(
480 pull_request = PullRequestModel().create(
481 c.rhodecode_user.user_id, source_repo, source_ref, target_repo,
481 c.rhodecode_user.user_id, source_repo, source_ref, target_repo,
482 target_ref, commit_ids, reviewers, pullrequest_title,
482 target_ref, commit_ids, reviewers, pullrequest_title,
483 description
483 description
484 )
484 )
485 Session().commit()
485 Session().commit()
486 h.flash(_('Successfully opened new pull request'),
486 h.flash(_('Successfully opened new pull request'),
487 category='success')
487 category='success')
488 except Exception as e:
488 except Exception as e:
489 msg = _('Error occurred during sending pull request')
489 msg = _('Error occurred during sending pull request')
490 log.exception(msg)
490 log.exception(msg)
491 h.flash(msg, category='error')
491 h.flash(msg, category='error')
492 return redirect(url('pullrequest_home', repo_name=repo_name))
492 return redirect(url('pullrequest_home', repo_name=repo_name))
493
493
494 return redirect(url('pullrequest_show', repo_name=target_repo,
494 return redirect(url('pullrequest_show', repo_name=target_repo,
495 pull_request_id=pull_request.pull_request_id))
495 pull_request_id=pull_request.pull_request_id))
496
496
497 @LoginRequired()
497 @LoginRequired()
498 @NotAnonymous()
498 @NotAnonymous()
499 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
499 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
500 'repository.admin')
500 'repository.admin')
501 @auth.CSRFRequired()
501 @auth.CSRFRequired()
502 @jsonify
502 @jsonify
503 def update(self, repo_name, pull_request_id):
503 def update(self, repo_name, pull_request_id):
504 pull_request_id = safe_int(pull_request_id)
504 pull_request_id = safe_int(pull_request_id)
505 pull_request = PullRequest.get_or_404(pull_request_id)
505 pull_request = PullRequest.get_or_404(pull_request_id)
506 # only owner or admin can update it
506 # only owner or admin can update it
507 allowed_to_update = PullRequestModel().check_user_update(
507 allowed_to_update = PullRequestModel().check_user_update(
508 pull_request, c.rhodecode_user)
508 pull_request, c.rhodecode_user)
509 if allowed_to_update:
509 if allowed_to_update:
510 controls = peppercorn.parse(request.POST.items())
510 controls = peppercorn.parse(request.POST.items())
511
511
512 if 'review_members' in controls:
512 if 'review_members' in controls:
513 self._update_reviewers(
513 self._update_reviewers(
514 pull_request_id, controls['review_members'])
514 pull_request_id, controls['review_members'])
515 elif str2bool(request.POST.get('update_commits', 'false')):
515 elif str2bool(request.POST.get('update_commits', 'false')):
516 self._update_commits(pull_request)
516 self._update_commits(pull_request)
517 elif str2bool(request.POST.get('close_pull_request', 'false')):
517 elif str2bool(request.POST.get('close_pull_request', 'false')):
518 self._reject_close(pull_request)
518 self._reject_close(pull_request)
519 elif str2bool(request.POST.get('edit_pull_request', 'false')):
519 elif str2bool(request.POST.get('edit_pull_request', 'false')):
520 self._edit_pull_request(pull_request)
520 self._edit_pull_request(pull_request)
521 else:
521 else:
522 raise HTTPBadRequest()
522 raise HTTPBadRequest()
523 return True
523 return True
524 raise HTTPForbidden()
524 raise HTTPForbidden()
525
525
526 def _edit_pull_request(self, pull_request):
526 def _edit_pull_request(self, pull_request):
527 try:
527 try:
528 PullRequestModel().edit(
528 PullRequestModel().edit(
529 pull_request, request.POST.get('title'),
529 pull_request, request.POST.get('title'),
530 request.POST.get('description'))
530 request.POST.get('description'))
531 except ValueError:
531 except ValueError:
532 msg = _(u'Cannot update closed pull requests.')
532 msg = _(u'Cannot update closed pull requests.')
533 h.flash(msg, category='error')
533 h.flash(msg, category='error')
534 return
534 return
535 else:
535 else:
536 Session().commit()
536 Session().commit()
537
537
538 msg = _(u'Pull request title & description updated.')
538 msg = _(u'Pull request title & description updated.')
539 h.flash(msg, category='success')
539 h.flash(msg, category='success')
540 return
540 return
541
541
542 def _update_commits(self, pull_request):
542 def _update_commits(self, pull_request):
543 resp = PullRequestModel().update_commits(pull_request)
543 resp = PullRequestModel().update_commits(pull_request)
544
544
545 if resp.executed:
545 if resp.executed:
546 msg = _(
546 msg = _(
547 u'Pull request updated to "{source_commit_id}" with '
547 u'Pull request updated to "{source_commit_id}" with '
548 u'{count_added} added, {count_removed} removed commits.')
548 u'{count_added} added, {count_removed} removed commits.')
549 msg = msg.format(
549 msg = msg.format(
550 source_commit_id=pull_request.source_ref_parts.commit_id,
550 source_commit_id=pull_request.source_ref_parts.commit_id,
551 count_added=len(resp.changes.added),
551 count_added=len(resp.changes.added),
552 count_removed=len(resp.changes.removed))
552 count_removed=len(resp.changes.removed))
553 h.flash(msg, category='success')
553 h.flash(msg, category='success')
554
554
555 registry = get_current_registry()
555 registry = get_current_registry()
556 rhodecode_plugins = getattr(registry, 'rhodecode_plugins', {})
556 rhodecode_plugins = getattr(registry, 'rhodecode_plugins', {})
557 channelstream_config = rhodecode_plugins.get('channelstream', {})
557 channelstream_config = rhodecode_plugins.get('channelstream', {})
558 if channelstream_config.get('enabled'):
558 if channelstream_config.get('enabled'):
559 message = msg + (
559 message = msg + (
560 ' - <a onclick="window.location.reload()">'
560 ' - <a onclick="window.location.reload()">'
561 '<strong>{}</strong></a>'.format(_('Reload page')))
561 '<strong>{}</strong></a>'.format(_('Reload page')))
562 channel = '/repo${}$/pr/{}'.format(
562 channel = '/repo${}$/pr/{}'.format(
563 pull_request.target_repo.repo_name,
563 pull_request.target_repo.repo_name,
564 pull_request.pull_request_id
564 pull_request.pull_request_id
565 )
565 )
566 payload = {
566 payload = {
567 'type': 'message',
567 'type': 'message',
568 'user': 'system',
568 'user': 'system',
569 'exclude_users': [request.user.username],
569 'exclude_users': [request.user.username],
570 'channel': channel,
570 'channel': channel,
571 'message': {
571 'message': {
572 'message': message,
572 'message': message,
573 'level': 'success',
573 'level': 'success',
574 'topic': '/notifications'
574 'topic': '/notifications'
575 }
575 }
576 }
576 }
577 channelstream_request(
577 channelstream_request(
578 channelstream_config, [payload], '/message',
578 channelstream_config, [payload], '/message',
579 raise_exc=False)
579 raise_exc=False)
580 else:
580 else:
581 msg = PullRequestModel.UPDATE_STATUS_MESSAGES[resp.reason]
581 msg = PullRequestModel.UPDATE_STATUS_MESSAGES[resp.reason]
582 warning_reasons = [
582 warning_reasons = [
583 UpdateFailureReason.NO_CHANGE,
583 UpdateFailureReason.NO_CHANGE,
584 UpdateFailureReason.WRONG_REF_TPYE,
584 UpdateFailureReason.WRONG_REF_TPYE,
585 ]
585 ]
586 category = 'warning' if resp.reason in warning_reasons else 'error'
586 category = 'warning' if resp.reason in warning_reasons else 'error'
587 h.flash(msg, category=category)
587 h.flash(msg, category=category)
588
588
589 @auth.CSRFRequired()
589 @auth.CSRFRequired()
590 @LoginRequired()
590 @LoginRequired()
591 @NotAnonymous()
591 @NotAnonymous()
592 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
592 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
593 'repository.admin')
593 'repository.admin')
594 def merge(self, repo_name, pull_request_id):
594 def merge(self, repo_name, pull_request_id):
595 """
595 """
596 POST /{repo_name}/pull-request/{pull_request_id}
596 POST /{repo_name}/pull-request/{pull_request_id}
597
597
598 Merge will perform a server-side merge of the specified
598 Merge will perform a server-side merge of the specified
599 pull request, if the pull request is approved and mergeable.
599 pull request, if the pull request is approved and mergeable.
600 After succesfull merging, the pull request is automatically
600 After succesfull merging, the pull request is automatically
601 closed, with a relevant comment.
601 closed, with a relevant comment.
602 """
602 """
603 pull_request_id = safe_int(pull_request_id)
603 pull_request_id = safe_int(pull_request_id)
604 pull_request = PullRequest.get_or_404(pull_request_id)
604 pull_request = PullRequest.get_or_404(pull_request_id)
605 user = c.rhodecode_user
605 user = c.rhodecode_user
606
606
607 if self._meets_merge_pre_conditions(pull_request, user):
607 if self._meets_merge_pre_conditions(pull_request, user):
608 log.debug("Pre-conditions checked, trying to merge.")
608 log.debug("Pre-conditions checked, trying to merge.")
609 extras = vcs_operation_context(
609 extras = vcs_operation_context(
610 request.environ, repo_name=pull_request.target_repo.repo_name,
610 request.environ, repo_name=pull_request.target_repo.repo_name,
611 username=user.username, action='push',
611 username=user.username, action='push',
612 scm=pull_request.target_repo.repo_type)
612 scm=pull_request.target_repo.repo_type)
613 self._merge_pull_request(pull_request, user, extras)
613 self._merge_pull_request(pull_request, user, extras)
614
614
615 return redirect(url(
615 return redirect(url(
616 'pullrequest_show',
616 'pullrequest_show',
617 repo_name=pull_request.target_repo.repo_name,
617 repo_name=pull_request.target_repo.repo_name,
618 pull_request_id=pull_request.pull_request_id))
618 pull_request_id=pull_request.pull_request_id))
619
619
620 def _meets_merge_pre_conditions(self, pull_request, user):
620 def _meets_merge_pre_conditions(self, pull_request, user):
621 if not PullRequestModel().check_user_merge(pull_request, user):
621 if not PullRequestModel().check_user_merge(pull_request, user):
622 raise HTTPForbidden()
622 raise HTTPForbidden()
623
623
624 merge_status, msg = PullRequestModel().merge_status(pull_request)
624 merge_status, msg = PullRequestModel().merge_status(pull_request)
625 if not merge_status:
625 if not merge_status:
626 log.debug("Cannot merge, not mergeable.")
626 log.debug("Cannot merge, not mergeable.")
627 h.flash(msg, category='error')
627 h.flash(msg, category='error')
628 return False
628 return False
629
629
630 if (pull_request.calculated_review_status()
630 if (pull_request.calculated_review_status()
631 is not ChangesetStatus.STATUS_APPROVED):
631 is not ChangesetStatus.STATUS_APPROVED):
632 log.debug("Cannot merge, approval is pending.")
632 log.debug("Cannot merge, approval is pending.")
633 msg = _('Pull request reviewer approval is pending.')
633 msg = _('Pull request reviewer approval is pending.')
634 h.flash(msg, category='error')
634 h.flash(msg, category='error')
635 return False
635 return False
636 return True
636 return True
637
637
638 def _merge_pull_request(self, pull_request, user, extras):
638 def _merge_pull_request(self, pull_request, user, extras):
639 merge_resp = PullRequestModel().merge(
639 merge_resp = PullRequestModel().merge(
640 pull_request, user, extras=extras)
640 pull_request, user, extras=extras)
641
641
642 if merge_resp.executed:
642 if merge_resp.executed:
643 log.debug("The merge was successful, closing the pull request.")
643 log.debug("The merge was successful, closing the pull request.")
644 PullRequestModel().close_pull_request(
644 PullRequestModel().close_pull_request(
645 pull_request.pull_request_id, user)
645 pull_request.pull_request_id, user)
646 Session().commit()
646 Session().commit()
647 msg = _('Pull request was successfully merged and closed.')
647 msg = _('Pull request was successfully merged and closed.')
648 h.flash(msg, category='success')
648 h.flash(msg, category='success')
649 else:
649 else:
650 log.debug(
650 log.debug(
651 "The merge was not successful. Merge response: %s",
651 "The merge was not successful. Merge response: %s",
652 merge_resp)
652 merge_resp)
653 msg = PullRequestModel().merge_status_message(
653 msg = PullRequestModel().merge_status_message(
654 merge_resp.failure_reason)
654 merge_resp.failure_reason)
655 h.flash(msg, category='error')
655 h.flash(msg, category='error')
656
656
657 def _update_reviewers(self, pull_request_id, review_members):
657 def _update_reviewers(self, pull_request_id, review_members):
658 reviewers = [
658 reviewers = [
659 (int(r['user_id']), r['reasons']) for r in review_members]
659 (int(r['user_id']), r['reasons']) for r in review_members]
660 PullRequestModel().update_reviewers(pull_request_id, reviewers)
660 PullRequestModel().update_reviewers(pull_request_id, reviewers)
661 Session().commit()
661 Session().commit()
662
662
663 def _reject_close(self, pull_request):
663 def _reject_close(self, pull_request):
664 if pull_request.is_closed():
664 if pull_request.is_closed():
665 raise HTTPForbidden()
665 raise HTTPForbidden()
666
666
667 PullRequestModel().close_pull_request_with_comment(
667 PullRequestModel().close_pull_request_with_comment(
668 pull_request, c.rhodecode_user, c.rhodecode_db_repo)
668 pull_request, c.rhodecode_user, c.rhodecode_db_repo)
669 Session().commit()
669 Session().commit()
670
670
671 @LoginRequired()
671 @LoginRequired()
672 @NotAnonymous()
672 @NotAnonymous()
673 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
673 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
674 'repository.admin')
674 'repository.admin')
675 @auth.CSRFRequired()
675 @auth.CSRFRequired()
676 @jsonify
676 @jsonify
677 def delete(self, repo_name, pull_request_id):
677 def delete(self, repo_name, pull_request_id):
678 pull_request_id = safe_int(pull_request_id)
678 pull_request_id = safe_int(pull_request_id)
679 pull_request = PullRequest.get_or_404(pull_request_id)
679 pull_request = PullRequest.get_or_404(pull_request_id)
680 # only owner can delete it !
680 # only owner can delete it !
681 if pull_request.author.user_id == c.rhodecode_user.user_id:
681 if pull_request.author.user_id == c.rhodecode_user.user_id:
682 PullRequestModel().delete(pull_request)
682 PullRequestModel().delete(pull_request)
683 Session().commit()
683 Session().commit()
684 h.flash(_('Successfully deleted pull request'),
684 h.flash(_('Successfully deleted pull request'),
685 category='success')
685 category='success')
686 return redirect(url('my_account_pullrequests'))
686 return redirect(url('my_account_pullrequests'))
687 raise HTTPForbidden()
687 raise HTTPForbidden()
688
688
689 def _get_pr_version(self, pull_request_id, version=None):
689 def _get_pr_version(self, pull_request_id, version=None):
690 pull_request_id = safe_int(pull_request_id)
690 pull_request_id = safe_int(pull_request_id)
691 at_version = None
691 at_version = None
692
692
693 if version and version == 'latest':
693 if version and version == 'latest':
694 pull_request_ver = PullRequest.get(pull_request_id)
694 pull_request_ver = PullRequest.get(pull_request_id)
695 pull_request_obj = pull_request_ver
695 pull_request_obj = pull_request_ver
696 _org_pull_request_obj = pull_request_obj
696 _org_pull_request_obj = pull_request_obj
697 at_version = 'latest'
697 at_version = 'latest'
698 elif version:
698 elif version:
699 pull_request_ver = PullRequestVersion.get_or_404(version)
699 pull_request_ver = PullRequestVersion.get_or_404(version)
700 pull_request_obj = pull_request_ver
700 pull_request_obj = pull_request_ver
701 _org_pull_request_obj = pull_request_ver.pull_request
701 _org_pull_request_obj = pull_request_ver.pull_request
702 at_version = pull_request_ver.pull_request_version_id
702 at_version = pull_request_ver.pull_request_version_id
703 else:
703 else:
704 _org_pull_request_obj = pull_request_obj = PullRequest.get_or_404(pull_request_id)
704 _org_pull_request_obj = pull_request_obj = PullRequest.get_or_404(pull_request_id)
705
705
706 pull_request_display_obj = PullRequest.get_pr_display_object(
706 pull_request_display_obj = PullRequest.get_pr_display_object(
707 pull_request_obj, _org_pull_request_obj)
707 pull_request_obj, _org_pull_request_obj)
708 return _org_pull_request_obj, pull_request_obj, \
708 return _org_pull_request_obj, pull_request_obj, \
709 pull_request_display_obj, at_version
709 pull_request_display_obj, at_version
710
710
711 def _get_pr_version_changes(self, version, pull_request_latest):
711 def _get_pr_version_changes(self, version, pull_request_latest):
712 """
712 """
713 Generate changes commits, and diff data based on the current pr version
713 Generate changes commits, and diff data based on the current pr version
714 """
714 """
715
715
716 #TODO(marcink): save those changes as JSON metadata for chaching later.
716 #TODO(marcink): save those changes as JSON metadata for chaching later.
717
717
718 # fake the version to add the "initial" state object
718 # fake the version to add the "initial" state object
719 pull_request_initial = PullRequest.get_pr_display_object(
719 pull_request_initial = PullRequest.get_pr_display_object(
720 pull_request_latest, pull_request_latest,
720 pull_request_latest, pull_request_latest,
721 internal_methods=['get_commit', 'versions'])
721 internal_methods=['get_commit', 'versions'])
722 pull_request_initial.revisions = []
722 pull_request_initial.revisions = []
723 pull_request_initial.source_repo.get_commit = types.MethodType(
723 pull_request_initial.source_repo.get_commit = types.MethodType(
724 lambda *a, **k: EmptyCommit(), pull_request_initial)
724 lambda *a, **k: EmptyCommit(), pull_request_initial)
725 pull_request_initial.source_repo.scm_instance = types.MethodType(
725 pull_request_initial.source_repo.scm_instance = types.MethodType(
726 lambda *a, **k: EmptyRepository(), pull_request_initial)
726 lambda *a, **k: EmptyRepository(), pull_request_initial)
727
727
728 _changes_versions = [pull_request_latest] + \
728 _changes_versions = [pull_request_latest] + \
729 list(reversed(c.versions)) + \
729 list(reversed(c.versions)) + \
730 [pull_request_initial]
730 [pull_request_initial]
731
731
732 if version == 'latest':
732 if version == 'latest':
733 index = 0
733 index = 0
734 else:
734 else:
735 for pos, prver in enumerate(_changes_versions):
735 for pos, prver in enumerate(_changes_versions):
736 ver = getattr(prver, 'pull_request_version_id', -1)
736 ver = getattr(prver, 'pull_request_version_id', -1)
737 if ver == safe_int(version):
737 if ver == safe_int(version):
738 index = pos
738 index = pos
739 break
739 break
740 else:
740 else:
741 index = 0
741 index = 0
742
742
743 cur_obj = _changes_versions[index]
743 cur_obj = _changes_versions[index]
744 prev_obj = _changes_versions[index + 1]
744 prev_obj = _changes_versions[index + 1]
745
745
746 old_commit_ids = set(prev_obj.revisions)
746 old_commit_ids = set(prev_obj.revisions)
747 new_commit_ids = set(cur_obj.revisions)
747 new_commit_ids = set(cur_obj.revisions)
748
748
749 changes = PullRequestModel()._calculate_commit_id_changes(
749 changes = PullRequestModel()._calculate_commit_id_changes(
750 old_commit_ids, new_commit_ids)
750 old_commit_ids, new_commit_ids)
751
751
752 old_diff_data, new_diff_data = PullRequestModel()._generate_update_diffs(
752 old_diff_data, new_diff_data = PullRequestModel()._generate_update_diffs(
753 cur_obj, prev_obj)
753 cur_obj, prev_obj)
754 file_changes = PullRequestModel()._calculate_file_changes(
754 file_changes = PullRequestModel()._calculate_file_changes(
755 old_diff_data, new_diff_data)
755 old_diff_data, new_diff_data)
756 return changes, file_changes
756 return changes, file_changes
757
757
758 @LoginRequired()
758 @LoginRequired()
759 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
759 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
760 'repository.admin')
760 'repository.admin')
761 def show(self, repo_name, pull_request_id):
761 def show(self, repo_name, pull_request_id):
762 pull_request_id = safe_int(pull_request_id)
762 pull_request_id = safe_int(pull_request_id)
763 version = request.GET.get('version')
763 version = request.GET.get('version')
764
764
765 (pull_request_latest,
765 (pull_request_latest,
766 pull_request_at_ver,
766 pull_request_at_ver,
767 pull_request_display_obj,
767 pull_request_display_obj,
768 at_version) = self._get_pr_version(pull_request_id, version=version)
768 at_version) = self._get_pr_version(pull_request_id, version=version)
769
769
770 c.template_context['pull_request_data']['pull_request_id'] = \
770 c.template_context['pull_request_data']['pull_request_id'] = \
771 pull_request_id
771 pull_request_id
772
772
773 # pull_requests repo_name we opened it against
773 # pull_requests repo_name we opened it against
774 # ie. target_repo must match
774 # ie. target_repo must match
775 if repo_name != pull_request_at_ver.target_repo.repo_name:
775 if repo_name != pull_request_at_ver.target_repo.repo_name:
776 raise HTTPNotFound
776 raise HTTPNotFound
777
777
778 c.shadow_clone_url = PullRequestModel().get_shadow_clone_url(
778 c.shadow_clone_url = PullRequestModel().get_shadow_clone_url(
779 pull_request_at_ver)
779 pull_request_at_ver)
780
780
781 pr_closed = pull_request_latest.is_closed()
781 pr_closed = pull_request_latest.is_closed()
782 if at_version and not at_version == 'latest':
782 if at_version and not at_version == 'latest':
783 c.allowed_to_change_status = False
783 c.allowed_to_change_status = False
784 c.allowed_to_update = False
784 c.allowed_to_update = False
785 c.allowed_to_merge = False
785 c.allowed_to_merge = False
786 c.allowed_to_delete = False
786 c.allowed_to_delete = False
787 c.allowed_to_comment = False
787 c.allowed_to_comment = False
788 else:
788 else:
789 c.allowed_to_change_status = PullRequestModel(). \
789 c.allowed_to_change_status = PullRequestModel(). \
790 check_user_change_status(pull_request_at_ver, c.rhodecode_user)
790 check_user_change_status(pull_request_at_ver, c.rhodecode_user)
791 c.allowed_to_update = PullRequestModel().check_user_update(
791 c.allowed_to_update = PullRequestModel().check_user_update(
792 pull_request_latest, c.rhodecode_user) and not pr_closed
792 pull_request_latest, c.rhodecode_user) and not pr_closed
793 c.allowed_to_merge = PullRequestModel().check_user_merge(
793 c.allowed_to_merge = PullRequestModel().check_user_merge(
794 pull_request_latest, c.rhodecode_user) and not pr_closed
794 pull_request_latest, c.rhodecode_user) and not pr_closed
795 c.allowed_to_delete = PullRequestModel().check_user_delete(
795 c.allowed_to_delete = PullRequestModel().check_user_delete(
796 pull_request_latest, c.rhodecode_user) and not pr_closed
796 pull_request_latest, c.rhodecode_user) and not pr_closed
797 c.allowed_to_comment = not pr_closed
797 c.allowed_to_comment = not pr_closed
798
798
799 cc_model = ChangesetCommentsModel()
799 cc_model = ChangesetCommentsModel()
800
800
801 c.pull_request_reviewers = pull_request_at_ver.reviewers_statuses()
801 c.pull_request_reviewers = pull_request_at_ver.reviewers_statuses()
802 c.pull_request_review_status = pull_request_at_ver.calculated_review_status()
802 c.pull_request_review_status = pull_request_at_ver.calculated_review_status()
803 c.pr_merge_status, c.pr_merge_msg = PullRequestModel().merge_status(
803 c.pr_merge_status, c.pr_merge_msg = PullRequestModel().merge_status(
804 pull_request_at_ver)
804 pull_request_at_ver)
805 c.approval_msg = None
805 c.approval_msg = None
806 if c.pull_request_review_status != ChangesetStatus.STATUS_APPROVED:
806 if c.pull_request_review_status != ChangesetStatus.STATUS_APPROVED:
807 c.approval_msg = _('Reviewer approval is pending.')
807 c.approval_msg = _('Reviewer approval is pending.')
808 c.pr_merge_status = False
808 c.pr_merge_status = False
809
809
810 # inline comments
810 # inline comments
811 inline_comments = cc_model.get_inline_comments(
811 inline_comments = cc_model.get_inline_comments(
812 c.rhodecode_db_repo.repo_id, pull_request=pull_request_id)
812 c.rhodecode_db_repo.repo_id, pull_request=pull_request_id)
813
813
814 _inline_cnt, c.inline_versions = cc_model.get_inline_comments_count(
814 _inline_cnt, c.inline_versions = cc_model.get_inline_comments_count(
815 inline_comments, version=at_version, include_aggregates=True)
815 inline_comments, version=at_version, include_aggregates=True)
816
816
817 c.versions = pull_request_display_obj.versions()
817 c.at_version_num = at_version if at_version and at_version != 'latest' else None
818 c.at_version_num = at_version if at_version and at_version != 'latest' else None
819 c.at_version_pos = ChangesetComment.get_index_from_version(
820 c.at_version_num, c.versions)
821
818 is_outdated = lambda co: \
822 is_outdated = lambda co: \
819 not c.at_version_num \
823 not c.at_version_num \
820 or co.pull_request_version_id <= c.at_version_num
824 or co.pull_request_version_id <= c.at_version_num
821
825
822 # inline_comments_until_version
826 # inline_comments_until_version
823 if c.at_version_num:
827 if c.at_version_num:
824 # if we use version, then do not show later comments
828 # if we use version, then do not show later comments
825 # than current version
829 # than current version
826 paths = collections.defaultdict(lambda: collections.defaultdict(list))
830 paths = collections.defaultdict(lambda: collections.defaultdict(list))
827 for fname, per_line_comments in inline_comments.iteritems():
831 for fname, per_line_comments in inline_comments.iteritems():
828 for lno, comments in per_line_comments.iteritems():
832 for lno, comments in per_line_comments.iteritems():
829 for co in comments:
833 for co in comments:
830 if co.pull_request_version_id and is_outdated(co):
834 if co.pull_request_version_id and is_outdated(co):
831 paths[co.f_path][co.line_no].append(co)
835 paths[co.f_path][co.line_no].append(co)
832 inline_comments = paths
836 inline_comments = paths
833
837
834 # outdated comments
838 # outdated comments
835 c.outdated_cnt = 0
839 c.outdated_cnt = 0
836 if ChangesetCommentsModel.use_outdated_comments(pull_request_latest):
840 if ChangesetCommentsModel.use_outdated_comments(pull_request_latest):
837 outdated_comments = cc_model.get_outdated_comments(
841 outdated_comments = cc_model.get_outdated_comments(
838 c.rhodecode_db_repo.repo_id,
842 c.rhodecode_db_repo.repo_id,
839 pull_request=pull_request_at_ver)
843 pull_request=pull_request_at_ver)
840
844
841 # Count outdated comments and check for deleted files
845 # Count outdated comments and check for deleted files
842 is_outdated = lambda co: \
846 is_outdated = lambda co: \
843 not c.at_version_num \
847 not c.at_version_num \
844 or co.pull_request_version_id < c.at_version_num
848 or co.pull_request_version_id < c.at_version_num
845 for file_name, lines in outdated_comments.iteritems():
849 for file_name, lines in outdated_comments.iteritems():
846 for comments in lines.values():
850 for comments in lines.values():
847 comments = [comm for comm in comments if is_outdated(comm)]
851 comments = [comm for comm in comments if is_outdated(comm)]
848 c.outdated_cnt += len(comments)
852 c.outdated_cnt += len(comments)
849
853
850 # load compare data into template context
854 # load compare data into template context
851 self._load_compare_data(pull_request_at_ver, inline_comments)
855 self._load_compare_data(pull_request_at_ver, inline_comments)
852
856
853 # this is a hack to properly display links, when creating PR, the
857 # this is a hack to properly display links, when creating PR, the
854 # compare view and others uses different notation, and
858 # compare view and others uses different notation, and
855 # compare_commits.mako renders links based on the target_repo.
859 # compare_commits.mako renders links based on the target_repo.
856 # We need to swap that here to generate it properly on the html side
860 # We need to swap that here to generate it properly on the html side
857 c.target_repo = c.source_repo
861 c.target_repo = c.source_repo
858
862
859 # general comments
863 # general comments
860 c.comments = cc_model.get_comments(
864 c.comments = cc_model.get_comments(
861 c.rhodecode_db_repo.repo_id, pull_request=pull_request_id)
865 c.rhodecode_db_repo.repo_id, pull_request=pull_request_id)
862
866
863 if c.allowed_to_update:
867 if c.allowed_to_update:
864 force_close = ('forced_closed', _('Close Pull Request'))
868 force_close = ('forced_closed', _('Close Pull Request'))
865 statuses = ChangesetStatus.STATUSES + [force_close]
869 statuses = ChangesetStatus.STATUSES + [force_close]
866 else:
870 else:
867 statuses = ChangesetStatus.STATUSES
871 statuses = ChangesetStatus.STATUSES
868 c.commit_statuses = statuses
872 c.commit_statuses = statuses
869
873
870 c.ancestor = None # TODO: add ancestor here
874 c.ancestor = None # TODO: add ancestor here
871 c.pull_request = pull_request_display_obj
875 c.pull_request = pull_request_display_obj
872 c.pull_request_latest = pull_request_latest
876 c.pull_request_latest = pull_request_latest
873 c.at_version = at_version
877 c.at_version = at_version
874
878
875 c.versions = pull_request_display_obj.versions()
876 c.changes = None
879 c.changes = None
877 c.file_changes = None
880 c.file_changes = None
878
881
879 c.show_version_changes = 1 # control flag, not used yet
882 c.show_version_changes = 1 # control flag, not used yet
880
883
881 if at_version and c.show_version_changes:
884 if at_version and c.show_version_changes:
882 c.changes, c.file_changes = self._get_pr_version_changes(
885 c.changes, c.file_changes = self._get_pr_version_changes(
883 version, pull_request_latest)
886 version, pull_request_latest)
884
887
885 return render('/pullrequests/pullrequest_show.mako')
888 return render('/pullrequests/pullrequest_show.mako')
886
889
887 @LoginRequired()
890 @LoginRequired()
888 @NotAnonymous()
891 @NotAnonymous()
889 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
892 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
890 'repository.admin')
893 'repository.admin')
891 @auth.CSRFRequired()
894 @auth.CSRFRequired()
892 @jsonify
895 @jsonify
893 def comment(self, repo_name, pull_request_id):
896 def comment(self, repo_name, pull_request_id):
894 pull_request_id = safe_int(pull_request_id)
897 pull_request_id = safe_int(pull_request_id)
895 pull_request = PullRequest.get_or_404(pull_request_id)
898 pull_request = PullRequest.get_or_404(pull_request_id)
896 if pull_request.is_closed():
899 if pull_request.is_closed():
897 raise HTTPForbidden()
900 raise HTTPForbidden()
898
901
899 # TODO: johbo: Re-think this bit, "approved_closed" does not exist
902 # TODO: johbo: Re-think this bit, "approved_closed" does not exist
900 # as a changeset status, still we want to send it in one value.
903 # as a changeset status, still we want to send it in one value.
901 status = request.POST.get('changeset_status', None)
904 status = request.POST.get('changeset_status', None)
902 text = request.POST.get('text')
905 text = request.POST.get('text')
903 if status and '_closed' in status:
906 if status and '_closed' in status:
904 close_pr = True
907 close_pr = True
905 status = status.replace('_closed', '')
908 status = status.replace('_closed', '')
906 else:
909 else:
907 close_pr = False
910 close_pr = False
908
911
909 forced = (status == 'forced')
912 forced = (status == 'forced')
910 if forced:
913 if forced:
911 status = 'rejected'
914 status = 'rejected'
912
915
913 allowed_to_change_status = PullRequestModel().check_user_change_status(
916 allowed_to_change_status = PullRequestModel().check_user_change_status(
914 pull_request, c.rhodecode_user)
917 pull_request, c.rhodecode_user)
915
918
916 if status and allowed_to_change_status:
919 if status and allowed_to_change_status:
917 message = (_('Status change %(transition_icon)s %(status)s')
920 message = (_('Status change %(transition_icon)s %(status)s')
918 % {'transition_icon': '>',
921 % {'transition_icon': '>',
919 'status': ChangesetStatus.get_status_lbl(status)})
922 'status': ChangesetStatus.get_status_lbl(status)})
920 if close_pr:
923 if close_pr:
921 message = _('Closing with') + ' ' + message
924 message = _('Closing with') + ' ' + message
922 text = text or message
925 text = text or message
923 comm = ChangesetCommentsModel().create(
926 comm = ChangesetCommentsModel().create(
924 text=text,
927 text=text,
925 repo=c.rhodecode_db_repo.repo_id,
928 repo=c.rhodecode_db_repo.repo_id,
926 user=c.rhodecode_user.user_id,
929 user=c.rhodecode_user.user_id,
927 pull_request=pull_request_id,
930 pull_request=pull_request_id,
928 f_path=request.POST.get('f_path'),
931 f_path=request.POST.get('f_path'),
929 line_no=request.POST.get('line'),
932 line_no=request.POST.get('line'),
930 status_change=(ChangesetStatus.get_status_lbl(status)
933 status_change=(ChangesetStatus.get_status_lbl(status)
931 if status and allowed_to_change_status else None),
934 if status and allowed_to_change_status else None),
932 status_change_type=(status
935 status_change_type=(status
933 if status and allowed_to_change_status else None),
936 if status and allowed_to_change_status else None),
934 closing_pr=close_pr
937 closing_pr=close_pr
935 )
938 )
936
939
937 if allowed_to_change_status:
940 if allowed_to_change_status:
938 old_calculated_status = pull_request.calculated_review_status()
941 old_calculated_status = pull_request.calculated_review_status()
939 # get status if set !
942 # get status if set !
940 if status:
943 if status:
941 ChangesetStatusModel().set_status(
944 ChangesetStatusModel().set_status(
942 c.rhodecode_db_repo.repo_id,
945 c.rhodecode_db_repo.repo_id,
943 status,
946 status,
944 c.rhodecode_user.user_id,
947 c.rhodecode_user.user_id,
945 comm,
948 comm,
946 pull_request=pull_request_id
949 pull_request=pull_request_id
947 )
950 )
948
951
949 Session().flush()
952 Session().flush()
950 events.trigger(events.PullRequestCommentEvent(pull_request, comm))
953 events.trigger(events.PullRequestCommentEvent(pull_request, comm))
951 # we now calculate the status of pull request, and based on that
954 # we now calculate the status of pull request, and based on that
952 # calculation we set the commits status
955 # calculation we set the commits status
953 calculated_status = pull_request.calculated_review_status()
956 calculated_status = pull_request.calculated_review_status()
954 if old_calculated_status != calculated_status:
957 if old_calculated_status != calculated_status:
955 PullRequestModel()._trigger_pull_request_hook(
958 PullRequestModel()._trigger_pull_request_hook(
956 pull_request, c.rhodecode_user, 'review_status_change')
959 pull_request, c.rhodecode_user, 'review_status_change')
957
960
958 calculated_status_lbl = ChangesetStatus.get_status_lbl(
961 calculated_status_lbl = ChangesetStatus.get_status_lbl(
959 calculated_status)
962 calculated_status)
960
963
961 if close_pr:
964 if close_pr:
962 status_completed = (
965 status_completed = (
963 calculated_status in [ChangesetStatus.STATUS_APPROVED,
966 calculated_status in [ChangesetStatus.STATUS_APPROVED,
964 ChangesetStatus.STATUS_REJECTED])
967 ChangesetStatus.STATUS_REJECTED])
965 if forced or status_completed:
968 if forced or status_completed:
966 PullRequestModel().close_pull_request(
969 PullRequestModel().close_pull_request(
967 pull_request_id, c.rhodecode_user)
970 pull_request_id, c.rhodecode_user)
968 else:
971 else:
969 h.flash(_('Closing pull request on other statuses than '
972 h.flash(_('Closing pull request on other statuses than '
970 'rejected or approved is forbidden. '
973 'rejected or approved is forbidden. '
971 'Calculated status from all reviewers '
974 'Calculated status from all reviewers '
972 'is currently: %s') % calculated_status_lbl,
975 'is currently: %s') % calculated_status_lbl,
973 category='warning')
976 category='warning')
974
977
975 Session().commit()
978 Session().commit()
976
979
977 if not request.is_xhr:
980 if not request.is_xhr:
978 return redirect(h.url('pullrequest_show', repo_name=repo_name,
981 return redirect(h.url('pullrequest_show', repo_name=repo_name,
979 pull_request_id=pull_request_id))
982 pull_request_id=pull_request_id))
980
983
981 data = {
984 data = {
982 'target_id': h.safeid(h.safe_unicode(request.POST.get('f_path'))),
985 'target_id': h.safeid(h.safe_unicode(request.POST.get('f_path'))),
983 }
986 }
984 if comm:
987 if comm:
985 c.co = comm
988 c.co = comm
989 c.inline_comment = True if comm.line_no else False
986 data.update(comm.get_dict())
990 data.update(comm.get_dict())
987 data.update({'rendered_text':
991 data.update({'rendered_text':
988 render('changeset/changeset_comment_block.mako')})
992 render('changeset/changeset_comment_block.mako')})
989
993
990 return data
994 return data
991
995
992 @LoginRequired()
996 @LoginRequired()
993 @NotAnonymous()
997 @NotAnonymous()
994 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
998 @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
995 'repository.admin')
999 'repository.admin')
996 @auth.CSRFRequired()
1000 @auth.CSRFRequired()
997 @jsonify
1001 @jsonify
998 def delete_comment(self, repo_name, comment_id):
1002 def delete_comment(self, repo_name, comment_id):
999 return self._delete_comment(comment_id)
1003 return self._delete_comment(comment_id)
1000
1004
1001 def _delete_comment(self, comment_id):
1005 def _delete_comment(self, comment_id):
1002 comment_id = safe_int(comment_id)
1006 comment_id = safe_int(comment_id)
1003 co = ChangesetComment.get_or_404(comment_id)
1007 co = ChangesetComment.get_or_404(comment_id)
1004 if co.pull_request.is_closed():
1008 if co.pull_request.is_closed():
1005 # don't allow deleting comments on closed pull request
1009 # don't allow deleting comments on closed pull request
1006 raise HTTPForbidden()
1010 raise HTTPForbidden()
1007
1011
1008 is_owner = co.author.user_id == c.rhodecode_user.user_id
1012 is_owner = co.author.user_id == c.rhodecode_user.user_id
1009 is_repo_admin = h.HasRepoPermissionAny('repository.admin')(c.repo_name)
1013 is_repo_admin = h.HasRepoPermissionAny('repository.admin')(c.repo_name)
1010 if h.HasPermissionAny('hg.admin')() or is_repo_admin or is_owner:
1014 if h.HasPermissionAny('hg.admin')() or is_repo_admin or is_owner:
1011 old_calculated_status = co.pull_request.calculated_review_status()
1015 old_calculated_status = co.pull_request.calculated_review_status()
1012 ChangesetCommentsModel().delete(comment=co)
1016 ChangesetCommentsModel().delete(comment=co)
1013 Session().commit()
1017 Session().commit()
1014 calculated_status = co.pull_request.calculated_review_status()
1018 calculated_status = co.pull_request.calculated_review_status()
1015 if old_calculated_status != calculated_status:
1019 if old_calculated_status != calculated_status:
1016 PullRequestModel()._trigger_pull_request_hook(
1020 PullRequestModel()._trigger_pull_request_hook(
1017 co.pull_request, c.rhodecode_user, 'review_status_change')
1021 co.pull_request, c.rhodecode_user, 'review_status_change')
1018 return True
1022 return True
1019 else:
1023 else:
1020 raise HTTPForbidden()
1024 raise HTTPForbidden()
@@ -1,3794 +1,3806 b''
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2
2
3 # Copyright (C) 2010-2017 RhodeCode GmbH
3 # Copyright (C) 2010-2017 RhodeCode GmbH
4 #
4 #
5 # This program is free software: you can redistribute it and/or modify
5 # This program is free software: you can redistribute it and/or modify
6 # it under the terms of the GNU Affero General Public License, version 3
6 # it under the terms of the GNU Affero General Public License, version 3
7 # (only), as published by the Free Software Foundation.
7 # (only), as published by the Free Software Foundation.
8 #
8 #
9 # This program is distributed in the hope that it will be useful,
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
12 # GNU General Public License for more details.
13 #
13 #
14 # You should have received a copy of the GNU Affero General Public License
14 # You should have received a copy of the GNU Affero General Public License
15 # along with this program. If not, see <http://www.gnu.org/licenses/>.
15 # along with this program. If not, see <http://www.gnu.org/licenses/>.
16 #
16 #
17 # This program is dual-licensed. If you wish to learn more about the
17 # This program is dual-licensed. If you wish to learn more about the
18 # RhodeCode Enterprise Edition, including its added features, Support services,
18 # RhodeCode Enterprise Edition, including its added features, Support services,
19 # and proprietary license terms, please see https://rhodecode.com/licenses/
19 # and proprietary license terms, please see https://rhodecode.com/licenses/
20
20
21 """
21 """
22 Database Models for RhodeCode Enterprise
22 Database Models for RhodeCode Enterprise
23 """
23 """
24
24
25 import re
25 import re
26 import os
26 import os
27 import time
27 import time
28 import hashlib
28 import hashlib
29 import logging
29 import logging
30 import datetime
30 import datetime
31 import warnings
31 import warnings
32 import ipaddress
32 import ipaddress
33 import functools
33 import functools
34 import traceback
34 import traceback
35 import collections
35 import collections
36
36
37
37
38 from sqlalchemy import *
38 from sqlalchemy import *
39 from sqlalchemy.ext.declarative import declared_attr
39 from sqlalchemy.ext.declarative import declared_attr
40 from sqlalchemy.ext.hybrid import hybrid_property
40 from sqlalchemy.ext.hybrid import hybrid_property
41 from sqlalchemy.orm import (
41 from sqlalchemy.orm import (
42 relationship, joinedload, class_mapper, validates, aliased)
42 relationship, joinedload, class_mapper, validates, aliased)
43 from sqlalchemy.sql.expression import true
43 from sqlalchemy.sql.expression import true
44 from beaker.cache import cache_region
44 from beaker.cache import cache_region
45 from webob.exc import HTTPNotFound
45 from webob.exc import HTTPNotFound
46 from zope.cachedescriptors.property import Lazy as LazyProperty
46 from zope.cachedescriptors.property import Lazy as LazyProperty
47
47
48 from pylons import url
48 from pylons import url
49 from pylons.i18n.translation import lazy_ugettext as _
49 from pylons.i18n.translation import lazy_ugettext as _
50
50
51 from rhodecode.lib.vcs import get_vcs_instance
51 from rhodecode.lib.vcs import get_vcs_instance
52 from rhodecode.lib.vcs.backends.base import EmptyCommit, Reference
52 from rhodecode.lib.vcs.backends.base import EmptyCommit, Reference
53 from rhodecode.lib.utils2 import (
53 from rhodecode.lib.utils2 import (
54 str2bool, safe_str, get_commit_safe, safe_unicode, md5_safe,
54 str2bool, safe_str, get_commit_safe, safe_unicode, md5_safe,
55 time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict,
55 time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict,
56 glob2re, StrictAttributeDict)
56 glob2re, StrictAttributeDict)
57 from rhodecode.lib.jsonalchemy import MutationObj, MutationList, JsonType
57 from rhodecode.lib.jsonalchemy import MutationObj, MutationList, JsonType
58 from rhodecode.lib.ext_json import json
58 from rhodecode.lib.ext_json import json
59 from rhodecode.lib.caching_query import FromCache
59 from rhodecode.lib.caching_query import FromCache
60 from rhodecode.lib.encrypt import AESCipher
60 from rhodecode.lib.encrypt import AESCipher
61
61
62 from rhodecode.model.meta import Base, Session
62 from rhodecode.model.meta import Base, Session
63
63
64 URL_SEP = '/'
64 URL_SEP = '/'
65 log = logging.getLogger(__name__)
65 log = logging.getLogger(__name__)
66
66
67 # =============================================================================
67 # =============================================================================
68 # BASE CLASSES
68 # BASE CLASSES
69 # =============================================================================
69 # =============================================================================
70
70
71 # this is propagated from .ini file rhodecode.encrypted_values.secret or
71 # this is propagated from .ini file rhodecode.encrypted_values.secret or
72 # beaker.session.secret if first is not set.
72 # beaker.session.secret if first is not set.
73 # and initialized at environment.py
73 # and initialized at environment.py
74 ENCRYPTION_KEY = None
74 ENCRYPTION_KEY = None
75
75
76 # used to sort permissions by types, '#' used here is not allowed to be in
76 # used to sort permissions by types, '#' used here is not allowed to be in
77 # usernames, and it's very early in sorted string.printable table.
77 # usernames, and it's very early in sorted string.printable table.
78 PERMISSION_TYPE_SORT = {
78 PERMISSION_TYPE_SORT = {
79 'admin': '####',
79 'admin': '####',
80 'write': '###',
80 'write': '###',
81 'read': '##',
81 'read': '##',
82 'none': '#',
82 'none': '#',
83 }
83 }
84
84
85
85
86 def display_sort(obj):
86 def display_sort(obj):
87 """
87 """
88 Sort function used to sort permissions in .permissions() function of
88 Sort function used to sort permissions in .permissions() function of
89 Repository, RepoGroup, UserGroup. Also it put the default user in front
89 Repository, RepoGroup, UserGroup. Also it put the default user in front
90 of all other resources
90 of all other resources
91 """
91 """
92
92
93 if obj.username == User.DEFAULT_USER:
93 if obj.username == User.DEFAULT_USER:
94 return '#####'
94 return '#####'
95 prefix = PERMISSION_TYPE_SORT.get(obj.permission.split('.')[-1], '')
95 prefix = PERMISSION_TYPE_SORT.get(obj.permission.split('.')[-1], '')
96 return prefix + obj.username
96 return prefix + obj.username
97
97
98
98
99 def _hash_key(k):
99 def _hash_key(k):
100 return md5_safe(k)
100 return md5_safe(k)
101
101
102
102
103 class EncryptedTextValue(TypeDecorator):
103 class EncryptedTextValue(TypeDecorator):
104 """
104 """
105 Special column for encrypted long text data, use like::
105 Special column for encrypted long text data, use like::
106
106
107 value = Column("encrypted_value", EncryptedValue(), nullable=False)
107 value = Column("encrypted_value", EncryptedValue(), nullable=False)
108
108
109 This column is intelligent so if value is in unencrypted form it return
109 This column is intelligent so if value is in unencrypted form it return
110 unencrypted form, but on save it always encrypts
110 unencrypted form, but on save it always encrypts
111 """
111 """
112 impl = Text
112 impl = Text
113
113
114 def process_bind_param(self, value, dialect):
114 def process_bind_param(self, value, dialect):
115 if not value:
115 if not value:
116 return value
116 return value
117 if value.startswith('enc$aes$') or value.startswith('enc$aes_hmac$'):
117 if value.startswith('enc$aes$') or value.startswith('enc$aes_hmac$'):
118 # protect against double encrypting if someone manually starts
118 # protect against double encrypting if someone manually starts
119 # doing
119 # doing
120 raise ValueError('value needs to be in unencrypted format, ie. '
120 raise ValueError('value needs to be in unencrypted format, ie. '
121 'not starting with enc$aes')
121 'not starting with enc$aes')
122 return 'enc$aes_hmac$%s' % AESCipher(
122 return 'enc$aes_hmac$%s' % AESCipher(
123 ENCRYPTION_KEY, hmac=True).encrypt(value)
123 ENCRYPTION_KEY, hmac=True).encrypt(value)
124
124
125 def process_result_value(self, value, dialect):
125 def process_result_value(self, value, dialect):
126 import rhodecode
126 import rhodecode
127
127
128 if not value:
128 if not value:
129 return value
129 return value
130
130
131 parts = value.split('$', 3)
131 parts = value.split('$', 3)
132 if not len(parts) == 3:
132 if not len(parts) == 3:
133 # probably not encrypted values
133 # probably not encrypted values
134 return value
134 return value
135 else:
135 else:
136 if parts[0] != 'enc':
136 if parts[0] != 'enc':
137 # parts ok but without our header ?
137 # parts ok but without our header ?
138 return value
138 return value
139 enc_strict_mode = str2bool(rhodecode.CONFIG.get(
139 enc_strict_mode = str2bool(rhodecode.CONFIG.get(
140 'rhodecode.encrypted_values.strict') or True)
140 'rhodecode.encrypted_values.strict') or True)
141 # at that stage we know it's our encryption
141 # at that stage we know it's our encryption
142 if parts[1] == 'aes':
142 if parts[1] == 'aes':
143 decrypted_data = AESCipher(ENCRYPTION_KEY).decrypt(parts[2])
143 decrypted_data = AESCipher(ENCRYPTION_KEY).decrypt(parts[2])
144 elif parts[1] == 'aes_hmac':
144 elif parts[1] == 'aes_hmac':
145 decrypted_data = AESCipher(
145 decrypted_data = AESCipher(
146 ENCRYPTION_KEY, hmac=True,
146 ENCRYPTION_KEY, hmac=True,
147 strict_verification=enc_strict_mode).decrypt(parts[2])
147 strict_verification=enc_strict_mode).decrypt(parts[2])
148 else:
148 else:
149 raise ValueError(
149 raise ValueError(
150 'Encryption type part is wrong, must be `aes` '
150 'Encryption type part is wrong, must be `aes` '
151 'or `aes_hmac`, got `%s` instead' % (parts[1]))
151 'or `aes_hmac`, got `%s` instead' % (parts[1]))
152 return decrypted_data
152 return decrypted_data
153
153
154
154
155 class BaseModel(object):
155 class BaseModel(object):
156 """
156 """
157 Base Model for all classes
157 Base Model for all classes
158 """
158 """
159
159
160 @classmethod
160 @classmethod
161 def _get_keys(cls):
161 def _get_keys(cls):
162 """return column names for this model """
162 """return column names for this model """
163 return class_mapper(cls).c.keys()
163 return class_mapper(cls).c.keys()
164
164
165 def get_dict(self):
165 def get_dict(self):
166 """
166 """
167 return dict with keys and values corresponding
167 return dict with keys and values corresponding
168 to this model data """
168 to this model data """
169
169
170 d = {}
170 d = {}
171 for k in self._get_keys():
171 for k in self._get_keys():
172 d[k] = getattr(self, k)
172 d[k] = getattr(self, k)
173
173
174 # also use __json__() if present to get additional fields
174 # also use __json__() if present to get additional fields
175 _json_attr = getattr(self, '__json__', None)
175 _json_attr = getattr(self, '__json__', None)
176 if _json_attr:
176 if _json_attr:
177 # update with attributes from __json__
177 # update with attributes from __json__
178 if callable(_json_attr):
178 if callable(_json_attr):
179 _json_attr = _json_attr()
179 _json_attr = _json_attr()
180 for k, val in _json_attr.iteritems():
180 for k, val in _json_attr.iteritems():
181 d[k] = val
181 d[k] = val
182 return d
182 return d
183
183
184 def get_appstruct(self):
184 def get_appstruct(self):
185 """return list with keys and values tuples corresponding
185 """return list with keys and values tuples corresponding
186 to this model data """
186 to this model data """
187
187
188 l = []
188 l = []
189 for k in self._get_keys():
189 for k in self._get_keys():
190 l.append((k, getattr(self, k),))
190 l.append((k, getattr(self, k),))
191 return l
191 return l
192
192
193 def populate_obj(self, populate_dict):
193 def populate_obj(self, populate_dict):
194 """populate model with data from given populate_dict"""
194 """populate model with data from given populate_dict"""
195
195
196 for k in self._get_keys():
196 for k in self._get_keys():
197 if k in populate_dict:
197 if k in populate_dict:
198 setattr(self, k, populate_dict[k])
198 setattr(self, k, populate_dict[k])
199
199
200 @classmethod
200 @classmethod
201 def query(cls):
201 def query(cls):
202 return Session().query(cls)
202 return Session().query(cls)
203
203
204 @classmethod
204 @classmethod
205 def get(cls, id_):
205 def get(cls, id_):
206 if id_:
206 if id_:
207 return cls.query().get(id_)
207 return cls.query().get(id_)
208
208
209 @classmethod
209 @classmethod
210 def get_or_404(cls, id_):
210 def get_or_404(cls, id_):
211 try:
211 try:
212 id_ = int(id_)
212 id_ = int(id_)
213 except (TypeError, ValueError):
213 except (TypeError, ValueError):
214 raise HTTPNotFound
214 raise HTTPNotFound
215
215
216 res = cls.query().get(id_)
216 res = cls.query().get(id_)
217 if not res:
217 if not res:
218 raise HTTPNotFound
218 raise HTTPNotFound
219 return res
219 return res
220
220
221 @classmethod
221 @classmethod
222 def getAll(cls):
222 def getAll(cls):
223 # deprecated and left for backward compatibility
223 # deprecated and left for backward compatibility
224 return cls.get_all()
224 return cls.get_all()
225
225
226 @classmethod
226 @classmethod
227 def get_all(cls):
227 def get_all(cls):
228 return cls.query().all()
228 return cls.query().all()
229
229
230 @classmethod
230 @classmethod
231 def delete(cls, id_):
231 def delete(cls, id_):
232 obj = cls.query().get(id_)
232 obj = cls.query().get(id_)
233 Session().delete(obj)
233 Session().delete(obj)
234
234
235 @classmethod
235 @classmethod
236 def identity_cache(cls, session, attr_name, value):
236 def identity_cache(cls, session, attr_name, value):
237 exist_in_session = []
237 exist_in_session = []
238 for (item_cls, pkey), instance in session.identity_map.items():
238 for (item_cls, pkey), instance in session.identity_map.items():
239 if cls == item_cls and getattr(instance, attr_name) == value:
239 if cls == item_cls and getattr(instance, attr_name) == value:
240 exist_in_session.append(instance)
240 exist_in_session.append(instance)
241 if exist_in_session:
241 if exist_in_session:
242 if len(exist_in_session) == 1:
242 if len(exist_in_session) == 1:
243 return exist_in_session[0]
243 return exist_in_session[0]
244 log.exception(
244 log.exception(
245 'multiple objects with attr %s and '
245 'multiple objects with attr %s and '
246 'value %s found with same name: %r',
246 'value %s found with same name: %r',
247 attr_name, value, exist_in_session)
247 attr_name, value, exist_in_session)
248
248
249 def __repr__(self):
249 def __repr__(self):
250 if hasattr(self, '__unicode__'):
250 if hasattr(self, '__unicode__'):
251 # python repr needs to return str
251 # python repr needs to return str
252 try:
252 try:
253 return safe_str(self.__unicode__())
253 return safe_str(self.__unicode__())
254 except UnicodeDecodeError:
254 except UnicodeDecodeError:
255 pass
255 pass
256 return '<DB:%s>' % (self.__class__.__name__)
256 return '<DB:%s>' % (self.__class__.__name__)
257
257
258
258
259 class RhodeCodeSetting(Base, BaseModel):
259 class RhodeCodeSetting(Base, BaseModel):
260 __tablename__ = 'rhodecode_settings'
260 __tablename__ = 'rhodecode_settings'
261 __table_args__ = (
261 __table_args__ = (
262 UniqueConstraint('app_settings_name'),
262 UniqueConstraint('app_settings_name'),
263 {'extend_existing': True, 'mysql_engine': 'InnoDB',
263 {'extend_existing': True, 'mysql_engine': 'InnoDB',
264 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
264 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
265 )
265 )
266
266
267 SETTINGS_TYPES = {
267 SETTINGS_TYPES = {
268 'str': safe_str,
268 'str': safe_str,
269 'int': safe_int,
269 'int': safe_int,
270 'unicode': safe_unicode,
270 'unicode': safe_unicode,
271 'bool': str2bool,
271 'bool': str2bool,
272 'list': functools.partial(aslist, sep=',')
272 'list': functools.partial(aslist, sep=',')
273 }
273 }
274 DEFAULT_UPDATE_URL = 'https://rhodecode.com/api/v1/info/versions'
274 DEFAULT_UPDATE_URL = 'https://rhodecode.com/api/v1/info/versions'
275 GLOBAL_CONF_KEY = 'app_settings'
275 GLOBAL_CONF_KEY = 'app_settings'
276
276
277 app_settings_id = Column("app_settings_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
277 app_settings_id = Column("app_settings_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
278 app_settings_name = Column("app_settings_name", String(255), nullable=True, unique=None, default=None)
278 app_settings_name = Column("app_settings_name", String(255), nullable=True, unique=None, default=None)
279 _app_settings_value = Column("app_settings_value", String(4096), nullable=True, unique=None, default=None)
279 _app_settings_value = Column("app_settings_value", String(4096), nullable=True, unique=None, default=None)
280 _app_settings_type = Column("app_settings_type", String(255), nullable=True, unique=None, default=None)
280 _app_settings_type = Column("app_settings_type", String(255), nullable=True, unique=None, default=None)
281
281
282 def __init__(self, key='', val='', type='unicode'):
282 def __init__(self, key='', val='', type='unicode'):
283 self.app_settings_name = key
283 self.app_settings_name = key
284 self.app_settings_type = type
284 self.app_settings_type = type
285 self.app_settings_value = val
285 self.app_settings_value = val
286
286
287 @validates('_app_settings_value')
287 @validates('_app_settings_value')
288 def validate_settings_value(self, key, val):
288 def validate_settings_value(self, key, val):
289 assert type(val) == unicode
289 assert type(val) == unicode
290 return val
290 return val
291
291
292 @hybrid_property
292 @hybrid_property
293 def app_settings_value(self):
293 def app_settings_value(self):
294 v = self._app_settings_value
294 v = self._app_settings_value
295 _type = self.app_settings_type
295 _type = self.app_settings_type
296 if _type:
296 if _type:
297 _type = self.app_settings_type.split('.')[0]
297 _type = self.app_settings_type.split('.')[0]
298 # decode the encrypted value
298 # decode the encrypted value
299 if 'encrypted' in self.app_settings_type:
299 if 'encrypted' in self.app_settings_type:
300 cipher = EncryptedTextValue()
300 cipher = EncryptedTextValue()
301 v = safe_unicode(cipher.process_result_value(v, None))
301 v = safe_unicode(cipher.process_result_value(v, None))
302
302
303 converter = self.SETTINGS_TYPES.get(_type) or \
303 converter = self.SETTINGS_TYPES.get(_type) or \
304 self.SETTINGS_TYPES['unicode']
304 self.SETTINGS_TYPES['unicode']
305 return converter(v)
305 return converter(v)
306
306
307 @app_settings_value.setter
307 @app_settings_value.setter
308 def app_settings_value(self, val):
308 def app_settings_value(self, val):
309 """
309 """
310 Setter that will always make sure we use unicode in app_settings_value
310 Setter that will always make sure we use unicode in app_settings_value
311
311
312 :param val:
312 :param val:
313 """
313 """
314 val = safe_unicode(val)
314 val = safe_unicode(val)
315 # encode the encrypted value
315 # encode the encrypted value
316 if 'encrypted' in self.app_settings_type:
316 if 'encrypted' in self.app_settings_type:
317 cipher = EncryptedTextValue()
317 cipher = EncryptedTextValue()
318 val = safe_unicode(cipher.process_bind_param(val, None))
318 val = safe_unicode(cipher.process_bind_param(val, None))
319 self._app_settings_value = val
319 self._app_settings_value = val
320
320
321 @hybrid_property
321 @hybrid_property
322 def app_settings_type(self):
322 def app_settings_type(self):
323 return self._app_settings_type
323 return self._app_settings_type
324
324
325 @app_settings_type.setter
325 @app_settings_type.setter
326 def app_settings_type(self, val):
326 def app_settings_type(self, val):
327 if val.split('.')[0] not in self.SETTINGS_TYPES:
327 if val.split('.')[0] not in self.SETTINGS_TYPES:
328 raise Exception('type must be one of %s got %s'
328 raise Exception('type must be one of %s got %s'
329 % (self.SETTINGS_TYPES.keys(), val))
329 % (self.SETTINGS_TYPES.keys(), val))
330 self._app_settings_type = val
330 self._app_settings_type = val
331
331
332 def __unicode__(self):
332 def __unicode__(self):
333 return u"<%s('%s:%s[%s]')>" % (
333 return u"<%s('%s:%s[%s]')>" % (
334 self.__class__.__name__,
334 self.__class__.__name__,
335 self.app_settings_name, self.app_settings_value,
335 self.app_settings_name, self.app_settings_value,
336 self.app_settings_type
336 self.app_settings_type
337 )
337 )
338
338
339
339
340 class RhodeCodeUi(Base, BaseModel):
340 class RhodeCodeUi(Base, BaseModel):
341 __tablename__ = 'rhodecode_ui'
341 __tablename__ = 'rhodecode_ui'
342 __table_args__ = (
342 __table_args__ = (
343 UniqueConstraint('ui_key'),
343 UniqueConstraint('ui_key'),
344 {'extend_existing': True, 'mysql_engine': 'InnoDB',
344 {'extend_existing': True, 'mysql_engine': 'InnoDB',
345 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
345 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
346 )
346 )
347
347
348 HOOK_REPO_SIZE = 'changegroup.repo_size'
348 HOOK_REPO_SIZE = 'changegroup.repo_size'
349 # HG
349 # HG
350 HOOK_PRE_PULL = 'preoutgoing.pre_pull'
350 HOOK_PRE_PULL = 'preoutgoing.pre_pull'
351 HOOK_PULL = 'outgoing.pull_logger'
351 HOOK_PULL = 'outgoing.pull_logger'
352 HOOK_PRE_PUSH = 'prechangegroup.pre_push'
352 HOOK_PRE_PUSH = 'prechangegroup.pre_push'
353 HOOK_PUSH = 'changegroup.push_logger'
353 HOOK_PUSH = 'changegroup.push_logger'
354
354
355 # TODO: johbo: Unify way how hooks are configured for git and hg,
355 # TODO: johbo: Unify way how hooks are configured for git and hg,
356 # git part is currently hardcoded.
356 # git part is currently hardcoded.
357
357
358 # SVN PATTERNS
358 # SVN PATTERNS
359 SVN_BRANCH_ID = 'vcs_svn_branch'
359 SVN_BRANCH_ID = 'vcs_svn_branch'
360 SVN_TAG_ID = 'vcs_svn_tag'
360 SVN_TAG_ID = 'vcs_svn_tag'
361
361
362 ui_id = Column(
362 ui_id = Column(
363 "ui_id", Integer(), nullable=False, unique=True, default=None,
363 "ui_id", Integer(), nullable=False, unique=True, default=None,
364 primary_key=True)
364 primary_key=True)
365 ui_section = Column(
365 ui_section = Column(
366 "ui_section", String(255), nullable=True, unique=None, default=None)
366 "ui_section", String(255), nullable=True, unique=None, default=None)
367 ui_key = Column(
367 ui_key = Column(
368 "ui_key", String(255), nullable=True, unique=None, default=None)
368 "ui_key", String(255), nullable=True, unique=None, default=None)
369 ui_value = Column(
369 ui_value = Column(
370 "ui_value", String(255), nullable=True, unique=None, default=None)
370 "ui_value", String(255), nullable=True, unique=None, default=None)
371 ui_active = Column(
371 ui_active = Column(
372 "ui_active", Boolean(), nullable=True, unique=None, default=True)
372 "ui_active", Boolean(), nullable=True, unique=None, default=True)
373
373
374 def __repr__(self):
374 def __repr__(self):
375 return '<%s[%s]%s=>%s]>' % (self.__class__.__name__, self.ui_section,
375 return '<%s[%s]%s=>%s]>' % (self.__class__.__name__, self.ui_section,
376 self.ui_key, self.ui_value)
376 self.ui_key, self.ui_value)
377
377
378
378
379 class RepoRhodeCodeSetting(Base, BaseModel):
379 class RepoRhodeCodeSetting(Base, BaseModel):
380 __tablename__ = 'repo_rhodecode_settings'
380 __tablename__ = 'repo_rhodecode_settings'
381 __table_args__ = (
381 __table_args__ = (
382 UniqueConstraint(
382 UniqueConstraint(
383 'app_settings_name', 'repository_id',
383 'app_settings_name', 'repository_id',
384 name='uq_repo_rhodecode_setting_name_repo_id'),
384 name='uq_repo_rhodecode_setting_name_repo_id'),
385 {'extend_existing': True, 'mysql_engine': 'InnoDB',
385 {'extend_existing': True, 'mysql_engine': 'InnoDB',
386 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
386 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
387 )
387 )
388
388
389 repository_id = Column(
389 repository_id = Column(
390 "repository_id", Integer(), ForeignKey('repositories.repo_id'),
390 "repository_id", Integer(), ForeignKey('repositories.repo_id'),
391 nullable=False)
391 nullable=False)
392 app_settings_id = Column(
392 app_settings_id = Column(
393 "app_settings_id", Integer(), nullable=False, unique=True,
393 "app_settings_id", Integer(), nullable=False, unique=True,
394 default=None, primary_key=True)
394 default=None, primary_key=True)
395 app_settings_name = Column(
395 app_settings_name = Column(
396 "app_settings_name", String(255), nullable=True, unique=None,
396 "app_settings_name", String(255), nullable=True, unique=None,
397 default=None)
397 default=None)
398 _app_settings_value = Column(
398 _app_settings_value = Column(
399 "app_settings_value", String(4096), nullable=True, unique=None,
399 "app_settings_value", String(4096), nullable=True, unique=None,
400 default=None)
400 default=None)
401 _app_settings_type = Column(
401 _app_settings_type = Column(
402 "app_settings_type", String(255), nullable=True, unique=None,
402 "app_settings_type", String(255), nullable=True, unique=None,
403 default=None)
403 default=None)
404
404
405 repository = relationship('Repository')
405 repository = relationship('Repository')
406
406
407 def __init__(self, repository_id, key='', val='', type='unicode'):
407 def __init__(self, repository_id, key='', val='', type='unicode'):
408 self.repository_id = repository_id
408 self.repository_id = repository_id
409 self.app_settings_name = key
409 self.app_settings_name = key
410 self.app_settings_type = type
410 self.app_settings_type = type
411 self.app_settings_value = val
411 self.app_settings_value = val
412
412
413 @validates('_app_settings_value')
413 @validates('_app_settings_value')
414 def validate_settings_value(self, key, val):
414 def validate_settings_value(self, key, val):
415 assert type(val) == unicode
415 assert type(val) == unicode
416 return val
416 return val
417
417
418 @hybrid_property
418 @hybrid_property
419 def app_settings_value(self):
419 def app_settings_value(self):
420 v = self._app_settings_value
420 v = self._app_settings_value
421 type_ = self.app_settings_type
421 type_ = self.app_settings_type
422 SETTINGS_TYPES = RhodeCodeSetting.SETTINGS_TYPES
422 SETTINGS_TYPES = RhodeCodeSetting.SETTINGS_TYPES
423 converter = SETTINGS_TYPES.get(type_) or SETTINGS_TYPES['unicode']
423 converter = SETTINGS_TYPES.get(type_) or SETTINGS_TYPES['unicode']
424 return converter(v)
424 return converter(v)
425
425
426 @app_settings_value.setter
426 @app_settings_value.setter
427 def app_settings_value(self, val):
427 def app_settings_value(self, val):
428 """
428 """
429 Setter that will always make sure we use unicode in app_settings_value
429 Setter that will always make sure we use unicode in app_settings_value
430
430
431 :param val:
431 :param val:
432 """
432 """
433 self._app_settings_value = safe_unicode(val)
433 self._app_settings_value = safe_unicode(val)
434
434
435 @hybrid_property
435 @hybrid_property
436 def app_settings_type(self):
436 def app_settings_type(self):
437 return self._app_settings_type
437 return self._app_settings_type
438
438
439 @app_settings_type.setter
439 @app_settings_type.setter
440 def app_settings_type(self, val):
440 def app_settings_type(self, val):
441 SETTINGS_TYPES = RhodeCodeSetting.SETTINGS_TYPES
441 SETTINGS_TYPES = RhodeCodeSetting.SETTINGS_TYPES
442 if val not in SETTINGS_TYPES:
442 if val not in SETTINGS_TYPES:
443 raise Exception('type must be one of %s got %s'
443 raise Exception('type must be one of %s got %s'
444 % (SETTINGS_TYPES.keys(), val))
444 % (SETTINGS_TYPES.keys(), val))
445 self._app_settings_type = val
445 self._app_settings_type = val
446
446
447 def __unicode__(self):
447 def __unicode__(self):
448 return u"<%s('%s:%s:%s[%s]')>" % (
448 return u"<%s('%s:%s:%s[%s]')>" % (
449 self.__class__.__name__, self.repository.repo_name,
449 self.__class__.__name__, self.repository.repo_name,
450 self.app_settings_name, self.app_settings_value,
450 self.app_settings_name, self.app_settings_value,
451 self.app_settings_type
451 self.app_settings_type
452 )
452 )
453
453
454
454
455 class RepoRhodeCodeUi(Base, BaseModel):
455 class RepoRhodeCodeUi(Base, BaseModel):
456 __tablename__ = 'repo_rhodecode_ui'
456 __tablename__ = 'repo_rhodecode_ui'
457 __table_args__ = (
457 __table_args__ = (
458 UniqueConstraint(
458 UniqueConstraint(
459 'repository_id', 'ui_section', 'ui_key',
459 'repository_id', 'ui_section', 'ui_key',
460 name='uq_repo_rhodecode_ui_repository_id_section_key'),
460 name='uq_repo_rhodecode_ui_repository_id_section_key'),
461 {'extend_existing': True, 'mysql_engine': 'InnoDB',
461 {'extend_existing': True, 'mysql_engine': 'InnoDB',
462 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
462 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
463 )
463 )
464
464
465 repository_id = Column(
465 repository_id = Column(
466 "repository_id", Integer(), ForeignKey('repositories.repo_id'),
466 "repository_id", Integer(), ForeignKey('repositories.repo_id'),
467 nullable=False)
467 nullable=False)
468 ui_id = Column(
468 ui_id = Column(
469 "ui_id", Integer(), nullable=False, unique=True, default=None,
469 "ui_id", Integer(), nullable=False, unique=True, default=None,
470 primary_key=True)
470 primary_key=True)
471 ui_section = Column(
471 ui_section = Column(
472 "ui_section", String(255), nullable=True, unique=None, default=None)
472 "ui_section", String(255), nullable=True, unique=None, default=None)
473 ui_key = Column(
473 ui_key = Column(
474 "ui_key", String(255), nullable=True, unique=None, default=None)
474 "ui_key", String(255), nullable=True, unique=None, default=None)
475 ui_value = Column(
475 ui_value = Column(
476 "ui_value", String(255), nullable=True, unique=None, default=None)
476 "ui_value", String(255), nullable=True, unique=None, default=None)
477 ui_active = Column(
477 ui_active = Column(
478 "ui_active", Boolean(), nullable=True, unique=None, default=True)
478 "ui_active", Boolean(), nullable=True, unique=None, default=True)
479
479
480 repository = relationship('Repository')
480 repository = relationship('Repository')
481
481
482 def __repr__(self):
482 def __repr__(self):
483 return '<%s[%s:%s]%s=>%s]>' % (
483 return '<%s[%s:%s]%s=>%s]>' % (
484 self.__class__.__name__, self.repository.repo_name,
484 self.__class__.__name__, self.repository.repo_name,
485 self.ui_section, self.ui_key, self.ui_value)
485 self.ui_section, self.ui_key, self.ui_value)
486
486
487
487
488 class User(Base, BaseModel):
488 class User(Base, BaseModel):
489 __tablename__ = 'users'
489 __tablename__ = 'users'
490 __table_args__ = (
490 __table_args__ = (
491 UniqueConstraint('username'), UniqueConstraint('email'),
491 UniqueConstraint('username'), UniqueConstraint('email'),
492 Index('u_username_idx', 'username'),
492 Index('u_username_idx', 'username'),
493 Index('u_email_idx', 'email'),
493 Index('u_email_idx', 'email'),
494 {'extend_existing': True, 'mysql_engine': 'InnoDB',
494 {'extend_existing': True, 'mysql_engine': 'InnoDB',
495 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
495 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
496 )
496 )
497 DEFAULT_USER = 'default'
497 DEFAULT_USER = 'default'
498 DEFAULT_USER_EMAIL = 'anonymous@rhodecode.org'
498 DEFAULT_USER_EMAIL = 'anonymous@rhodecode.org'
499 DEFAULT_GRAVATAR_URL = 'https://secure.gravatar.com/avatar/{md5email}?d=identicon&s={size}'
499 DEFAULT_GRAVATAR_URL = 'https://secure.gravatar.com/avatar/{md5email}?d=identicon&s={size}'
500
500
501 user_id = Column("user_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
501 user_id = Column("user_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
502 username = Column("username", String(255), nullable=True, unique=None, default=None)
502 username = Column("username", String(255), nullable=True, unique=None, default=None)
503 password = Column("password", String(255), nullable=True, unique=None, default=None)
503 password = Column("password", String(255), nullable=True, unique=None, default=None)
504 active = Column("active", Boolean(), nullable=True, unique=None, default=True)
504 active = Column("active", Boolean(), nullable=True, unique=None, default=True)
505 admin = Column("admin", Boolean(), nullable=True, unique=None, default=False)
505 admin = Column("admin", Boolean(), nullable=True, unique=None, default=False)
506 name = Column("firstname", String(255), nullable=True, unique=None, default=None)
506 name = Column("firstname", String(255), nullable=True, unique=None, default=None)
507 lastname = Column("lastname", String(255), nullable=True, unique=None, default=None)
507 lastname = Column("lastname", String(255), nullable=True, unique=None, default=None)
508 _email = Column("email", String(255), nullable=True, unique=None, default=None)
508 _email = Column("email", String(255), nullable=True, unique=None, default=None)
509 last_login = Column("last_login", DateTime(timezone=False), nullable=True, unique=None, default=None)
509 last_login = Column("last_login", DateTime(timezone=False), nullable=True, unique=None, default=None)
510 extern_type = Column("extern_type", String(255), nullable=True, unique=None, default=None)
510 extern_type = Column("extern_type", String(255), nullable=True, unique=None, default=None)
511 extern_name = Column("extern_name", String(255), nullable=True, unique=None, default=None)
511 extern_name = Column("extern_name", String(255), nullable=True, unique=None, default=None)
512 api_key = Column("api_key", String(255), nullable=True, unique=None, default=None)
512 api_key = Column("api_key", String(255), nullable=True, unique=None, default=None)
513 inherit_default_permissions = Column("inherit_default_permissions", Boolean(), nullable=False, unique=None, default=True)
513 inherit_default_permissions = Column("inherit_default_permissions", Boolean(), nullable=False, unique=None, default=True)
514 created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
514 created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
515 _user_data = Column("user_data", LargeBinary(), nullable=True) # JSON data
515 _user_data = Column("user_data", LargeBinary(), nullable=True) # JSON data
516
516
517 user_log = relationship('UserLog')
517 user_log = relationship('UserLog')
518 user_perms = relationship('UserToPerm', primaryjoin="User.user_id==UserToPerm.user_id", cascade='all')
518 user_perms = relationship('UserToPerm', primaryjoin="User.user_id==UserToPerm.user_id", cascade='all')
519
519
520 repositories = relationship('Repository')
520 repositories = relationship('Repository')
521 repository_groups = relationship('RepoGroup')
521 repository_groups = relationship('RepoGroup')
522 user_groups = relationship('UserGroup')
522 user_groups = relationship('UserGroup')
523
523
524 user_followers = relationship('UserFollowing', primaryjoin='UserFollowing.follows_user_id==User.user_id', cascade='all')
524 user_followers = relationship('UserFollowing', primaryjoin='UserFollowing.follows_user_id==User.user_id', cascade='all')
525 followings = relationship('UserFollowing', primaryjoin='UserFollowing.user_id==User.user_id', cascade='all')
525 followings = relationship('UserFollowing', primaryjoin='UserFollowing.user_id==User.user_id', cascade='all')
526
526
527 repo_to_perm = relationship('UserRepoToPerm', primaryjoin='UserRepoToPerm.user_id==User.user_id', cascade='all')
527 repo_to_perm = relationship('UserRepoToPerm', primaryjoin='UserRepoToPerm.user_id==User.user_id', cascade='all')
528 repo_group_to_perm = relationship('UserRepoGroupToPerm', primaryjoin='UserRepoGroupToPerm.user_id==User.user_id', cascade='all')
528 repo_group_to_perm = relationship('UserRepoGroupToPerm', primaryjoin='UserRepoGroupToPerm.user_id==User.user_id', cascade='all')
529 user_group_to_perm = relationship('UserUserGroupToPerm', primaryjoin='UserUserGroupToPerm.user_id==User.user_id', cascade='all')
529 user_group_to_perm = relationship('UserUserGroupToPerm', primaryjoin='UserUserGroupToPerm.user_id==User.user_id', cascade='all')
530
530
531 group_member = relationship('UserGroupMember', cascade='all')
531 group_member = relationship('UserGroupMember', cascade='all')
532
532
533 notifications = relationship('UserNotification', cascade='all')
533 notifications = relationship('UserNotification', cascade='all')
534 # notifications assigned to this user
534 # notifications assigned to this user
535 user_created_notifications = relationship('Notification', cascade='all')
535 user_created_notifications = relationship('Notification', cascade='all')
536 # comments created by this user
536 # comments created by this user
537 user_comments = relationship('ChangesetComment', cascade='all')
537 user_comments = relationship('ChangesetComment', cascade='all')
538 # user profile extra info
538 # user profile extra info
539 user_emails = relationship('UserEmailMap', cascade='all')
539 user_emails = relationship('UserEmailMap', cascade='all')
540 user_ip_map = relationship('UserIpMap', cascade='all')
540 user_ip_map = relationship('UserIpMap', cascade='all')
541 user_auth_tokens = relationship('UserApiKeys', cascade='all')
541 user_auth_tokens = relationship('UserApiKeys', cascade='all')
542 # gists
542 # gists
543 user_gists = relationship('Gist', cascade='all')
543 user_gists = relationship('Gist', cascade='all')
544 # user pull requests
544 # user pull requests
545 user_pull_requests = relationship('PullRequest', cascade='all')
545 user_pull_requests = relationship('PullRequest', cascade='all')
546 # external identities
546 # external identities
547 extenal_identities = relationship(
547 extenal_identities = relationship(
548 'ExternalIdentity',
548 'ExternalIdentity',
549 primaryjoin="User.user_id==ExternalIdentity.local_user_id",
549 primaryjoin="User.user_id==ExternalIdentity.local_user_id",
550 cascade='all')
550 cascade='all')
551
551
552 def __unicode__(self):
552 def __unicode__(self):
553 return u"<%s('id:%s:%s')>" % (self.__class__.__name__,
553 return u"<%s('id:%s:%s')>" % (self.__class__.__name__,
554 self.user_id, self.username)
554 self.user_id, self.username)
555
555
556 @hybrid_property
556 @hybrid_property
557 def email(self):
557 def email(self):
558 return self._email
558 return self._email
559
559
560 @email.setter
560 @email.setter
561 def email(self, val):
561 def email(self, val):
562 self._email = val.lower() if val else None
562 self._email = val.lower() if val else None
563
563
564 @property
564 @property
565 def firstname(self):
565 def firstname(self):
566 # alias for future
566 # alias for future
567 return self.name
567 return self.name
568
568
569 @property
569 @property
570 def emails(self):
570 def emails(self):
571 other = UserEmailMap.query().filter(UserEmailMap.user==self).all()
571 other = UserEmailMap.query().filter(UserEmailMap.user==self).all()
572 return [self.email] + [x.email for x in other]
572 return [self.email] + [x.email for x in other]
573
573
574 @property
574 @property
575 def auth_tokens(self):
575 def auth_tokens(self):
576 return [self.api_key] + [x.api_key for x in self.extra_auth_tokens]
576 return [self.api_key] + [x.api_key for x in self.extra_auth_tokens]
577
577
578 @property
578 @property
579 def extra_auth_tokens(self):
579 def extra_auth_tokens(self):
580 return UserApiKeys.query().filter(UserApiKeys.user == self).all()
580 return UserApiKeys.query().filter(UserApiKeys.user == self).all()
581
581
582 @property
582 @property
583 def feed_token(self):
583 def feed_token(self):
584 feed_tokens = UserApiKeys.query()\
584 feed_tokens = UserApiKeys.query()\
585 .filter(UserApiKeys.user == self)\
585 .filter(UserApiKeys.user == self)\
586 .filter(UserApiKeys.role == UserApiKeys.ROLE_FEED)\
586 .filter(UserApiKeys.role == UserApiKeys.ROLE_FEED)\
587 .all()
587 .all()
588 if feed_tokens:
588 if feed_tokens:
589 return feed_tokens[0].api_key
589 return feed_tokens[0].api_key
590 else:
590 else:
591 # use the main token so we don't end up with nothing...
591 # use the main token so we don't end up with nothing...
592 return self.api_key
592 return self.api_key
593
593
594 @classmethod
594 @classmethod
595 def extra_valid_auth_tokens(cls, user, role=None):
595 def extra_valid_auth_tokens(cls, user, role=None):
596 tokens = UserApiKeys.query().filter(UserApiKeys.user == user)\
596 tokens = UserApiKeys.query().filter(UserApiKeys.user == user)\
597 .filter(or_(UserApiKeys.expires == -1,
597 .filter(or_(UserApiKeys.expires == -1,
598 UserApiKeys.expires >= time.time()))
598 UserApiKeys.expires >= time.time()))
599 if role:
599 if role:
600 tokens = tokens.filter(or_(UserApiKeys.role == role,
600 tokens = tokens.filter(or_(UserApiKeys.role == role,
601 UserApiKeys.role == UserApiKeys.ROLE_ALL))
601 UserApiKeys.role == UserApiKeys.ROLE_ALL))
602 return tokens.all()
602 return tokens.all()
603
603
604 @property
604 @property
605 def builtin_token_roles(self):
605 def builtin_token_roles(self):
606 return map(UserApiKeys._get_role_name, [
606 return map(UserApiKeys._get_role_name, [
607 UserApiKeys.ROLE_API, UserApiKeys.ROLE_FEED, UserApiKeys.ROLE_HTTP
607 UserApiKeys.ROLE_API, UserApiKeys.ROLE_FEED, UserApiKeys.ROLE_HTTP
608 ])
608 ])
609
609
610 @property
610 @property
611 def ip_addresses(self):
611 def ip_addresses(self):
612 ret = UserIpMap.query().filter(UserIpMap.user == self).all()
612 ret = UserIpMap.query().filter(UserIpMap.user == self).all()
613 return [x.ip_addr for x in ret]
613 return [x.ip_addr for x in ret]
614
614
615 @property
615 @property
616 def username_and_name(self):
616 def username_and_name(self):
617 return '%s (%s %s)' % (self.username, self.firstname, self.lastname)
617 return '%s (%s %s)' % (self.username, self.firstname, self.lastname)
618
618
619 @property
619 @property
620 def username_or_name_or_email(self):
620 def username_or_name_or_email(self):
621 full_name = self.full_name if self.full_name is not ' ' else None
621 full_name = self.full_name if self.full_name is not ' ' else None
622 return self.username or full_name or self.email
622 return self.username or full_name or self.email
623
623
624 @property
624 @property
625 def full_name(self):
625 def full_name(self):
626 return '%s %s' % (self.firstname, self.lastname)
626 return '%s %s' % (self.firstname, self.lastname)
627
627
628 @property
628 @property
629 def full_name_or_username(self):
629 def full_name_or_username(self):
630 return ('%s %s' % (self.firstname, self.lastname)
630 return ('%s %s' % (self.firstname, self.lastname)
631 if (self.firstname and self.lastname) else self.username)
631 if (self.firstname and self.lastname) else self.username)
632
632
633 @property
633 @property
634 def full_contact(self):
634 def full_contact(self):
635 return '%s %s <%s>' % (self.firstname, self.lastname, self.email)
635 return '%s %s <%s>' % (self.firstname, self.lastname, self.email)
636
636
637 @property
637 @property
638 def short_contact(self):
638 def short_contact(self):
639 return '%s %s' % (self.firstname, self.lastname)
639 return '%s %s' % (self.firstname, self.lastname)
640
640
641 @property
641 @property
642 def is_admin(self):
642 def is_admin(self):
643 return self.admin
643 return self.admin
644
644
645 @property
645 @property
646 def AuthUser(self):
646 def AuthUser(self):
647 """
647 """
648 Returns instance of AuthUser for this user
648 Returns instance of AuthUser for this user
649 """
649 """
650 from rhodecode.lib.auth import AuthUser
650 from rhodecode.lib.auth import AuthUser
651 return AuthUser(user_id=self.user_id, api_key=self.api_key,
651 return AuthUser(user_id=self.user_id, api_key=self.api_key,
652 username=self.username)
652 username=self.username)
653
653
654 @hybrid_property
654 @hybrid_property
655 def user_data(self):
655 def user_data(self):
656 if not self._user_data:
656 if not self._user_data:
657 return {}
657 return {}
658
658
659 try:
659 try:
660 return json.loads(self._user_data)
660 return json.loads(self._user_data)
661 except TypeError:
661 except TypeError:
662 return {}
662 return {}
663
663
664 @user_data.setter
664 @user_data.setter
665 def user_data(self, val):
665 def user_data(self, val):
666 if not isinstance(val, dict):
666 if not isinstance(val, dict):
667 raise Exception('user_data must be dict, got %s' % type(val))
667 raise Exception('user_data must be dict, got %s' % type(val))
668 try:
668 try:
669 self._user_data = json.dumps(val)
669 self._user_data = json.dumps(val)
670 except Exception:
670 except Exception:
671 log.error(traceback.format_exc())
671 log.error(traceback.format_exc())
672
672
673 @classmethod
673 @classmethod
674 def get_by_username(cls, username, case_insensitive=False,
674 def get_by_username(cls, username, case_insensitive=False,
675 cache=False, identity_cache=False):
675 cache=False, identity_cache=False):
676 session = Session()
676 session = Session()
677
677
678 if case_insensitive:
678 if case_insensitive:
679 q = cls.query().filter(
679 q = cls.query().filter(
680 func.lower(cls.username) == func.lower(username))
680 func.lower(cls.username) == func.lower(username))
681 else:
681 else:
682 q = cls.query().filter(cls.username == username)
682 q = cls.query().filter(cls.username == username)
683
683
684 if cache:
684 if cache:
685 if identity_cache:
685 if identity_cache:
686 val = cls.identity_cache(session, 'username', username)
686 val = cls.identity_cache(session, 'username', username)
687 if val:
687 if val:
688 return val
688 return val
689 else:
689 else:
690 q = q.options(
690 q = q.options(
691 FromCache("sql_cache_short",
691 FromCache("sql_cache_short",
692 "get_user_by_name_%s" % _hash_key(username)))
692 "get_user_by_name_%s" % _hash_key(username)))
693
693
694 return q.scalar()
694 return q.scalar()
695
695
696 @classmethod
696 @classmethod
697 def get_by_auth_token(cls, auth_token, cache=False, fallback=True):
697 def get_by_auth_token(cls, auth_token, cache=False, fallback=True):
698 q = cls.query().filter(cls.api_key == auth_token)
698 q = cls.query().filter(cls.api_key == auth_token)
699
699
700 if cache:
700 if cache:
701 q = q.options(FromCache("sql_cache_short",
701 q = q.options(FromCache("sql_cache_short",
702 "get_auth_token_%s" % auth_token))
702 "get_auth_token_%s" % auth_token))
703 res = q.scalar()
703 res = q.scalar()
704
704
705 if fallback and not res:
705 if fallback and not res:
706 #fallback to additional keys
706 #fallback to additional keys
707 _res = UserApiKeys.query()\
707 _res = UserApiKeys.query()\
708 .filter(UserApiKeys.api_key == auth_token)\
708 .filter(UserApiKeys.api_key == auth_token)\
709 .filter(or_(UserApiKeys.expires == -1,
709 .filter(or_(UserApiKeys.expires == -1,
710 UserApiKeys.expires >= time.time()))\
710 UserApiKeys.expires >= time.time()))\
711 .first()
711 .first()
712 if _res:
712 if _res:
713 res = _res.user
713 res = _res.user
714 return res
714 return res
715
715
716 @classmethod
716 @classmethod
717 def get_by_email(cls, email, case_insensitive=False, cache=False):
717 def get_by_email(cls, email, case_insensitive=False, cache=False):
718
718
719 if case_insensitive:
719 if case_insensitive:
720 q = cls.query().filter(func.lower(cls.email) == func.lower(email))
720 q = cls.query().filter(func.lower(cls.email) == func.lower(email))
721
721
722 else:
722 else:
723 q = cls.query().filter(cls.email == email)
723 q = cls.query().filter(cls.email == email)
724
724
725 if cache:
725 if cache:
726 q = q.options(FromCache("sql_cache_short",
726 q = q.options(FromCache("sql_cache_short",
727 "get_email_key_%s" % _hash_key(email)))
727 "get_email_key_%s" % _hash_key(email)))
728
728
729 ret = q.scalar()
729 ret = q.scalar()
730 if ret is None:
730 if ret is None:
731 q = UserEmailMap.query()
731 q = UserEmailMap.query()
732 # try fetching in alternate email map
732 # try fetching in alternate email map
733 if case_insensitive:
733 if case_insensitive:
734 q = q.filter(func.lower(UserEmailMap.email) == func.lower(email))
734 q = q.filter(func.lower(UserEmailMap.email) == func.lower(email))
735 else:
735 else:
736 q = q.filter(UserEmailMap.email == email)
736 q = q.filter(UserEmailMap.email == email)
737 q = q.options(joinedload(UserEmailMap.user))
737 q = q.options(joinedload(UserEmailMap.user))
738 if cache:
738 if cache:
739 q = q.options(FromCache("sql_cache_short",
739 q = q.options(FromCache("sql_cache_short",
740 "get_email_map_key_%s" % email))
740 "get_email_map_key_%s" % email))
741 ret = getattr(q.scalar(), 'user', None)
741 ret = getattr(q.scalar(), 'user', None)
742
742
743 return ret
743 return ret
744
744
745 @classmethod
745 @classmethod
746 def get_from_cs_author(cls, author):
746 def get_from_cs_author(cls, author):
747 """
747 """
748 Tries to get User objects out of commit author string
748 Tries to get User objects out of commit author string
749
749
750 :param author:
750 :param author:
751 """
751 """
752 from rhodecode.lib.helpers import email, author_name
752 from rhodecode.lib.helpers import email, author_name
753 # Valid email in the attribute passed, see if they're in the system
753 # Valid email in the attribute passed, see if they're in the system
754 _email = email(author)
754 _email = email(author)
755 if _email:
755 if _email:
756 user = cls.get_by_email(_email, case_insensitive=True)
756 user = cls.get_by_email(_email, case_insensitive=True)
757 if user:
757 if user:
758 return user
758 return user
759 # Maybe we can match by username?
759 # Maybe we can match by username?
760 _author = author_name(author)
760 _author = author_name(author)
761 user = cls.get_by_username(_author, case_insensitive=True)
761 user = cls.get_by_username(_author, case_insensitive=True)
762 if user:
762 if user:
763 return user
763 return user
764
764
765 def update_userdata(self, **kwargs):
765 def update_userdata(self, **kwargs):
766 usr = self
766 usr = self
767 old = usr.user_data
767 old = usr.user_data
768 old.update(**kwargs)
768 old.update(**kwargs)
769 usr.user_data = old
769 usr.user_data = old
770 Session().add(usr)
770 Session().add(usr)
771 log.debug('updated userdata with ', kwargs)
771 log.debug('updated userdata with ', kwargs)
772
772
773 def update_lastlogin(self):
773 def update_lastlogin(self):
774 """Update user lastlogin"""
774 """Update user lastlogin"""
775 self.last_login = datetime.datetime.now()
775 self.last_login = datetime.datetime.now()
776 Session().add(self)
776 Session().add(self)
777 log.debug('updated user %s lastlogin', self.username)
777 log.debug('updated user %s lastlogin', self.username)
778
778
779 def update_lastactivity(self):
779 def update_lastactivity(self):
780 """Update user lastactivity"""
780 """Update user lastactivity"""
781 usr = self
781 usr = self
782 old = usr.user_data
782 old = usr.user_data
783 old.update({'last_activity': time.time()})
783 old.update({'last_activity': time.time()})
784 usr.user_data = old
784 usr.user_data = old
785 Session().add(usr)
785 Session().add(usr)
786 log.debug('updated user %s lastactivity', usr.username)
786 log.debug('updated user %s lastactivity', usr.username)
787
787
788 def update_password(self, new_password, change_api_key=False):
788 def update_password(self, new_password, change_api_key=False):
789 from rhodecode.lib.auth import get_crypt_password,generate_auth_token
789 from rhodecode.lib.auth import get_crypt_password,generate_auth_token
790
790
791 self.password = get_crypt_password(new_password)
791 self.password = get_crypt_password(new_password)
792 if change_api_key:
792 if change_api_key:
793 self.api_key = generate_auth_token(self.username)
793 self.api_key = generate_auth_token(self.username)
794 Session().add(self)
794 Session().add(self)
795
795
796 @classmethod
796 @classmethod
797 def get_first_super_admin(cls):
797 def get_first_super_admin(cls):
798 user = User.query().filter(User.admin == true()).first()
798 user = User.query().filter(User.admin == true()).first()
799 if user is None:
799 if user is None:
800 raise Exception('FATAL: Missing administrative account!')
800 raise Exception('FATAL: Missing administrative account!')
801 return user
801 return user
802
802
803 @classmethod
803 @classmethod
804 def get_all_super_admins(cls):
804 def get_all_super_admins(cls):
805 """
805 """
806 Returns all admin accounts sorted by username
806 Returns all admin accounts sorted by username
807 """
807 """
808 return User.query().filter(User.admin == true())\
808 return User.query().filter(User.admin == true())\
809 .order_by(User.username.asc()).all()
809 .order_by(User.username.asc()).all()
810
810
811 @classmethod
811 @classmethod
812 def get_default_user(cls, cache=False):
812 def get_default_user(cls, cache=False):
813 user = User.get_by_username(User.DEFAULT_USER, cache=cache)
813 user = User.get_by_username(User.DEFAULT_USER, cache=cache)
814 if user is None:
814 if user is None:
815 raise Exception('FATAL: Missing default account!')
815 raise Exception('FATAL: Missing default account!')
816 return user
816 return user
817
817
818 def _get_default_perms(self, user, suffix=''):
818 def _get_default_perms(self, user, suffix=''):
819 from rhodecode.model.permission import PermissionModel
819 from rhodecode.model.permission import PermissionModel
820 return PermissionModel().get_default_perms(user.user_perms, suffix)
820 return PermissionModel().get_default_perms(user.user_perms, suffix)
821
821
822 def get_default_perms(self, suffix=''):
822 def get_default_perms(self, suffix=''):
823 return self._get_default_perms(self, suffix)
823 return self._get_default_perms(self, suffix)
824
824
825 def get_api_data(self, include_secrets=False, details='full'):
825 def get_api_data(self, include_secrets=False, details='full'):
826 """
826 """
827 Common function for generating user related data for API
827 Common function for generating user related data for API
828
828
829 :param include_secrets: By default secrets in the API data will be replaced
829 :param include_secrets: By default secrets in the API data will be replaced
830 by a placeholder value to prevent exposing this data by accident. In case
830 by a placeholder value to prevent exposing this data by accident. In case
831 this data shall be exposed, set this flag to ``True``.
831 this data shall be exposed, set this flag to ``True``.
832
832
833 :param details: details can be 'basic|full' basic gives only a subset of
833 :param details: details can be 'basic|full' basic gives only a subset of
834 the available user information that includes user_id, name and emails.
834 the available user information that includes user_id, name and emails.
835 """
835 """
836 user = self
836 user = self
837 user_data = self.user_data
837 user_data = self.user_data
838 data = {
838 data = {
839 'user_id': user.user_id,
839 'user_id': user.user_id,
840 'username': user.username,
840 'username': user.username,
841 'firstname': user.name,
841 'firstname': user.name,
842 'lastname': user.lastname,
842 'lastname': user.lastname,
843 'email': user.email,
843 'email': user.email,
844 'emails': user.emails,
844 'emails': user.emails,
845 }
845 }
846 if details == 'basic':
846 if details == 'basic':
847 return data
847 return data
848
848
849 api_key_length = 40
849 api_key_length = 40
850 api_key_replacement = '*' * api_key_length
850 api_key_replacement = '*' * api_key_length
851
851
852 extras = {
852 extras = {
853 'api_key': api_key_replacement,
853 'api_key': api_key_replacement,
854 'api_keys': [api_key_replacement],
854 'api_keys': [api_key_replacement],
855 'active': user.active,
855 'active': user.active,
856 'admin': user.admin,
856 'admin': user.admin,
857 'extern_type': user.extern_type,
857 'extern_type': user.extern_type,
858 'extern_name': user.extern_name,
858 'extern_name': user.extern_name,
859 'last_login': user.last_login,
859 'last_login': user.last_login,
860 'ip_addresses': user.ip_addresses,
860 'ip_addresses': user.ip_addresses,
861 'language': user_data.get('language')
861 'language': user_data.get('language')
862 }
862 }
863 data.update(extras)
863 data.update(extras)
864
864
865 if include_secrets:
865 if include_secrets:
866 data['api_key'] = user.api_key
866 data['api_key'] = user.api_key
867 data['api_keys'] = user.auth_tokens
867 data['api_keys'] = user.auth_tokens
868 return data
868 return data
869
869
870 def __json__(self):
870 def __json__(self):
871 data = {
871 data = {
872 'full_name': self.full_name,
872 'full_name': self.full_name,
873 'full_name_or_username': self.full_name_or_username,
873 'full_name_or_username': self.full_name_or_username,
874 'short_contact': self.short_contact,
874 'short_contact': self.short_contact,
875 'full_contact': self.full_contact,
875 'full_contact': self.full_contact,
876 }
876 }
877 data.update(self.get_api_data())
877 data.update(self.get_api_data())
878 return data
878 return data
879
879
880
880
881 class UserApiKeys(Base, BaseModel):
881 class UserApiKeys(Base, BaseModel):
882 __tablename__ = 'user_api_keys'
882 __tablename__ = 'user_api_keys'
883 __table_args__ = (
883 __table_args__ = (
884 Index('uak_api_key_idx', 'api_key'),
884 Index('uak_api_key_idx', 'api_key'),
885 Index('uak_api_key_expires_idx', 'api_key', 'expires'),
885 Index('uak_api_key_expires_idx', 'api_key', 'expires'),
886 UniqueConstraint('api_key'),
886 UniqueConstraint('api_key'),
887 {'extend_existing': True, 'mysql_engine': 'InnoDB',
887 {'extend_existing': True, 'mysql_engine': 'InnoDB',
888 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
888 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
889 )
889 )
890 __mapper_args__ = {}
890 __mapper_args__ = {}
891
891
892 # ApiKey role
892 # ApiKey role
893 ROLE_ALL = 'token_role_all'
893 ROLE_ALL = 'token_role_all'
894 ROLE_HTTP = 'token_role_http'
894 ROLE_HTTP = 'token_role_http'
895 ROLE_VCS = 'token_role_vcs'
895 ROLE_VCS = 'token_role_vcs'
896 ROLE_API = 'token_role_api'
896 ROLE_API = 'token_role_api'
897 ROLE_FEED = 'token_role_feed'
897 ROLE_FEED = 'token_role_feed'
898 ROLES = [ROLE_ALL, ROLE_HTTP, ROLE_VCS, ROLE_API, ROLE_FEED]
898 ROLES = [ROLE_ALL, ROLE_HTTP, ROLE_VCS, ROLE_API, ROLE_FEED]
899
899
900 user_api_key_id = Column("user_api_key_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
900 user_api_key_id = Column("user_api_key_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
901 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
901 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
902 api_key = Column("api_key", String(255), nullable=False, unique=True)
902 api_key = Column("api_key", String(255), nullable=False, unique=True)
903 description = Column('description', UnicodeText().with_variant(UnicodeText(1024), 'mysql'))
903 description = Column('description', UnicodeText().with_variant(UnicodeText(1024), 'mysql'))
904 expires = Column('expires', Float(53), nullable=False)
904 expires = Column('expires', Float(53), nullable=False)
905 role = Column('role', String(255), nullable=True)
905 role = Column('role', String(255), nullable=True)
906 created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
906 created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
907
907
908 user = relationship('User', lazy='joined')
908 user = relationship('User', lazy='joined')
909
909
910 @classmethod
910 @classmethod
911 def _get_role_name(cls, role):
911 def _get_role_name(cls, role):
912 return {
912 return {
913 cls.ROLE_ALL: _('all'),
913 cls.ROLE_ALL: _('all'),
914 cls.ROLE_HTTP: _('http/web interface'),
914 cls.ROLE_HTTP: _('http/web interface'),
915 cls.ROLE_VCS: _('vcs (git/hg/svn protocol)'),
915 cls.ROLE_VCS: _('vcs (git/hg/svn protocol)'),
916 cls.ROLE_API: _('api calls'),
916 cls.ROLE_API: _('api calls'),
917 cls.ROLE_FEED: _('feed access'),
917 cls.ROLE_FEED: _('feed access'),
918 }.get(role, role)
918 }.get(role, role)
919
919
920 @property
920 @property
921 def expired(self):
921 def expired(self):
922 if self.expires == -1:
922 if self.expires == -1:
923 return False
923 return False
924 return time.time() > self.expires
924 return time.time() > self.expires
925
925
926 @property
926 @property
927 def role_humanized(self):
927 def role_humanized(self):
928 return self._get_role_name(self.role)
928 return self._get_role_name(self.role)
929
929
930
930
931 class UserEmailMap(Base, BaseModel):
931 class UserEmailMap(Base, BaseModel):
932 __tablename__ = 'user_email_map'
932 __tablename__ = 'user_email_map'
933 __table_args__ = (
933 __table_args__ = (
934 Index('uem_email_idx', 'email'),
934 Index('uem_email_idx', 'email'),
935 UniqueConstraint('email'),
935 UniqueConstraint('email'),
936 {'extend_existing': True, 'mysql_engine': 'InnoDB',
936 {'extend_existing': True, 'mysql_engine': 'InnoDB',
937 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
937 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
938 )
938 )
939 __mapper_args__ = {}
939 __mapper_args__ = {}
940
940
941 email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
941 email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
942 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
942 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
943 _email = Column("email", String(255), nullable=True, unique=False, default=None)
943 _email = Column("email", String(255), nullable=True, unique=False, default=None)
944 user = relationship('User', lazy='joined')
944 user = relationship('User', lazy='joined')
945
945
946 @validates('_email')
946 @validates('_email')
947 def validate_email(self, key, email):
947 def validate_email(self, key, email):
948 # check if this email is not main one
948 # check if this email is not main one
949 main_email = Session().query(User).filter(User.email == email).scalar()
949 main_email = Session().query(User).filter(User.email == email).scalar()
950 if main_email is not None:
950 if main_email is not None:
951 raise AttributeError('email %s is present is user table' % email)
951 raise AttributeError('email %s is present is user table' % email)
952 return email
952 return email
953
953
954 @hybrid_property
954 @hybrid_property
955 def email(self):
955 def email(self):
956 return self._email
956 return self._email
957
957
958 @email.setter
958 @email.setter
959 def email(self, val):
959 def email(self, val):
960 self._email = val.lower() if val else None
960 self._email = val.lower() if val else None
961
961
962
962
963 class UserIpMap(Base, BaseModel):
963 class UserIpMap(Base, BaseModel):
964 __tablename__ = 'user_ip_map'
964 __tablename__ = 'user_ip_map'
965 __table_args__ = (
965 __table_args__ = (
966 UniqueConstraint('user_id', 'ip_addr'),
966 UniqueConstraint('user_id', 'ip_addr'),
967 {'extend_existing': True, 'mysql_engine': 'InnoDB',
967 {'extend_existing': True, 'mysql_engine': 'InnoDB',
968 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
968 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
969 )
969 )
970 __mapper_args__ = {}
970 __mapper_args__ = {}
971
971
972 ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
972 ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
973 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
973 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
974 ip_addr = Column("ip_addr", String(255), nullable=True, unique=False, default=None)
974 ip_addr = Column("ip_addr", String(255), nullable=True, unique=False, default=None)
975 active = Column("active", Boolean(), nullable=True, unique=None, default=True)
975 active = Column("active", Boolean(), nullable=True, unique=None, default=True)
976 description = Column("description", String(10000), nullable=True, unique=None, default=None)
976 description = Column("description", String(10000), nullable=True, unique=None, default=None)
977 user = relationship('User', lazy='joined')
977 user = relationship('User', lazy='joined')
978
978
979 @classmethod
979 @classmethod
980 def _get_ip_range(cls, ip_addr):
980 def _get_ip_range(cls, ip_addr):
981 net = ipaddress.ip_network(ip_addr, strict=False)
981 net = ipaddress.ip_network(ip_addr, strict=False)
982 return [str(net.network_address), str(net.broadcast_address)]
982 return [str(net.network_address), str(net.broadcast_address)]
983
983
984 def __json__(self):
984 def __json__(self):
985 return {
985 return {
986 'ip_addr': self.ip_addr,
986 'ip_addr': self.ip_addr,
987 'ip_range': self._get_ip_range(self.ip_addr),
987 'ip_range': self._get_ip_range(self.ip_addr),
988 }
988 }
989
989
990 def __unicode__(self):
990 def __unicode__(self):
991 return u"<%s('user_id:%s=>%s')>" % (self.__class__.__name__,
991 return u"<%s('user_id:%s=>%s')>" % (self.__class__.__name__,
992 self.user_id, self.ip_addr)
992 self.user_id, self.ip_addr)
993
993
994 class UserLog(Base, BaseModel):
994 class UserLog(Base, BaseModel):
995 __tablename__ = 'user_logs'
995 __tablename__ = 'user_logs'
996 __table_args__ = (
996 __table_args__ = (
997 {'extend_existing': True, 'mysql_engine': 'InnoDB',
997 {'extend_existing': True, 'mysql_engine': 'InnoDB',
998 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
998 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
999 )
999 )
1000 user_log_id = Column("user_log_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
1000 user_log_id = Column("user_log_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
1001 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
1001 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
1002 username = Column("username", String(255), nullable=True, unique=None, default=None)
1002 username = Column("username", String(255), nullable=True, unique=None, default=None)
1003 repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True)
1003 repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True)
1004 repository_name = Column("repository_name", String(255), nullable=True, unique=None, default=None)
1004 repository_name = Column("repository_name", String(255), nullable=True, unique=None, default=None)
1005 user_ip = Column("user_ip", String(255), nullable=True, unique=None, default=None)
1005 user_ip = Column("user_ip", String(255), nullable=True, unique=None, default=None)
1006 action = Column("action", Text().with_variant(Text(1200000), 'mysql'), nullable=True, unique=None, default=None)
1006 action = Column("action", Text().with_variant(Text(1200000), 'mysql'), nullable=True, unique=None, default=None)
1007 action_date = Column("action_date", DateTime(timezone=False), nullable=True, unique=None, default=None)
1007 action_date = Column("action_date", DateTime(timezone=False), nullable=True, unique=None, default=None)
1008
1008
1009 def __unicode__(self):
1009 def __unicode__(self):
1010 return u"<%s('id:%s:%s')>" % (self.__class__.__name__,
1010 return u"<%s('id:%s:%s')>" % (self.__class__.__name__,
1011 self.repository_name,
1011 self.repository_name,
1012 self.action)
1012 self.action)
1013
1013
1014 @property
1014 @property
1015 def action_as_day(self):
1015 def action_as_day(self):
1016 return datetime.date(*self.action_date.timetuple()[:3])
1016 return datetime.date(*self.action_date.timetuple()[:3])
1017
1017
1018 user = relationship('User')
1018 user = relationship('User')
1019 repository = relationship('Repository', cascade='')
1019 repository = relationship('Repository', cascade='')
1020
1020
1021
1021
1022 class UserGroup(Base, BaseModel):
1022 class UserGroup(Base, BaseModel):
1023 __tablename__ = 'users_groups'
1023 __tablename__ = 'users_groups'
1024 __table_args__ = (
1024 __table_args__ = (
1025 {'extend_existing': True, 'mysql_engine': 'InnoDB',
1025 {'extend_existing': True, 'mysql_engine': 'InnoDB',
1026 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
1026 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
1027 )
1027 )
1028
1028
1029 users_group_id = Column("users_group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
1029 users_group_id = Column("users_group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
1030 users_group_name = Column("users_group_name", String(255), nullable=False, unique=True, default=None)
1030 users_group_name = Column("users_group_name", String(255), nullable=False, unique=True, default=None)
1031 user_group_description = Column("user_group_description", String(10000), nullable=True, unique=None, default=None)
1031 user_group_description = Column("user_group_description", String(10000), nullable=True, unique=None, default=None)
1032 users_group_active = Column("users_group_active", Boolean(), nullable=True, unique=None, default=None)
1032 users_group_active = Column("users_group_active", Boolean(), nullable=True, unique=None, default=None)
1033 inherit_default_permissions = Column("users_group_inherit_default_permissions", Boolean(), nullable=False, unique=None, default=True)
1033 inherit_default_permissions = Column("users_group_inherit_default_permissions", Boolean(), nullable=False, unique=None, default=True)
1034 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None)
1034 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None)
1035 created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
1035 created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
1036 _group_data = Column("group_data", LargeBinary(), nullable=True) # JSON data
1036 _group_data = Column("group_data", LargeBinary(), nullable=True) # JSON data
1037
1037
1038 members = relationship('UserGroupMember', cascade="all, delete, delete-orphan", lazy="joined")
1038 members = relationship('UserGroupMember', cascade="all, delete, delete-orphan", lazy="joined")
1039 users_group_to_perm = relationship('UserGroupToPerm', cascade='all')
1039 users_group_to_perm = relationship('UserGroupToPerm', cascade='all')
1040 users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
1040 users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
1041 users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
1041 users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
1042 user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
1042 user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
1043 user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
1043 user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
1044
1044
1045 user = relationship('User')
1045 user = relationship('User')
1046
1046
1047 @hybrid_property
1047 @hybrid_property
1048 def group_data(self):
1048 def group_data(self):
1049 if not self._group_data:
1049 if not self._group_data:
1050 return {}
1050 return {}
1051
1051
1052 try:
1052 try:
1053 return json.loads(self._group_data)
1053 return json.loads(self._group_data)
1054 except TypeError:
1054 except TypeError:
1055 return {}
1055 return {}
1056
1056
1057 @group_data.setter
1057 @group_data.setter
1058 def group_data(self, val):
1058 def group_data(self, val):
1059 try:
1059 try:
1060 self._group_data = json.dumps(val)
1060 self._group_data = json.dumps(val)
1061 except Exception:
1061 except Exception:
1062 log.error(traceback.format_exc())
1062 log.error(traceback.format_exc())
1063
1063
1064 def __unicode__(self):
1064 def __unicode__(self):
1065 return u"<%s('id:%s:%s')>" % (self.__class__.__name__,
1065 return u"<%s('id:%s:%s')>" % (self.__class__.__name__,
1066 self.users_group_id,
1066 self.users_group_id,
1067 self.users_group_name)
1067 self.users_group_name)
1068
1068
1069 @classmethod
1069 @classmethod
1070 def get_by_group_name(cls, group_name, cache=False,
1070 def get_by_group_name(cls, group_name, cache=False,
1071 case_insensitive=False):
1071 case_insensitive=False):
1072 if case_insensitive:
1072 if case_insensitive:
1073 q = cls.query().filter(func.lower(cls.users_group_name) ==
1073 q = cls.query().filter(func.lower(cls.users_group_name) ==
1074 func.lower(group_name))
1074 func.lower(group_name))
1075
1075
1076 else:
1076 else:
1077 q = cls.query().filter(cls.users_group_name == group_name)
1077 q = cls.query().filter(cls.users_group_name == group_name)
1078 if cache:
1078 if cache:
1079 q = q.options(FromCache(
1079 q = q.options(FromCache(
1080 "sql_cache_short",
1080 "sql_cache_short",
1081 "get_group_%s" % _hash_key(group_name)))
1081 "get_group_%s" % _hash_key(group_name)))
1082 return q.scalar()
1082 return q.scalar()
1083
1083
1084 @classmethod
1084 @classmethod
1085 def get(cls, user_group_id, cache=False):
1085 def get(cls, user_group_id, cache=False):
1086 user_group = cls.query()
1086 user_group = cls.query()
1087 if cache:
1087 if cache:
1088 user_group = user_group.options(FromCache("sql_cache_short",
1088 user_group = user_group.options(FromCache("sql_cache_short",
1089 "get_users_group_%s" % user_group_id))
1089 "get_users_group_%s" % user_group_id))
1090 return user_group.get(user_group_id)
1090 return user_group.get(user_group_id)
1091
1091
1092 def permissions(self, with_admins=True, with_owner=True):
1092 def permissions(self, with_admins=True, with_owner=True):
1093 q = UserUserGroupToPerm.query().filter(UserUserGroupToPerm.user_group == self)
1093 q = UserUserGroupToPerm.query().filter(UserUserGroupToPerm.user_group == self)
1094 q = q.options(joinedload(UserUserGroupToPerm.user_group),
1094 q = q.options(joinedload(UserUserGroupToPerm.user_group),
1095 joinedload(UserUserGroupToPerm.user),
1095 joinedload(UserUserGroupToPerm.user),
1096 joinedload(UserUserGroupToPerm.permission),)
1096 joinedload(UserUserGroupToPerm.permission),)
1097
1097
1098 # get owners and admins and permissions. We do a trick of re-writing
1098 # get owners and admins and permissions. We do a trick of re-writing
1099 # objects from sqlalchemy to named-tuples due to sqlalchemy session
1099 # objects from sqlalchemy to named-tuples due to sqlalchemy session
1100 # has a global reference and changing one object propagates to all
1100 # has a global reference and changing one object propagates to all
1101 # others. This means if admin is also an owner admin_row that change
1101 # others. This means if admin is also an owner admin_row that change
1102 # would propagate to both objects
1102 # would propagate to both objects
1103 perm_rows = []
1103 perm_rows = []
1104 for _usr in q.all():
1104 for _usr in q.all():
1105 usr = AttributeDict(_usr.user.get_dict())
1105 usr = AttributeDict(_usr.user.get_dict())
1106 usr.permission = _usr.permission.permission_name
1106 usr.permission = _usr.permission.permission_name
1107 perm_rows.append(usr)
1107 perm_rows.append(usr)
1108
1108
1109 # filter the perm rows by 'default' first and then sort them by
1109 # filter the perm rows by 'default' first and then sort them by
1110 # admin,write,read,none permissions sorted again alphabetically in
1110 # admin,write,read,none permissions sorted again alphabetically in
1111 # each group
1111 # each group
1112 perm_rows = sorted(perm_rows, key=display_sort)
1112 perm_rows = sorted(perm_rows, key=display_sort)
1113
1113
1114 _admin_perm = 'usergroup.admin'
1114 _admin_perm = 'usergroup.admin'
1115 owner_row = []
1115 owner_row = []
1116 if with_owner:
1116 if with_owner:
1117 usr = AttributeDict(self.user.get_dict())
1117 usr = AttributeDict(self.user.get_dict())
1118 usr.owner_row = True
1118 usr.owner_row = True
1119 usr.permission = _admin_perm
1119 usr.permission = _admin_perm
1120 owner_row.append(usr)
1120 owner_row.append(usr)
1121
1121
1122 super_admin_rows = []
1122 super_admin_rows = []
1123 if with_admins:
1123 if with_admins:
1124 for usr in User.get_all_super_admins():
1124 for usr in User.get_all_super_admins():
1125 # if this admin is also owner, don't double the record
1125 # if this admin is also owner, don't double the record
1126 if usr.user_id == owner_row[0].user_id:
1126 if usr.user_id == owner_row[0].user_id:
1127 owner_row[0].admin_row = True
1127 owner_row[0].admin_row = True
1128 else:
1128 else:
1129 usr = AttributeDict(usr.get_dict())
1129 usr = AttributeDict(usr.get_dict())
1130 usr.admin_row = True
1130 usr.admin_row = True
1131 usr.permission = _admin_perm
1131 usr.permission = _admin_perm
1132 super_admin_rows.append(usr)
1132 super_admin_rows.append(usr)
1133
1133
1134 return super_admin_rows + owner_row + perm_rows
1134 return super_admin_rows + owner_row + perm_rows
1135
1135
1136 def permission_user_groups(self):
1136 def permission_user_groups(self):
1137 q = UserGroupUserGroupToPerm.query().filter(UserGroupUserGroupToPerm.target_user_group == self)
1137 q = UserGroupUserGroupToPerm.query().filter(UserGroupUserGroupToPerm.target_user_group == self)
1138 q = q.options(joinedload(UserGroupUserGroupToPerm.user_group),
1138 q = q.options(joinedload(UserGroupUserGroupToPerm.user_group),
1139 joinedload(UserGroupUserGroupToPerm.target_user_group),
1139 joinedload(UserGroupUserGroupToPerm.target_user_group),
1140 joinedload(UserGroupUserGroupToPerm.permission),)
1140 joinedload(UserGroupUserGroupToPerm.permission),)
1141
1141
1142 perm_rows = []
1142 perm_rows = []
1143 for _user_group in q.all():
1143 for _user_group in q.all():
1144 usr = AttributeDict(_user_group.user_group.get_dict())
1144 usr = AttributeDict(_user_group.user_group.get_dict())
1145 usr.permission = _user_group.permission.permission_name
1145 usr.permission = _user_group.permission.permission_name
1146 perm_rows.append(usr)
1146 perm_rows.append(usr)
1147
1147
1148 return perm_rows
1148 return perm_rows
1149
1149
1150 def _get_default_perms(self, user_group, suffix=''):
1150 def _get_default_perms(self, user_group, suffix=''):
1151 from rhodecode.model.permission import PermissionModel
1151 from rhodecode.model.permission import PermissionModel
1152 return PermissionModel().get_default_perms(user_group.users_group_to_perm, suffix)
1152 return PermissionModel().get_default_perms(user_group.users_group_to_perm, suffix)
1153
1153
1154 def get_default_perms(self, suffix=''):
1154 def get_default_perms(self, suffix=''):
1155 return self._get_default_perms(self, suffix)
1155 return self._get_default_perms(self, suffix)
1156
1156
1157 def get_api_data(self, with_group_members=True, include_secrets=False):
1157 def get_api_data(self, with_group_members=True, include_secrets=False):
1158 """
1158 """
1159 :param include_secrets: See :meth:`User.get_api_data`, this parameter is
1159 :param include_secrets: See :meth:`User.get_api_data`, this parameter is
1160 basically forwarded.
1160 basically forwarded.
1161
1161
1162 """
1162 """
1163 user_group = self
1163 user_group = self
1164
1164
1165 data = {
1165 data = {
1166 'users_group_id': user_group.users_group_id,
1166 'users_group_id': user_group.users_group_id,
1167 'group_name': user_group.users_group_name,
1167 'group_name': user_group.users_group_name,
1168 'group_description': user_group.user_group_description,
1168 'group_description': user_group.user_group_description,
1169 'active': user_group.users_group_active,
1169 'active': user_group.users_group_active,
1170 'owner': user_group.user.username,
1170 'owner': user_group.user.username,
1171 }
1171 }
1172 if with_group_members:
1172 if with_group_members:
1173 users = []
1173 users = []
1174 for user in user_group.members:
1174 for user in user_group.members:
1175 user = user.user
1175 user = user.user
1176 users.append(user.get_api_data(include_secrets=include_secrets))
1176 users.append(user.get_api_data(include_secrets=include_secrets))
1177 data['users'] = users
1177 data['users'] = users
1178
1178
1179 return data
1179 return data
1180
1180
1181
1181
1182 class UserGroupMember(Base, BaseModel):
1182 class UserGroupMember(Base, BaseModel):
1183 __tablename__ = 'users_groups_members'
1183 __tablename__ = 'users_groups_members'
1184 __table_args__ = (
1184 __table_args__ = (
1185 {'extend_existing': True, 'mysql_engine': 'InnoDB',
1185 {'extend_existing': True, 'mysql_engine': 'InnoDB',
1186 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
1186 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
1187 )
1187 )
1188
1188
1189 users_group_member_id = Column("users_group_member_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
1189 users_group_member_id = Column("users_group_member_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
1190 users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
1190 users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
1191 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
1191 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
1192
1192
1193 user = relationship('User', lazy='joined')
1193 user = relationship('User', lazy='joined')
1194 users_group = relationship('UserGroup')
1194 users_group = relationship('UserGroup')
1195
1195
1196 def __init__(self, gr_id='', u_id=''):
1196 def __init__(self, gr_id='', u_id=''):
1197 self.users_group_id = gr_id
1197 self.users_group_id = gr_id
1198 self.user_id = u_id
1198 self.user_id = u_id
1199
1199
1200
1200
1201 class RepositoryField(Base, BaseModel):
1201 class RepositoryField(Base, BaseModel):
1202 __tablename__ = 'repositories_fields'
1202 __tablename__ = 'repositories_fields'
1203 __table_args__ = (
1203 __table_args__ = (
1204 UniqueConstraint('repository_id', 'field_key'), # no-multi field
1204 UniqueConstraint('repository_id', 'field_key'), # no-multi field
1205 {'extend_existing': True, 'mysql_engine': 'InnoDB',
1205 {'extend_existing': True, 'mysql_engine': 'InnoDB',
1206 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
1206 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
1207 )
1207 )
1208 PREFIX = 'ex_' # prefix used in form to not conflict with already existing fields
1208 PREFIX = 'ex_' # prefix used in form to not conflict with already existing fields
1209
1209
1210 repo_field_id = Column("repo_field_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
1210 repo_field_id = Column("repo_field_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
1211 repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
1211 repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
1212 field_key = Column("field_key", String(250))
1212 field_key = Column("field_key", String(250))
1213 field_label = Column("field_label", String(1024), nullable=False)
1213 field_label = Column("field_label", String(1024), nullable=False)
1214 field_value = Column("field_value", String(10000), nullable=False)
1214 field_value = Column("field_value", String(10000), nullable=False)
1215 field_desc = Column("field_desc", String(1024), nullable=False)
1215 field_desc = Column("field_desc", String(1024), nullable=False)
1216 field_type = Column("field_type", String(255), nullable=False, unique=None)
1216 field_type = Column("field_type", String(255), nullable=False, unique=None)
1217 created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
1217 created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
1218
1218
1219 repository = relationship('Repository')
1219 repository = relationship('Repository')
1220
1220
1221 @property
1221 @property
1222 def field_key_prefixed(self):
1222 def field_key_prefixed(self):
1223 return 'ex_%s' % self.field_key
1223 return 'ex_%s' % self.field_key
1224
1224
1225 @classmethod
1225 @classmethod
1226 def un_prefix_key(cls, key):
1226 def un_prefix_key(cls, key):
1227 if key.startswith(cls.PREFIX):
1227 if key.startswith(cls.PREFIX):
1228 return key[len(cls.PREFIX):]
1228 return key[len(cls.PREFIX):]
1229 return key
1229 return key
1230
1230
1231 @classmethod
1231 @classmethod
1232 def get_by_key_name(cls, key, repo):
1232 def get_by_key_name(cls, key, repo):
1233 row = cls.query()\
1233 row = cls.query()\
1234 .filter(cls.repository == repo)\
1234 .filter(cls.repository == repo)\
1235 .filter(cls.field_key == key).scalar()
1235 .filter(cls.field_key == key).scalar()
1236 return row
1236 return row
1237
1237
1238
1238
1239 class Repository(Base, BaseModel):
1239 class Repository(Base, BaseModel):
1240 __tablename__ = 'repositories'
1240 __tablename__ = 'repositories'
1241 __table_args__ = (
1241 __table_args__ = (
1242 Index('r_repo_name_idx', 'repo_name', mysql_length=255),
1242 Index('r_repo_name_idx', 'repo_name', mysql_length=255),
1243 {'extend_existing': True, 'mysql_engine': 'InnoDB',
1243 {'extend_existing': True, 'mysql_engine': 'InnoDB',
1244 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
1244 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
1245 )
1245 )
1246 DEFAULT_CLONE_URI = '{scheme}://{user}@{netloc}/{repo}'
1246 DEFAULT_CLONE_URI = '{scheme}://{user}@{netloc}/{repo}'
1247 DEFAULT_CLONE_URI_ID = '{scheme}://{user}@{netloc}/_{repoid}'
1247 DEFAULT_CLONE_URI_ID = '{scheme}://{user}@{netloc}/_{repoid}'
1248
1248
1249 STATE_CREATED = 'repo_state_created'
1249 STATE_CREATED = 'repo_state_created'
1250 STATE_PENDING = 'repo_state_pending'
1250 STATE_PENDING = 'repo_state_pending'
1251 STATE_ERROR = 'repo_state_error'
1251 STATE_ERROR = 'repo_state_error'
1252
1252
1253 LOCK_AUTOMATIC = 'lock_auto'
1253 LOCK_AUTOMATIC = 'lock_auto'
1254 LOCK_API = 'lock_api'
1254 LOCK_API = 'lock_api'
1255 LOCK_WEB = 'lock_web'
1255 LOCK_WEB = 'lock_web'
1256 LOCK_PULL = 'lock_pull'
1256 LOCK_PULL = 'lock_pull'
1257
1257
1258 NAME_SEP = URL_SEP
1258 NAME_SEP = URL_SEP
1259
1259
1260 repo_id = Column(
1260 repo_id = Column(
1261 "repo_id", Integer(), nullable=False, unique=True, default=None,
1261 "repo_id", Integer(), nullable=False, unique=True, default=None,
1262 primary_key=True)
1262 primary_key=True)
1263 _repo_name = Column(
1263 _repo_name = Column(
1264 "repo_name", Text(), nullable=False, default=None)
1264 "repo_name", Text(), nullable=False, default=None)
1265 _repo_name_hash = Column(
1265 _repo_name_hash = Column(
1266 "repo_name_hash", String(255), nullable=False, unique=True)
1266 "repo_name_hash", String(255), nullable=False, unique=True)
1267 repo_state = Column("repo_state", String(255), nullable=True)
1267 repo_state = Column("repo_state", String(255), nullable=True)
1268
1268
1269 clone_uri = Column(
1269 clone_uri = Column(
1270 "clone_uri", EncryptedTextValue(), nullable=True, unique=False,
1270 "clone_uri", EncryptedTextValue(), nullable=True, unique=False,
1271 default=None)
1271 default=None)
1272 repo_type = Column(
1272 repo_type = Column(
1273 "repo_type", String(255), nullable=False, unique=False, default=None)
1273 "repo_type", String(255), nullable=False, unique=False, default=None)
1274 user_id = Column(
1274 user_id = Column(
1275 "user_id", Integer(), ForeignKey('users.user_id'), nullable=False,
1275 "user_id", Integer(), ForeignKey('users.user_id'), nullable=False,
1276 unique=False, default=None)
1276 unique=False, default=None)
1277 private = Column(
1277 private = Column(
1278 "private", Boolean(), nullable=True, unique=None, default=None)
1278 "private", Boolean(), nullable=True, unique=None, default=None)
1279 enable_statistics = Column(
1279 enable_statistics = Column(
1280 "statistics", Boolean(), nullable=True, unique=None, default=True)
1280 "statistics", Boolean(), nullable=True, unique=None, default=True)
1281 enable_downloads = Column(
1281 enable_downloads = Column(
1282 "downloads", Boolean(), nullable=True, unique=None, default=True)
1282 "downloads", Boolean(), nullable=True, unique=None, default=True)
1283 description = Column(
1283 description = Column(
1284 "description", String(10000), nullable=True, unique=None, default=None)
1284 "description", String(10000), nullable=True, unique=None, default=None)
1285 created_on = Column(
1285 created_on = Column(
1286 'created_on', DateTime(timezone=False), nullable=True, unique=None,
1286 'created_on', DateTime(timezone=False), nullable=True, unique=None,
1287 default=datetime.datetime.now)
1287 default=datetime.datetime.now)
1288 updated_on = Column(
1288 updated_on = Column(
1289 'updated_on', DateTime(timezone=False), nullable=True, unique=None,
1289 'updated_on', DateTime(timezone=False), nullable=True, unique=None,
1290 default=datetime.datetime.now)
1290 default=datetime.datetime.now)
1291 _landing_revision = Column(
1291 _landing_revision = Column(
1292 "landing_revision", String(255), nullable=False, unique=False,
1292 "landing_revision", String(255), nullable=False, unique=False,
1293 default=None)
1293 default=None)
1294 enable_locking = Column(
1294 enable_locking = Column(
1295 "enable_locking", Boolean(), nullable=False, unique=None,
1295 "enable_locking", Boolean(), nullable=False, unique=None,
1296 default=False)
1296 default=False)
1297 _locked = Column(
1297 _locked = Column(
1298 "locked", String(255), nullable=True, unique=False, default=None)
1298 "locked", String(255), nullable=True, unique=False, default=None)
1299 _changeset_cache = Column(
1299 _changeset_cache = Column(
1300 "changeset_cache", LargeBinary(), nullable=True) # JSON data
1300 "changeset_cache", LargeBinary(), nullable=True) # JSON data
1301
1301
1302 fork_id = Column(
1302 fork_id = Column(
1303 "fork_id", Integer(), ForeignKey('repositories.repo_id'),
1303 "fork_id", Integer(), ForeignKey('repositories.repo_id'),
1304 nullable=True, unique=False, default=None)
1304 nullable=True, unique=False, default=None)
1305 group_id = Column(
1305 group_id = Column(
1306 "group_id", Integer(), ForeignKey('groups.group_id'), nullable=True,
1306 "group_id", Integer(), ForeignKey('groups.group_id'), nullable=True,
1307 unique=False, default=None)
1307 unique=False, default=None)
1308
1308
1309 user = relationship('User', lazy='joined')
1309 user = relationship('User', lazy='joined')
1310 fork = relationship('Repository', remote_side=repo_id, lazy='joined')
1310 fork = relationship('Repository', remote_side=repo_id, lazy='joined')
1311 group = relationship('RepoGroup', lazy='joined')
1311 group = relationship('RepoGroup', lazy='joined')
1312 repo_to_perm = relationship(
1312 repo_to_perm = relationship(
1313 'UserRepoToPerm', cascade='all',
1313 'UserRepoToPerm', cascade='all',
1314 order_by='UserRepoToPerm.repo_to_perm_id')
1314 order_by='UserRepoToPerm.repo_to_perm_id')
1315 users_group_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
1315 users_group_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
1316 stats = relationship('Statistics', cascade='all', uselist=False)
1316 stats = relationship('Statistics', cascade='all', uselist=False)
1317
1317
1318 followers = relationship(
1318 followers = relationship(
1319 'UserFollowing',
1319 'UserFollowing',
1320 primaryjoin='UserFollowing.follows_repo_id==Repository.repo_id',
1320 primaryjoin='UserFollowing.follows_repo_id==Repository.repo_id',
1321 cascade='all')
1321 cascade='all')
1322 extra_fields = relationship(
1322 extra_fields = relationship(
1323 'RepositoryField', cascade="all, delete, delete-orphan")
1323 'RepositoryField', cascade="all, delete, delete-orphan")
1324 logs = relationship('UserLog')
1324 logs = relationship('UserLog')
1325 comments = relationship(
1325 comments = relationship(
1326 'ChangesetComment', cascade="all, delete, delete-orphan")
1326 'ChangesetComment', cascade="all, delete, delete-orphan")
1327 pull_requests_source = relationship(
1327 pull_requests_source = relationship(
1328 'PullRequest',
1328 'PullRequest',
1329 primaryjoin='PullRequest.source_repo_id==Repository.repo_id',
1329 primaryjoin='PullRequest.source_repo_id==Repository.repo_id',
1330 cascade="all, delete, delete-orphan")
1330 cascade="all, delete, delete-orphan")
1331 pull_requests_target = relationship(
1331 pull_requests_target = relationship(
1332 'PullRequest',
1332 'PullRequest',
1333 primaryjoin='PullRequest.target_repo_id==Repository.repo_id',
1333 primaryjoin='PullRequest.target_repo_id==Repository.repo_id',
1334 cascade="all, delete, delete-orphan")
1334 cascade="all, delete, delete-orphan")
1335 ui = relationship('RepoRhodeCodeUi', cascade="all")
1335 ui = relationship('RepoRhodeCodeUi', cascade="all")
1336 settings = relationship('RepoRhodeCodeSetting', cascade="all")
1336 settings = relationship('RepoRhodeCodeSetting', cascade="all")
1337 integrations = relationship('Integration',
1337 integrations = relationship('Integration',
1338 cascade="all, delete, delete-orphan")
1338 cascade="all, delete, delete-orphan")
1339
1339
1340 def __unicode__(self):
1340 def __unicode__(self):
1341 return u"<%s('%s:%s')>" % (self.__class__.__name__, self.repo_id,
1341 return u"<%s('%s:%s')>" % (self.__class__.__name__, self.repo_id,
1342 safe_unicode(self.repo_name))
1342 safe_unicode(self.repo_name))
1343
1343
1344 @hybrid_property
1344 @hybrid_property
1345 def landing_rev(self):
1345 def landing_rev(self):
1346 # always should return [rev_type, rev]
1346 # always should return [rev_type, rev]
1347 if self._landing_revision:
1347 if self._landing_revision:
1348 _rev_info = self._landing_revision.split(':')
1348 _rev_info = self._landing_revision.split(':')
1349 if len(_rev_info) < 2:
1349 if len(_rev_info) < 2:
1350 _rev_info.insert(0, 'rev')
1350 _rev_info.insert(0, 'rev')
1351 return [_rev_info[0], _rev_info[1]]
1351 return [_rev_info[0], _rev_info[1]]
1352 return [None, None]
1352 return [None, None]
1353
1353
1354 @landing_rev.setter
1354 @landing_rev.setter
1355 def landing_rev(self, val):
1355 def landing_rev(self, val):
1356 if ':' not in val:
1356 if ':' not in val:
1357 raise ValueError('value must be delimited with `:` and consist '
1357 raise ValueError('value must be delimited with `:` and consist '
1358 'of <rev_type>:<rev>, got %s instead' % val)
1358 'of <rev_type>:<rev>, got %s instead' % val)
1359 self._landing_revision = val
1359 self._landing_revision = val
1360
1360
1361 @hybrid_property
1361 @hybrid_property
1362 def locked(self):
1362 def locked(self):
1363 if self._locked:
1363 if self._locked:
1364 user_id, timelocked, reason = self._locked.split(':')
1364 user_id, timelocked, reason = self._locked.split(':')
1365 lock_values = int(user_id), timelocked, reason
1365 lock_values = int(user_id), timelocked, reason
1366 else:
1366 else:
1367 lock_values = [None, None, None]
1367 lock_values = [None, None, None]
1368 return lock_values
1368 return lock_values
1369
1369
1370 @locked.setter
1370 @locked.setter
1371 def locked(self, val):
1371 def locked(self, val):
1372 if val and isinstance(val, (list, tuple)):
1372 if val and isinstance(val, (list, tuple)):
1373 self._locked = ':'.join(map(str, val))
1373 self._locked = ':'.join(map(str, val))
1374 else:
1374 else:
1375 self._locked = None
1375 self._locked = None
1376
1376
1377 @hybrid_property
1377 @hybrid_property
1378 def changeset_cache(self):
1378 def changeset_cache(self):
1379 from rhodecode.lib.vcs.backends.base import EmptyCommit
1379 from rhodecode.lib.vcs.backends.base import EmptyCommit
1380 dummy = EmptyCommit().__json__()
1380 dummy = EmptyCommit().__json__()
1381 if not self._changeset_cache:
1381 if not self._changeset_cache:
1382 return dummy
1382 return dummy
1383 try:
1383 try:
1384 return json.loads(self._changeset_cache)
1384 return json.loads(self._changeset_cache)
1385 except TypeError:
1385 except TypeError:
1386 return dummy
1386 return dummy
1387 except Exception:
1387 except Exception:
1388 log.error(traceback.format_exc())
1388 log.error(traceback.format_exc())
1389 return dummy
1389 return dummy
1390
1390
1391 @changeset_cache.setter
1391 @changeset_cache.setter
1392 def changeset_cache(self, val):
1392 def changeset_cache(self, val):
1393 try:
1393 try:
1394 self._changeset_cache = json.dumps(val)
1394 self._changeset_cache = json.dumps(val)
1395 except Exception:
1395 except Exception:
1396 log.error(traceback.format_exc())
1396 log.error(traceback.format_exc())
1397
1397
1398 @hybrid_property
1398 @hybrid_property
1399 def repo_name(self):
1399 def repo_name(self):
1400 return self._repo_name
1400 return self._repo_name
1401
1401
1402 @repo_name.setter
1402 @repo_name.setter
1403 def repo_name(self, value):
1403 def repo_name(self, value):
1404 self._repo_name = value
1404 self._repo_name = value
1405 self._repo_name_hash = hashlib.sha1(safe_str(value)).hexdigest()
1405 self._repo_name_hash = hashlib.sha1(safe_str(value)).hexdigest()
1406
1406
1407 @classmethod
1407 @classmethod
1408 def normalize_repo_name(cls, repo_name):
1408 def normalize_repo_name(cls, repo_name):
1409 """
1409 """
1410 Normalizes os specific repo_name to the format internally stored inside
1410 Normalizes os specific repo_name to the format internally stored inside
1411 database using URL_SEP
1411 database using URL_SEP
1412
1412
1413 :param cls:
1413 :param cls:
1414 :param repo_name:
1414 :param repo_name:
1415 """
1415 """
1416 return cls.NAME_SEP.join(repo_name.split(os.sep))
1416 return cls.NAME_SEP.join(repo_name.split(os.sep))
1417
1417
1418 @classmethod
1418 @classmethod
1419 def get_by_repo_name(cls, repo_name, cache=False, identity_cache=False):
1419 def get_by_repo_name(cls, repo_name, cache=False, identity_cache=False):
1420 session = Session()
1420 session = Session()
1421 q = session.query(cls).filter(cls.repo_name == repo_name)
1421 q = session.query(cls).filter(cls.repo_name == repo_name)
1422
1422
1423 if cache:
1423 if cache:
1424 if identity_cache:
1424 if identity_cache:
1425 val = cls.identity_cache(session, 'repo_name', repo_name)
1425 val = cls.identity_cache(session, 'repo_name', repo_name)
1426 if val:
1426 if val:
1427 return val
1427 return val
1428 else:
1428 else:
1429 q = q.options(
1429 q = q.options(
1430 FromCache("sql_cache_short",
1430 FromCache("sql_cache_short",
1431 "get_repo_by_name_%s" % _hash_key(repo_name)))
1431 "get_repo_by_name_%s" % _hash_key(repo_name)))
1432
1432
1433 return q.scalar()
1433 return q.scalar()
1434
1434
1435 @classmethod
1435 @classmethod
1436 def get_by_full_path(cls, repo_full_path):
1436 def get_by_full_path(cls, repo_full_path):
1437 repo_name = repo_full_path.split(cls.base_path(), 1)[-1]
1437 repo_name = repo_full_path.split(cls.base_path(), 1)[-1]
1438 repo_name = cls.normalize_repo_name(repo_name)
1438 repo_name = cls.normalize_repo_name(repo_name)
1439 return cls.get_by_repo_name(repo_name.strip(URL_SEP))
1439 return cls.get_by_repo_name(repo_name.strip(URL_SEP))
1440
1440
1441 @classmethod
1441 @classmethod
1442 def get_repo_forks(cls, repo_id):
1442 def get_repo_forks(cls, repo_id):
1443 return cls.query().filter(Repository.fork_id == repo_id)
1443 return cls.query().filter(Repository.fork_id == repo_id)
1444
1444
1445 @classmethod
1445 @classmethod
1446 def base_path(cls):
1446 def base_path(cls):
1447 """
1447 """
1448 Returns base path when all repos are stored
1448 Returns base path when all repos are stored
1449
1449
1450 :param cls:
1450 :param cls:
1451 """
1451 """
1452 q = Session().query(RhodeCodeUi)\
1452 q = Session().query(RhodeCodeUi)\
1453 .filter(RhodeCodeUi.ui_key == cls.NAME_SEP)
1453 .filter(RhodeCodeUi.ui_key == cls.NAME_SEP)
1454 q = q.options(FromCache("sql_cache_short", "repository_repo_path"))
1454 q = q.options(FromCache("sql_cache_short", "repository_repo_path"))
1455 return q.one().ui_value
1455 return q.one().ui_value
1456
1456
1457 @classmethod
1457 @classmethod
1458 def is_valid(cls, repo_name):
1458 def is_valid(cls, repo_name):
1459 """
1459 """
1460 returns True if given repo name is a valid filesystem repository
1460 returns True if given repo name is a valid filesystem repository
1461
1461
1462 :param cls:
1462 :param cls:
1463 :param repo_name:
1463 :param repo_name:
1464 """
1464 """
1465 from rhodecode.lib.utils import is_valid_repo
1465 from rhodecode.lib.utils import is_valid_repo
1466
1466
1467 return is_valid_repo(repo_name, cls.base_path())
1467 return is_valid_repo(repo_name, cls.base_path())
1468
1468
1469 @classmethod
1469 @classmethod
1470 def get_all_repos(cls, user_id=Optional(None), group_id=Optional(None),
1470 def get_all_repos(cls, user_id=Optional(None), group_id=Optional(None),
1471 case_insensitive=True):
1471 case_insensitive=True):
1472 q = Repository.query()
1472 q = Repository.query()
1473
1473
1474 if not isinstance(user_id, Optional):
1474 if not isinstance(user_id, Optional):
1475 q = q.filter(Repository.user_id == user_id)
1475 q = q.filter(Repository.user_id == user_id)
1476
1476
1477 if not isinstance(group_id, Optional):
1477 if not isinstance(group_id, Optional):
1478 q = q.filter(Repository.group_id == group_id)
1478 q = q.filter(Repository.group_id == group_id)
1479
1479
1480 if case_insensitive:
1480 if case_insensitive:
1481 q = q.order_by(func.lower(Repository.repo_name))
1481 q = q.order_by(func.lower(Repository.repo_name))
1482 else:
1482 else:
1483 q = q.order_by(Repository.repo_name)
1483 q = q.order_by(Repository.repo_name)
1484 return q.all()
1484 return q.all()
1485
1485
1486 @property
1486 @property
1487 def forks(self):
1487 def forks(self):
1488 """
1488 """
1489 Return forks of this repo
1489 Return forks of this repo
1490 """
1490 """
1491 return Repository.get_repo_forks(self.repo_id)
1491 return Repository.get_repo_forks(self.repo_id)
1492
1492
1493 @property
1493 @property
1494 def parent(self):
1494 def parent(self):
1495 """
1495 """
1496 Returns fork parent
1496 Returns fork parent
1497 """
1497 """
1498 return self.fork
1498 return self.fork
1499
1499
1500 @property
1500 @property
1501 def just_name(self):
1501 def just_name(self):
1502 return self.repo_name.split(self.NAME_SEP)[-1]
1502 return self.repo_name.split(self.NAME_SEP)[-1]
1503
1503
1504 @property
1504 @property
1505 def groups_with_parents(self):
1505 def groups_with_parents(self):
1506 groups = []
1506 groups = []
1507 if self.group is None:
1507 if self.group is None:
1508 return groups
1508 return groups
1509
1509
1510 cur_gr = self.group
1510 cur_gr = self.group
1511 groups.insert(0, cur_gr)
1511 groups.insert(0, cur_gr)
1512 while 1:
1512 while 1:
1513 gr = getattr(cur_gr, 'parent_group', None)
1513 gr = getattr(cur_gr, 'parent_group', None)
1514 cur_gr = cur_gr.parent_group
1514 cur_gr = cur_gr.parent_group
1515 if gr is None:
1515 if gr is None:
1516 break
1516 break
1517 groups.insert(0, gr)
1517 groups.insert(0, gr)
1518
1518
1519 return groups
1519 return groups
1520
1520
1521 @property
1521 @property
1522 def groups_and_repo(self):
1522 def groups_and_repo(self):
1523 return self.groups_with_parents, self
1523 return self.groups_with_parents, self
1524
1524
1525 @LazyProperty
1525 @LazyProperty
1526 def repo_path(self):
1526 def repo_path(self):
1527 """
1527 """
1528 Returns base full path for that repository means where it actually
1528 Returns base full path for that repository means where it actually
1529 exists on a filesystem
1529 exists on a filesystem
1530 """
1530 """
1531 q = Session().query(RhodeCodeUi).filter(
1531 q = Session().query(RhodeCodeUi).filter(
1532 RhodeCodeUi.ui_key == self.NAME_SEP)
1532 RhodeCodeUi.ui_key == self.NAME_SEP)
1533 q = q.options(FromCache("sql_cache_short", "repository_repo_path"))
1533 q = q.options(FromCache("sql_cache_short", "repository_repo_path"))
1534 return q.one().ui_value
1534 return q.one().ui_value
1535
1535
1536 @property
1536 @property
1537 def repo_full_path(self):
1537 def repo_full_path(self):
1538 p = [self.repo_path]
1538 p = [self.repo_path]
1539 # we need to split the name by / since this is how we store the
1539 # we need to split the name by / since this is how we store the
1540 # names in the database, but that eventually needs to be converted
1540 # names in the database, but that eventually needs to be converted
1541 # into a valid system path
1541 # into a valid system path
1542 p += self.repo_name.split(self.NAME_SEP)
1542 p += self.repo_name.split(self.NAME_SEP)
1543 return os.path.join(*map(safe_unicode, p))
1543 return os.path.join(*map(safe_unicode, p))
1544
1544
1545 @property
1545 @property
1546 def cache_keys(self):
1546 def cache_keys(self):
1547 """
1547 """
1548 Returns associated cache keys for that repo
1548 Returns associated cache keys for that repo
1549 """
1549 """
1550 return CacheKey.query()\
1550 return CacheKey.query()\
1551 .filter(CacheKey.cache_args == self.repo_name)\
1551 .filter(CacheKey.cache_args == self.repo_name)\
1552 .order_by(CacheKey.cache_key)\
1552 .order_by(CacheKey.cache_key)\
1553 .all()
1553 .all()
1554
1554
1555 def get_new_name(self, repo_name):
1555 def get_new_name(self, repo_name):
1556 """
1556 """
1557 returns new full repository name based on assigned group and new new
1557 returns new full repository name based on assigned group and new new
1558
1558
1559 :param group_name:
1559 :param group_name:
1560 """
1560 """
1561 path_prefix = self.group.full_path_splitted if self.group else []
1561 path_prefix = self.group.full_path_splitted if self.group else []
1562 return self.NAME_SEP.join(path_prefix + [repo_name])
1562 return self.NAME_SEP.join(path_prefix + [repo_name])
1563
1563
1564 @property
1564 @property
1565 def _config(self):
1565 def _config(self):
1566 """
1566 """
1567 Returns db based config object.
1567 Returns db based config object.
1568 """
1568 """
1569 from rhodecode.lib.utils import make_db_config
1569 from rhodecode.lib.utils import make_db_config
1570 return make_db_config(clear_session=False, repo=self)
1570 return make_db_config(clear_session=False, repo=self)
1571
1571
1572 def permissions(self, with_admins=True, with_owner=True):
1572 def permissions(self, with_admins=True, with_owner=True):
1573 q = UserRepoToPerm.query().filter(UserRepoToPerm.repository == self)
1573 q = UserRepoToPerm.query().filter(UserRepoToPerm.repository == self)
1574 q = q.options(joinedload(UserRepoToPerm.repository),
1574 q = q.options(joinedload(UserRepoToPerm.repository),
1575 joinedload(UserRepoToPerm.user),
1575 joinedload(UserRepoToPerm.user),
1576 joinedload(UserRepoToPerm.permission),)
1576 joinedload(UserRepoToPerm.permission),)
1577
1577
1578 # get owners and admins and permissions. We do a trick of re-writing
1578 # get owners and admins and permissions. We do a trick of re-writing
1579 # objects from sqlalchemy to named-tuples due to sqlalchemy session
1579 # objects from sqlalchemy to named-tuples due to sqlalchemy session
1580 # has a global reference and changing one object propagates to all
1580 # has a global reference and changing one object propagates to all
1581 # others. This means if admin is also an owner admin_row that change
1581 # others. This means if admin is also an owner admin_row that change
1582 # would propagate to both objects
1582 # would propagate to both objects
1583 perm_rows = []
1583 perm_rows = []
1584 for _usr in q.all():
1584 for _usr in q.all():
1585 usr = AttributeDict(_usr.user.get_dict())
1585 usr = AttributeDict(_usr.user.get_dict())
1586 usr.permission = _usr.permission.permission_name
1586 usr.permission = _usr.permission.permission_name
1587 perm_rows.append(usr)
1587 perm_rows.append(usr)
1588
1588
1589 # filter the perm rows by 'default' first and then sort them by
1589 # filter the perm rows by 'default' first and then sort them by
1590 # admin,write,read,none permissions sorted again alphabetically in
1590 # admin,write,read,none permissions sorted again alphabetically in
1591 # each group
1591 # each group
1592 perm_rows = sorted(perm_rows, key=display_sort)
1592 perm_rows = sorted(perm_rows, key=display_sort)
1593
1593
1594 _admin_perm = 'repository.admin'
1594 _admin_perm = 'repository.admin'
1595 owner_row = []
1595 owner_row = []
1596 if with_owner:
1596 if with_owner:
1597 usr = AttributeDict(self.user.get_dict())
1597 usr = AttributeDict(self.user.get_dict())
1598 usr.owner_row = True
1598 usr.owner_row = True
1599 usr.permission = _admin_perm
1599 usr.permission = _admin_perm
1600 owner_row.append(usr)
1600 owner_row.append(usr)
1601
1601
1602 super_admin_rows = []
1602 super_admin_rows = []
1603 if with_admins:
1603 if with_admins:
1604 for usr in User.get_all_super_admins():
1604 for usr in User.get_all_super_admins():
1605 # if this admin is also owner, don't double the record
1605 # if this admin is also owner, don't double the record
1606 if usr.user_id == owner_row[0].user_id:
1606 if usr.user_id == owner_row[0].user_id:
1607 owner_row[0].admin_row = True
1607 owner_row[0].admin_row = True
1608 else:
1608 else:
1609 usr = AttributeDict(usr.get_dict())
1609 usr = AttributeDict(usr.get_dict())
1610 usr.admin_row = True
1610 usr.admin_row = True
1611 usr.permission = _admin_perm
1611 usr.permission = _admin_perm
1612 super_admin_rows.append(usr)
1612 super_admin_rows.append(usr)
1613
1613
1614 return super_admin_rows + owner_row + perm_rows
1614 return super_admin_rows + owner_row + perm_rows
1615
1615
1616 def permission_user_groups(self):
1616 def permission_user_groups(self):
1617 q = UserGroupRepoToPerm.query().filter(
1617 q = UserGroupRepoToPerm.query().filter(
1618 UserGroupRepoToPerm.repository == self)
1618 UserGroupRepoToPerm.repository == self)
1619 q = q.options(joinedload(UserGroupRepoToPerm.repository),
1619 q = q.options(joinedload(UserGroupRepoToPerm.repository),
1620 joinedload(UserGroupRepoToPerm.users_group),
1620 joinedload(UserGroupRepoToPerm.users_group),
1621 joinedload(UserGroupRepoToPerm.permission),)
1621 joinedload(UserGroupRepoToPerm.permission),)
1622
1622
1623 perm_rows = []
1623 perm_rows = []
1624 for _user_group in q.all():
1624 for _user_group in q.all():
1625 usr = AttributeDict(_user_group.users_group.get_dict())
1625 usr = AttributeDict(_user_group.users_group.get_dict())
1626 usr.permission = _user_group.permission.permission_name
1626 usr.permission = _user_group.permission.permission_name
1627 perm_rows.append(usr)
1627 perm_rows.append(usr)
1628
1628
1629 return perm_rows
1629 return perm_rows
1630
1630
1631 def get_api_data(self, include_secrets=False):
1631 def get_api_data(self, include_secrets=False):
1632 """
1632 """
1633 Common function for generating repo api data
1633 Common function for generating repo api data
1634
1634
1635 :param include_secrets: See :meth:`User.get_api_data`.
1635 :param include_secrets: See :meth:`User.get_api_data`.
1636
1636
1637 """
1637 """
1638 # TODO: mikhail: Here there is an anti-pattern, we probably need to
1638 # TODO: mikhail: Here there is an anti-pattern, we probably need to
1639 # move this methods on models level.
1639 # move this methods on models level.
1640 from rhodecode.model.settings import SettingsModel
1640 from rhodecode.model.settings import SettingsModel
1641
1641
1642 repo = self
1642 repo = self
1643 _user_id, _time, _reason = self.locked
1643 _user_id, _time, _reason = self.locked
1644
1644
1645 data = {
1645 data = {
1646 'repo_id': repo.repo_id,
1646 'repo_id': repo.repo_id,
1647 'repo_name': repo.repo_name,
1647 'repo_name': repo.repo_name,
1648 'repo_type': repo.repo_type,
1648 'repo_type': repo.repo_type,
1649 'clone_uri': repo.clone_uri or '',
1649 'clone_uri': repo.clone_uri or '',
1650 'url': url('summary_home', repo_name=self.repo_name, qualified=True),
1650 'url': url('summary_home', repo_name=self.repo_name, qualified=True),
1651 'private': repo.private,
1651 'private': repo.private,
1652 'created_on': repo.created_on,
1652 'created_on': repo.created_on,
1653 'description': repo.description,
1653 'description': repo.description,
1654 'landing_rev': repo.landing_rev,
1654 'landing_rev': repo.landing_rev,
1655 'owner': repo.user.username,
1655 'owner': repo.user.username,
1656 'fork_of': repo.fork.repo_name if repo.fork else None,
1656 'fork_of': repo.fork.repo_name if repo.fork else None,
1657 'enable_statistics': repo.enable_statistics,
1657 'enable_statistics': repo.enable_statistics,
1658 'enable_locking': repo.enable_locking,
1658 'enable_locking': repo.enable_locking,
1659 'enable_downloads': repo.enable_downloads,
1659 'enable_downloads': repo.enable_downloads,
1660 'last_changeset': repo.changeset_cache,
1660 'last_changeset': repo.changeset_cache,
1661 'locked_by': User.get(_user_id).get_api_data(
1661 'locked_by': User.get(_user_id).get_api_data(
1662 include_secrets=include_secrets) if _user_id else None,
1662 include_secrets=include_secrets) if _user_id else None,
1663 'locked_date': time_to_datetime(_time) if _time else None,
1663 'locked_date': time_to_datetime(_time) if _time else None,
1664 'lock_reason': _reason if _reason else None,
1664 'lock_reason': _reason if _reason else None,
1665 }
1665 }
1666
1666
1667 # TODO: mikhail: should be per-repo settings here
1667 # TODO: mikhail: should be per-repo settings here
1668 rc_config = SettingsModel().get_all_settings()
1668 rc_config = SettingsModel().get_all_settings()
1669 repository_fields = str2bool(
1669 repository_fields = str2bool(
1670 rc_config.get('rhodecode_repository_fields'))
1670 rc_config.get('rhodecode_repository_fields'))
1671 if repository_fields:
1671 if repository_fields:
1672 for f in self.extra_fields:
1672 for f in self.extra_fields:
1673 data[f.field_key_prefixed] = f.field_value
1673 data[f.field_key_prefixed] = f.field_value
1674
1674
1675 return data
1675 return data
1676
1676
1677 @classmethod
1677 @classmethod
1678 def lock(cls, repo, user_id, lock_time=None, lock_reason=None):
1678 def lock(cls, repo, user_id, lock_time=None, lock_reason=None):
1679 if not lock_time:
1679 if not lock_time:
1680 lock_time = time.time()
1680 lock_time = time.time()
1681 if not lock_reason:
1681 if not lock_reason:
1682 lock_reason = cls.LOCK_AUTOMATIC
1682 lock_reason = cls.LOCK_AUTOMATIC
1683 repo.locked = [user_id, lock_time, lock_reason]
1683 repo.locked = [user_id, lock_time, lock_reason]
1684 Session().add(repo)
1684 Session().add(repo)
1685 Session().commit()
1685 Session().commit()
1686
1686
1687 @classmethod
1687 @classmethod
1688 def unlock(cls, repo):
1688 def unlock(cls, repo):
1689 repo.locked = None
1689 repo.locked = None
1690 Session().add(repo)
1690 Session().add(repo)
1691 Session().commit()
1691 Session().commit()
1692
1692
1693 @classmethod
1693 @classmethod
1694 def getlock(cls, repo):
1694 def getlock(cls, repo):
1695 return repo.locked
1695 return repo.locked
1696
1696
1697 def is_user_lock(self, user_id):
1697 def is_user_lock(self, user_id):
1698 if self.lock[0]:
1698 if self.lock[0]:
1699 lock_user_id = safe_int(self.lock[0])
1699 lock_user_id = safe_int(self.lock[0])
1700 user_id = safe_int(user_id)
1700 user_id = safe_int(user_id)
1701 # both are ints, and they are equal
1701 # both are ints, and they are equal
1702 return all([lock_user_id, user_id]) and lock_user_id == user_id
1702 return all([lock_user_id, user_id]) and lock_user_id == user_id
1703
1703
1704 return False
1704 return False
1705
1705
1706 def get_locking_state(self, action, user_id, only_when_enabled=True):
1706 def get_locking_state(self, action, user_id, only_when_enabled=True):
1707 """
1707 """
1708 Checks locking on this repository, if locking is enabled and lock is
1708 Checks locking on this repository, if locking is enabled and lock is
1709 present returns a tuple of make_lock, locked, locked_by.
1709 present returns a tuple of make_lock, locked, locked_by.
1710 make_lock can have 3 states None (do nothing) True, make lock
1710 make_lock can have 3 states None (do nothing) True, make lock
1711 False release lock, This value is later propagated to hooks, which
1711 False release lock, This value is later propagated to hooks, which
1712 do the locking. Think about this as signals passed to hooks what to do.
1712 do the locking. Think about this as signals passed to hooks what to do.
1713
1713
1714 """
1714 """
1715 # TODO: johbo: This is part of the business logic and should be moved
1715 # TODO: johbo: This is part of the business logic and should be moved
1716 # into the RepositoryModel.
1716 # into the RepositoryModel.
1717
1717
1718 if action not in ('push', 'pull'):
1718 if action not in ('push', 'pull'):
1719 raise ValueError("Invalid action value: %s" % repr(action))
1719 raise ValueError("Invalid action value: %s" % repr(action))
1720
1720
1721 # defines if locked error should be thrown to user
1721 # defines if locked error should be thrown to user
1722 currently_locked = False
1722 currently_locked = False
1723 # defines if new lock should be made, tri-state
1723 # defines if new lock should be made, tri-state
1724 make_lock = None
1724 make_lock = None
1725 repo = self
1725 repo = self
1726 user = User.get(user_id)
1726 user = User.get(user_id)
1727
1727
1728 lock_info = repo.locked
1728 lock_info = repo.locked
1729
1729
1730 if repo and (repo.enable_locking or not only_when_enabled):
1730 if repo and (repo.enable_locking or not only_when_enabled):
1731 if action == 'push':
1731 if action == 'push':
1732 # check if it's already locked !, if it is compare users
1732 # check if it's already locked !, if it is compare users
1733 locked_by_user_id = lock_info[0]
1733 locked_by_user_id = lock_info[0]
1734 if user.user_id == locked_by_user_id:
1734 if user.user_id == locked_by_user_id:
1735 log.debug(
1735 log.debug(
1736 'Got `push` action from user %s, now unlocking', user)
1736 'Got `push` action from user %s, now unlocking', user)
1737 # unlock if we have push from user who locked
1737 # unlock if we have push from user who locked
1738 make_lock = False
1738 make_lock = False
1739 else:
1739 else:
1740 # we're not the same user who locked, ban with
1740 # we're not the same user who locked, ban with
1741 # code defined in settings (default is 423 HTTP Locked) !
1741 # code defined in settings (default is 423 HTTP Locked) !
1742 log.debug('Repo %s is currently locked by %s', repo, user)
1742 log.debug('Repo %s is currently locked by %s', repo, user)
1743 currently_locked = True
1743 currently_locked = True
1744 elif action == 'pull':
1744 elif action == 'pull':
1745 # [0] user [1] date
1745 # [0] user [1] date
1746 if lock_info[0] and lock_info[1]:
1746 if lock_info[0] and lock_info[1]:
1747 log.debug('Repo %s is currently locked by %s', repo, user)
1747 log.debug('Repo %s is currently locked by %s', repo, user)
1748 currently_locked = True
1748 currently_locked = True
1749 else:
1749 else:
1750 log.debug('Setting lock on repo %s by %s', repo, user)
1750 log.debug('Setting lock on repo %s by %s', repo, user)
1751 make_lock = True
1751 make_lock = True
1752
1752
1753 else:
1753 else:
1754 log.debug('Repository %s do not have locking enabled', repo)
1754 log.debug('Repository %s do not have locking enabled', repo)
1755
1755
1756 log.debug('FINAL locking values make_lock:%s,locked:%s,locked_by:%s',
1756 log.debug('FINAL locking values make_lock:%s,locked:%s,locked_by:%s',
1757 make_lock, currently_locked, lock_info)
1757 make_lock, currently_locked, lock_info)
1758
1758
1759 from rhodecode.lib.auth import HasRepoPermissionAny
1759 from rhodecode.lib.auth import HasRepoPermissionAny
1760 perm_check = HasRepoPermissionAny('repository.write', 'repository.admin')
1760 perm_check = HasRepoPermissionAny('repository.write', 'repository.admin')
1761 if make_lock and not perm_check(repo_name=repo.repo_name, user=user):
1761 if make_lock and not perm_check(repo_name=repo.repo_name, user=user):
1762 # if we don't have at least write permission we cannot make a lock
1762 # if we don't have at least write permission we cannot make a lock
1763 log.debug('lock state reset back to FALSE due to lack '
1763 log.debug('lock state reset back to FALSE due to lack '
1764 'of at least read permission')
1764 'of at least read permission')
1765 make_lock = False
1765 make_lock = False
1766
1766
1767 return make_lock, currently_locked, lock_info
1767 return make_lock, currently_locked, lock_info
1768
1768
1769 @property
1769 @property
1770 def last_db_change(self):
1770 def last_db_change(self):
1771 return self.updated_on
1771 return self.updated_on
1772
1772
1773 @property
1773 @property
1774 def clone_uri_hidden(self):
1774 def clone_uri_hidden(self):
1775 clone_uri = self.clone_uri
1775 clone_uri = self.clone_uri
1776 if clone_uri:
1776 if clone_uri:
1777 import urlobject
1777 import urlobject
1778 url_obj = urlobject.URLObject(clone_uri)
1778 url_obj = urlobject.URLObject(clone_uri)
1779 if url_obj.password:
1779 if url_obj.password:
1780 clone_uri = url_obj.with_password('*****')
1780 clone_uri = url_obj.with_password('*****')
1781 return clone_uri
1781 return clone_uri
1782
1782
1783 def clone_url(self, **override):
1783 def clone_url(self, **override):
1784 qualified_home_url = url('home', qualified=True)
1784 qualified_home_url = url('home', qualified=True)
1785
1785
1786 uri_tmpl = None
1786 uri_tmpl = None
1787 if 'with_id' in override:
1787 if 'with_id' in override:
1788 uri_tmpl = self.DEFAULT_CLONE_URI_ID
1788 uri_tmpl = self.DEFAULT_CLONE_URI_ID
1789 del override['with_id']
1789 del override['with_id']
1790
1790
1791 if 'uri_tmpl' in override:
1791 if 'uri_tmpl' in override:
1792 uri_tmpl = override['uri_tmpl']
1792 uri_tmpl = override['uri_tmpl']
1793 del override['uri_tmpl']
1793 del override['uri_tmpl']
1794
1794
1795 # we didn't override our tmpl from **overrides
1795 # we didn't override our tmpl from **overrides
1796 if not uri_tmpl:
1796 if not uri_tmpl:
1797 uri_tmpl = self.DEFAULT_CLONE_URI
1797 uri_tmpl = self.DEFAULT_CLONE_URI
1798 try:
1798 try:
1799 from pylons import tmpl_context as c
1799 from pylons import tmpl_context as c
1800 uri_tmpl = c.clone_uri_tmpl
1800 uri_tmpl = c.clone_uri_tmpl
1801 except Exception:
1801 except Exception:
1802 # in any case if we call this outside of request context,
1802 # in any case if we call this outside of request context,
1803 # ie, not having tmpl_context set up
1803 # ie, not having tmpl_context set up
1804 pass
1804 pass
1805
1805
1806 return get_clone_url(uri_tmpl=uri_tmpl,
1806 return get_clone_url(uri_tmpl=uri_tmpl,
1807 qualifed_home_url=qualified_home_url,
1807 qualifed_home_url=qualified_home_url,
1808 repo_name=self.repo_name,
1808 repo_name=self.repo_name,
1809 repo_id=self.repo_id, **override)
1809 repo_id=self.repo_id, **override)
1810
1810
1811 def set_state(self, state):
1811 def set_state(self, state):
1812 self.repo_state = state
1812 self.repo_state = state
1813 Session().add(self)
1813 Session().add(self)
1814 #==========================================================================
1814 #==========================================================================
1815 # SCM PROPERTIES
1815 # SCM PROPERTIES
1816 #==========================================================================
1816 #==========================================================================
1817
1817
1818 def get_commit(self, commit_id=None, commit_idx=None, pre_load=None):
1818 def get_commit(self, commit_id=None, commit_idx=None, pre_load=None):
1819 return get_commit_safe(
1819 return get_commit_safe(
1820 self.scm_instance(), commit_id, commit_idx, pre_load=pre_load)
1820 self.scm_instance(), commit_id, commit_idx, pre_load=pre_load)
1821
1821
1822 def get_changeset(self, rev=None, pre_load=None):
1822 def get_changeset(self, rev=None, pre_load=None):
1823 warnings.warn("Use get_commit", DeprecationWarning)
1823 warnings.warn("Use get_commit", DeprecationWarning)
1824 commit_id = None
1824 commit_id = None
1825 commit_idx = None
1825 commit_idx = None
1826 if isinstance(rev, basestring):
1826 if isinstance(rev, basestring):
1827 commit_id = rev
1827 commit_id = rev
1828 else:
1828 else:
1829 commit_idx = rev
1829 commit_idx = rev
1830 return self.get_commit(commit_id=commit_id, commit_idx=commit_idx,
1830 return self.get_commit(commit_id=commit_id, commit_idx=commit_idx,
1831 pre_load=pre_load)
1831 pre_load=pre_load)
1832
1832
1833 def get_landing_commit(self):
1833 def get_landing_commit(self):
1834 """
1834 """
1835 Returns landing commit, or if that doesn't exist returns the tip
1835 Returns landing commit, or if that doesn't exist returns the tip
1836 """
1836 """
1837 _rev_type, _rev = self.landing_rev
1837 _rev_type, _rev = self.landing_rev
1838 commit = self.get_commit(_rev)
1838 commit = self.get_commit(_rev)
1839 if isinstance(commit, EmptyCommit):
1839 if isinstance(commit, EmptyCommit):
1840 return self.get_commit()
1840 return self.get_commit()
1841 return commit
1841 return commit
1842
1842
1843 def update_commit_cache(self, cs_cache=None, config=None):
1843 def update_commit_cache(self, cs_cache=None, config=None):
1844 """
1844 """
1845 Update cache of last changeset for repository, keys should be::
1845 Update cache of last changeset for repository, keys should be::
1846
1846
1847 short_id
1847 short_id
1848 raw_id
1848 raw_id
1849 revision
1849 revision
1850 parents
1850 parents
1851 message
1851 message
1852 date
1852 date
1853 author
1853 author
1854
1854
1855 :param cs_cache:
1855 :param cs_cache:
1856 """
1856 """
1857 from rhodecode.lib.vcs.backends.base import BaseChangeset
1857 from rhodecode.lib.vcs.backends.base import BaseChangeset
1858 if cs_cache is None:
1858 if cs_cache is None:
1859 # use no-cache version here
1859 # use no-cache version here
1860 scm_repo = self.scm_instance(cache=False, config=config)
1860 scm_repo = self.scm_instance(cache=False, config=config)
1861 if scm_repo:
1861 if scm_repo:
1862 cs_cache = scm_repo.get_commit(
1862 cs_cache = scm_repo.get_commit(
1863 pre_load=["author", "date", "message", "parents"])
1863 pre_load=["author", "date", "message", "parents"])
1864 else:
1864 else:
1865 cs_cache = EmptyCommit()
1865 cs_cache = EmptyCommit()
1866
1866
1867 if isinstance(cs_cache, BaseChangeset):
1867 if isinstance(cs_cache, BaseChangeset):
1868 cs_cache = cs_cache.__json__()
1868 cs_cache = cs_cache.__json__()
1869
1869
1870 def is_outdated(new_cs_cache):
1870 def is_outdated(new_cs_cache):
1871 if (new_cs_cache['raw_id'] != self.changeset_cache['raw_id'] or
1871 if (new_cs_cache['raw_id'] != self.changeset_cache['raw_id'] or
1872 new_cs_cache['revision'] != self.changeset_cache['revision']):
1872 new_cs_cache['revision'] != self.changeset_cache['revision']):
1873 return True
1873 return True
1874 return False
1874 return False
1875
1875
1876 # check if we have maybe already latest cached revision
1876 # check if we have maybe already latest cached revision
1877 if is_outdated(cs_cache) or not self.changeset_cache:
1877 if is_outdated(cs_cache) or not self.changeset_cache:
1878 _default = datetime.datetime.fromtimestamp(0)
1878 _default = datetime.datetime.fromtimestamp(0)
1879 last_change = cs_cache.get('date') or _default
1879 last_change = cs_cache.get('date') or _default
1880 log.debug('updated repo %s with new cs cache %s',
1880 log.debug('updated repo %s with new cs cache %s',
1881 self.repo_name, cs_cache)
1881 self.repo_name, cs_cache)
1882 self.updated_on = last_change
1882 self.updated_on = last_change
1883 self.changeset_cache = cs_cache
1883 self.changeset_cache = cs_cache
1884 Session().add(self)
1884 Session().add(self)
1885 Session().commit()
1885 Session().commit()
1886 else:
1886 else:
1887 log.debug('Skipping update_commit_cache for repo:`%s` '
1887 log.debug('Skipping update_commit_cache for repo:`%s` '
1888 'commit already with latest changes', self.repo_name)
1888 'commit already with latest changes', self.repo_name)
1889
1889
1890 @property
1890 @property
1891 def tip(self):
1891 def tip(self):
1892 return self.get_commit('tip')
1892 return self.get_commit('tip')
1893
1893
1894 @property
1894 @property
1895 def author(self):
1895 def author(self):
1896 return self.tip.author
1896 return self.tip.author
1897
1897
1898 @property
1898 @property
1899 def last_change(self):
1899 def last_change(self):
1900 return self.scm_instance().last_change
1900 return self.scm_instance().last_change
1901
1901
1902 def get_comments(self, revisions=None):
1902 def get_comments(self, revisions=None):
1903 """
1903 """
1904 Returns comments for this repository grouped by revisions
1904 Returns comments for this repository grouped by revisions
1905
1905
1906 :param revisions: filter query by revisions only
1906 :param revisions: filter query by revisions only
1907 """
1907 """
1908 cmts = ChangesetComment.query()\
1908 cmts = ChangesetComment.query()\
1909 .filter(ChangesetComment.repo == self)
1909 .filter(ChangesetComment.repo == self)
1910 if revisions:
1910 if revisions:
1911 cmts = cmts.filter(ChangesetComment.revision.in_(revisions))
1911 cmts = cmts.filter(ChangesetComment.revision.in_(revisions))
1912 grouped = collections.defaultdict(list)
1912 grouped = collections.defaultdict(list)
1913 for cmt in cmts.all():
1913 for cmt in cmts.all():
1914 grouped[cmt.revision].append(cmt)
1914 grouped[cmt.revision].append(cmt)
1915 return grouped
1915 return grouped
1916
1916
1917 def statuses(self, revisions=None):
1917 def statuses(self, revisions=None):
1918 """
1918 """
1919 Returns statuses for this repository
1919 Returns statuses for this repository
1920
1920
1921 :param revisions: list of revisions to get statuses for
1921 :param revisions: list of revisions to get statuses for
1922 """
1922 """
1923 statuses = ChangesetStatus.query()\
1923 statuses = ChangesetStatus.query()\
1924 .filter(ChangesetStatus.repo == self)\
1924 .filter(ChangesetStatus.repo == self)\
1925 .filter(ChangesetStatus.version == 0)
1925 .filter(ChangesetStatus.version == 0)
1926
1926
1927 if revisions:
1927 if revisions:
1928 # Try doing the filtering in chunks to avoid hitting limits
1928 # Try doing the filtering in chunks to avoid hitting limits
1929 size = 500
1929 size = 500
1930 status_results = []
1930 status_results = []
1931 for chunk in xrange(0, len(revisions), size):
1931 for chunk in xrange(0, len(revisions), size):
1932 status_results += statuses.filter(
1932 status_results += statuses.filter(
1933 ChangesetStatus.revision.in_(
1933 ChangesetStatus.revision.in_(
1934 revisions[chunk: chunk+size])
1934 revisions[chunk: chunk+size])
1935 ).all()
1935 ).all()
1936 else:
1936 else:
1937 status_results = statuses.all()
1937 status_results = statuses.all()
1938
1938
1939 grouped = {}
1939 grouped = {}
1940
1940
1941 # maybe we have open new pullrequest without a status?
1941 # maybe we have open new pullrequest without a status?
1942 stat = ChangesetStatus.STATUS_UNDER_REVIEW
1942 stat = ChangesetStatus.STATUS_UNDER_REVIEW
1943 status_lbl = ChangesetStatus.get_status_lbl(stat)
1943 status_lbl = ChangesetStatus.get_status_lbl(stat)
1944 for pr in PullRequest.query().filter(PullRequest.source_repo == self).all():
1944 for pr in PullRequest.query().filter(PullRequest.source_repo == self).all():
1945 for rev in pr.revisions:
1945 for rev in pr.revisions:
1946 pr_id = pr.pull_request_id
1946 pr_id = pr.pull_request_id
1947 pr_repo = pr.target_repo.repo_name
1947 pr_repo = pr.target_repo.repo_name
1948 grouped[rev] = [stat, status_lbl, pr_id, pr_repo]
1948 grouped[rev] = [stat, status_lbl, pr_id, pr_repo]
1949
1949
1950 for stat in status_results:
1950 for stat in status_results:
1951 pr_id = pr_repo = None
1951 pr_id = pr_repo = None
1952 if stat.pull_request:
1952 if stat.pull_request:
1953 pr_id = stat.pull_request.pull_request_id
1953 pr_id = stat.pull_request.pull_request_id
1954 pr_repo = stat.pull_request.target_repo.repo_name
1954 pr_repo = stat.pull_request.target_repo.repo_name
1955 grouped[stat.revision] = [str(stat.status), stat.status_lbl,
1955 grouped[stat.revision] = [str(stat.status), stat.status_lbl,
1956 pr_id, pr_repo]
1956 pr_id, pr_repo]
1957 return grouped
1957 return grouped
1958
1958
1959 # ==========================================================================
1959 # ==========================================================================
1960 # SCM CACHE INSTANCE
1960 # SCM CACHE INSTANCE
1961 # ==========================================================================
1961 # ==========================================================================
1962
1962
1963 def scm_instance(self, **kwargs):
1963 def scm_instance(self, **kwargs):
1964 import rhodecode
1964 import rhodecode
1965
1965
1966 # Passing a config will not hit the cache currently only used
1966 # Passing a config will not hit the cache currently only used
1967 # for repo2dbmapper
1967 # for repo2dbmapper
1968 config = kwargs.pop('config', None)
1968 config = kwargs.pop('config', None)
1969 cache = kwargs.pop('cache', None)
1969 cache = kwargs.pop('cache', None)
1970 full_cache = str2bool(rhodecode.CONFIG.get('vcs_full_cache'))
1970 full_cache = str2bool(rhodecode.CONFIG.get('vcs_full_cache'))
1971 # if cache is NOT defined use default global, else we have a full
1971 # if cache is NOT defined use default global, else we have a full
1972 # control over cache behaviour
1972 # control over cache behaviour
1973 if cache is None and full_cache and not config:
1973 if cache is None and full_cache and not config:
1974 return self._get_instance_cached()
1974 return self._get_instance_cached()
1975 return self._get_instance(cache=bool(cache), config=config)
1975 return self._get_instance(cache=bool(cache), config=config)
1976
1976
1977 def _get_instance_cached(self):
1977 def _get_instance_cached(self):
1978 @cache_region('long_term')
1978 @cache_region('long_term')
1979 def _get_repo(cache_key):
1979 def _get_repo(cache_key):
1980 return self._get_instance()
1980 return self._get_instance()
1981
1981
1982 invalidator_context = CacheKey.repo_context_cache(
1982 invalidator_context = CacheKey.repo_context_cache(
1983 _get_repo, self.repo_name, None, thread_scoped=True)
1983 _get_repo, self.repo_name, None, thread_scoped=True)
1984
1984
1985 with invalidator_context as context:
1985 with invalidator_context as context:
1986 context.invalidate()
1986 context.invalidate()
1987 repo = context.compute()
1987 repo = context.compute()
1988
1988
1989 return repo
1989 return repo
1990
1990
1991 def _get_instance(self, cache=True, config=None):
1991 def _get_instance(self, cache=True, config=None):
1992 config = config or self._config
1992 config = config or self._config
1993 custom_wire = {
1993 custom_wire = {
1994 'cache': cache # controls the vcs.remote cache
1994 'cache': cache # controls the vcs.remote cache
1995 }
1995 }
1996 repo = get_vcs_instance(
1996 repo = get_vcs_instance(
1997 repo_path=safe_str(self.repo_full_path),
1997 repo_path=safe_str(self.repo_full_path),
1998 config=config,
1998 config=config,
1999 with_wire=custom_wire,
1999 with_wire=custom_wire,
2000 create=False,
2000 create=False,
2001 _vcs_alias=self.repo_type)
2001 _vcs_alias=self.repo_type)
2002
2002
2003 return repo
2003 return repo
2004
2004
2005 def __json__(self):
2005 def __json__(self):
2006 return {'landing_rev': self.landing_rev}
2006 return {'landing_rev': self.landing_rev}
2007
2007
2008 def get_dict(self):
2008 def get_dict(self):
2009
2009
2010 # Since we transformed `repo_name` to a hybrid property, we need to
2010 # Since we transformed `repo_name` to a hybrid property, we need to
2011 # keep compatibility with the code which uses `repo_name` field.
2011 # keep compatibility with the code which uses `repo_name` field.
2012
2012
2013 result = super(Repository, self).get_dict()
2013 result = super(Repository, self).get_dict()
2014 result['repo_name'] = result.pop('_repo_name', None)
2014 result['repo_name'] = result.pop('_repo_name', None)
2015 return result
2015 return result
2016
2016
2017
2017
2018 class RepoGroup(Base, BaseModel):
2018 class RepoGroup(Base, BaseModel):
2019 __tablename__ = 'groups'
2019 __tablename__ = 'groups'
2020 __table_args__ = (
2020 __table_args__ = (
2021 UniqueConstraint('group_name', 'group_parent_id'),
2021 UniqueConstraint('group_name', 'group_parent_id'),
2022 CheckConstraint('group_id != group_parent_id'),
2022 CheckConstraint('group_id != group_parent_id'),
2023 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2023 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2024 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
2024 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
2025 )
2025 )
2026 __mapper_args__ = {'order_by': 'group_name'}
2026 __mapper_args__ = {'order_by': 'group_name'}
2027
2027
2028 CHOICES_SEPARATOR = '/' # used to generate select2 choices for nested groups
2028 CHOICES_SEPARATOR = '/' # used to generate select2 choices for nested groups
2029
2029
2030 group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2030 group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2031 group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
2031 group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
2032 group_parent_id = Column("group_parent_id", Integer(), ForeignKey('groups.group_id'), nullable=True, unique=None, default=None)
2032 group_parent_id = Column("group_parent_id", Integer(), ForeignKey('groups.group_id'), nullable=True, unique=None, default=None)
2033 group_description = Column("group_description", String(10000), nullable=True, unique=None, default=None)
2033 group_description = Column("group_description", String(10000), nullable=True, unique=None, default=None)
2034 enable_locking = Column("enable_locking", Boolean(), nullable=False, unique=None, default=False)
2034 enable_locking = Column("enable_locking", Boolean(), nullable=False, unique=None, default=False)
2035 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None)
2035 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None)
2036 created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
2036 created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
2037 personal = Column('personal', Boolean(), nullable=True, unique=None, default=None)
2037 personal = Column('personal', Boolean(), nullable=True, unique=None, default=None)
2038
2038
2039 repo_group_to_perm = relationship('UserRepoGroupToPerm', cascade='all', order_by='UserRepoGroupToPerm.group_to_perm_id')
2039 repo_group_to_perm = relationship('UserRepoGroupToPerm', cascade='all', order_by='UserRepoGroupToPerm.group_to_perm_id')
2040 users_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
2040 users_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
2041 parent_group = relationship('RepoGroup', remote_side=group_id)
2041 parent_group = relationship('RepoGroup', remote_side=group_id)
2042 user = relationship('User')
2042 user = relationship('User')
2043 integrations = relationship('Integration',
2043 integrations = relationship('Integration',
2044 cascade="all, delete, delete-orphan")
2044 cascade="all, delete, delete-orphan")
2045
2045
2046 def __init__(self, group_name='', parent_group=None):
2046 def __init__(self, group_name='', parent_group=None):
2047 self.group_name = group_name
2047 self.group_name = group_name
2048 self.parent_group = parent_group
2048 self.parent_group = parent_group
2049
2049
2050 def __unicode__(self):
2050 def __unicode__(self):
2051 return u"<%s('id:%s:%s')>" % (self.__class__.__name__, self.group_id,
2051 return u"<%s('id:%s:%s')>" % (self.__class__.__name__, self.group_id,
2052 self.group_name)
2052 self.group_name)
2053
2053
2054 @classmethod
2054 @classmethod
2055 def _generate_choice(cls, repo_group):
2055 def _generate_choice(cls, repo_group):
2056 from webhelpers.html import literal as _literal
2056 from webhelpers.html import literal as _literal
2057 _name = lambda k: _literal(cls.CHOICES_SEPARATOR.join(k))
2057 _name = lambda k: _literal(cls.CHOICES_SEPARATOR.join(k))
2058 return repo_group.group_id, _name(repo_group.full_path_splitted)
2058 return repo_group.group_id, _name(repo_group.full_path_splitted)
2059
2059
2060 @classmethod
2060 @classmethod
2061 def groups_choices(cls, groups=None, show_empty_group=True):
2061 def groups_choices(cls, groups=None, show_empty_group=True):
2062 if not groups:
2062 if not groups:
2063 groups = cls.query().all()
2063 groups = cls.query().all()
2064
2064
2065 repo_groups = []
2065 repo_groups = []
2066 if show_empty_group:
2066 if show_empty_group:
2067 repo_groups = [('-1', u'-- %s --' % _('No parent'))]
2067 repo_groups = [('-1', u'-- %s --' % _('No parent'))]
2068
2068
2069 repo_groups.extend([cls._generate_choice(x) for x in groups])
2069 repo_groups.extend([cls._generate_choice(x) for x in groups])
2070
2070
2071 repo_groups = sorted(
2071 repo_groups = sorted(
2072 repo_groups, key=lambda t: t[1].split(cls.CHOICES_SEPARATOR)[0])
2072 repo_groups, key=lambda t: t[1].split(cls.CHOICES_SEPARATOR)[0])
2073 return repo_groups
2073 return repo_groups
2074
2074
2075 @classmethod
2075 @classmethod
2076 def url_sep(cls):
2076 def url_sep(cls):
2077 return URL_SEP
2077 return URL_SEP
2078
2078
2079 @classmethod
2079 @classmethod
2080 def get_by_group_name(cls, group_name, cache=False, case_insensitive=False):
2080 def get_by_group_name(cls, group_name, cache=False, case_insensitive=False):
2081 if case_insensitive:
2081 if case_insensitive:
2082 gr = cls.query().filter(func.lower(cls.group_name)
2082 gr = cls.query().filter(func.lower(cls.group_name)
2083 == func.lower(group_name))
2083 == func.lower(group_name))
2084 else:
2084 else:
2085 gr = cls.query().filter(cls.group_name == group_name)
2085 gr = cls.query().filter(cls.group_name == group_name)
2086 if cache:
2086 if cache:
2087 gr = gr.options(FromCache(
2087 gr = gr.options(FromCache(
2088 "sql_cache_short",
2088 "sql_cache_short",
2089 "get_group_%s" % _hash_key(group_name)))
2089 "get_group_%s" % _hash_key(group_name)))
2090 return gr.scalar()
2090 return gr.scalar()
2091
2091
2092 @classmethod
2092 @classmethod
2093 def get_user_personal_repo_group(cls, user_id):
2093 def get_user_personal_repo_group(cls, user_id):
2094 user = User.get(user_id)
2094 user = User.get(user_id)
2095 return cls.query()\
2095 return cls.query()\
2096 .filter(cls.personal == true())\
2096 .filter(cls.personal == true())\
2097 .filter(cls.user == user).scalar()
2097 .filter(cls.user == user).scalar()
2098
2098
2099 @classmethod
2099 @classmethod
2100 def get_all_repo_groups(cls, user_id=Optional(None), group_id=Optional(None),
2100 def get_all_repo_groups(cls, user_id=Optional(None), group_id=Optional(None),
2101 case_insensitive=True):
2101 case_insensitive=True):
2102 q = RepoGroup.query()
2102 q = RepoGroup.query()
2103
2103
2104 if not isinstance(user_id, Optional):
2104 if not isinstance(user_id, Optional):
2105 q = q.filter(RepoGroup.user_id == user_id)
2105 q = q.filter(RepoGroup.user_id == user_id)
2106
2106
2107 if not isinstance(group_id, Optional):
2107 if not isinstance(group_id, Optional):
2108 q = q.filter(RepoGroup.group_parent_id == group_id)
2108 q = q.filter(RepoGroup.group_parent_id == group_id)
2109
2109
2110 if case_insensitive:
2110 if case_insensitive:
2111 q = q.order_by(func.lower(RepoGroup.group_name))
2111 q = q.order_by(func.lower(RepoGroup.group_name))
2112 else:
2112 else:
2113 q = q.order_by(RepoGroup.group_name)
2113 q = q.order_by(RepoGroup.group_name)
2114 return q.all()
2114 return q.all()
2115
2115
2116 @property
2116 @property
2117 def parents(self):
2117 def parents(self):
2118 parents_recursion_limit = 10
2118 parents_recursion_limit = 10
2119 groups = []
2119 groups = []
2120 if self.parent_group is None:
2120 if self.parent_group is None:
2121 return groups
2121 return groups
2122 cur_gr = self.parent_group
2122 cur_gr = self.parent_group
2123 groups.insert(0, cur_gr)
2123 groups.insert(0, cur_gr)
2124 cnt = 0
2124 cnt = 0
2125 while 1:
2125 while 1:
2126 cnt += 1
2126 cnt += 1
2127 gr = getattr(cur_gr, 'parent_group', None)
2127 gr = getattr(cur_gr, 'parent_group', None)
2128 cur_gr = cur_gr.parent_group
2128 cur_gr = cur_gr.parent_group
2129 if gr is None:
2129 if gr is None:
2130 break
2130 break
2131 if cnt == parents_recursion_limit:
2131 if cnt == parents_recursion_limit:
2132 # this will prevent accidental infinit loops
2132 # this will prevent accidental infinit loops
2133 log.error(('more than %s parents found for group %s, stopping '
2133 log.error(('more than %s parents found for group %s, stopping '
2134 'recursive parent fetching' % (parents_recursion_limit, self)))
2134 'recursive parent fetching' % (parents_recursion_limit, self)))
2135 break
2135 break
2136
2136
2137 groups.insert(0, gr)
2137 groups.insert(0, gr)
2138 return groups
2138 return groups
2139
2139
2140 @property
2140 @property
2141 def children(self):
2141 def children(self):
2142 return RepoGroup.query().filter(RepoGroup.parent_group == self)
2142 return RepoGroup.query().filter(RepoGroup.parent_group == self)
2143
2143
2144 @property
2144 @property
2145 def name(self):
2145 def name(self):
2146 return self.group_name.split(RepoGroup.url_sep())[-1]
2146 return self.group_name.split(RepoGroup.url_sep())[-1]
2147
2147
2148 @property
2148 @property
2149 def full_path(self):
2149 def full_path(self):
2150 return self.group_name
2150 return self.group_name
2151
2151
2152 @property
2152 @property
2153 def full_path_splitted(self):
2153 def full_path_splitted(self):
2154 return self.group_name.split(RepoGroup.url_sep())
2154 return self.group_name.split(RepoGroup.url_sep())
2155
2155
2156 @property
2156 @property
2157 def repositories(self):
2157 def repositories(self):
2158 return Repository.query()\
2158 return Repository.query()\
2159 .filter(Repository.group == self)\
2159 .filter(Repository.group == self)\
2160 .order_by(Repository.repo_name)
2160 .order_by(Repository.repo_name)
2161
2161
2162 @property
2162 @property
2163 def repositories_recursive_count(self):
2163 def repositories_recursive_count(self):
2164 cnt = self.repositories.count()
2164 cnt = self.repositories.count()
2165
2165
2166 def children_count(group):
2166 def children_count(group):
2167 cnt = 0
2167 cnt = 0
2168 for child in group.children:
2168 for child in group.children:
2169 cnt += child.repositories.count()
2169 cnt += child.repositories.count()
2170 cnt += children_count(child)
2170 cnt += children_count(child)
2171 return cnt
2171 return cnt
2172
2172
2173 return cnt + children_count(self)
2173 return cnt + children_count(self)
2174
2174
2175 def _recursive_objects(self, include_repos=True):
2175 def _recursive_objects(self, include_repos=True):
2176 all_ = []
2176 all_ = []
2177
2177
2178 def _get_members(root_gr):
2178 def _get_members(root_gr):
2179 if include_repos:
2179 if include_repos:
2180 for r in root_gr.repositories:
2180 for r in root_gr.repositories:
2181 all_.append(r)
2181 all_.append(r)
2182 childs = root_gr.children.all()
2182 childs = root_gr.children.all()
2183 if childs:
2183 if childs:
2184 for gr in childs:
2184 for gr in childs:
2185 all_.append(gr)
2185 all_.append(gr)
2186 _get_members(gr)
2186 _get_members(gr)
2187
2187
2188 _get_members(self)
2188 _get_members(self)
2189 return [self] + all_
2189 return [self] + all_
2190
2190
2191 def recursive_groups_and_repos(self):
2191 def recursive_groups_and_repos(self):
2192 """
2192 """
2193 Recursive return all groups, with repositories in those groups
2193 Recursive return all groups, with repositories in those groups
2194 """
2194 """
2195 return self._recursive_objects()
2195 return self._recursive_objects()
2196
2196
2197 def recursive_groups(self):
2197 def recursive_groups(self):
2198 """
2198 """
2199 Returns all children groups for this group including children of children
2199 Returns all children groups for this group including children of children
2200 """
2200 """
2201 return self._recursive_objects(include_repos=False)
2201 return self._recursive_objects(include_repos=False)
2202
2202
2203 def get_new_name(self, group_name):
2203 def get_new_name(self, group_name):
2204 """
2204 """
2205 returns new full group name based on parent and new name
2205 returns new full group name based on parent and new name
2206
2206
2207 :param group_name:
2207 :param group_name:
2208 """
2208 """
2209 path_prefix = (self.parent_group.full_path_splitted if
2209 path_prefix = (self.parent_group.full_path_splitted if
2210 self.parent_group else [])
2210 self.parent_group else [])
2211 return RepoGroup.url_sep().join(path_prefix + [group_name])
2211 return RepoGroup.url_sep().join(path_prefix + [group_name])
2212
2212
2213 def permissions(self, with_admins=True, with_owner=True):
2213 def permissions(self, with_admins=True, with_owner=True):
2214 q = UserRepoGroupToPerm.query().filter(UserRepoGroupToPerm.group == self)
2214 q = UserRepoGroupToPerm.query().filter(UserRepoGroupToPerm.group == self)
2215 q = q.options(joinedload(UserRepoGroupToPerm.group),
2215 q = q.options(joinedload(UserRepoGroupToPerm.group),
2216 joinedload(UserRepoGroupToPerm.user),
2216 joinedload(UserRepoGroupToPerm.user),
2217 joinedload(UserRepoGroupToPerm.permission),)
2217 joinedload(UserRepoGroupToPerm.permission),)
2218
2218
2219 # get owners and admins and permissions. We do a trick of re-writing
2219 # get owners and admins and permissions. We do a trick of re-writing
2220 # objects from sqlalchemy to named-tuples due to sqlalchemy session
2220 # objects from sqlalchemy to named-tuples due to sqlalchemy session
2221 # has a global reference and changing one object propagates to all
2221 # has a global reference and changing one object propagates to all
2222 # others. This means if admin is also an owner admin_row that change
2222 # others. This means if admin is also an owner admin_row that change
2223 # would propagate to both objects
2223 # would propagate to both objects
2224 perm_rows = []
2224 perm_rows = []
2225 for _usr in q.all():
2225 for _usr in q.all():
2226 usr = AttributeDict(_usr.user.get_dict())
2226 usr = AttributeDict(_usr.user.get_dict())
2227 usr.permission = _usr.permission.permission_name
2227 usr.permission = _usr.permission.permission_name
2228 perm_rows.append(usr)
2228 perm_rows.append(usr)
2229
2229
2230 # filter the perm rows by 'default' first and then sort them by
2230 # filter the perm rows by 'default' first and then sort them by
2231 # admin,write,read,none permissions sorted again alphabetically in
2231 # admin,write,read,none permissions sorted again alphabetically in
2232 # each group
2232 # each group
2233 perm_rows = sorted(perm_rows, key=display_sort)
2233 perm_rows = sorted(perm_rows, key=display_sort)
2234
2234
2235 _admin_perm = 'group.admin'
2235 _admin_perm = 'group.admin'
2236 owner_row = []
2236 owner_row = []
2237 if with_owner:
2237 if with_owner:
2238 usr = AttributeDict(self.user.get_dict())
2238 usr = AttributeDict(self.user.get_dict())
2239 usr.owner_row = True
2239 usr.owner_row = True
2240 usr.permission = _admin_perm
2240 usr.permission = _admin_perm
2241 owner_row.append(usr)
2241 owner_row.append(usr)
2242
2242
2243 super_admin_rows = []
2243 super_admin_rows = []
2244 if with_admins:
2244 if with_admins:
2245 for usr in User.get_all_super_admins():
2245 for usr in User.get_all_super_admins():
2246 # if this admin is also owner, don't double the record
2246 # if this admin is also owner, don't double the record
2247 if usr.user_id == owner_row[0].user_id:
2247 if usr.user_id == owner_row[0].user_id:
2248 owner_row[0].admin_row = True
2248 owner_row[0].admin_row = True
2249 else:
2249 else:
2250 usr = AttributeDict(usr.get_dict())
2250 usr = AttributeDict(usr.get_dict())
2251 usr.admin_row = True
2251 usr.admin_row = True
2252 usr.permission = _admin_perm
2252 usr.permission = _admin_perm
2253 super_admin_rows.append(usr)
2253 super_admin_rows.append(usr)
2254
2254
2255 return super_admin_rows + owner_row + perm_rows
2255 return super_admin_rows + owner_row + perm_rows
2256
2256
2257 def permission_user_groups(self):
2257 def permission_user_groups(self):
2258 q = UserGroupRepoGroupToPerm.query().filter(UserGroupRepoGroupToPerm.group == self)
2258 q = UserGroupRepoGroupToPerm.query().filter(UserGroupRepoGroupToPerm.group == self)
2259 q = q.options(joinedload(UserGroupRepoGroupToPerm.group),
2259 q = q.options(joinedload(UserGroupRepoGroupToPerm.group),
2260 joinedload(UserGroupRepoGroupToPerm.users_group),
2260 joinedload(UserGroupRepoGroupToPerm.users_group),
2261 joinedload(UserGroupRepoGroupToPerm.permission),)
2261 joinedload(UserGroupRepoGroupToPerm.permission),)
2262
2262
2263 perm_rows = []
2263 perm_rows = []
2264 for _user_group in q.all():
2264 for _user_group in q.all():
2265 usr = AttributeDict(_user_group.users_group.get_dict())
2265 usr = AttributeDict(_user_group.users_group.get_dict())
2266 usr.permission = _user_group.permission.permission_name
2266 usr.permission = _user_group.permission.permission_name
2267 perm_rows.append(usr)
2267 perm_rows.append(usr)
2268
2268
2269 return perm_rows
2269 return perm_rows
2270
2270
2271 def get_api_data(self):
2271 def get_api_data(self):
2272 """
2272 """
2273 Common function for generating api data
2273 Common function for generating api data
2274
2274
2275 """
2275 """
2276 group = self
2276 group = self
2277 data = {
2277 data = {
2278 'group_id': group.group_id,
2278 'group_id': group.group_id,
2279 'group_name': group.group_name,
2279 'group_name': group.group_name,
2280 'group_description': group.group_description,
2280 'group_description': group.group_description,
2281 'parent_group': group.parent_group.group_name if group.parent_group else None,
2281 'parent_group': group.parent_group.group_name if group.parent_group else None,
2282 'repositories': [x.repo_name for x in group.repositories],
2282 'repositories': [x.repo_name for x in group.repositories],
2283 'owner': group.user.username,
2283 'owner': group.user.username,
2284 }
2284 }
2285 return data
2285 return data
2286
2286
2287
2287
2288 class Permission(Base, BaseModel):
2288 class Permission(Base, BaseModel):
2289 __tablename__ = 'permissions'
2289 __tablename__ = 'permissions'
2290 __table_args__ = (
2290 __table_args__ = (
2291 Index('p_perm_name_idx', 'permission_name'),
2291 Index('p_perm_name_idx', 'permission_name'),
2292 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2292 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2293 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
2293 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
2294 )
2294 )
2295 PERMS = [
2295 PERMS = [
2296 ('hg.admin', _('RhodeCode Super Administrator')),
2296 ('hg.admin', _('RhodeCode Super Administrator')),
2297
2297
2298 ('repository.none', _('Repository no access')),
2298 ('repository.none', _('Repository no access')),
2299 ('repository.read', _('Repository read access')),
2299 ('repository.read', _('Repository read access')),
2300 ('repository.write', _('Repository write access')),
2300 ('repository.write', _('Repository write access')),
2301 ('repository.admin', _('Repository admin access')),
2301 ('repository.admin', _('Repository admin access')),
2302
2302
2303 ('group.none', _('Repository group no access')),
2303 ('group.none', _('Repository group no access')),
2304 ('group.read', _('Repository group read access')),
2304 ('group.read', _('Repository group read access')),
2305 ('group.write', _('Repository group write access')),
2305 ('group.write', _('Repository group write access')),
2306 ('group.admin', _('Repository group admin access')),
2306 ('group.admin', _('Repository group admin access')),
2307
2307
2308 ('usergroup.none', _('User group no access')),
2308 ('usergroup.none', _('User group no access')),
2309 ('usergroup.read', _('User group read access')),
2309 ('usergroup.read', _('User group read access')),
2310 ('usergroup.write', _('User group write access')),
2310 ('usergroup.write', _('User group write access')),
2311 ('usergroup.admin', _('User group admin access')),
2311 ('usergroup.admin', _('User group admin access')),
2312
2312
2313 ('hg.repogroup.create.false', _('Repository Group creation disabled')),
2313 ('hg.repogroup.create.false', _('Repository Group creation disabled')),
2314 ('hg.repogroup.create.true', _('Repository Group creation enabled')),
2314 ('hg.repogroup.create.true', _('Repository Group creation enabled')),
2315
2315
2316 ('hg.usergroup.create.false', _('User Group creation disabled')),
2316 ('hg.usergroup.create.false', _('User Group creation disabled')),
2317 ('hg.usergroup.create.true', _('User Group creation enabled')),
2317 ('hg.usergroup.create.true', _('User Group creation enabled')),
2318
2318
2319 ('hg.create.none', _('Repository creation disabled')),
2319 ('hg.create.none', _('Repository creation disabled')),
2320 ('hg.create.repository', _('Repository creation enabled')),
2320 ('hg.create.repository', _('Repository creation enabled')),
2321 ('hg.create.write_on_repogroup.true', _('Repository creation enabled with write permission to a repository group')),
2321 ('hg.create.write_on_repogroup.true', _('Repository creation enabled with write permission to a repository group')),
2322 ('hg.create.write_on_repogroup.false', _('Repository creation disabled with write permission to a repository group')),
2322 ('hg.create.write_on_repogroup.false', _('Repository creation disabled with write permission to a repository group')),
2323
2323
2324 ('hg.fork.none', _('Repository forking disabled')),
2324 ('hg.fork.none', _('Repository forking disabled')),
2325 ('hg.fork.repository', _('Repository forking enabled')),
2325 ('hg.fork.repository', _('Repository forking enabled')),
2326
2326
2327 ('hg.register.none', _('Registration disabled')),
2327 ('hg.register.none', _('Registration disabled')),
2328 ('hg.register.manual_activate', _('User Registration with manual account activation')),
2328 ('hg.register.manual_activate', _('User Registration with manual account activation')),
2329 ('hg.register.auto_activate', _('User Registration with automatic account activation')),
2329 ('hg.register.auto_activate', _('User Registration with automatic account activation')),
2330
2330
2331 ('hg.password_reset.enabled', _('Password reset enabled')),
2331 ('hg.password_reset.enabled', _('Password reset enabled')),
2332 ('hg.password_reset.hidden', _('Password reset hidden')),
2332 ('hg.password_reset.hidden', _('Password reset hidden')),
2333 ('hg.password_reset.disabled', _('Password reset disabled')),
2333 ('hg.password_reset.disabled', _('Password reset disabled')),
2334
2334
2335 ('hg.extern_activate.manual', _('Manual activation of external account')),
2335 ('hg.extern_activate.manual', _('Manual activation of external account')),
2336 ('hg.extern_activate.auto', _('Automatic activation of external account')),
2336 ('hg.extern_activate.auto', _('Automatic activation of external account')),
2337
2337
2338 ('hg.inherit_default_perms.false', _('Inherit object permissions from default user disabled')),
2338 ('hg.inherit_default_perms.false', _('Inherit object permissions from default user disabled')),
2339 ('hg.inherit_default_perms.true', _('Inherit object permissions from default user enabled')),
2339 ('hg.inherit_default_perms.true', _('Inherit object permissions from default user enabled')),
2340 ]
2340 ]
2341
2341
2342 # definition of system default permissions for DEFAULT user
2342 # definition of system default permissions for DEFAULT user
2343 DEFAULT_USER_PERMISSIONS = [
2343 DEFAULT_USER_PERMISSIONS = [
2344 'repository.read',
2344 'repository.read',
2345 'group.read',
2345 'group.read',
2346 'usergroup.read',
2346 'usergroup.read',
2347 'hg.create.repository',
2347 'hg.create.repository',
2348 'hg.repogroup.create.false',
2348 'hg.repogroup.create.false',
2349 'hg.usergroup.create.false',
2349 'hg.usergroup.create.false',
2350 'hg.create.write_on_repogroup.true',
2350 'hg.create.write_on_repogroup.true',
2351 'hg.fork.repository',
2351 'hg.fork.repository',
2352 'hg.register.manual_activate',
2352 'hg.register.manual_activate',
2353 'hg.password_reset.enabled',
2353 'hg.password_reset.enabled',
2354 'hg.extern_activate.auto',
2354 'hg.extern_activate.auto',
2355 'hg.inherit_default_perms.true',
2355 'hg.inherit_default_perms.true',
2356 ]
2356 ]
2357
2357
2358 # defines which permissions are more important higher the more important
2358 # defines which permissions are more important higher the more important
2359 # Weight defines which permissions are more important.
2359 # Weight defines which permissions are more important.
2360 # The higher number the more important.
2360 # The higher number the more important.
2361 PERM_WEIGHTS = {
2361 PERM_WEIGHTS = {
2362 'repository.none': 0,
2362 'repository.none': 0,
2363 'repository.read': 1,
2363 'repository.read': 1,
2364 'repository.write': 3,
2364 'repository.write': 3,
2365 'repository.admin': 4,
2365 'repository.admin': 4,
2366
2366
2367 'group.none': 0,
2367 'group.none': 0,
2368 'group.read': 1,
2368 'group.read': 1,
2369 'group.write': 3,
2369 'group.write': 3,
2370 'group.admin': 4,
2370 'group.admin': 4,
2371
2371
2372 'usergroup.none': 0,
2372 'usergroup.none': 0,
2373 'usergroup.read': 1,
2373 'usergroup.read': 1,
2374 'usergroup.write': 3,
2374 'usergroup.write': 3,
2375 'usergroup.admin': 4,
2375 'usergroup.admin': 4,
2376
2376
2377 'hg.repogroup.create.false': 0,
2377 'hg.repogroup.create.false': 0,
2378 'hg.repogroup.create.true': 1,
2378 'hg.repogroup.create.true': 1,
2379
2379
2380 'hg.usergroup.create.false': 0,
2380 'hg.usergroup.create.false': 0,
2381 'hg.usergroup.create.true': 1,
2381 'hg.usergroup.create.true': 1,
2382
2382
2383 'hg.fork.none': 0,
2383 'hg.fork.none': 0,
2384 'hg.fork.repository': 1,
2384 'hg.fork.repository': 1,
2385 'hg.create.none': 0,
2385 'hg.create.none': 0,
2386 'hg.create.repository': 1
2386 'hg.create.repository': 1
2387 }
2387 }
2388
2388
2389 permission_id = Column("permission_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2389 permission_id = Column("permission_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2390 permission_name = Column("permission_name", String(255), nullable=True, unique=None, default=None)
2390 permission_name = Column("permission_name", String(255), nullable=True, unique=None, default=None)
2391 permission_longname = Column("permission_longname", String(255), nullable=True, unique=None, default=None)
2391 permission_longname = Column("permission_longname", String(255), nullable=True, unique=None, default=None)
2392
2392
2393 def __unicode__(self):
2393 def __unicode__(self):
2394 return u"<%s('%s:%s')>" % (
2394 return u"<%s('%s:%s')>" % (
2395 self.__class__.__name__, self.permission_id, self.permission_name
2395 self.__class__.__name__, self.permission_id, self.permission_name
2396 )
2396 )
2397
2397
2398 @classmethod
2398 @classmethod
2399 def get_by_key(cls, key):
2399 def get_by_key(cls, key):
2400 return cls.query().filter(cls.permission_name == key).scalar()
2400 return cls.query().filter(cls.permission_name == key).scalar()
2401
2401
2402 @classmethod
2402 @classmethod
2403 def get_default_repo_perms(cls, user_id, repo_id=None):
2403 def get_default_repo_perms(cls, user_id, repo_id=None):
2404 q = Session().query(UserRepoToPerm, Repository, Permission)\
2404 q = Session().query(UserRepoToPerm, Repository, Permission)\
2405 .join((Permission, UserRepoToPerm.permission_id == Permission.permission_id))\
2405 .join((Permission, UserRepoToPerm.permission_id == Permission.permission_id))\
2406 .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id))\
2406 .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id))\
2407 .filter(UserRepoToPerm.user_id == user_id)
2407 .filter(UserRepoToPerm.user_id == user_id)
2408 if repo_id:
2408 if repo_id:
2409 q = q.filter(UserRepoToPerm.repository_id == repo_id)
2409 q = q.filter(UserRepoToPerm.repository_id == repo_id)
2410 return q.all()
2410 return q.all()
2411
2411
2412 @classmethod
2412 @classmethod
2413 def get_default_repo_perms_from_user_group(cls, user_id, repo_id=None):
2413 def get_default_repo_perms_from_user_group(cls, user_id, repo_id=None):
2414 q = Session().query(UserGroupRepoToPerm, Repository, Permission)\
2414 q = Session().query(UserGroupRepoToPerm, Repository, Permission)\
2415 .join(
2415 .join(
2416 Permission,
2416 Permission,
2417 UserGroupRepoToPerm.permission_id == Permission.permission_id)\
2417 UserGroupRepoToPerm.permission_id == Permission.permission_id)\
2418 .join(
2418 .join(
2419 Repository,
2419 Repository,
2420 UserGroupRepoToPerm.repository_id == Repository.repo_id)\
2420 UserGroupRepoToPerm.repository_id == Repository.repo_id)\
2421 .join(
2421 .join(
2422 UserGroup,
2422 UserGroup,
2423 UserGroupRepoToPerm.users_group_id ==
2423 UserGroupRepoToPerm.users_group_id ==
2424 UserGroup.users_group_id)\
2424 UserGroup.users_group_id)\
2425 .join(
2425 .join(
2426 UserGroupMember,
2426 UserGroupMember,
2427 UserGroupRepoToPerm.users_group_id ==
2427 UserGroupRepoToPerm.users_group_id ==
2428 UserGroupMember.users_group_id)\
2428 UserGroupMember.users_group_id)\
2429 .filter(
2429 .filter(
2430 UserGroupMember.user_id == user_id,
2430 UserGroupMember.user_id == user_id,
2431 UserGroup.users_group_active == true())
2431 UserGroup.users_group_active == true())
2432 if repo_id:
2432 if repo_id:
2433 q = q.filter(UserGroupRepoToPerm.repository_id == repo_id)
2433 q = q.filter(UserGroupRepoToPerm.repository_id == repo_id)
2434 return q.all()
2434 return q.all()
2435
2435
2436 @classmethod
2436 @classmethod
2437 def get_default_group_perms(cls, user_id, repo_group_id=None):
2437 def get_default_group_perms(cls, user_id, repo_group_id=None):
2438 q = Session().query(UserRepoGroupToPerm, RepoGroup, Permission)\
2438 q = Session().query(UserRepoGroupToPerm, RepoGroup, Permission)\
2439 .join((Permission, UserRepoGroupToPerm.permission_id == Permission.permission_id))\
2439 .join((Permission, UserRepoGroupToPerm.permission_id == Permission.permission_id))\
2440 .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id))\
2440 .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id))\
2441 .filter(UserRepoGroupToPerm.user_id == user_id)
2441 .filter(UserRepoGroupToPerm.user_id == user_id)
2442 if repo_group_id:
2442 if repo_group_id:
2443 q = q.filter(UserRepoGroupToPerm.group_id == repo_group_id)
2443 q = q.filter(UserRepoGroupToPerm.group_id == repo_group_id)
2444 return q.all()
2444 return q.all()
2445
2445
2446 @classmethod
2446 @classmethod
2447 def get_default_group_perms_from_user_group(
2447 def get_default_group_perms_from_user_group(
2448 cls, user_id, repo_group_id=None):
2448 cls, user_id, repo_group_id=None):
2449 q = Session().query(UserGroupRepoGroupToPerm, RepoGroup, Permission)\
2449 q = Session().query(UserGroupRepoGroupToPerm, RepoGroup, Permission)\
2450 .join(
2450 .join(
2451 Permission,
2451 Permission,
2452 UserGroupRepoGroupToPerm.permission_id ==
2452 UserGroupRepoGroupToPerm.permission_id ==
2453 Permission.permission_id)\
2453 Permission.permission_id)\
2454 .join(
2454 .join(
2455 RepoGroup,
2455 RepoGroup,
2456 UserGroupRepoGroupToPerm.group_id == RepoGroup.group_id)\
2456 UserGroupRepoGroupToPerm.group_id == RepoGroup.group_id)\
2457 .join(
2457 .join(
2458 UserGroup,
2458 UserGroup,
2459 UserGroupRepoGroupToPerm.users_group_id ==
2459 UserGroupRepoGroupToPerm.users_group_id ==
2460 UserGroup.users_group_id)\
2460 UserGroup.users_group_id)\
2461 .join(
2461 .join(
2462 UserGroupMember,
2462 UserGroupMember,
2463 UserGroupRepoGroupToPerm.users_group_id ==
2463 UserGroupRepoGroupToPerm.users_group_id ==
2464 UserGroupMember.users_group_id)\
2464 UserGroupMember.users_group_id)\
2465 .filter(
2465 .filter(
2466 UserGroupMember.user_id == user_id,
2466 UserGroupMember.user_id == user_id,
2467 UserGroup.users_group_active == true())
2467 UserGroup.users_group_active == true())
2468 if repo_group_id:
2468 if repo_group_id:
2469 q = q.filter(UserGroupRepoGroupToPerm.group_id == repo_group_id)
2469 q = q.filter(UserGroupRepoGroupToPerm.group_id == repo_group_id)
2470 return q.all()
2470 return q.all()
2471
2471
2472 @classmethod
2472 @classmethod
2473 def get_default_user_group_perms(cls, user_id, user_group_id=None):
2473 def get_default_user_group_perms(cls, user_id, user_group_id=None):
2474 q = Session().query(UserUserGroupToPerm, UserGroup, Permission)\
2474 q = Session().query(UserUserGroupToPerm, UserGroup, Permission)\
2475 .join((Permission, UserUserGroupToPerm.permission_id == Permission.permission_id))\
2475 .join((Permission, UserUserGroupToPerm.permission_id == Permission.permission_id))\
2476 .join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id))\
2476 .join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id))\
2477 .filter(UserUserGroupToPerm.user_id == user_id)
2477 .filter(UserUserGroupToPerm.user_id == user_id)
2478 if user_group_id:
2478 if user_group_id:
2479 q = q.filter(UserUserGroupToPerm.user_group_id == user_group_id)
2479 q = q.filter(UserUserGroupToPerm.user_group_id == user_group_id)
2480 return q.all()
2480 return q.all()
2481
2481
2482 @classmethod
2482 @classmethod
2483 def get_default_user_group_perms_from_user_group(
2483 def get_default_user_group_perms_from_user_group(
2484 cls, user_id, user_group_id=None):
2484 cls, user_id, user_group_id=None):
2485 TargetUserGroup = aliased(UserGroup, name='target_user_group')
2485 TargetUserGroup = aliased(UserGroup, name='target_user_group')
2486 q = Session().query(UserGroupUserGroupToPerm, UserGroup, Permission)\
2486 q = Session().query(UserGroupUserGroupToPerm, UserGroup, Permission)\
2487 .join(
2487 .join(
2488 Permission,
2488 Permission,
2489 UserGroupUserGroupToPerm.permission_id ==
2489 UserGroupUserGroupToPerm.permission_id ==
2490 Permission.permission_id)\
2490 Permission.permission_id)\
2491 .join(
2491 .join(
2492 TargetUserGroup,
2492 TargetUserGroup,
2493 UserGroupUserGroupToPerm.target_user_group_id ==
2493 UserGroupUserGroupToPerm.target_user_group_id ==
2494 TargetUserGroup.users_group_id)\
2494 TargetUserGroup.users_group_id)\
2495 .join(
2495 .join(
2496 UserGroup,
2496 UserGroup,
2497 UserGroupUserGroupToPerm.user_group_id ==
2497 UserGroupUserGroupToPerm.user_group_id ==
2498 UserGroup.users_group_id)\
2498 UserGroup.users_group_id)\
2499 .join(
2499 .join(
2500 UserGroupMember,
2500 UserGroupMember,
2501 UserGroupUserGroupToPerm.user_group_id ==
2501 UserGroupUserGroupToPerm.user_group_id ==
2502 UserGroupMember.users_group_id)\
2502 UserGroupMember.users_group_id)\
2503 .filter(
2503 .filter(
2504 UserGroupMember.user_id == user_id,
2504 UserGroupMember.user_id == user_id,
2505 UserGroup.users_group_active == true())
2505 UserGroup.users_group_active == true())
2506 if user_group_id:
2506 if user_group_id:
2507 q = q.filter(
2507 q = q.filter(
2508 UserGroupUserGroupToPerm.user_group_id == user_group_id)
2508 UserGroupUserGroupToPerm.user_group_id == user_group_id)
2509
2509
2510 return q.all()
2510 return q.all()
2511
2511
2512
2512
2513 class UserRepoToPerm(Base, BaseModel):
2513 class UserRepoToPerm(Base, BaseModel):
2514 __tablename__ = 'repo_to_perm'
2514 __tablename__ = 'repo_to_perm'
2515 __table_args__ = (
2515 __table_args__ = (
2516 UniqueConstraint('user_id', 'repository_id', 'permission_id'),
2516 UniqueConstraint('user_id', 'repository_id', 'permission_id'),
2517 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2517 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2518 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
2518 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
2519 )
2519 )
2520 repo_to_perm_id = Column("repo_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2520 repo_to_perm_id = Column("repo_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2521 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
2521 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
2522 permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
2522 permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
2523 repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
2523 repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
2524
2524
2525 user = relationship('User')
2525 user = relationship('User')
2526 repository = relationship('Repository')
2526 repository = relationship('Repository')
2527 permission = relationship('Permission')
2527 permission = relationship('Permission')
2528
2528
2529 @classmethod
2529 @classmethod
2530 def create(cls, user, repository, permission):
2530 def create(cls, user, repository, permission):
2531 n = cls()
2531 n = cls()
2532 n.user = user
2532 n.user = user
2533 n.repository = repository
2533 n.repository = repository
2534 n.permission = permission
2534 n.permission = permission
2535 Session().add(n)
2535 Session().add(n)
2536 return n
2536 return n
2537
2537
2538 def __unicode__(self):
2538 def __unicode__(self):
2539 return u'<%s => %s >' % (self.user, self.repository)
2539 return u'<%s => %s >' % (self.user, self.repository)
2540
2540
2541
2541
2542 class UserUserGroupToPerm(Base, BaseModel):
2542 class UserUserGroupToPerm(Base, BaseModel):
2543 __tablename__ = 'user_user_group_to_perm'
2543 __tablename__ = 'user_user_group_to_perm'
2544 __table_args__ = (
2544 __table_args__ = (
2545 UniqueConstraint('user_id', 'user_group_id', 'permission_id'),
2545 UniqueConstraint('user_id', 'user_group_id', 'permission_id'),
2546 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2546 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2547 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
2547 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
2548 )
2548 )
2549 user_user_group_to_perm_id = Column("user_user_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2549 user_user_group_to_perm_id = Column("user_user_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2550 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
2550 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
2551 permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
2551 permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
2552 user_group_id = Column("user_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
2552 user_group_id = Column("user_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
2553
2553
2554 user = relationship('User')
2554 user = relationship('User')
2555 user_group = relationship('UserGroup')
2555 user_group = relationship('UserGroup')
2556 permission = relationship('Permission')
2556 permission = relationship('Permission')
2557
2557
2558 @classmethod
2558 @classmethod
2559 def create(cls, user, user_group, permission):
2559 def create(cls, user, user_group, permission):
2560 n = cls()
2560 n = cls()
2561 n.user = user
2561 n.user = user
2562 n.user_group = user_group
2562 n.user_group = user_group
2563 n.permission = permission
2563 n.permission = permission
2564 Session().add(n)
2564 Session().add(n)
2565 return n
2565 return n
2566
2566
2567 def __unicode__(self):
2567 def __unicode__(self):
2568 return u'<%s => %s >' % (self.user, self.user_group)
2568 return u'<%s => %s >' % (self.user, self.user_group)
2569
2569
2570
2570
2571 class UserToPerm(Base, BaseModel):
2571 class UserToPerm(Base, BaseModel):
2572 __tablename__ = 'user_to_perm'
2572 __tablename__ = 'user_to_perm'
2573 __table_args__ = (
2573 __table_args__ = (
2574 UniqueConstraint('user_id', 'permission_id'),
2574 UniqueConstraint('user_id', 'permission_id'),
2575 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2575 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2576 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
2576 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
2577 )
2577 )
2578 user_to_perm_id = Column("user_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2578 user_to_perm_id = Column("user_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2579 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
2579 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
2580 permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
2580 permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
2581
2581
2582 user = relationship('User')
2582 user = relationship('User')
2583 permission = relationship('Permission', lazy='joined')
2583 permission = relationship('Permission', lazy='joined')
2584
2584
2585 def __unicode__(self):
2585 def __unicode__(self):
2586 return u'<%s => %s >' % (self.user, self.permission)
2586 return u'<%s => %s >' % (self.user, self.permission)
2587
2587
2588
2588
2589 class UserGroupRepoToPerm(Base, BaseModel):
2589 class UserGroupRepoToPerm(Base, BaseModel):
2590 __tablename__ = 'users_group_repo_to_perm'
2590 __tablename__ = 'users_group_repo_to_perm'
2591 __table_args__ = (
2591 __table_args__ = (
2592 UniqueConstraint('repository_id', 'users_group_id', 'permission_id'),
2592 UniqueConstraint('repository_id', 'users_group_id', 'permission_id'),
2593 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2593 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2594 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
2594 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
2595 )
2595 )
2596 users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2596 users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2597 users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
2597 users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
2598 permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
2598 permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
2599 repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
2599 repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
2600
2600
2601 users_group = relationship('UserGroup')
2601 users_group = relationship('UserGroup')
2602 permission = relationship('Permission')
2602 permission = relationship('Permission')
2603 repository = relationship('Repository')
2603 repository = relationship('Repository')
2604
2604
2605 @classmethod
2605 @classmethod
2606 def create(cls, users_group, repository, permission):
2606 def create(cls, users_group, repository, permission):
2607 n = cls()
2607 n = cls()
2608 n.users_group = users_group
2608 n.users_group = users_group
2609 n.repository = repository
2609 n.repository = repository
2610 n.permission = permission
2610 n.permission = permission
2611 Session().add(n)
2611 Session().add(n)
2612 return n
2612 return n
2613
2613
2614 def __unicode__(self):
2614 def __unicode__(self):
2615 return u'<UserGroupRepoToPerm:%s => %s >' % (self.users_group, self.repository)
2615 return u'<UserGroupRepoToPerm:%s => %s >' % (self.users_group, self.repository)
2616
2616
2617
2617
2618 class UserGroupUserGroupToPerm(Base, BaseModel):
2618 class UserGroupUserGroupToPerm(Base, BaseModel):
2619 __tablename__ = 'user_group_user_group_to_perm'
2619 __tablename__ = 'user_group_user_group_to_perm'
2620 __table_args__ = (
2620 __table_args__ = (
2621 UniqueConstraint('target_user_group_id', 'user_group_id', 'permission_id'),
2621 UniqueConstraint('target_user_group_id', 'user_group_id', 'permission_id'),
2622 CheckConstraint('target_user_group_id != user_group_id'),
2622 CheckConstraint('target_user_group_id != user_group_id'),
2623 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2623 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2624 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
2624 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
2625 )
2625 )
2626 user_group_user_group_to_perm_id = Column("user_group_user_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2626 user_group_user_group_to_perm_id = Column("user_group_user_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2627 target_user_group_id = Column("target_user_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
2627 target_user_group_id = Column("target_user_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
2628 permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
2628 permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
2629 user_group_id = Column("user_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
2629 user_group_id = Column("user_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
2630
2630
2631 target_user_group = relationship('UserGroup', primaryjoin='UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id')
2631 target_user_group = relationship('UserGroup', primaryjoin='UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id')
2632 user_group = relationship('UserGroup', primaryjoin='UserGroupUserGroupToPerm.user_group_id==UserGroup.users_group_id')
2632 user_group = relationship('UserGroup', primaryjoin='UserGroupUserGroupToPerm.user_group_id==UserGroup.users_group_id')
2633 permission = relationship('Permission')
2633 permission = relationship('Permission')
2634
2634
2635 @classmethod
2635 @classmethod
2636 def create(cls, target_user_group, user_group, permission):
2636 def create(cls, target_user_group, user_group, permission):
2637 n = cls()
2637 n = cls()
2638 n.target_user_group = target_user_group
2638 n.target_user_group = target_user_group
2639 n.user_group = user_group
2639 n.user_group = user_group
2640 n.permission = permission
2640 n.permission = permission
2641 Session().add(n)
2641 Session().add(n)
2642 return n
2642 return n
2643
2643
2644 def __unicode__(self):
2644 def __unicode__(self):
2645 return u'<UserGroupUserGroup:%s => %s >' % (self.target_user_group, self.user_group)
2645 return u'<UserGroupUserGroup:%s => %s >' % (self.target_user_group, self.user_group)
2646
2646
2647
2647
2648 class UserGroupToPerm(Base, BaseModel):
2648 class UserGroupToPerm(Base, BaseModel):
2649 __tablename__ = 'users_group_to_perm'
2649 __tablename__ = 'users_group_to_perm'
2650 __table_args__ = (
2650 __table_args__ = (
2651 UniqueConstraint('users_group_id', 'permission_id',),
2651 UniqueConstraint('users_group_id', 'permission_id',),
2652 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2652 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2653 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
2653 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
2654 )
2654 )
2655 users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2655 users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2656 users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
2656 users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
2657 permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
2657 permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
2658
2658
2659 users_group = relationship('UserGroup')
2659 users_group = relationship('UserGroup')
2660 permission = relationship('Permission')
2660 permission = relationship('Permission')
2661
2661
2662
2662
2663 class UserRepoGroupToPerm(Base, BaseModel):
2663 class UserRepoGroupToPerm(Base, BaseModel):
2664 __tablename__ = 'user_repo_group_to_perm'
2664 __tablename__ = 'user_repo_group_to_perm'
2665 __table_args__ = (
2665 __table_args__ = (
2666 UniqueConstraint('user_id', 'group_id', 'permission_id'),
2666 UniqueConstraint('user_id', 'group_id', 'permission_id'),
2667 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2667 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2668 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
2668 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
2669 )
2669 )
2670
2670
2671 group_to_perm_id = Column("group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2671 group_to_perm_id = Column("group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2672 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
2672 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
2673 group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None)
2673 group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None)
2674 permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
2674 permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
2675
2675
2676 user = relationship('User')
2676 user = relationship('User')
2677 group = relationship('RepoGroup')
2677 group = relationship('RepoGroup')
2678 permission = relationship('Permission')
2678 permission = relationship('Permission')
2679
2679
2680 @classmethod
2680 @classmethod
2681 def create(cls, user, repository_group, permission):
2681 def create(cls, user, repository_group, permission):
2682 n = cls()
2682 n = cls()
2683 n.user = user
2683 n.user = user
2684 n.group = repository_group
2684 n.group = repository_group
2685 n.permission = permission
2685 n.permission = permission
2686 Session().add(n)
2686 Session().add(n)
2687 return n
2687 return n
2688
2688
2689
2689
2690 class UserGroupRepoGroupToPerm(Base, BaseModel):
2690 class UserGroupRepoGroupToPerm(Base, BaseModel):
2691 __tablename__ = 'users_group_repo_group_to_perm'
2691 __tablename__ = 'users_group_repo_group_to_perm'
2692 __table_args__ = (
2692 __table_args__ = (
2693 UniqueConstraint('users_group_id', 'group_id'),
2693 UniqueConstraint('users_group_id', 'group_id'),
2694 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2694 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2695 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
2695 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
2696 )
2696 )
2697
2697
2698 users_group_repo_group_to_perm_id = Column("users_group_repo_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2698 users_group_repo_group_to_perm_id = Column("users_group_repo_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2699 users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
2699 users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
2700 group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None)
2700 group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None)
2701 permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
2701 permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
2702
2702
2703 users_group = relationship('UserGroup')
2703 users_group = relationship('UserGroup')
2704 permission = relationship('Permission')
2704 permission = relationship('Permission')
2705 group = relationship('RepoGroup')
2705 group = relationship('RepoGroup')
2706
2706
2707 @classmethod
2707 @classmethod
2708 def create(cls, user_group, repository_group, permission):
2708 def create(cls, user_group, repository_group, permission):
2709 n = cls()
2709 n = cls()
2710 n.users_group = user_group
2710 n.users_group = user_group
2711 n.group = repository_group
2711 n.group = repository_group
2712 n.permission = permission
2712 n.permission = permission
2713 Session().add(n)
2713 Session().add(n)
2714 return n
2714 return n
2715
2715
2716 def __unicode__(self):
2716 def __unicode__(self):
2717 return u'<UserGroupRepoGroupToPerm:%s => %s >' % (self.users_group, self.group)
2717 return u'<UserGroupRepoGroupToPerm:%s => %s >' % (self.users_group, self.group)
2718
2718
2719
2719
2720 class Statistics(Base, BaseModel):
2720 class Statistics(Base, BaseModel):
2721 __tablename__ = 'statistics'
2721 __tablename__ = 'statistics'
2722 __table_args__ = (
2722 __table_args__ = (
2723 UniqueConstraint('repository_id'),
2723 UniqueConstraint('repository_id'),
2724 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2724 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2725 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
2725 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
2726 )
2726 )
2727 stat_id = Column("stat_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2727 stat_id = Column("stat_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2728 repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=True, default=None)
2728 repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=True, default=None)
2729 stat_on_revision = Column("stat_on_revision", Integer(), nullable=False)
2729 stat_on_revision = Column("stat_on_revision", Integer(), nullable=False)
2730 commit_activity = Column("commit_activity", LargeBinary(1000000), nullable=False)#JSON data
2730 commit_activity = Column("commit_activity", LargeBinary(1000000), nullable=False)#JSON data
2731 commit_activity_combined = Column("commit_activity_combined", LargeBinary(), nullable=False)#JSON data
2731 commit_activity_combined = Column("commit_activity_combined", LargeBinary(), nullable=False)#JSON data
2732 languages = Column("languages", LargeBinary(1000000), nullable=False)#JSON data
2732 languages = Column("languages", LargeBinary(1000000), nullable=False)#JSON data
2733
2733
2734 repository = relationship('Repository', single_parent=True)
2734 repository = relationship('Repository', single_parent=True)
2735
2735
2736
2736
2737 class UserFollowing(Base, BaseModel):
2737 class UserFollowing(Base, BaseModel):
2738 __tablename__ = 'user_followings'
2738 __tablename__ = 'user_followings'
2739 __table_args__ = (
2739 __table_args__ = (
2740 UniqueConstraint('user_id', 'follows_repository_id'),
2740 UniqueConstraint('user_id', 'follows_repository_id'),
2741 UniqueConstraint('user_id', 'follows_user_id'),
2741 UniqueConstraint('user_id', 'follows_user_id'),
2742 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2742 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2743 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
2743 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
2744 )
2744 )
2745
2745
2746 user_following_id = Column("user_following_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2746 user_following_id = Column("user_following_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2747 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
2747 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
2748 follows_repo_id = Column("follows_repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True, unique=None, default=None)
2748 follows_repo_id = Column("follows_repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True, unique=None, default=None)
2749 follows_user_id = Column("follows_user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
2749 follows_user_id = Column("follows_user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
2750 follows_from = Column('follows_from', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now)
2750 follows_from = Column('follows_from', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now)
2751
2751
2752 user = relationship('User', primaryjoin='User.user_id==UserFollowing.user_id')
2752 user = relationship('User', primaryjoin='User.user_id==UserFollowing.user_id')
2753
2753
2754 follows_user = relationship('User', primaryjoin='User.user_id==UserFollowing.follows_user_id')
2754 follows_user = relationship('User', primaryjoin='User.user_id==UserFollowing.follows_user_id')
2755 follows_repository = relationship('Repository', order_by='Repository.repo_name')
2755 follows_repository = relationship('Repository', order_by='Repository.repo_name')
2756
2756
2757 @classmethod
2757 @classmethod
2758 def get_repo_followers(cls, repo_id):
2758 def get_repo_followers(cls, repo_id):
2759 return cls.query().filter(cls.follows_repo_id == repo_id)
2759 return cls.query().filter(cls.follows_repo_id == repo_id)
2760
2760
2761
2761
2762 class CacheKey(Base, BaseModel):
2762 class CacheKey(Base, BaseModel):
2763 __tablename__ = 'cache_invalidation'
2763 __tablename__ = 'cache_invalidation'
2764 __table_args__ = (
2764 __table_args__ = (
2765 UniqueConstraint('cache_key'),
2765 UniqueConstraint('cache_key'),
2766 Index('key_idx', 'cache_key'),
2766 Index('key_idx', 'cache_key'),
2767 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2767 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2768 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
2768 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
2769 )
2769 )
2770 CACHE_TYPE_ATOM = 'ATOM'
2770 CACHE_TYPE_ATOM = 'ATOM'
2771 CACHE_TYPE_RSS = 'RSS'
2771 CACHE_TYPE_RSS = 'RSS'
2772 CACHE_TYPE_README = 'README'
2772 CACHE_TYPE_README = 'README'
2773
2773
2774 cache_id = Column("cache_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2774 cache_id = Column("cache_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2775 cache_key = Column("cache_key", String(255), nullable=True, unique=None, default=None)
2775 cache_key = Column("cache_key", String(255), nullable=True, unique=None, default=None)
2776 cache_args = Column("cache_args", String(255), nullable=True, unique=None, default=None)
2776 cache_args = Column("cache_args", String(255), nullable=True, unique=None, default=None)
2777 cache_active = Column("cache_active", Boolean(), nullable=True, unique=None, default=False)
2777 cache_active = Column("cache_active", Boolean(), nullable=True, unique=None, default=False)
2778
2778
2779 def __init__(self, cache_key, cache_args=''):
2779 def __init__(self, cache_key, cache_args=''):
2780 self.cache_key = cache_key
2780 self.cache_key = cache_key
2781 self.cache_args = cache_args
2781 self.cache_args = cache_args
2782 self.cache_active = False
2782 self.cache_active = False
2783
2783
2784 def __unicode__(self):
2784 def __unicode__(self):
2785 return u"<%s('%s:%s[%s]')>" % (
2785 return u"<%s('%s:%s[%s]')>" % (
2786 self.__class__.__name__,
2786 self.__class__.__name__,
2787 self.cache_id, self.cache_key, self.cache_active)
2787 self.cache_id, self.cache_key, self.cache_active)
2788
2788
2789 def _cache_key_partition(self):
2789 def _cache_key_partition(self):
2790 prefix, repo_name, suffix = self.cache_key.partition(self.cache_args)
2790 prefix, repo_name, suffix = self.cache_key.partition(self.cache_args)
2791 return prefix, repo_name, suffix
2791 return prefix, repo_name, suffix
2792
2792
2793 def get_prefix(self):
2793 def get_prefix(self):
2794 """
2794 """
2795 Try to extract prefix from existing cache key. The key could consist
2795 Try to extract prefix from existing cache key. The key could consist
2796 of prefix, repo_name, suffix
2796 of prefix, repo_name, suffix
2797 """
2797 """
2798 # this returns prefix, repo_name, suffix
2798 # this returns prefix, repo_name, suffix
2799 return self._cache_key_partition()[0]
2799 return self._cache_key_partition()[0]
2800
2800
2801 def get_suffix(self):
2801 def get_suffix(self):
2802 """
2802 """
2803 get suffix that might have been used in _get_cache_key to
2803 get suffix that might have been used in _get_cache_key to
2804 generate self.cache_key. Only used for informational purposes
2804 generate self.cache_key. Only used for informational purposes
2805 in repo_edit.mako.
2805 in repo_edit.mako.
2806 """
2806 """
2807 # prefix, repo_name, suffix
2807 # prefix, repo_name, suffix
2808 return self._cache_key_partition()[2]
2808 return self._cache_key_partition()[2]
2809
2809
2810 @classmethod
2810 @classmethod
2811 def delete_all_cache(cls):
2811 def delete_all_cache(cls):
2812 """
2812 """
2813 Delete all cache keys from database.
2813 Delete all cache keys from database.
2814 Should only be run when all instances are down and all entries
2814 Should only be run when all instances are down and all entries
2815 thus stale.
2815 thus stale.
2816 """
2816 """
2817 cls.query().delete()
2817 cls.query().delete()
2818 Session().commit()
2818 Session().commit()
2819
2819
2820 @classmethod
2820 @classmethod
2821 def get_cache_key(cls, repo_name, cache_type):
2821 def get_cache_key(cls, repo_name, cache_type):
2822 """
2822 """
2823
2823
2824 Generate a cache key for this process of RhodeCode instance.
2824 Generate a cache key for this process of RhodeCode instance.
2825 Prefix most likely will be process id or maybe explicitly set
2825 Prefix most likely will be process id or maybe explicitly set
2826 instance_id from .ini file.
2826 instance_id from .ini file.
2827 """
2827 """
2828 import rhodecode
2828 import rhodecode
2829 prefix = safe_unicode(rhodecode.CONFIG.get('instance_id') or '')
2829 prefix = safe_unicode(rhodecode.CONFIG.get('instance_id') or '')
2830
2830
2831 repo_as_unicode = safe_unicode(repo_name)
2831 repo_as_unicode = safe_unicode(repo_name)
2832 key = u'{}_{}'.format(repo_as_unicode, cache_type) \
2832 key = u'{}_{}'.format(repo_as_unicode, cache_type) \
2833 if cache_type else repo_as_unicode
2833 if cache_type else repo_as_unicode
2834
2834
2835 return u'{}{}'.format(prefix, key)
2835 return u'{}{}'.format(prefix, key)
2836
2836
2837 @classmethod
2837 @classmethod
2838 def set_invalidate(cls, repo_name, delete=False):
2838 def set_invalidate(cls, repo_name, delete=False):
2839 """
2839 """
2840 Mark all caches of a repo as invalid in the database.
2840 Mark all caches of a repo as invalid in the database.
2841 """
2841 """
2842
2842
2843 try:
2843 try:
2844 qry = Session().query(cls).filter(cls.cache_args == repo_name)
2844 qry = Session().query(cls).filter(cls.cache_args == repo_name)
2845 if delete:
2845 if delete:
2846 log.debug('cache objects deleted for repo %s',
2846 log.debug('cache objects deleted for repo %s',
2847 safe_str(repo_name))
2847 safe_str(repo_name))
2848 qry.delete()
2848 qry.delete()
2849 else:
2849 else:
2850 log.debug('cache objects marked as invalid for repo %s',
2850 log.debug('cache objects marked as invalid for repo %s',
2851 safe_str(repo_name))
2851 safe_str(repo_name))
2852 qry.update({"cache_active": False})
2852 qry.update({"cache_active": False})
2853
2853
2854 Session().commit()
2854 Session().commit()
2855 except Exception:
2855 except Exception:
2856 log.exception(
2856 log.exception(
2857 'Cache key invalidation failed for repository %s',
2857 'Cache key invalidation failed for repository %s',
2858 safe_str(repo_name))
2858 safe_str(repo_name))
2859 Session().rollback()
2859 Session().rollback()
2860
2860
2861 @classmethod
2861 @classmethod
2862 def get_active_cache(cls, cache_key):
2862 def get_active_cache(cls, cache_key):
2863 inv_obj = cls.query().filter(cls.cache_key == cache_key).scalar()
2863 inv_obj = cls.query().filter(cls.cache_key == cache_key).scalar()
2864 if inv_obj:
2864 if inv_obj:
2865 return inv_obj
2865 return inv_obj
2866 return None
2866 return None
2867
2867
2868 @classmethod
2868 @classmethod
2869 def repo_context_cache(cls, compute_func, repo_name, cache_type,
2869 def repo_context_cache(cls, compute_func, repo_name, cache_type,
2870 thread_scoped=False):
2870 thread_scoped=False):
2871 """
2871 """
2872 @cache_region('long_term')
2872 @cache_region('long_term')
2873 def _heavy_calculation(cache_key):
2873 def _heavy_calculation(cache_key):
2874 return 'result'
2874 return 'result'
2875
2875
2876 cache_context = CacheKey.repo_context_cache(
2876 cache_context = CacheKey.repo_context_cache(
2877 _heavy_calculation, repo_name, cache_type)
2877 _heavy_calculation, repo_name, cache_type)
2878
2878
2879 with cache_context as context:
2879 with cache_context as context:
2880 context.invalidate()
2880 context.invalidate()
2881 computed = context.compute()
2881 computed = context.compute()
2882
2882
2883 assert computed == 'result'
2883 assert computed == 'result'
2884 """
2884 """
2885 from rhodecode.lib import caches
2885 from rhodecode.lib import caches
2886 return caches.InvalidationContext(
2886 return caches.InvalidationContext(
2887 compute_func, repo_name, cache_type, thread_scoped=thread_scoped)
2887 compute_func, repo_name, cache_type, thread_scoped=thread_scoped)
2888
2888
2889
2889
2890 class ChangesetComment(Base, BaseModel):
2890 class ChangesetComment(Base, BaseModel):
2891 __tablename__ = 'changeset_comments'
2891 __tablename__ = 'changeset_comments'
2892 __table_args__ = (
2892 __table_args__ = (
2893 Index('cc_revision_idx', 'revision'),
2893 Index('cc_revision_idx', 'revision'),
2894 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2894 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2895 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
2895 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
2896 )
2896 )
2897
2897
2898 COMMENT_OUTDATED = u'comment_outdated'
2898 COMMENT_OUTDATED = u'comment_outdated'
2899
2899
2900 comment_id = Column('comment_id', Integer(), nullable=False, primary_key=True)
2900 comment_id = Column('comment_id', Integer(), nullable=False, primary_key=True)
2901 repo_id = Column('repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)
2901 repo_id = Column('repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)
2902 revision = Column('revision', String(40), nullable=True)
2902 revision = Column('revision', String(40), nullable=True)
2903 pull_request_id = Column("pull_request_id", Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=True)
2903 pull_request_id = Column("pull_request_id", Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=True)
2904 pull_request_version_id = Column("pull_request_version_id", Integer(), ForeignKey('pull_request_versions.pull_request_version_id'), nullable=True)
2904 pull_request_version_id = Column("pull_request_version_id", Integer(), ForeignKey('pull_request_versions.pull_request_version_id'), nullable=True)
2905 line_no = Column('line_no', Unicode(10), nullable=True)
2905 line_no = Column('line_no', Unicode(10), nullable=True)
2906 hl_lines = Column('hl_lines', Unicode(512), nullable=True)
2906 hl_lines = Column('hl_lines', Unicode(512), nullable=True)
2907 f_path = Column('f_path', Unicode(1000), nullable=True)
2907 f_path = Column('f_path', Unicode(1000), nullable=True)
2908 user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False)
2908 user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False)
2909 text = Column('text', UnicodeText().with_variant(UnicodeText(25000), 'mysql'), nullable=False)
2909 text = Column('text', UnicodeText().with_variant(UnicodeText(25000), 'mysql'), nullable=False)
2910 created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
2910 created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
2911 modified_at = Column('modified_at', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
2911 modified_at = Column('modified_at', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
2912 renderer = Column('renderer', Unicode(64), nullable=True)
2912 renderer = Column('renderer', Unicode(64), nullable=True)
2913 display_state = Column('display_state', Unicode(128), nullable=True)
2913 display_state = Column('display_state', Unicode(128), nullable=True)
2914
2914
2915 author = relationship('User', lazy='joined')
2915 author = relationship('User', lazy='joined')
2916 repo = relationship('Repository')
2916 repo = relationship('Repository')
2917 status_change = relationship('ChangesetStatus', cascade="all, delete, delete-orphan")
2917 status_change = relationship('ChangesetStatus', cascade="all, delete, delete-orphan")
2918 pull_request = relationship('PullRequest', lazy='joined')
2918 pull_request = relationship('PullRequest', lazy='joined')
2919 pull_request_version = relationship('PullRequestVersion')
2919 pull_request_version = relationship('PullRequestVersion')
2920
2920
2921 @classmethod
2921 @classmethod
2922 def get_users(cls, revision=None, pull_request_id=None):
2922 def get_users(cls, revision=None, pull_request_id=None):
2923 """
2923 """
2924 Returns user associated with this ChangesetComment. ie those
2924 Returns user associated with this ChangesetComment. ie those
2925 who actually commented
2925 who actually commented
2926
2926
2927 :param cls:
2927 :param cls:
2928 :param revision:
2928 :param revision:
2929 """
2929 """
2930 q = Session().query(User)\
2930 q = Session().query(User)\
2931 .join(ChangesetComment.author)
2931 .join(ChangesetComment.author)
2932 if revision:
2932 if revision:
2933 q = q.filter(cls.revision == revision)
2933 q = q.filter(cls.revision == revision)
2934 elif pull_request_id:
2934 elif pull_request_id:
2935 q = q.filter(cls.pull_request_id == pull_request_id)
2935 q = q.filter(cls.pull_request_id == pull_request_id)
2936 return q.all()
2936 return q.all()
2937
2937
2938 @classmethod
2939 def get_index_from_version(cls, pr_version, versions):
2940 num_versions = [x.pull_request_version_id for x in versions]
2941 try:
2942 return num_versions.index(pr_version) +1
2943 except (IndexError, ValueError):
2944 return
2945
2938 @property
2946 @property
2939 def outdated(self):
2947 def outdated(self):
2940 return self.display_state == self.COMMENT_OUTDATED
2948 return self.display_state == self.COMMENT_OUTDATED
2941
2949
2942 def outdated_at_version(self, version):
2950 def outdated_at_version(self, version):
2943 """
2951 """
2944 Checks if comment is outdated for given pull request version
2952 Checks if comment is outdated for given pull request version
2945 """
2953 """
2946 return self.outdated and self.pull_request_version_id != version
2954 return self.outdated and self.pull_request_version_id != version
2947
2955
2956 def get_index_version(self, versions):
2957 return self.get_index_from_version(
2958 self.pull_request_version_id, versions)
2959
2948 def render(self, mentions=False):
2960 def render(self, mentions=False):
2949 from rhodecode.lib import helpers as h
2961 from rhodecode.lib import helpers as h
2950 return h.render(self.text, renderer=self.renderer, mentions=mentions)
2962 return h.render(self.text, renderer=self.renderer, mentions=mentions)
2951
2963
2952 def __repr__(self):
2964 def __repr__(self):
2953 if self.comment_id:
2965 if self.comment_id:
2954 return '<DB:ChangesetComment #%s>' % self.comment_id
2966 return '<DB:ChangesetComment #%s>' % self.comment_id
2955 else:
2967 else:
2956 return '<DB:ChangesetComment at %#x>' % id(self)
2968 return '<DB:ChangesetComment at %#x>' % id(self)
2957
2969
2958
2970
2959 class ChangesetStatus(Base, BaseModel):
2971 class ChangesetStatus(Base, BaseModel):
2960 __tablename__ = 'changeset_statuses'
2972 __tablename__ = 'changeset_statuses'
2961 __table_args__ = (
2973 __table_args__ = (
2962 Index('cs_revision_idx', 'revision'),
2974 Index('cs_revision_idx', 'revision'),
2963 Index('cs_version_idx', 'version'),
2975 Index('cs_version_idx', 'version'),
2964 UniqueConstraint('repo_id', 'revision', 'version'),
2976 UniqueConstraint('repo_id', 'revision', 'version'),
2965 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2977 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2966 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
2978 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
2967 )
2979 )
2968 STATUS_NOT_REVIEWED = DEFAULT = 'not_reviewed'
2980 STATUS_NOT_REVIEWED = DEFAULT = 'not_reviewed'
2969 STATUS_APPROVED = 'approved'
2981 STATUS_APPROVED = 'approved'
2970 STATUS_REJECTED = 'rejected'
2982 STATUS_REJECTED = 'rejected'
2971 STATUS_UNDER_REVIEW = 'under_review'
2983 STATUS_UNDER_REVIEW = 'under_review'
2972
2984
2973 STATUSES = [
2985 STATUSES = [
2974 (STATUS_NOT_REVIEWED, _("Not Reviewed")), # (no icon) and default
2986 (STATUS_NOT_REVIEWED, _("Not Reviewed")), # (no icon) and default
2975 (STATUS_APPROVED, _("Approved")),
2987 (STATUS_APPROVED, _("Approved")),
2976 (STATUS_REJECTED, _("Rejected")),
2988 (STATUS_REJECTED, _("Rejected")),
2977 (STATUS_UNDER_REVIEW, _("Under Review")),
2989 (STATUS_UNDER_REVIEW, _("Under Review")),
2978 ]
2990 ]
2979
2991
2980 changeset_status_id = Column('changeset_status_id', Integer(), nullable=False, primary_key=True)
2992 changeset_status_id = Column('changeset_status_id', Integer(), nullable=False, primary_key=True)
2981 repo_id = Column('repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)
2993 repo_id = Column('repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)
2982 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None)
2994 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None)
2983 revision = Column('revision', String(40), nullable=False)
2995 revision = Column('revision', String(40), nullable=False)
2984 status = Column('status', String(128), nullable=False, default=DEFAULT)
2996 status = Column('status', String(128), nullable=False, default=DEFAULT)
2985 changeset_comment_id = Column('changeset_comment_id', Integer(), ForeignKey('changeset_comments.comment_id'))
2997 changeset_comment_id = Column('changeset_comment_id', Integer(), ForeignKey('changeset_comments.comment_id'))
2986 modified_at = Column('modified_at', DateTime(), nullable=False, default=datetime.datetime.now)
2998 modified_at = Column('modified_at', DateTime(), nullable=False, default=datetime.datetime.now)
2987 version = Column('version', Integer(), nullable=False, default=0)
2999 version = Column('version', Integer(), nullable=False, default=0)
2988 pull_request_id = Column("pull_request_id", Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=True)
3000 pull_request_id = Column("pull_request_id", Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=True)
2989
3001
2990 author = relationship('User', lazy='joined')
3002 author = relationship('User', lazy='joined')
2991 repo = relationship('Repository')
3003 repo = relationship('Repository')
2992 comment = relationship('ChangesetComment', lazy='joined')
3004 comment = relationship('ChangesetComment', lazy='joined')
2993 pull_request = relationship('PullRequest', lazy='joined')
3005 pull_request = relationship('PullRequest', lazy='joined')
2994
3006
2995 def __unicode__(self):
3007 def __unicode__(self):
2996 return u"<%s('%s[%s]:%s')>" % (
3008 return u"<%s('%s[%s]:%s')>" % (
2997 self.__class__.__name__,
3009 self.__class__.__name__,
2998 self.status, self.version, self.author
3010 self.status, self.version, self.author
2999 )
3011 )
3000
3012
3001 @classmethod
3013 @classmethod
3002 def get_status_lbl(cls, value):
3014 def get_status_lbl(cls, value):
3003 return dict(cls.STATUSES).get(value)
3015 return dict(cls.STATUSES).get(value)
3004
3016
3005 @property
3017 @property
3006 def status_lbl(self):
3018 def status_lbl(self):
3007 return ChangesetStatus.get_status_lbl(self.status)
3019 return ChangesetStatus.get_status_lbl(self.status)
3008
3020
3009
3021
3010 class _PullRequestBase(BaseModel):
3022 class _PullRequestBase(BaseModel):
3011 """
3023 """
3012 Common attributes of pull request and version entries.
3024 Common attributes of pull request and version entries.
3013 """
3025 """
3014
3026
3015 # .status values
3027 # .status values
3016 STATUS_NEW = u'new'
3028 STATUS_NEW = u'new'
3017 STATUS_OPEN = u'open'
3029 STATUS_OPEN = u'open'
3018 STATUS_CLOSED = u'closed'
3030 STATUS_CLOSED = u'closed'
3019
3031
3020 title = Column('title', Unicode(255), nullable=True)
3032 title = Column('title', Unicode(255), nullable=True)
3021 description = Column(
3033 description = Column(
3022 'description', UnicodeText().with_variant(UnicodeText(10240), 'mysql'),
3034 'description', UnicodeText().with_variant(UnicodeText(10240), 'mysql'),
3023 nullable=True)
3035 nullable=True)
3024 # new/open/closed status of pull request (not approve/reject/etc)
3036 # new/open/closed status of pull request (not approve/reject/etc)
3025 status = Column('status', Unicode(255), nullable=False, default=STATUS_NEW)
3037 status = Column('status', Unicode(255), nullable=False, default=STATUS_NEW)
3026 created_on = Column(
3038 created_on = Column(
3027 'created_on', DateTime(timezone=False), nullable=False,
3039 'created_on', DateTime(timezone=False), nullable=False,
3028 default=datetime.datetime.now)
3040 default=datetime.datetime.now)
3029 updated_on = Column(
3041 updated_on = Column(
3030 'updated_on', DateTime(timezone=False), nullable=False,
3042 'updated_on', DateTime(timezone=False), nullable=False,
3031 default=datetime.datetime.now)
3043 default=datetime.datetime.now)
3032
3044
3033 @declared_attr
3045 @declared_attr
3034 def user_id(cls):
3046 def user_id(cls):
3035 return Column(
3047 return Column(
3036 "user_id", Integer(), ForeignKey('users.user_id'), nullable=False,
3048 "user_id", Integer(), ForeignKey('users.user_id'), nullable=False,
3037 unique=None)
3049 unique=None)
3038
3050
3039 # 500 revisions max
3051 # 500 revisions max
3040 _revisions = Column(
3052 _revisions = Column(
3041 'revisions', UnicodeText().with_variant(UnicodeText(20500), 'mysql'))
3053 'revisions', UnicodeText().with_variant(UnicodeText(20500), 'mysql'))
3042
3054
3043 @declared_attr
3055 @declared_attr
3044 def source_repo_id(cls):
3056 def source_repo_id(cls):
3045 # TODO: dan: rename column to source_repo_id
3057 # TODO: dan: rename column to source_repo_id
3046 return Column(
3058 return Column(
3047 'org_repo_id', Integer(), ForeignKey('repositories.repo_id'),
3059 'org_repo_id', Integer(), ForeignKey('repositories.repo_id'),
3048 nullable=False)
3060 nullable=False)
3049
3061
3050 source_ref = Column('org_ref', Unicode(255), nullable=False)
3062 source_ref = Column('org_ref', Unicode(255), nullable=False)
3051
3063
3052 @declared_attr
3064 @declared_attr
3053 def target_repo_id(cls):
3065 def target_repo_id(cls):
3054 # TODO: dan: rename column to target_repo_id
3066 # TODO: dan: rename column to target_repo_id
3055 return Column(
3067 return Column(
3056 'other_repo_id', Integer(), ForeignKey('repositories.repo_id'),
3068 'other_repo_id', Integer(), ForeignKey('repositories.repo_id'),
3057 nullable=False)
3069 nullable=False)
3058
3070
3059 target_ref = Column('other_ref', Unicode(255), nullable=False)
3071 target_ref = Column('other_ref', Unicode(255), nullable=False)
3060 _shadow_merge_ref = Column('shadow_merge_ref', Unicode(255), nullable=True)
3072 _shadow_merge_ref = Column('shadow_merge_ref', Unicode(255), nullable=True)
3061
3073
3062 # TODO: dan: rename column to last_merge_source_rev
3074 # TODO: dan: rename column to last_merge_source_rev
3063 _last_merge_source_rev = Column(
3075 _last_merge_source_rev = Column(
3064 'last_merge_org_rev', String(40), nullable=True)
3076 'last_merge_org_rev', String(40), nullable=True)
3065 # TODO: dan: rename column to last_merge_target_rev
3077 # TODO: dan: rename column to last_merge_target_rev
3066 _last_merge_target_rev = Column(
3078 _last_merge_target_rev = Column(
3067 'last_merge_other_rev', String(40), nullable=True)
3079 'last_merge_other_rev', String(40), nullable=True)
3068 _last_merge_status = Column('merge_status', Integer(), nullable=True)
3080 _last_merge_status = Column('merge_status', Integer(), nullable=True)
3069 merge_rev = Column('merge_rev', String(40), nullable=True)
3081 merge_rev = Column('merge_rev', String(40), nullable=True)
3070
3082
3071 @hybrid_property
3083 @hybrid_property
3072 def revisions(self):
3084 def revisions(self):
3073 return self._revisions.split(':') if self._revisions else []
3085 return self._revisions.split(':') if self._revisions else []
3074
3086
3075 @revisions.setter
3087 @revisions.setter
3076 def revisions(self, val):
3088 def revisions(self, val):
3077 self._revisions = ':'.join(val)
3089 self._revisions = ':'.join(val)
3078
3090
3079 @declared_attr
3091 @declared_attr
3080 def author(cls):
3092 def author(cls):
3081 return relationship('User', lazy='joined')
3093 return relationship('User', lazy='joined')
3082
3094
3083 @declared_attr
3095 @declared_attr
3084 def source_repo(cls):
3096 def source_repo(cls):
3085 return relationship(
3097 return relationship(
3086 'Repository',
3098 'Repository',
3087 primaryjoin='%s.source_repo_id==Repository.repo_id' % cls.__name__)
3099 primaryjoin='%s.source_repo_id==Repository.repo_id' % cls.__name__)
3088
3100
3089 @property
3101 @property
3090 def source_ref_parts(self):
3102 def source_ref_parts(self):
3091 return self.unicode_to_reference(self.source_ref)
3103 return self.unicode_to_reference(self.source_ref)
3092
3104
3093 @declared_attr
3105 @declared_attr
3094 def target_repo(cls):
3106 def target_repo(cls):
3095 return relationship(
3107 return relationship(
3096 'Repository',
3108 'Repository',
3097 primaryjoin='%s.target_repo_id==Repository.repo_id' % cls.__name__)
3109 primaryjoin='%s.target_repo_id==Repository.repo_id' % cls.__name__)
3098
3110
3099 @property
3111 @property
3100 def target_ref_parts(self):
3112 def target_ref_parts(self):
3101 return self.unicode_to_reference(self.target_ref)
3113 return self.unicode_to_reference(self.target_ref)
3102
3114
3103 @property
3115 @property
3104 def shadow_merge_ref(self):
3116 def shadow_merge_ref(self):
3105 return self.unicode_to_reference(self._shadow_merge_ref)
3117 return self.unicode_to_reference(self._shadow_merge_ref)
3106
3118
3107 @shadow_merge_ref.setter
3119 @shadow_merge_ref.setter
3108 def shadow_merge_ref(self, ref):
3120 def shadow_merge_ref(self, ref):
3109 self._shadow_merge_ref = self.reference_to_unicode(ref)
3121 self._shadow_merge_ref = self.reference_to_unicode(ref)
3110
3122
3111 def unicode_to_reference(self, raw):
3123 def unicode_to_reference(self, raw):
3112 """
3124 """
3113 Convert a unicode (or string) to a reference object.
3125 Convert a unicode (or string) to a reference object.
3114 If unicode evaluates to False it returns None.
3126 If unicode evaluates to False it returns None.
3115 """
3127 """
3116 if raw:
3128 if raw:
3117 refs = raw.split(':')
3129 refs = raw.split(':')
3118 return Reference(*refs)
3130 return Reference(*refs)
3119 else:
3131 else:
3120 return None
3132 return None
3121
3133
3122 def reference_to_unicode(self, ref):
3134 def reference_to_unicode(self, ref):
3123 """
3135 """
3124 Convert a reference object to unicode.
3136 Convert a reference object to unicode.
3125 If reference is None it returns None.
3137 If reference is None it returns None.
3126 """
3138 """
3127 if ref:
3139 if ref:
3128 return u':'.join(ref)
3140 return u':'.join(ref)
3129 else:
3141 else:
3130 return None
3142 return None
3131
3143
3132 def get_api_data(self):
3144 def get_api_data(self):
3133 from rhodecode.model.pull_request import PullRequestModel
3145 from rhodecode.model.pull_request import PullRequestModel
3134 pull_request = self
3146 pull_request = self
3135 merge_status = PullRequestModel().merge_status(pull_request)
3147 merge_status = PullRequestModel().merge_status(pull_request)
3136
3148
3137 pull_request_url = url(
3149 pull_request_url = url(
3138 'pullrequest_show', repo_name=self.target_repo.repo_name,
3150 'pullrequest_show', repo_name=self.target_repo.repo_name,
3139 pull_request_id=self.pull_request_id, qualified=True)
3151 pull_request_id=self.pull_request_id, qualified=True)
3140
3152
3141 merge_data = {
3153 merge_data = {
3142 'clone_url': PullRequestModel().get_shadow_clone_url(pull_request),
3154 'clone_url': PullRequestModel().get_shadow_clone_url(pull_request),
3143 'reference': (
3155 'reference': (
3144 pull_request.shadow_merge_ref._asdict()
3156 pull_request.shadow_merge_ref._asdict()
3145 if pull_request.shadow_merge_ref else None),
3157 if pull_request.shadow_merge_ref else None),
3146 }
3158 }
3147
3159
3148 data = {
3160 data = {
3149 'pull_request_id': pull_request.pull_request_id,
3161 'pull_request_id': pull_request.pull_request_id,
3150 'url': pull_request_url,
3162 'url': pull_request_url,
3151 'title': pull_request.title,
3163 'title': pull_request.title,
3152 'description': pull_request.description,
3164 'description': pull_request.description,
3153 'status': pull_request.status,
3165 'status': pull_request.status,
3154 'created_on': pull_request.created_on,
3166 'created_on': pull_request.created_on,
3155 'updated_on': pull_request.updated_on,
3167 'updated_on': pull_request.updated_on,
3156 'commit_ids': pull_request.revisions,
3168 'commit_ids': pull_request.revisions,
3157 'review_status': pull_request.calculated_review_status(),
3169 'review_status': pull_request.calculated_review_status(),
3158 'mergeable': {
3170 'mergeable': {
3159 'status': merge_status[0],
3171 'status': merge_status[0],
3160 'message': unicode(merge_status[1]),
3172 'message': unicode(merge_status[1]),
3161 },
3173 },
3162 'source': {
3174 'source': {
3163 'clone_url': pull_request.source_repo.clone_url(),
3175 'clone_url': pull_request.source_repo.clone_url(),
3164 'repository': pull_request.source_repo.repo_name,
3176 'repository': pull_request.source_repo.repo_name,
3165 'reference': {
3177 'reference': {
3166 'name': pull_request.source_ref_parts.name,
3178 'name': pull_request.source_ref_parts.name,
3167 'type': pull_request.source_ref_parts.type,
3179 'type': pull_request.source_ref_parts.type,
3168 'commit_id': pull_request.source_ref_parts.commit_id,
3180 'commit_id': pull_request.source_ref_parts.commit_id,
3169 },
3181 },
3170 },
3182 },
3171 'target': {
3183 'target': {
3172 'clone_url': pull_request.target_repo.clone_url(),
3184 'clone_url': pull_request.target_repo.clone_url(),
3173 'repository': pull_request.target_repo.repo_name,
3185 'repository': pull_request.target_repo.repo_name,
3174 'reference': {
3186 'reference': {
3175 'name': pull_request.target_ref_parts.name,
3187 'name': pull_request.target_ref_parts.name,
3176 'type': pull_request.target_ref_parts.type,
3188 'type': pull_request.target_ref_parts.type,
3177 'commit_id': pull_request.target_ref_parts.commit_id,
3189 'commit_id': pull_request.target_ref_parts.commit_id,
3178 },
3190 },
3179 },
3191 },
3180 'merge': merge_data,
3192 'merge': merge_data,
3181 'author': pull_request.author.get_api_data(include_secrets=False,
3193 'author': pull_request.author.get_api_data(include_secrets=False,
3182 details='basic'),
3194 details='basic'),
3183 'reviewers': [
3195 'reviewers': [
3184 {
3196 {
3185 'user': reviewer.get_api_data(include_secrets=False,
3197 'user': reviewer.get_api_data(include_secrets=False,
3186 details='basic'),
3198 details='basic'),
3187 'reasons': reasons,
3199 'reasons': reasons,
3188 'review_status': st[0][1].status if st else 'not_reviewed',
3200 'review_status': st[0][1].status if st else 'not_reviewed',
3189 }
3201 }
3190 for reviewer, reasons, st in pull_request.reviewers_statuses()
3202 for reviewer, reasons, st in pull_request.reviewers_statuses()
3191 ]
3203 ]
3192 }
3204 }
3193
3205
3194 return data
3206 return data
3195
3207
3196
3208
3197 class PullRequest(Base, _PullRequestBase):
3209 class PullRequest(Base, _PullRequestBase):
3198 __tablename__ = 'pull_requests'
3210 __tablename__ = 'pull_requests'
3199 __table_args__ = (
3211 __table_args__ = (
3200 {'extend_existing': True, 'mysql_engine': 'InnoDB',
3212 {'extend_existing': True, 'mysql_engine': 'InnoDB',
3201 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
3213 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
3202 )
3214 )
3203
3215
3204 pull_request_id = Column(
3216 pull_request_id = Column(
3205 'pull_request_id', Integer(), nullable=False, primary_key=True)
3217 'pull_request_id', Integer(), nullable=False, primary_key=True)
3206
3218
3207 def __repr__(self):
3219 def __repr__(self):
3208 if self.pull_request_id:
3220 if self.pull_request_id:
3209 return '<DB:PullRequest #%s>' % self.pull_request_id
3221 return '<DB:PullRequest #%s>' % self.pull_request_id
3210 else:
3222 else:
3211 return '<DB:PullRequest at %#x>' % id(self)
3223 return '<DB:PullRequest at %#x>' % id(self)
3212
3224
3213 reviewers = relationship('PullRequestReviewers',
3225 reviewers = relationship('PullRequestReviewers',
3214 cascade="all, delete, delete-orphan")
3226 cascade="all, delete, delete-orphan")
3215 statuses = relationship('ChangesetStatus')
3227 statuses = relationship('ChangesetStatus')
3216 comments = relationship('ChangesetComment',
3228 comments = relationship('ChangesetComment',
3217 cascade="all, delete, delete-orphan")
3229 cascade="all, delete, delete-orphan")
3218 versions = relationship('PullRequestVersion',
3230 versions = relationship('PullRequestVersion',
3219 cascade="all, delete, delete-orphan",
3231 cascade="all, delete, delete-orphan",
3220 lazy='dynamic')
3232 lazy='dynamic')
3221
3233
3222
3234
3223 @classmethod
3235 @classmethod
3224 def get_pr_display_object(cls, pull_request_obj, org_pull_request_obj,
3236 def get_pr_display_object(cls, pull_request_obj, org_pull_request_obj,
3225 internal_methods=None):
3237 internal_methods=None):
3226
3238
3227 class PullRequestDisplay(object):
3239 class PullRequestDisplay(object):
3228 """
3240 """
3229 Special object wrapper for showing PullRequest data via Versions
3241 Special object wrapper for showing PullRequest data via Versions
3230 It mimics PR object as close as possible. This is read only object
3242 It mimics PR object as close as possible. This is read only object
3231 just for display
3243 just for display
3232 """
3244 """
3233
3245
3234 def __init__(self, attrs, internal=None):
3246 def __init__(self, attrs, internal=None):
3235 self.attrs = attrs
3247 self.attrs = attrs
3236 # internal have priority over the given ones via attrs
3248 # internal have priority over the given ones via attrs
3237 self.internal = internal or ['versions']
3249 self.internal = internal or ['versions']
3238
3250
3239 def __getattr__(self, item):
3251 def __getattr__(self, item):
3240 if item in self.internal:
3252 if item in self.internal:
3241 return getattr(self, item)
3253 return getattr(self, item)
3242 try:
3254 try:
3243 return self.attrs[item]
3255 return self.attrs[item]
3244 except KeyError:
3256 except KeyError:
3245 raise AttributeError(
3257 raise AttributeError(
3246 '%s object has no attribute %s' % (self, item))
3258 '%s object has no attribute %s' % (self, item))
3247
3259
3248 def __repr__(self):
3260 def __repr__(self):
3249 return '<DB:PullRequestDisplay #%s>' % self.attrs.get('pull_request_id')
3261 return '<DB:PullRequestDisplay #%s>' % self.attrs.get('pull_request_id')
3250
3262
3251 def versions(self):
3263 def versions(self):
3252 return pull_request_obj.versions.order_by(
3264 return pull_request_obj.versions.order_by(
3253 PullRequestVersion.pull_request_version_id).all()
3265 PullRequestVersion.pull_request_version_id).all()
3254
3266
3255 def is_closed(self):
3267 def is_closed(self):
3256 return pull_request_obj.is_closed()
3268 return pull_request_obj.is_closed()
3257
3269
3258 attrs = StrictAttributeDict(pull_request_obj.get_api_data())
3270 attrs = StrictAttributeDict(pull_request_obj.get_api_data())
3259
3271
3260 attrs.author = StrictAttributeDict(
3272 attrs.author = StrictAttributeDict(
3261 pull_request_obj.author.get_api_data())
3273 pull_request_obj.author.get_api_data())
3262 if pull_request_obj.target_repo:
3274 if pull_request_obj.target_repo:
3263 attrs.target_repo = StrictAttributeDict(
3275 attrs.target_repo = StrictAttributeDict(
3264 pull_request_obj.target_repo.get_api_data())
3276 pull_request_obj.target_repo.get_api_data())
3265 attrs.target_repo.clone_url = pull_request_obj.target_repo.clone_url
3277 attrs.target_repo.clone_url = pull_request_obj.target_repo.clone_url
3266
3278
3267 if pull_request_obj.source_repo:
3279 if pull_request_obj.source_repo:
3268 attrs.source_repo = StrictAttributeDict(
3280 attrs.source_repo = StrictAttributeDict(
3269 pull_request_obj.source_repo.get_api_data())
3281 pull_request_obj.source_repo.get_api_data())
3270 attrs.source_repo.clone_url = pull_request_obj.source_repo.clone_url
3282 attrs.source_repo.clone_url = pull_request_obj.source_repo.clone_url
3271
3283
3272 attrs.source_ref_parts = pull_request_obj.source_ref_parts
3284 attrs.source_ref_parts = pull_request_obj.source_ref_parts
3273 attrs.target_ref_parts = pull_request_obj.target_ref_parts
3285 attrs.target_ref_parts = pull_request_obj.target_ref_parts
3274 attrs.revisions = pull_request_obj.revisions
3286 attrs.revisions = pull_request_obj.revisions
3275
3287
3276 attrs.shadow_merge_ref = org_pull_request_obj.shadow_merge_ref
3288 attrs.shadow_merge_ref = org_pull_request_obj.shadow_merge_ref
3277
3289
3278 return PullRequestDisplay(attrs, internal=internal_methods)
3290 return PullRequestDisplay(attrs, internal=internal_methods)
3279
3291
3280 def is_closed(self):
3292 def is_closed(self):
3281 return self.status == self.STATUS_CLOSED
3293 return self.status == self.STATUS_CLOSED
3282
3294
3283 def __json__(self):
3295 def __json__(self):
3284 return {
3296 return {
3285 'revisions': self.revisions,
3297 'revisions': self.revisions,
3286 }
3298 }
3287
3299
3288 def calculated_review_status(self):
3300 def calculated_review_status(self):
3289 from rhodecode.model.changeset_status import ChangesetStatusModel
3301 from rhodecode.model.changeset_status import ChangesetStatusModel
3290 return ChangesetStatusModel().calculated_review_status(self)
3302 return ChangesetStatusModel().calculated_review_status(self)
3291
3303
3292 def reviewers_statuses(self):
3304 def reviewers_statuses(self):
3293 from rhodecode.model.changeset_status import ChangesetStatusModel
3305 from rhodecode.model.changeset_status import ChangesetStatusModel
3294 return ChangesetStatusModel().reviewers_statuses(self)
3306 return ChangesetStatusModel().reviewers_statuses(self)
3295
3307
3296
3308
3297 class PullRequestVersion(Base, _PullRequestBase):
3309 class PullRequestVersion(Base, _PullRequestBase):
3298 __tablename__ = 'pull_request_versions'
3310 __tablename__ = 'pull_request_versions'
3299 __table_args__ = (
3311 __table_args__ = (
3300 {'extend_existing': True, 'mysql_engine': 'InnoDB',
3312 {'extend_existing': True, 'mysql_engine': 'InnoDB',
3301 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
3313 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
3302 )
3314 )
3303
3315
3304 pull_request_version_id = Column(
3316 pull_request_version_id = Column(
3305 'pull_request_version_id', Integer(), nullable=False, primary_key=True)
3317 'pull_request_version_id', Integer(), nullable=False, primary_key=True)
3306 pull_request_id = Column(
3318 pull_request_id = Column(
3307 'pull_request_id', Integer(),
3319 'pull_request_id', Integer(),
3308 ForeignKey('pull_requests.pull_request_id'), nullable=False)
3320 ForeignKey('pull_requests.pull_request_id'), nullable=False)
3309 pull_request = relationship('PullRequest')
3321 pull_request = relationship('PullRequest')
3310
3322
3311 def __repr__(self):
3323 def __repr__(self):
3312 if self.pull_request_version_id:
3324 if self.pull_request_version_id:
3313 return '<DB:PullRequestVersion #%s>' % self.pull_request_version_id
3325 return '<DB:PullRequestVersion #%s>' % self.pull_request_version_id
3314 else:
3326 else:
3315 return '<DB:PullRequestVersion at %#x>' % id(self)
3327 return '<DB:PullRequestVersion at %#x>' % id(self)
3316
3328
3317 @property
3329 @property
3318 def reviewers(self):
3330 def reviewers(self):
3319 return self.pull_request.reviewers
3331 return self.pull_request.reviewers
3320
3332
3321 @property
3333 @property
3322 def versions(self):
3334 def versions(self):
3323 return self.pull_request.versions
3335 return self.pull_request.versions
3324
3336
3325 def is_closed(self):
3337 def is_closed(self):
3326 # calculate from original
3338 # calculate from original
3327 return self.pull_request.status == self.STATUS_CLOSED
3339 return self.pull_request.status == self.STATUS_CLOSED
3328
3340
3329 def calculated_review_status(self):
3341 def calculated_review_status(self):
3330 return self.pull_request.calculated_review_status()
3342 return self.pull_request.calculated_review_status()
3331
3343
3332 def reviewers_statuses(self):
3344 def reviewers_statuses(self):
3333 return self.pull_request.reviewers_statuses()
3345 return self.pull_request.reviewers_statuses()
3334
3346
3335
3347
3336 class PullRequestReviewers(Base, BaseModel):
3348 class PullRequestReviewers(Base, BaseModel):
3337 __tablename__ = 'pull_request_reviewers'
3349 __tablename__ = 'pull_request_reviewers'
3338 __table_args__ = (
3350 __table_args__ = (
3339 {'extend_existing': True, 'mysql_engine': 'InnoDB',
3351 {'extend_existing': True, 'mysql_engine': 'InnoDB',
3340 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
3352 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
3341 )
3353 )
3342
3354
3343 def __init__(self, user=None, pull_request=None, reasons=None):
3355 def __init__(self, user=None, pull_request=None, reasons=None):
3344 self.user = user
3356 self.user = user
3345 self.pull_request = pull_request
3357 self.pull_request = pull_request
3346 self.reasons = reasons or []
3358 self.reasons = reasons or []
3347
3359
3348 @hybrid_property
3360 @hybrid_property
3349 def reasons(self):
3361 def reasons(self):
3350 if not self._reasons:
3362 if not self._reasons:
3351 return []
3363 return []
3352 return self._reasons
3364 return self._reasons
3353
3365
3354 @reasons.setter
3366 @reasons.setter
3355 def reasons(self, val):
3367 def reasons(self, val):
3356 val = val or []
3368 val = val or []
3357 if any(not isinstance(x, basestring) for x in val):
3369 if any(not isinstance(x, basestring) for x in val):
3358 raise Exception('invalid reasons type, must be list of strings')
3370 raise Exception('invalid reasons type, must be list of strings')
3359 self._reasons = val
3371 self._reasons = val
3360
3372
3361 pull_requests_reviewers_id = Column(
3373 pull_requests_reviewers_id = Column(
3362 'pull_requests_reviewers_id', Integer(), nullable=False,
3374 'pull_requests_reviewers_id', Integer(), nullable=False,
3363 primary_key=True)
3375 primary_key=True)
3364 pull_request_id = Column(
3376 pull_request_id = Column(
3365 "pull_request_id", Integer(),
3377 "pull_request_id", Integer(),
3366 ForeignKey('pull_requests.pull_request_id'), nullable=False)
3378 ForeignKey('pull_requests.pull_request_id'), nullable=False)
3367 user_id = Column(
3379 user_id = Column(
3368 "user_id", Integer(), ForeignKey('users.user_id'), nullable=True)
3380 "user_id", Integer(), ForeignKey('users.user_id'), nullable=True)
3369 _reasons = Column(
3381 _reasons = Column(
3370 'reason', MutationList.as_mutable(
3382 'reason', MutationList.as_mutable(
3371 JsonType('list', dialect_map=dict(mysql=UnicodeText(16384)))))
3383 JsonType('list', dialect_map=dict(mysql=UnicodeText(16384)))))
3372
3384
3373 user = relationship('User')
3385 user = relationship('User')
3374 pull_request = relationship('PullRequest')
3386 pull_request = relationship('PullRequest')
3375
3387
3376
3388
3377 class Notification(Base, BaseModel):
3389 class Notification(Base, BaseModel):
3378 __tablename__ = 'notifications'
3390 __tablename__ = 'notifications'
3379 __table_args__ = (
3391 __table_args__ = (
3380 Index('notification_type_idx', 'type'),
3392 Index('notification_type_idx', 'type'),
3381 {'extend_existing': True, 'mysql_engine': 'InnoDB',
3393 {'extend_existing': True, 'mysql_engine': 'InnoDB',
3382 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
3394 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
3383 )
3395 )
3384
3396
3385 TYPE_CHANGESET_COMMENT = u'cs_comment'
3397 TYPE_CHANGESET_COMMENT = u'cs_comment'
3386 TYPE_MESSAGE = u'message'
3398 TYPE_MESSAGE = u'message'
3387 TYPE_MENTION = u'mention'
3399 TYPE_MENTION = u'mention'
3388 TYPE_REGISTRATION = u'registration'
3400 TYPE_REGISTRATION = u'registration'
3389 TYPE_PULL_REQUEST = u'pull_request'
3401 TYPE_PULL_REQUEST = u'pull_request'
3390 TYPE_PULL_REQUEST_COMMENT = u'pull_request_comment'
3402 TYPE_PULL_REQUEST_COMMENT = u'pull_request_comment'
3391
3403
3392 notification_id = Column('notification_id', Integer(), nullable=False, primary_key=True)
3404 notification_id = Column('notification_id', Integer(), nullable=False, primary_key=True)
3393 subject = Column('subject', Unicode(512), nullable=True)
3405 subject = Column('subject', Unicode(512), nullable=True)
3394 body = Column('body', UnicodeText().with_variant(UnicodeText(50000), 'mysql'), nullable=True)
3406 body = Column('body', UnicodeText().with_variant(UnicodeText(50000), 'mysql'), nullable=True)
3395 created_by = Column("created_by", Integer(), ForeignKey('users.user_id'), nullable=True)
3407 created_by = Column("created_by", Integer(), ForeignKey('users.user_id'), nullable=True)
3396 created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
3408 created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
3397 type_ = Column('type', Unicode(255))
3409 type_ = Column('type', Unicode(255))
3398
3410
3399 created_by_user = relationship('User')
3411 created_by_user = relationship('User')
3400 notifications_to_users = relationship('UserNotification', lazy='joined',
3412 notifications_to_users = relationship('UserNotification', lazy='joined',
3401 cascade="all, delete, delete-orphan")
3413 cascade="all, delete, delete-orphan")
3402
3414
3403 @property
3415 @property
3404 def recipients(self):
3416 def recipients(self):
3405 return [x.user for x in UserNotification.query()\
3417 return [x.user for x in UserNotification.query()\
3406 .filter(UserNotification.notification == self)\
3418 .filter(UserNotification.notification == self)\
3407 .order_by(UserNotification.user_id.asc()).all()]
3419 .order_by(UserNotification.user_id.asc()).all()]
3408
3420
3409 @classmethod
3421 @classmethod
3410 def create(cls, created_by, subject, body, recipients, type_=None):
3422 def create(cls, created_by, subject, body, recipients, type_=None):
3411 if type_ is None:
3423 if type_ is None:
3412 type_ = Notification.TYPE_MESSAGE
3424 type_ = Notification.TYPE_MESSAGE
3413
3425
3414 notification = cls()
3426 notification = cls()
3415 notification.created_by_user = created_by
3427 notification.created_by_user = created_by
3416 notification.subject = subject
3428 notification.subject = subject
3417 notification.body = body
3429 notification.body = body
3418 notification.type_ = type_
3430 notification.type_ = type_
3419 notification.created_on = datetime.datetime.now()
3431 notification.created_on = datetime.datetime.now()
3420
3432
3421 for u in recipients:
3433 for u in recipients:
3422 assoc = UserNotification()
3434 assoc = UserNotification()
3423 assoc.notification = notification
3435 assoc.notification = notification
3424
3436
3425 # if created_by is inside recipients mark his notification
3437 # if created_by is inside recipients mark his notification
3426 # as read
3438 # as read
3427 if u.user_id == created_by.user_id:
3439 if u.user_id == created_by.user_id:
3428 assoc.read = True
3440 assoc.read = True
3429
3441
3430 u.notifications.append(assoc)
3442 u.notifications.append(assoc)
3431 Session().add(notification)
3443 Session().add(notification)
3432
3444
3433 return notification
3445 return notification
3434
3446
3435 @property
3447 @property
3436 def description(self):
3448 def description(self):
3437 from rhodecode.model.notification import NotificationModel
3449 from rhodecode.model.notification import NotificationModel
3438 return NotificationModel().make_description(self)
3450 return NotificationModel().make_description(self)
3439
3451
3440
3452
3441 class UserNotification(Base, BaseModel):
3453 class UserNotification(Base, BaseModel):
3442 __tablename__ = 'user_to_notification'
3454 __tablename__ = 'user_to_notification'
3443 __table_args__ = (
3455 __table_args__ = (
3444 UniqueConstraint('user_id', 'notification_id'),
3456 UniqueConstraint('user_id', 'notification_id'),
3445 {'extend_existing': True, 'mysql_engine': 'InnoDB',
3457 {'extend_existing': True, 'mysql_engine': 'InnoDB',
3446 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
3458 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
3447 )
3459 )
3448 user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), primary_key=True)
3460 user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), primary_key=True)
3449 notification_id = Column("notification_id", Integer(), ForeignKey('notifications.notification_id'), primary_key=True)
3461 notification_id = Column("notification_id", Integer(), ForeignKey('notifications.notification_id'), primary_key=True)
3450 read = Column('read', Boolean, default=False)
3462 read = Column('read', Boolean, default=False)
3451 sent_on = Column('sent_on', DateTime(timezone=False), nullable=True, unique=None)
3463 sent_on = Column('sent_on', DateTime(timezone=False), nullable=True, unique=None)
3452
3464
3453 user = relationship('User', lazy="joined")
3465 user = relationship('User', lazy="joined")
3454 notification = relationship('Notification', lazy="joined",
3466 notification = relationship('Notification', lazy="joined",
3455 order_by=lambda: Notification.created_on.desc(),)
3467 order_by=lambda: Notification.created_on.desc(),)
3456
3468
3457 def mark_as_read(self):
3469 def mark_as_read(self):
3458 self.read = True
3470 self.read = True
3459 Session().add(self)
3471 Session().add(self)
3460
3472
3461
3473
3462 class Gist(Base, BaseModel):
3474 class Gist(Base, BaseModel):
3463 __tablename__ = 'gists'
3475 __tablename__ = 'gists'
3464 __table_args__ = (
3476 __table_args__ = (
3465 Index('g_gist_access_id_idx', 'gist_access_id'),
3477 Index('g_gist_access_id_idx', 'gist_access_id'),
3466 Index('g_created_on_idx', 'created_on'),
3478 Index('g_created_on_idx', 'created_on'),
3467 {'extend_existing': True, 'mysql_engine': 'InnoDB',
3479 {'extend_existing': True, 'mysql_engine': 'InnoDB',
3468 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
3480 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
3469 )
3481 )
3470 GIST_PUBLIC = u'public'
3482 GIST_PUBLIC = u'public'
3471 GIST_PRIVATE = u'private'
3483 GIST_PRIVATE = u'private'
3472 DEFAULT_FILENAME = u'gistfile1.txt'
3484 DEFAULT_FILENAME = u'gistfile1.txt'
3473
3485
3474 ACL_LEVEL_PUBLIC = u'acl_public'
3486 ACL_LEVEL_PUBLIC = u'acl_public'
3475 ACL_LEVEL_PRIVATE = u'acl_private'
3487 ACL_LEVEL_PRIVATE = u'acl_private'
3476
3488
3477 gist_id = Column('gist_id', Integer(), primary_key=True)
3489 gist_id = Column('gist_id', Integer(), primary_key=True)
3478 gist_access_id = Column('gist_access_id', Unicode(250))
3490 gist_access_id = Column('gist_access_id', Unicode(250))
3479 gist_description = Column('gist_description', UnicodeText().with_variant(UnicodeText(1024), 'mysql'))
3491 gist_description = Column('gist_description', UnicodeText().with_variant(UnicodeText(1024), 'mysql'))
3480 gist_owner = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=True)
3492 gist_owner = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=True)
3481 gist_expires = Column('gist_expires', Float(53), nullable=False)
3493 gist_expires = Column('gist_expires', Float(53), nullable=False)
3482 gist_type = Column('gist_type', Unicode(128), nullable=False)
3494 gist_type = Column('gist_type', Unicode(128), nullable=False)
3483 created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
3495 created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
3484 modified_at = Column('modified_at', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
3496 modified_at = Column('modified_at', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
3485 acl_level = Column('acl_level', Unicode(128), nullable=True)
3497 acl_level = Column('acl_level', Unicode(128), nullable=True)
3486
3498
3487 owner = relationship('User')
3499 owner = relationship('User')
3488
3500
3489 def __repr__(self):
3501 def __repr__(self):
3490 return '<Gist:[%s]%s>' % (self.gist_type, self.gist_access_id)
3502 return '<Gist:[%s]%s>' % (self.gist_type, self.gist_access_id)
3491
3503
3492 @classmethod
3504 @classmethod
3493 def get_or_404(cls, id_):
3505 def get_or_404(cls, id_):
3494 res = cls.query().filter(cls.gist_access_id == id_).scalar()
3506 res = cls.query().filter(cls.gist_access_id == id_).scalar()
3495 if not res:
3507 if not res:
3496 raise HTTPNotFound
3508 raise HTTPNotFound
3497 return res
3509 return res
3498
3510
3499 @classmethod
3511 @classmethod
3500 def get_by_access_id(cls, gist_access_id):
3512 def get_by_access_id(cls, gist_access_id):
3501 return cls.query().filter(cls.gist_access_id == gist_access_id).scalar()
3513 return cls.query().filter(cls.gist_access_id == gist_access_id).scalar()
3502
3514
3503 def gist_url(self):
3515 def gist_url(self):
3504 import rhodecode
3516 import rhodecode
3505 alias_url = rhodecode.CONFIG.get('gist_alias_url')
3517 alias_url = rhodecode.CONFIG.get('gist_alias_url')
3506 if alias_url:
3518 if alias_url:
3507 return alias_url.replace('{gistid}', self.gist_access_id)
3519 return alias_url.replace('{gistid}', self.gist_access_id)
3508
3520
3509 return url('gist', gist_id=self.gist_access_id, qualified=True)
3521 return url('gist', gist_id=self.gist_access_id, qualified=True)
3510
3522
3511 @classmethod
3523 @classmethod
3512 def base_path(cls):
3524 def base_path(cls):
3513 """
3525 """
3514 Returns base path when all gists are stored
3526 Returns base path when all gists are stored
3515
3527
3516 :param cls:
3528 :param cls:
3517 """
3529 """
3518 from rhodecode.model.gist import GIST_STORE_LOC
3530 from rhodecode.model.gist import GIST_STORE_LOC
3519 q = Session().query(RhodeCodeUi)\
3531 q = Session().query(RhodeCodeUi)\
3520 .filter(RhodeCodeUi.ui_key == URL_SEP)
3532 .filter(RhodeCodeUi.ui_key == URL_SEP)
3521 q = q.options(FromCache("sql_cache_short", "repository_repo_path"))
3533 q = q.options(FromCache("sql_cache_short", "repository_repo_path"))
3522 return os.path.join(q.one().ui_value, GIST_STORE_LOC)
3534 return os.path.join(q.one().ui_value, GIST_STORE_LOC)
3523
3535
3524 def get_api_data(self):
3536 def get_api_data(self):
3525 """
3537 """
3526 Common function for generating gist related data for API
3538 Common function for generating gist related data for API
3527 """
3539 """
3528 gist = self
3540 gist = self
3529 data = {
3541 data = {
3530 'gist_id': gist.gist_id,
3542 'gist_id': gist.gist_id,
3531 'type': gist.gist_type,
3543 'type': gist.gist_type,
3532 'access_id': gist.gist_access_id,
3544 'access_id': gist.gist_access_id,
3533 'description': gist.gist_description,
3545 'description': gist.gist_description,
3534 'url': gist.gist_url(),
3546 'url': gist.gist_url(),
3535 'expires': gist.gist_expires,
3547 'expires': gist.gist_expires,
3536 'created_on': gist.created_on,
3548 'created_on': gist.created_on,
3537 'modified_at': gist.modified_at,
3549 'modified_at': gist.modified_at,
3538 'content': None,
3550 'content': None,
3539 'acl_level': gist.acl_level,
3551 'acl_level': gist.acl_level,
3540 }
3552 }
3541 return data
3553 return data
3542
3554
3543 def __json__(self):
3555 def __json__(self):
3544 data = dict(
3556 data = dict(
3545 )
3557 )
3546 data.update(self.get_api_data())
3558 data.update(self.get_api_data())
3547 return data
3559 return data
3548 # SCM functions
3560 # SCM functions
3549
3561
3550 def scm_instance(self, **kwargs):
3562 def scm_instance(self, **kwargs):
3551 full_repo_path = os.path.join(self.base_path(), self.gist_access_id)
3563 full_repo_path = os.path.join(self.base_path(), self.gist_access_id)
3552 return get_vcs_instance(
3564 return get_vcs_instance(
3553 repo_path=safe_str(full_repo_path), create=False)
3565 repo_path=safe_str(full_repo_path), create=False)
3554
3566
3555
3567
3556 class DbMigrateVersion(Base, BaseModel):
3568 class DbMigrateVersion(Base, BaseModel):
3557 __tablename__ = 'db_migrate_version'
3569 __tablename__ = 'db_migrate_version'
3558 __table_args__ = (
3570 __table_args__ = (
3559 {'extend_existing': True, 'mysql_engine': 'InnoDB',
3571 {'extend_existing': True, 'mysql_engine': 'InnoDB',
3560 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
3572 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
3561 )
3573 )
3562 repository_id = Column('repository_id', String(250), primary_key=True)
3574 repository_id = Column('repository_id', String(250), primary_key=True)
3563 repository_path = Column('repository_path', Text)
3575 repository_path = Column('repository_path', Text)
3564 version = Column('version', Integer)
3576 version = Column('version', Integer)
3565
3577
3566
3578
3567 class ExternalIdentity(Base, BaseModel):
3579 class ExternalIdentity(Base, BaseModel):
3568 __tablename__ = 'external_identities'
3580 __tablename__ = 'external_identities'
3569 __table_args__ = (
3581 __table_args__ = (
3570 Index('local_user_id_idx', 'local_user_id'),
3582 Index('local_user_id_idx', 'local_user_id'),
3571 Index('external_id_idx', 'external_id'),
3583 Index('external_id_idx', 'external_id'),
3572 {'extend_existing': True, 'mysql_engine': 'InnoDB',
3584 {'extend_existing': True, 'mysql_engine': 'InnoDB',
3573 'mysql_charset': 'utf8'})
3585 'mysql_charset': 'utf8'})
3574
3586
3575 external_id = Column('external_id', Unicode(255), default=u'',
3587 external_id = Column('external_id', Unicode(255), default=u'',
3576 primary_key=True)
3588 primary_key=True)
3577 external_username = Column('external_username', Unicode(1024), default=u'')
3589 external_username = Column('external_username', Unicode(1024), default=u'')
3578 local_user_id = Column('local_user_id', Integer(),
3590 local_user_id = Column('local_user_id', Integer(),
3579 ForeignKey('users.user_id'), primary_key=True)
3591 ForeignKey('users.user_id'), primary_key=True)
3580 provider_name = Column('provider_name', Unicode(255), default=u'',
3592 provider_name = Column('provider_name', Unicode(255), default=u'',
3581 primary_key=True)
3593 primary_key=True)
3582 access_token = Column('access_token', String(1024), default=u'')
3594 access_token = Column('access_token', String(1024), default=u'')
3583 alt_token = Column('alt_token', String(1024), default=u'')
3595 alt_token = Column('alt_token', String(1024), default=u'')
3584 token_secret = Column('token_secret', String(1024), default=u'')
3596 token_secret = Column('token_secret', String(1024), default=u'')
3585
3597
3586 @classmethod
3598 @classmethod
3587 def by_external_id_and_provider(cls, external_id, provider_name,
3599 def by_external_id_and_provider(cls, external_id, provider_name,
3588 local_user_id=None):
3600 local_user_id=None):
3589 """
3601 """
3590 Returns ExternalIdentity instance based on search params
3602 Returns ExternalIdentity instance based on search params
3591
3603
3592 :param external_id:
3604 :param external_id:
3593 :param provider_name:
3605 :param provider_name:
3594 :return: ExternalIdentity
3606 :return: ExternalIdentity
3595 """
3607 """
3596 query = cls.query()
3608 query = cls.query()
3597 query = query.filter(cls.external_id == external_id)
3609 query = query.filter(cls.external_id == external_id)
3598 query = query.filter(cls.provider_name == provider_name)
3610 query = query.filter(cls.provider_name == provider_name)
3599 if local_user_id:
3611 if local_user_id:
3600 query = query.filter(cls.local_user_id == local_user_id)
3612 query = query.filter(cls.local_user_id == local_user_id)
3601 return query.first()
3613 return query.first()
3602
3614
3603 @classmethod
3615 @classmethod
3604 def user_by_external_id_and_provider(cls, external_id, provider_name):
3616 def user_by_external_id_and_provider(cls, external_id, provider_name):
3605 """
3617 """
3606 Returns User instance based on search params
3618 Returns User instance based on search params
3607
3619
3608 :param external_id:
3620 :param external_id:
3609 :param provider_name:
3621 :param provider_name:
3610 :return: User
3622 :return: User
3611 """
3623 """
3612 query = User.query()
3624 query = User.query()
3613 query = query.filter(cls.external_id == external_id)
3625 query = query.filter(cls.external_id == external_id)
3614 query = query.filter(cls.provider_name == provider_name)
3626 query = query.filter(cls.provider_name == provider_name)
3615 query = query.filter(User.user_id == cls.local_user_id)
3627 query = query.filter(User.user_id == cls.local_user_id)
3616 return query.first()
3628 return query.first()
3617
3629
3618 @classmethod
3630 @classmethod
3619 def by_local_user_id(cls, local_user_id):
3631 def by_local_user_id(cls, local_user_id):
3620 """
3632 """
3621 Returns all tokens for user
3633 Returns all tokens for user
3622
3634
3623 :param local_user_id:
3635 :param local_user_id:
3624 :return: ExternalIdentity
3636 :return: ExternalIdentity
3625 """
3637 """
3626 query = cls.query()
3638 query = cls.query()
3627 query = query.filter(cls.local_user_id == local_user_id)
3639 query = query.filter(cls.local_user_id == local_user_id)
3628 return query
3640 return query
3629
3641
3630
3642
3631 class Integration(Base, BaseModel):
3643 class Integration(Base, BaseModel):
3632 __tablename__ = 'integrations'
3644 __tablename__ = 'integrations'
3633 __table_args__ = (
3645 __table_args__ = (
3634 {'extend_existing': True, 'mysql_engine': 'InnoDB',
3646 {'extend_existing': True, 'mysql_engine': 'InnoDB',
3635 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
3647 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
3636 )
3648 )
3637
3649
3638 integration_id = Column('integration_id', Integer(), primary_key=True)
3650 integration_id = Column('integration_id', Integer(), primary_key=True)
3639 integration_type = Column('integration_type', String(255))
3651 integration_type = Column('integration_type', String(255))
3640 enabled = Column('enabled', Boolean(), nullable=False)
3652 enabled = Column('enabled', Boolean(), nullable=False)
3641 name = Column('name', String(255), nullable=False)
3653 name = Column('name', String(255), nullable=False)
3642 child_repos_only = Column('child_repos_only', Boolean(), nullable=False,
3654 child_repos_only = Column('child_repos_only', Boolean(), nullable=False,
3643 default=False)
3655 default=False)
3644
3656
3645 settings = Column(
3657 settings = Column(
3646 'settings_json', MutationObj.as_mutable(
3658 'settings_json', MutationObj.as_mutable(
3647 JsonType(dialect_map=dict(mysql=UnicodeText(16384)))))
3659 JsonType(dialect_map=dict(mysql=UnicodeText(16384)))))
3648 repo_id = Column(
3660 repo_id = Column(
3649 'repo_id', Integer(), ForeignKey('repositories.repo_id'),
3661 'repo_id', Integer(), ForeignKey('repositories.repo_id'),
3650 nullable=True, unique=None, default=None)
3662 nullable=True, unique=None, default=None)
3651 repo = relationship('Repository', lazy='joined')
3663 repo = relationship('Repository', lazy='joined')
3652
3664
3653 repo_group_id = Column(
3665 repo_group_id = Column(
3654 'repo_group_id', Integer(), ForeignKey('groups.group_id'),
3666 'repo_group_id', Integer(), ForeignKey('groups.group_id'),
3655 nullable=True, unique=None, default=None)
3667 nullable=True, unique=None, default=None)
3656 repo_group = relationship('RepoGroup', lazy='joined')
3668 repo_group = relationship('RepoGroup', lazy='joined')
3657
3669
3658 @property
3670 @property
3659 def scope(self):
3671 def scope(self):
3660 if self.repo:
3672 if self.repo:
3661 return repr(self.repo)
3673 return repr(self.repo)
3662 if self.repo_group:
3674 if self.repo_group:
3663 if self.child_repos_only:
3675 if self.child_repos_only:
3664 return repr(self.repo_group) + ' (child repos only)'
3676 return repr(self.repo_group) + ' (child repos only)'
3665 else:
3677 else:
3666 return repr(self.repo_group) + ' (recursive)'
3678 return repr(self.repo_group) + ' (recursive)'
3667 if self.child_repos_only:
3679 if self.child_repos_only:
3668 return 'root_repos'
3680 return 'root_repos'
3669 return 'global'
3681 return 'global'
3670
3682
3671 def __repr__(self):
3683 def __repr__(self):
3672 return '<Integration(%r, %r)>' % (self.integration_type, self.scope)
3684 return '<Integration(%r, %r)>' % (self.integration_type, self.scope)
3673
3685
3674
3686
3675 class RepoReviewRuleUser(Base, BaseModel):
3687 class RepoReviewRuleUser(Base, BaseModel):
3676 __tablename__ = 'repo_review_rules_users'
3688 __tablename__ = 'repo_review_rules_users'
3677 __table_args__ = (
3689 __table_args__ = (
3678 {'extend_existing': True, 'mysql_engine': 'InnoDB',
3690 {'extend_existing': True, 'mysql_engine': 'InnoDB',
3679 'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
3691 'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
3680 )
3692 )
3681 repo_review_rule_user_id = Column(
3693 repo_review_rule_user_id = Column(
3682 'repo_review_rule_user_id', Integer(), primary_key=True)
3694 'repo_review_rule_user_id', Integer(), primary_key=True)
3683 repo_review_rule_id = Column("repo_review_rule_id",
3695 repo_review_rule_id = Column("repo_review_rule_id",
3684 Integer(), ForeignKey('repo_review_rules.repo_review_rule_id'))
3696 Integer(), ForeignKey('repo_review_rules.repo_review_rule_id'))
3685 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'),
3697 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'),
3686 nullable=False)
3698 nullable=False)
3687 user = relationship('User')
3699 user = relationship('User')
3688
3700
3689
3701
3690 class RepoReviewRuleUserGroup(Base, BaseModel):
3702 class RepoReviewRuleUserGroup(Base, BaseModel):
3691 __tablename__ = 'repo_review_rules_users_groups'
3703 __tablename__ = 'repo_review_rules_users_groups'
3692 __table_args__ = (
3704 __table_args__ = (
3693 {'extend_existing': True, 'mysql_engine': 'InnoDB',
3705 {'extend_existing': True, 'mysql_engine': 'InnoDB',
3694 'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
3706 'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
3695 )
3707 )
3696 repo_review_rule_users_group_id = Column(
3708 repo_review_rule_users_group_id = Column(
3697 'repo_review_rule_users_group_id', Integer(), primary_key=True)
3709 'repo_review_rule_users_group_id', Integer(), primary_key=True)
3698 repo_review_rule_id = Column("repo_review_rule_id",
3710 repo_review_rule_id = Column("repo_review_rule_id",
3699 Integer(), ForeignKey('repo_review_rules.repo_review_rule_id'))
3711 Integer(), ForeignKey('repo_review_rules.repo_review_rule_id'))
3700 users_group_id = Column("users_group_id", Integer(),
3712 users_group_id = Column("users_group_id", Integer(),
3701 ForeignKey('users_groups.users_group_id'), nullable=False)
3713 ForeignKey('users_groups.users_group_id'), nullable=False)
3702 users_group = relationship('UserGroup')
3714 users_group = relationship('UserGroup')
3703
3715
3704
3716
3705 class RepoReviewRule(Base, BaseModel):
3717 class RepoReviewRule(Base, BaseModel):
3706 __tablename__ = 'repo_review_rules'
3718 __tablename__ = 'repo_review_rules'
3707 __table_args__ = (
3719 __table_args__ = (
3708 {'extend_existing': True, 'mysql_engine': 'InnoDB',
3720 {'extend_existing': True, 'mysql_engine': 'InnoDB',
3709 'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
3721 'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
3710 )
3722 )
3711
3723
3712 repo_review_rule_id = Column(
3724 repo_review_rule_id = Column(
3713 'repo_review_rule_id', Integer(), primary_key=True)
3725 'repo_review_rule_id', Integer(), primary_key=True)
3714 repo_id = Column(
3726 repo_id = Column(
3715 "repo_id", Integer(), ForeignKey('repositories.repo_id'))
3727 "repo_id", Integer(), ForeignKey('repositories.repo_id'))
3716 repo = relationship('Repository', backref='review_rules')
3728 repo = relationship('Repository', backref='review_rules')
3717
3729
3718 _branch_pattern = Column("branch_pattern", UnicodeText().with_variant(UnicodeText(255), 'mysql'),
3730 _branch_pattern = Column("branch_pattern", UnicodeText().with_variant(UnicodeText(255), 'mysql'),
3719 default=u'*') # glob
3731 default=u'*') # glob
3720 _file_pattern = Column("file_pattern", UnicodeText().with_variant(UnicodeText(255), 'mysql'),
3732 _file_pattern = Column("file_pattern", UnicodeText().with_variant(UnicodeText(255), 'mysql'),
3721 default=u'*') # glob
3733 default=u'*') # glob
3722
3734
3723 use_authors_for_review = Column("use_authors_for_review", Boolean(),
3735 use_authors_for_review = Column("use_authors_for_review", Boolean(),
3724 nullable=False, default=False)
3736 nullable=False, default=False)
3725 rule_users = relationship('RepoReviewRuleUser')
3737 rule_users = relationship('RepoReviewRuleUser')
3726 rule_user_groups = relationship('RepoReviewRuleUserGroup')
3738 rule_user_groups = relationship('RepoReviewRuleUserGroup')
3727
3739
3728 @hybrid_property
3740 @hybrid_property
3729 def branch_pattern(self):
3741 def branch_pattern(self):
3730 return self._branch_pattern or '*'
3742 return self._branch_pattern or '*'
3731
3743
3732 def _validate_glob(self, value):
3744 def _validate_glob(self, value):
3733 re.compile('^' + glob2re(value) + '$')
3745 re.compile('^' + glob2re(value) + '$')
3734
3746
3735 @branch_pattern.setter
3747 @branch_pattern.setter
3736 def branch_pattern(self, value):
3748 def branch_pattern(self, value):
3737 self._validate_glob(value)
3749 self._validate_glob(value)
3738 self._branch_pattern = value or '*'
3750 self._branch_pattern = value or '*'
3739
3751
3740 @hybrid_property
3752 @hybrid_property
3741 def file_pattern(self):
3753 def file_pattern(self):
3742 return self._file_pattern or '*'
3754 return self._file_pattern or '*'
3743
3755
3744 @file_pattern.setter
3756 @file_pattern.setter
3745 def file_pattern(self, value):
3757 def file_pattern(self, value):
3746 self._validate_glob(value)
3758 self._validate_glob(value)
3747 self._file_pattern = value or '*'
3759 self._file_pattern = value or '*'
3748
3760
3749 def matches(self, branch, files_changed):
3761 def matches(self, branch, files_changed):
3750 """
3762 """
3751 Check if this review rule matches a branch/files in a pull request
3763 Check if this review rule matches a branch/files in a pull request
3752
3764
3753 :param branch: branch name for the commit
3765 :param branch: branch name for the commit
3754 :param files_changed: list of file paths changed in the pull request
3766 :param files_changed: list of file paths changed in the pull request
3755 """
3767 """
3756
3768
3757 branch = branch or ''
3769 branch = branch or ''
3758 files_changed = files_changed or []
3770 files_changed = files_changed or []
3759
3771
3760 branch_matches = True
3772 branch_matches = True
3761 if branch:
3773 if branch:
3762 branch_regex = re.compile('^' + glob2re(self.branch_pattern) + '$')
3774 branch_regex = re.compile('^' + glob2re(self.branch_pattern) + '$')
3763 branch_matches = bool(branch_regex.search(branch))
3775 branch_matches = bool(branch_regex.search(branch))
3764
3776
3765 files_matches = True
3777 files_matches = True
3766 if self.file_pattern != '*':
3778 if self.file_pattern != '*':
3767 files_matches = False
3779 files_matches = False
3768 file_regex = re.compile(glob2re(self.file_pattern))
3780 file_regex = re.compile(glob2re(self.file_pattern))
3769 for filename in files_changed:
3781 for filename in files_changed:
3770 if file_regex.search(filename):
3782 if file_regex.search(filename):
3771 files_matches = True
3783 files_matches = True
3772 break
3784 break
3773
3785
3774 return branch_matches and files_matches
3786 return branch_matches and files_matches
3775
3787
3776 @property
3788 @property
3777 def review_users(self):
3789 def review_users(self):
3778 """ Returns the users which this rule applies to """
3790 """ Returns the users which this rule applies to """
3779
3791
3780 users = set()
3792 users = set()
3781 users |= set([
3793 users |= set([
3782 rule_user.user for rule_user in self.rule_users
3794 rule_user.user for rule_user in self.rule_users
3783 if rule_user.user.active])
3795 if rule_user.user.active])
3784 users |= set(
3796 users |= set(
3785 member.user
3797 member.user
3786 for rule_user_group in self.rule_user_groups
3798 for rule_user_group in self.rule_user_groups
3787 for member in rule_user_group.users_group.members
3799 for member in rule_user_group.users_group.members
3788 if member.user.active
3800 if member.user.active
3789 )
3801 )
3790 return users
3802 return users
3791
3803
3792 def __repr__(self):
3804 def __repr__(self):
3793 return '<RepoReviewerRule(id=%r, repo=%r)>' % (
3805 return '<RepoReviewerRule(id=%r, repo=%r)>' % (
3794 self.repo_review_rule_id, self.repo)
3806 self.repo_review_rule_id, self.repo)
@@ -1,407 +1,432 b''
1 // comments.less
1 // comments.less
2 // For use in RhodeCode applications;
2 // For use in RhodeCode applications;
3 // see style guide documentation for guidelines.
3 // see style guide documentation for guidelines.
4
4
5
5
6 // Comments
6 // Comments
7 .comments {
7 .comments {
8 width: 100%;
8 width: 100%;
9 }
9 }
10
10
11 tr.inline-comments div {
11 tr.inline-comments div {
12 max-width: 100%;
12 max-width: 100%;
13
13
14 p {
14 p {
15 white-space: normal;
15 white-space: normal;
16 }
16 }
17
17
18 code, pre, .code, dd {
18 code, pre, .code, dd {
19 overflow-x: auto;
19 overflow-x: auto;
20 width: 1062px;
20 width: 1062px;
21 }
21 }
22
22
23 dd {
23 dd {
24 width: auto;
24 width: auto;
25 }
25 }
26 }
26 }
27
27
28 #injected_page_comments {
28 #injected_page_comments {
29 .comment-previous-link,
29 .comment-previous-link,
30 .comment-next-link,
30 .comment-next-link,
31 .comment-links-divider {
31 .comment-links-divider {
32 display: none;
32 display: none;
33 }
33 }
34 }
34 }
35
35
36 .add-comment {
36 .add-comment {
37 margin-bottom: 10px;
37 margin-bottom: 10px;
38 }
38 }
39 .hide-comment-button .add-comment {
39 .hide-comment-button .add-comment {
40 display: none;
40 display: none;
41 }
41 }
42
42
43 .comment-bubble {
43 .comment-bubble {
44 color: @grey4;
44 color: @grey4;
45 margin-top: 4px;
45 margin-top: 4px;
46 margin-right: 30px;
46 margin-right: 30px;
47 visibility: hidden;
47 visibility: hidden;
48 }
48 }
49
49
50 .comment {
50 .comment {
51
52 &.comment-general {
53 border: 1px solid @grey5;
54 padding: 5px 5px 5px 5px;
55 }
56
51 margin: @padding 0;
57 margin: @padding 0;
52 padding: 4px 0 0 0;
58 padding: 4px 0 0 0;
53 line-height: 1em;
59 line-height: 1em;
54
60
55 .rc-user {
61 .rc-user {
56 min-width: 0;
62 min-width: 0;
57 margin: -2px .5em 0 0;
63 margin: -2px .5em 0 0;
58 }
64 }
59
65
60 .meta {
66 .meta {
61 position: relative;
67 position: relative;
62 width: 100%;
68 width: 100%;
63 margin: 0 0 .5em 0;
69 margin: 0 0 .5em 0;
70 border-bottom: 1px solid @grey5;
71 padding: 8px 0px;
64
72
65 &:hover .permalink {
73 &:hover .permalink {
66 visibility: visible;
74 visibility: visible;
67 color: @rcblue;
75 color: @rcblue;
68 }
76 }
69 }
77 }
70
78
71 .author,
79 .author,
72 .date {
80 .date {
73 display: inline;
81 display: inline;
74 margin: 0 .5 0 0;
75 padding: 0 .5 0 0;
76
82
77 &:after {
83 &:after {
78 content: ' | ';
84 content: ' | ';
79 color: @grey5;
85 color: @grey5;
80 }
86 }
81 }
87 }
82
88
89 .author-general img {
90 top: -3px;
91 }
92 .author-inline img {
93 top: -3px;
94 }
95
83 .status-change,
96 .status-change,
84 .permalink,
97 .permalink,
85 .changeset-status-lbl {
98 .changeset-status-lbl {
86 display: inline;
99 display: inline;
87 }
100 }
88
101
89 .permalink {
102 .permalink {
90 visibility: hidden;
103 visibility: hidden;
91 }
104 }
92
105
93 .comment-links-divider {
106 .comment-links-divider {
94 display: inline;
107 display: inline;
95 }
108 }
96
109
97 .comment-links-block {
110 .comment-links-block {
98 float:right;
111 float:right;
99 text-align: right;
112 text-align: right;
100 min-width: 85px;
113 min-width: 85px;
101
114
102 [class^="icon-"]:before,
115 [class^="icon-"]:before,
103 [class*=" icon-"]:before {
116 [class*=" icon-"]:before {
104 margin-left: 0;
117 margin-left: 0;
105 margin-right: 0;
118 margin-right: 0;
106 }
119 }
107 }
120 }
108
121
109 .comment-previous-link {
122 .comment-previous-link {
110 display: inline-block;
123 display: inline-block;
111
124
112 .arrow_comment_link{
125 .arrow_comment_link{
113 cursor: pointer;
126 cursor: pointer;
114 i {
127 i {
115 font-size:10px;
128 font-size:10px;
116 }
129 }
117 }
130 }
118 .arrow_comment_link.disabled {
131 .arrow_comment_link.disabled {
119 cursor: default;
132 cursor: default;
120 color: @grey5;
133 color: @grey5;
121 }
134 }
122 }
135 }
123
136
124 .comment-next-link {
137 .comment-next-link {
125 display: inline-block;
138 display: inline-block;
126
139
127 .arrow_comment_link{
140 .arrow_comment_link{
128 cursor: pointer;
141 cursor: pointer;
129 i {
142 i {
130 font-size:10px;
143 font-size:10px;
131 }
144 }
132 }
145 }
133 .arrow_comment_link.disabled {
146 .arrow_comment_link.disabled {
134 cursor: default;
147 cursor: default;
135 color: @grey5;
148 color: @grey5;
136 }
149 }
137 }
150 }
138
151
139 .flag_status {
152 .flag_status {
140 display: inline-block;
153 display: inline-block;
141 margin: -2px .5em 0 .25em
154 margin: -2px .5em 0 .25em
142 }
155 }
143
156
144 .delete-comment {
157 .delete-comment {
145 display: inline-block;
158 display: inline-block;
146 color: @rcblue;
159 color: @rcblue;
147
160
148 &:hover {
161 &:hover {
149 cursor: pointer;
162 cursor: pointer;
150 }
163 }
151 }
164 }
152
165
153
166
154 .text {
167 .text {
155 clear: both;
168 clear: both;
156 border: @border-thickness solid @grey5;
157 .border-radius(@border-radius);
169 .border-radius(@border-radius);
158 .box-sizing(border-box);
170 .box-sizing(border-box);
159
171
160 .markdown-block p,
172 .markdown-block p,
161 .rst-block p {
173 .rst-block p {
162 margin: .5em 0 !important;
174 margin: .5em 0 !important;
163 // TODO: lisa: This is needed because of other rst !important rules :[
175 // TODO: lisa: This is needed because of other rst !important rules :[
164 }
176 }
165 }
177 }
178
179 .pr-version {
180 float: left;
181 margin: 0px 4px;
182 }
183 .pr-version-inline {
184 float: left;
185 margin: 1px 4px;
186 }
187 .pr-version-num {
188 font-size: 10px;
189 }
190
166 }
191 }
167
192
168 .show-outdated-comments {
193 .show-outdated-comments {
169 display: inline;
194 display: inline;
170 color: @rcblue;
195 color: @rcblue;
171 }
196 }
172
197
173 // Comment Form
198 // Comment Form
174 div.comment-form {
199 div.comment-form {
175 margin-top: 20px;
200 margin-top: 20px;
176 }
201 }
177
202
178 .comment-form strong {
203 .comment-form strong {
179 display: block;
204 display: block;
180 margin-bottom: 15px;
205 margin-bottom: 15px;
181 }
206 }
182
207
183 .comment-form textarea {
208 .comment-form textarea {
184 width: 100%;
209 width: 100%;
185 height: 100px;
210 height: 100px;
186 font-family: 'Monaco', 'Courier', 'Courier New', monospace;
211 font-family: 'Monaco', 'Courier', 'Courier New', monospace;
187 }
212 }
188
213
189 form.comment-form {
214 form.comment-form {
190 margin-top: 10px;
215 margin-top: 10px;
191 margin-left: 10px;
216 margin-left: 10px;
192 }
217 }
193
218
194 .comment-inline-form .comment-block-ta,
219 .comment-inline-form .comment-block-ta,
195 .comment-form .comment-block-ta,
220 .comment-form .comment-block-ta,
196 .comment-form .preview-box {
221 .comment-form .preview-box {
197 .border-radius(@border-radius);
222 .border-radius(@border-radius);
198 .box-sizing(border-box);
223 .box-sizing(border-box);
199 background-color: white;
224 background-color: white;
200 }
225 }
201
226
202 .comment-form-submit {
227 .comment-form-submit {
203 margin-top: 5px;
228 margin-top: 5px;
204 margin-left: 525px;
229 margin-left: 525px;
205 }
230 }
206
231
207 .file-comments {
232 .file-comments {
208 display: none;
233 display: none;
209 }
234 }
210
235
211 .comment-form .preview-box.unloaded,
236 .comment-form .preview-box.unloaded,
212 .comment-inline-form .preview-box.unloaded {
237 .comment-inline-form .preview-box.unloaded {
213 height: 50px;
238 height: 50px;
214 text-align: center;
239 text-align: center;
215 padding: 20px;
240 padding: 20px;
216 background-color: white;
241 background-color: white;
217 }
242 }
218
243
219 .comment-footer {
244 .comment-footer {
220 position: relative;
245 position: relative;
221 width: 100%;
246 width: 100%;
222 min-height: 42px;
247 min-height: 42px;
223
248
224 .status_box,
249 .status_box,
225 .cancel-button {
250 .cancel-button {
226 float: left;
251 float: left;
227 display: inline-block;
252 display: inline-block;
228 }
253 }
229
254
230 .action-buttons {
255 .action-buttons {
231 float: right;
256 float: right;
232 display: inline-block;
257 display: inline-block;
233 }
258 }
234 }
259 }
235
260
236 .comment-form {
261 .comment-form {
237
262
238 .comment {
263 .comment {
239 margin-left: 10px;
264 margin-left: 10px;
240 }
265 }
241
266
242 .comment-help {
267 .comment-help {
243 color: @grey4;
268 color: @grey4;
244 padding: 5px 0 5px 0;
269 padding: 5px 0 5px 0;
245 }
270 }
246
271
247 .comment-title {
272 .comment-title {
248 padding: 5px 0 5px 0;
273 padding: 5px 0 5px 0;
249 }
274 }
250
275
251 .comment-button {
276 .comment-button {
252 display: inline-block;
277 display: inline-block;
253 }
278 }
254
279
255 .comment-button .comment-button-input {
280 .comment-button .comment-button-input {
256 margin-right: 0;
281 margin-right: 0;
257 }
282 }
258
283
259 .comment-footer {
284 .comment-footer {
260 margin-bottom: 110px;
285 margin-bottom: 110px;
261 margin-top: 10px;
286 margin-top: 10px;
262 }
287 }
263 }
288 }
264
289
265
290
266 .comment-form-login {
291 .comment-form-login {
267 .comment-help {
292 .comment-help {
268 padding: 0.9em; //same as the button
293 padding: 0.9em; //same as the button
269 }
294 }
270
295
271 div.clearfix {
296 div.clearfix {
272 clear: both;
297 clear: both;
273 width: 100%;
298 width: 100%;
274 display: block;
299 display: block;
275 }
300 }
276 }
301 }
277
302
278 .preview-box {
303 .preview-box {
279 min-height: 105px;
304 min-height: 105px;
280 margin-bottom: 15px;
305 margin-bottom: 15px;
281 background-color: white;
306 background-color: white;
282 .border-radius(@border-radius);
307 .border-radius(@border-radius);
283 .box-sizing(border-box);
308 .box-sizing(border-box);
284 }
309 }
285
310
286 .add-another-button {
311 .add-another-button {
287 margin-left: 10px;
312 margin-left: 10px;
288 margin-top: 10px;
313 margin-top: 10px;
289 margin-bottom: 10px;
314 margin-bottom: 10px;
290 }
315 }
291
316
292 .comment .buttons {
317 .comment .buttons {
293 float: right;
318 float: right;
294 margin: -1px 0px 0px 0px;
319 margin: -1px 0px 0px 0px;
295 }
320 }
296
321
297 // Inline Comment Form
322 // Inline Comment Form
298 .injected_diff .comment-inline-form,
323 .injected_diff .comment-inline-form,
299 .comment-inline-form {
324 .comment-inline-form {
300 background-color: white;
325 background-color: white;
301 margin-top: 10px;
326 margin-top: 10px;
302 margin-bottom: 20px;
327 margin-bottom: 20px;
303 }
328 }
304
329
305 .inline-form {
330 .inline-form {
306 padding: 10px 7px;
331 padding: 10px 7px;
307 }
332 }
308
333
309 .inline-form div {
334 .inline-form div {
310 max-width: 100%;
335 max-width: 100%;
311 }
336 }
312
337
313 .overlay {
338 .overlay {
314 display: none;
339 display: none;
315 position: absolute;
340 position: absolute;
316 width: 100%;
341 width: 100%;
317 text-align: center;
342 text-align: center;
318 vertical-align: middle;
343 vertical-align: middle;
319 font-size: 16px;
344 font-size: 16px;
320 background: none repeat scroll 0 0 white;
345 background: none repeat scroll 0 0 white;
321
346
322 &.submitting {
347 &.submitting {
323 display: block;
348 display: block;
324 opacity: 0.5;
349 opacity: 0.5;
325 z-index: 100;
350 z-index: 100;
326 }
351 }
327 }
352 }
328 .comment-inline-form .overlay.submitting .overlay-text {
353 .comment-inline-form .overlay.submitting .overlay-text {
329 margin-top: 5%;
354 margin-top: 5%;
330 }
355 }
331
356
332 .comment-inline-form .clearfix,
357 .comment-inline-form .clearfix,
333 .comment-form .clearfix {
358 .comment-form .clearfix {
334 .border-radius(@border-radius);
359 .border-radius(@border-radius);
335 margin: 0px;
360 margin: 0px;
336 }
361 }
337
362
338 .comment-inline-form .comment-footer {
363 .comment-inline-form .comment-footer {
339 margin: 10px 0px 0px 0px;
364 margin: 10px 0px 0px 0px;
340 }
365 }
341
366
342 .hide-inline-form-button {
367 .hide-inline-form-button {
343 margin-left: 5px;
368 margin-left: 5px;
344 }
369 }
345 .comment-button .hide-inline-form {
370 .comment-button .hide-inline-form {
346 background: white;
371 background: white;
347 }
372 }
348
373
349 .comment-area {
374 .comment-area {
350 padding: 8px 12px;
375 padding: 8px 12px;
351 border: 1px solid @grey5;
376 border: 1px solid @grey5;
352 .border-radius(@border-radius);
377 .border-radius(@border-radius);
353 }
378 }
354
379
355 .comment-area-header .nav-links {
380 .comment-area-header .nav-links {
356 display: flex;
381 display: flex;
357 flex-flow: row wrap;
382 flex-flow: row wrap;
358 -webkit-flex-flow: row wrap;
383 -webkit-flex-flow: row wrap;
359 width: 100%;
384 width: 100%;
360 }
385 }
361
386
362 .comment-area-footer {
387 .comment-area-footer {
363 display: flex;
388 display: flex;
364 }
389 }
365
390
366 .comment-footer .toolbar {
391 .comment-footer .toolbar {
367
392
368 }
393 }
369
394
370 .nav-links {
395 .nav-links {
371 padding: 0;
396 padding: 0;
372 margin: 0;
397 margin: 0;
373 list-style: none;
398 list-style: none;
374 height: auto;
399 height: auto;
375 border-bottom: 1px solid @grey5;
400 border-bottom: 1px solid @grey5;
376 }
401 }
377 .nav-links li {
402 .nav-links li {
378 display: inline-block;
403 display: inline-block;
379 }
404 }
380 .nav-links li:before {
405 .nav-links li:before {
381 content: "";
406 content: "";
382 }
407 }
383 .nav-links li a.disabled {
408 .nav-links li a.disabled {
384 cursor: not-allowed;
409 cursor: not-allowed;
385 }
410 }
386
411
387 .nav-links li.active a {
412 .nav-links li.active a {
388 border-bottom: 2px solid @rcblue;
413 border-bottom: 2px solid @rcblue;
389 color: #000;
414 color: #000;
390 font-weight: 600;
415 font-weight: 600;
391 }
416 }
392 .nav-links li a {
417 .nav-links li a {
393 display: inline-block;
418 display: inline-block;
394 padding: 0px 10px 5px 10px;
419 padding: 0px 10px 5px 10px;
395 margin-bottom: -1px;
420 margin-bottom: -1px;
396 font-size: 14px;
421 font-size: 14px;
397 line-height: 28px;
422 line-height: 28px;
398 color: #8f8f8f;
423 color: #8f8f8f;
399 border-bottom: 2px solid transparent;
424 border-bottom: 2px solid transparent;
400 }
425 }
401
426
402 .toolbar-text {
427 .toolbar-text {
403 float: left;
428 float: left;
404 margin: -5px 0px 0px 0px;
429 margin: -5px 0px 0px 0px;
405 font-size: 12px;
430 font-size: 12px;
406 }
431 }
407
432
@@ -1,4 +1,4 b''
1 ## this is a dummy html file for partial rendering on server and sending
1 ## this is a dummy html file for partial rendering on server and sending
2 ## generated output via ajax after comment submit
2 ## generated output via ajax after comment submit
3 <%namespace name="comment" file="/changeset/changeset_file_comment.mako"/>
3 <%namespace name="comment" file="/changeset/changeset_file_comment.mako"/>
4 ${comment.comment_block(c.co, inline=True)}
4 ${comment.comment_block(c.co, inline=c.inline_comment)}
@@ -1,263 +1,297 b''
1 ## -*- coding: utf-8 -*-
1 ## -*- coding: utf-8 -*-
2 ## usage:
2 ## usage:
3 ## <%namespace name="comment" file="/changeset/changeset_file_comment.mako"/>
3 ## <%namespace name="comment" file="/changeset/changeset_file_comment.mako"/>
4 ## ${comment.comment_block(comment)}
4 ## ${comment.comment_block(comment)}
5 ##
5 ##
6 <%namespace name="base" file="/base/base.mako"/>
6 <%namespace name="base" file="/base/base.mako"/>
7
7
8 <%def name="comment_block(comment, inline=False)">
8 <%def name="comment_block(comment, inline=False)">
9 <% outdated_at_ver = comment.outdated_at_version(getattr(c, 'at_version', None)) %>
9 <% outdated_at_ver = comment.outdated_at_version(getattr(c, 'at_version', None)) %>
10 <% pr_index_ver = comment.get_index_version(getattr(c, 'versions', [])) %>
10
11
11 <div class="comment
12 <div class="comment
12 ${'comment-inline' if inline else ''}
13 ${'comment-inline' if inline else 'comment-general'}
13 ${'comment-outdated' if outdated_at_ver else 'comment-current'}"
14 ${'comment-outdated' if outdated_at_ver else 'comment-current'}"
14 id="comment-${comment.comment_id}"
15 id="comment-${comment.comment_id}"
15 line="${comment.line_no}"
16 line="${comment.line_no}"
16 data-comment-id="${comment.comment_id}"
17 data-comment-id="${comment.comment_id}"
17 style="${'display: none;' if outdated_at_ver else ''}">
18 style="${'display: none;' if outdated_at_ver else ''}">
18
19
19 <div class="meta">
20 <div class="meta">
20 <div class="author">
21 <div class="author ${'author-inline' if inline else 'author-general'}">
21 ${base.gravatar_with_user(comment.author.email, 16)}
22 ${base.gravatar_with_user(comment.author.email, 20)}
22 </div>
23 </div>
23 <div class="date">
24 <div class="date">
24 ${h.age_component(comment.modified_at, time_is_local=True)}
25 ${h.age_component(comment.modified_at, time_is_local=True)}
25 </div>
26 </div>
27 % if inline:
28 <span></span>
29 % else:
26 <div class="status-change">
30 <div class="status-change">
27 % if comment.pull_request:
31 % if comment.pull_request:
28 % if comment.outdated:
29 <a href="?version=${comment.pull_request_version_id}#comment-${comment.comment_id}">
30 ${_('Outdated comment from pull request version {}').format(comment.pull_request_version_id)}
31 </a>
32 % else:
33 <a href="${h.url('pullrequest_show',repo_name=comment.pull_request.target_repo.repo_name,pull_request_id=comment.pull_request.pull_request_id)}">
32 <a href="${h.url('pullrequest_show',repo_name=comment.pull_request.target_repo.repo_name,pull_request_id=comment.pull_request.pull_request_id)}">
34 %if comment.status_change:
33 % if comment.status_change:
35 ${_('Vote on pull request #%s') % comment.pull_request.pull_request_id}:
34 ${_('Vote on pull request #%s') % comment.pull_request.pull_request_id}:
36 %else:
35 % else:
37 ${_('Comment on pull request #%s') % comment.pull_request.pull_request_id}
36 ${_('Comment on pull request #%s') % comment.pull_request.pull_request_id}
38 %endif
37 % endif
39 </a>
38 </a>
40 % endif
41 % else:
39 % else:
42 % if comment.status_change:
40 % if comment.status_change:
43 ${_('Status change on commit')}:
41 ${_('Status change on commit')}:
44 % else:
42 % else:
45 ${_('Comment on commit')}
43 ${_('Comment on commit')}
46 % endif
44 % endif
47 % endif
45 % endif
48 </div>
46 </div>
47 % endif
48
49 %if comment.status_change:
49 % if comment.status_change:
50 <div class="${'flag_status %s' % comment.status_change[0].status}"></div>
50 <div class="${'flag_status %s' % comment.status_change[0].status}"></div>
51 <div title="${_('Commit status')}" class="changeset-status-lbl">
51 <div title="${_('Commit status')}" class="changeset-status-lbl">
52 ${comment.status_change[0].status_lbl}
52 ${comment.status_change[0].status_lbl}
53 </div>
53 </div>
54 %endif
54 % endif
55
55 <a class="permalink" href="#comment-${comment.comment_id}"> &para;</a>
56 <a class="permalink" href="#comment-${comment.comment_id}"> &para;</a>
56
57
57 <div class="comment-links-block">
58 <div class="comment-links-block">
59
60 % if inline:
61 % if outdated_at_ver:
62 <div class="pr-version-inline">
63 <a href="${h.url.current(version=comment.pull_request_version_id, anchor='comment-{}'.format(comment.comment_id))}">
64 <code class="pr-version-num">
65 outdated ${'v{}'.format(pr_index_ver)}
66 </code>
67 </a>
68 </div>
69 |
70 % endif
71 % else:
72 % if comment.pull_request_version_id and pr_index_ver:
73 |
74 <div class="pr-version">
75 % if comment.outdated:
76 <a href="?version=${comment.pull_request_version_id}#comment-${comment.comment_id}">
77 ${_('Outdated comment from pull request version {}').format(pr_index_ver)}
78 </a>
79 % else:
80 <div class="tooltip" title="${_('Comment from pull request version {0}').format(pr_index_ver)}">
81 <a href="${h.url('pullrequest_show',repo_name=comment.pull_request.target_repo.repo_name,pull_request_id=comment.pull_request.pull_request_id, version=comment.pull_request_version_id)}">
82 <code class="pr-version-num">
83 ${'v{}'.format(pr_index_ver)}
84 </code>
85 </a>
86 </div>
87 % endif
88 </div>
89 % endif
90 % endif
91
58 ## show delete comment if it's not a PR (regular comments) or it's PR that is not closed
92 ## show delete comment if it's not a PR (regular comments) or it's PR that is not closed
59 ## only super-admin, repo admin OR comment owner can delete, also hide delete if currently viewed comment is outdated
93 ## only super-admin, repo admin OR comment owner can delete, also hide delete if currently viewed comment is outdated
60 %if not outdated_at_ver and (not comment.pull_request or (comment.pull_request and not comment.pull_request.is_closed())):
94 %if not outdated_at_ver and (not comment.pull_request or (comment.pull_request and not comment.pull_request.is_closed())):
61 ## permissions to delete
95 ## permissions to delete
62 %if h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or comment.author.user_id == c.rhodecode_user.user_id:
96 %if h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or comment.author.user_id == c.rhodecode_user.user_id:
63 ## TODO: dan: add edit comment here
97 ## TODO: dan: add edit comment here
64 <a onclick="return Rhodecode.comments.deleteComment(this);" class="delete-comment"> ${_('Delete')}</a>
98 <a onclick="return Rhodecode.comments.deleteComment(this);" class="delete-comment"> ${_('Delete')}</a>
65 %else:
99 %else:
66 <button class="btn-link" disabled="disabled"> ${_('Delete')}</button>
100 <button class="btn-link" disabled="disabled"> ${_('Delete')}</button>
67 %endif
101 %endif
68 %else:
102 %else:
69 <button class="btn-link" disabled="disabled"> ${_('Delete')}</button>
103 <button class="btn-link" disabled="disabled"> ${_('Delete')}</button>
70 %endif
104 %endif
71
105
72 %if not outdated_at_ver:
106 %if not outdated_at_ver:
73 | <a onclick="return Rhodecode.comments.prevComment(this);" class="prev-comment"> ${_('Prev')}</a>
107 | <a onclick="return Rhodecode.comments.prevComment(this);" class="prev-comment"> ${_('Prev')}</a>
74 | <a onclick="return Rhodecode.comments.nextComment(this);" class="next-comment"> ${_('Next')}</a>
108 | <a onclick="return Rhodecode.comments.nextComment(this);" class="next-comment"> ${_('Next')}</a>
75 %endif
109 %endif
76
110
77 </div>
111 </div>
78 </div>
112 </div>
79 <div class="text">
113 <div class="text">
80 ${comment.render(mentions=True)|n}
114 ${comment.render(mentions=True)|n}
81 </div>
115 </div>
82
116
83 </div>
117 </div>
84 </%def>
118 </%def>
85 ## generate main comments
119 ## generate main comments
86 <%def name="generate_comments(include_pull_request=False, is_pull_request=False)">
120 <%def name="generate_comments(include_pull_request=False, is_pull_request=False)">
87 <div id="comments">
121 <div id="comments">
88 %for comment in c.comments:
122 %for comment in c.comments:
89 <div id="comment-tr-${comment.comment_id}">
123 <div id="comment-tr-${comment.comment_id}">
90 ## only render comments that are not from pull request, or from
124 ## only render comments that are not from pull request, or from
91 ## pull request and a status change
125 ## pull request and a status change
92 %if not comment.pull_request or (comment.pull_request and comment.status_change) or include_pull_request:
126 %if not comment.pull_request or (comment.pull_request and comment.status_change) or include_pull_request:
93 ${comment_block(comment)}
127 ${comment_block(comment)}
94 %endif
128 %endif
95 </div>
129 </div>
96 %endfor
130 %endfor
97 ## to anchor ajax comments
131 ## to anchor ajax comments
98 <div id="injected_page_comments"></div>
132 <div id="injected_page_comments"></div>
99 </div>
133 </div>
100 </%def>
134 </%def>
101
135
102 ## MAIN COMMENT FORM
136 ## MAIN COMMENT FORM
103 <%def name="comments(post_url, cur_status, is_pull_request=False, is_compare=False, change_status=True, form_extras=None)">
137 <%def name="comments(post_url, cur_status, is_pull_request=False, is_compare=False, change_status=True, form_extras=None)">
104
138
105 %if is_compare:
139 %if is_compare:
106 <% form_id = "comments_form_compare" %>
140 <% form_id = "comments_form_compare" %>
107 %else:
141 %else:
108 <% form_id = "comments_form" %>
142 <% form_id = "comments_form" %>
109 %endif
143 %endif
110
144
111
145
112 %if is_pull_request:
146 %if is_pull_request:
113 <div class="pull-request-merge">
147 <div class="pull-request-merge">
114 %if c.allowed_to_merge:
148 %if c.allowed_to_merge:
115 <div class="pull-request-wrap">
149 <div class="pull-request-wrap">
116 <div class="pull-right">
150 <div class="pull-right">
117 ${h.secure_form(url('pullrequest_merge', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id), id='merge_pull_request_form')}
151 ${h.secure_form(url('pullrequest_merge', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id), id='merge_pull_request_form')}
118 <span data-role="merge-message">${c.pr_merge_msg} ${c.approval_msg if c.approval_msg else ''}</span>
152 <span data-role="merge-message">${c.pr_merge_msg} ${c.approval_msg if c.approval_msg else ''}</span>
119 <% merge_disabled = ' disabled' if c.pr_merge_status is False else '' %>
153 <% merge_disabled = ' disabled' if c.pr_merge_status is False else '' %>
120 <input type="submit" id="merge_pull_request" value="${_('Merge Pull Request')}" class="btn${merge_disabled}"${merge_disabled}>
154 <input type="submit" id="merge_pull_request" value="${_('Merge Pull Request')}" class="btn${merge_disabled}"${merge_disabled}>
121 ${h.end_form()}
155 ${h.end_form()}
122 </div>
156 </div>
123 </div>
157 </div>
124 %else:
158 %else:
125 <div class="pull-request-wrap">
159 <div class="pull-request-wrap">
126 <div class="pull-right">
160 <div class="pull-right">
127 <span>${c.pr_merge_msg} ${c.approval_msg if c.approval_msg else ''}</span>
161 <span>${c.pr_merge_msg} ${c.approval_msg if c.approval_msg else ''}</span>
128 </div>
162 </div>
129 </div>
163 </div>
130 %endif
164 %endif
131 </div>
165 </div>
132 %endif
166 %endif
133 <div class="comments">
167 <div class="comments">
134 <%
168 <%
135 if is_pull_request:
169 if is_pull_request:
136 placeholder = _('Leave a comment on this Pull Request.')
170 placeholder = _('Leave a comment on this Pull Request.')
137 elif is_compare:
171 elif is_compare:
138 placeholder = _('Leave a comment on all commits in this range.')
172 placeholder = _('Leave a comment on all commits in this range.')
139 else:
173 else:
140 placeholder = _('Leave a comment on this Commit.')
174 placeholder = _('Leave a comment on this Commit.')
141 %>
175 %>
142 % if c.rhodecode_user.username != h.DEFAULT_USER:
176 % if c.rhodecode_user.username != h.DEFAULT_USER:
143 <div class="comment-form ac">
177 <div class="comment-form ac">
144 ${h.secure_form(post_url, id_=form_id)}
178 ${h.secure_form(post_url, id_=form_id)}
145 <div class="comment-area">
179 <div class="comment-area">
146 <div class="comment-area-header">
180 <div class="comment-area-header">
147 <ul class="nav-links clearfix">
181 <ul class="nav-links clearfix">
148 <li class="active">
182 <li class="active">
149 <a href="#edit-btn" tabindex="-1" id="edit-btn">${_('Write')}</a>
183 <a href="#edit-btn" tabindex="-1" id="edit-btn">${_('Write')}</a>
150 </li>
184 </li>
151 <li class="">
185 <li class="">
152 <a href="#preview-btn" tabindex="-1" id="preview-btn">${_('Preview')}</a>
186 <a href="#preview-btn" tabindex="-1" id="preview-btn">${_('Preview')}</a>
153 </li>
187 </li>
154 </ul>
188 </ul>
155 </div>
189 </div>
156
190
157 <div class="comment-area-write" style="display: block;">
191 <div class="comment-area-write" style="display: block;">
158 <div id="edit-container">
192 <div id="edit-container">
159 <textarea id="text" name="text" class="comment-block-ta ac-input"></textarea>
193 <textarea id="text" name="text" class="comment-block-ta ac-input"></textarea>
160 </div>
194 </div>
161 <div id="preview-container" class="clearfix" style="display: none;">
195 <div id="preview-container" class="clearfix" style="display: none;">
162 <div id="preview-box" class="preview-box"></div>
196 <div id="preview-box" class="preview-box"></div>
163 </div>
197 </div>
164 </div>
198 </div>
165
199
166 <div class="comment-area-footer">
200 <div class="comment-area-footer">
167 <div class="toolbar">
201 <div class="toolbar">
168 <div class="toolbar-text">
202 <div class="toolbar-text">
169 ${(_('Comments parsed using %s syntax with %s support.') % (
203 ${(_('Comments parsed using %s syntax with %s support.') % (
170 ('<a href="%s">%s</a>' % (h.url('%s_help' % c.visual.default_renderer), c.visual.default_renderer.upper())),
204 ('<a href="%s">%s</a>' % (h.url('%s_help' % c.visual.default_renderer), c.visual.default_renderer.upper())),
171 ('<span class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to send notification to this RhodeCode user'))
205 ('<span class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to send notification to this RhodeCode user'))
172 )
206 )
173 )|n}
207 )|n}
174 </div>
208 </div>
175 </div>
209 </div>
176 </div>
210 </div>
177 </div>
211 </div>
178
212
179 <div id="comment_form_extras">
213 <div id="comment_form_extras">
180 %if form_extras and isinstance(form_extras, (list, tuple)):
214 %if form_extras and isinstance(form_extras, (list, tuple)):
181 % for form_ex_el in form_extras:
215 % for form_ex_el in form_extras:
182 ${form_ex_el|n}
216 ${form_ex_el|n}
183 % endfor
217 % endfor
184 %endif
218 %endif
185 </div>
219 </div>
186 <div class="comment-footer">
220 <div class="comment-footer">
187 %if change_status:
221 %if change_status:
188 <div class="status_box">
222 <div class="status_box">
189 <select id="change_status" name="changeset_status">
223 <select id="change_status" name="changeset_status">
190 <option></option> # Placeholder
224 <option></option> # Placeholder
191 %for status,lbl in c.commit_statuses:
225 %for status,lbl in c.commit_statuses:
192 <option value="${status}" data-status="${status}">${lbl}</option>
226 <option value="${status}" data-status="${status}">${lbl}</option>
193 %if is_pull_request and change_status and status in ('approved', 'rejected'):
227 %if is_pull_request and change_status and status in ('approved', 'rejected'):
194 <option value="${status}_closed" data-status="${status}">${lbl} & ${_('Closed')}</option>
228 <option value="${status}_closed" data-status="${status}">${lbl} & ${_('Closed')}</option>
195 %endif
229 %endif
196 %endfor
230 %endfor
197 </select>
231 </select>
198 </div>
232 </div>
199 %endif
233 %endif
200 <div class="action-buttons">
234 <div class="action-buttons">
201 <div class="comment-button">${h.submit('save', _('Comment'), class_="btn btn-success comment-button-input")}</div>
235 <div class="comment-button">${h.submit('save', _('Comment'), class_="btn btn-success comment-button-input")}</div>
202 </div>
236 </div>
203 </div>
237 </div>
204 ${h.end_form()}
238 ${h.end_form()}
205 </div>
239 </div>
206 % else:
240 % else:
207 <div class="comment-form ac">
241 <div class="comment-form ac">
208
242
209 <div class="comment-area">
243 <div class="comment-area">
210 <div class="comment-area-header">
244 <div class="comment-area-header">
211 <ul class="nav-links clearfix">
245 <ul class="nav-links clearfix">
212 <li class="active">
246 <li class="active">
213 <a class="disabled" href="#edit-btn" disabled="disabled" onclick="return false">${_('Write')}</a>
247 <a class="disabled" href="#edit-btn" disabled="disabled" onclick="return false">${_('Write')}</a>
214 </li>
248 </li>
215 <li class="">
249 <li class="">
216 <a class="disabled" href="#preview-btn" disabled="disabled" onclick="return false">${_('Preview')}</a>
250 <a class="disabled" href="#preview-btn" disabled="disabled" onclick="return false">${_('Preview')}</a>
217 </li>
251 </li>
218 </ul>
252 </ul>
219 </div>
253 </div>
220
254
221 <div class="comment-area-write" style="display: block;">
255 <div class="comment-area-write" style="display: block;">
222 <div id="edit-container">
256 <div id="edit-container">
223 <div style="padding: 40px 0">
257 <div style="padding: 40px 0">
224 ${_('You need to be logged in to leave comments.')}
258 ${_('You need to be logged in to leave comments.')}
225 <a href="${h.route_path('login', _query={'came_from': h.url.current()})}">${_('Login now')}</a>
259 <a href="${h.route_path('login', _query={'came_from': h.url.current()})}">${_('Login now')}</a>
226 </div>
260 </div>
227 </div>
261 </div>
228 <div id="preview-container" class="clearfix" style="display: none;">
262 <div id="preview-container" class="clearfix" style="display: none;">
229 <div id="preview-box" class="preview-box"></div>
263 <div id="preview-box" class="preview-box"></div>
230 </div>
264 </div>
231 </div>
265 </div>
232
266
233 <div class="comment-area-footer">
267 <div class="comment-area-footer">
234 <div class="toolbar">
268 <div class="toolbar">
235 <div class="toolbar-text">
269 <div class="toolbar-text">
236 </div>
270 </div>
237 </div>
271 </div>
238 </div>
272 </div>
239 </div>
273 </div>
240
274
241 <div class="comment-footer">
275 <div class="comment-footer">
242 </div>
276 </div>
243
277
244 </div>
278 </div>
245 % endif
279 % endif
246
280
247 </div>
281 </div>
248
282
249 <script>
283 <script>
250 // init active elements of commentForm
284 // init active elements of commentForm
251 var commitId = templateContext.commit_data.commit_id;
285 var commitId = templateContext.commit_data.commit_id;
252 var pullRequestId = templateContext.pull_request_data.pull_request_id;
286 var pullRequestId = templateContext.pull_request_data.pull_request_id;
253 var lineNo;
287 var lineNo;
254
288
255 var mainCommentForm = new CommentForm(
289 var mainCommentForm = new CommentForm(
256 "#${form_id}", commitId, pullRequestId, lineNo, true);
290 "#${form_id}", commitId, pullRequestId, lineNo, true);
257
291
258 mainCommentForm.cm.setOption('placeholder', "${placeholder}");
292 mainCommentForm.cm.setOption('placeholder', "${placeholder}");
259
293
260 mainCommentForm.initStatusChangeSelector();
294 mainCommentForm.initStatusChangeSelector();
261 bindToggleButtons();
295 bindToggleButtons();
262 </script>
296 </script>
263 </%def>
297 </%def>
@@ -1,711 +1,711 b''
1 <%def name="diff_line_anchor(filename, line, type)"><%
1 <%def name="diff_line_anchor(filename, line, type)"><%
2 return '%s_%s_%i' % (h.safeid(filename), type, line)
2 return '%s_%s_%i' % (h.safeid(filename), type, line)
3 %></%def>
3 %></%def>
4
4
5 <%def name="action_class(action)">
5 <%def name="action_class(action)">
6 <%
6 <%
7 return {
7 return {
8 '-': 'cb-deletion',
8 '-': 'cb-deletion',
9 '+': 'cb-addition',
9 '+': 'cb-addition',
10 ' ': 'cb-context',
10 ' ': 'cb-context',
11 }.get(action, 'cb-empty')
11 }.get(action, 'cb-empty')
12 %>
12 %>
13 </%def>
13 </%def>
14
14
15 <%def name="op_class(op_id)">
15 <%def name="op_class(op_id)">
16 <%
16 <%
17 return {
17 return {
18 DEL_FILENODE: 'deletion', # file deleted
18 DEL_FILENODE: 'deletion', # file deleted
19 BIN_FILENODE: 'warning' # binary diff hidden
19 BIN_FILENODE: 'warning' # binary diff hidden
20 }.get(op_id, 'addition')
20 }.get(op_id, 'addition')
21 %>
21 %>
22 </%def>
22 </%def>
23
23
24 <%def name="link_for(**kw)">
24 <%def name="link_for(**kw)">
25 <%
25 <%
26 new_args = request.GET.mixed()
26 new_args = request.GET.mixed()
27 new_args.update(kw)
27 new_args.update(kw)
28 return h.url('', **new_args)
28 return h.url('', **new_args)
29 %>
29 %>
30 </%def>
30 </%def>
31
31
32 <%def name="render_diffset(diffset, commit=None,
32 <%def name="render_diffset(diffset, commit=None,
33
33
34 # collapse all file diff entries when there are more than this amount of files in the diff
34 # collapse all file diff entries when there are more than this amount of files in the diff
35 collapse_when_files_over=20,
35 collapse_when_files_over=20,
36
36
37 # collapse lines in the diff when more than this amount of lines changed in the file diff
37 # collapse lines in the diff when more than this amount of lines changed in the file diff
38 lines_changed_limit=500,
38 lines_changed_limit=500,
39
39
40 # add a ruler at to the output
40 # add a ruler at to the output
41 ruler_at_chars=0,
41 ruler_at_chars=0,
42
42
43 # show inline comments
43 # show inline comments
44 use_comments=False,
44 use_comments=False,
45
45
46 # disable new comments
46 # disable new comments
47 disable_new_comments=False,
47 disable_new_comments=False,
48
48
49 # special file-comments that were deleted in previous versions
49 # special file-comments that were deleted in previous versions
50 # it's used for showing outdated comments for deleted files in a PR
50 # it's used for showing outdated comments for deleted files in a PR
51 deleted_files_comments=None
51 deleted_files_comments=None
52
52
53 )">
53 )">
54
54
55 %if use_comments:
55 %if use_comments:
56 <div id="cb-comments-inline-container-template" class="js-template">
56 <div id="cb-comments-inline-container-template" class="js-template">
57 ${inline_comments_container([])}
57 ${inline_comments_container([])}
58 </div>
58 </div>
59 <div class="js-template" id="cb-comment-inline-form-template">
59 <div class="js-template" id="cb-comment-inline-form-template">
60 <div class="comment-inline-form ac">
60 <div class="comment-inline-form ac">
61
61
62 %if c.rhodecode_user.username != h.DEFAULT_USER:
62 %if c.rhodecode_user.username != h.DEFAULT_USER:
63 ${h.form('#', method='get')}
63 ${h.form('#', method='get')}
64 <div class="comment-area">
64 <div class="comment-area">
65 <div class="comment-area-header">
65 <div class="comment-area-header">
66 <ul class="nav-links clearfix">
66 <ul class="nav-links clearfix">
67 <li class="active">
67 <li class="active">
68 <a href="#edit-btn" tabindex="-1" id="edit-btn_{1}">${_('Write')}</a>
68 <a href="#edit-btn" tabindex="-1" id="edit-btn_{1}">${_('Write')}</a>
69 </li>
69 </li>
70 <li class="">
70 <li class="">
71 <a href="#preview-btn" tabindex="-1" id="preview-btn_{1}">${_('Preview')}</a>
71 <a href="#preview-btn" tabindex="-1" id="preview-btn_{1}">${_('Preview')}</a>
72 </li>
72 </li>
73 </ul>
73 </ul>
74 </div>
74 </div>
75
75
76 <div class="comment-area-write" style="display: block;">
76 <div class="comment-area-write" style="display: block;">
77 <div id="edit-container_{1}">
77 <div id="edit-container_{1}">
78 <textarea id="text_{1}" name="text" class="comment-block-ta ac-input"></textarea>
78 <textarea id="text_{1}" name="text" class="comment-block-ta ac-input"></textarea>
79 </div>
79 </div>
80 <div id="preview-container_{1}" class="clearfix" style="display: none;">
80 <div id="preview-container_{1}" class="clearfix" style="display: none;">
81 <div id="preview-box_{1}" class="preview-box"></div>
81 <div id="preview-box_{1}" class="preview-box"></div>
82 </div>
82 </div>
83 </div>
83 </div>
84
84
85 <div class="comment-area-footer">
85 <div class="comment-area-footer">
86 <div class="toolbar">
86 <div class="toolbar">
87 <div class="toolbar-text">
87 <div class="toolbar-text">
88 ${(_('Comments parsed using %s syntax with %s support.') % (
88 ${(_('Comments parsed using %s syntax with %s support.') % (
89 ('<a href="%s">%s</a>' % (h.url('%s_help' % c.visual.default_renderer), c.visual.default_renderer.upper())),
89 ('<a href="%s">%s</a>' % (h.url('%s_help' % c.visual.default_renderer), c.visual.default_renderer.upper())),
90 ('<span class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to send notification to this RhodeCode user'))
90 ('<span class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to send notification to this RhodeCode user'))
91 )
91 )
92 )|n}
92 )|n}
93 </div>
93 </div>
94 </div>
94 </div>
95 </div>
95 </div>
96 </div>
96 </div>
97
97
98 <div class="comment-footer">
98 <div class="comment-footer">
99 <div class="action-buttons">
99 <div class="action-buttons">
100 <input type="hidden" name="f_path" value="{0}">
100 <input type="hidden" name="f_path" value="{0}">
101 <input type="hidden" name="line" value="{1}">
101 <input type="hidden" name="line" value="{1}">
102 <button type="button" class="cb-comment-cancel" onclick="return Rhodecode.comments.cancelComment(this);">
102 <button type="button" class="cb-comment-cancel" onclick="return Rhodecode.comments.cancelComment(this);">
103 ${_('Cancel')}
103 ${_('Cancel')}
104 </button>
104 </button>
105 ${h.submit('save', _('Comment'), class_='btn btn-success save-inline-form')}
105 ${h.submit('save', _('Comment'), class_='btn btn-success save-inline-form')}
106 </div>
106 </div>
107 ${h.end_form()}
107 ${h.end_form()}
108 </div>
108 </div>
109 %else:
109 %else:
110 ${h.form('', class_='inline-form comment-form-login', method='get')}
110 ${h.form('', class_='inline-form comment-form-login', method='get')}
111 <div class="pull-left">
111 <div class="pull-left">
112 <div class="comment-help pull-right">
112 <div class="comment-help pull-right">
113 ${_('You need to be logged in to leave comments.')} <a href="${h.route_path('login', _query={'came_from': h.url.current()})}">${_('Login now')}</a>
113 ${_('You need to be logged in to leave comments.')} <a href="${h.route_path('login', _query={'came_from': h.url.current()})}">${_('Login now')}</a>
114 </div>
114 </div>
115 </div>
115 </div>
116 <div class="comment-button pull-right">
116 <div class="comment-button pull-right">
117 <button type="button" class="cb-comment-cancel" onclick="return Rhodecode.comments.cancelComment(this);">
117 <button type="button" class="cb-comment-cancel" onclick="return Rhodecode.comments.cancelComment(this);">
118 ${_('Cancel')}
118 ${_('Cancel')}
119 </button>
119 </button>
120 </div>
120 </div>
121 <div class="clearfix"></div>
121 <div class="clearfix"></div>
122 ${h.end_form()}
122 ${h.end_form()}
123 %endif
123 %endif
124 </div>
124 </div>
125 </div>
125 </div>
126
126
127 %endif
127 %endif
128 <%
128 <%
129 collapse_all = len(diffset.files) > collapse_when_files_over
129 collapse_all = len(diffset.files) > collapse_when_files_over
130 %>
130 %>
131
131
132 %if c.diffmode == 'sideside':
132 %if c.diffmode == 'sideside':
133 <style>
133 <style>
134 .wrapper {
134 .wrapper {
135 max-width: 1600px !important;
135 max-width: 1600px !important;
136 }
136 }
137 </style>
137 </style>
138 %endif
138 %endif
139
139
140 %if ruler_at_chars:
140 %if ruler_at_chars:
141 <style>
141 <style>
142 .diff table.cb .cb-content:after {
142 .diff table.cb .cb-content:after {
143 content: "";
143 content: "";
144 border-left: 1px solid blue;
144 border-left: 1px solid blue;
145 position: absolute;
145 position: absolute;
146 top: 0;
146 top: 0;
147 height: 18px;
147 height: 18px;
148 opacity: .2;
148 opacity: .2;
149 z-index: 10;
149 z-index: 10;
150 //## +5 to account for diff action (+/-)
150 //## +5 to account for diff action (+/-)
151 left: ${ruler_at_chars + 5}ch;
151 left: ${ruler_at_chars + 5}ch;
152 </style>
152 </style>
153 %endif
153 %endif
154
154
155 <div class="diffset ${disable_new_comments and 'diffset-comments-disabled'}">
155 <div class="diffset ${disable_new_comments and 'diffset-comments-disabled'}">
156 <div class="diffset-heading ${diffset.limited_diff and 'diffset-heading-warning' or ''}">
156 <div class="diffset-heading ${diffset.limited_diff and 'diffset-heading-warning' or ''}">
157 %if commit:
157 %if commit:
158 <div class="pull-right">
158 <div class="pull-right">
159 <a class="btn tooltip" title="${_('Browse Files at revision {}').format(commit.raw_id)}" href="${h.url('files_home',repo_name=diffset.repo_name, revision=commit.raw_id, f_path='')}">
159 <a class="btn tooltip" title="${_('Browse Files at revision {}').format(commit.raw_id)}" href="${h.url('files_home',repo_name=diffset.repo_name, revision=commit.raw_id, f_path='')}">
160 ${_('Browse Files')}
160 ${_('Browse Files')}
161 </a>
161 </a>
162 </div>
162 </div>
163 %endif
163 %endif
164 <h2 class="clearinner">
164 <h2 class="clearinner">
165 %if commit:
165 %if commit:
166 <a class="tooltip revision" title="${h.tooltip(commit.message)}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=commit.raw_id)}">${'r%s:%s' % (commit.revision,h.short_id(commit.raw_id))}</a> -
166 <a class="tooltip revision" title="${h.tooltip(commit.message)}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=commit.raw_id)}">${'r%s:%s' % (commit.revision,h.short_id(commit.raw_id))}</a> -
167 ${h.age_component(commit.date)} -
167 ${h.age_component(commit.date)} -
168 %endif
168 %endif
169 %if diffset.limited_diff:
169 %if diffset.limited_diff:
170 ${_('The requested commit is too big and content was truncated.')}
170 ${_('The requested commit is too big and content was truncated.')}
171
171
172 ${ungettext('%(num)s file changed.', '%(num)s files changed.', diffset.changed_files) % {'num': diffset.changed_files}}
172 ${ungettext('%(num)s file changed.', '%(num)s files changed.', diffset.changed_files) % {'num': diffset.changed_files}}
173 <a href="${link_for(fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a>
173 <a href="${link_for(fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a>
174 %else:
174 %else:
175 ${ungettext('%(num)s file changed: %(linesadd)s inserted, ''%(linesdel)s deleted',
175 ${ungettext('%(num)s file changed: %(linesadd)s inserted, ''%(linesdel)s deleted',
176 '%(num)s files changed: %(linesadd)s inserted, %(linesdel)s deleted', diffset.changed_files) % {'num': diffset.changed_files, 'linesadd': diffset.lines_added, 'linesdel': diffset.lines_deleted}}
176 '%(num)s files changed: %(linesadd)s inserted, %(linesdel)s deleted', diffset.changed_files) % {'num': diffset.changed_files, 'linesadd': diffset.lines_added, 'linesdel': diffset.lines_deleted}}
177 %endif
177 %endif
178
178
179 <% at_ver = getattr(c, 'at_version_num', None) %>
179 <% at_ver = getattr(c, 'at_version_pos', None) %>
180 % if at_ver:
180 % if at_ver:
181 <div class="pull-right">
181 <div class="pull-right">
182 ${_('Changes at version %d') % at_ver}
182 ${_('Showing changes at version %d') % at_ver}
183 </div>
183 </div>
184 % endif
184 % endif
185
185
186 </h2>
186 </h2>
187 </div>
187 </div>
188
188
189 %if not diffset.files:
189 %if not diffset.files:
190 <p class="empty_data">${_('No files')}</p>
190 <p class="empty_data">${_('No files')}</p>
191 %endif
191 %endif
192
192
193 <div class="filediffs">
193 <div class="filediffs">
194 %for i, filediff in enumerate(diffset.files):
194 %for i, filediff in enumerate(diffset.files):
195
195
196 <%
196 <%
197 lines_changed = filediff['patch']['stats']['added'] + filediff['patch']['stats']['deleted']
197 lines_changed = filediff['patch']['stats']['added'] + filediff['patch']['stats']['deleted']
198 over_lines_changed_limit = lines_changed > lines_changed_limit
198 over_lines_changed_limit = lines_changed > lines_changed_limit
199 %>
199 %>
200 <input ${collapse_all and 'checked' or ''} class="filediff-collapse-state" id="filediff-collapse-${id(filediff)}" type="checkbox">
200 <input ${collapse_all and 'checked' or ''} class="filediff-collapse-state" id="filediff-collapse-${id(filediff)}" type="checkbox">
201 <div
201 <div
202 class="filediff"
202 class="filediff"
203 data-f-path="${filediff['patch']['filename']}"
203 data-f-path="${filediff['patch']['filename']}"
204 id="a_${h.FID('', filediff['patch']['filename'])}">
204 id="a_${h.FID('', filediff['patch']['filename'])}">
205 <label for="filediff-collapse-${id(filediff)}" class="filediff-heading">
205 <label for="filediff-collapse-${id(filediff)}" class="filediff-heading">
206 <div class="filediff-collapse-indicator"></div>
206 <div class="filediff-collapse-indicator"></div>
207 ${diff_ops(filediff)}
207 ${diff_ops(filediff)}
208 </label>
208 </label>
209 ${diff_menu(filediff, use_comments=use_comments)}
209 ${diff_menu(filediff, use_comments=use_comments)}
210 <table class="cb cb-diff-${c.diffmode} code-highlight ${over_lines_changed_limit and 'cb-collapsed' or ''}">
210 <table class="cb cb-diff-${c.diffmode} code-highlight ${over_lines_changed_limit and 'cb-collapsed' or ''}">
211 %if not filediff.hunks:
211 %if not filediff.hunks:
212 %for op_id, op_text in filediff['patch']['stats']['ops'].items():
212 %for op_id, op_text in filediff['patch']['stats']['ops'].items():
213 <tr>
213 <tr>
214 <td class="cb-text cb-${op_class(op_id)}" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=6'}>
214 <td class="cb-text cb-${op_class(op_id)}" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=6'}>
215 %if op_id == DEL_FILENODE:
215 %if op_id == DEL_FILENODE:
216 ${_('File was deleted')}
216 ${_('File was deleted')}
217 %elif op_id == BIN_FILENODE:
217 %elif op_id == BIN_FILENODE:
218 ${_('Binary file hidden')}
218 ${_('Binary file hidden')}
219 %else:
219 %else:
220 ${op_text}
220 ${op_text}
221 %endif
221 %endif
222 </td>
222 </td>
223 </tr>
223 </tr>
224 %endfor
224 %endfor
225 %endif
225 %endif
226 %if filediff.patch['is_limited_diff']:
226 %if filediff.patch['is_limited_diff']:
227 <tr class="cb-warning cb-collapser">
227 <tr class="cb-warning cb-collapser">
228 <td class="cb-text" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=6'}>
228 <td class="cb-text" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=6'}>
229 ${_('The requested commit is too big and content was truncated.')} <a href="${link_for(fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a>
229 ${_('The requested commit is too big and content was truncated.')} <a href="${link_for(fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a>
230 </td>
230 </td>
231 </tr>
231 </tr>
232 %else:
232 %else:
233 %if over_lines_changed_limit:
233 %if over_lines_changed_limit:
234 <tr class="cb-warning cb-collapser">
234 <tr class="cb-warning cb-collapser">
235 <td class="cb-text" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=6'}>
235 <td class="cb-text" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=6'}>
236 ${_('This diff has been collapsed as it changes many lines, (%i lines changed)' % lines_changed)}
236 ${_('This diff has been collapsed as it changes many lines, (%i lines changed)' % lines_changed)}
237 <a href="#" class="cb-expand"
237 <a href="#" class="cb-expand"
238 onclick="$(this).closest('table').removeClass('cb-collapsed'); return false;">${_('Show them')}
238 onclick="$(this).closest('table').removeClass('cb-collapsed'); return false;">${_('Show them')}
239 </a>
239 </a>
240 <a href="#" class="cb-collapse"
240 <a href="#" class="cb-collapse"
241 onclick="$(this).closest('table').addClass('cb-collapsed'); return false;">${_('Hide them')}
241 onclick="$(this).closest('table').addClass('cb-collapsed'); return false;">${_('Hide them')}
242 </a>
242 </a>
243 </td>
243 </td>
244 </tr>
244 </tr>
245 %endif
245 %endif
246 %endif
246 %endif
247
247
248 %for hunk in filediff.hunks:
248 %for hunk in filediff.hunks:
249 <tr class="cb-hunk">
249 <tr class="cb-hunk">
250 <td ${c.diffmode == 'unified' and 'colspan=3' or ''}>
250 <td ${c.diffmode == 'unified' and 'colspan=3' or ''}>
251 ## TODO: dan: add ajax loading of more context here
251 ## TODO: dan: add ajax loading of more context here
252 ## <a href="#">
252 ## <a href="#">
253 <i class="icon-more"></i>
253 <i class="icon-more"></i>
254 ## </a>
254 ## </a>
255 </td>
255 </td>
256 <td ${c.diffmode == 'sideside' and 'colspan=5' or ''}>
256 <td ${c.diffmode == 'sideside' and 'colspan=5' or ''}>
257 @@
257 @@
258 -${hunk.source_start},${hunk.source_length}
258 -${hunk.source_start},${hunk.source_length}
259 +${hunk.target_start},${hunk.target_length}
259 +${hunk.target_start},${hunk.target_length}
260 ${hunk.section_header}
260 ${hunk.section_header}
261 </td>
261 </td>
262 </tr>
262 </tr>
263 %if c.diffmode == 'unified':
263 %if c.diffmode == 'unified':
264 ${render_hunk_lines_unified(hunk, use_comments=use_comments)}
264 ${render_hunk_lines_unified(hunk, use_comments=use_comments)}
265 %elif c.diffmode == 'sideside':
265 %elif c.diffmode == 'sideside':
266 ${render_hunk_lines_sideside(hunk, use_comments=use_comments)}
266 ${render_hunk_lines_sideside(hunk, use_comments=use_comments)}
267 %else:
267 %else:
268 <tr class="cb-line">
268 <tr class="cb-line">
269 <td>unknown diff mode</td>
269 <td>unknown diff mode</td>
270 </tr>
270 </tr>
271 %endif
271 %endif
272 %endfor
272 %endfor
273
273
274 ## outdated comments that do not fit into currently displayed lines
274 ## outdated comments that do not fit into currently displayed lines
275 % for lineno, comments in filediff.left_comments.items():
275 % for lineno, comments in filediff.left_comments.items():
276
276
277 %if c.diffmode == 'unified':
277 %if c.diffmode == 'unified':
278 <tr class="cb-line">
278 <tr class="cb-line">
279 <td class="cb-data cb-context"></td>
279 <td class="cb-data cb-context"></td>
280 <td class="cb-lineno cb-context"></td>
280 <td class="cb-lineno cb-context"></td>
281 <td class="cb-lineno cb-context"></td>
281 <td class="cb-lineno cb-context"></td>
282 <td class="cb-content cb-context">
282 <td class="cb-content cb-context">
283 ${inline_comments_container(comments)}
283 ${inline_comments_container(comments)}
284 </td>
284 </td>
285 </tr>
285 </tr>
286 %elif c.diffmode == 'sideside':
286 %elif c.diffmode == 'sideside':
287 <tr class="cb-line">
287 <tr class="cb-line">
288 <td class="cb-data cb-context"></td>
288 <td class="cb-data cb-context"></td>
289 <td class="cb-lineno cb-context"></td>
289 <td class="cb-lineno cb-context"></td>
290 <td class="cb-content cb-context"></td>
290 <td class="cb-content cb-context"></td>
291
291
292 <td class="cb-data cb-context"></td>
292 <td class="cb-data cb-context"></td>
293 <td class="cb-lineno cb-context"></td>
293 <td class="cb-lineno cb-context"></td>
294 <td class="cb-content cb-context">
294 <td class="cb-content cb-context">
295 ${inline_comments_container(comments)}
295 ${inline_comments_container(comments)}
296 </td>
296 </td>
297 </tr>
297 </tr>
298 %endif
298 %endif
299
299
300 % endfor
300 % endfor
301
301
302 </table>
302 </table>
303 </div>
303 </div>
304 %endfor
304 %endfor
305
305
306 ## outdated comments that are made for a file that has been deleted
306 ## outdated comments that are made for a file that has been deleted
307 % for filename, comments_dict in (deleted_files_comments or {}).items():
307 % for filename, comments_dict in (deleted_files_comments or {}).items():
308
308
309 <div class="filediffs filediff-outdated" style="display: none">
309 <div class="filediffs filediff-outdated" style="display: none">
310 <input ${collapse_all and 'checked' or ''} class="filediff-collapse-state" id="filediff-collapse-${id(filename)}" type="checkbox">
310 <input ${collapse_all and 'checked' or ''} class="filediff-collapse-state" id="filediff-collapse-${id(filename)}" type="checkbox">
311 <div class="filediff" data-f-path="${filename}" id="a_${h.FID('', filename)}">
311 <div class="filediff" data-f-path="${filename}" id="a_${h.FID('', filename)}">
312 <label for="filediff-collapse-${id(filename)}" class="filediff-heading">
312 <label for="filediff-collapse-${id(filename)}" class="filediff-heading">
313 <div class="filediff-collapse-indicator"></div>
313 <div class="filediff-collapse-indicator"></div>
314 <span class="pill">
314 <span class="pill">
315 ## file was deleted
315 ## file was deleted
316 <strong>${filename}</strong>
316 <strong>${filename}</strong>
317 </span>
317 </span>
318 <span class="pill-group" style="float: left">
318 <span class="pill-group" style="float: left">
319 ## file op, doesn't need translation
319 ## file op, doesn't need translation
320 <span class="pill" op="removed">removed in this version</span>
320 <span class="pill" op="removed">removed in this version</span>
321 </span>
321 </span>
322 <a class="pill filediff-anchor" href="#a_${h.FID('', filename)}">ΒΆ</a>
322 <a class="pill filediff-anchor" href="#a_${h.FID('', filename)}">ΒΆ</a>
323 <span class="pill-group" style="float: right">
323 <span class="pill-group" style="float: right">
324 <span class="pill" op="deleted">-${comments_dict['stats']}</span>
324 <span class="pill" op="deleted">-${comments_dict['stats']}</span>
325 </span>
325 </span>
326 </label>
326 </label>
327
327
328 <table class="cb cb-diff-${c.diffmode} code-highlight ${over_lines_changed_limit and 'cb-collapsed' or ''}">
328 <table class="cb cb-diff-${c.diffmode} code-highlight ${over_lines_changed_limit and 'cb-collapsed' or ''}">
329 <tr>
329 <tr>
330 % if c.diffmode == 'unified':
330 % if c.diffmode == 'unified':
331 <td></td>
331 <td></td>
332 %endif
332 %endif
333
333
334 <td></td>
334 <td></td>
335 <td class="cb-text cb-${op_class(BIN_FILENODE)}" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=5'}>
335 <td class="cb-text cb-${op_class(BIN_FILENODE)}" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=5'}>
336 ${_('File was deleted in this version, and outdated comments were made on it')}
336 ${_('File was deleted in this version, and outdated comments were made on it')}
337 </td>
337 </td>
338 </tr>
338 </tr>
339 %if c.diffmode == 'unified':
339 %if c.diffmode == 'unified':
340 <tr class="cb-line">
340 <tr class="cb-line">
341 <td class="cb-data cb-context"></td>
341 <td class="cb-data cb-context"></td>
342 <td class="cb-lineno cb-context"></td>
342 <td class="cb-lineno cb-context"></td>
343 <td class="cb-lineno cb-context"></td>
343 <td class="cb-lineno cb-context"></td>
344 <td class="cb-content cb-context">
344 <td class="cb-content cb-context">
345 ${inline_comments_container(comments_dict['comments'])}
345 ${inline_comments_container(comments_dict['comments'])}
346 </td>
346 </td>
347 </tr>
347 </tr>
348 %elif c.diffmode == 'sideside':
348 %elif c.diffmode == 'sideside':
349 <tr class="cb-line">
349 <tr class="cb-line">
350 <td class="cb-data cb-context"></td>
350 <td class="cb-data cb-context"></td>
351 <td class="cb-lineno cb-context"></td>
351 <td class="cb-lineno cb-context"></td>
352 <td class="cb-content cb-context"></td>
352 <td class="cb-content cb-context"></td>
353
353
354 <td class="cb-data cb-context"></td>
354 <td class="cb-data cb-context"></td>
355 <td class="cb-lineno cb-context"></td>
355 <td class="cb-lineno cb-context"></td>
356 <td class="cb-content cb-context">
356 <td class="cb-content cb-context">
357 ${inline_comments_container(comments_dict['comments'])}
357 ${inline_comments_container(comments_dict['comments'])}
358 </td>
358 </td>
359 </tr>
359 </tr>
360 %endif
360 %endif
361 </table>
361 </table>
362 </div>
362 </div>
363 </div>
363 </div>
364 % endfor
364 % endfor
365
365
366 </div>
366 </div>
367 </div>
367 </div>
368 </%def>
368 </%def>
369
369
370 <%def name="diff_ops(filediff)">
370 <%def name="diff_ops(filediff)">
371 <%
371 <%
372 stats = filediff['patch']['stats']
372 stats = filediff['patch']['stats']
373 from rhodecode.lib.diffs import NEW_FILENODE, DEL_FILENODE, \
373 from rhodecode.lib.diffs import NEW_FILENODE, DEL_FILENODE, \
374 MOD_FILENODE, RENAMED_FILENODE, CHMOD_FILENODE, BIN_FILENODE
374 MOD_FILENODE, RENAMED_FILENODE, CHMOD_FILENODE, BIN_FILENODE
375 %>
375 %>
376 <span class="pill">
376 <span class="pill">
377 %if filediff.source_file_path and filediff.target_file_path:
377 %if filediff.source_file_path and filediff.target_file_path:
378 %if filediff.source_file_path != filediff.target_file_path:
378 %if filediff.source_file_path != filediff.target_file_path:
379 ## file was renamed
379 ## file was renamed
380 <strong>${filediff.target_file_path}</strong> β¬… <del>${filediff.source_file_path}</del>
380 <strong>${filediff.target_file_path}</strong> β¬… <del>${filediff.source_file_path}</del>
381 %else:
381 %else:
382 ## file was modified
382 ## file was modified
383 <strong>${filediff.source_file_path}</strong>
383 <strong>${filediff.source_file_path}</strong>
384 %endif
384 %endif
385 %else:
385 %else:
386 %if filediff.source_file_path:
386 %if filediff.source_file_path:
387 ## file was deleted
387 ## file was deleted
388 <strong>${filediff.source_file_path}</strong>
388 <strong>${filediff.source_file_path}</strong>
389 %else:
389 %else:
390 ## file was added
390 ## file was added
391 <strong>${filediff.target_file_path}</strong>
391 <strong>${filediff.target_file_path}</strong>
392 %endif
392 %endif
393 %endif
393 %endif
394 </span>
394 </span>
395 <span class="pill-group" style="float: left">
395 <span class="pill-group" style="float: left">
396 %if filediff.patch['is_limited_diff']:
396 %if filediff.patch['is_limited_diff']:
397 <span class="pill tooltip" op="limited" title="The stats for this diff are not complete">limited diff</span>
397 <span class="pill tooltip" op="limited" title="The stats for this diff are not complete">limited diff</span>
398 %endif
398 %endif
399 %if RENAMED_FILENODE in stats['ops']:
399 %if RENAMED_FILENODE in stats['ops']:
400 <span class="pill" op="renamed">renamed</span>
400 <span class="pill" op="renamed">renamed</span>
401 %endif
401 %endif
402
402
403 %if NEW_FILENODE in stats['ops']:
403 %if NEW_FILENODE in stats['ops']:
404 <span class="pill" op="created">created</span>
404 <span class="pill" op="created">created</span>
405 %if filediff['target_mode'].startswith('120'):
405 %if filediff['target_mode'].startswith('120'):
406 <span class="pill" op="symlink">symlink</span>
406 <span class="pill" op="symlink">symlink</span>
407 %else:
407 %else:
408 <span class="pill" op="mode">${nice_mode(filediff['target_mode'])}</span>
408 <span class="pill" op="mode">${nice_mode(filediff['target_mode'])}</span>
409 %endif
409 %endif
410 %endif
410 %endif
411
411
412 %if DEL_FILENODE in stats['ops']:
412 %if DEL_FILENODE in stats['ops']:
413 <span class="pill" op="removed">removed</span>
413 <span class="pill" op="removed">removed</span>
414 %endif
414 %endif
415
415
416 %if CHMOD_FILENODE in stats['ops']:
416 %if CHMOD_FILENODE in stats['ops']:
417 <span class="pill" op="mode">
417 <span class="pill" op="mode">
418 ${nice_mode(filediff['source_mode'])} ➑ ${nice_mode(filediff['target_mode'])}
418 ${nice_mode(filediff['source_mode'])} ➑ ${nice_mode(filediff['target_mode'])}
419 </span>
419 </span>
420 %endif
420 %endif
421 </span>
421 </span>
422
422
423 <a class="pill filediff-anchor" href="#a_${h.FID('', filediff.patch['filename'])}">ΒΆ</a>
423 <a class="pill filediff-anchor" href="#a_${h.FID('', filediff.patch['filename'])}">ΒΆ</a>
424
424
425 <span class="pill-group" style="float: right">
425 <span class="pill-group" style="float: right">
426 %if BIN_FILENODE in stats['ops']:
426 %if BIN_FILENODE in stats['ops']:
427 <span class="pill" op="binary">binary</span>
427 <span class="pill" op="binary">binary</span>
428 %if MOD_FILENODE in stats['ops']:
428 %if MOD_FILENODE in stats['ops']:
429 <span class="pill" op="modified">modified</span>
429 <span class="pill" op="modified">modified</span>
430 %endif
430 %endif
431 %endif
431 %endif
432 %if stats['added']:
432 %if stats['added']:
433 <span class="pill" op="added">+${stats['added']}</span>
433 <span class="pill" op="added">+${stats['added']}</span>
434 %endif
434 %endif
435 %if stats['deleted']:
435 %if stats['deleted']:
436 <span class="pill" op="deleted">-${stats['deleted']}</span>
436 <span class="pill" op="deleted">-${stats['deleted']}</span>
437 %endif
437 %endif
438 </span>
438 </span>
439
439
440 </%def>
440 </%def>
441
441
442 <%def name="nice_mode(filemode)">
442 <%def name="nice_mode(filemode)">
443 ${filemode.startswith('100') and filemode[3:] or filemode}
443 ${filemode.startswith('100') and filemode[3:] or filemode}
444 </%def>
444 </%def>
445
445
446 <%def name="diff_menu(filediff, use_comments=False)">
446 <%def name="diff_menu(filediff, use_comments=False)">
447 <div class="filediff-menu">
447 <div class="filediff-menu">
448 %if filediff.diffset.source_ref:
448 %if filediff.diffset.source_ref:
449 %if filediff.patch['operation'] in ['D', 'M']:
449 %if filediff.patch['operation'] in ['D', 'M']:
450 <a
450 <a
451 class="tooltip"
451 class="tooltip"
452 href="${h.url('files_home',repo_name=filediff.diffset.repo_name,f_path=filediff.source_file_path,revision=filediff.diffset.source_ref)}"
452 href="${h.url('files_home',repo_name=filediff.diffset.repo_name,f_path=filediff.source_file_path,revision=filediff.diffset.source_ref)}"
453 title="${h.tooltip(_('Show file at commit: %(commit_id)s') % {'commit_id': filediff.diffset.source_ref[:12]})}"
453 title="${h.tooltip(_('Show file at commit: %(commit_id)s') % {'commit_id': filediff.diffset.source_ref[:12]})}"
454 >
454 >
455 ${_('Show file before')}
455 ${_('Show file before')}
456 </a> |
456 </a> |
457 %else:
457 %else:
458 <span
458 <span
459 class="tooltip"
459 class="tooltip"
460 title="${h.tooltip(_('File no longer present at commit: %(commit_id)s') % {'commit_id': filediff.diffset.source_ref[:12]})}"
460 title="${h.tooltip(_('File no longer present at commit: %(commit_id)s') % {'commit_id': filediff.diffset.source_ref[:12]})}"
461 >
461 >
462 ${_('Show file before')}
462 ${_('Show file before')}
463 </span> |
463 </span> |
464 %endif
464 %endif
465 %if filediff.patch['operation'] in ['A', 'M']:
465 %if filediff.patch['operation'] in ['A', 'M']:
466 <a
466 <a
467 class="tooltip"
467 class="tooltip"
468 href="${h.url('files_home',repo_name=filediff.diffset.source_repo_name,f_path=filediff.target_file_path,revision=filediff.diffset.target_ref)}"
468 href="${h.url('files_home',repo_name=filediff.diffset.source_repo_name,f_path=filediff.target_file_path,revision=filediff.diffset.target_ref)}"
469 title="${h.tooltip(_('Show file at commit: %(commit_id)s') % {'commit_id': filediff.diffset.target_ref[:12]})}"
469 title="${h.tooltip(_('Show file at commit: %(commit_id)s') % {'commit_id': filediff.diffset.target_ref[:12]})}"
470 >
470 >
471 ${_('Show file after')}
471 ${_('Show file after')}
472 </a> |
472 </a> |
473 %else:
473 %else:
474 <span
474 <span
475 class="tooltip"
475 class="tooltip"
476 title="${h.tooltip(_('File no longer present at commit: %(commit_id)s') % {'commit_id': filediff.diffset.target_ref[:12]})}"
476 title="${h.tooltip(_('File no longer present at commit: %(commit_id)s') % {'commit_id': filediff.diffset.target_ref[:12]})}"
477 >
477 >
478 ${_('Show file after')}
478 ${_('Show file after')}
479 </span> |
479 </span> |
480 %endif
480 %endif
481 <a
481 <a
482 class="tooltip"
482 class="tooltip"
483 title="${h.tooltip(_('Raw diff'))}"
483 title="${h.tooltip(_('Raw diff'))}"
484 href="${h.url('files_diff_home',repo_name=filediff.diffset.repo_name,f_path=filediff.target_file_path,diff2=filediff.diffset.target_ref,diff1=filediff.diffset.source_ref,diff='raw')}"
484 href="${h.url('files_diff_home',repo_name=filediff.diffset.repo_name,f_path=filediff.target_file_path,diff2=filediff.diffset.target_ref,diff1=filediff.diffset.source_ref,diff='raw')}"
485 >
485 >
486 ${_('Raw diff')}
486 ${_('Raw diff')}
487 </a> |
487 </a> |
488 <a
488 <a
489 class="tooltip"
489 class="tooltip"
490 title="${h.tooltip(_('Download diff'))}"
490 title="${h.tooltip(_('Download diff'))}"
491 href="${h.url('files_diff_home',repo_name=filediff.diffset.repo_name,f_path=filediff.target_file_path,diff2=filediff.diffset.target_ref,diff1=filediff.diffset.source_ref,diff='download')}"
491 href="${h.url('files_diff_home',repo_name=filediff.diffset.repo_name,f_path=filediff.target_file_path,diff2=filediff.diffset.target_ref,diff1=filediff.diffset.source_ref,diff='download')}"
492 >
492 >
493 ${_('Download diff')}
493 ${_('Download diff')}
494 </a>
494 </a>
495 % if use_comments:
495 % if use_comments:
496 |
496 |
497 % endif
497 % endif
498
498
499 ## TODO: dan: refactor ignorews_url and context_url into the diff renderer same as diffmode=unified/sideside. Also use ajax to load more context (by clicking hunks)
499 ## TODO: dan: refactor ignorews_url and context_url into the diff renderer same as diffmode=unified/sideside. Also use ajax to load more context (by clicking hunks)
500 %if hasattr(c, 'ignorews_url'):
500 %if hasattr(c, 'ignorews_url'):
501 ${c.ignorews_url(request.GET, h.FID('', filediff['patch']['filename']))}
501 ${c.ignorews_url(request.GET, h.FID('', filediff['patch']['filename']))}
502 %endif
502 %endif
503 %if hasattr(c, 'context_url'):
503 %if hasattr(c, 'context_url'):
504 ${c.context_url(request.GET, h.FID('', filediff['patch']['filename']))}
504 ${c.context_url(request.GET, h.FID('', filediff['patch']['filename']))}
505 %endif
505 %endif
506
506
507 %if use_comments:
507 %if use_comments:
508 <a href="#" onclick="return Rhodecode.comments.toggleComments(this);">
508 <a href="#" onclick="return Rhodecode.comments.toggleComments(this);">
509 <span class="show-comment-button">${_('Show comments')}</span><span class="hide-comment-button">${_('Hide comments')}</span>
509 <span class="show-comment-button">${_('Show comments')}</span><span class="hide-comment-button">${_('Hide comments')}</span>
510 </a>
510 </a>
511 %endif
511 %endif
512 %endif
512 %endif
513 </div>
513 </div>
514 </%def>
514 </%def>
515
515
516
516
517 <%namespace name="commentblock" file="/changeset/changeset_file_comment.mako"/>
517 <%namespace name="commentblock" file="/changeset/changeset_file_comment.mako"/>
518 <%def name="inline_comments_container(comments)">
518 <%def name="inline_comments_container(comments)">
519 <div class="inline-comments">
519 <div class="inline-comments">
520 %for comment in comments:
520 %for comment in comments:
521 ${commentblock.comment_block(comment, inline=True)}
521 ${commentblock.comment_block(comment, inline=True)}
522 %endfor
522 %endfor
523
523
524 % if comments and comments[-1].outdated:
524 % if comments and comments[-1].outdated:
525 <span class="btn btn-secondary cb-comment-add-button comment-outdated}"
525 <span class="btn btn-secondary cb-comment-add-button comment-outdated}"
526 style="display: none;}">
526 style="display: none;}">
527 ${_('Add another comment')}
527 ${_('Add another comment')}
528 </span>
528 </span>
529 % else:
529 % else:
530 <span onclick="return Rhodecode.comments.createComment(this)"
530 <span onclick="return Rhodecode.comments.createComment(this)"
531 class="btn btn-secondary cb-comment-add-button">
531 class="btn btn-secondary cb-comment-add-button">
532 ${_('Add another comment')}
532 ${_('Add another comment')}
533 </span>
533 </span>
534 % endif
534 % endif
535
535
536 </div>
536 </div>
537 </%def>
537 </%def>
538
538
539
539
540 <%def name="render_hunk_lines_sideside(hunk, use_comments=False)">
540 <%def name="render_hunk_lines_sideside(hunk, use_comments=False)">
541 %for i, line in enumerate(hunk.sideside):
541 %for i, line in enumerate(hunk.sideside):
542 <%
542 <%
543 old_line_anchor, new_line_anchor = None, None
543 old_line_anchor, new_line_anchor = None, None
544 if line.original.lineno:
544 if line.original.lineno:
545 old_line_anchor = diff_line_anchor(hunk.filediff.source_file_path, line.original.lineno, 'o')
545 old_line_anchor = diff_line_anchor(hunk.filediff.source_file_path, line.original.lineno, 'o')
546 if line.modified.lineno:
546 if line.modified.lineno:
547 new_line_anchor = diff_line_anchor(hunk.filediff.target_file_path, line.modified.lineno, 'n')
547 new_line_anchor = diff_line_anchor(hunk.filediff.target_file_path, line.modified.lineno, 'n')
548 %>
548 %>
549
549
550 <tr class="cb-line">
550 <tr class="cb-line">
551 <td class="cb-data ${action_class(line.original.action)}"
551 <td class="cb-data ${action_class(line.original.action)}"
552 data-line-number="${line.original.lineno}"
552 data-line-number="${line.original.lineno}"
553 >
553 >
554 <div>
554 <div>
555 %if line.original.comments:
555 %if line.original.comments:
556 <i class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
556 <i class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
557 %endif
557 %endif
558 </div>
558 </div>
559 </td>
559 </td>
560 <td class="cb-lineno ${action_class(line.original.action)}"
560 <td class="cb-lineno ${action_class(line.original.action)}"
561 data-line-number="${line.original.lineno}"
561 data-line-number="${line.original.lineno}"
562 %if old_line_anchor:
562 %if old_line_anchor:
563 id="${old_line_anchor}"
563 id="${old_line_anchor}"
564 %endif
564 %endif
565 >
565 >
566 %if line.original.lineno:
566 %if line.original.lineno:
567 <a name="${old_line_anchor}" href="#${old_line_anchor}">${line.original.lineno}</a>
567 <a name="${old_line_anchor}" href="#${old_line_anchor}">${line.original.lineno}</a>
568 %endif
568 %endif
569 </td>
569 </td>
570 <td class="cb-content ${action_class(line.original.action)}"
570 <td class="cb-content ${action_class(line.original.action)}"
571 data-line-number="o${line.original.lineno}"
571 data-line-number="o${line.original.lineno}"
572 >
572 >
573 %if use_comments and line.original.lineno:
573 %if use_comments and line.original.lineno:
574 ${render_add_comment_button()}
574 ${render_add_comment_button()}
575 %endif
575 %endif
576 <span class="cb-code">${line.original.action} ${line.original.content or '' | n}</span>
576 <span class="cb-code">${line.original.action} ${line.original.content or '' | n}</span>
577 %if use_comments and line.original.lineno and line.original.comments:
577 %if use_comments and line.original.lineno and line.original.comments:
578 ${inline_comments_container(line.original.comments)}
578 ${inline_comments_container(line.original.comments)}
579 %endif
579 %endif
580 </td>
580 </td>
581 <td class="cb-data ${action_class(line.modified.action)}"
581 <td class="cb-data ${action_class(line.modified.action)}"
582 data-line-number="${line.modified.lineno}"
582 data-line-number="${line.modified.lineno}"
583 >
583 >
584 <div>
584 <div>
585 %if line.modified.comments:
585 %if line.modified.comments:
586 <i class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
586 <i class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
587 %endif
587 %endif
588 </div>
588 </div>
589 </td>
589 </td>
590 <td class="cb-lineno ${action_class(line.modified.action)}"
590 <td class="cb-lineno ${action_class(line.modified.action)}"
591 data-line-number="${line.modified.lineno}"
591 data-line-number="${line.modified.lineno}"
592 %if new_line_anchor:
592 %if new_line_anchor:
593 id="${new_line_anchor}"
593 id="${new_line_anchor}"
594 %endif
594 %endif
595 >
595 >
596 %if line.modified.lineno:
596 %if line.modified.lineno:
597 <a name="${new_line_anchor}" href="#${new_line_anchor}">${line.modified.lineno}</a>
597 <a name="${new_line_anchor}" href="#${new_line_anchor}">${line.modified.lineno}</a>
598 %endif
598 %endif
599 </td>
599 </td>
600 <td class="cb-content ${action_class(line.modified.action)}"
600 <td class="cb-content ${action_class(line.modified.action)}"
601 data-line-number="n${line.modified.lineno}"
601 data-line-number="n${line.modified.lineno}"
602 >
602 >
603 %if use_comments and line.modified.lineno:
603 %if use_comments and line.modified.lineno:
604 ${render_add_comment_button()}
604 ${render_add_comment_button()}
605 %endif
605 %endif
606 <span class="cb-code">${line.modified.action} ${line.modified.content or '' | n}</span>
606 <span class="cb-code">${line.modified.action} ${line.modified.content or '' | n}</span>
607 %if use_comments and line.modified.lineno and line.modified.comments:
607 %if use_comments and line.modified.lineno and line.modified.comments:
608 ${inline_comments_container(line.modified.comments)}
608 ${inline_comments_container(line.modified.comments)}
609 %endif
609 %endif
610 </td>
610 </td>
611 </tr>
611 </tr>
612 %endfor
612 %endfor
613 </%def>
613 </%def>
614
614
615
615
616 <%def name="render_hunk_lines_unified(hunk, use_comments=False)">
616 <%def name="render_hunk_lines_unified(hunk, use_comments=False)">
617 %for old_line_no, new_line_no, action, content, comments in hunk.unified:
617 %for old_line_no, new_line_no, action, content, comments in hunk.unified:
618 <%
618 <%
619 old_line_anchor, new_line_anchor = None, None
619 old_line_anchor, new_line_anchor = None, None
620 if old_line_no:
620 if old_line_no:
621 old_line_anchor = diff_line_anchor(hunk.filediff.source_file_path, old_line_no, 'o')
621 old_line_anchor = diff_line_anchor(hunk.filediff.source_file_path, old_line_no, 'o')
622 if new_line_no:
622 if new_line_no:
623 new_line_anchor = diff_line_anchor(hunk.filediff.target_file_path, new_line_no, 'n')
623 new_line_anchor = diff_line_anchor(hunk.filediff.target_file_path, new_line_no, 'n')
624 %>
624 %>
625 <tr class="cb-line">
625 <tr class="cb-line">
626 <td class="cb-data ${action_class(action)}">
626 <td class="cb-data ${action_class(action)}">
627 <div>
627 <div>
628 %if comments:
628 %if comments:
629 <i class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
629 <i class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
630 %endif
630 %endif
631 </div>
631 </div>
632 </td>
632 </td>
633 <td class="cb-lineno ${action_class(action)}"
633 <td class="cb-lineno ${action_class(action)}"
634 data-line-number="${old_line_no}"
634 data-line-number="${old_line_no}"
635 %if old_line_anchor:
635 %if old_line_anchor:
636 id="${old_line_anchor}"
636 id="${old_line_anchor}"
637 %endif
637 %endif
638 >
638 >
639 %if old_line_anchor:
639 %if old_line_anchor:
640 <a name="${old_line_anchor}" href="#${old_line_anchor}">${old_line_no}</a>
640 <a name="${old_line_anchor}" href="#${old_line_anchor}">${old_line_no}</a>
641 %endif
641 %endif
642 </td>
642 </td>
643 <td class="cb-lineno ${action_class(action)}"
643 <td class="cb-lineno ${action_class(action)}"
644 data-line-number="${new_line_no}"
644 data-line-number="${new_line_no}"
645 %if new_line_anchor:
645 %if new_line_anchor:
646 id="${new_line_anchor}"
646 id="${new_line_anchor}"
647 %endif
647 %endif
648 >
648 >
649 %if new_line_anchor:
649 %if new_line_anchor:
650 <a name="${new_line_anchor}" href="#${new_line_anchor}">${new_line_no}</a>
650 <a name="${new_line_anchor}" href="#${new_line_anchor}">${new_line_no}</a>
651 %endif
651 %endif
652 </td>
652 </td>
653 <td class="cb-content ${action_class(action)}"
653 <td class="cb-content ${action_class(action)}"
654 data-line-number="${new_line_no and 'n' or 'o'}${new_line_no or old_line_no}"
654 data-line-number="${new_line_no and 'n' or 'o'}${new_line_no or old_line_no}"
655 >
655 >
656 %if use_comments:
656 %if use_comments:
657 ${render_add_comment_button()}
657 ${render_add_comment_button()}
658 %endif
658 %endif
659 <span class="cb-code">${action} ${content or '' | n}</span>
659 <span class="cb-code">${action} ${content or '' | n}</span>
660 %if use_comments and comments:
660 %if use_comments and comments:
661 ${inline_comments_container(comments)}
661 ${inline_comments_container(comments)}
662 %endif
662 %endif
663 </td>
663 </td>
664 </tr>
664 </tr>
665 %endfor
665 %endfor
666 </%def>
666 </%def>
667
667
668 <%def name="render_add_comment_button()">
668 <%def name="render_add_comment_button()">
669 <button class="btn btn-small btn-primary cb-comment-box-opener" onclick="return Rhodecode.comments.createComment(this)">
669 <button class="btn btn-small btn-primary cb-comment-box-opener" onclick="return Rhodecode.comments.createComment(this)">
670 <span><i class="icon-comment"></i></span>
670 <span><i class="icon-comment"></i></span>
671 </button>
671 </button>
672 </%def>
672 </%def>
673
673
674 <%def name="render_diffset_menu()">
674 <%def name="render_diffset_menu()">
675
675
676 <div class="diffset-menu clearinner">
676 <div class="diffset-menu clearinner">
677 <div class="pull-right">
677 <div class="pull-right">
678 <div class="btn-group">
678 <div class="btn-group">
679
679
680 <a
680 <a
681 class="btn ${c.diffmode == 'sideside' and 'btn-primary'} tooltip"
681 class="btn ${c.diffmode == 'sideside' and 'btn-primary'} tooltip"
682 title="${_('View side by side')}"
682 title="${_('View side by side')}"
683 href="${h.url_replace(diffmode='sideside')}">
683 href="${h.url_replace(diffmode='sideside')}">
684 <span>${_('Side by Side')}</span>
684 <span>${_('Side by Side')}</span>
685 </a>
685 </a>
686 <a
686 <a
687 class="btn ${c.diffmode == 'unified' and 'btn-primary'} tooltip"
687 class="btn ${c.diffmode == 'unified' and 'btn-primary'} tooltip"
688 title="${_('View unified')}" href="${h.url_replace(diffmode='unified')}">
688 title="${_('View unified')}" href="${h.url_replace(diffmode='unified')}">
689 <span>${_('Unified')}</span>
689 <span>${_('Unified')}</span>
690 </a>
690 </a>
691 </div>
691 </div>
692 </div>
692 </div>
693
693
694 <div class="pull-left">
694 <div class="pull-left">
695 <div class="btn-group">
695 <div class="btn-group">
696 <a
696 <a
697 class="btn"
697 class="btn"
698 href="#"
698 href="#"
699 onclick="$('input[class=filediff-collapse-state]').prop('checked', false); return false">${_('Expand All Files')}</a>
699 onclick="$('input[class=filediff-collapse-state]').prop('checked', false); return false">${_('Expand All Files')}</a>
700 <a
700 <a
701 class="btn"
701 class="btn"
702 href="#"
702 href="#"
703 onclick="$('input[class=filediff-collapse-state]').prop('checked', true); return false">${_('Collapse All Files')}</a>
703 onclick="$('input[class=filediff-collapse-state]').prop('checked', true); return false">${_('Collapse All Files')}</a>
704 <a
704 <a
705 class="btn"
705 class="btn"
706 href="#"
706 href="#"
707 onclick="return Rhodecode.comments.toggleWideMode(this)">${_('Wide Mode Diff')}</a>
707 onclick="return Rhodecode.comments.toggleWideMode(this)">${_('Wide Mode Diff')}</a>
708 </div>
708 </div>
709 </div>
709 </div>
710 </div>
710 </div>
711 </%def>
711 </%def>
@@ -1,638 +1,643 b''
1 <%inherit file="/base/base.mako"/>
1 <%inherit file="/base/base.mako"/>
2
2
3 <%def name="title()">
3 <%def name="title()">
4 ${_('%s Pull Request #%s') % (c.repo_name, c.pull_request.pull_request_id)}
4 ${_('%s Pull Request #%s') % (c.repo_name, c.pull_request.pull_request_id)}
5 %if c.rhodecode_name:
5 %if c.rhodecode_name:
6 &middot; ${h.branding(c.rhodecode_name)}
6 &middot; ${h.branding(c.rhodecode_name)}
7 %endif
7 %endif
8 </%def>
8 </%def>
9
9
10 <%def name="breadcrumbs_links()">
10 <%def name="breadcrumbs_links()">
11 <span id="pr-title">
11 <span id="pr-title">
12 ${c.pull_request.title}
12 ${c.pull_request.title}
13 %if c.pull_request.is_closed():
13 %if c.pull_request.is_closed():
14 (${_('Closed')})
14 (${_('Closed')})
15 %endif
15 %endif
16 </span>
16 </span>
17 <div id="pr-title-edit" class="input" style="display: none;">
17 <div id="pr-title-edit" class="input" style="display: none;">
18 ${h.text('pullrequest_title', id_="pr-title-input", class_="large", value=c.pull_request.title)}
18 ${h.text('pullrequest_title', id_="pr-title-input", class_="large", value=c.pull_request.title)}
19 </div>
19 </div>
20 </%def>
20 </%def>
21
21
22 <%def name="menu_bar_nav()">
22 <%def name="menu_bar_nav()">
23 ${self.menu_items(active='repositories')}
23 ${self.menu_items(active='repositories')}
24 </%def>
24 </%def>
25
25
26 <%def name="menu_bar_subnav()">
26 <%def name="menu_bar_subnav()">
27 ${self.repo_menu(active='showpullrequest')}
27 ${self.repo_menu(active='showpullrequest')}
28 </%def>
28 </%def>
29
29
30 <%def name="main()">
30 <%def name="main()">
31
31
32 <script type="text/javascript">
32 <script type="text/javascript">
33 // TODO: marcink switch this to pyroutes
33 // TODO: marcink switch this to pyroutes
34 AJAX_COMMENT_DELETE_URL = "${url('pullrequest_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}";
34 AJAX_COMMENT_DELETE_URL = "${url('pullrequest_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}";
35 templateContext.pull_request_data.pull_request_id = ${c.pull_request.pull_request_id};
35 templateContext.pull_request_data.pull_request_id = ${c.pull_request.pull_request_id};
36 </script>
36 </script>
37 <div class="box">
37 <div class="box">
38 <div class="title">
38 <div class="title">
39 ${self.repo_page_title(c.rhodecode_db_repo)}
39 ${self.repo_page_title(c.rhodecode_db_repo)}
40 </div>
40 </div>
41
41
42 ${self.breadcrumbs()}
42 ${self.breadcrumbs()}
43
43
44 <div class="box pr-summary">
44 <div class="box pr-summary">
45 <div class="summary-details block-left">
45 <div class="summary-details block-left">
46 <% summary = lambda n:{False:'summary-short'}.get(n) %>
46 <% summary = lambda n:{False:'summary-short'}.get(n) %>
47 <div class="pr-details-title">
47 <div class="pr-details-title">
48 <a href="${h.url('pull_requests_global', pull_request_id=c.pull_request.pull_request_id)}">${_('Pull request #%s') % c.pull_request.pull_request_id}</a> ${_('From')} ${h.format_date(c.pull_request.created_on)}
48 <a href="${h.url('pull_requests_global', pull_request_id=c.pull_request.pull_request_id)}">${_('Pull request #%s') % c.pull_request.pull_request_id}</a> ${_('From')} ${h.format_date(c.pull_request.created_on)}
49 %if c.allowed_to_update:
49 %if c.allowed_to_update:
50 <div id="delete_pullrequest" class="pull-right action_button ${'' if c.allowed_to_delete else 'disabled' }" style="clear:inherit;padding: 0">
50 <div id="delete_pullrequest" class="pull-right action_button ${'' if c.allowed_to_delete else 'disabled' }" style="clear:inherit;padding: 0">
51 % if c.allowed_to_delete:
51 % if c.allowed_to_delete:
52 ${h.secure_form(url('pullrequest_delete', repo_name=c.pull_request.target_repo.repo_name, pull_request_id=c.pull_request.pull_request_id),method='delete')}
52 ${h.secure_form(url('pullrequest_delete', repo_name=c.pull_request.target_repo.repo_name, pull_request_id=c.pull_request.pull_request_id),method='delete')}
53 ${h.submit('remove_%s' % c.pull_request.pull_request_id, _('Delete'),
53 ${h.submit('remove_%s' % c.pull_request.pull_request_id, _('Delete'),
54 class_="btn btn-link btn-danger",onclick="return confirm('"+_('Confirm to delete this pull request')+"');")}
54 class_="btn btn-link btn-danger",onclick="return confirm('"+_('Confirm to delete this pull request')+"');")}
55 ${h.end_form()}
55 ${h.end_form()}
56 % else:
56 % else:
57 ${_('Delete')}
57 ${_('Delete')}
58 % endif
58 % endif
59 </div>
59 </div>
60 <div id="open_edit_pullrequest" class="pull-right action_button">${_('Edit')}</div>
60 <div id="open_edit_pullrequest" class="pull-right action_button">${_('Edit')}</div>
61 <div id="close_edit_pullrequest" class="pull-right action_button" style="display: none;padding: 0">${_('Cancel')}</div>
61 <div id="close_edit_pullrequest" class="pull-right action_button" style="display: none;padding: 0">${_('Cancel')}</div>
62 %endif
62 %endif
63 </div>
63 </div>
64
64
65 <div id="summary" class="fields pr-details-content">
65 <div id="summary" class="fields pr-details-content">
66 <div class="field">
66 <div class="field">
67 <div class="label-summary">
67 <div class="label-summary">
68 <label>${_('Origin')}:</label>
68 <label>${_('Origin')}:</label>
69 </div>
69 </div>
70 <div class="input">
70 <div class="input">
71 <div class="pr-origininfo">
71 <div class="pr-origininfo">
72 ## branch link is only valid if it is a branch
72 ## branch link is only valid if it is a branch
73 <span class="tag">
73 <span class="tag">
74 %if c.pull_request.source_ref_parts.type == 'branch':
74 %if c.pull_request.source_ref_parts.type == 'branch':
75 <a href="${h.url('changelog_home', repo_name=c.pull_request.source_repo.repo_name, branch=c.pull_request.source_ref_parts.name)}">${c.pull_request.source_ref_parts.type}: ${c.pull_request.source_ref_parts.name}</a>
75 <a href="${h.url('changelog_home', repo_name=c.pull_request.source_repo.repo_name, branch=c.pull_request.source_ref_parts.name)}">${c.pull_request.source_ref_parts.type}: ${c.pull_request.source_ref_parts.name}</a>
76 %else:
76 %else:
77 ${c.pull_request.source_ref_parts.type}: ${c.pull_request.source_ref_parts.name}
77 ${c.pull_request.source_ref_parts.type}: ${c.pull_request.source_ref_parts.name}
78 %endif
78 %endif
79 </span>
79 </span>
80 <span class="clone-url">
80 <span class="clone-url">
81 <a href="${h.url('summary_home', repo_name=c.pull_request.source_repo.repo_name)}">${c.pull_request.source_repo.clone_url()}</a>
81 <a href="${h.url('summary_home', repo_name=c.pull_request.source_repo.repo_name)}">${c.pull_request.source_repo.clone_url()}</a>
82 </span>
82 </span>
83 </div>
83 </div>
84 <div class="pr-pullinfo">
84 <div class="pr-pullinfo">
85 %if h.is_hg(c.pull_request.source_repo):
85 %if h.is_hg(c.pull_request.source_repo):
86 <input type="text" value="hg pull -r ${h.short_id(c.source_ref)} ${c.pull_request.source_repo.clone_url()}" readonly="readonly">
86 <input type="text" value="hg pull -r ${h.short_id(c.source_ref)} ${c.pull_request.source_repo.clone_url()}" readonly="readonly">
87 %elif h.is_git(c.pull_request.source_repo):
87 %elif h.is_git(c.pull_request.source_repo):
88 <input type="text" value="git pull ${c.pull_request.source_repo.clone_url()} ${c.pull_request.source_ref_parts.name}" readonly="readonly">
88 <input type="text" value="git pull ${c.pull_request.source_repo.clone_url()} ${c.pull_request.source_ref_parts.name}" readonly="readonly">
89 %endif
89 %endif
90 </div>
90 </div>
91 </div>
91 </div>
92 </div>
92 </div>
93 <div class="field">
93 <div class="field">
94 <div class="label-summary">
94 <div class="label-summary">
95 <label>${_('Target')}:</label>
95 <label>${_('Target')}:</label>
96 </div>
96 </div>
97 <div class="input">
97 <div class="input">
98 <div class="pr-targetinfo">
98 <div class="pr-targetinfo">
99 ## branch link is only valid if it is a branch
99 ## branch link is only valid if it is a branch
100 <span class="tag">
100 <span class="tag">
101 %if c.pull_request.target_ref_parts.type == 'branch':
101 %if c.pull_request.target_ref_parts.type == 'branch':
102 <a href="${h.url('changelog_home', repo_name=c.pull_request.target_repo.repo_name, branch=c.pull_request.target_ref_parts.name)}">${c.pull_request.target_ref_parts.type}: ${c.pull_request.target_ref_parts.name}</a>
102 <a href="${h.url('changelog_home', repo_name=c.pull_request.target_repo.repo_name, branch=c.pull_request.target_ref_parts.name)}">${c.pull_request.target_ref_parts.type}: ${c.pull_request.target_ref_parts.name}</a>
103 %else:
103 %else:
104 ${c.pull_request.target_ref_parts.type}: ${c.pull_request.target_ref_parts.name}
104 ${c.pull_request.target_ref_parts.type}: ${c.pull_request.target_ref_parts.name}
105 %endif
105 %endif
106 </span>
106 </span>
107 <span class="clone-url">
107 <span class="clone-url">
108 <a href="${h.url('summary_home', repo_name=c.pull_request.target_repo.repo_name)}">${c.pull_request.target_repo.clone_url()}</a>
108 <a href="${h.url('summary_home', repo_name=c.pull_request.target_repo.repo_name)}">${c.pull_request.target_repo.clone_url()}</a>
109 </span>
109 </span>
110 </div>
110 </div>
111 </div>
111 </div>
112 </div>
112 </div>
113
113
114 ## Link to the shadow repository.
114 ## Link to the shadow repository.
115 <div class="field">
115 <div class="field">
116 <div class="label-summary">
116 <div class="label-summary">
117 <label>${_('Merge')}:</label>
117 <label>${_('Merge')}:</label>
118 </div>
118 </div>
119 <div class="input">
119 <div class="input">
120 % if not c.pull_request.is_closed() and c.pull_request.shadow_merge_ref:
120 % if not c.pull_request.is_closed() and c.pull_request.shadow_merge_ref:
121 <div class="pr-mergeinfo">
121 <div class="pr-mergeinfo">
122 %if h.is_hg(c.pull_request.target_repo):
122 %if h.is_hg(c.pull_request.target_repo):
123 <input type="text" value="hg clone -u ${c.pull_request.shadow_merge_ref.name} ${c.shadow_clone_url} pull-request-${c.pull_request.pull_request_id}" readonly="readonly">
123 <input type="text" value="hg clone -u ${c.pull_request.shadow_merge_ref.name} ${c.shadow_clone_url} pull-request-${c.pull_request.pull_request_id}" readonly="readonly">
124 %elif h.is_git(c.pull_request.target_repo):
124 %elif h.is_git(c.pull_request.target_repo):
125 <input type="text" value="git clone --branch ${c.pull_request.shadow_merge_ref.name} ${c.shadow_clone_url} pull-request-${c.pull_request.pull_request_id}" readonly="readonly">
125 <input type="text" value="git clone --branch ${c.pull_request.shadow_merge_ref.name} ${c.shadow_clone_url} pull-request-${c.pull_request.pull_request_id}" readonly="readonly">
126 %endif
126 %endif
127 </div>
127 </div>
128 % else:
128 % else:
129 <div class="">
129 <div class="">
130 ${_('Shadow repository data not available')}.
130 ${_('Shadow repository data not available')}.
131 </div>
131 </div>
132 % endif
132 % endif
133 </div>
133 </div>
134 </div>
134 </div>
135
135
136 <div class="field">
136 <div class="field">
137 <div class="label-summary">
137 <div class="label-summary">
138 <label>${_('Review')}:</label>
138 <label>${_('Review')}:</label>
139 </div>
139 </div>
140 <div class="input">
140 <div class="input">
141 %if c.pull_request_review_status:
141 %if c.pull_request_review_status:
142 <div class="${'flag_status %s' % c.pull_request_review_status} tooltip pull-left"></div>
142 <div class="${'flag_status %s' % c.pull_request_review_status} tooltip pull-left"></div>
143 <span class="changeset-status-lbl tooltip">
143 <span class="changeset-status-lbl tooltip">
144 %if c.pull_request.is_closed():
144 %if c.pull_request.is_closed():
145 ${_('Closed')},
145 ${_('Closed')},
146 %endif
146 %endif
147 ${h.commit_status_lbl(c.pull_request_review_status)}
147 ${h.commit_status_lbl(c.pull_request_review_status)}
148 </span>
148 </span>
149 - ${ungettext('calculated based on %s reviewer vote', 'calculated based on %s reviewers votes', len(c.pull_request_reviewers)) % len(c.pull_request_reviewers)}
149 - ${ungettext('calculated based on %s reviewer vote', 'calculated based on %s reviewers votes', len(c.pull_request_reviewers)) % len(c.pull_request_reviewers)}
150 %endif
150 %endif
151 </div>
151 </div>
152 </div>
152 </div>
153 <div class="field">
153 <div class="field">
154 <div class="pr-description-label label-summary">
154 <div class="pr-description-label label-summary">
155 <label>${_('Description')}:</label>
155 <label>${_('Description')}:</label>
156 </div>
156 </div>
157 <div id="pr-desc" class="input">
157 <div id="pr-desc" class="input">
158 <div class="pr-description">${h.urlify_commit_message(c.pull_request.description, c.repo_name)}</div>
158 <div class="pr-description">${h.urlify_commit_message(c.pull_request.description, c.repo_name)}</div>
159 </div>
159 </div>
160 <div id="pr-desc-edit" class="input textarea editor" style="display: none;">
160 <div id="pr-desc-edit" class="input textarea editor" style="display: none;">
161 <textarea id="pr-description-input" size="30">${c.pull_request.description}</textarea>
161 <textarea id="pr-description-input" size="30">${c.pull_request.description}</textarea>
162 </div>
162 </div>
163 </div>
163 </div>
164
164
165 <div class="field">
165 <div class="field">
166 <div class="label-summary">
166 <div class="label-summary">
167 <label>${_('Versions')} (${len(c.versions)+1}):</label>
167 <label>${_('Versions')} (${len(c.versions)+1}):</label>
168 </div>
168 </div>
169
169
170 <div class="pr-versions">
170 <div class="pr-versions">
171 % if c.show_version_changes:
171 % if c.show_version_changes:
172 <table>
172 <table>
173 ## CURRENTLY SELECT PR VERSION
173 ## CURRENTLY SELECT PR VERSION
174 <tr class="version-pr" style="display: ${'' if c.at_version_num is None else 'none'}">
174 <tr class="version-pr" style="display: ${'' if c.at_version_num is None else 'none'}">
175 <td>
175 <td>
176 % if c.at_version in [None, 'latest']:
176 % if c.at_version in [None, 'latest']:
177 <i class="icon-ok link"></i>
177 <i class="icon-ok link"></i>
178 % else:
178 % else:
179 <i class="icon-comment"></i> <code>${len(c.inline_versions[None])}</code>
179 <i class="icon-comment"></i> <code>${len(c.inline_versions[None])}</code>
180 % endif
180 % endif
181 </td>
181 </td>
182 <td>
182 <td>
183 <code>
183 <code>
184 % if c.versions:
184 % if c.versions:
185 <a href="${h.url.current(version='latest')}">${_('latest')}</a>
185 <a href="${h.url.current(version='latest')}">${_('latest')}</a>
186 % else:
186 % else:
187 ${_('initial')}
187 ${_('initial')}
188 % endif
188 % endif
189 </code>
189 </code>
190 </td>
190 </td>
191 <td>
191 <td>
192 <code>${c.pull_request_latest.source_ref_parts.commit_id[:6]}</code>
192 <code>${c.pull_request_latest.source_ref_parts.commit_id[:6]}</code>
193 </td>
193 </td>
194 <td>
194 <td>
195 ${_('created')} ${h.age_component(c.pull_request_latest.updated_on)}
195 ${_('created')} ${h.age_component(c.pull_request_latest.updated_on)}
196 </td>
196 </td>
197 <td align="right">
197 <td align="right">
198 % if c.versions and c.at_version_num in [None, 'latest']:
198 % if c.versions and c.at_version_num in [None, 'latest']:
199 <span id="show-pr-versions" class="btn btn-link" onclick="$('.version-pr').show(); $(this).hide(); return false">${_('Show all versions')}</span>
199 <span id="show-pr-versions" class="btn btn-link" onclick="$('.version-pr').show(); $(this).hide(); return false">${_('Show all versions')}</span>
200 % endif
200 % endif
201 </td>
201 </td>
202 </tr>
202 </tr>
203
203
204 ## SHOW ALL VERSIONS OF PR
204 ## SHOW ALL VERSIONS OF PR
205 <% ver_pr = None %>
205 <% ver_pr = None %>
206 % for ver in reversed(c.pull_request.versions()):
206 % for data in reversed(list(enumerate(c.versions, 1))):
207 <% ver_pos = data[0] %>
208 <% ver = data[1] %>
207 <% ver_pr = ver.pull_request_version_id %>
209 <% ver_pr = ver.pull_request_version_id %>
210
208 <tr class="version-pr" style="display: ${'' if c.at_version == ver_pr else 'none'}">
211 <tr class="version-pr" style="display: ${'' if c.at_version == ver_pr else 'none'}">
209 <td>
212 <td>
210 % if c.at_version == ver_pr:
213 % if c.at_version == ver_pr:
211 <i class="icon-ok link"></i>
214 <i class="icon-ok link"></i>
212 % else:
215 % else:
213 <i class="icon-comment"></i> <code>${len(c.inline_versions[ver_pr])}</code>
216 <i class="icon-comment"></i> <code>${len(c.inline_versions[ver_pr])}</code>
214 % endif
217 % endif
215 </td>
218 </td>
216 <td>
219 <td>
217 <code><a href="${h.url.current(version=ver_pr)}">version ${ver_pr}</a></code>
220 <code class="tooltip" title="${_('Comment from pull request version {0}').format(ver_pos)}">
221 <a href="${h.url.current(version=ver_pr)}">v${ver_pos}</a>
222 </code>
218 </td>
223 </td>
219 <td>
224 <td>
220 <code>${ver.source_ref_parts.commit_id[:6]}</code>
225 <code>${ver.source_ref_parts.commit_id[:6]}</code>
221 </td>
226 </td>
222 <td>
227 <td>
223 ${_('created')} ${h.age_component(ver.updated_on)}
228 ${_('created')} ${h.age_component(ver.updated_on)}
224 </td>
229 </td>
225 <td align="right">
230 <td align="right">
226 % if c.at_version == ver_pr:
231 % if c.at_version == ver_pr:
227 <span id="show-pr-versions" class="btn btn-link" onclick="$('.version-pr').show(); $(this).hide(); return false">${_('Show all versions')}</span>
232 <span id="show-pr-versions" class="btn btn-link" onclick="$('.version-pr').show(); $(this).hide(); return false">${_('Show all versions')}</span>
228 % endif
233 % endif
229 </td>
234 </td>
230 </tr>
235 </tr>
231 % endfor
236 % endfor
232
237
233 ## show comment/inline comments summary
238 ## show comment/inline comments summary
234 <tr>
239 <tr>
235 <td>
240 <td>
236 </td>
241 </td>
237
242
238 <% inline_comm_count_ver = len(c.inline_versions[ver_pr])%>
243 <% inline_comm_count_ver = len(c.inline_versions[ver_pr])%>
239 <td colspan="4" style="border-top: 1px dashed #dbd9da">
244 <td colspan="4" style="border-top: 1px dashed #dbd9da">
240 ${_('Comments for this version')}:
245 ${_('Comments for this version')}:
241 %if c.comments:
246 %if c.comments:
242 <a href="#comments">${_("%d General ") % len(c.comments)}</a>
247 <a href="#comments">${_("%d General ") % len(c.comments)}</a>
243 %else:
248 %else:
244 ${_("%d General ") % len(c.comments)}
249 ${_("%d General ") % len(c.comments)}
245 %endif
250 %endif
246
251
247 <% inline_comm_count_ver = len(c.inline_versions[c.at_version_num])%>
252 <% inline_comm_count_ver = len(c.inline_versions[c.at_version_num])%>
248 %if inline_comm_count_ver:
253 %if inline_comm_count_ver:
249 , <a href="#" onclick="return Rhodecode.comments.nextComment();" id="inline-comments-counter">${_("%d Inline") % inline_comm_count_ver}</a>
254 , <a href="#" onclick="return Rhodecode.comments.nextComment();" id="inline-comments-counter">${_("%d Inline") % inline_comm_count_ver}</a>
250 %else:
255 %else:
251 , ${_("%d Inline") % inline_comm_count_ver}
256 , ${_("%d Inline") % inline_comm_count_ver}
252 %endif
257 %endif
253
258
254 %if c.outdated_cnt:
259 %if c.outdated_cnt:
255 , <a href="#" onclick="showOutdated(); Rhodecode.comments.nextOutdatedComment(); return false;">${_("%d Outdated") % c.outdated_cnt}</a>
260 , <a href="#" onclick="showOutdated(); Rhodecode.comments.nextOutdatedComment(); return false;">${_("%d Outdated") % c.outdated_cnt}</a>
256 <a href="#" class="showOutdatedComments" onclick="showOutdated(this); return false;"> | ${_('show outdated comments')}</a>
261 <a href="#" class="showOutdatedComments" onclick="showOutdated(this); return false;"> | ${_('show outdated comments')}</a>
257 <a href="#" class="hideOutdatedComments" style="display: none" onclick="hideOutdated(this); return false;"> | ${_('hide outdated comments')}</a>
262 <a href="#" class="hideOutdatedComments" style="display: none" onclick="hideOutdated(this); return false;"> | ${_('hide outdated comments')}</a>
258 %else:
263 %else:
259 , ${_("%d Outdated") % c.outdated_cnt}
264 , ${_("%d Outdated") % c.outdated_cnt}
260 %endif
265 %endif
261 </td>
266 </td>
262 </tr>
267 </tr>
263
268
264 <tr>
269 <tr>
265 <td></td>
270 <td></td>
266 <td colspan="4">
271 <td colspan="4">
267 % if c.at_version:
272 % if c.at_version:
268 <pre>
273 <pre>
269 Changed commits:
274 Changed commits:
270 * added: ${len(c.changes.added)}
275 * added: ${len(c.changes.added)}
271 * removed: ${len(c.changes.removed)}
276 * removed: ${len(c.changes.removed)}
272
277
273 % if not (c.file_changes.added+c.file_changes.modified+c.file_changes.removed):
278 % if not (c.file_changes.added+c.file_changes.modified+c.file_changes.removed):
274 No file changes found
279 No file changes found
275 % else:
280 % else:
276 Changed files:
281 Changed files:
277 %for file_name in c.file_changes.added:
282 %for file_name in c.file_changes.added:
278 * A <a href="#${'a_' + h.FID('', file_name)}">${file_name}</a>
283 * A <a href="#${'a_' + h.FID('', file_name)}">${file_name}</a>
279 %endfor
284 %endfor
280 %for file_name in c.file_changes.modified:
285 %for file_name in c.file_changes.modified:
281 * M <a href="#${'a_' + h.FID('', file_name)}">${file_name}</a>
286 * M <a href="#${'a_' + h.FID('', file_name)}">${file_name}</a>
282 %endfor
287 %endfor
283 %for file_name in c.file_changes.removed:
288 %for file_name in c.file_changes.removed:
284 * R ${file_name}
289 * R ${file_name}
285 %endfor
290 %endfor
286 % endif
291 % endif
287 </pre>
292 </pre>
288 % endif
293 % endif
289 </td>
294 </td>
290 </tr>
295 </tr>
291 </table>
296 </table>
292 % else:
297 % else:
293 ${_('Pull request versions not available')}.
298 ${_('Pull request versions not available')}.
294 % endif
299 % endif
295 </div>
300 </div>
296 </div>
301 </div>
297
302
298 <div id="pr-save" class="field" style="display: none;">
303 <div id="pr-save" class="field" style="display: none;">
299 <div class="label-summary"></div>
304 <div class="label-summary"></div>
300 <div class="input">
305 <div class="input">
301 <span id="edit_pull_request" class="btn btn-small">${_('Save Changes')}</span>
306 <span id="edit_pull_request" class="btn btn-small">${_('Save Changes')}</span>
302 </div>
307 </div>
303 </div>
308 </div>
304 </div>
309 </div>
305 </div>
310 </div>
306 <div>
311 <div>
307 ## AUTHOR
312 ## AUTHOR
308 <div class="reviewers-title block-right">
313 <div class="reviewers-title block-right">
309 <div class="pr-details-title">
314 <div class="pr-details-title">
310 ${_('Author')}
315 ${_('Author')}
311 </div>
316 </div>
312 </div>
317 </div>
313 <div class="block-right pr-details-content reviewers">
318 <div class="block-right pr-details-content reviewers">
314 <ul class="group_members">
319 <ul class="group_members">
315 <li>
320 <li>
316 ${self.gravatar_with_user(c.pull_request.author.email, 16)}
321 ${self.gravatar_with_user(c.pull_request.author.email, 16)}
317 </li>
322 </li>
318 </ul>
323 </ul>
319 </div>
324 </div>
320 ## REVIEWERS
325 ## REVIEWERS
321 <div class="reviewers-title block-right">
326 <div class="reviewers-title block-right">
322 <div class="pr-details-title">
327 <div class="pr-details-title">
323 ${_('Pull request reviewers')}
328 ${_('Pull request reviewers')}
324 %if c.allowed_to_update:
329 %if c.allowed_to_update:
325 <span id="open_edit_reviewers" class="block-right action_button">${_('Edit')}</span>
330 <span id="open_edit_reviewers" class="block-right action_button">${_('Edit')}</span>
326 <span id="close_edit_reviewers" class="block-right action_button" style="display: none;">${_('Close')}</span>
331 <span id="close_edit_reviewers" class="block-right action_button" style="display: none;">${_('Close')}</span>
327 %endif
332 %endif
328 </div>
333 </div>
329 </div>
334 </div>
330 <div id="reviewers" class="block-right pr-details-content reviewers">
335 <div id="reviewers" class="block-right pr-details-content reviewers">
331 ## members goes here !
336 ## members goes here !
332 <input type="hidden" name="__start__" value="review_members:sequence">
337 <input type="hidden" name="__start__" value="review_members:sequence">
333 <ul id="review_members" class="group_members">
338 <ul id="review_members" class="group_members">
334 %for member,reasons,status in c.pull_request_reviewers:
339 %for member,reasons,status in c.pull_request_reviewers:
335 <li id="reviewer_${member.user_id}">
340 <li id="reviewer_${member.user_id}">
336 <div class="reviewers_member">
341 <div class="reviewers_member">
337 <div class="reviewer_status tooltip" title="${h.tooltip(h.commit_status_lbl(status[0][1].status if status else 'not_reviewed'))}">
342 <div class="reviewer_status tooltip" title="${h.tooltip(h.commit_status_lbl(status[0][1].status if status else 'not_reviewed'))}">
338 <div class="${'flag_status %s' % (status[0][1].status if status else 'not_reviewed')} pull-left reviewer_member_status"></div>
343 <div class="${'flag_status %s' % (status[0][1].status if status else 'not_reviewed')} pull-left reviewer_member_status"></div>
339 </div>
344 </div>
340 <div id="reviewer_${member.user_id}_name" class="reviewer_name">
345 <div id="reviewer_${member.user_id}_name" class="reviewer_name">
341 ${self.gravatar_with_user(member.email, 16)}
346 ${self.gravatar_with_user(member.email, 16)}
342 </div>
347 </div>
343 <input type="hidden" name="__start__" value="reviewer:mapping">
348 <input type="hidden" name="__start__" value="reviewer:mapping">
344 <input type="hidden" name="__start__" value="reasons:sequence">
349 <input type="hidden" name="__start__" value="reasons:sequence">
345 %for reason in reasons:
350 %for reason in reasons:
346 <div class="reviewer_reason">- ${reason}</div>
351 <div class="reviewer_reason">- ${reason}</div>
347 <input type="hidden" name="reason" value="${reason}">
352 <input type="hidden" name="reason" value="${reason}">
348
353
349 %endfor
354 %endfor
350 <input type="hidden" name="__end__" value="reasons:sequence">
355 <input type="hidden" name="__end__" value="reasons:sequence">
351 <input id="reviewer_${member.user_id}_input" type="hidden" value="${member.user_id}" name="user_id" />
356 <input id="reviewer_${member.user_id}_input" type="hidden" value="${member.user_id}" name="user_id" />
352 <input type="hidden" name="__end__" value="reviewer:mapping">
357 <input type="hidden" name="__end__" value="reviewer:mapping">
353 %if c.allowed_to_update:
358 %if c.allowed_to_update:
354 <div class="reviewer_member_remove action_button" onclick="removeReviewMember(${member.user_id}, true)" style="visibility: hidden;">
359 <div class="reviewer_member_remove action_button" onclick="removeReviewMember(${member.user_id}, true)" style="visibility: hidden;">
355 <i class="icon-remove-sign" ></i>
360 <i class="icon-remove-sign" ></i>
356 </div>
361 </div>
357 %endif
362 %endif
358 </div>
363 </div>
359 </li>
364 </li>
360 %endfor
365 %endfor
361 </ul>
366 </ul>
362 <input type="hidden" name="__end__" value="review_members:sequence">
367 <input type="hidden" name="__end__" value="review_members:sequence">
363 %if not c.pull_request.is_closed():
368 %if not c.pull_request.is_closed():
364 <div id="add_reviewer_input" class='ac' style="display: none;">
369 <div id="add_reviewer_input" class='ac' style="display: none;">
365 %if c.allowed_to_update:
370 %if c.allowed_to_update:
366 <div class="reviewer_ac">
371 <div class="reviewer_ac">
367 ${h.text('user', class_='ac-input', placeholder=_('Add reviewer'))}
372 ${h.text('user', class_='ac-input', placeholder=_('Add reviewer'))}
368 <div id="reviewers_container"></div>
373 <div id="reviewers_container"></div>
369 </div>
374 </div>
370 <div>
375 <div>
371 <span id="update_pull_request" class="btn btn-small">${_('Save Changes')}</span>
376 <span id="update_pull_request" class="btn btn-small">${_('Save Changes')}</span>
372 </div>
377 </div>
373 %endif
378 %endif
374 </div>
379 </div>
375 %endif
380 %endif
376 </div>
381 </div>
377 </div>
382 </div>
378 </div>
383 </div>
379 <div class="box">
384 <div class="box">
380 ##DIFF
385 ##DIFF
381 <div class="table" >
386 <div class="table" >
382 <div id="changeset_compare_view_content">
387 <div id="changeset_compare_view_content">
383 ##CS
388 ##CS
384 % if c.missing_requirements:
389 % if c.missing_requirements:
385 <div class="box">
390 <div class="box">
386 <div class="alert alert-warning">
391 <div class="alert alert-warning">
387 <div>
392 <div>
388 <strong>${_('Missing requirements:')}</strong>
393 <strong>${_('Missing requirements:')}</strong>
389 ${_('These commits cannot be displayed, because this repository uses the Mercurial largefiles extension, which was not enabled.')}
394 ${_('These commits cannot be displayed, because this repository uses the Mercurial largefiles extension, which was not enabled.')}
390 </div>
395 </div>
391 </div>
396 </div>
392 </div>
397 </div>
393 % elif c.missing_commits:
398 % elif c.missing_commits:
394 <div class="box">
399 <div class="box">
395 <div class="alert alert-warning">
400 <div class="alert alert-warning">
396 <div>
401 <div>
397 <strong>${_('Missing commits')}:</strong>
402 <strong>${_('Missing commits')}:</strong>
398 ${_('This pull request cannot be displayed, because one or more commits no longer exist in the source repository.')}
403 ${_('This pull request cannot be displayed, because one or more commits no longer exist in the source repository.')}
399 ${_('Please update this pull request, push the commits back into the source repository, or consider closing this pull request.')}
404 ${_('Please update this pull request, push the commits back into the source repository, or consider closing this pull request.')}
400 </div>
405 </div>
401 </div>
406 </div>
402 </div>
407 </div>
403 % endif
408 % endif
404 <div class="compare_view_commits_title">
409 <div class="compare_view_commits_title">
405
410
406 <div class="pull-left">
411 <div class="pull-left">
407 <div class="btn-group">
412 <div class="btn-group">
408 <a
413 <a
409 class="btn"
414 class="btn"
410 href="#"
415 href="#"
411 onclick="$('.compare_select').show();$('.compare_select_hidden').hide(); return false">
416 onclick="$('.compare_select').show();$('.compare_select_hidden').hide(); return false">
412 ${ungettext('Expand %s commit','Expand %s commits', len(c.commit_ranges)) % len(c.commit_ranges)}
417 ${ungettext('Expand %s commit','Expand %s commits', len(c.commit_ranges)) % len(c.commit_ranges)}
413 </a>
418 </a>
414 <a
419 <a
415 class="btn"
420 class="btn"
416 href="#"
421 href="#"
417 onclick="$('.compare_select').hide();$('.compare_select_hidden').show(); return false">
422 onclick="$('.compare_select').hide();$('.compare_select_hidden').show(); return false">
418 ${ungettext('Collapse %s commit','Collapse %s commits', len(c.commit_ranges)) % len(c.commit_ranges)}
423 ${ungettext('Collapse %s commit','Collapse %s commits', len(c.commit_ranges)) % len(c.commit_ranges)}
419 </a>
424 </a>
420 </div>
425 </div>
421 </div>
426 </div>
422
427
423 <div class="pull-right">
428 <div class="pull-right">
424 % if c.allowed_to_update and not c.pull_request.is_closed():
429 % if c.allowed_to_update and not c.pull_request.is_closed():
425 <a id="update_commits" class="btn btn-primary pull-right">${_('Update commits')}</a>
430 <a id="update_commits" class="btn btn-primary pull-right">${_('Update commits')}</a>
426 % else:
431 % else:
427 <a class="tooltip btn disabled pull-right" disabled="disabled" title="${_('Update is disabled for current view')}">${_('Update commits')}</a>
432 <a class="tooltip btn disabled pull-right" disabled="disabled" title="${_('Update is disabled for current view')}">${_('Update commits')}</a>
428 % endif
433 % endif
429
434
430 </div>
435 </div>
431
436
432 </div>
437 </div>
433 % if not c.missing_commits:
438 % if not c.missing_commits:
434 <%include file="/compare/compare_commits.mako" />
439 <%include file="/compare/compare_commits.mako" />
435 <div class="cs_files">
440 <div class="cs_files">
436 <%namespace name="cbdiffs" file="/codeblocks/diffs.mako"/>
441 <%namespace name="cbdiffs" file="/codeblocks/diffs.mako"/>
437 ${cbdiffs.render_diffset_menu()}
442 ${cbdiffs.render_diffset_menu()}
438 ${cbdiffs.render_diffset(
443 ${cbdiffs.render_diffset(
439 c.diffset, use_comments=True,
444 c.diffset, use_comments=True,
440 collapse_when_files_over=30,
445 collapse_when_files_over=30,
441 disable_new_comments=not c.allowed_to_comment,
446 disable_new_comments=not c.allowed_to_comment,
442 deleted_files_comments=c.deleted_files_comments)}
447 deleted_files_comments=c.deleted_files_comments)}
443
448
444 </div>
449 </div>
445 % endif
450 % endif
446 </div>
451 </div>
447 </div>
452 </div>
448
453
449 ## template for inline comment form
454 ## template for inline comment form
450 <%namespace name="comment" file="/changeset/changeset_file_comment.mako"/>
455 <%namespace name="comment" file="/changeset/changeset_file_comment.mako"/>
451
456
452 ## render general comments
457 ## render general comments
453 ${comment.generate_comments(include_pull_request=True, is_pull_request=True)}
458 ${comment.generate_comments(include_pull_request=True, is_pull_request=True)}
454
459
455 % if not c.pull_request.is_closed():
460 % if not c.pull_request.is_closed():
456 ## main comment form and it status
461 ## main comment form and it status
457 ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name,
462 ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name,
458 pull_request_id=c.pull_request.pull_request_id),
463 pull_request_id=c.pull_request.pull_request_id),
459 c.pull_request_review_status,
464 c.pull_request_review_status,
460 is_pull_request=True, change_status=c.allowed_to_change_status)}
465 is_pull_request=True, change_status=c.allowed_to_change_status)}
461 %endif
466 %endif
462
467
463 <script type="text/javascript">
468 <script type="text/javascript">
464 if (location.hash) {
469 if (location.hash) {
465 var result = splitDelimitedHash(location.hash);
470 var result = splitDelimitedHash(location.hash);
466 var line = $('html').find(result.loc);
471 var line = $('html').find(result.loc);
467 if (line.length > 0){
472 if (line.length > 0){
468 offsetScroll(line, 70);
473 offsetScroll(line, 70);
469 }
474 }
470 }
475 }
471 $(function(){
476 $(function(){
472 ReviewerAutoComplete('user');
477 ReviewerAutoComplete('user');
473 // custom code mirror
478 // custom code mirror
474 var codeMirrorInstance = initPullRequestsCodeMirror('#pr-description-input');
479 var codeMirrorInstance = initPullRequestsCodeMirror('#pr-description-input');
475
480
476 var PRDetails = {
481 var PRDetails = {
477 editButton: $('#open_edit_pullrequest'),
482 editButton: $('#open_edit_pullrequest'),
478 closeButton: $('#close_edit_pullrequest'),
483 closeButton: $('#close_edit_pullrequest'),
479 deleteButton: $('#delete_pullrequest'),
484 deleteButton: $('#delete_pullrequest'),
480 viewFields: $('#pr-desc, #pr-title'),
485 viewFields: $('#pr-desc, #pr-title'),
481 editFields: $('#pr-desc-edit, #pr-title-edit, #pr-save'),
486 editFields: $('#pr-desc-edit, #pr-title-edit, #pr-save'),
482
487
483 init: function() {
488 init: function() {
484 var that = this;
489 var that = this;
485 this.editButton.on('click', function(e) { that.edit(); });
490 this.editButton.on('click', function(e) { that.edit(); });
486 this.closeButton.on('click', function(e) { that.view(); });
491 this.closeButton.on('click', function(e) { that.view(); });
487 },
492 },
488
493
489 edit: function(event) {
494 edit: function(event) {
490 this.viewFields.hide();
495 this.viewFields.hide();
491 this.editButton.hide();
496 this.editButton.hide();
492 this.deleteButton.hide();
497 this.deleteButton.hide();
493 this.closeButton.show();
498 this.closeButton.show();
494 this.editFields.show();
499 this.editFields.show();
495 codeMirrorInstance.refresh();
500 codeMirrorInstance.refresh();
496 },
501 },
497
502
498 view: function(event) {
503 view: function(event) {
499 this.editButton.show();
504 this.editButton.show();
500 this.deleteButton.show();
505 this.deleteButton.show();
501 this.editFields.hide();
506 this.editFields.hide();
502 this.closeButton.hide();
507 this.closeButton.hide();
503 this.viewFields.show();
508 this.viewFields.show();
504 }
509 }
505 };
510 };
506
511
507 var ReviewersPanel = {
512 var ReviewersPanel = {
508 editButton: $('#open_edit_reviewers'),
513 editButton: $('#open_edit_reviewers'),
509 closeButton: $('#close_edit_reviewers'),
514 closeButton: $('#close_edit_reviewers'),
510 addButton: $('#add_reviewer_input'),
515 addButton: $('#add_reviewer_input'),
511 removeButtons: $('.reviewer_member_remove'),
516 removeButtons: $('.reviewer_member_remove'),
512
517
513 init: function() {
518 init: function() {
514 var that = this;
519 var that = this;
515 this.editButton.on('click', function(e) { that.edit(); });
520 this.editButton.on('click', function(e) { that.edit(); });
516 this.closeButton.on('click', function(e) { that.close(); });
521 this.closeButton.on('click', function(e) { that.close(); });
517 },
522 },
518
523
519 edit: function(event) {
524 edit: function(event) {
520 this.editButton.hide();
525 this.editButton.hide();
521 this.closeButton.show();
526 this.closeButton.show();
522 this.addButton.show();
527 this.addButton.show();
523 this.removeButtons.css('visibility', 'visible');
528 this.removeButtons.css('visibility', 'visible');
524 },
529 },
525
530
526 close: function(event) {
531 close: function(event) {
527 this.editButton.show();
532 this.editButton.show();
528 this.closeButton.hide();
533 this.closeButton.hide();
529 this.addButton.hide();
534 this.addButton.hide();
530 this.removeButtons.css('visibility', 'hidden');
535 this.removeButtons.css('visibility', 'hidden');
531 }
536 }
532 };
537 };
533
538
534 PRDetails.init();
539 PRDetails.init();
535 ReviewersPanel.init();
540 ReviewersPanel.init();
536
541
537 showOutdated = function(self){
542 showOutdated = function(self){
538 $('.comment-outdated').show();
543 $('.comment-outdated').show();
539 $('.filediff-outdated').show();
544 $('.filediff-outdated').show();
540 $('.showOutdatedComments').hide();
545 $('.showOutdatedComments').hide();
541 $('.hideOutdatedComments').show();
546 $('.hideOutdatedComments').show();
542
547
543 };
548 };
544
549
545 hideOutdated = function(self){
550 hideOutdated = function(self){
546 $('.comment-outdated').hide();
551 $('.comment-outdated').hide();
547 $('.filediff-outdated').hide();
552 $('.filediff-outdated').hide();
548 $('.hideOutdatedComments').hide();
553 $('.hideOutdatedComments').hide();
549 $('.showOutdatedComments').show();
554 $('.showOutdatedComments').show();
550 };
555 };
551
556
552 $('#show-outdated-comments').on('click', function(e){
557 $('#show-outdated-comments').on('click', function(e){
553 var button = $(this);
558 var button = $(this);
554 var outdated = $('.comment-outdated');
559 var outdated = $('.comment-outdated');
555
560
556 if (button.html() === "(Show)") {
561 if (button.html() === "(Show)") {
557 button.html("(Hide)");
562 button.html("(Hide)");
558 outdated.show();
563 outdated.show();
559 } else {
564 } else {
560 button.html("(Show)");
565 button.html("(Show)");
561 outdated.hide();
566 outdated.hide();
562 }
567 }
563 });
568 });
564
569
565 $('.show-inline-comments').on('change', function(e){
570 $('.show-inline-comments').on('change', function(e){
566 var show = 'none';
571 var show = 'none';
567 var target = e.currentTarget;
572 var target = e.currentTarget;
568 if(target.checked){
573 if(target.checked){
569 show = ''
574 show = ''
570 }
575 }
571 var boxid = $(target).attr('id_for');
576 var boxid = $(target).attr('id_for');
572 var comments = $('#{0} .inline-comments'.format(boxid));
577 var comments = $('#{0} .inline-comments'.format(boxid));
573 var fn_display = function(idx){
578 var fn_display = function(idx){
574 $(this).css('display', show);
579 $(this).css('display', show);
575 };
580 };
576 $(comments).each(fn_display);
581 $(comments).each(fn_display);
577 var btns = $('#{0} .inline-comments-button'.format(boxid));
582 var btns = $('#{0} .inline-comments-button'.format(boxid));
578 $(btns).each(fn_display);
583 $(btns).each(fn_display);
579 });
584 });
580
585
581 $('#merge_pull_request_form').submit(function() {
586 $('#merge_pull_request_form').submit(function() {
582 if (!$('#merge_pull_request').attr('disabled')) {
587 if (!$('#merge_pull_request').attr('disabled')) {
583 $('#merge_pull_request').attr('disabled', 'disabled');
588 $('#merge_pull_request').attr('disabled', 'disabled');
584 }
589 }
585 return true;
590 return true;
586 });
591 });
587
592
588 $('#edit_pull_request').on('click', function(e){
593 $('#edit_pull_request').on('click', function(e){
589 var title = $('#pr-title-input').val();
594 var title = $('#pr-title-input').val();
590 var description = codeMirrorInstance.getValue();
595 var description = codeMirrorInstance.getValue();
591 editPullRequest(
596 editPullRequest(
592 "${c.repo_name}", "${c.pull_request.pull_request_id}",
597 "${c.repo_name}", "${c.pull_request.pull_request_id}",
593 title, description);
598 title, description);
594 });
599 });
595
600
596 $('#update_pull_request').on('click', function(e){
601 $('#update_pull_request').on('click', function(e){
597 updateReviewers(undefined, "${c.repo_name}", "${c.pull_request.pull_request_id}");
602 updateReviewers(undefined, "${c.repo_name}", "${c.pull_request.pull_request_id}");
598 });
603 });
599
604
600 $('#update_commits').on('click', function(e){
605 $('#update_commits').on('click', function(e){
601 var isDisabled = !$(e.currentTarget).attr('disabled');
606 var isDisabled = !$(e.currentTarget).attr('disabled');
602 $(e.currentTarget).text(_gettext('Updating...'));
607 $(e.currentTarget).text(_gettext('Updating...'));
603 $(e.currentTarget).attr('disabled', 'disabled');
608 $(e.currentTarget).attr('disabled', 'disabled');
604 if(isDisabled){
609 if(isDisabled){
605 updateCommits("${c.repo_name}", "${c.pull_request.pull_request_id}");
610 updateCommits("${c.repo_name}", "${c.pull_request.pull_request_id}");
606 }
611 }
607
612
608 });
613 });
609 // fixing issue with caches on firefox
614 // fixing issue with caches on firefox
610 $('#update_commits').removeAttr("disabled");
615 $('#update_commits').removeAttr("disabled");
611
616
612 $('#close_pull_request').on('click', function(e){
617 $('#close_pull_request').on('click', function(e){
613 closePullRequest("${c.repo_name}", "${c.pull_request.pull_request_id}");
618 closePullRequest("${c.repo_name}", "${c.pull_request.pull_request_id}");
614 });
619 });
615
620
616 $('.show-inline-comments').on('click', function(e){
621 $('.show-inline-comments').on('click', function(e){
617 var boxid = $(this).attr('data-comment-id');
622 var boxid = $(this).attr('data-comment-id');
618 var button = $(this);
623 var button = $(this);
619
624
620 if(button.hasClass("comments-visible")) {
625 if(button.hasClass("comments-visible")) {
621 $('#{0} .inline-comments'.format(boxid)).each(function(index){
626 $('#{0} .inline-comments'.format(boxid)).each(function(index){
622 $(this).hide();
627 $(this).hide();
623 });
628 });
624 button.removeClass("comments-visible");
629 button.removeClass("comments-visible");
625 } else {
630 } else {
626 $('#{0} .inline-comments'.format(boxid)).each(function(index){
631 $('#{0} .inline-comments'.format(boxid)).each(function(index){
627 $(this).show();
632 $(this).show();
628 });
633 });
629 button.addClass("comments-visible");
634 button.addClass("comments-visible");
630 }
635 }
631 });
636 });
632 })
637 })
633 </script>
638 </script>
634
639
635 </div>
640 </div>
636 </div>
641 </div>
637
642
638 </%def>
643 </%def>
General Comments 0
You need to be logged in to leave comments. Login now