##// END OF EJS Templates
files: changed the copy path label to indicate we're actually copying only the path....
dan -
r4278:347fefc5 default
parent child Browse files
Show More
@@ -1,1959 +1,1959 b''
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2
2
3 # Copyright (C) 2010-2019 RhodeCode GmbH
3 # Copyright (C) 2010-2019 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 Helper functions
22 Helper functions
23
23
24 Consists of functions to typically be used within templates, but also
24 Consists of functions to typically be used within templates, but also
25 available to Controllers. This module is available to both as 'h'.
25 available to Controllers. This module is available to both as 'h'.
26 """
26 """
27
27
28 import os
28 import os
29 import random
29 import random
30 import hashlib
30 import hashlib
31 import StringIO
31 import StringIO
32 import textwrap
32 import textwrap
33 import urllib
33 import urllib
34 import math
34 import math
35 import logging
35 import logging
36 import re
36 import re
37 import time
37 import time
38 import string
38 import string
39 import hashlib
39 import hashlib
40 from collections import OrderedDict
40 from collections import OrderedDict
41
41
42 import pygments
42 import pygments
43 import itertools
43 import itertools
44 import fnmatch
44 import fnmatch
45 import bleach
45 import bleach
46
46
47 from pyramid import compat
47 from pyramid import compat
48 from datetime import datetime
48 from datetime import datetime
49 from functools import partial
49 from functools import partial
50 from pygments.formatters.html import HtmlFormatter
50 from pygments.formatters.html import HtmlFormatter
51 from pygments.lexers import (
51 from pygments.lexers import (
52 get_lexer_by_name, get_lexer_for_filename, get_lexer_for_mimetype)
52 get_lexer_by_name, get_lexer_for_filename, get_lexer_for_mimetype)
53
53
54 from pyramid.threadlocal import get_current_request
54 from pyramid.threadlocal import get_current_request
55
55
56 from webhelpers2.html import literal, HTML, escape
56 from webhelpers2.html import literal, HTML, escape
57 from webhelpers2.html._autolink import _auto_link_urls
57 from webhelpers2.html._autolink import _auto_link_urls
58 from webhelpers2.html.tools import (
58 from webhelpers2.html.tools import (
59 button_to, highlight, js_obfuscate, strip_links, strip_tags)
59 button_to, highlight, js_obfuscate, strip_links, strip_tags)
60
60
61 from webhelpers2.text import (
61 from webhelpers2.text import (
62 chop_at, collapse, convert_accented_entities,
62 chop_at, collapse, convert_accented_entities,
63 convert_misc_entities, lchop, plural, rchop, remove_formatting,
63 convert_misc_entities, lchop, plural, rchop, remove_formatting,
64 replace_whitespace, urlify, truncate, wrap_paragraphs)
64 replace_whitespace, urlify, truncate, wrap_paragraphs)
65 from webhelpers2.date import time_ago_in_words
65 from webhelpers2.date import time_ago_in_words
66
66
67 from webhelpers2.html.tags import (
67 from webhelpers2.html.tags import (
68 _input, NotGiven, _make_safe_id_component as safeid,
68 _input, NotGiven, _make_safe_id_component as safeid,
69 form as insecure_form,
69 form as insecure_form,
70 auto_discovery_link, checkbox, end_form, file,
70 auto_discovery_link, checkbox, end_form, file,
71 hidden, image, javascript_link, link_to, link_to_if, link_to_unless, ol,
71 hidden, image, javascript_link, link_to, link_to_if, link_to_unless, ol,
72 select as raw_select, stylesheet_link, submit, text, password, textarea,
72 select as raw_select, stylesheet_link, submit, text, password, textarea,
73 ul, radio, Options)
73 ul, radio, Options)
74
74
75 from webhelpers2.number import format_byte_size
75 from webhelpers2.number import format_byte_size
76
76
77 from rhodecode.lib.action_parser import action_parser
77 from rhodecode.lib.action_parser import action_parser
78 from rhodecode.lib.pagination import Page, RepoPage, SqlPage
78 from rhodecode.lib.pagination import Page, RepoPage, SqlPage
79 from rhodecode.lib.ext_json import json
79 from rhodecode.lib.ext_json import json
80 from rhodecode.lib.utils import repo_name_slug, get_custom_lexer
80 from rhodecode.lib.utils import repo_name_slug, get_custom_lexer
81 from rhodecode.lib.utils2 import (
81 from rhodecode.lib.utils2 import (
82 str2bool, safe_unicode, safe_str,
82 str2bool, safe_unicode, safe_str,
83 get_commit_safe, datetime_to_time, time_to_datetime, time_to_utcdatetime,
83 get_commit_safe, datetime_to_time, time_to_datetime, time_to_utcdatetime,
84 AttributeDict, safe_int, md5, md5_safe, get_host_info)
84 AttributeDict, safe_int, md5, md5_safe, get_host_info)
85 from rhodecode.lib.markup_renderer import MarkupRenderer, relative_links
85 from rhodecode.lib.markup_renderer import MarkupRenderer, relative_links
86 from rhodecode.lib.vcs.exceptions import CommitDoesNotExistError
86 from rhodecode.lib.vcs.exceptions import CommitDoesNotExistError
87 from rhodecode.lib.vcs.backends.base import BaseChangeset, EmptyCommit
87 from rhodecode.lib.vcs.backends.base import BaseChangeset, EmptyCommit
88 from rhodecode.lib.index.search_utils import get_matching_line_offsets
88 from rhodecode.lib.index.search_utils import get_matching_line_offsets
89 from rhodecode.config.conf import DATE_FORMAT, DATETIME_FORMAT
89 from rhodecode.config.conf import DATE_FORMAT, DATETIME_FORMAT
90 from rhodecode.model.changeset_status import ChangesetStatusModel
90 from rhodecode.model.changeset_status import ChangesetStatusModel
91 from rhodecode.model.db import Permission, User, Repository
91 from rhodecode.model.db import Permission, User, Repository
92 from rhodecode.model.repo_group import RepoGroupModel
92 from rhodecode.model.repo_group import RepoGroupModel
93 from rhodecode.model.settings import IssueTrackerSettingsModel
93 from rhodecode.model.settings import IssueTrackerSettingsModel
94
94
95
95
96 log = logging.getLogger(__name__)
96 log = logging.getLogger(__name__)
97
97
98
98
99 DEFAULT_USER = User.DEFAULT_USER
99 DEFAULT_USER = User.DEFAULT_USER
100 DEFAULT_USER_EMAIL = User.DEFAULT_USER_EMAIL
100 DEFAULT_USER_EMAIL = User.DEFAULT_USER_EMAIL
101
101
102
102
103 def asset(path, ver=None, **kwargs):
103 def asset(path, ver=None, **kwargs):
104 """
104 """
105 Helper to generate a static asset file path for rhodecode assets
105 Helper to generate a static asset file path for rhodecode assets
106
106
107 eg. h.asset('images/image.png', ver='3923')
107 eg. h.asset('images/image.png', ver='3923')
108
108
109 :param path: path of asset
109 :param path: path of asset
110 :param ver: optional version query param to append as ?ver=
110 :param ver: optional version query param to append as ?ver=
111 """
111 """
112 request = get_current_request()
112 request = get_current_request()
113 query = {}
113 query = {}
114 query.update(kwargs)
114 query.update(kwargs)
115 if ver:
115 if ver:
116 query = {'ver': ver}
116 query = {'ver': ver}
117 return request.static_path(
117 return request.static_path(
118 'rhodecode:public/{}'.format(path), _query=query)
118 'rhodecode:public/{}'.format(path), _query=query)
119
119
120
120
121 default_html_escape_table = {
121 default_html_escape_table = {
122 ord('&'): u'&amp;',
122 ord('&'): u'&amp;',
123 ord('<'): u'&lt;',
123 ord('<'): u'&lt;',
124 ord('>'): u'&gt;',
124 ord('>'): u'&gt;',
125 ord('"'): u'&quot;',
125 ord('"'): u'&quot;',
126 ord("'"): u'&#39;',
126 ord("'"): u'&#39;',
127 }
127 }
128
128
129
129
130 def html_escape(text, html_escape_table=default_html_escape_table):
130 def html_escape(text, html_escape_table=default_html_escape_table):
131 """Produce entities within text."""
131 """Produce entities within text."""
132 return text.translate(html_escape_table)
132 return text.translate(html_escape_table)
133
133
134
134
135 def chop_at_smart(s, sub, inclusive=False, suffix_if_chopped=None):
135 def chop_at_smart(s, sub, inclusive=False, suffix_if_chopped=None):
136 """
136 """
137 Truncate string ``s`` at the first occurrence of ``sub``.
137 Truncate string ``s`` at the first occurrence of ``sub``.
138
138
139 If ``inclusive`` is true, truncate just after ``sub`` rather than at it.
139 If ``inclusive`` is true, truncate just after ``sub`` rather than at it.
140 """
140 """
141 suffix_if_chopped = suffix_if_chopped or ''
141 suffix_if_chopped = suffix_if_chopped or ''
142 pos = s.find(sub)
142 pos = s.find(sub)
143 if pos == -1:
143 if pos == -1:
144 return s
144 return s
145
145
146 if inclusive:
146 if inclusive:
147 pos += len(sub)
147 pos += len(sub)
148
148
149 chopped = s[:pos]
149 chopped = s[:pos]
150 left = s[pos:].strip()
150 left = s[pos:].strip()
151
151
152 if left and suffix_if_chopped:
152 if left and suffix_if_chopped:
153 chopped += suffix_if_chopped
153 chopped += suffix_if_chopped
154
154
155 return chopped
155 return chopped
156
156
157
157
158 def shorter(text, size=20, prefix=False):
158 def shorter(text, size=20, prefix=False):
159 postfix = '...'
159 postfix = '...'
160 if len(text) > size:
160 if len(text) > size:
161 if prefix:
161 if prefix:
162 # shorten in front
162 # shorten in front
163 return postfix + text[-(size - len(postfix)):]
163 return postfix + text[-(size - len(postfix)):]
164 else:
164 else:
165 return text[:size - len(postfix)] + postfix
165 return text[:size - len(postfix)] + postfix
166 return text
166 return text
167
167
168
168
169 def reset(name, value=None, id=NotGiven, type="reset", **attrs):
169 def reset(name, value=None, id=NotGiven, type="reset", **attrs):
170 """
170 """
171 Reset button
171 Reset button
172 """
172 """
173 return _input(type, name, value, id, attrs)
173 return _input(type, name, value, id, attrs)
174
174
175
175
176 def select(name, selected_values, options, id=NotGiven, **attrs):
176 def select(name, selected_values, options, id=NotGiven, **attrs):
177
177
178 if isinstance(options, (list, tuple)):
178 if isinstance(options, (list, tuple)):
179 options_iter = options
179 options_iter = options
180 # Handle old value,label lists ... where value also can be value,label lists
180 # Handle old value,label lists ... where value also can be value,label lists
181 options = Options()
181 options = Options()
182 for opt in options_iter:
182 for opt in options_iter:
183 if isinstance(opt, tuple) and len(opt) == 2:
183 if isinstance(opt, tuple) and len(opt) == 2:
184 value, label = opt
184 value, label = opt
185 elif isinstance(opt, basestring):
185 elif isinstance(opt, basestring):
186 value = label = opt
186 value = label = opt
187 else:
187 else:
188 raise ValueError('invalid select option type %r' % type(opt))
188 raise ValueError('invalid select option type %r' % type(opt))
189
189
190 if isinstance(value, (list, tuple)):
190 if isinstance(value, (list, tuple)):
191 option_group = options.add_optgroup(label)
191 option_group = options.add_optgroup(label)
192 for opt2 in value:
192 for opt2 in value:
193 if isinstance(opt2, tuple) and len(opt2) == 2:
193 if isinstance(opt2, tuple) and len(opt2) == 2:
194 group_value, group_label = opt2
194 group_value, group_label = opt2
195 elif isinstance(opt2, basestring):
195 elif isinstance(opt2, basestring):
196 group_value = group_label = opt2
196 group_value = group_label = opt2
197 else:
197 else:
198 raise ValueError('invalid select option type %r' % type(opt2))
198 raise ValueError('invalid select option type %r' % type(opt2))
199
199
200 option_group.add_option(group_label, group_value)
200 option_group.add_option(group_label, group_value)
201 else:
201 else:
202 options.add_option(label, value)
202 options.add_option(label, value)
203
203
204 return raw_select(name, selected_values, options, id=id, **attrs)
204 return raw_select(name, selected_values, options, id=id, **attrs)
205
205
206
206
207 def branding(name, length=40):
207 def branding(name, length=40):
208 return truncate(name, length, indicator="")
208 return truncate(name, length, indicator="")
209
209
210
210
211 def FID(raw_id, path):
211 def FID(raw_id, path):
212 """
212 """
213 Creates a unique ID for filenode based on it's hash of path and commit
213 Creates a unique ID for filenode based on it's hash of path and commit
214 it's safe to use in urls
214 it's safe to use in urls
215
215
216 :param raw_id:
216 :param raw_id:
217 :param path:
217 :param path:
218 """
218 """
219
219
220 return 'c-%s-%s' % (short_id(raw_id), md5_safe(path)[:12])
220 return 'c-%s-%s' % (short_id(raw_id), md5_safe(path)[:12])
221
221
222
222
223 class _GetError(object):
223 class _GetError(object):
224 """Get error from form_errors, and represent it as span wrapped error
224 """Get error from form_errors, and represent it as span wrapped error
225 message
225 message
226
226
227 :param field_name: field to fetch errors for
227 :param field_name: field to fetch errors for
228 :param form_errors: form errors dict
228 :param form_errors: form errors dict
229 """
229 """
230
230
231 def __call__(self, field_name, form_errors):
231 def __call__(self, field_name, form_errors):
232 tmpl = """<span class="error_msg">%s</span>"""
232 tmpl = """<span class="error_msg">%s</span>"""
233 if form_errors and field_name in form_errors:
233 if form_errors and field_name in form_errors:
234 return literal(tmpl % form_errors.get(field_name))
234 return literal(tmpl % form_errors.get(field_name))
235
235
236
236
237 get_error = _GetError()
237 get_error = _GetError()
238
238
239
239
240 class _ToolTip(object):
240 class _ToolTip(object):
241
241
242 def __call__(self, tooltip_title, trim_at=50):
242 def __call__(self, tooltip_title, trim_at=50):
243 """
243 """
244 Special function just to wrap our text into nice formatted
244 Special function just to wrap our text into nice formatted
245 autowrapped text
245 autowrapped text
246
246
247 :param tooltip_title:
247 :param tooltip_title:
248 """
248 """
249 tooltip_title = escape(tooltip_title)
249 tooltip_title = escape(tooltip_title)
250 tooltip_title = tooltip_title.replace('<', '&lt;').replace('>', '&gt;')
250 tooltip_title = tooltip_title.replace('<', '&lt;').replace('>', '&gt;')
251 return tooltip_title
251 return tooltip_title
252
252
253
253
254 tooltip = _ToolTip()
254 tooltip = _ToolTip()
255
255
256 files_icon = u'<i class="file-breadcrumb-copy tooltip icon-clipboard clipboard-action" data-clipboard-text="{}" title="Copy the full path"></i>'
256 files_icon = u'<i class="file-breadcrumb-copy tooltip icon-clipboard clipboard-action" data-clipboard-text="{}" title="Copy file path"></i>'
257
257
258
258
259 def files_breadcrumbs(repo_name, commit_id, file_path, at_ref=None, limit_items=False, linkify_last_item=False):
259 def files_breadcrumbs(repo_name, commit_id, file_path, at_ref=None, limit_items=False, linkify_last_item=False):
260 if isinstance(file_path, str):
260 if isinstance(file_path, str):
261 file_path = safe_unicode(file_path)
261 file_path = safe_unicode(file_path)
262
262
263 route_qry = {'at': at_ref} if at_ref else None
263 route_qry = {'at': at_ref} if at_ref else None
264
264
265 # first segment is a `..` link to repo files
265 # first segment is a `..` link to repo files
266 root_name = literal(u'<i class="icon-home"></i>')
266 root_name = literal(u'<i class="icon-home"></i>')
267 url_segments = [
267 url_segments = [
268 link_to(
268 link_to(
269 root_name,
269 root_name,
270 route_path(
270 route_path(
271 'repo_files',
271 'repo_files',
272 repo_name=repo_name,
272 repo_name=repo_name,
273 commit_id=commit_id,
273 commit_id=commit_id,
274 f_path='',
274 f_path='',
275 _query=route_qry),
275 _query=route_qry),
276 )]
276 )]
277
277
278 path_segments = file_path.split('/')
278 path_segments = file_path.split('/')
279 last_cnt = len(path_segments) - 1
279 last_cnt = len(path_segments) - 1
280 for cnt, segment in enumerate(path_segments):
280 for cnt, segment in enumerate(path_segments):
281 if not segment:
281 if not segment:
282 continue
282 continue
283 segment_html = escape(segment)
283 segment_html = escape(segment)
284
284
285 last_item = cnt == last_cnt
285 last_item = cnt == last_cnt
286
286
287 if last_item and linkify_last_item is False:
287 if last_item and linkify_last_item is False:
288 # plain version
288 # plain version
289 url_segments.append(segment_html)
289 url_segments.append(segment_html)
290 else:
290 else:
291 url_segments.append(
291 url_segments.append(
292 link_to(
292 link_to(
293 segment_html,
293 segment_html,
294 route_path(
294 route_path(
295 'repo_files',
295 'repo_files',
296 repo_name=repo_name,
296 repo_name=repo_name,
297 commit_id=commit_id,
297 commit_id=commit_id,
298 f_path='/'.join(path_segments[:cnt + 1]),
298 f_path='/'.join(path_segments[:cnt + 1]),
299 _query=route_qry),
299 _query=route_qry),
300 ))
300 ))
301
301
302 limited_url_segments = url_segments[:1] + ['...'] + url_segments[-5:]
302 limited_url_segments = url_segments[:1] + ['...'] + url_segments[-5:]
303 if limit_items and len(limited_url_segments) < len(url_segments):
303 if limit_items and len(limited_url_segments) < len(url_segments):
304 url_segments = limited_url_segments
304 url_segments = limited_url_segments
305
305
306 full_path = file_path
306 full_path = file_path
307 icon = files_icon.format(escape(full_path))
307 icon = files_icon.format(escape(full_path))
308 if file_path == '':
308 if file_path == '':
309 return root_name
309 return root_name
310 else:
310 else:
311 return literal(' / '.join(url_segments) + icon)
311 return literal(' / '.join(url_segments) + icon)
312
312
313
313
314 def files_url_data(request):
314 def files_url_data(request):
315 matchdict = request.matchdict
315 matchdict = request.matchdict
316
316
317 if 'f_path' not in matchdict:
317 if 'f_path' not in matchdict:
318 matchdict['f_path'] = ''
318 matchdict['f_path'] = ''
319
319
320 if 'commit_id' not in matchdict:
320 if 'commit_id' not in matchdict:
321 matchdict['commit_id'] = 'tip'
321 matchdict['commit_id'] = 'tip'
322
322
323 return json.dumps(matchdict)
323 return json.dumps(matchdict)
324
324
325
325
326 def code_highlight(code, lexer, formatter, use_hl_filter=False):
326 def code_highlight(code, lexer, formatter, use_hl_filter=False):
327 """
327 """
328 Lex ``code`` with ``lexer`` and format it with the formatter ``formatter``.
328 Lex ``code`` with ``lexer`` and format it with the formatter ``formatter``.
329
329
330 If ``outfile`` is given and a valid file object (an object
330 If ``outfile`` is given and a valid file object (an object
331 with a ``write`` method), the result will be written to it, otherwise
331 with a ``write`` method), the result will be written to it, otherwise
332 it is returned as a string.
332 it is returned as a string.
333 """
333 """
334 if use_hl_filter:
334 if use_hl_filter:
335 # add HL filter
335 # add HL filter
336 from rhodecode.lib.index import search_utils
336 from rhodecode.lib.index import search_utils
337 lexer.add_filter(search_utils.ElasticSearchHLFilter())
337 lexer.add_filter(search_utils.ElasticSearchHLFilter())
338 return pygments.format(pygments.lex(code, lexer), formatter)
338 return pygments.format(pygments.lex(code, lexer), formatter)
339
339
340
340
341 class CodeHtmlFormatter(HtmlFormatter):
341 class CodeHtmlFormatter(HtmlFormatter):
342 """
342 """
343 My code Html Formatter for source codes
343 My code Html Formatter for source codes
344 """
344 """
345
345
346 def wrap(self, source, outfile):
346 def wrap(self, source, outfile):
347 return self._wrap_div(self._wrap_pre(self._wrap_code(source)))
347 return self._wrap_div(self._wrap_pre(self._wrap_code(source)))
348
348
349 def _wrap_code(self, source):
349 def _wrap_code(self, source):
350 for cnt, it in enumerate(source):
350 for cnt, it in enumerate(source):
351 i, t = it
351 i, t = it
352 t = '<div id="L%s">%s</div>' % (cnt + 1, t)
352 t = '<div id="L%s">%s</div>' % (cnt + 1, t)
353 yield i, t
353 yield i, t
354
354
355 def _wrap_tablelinenos(self, inner):
355 def _wrap_tablelinenos(self, inner):
356 dummyoutfile = StringIO.StringIO()
356 dummyoutfile = StringIO.StringIO()
357 lncount = 0
357 lncount = 0
358 for t, line in inner:
358 for t, line in inner:
359 if t:
359 if t:
360 lncount += 1
360 lncount += 1
361 dummyoutfile.write(line)
361 dummyoutfile.write(line)
362
362
363 fl = self.linenostart
363 fl = self.linenostart
364 mw = len(str(lncount + fl - 1))
364 mw = len(str(lncount + fl - 1))
365 sp = self.linenospecial
365 sp = self.linenospecial
366 st = self.linenostep
366 st = self.linenostep
367 la = self.lineanchors
367 la = self.lineanchors
368 aln = self.anchorlinenos
368 aln = self.anchorlinenos
369 nocls = self.noclasses
369 nocls = self.noclasses
370 if sp:
370 if sp:
371 lines = []
371 lines = []
372
372
373 for i in range(fl, fl + lncount):
373 for i in range(fl, fl + lncount):
374 if i % st == 0:
374 if i % st == 0:
375 if i % sp == 0:
375 if i % sp == 0:
376 if aln:
376 if aln:
377 lines.append('<a href="#%s%d" class="special">%*d</a>' %
377 lines.append('<a href="#%s%d" class="special">%*d</a>' %
378 (la, i, mw, i))
378 (la, i, mw, i))
379 else:
379 else:
380 lines.append('<span class="special">%*d</span>' % (mw, i))
380 lines.append('<span class="special">%*d</span>' % (mw, i))
381 else:
381 else:
382 if aln:
382 if aln:
383 lines.append('<a href="#%s%d">%*d</a>' % (la, i, mw, i))
383 lines.append('<a href="#%s%d">%*d</a>' % (la, i, mw, i))
384 else:
384 else:
385 lines.append('%*d' % (mw, i))
385 lines.append('%*d' % (mw, i))
386 else:
386 else:
387 lines.append('')
387 lines.append('')
388 ls = '\n'.join(lines)
388 ls = '\n'.join(lines)
389 else:
389 else:
390 lines = []
390 lines = []
391 for i in range(fl, fl + lncount):
391 for i in range(fl, fl + lncount):
392 if i % st == 0:
392 if i % st == 0:
393 if aln:
393 if aln:
394 lines.append('<a href="#%s%d">%*d</a>' % (la, i, mw, i))
394 lines.append('<a href="#%s%d">%*d</a>' % (la, i, mw, i))
395 else:
395 else:
396 lines.append('%*d' % (mw, i))
396 lines.append('%*d' % (mw, i))
397 else:
397 else:
398 lines.append('')
398 lines.append('')
399 ls = '\n'.join(lines)
399 ls = '\n'.join(lines)
400
400
401 # in case you wonder about the seemingly redundant <div> here: since the
401 # in case you wonder about the seemingly redundant <div> here: since the
402 # content in the other cell also is wrapped in a div, some browsers in
402 # content in the other cell also is wrapped in a div, some browsers in
403 # some configurations seem to mess up the formatting...
403 # some configurations seem to mess up the formatting...
404 if nocls:
404 if nocls:
405 yield 0, ('<table class="%stable">' % self.cssclass +
405 yield 0, ('<table class="%stable">' % self.cssclass +
406 '<tr><td><div class="linenodiv" '
406 '<tr><td><div class="linenodiv" '
407 'style="background-color: #f0f0f0; padding-right: 10px">'
407 'style="background-color: #f0f0f0; padding-right: 10px">'
408 '<pre style="line-height: 125%">' +
408 '<pre style="line-height: 125%">' +
409 ls + '</pre></div></td><td id="hlcode" class="code">')
409 ls + '</pre></div></td><td id="hlcode" class="code">')
410 else:
410 else:
411 yield 0, ('<table class="%stable">' % self.cssclass +
411 yield 0, ('<table class="%stable">' % self.cssclass +
412 '<tr><td class="linenos"><div class="linenodiv"><pre>' +
412 '<tr><td class="linenos"><div class="linenodiv"><pre>' +
413 ls + '</pre></div></td><td id="hlcode" class="code">')
413 ls + '</pre></div></td><td id="hlcode" class="code">')
414 yield 0, dummyoutfile.getvalue()
414 yield 0, dummyoutfile.getvalue()
415 yield 0, '</td></tr></table>'
415 yield 0, '</td></tr></table>'
416
416
417
417
418 class SearchContentCodeHtmlFormatter(CodeHtmlFormatter):
418 class SearchContentCodeHtmlFormatter(CodeHtmlFormatter):
419 def __init__(self, **kw):
419 def __init__(self, **kw):
420 # only show these line numbers if set
420 # only show these line numbers if set
421 self.only_lines = kw.pop('only_line_numbers', [])
421 self.only_lines = kw.pop('only_line_numbers', [])
422 self.query_terms = kw.pop('query_terms', [])
422 self.query_terms = kw.pop('query_terms', [])
423 self.max_lines = kw.pop('max_lines', 5)
423 self.max_lines = kw.pop('max_lines', 5)
424 self.line_context = kw.pop('line_context', 3)
424 self.line_context = kw.pop('line_context', 3)
425 self.url = kw.pop('url', None)
425 self.url = kw.pop('url', None)
426
426
427 super(CodeHtmlFormatter, self).__init__(**kw)
427 super(CodeHtmlFormatter, self).__init__(**kw)
428
428
429 def _wrap_code(self, source):
429 def _wrap_code(self, source):
430 for cnt, it in enumerate(source):
430 for cnt, it in enumerate(source):
431 i, t = it
431 i, t = it
432 t = '<pre>%s</pre>' % t
432 t = '<pre>%s</pre>' % t
433 yield i, t
433 yield i, t
434
434
435 def _wrap_tablelinenos(self, inner):
435 def _wrap_tablelinenos(self, inner):
436 yield 0, '<table class="code-highlight %stable">' % self.cssclass
436 yield 0, '<table class="code-highlight %stable">' % self.cssclass
437
437
438 last_shown_line_number = 0
438 last_shown_line_number = 0
439 current_line_number = 1
439 current_line_number = 1
440
440
441 for t, line in inner:
441 for t, line in inner:
442 if not t:
442 if not t:
443 yield t, line
443 yield t, line
444 continue
444 continue
445
445
446 if current_line_number in self.only_lines:
446 if current_line_number in self.only_lines:
447 if last_shown_line_number + 1 != current_line_number:
447 if last_shown_line_number + 1 != current_line_number:
448 yield 0, '<tr>'
448 yield 0, '<tr>'
449 yield 0, '<td class="line">...</td>'
449 yield 0, '<td class="line">...</td>'
450 yield 0, '<td id="hlcode" class="code"></td>'
450 yield 0, '<td id="hlcode" class="code"></td>'
451 yield 0, '</tr>'
451 yield 0, '</tr>'
452
452
453 yield 0, '<tr>'
453 yield 0, '<tr>'
454 if self.url:
454 if self.url:
455 yield 0, '<td class="line"><a href="%s#L%i">%i</a></td>' % (
455 yield 0, '<td class="line"><a href="%s#L%i">%i</a></td>' % (
456 self.url, current_line_number, current_line_number)
456 self.url, current_line_number, current_line_number)
457 else:
457 else:
458 yield 0, '<td class="line"><a href="">%i</a></td>' % (
458 yield 0, '<td class="line"><a href="">%i</a></td>' % (
459 current_line_number)
459 current_line_number)
460 yield 0, '<td id="hlcode" class="code">' + line + '</td>'
460 yield 0, '<td id="hlcode" class="code">' + line + '</td>'
461 yield 0, '</tr>'
461 yield 0, '</tr>'
462
462
463 last_shown_line_number = current_line_number
463 last_shown_line_number = current_line_number
464
464
465 current_line_number += 1
465 current_line_number += 1
466
466
467 yield 0, '</table>'
467 yield 0, '</table>'
468
468
469
469
470 def hsv_to_rgb(h, s, v):
470 def hsv_to_rgb(h, s, v):
471 """ Convert hsv color values to rgb """
471 """ Convert hsv color values to rgb """
472
472
473 if s == 0.0:
473 if s == 0.0:
474 return v, v, v
474 return v, v, v
475 i = int(h * 6.0) # XXX assume int() truncates!
475 i = int(h * 6.0) # XXX assume int() truncates!
476 f = (h * 6.0) - i
476 f = (h * 6.0) - i
477 p = v * (1.0 - s)
477 p = v * (1.0 - s)
478 q = v * (1.0 - s * f)
478 q = v * (1.0 - s * f)
479 t = v * (1.0 - s * (1.0 - f))
479 t = v * (1.0 - s * (1.0 - f))
480 i = i % 6
480 i = i % 6
481 if i == 0:
481 if i == 0:
482 return v, t, p
482 return v, t, p
483 if i == 1:
483 if i == 1:
484 return q, v, p
484 return q, v, p
485 if i == 2:
485 if i == 2:
486 return p, v, t
486 return p, v, t
487 if i == 3:
487 if i == 3:
488 return p, q, v
488 return p, q, v
489 if i == 4:
489 if i == 4:
490 return t, p, v
490 return t, p, v
491 if i == 5:
491 if i == 5:
492 return v, p, q
492 return v, p, q
493
493
494
494
495 def unique_color_generator(n=10000, saturation=0.10, lightness=0.95):
495 def unique_color_generator(n=10000, saturation=0.10, lightness=0.95):
496 """
496 """
497 Generator for getting n of evenly distributed colors using
497 Generator for getting n of evenly distributed colors using
498 hsv color and golden ratio. It always return same order of colors
498 hsv color and golden ratio. It always return same order of colors
499
499
500 :param n: number of colors to generate
500 :param n: number of colors to generate
501 :param saturation: saturation of returned colors
501 :param saturation: saturation of returned colors
502 :param lightness: lightness of returned colors
502 :param lightness: lightness of returned colors
503 :returns: RGB tuple
503 :returns: RGB tuple
504 """
504 """
505
505
506 golden_ratio = 0.618033988749895
506 golden_ratio = 0.618033988749895
507 h = 0.22717784590367374
507 h = 0.22717784590367374
508
508
509 for _ in xrange(n):
509 for _ in xrange(n):
510 h += golden_ratio
510 h += golden_ratio
511 h %= 1
511 h %= 1
512 HSV_tuple = [h, saturation, lightness]
512 HSV_tuple = [h, saturation, lightness]
513 RGB_tuple = hsv_to_rgb(*HSV_tuple)
513 RGB_tuple = hsv_to_rgb(*HSV_tuple)
514 yield map(lambda x: str(int(x * 256)), RGB_tuple)
514 yield map(lambda x: str(int(x * 256)), RGB_tuple)
515
515
516
516
517 def color_hasher(n=10000, saturation=0.10, lightness=0.95):
517 def color_hasher(n=10000, saturation=0.10, lightness=0.95):
518 """
518 """
519 Returns a function which when called with an argument returns a unique
519 Returns a function which when called with an argument returns a unique
520 color for that argument, eg.
520 color for that argument, eg.
521
521
522 :param n: number of colors to generate
522 :param n: number of colors to generate
523 :param saturation: saturation of returned colors
523 :param saturation: saturation of returned colors
524 :param lightness: lightness of returned colors
524 :param lightness: lightness of returned colors
525 :returns: css RGB string
525 :returns: css RGB string
526
526
527 >>> color_hash = color_hasher()
527 >>> color_hash = color_hasher()
528 >>> color_hash('hello')
528 >>> color_hash('hello')
529 'rgb(34, 12, 59)'
529 'rgb(34, 12, 59)'
530 >>> color_hash('hello')
530 >>> color_hash('hello')
531 'rgb(34, 12, 59)'
531 'rgb(34, 12, 59)'
532 >>> color_hash('other')
532 >>> color_hash('other')
533 'rgb(90, 224, 159)'
533 'rgb(90, 224, 159)'
534 """
534 """
535
535
536 color_dict = {}
536 color_dict = {}
537 cgenerator = unique_color_generator(
537 cgenerator = unique_color_generator(
538 saturation=saturation, lightness=lightness)
538 saturation=saturation, lightness=lightness)
539
539
540 def get_color_string(thing):
540 def get_color_string(thing):
541 if thing in color_dict:
541 if thing in color_dict:
542 col = color_dict[thing]
542 col = color_dict[thing]
543 else:
543 else:
544 col = color_dict[thing] = cgenerator.next()
544 col = color_dict[thing] = cgenerator.next()
545 return "rgb(%s)" % (', '.join(col))
545 return "rgb(%s)" % (', '.join(col))
546
546
547 return get_color_string
547 return get_color_string
548
548
549
549
550 def get_lexer_safe(mimetype=None, filepath=None):
550 def get_lexer_safe(mimetype=None, filepath=None):
551 """
551 """
552 Tries to return a relevant pygments lexer using mimetype/filepath name,
552 Tries to return a relevant pygments lexer using mimetype/filepath name,
553 defaulting to plain text if none could be found
553 defaulting to plain text if none could be found
554 """
554 """
555 lexer = None
555 lexer = None
556 try:
556 try:
557 if mimetype:
557 if mimetype:
558 lexer = get_lexer_for_mimetype(mimetype)
558 lexer = get_lexer_for_mimetype(mimetype)
559 if not lexer:
559 if not lexer:
560 lexer = get_lexer_for_filename(filepath)
560 lexer = get_lexer_for_filename(filepath)
561 except pygments.util.ClassNotFound:
561 except pygments.util.ClassNotFound:
562 pass
562 pass
563
563
564 if not lexer:
564 if not lexer:
565 lexer = get_lexer_by_name('text')
565 lexer = get_lexer_by_name('text')
566
566
567 return lexer
567 return lexer
568
568
569
569
570 def get_lexer_for_filenode(filenode):
570 def get_lexer_for_filenode(filenode):
571 lexer = get_custom_lexer(filenode.extension) or filenode.lexer
571 lexer = get_custom_lexer(filenode.extension) or filenode.lexer
572 return lexer
572 return lexer
573
573
574
574
575 def pygmentize(filenode, **kwargs):
575 def pygmentize(filenode, **kwargs):
576 """
576 """
577 pygmentize function using pygments
577 pygmentize function using pygments
578
578
579 :param filenode:
579 :param filenode:
580 """
580 """
581 lexer = get_lexer_for_filenode(filenode)
581 lexer = get_lexer_for_filenode(filenode)
582 return literal(code_highlight(filenode.content, lexer,
582 return literal(code_highlight(filenode.content, lexer,
583 CodeHtmlFormatter(**kwargs)))
583 CodeHtmlFormatter(**kwargs)))
584
584
585
585
586 def is_following_repo(repo_name, user_id):
586 def is_following_repo(repo_name, user_id):
587 from rhodecode.model.scm import ScmModel
587 from rhodecode.model.scm import ScmModel
588 return ScmModel().is_following_repo(repo_name, user_id)
588 return ScmModel().is_following_repo(repo_name, user_id)
589
589
590
590
591 class _Message(object):
591 class _Message(object):
592 """A message returned by ``Flash.pop_messages()``.
592 """A message returned by ``Flash.pop_messages()``.
593
593
594 Converting the message to a string returns the message text. Instances
594 Converting the message to a string returns the message text. Instances
595 also have the following attributes:
595 also have the following attributes:
596
596
597 * ``message``: the message text.
597 * ``message``: the message text.
598 * ``category``: the category specified when the message was created.
598 * ``category``: the category specified when the message was created.
599 """
599 """
600
600
601 def __init__(self, category, message, sub_data=None):
601 def __init__(self, category, message, sub_data=None):
602 self.category = category
602 self.category = category
603 self.message = message
603 self.message = message
604 self.sub_data = sub_data or {}
604 self.sub_data = sub_data or {}
605
605
606 def __str__(self):
606 def __str__(self):
607 return self.message
607 return self.message
608
608
609 __unicode__ = __str__
609 __unicode__ = __str__
610
610
611 def __html__(self):
611 def __html__(self):
612 return escape(safe_unicode(self.message))
612 return escape(safe_unicode(self.message))
613
613
614
614
615 class Flash(object):
615 class Flash(object):
616 # List of allowed categories. If None, allow any category.
616 # List of allowed categories. If None, allow any category.
617 categories = ["warning", "notice", "error", "success"]
617 categories = ["warning", "notice", "error", "success"]
618
618
619 # Default category if none is specified.
619 # Default category if none is specified.
620 default_category = "notice"
620 default_category = "notice"
621
621
622 def __init__(self, session_key="flash", categories=None,
622 def __init__(self, session_key="flash", categories=None,
623 default_category=None):
623 default_category=None):
624 """
624 """
625 Instantiate a ``Flash`` object.
625 Instantiate a ``Flash`` object.
626
626
627 ``session_key`` is the key to save the messages under in the user's
627 ``session_key`` is the key to save the messages under in the user's
628 session.
628 session.
629
629
630 ``categories`` is an optional list which overrides the default list
630 ``categories`` is an optional list which overrides the default list
631 of categories.
631 of categories.
632
632
633 ``default_category`` overrides the default category used for messages
633 ``default_category`` overrides the default category used for messages
634 when none is specified.
634 when none is specified.
635 """
635 """
636 self.session_key = session_key
636 self.session_key = session_key
637 if categories is not None:
637 if categories is not None:
638 self.categories = categories
638 self.categories = categories
639 if default_category is not None:
639 if default_category is not None:
640 self.default_category = default_category
640 self.default_category = default_category
641 if self.categories and self.default_category not in self.categories:
641 if self.categories and self.default_category not in self.categories:
642 raise ValueError(
642 raise ValueError(
643 "unrecognized default category %r" % (self.default_category,))
643 "unrecognized default category %r" % (self.default_category,))
644
644
645 def pop_messages(self, session=None, request=None):
645 def pop_messages(self, session=None, request=None):
646 """
646 """
647 Return all accumulated messages and delete them from the session.
647 Return all accumulated messages and delete them from the session.
648
648
649 The return value is a list of ``Message`` objects.
649 The return value is a list of ``Message`` objects.
650 """
650 """
651 messages = []
651 messages = []
652
652
653 if not session:
653 if not session:
654 if not request:
654 if not request:
655 request = get_current_request()
655 request = get_current_request()
656 session = request.session
656 session = request.session
657
657
658 # Pop the 'old' pylons flash messages. They are tuples of the form
658 # Pop the 'old' pylons flash messages. They are tuples of the form
659 # (category, message)
659 # (category, message)
660 for cat, msg in session.pop(self.session_key, []):
660 for cat, msg in session.pop(self.session_key, []):
661 messages.append(_Message(cat, msg))
661 messages.append(_Message(cat, msg))
662
662
663 # Pop the 'new' pyramid flash messages for each category as list
663 # Pop the 'new' pyramid flash messages for each category as list
664 # of strings.
664 # of strings.
665 for cat in self.categories:
665 for cat in self.categories:
666 for msg in session.pop_flash(queue=cat):
666 for msg in session.pop_flash(queue=cat):
667 sub_data = {}
667 sub_data = {}
668 if hasattr(msg, 'rsplit'):
668 if hasattr(msg, 'rsplit'):
669 flash_data = msg.rsplit('|DELIM|', 1)
669 flash_data = msg.rsplit('|DELIM|', 1)
670 org_message = flash_data[0]
670 org_message = flash_data[0]
671 if len(flash_data) > 1:
671 if len(flash_data) > 1:
672 sub_data = json.loads(flash_data[1])
672 sub_data = json.loads(flash_data[1])
673 else:
673 else:
674 org_message = msg
674 org_message = msg
675
675
676 messages.append(_Message(cat, org_message, sub_data=sub_data))
676 messages.append(_Message(cat, org_message, sub_data=sub_data))
677
677
678 # Map messages from the default queue to the 'notice' category.
678 # Map messages from the default queue to the 'notice' category.
679 for msg in session.pop_flash():
679 for msg in session.pop_flash():
680 messages.append(_Message('notice', msg))
680 messages.append(_Message('notice', msg))
681
681
682 session.save()
682 session.save()
683 return messages
683 return messages
684
684
685 def json_alerts(self, session=None, request=None):
685 def json_alerts(self, session=None, request=None):
686 payloads = []
686 payloads = []
687 messages = flash.pop_messages(session=session, request=request) or []
687 messages = flash.pop_messages(session=session, request=request) or []
688 for message in messages:
688 for message in messages:
689 payloads.append({
689 payloads.append({
690 'message': {
690 'message': {
691 'message': u'{}'.format(message.message),
691 'message': u'{}'.format(message.message),
692 'level': message.category,
692 'level': message.category,
693 'force': True,
693 'force': True,
694 'subdata': message.sub_data
694 'subdata': message.sub_data
695 }
695 }
696 })
696 })
697 return json.dumps(payloads)
697 return json.dumps(payloads)
698
698
699 def __call__(self, message, category=None, ignore_duplicate=True,
699 def __call__(self, message, category=None, ignore_duplicate=True,
700 session=None, request=None):
700 session=None, request=None):
701
701
702 if not session:
702 if not session:
703 if not request:
703 if not request:
704 request = get_current_request()
704 request = get_current_request()
705 session = request.session
705 session = request.session
706
706
707 session.flash(
707 session.flash(
708 message, queue=category, allow_duplicate=not ignore_duplicate)
708 message, queue=category, allow_duplicate=not ignore_duplicate)
709
709
710
710
711 flash = Flash()
711 flash = Flash()
712
712
713 #==============================================================================
713 #==============================================================================
714 # SCM FILTERS available via h.
714 # SCM FILTERS available via h.
715 #==============================================================================
715 #==============================================================================
716 from rhodecode.lib.vcs.utils import author_name, author_email
716 from rhodecode.lib.vcs.utils import author_name, author_email
717 from rhodecode.lib.utils2 import credentials_filter, age, age_from_seconds
717 from rhodecode.lib.utils2 import credentials_filter, age, age_from_seconds
718 from rhodecode.model.db import User, ChangesetStatus
718 from rhodecode.model.db import User, ChangesetStatus
719
719
720 capitalize = lambda x: x.capitalize()
720 capitalize = lambda x: x.capitalize()
721 email = author_email
721 email = author_email
722 short_id = lambda x: x[:12]
722 short_id = lambda x: x[:12]
723 hide_credentials = lambda x: ''.join(credentials_filter(x))
723 hide_credentials = lambda x: ''.join(credentials_filter(x))
724
724
725
725
726 import pytz
726 import pytz
727 import tzlocal
727 import tzlocal
728 local_timezone = tzlocal.get_localzone()
728 local_timezone = tzlocal.get_localzone()
729
729
730
730
731 def age_component(datetime_iso, value=None, time_is_local=False, tooltip=True):
731 def age_component(datetime_iso, value=None, time_is_local=False, tooltip=True):
732 title = value or format_date(datetime_iso)
732 title = value or format_date(datetime_iso)
733 tzinfo = '+00:00'
733 tzinfo = '+00:00'
734
734
735 # detect if we have a timezone info, otherwise, add it
735 # detect if we have a timezone info, otherwise, add it
736 if time_is_local and isinstance(datetime_iso, datetime) and not datetime_iso.tzinfo:
736 if time_is_local and isinstance(datetime_iso, datetime) and not datetime_iso.tzinfo:
737 force_timezone = os.environ.get('RC_TIMEZONE', '')
737 force_timezone = os.environ.get('RC_TIMEZONE', '')
738 if force_timezone:
738 if force_timezone:
739 force_timezone = pytz.timezone(force_timezone)
739 force_timezone = pytz.timezone(force_timezone)
740 timezone = force_timezone or local_timezone
740 timezone = force_timezone or local_timezone
741 offset = timezone.localize(datetime_iso).strftime('%z')
741 offset = timezone.localize(datetime_iso).strftime('%z')
742 tzinfo = '{}:{}'.format(offset[:-2], offset[-2:])
742 tzinfo = '{}:{}'.format(offset[:-2], offset[-2:])
743
743
744 return literal(
744 return literal(
745 '<time class="timeago {cls}" title="{tt_title}" datetime="{dt}{tzinfo}">{title}</time>'.format(
745 '<time class="timeago {cls}" title="{tt_title}" datetime="{dt}{tzinfo}">{title}</time>'.format(
746 cls='tooltip' if tooltip else '',
746 cls='tooltip' if tooltip else '',
747 tt_title=('{title}{tzinfo}'.format(title=title, tzinfo=tzinfo)) if tooltip else '',
747 tt_title=('{title}{tzinfo}'.format(title=title, tzinfo=tzinfo)) if tooltip else '',
748 title=title, dt=datetime_iso, tzinfo=tzinfo
748 title=title, dt=datetime_iso, tzinfo=tzinfo
749 ))
749 ))
750
750
751
751
752 def _shorten_commit_id(commit_id, commit_len=None):
752 def _shorten_commit_id(commit_id, commit_len=None):
753 if commit_len is None:
753 if commit_len is None:
754 request = get_current_request()
754 request = get_current_request()
755 commit_len = request.call_context.visual.show_sha_length
755 commit_len = request.call_context.visual.show_sha_length
756 return commit_id[:commit_len]
756 return commit_id[:commit_len]
757
757
758
758
759 def show_id(commit, show_idx=None, commit_len=None):
759 def show_id(commit, show_idx=None, commit_len=None):
760 """
760 """
761 Configurable function that shows ID
761 Configurable function that shows ID
762 by default it's r123:fffeeefffeee
762 by default it's r123:fffeeefffeee
763
763
764 :param commit: commit instance
764 :param commit: commit instance
765 """
765 """
766 if show_idx is None:
766 if show_idx is None:
767 request = get_current_request()
767 request = get_current_request()
768 show_idx = request.call_context.visual.show_revision_number
768 show_idx = request.call_context.visual.show_revision_number
769
769
770 raw_id = _shorten_commit_id(commit.raw_id, commit_len=commit_len)
770 raw_id = _shorten_commit_id(commit.raw_id, commit_len=commit_len)
771 if show_idx:
771 if show_idx:
772 return 'r%s:%s' % (commit.idx, raw_id)
772 return 'r%s:%s' % (commit.idx, raw_id)
773 else:
773 else:
774 return '%s' % (raw_id, )
774 return '%s' % (raw_id, )
775
775
776
776
777 def format_date(date):
777 def format_date(date):
778 """
778 """
779 use a standardized formatting for dates used in RhodeCode
779 use a standardized formatting for dates used in RhodeCode
780
780
781 :param date: date/datetime object
781 :param date: date/datetime object
782 :return: formatted date
782 :return: formatted date
783 """
783 """
784
784
785 if date:
785 if date:
786 _fmt = "%a, %d %b %Y %H:%M:%S"
786 _fmt = "%a, %d %b %Y %H:%M:%S"
787 return safe_unicode(date.strftime(_fmt))
787 return safe_unicode(date.strftime(_fmt))
788
788
789 return u""
789 return u""
790
790
791
791
792 class _RepoChecker(object):
792 class _RepoChecker(object):
793
793
794 def __init__(self, backend_alias):
794 def __init__(self, backend_alias):
795 self._backend_alias = backend_alias
795 self._backend_alias = backend_alias
796
796
797 def __call__(self, repository):
797 def __call__(self, repository):
798 if hasattr(repository, 'alias'):
798 if hasattr(repository, 'alias'):
799 _type = repository.alias
799 _type = repository.alias
800 elif hasattr(repository, 'repo_type'):
800 elif hasattr(repository, 'repo_type'):
801 _type = repository.repo_type
801 _type = repository.repo_type
802 else:
802 else:
803 _type = repository
803 _type = repository
804 return _type == self._backend_alias
804 return _type == self._backend_alias
805
805
806
806
807 is_git = _RepoChecker('git')
807 is_git = _RepoChecker('git')
808 is_hg = _RepoChecker('hg')
808 is_hg = _RepoChecker('hg')
809 is_svn = _RepoChecker('svn')
809 is_svn = _RepoChecker('svn')
810
810
811
811
812 def get_repo_type_by_name(repo_name):
812 def get_repo_type_by_name(repo_name):
813 repo = Repository.get_by_repo_name(repo_name)
813 repo = Repository.get_by_repo_name(repo_name)
814 if repo:
814 if repo:
815 return repo.repo_type
815 return repo.repo_type
816
816
817
817
818 def is_svn_without_proxy(repository):
818 def is_svn_without_proxy(repository):
819 if is_svn(repository):
819 if is_svn(repository):
820 from rhodecode.model.settings import VcsSettingsModel
820 from rhodecode.model.settings import VcsSettingsModel
821 conf = VcsSettingsModel().get_ui_settings_as_config_obj()
821 conf = VcsSettingsModel().get_ui_settings_as_config_obj()
822 return not str2bool(conf.get('vcs_svn_proxy', 'http_requests_enabled'))
822 return not str2bool(conf.get('vcs_svn_proxy', 'http_requests_enabled'))
823 return False
823 return False
824
824
825
825
826 def discover_user(author):
826 def discover_user(author):
827 """
827 """
828 Tries to discover RhodeCode User based on the author string. Author string
828 Tries to discover RhodeCode User based on the author string. Author string
829 is typically `FirstName LastName <email@address.com>`
829 is typically `FirstName LastName <email@address.com>`
830 """
830 """
831
831
832 # if author is already an instance use it for extraction
832 # if author is already an instance use it for extraction
833 if isinstance(author, User):
833 if isinstance(author, User):
834 return author
834 return author
835
835
836 # Valid email in the attribute passed, see if they're in the system
836 # Valid email in the attribute passed, see if they're in the system
837 _email = author_email(author)
837 _email = author_email(author)
838 if _email != '':
838 if _email != '':
839 user = User.get_by_email(_email, case_insensitive=True, cache=True)
839 user = User.get_by_email(_email, case_insensitive=True, cache=True)
840 if user is not None:
840 if user is not None:
841 return user
841 return user
842
842
843 # Maybe it's a username, we try to extract it and fetch by username ?
843 # Maybe it's a username, we try to extract it and fetch by username ?
844 _author = author_name(author)
844 _author = author_name(author)
845 user = User.get_by_username(_author, case_insensitive=True, cache=True)
845 user = User.get_by_username(_author, case_insensitive=True, cache=True)
846 if user is not None:
846 if user is not None:
847 return user
847 return user
848
848
849 return None
849 return None
850
850
851
851
852 def email_or_none(author):
852 def email_or_none(author):
853 # extract email from the commit string
853 # extract email from the commit string
854 _email = author_email(author)
854 _email = author_email(author)
855
855
856 # If we have an email, use it, otherwise
856 # If we have an email, use it, otherwise
857 # see if it contains a username we can get an email from
857 # see if it contains a username we can get an email from
858 if _email != '':
858 if _email != '':
859 return _email
859 return _email
860 else:
860 else:
861 user = User.get_by_username(
861 user = User.get_by_username(
862 author_name(author), case_insensitive=True, cache=True)
862 author_name(author), case_insensitive=True, cache=True)
863
863
864 if user is not None:
864 if user is not None:
865 return user.email
865 return user.email
866
866
867 # No valid email, not a valid user in the system, none!
867 # No valid email, not a valid user in the system, none!
868 return None
868 return None
869
869
870
870
871 def link_to_user(author, length=0, **kwargs):
871 def link_to_user(author, length=0, **kwargs):
872 user = discover_user(author)
872 user = discover_user(author)
873 # user can be None, but if we have it already it means we can re-use it
873 # user can be None, but if we have it already it means we can re-use it
874 # in the person() function, so we save 1 intensive-query
874 # in the person() function, so we save 1 intensive-query
875 if user:
875 if user:
876 author = user
876 author = user
877
877
878 display_person = person(author, 'username_or_name_or_email')
878 display_person = person(author, 'username_or_name_or_email')
879 if length:
879 if length:
880 display_person = shorter(display_person, length)
880 display_person = shorter(display_person, length)
881
881
882 if user:
882 if user:
883 return link_to(
883 return link_to(
884 escape(display_person),
884 escape(display_person),
885 route_path('user_profile', username=user.username),
885 route_path('user_profile', username=user.username),
886 **kwargs)
886 **kwargs)
887 else:
887 else:
888 return escape(display_person)
888 return escape(display_person)
889
889
890
890
891 def link_to_group(users_group_name, **kwargs):
891 def link_to_group(users_group_name, **kwargs):
892 return link_to(
892 return link_to(
893 escape(users_group_name),
893 escape(users_group_name),
894 route_path('user_group_profile', user_group_name=users_group_name),
894 route_path('user_group_profile', user_group_name=users_group_name),
895 **kwargs)
895 **kwargs)
896
896
897
897
898 def person(author, show_attr="username_and_name"):
898 def person(author, show_attr="username_and_name"):
899 user = discover_user(author)
899 user = discover_user(author)
900 if user:
900 if user:
901 return getattr(user, show_attr)
901 return getattr(user, show_attr)
902 else:
902 else:
903 _author = author_name(author)
903 _author = author_name(author)
904 _email = email(author)
904 _email = email(author)
905 return _author or _email
905 return _author or _email
906
906
907
907
908 def author_string(email):
908 def author_string(email):
909 if email:
909 if email:
910 user = User.get_by_email(email, case_insensitive=True, cache=True)
910 user = User.get_by_email(email, case_insensitive=True, cache=True)
911 if user:
911 if user:
912 if user.first_name or user.last_name:
912 if user.first_name or user.last_name:
913 return '%s %s &lt;%s&gt;' % (
913 return '%s %s &lt;%s&gt;' % (
914 user.first_name, user.last_name, email)
914 user.first_name, user.last_name, email)
915 else:
915 else:
916 return email
916 return email
917 else:
917 else:
918 return email
918 return email
919 else:
919 else:
920 return None
920 return None
921
921
922
922
923 def person_by_id(id_, show_attr="username_and_name"):
923 def person_by_id(id_, show_attr="username_and_name"):
924 # attr to return from fetched user
924 # attr to return from fetched user
925 person_getter = lambda usr: getattr(usr, show_attr)
925 person_getter = lambda usr: getattr(usr, show_attr)
926
926
927 #maybe it's an ID ?
927 #maybe it's an ID ?
928 if str(id_).isdigit() or isinstance(id_, int):
928 if str(id_).isdigit() or isinstance(id_, int):
929 id_ = int(id_)
929 id_ = int(id_)
930 user = User.get(id_)
930 user = User.get(id_)
931 if user is not None:
931 if user is not None:
932 return person_getter(user)
932 return person_getter(user)
933 return id_
933 return id_
934
934
935
935
936 def gravatar_with_user(request, author, show_disabled=False, tooltip=False):
936 def gravatar_with_user(request, author, show_disabled=False, tooltip=False):
937 _render = request.get_partial_renderer('rhodecode:templates/base/base.mako')
937 _render = request.get_partial_renderer('rhodecode:templates/base/base.mako')
938 return _render('gravatar_with_user', author, show_disabled=show_disabled, tooltip=tooltip)
938 return _render('gravatar_with_user', author, show_disabled=show_disabled, tooltip=tooltip)
939
939
940
940
941 tags_paterns = OrderedDict((
941 tags_paterns = OrderedDict((
942 ('lang', (re.compile(r'\[(lang|language)\ \=\&gt;\ *([a-zA-Z\-\/\#\+\.]*)\]'),
942 ('lang', (re.compile(r'\[(lang|language)\ \=\&gt;\ *([a-zA-Z\-\/\#\+\.]*)\]'),
943 '<div class="metatag" tag="lang">\\2</div>')),
943 '<div class="metatag" tag="lang">\\2</div>')),
944
944
945 ('see', (re.compile(r'\[see\ \=\&gt;\ *([a-zA-Z0-9\/\=\?\&amp;\ \:\/\.\-]*)\]'),
945 ('see', (re.compile(r'\[see\ \=\&gt;\ *([a-zA-Z0-9\/\=\?\&amp;\ \:\/\.\-]*)\]'),
946 '<div class="metatag" tag="see">see: \\1 </div>')),
946 '<div class="metatag" tag="see">see: \\1 </div>')),
947
947
948 ('url', (re.compile(r'\[url\ \=\&gt;\ \[([a-zA-Z0-9\ \.\-\_]+)\]\((http://|https://|/)(.*?)\)\]'),
948 ('url', (re.compile(r'\[url\ \=\&gt;\ \[([a-zA-Z0-9\ \.\-\_]+)\]\((http://|https://|/)(.*?)\)\]'),
949 '<div class="metatag" tag="url"> <a href="\\2\\3">\\1</a> </div>')),
949 '<div class="metatag" tag="url"> <a href="\\2\\3">\\1</a> </div>')),
950
950
951 ('license', (re.compile(r'\[license\ \=\&gt;\ *([a-zA-Z0-9\/\=\?\&amp;\ \:\/\.\-]*)\]'),
951 ('license', (re.compile(r'\[license\ \=\&gt;\ *([a-zA-Z0-9\/\=\?\&amp;\ \:\/\.\-]*)\]'),
952 '<div class="metatag" tag="license"><a href="http:\/\/www.opensource.org/licenses/\\1">\\1</a></div>')),
952 '<div class="metatag" tag="license"><a href="http:\/\/www.opensource.org/licenses/\\1">\\1</a></div>')),
953
953
954 ('ref', (re.compile(r'\[(requires|recommends|conflicts|base)\ \=\&gt;\ *([a-zA-Z0-9\-\/]*)\]'),
954 ('ref', (re.compile(r'\[(requires|recommends|conflicts|base)\ \=\&gt;\ *([a-zA-Z0-9\-\/]*)\]'),
955 '<div class="metatag" tag="ref \\1">\\1: <a href="/\\2">\\2</a></div>')),
955 '<div class="metatag" tag="ref \\1">\\1: <a href="/\\2">\\2</a></div>')),
956
956
957 ('state', (re.compile(r'\[(stable|featured|stale|dead|dev|deprecated)\]'),
957 ('state', (re.compile(r'\[(stable|featured|stale|dead|dev|deprecated)\]'),
958 '<div class="metatag" tag="state \\1">\\1</div>')),
958 '<div class="metatag" tag="state \\1">\\1</div>')),
959
959
960 # label in grey
960 # label in grey
961 ('label', (re.compile(r'\[([a-z]+)\]'),
961 ('label', (re.compile(r'\[([a-z]+)\]'),
962 '<div class="metatag" tag="label">\\1</div>')),
962 '<div class="metatag" tag="label">\\1</div>')),
963
963
964 # generic catch all in grey
964 # generic catch all in grey
965 ('generic', (re.compile(r'\[([a-zA-Z0-9\.\-\_]+)\]'),
965 ('generic', (re.compile(r'\[([a-zA-Z0-9\.\-\_]+)\]'),
966 '<div class="metatag" tag="generic">\\1</div>')),
966 '<div class="metatag" tag="generic">\\1</div>')),
967 ))
967 ))
968
968
969
969
970 def extract_metatags(value):
970 def extract_metatags(value):
971 """
971 """
972 Extract supported meta-tags from given text value
972 Extract supported meta-tags from given text value
973 """
973 """
974 tags = []
974 tags = []
975 if not value:
975 if not value:
976 return tags, ''
976 return tags, ''
977
977
978 for key, val in tags_paterns.items():
978 for key, val in tags_paterns.items():
979 pat, replace_html = val
979 pat, replace_html = val
980 tags.extend([(key, x.group()) for x in pat.finditer(value)])
980 tags.extend([(key, x.group()) for x in pat.finditer(value)])
981 value = pat.sub('', value)
981 value = pat.sub('', value)
982
982
983 return tags, value
983 return tags, value
984
984
985
985
986 def style_metatag(tag_type, value):
986 def style_metatag(tag_type, value):
987 """
987 """
988 converts tags from value into html equivalent
988 converts tags from value into html equivalent
989 """
989 """
990 if not value:
990 if not value:
991 return ''
991 return ''
992
992
993 html_value = value
993 html_value = value
994 tag_data = tags_paterns.get(tag_type)
994 tag_data = tags_paterns.get(tag_type)
995 if tag_data:
995 if tag_data:
996 pat, replace_html = tag_data
996 pat, replace_html = tag_data
997 # convert to plain `unicode` instead of a markup tag to be used in
997 # convert to plain `unicode` instead of a markup tag to be used in
998 # regex expressions. safe_unicode doesn't work here
998 # regex expressions. safe_unicode doesn't work here
999 html_value = pat.sub(replace_html, unicode(value))
999 html_value = pat.sub(replace_html, unicode(value))
1000
1000
1001 return html_value
1001 return html_value
1002
1002
1003
1003
1004 def bool2icon(value, show_at_false=True):
1004 def bool2icon(value, show_at_false=True):
1005 """
1005 """
1006 Returns boolean value of a given value, represented as html element with
1006 Returns boolean value of a given value, represented as html element with
1007 classes that will represent icons
1007 classes that will represent icons
1008
1008
1009 :param value: given value to convert to html node
1009 :param value: given value to convert to html node
1010 """
1010 """
1011
1011
1012 if value: # does bool conversion
1012 if value: # does bool conversion
1013 return HTML.tag('i', class_="icon-true", title='True')
1013 return HTML.tag('i', class_="icon-true", title='True')
1014 else: # not true as bool
1014 else: # not true as bool
1015 if show_at_false:
1015 if show_at_false:
1016 return HTML.tag('i', class_="icon-false", title='False')
1016 return HTML.tag('i', class_="icon-false", title='False')
1017 return HTML.tag('i')
1017 return HTML.tag('i')
1018
1018
1019 #==============================================================================
1019 #==============================================================================
1020 # PERMS
1020 # PERMS
1021 #==============================================================================
1021 #==============================================================================
1022 from rhodecode.lib.auth import (
1022 from rhodecode.lib.auth import (
1023 HasPermissionAny, HasPermissionAll,
1023 HasPermissionAny, HasPermissionAll,
1024 HasRepoPermissionAny, HasRepoPermissionAll, HasRepoGroupPermissionAll,
1024 HasRepoPermissionAny, HasRepoPermissionAll, HasRepoGroupPermissionAll,
1025 HasRepoGroupPermissionAny, HasRepoPermissionAnyApi, get_csrf_token,
1025 HasRepoGroupPermissionAny, HasRepoPermissionAnyApi, get_csrf_token,
1026 csrf_token_key, AuthUser)
1026 csrf_token_key, AuthUser)
1027
1027
1028
1028
1029 #==============================================================================
1029 #==============================================================================
1030 # GRAVATAR URL
1030 # GRAVATAR URL
1031 #==============================================================================
1031 #==============================================================================
1032 class InitialsGravatar(object):
1032 class InitialsGravatar(object):
1033 def __init__(self, email_address, first_name, last_name, size=30,
1033 def __init__(self, email_address, first_name, last_name, size=30,
1034 background=None, text_color='#fff'):
1034 background=None, text_color='#fff'):
1035 self.size = size
1035 self.size = size
1036 self.first_name = first_name
1036 self.first_name = first_name
1037 self.last_name = last_name
1037 self.last_name = last_name
1038 self.email_address = email_address
1038 self.email_address = email_address
1039 self.background = background or self.str2color(email_address)
1039 self.background = background or self.str2color(email_address)
1040 self.text_color = text_color
1040 self.text_color = text_color
1041
1041
1042 def get_color_bank(self):
1042 def get_color_bank(self):
1043 """
1043 """
1044 returns a predefined list of colors that gravatars can use.
1044 returns a predefined list of colors that gravatars can use.
1045 Those are randomized distinct colors that guarantee readability and
1045 Those are randomized distinct colors that guarantee readability and
1046 uniqueness.
1046 uniqueness.
1047
1047
1048 generated with: http://phrogz.net/css/distinct-colors.html
1048 generated with: http://phrogz.net/css/distinct-colors.html
1049 """
1049 """
1050 return [
1050 return [
1051 '#bf3030', '#a67f53', '#00ff00', '#5989b3', '#392040', '#d90000',
1051 '#bf3030', '#a67f53', '#00ff00', '#5989b3', '#392040', '#d90000',
1052 '#402910', '#204020', '#79baf2', '#a700b3', '#bf6060', '#7f5320',
1052 '#402910', '#204020', '#79baf2', '#a700b3', '#bf6060', '#7f5320',
1053 '#008000', '#003059', '#ee00ff', '#ff0000', '#8c4b00', '#007300',
1053 '#008000', '#003059', '#ee00ff', '#ff0000', '#8c4b00', '#007300',
1054 '#005fb3', '#de73e6', '#ff4040', '#ffaa00', '#3df255', '#203140',
1054 '#005fb3', '#de73e6', '#ff4040', '#ffaa00', '#3df255', '#203140',
1055 '#47004d', '#591616', '#664400', '#59b365', '#0d2133', '#83008c',
1055 '#47004d', '#591616', '#664400', '#59b365', '#0d2133', '#83008c',
1056 '#592d2d', '#bf9f60', '#73e682', '#1d3f73', '#73006b', '#402020',
1056 '#592d2d', '#bf9f60', '#73e682', '#1d3f73', '#73006b', '#402020',
1057 '#b2862d', '#397341', '#597db3', '#e600d6', '#a60000', '#736039',
1057 '#b2862d', '#397341', '#597db3', '#e600d6', '#a60000', '#736039',
1058 '#00b318', '#79aaf2', '#330d30', '#ff8080', '#403010', '#16591f',
1058 '#00b318', '#79aaf2', '#330d30', '#ff8080', '#403010', '#16591f',
1059 '#002459', '#8c4688', '#e50000', '#ffbf40', '#00732e', '#102340',
1059 '#002459', '#8c4688', '#e50000', '#ffbf40', '#00732e', '#102340',
1060 '#bf60ac', '#8c4646', '#cc8800', '#00a642', '#1d3473', '#b32d98',
1060 '#bf60ac', '#8c4646', '#cc8800', '#00a642', '#1d3473', '#b32d98',
1061 '#660e00', '#ffd580', '#80ffb2', '#7391e6', '#733967', '#d97b6c',
1061 '#660e00', '#ffd580', '#80ffb2', '#7391e6', '#733967', '#d97b6c',
1062 '#8c5e00', '#59b389', '#3967e6', '#590047', '#73281d', '#665200',
1062 '#8c5e00', '#59b389', '#3967e6', '#590047', '#73281d', '#665200',
1063 '#00e67a', '#2d50b3', '#8c2377', '#734139', '#b2982d', '#16593a',
1063 '#00e67a', '#2d50b3', '#8c2377', '#734139', '#b2982d', '#16593a',
1064 '#001859', '#ff00aa', '#a65e53', '#ffcc00', '#0d3321', '#2d3959',
1064 '#001859', '#ff00aa', '#a65e53', '#ffcc00', '#0d3321', '#2d3959',
1065 '#731d56', '#401610', '#4c3d00', '#468c6c', '#002ca6', '#d936a3',
1065 '#731d56', '#401610', '#4c3d00', '#468c6c', '#002ca6', '#d936a3',
1066 '#d94c36', '#403920', '#36d9a3', '#0d1733', '#592d4a', '#993626',
1066 '#d94c36', '#403920', '#36d9a3', '#0d1733', '#592d4a', '#993626',
1067 '#cca300', '#00734d', '#46598c', '#8c005e', '#7f1100', '#8c7000',
1067 '#cca300', '#00734d', '#46598c', '#8c005e', '#7f1100', '#8c7000',
1068 '#00a66f', '#7382e6', '#b32d74', '#d9896c', '#ffe680', '#1d7362',
1068 '#00a66f', '#7382e6', '#b32d74', '#d9896c', '#ffe680', '#1d7362',
1069 '#364cd9', '#73003d', '#d93a00', '#998a4d', '#59b3a1', '#5965b3',
1069 '#364cd9', '#73003d', '#d93a00', '#998a4d', '#59b3a1', '#5965b3',
1070 '#e5007a', '#73341d', '#665f00', '#00b38f', '#0018b3', '#59163a',
1070 '#e5007a', '#73341d', '#665f00', '#00b38f', '#0018b3', '#59163a',
1071 '#b2502d', '#bfb960', '#00ffcc', '#23318c', '#a6537f', '#734939',
1071 '#b2502d', '#bfb960', '#00ffcc', '#23318c', '#a6537f', '#734939',
1072 '#b2a700', '#104036', '#3d3df2', '#402031', '#e56739', '#736f39',
1072 '#b2a700', '#104036', '#3d3df2', '#402031', '#e56739', '#736f39',
1073 '#79f2ea', '#000059', '#401029', '#4c1400', '#ffee00', '#005953',
1073 '#79f2ea', '#000059', '#401029', '#4c1400', '#ffee00', '#005953',
1074 '#101040', '#990052', '#402820', '#403d10', '#00ffee', '#0000d9',
1074 '#101040', '#990052', '#402820', '#403d10', '#00ffee', '#0000d9',
1075 '#ff80c4', '#a66953', '#eeff00', '#00ccbe', '#8080ff', '#e673a1',
1075 '#ff80c4', '#a66953', '#eeff00', '#00ccbe', '#8080ff', '#e673a1',
1076 '#a62c00', '#474d00', '#1a3331', '#46468c', '#733950', '#662900',
1076 '#a62c00', '#474d00', '#1a3331', '#46468c', '#733950', '#662900',
1077 '#858c23', '#238c85', '#0f0073', '#b20047', '#d9986c', '#becc00',
1077 '#858c23', '#238c85', '#0f0073', '#b20047', '#d9986c', '#becc00',
1078 '#396f73', '#281d73', '#ff0066', '#ff6600', '#dee673', '#59adb3',
1078 '#396f73', '#281d73', '#ff0066', '#ff6600', '#dee673', '#59adb3',
1079 '#6559b3', '#590024', '#b2622d', '#98b32d', '#36ced9', '#332d59',
1079 '#6559b3', '#590024', '#b2622d', '#98b32d', '#36ced9', '#332d59',
1080 '#40001a', '#733f1d', '#526600', '#005359', '#242040', '#bf6079',
1080 '#40001a', '#733f1d', '#526600', '#005359', '#242040', '#bf6079',
1081 '#735039', '#cef23d', '#007780', '#5630bf', '#66001b', '#b24700',
1081 '#735039', '#cef23d', '#007780', '#5630bf', '#66001b', '#b24700',
1082 '#acbf60', '#1d6273', '#25008c', '#731d34', '#a67453', '#50592d',
1082 '#acbf60', '#1d6273', '#25008c', '#731d34', '#a67453', '#50592d',
1083 '#00ccff', '#6600ff', '#ff0044', '#4c1f00', '#8a994d', '#79daf2',
1083 '#00ccff', '#6600ff', '#ff0044', '#4c1f00', '#8a994d', '#79daf2',
1084 '#a173e6', '#d93662', '#402310', '#aaff00', '#2d98b3', '#8c40ff',
1084 '#a173e6', '#d93662', '#402310', '#aaff00', '#2d98b3', '#8c40ff',
1085 '#592d39', '#ff8c40', '#354020', '#103640', '#1a0040', '#331a20',
1085 '#592d39', '#ff8c40', '#354020', '#103640', '#1a0040', '#331a20',
1086 '#331400', '#334d00', '#1d5673', '#583973', '#7f0022', '#4c3626',
1086 '#331400', '#334d00', '#1d5673', '#583973', '#7f0022', '#4c3626',
1087 '#88cc00', '#36a3d9', '#3d0073', '#d9364c', '#33241a', '#698c23',
1087 '#88cc00', '#36a3d9', '#3d0073', '#d9364c', '#33241a', '#698c23',
1088 '#5995b3', '#300059', '#e57382', '#7f3300', '#366600', '#00aaff',
1088 '#5995b3', '#300059', '#e57382', '#7f3300', '#366600', '#00aaff',
1089 '#3a1659', '#733941', '#663600', '#74b32d', '#003c59', '#7f53a6',
1089 '#3a1659', '#733941', '#663600', '#74b32d', '#003c59', '#7f53a6',
1090 '#73000f', '#ff8800', '#baf279', '#79caf2', '#291040', '#a6293a',
1090 '#73000f', '#ff8800', '#baf279', '#79caf2', '#291040', '#a6293a',
1091 '#b2742d', '#587339', '#0077b3', '#632699', '#400009', '#d9a66c',
1091 '#b2742d', '#587339', '#0077b3', '#632699', '#400009', '#d9a66c',
1092 '#294010', '#2d4a59', '#aa00ff', '#4c131b', '#b25f00', '#5ce600',
1092 '#294010', '#2d4a59', '#aa00ff', '#4c131b', '#b25f00', '#5ce600',
1093 '#267399', '#a336d9', '#990014', '#664e33', '#86bf60', '#0088ff',
1093 '#267399', '#a336d9', '#990014', '#664e33', '#86bf60', '#0088ff',
1094 '#7700b3', '#593a16', '#073300', '#1d4b73', '#ac60bf', '#e59539',
1094 '#7700b3', '#593a16', '#073300', '#1d4b73', '#ac60bf', '#e59539',
1095 '#4f8c46', '#368dd9', '#5c0073'
1095 '#4f8c46', '#368dd9', '#5c0073'
1096 ]
1096 ]
1097
1097
1098 def rgb_to_hex_color(self, rgb_tuple):
1098 def rgb_to_hex_color(self, rgb_tuple):
1099 """
1099 """
1100 Converts an rgb_tuple passed to an hex color.
1100 Converts an rgb_tuple passed to an hex color.
1101
1101
1102 :param rgb_tuple: tuple with 3 ints represents rgb color space
1102 :param rgb_tuple: tuple with 3 ints represents rgb color space
1103 """
1103 """
1104 return '#' + ("".join(map(chr, rgb_tuple)).encode('hex'))
1104 return '#' + ("".join(map(chr, rgb_tuple)).encode('hex'))
1105
1105
1106 def email_to_int_list(self, email_str):
1106 def email_to_int_list(self, email_str):
1107 """
1107 """
1108 Get every byte of the hex digest value of email and turn it to integer.
1108 Get every byte of the hex digest value of email and turn it to integer.
1109 It's going to be always between 0-255
1109 It's going to be always between 0-255
1110 """
1110 """
1111 digest = md5_safe(email_str.lower())
1111 digest = md5_safe(email_str.lower())
1112 return [int(digest[i * 2:i * 2 + 2], 16) for i in range(16)]
1112 return [int(digest[i * 2:i * 2 + 2], 16) for i in range(16)]
1113
1113
1114 def pick_color_bank_index(self, email_str, color_bank):
1114 def pick_color_bank_index(self, email_str, color_bank):
1115 return self.email_to_int_list(email_str)[0] % len(color_bank)
1115 return self.email_to_int_list(email_str)[0] % len(color_bank)
1116
1116
1117 def str2color(self, email_str):
1117 def str2color(self, email_str):
1118 """
1118 """
1119 Tries to map in a stable algorithm an email to color
1119 Tries to map in a stable algorithm an email to color
1120
1120
1121 :param email_str:
1121 :param email_str:
1122 """
1122 """
1123 color_bank = self.get_color_bank()
1123 color_bank = self.get_color_bank()
1124 # pick position (module it's length so we always find it in the
1124 # pick position (module it's length so we always find it in the
1125 # bank even if it's smaller than 256 values
1125 # bank even if it's smaller than 256 values
1126 pos = self.pick_color_bank_index(email_str, color_bank)
1126 pos = self.pick_color_bank_index(email_str, color_bank)
1127 return color_bank[pos]
1127 return color_bank[pos]
1128
1128
1129 def normalize_email(self, email_address):
1129 def normalize_email(self, email_address):
1130 import unicodedata
1130 import unicodedata
1131 # default host used to fill in the fake/missing email
1131 # default host used to fill in the fake/missing email
1132 default_host = u'localhost'
1132 default_host = u'localhost'
1133
1133
1134 if not email_address:
1134 if not email_address:
1135 email_address = u'%s@%s' % (User.DEFAULT_USER, default_host)
1135 email_address = u'%s@%s' % (User.DEFAULT_USER, default_host)
1136
1136
1137 email_address = safe_unicode(email_address)
1137 email_address = safe_unicode(email_address)
1138
1138
1139 if u'@' not in email_address:
1139 if u'@' not in email_address:
1140 email_address = u'%s@%s' % (email_address, default_host)
1140 email_address = u'%s@%s' % (email_address, default_host)
1141
1141
1142 if email_address.endswith(u'@'):
1142 if email_address.endswith(u'@'):
1143 email_address = u'%s%s' % (email_address, default_host)
1143 email_address = u'%s%s' % (email_address, default_host)
1144
1144
1145 email_address = unicodedata.normalize('NFKD', email_address)\
1145 email_address = unicodedata.normalize('NFKD', email_address)\
1146 .encode('ascii', 'ignore')
1146 .encode('ascii', 'ignore')
1147 return email_address
1147 return email_address
1148
1148
1149 def get_initials(self):
1149 def get_initials(self):
1150 """
1150 """
1151 Returns 2 letter initials calculated based on the input.
1151 Returns 2 letter initials calculated based on the input.
1152 The algorithm picks first given email address, and takes first letter
1152 The algorithm picks first given email address, and takes first letter
1153 of part before @, and then the first letter of server name. In case
1153 of part before @, and then the first letter of server name. In case
1154 the part before @ is in a format of `somestring.somestring2` it replaces
1154 the part before @ is in a format of `somestring.somestring2` it replaces
1155 the server letter with first letter of somestring2
1155 the server letter with first letter of somestring2
1156
1156
1157 In case function was initialized with both first and lastname, this
1157 In case function was initialized with both first and lastname, this
1158 overrides the extraction from email by first letter of the first and
1158 overrides the extraction from email by first letter of the first and
1159 last name. We add special logic to that functionality, In case Full name
1159 last name. We add special logic to that functionality, In case Full name
1160 is compound, like Guido Von Rossum, we use last part of the last name
1160 is compound, like Guido Von Rossum, we use last part of the last name
1161 (Von Rossum) picking `R`.
1161 (Von Rossum) picking `R`.
1162
1162
1163 Function also normalizes the non-ascii characters to they ascii
1163 Function also normalizes the non-ascii characters to they ascii
1164 representation, eg Δ„ => A
1164 representation, eg Δ„ => A
1165 """
1165 """
1166 import unicodedata
1166 import unicodedata
1167 # replace non-ascii to ascii
1167 # replace non-ascii to ascii
1168 first_name = unicodedata.normalize(
1168 first_name = unicodedata.normalize(
1169 'NFKD', safe_unicode(self.first_name)).encode('ascii', 'ignore')
1169 'NFKD', safe_unicode(self.first_name)).encode('ascii', 'ignore')
1170 last_name = unicodedata.normalize(
1170 last_name = unicodedata.normalize(
1171 'NFKD', safe_unicode(self.last_name)).encode('ascii', 'ignore')
1171 'NFKD', safe_unicode(self.last_name)).encode('ascii', 'ignore')
1172
1172
1173 # do NFKD encoding, and also make sure email has proper format
1173 # do NFKD encoding, and also make sure email has proper format
1174 email_address = self.normalize_email(self.email_address)
1174 email_address = self.normalize_email(self.email_address)
1175
1175
1176 # first push the email initials
1176 # first push the email initials
1177 prefix, server = email_address.split('@', 1)
1177 prefix, server = email_address.split('@', 1)
1178
1178
1179 # check if prefix is maybe a 'first_name.last_name' syntax
1179 # check if prefix is maybe a 'first_name.last_name' syntax
1180 _dot_split = prefix.rsplit('.', 1)
1180 _dot_split = prefix.rsplit('.', 1)
1181 if len(_dot_split) == 2 and _dot_split[1]:
1181 if len(_dot_split) == 2 and _dot_split[1]:
1182 initials = [_dot_split[0][0], _dot_split[1][0]]
1182 initials = [_dot_split[0][0], _dot_split[1][0]]
1183 else:
1183 else:
1184 initials = [prefix[0], server[0]]
1184 initials = [prefix[0], server[0]]
1185
1185
1186 # then try to replace either first_name or last_name
1186 # then try to replace either first_name or last_name
1187 fn_letter = (first_name or " ")[0].strip()
1187 fn_letter = (first_name or " ")[0].strip()
1188 ln_letter = (last_name.split(' ', 1)[-1] or " ")[0].strip()
1188 ln_letter = (last_name.split(' ', 1)[-1] or " ")[0].strip()
1189
1189
1190 if fn_letter:
1190 if fn_letter:
1191 initials[0] = fn_letter
1191 initials[0] = fn_letter
1192
1192
1193 if ln_letter:
1193 if ln_letter:
1194 initials[1] = ln_letter
1194 initials[1] = ln_letter
1195
1195
1196 return ''.join(initials).upper()
1196 return ''.join(initials).upper()
1197
1197
1198 def get_img_data_by_type(self, font_family, img_type):
1198 def get_img_data_by_type(self, font_family, img_type):
1199 default_user = """
1199 default_user = """
1200 <svg xmlns="http://www.w3.org/2000/svg"
1200 <svg xmlns="http://www.w3.org/2000/svg"
1201 version="1.1" x="0px" y="0px" width="{size}" height="{size}"
1201 version="1.1" x="0px" y="0px" width="{size}" height="{size}"
1202 viewBox="-15 -10 439.165 429.164"
1202 viewBox="-15 -10 439.165 429.164"
1203
1203
1204 xml:space="preserve"
1204 xml:space="preserve"
1205 style="background:{background};" >
1205 style="background:{background};" >
1206
1206
1207 <path d="M204.583,216.671c50.664,0,91.74-48.075,
1207 <path d="M204.583,216.671c50.664,0,91.74-48.075,
1208 91.74-107.378c0-82.237-41.074-107.377-91.74-107.377
1208 91.74-107.378c0-82.237-41.074-107.377-91.74-107.377
1209 c-50.668,0-91.74,25.14-91.74,107.377C112.844,
1209 c-50.668,0-91.74,25.14-91.74,107.377C112.844,
1210 168.596,153.916,216.671,
1210 168.596,153.916,216.671,
1211 204.583,216.671z" fill="{text_color}"/>
1211 204.583,216.671z" fill="{text_color}"/>
1212 <path d="M407.164,374.717L360.88,
1212 <path d="M407.164,374.717L360.88,
1213 270.454c-2.117-4.771-5.836-8.728-10.465-11.138l-71.83-37.392
1213 270.454c-2.117-4.771-5.836-8.728-10.465-11.138l-71.83-37.392
1214 c-1.584-0.823-3.502-0.663-4.926,0.415c-20.316,
1214 c-1.584-0.823-3.502-0.663-4.926,0.415c-20.316,
1215 15.366-44.203,23.488-69.076,23.488c-24.877,
1215 15.366-44.203,23.488-69.076,23.488c-24.877,
1216 0-48.762-8.122-69.078-23.488
1216 0-48.762-8.122-69.078-23.488
1217 c-1.428-1.078-3.346-1.238-4.93-0.415L58.75,
1217 c-1.428-1.078-3.346-1.238-4.93-0.415L58.75,
1218 259.316c-4.631,2.41-8.346,6.365-10.465,11.138L2.001,374.717
1218 259.316c-4.631,2.41-8.346,6.365-10.465,11.138L2.001,374.717
1219 c-3.191,7.188-2.537,15.412,1.75,22.005c4.285,
1219 c-3.191,7.188-2.537,15.412,1.75,22.005c4.285,
1220 6.592,11.537,10.526,19.4,10.526h362.861c7.863,0,15.117-3.936,
1220 6.592,11.537,10.526,19.4,10.526h362.861c7.863,0,15.117-3.936,
1221 19.402-10.527 C409.699,390.129,
1221 19.402-10.527 C409.699,390.129,
1222 410.355,381.902,407.164,374.717z" fill="{text_color}"/>
1222 410.355,381.902,407.164,374.717z" fill="{text_color}"/>
1223 </svg>""".format(
1223 </svg>""".format(
1224 size=self.size,
1224 size=self.size,
1225 background='#979797', # @grey4
1225 background='#979797', # @grey4
1226 text_color=self.text_color,
1226 text_color=self.text_color,
1227 font_family=font_family)
1227 font_family=font_family)
1228
1228
1229 return {
1229 return {
1230 "default_user": default_user
1230 "default_user": default_user
1231 }[img_type]
1231 }[img_type]
1232
1232
1233 def get_img_data(self, svg_type=None):
1233 def get_img_data(self, svg_type=None):
1234 """
1234 """
1235 generates the svg metadata for image
1235 generates the svg metadata for image
1236 """
1236 """
1237 fonts = [
1237 fonts = [
1238 '-apple-system',
1238 '-apple-system',
1239 'BlinkMacSystemFont',
1239 'BlinkMacSystemFont',
1240 'Segoe UI',
1240 'Segoe UI',
1241 'Roboto',
1241 'Roboto',
1242 'Oxygen-Sans',
1242 'Oxygen-Sans',
1243 'Ubuntu',
1243 'Ubuntu',
1244 'Cantarell',
1244 'Cantarell',
1245 'Helvetica Neue',
1245 'Helvetica Neue',
1246 'sans-serif'
1246 'sans-serif'
1247 ]
1247 ]
1248 font_family = ','.join(fonts)
1248 font_family = ','.join(fonts)
1249 if svg_type:
1249 if svg_type:
1250 return self.get_img_data_by_type(font_family, svg_type)
1250 return self.get_img_data_by_type(font_family, svg_type)
1251
1251
1252 initials = self.get_initials()
1252 initials = self.get_initials()
1253 img_data = """
1253 img_data = """
1254 <svg xmlns="http://www.w3.org/2000/svg" pointer-events="none"
1254 <svg xmlns="http://www.w3.org/2000/svg" pointer-events="none"
1255 width="{size}" height="{size}"
1255 width="{size}" height="{size}"
1256 style="width: 100%; height: 100%; background-color: {background}"
1256 style="width: 100%; height: 100%; background-color: {background}"
1257 viewBox="0 0 {size} {size}">
1257 viewBox="0 0 {size} {size}">
1258 <text text-anchor="middle" y="50%" x="50%" dy="0.35em"
1258 <text text-anchor="middle" y="50%" x="50%" dy="0.35em"
1259 pointer-events="auto" fill="{text_color}"
1259 pointer-events="auto" fill="{text_color}"
1260 font-family="{font_family}"
1260 font-family="{font_family}"
1261 style="font-weight: 400; font-size: {f_size}px;">{text}
1261 style="font-weight: 400; font-size: {f_size}px;">{text}
1262 </text>
1262 </text>
1263 </svg>""".format(
1263 </svg>""".format(
1264 size=self.size,
1264 size=self.size,
1265 f_size=self.size/2.05, # scale the text inside the box nicely
1265 f_size=self.size/2.05, # scale the text inside the box nicely
1266 background=self.background,
1266 background=self.background,
1267 text_color=self.text_color,
1267 text_color=self.text_color,
1268 text=initials.upper(),
1268 text=initials.upper(),
1269 font_family=font_family)
1269 font_family=font_family)
1270
1270
1271 return img_data
1271 return img_data
1272
1272
1273 def generate_svg(self, svg_type=None):
1273 def generate_svg(self, svg_type=None):
1274 img_data = self.get_img_data(svg_type)
1274 img_data = self.get_img_data(svg_type)
1275 return "data:image/svg+xml;base64,%s" % img_data.encode('base64')
1275 return "data:image/svg+xml;base64,%s" % img_data.encode('base64')
1276
1276
1277
1277
1278 def initials_gravatar(email_address, first_name, last_name, size=30):
1278 def initials_gravatar(email_address, first_name, last_name, size=30):
1279 svg_type = None
1279 svg_type = None
1280 if email_address == User.DEFAULT_USER_EMAIL:
1280 if email_address == User.DEFAULT_USER_EMAIL:
1281 svg_type = 'default_user'
1281 svg_type = 'default_user'
1282 klass = InitialsGravatar(email_address, first_name, last_name, size)
1282 klass = InitialsGravatar(email_address, first_name, last_name, size)
1283 return klass.generate_svg(svg_type=svg_type)
1283 return klass.generate_svg(svg_type=svg_type)
1284
1284
1285
1285
1286 def gravatar_url(email_address, size=30, request=None):
1286 def gravatar_url(email_address, size=30, request=None):
1287 request = get_current_request()
1287 request = get_current_request()
1288 _use_gravatar = request.call_context.visual.use_gravatar
1288 _use_gravatar = request.call_context.visual.use_gravatar
1289 _gravatar_url = request.call_context.visual.gravatar_url
1289 _gravatar_url = request.call_context.visual.gravatar_url
1290
1290
1291 _gravatar_url = _gravatar_url or User.DEFAULT_GRAVATAR_URL
1291 _gravatar_url = _gravatar_url or User.DEFAULT_GRAVATAR_URL
1292
1292
1293 email_address = email_address or User.DEFAULT_USER_EMAIL
1293 email_address = email_address or User.DEFAULT_USER_EMAIL
1294 if isinstance(email_address, unicode):
1294 if isinstance(email_address, unicode):
1295 # hashlib crashes on unicode items
1295 # hashlib crashes on unicode items
1296 email_address = safe_str(email_address)
1296 email_address = safe_str(email_address)
1297
1297
1298 # empty email or default user
1298 # empty email or default user
1299 if not email_address or email_address == User.DEFAULT_USER_EMAIL:
1299 if not email_address or email_address == User.DEFAULT_USER_EMAIL:
1300 return initials_gravatar(User.DEFAULT_USER_EMAIL, '', '', size=size)
1300 return initials_gravatar(User.DEFAULT_USER_EMAIL, '', '', size=size)
1301
1301
1302 if _use_gravatar:
1302 if _use_gravatar:
1303 # TODO: Disuse pyramid thread locals. Think about another solution to
1303 # TODO: Disuse pyramid thread locals. Think about another solution to
1304 # get the host and schema here.
1304 # get the host and schema here.
1305 request = get_current_request()
1305 request = get_current_request()
1306 tmpl = safe_str(_gravatar_url)
1306 tmpl = safe_str(_gravatar_url)
1307 tmpl = tmpl.replace('{email}', email_address)\
1307 tmpl = tmpl.replace('{email}', email_address)\
1308 .replace('{md5email}', md5_safe(email_address.lower())) \
1308 .replace('{md5email}', md5_safe(email_address.lower())) \
1309 .replace('{netloc}', request.host)\
1309 .replace('{netloc}', request.host)\
1310 .replace('{scheme}', request.scheme)\
1310 .replace('{scheme}', request.scheme)\
1311 .replace('{size}', safe_str(size))
1311 .replace('{size}', safe_str(size))
1312 return tmpl
1312 return tmpl
1313 else:
1313 else:
1314 return initials_gravatar(email_address, '', '', size=size)
1314 return initials_gravatar(email_address, '', '', size=size)
1315
1315
1316
1316
1317 def breadcrumb_repo_link(repo):
1317 def breadcrumb_repo_link(repo):
1318 """
1318 """
1319 Makes a breadcrumbs path link to repo
1319 Makes a breadcrumbs path link to repo
1320
1320
1321 ex::
1321 ex::
1322 group >> subgroup >> repo
1322 group >> subgroup >> repo
1323
1323
1324 :param repo: a Repository instance
1324 :param repo: a Repository instance
1325 """
1325 """
1326
1326
1327 path = [
1327 path = [
1328 link_to(group.name, route_path('repo_group_home', repo_group_name=group.group_name),
1328 link_to(group.name, route_path('repo_group_home', repo_group_name=group.group_name),
1329 title='last change:{}'.format(format_date(group.last_commit_change)))
1329 title='last change:{}'.format(format_date(group.last_commit_change)))
1330 for group in repo.groups_with_parents
1330 for group in repo.groups_with_parents
1331 ] + [
1331 ] + [
1332 link_to(repo.just_name, route_path('repo_summary', repo_name=repo.repo_name),
1332 link_to(repo.just_name, route_path('repo_summary', repo_name=repo.repo_name),
1333 title='last change:{}'.format(format_date(repo.last_commit_change)))
1333 title='last change:{}'.format(format_date(repo.last_commit_change)))
1334 ]
1334 ]
1335
1335
1336 return literal(' &raquo; '.join(path))
1336 return literal(' &raquo; '.join(path))
1337
1337
1338
1338
1339 def breadcrumb_repo_group_link(repo_group):
1339 def breadcrumb_repo_group_link(repo_group):
1340 """
1340 """
1341 Makes a breadcrumbs path link to repo
1341 Makes a breadcrumbs path link to repo
1342
1342
1343 ex::
1343 ex::
1344 group >> subgroup
1344 group >> subgroup
1345
1345
1346 :param repo_group: a Repository Group instance
1346 :param repo_group: a Repository Group instance
1347 """
1347 """
1348
1348
1349 path = [
1349 path = [
1350 link_to(group.name,
1350 link_to(group.name,
1351 route_path('repo_group_home', repo_group_name=group.group_name),
1351 route_path('repo_group_home', repo_group_name=group.group_name),
1352 title='last change:{}'.format(format_date(group.last_commit_change)))
1352 title='last change:{}'.format(format_date(group.last_commit_change)))
1353 for group in repo_group.parents
1353 for group in repo_group.parents
1354 ] + [
1354 ] + [
1355 link_to(repo_group.name,
1355 link_to(repo_group.name,
1356 route_path('repo_group_home', repo_group_name=repo_group.group_name),
1356 route_path('repo_group_home', repo_group_name=repo_group.group_name),
1357 title='last change:{}'.format(format_date(repo_group.last_commit_change)))
1357 title='last change:{}'.format(format_date(repo_group.last_commit_change)))
1358 ]
1358 ]
1359
1359
1360 return literal(' &raquo; '.join(path))
1360 return literal(' &raquo; '.join(path))
1361
1361
1362
1362
1363 def format_byte_size_binary(file_size):
1363 def format_byte_size_binary(file_size):
1364 """
1364 """
1365 Formats file/folder sizes to standard.
1365 Formats file/folder sizes to standard.
1366 """
1366 """
1367 if file_size is None:
1367 if file_size is None:
1368 file_size = 0
1368 file_size = 0
1369
1369
1370 formatted_size = format_byte_size(file_size, binary=True)
1370 formatted_size = format_byte_size(file_size, binary=True)
1371 return formatted_size
1371 return formatted_size
1372
1372
1373
1373
1374 def urlify_text(text_, safe=True, **href_attrs):
1374 def urlify_text(text_, safe=True, **href_attrs):
1375 """
1375 """
1376 Extract urls from text and make html links out of them
1376 Extract urls from text and make html links out of them
1377 """
1377 """
1378
1378
1379 url_pat = re.compile(r'''(http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@#.&+]'''
1379 url_pat = re.compile(r'''(http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@#.&+]'''
1380 '''|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+)''')
1380 '''|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+)''')
1381
1381
1382 def url_func(match_obj):
1382 def url_func(match_obj):
1383 url_full = match_obj.groups()[0]
1383 url_full = match_obj.groups()[0]
1384 a_options = dict(href_attrs)
1384 a_options = dict(href_attrs)
1385 a_options['href'] = url_full
1385 a_options['href'] = url_full
1386 a_text = url_full
1386 a_text = url_full
1387 return HTML.tag("a", a_text, **a_options)
1387 return HTML.tag("a", a_text, **a_options)
1388
1388
1389 _new_text = url_pat.sub(url_func, text_)
1389 _new_text = url_pat.sub(url_func, text_)
1390
1390
1391 if safe:
1391 if safe:
1392 return literal(_new_text)
1392 return literal(_new_text)
1393 return _new_text
1393 return _new_text
1394
1394
1395
1395
1396 def urlify_commits(text_, repo_name):
1396 def urlify_commits(text_, repo_name):
1397 """
1397 """
1398 Extract commit ids from text and make link from them
1398 Extract commit ids from text and make link from them
1399
1399
1400 :param text_:
1400 :param text_:
1401 :param repo_name: repo name to build the URL with
1401 :param repo_name: repo name to build the URL with
1402 """
1402 """
1403
1403
1404 url_pat = re.compile(r'(^|\s)([0-9a-fA-F]{12,40})($|\s)')
1404 url_pat = re.compile(r'(^|\s)([0-9a-fA-F]{12,40})($|\s)')
1405
1405
1406 def url_func(match_obj):
1406 def url_func(match_obj):
1407 commit_id = match_obj.groups()[1]
1407 commit_id = match_obj.groups()[1]
1408 pref = match_obj.groups()[0]
1408 pref = match_obj.groups()[0]
1409 suf = match_obj.groups()[2]
1409 suf = match_obj.groups()[2]
1410
1410
1411 tmpl = (
1411 tmpl = (
1412 '%(pref)s<a class="tooltip-hovercard %(cls)s" href="%(url)s" data-hovercard-alt="%(hovercard_alt)s" data-hovercard-url="%(hovercard_url)s">'
1412 '%(pref)s<a class="tooltip-hovercard %(cls)s" href="%(url)s" data-hovercard-alt="%(hovercard_alt)s" data-hovercard-url="%(hovercard_url)s">'
1413 '%(commit_id)s</a>%(suf)s'
1413 '%(commit_id)s</a>%(suf)s'
1414 )
1414 )
1415 return tmpl % {
1415 return tmpl % {
1416 'pref': pref,
1416 'pref': pref,
1417 'cls': 'revision-link',
1417 'cls': 'revision-link',
1418 'url': route_url(
1418 'url': route_url(
1419 'repo_commit', repo_name=repo_name, commit_id=commit_id),
1419 'repo_commit', repo_name=repo_name, commit_id=commit_id),
1420 'commit_id': commit_id,
1420 'commit_id': commit_id,
1421 'suf': suf,
1421 'suf': suf,
1422 'hovercard_alt': 'Commit: {}'.format(commit_id),
1422 'hovercard_alt': 'Commit: {}'.format(commit_id),
1423 'hovercard_url': route_url(
1423 'hovercard_url': route_url(
1424 'hovercard_repo_commit', repo_name=repo_name, commit_id=commit_id)
1424 'hovercard_repo_commit', repo_name=repo_name, commit_id=commit_id)
1425 }
1425 }
1426
1426
1427 new_text = url_pat.sub(url_func, text_)
1427 new_text = url_pat.sub(url_func, text_)
1428
1428
1429 return new_text
1429 return new_text
1430
1430
1431
1431
1432 def _process_url_func(match_obj, repo_name, uid, entry,
1432 def _process_url_func(match_obj, repo_name, uid, entry,
1433 return_raw_data=False, link_format='html'):
1433 return_raw_data=False, link_format='html'):
1434 pref = ''
1434 pref = ''
1435 if match_obj.group().startswith(' '):
1435 if match_obj.group().startswith(' '):
1436 pref = ' '
1436 pref = ' '
1437
1437
1438 issue_id = ''.join(match_obj.groups())
1438 issue_id = ''.join(match_obj.groups())
1439
1439
1440 if link_format == 'html':
1440 if link_format == 'html':
1441 tmpl = (
1441 tmpl = (
1442 '%(pref)s<a class="tooltip %(cls)s" href="%(url)s" title="%(title)s">'
1442 '%(pref)s<a class="tooltip %(cls)s" href="%(url)s" title="%(title)s">'
1443 '%(issue-prefix)s%(id-repr)s'
1443 '%(issue-prefix)s%(id-repr)s'
1444 '</a>')
1444 '</a>')
1445 elif link_format == 'html+hovercard':
1445 elif link_format == 'html+hovercard':
1446 tmpl = (
1446 tmpl = (
1447 '%(pref)s<a class="tooltip-hovercard %(cls)s" href="%(url)s" data-hovercard-url="%(hovercard_url)s">'
1447 '%(pref)s<a class="tooltip-hovercard %(cls)s" href="%(url)s" data-hovercard-url="%(hovercard_url)s">'
1448 '%(issue-prefix)s%(id-repr)s'
1448 '%(issue-prefix)s%(id-repr)s'
1449 '</a>')
1449 '</a>')
1450 elif link_format in ['rst', 'rst+hovercard']:
1450 elif link_format in ['rst', 'rst+hovercard']:
1451 tmpl = '`%(issue-prefix)s%(id-repr)s <%(url)s>`_'
1451 tmpl = '`%(issue-prefix)s%(id-repr)s <%(url)s>`_'
1452 elif link_format in ['markdown', 'markdown+hovercard']:
1452 elif link_format in ['markdown', 'markdown+hovercard']:
1453 tmpl = '[%(pref)s%(issue-prefix)s%(id-repr)s](%(url)s)'
1453 tmpl = '[%(pref)s%(issue-prefix)s%(id-repr)s](%(url)s)'
1454 else:
1454 else:
1455 raise ValueError('Bad link_format:{}'.format(link_format))
1455 raise ValueError('Bad link_format:{}'.format(link_format))
1456
1456
1457 (repo_name_cleaned,
1457 (repo_name_cleaned,
1458 parent_group_name) = RepoGroupModel()._get_group_name_and_parent(repo_name)
1458 parent_group_name) = RepoGroupModel()._get_group_name_and_parent(repo_name)
1459
1459
1460 # variables replacement
1460 # variables replacement
1461 named_vars = {
1461 named_vars = {
1462 'id': issue_id,
1462 'id': issue_id,
1463 'repo': repo_name,
1463 'repo': repo_name,
1464 'repo_name': repo_name_cleaned,
1464 'repo_name': repo_name_cleaned,
1465 'group_name': parent_group_name,
1465 'group_name': parent_group_name,
1466 # set dummy keys so we always have them
1466 # set dummy keys so we always have them
1467 'hostname': '',
1467 'hostname': '',
1468 'netloc': '',
1468 'netloc': '',
1469 'scheme': ''
1469 'scheme': ''
1470 }
1470 }
1471
1471
1472 request = get_current_request()
1472 request = get_current_request()
1473 if request:
1473 if request:
1474 # exposes, hostname, netloc, scheme
1474 # exposes, hostname, netloc, scheme
1475 host_data = get_host_info(request)
1475 host_data = get_host_info(request)
1476 named_vars.update(host_data)
1476 named_vars.update(host_data)
1477
1477
1478 # named regex variables
1478 # named regex variables
1479 named_vars.update(match_obj.groupdict())
1479 named_vars.update(match_obj.groupdict())
1480 _url = string.Template(entry['url']).safe_substitute(**named_vars)
1480 _url = string.Template(entry['url']).safe_substitute(**named_vars)
1481 desc = string.Template(entry['desc']).safe_substitute(**named_vars)
1481 desc = string.Template(entry['desc']).safe_substitute(**named_vars)
1482 hovercard_url = string.Template(entry.get('hovercard_url', '')).safe_substitute(**named_vars)
1482 hovercard_url = string.Template(entry.get('hovercard_url', '')).safe_substitute(**named_vars)
1483
1483
1484 def quote_cleaner(input_str):
1484 def quote_cleaner(input_str):
1485 """Remove quotes as it's HTML"""
1485 """Remove quotes as it's HTML"""
1486 return input_str.replace('"', '')
1486 return input_str.replace('"', '')
1487
1487
1488 data = {
1488 data = {
1489 'pref': pref,
1489 'pref': pref,
1490 'cls': quote_cleaner('issue-tracker-link'),
1490 'cls': quote_cleaner('issue-tracker-link'),
1491 'url': quote_cleaner(_url),
1491 'url': quote_cleaner(_url),
1492 'id-repr': issue_id,
1492 'id-repr': issue_id,
1493 'issue-prefix': entry['pref'],
1493 'issue-prefix': entry['pref'],
1494 'serv': entry['url'],
1494 'serv': entry['url'],
1495 'title': desc,
1495 'title': desc,
1496 'hovercard_url': hovercard_url
1496 'hovercard_url': hovercard_url
1497 }
1497 }
1498
1498
1499 if return_raw_data:
1499 if return_raw_data:
1500 return {
1500 return {
1501 'id': issue_id,
1501 'id': issue_id,
1502 'url': _url
1502 'url': _url
1503 }
1503 }
1504 return tmpl % data
1504 return tmpl % data
1505
1505
1506
1506
1507 def get_active_pattern_entries(repo_name):
1507 def get_active_pattern_entries(repo_name):
1508 repo = None
1508 repo = None
1509 if repo_name:
1509 if repo_name:
1510 # Retrieving repo_name to avoid invalid repo_name to explode on
1510 # Retrieving repo_name to avoid invalid repo_name to explode on
1511 # IssueTrackerSettingsModel but still passing invalid name further down
1511 # IssueTrackerSettingsModel but still passing invalid name further down
1512 repo = Repository.get_by_repo_name(repo_name, cache=True)
1512 repo = Repository.get_by_repo_name(repo_name, cache=True)
1513
1513
1514 settings_model = IssueTrackerSettingsModel(repo=repo)
1514 settings_model = IssueTrackerSettingsModel(repo=repo)
1515 active_entries = settings_model.get_settings(cache=True)
1515 active_entries = settings_model.get_settings(cache=True)
1516 return active_entries
1516 return active_entries
1517
1517
1518
1518
1519 pr_pattern_re = re.compile(r'(?:(?:^!)|(?: !))(\d+)')
1519 pr_pattern_re = re.compile(r'(?:(?:^!)|(?: !))(\d+)')
1520
1520
1521
1521
1522 def process_patterns(text_string, repo_name, link_format='html', active_entries=None):
1522 def process_patterns(text_string, repo_name, link_format='html', active_entries=None):
1523
1523
1524 allowed_formats = ['html', 'rst', 'markdown',
1524 allowed_formats = ['html', 'rst', 'markdown',
1525 'html+hovercard', 'rst+hovercard', 'markdown+hovercard']
1525 'html+hovercard', 'rst+hovercard', 'markdown+hovercard']
1526 if link_format not in allowed_formats:
1526 if link_format not in allowed_formats:
1527 raise ValueError('Link format can be only one of:{} got {}'.format(
1527 raise ValueError('Link format can be only one of:{} got {}'.format(
1528 allowed_formats, link_format))
1528 allowed_formats, link_format))
1529
1529
1530 if active_entries is None:
1530 if active_entries is None:
1531 log.debug('Fetch active patterns for repo: %s', repo_name)
1531 log.debug('Fetch active patterns for repo: %s', repo_name)
1532 active_entries = get_active_pattern_entries(repo_name)
1532 active_entries = get_active_pattern_entries(repo_name)
1533
1533
1534 issues_data = []
1534 issues_data = []
1535 new_text = text_string
1535 new_text = text_string
1536
1536
1537 log.debug('Got %s entries to process', len(active_entries))
1537 log.debug('Got %s entries to process', len(active_entries))
1538 for uid, entry in active_entries.items():
1538 for uid, entry in active_entries.items():
1539 log.debug('found issue tracker entry with uid %s', uid)
1539 log.debug('found issue tracker entry with uid %s', uid)
1540
1540
1541 if not (entry['pat'] and entry['url']):
1541 if not (entry['pat'] and entry['url']):
1542 log.debug('skipping due to missing data')
1542 log.debug('skipping due to missing data')
1543 continue
1543 continue
1544
1544
1545 log.debug('issue tracker entry: uid: `%s` PAT:%s URL:%s PREFIX:%s',
1545 log.debug('issue tracker entry: uid: `%s` PAT:%s URL:%s PREFIX:%s',
1546 uid, entry['pat'], entry['url'], entry['pref'])
1546 uid, entry['pat'], entry['url'], entry['pref'])
1547
1547
1548 if entry.get('pat_compiled'):
1548 if entry.get('pat_compiled'):
1549 pattern = entry['pat_compiled']
1549 pattern = entry['pat_compiled']
1550 else:
1550 else:
1551 try:
1551 try:
1552 pattern = re.compile(r'%s' % entry['pat'])
1552 pattern = re.compile(r'%s' % entry['pat'])
1553 except re.error:
1553 except re.error:
1554 log.exception('issue tracker pattern: `%s` failed to compile', entry['pat'])
1554 log.exception('issue tracker pattern: `%s` failed to compile', entry['pat'])
1555 continue
1555 continue
1556
1556
1557 data_func = partial(
1557 data_func = partial(
1558 _process_url_func, repo_name=repo_name, entry=entry, uid=uid,
1558 _process_url_func, repo_name=repo_name, entry=entry, uid=uid,
1559 return_raw_data=True)
1559 return_raw_data=True)
1560
1560
1561 for match_obj in pattern.finditer(text_string):
1561 for match_obj in pattern.finditer(text_string):
1562 issues_data.append(data_func(match_obj))
1562 issues_data.append(data_func(match_obj))
1563
1563
1564 url_func = partial(
1564 url_func = partial(
1565 _process_url_func, repo_name=repo_name, entry=entry, uid=uid,
1565 _process_url_func, repo_name=repo_name, entry=entry, uid=uid,
1566 link_format=link_format)
1566 link_format=link_format)
1567
1567
1568 new_text = pattern.sub(url_func, new_text)
1568 new_text = pattern.sub(url_func, new_text)
1569 log.debug('processed prefix:uid `%s`', uid)
1569 log.debug('processed prefix:uid `%s`', uid)
1570
1570
1571 # finally use global replace, eg !123 -> pr-link, those will not catch
1571 # finally use global replace, eg !123 -> pr-link, those will not catch
1572 # if already similar pattern exists
1572 # if already similar pattern exists
1573 server_url = '${scheme}://${netloc}'
1573 server_url = '${scheme}://${netloc}'
1574 pr_entry = {
1574 pr_entry = {
1575 'pref': '!',
1575 'pref': '!',
1576 'url': server_url + '/_admin/pull-requests/${id}',
1576 'url': server_url + '/_admin/pull-requests/${id}',
1577 'desc': 'Pull Request !${id}',
1577 'desc': 'Pull Request !${id}',
1578 'hovercard_url': server_url + '/_hovercard/pull_request/${id}'
1578 'hovercard_url': server_url + '/_hovercard/pull_request/${id}'
1579 }
1579 }
1580 pr_url_func = partial(
1580 pr_url_func = partial(
1581 _process_url_func, repo_name=repo_name, entry=pr_entry, uid=None,
1581 _process_url_func, repo_name=repo_name, entry=pr_entry, uid=None,
1582 link_format=link_format+'+hovercard')
1582 link_format=link_format+'+hovercard')
1583 new_text = pr_pattern_re.sub(pr_url_func, new_text)
1583 new_text = pr_pattern_re.sub(pr_url_func, new_text)
1584 log.debug('processed !pr pattern')
1584 log.debug('processed !pr pattern')
1585
1585
1586 return new_text, issues_data
1586 return new_text, issues_data
1587
1587
1588
1588
1589 def urlify_commit_message(commit_text, repository=None, active_pattern_entries=None):
1589 def urlify_commit_message(commit_text, repository=None, active_pattern_entries=None):
1590 """
1590 """
1591 Parses given text message and makes proper links.
1591 Parses given text message and makes proper links.
1592 issues are linked to given issue-server, and rest is a commit link
1592 issues are linked to given issue-server, and rest is a commit link
1593 """
1593 """
1594
1594
1595 def escaper(_text):
1595 def escaper(_text):
1596 return _text.replace('<', '&lt;').replace('>', '&gt;')
1596 return _text.replace('<', '&lt;').replace('>', '&gt;')
1597
1597
1598 new_text = escaper(commit_text)
1598 new_text = escaper(commit_text)
1599
1599
1600 # extract http/https links and make them real urls
1600 # extract http/https links and make them real urls
1601 new_text = urlify_text(new_text, safe=False)
1601 new_text = urlify_text(new_text, safe=False)
1602
1602
1603 # urlify commits - extract commit ids and make link out of them, if we have
1603 # urlify commits - extract commit ids and make link out of them, if we have
1604 # the scope of repository present.
1604 # the scope of repository present.
1605 if repository:
1605 if repository:
1606 new_text = urlify_commits(new_text, repository)
1606 new_text = urlify_commits(new_text, repository)
1607
1607
1608 # process issue tracker patterns
1608 # process issue tracker patterns
1609 new_text, issues = process_patterns(new_text, repository or '',
1609 new_text, issues = process_patterns(new_text, repository or '',
1610 active_entries=active_pattern_entries)
1610 active_entries=active_pattern_entries)
1611
1611
1612 return literal(new_text)
1612 return literal(new_text)
1613
1613
1614
1614
1615 def render_binary(repo_name, file_obj):
1615 def render_binary(repo_name, file_obj):
1616 """
1616 """
1617 Choose how to render a binary file
1617 Choose how to render a binary file
1618 """
1618 """
1619
1619
1620 filename = file_obj.name
1620 filename = file_obj.name
1621
1621
1622 # images
1622 # images
1623 for ext in ['*.png', '*.jpg', '*.ico', '*.gif']:
1623 for ext in ['*.png', '*.jpg', '*.ico', '*.gif']:
1624 if fnmatch.fnmatch(filename, pat=ext):
1624 if fnmatch.fnmatch(filename, pat=ext):
1625 alt = escape(filename)
1625 alt = escape(filename)
1626 src = route_path(
1626 src = route_path(
1627 'repo_file_raw', repo_name=repo_name,
1627 'repo_file_raw', repo_name=repo_name,
1628 commit_id=file_obj.commit.raw_id,
1628 commit_id=file_obj.commit.raw_id,
1629 f_path=file_obj.path)
1629 f_path=file_obj.path)
1630 return literal(
1630 return literal(
1631 '<img class="rendered-binary" alt="{}" src="{}">'.format(alt, src))
1631 '<img class="rendered-binary" alt="{}" src="{}">'.format(alt, src))
1632
1632
1633
1633
1634 def renderer_from_filename(filename, exclude=None):
1634 def renderer_from_filename(filename, exclude=None):
1635 """
1635 """
1636 choose a renderer based on filename, this works only for text based files
1636 choose a renderer based on filename, this works only for text based files
1637 """
1637 """
1638
1638
1639 # ipython
1639 # ipython
1640 for ext in ['*.ipynb']:
1640 for ext in ['*.ipynb']:
1641 if fnmatch.fnmatch(filename, pat=ext):
1641 if fnmatch.fnmatch(filename, pat=ext):
1642 return 'jupyter'
1642 return 'jupyter'
1643
1643
1644 is_markup = MarkupRenderer.renderer_from_filename(filename, exclude=exclude)
1644 is_markup = MarkupRenderer.renderer_from_filename(filename, exclude=exclude)
1645 if is_markup:
1645 if is_markup:
1646 return is_markup
1646 return is_markup
1647 return None
1647 return None
1648
1648
1649
1649
1650 def render(source, renderer='rst', mentions=False, relative_urls=None,
1650 def render(source, renderer='rst', mentions=False, relative_urls=None,
1651 repo_name=None, active_pattern_entries=None):
1651 repo_name=None, active_pattern_entries=None):
1652
1652
1653 def maybe_convert_relative_links(html_source):
1653 def maybe_convert_relative_links(html_source):
1654 if relative_urls:
1654 if relative_urls:
1655 return relative_links(html_source, relative_urls)
1655 return relative_links(html_source, relative_urls)
1656 return html_source
1656 return html_source
1657
1657
1658 if renderer == 'plain':
1658 if renderer == 'plain':
1659 return literal(
1659 return literal(
1660 MarkupRenderer.plain(source, leading_newline=False))
1660 MarkupRenderer.plain(source, leading_newline=False))
1661
1661
1662 elif renderer == 'rst':
1662 elif renderer == 'rst':
1663 if repo_name:
1663 if repo_name:
1664 # process patterns on comments if we pass in repo name
1664 # process patterns on comments if we pass in repo name
1665 source, issues = process_patterns(
1665 source, issues = process_patterns(
1666 source, repo_name, link_format='rst',
1666 source, repo_name, link_format='rst',
1667 active_entries=active_pattern_entries)
1667 active_entries=active_pattern_entries)
1668
1668
1669 return literal(
1669 return literal(
1670 '<div class="rst-block">%s</div>' %
1670 '<div class="rst-block">%s</div>' %
1671 maybe_convert_relative_links(
1671 maybe_convert_relative_links(
1672 MarkupRenderer.rst(source, mentions=mentions)))
1672 MarkupRenderer.rst(source, mentions=mentions)))
1673
1673
1674 elif renderer == 'markdown':
1674 elif renderer == 'markdown':
1675 if repo_name:
1675 if repo_name:
1676 # process patterns on comments if we pass in repo name
1676 # process patterns on comments if we pass in repo name
1677 source, issues = process_patterns(
1677 source, issues = process_patterns(
1678 source, repo_name, link_format='markdown',
1678 source, repo_name, link_format='markdown',
1679 active_entries=active_pattern_entries)
1679 active_entries=active_pattern_entries)
1680
1680
1681 return literal(
1681 return literal(
1682 '<div class="markdown-block">%s</div>' %
1682 '<div class="markdown-block">%s</div>' %
1683 maybe_convert_relative_links(
1683 maybe_convert_relative_links(
1684 MarkupRenderer.markdown(source, flavored=True,
1684 MarkupRenderer.markdown(source, flavored=True,
1685 mentions=mentions)))
1685 mentions=mentions)))
1686
1686
1687 elif renderer == 'jupyter':
1687 elif renderer == 'jupyter':
1688 return literal(
1688 return literal(
1689 '<div class="ipynb">%s</div>' %
1689 '<div class="ipynb">%s</div>' %
1690 maybe_convert_relative_links(
1690 maybe_convert_relative_links(
1691 MarkupRenderer.jupyter(source)))
1691 MarkupRenderer.jupyter(source)))
1692
1692
1693 # None means just show the file-source
1693 # None means just show the file-source
1694 return None
1694 return None
1695
1695
1696
1696
1697 def commit_status(repo, commit_id):
1697 def commit_status(repo, commit_id):
1698 return ChangesetStatusModel().get_status(repo, commit_id)
1698 return ChangesetStatusModel().get_status(repo, commit_id)
1699
1699
1700
1700
1701 def commit_status_lbl(commit_status):
1701 def commit_status_lbl(commit_status):
1702 return dict(ChangesetStatus.STATUSES).get(commit_status)
1702 return dict(ChangesetStatus.STATUSES).get(commit_status)
1703
1703
1704
1704
1705 def commit_time(repo_name, commit_id):
1705 def commit_time(repo_name, commit_id):
1706 repo = Repository.get_by_repo_name(repo_name)
1706 repo = Repository.get_by_repo_name(repo_name)
1707 commit = repo.get_commit(commit_id=commit_id)
1707 commit = repo.get_commit(commit_id=commit_id)
1708 return commit.date
1708 return commit.date
1709
1709
1710
1710
1711 def get_permission_name(key):
1711 def get_permission_name(key):
1712 return dict(Permission.PERMS).get(key)
1712 return dict(Permission.PERMS).get(key)
1713
1713
1714
1714
1715 def journal_filter_help(request):
1715 def journal_filter_help(request):
1716 _ = request.translate
1716 _ = request.translate
1717 from rhodecode.lib.audit_logger import ACTIONS
1717 from rhodecode.lib.audit_logger import ACTIONS
1718 actions = '\n'.join(textwrap.wrap(', '.join(sorted(ACTIONS.keys())), 80))
1718 actions = '\n'.join(textwrap.wrap(', '.join(sorted(ACTIONS.keys())), 80))
1719
1719
1720 return _(
1720 return _(
1721 'Example filter terms:\n' +
1721 'Example filter terms:\n' +
1722 ' repository:vcs\n' +
1722 ' repository:vcs\n' +
1723 ' username:marcin\n' +
1723 ' username:marcin\n' +
1724 ' username:(NOT marcin)\n' +
1724 ' username:(NOT marcin)\n' +
1725 ' action:*push*\n' +
1725 ' action:*push*\n' +
1726 ' ip:127.0.0.1\n' +
1726 ' ip:127.0.0.1\n' +
1727 ' date:20120101\n' +
1727 ' date:20120101\n' +
1728 ' date:[20120101100000 TO 20120102]\n' +
1728 ' date:[20120101100000 TO 20120102]\n' +
1729 '\n' +
1729 '\n' +
1730 'Actions: {actions}\n' +
1730 'Actions: {actions}\n' +
1731 '\n' +
1731 '\n' +
1732 'Generate wildcards using \'*\' character:\n' +
1732 'Generate wildcards using \'*\' character:\n' +
1733 ' "repository:vcs*" - search everything starting with \'vcs\'\n' +
1733 ' "repository:vcs*" - search everything starting with \'vcs\'\n' +
1734 ' "repository:*vcs*" - search for repository containing \'vcs\'\n' +
1734 ' "repository:*vcs*" - search for repository containing \'vcs\'\n' +
1735 '\n' +
1735 '\n' +
1736 'Optional AND / OR operators in queries\n' +
1736 'Optional AND / OR operators in queries\n' +
1737 ' "repository:vcs OR repository:test"\n' +
1737 ' "repository:vcs OR repository:test"\n' +
1738 ' "username:test AND repository:test*"\n'
1738 ' "username:test AND repository:test*"\n'
1739 ).format(actions=actions)
1739 ).format(actions=actions)
1740
1740
1741
1741
1742 def not_mapped_error(repo_name):
1742 def not_mapped_error(repo_name):
1743 from rhodecode.translation import _
1743 from rhodecode.translation import _
1744 flash(_('%s repository is not mapped to db perhaps'
1744 flash(_('%s repository is not mapped to db perhaps'
1745 ' it was created or renamed from the filesystem'
1745 ' it was created or renamed from the filesystem'
1746 ' please run the application again'
1746 ' please run the application again'
1747 ' in order to rescan repositories') % repo_name, category='error')
1747 ' in order to rescan repositories') % repo_name, category='error')
1748
1748
1749
1749
1750 def ip_range(ip_addr):
1750 def ip_range(ip_addr):
1751 from rhodecode.model.db import UserIpMap
1751 from rhodecode.model.db import UserIpMap
1752 s, e = UserIpMap._get_ip_range(ip_addr)
1752 s, e = UserIpMap._get_ip_range(ip_addr)
1753 return '%s - %s' % (s, e)
1753 return '%s - %s' % (s, e)
1754
1754
1755
1755
1756 def form(url, method='post', needs_csrf_token=True, **attrs):
1756 def form(url, method='post', needs_csrf_token=True, **attrs):
1757 """Wrapper around webhelpers.tags.form to prevent CSRF attacks."""
1757 """Wrapper around webhelpers.tags.form to prevent CSRF attacks."""
1758 if method.lower() != 'get' and needs_csrf_token:
1758 if method.lower() != 'get' and needs_csrf_token:
1759 raise Exception(
1759 raise Exception(
1760 'Forms to POST/PUT/DELETE endpoints should have (in general) a ' +
1760 'Forms to POST/PUT/DELETE endpoints should have (in general) a ' +
1761 'CSRF token. If the endpoint does not require such token you can ' +
1761 'CSRF token. If the endpoint does not require such token you can ' +
1762 'explicitly set the parameter needs_csrf_token to false.')
1762 'explicitly set the parameter needs_csrf_token to false.')
1763
1763
1764 return insecure_form(url, method=method, **attrs)
1764 return insecure_form(url, method=method, **attrs)
1765
1765
1766
1766
1767 def secure_form(form_url, method="POST", multipart=False, **attrs):
1767 def secure_form(form_url, method="POST", multipart=False, **attrs):
1768 """Start a form tag that points the action to an url. This
1768 """Start a form tag that points the action to an url. This
1769 form tag will also include the hidden field containing
1769 form tag will also include the hidden field containing
1770 the auth token.
1770 the auth token.
1771
1771
1772 The url options should be given either as a string, or as a
1772 The url options should be given either as a string, or as a
1773 ``url()`` function. The method for the form defaults to POST.
1773 ``url()`` function. The method for the form defaults to POST.
1774
1774
1775 Options:
1775 Options:
1776
1776
1777 ``multipart``
1777 ``multipart``
1778 If set to True, the enctype is set to "multipart/form-data".
1778 If set to True, the enctype is set to "multipart/form-data".
1779 ``method``
1779 ``method``
1780 The method to use when submitting the form, usually either
1780 The method to use when submitting the form, usually either
1781 "GET" or "POST". If "PUT", "DELETE", or another verb is used, a
1781 "GET" or "POST". If "PUT", "DELETE", or another verb is used, a
1782 hidden input with name _method is added to simulate the verb
1782 hidden input with name _method is added to simulate the verb
1783 over POST.
1783 over POST.
1784
1784
1785 """
1785 """
1786
1786
1787 if 'request' in attrs:
1787 if 'request' in attrs:
1788 session = attrs['request'].session
1788 session = attrs['request'].session
1789 del attrs['request']
1789 del attrs['request']
1790 else:
1790 else:
1791 raise ValueError(
1791 raise ValueError(
1792 'Calling this form requires request= to be passed as argument')
1792 'Calling this form requires request= to be passed as argument')
1793
1793
1794 _form = insecure_form(form_url, method, multipart, **attrs)
1794 _form = insecure_form(form_url, method, multipart, **attrs)
1795 token = literal(
1795 token = literal(
1796 '<input type="hidden" name="{}" value="{}">'.format(
1796 '<input type="hidden" name="{}" value="{}">'.format(
1797 csrf_token_key, get_csrf_token(session)))
1797 csrf_token_key, get_csrf_token(session)))
1798
1798
1799 return literal("%s\n%s" % (_form, token))
1799 return literal("%s\n%s" % (_form, token))
1800
1800
1801
1801
1802 def dropdownmenu(name, selected, options, enable_filter=False, **attrs):
1802 def dropdownmenu(name, selected, options, enable_filter=False, **attrs):
1803 select_html = select(name, selected, options, **attrs)
1803 select_html = select(name, selected, options, **attrs)
1804
1804
1805 select2 = """
1805 select2 = """
1806 <script>
1806 <script>
1807 $(document).ready(function() {
1807 $(document).ready(function() {
1808 $('#%s').select2({
1808 $('#%s').select2({
1809 containerCssClass: 'drop-menu %s',
1809 containerCssClass: 'drop-menu %s',
1810 dropdownCssClass: 'drop-menu-dropdown',
1810 dropdownCssClass: 'drop-menu-dropdown',
1811 dropdownAutoWidth: true%s
1811 dropdownAutoWidth: true%s
1812 });
1812 });
1813 });
1813 });
1814 </script>
1814 </script>
1815 """
1815 """
1816
1816
1817 filter_option = """,
1817 filter_option = """,
1818 minimumResultsForSearch: -1
1818 minimumResultsForSearch: -1
1819 """
1819 """
1820 input_id = attrs.get('id') or name
1820 input_id = attrs.get('id') or name
1821 extra_classes = ' '.join(attrs.pop('extra_classes', []))
1821 extra_classes = ' '.join(attrs.pop('extra_classes', []))
1822 filter_enabled = "" if enable_filter else filter_option
1822 filter_enabled = "" if enable_filter else filter_option
1823 select_script = literal(select2 % (input_id, extra_classes, filter_enabled))
1823 select_script = literal(select2 % (input_id, extra_classes, filter_enabled))
1824
1824
1825 return literal(select_html+select_script)
1825 return literal(select_html+select_script)
1826
1826
1827
1827
1828 def get_visual_attr(tmpl_context_var, attr_name):
1828 def get_visual_attr(tmpl_context_var, attr_name):
1829 """
1829 """
1830 A safe way to get a variable from visual variable of template context
1830 A safe way to get a variable from visual variable of template context
1831
1831
1832 :param tmpl_context_var: instance of tmpl_context, usually present as `c`
1832 :param tmpl_context_var: instance of tmpl_context, usually present as `c`
1833 :param attr_name: name of the attribute we fetch from the c.visual
1833 :param attr_name: name of the attribute we fetch from the c.visual
1834 """
1834 """
1835 visual = getattr(tmpl_context_var, 'visual', None)
1835 visual = getattr(tmpl_context_var, 'visual', None)
1836 if not visual:
1836 if not visual:
1837 return
1837 return
1838 else:
1838 else:
1839 return getattr(visual, attr_name, None)
1839 return getattr(visual, attr_name, None)
1840
1840
1841
1841
1842 def get_last_path_part(file_node):
1842 def get_last_path_part(file_node):
1843 if not file_node.path:
1843 if not file_node.path:
1844 return u'/'
1844 return u'/'
1845
1845
1846 path = safe_unicode(file_node.path.split('/')[-1])
1846 path = safe_unicode(file_node.path.split('/')[-1])
1847 return u'../' + path
1847 return u'../' + path
1848
1848
1849
1849
1850 def route_url(*args, **kwargs):
1850 def route_url(*args, **kwargs):
1851 """
1851 """
1852 Wrapper around pyramids `route_url` (fully qualified url) function.
1852 Wrapper around pyramids `route_url` (fully qualified url) function.
1853 """
1853 """
1854 req = get_current_request()
1854 req = get_current_request()
1855 return req.route_url(*args, **kwargs)
1855 return req.route_url(*args, **kwargs)
1856
1856
1857
1857
1858 def route_path(*args, **kwargs):
1858 def route_path(*args, **kwargs):
1859 """
1859 """
1860 Wrapper around pyramids `route_path` function.
1860 Wrapper around pyramids `route_path` function.
1861 """
1861 """
1862 req = get_current_request()
1862 req = get_current_request()
1863 return req.route_path(*args, **kwargs)
1863 return req.route_path(*args, **kwargs)
1864
1864
1865
1865
1866 def route_path_or_none(*args, **kwargs):
1866 def route_path_or_none(*args, **kwargs):
1867 try:
1867 try:
1868 return route_path(*args, **kwargs)
1868 return route_path(*args, **kwargs)
1869 except KeyError:
1869 except KeyError:
1870 return None
1870 return None
1871
1871
1872
1872
1873 def current_route_path(request, **kw):
1873 def current_route_path(request, **kw):
1874 new_args = request.GET.mixed()
1874 new_args = request.GET.mixed()
1875 new_args.update(kw)
1875 new_args.update(kw)
1876 return request.current_route_path(_query=new_args)
1876 return request.current_route_path(_query=new_args)
1877
1877
1878
1878
1879 def curl_api_example(method, args):
1879 def curl_api_example(method, args):
1880 args_json = json.dumps(OrderedDict([
1880 args_json = json.dumps(OrderedDict([
1881 ('id', 1),
1881 ('id', 1),
1882 ('auth_token', 'SECRET'),
1882 ('auth_token', 'SECRET'),
1883 ('method', method),
1883 ('method', method),
1884 ('args', args)
1884 ('args', args)
1885 ]))
1885 ]))
1886
1886
1887 return "curl {api_url} -X POST -H 'content-type:text/plain' --data-binary '{args_json}'".format(
1887 return "curl {api_url} -X POST -H 'content-type:text/plain' --data-binary '{args_json}'".format(
1888 api_url=route_url('apiv2'),
1888 api_url=route_url('apiv2'),
1889 args_json=args_json
1889 args_json=args_json
1890 )
1890 )
1891
1891
1892
1892
1893 def api_call_example(method, args):
1893 def api_call_example(method, args):
1894 """
1894 """
1895 Generates an API call example via CURL
1895 Generates an API call example via CURL
1896 """
1896 """
1897 curl_call = curl_api_example(method, args)
1897 curl_call = curl_api_example(method, args)
1898
1898
1899 return literal(
1899 return literal(
1900 curl_call +
1900 curl_call +
1901 "<br/><br/>SECRET can be found in <a href=\"{token_url}\">auth-tokens</a> page, "
1901 "<br/><br/>SECRET can be found in <a href=\"{token_url}\">auth-tokens</a> page, "
1902 "and needs to be of `api calls` role."
1902 "and needs to be of `api calls` role."
1903 .format(token_url=route_url('my_account_auth_tokens')))
1903 .format(token_url=route_url('my_account_auth_tokens')))
1904
1904
1905
1905
1906 def notification_description(notification, request):
1906 def notification_description(notification, request):
1907 """
1907 """
1908 Generate notification human readable description based on notification type
1908 Generate notification human readable description based on notification type
1909 """
1909 """
1910 from rhodecode.model.notification import NotificationModel
1910 from rhodecode.model.notification import NotificationModel
1911 return NotificationModel().make_description(
1911 return NotificationModel().make_description(
1912 notification, translate=request.translate)
1912 notification, translate=request.translate)
1913
1913
1914
1914
1915 def go_import_header(request, db_repo=None):
1915 def go_import_header(request, db_repo=None):
1916 """
1916 """
1917 Creates a header for go-import functionality in Go Lang
1917 Creates a header for go-import functionality in Go Lang
1918 """
1918 """
1919
1919
1920 if not db_repo:
1920 if not db_repo:
1921 return
1921 return
1922 if 'go-get' not in request.GET:
1922 if 'go-get' not in request.GET:
1923 return
1923 return
1924
1924
1925 clone_url = db_repo.clone_url()
1925 clone_url = db_repo.clone_url()
1926 prefix = re.split(r'^https?:\/\/', clone_url)[-1]
1926 prefix = re.split(r'^https?:\/\/', clone_url)[-1]
1927 # we have a repo and go-get flag,
1927 # we have a repo and go-get flag,
1928 return literal('<meta name="go-import" content="{} {} {}">'.format(
1928 return literal('<meta name="go-import" content="{} {} {}">'.format(
1929 prefix, db_repo.repo_type, clone_url))
1929 prefix, db_repo.repo_type, clone_url))
1930
1930
1931
1931
1932 def reviewer_as_json(*args, **kwargs):
1932 def reviewer_as_json(*args, **kwargs):
1933 from rhodecode.apps.repository.utils import reviewer_as_json as _reviewer_as_json
1933 from rhodecode.apps.repository.utils import reviewer_as_json as _reviewer_as_json
1934 return _reviewer_as_json(*args, **kwargs)
1934 return _reviewer_as_json(*args, **kwargs)
1935
1935
1936
1936
1937 def get_repo_view_type(request):
1937 def get_repo_view_type(request):
1938 route_name = request.matched_route.name
1938 route_name = request.matched_route.name
1939 route_to_view_type = {
1939 route_to_view_type = {
1940 'repo_changelog': 'commits',
1940 'repo_changelog': 'commits',
1941 'repo_commits': 'commits',
1941 'repo_commits': 'commits',
1942 'repo_files': 'files',
1942 'repo_files': 'files',
1943 'repo_summary': 'summary',
1943 'repo_summary': 'summary',
1944 'repo_commit': 'commit'
1944 'repo_commit': 'commit'
1945 }
1945 }
1946
1946
1947 return route_to_view_type.get(route_name)
1947 return route_to_view_type.get(route_name)
1948
1948
1949
1949
1950 def is_active(menu_entry, selected):
1950 def is_active(menu_entry, selected):
1951 """
1951 """
1952 Returns active class for selecting menus in templates
1952 Returns active class for selecting menus in templates
1953 <li class=${h.is_active('settings', current_active)}></li>
1953 <li class=${h.is_active('settings', current_active)}></li>
1954 """
1954 """
1955 if not isinstance(menu_entry, list):
1955 if not isinstance(menu_entry, list):
1956 menu_entry = [menu_entry]
1956 menu_entry = [menu_entry]
1957
1957
1958 if selected in menu_entry:
1958 if selected in menu_entry:
1959 return "active"
1959 return "active"
@@ -1,1186 +1,1186 b''
1 <%namespace name="commentblock" file="/changeset/changeset_file_comment.mako"/>
1 <%namespace name="commentblock" file="/changeset/changeset_file_comment.mako"/>
2
2
3 <%def name="diff_line_anchor(commit, filename, line, type)"><%
3 <%def name="diff_line_anchor(commit, filename, line, type)"><%
4 return '%s_%s_%i' % (h.md5_safe(commit+filename), type, line)
4 return '%s_%s_%i' % (h.md5_safe(commit+filename), type, line)
5 %></%def>
5 %></%def>
6
6
7 <%def name="action_class(action)">
7 <%def name="action_class(action)">
8 <%
8 <%
9 return {
9 return {
10 '-': 'cb-deletion',
10 '-': 'cb-deletion',
11 '+': 'cb-addition',
11 '+': 'cb-addition',
12 ' ': 'cb-context',
12 ' ': 'cb-context',
13 }.get(action, 'cb-empty')
13 }.get(action, 'cb-empty')
14 %>
14 %>
15 </%def>
15 </%def>
16
16
17 <%def name="op_class(op_id)">
17 <%def name="op_class(op_id)">
18 <%
18 <%
19 return {
19 return {
20 DEL_FILENODE: 'deletion', # file deleted
20 DEL_FILENODE: 'deletion', # file deleted
21 BIN_FILENODE: 'warning' # binary diff hidden
21 BIN_FILENODE: 'warning' # binary diff hidden
22 }.get(op_id, 'addition')
22 }.get(op_id, 'addition')
23 %>
23 %>
24 </%def>
24 </%def>
25
25
26
26
27
27
28 <%def name="render_diffset(diffset, commit=None,
28 <%def name="render_diffset(diffset, commit=None,
29
29
30 # collapse all file diff entries when there are more than this amount of files in the diff
30 # collapse all file diff entries when there are more than this amount of files in the diff
31 collapse_when_files_over=20,
31 collapse_when_files_over=20,
32
32
33 # collapse lines in the diff when more than this amount of lines changed in the file diff
33 # collapse lines in the diff when more than this amount of lines changed in the file diff
34 lines_changed_limit=500,
34 lines_changed_limit=500,
35
35
36 # add a ruler at to the output
36 # add a ruler at to the output
37 ruler_at_chars=0,
37 ruler_at_chars=0,
38
38
39 # show inline comments
39 # show inline comments
40 use_comments=False,
40 use_comments=False,
41
41
42 # disable new comments
42 # disable new comments
43 disable_new_comments=False,
43 disable_new_comments=False,
44
44
45 # special file-comments that were deleted in previous versions
45 # special file-comments that were deleted in previous versions
46 # it's used for showing outdated comments for deleted files in a PR
46 # it's used for showing outdated comments for deleted files in a PR
47 deleted_files_comments=None,
47 deleted_files_comments=None,
48
48
49 # for cache purpose
49 # for cache purpose
50 inline_comments=None,
50 inline_comments=None,
51
51
52 # additional menu for PRs
52 # additional menu for PRs
53 pull_request_menu=None,
53 pull_request_menu=None,
54
54
55 # show/hide todo next to comments
55 # show/hide todo next to comments
56 show_todos=True,
56 show_todos=True,
57
57
58 )">
58 )">
59
59
60 <%
60 <%
61 diffset_container_id = h.md5(diffset.target_ref)
61 diffset_container_id = h.md5(diffset.target_ref)
62 collapse_all = len(diffset.files) > collapse_when_files_over
62 collapse_all = len(diffset.files) > collapse_when_files_over
63 active_pattern_entries = h.get_active_pattern_entries(getattr(c, 'repo_name', None))
63 active_pattern_entries = h.get_active_pattern_entries(getattr(c, 'repo_name', None))
64 %>
64 %>
65
65
66 %if use_comments:
66 %if use_comments:
67
67
68 ## Template for injecting comments
68 ## Template for injecting comments
69 <div id="cb-comments-inline-container-template" class="js-template">
69 <div id="cb-comments-inline-container-template" class="js-template">
70 ${inline_comments_container([])}
70 ${inline_comments_container([])}
71 </div>
71 </div>
72
72
73 <div class="js-template" id="cb-comment-inline-form-template">
73 <div class="js-template" id="cb-comment-inline-form-template">
74 <div class="comment-inline-form ac">
74 <div class="comment-inline-form ac">
75
75
76 %if c.rhodecode_user.username != h.DEFAULT_USER:
76 %if c.rhodecode_user.username != h.DEFAULT_USER:
77 ## render template for inline comments
77 ## render template for inline comments
78 ${commentblock.comment_form(form_type='inline')}
78 ${commentblock.comment_form(form_type='inline')}
79 %else:
79 %else:
80 ${h.form('', class_='inline-form comment-form-login', method='get')}
80 ${h.form('', class_='inline-form comment-form-login', method='get')}
81 <div class="pull-left">
81 <div class="pull-left">
82 <div class="comment-help pull-right">
82 <div class="comment-help pull-right">
83 ${_('You need to be logged in to leave comments.')} <a href="${h.route_path('login', _query={'came_from': h.current_route_path(request)})}">${_('Login now')}</a>
83 ${_('You need to be logged in to leave comments.')} <a href="${h.route_path('login', _query={'came_from': h.current_route_path(request)})}">${_('Login now')}</a>
84 </div>
84 </div>
85 </div>
85 </div>
86 <div class="comment-button pull-right">
86 <div class="comment-button pull-right">
87 <button type="button" class="cb-comment-cancel" onclick="return Rhodecode.comments.cancelComment(this);">
87 <button type="button" class="cb-comment-cancel" onclick="return Rhodecode.comments.cancelComment(this);">
88 ${_('Cancel')}
88 ${_('Cancel')}
89 </button>
89 </button>
90 </div>
90 </div>
91 <div class="clearfix"></div>
91 <div class="clearfix"></div>
92 ${h.end_form()}
92 ${h.end_form()}
93 %endif
93 %endif
94 </div>
94 </div>
95 </div>
95 </div>
96
96
97 %endif
97 %endif
98
98
99 %if c.user_session_attrs["diffmode"] == 'sideside':
99 %if c.user_session_attrs["diffmode"] == 'sideside':
100 <style>
100 <style>
101 .wrapper {
101 .wrapper {
102 max-width: 1600px !important;
102 max-width: 1600px !important;
103 }
103 }
104 </style>
104 </style>
105 %endif
105 %endif
106
106
107 %if ruler_at_chars:
107 %if ruler_at_chars:
108 <style>
108 <style>
109 .diff table.cb .cb-content:after {
109 .diff table.cb .cb-content:after {
110 content: "";
110 content: "";
111 border-left: 1px solid blue;
111 border-left: 1px solid blue;
112 position: absolute;
112 position: absolute;
113 top: 0;
113 top: 0;
114 height: 18px;
114 height: 18px;
115 opacity: .2;
115 opacity: .2;
116 z-index: 10;
116 z-index: 10;
117 //## +5 to account for diff action (+/-)
117 //## +5 to account for diff action (+/-)
118 left: ${ruler_at_chars + 5}ch;
118 left: ${ruler_at_chars + 5}ch;
119 </style>
119 </style>
120 %endif
120 %endif
121
121
122 <div class="diffset ${disable_new_comments and 'diffset-comments-disabled'}">
122 <div class="diffset ${disable_new_comments and 'diffset-comments-disabled'}">
123
123
124 <div style="height: 20px; line-height: 20px">
124 <div style="height: 20px; line-height: 20px">
125 ## expand/collapse action
125 ## expand/collapse action
126 <div class="pull-left">
126 <div class="pull-left">
127 <a class="${'collapsed' if collapse_all else ''}" href="#expand-files" onclick="toggleExpand(this, '${diffset_container_id}'); return false">
127 <a class="${'collapsed' if collapse_all else ''}" href="#expand-files" onclick="toggleExpand(this, '${diffset_container_id}'); return false">
128 % if collapse_all:
128 % if collapse_all:
129 <i class="icon-plus-squared-alt icon-no-margin"></i>${_('Expand all files')}
129 <i class="icon-plus-squared-alt icon-no-margin"></i>${_('Expand all files')}
130 % else:
130 % else:
131 <i class="icon-minus-squared-alt icon-no-margin"></i>${_('Collapse all files')}
131 <i class="icon-minus-squared-alt icon-no-margin"></i>${_('Collapse all files')}
132 % endif
132 % endif
133 </a>
133 </a>
134
134
135 </div>
135 </div>
136
136
137 ## todos
137 ## todos
138 % if show_todos and getattr(c, 'at_version', None):
138 % if show_todos and getattr(c, 'at_version', None):
139 <div class="pull-right">
139 <div class="pull-right">
140 <i class="icon-flag-filled" style="color: #949494">TODOs:</i>
140 <i class="icon-flag-filled" style="color: #949494">TODOs:</i>
141 ${_('not available in this view')}
141 ${_('not available in this view')}
142 </div>
142 </div>
143 % elif show_todos:
143 % elif show_todos:
144 <div class="pull-right">
144 <div class="pull-right">
145 <div class="comments-number" style="padding-left: 10px">
145 <div class="comments-number" style="padding-left: 10px">
146 % if hasattr(c, 'unresolved_comments') and hasattr(c, 'resolved_comments'):
146 % if hasattr(c, 'unresolved_comments') and hasattr(c, 'resolved_comments'):
147 <i class="icon-flag-filled" style="color: #949494">TODOs:</i>
147 <i class="icon-flag-filled" style="color: #949494">TODOs:</i>
148 % if c.unresolved_comments:
148 % if c.unresolved_comments:
149 <a href="#show-todos" onclick="$('#todo-box').toggle(); return false">
149 <a href="#show-todos" onclick="$('#todo-box').toggle(); return false">
150 ${_('{} unresolved').format(len(c.unresolved_comments))}
150 ${_('{} unresolved').format(len(c.unresolved_comments))}
151 </a>
151 </a>
152 % else:
152 % else:
153 ${_('0 unresolved')}
153 ${_('0 unresolved')}
154 % endif
154 % endif
155
155
156 ${_('{} Resolved').format(len(c.resolved_comments))}
156 ${_('{} Resolved').format(len(c.resolved_comments))}
157 % endif
157 % endif
158 </div>
158 </div>
159 </div>
159 </div>
160 % endif
160 % endif
161
161
162 ## comments
162 ## comments
163 <div class="pull-right">
163 <div class="pull-right">
164 <div class="comments-number" style="padding-left: 10px">
164 <div class="comments-number" style="padding-left: 10px">
165 % if hasattr(c, 'comments') and hasattr(c, 'inline_cnt'):
165 % if hasattr(c, 'comments') and hasattr(c, 'inline_cnt'):
166 <i class="icon-comment" style="color: #949494">COMMENTS:</i>
166 <i class="icon-comment" style="color: #949494">COMMENTS:</i>
167 % if c.comments:
167 % if c.comments:
168 <a href="#comments">${_ungettext("{} General", "{} General", len(c.comments)).format(len(c.comments))}</a>,
168 <a href="#comments">${_ungettext("{} General", "{} General", len(c.comments)).format(len(c.comments))}</a>,
169 % else:
169 % else:
170 ${_('0 General')}
170 ${_('0 General')}
171 % endif
171 % endif
172
172
173 % if c.inline_cnt:
173 % if c.inline_cnt:
174 <a href="#" onclick="return Rhodecode.comments.nextComment();"
174 <a href="#" onclick="return Rhodecode.comments.nextComment();"
175 id="inline-comments-counter">${_ungettext("{} Inline", "{} Inline", c.inline_cnt).format(c.inline_cnt)}
175 id="inline-comments-counter">${_ungettext("{} Inline", "{} Inline", c.inline_cnt).format(c.inline_cnt)}
176 </a>
176 </a>
177 % else:
177 % else:
178 ${_('0 Inline')}
178 ${_('0 Inline')}
179 % endif
179 % endif
180 % endif
180 % endif
181
181
182 % if pull_request_menu:
182 % if pull_request_menu:
183 <%
183 <%
184 outdated_comm_count_ver = pull_request_menu['outdated_comm_count_ver']
184 outdated_comm_count_ver = pull_request_menu['outdated_comm_count_ver']
185 %>
185 %>
186
186
187 % if outdated_comm_count_ver:
187 % if outdated_comm_count_ver:
188 <a href="#" onclick="showOutdated(); Rhodecode.comments.nextOutdatedComment(); return false;">
188 <a href="#" onclick="showOutdated(); Rhodecode.comments.nextOutdatedComment(); return false;">
189 (${_("{} Outdated").format(outdated_comm_count_ver)})
189 (${_("{} Outdated").format(outdated_comm_count_ver)})
190 </a>
190 </a>
191 <a href="#" class="showOutdatedComments" onclick="showOutdated(this); return false;"> | ${_('show outdated')}</a>
191 <a href="#" class="showOutdatedComments" onclick="showOutdated(this); return false;"> | ${_('show outdated')}</a>
192 <a href="#" class="hideOutdatedComments" style="display: none" onclick="hideOutdated(this); return false;"> | ${_('hide outdated')}</a>
192 <a href="#" class="hideOutdatedComments" style="display: none" onclick="hideOutdated(this); return false;"> | ${_('hide outdated')}</a>
193 % else:
193 % else:
194 (${_("{} Outdated").format(outdated_comm_count_ver)})
194 (${_("{} Outdated").format(outdated_comm_count_ver)})
195 % endif
195 % endif
196
196
197 % endif
197 % endif
198
198
199 </div>
199 </div>
200 </div>
200 </div>
201
201
202 </div>
202 </div>
203
203
204 % if diffset.limited_diff:
204 % if diffset.limited_diff:
205 <div class="diffset-heading ${(diffset.limited_diff and 'diffset-heading-warning' or '')}">
205 <div class="diffset-heading ${(diffset.limited_diff and 'diffset-heading-warning' or '')}">
206 <h2 class="clearinner">
206 <h2 class="clearinner">
207 ${_('The requested changes are too big and content was truncated.')}
207 ${_('The requested changes are too big and content was truncated.')}
208 <a href="${h.current_route_path(request, fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a>
208 <a href="${h.current_route_path(request, fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a>
209 </h2>
209 </h2>
210 </div>
210 </div>
211 ## commit range header for each individual diff
211 ## commit range header for each individual diff
212 % elif commit and hasattr(c, 'commit_ranges') and len(c.commit_ranges) > 1:
212 % elif commit and hasattr(c, 'commit_ranges') and len(c.commit_ranges) > 1:
213 <div class="diffset-heading ${(diffset.limited_diff and 'diffset-heading-warning' or '')}">
213 <div class="diffset-heading ${(diffset.limited_diff and 'diffset-heading-warning' or '')}">
214 <div class="clearinner">
214 <div class="clearinner">
215 <a class="tooltip revision" title="${h.tooltip(commit.message)}" href="${h.route_path('repo_commit',repo_name=diffset.repo_name,commit_id=commit.raw_id)}">${('r%s:%s' % (commit.idx,h.short_id(commit.raw_id)))}</a>
215 <a class="tooltip revision" title="${h.tooltip(commit.message)}" href="${h.route_path('repo_commit',repo_name=diffset.repo_name,commit_id=commit.raw_id)}">${('r%s:%s' % (commit.idx,h.short_id(commit.raw_id)))}</a>
216 </div>
216 </div>
217 </div>
217 </div>
218 % endif
218 % endif
219
219
220 <div id="todo-box">
220 <div id="todo-box">
221 % if hasattr(c, 'unresolved_comments') and c.unresolved_comments:
221 % if hasattr(c, 'unresolved_comments') and c.unresolved_comments:
222 % for co in c.unresolved_comments:
222 % for co in c.unresolved_comments:
223 <a class="permalink" href="#comment-${co.comment_id}"
223 <a class="permalink" href="#comment-${co.comment_id}"
224 onclick="Rhodecode.comments.scrollToComment($('#comment-${co.comment_id}'))">
224 onclick="Rhodecode.comments.scrollToComment($('#comment-${co.comment_id}'))">
225 <i class="icon-flag-filled-red"></i>
225 <i class="icon-flag-filled-red"></i>
226 ${co.comment_id}</a>${('' if loop.last else ',')}
226 ${co.comment_id}</a>${('' if loop.last else ',')}
227 % endfor
227 % endfor
228 % endif
228 % endif
229 </div>
229 </div>
230 %if diffset.has_hidden_changes:
230 %if diffset.has_hidden_changes:
231 <p class="empty_data">${_('Some changes may be hidden')}</p>
231 <p class="empty_data">${_('Some changes may be hidden')}</p>
232 %elif not diffset.files:
232 %elif not diffset.files:
233 <p class="empty_data">${_('No files')}</p>
233 <p class="empty_data">${_('No files')}</p>
234 %endif
234 %endif
235
235
236 <div class="filediffs">
236 <div class="filediffs">
237
237
238 ## initial value could be marked as False later on
238 ## initial value could be marked as False later on
239 <% over_lines_changed_limit = False %>
239 <% over_lines_changed_limit = False %>
240 %for i, filediff in enumerate(diffset.files):
240 %for i, filediff in enumerate(diffset.files):
241
241
242 <%
242 <%
243 lines_changed = filediff.patch['stats']['added'] + filediff.patch['stats']['deleted']
243 lines_changed = filediff.patch['stats']['added'] + filediff.patch['stats']['deleted']
244 over_lines_changed_limit = lines_changed > lines_changed_limit
244 over_lines_changed_limit = lines_changed > lines_changed_limit
245 %>
245 %>
246 ## anchor with support of sticky header
246 ## anchor with support of sticky header
247 <div class="anchor" id="a_${h.FID(filediff.raw_id, filediff.patch['filename'])}"></div>
247 <div class="anchor" id="a_${h.FID(filediff.raw_id, filediff.patch['filename'])}"></div>
248
248
249 <input ${(collapse_all and 'checked' or '')} class="filediff-collapse-state collapse-${diffset_container_id}" id="filediff-collapse-${id(filediff)}" type="checkbox" onchange="updateSticky();">
249 <input ${(collapse_all and 'checked' or '')} class="filediff-collapse-state collapse-${diffset_container_id}" id="filediff-collapse-${id(filediff)}" type="checkbox" onchange="updateSticky();">
250 <div
250 <div
251 class="filediff"
251 class="filediff"
252 data-f-path="${filediff.patch['filename']}"
252 data-f-path="${filediff.patch['filename']}"
253 data-anchor-id="${h.FID(filediff.raw_id, filediff.patch['filename'])}"
253 data-anchor-id="${h.FID(filediff.raw_id, filediff.patch['filename'])}"
254 >
254 >
255 <label for="filediff-collapse-${id(filediff)}" class="filediff-heading">
255 <label for="filediff-collapse-${id(filediff)}" class="filediff-heading">
256 <div class="filediff-collapse-indicator icon-"></div>
256 <div class="filediff-collapse-indicator icon-"></div>
257 ${diff_ops(filediff)}
257 ${diff_ops(filediff)}
258 </label>
258 </label>
259
259
260 ${diff_menu(filediff, use_comments=use_comments)}
260 ${diff_menu(filediff, use_comments=use_comments)}
261 <table data-f-path="${filediff.patch['filename']}" data-anchor-id="${h.FID(filediff.raw_id, filediff.patch['filename'])}" class="code-visible-block cb cb-diff-${c.user_session_attrs["diffmode"]} code-highlight ${(over_lines_changed_limit and 'cb-collapsed' or '')}">
261 <table data-f-path="${filediff.patch['filename']}" data-anchor-id="${h.FID(filediff.raw_id, filediff.patch['filename'])}" class="code-visible-block cb cb-diff-${c.user_session_attrs["diffmode"]} code-highlight ${(over_lines_changed_limit and 'cb-collapsed' or '')}">
262
262
263 ## new/deleted/empty content case
263 ## new/deleted/empty content case
264 % if not filediff.hunks:
264 % if not filediff.hunks:
265 ## Comment container, on "fakes" hunk that contains all data to render comments
265 ## Comment container, on "fakes" hunk that contains all data to render comments
266 ${render_hunk_lines(filediff, c.user_session_attrs["diffmode"], filediff.hunk_ops, use_comments=use_comments, inline_comments=inline_comments, active_pattern_entries=active_pattern_entries)}
266 ${render_hunk_lines(filediff, c.user_session_attrs["diffmode"], filediff.hunk_ops, use_comments=use_comments, inline_comments=inline_comments, active_pattern_entries=active_pattern_entries)}
267 % endif
267 % endif
268
268
269 %if filediff.limited_diff:
269 %if filediff.limited_diff:
270 <tr class="cb-warning cb-collapser">
270 <tr class="cb-warning cb-collapser">
271 <td class="cb-text" ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=4' or 'colspan=6')}>
271 <td class="cb-text" ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=4' or 'colspan=6')}>
272 ${_('The requested commit or file is too big and content was truncated.')} <a href="${h.current_route_path(request, fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a>
272 ${_('The requested commit or file is too big and content was truncated.')} <a href="${h.current_route_path(request, fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a>
273 </td>
273 </td>
274 </tr>
274 </tr>
275 %else:
275 %else:
276 %if over_lines_changed_limit:
276 %if over_lines_changed_limit:
277 <tr class="cb-warning cb-collapser">
277 <tr class="cb-warning cb-collapser">
278 <td class="cb-text" ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=4' or 'colspan=6')}>
278 <td class="cb-text" ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=4' or 'colspan=6')}>
279 ${_('This diff has been collapsed as it changes many lines, (%i lines changed)' % lines_changed)}
279 ${_('This diff has been collapsed as it changes many lines, (%i lines changed)' % lines_changed)}
280 <a href="#" class="cb-expand"
280 <a href="#" class="cb-expand"
281 onclick="$(this).closest('table').removeClass('cb-collapsed'); updateSticky(); return false;">${_('Show them')}
281 onclick="$(this).closest('table').removeClass('cb-collapsed'); updateSticky(); return false;">${_('Show them')}
282 </a>
282 </a>
283 <a href="#" class="cb-collapse"
283 <a href="#" class="cb-collapse"
284 onclick="$(this).closest('table').addClass('cb-collapsed'); updateSticky(); return false;">${_('Hide them')}
284 onclick="$(this).closest('table').addClass('cb-collapsed'); updateSticky(); return false;">${_('Hide them')}
285 </a>
285 </a>
286 </td>
286 </td>
287 </tr>
287 </tr>
288 %endif
288 %endif
289 %endif
289 %endif
290
290
291 % for hunk in filediff.hunks:
291 % for hunk in filediff.hunks:
292 <tr class="cb-hunk">
292 <tr class="cb-hunk">
293 <td ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=3' or '')}>
293 <td ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=3' or '')}>
294 ## TODO: dan: add ajax loading of more context here
294 ## TODO: dan: add ajax loading of more context here
295 ## <a href="#">
295 ## <a href="#">
296 <i class="icon-more"></i>
296 <i class="icon-more"></i>
297 ## </a>
297 ## </a>
298 </td>
298 </td>
299 <td ${(c.user_session_attrs["diffmode"] == 'sideside' and 'colspan=5' or '')}>
299 <td ${(c.user_session_attrs["diffmode"] == 'sideside' and 'colspan=5' or '')}>
300 @@
300 @@
301 -${hunk.source_start},${hunk.source_length}
301 -${hunk.source_start},${hunk.source_length}
302 +${hunk.target_start},${hunk.target_length}
302 +${hunk.target_start},${hunk.target_length}
303 ${hunk.section_header}
303 ${hunk.section_header}
304 </td>
304 </td>
305 </tr>
305 </tr>
306 ${render_hunk_lines(filediff, c.user_session_attrs["diffmode"], hunk, use_comments=use_comments, inline_comments=inline_comments, active_pattern_entries=active_pattern_entries)}
306 ${render_hunk_lines(filediff, c.user_session_attrs["diffmode"], hunk, use_comments=use_comments, inline_comments=inline_comments, active_pattern_entries=active_pattern_entries)}
307 % endfor
307 % endfor
308
308
309 <% unmatched_comments = (inline_comments or {}).get(filediff.patch['filename'], {}) %>
309 <% unmatched_comments = (inline_comments or {}).get(filediff.patch['filename'], {}) %>
310
310
311 ## outdated comments that do not fit into currently displayed lines
311 ## outdated comments that do not fit into currently displayed lines
312 % for lineno, comments in unmatched_comments.items():
312 % for lineno, comments in unmatched_comments.items():
313
313
314 %if c.user_session_attrs["diffmode"] == 'unified':
314 %if c.user_session_attrs["diffmode"] == 'unified':
315 % if loop.index == 0:
315 % if loop.index == 0:
316 <tr class="cb-hunk">
316 <tr class="cb-hunk">
317 <td colspan="3"></td>
317 <td colspan="3"></td>
318 <td>
318 <td>
319 <div>
319 <div>
320 ${_('Unmatched/outdated inline comments below')}
320 ${_('Unmatched/outdated inline comments below')}
321 </div>
321 </div>
322 </td>
322 </td>
323 </tr>
323 </tr>
324 % endif
324 % endif
325 <tr class="cb-line">
325 <tr class="cb-line">
326 <td class="cb-data cb-context"></td>
326 <td class="cb-data cb-context"></td>
327 <td class="cb-lineno cb-context"></td>
327 <td class="cb-lineno cb-context"></td>
328 <td class="cb-lineno cb-context"></td>
328 <td class="cb-lineno cb-context"></td>
329 <td class="cb-content cb-context">
329 <td class="cb-content cb-context">
330 ${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)}
330 ${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)}
331 </td>
331 </td>
332 </tr>
332 </tr>
333 %elif c.user_session_attrs["diffmode"] == 'sideside':
333 %elif c.user_session_attrs["diffmode"] == 'sideside':
334 % if loop.index == 0:
334 % if loop.index == 0:
335 <tr class="cb-comment-info">
335 <tr class="cb-comment-info">
336 <td colspan="2"></td>
336 <td colspan="2"></td>
337 <td class="cb-line">
337 <td class="cb-line">
338 <div>
338 <div>
339 ${_('Unmatched/outdated inline comments below')}
339 ${_('Unmatched/outdated inline comments below')}
340 </div>
340 </div>
341 </td>
341 </td>
342 <td colspan="2"></td>
342 <td colspan="2"></td>
343 <td class="cb-line">
343 <td class="cb-line">
344 <div>
344 <div>
345 ${_('Unmatched/outdated comments below')}
345 ${_('Unmatched/outdated comments below')}
346 </div>
346 </div>
347 </td>
347 </td>
348 </tr>
348 </tr>
349 % endif
349 % endif
350 <tr class="cb-line">
350 <tr class="cb-line">
351 <td class="cb-data cb-context"></td>
351 <td class="cb-data cb-context"></td>
352 <td class="cb-lineno cb-context"></td>
352 <td class="cb-lineno cb-context"></td>
353 <td class="cb-content cb-context">
353 <td class="cb-content cb-context">
354 % if lineno.startswith('o'):
354 % if lineno.startswith('o'):
355 ${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)}
355 ${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)}
356 % endif
356 % endif
357 </td>
357 </td>
358
358
359 <td class="cb-data cb-context"></td>
359 <td class="cb-data cb-context"></td>
360 <td class="cb-lineno cb-context"></td>
360 <td class="cb-lineno cb-context"></td>
361 <td class="cb-content cb-context">
361 <td class="cb-content cb-context">
362 % if lineno.startswith('n'):
362 % if lineno.startswith('n'):
363 ${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)}
363 ${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)}
364 % endif
364 % endif
365 </td>
365 </td>
366 </tr>
366 </tr>
367 %endif
367 %endif
368
368
369 % endfor
369 % endfor
370
370
371 </table>
371 </table>
372 </div>
372 </div>
373 %endfor
373 %endfor
374
374
375 ## outdated comments that are made for a file that has been deleted
375 ## outdated comments that are made for a file that has been deleted
376 % for filename, comments_dict in (deleted_files_comments or {}).items():
376 % for filename, comments_dict in (deleted_files_comments or {}).items():
377
377
378 <%
378 <%
379 display_state = 'display: none'
379 display_state = 'display: none'
380 open_comments_in_file = [x for x in comments_dict['comments'] if x.outdated is False]
380 open_comments_in_file = [x for x in comments_dict['comments'] if x.outdated is False]
381 if open_comments_in_file:
381 if open_comments_in_file:
382 display_state = ''
382 display_state = ''
383 fid = str(id(filename))
383 fid = str(id(filename))
384 %>
384 %>
385 <div class="filediffs filediff-outdated" style="${display_state}">
385 <div class="filediffs filediff-outdated" style="${display_state}">
386 <input ${(collapse_all and 'checked' or '')} class="filediff-collapse-state collapse-${diffset_container_id}" id="filediff-collapse-${id(filename)}" type="checkbox" onchange="updateSticky();">
386 <input ${(collapse_all and 'checked' or '')} class="filediff-collapse-state collapse-${diffset_container_id}" id="filediff-collapse-${id(filename)}" type="checkbox" onchange="updateSticky();">
387 <div class="filediff" data-f-path="${filename}" id="a_${h.FID(fid, filename)}">
387 <div class="filediff" data-f-path="${filename}" id="a_${h.FID(fid, filename)}">
388 <label for="filediff-collapse-${id(filename)}" class="filediff-heading">
388 <label for="filediff-collapse-${id(filename)}" class="filediff-heading">
389 <div class="filediff-collapse-indicator icon-"></div>
389 <div class="filediff-collapse-indicator icon-"></div>
390
390
391 <span class="pill">
391 <span class="pill">
392 ## file was deleted
392 ## file was deleted
393 ${filename}
393 ${filename}
394 </span>
394 </span>
395 <span class="pill-group pull-left" >
395 <span class="pill-group pull-left" >
396 ## file op, doesn't need translation
396 ## file op, doesn't need translation
397 <span class="pill" op="removed">removed in this version</span>
397 <span class="pill" op="removed">removed in this version</span>
398 </span>
398 </span>
399 <a class="pill filediff-anchor" href="#a_${h.FID(fid, filename)}">ΒΆ</a>
399 <a class="pill filediff-anchor" href="#a_${h.FID(fid, filename)}">ΒΆ</a>
400 <span class="pill-group pull-right">
400 <span class="pill-group pull-right">
401 <span class="pill" op="deleted">-${comments_dict['stats']}</span>
401 <span class="pill" op="deleted">-${comments_dict['stats']}</span>
402 </span>
402 </span>
403 </label>
403 </label>
404
404
405 <table class="cb cb-diff-${c.user_session_attrs["diffmode"]} code-highlight ${(over_lines_changed_limit and 'cb-collapsed' or '')}">
405 <table class="cb cb-diff-${c.user_session_attrs["diffmode"]} code-highlight ${(over_lines_changed_limit and 'cb-collapsed' or '')}">
406 <tr>
406 <tr>
407 % if c.user_session_attrs["diffmode"] == 'unified':
407 % if c.user_session_attrs["diffmode"] == 'unified':
408 <td></td>
408 <td></td>
409 %endif
409 %endif
410
410
411 <td></td>
411 <td></td>
412 <td class="cb-text cb-${op_class(BIN_FILENODE)}" ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=4' or 'colspan=5')}>
412 <td class="cb-text cb-${op_class(BIN_FILENODE)}" ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=4' or 'colspan=5')}>
413 ${_('File was deleted in this version. There are still outdated/unresolved comments attached to it.')}
413 ${_('File was deleted in this version. There are still outdated/unresolved comments attached to it.')}
414 </td>
414 </td>
415 </tr>
415 </tr>
416 %if c.user_session_attrs["diffmode"] == 'unified':
416 %if c.user_session_attrs["diffmode"] == 'unified':
417 <tr class="cb-line">
417 <tr class="cb-line">
418 <td class="cb-data cb-context"></td>
418 <td class="cb-data cb-context"></td>
419 <td class="cb-lineno cb-context"></td>
419 <td class="cb-lineno cb-context"></td>
420 <td class="cb-lineno cb-context"></td>
420 <td class="cb-lineno cb-context"></td>
421 <td class="cb-content cb-context">
421 <td class="cb-content cb-context">
422 ${inline_comments_container(comments_dict['comments'], active_pattern_entries=active_pattern_entries)}
422 ${inline_comments_container(comments_dict['comments'], active_pattern_entries=active_pattern_entries)}
423 </td>
423 </td>
424 </tr>
424 </tr>
425 %elif c.user_session_attrs["diffmode"] == 'sideside':
425 %elif c.user_session_attrs["diffmode"] == 'sideside':
426 <tr class="cb-line">
426 <tr class="cb-line">
427 <td class="cb-data cb-context"></td>
427 <td class="cb-data cb-context"></td>
428 <td class="cb-lineno cb-context"></td>
428 <td class="cb-lineno cb-context"></td>
429 <td class="cb-content cb-context"></td>
429 <td class="cb-content cb-context"></td>
430
430
431 <td class="cb-data cb-context"></td>
431 <td class="cb-data cb-context"></td>
432 <td class="cb-lineno cb-context"></td>
432 <td class="cb-lineno cb-context"></td>
433 <td class="cb-content cb-context">
433 <td class="cb-content cb-context">
434 ${inline_comments_container(comments_dict['comments'], active_pattern_entries=active_pattern_entries)}
434 ${inline_comments_container(comments_dict['comments'], active_pattern_entries=active_pattern_entries)}
435 </td>
435 </td>
436 </tr>
436 </tr>
437 %endif
437 %endif
438 </table>
438 </table>
439 </div>
439 </div>
440 </div>
440 </div>
441 % endfor
441 % endfor
442
442
443 </div>
443 </div>
444 </div>
444 </div>
445 </%def>
445 </%def>
446
446
447 <%def name="diff_ops(filediff)">
447 <%def name="diff_ops(filediff)">
448 <%
448 <%
449 from rhodecode.lib.diffs import NEW_FILENODE, DEL_FILENODE, \
449 from rhodecode.lib.diffs import NEW_FILENODE, DEL_FILENODE, \
450 MOD_FILENODE, RENAMED_FILENODE, CHMOD_FILENODE, BIN_FILENODE, COPIED_FILENODE
450 MOD_FILENODE, RENAMED_FILENODE, CHMOD_FILENODE, BIN_FILENODE, COPIED_FILENODE
451 %>
451 %>
452 <span class="pill">
452 <span class="pill">
453 <i class="icon-file-text"></i>
453 <i class="icon-file-text"></i>
454 %if filediff.source_file_path and filediff.target_file_path:
454 %if filediff.source_file_path and filediff.target_file_path:
455 %if filediff.source_file_path != filediff.target_file_path:
455 %if filediff.source_file_path != filediff.target_file_path:
456 ## file was renamed, or copied
456 ## file was renamed, or copied
457 %if RENAMED_FILENODE in filediff.patch['stats']['ops']:
457 %if RENAMED_FILENODE in filediff.patch['stats']['ops']:
458 ${filediff.target_file_path} β¬… <del>${filediff.source_file_path}</del>
458 ${filediff.target_file_path} β¬… <del>${filediff.source_file_path}</del>
459 <% final_path = filediff.target_file_path %>
459 <% final_path = filediff.target_file_path %>
460 %elif COPIED_FILENODE in filediff.patch['stats']['ops']:
460 %elif COPIED_FILENODE in filediff.patch['stats']['ops']:
461 ${filediff.target_file_path} β¬… ${filediff.source_file_path}
461 ${filediff.target_file_path} β¬… ${filediff.source_file_path}
462 <% final_path = filediff.target_file_path %>
462 <% final_path = filediff.target_file_path %>
463 %endif
463 %endif
464 %else:
464 %else:
465 ## file was modified
465 ## file was modified
466 ${filediff.source_file_path}
466 ${filediff.source_file_path}
467 <% final_path = filediff.source_file_path %>
467 <% final_path = filediff.source_file_path %>
468 %endif
468 %endif
469 %else:
469 %else:
470 %if filediff.source_file_path:
470 %if filediff.source_file_path:
471 ## file was deleted
471 ## file was deleted
472 ${filediff.source_file_path}
472 ${filediff.source_file_path}
473 <% final_path = filediff.source_file_path %>
473 <% final_path = filediff.source_file_path %>
474 %else:
474 %else:
475 ## file was added
475 ## file was added
476 ${filediff.target_file_path}
476 ${filediff.target_file_path}
477 <% final_path = filediff.target_file_path %>
477 <% final_path = filediff.target_file_path %>
478 %endif
478 %endif
479 %endif
479 %endif
480 <i style="color: #aaa" class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${final_path}" title="${_('Copy the full path')}" onclick="return false;"></i>
480 <i style="color: #aaa" class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${final_path}" title="${_('Copy file path')}" onclick="return false;"></i>
481 </span>
481 </span>
482 ## anchor link
482 ## anchor link
483 <a class="pill filediff-anchor" href="#a_${h.FID(filediff.raw_id, filediff.patch['filename'])}">ΒΆ</a>
483 <a class="pill filediff-anchor" href="#a_${h.FID(filediff.raw_id, filediff.patch['filename'])}">ΒΆ</a>
484
484
485 <span class="pill-group pull-right">
485 <span class="pill-group pull-right">
486
486
487 ## ops pills
487 ## ops pills
488 %if filediff.limited_diff:
488 %if filediff.limited_diff:
489 <span class="pill tooltip" op="limited" title="The stats for this diff are not complete">limited diff</span>
489 <span class="pill tooltip" op="limited" title="The stats for this diff are not complete">limited diff</span>
490 %endif
490 %endif
491
491
492 %if NEW_FILENODE in filediff.patch['stats']['ops']:
492 %if NEW_FILENODE in filediff.patch['stats']['ops']:
493 <span class="pill" op="created">created</span>
493 <span class="pill" op="created">created</span>
494 %if filediff['target_mode'].startswith('120'):
494 %if filediff['target_mode'].startswith('120'):
495 <span class="pill" op="symlink">symlink</span>
495 <span class="pill" op="symlink">symlink</span>
496 %else:
496 %else:
497 <span class="pill" op="mode">${nice_mode(filediff['target_mode'])}</span>
497 <span class="pill" op="mode">${nice_mode(filediff['target_mode'])}</span>
498 %endif
498 %endif
499 %endif
499 %endif
500
500
501 %if RENAMED_FILENODE in filediff.patch['stats']['ops']:
501 %if RENAMED_FILENODE in filediff.patch['stats']['ops']:
502 <span class="pill" op="renamed">renamed</span>
502 <span class="pill" op="renamed">renamed</span>
503 %endif
503 %endif
504
504
505 %if COPIED_FILENODE in filediff.patch['stats']['ops']:
505 %if COPIED_FILENODE in filediff.patch['stats']['ops']:
506 <span class="pill" op="copied">copied</span>
506 <span class="pill" op="copied">copied</span>
507 %endif
507 %endif
508
508
509 %if DEL_FILENODE in filediff.patch['stats']['ops']:
509 %if DEL_FILENODE in filediff.patch['stats']['ops']:
510 <span class="pill" op="removed">removed</span>
510 <span class="pill" op="removed">removed</span>
511 %endif
511 %endif
512
512
513 %if CHMOD_FILENODE in filediff.patch['stats']['ops']:
513 %if CHMOD_FILENODE in filediff.patch['stats']['ops']:
514 <span class="pill" op="mode">
514 <span class="pill" op="mode">
515 ${nice_mode(filediff['source_mode'])} ➑ ${nice_mode(filediff['target_mode'])}
515 ${nice_mode(filediff['source_mode'])} ➑ ${nice_mode(filediff['target_mode'])}
516 </span>
516 </span>
517 %endif
517 %endif
518
518
519 %if BIN_FILENODE in filediff.patch['stats']['ops']:
519 %if BIN_FILENODE in filediff.patch['stats']['ops']:
520 <span class="pill" op="binary">binary</span>
520 <span class="pill" op="binary">binary</span>
521 %if MOD_FILENODE in filediff.patch['stats']['ops']:
521 %if MOD_FILENODE in filediff.patch['stats']['ops']:
522 <span class="pill" op="modified">modified</span>
522 <span class="pill" op="modified">modified</span>
523 %endif
523 %endif
524 %endif
524 %endif
525
525
526 <span class="pill" op="added">${('+' if filediff.patch['stats']['added'] else '')}${filediff.patch['stats']['added']}</span>
526 <span class="pill" op="added">${('+' if filediff.patch['stats']['added'] else '')}${filediff.patch['stats']['added']}</span>
527 <span class="pill" op="deleted">${((h.safe_int(filediff.patch['stats']['deleted']) or 0) * -1)}</span>
527 <span class="pill" op="deleted">${((h.safe_int(filediff.patch['stats']['deleted']) or 0) * -1)}</span>
528
528
529 </span>
529 </span>
530
530
531 </%def>
531 </%def>
532
532
533 <%def name="nice_mode(filemode)">
533 <%def name="nice_mode(filemode)">
534 ${(filemode.startswith('100') and filemode[3:] or filemode)}
534 ${(filemode.startswith('100') and filemode[3:] or filemode)}
535 </%def>
535 </%def>
536
536
537 <%def name="diff_menu(filediff, use_comments=False)">
537 <%def name="diff_menu(filediff, use_comments=False)">
538 <div class="filediff-menu">
538 <div class="filediff-menu">
539
539
540 %if filediff.diffset.source_ref:
540 %if filediff.diffset.source_ref:
541
541
542 ## FILE BEFORE CHANGES
542 ## FILE BEFORE CHANGES
543 %if filediff.operation in ['D', 'M']:
543 %if filediff.operation in ['D', 'M']:
544 <a
544 <a
545 class="tooltip"
545 class="tooltip"
546 href="${h.route_path('repo_files',repo_name=filediff.diffset.target_repo_name,commit_id=filediff.diffset.source_ref,f_path=filediff.source_file_path)}"
546 href="${h.route_path('repo_files',repo_name=filediff.diffset.target_repo_name,commit_id=filediff.diffset.source_ref,f_path=filediff.source_file_path)}"
547 title="${h.tooltip(_('Show file at commit: %(commit_id)s') % {'commit_id': filediff.diffset.source_ref[:12]})}"
547 title="${h.tooltip(_('Show file at commit: %(commit_id)s') % {'commit_id': filediff.diffset.source_ref[:12]})}"
548 >
548 >
549 ${_('Show file before')}
549 ${_('Show file before')}
550 </a> |
550 </a> |
551 %else:
551 %else:
552 <span
552 <span
553 class="tooltip"
553 class="tooltip"
554 title="${h.tooltip(_('File not present at commit: %(commit_id)s') % {'commit_id': filediff.diffset.source_ref[:12]})}"
554 title="${h.tooltip(_('File not present at commit: %(commit_id)s') % {'commit_id': filediff.diffset.source_ref[:12]})}"
555 >
555 >
556 ${_('Show file before')}
556 ${_('Show file before')}
557 </span> |
557 </span> |
558 %endif
558 %endif
559
559
560 ## FILE AFTER CHANGES
560 ## FILE AFTER CHANGES
561 %if filediff.operation in ['A', 'M']:
561 %if filediff.operation in ['A', 'M']:
562 <a
562 <a
563 class="tooltip"
563 class="tooltip"
564 href="${h.route_path('repo_files',repo_name=filediff.diffset.source_repo_name,commit_id=filediff.diffset.target_ref,f_path=filediff.target_file_path)}"
564 href="${h.route_path('repo_files',repo_name=filediff.diffset.source_repo_name,commit_id=filediff.diffset.target_ref,f_path=filediff.target_file_path)}"
565 title="${h.tooltip(_('Show file at commit: %(commit_id)s') % {'commit_id': filediff.diffset.target_ref[:12]})}"
565 title="${h.tooltip(_('Show file at commit: %(commit_id)s') % {'commit_id': filediff.diffset.target_ref[:12]})}"
566 >
566 >
567 ${_('Show file after')}
567 ${_('Show file after')}
568 </a>
568 </a>
569 %else:
569 %else:
570 <span
570 <span
571 class="tooltip"
571 class="tooltip"
572 title="${h.tooltip(_('File not present at commit: %(commit_id)s') % {'commit_id': filediff.diffset.target_ref[:12]})}"
572 title="${h.tooltip(_('File not present at commit: %(commit_id)s') % {'commit_id': filediff.diffset.target_ref[:12]})}"
573 >
573 >
574 ${_('Show file after')}
574 ${_('Show file after')}
575 </span>
575 </span>
576 %endif
576 %endif
577
577
578 % if use_comments:
578 % if use_comments:
579 |
579 |
580 <a href="#" onclick="return Rhodecode.comments.toggleComments(this);">
580 <a href="#" onclick="return Rhodecode.comments.toggleComments(this);">
581 <span class="show-comment-button">${_('Show comments')}</span><span class="hide-comment-button">${_('Hide comments')}</span>
581 <span class="show-comment-button">${_('Show comments')}</span><span class="hide-comment-button">${_('Hide comments')}</span>
582 </a>
582 </a>
583 % endif
583 % endif
584
584
585 %endif
585 %endif
586
586
587 </div>
587 </div>
588 </%def>
588 </%def>
589
589
590
590
591 <%def name="inline_comments_container(comments, active_pattern_entries=None)">
591 <%def name="inline_comments_container(comments, active_pattern_entries=None)">
592
592
593 <div class="inline-comments">
593 <div class="inline-comments">
594 %for comment in comments:
594 %for comment in comments:
595 ${commentblock.comment_block(comment, inline=True, active_pattern_entries=active_pattern_entries)}
595 ${commentblock.comment_block(comment, inline=True, active_pattern_entries=active_pattern_entries)}
596 %endfor
596 %endfor
597 % if comments and comments[-1].outdated:
597 % if comments and comments[-1].outdated:
598 <span class="btn btn-secondary cb-comment-add-button comment-outdated}" style="display: none;}">
598 <span class="btn btn-secondary cb-comment-add-button comment-outdated}" style="display: none;}">
599 ${_('Add another comment')}
599 ${_('Add another comment')}
600 </span>
600 </span>
601 % else:
601 % else:
602 <span onclick="return Rhodecode.comments.createComment(this)" class="btn btn-secondary cb-comment-add-button">
602 <span onclick="return Rhodecode.comments.createComment(this)" class="btn btn-secondary cb-comment-add-button">
603 ${_('Add another comment')}
603 ${_('Add another comment')}
604 </span>
604 </span>
605 % endif
605 % endif
606
606
607 </div>
607 </div>
608 </%def>
608 </%def>
609
609
610 <%!
610 <%!
611 def get_comments_for(diff_type, comments, filename, line_version, line_number):
611 def get_comments_for(diff_type, comments, filename, line_version, line_number):
612 if hasattr(filename, 'unicode_path'):
612 if hasattr(filename, 'unicode_path'):
613 filename = filename.unicode_path
613 filename = filename.unicode_path
614
614
615 if not isinstance(filename, (unicode, str)):
615 if not isinstance(filename, (unicode, str)):
616 return None
616 return None
617
617
618 line_key = '{}{}'.format(line_version, line_number) ## e.g o37, n12
618 line_key = '{}{}'.format(line_version, line_number) ## e.g o37, n12
619
619
620 if comments and filename in comments:
620 if comments and filename in comments:
621 file_comments = comments[filename]
621 file_comments = comments[filename]
622 if line_key in file_comments:
622 if line_key in file_comments:
623 data = file_comments.pop(line_key)
623 data = file_comments.pop(line_key)
624 return data
624 return data
625 %>
625 %>
626
626
627 <%def name="render_hunk_lines_sideside(filediff, hunk, use_comments=False, inline_comments=None, active_pattern_entries=None)">
627 <%def name="render_hunk_lines_sideside(filediff, hunk, use_comments=False, inline_comments=None, active_pattern_entries=None)">
628 %for i, line in enumerate(hunk.sideside):
628 %for i, line in enumerate(hunk.sideside):
629 <%
629 <%
630 old_line_anchor, new_line_anchor = None, None
630 old_line_anchor, new_line_anchor = None, None
631
631
632 if line.original.lineno:
632 if line.original.lineno:
633 old_line_anchor = diff_line_anchor(filediff.raw_id, hunk.source_file_path, line.original.lineno, 'o')
633 old_line_anchor = diff_line_anchor(filediff.raw_id, hunk.source_file_path, line.original.lineno, 'o')
634 if line.modified.lineno:
634 if line.modified.lineno:
635 new_line_anchor = diff_line_anchor(filediff.raw_id, hunk.target_file_path, line.modified.lineno, 'n')
635 new_line_anchor = diff_line_anchor(filediff.raw_id, hunk.target_file_path, line.modified.lineno, 'n')
636 %>
636 %>
637
637
638 <tr class="cb-line">
638 <tr class="cb-line">
639 <td class="cb-data ${action_class(line.original.action)}"
639 <td class="cb-data ${action_class(line.original.action)}"
640 data-line-no="${line.original.lineno}"
640 data-line-no="${line.original.lineno}"
641 >
641 >
642 <div>
642 <div>
643
643
644 <% line_old_comments = None %>
644 <% line_old_comments = None %>
645 %if line.original.get_comment_args:
645 %if line.original.get_comment_args:
646 <% line_old_comments = get_comments_for('side-by-side', inline_comments, *line.original.get_comment_args) %>
646 <% line_old_comments = get_comments_for('side-by-side', inline_comments, *line.original.get_comment_args) %>
647 %endif
647 %endif
648 %if line_old_comments:
648 %if line_old_comments:
649 <% has_outdated = any([x.outdated for x in line_old_comments]) %>
649 <% has_outdated = any([x.outdated for x in line_old_comments]) %>
650 % if has_outdated:
650 % if has_outdated:
651 <i title="${_('comments including outdated')}:${len(line_old_comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
651 <i title="${_('comments including outdated')}:${len(line_old_comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
652 % else:
652 % else:
653 <i title="${_('comments')}: ${len(line_old_comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
653 <i title="${_('comments')}: ${len(line_old_comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
654 % endif
654 % endif
655 %endif
655 %endif
656 </div>
656 </div>
657 </td>
657 </td>
658 <td class="cb-lineno ${action_class(line.original.action)}"
658 <td class="cb-lineno ${action_class(line.original.action)}"
659 data-line-no="${line.original.lineno}"
659 data-line-no="${line.original.lineno}"
660 %if old_line_anchor:
660 %if old_line_anchor:
661 id="${old_line_anchor}"
661 id="${old_line_anchor}"
662 %endif
662 %endif
663 >
663 >
664 %if line.original.lineno:
664 %if line.original.lineno:
665 <a name="${old_line_anchor}" href="#${old_line_anchor}">${line.original.lineno}</a>
665 <a name="${old_line_anchor}" href="#${old_line_anchor}">${line.original.lineno}</a>
666 %endif
666 %endif
667 </td>
667 </td>
668 <td class="cb-content ${action_class(line.original.action)}"
668 <td class="cb-content ${action_class(line.original.action)}"
669 data-line-no="o${line.original.lineno}"
669 data-line-no="o${line.original.lineno}"
670 >
670 >
671 %if use_comments and line.original.lineno:
671 %if use_comments and line.original.lineno:
672 ${render_add_comment_button()}
672 ${render_add_comment_button()}
673 %endif
673 %endif
674 <span class="cb-code"><span class="cb-action ${action_class(line.original.action)}"></span>${line.original.content or '' | n}</span>
674 <span class="cb-code"><span class="cb-action ${action_class(line.original.action)}"></span>${line.original.content or '' | n}</span>
675
675
676 %if use_comments and line.original.lineno and line_old_comments:
676 %if use_comments and line.original.lineno and line_old_comments:
677 ${inline_comments_container(line_old_comments, active_pattern_entries=active_pattern_entries)}
677 ${inline_comments_container(line_old_comments, active_pattern_entries=active_pattern_entries)}
678 %endif
678 %endif
679
679
680 </td>
680 </td>
681 <td class="cb-data ${action_class(line.modified.action)}"
681 <td class="cb-data ${action_class(line.modified.action)}"
682 data-line-no="${line.modified.lineno}"
682 data-line-no="${line.modified.lineno}"
683 >
683 >
684 <div>
684 <div>
685
685
686 %if line.modified.get_comment_args:
686 %if line.modified.get_comment_args:
687 <% line_new_comments = get_comments_for('side-by-side', inline_comments, *line.modified.get_comment_args) %>
687 <% line_new_comments = get_comments_for('side-by-side', inline_comments, *line.modified.get_comment_args) %>
688 %else:
688 %else:
689 <% line_new_comments = None%>
689 <% line_new_comments = None%>
690 %endif
690 %endif
691 %if line_new_comments:
691 %if line_new_comments:
692 <% has_outdated = any([x.outdated for x in line_new_comments]) %>
692 <% has_outdated = any([x.outdated for x in line_new_comments]) %>
693 % if has_outdated:
693 % if has_outdated:
694 <i title="${_('comments including outdated')}:${len(line_new_comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
694 <i title="${_('comments including outdated')}:${len(line_new_comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
695 % else:
695 % else:
696 <i title="${_('comments')}: ${len(line_new_comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
696 <i title="${_('comments')}: ${len(line_new_comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
697 % endif
697 % endif
698 %endif
698 %endif
699 </div>
699 </div>
700 </td>
700 </td>
701 <td class="cb-lineno ${action_class(line.modified.action)}"
701 <td class="cb-lineno ${action_class(line.modified.action)}"
702 data-line-no="${line.modified.lineno}"
702 data-line-no="${line.modified.lineno}"
703 %if new_line_anchor:
703 %if new_line_anchor:
704 id="${new_line_anchor}"
704 id="${new_line_anchor}"
705 %endif
705 %endif
706 >
706 >
707 %if line.modified.lineno:
707 %if line.modified.lineno:
708 <a name="${new_line_anchor}" href="#${new_line_anchor}">${line.modified.lineno}</a>
708 <a name="${new_line_anchor}" href="#${new_line_anchor}">${line.modified.lineno}</a>
709 %endif
709 %endif
710 </td>
710 </td>
711 <td class="cb-content ${action_class(line.modified.action)}"
711 <td class="cb-content ${action_class(line.modified.action)}"
712 data-line-no="n${line.modified.lineno}"
712 data-line-no="n${line.modified.lineno}"
713 >
713 >
714 %if use_comments and line.modified.lineno:
714 %if use_comments and line.modified.lineno:
715 ${render_add_comment_button()}
715 ${render_add_comment_button()}
716 %endif
716 %endif
717 <span class="cb-code"><span class="cb-action ${action_class(line.modified.action)}"></span>${line.modified.content or '' | n}</span>
717 <span class="cb-code"><span class="cb-action ${action_class(line.modified.action)}"></span>${line.modified.content or '' | n}</span>
718 %if use_comments and line.modified.lineno and line_new_comments:
718 %if use_comments and line.modified.lineno and line_new_comments:
719 ${inline_comments_container(line_new_comments, active_pattern_entries=active_pattern_entries)}
719 ${inline_comments_container(line_new_comments, active_pattern_entries=active_pattern_entries)}
720 %endif
720 %endif
721 </td>
721 </td>
722 </tr>
722 </tr>
723 %endfor
723 %endfor
724 </%def>
724 </%def>
725
725
726
726
727 <%def name="render_hunk_lines_unified(filediff, hunk, use_comments=False, inline_comments=None, active_pattern_entries=None)">
727 <%def name="render_hunk_lines_unified(filediff, hunk, use_comments=False, inline_comments=None, active_pattern_entries=None)">
728 %for old_line_no, new_line_no, action, content, comments_args in hunk.unified:
728 %for old_line_no, new_line_no, action, content, comments_args in hunk.unified:
729
729
730 <%
730 <%
731 old_line_anchor, new_line_anchor = None, None
731 old_line_anchor, new_line_anchor = None, None
732 if old_line_no:
732 if old_line_no:
733 old_line_anchor = diff_line_anchor(filediff.raw_id, hunk.source_file_path, old_line_no, 'o')
733 old_line_anchor = diff_line_anchor(filediff.raw_id, hunk.source_file_path, old_line_no, 'o')
734 if new_line_no:
734 if new_line_no:
735 new_line_anchor = diff_line_anchor(filediff.raw_id, hunk.target_file_path, new_line_no, 'n')
735 new_line_anchor = diff_line_anchor(filediff.raw_id, hunk.target_file_path, new_line_no, 'n')
736 %>
736 %>
737 <tr class="cb-line">
737 <tr class="cb-line">
738 <td class="cb-data ${action_class(action)}">
738 <td class="cb-data ${action_class(action)}">
739 <div>
739 <div>
740
740
741 %if comments_args:
741 %if comments_args:
742 <% comments = get_comments_for('unified', inline_comments, *comments_args) %>
742 <% comments = get_comments_for('unified', inline_comments, *comments_args) %>
743 %else:
743 %else:
744 <% comments = None %>
744 <% comments = None %>
745 %endif
745 %endif
746
746
747 % if comments:
747 % if comments:
748 <% has_outdated = any([x.outdated for x in comments]) %>
748 <% has_outdated = any([x.outdated for x in comments]) %>
749 % if has_outdated:
749 % if has_outdated:
750 <i title="${_('comments including outdated')}:${len(comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
750 <i title="${_('comments including outdated')}:${len(comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
751 % else:
751 % else:
752 <i title="${_('comments')}: ${len(comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
752 <i title="${_('comments')}: ${len(comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
753 % endif
753 % endif
754 % endif
754 % endif
755 </div>
755 </div>
756 </td>
756 </td>
757 <td class="cb-lineno ${action_class(action)}"
757 <td class="cb-lineno ${action_class(action)}"
758 data-line-no="${old_line_no}"
758 data-line-no="${old_line_no}"
759 %if old_line_anchor:
759 %if old_line_anchor:
760 id="${old_line_anchor}"
760 id="${old_line_anchor}"
761 %endif
761 %endif
762 >
762 >
763 %if old_line_anchor:
763 %if old_line_anchor:
764 <a name="${old_line_anchor}" href="#${old_line_anchor}">${old_line_no}</a>
764 <a name="${old_line_anchor}" href="#${old_line_anchor}">${old_line_no}</a>
765 %endif
765 %endif
766 </td>
766 </td>
767 <td class="cb-lineno ${action_class(action)}"
767 <td class="cb-lineno ${action_class(action)}"
768 data-line-no="${new_line_no}"
768 data-line-no="${new_line_no}"
769 %if new_line_anchor:
769 %if new_line_anchor:
770 id="${new_line_anchor}"
770 id="${new_line_anchor}"
771 %endif
771 %endif
772 >
772 >
773 %if new_line_anchor:
773 %if new_line_anchor:
774 <a name="${new_line_anchor}" href="#${new_line_anchor}">${new_line_no}</a>
774 <a name="${new_line_anchor}" href="#${new_line_anchor}">${new_line_no}</a>
775 %endif
775 %endif
776 </td>
776 </td>
777 <td class="cb-content ${action_class(action)}"
777 <td class="cb-content ${action_class(action)}"
778 data-line-no="${(new_line_no and 'n' or 'o')}${(new_line_no or old_line_no)}"
778 data-line-no="${(new_line_no and 'n' or 'o')}${(new_line_no or old_line_no)}"
779 >
779 >
780 %if use_comments:
780 %if use_comments:
781 ${render_add_comment_button()}
781 ${render_add_comment_button()}
782 %endif
782 %endif
783 <span class="cb-code"><span class="cb-action ${action_class(action)}"></span> ${content or '' | n}</span>
783 <span class="cb-code"><span class="cb-action ${action_class(action)}"></span> ${content or '' | n}</span>
784 %if use_comments and comments:
784 %if use_comments and comments:
785 ${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)}
785 ${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)}
786 %endif
786 %endif
787 </td>
787 </td>
788 </tr>
788 </tr>
789 %endfor
789 %endfor
790 </%def>
790 </%def>
791
791
792
792
793 <%def name="render_hunk_lines(filediff, diff_mode, hunk, use_comments, inline_comments, active_pattern_entries)">
793 <%def name="render_hunk_lines(filediff, diff_mode, hunk, use_comments, inline_comments, active_pattern_entries)">
794 % if diff_mode == 'unified':
794 % if diff_mode == 'unified':
795 ${render_hunk_lines_unified(filediff, hunk, use_comments=use_comments, inline_comments=inline_comments, active_pattern_entries=active_pattern_entries)}
795 ${render_hunk_lines_unified(filediff, hunk, use_comments=use_comments, inline_comments=inline_comments, active_pattern_entries=active_pattern_entries)}
796 % elif diff_mode == 'sideside':
796 % elif diff_mode == 'sideside':
797 ${render_hunk_lines_sideside(filediff, hunk, use_comments=use_comments, inline_comments=inline_comments, active_pattern_entries=active_pattern_entries)}
797 ${render_hunk_lines_sideside(filediff, hunk, use_comments=use_comments, inline_comments=inline_comments, active_pattern_entries=active_pattern_entries)}
798 % else:
798 % else:
799 <tr class="cb-line">
799 <tr class="cb-line">
800 <td>unknown diff mode</td>
800 <td>unknown diff mode</td>
801 </tr>
801 </tr>
802 % endif
802 % endif
803 </%def>file changes
803 </%def>file changes
804
804
805
805
806 <%def name="render_add_comment_button()">
806 <%def name="render_add_comment_button()">
807 <button class="btn btn-small btn-primary cb-comment-box-opener" onclick="return Rhodecode.comments.createComment(this)">
807 <button class="btn btn-small btn-primary cb-comment-box-opener" onclick="return Rhodecode.comments.createComment(this)">
808 <span><i class="icon-comment"></i></span>
808 <span><i class="icon-comment"></i></span>
809 </button>
809 </button>
810 </%def>
810 </%def>
811
811
812 <%def name="render_diffset_menu(diffset, range_diff_on=None)">
812 <%def name="render_diffset_menu(diffset, range_diff_on=None)">
813 <% diffset_container_id = h.md5(diffset.target_ref) %>
813 <% diffset_container_id = h.md5(diffset.target_ref) %>
814
814
815 <div id="diff-file-sticky" class="diffset-menu clearinner">
815 <div id="diff-file-sticky" class="diffset-menu clearinner">
816 ## auto adjustable
816 ## auto adjustable
817 <div class="sidebar__inner">
817 <div class="sidebar__inner">
818 <div class="sidebar__bar">
818 <div class="sidebar__bar">
819 <div class="pull-right">
819 <div class="pull-right">
820 <div class="btn-group">
820 <div class="btn-group">
821 <a class="btn tooltip toggle-wide-diff" href="#toggle-wide-diff" onclick="toggleWideDiff(this); return false" title="${h.tooltip(_('Toggle wide diff'))}">
821 <a class="btn tooltip toggle-wide-diff" href="#toggle-wide-diff" onclick="toggleWideDiff(this); return false" title="${h.tooltip(_('Toggle wide diff'))}">
822 <i class="icon-wide-mode"></i>
822 <i class="icon-wide-mode"></i>
823 </a>
823 </a>
824 </div>
824 </div>
825 <div class="btn-group">
825 <div class="btn-group">
826
826
827 <a
827 <a
828 class="btn ${(c.user_session_attrs["diffmode"] == 'sideside' and 'btn-active')} tooltip"
828 class="btn ${(c.user_session_attrs["diffmode"] == 'sideside' and 'btn-active')} tooltip"
829 title="${h.tooltip(_('View diff as side by side'))}"
829 title="${h.tooltip(_('View diff as side by side'))}"
830 href="${h.current_route_path(request, diffmode='sideside')}">
830 href="${h.current_route_path(request, diffmode='sideside')}">
831 <span>${_('Side by Side')}</span>
831 <span>${_('Side by Side')}</span>
832 </a>
832 </a>
833
833
834 <a
834 <a
835 class="btn ${(c.user_session_attrs["diffmode"] == 'unified' and 'btn-active')} tooltip"
835 class="btn ${(c.user_session_attrs["diffmode"] == 'unified' and 'btn-active')} tooltip"
836 title="${h.tooltip(_('View diff as unified'))}" href="${h.current_route_path(request, diffmode='unified')}">
836 title="${h.tooltip(_('View diff as unified'))}" href="${h.current_route_path(request, diffmode='unified')}">
837 <span>${_('Unified')}</span>
837 <span>${_('Unified')}</span>
838 </a>
838 </a>
839
839
840 % if range_diff_on is True:
840 % if range_diff_on is True:
841 <a
841 <a
842 title="${_('Turn off: Show the diff as commit range')}"
842 title="${_('Turn off: Show the diff as commit range')}"
843 class="btn btn-primary"
843 class="btn btn-primary"
844 href="${h.current_route_path(request, **{"range-diff":"0"})}">
844 href="${h.current_route_path(request, **{"range-diff":"0"})}">
845 <span>${_('Range Diff')}</span>
845 <span>${_('Range Diff')}</span>
846 </a>
846 </a>
847 % elif range_diff_on is False:
847 % elif range_diff_on is False:
848 <a
848 <a
849 title="${_('Show the diff as commit range')}"
849 title="${_('Show the diff as commit range')}"
850 class="btn"
850 class="btn"
851 href="${h.current_route_path(request, **{"range-diff":"1"})}">
851 href="${h.current_route_path(request, **{"range-diff":"1"})}">
852 <span>${_('Range Diff')}</span>
852 <span>${_('Range Diff')}</span>
853 </a>
853 </a>
854 % endif
854 % endif
855 </div>
855 </div>
856 <div class="btn-group">
856 <div class="btn-group">
857
857
858 <div class="pull-left">
858 <div class="pull-left">
859 ${h.hidden('diff_menu_{}'.format(diffset_container_id))}
859 ${h.hidden('diff_menu_{}'.format(diffset_container_id))}
860 </div>
860 </div>
861
861
862 </div>
862 </div>
863 </div>
863 </div>
864 <div class="pull-left">
864 <div class="pull-left">
865 <div class="btn-group">
865 <div class="btn-group">
866 <div class="pull-left">
866 <div class="pull-left">
867 ${h.hidden('file_filter_{}'.format(diffset_container_id))}
867 ${h.hidden('file_filter_{}'.format(diffset_container_id))}
868 </div>
868 </div>
869
869
870 </div>
870 </div>
871 </div>
871 </div>
872 </div>
872 </div>
873 <div class="fpath-placeholder">
873 <div class="fpath-placeholder">
874 <i class="icon-file-text"></i>
874 <i class="icon-file-text"></i>
875 <strong class="fpath-placeholder-text">
875 <strong class="fpath-placeholder-text">
876 Context file:
876 Context file:
877 </strong>
877 </strong>
878 </div>
878 </div>
879 <div class="sidebar_inner_shadow"></div>
879 <div class="sidebar_inner_shadow"></div>
880 </div>
880 </div>
881 </div>
881 </div>
882
882
883 % if diffset:
883 % if diffset:
884 %if diffset.limited_diff:
884 %if diffset.limited_diff:
885 <% file_placeholder = _ungettext('%(num)s file changed', '%(num)s files changed', diffset.changed_files) % {'num': diffset.changed_files} %>
885 <% file_placeholder = _ungettext('%(num)s file changed', '%(num)s files changed', diffset.changed_files) % {'num': diffset.changed_files} %>
886 %else:
886 %else:
887 <% file_placeholder = h.literal(_ungettext('%(num)s file changed: <span class="op-added">%(linesadd)s inserted</span>, <span class="op-deleted">%(linesdel)s deleted</span>', '%(num)s files changed: <span class="op-added">%(linesadd)s inserted</span>, <span class="op-deleted">%(linesdel)s deleted</span>',
887 <% file_placeholder = h.literal(_ungettext('%(num)s file changed: <span class="op-added">%(linesadd)s inserted</span>, <span class="op-deleted">%(linesdel)s deleted</span>', '%(num)s files changed: <span class="op-added">%(linesadd)s inserted</span>, <span class="op-deleted">%(linesdel)s deleted</span>',
888 diffset.changed_files) % {'num': diffset.changed_files, 'linesadd': diffset.lines_added, 'linesdel': diffset.lines_deleted}) %>
888 diffset.changed_files) % {'num': diffset.changed_files, 'linesadd': diffset.lines_added, 'linesdel': diffset.lines_deleted}) %>
889
889
890 %endif
890 %endif
891 ## case on range-diff placeholder needs to be updated
891 ## case on range-diff placeholder needs to be updated
892 % if range_diff_on is True:
892 % if range_diff_on is True:
893 <% file_placeholder = _('Disabled on range diff') %>
893 <% file_placeholder = _('Disabled on range diff') %>
894 % endif
894 % endif
895
895
896 <script type="text/javascript">
896 <script type="text/javascript">
897 var feedFilesOptions = function (query, initialData) {
897 var feedFilesOptions = function (query, initialData) {
898 var data = {results: []};
898 var data = {results: []};
899 var isQuery = typeof query.term !== 'undefined';
899 var isQuery = typeof query.term !== 'undefined';
900
900
901 var section = _gettext('Changed files');
901 var section = _gettext('Changed files');
902 var filteredData = [];
902 var filteredData = [];
903
903
904 //filter results
904 //filter results
905 $.each(initialData.results, function (idx, value) {
905 $.each(initialData.results, function (idx, value) {
906
906
907 if (!isQuery || query.term.length === 0 || value.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0) {
907 if (!isQuery || query.term.length === 0 || value.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0) {
908 filteredData.push({
908 filteredData.push({
909 'id': this.id,
909 'id': this.id,
910 'text': this.text,
910 'text': this.text,
911 "ops": this.ops,
911 "ops": this.ops,
912 })
912 })
913 }
913 }
914
914
915 });
915 });
916
916
917 data.results = filteredData;
917 data.results = filteredData;
918
918
919 query.callback(data);
919 query.callback(data);
920 };
920 };
921
921
922 var selectionFormatter = function(data, escapeMarkup) {
922 var selectionFormatter = function(data, escapeMarkup) {
923 var container = '<div class="filelist" style="padding-right:100px">{0}</div>';
923 var container = '<div class="filelist" style="padding-right:100px">{0}</div>';
924 var tmpl = '<div><strong>{0}</strong></div>'.format(escapeMarkup(data['text']));
924 var tmpl = '<div><strong>{0}</strong></div>'.format(escapeMarkup(data['text']));
925 var pill = '<div class="pill-group" style="position: absolute; top:7px; right: 0">' +
925 var pill = '<div class="pill-group" style="position: absolute; top:7px; right: 0">' +
926 '<span class="pill" op="added">{0}</span>' +
926 '<span class="pill" op="added">{0}</span>' +
927 '<span class="pill" op="deleted">{1}</span>' +
927 '<span class="pill" op="deleted">{1}</span>' +
928 '</div>'
928 '</div>'
929 ;
929 ;
930 var added = data['ops']['added'];
930 var added = data['ops']['added'];
931 if (added === 0) {
931 if (added === 0) {
932 // don't show +0
932 // don't show +0
933 added = 0;
933 added = 0;
934 } else {
934 } else {
935 added = '+' + added;
935 added = '+' + added;
936 }
936 }
937
937
938 var deleted = -1*data['ops']['deleted'];
938 var deleted = -1*data['ops']['deleted'];
939
939
940 tmpl += pill.format(added, deleted);
940 tmpl += pill.format(added, deleted);
941 return container.format(tmpl);
941 return container.format(tmpl);
942 };
942 };
943 var formatFileResult = function(result, container, query, escapeMarkup) {
943 var formatFileResult = function(result, container, query, escapeMarkup) {
944 return selectionFormatter(result, escapeMarkup);
944 return selectionFormatter(result, escapeMarkup);
945 };
945 };
946
946
947 var formatSelection = function (data, container) {
947 var formatSelection = function (data, container) {
948 return '${file_placeholder}'
948 return '${file_placeholder}'
949 };
949 };
950
950
951 if (window.preloadFileFilterData === undefined) {
951 if (window.preloadFileFilterData === undefined) {
952 window.preloadFileFilterData = {}
952 window.preloadFileFilterData = {}
953 }
953 }
954
954
955 preloadFileFilterData["${diffset_container_id}"] = {
955 preloadFileFilterData["${diffset_container_id}"] = {
956 results: [
956 results: [
957 % for filediff in diffset.files:
957 % for filediff in diffset.files:
958 {id:"a_${h.FID(filediff.raw_id, filediff.patch['filename'])}",
958 {id:"a_${h.FID(filediff.raw_id, filediff.patch['filename'])}",
959 text:"${filediff.patch['filename']}",
959 text:"${filediff.patch['filename']}",
960 ops:${h.json.dumps(filediff.patch['stats'])|n}}${('' if loop.last else ',')}
960 ops:${h.json.dumps(filediff.patch['stats'])|n}}${('' if loop.last else ',')}
961 % endfor
961 % endfor
962 ]
962 ]
963 };
963 };
964
964
965 var diffFileFilterId = "#file_filter_" + "${diffset_container_id}";
965 var diffFileFilterId = "#file_filter_" + "${diffset_container_id}";
966 var diffFileFilter = $(diffFileFilterId).select2({
966 var diffFileFilter = $(diffFileFilterId).select2({
967 'dropdownAutoWidth': true,
967 'dropdownAutoWidth': true,
968 'width': 'auto',
968 'width': 'auto',
969
969
970 containerCssClass: "drop-menu",
970 containerCssClass: "drop-menu",
971 dropdownCssClass: "drop-menu-dropdown",
971 dropdownCssClass: "drop-menu-dropdown",
972 data: preloadFileFilterData["${diffset_container_id}"],
972 data: preloadFileFilterData["${diffset_container_id}"],
973 query: function(query) {
973 query: function(query) {
974 feedFilesOptions(query, preloadFileFilterData["${diffset_container_id}"]);
974 feedFilesOptions(query, preloadFileFilterData["${diffset_container_id}"]);
975 },
975 },
976 initSelection: function(element, callback) {
976 initSelection: function(element, callback) {
977 callback({'init': true});
977 callback({'init': true});
978 },
978 },
979 formatResult: formatFileResult,
979 formatResult: formatFileResult,
980 formatSelection: formatSelection
980 formatSelection: formatSelection
981 });
981 });
982
982
983 % if range_diff_on is True:
983 % if range_diff_on is True:
984 diffFileFilter.select2("enable", false);
984 diffFileFilter.select2("enable", false);
985 % endif
985 % endif
986
986
987 $(diffFileFilterId).on('select2-selecting', function (e) {
987 $(diffFileFilterId).on('select2-selecting', function (e) {
988 var idSelector = e.choice.id;
988 var idSelector = e.choice.id;
989
989
990 // expand the container if we quick-select the field
990 // expand the container if we quick-select the field
991 $('#'+idSelector).next().prop('checked', false);
991 $('#'+idSelector).next().prop('checked', false);
992 // hide the mast as we later do preventDefault()
992 // hide the mast as we later do preventDefault()
993 $("#select2-drop-mask").click();
993 $("#select2-drop-mask").click();
994
994
995 window.location.hash = '#'+idSelector;
995 window.location.hash = '#'+idSelector;
996 updateSticky();
996 updateSticky();
997
997
998 e.preventDefault();
998 e.preventDefault();
999 });
999 });
1000
1000
1001 </script>
1001 </script>
1002 % endif
1002 % endif
1003
1003
1004 <script type="text/javascript">
1004 <script type="text/javascript">
1005 $(document).ready(function () {
1005 $(document).ready(function () {
1006
1006
1007 var contextPrefix = _gettext('Context file: ');
1007 var contextPrefix = _gettext('Context file: ');
1008 ## sticky sidebar
1008 ## sticky sidebar
1009 var sidebarElement = document.getElementById('diff-file-sticky');
1009 var sidebarElement = document.getElementById('diff-file-sticky');
1010 sidebar = new StickySidebar(sidebarElement, {
1010 sidebar = new StickySidebar(sidebarElement, {
1011 topSpacing: 0,
1011 topSpacing: 0,
1012 bottomSpacing: 0,
1012 bottomSpacing: 0,
1013 innerWrapperSelector: '.sidebar__inner'
1013 innerWrapperSelector: '.sidebar__inner'
1014 });
1014 });
1015 sidebarElement.addEventListener('affixed.static.stickySidebar', function () {
1015 sidebarElement.addEventListener('affixed.static.stickySidebar', function () {
1016 // reset our file so it's not holding new value
1016 // reset our file so it's not holding new value
1017 $('.fpath-placeholder-text').html(contextPrefix + ' - ')
1017 $('.fpath-placeholder-text').html(contextPrefix + ' - ')
1018 });
1018 });
1019
1019
1020 updateSticky = function () {
1020 updateSticky = function () {
1021 sidebar.updateSticky();
1021 sidebar.updateSticky();
1022 Waypoint.refreshAll();
1022 Waypoint.refreshAll();
1023 };
1023 };
1024
1024
1025 var animateText = function (fPath, anchorId) {
1025 var animateText = function (fPath, anchorId) {
1026 fPath = Select2.util.escapeMarkup(fPath);
1026 fPath = Select2.util.escapeMarkup(fPath);
1027 $('.fpath-placeholder-text').html(contextPrefix + '<a href="#a_' + anchorId + '">' + fPath + '</a>')
1027 $('.fpath-placeholder-text').html(contextPrefix + '<a href="#a_' + anchorId + '">' + fPath + '</a>')
1028 };
1028 };
1029
1029
1030 ## dynamic file waypoints
1030 ## dynamic file waypoints
1031 var setFPathInfo = function(fPath, anchorId){
1031 var setFPathInfo = function(fPath, anchorId){
1032 animateText(fPath, anchorId)
1032 animateText(fPath, anchorId)
1033 };
1033 };
1034
1034
1035 var codeBlock = $('.filediff');
1035 var codeBlock = $('.filediff');
1036
1036
1037 // forward waypoint
1037 // forward waypoint
1038 codeBlock.waypoint(
1038 codeBlock.waypoint(
1039 function(direction) {
1039 function(direction) {
1040 if (direction === "down"){
1040 if (direction === "down"){
1041 setFPathInfo($(this.element).data('fPath'), $(this.element).data('anchorId'))
1041 setFPathInfo($(this.element).data('fPath'), $(this.element).data('anchorId'))
1042 }
1042 }
1043 }, {
1043 }, {
1044 offset: function () {
1044 offset: function () {
1045 return 70;
1045 return 70;
1046 },
1046 },
1047 context: '.fpath-placeholder'
1047 context: '.fpath-placeholder'
1048 }
1048 }
1049 );
1049 );
1050
1050
1051 // backward waypoint
1051 // backward waypoint
1052 codeBlock.waypoint(
1052 codeBlock.waypoint(
1053 function(direction) {
1053 function(direction) {
1054 if (direction === "up"){
1054 if (direction === "up"){
1055 setFPathInfo($(this.element).data('fPath'), $(this.element).data('anchorId'))
1055 setFPathInfo($(this.element).data('fPath'), $(this.element).data('anchorId'))
1056 }
1056 }
1057 }, {
1057 }, {
1058 offset: function () {
1058 offset: function () {
1059 return -this.element.clientHeight + 90;
1059 return -this.element.clientHeight + 90;
1060 },
1060 },
1061 context: '.fpath-placeholder'
1061 context: '.fpath-placeholder'
1062 }
1062 }
1063 );
1063 );
1064
1064
1065 toggleWideDiff = function (el) {
1065 toggleWideDiff = function (el) {
1066 updateSticky();
1066 updateSticky();
1067 var wide = Rhodecode.comments.toggleWideMode(this);
1067 var wide = Rhodecode.comments.toggleWideMode(this);
1068 storeUserSessionAttr('rc_user_session_attr.wide_diff_mode', wide);
1068 storeUserSessionAttr('rc_user_session_attr.wide_diff_mode', wide);
1069 if (wide === true) {
1069 if (wide === true) {
1070 $(el).addClass('btn-active');
1070 $(el).addClass('btn-active');
1071 } else {
1071 } else {
1072 $(el).removeClass('btn-active');
1072 $(el).removeClass('btn-active');
1073 }
1073 }
1074 return null;
1074 return null;
1075 };
1075 };
1076
1076
1077 var preloadDiffMenuData = {
1077 var preloadDiffMenuData = {
1078 results: [
1078 results: [
1079
1079
1080 ## Whitespace change
1080 ## Whitespace change
1081 % if request.GET.get('ignorews', '') == '1':
1081 % if request.GET.get('ignorews', '') == '1':
1082 {
1082 {
1083 id: 2,
1083 id: 2,
1084 text: _gettext('Show whitespace changes'),
1084 text: _gettext('Show whitespace changes'),
1085 action: function () {},
1085 action: function () {},
1086 url: "${h.current_route_path(request, ignorews=0)|n}"
1086 url: "${h.current_route_path(request, ignorews=0)|n}"
1087 },
1087 },
1088 % else:
1088 % else:
1089 {
1089 {
1090 id: 2,
1090 id: 2,
1091 text: _gettext('Hide whitespace changes'),
1091 text: _gettext('Hide whitespace changes'),
1092 action: function () {},
1092 action: function () {},
1093 url: "${h.current_route_path(request, ignorews=1)|n}"
1093 url: "${h.current_route_path(request, ignorews=1)|n}"
1094 },
1094 },
1095 % endif
1095 % endif
1096
1096
1097 ## FULL CONTEXT
1097 ## FULL CONTEXT
1098 % if request.GET.get('fullcontext', '') == '1':
1098 % if request.GET.get('fullcontext', '') == '1':
1099 {
1099 {
1100 id: 3,
1100 id: 3,
1101 text: _gettext('Hide full context diff'),
1101 text: _gettext('Hide full context diff'),
1102 action: function () {},
1102 action: function () {},
1103 url: "${h.current_route_path(request, fullcontext=0)|n}"
1103 url: "${h.current_route_path(request, fullcontext=0)|n}"
1104 },
1104 },
1105 % else:
1105 % else:
1106 {
1106 {
1107 id: 3,
1107 id: 3,
1108 text: _gettext('Show full context diff'),
1108 text: _gettext('Show full context diff'),
1109 action: function () {},
1109 action: function () {},
1110 url: "${h.current_route_path(request, fullcontext=1)|n}"
1110 url: "${h.current_route_path(request, fullcontext=1)|n}"
1111 },
1111 },
1112 % endif
1112 % endif
1113
1113
1114 ]
1114 ]
1115 };
1115 };
1116
1116
1117 var diffMenuId = "#diff_menu_" + "${diffset_container_id}";
1117 var diffMenuId = "#diff_menu_" + "${diffset_container_id}";
1118 $(diffMenuId).select2({
1118 $(diffMenuId).select2({
1119 minimumResultsForSearch: -1,
1119 minimumResultsForSearch: -1,
1120 containerCssClass: "drop-menu-no-width",
1120 containerCssClass: "drop-menu-no-width",
1121 dropdownCssClass: "drop-menu-dropdown",
1121 dropdownCssClass: "drop-menu-dropdown",
1122 dropdownAutoWidth: true,
1122 dropdownAutoWidth: true,
1123 data: preloadDiffMenuData,
1123 data: preloadDiffMenuData,
1124 placeholder: "${_('...')}",
1124 placeholder: "${_('...')}",
1125 });
1125 });
1126 $(diffMenuId).on('select2-selecting', function (e) {
1126 $(diffMenuId).on('select2-selecting', function (e) {
1127 e.choice.action();
1127 e.choice.action();
1128 if (e.choice.url !== null) {
1128 if (e.choice.url !== null) {
1129 window.location = e.choice.url
1129 window.location = e.choice.url
1130 }
1130 }
1131 });
1131 });
1132 toggleExpand = function (el, diffsetEl) {
1132 toggleExpand = function (el, diffsetEl) {
1133 var el = $(el);
1133 var el = $(el);
1134 if (el.hasClass('collapsed')) {
1134 if (el.hasClass('collapsed')) {
1135 $('.filediff-collapse-state.collapse-{0}'.format(diffsetEl)).prop('checked', false);
1135 $('.filediff-collapse-state.collapse-{0}'.format(diffsetEl)).prop('checked', false);
1136 el.removeClass('collapsed');
1136 el.removeClass('collapsed');
1137 el.html(
1137 el.html(
1138 '<i class="icon-minus-squared-alt icon-no-margin"></i>' +
1138 '<i class="icon-minus-squared-alt icon-no-margin"></i>' +
1139 _gettext('Collapse all files'));
1139 _gettext('Collapse all files'));
1140 }
1140 }
1141 else {
1141 else {
1142 $('.filediff-collapse-state.collapse-{0}'.format(diffsetEl)).prop('checked', true);
1142 $('.filediff-collapse-state.collapse-{0}'.format(diffsetEl)).prop('checked', true);
1143 el.addClass('collapsed');
1143 el.addClass('collapsed');
1144 el.html(
1144 el.html(
1145 '<i class="icon-plus-squared-alt icon-no-margin"></i>' +
1145 '<i class="icon-plus-squared-alt icon-no-margin"></i>' +
1146 _gettext('Expand all files'));
1146 _gettext('Expand all files'));
1147 }
1147 }
1148 updateSticky()
1148 updateSticky()
1149 };
1149 };
1150
1150
1151 toggleCommitExpand = function (el) {
1151 toggleCommitExpand = function (el) {
1152 var $el = $(el);
1152 var $el = $(el);
1153 var commits = $el.data('toggleCommitsCnt');
1153 var commits = $el.data('toggleCommitsCnt');
1154 var collapseMsg = _ngettext('Collapse {0} commit', 'Collapse {0} commits', commits).format(commits);
1154 var collapseMsg = _ngettext('Collapse {0} commit', 'Collapse {0} commits', commits).format(commits);
1155 var expandMsg = _ngettext('Expand {0} commit', 'Expand {0} commits', commits).format(commits);
1155 var expandMsg = _ngettext('Expand {0} commit', 'Expand {0} commits', commits).format(commits);
1156
1156
1157 if ($el.hasClass('collapsed')) {
1157 if ($el.hasClass('collapsed')) {
1158 $('.compare_select').show();
1158 $('.compare_select').show();
1159 $('.compare_select_hidden').hide();
1159 $('.compare_select_hidden').hide();
1160
1160
1161 $el.removeClass('collapsed');
1161 $el.removeClass('collapsed');
1162 $el.html(
1162 $el.html(
1163 '<i class="icon-minus-squared-alt icon-no-margin"></i>' +
1163 '<i class="icon-minus-squared-alt icon-no-margin"></i>' +
1164 collapseMsg);
1164 collapseMsg);
1165 }
1165 }
1166 else {
1166 else {
1167 $('.compare_select').hide();
1167 $('.compare_select').hide();
1168 $('.compare_select_hidden').show();
1168 $('.compare_select_hidden').show();
1169 $el.addClass('collapsed');
1169 $el.addClass('collapsed');
1170 $el.html(
1170 $el.html(
1171 '<i class="icon-plus-squared-alt icon-no-margin"></i>' +
1171 '<i class="icon-plus-squared-alt icon-no-margin"></i>' +
1172 expandMsg);
1172 expandMsg);
1173 }
1173 }
1174 updateSticky();
1174 updateSticky();
1175 };
1175 };
1176
1176
1177 // get stored diff mode and pre-enable it
1177 // get stored diff mode and pre-enable it
1178 if (templateContext.session_attrs.wide_diff_mode === "true") {
1178 if (templateContext.session_attrs.wide_diff_mode === "true") {
1179 Rhodecode.comments.toggleWideMode(null);
1179 Rhodecode.comments.toggleWideMode(null);
1180 $('.toggle-wide-diff').addClass('btn-active');
1180 $('.toggle-wide-diff').addClass('btn-active');
1181 updateSticky();
1181 updateSticky();
1182 }
1182 }
1183 });
1183 });
1184 </script>
1184 </script>
1185
1185
1186 </%def>
1186 </%def>
@@ -1,176 +1,177 b''
1 <%namespace name="sourceblock" file="/codeblocks/source.mako"/>
1 <%namespace name="sourceblock" file="/codeblocks/source.mako"/>
2
2
3 <div id="codeblock" class="browserblock">
3 <div id="codeblock" class="browserblock">
4 <div class="browser-header">
4 <div class="browser-header">
5 <div class="browser-nav">
5 <div class="browser-nav">
6 <div class="pull-left">
6 <div class="pull-left">
7 ## loads the history for a file
7 ## loads the history for a file
8 ${h.hidden('file_refs_filter')}
8 ${h.hidden('file_refs_filter')}
9 </div>
9 </div>
10
10
11 <div class="pull-right">
11 <div class="pull-right">
12
12
13 ## Download
13 ## Download
14 % if c.lf_node:
14 % if c.lf_node:
15 <a class="btn btn-default" href="${h.route_path('repo_file_download',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path, _query=dict(lf=1))}">
15 <a class="btn btn-default" href="${h.route_path('repo_file_download',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path, _query=dict(lf=1))}">
16 ${_('Download largefile')}
16 ${_('Download largefile')}
17 </a>
17 </a>
18 % else:
18 % else:
19 <a class="btn btn-default" href="${h.route_path('repo_file_download',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path)}">
19 <a class="btn btn-default" href="${h.route_path('repo_file_download',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path)}">
20 ${_('Download file')}
20 ${_('Download file')}
21 </a>
21 </a>
22 % endif
22 % endif
23
23
24 %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
24 %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
25 ## on branch head, can edit files
25 ## on branch head, can edit files
26 %if c.on_branch_head and c.branch_or_raw_id:
26 %if c.on_branch_head and c.branch_or_raw_id:
27 ## binary files are delete only
27 ## binary files are delete only
28 % if c.file.is_binary:
28 % if c.file.is_binary:
29 ${h.link_to(_('Edit'), '#Edit', class_="btn btn-default disabled tooltip", title=_('Editing binary files not allowed'))}
29 ${h.link_to(_('Edit'), '#Edit', class_="btn btn-default disabled tooltip", title=_('Editing binary files not allowed'))}
30 ${h.link_to(_('Delete'), h.route_path('repo_files_remove_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path),class_="btn btn-danger")}
30 ${h.link_to(_('Delete'), h.route_path('repo_files_remove_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path),class_="btn btn-danger")}
31 % else:
31 % else:
32 <a class="btn btn-default" href="${h.route_path('repo_files_edit_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path)}">
32 <a class="btn btn-default" href="${h.route_path('repo_files_edit_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path)}">
33 ${_('Edit on branch: ')}<code>${c.branch_name}</code>
33 ${_('Edit on branch: ')}<code>${c.branch_name}</code>
34 </a>
34 </a>
35
35
36 <a class="btn btn-danger" href="${h.route_path('repo_files_remove_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path)}">
36 <a class="btn btn-danger" href="${h.route_path('repo_files_remove_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path)}">
37 ${_('Delete')}
37 ${_('Delete')}
38 </a>
38 </a>
39 % endif
39 % endif
40 ## not on head, forbid all
40 ## not on head, forbid all
41 % else:
41 % else:
42 ${h.link_to(_('Edit'), '#Edit', class_="btn btn-default disabled tooltip", title=_('Editing files allowed only when on branch head commit'))}
42 ${h.link_to(_('Edit'), '#Edit', class_="btn btn-default disabled tooltip", title=_('Editing files allowed only when on branch head commit'))}
43 ${h.link_to(_('Delete'), '#Delete', class_="btn btn-default btn-danger disabled tooltip", title=_('Deleting files allowed only when on branch head commit'))}
43 ${h.link_to(_('Delete'), '#Delete', class_="btn btn-default btn-danger disabled tooltip", title=_('Deleting files allowed only when on branch head commit'))}
44 % endif
44 % endif
45 %endif
45 %endif
46
46
47 </div>
47 </div>
48 </div>
48 </div>
49 <div id="file_history_container"></div>
49 <div id="file_history_container"></div>
50
50
51 </div>
51 </div>
52 </div>
52 </div>
53
53
54 <div class="codeblock">
54 <div class="codeblock">
55 <div class=" codeblock-header">
55 <div class=" codeblock-header">
56 <div class="file-filename">
56 <div class="file-filename">
57 <i class="icon-file"></i> ${c.file}
57 <i class="icon-file"></i> ${c.file}
58 </div>
58 </div>
59
59
60 <div class="file-stats">
60 <div class="file-stats">
61
61
62 <div class="stats-info">
62 <div class="stats-info">
63 <span class="stats-first-item">
63 <span class="stats-first-item">
64 % if c.file_size_too_big:
64 % if c.file_size_too_big:
65 0 ${(_('lines'))}
65 0 ${(_('lines'))}
66 % else:
66 % else:
67 ${c.file.lines()[0]} ${_ungettext('line', 'lines', c.file.lines()[0])}
67 ${c.file.lines()[0]} ${_ungettext('line', 'lines', c.file.lines()[0])}
68 % endif
68 % endif
69 </span>
69 </span>
70
70
71 <span> | ${h.format_byte_size_binary(c.file.size)}</span>
71 <span> | ${h.format_byte_size_binary(c.file.size)}</span>
72 % if c.lf_node:
72 % if c.lf_node:
73 <span title="${_('This file is a pointer to large binary file')}"> | ${_('LargeFile')} ${h.format_byte_size_binary(c.lf_node.size)} </span>
73 <span title="${_('This file is a pointer to large binary file')}"> | ${_('LargeFile')} ${h.format_byte_size_binary(c.lf_node.size)} </span>
74 % endif
74 % endif
75 <span>
75 <span>
76 | ${c.file.mimetype}
76 | ${c.file.mimetype}
77 </span>
77 </span>
78
78
79 % if not c.file_size_too_big:
79 % if not c.file_size_too_big:
80 <span> |
80 <span> |
81 ${h.get_lexer_for_filenode(c.file).__class__.__name__}
81 ${h.get_lexer_for_filenode(c.file).__class__.__name__}
82 </span>
82 </span>
83 % endif
83 % endif
84
84
85 </div>
85 </div>
86 </div>
86 </div>
87 </div>
87 </div>
88
88
89 <div class="path clear-fix">
89 <div class="path clear-fix">
90 <div class="pull-left">
90 <div class="pull-left">
91 ${h.files_breadcrumbs(c.repo_name,c.commit.raw_id,c.file.path, request.GET.get('at'))}
91 ${h.files_breadcrumbs(c.repo_name,c.commit.raw_id,c.file.path, request.GET.get('at'))}
92 </div>
92 </div>
93
93
94 <div class="pull-right stats">
94 <div class="pull-right stats">
95 <a id="file_history_overview" href="#loadHistory">
95 <a id="file_history_overview" href="#loadHistory">
96 ${_('History')}
96 ${_('History')}
97 </a>
97 </a>
98 |
98 |
99 %if c.annotate:
99 %if c.annotate:
100 ${h.link_to(_('Source'), h.route_path('repo_files', repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))}
100 ${h.link_to(_('Source'), h.route_path('repo_files', repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))}
101 %else:
101 %else:
102 ${h.link_to(_('Annotation'), h.route_path('repo_files:annotated',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))}
102 ${h.link_to(_('Annotation'), h.route_path('repo_files:annotated',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))}
103 %endif
103 %endif
104 | ${h.link_to(_('Raw'), h.route_path('repo_file_raw',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))}
104 | ${h.link_to(_('Raw'), h.route_path('repo_file_raw',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))}
105 % if not c.file.is_binary:
105 % if not c.file.is_binary:
106 |<a href="#copySource" onclick="return false;" class="no-grey clipboard-action" data-clipboard-text="${c.file.content}">${_('Copy content')}</a>
106 |<a href="#copySource" onclick="return false;" class="no-grey clipboard-action" data-clipboard-text="${c.file.content}">${_('Copy content')}</a>
107 |<a href="#copySource" onclick="return false;" class="no-grey clipboard-action" data-clipboard-text="${h.route_url('repo_files', repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path)}">${_('Copy permalink')}</a>
107 % endif
108 % endif
108
109
109 </div>
110 </div>
110 <div class="clear-fix"></div>
111 <div class="clear-fix"></div>
111 </div>
112 </div>
112
113
113 <div class="code-body clear-fix ">
114 <div class="code-body clear-fix ">
114 %if c.file.is_binary:
115 %if c.file.is_binary:
115 <% rendered_binary = h.render_binary(c.repo_name, c.file)%>
116 <% rendered_binary = h.render_binary(c.repo_name, c.file)%>
116 % if rendered_binary:
117 % if rendered_binary:
117 ${rendered_binary}
118 ${rendered_binary}
118 % else:
119 % else:
119 <div>
120 <div>
120 ${_('Binary file ({})').format(c.file.mimetype)}
121 ${_('Binary file ({})').format(c.file.mimetype)}
121 </div>
122 </div>
122 % endif
123 % endif
123 %else:
124 %else:
124 % if c.file_size_too_big:
125 % if c.file_size_too_big:
125 ${_('File size {} is bigger then allowed limit {}. ').format(h.format_byte_size_binary(c.file.size), h.format_byte_size_binary(c.visual.cut_off_limit_file))} ${h.link_to(_('Show as raw'),
126 ${_('File size {} is bigger then allowed limit {}. ').format(h.format_byte_size_binary(c.file.size), h.format_byte_size_binary(c.visual.cut_off_limit_file))} ${h.link_to(_('Show as raw'),
126 h.route_path('repo_file_raw',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))}
127 h.route_path('repo_file_raw',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))}
127 % else:
128 % else:
128 %if c.renderer and not c.annotate:
129 %if c.renderer and not c.annotate:
129 ## pick relative url based on renderer
130 ## pick relative url based on renderer
130 <%
131 <%
131 relative_urls = {
132 relative_urls = {
132 'raw': h.route_path('repo_file_raw',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path),
133 'raw': h.route_path('repo_file_raw',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path),
133 'standard': h.route_path('repo_files',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path),
134 'standard': h.route_path('repo_files',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path),
134 }
135 }
135 %>
136 %>
136 ${h.render(c.file.content, renderer=c.renderer, relative_urls=relative_urls)}
137 ${h.render(c.file.content, renderer=c.renderer, relative_urls=relative_urls)}
137 %else:
138 %else:
138 <table class="cb codehilite">
139 <table class="cb codehilite">
139 %if c.annotate:
140 %if c.annotate:
140 <% color_hasher = h.color_hasher() %>
141 <% color_hasher = h.color_hasher() %>
141 %for annotation, lines in c.annotated_lines:
142 %for annotation, lines in c.annotated_lines:
142 ${sourceblock.render_annotation_lines(annotation, lines, color_hasher)}
143 ${sourceblock.render_annotation_lines(annotation, lines, color_hasher)}
143 %endfor
144 %endfor
144 %else:
145 %else:
145 %for line_num, tokens in enumerate(c.lines, 1):
146 %for line_num, tokens in enumerate(c.lines, 1):
146 ${sourceblock.render_line(line_num, tokens)}
147 ${sourceblock.render_line(line_num, tokens)}
147 %endfor
148 %endfor
148 %endif
149 %endif
149 </table>
150 </table>
150 %endif
151 %endif
151 % endif
152 % endif
152 %endif
153 %endif
153 </div>
154 </div>
154
155
155 </div>
156 </div>
156
157
157 <script type="text/javascript">
158 <script type="text/javascript">
158 % if request.GET.get('mark'):
159 % if request.GET.get('mark'):
159
160
160 $(function(){
161 $(function(){
161 $(".codehilite").mark(
162 $(".codehilite").mark(
162 "${request.GET.get('mark')}",
163 "${request.GET.get('mark')}",
163 {
164 {
164 "className": 'match',
165 "className": 'match',
165 "accuracy": "complementary",
166 "accuracy": "complementary",
166 "ignorePunctuation": ":._(){}[]!'+=".split(""),
167 "ignorePunctuation": ":._(){}[]!'+=".split(""),
167 "each": function(el) {
168 "each": function(el) {
168 // and also highlight lines !
169 // and also highlight lines !
169 $($(el).closest('tr')).find('td.cb-lineno').addClass('cb-line-selected');
170 $($(el).closest('tr')).find('td.cb-lineno').addClass('cb-line-selected');
170 }
171 }
171 }
172 }
172 );
173 );
173
174
174 });
175 });
175 % endif
176 % endif
176 </script>
177 </script>
General Comments 0
You need to be logged in to leave comments. Login now