annotate rhodecode/lib/helpers.py @ 3631:10b4e34841a4 beta

Don't catch all exceptions
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 28 Mar 2013 03:34:36 +0100
parents 32cb8d45f330
children 659bd922520e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
564e40829f80 initial commit.
Marcin Kuzminski
parents:
diff changeset
1 """Helper functions
564e40829f80 initial commit.
Marcin Kuzminski
parents:
diff changeset
2
564e40829f80 initial commit.
Marcin Kuzminski
parents:
diff changeset
3 Consists of functions to typically be used within templates, but also
564e40829f80 initial commit.
Marcin Kuzminski
parents:
diff changeset
4 available to Controllers. This module is available to both as 'h'.
564e40829f80 initial commit.
Marcin Kuzminski
parents:
diff changeset
5 """
734
49eb69d78988 implemented user dashboards, and following system.
Marcin Kuzminski <marcin@python-works.com>
parents: 718
diff changeset
6 import random
49eb69d78988 implemented user dashboards, and following system.
Marcin Kuzminski <marcin@python-works.com>
parents: 718
diff changeset
7 import hashlib
966
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
8 import StringIO
1101
c1080b42a7cb fixed problem with int. chars in gravatars
Marcin Kuzminski <marcin@python-works.com>
parents: 1100
diff changeset
9 import urllib
1422
e69da281e235 fixed issues with repo pager
Marcin Kuzminski <marcin@python-works.com>
parents: 1421
diff changeset
10 import math
1837
a6a30c919513 #73 mapping of commited issues from commit message into issue tracker url.
Marcin Kuzminski <marcin@python-works.com>
parents: 1832
diff changeset
11 import logging
2674
a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options.
Marcin Kuzminski <marcin@python-works.com>
parents: 2609
diff changeset
12 import re
2836
819eb7f8a555 Implemented patch from andrewsh ref #565 Add support for {netloc} and {scheme}
Marcin Kuzminski <marcin@python-works.com>
parents: 2751
diff changeset
13 import urlparse
3070
cc7eedb5323c final implementation of #210 journal filtering.
Marcin Kuzminski <marcin@python-works.com>
parents: 3063
diff changeset
14 import textwrap
1101
c1080b42a7cb fixed problem with int. chars in gravatars
Marcin Kuzminski <marcin@python-works.com>
parents: 1100
diff changeset
15
1154
36fe593dfe4b simplified str2bool, and moved safe_unicode out of helpers since it was not html specific function
Marcin Kuzminski <marcin@python-works.com>
parents: 1115
diff changeset
16 from datetime import datetime
1716
7d1fc253549e notification to commit author + gardening
Marcin Kuzminski <marcin@python-works.com>
parents: 1676
diff changeset
17 from pygments.formatters.html import HtmlFormatter
250
be4621c6de58 Pygments code coloring rewrite, annotation was moved to vcs whitch had much better lib for that. Fixed code recognition based on mimetypes of filenodes, for better coloring.
Marcin Kuzminski <marcin@python-works.com>
parents: 165
diff changeset
18 from pygments import highlight as code_highlight
1110
5351a3a32381 #21 added optional flag to disable gravatar, and use local icon
Marcin Kuzminski <marcin@python-works.com>
parents: 1105
diff changeset
19 from pylons import url, request, config
97
be0096a02772 added helper for filesize
Marcin Kuzminski <marcin@python-works.com>
parents: 94
diff changeset
20 from pylons.i18n.translation import _, ungettext
1832
b9708d66277c fixed problem with anchor links that contains non ascii chars
Marcin Kuzminski <marcin@python-works.com>
parents: 1818
diff changeset
21 from hashlib import md5
1022
4f834b0abcd3 Code refactor number 2
Marcin Kuzminski <marcin@python-works.com>
parents: 1009
diff changeset
22
250
be4621c6de58 Pygments code coloring rewrite, annotation was moved to vcs whitch had much better lib for that. Fixed code recognition based on mimetypes of filenodes, for better coloring.
Marcin Kuzminski <marcin@python-works.com>
parents: 165
diff changeset
23 from webhelpers.html import literal, HTML, escape
281
cd2ee462fc2c implemented yui tooltip, and added it into annotation and main page.
Marcin Kuzminski <marcin@python-works.com>
parents: 278
diff changeset
24 from webhelpers.html.tools import *
98
01d0f363f36d added pygments webhelper
Marcin Kuzminski <marcin@python-works.com>
parents: 97
diff changeset
25 from webhelpers.html.builder import make_tag
250
be4621c6de58 Pygments code coloring rewrite, annotation was moved to vcs whitch had much better lib for that. Fixed code recognition based on mimetypes of filenodes, for better coloring.
Marcin Kuzminski <marcin@python-works.com>
parents: 165
diff changeset
26 from webhelpers.html.tags import auto_discovery_link, checkbox, css_classes, \
1766
Marcin Kuzminski <marcin@python-works.com>
parents: 1764
diff changeset
27 end_form, file, form, hidden, image, javascript_link, link_to, \
Marcin Kuzminski <marcin@python-works.com>
parents: 1764
diff changeset
28 link_to_if, link_to_unless, ol, required_legend, select, stylesheet_link, \
Marcin Kuzminski <marcin@python-works.com>
parents: 1764
diff changeset
29 submit, text, password, textarea, title, ul, xml_declaration, radio
Marcin Kuzminski <marcin@python-works.com>
parents: 1764
diff changeset
30 from webhelpers.html.tools import auto_link, button_to, highlight, \
Marcin Kuzminski <marcin@python-works.com>
parents: 1764
diff changeset
31 js_obfuscate, mail_to, strip_links, strip_tags, tag_re
250
be4621c6de58 Pygments code coloring rewrite, annotation was moved to vcs whitch had much better lib for that. Fixed code recognition based on mimetypes of filenodes, for better coloring.
Marcin Kuzminski <marcin@python-works.com>
parents: 165
diff changeset
32 from webhelpers.number import format_byte_size, format_bit_size
0
564e40829f80 initial commit.
Marcin Kuzminski
parents:
diff changeset
33 from webhelpers.pylonslib import Flash as _Flash
564e40829f80 initial commit.
Marcin Kuzminski
parents:
diff changeset
34 from webhelpers.pylonslib.secure_form import secure_form
250
be4621c6de58 Pygments code coloring rewrite, annotation was moved to vcs whitch had much better lib for that. Fixed code recognition based on mimetypes of filenodes, for better coloring.
Marcin Kuzminski <marcin@python-works.com>
parents: 165
diff changeset
35 from webhelpers.text import chop_at, collapse, convert_accented_entities, \
be4621c6de58 Pygments code coloring rewrite, annotation was moved to vcs whitch had much better lib for that. Fixed code recognition based on mimetypes of filenodes, for better coloring.
Marcin Kuzminski <marcin@python-works.com>
parents: 165
diff changeset
36 convert_misc_entities, lchop, plural, rchop, remove_formatting, \
281
cd2ee462fc2c implemented yui tooltip, and added it into annotation and main page.
Marcin Kuzminski <marcin@python-works.com>
parents: 278
diff changeset
37 replace_whitespace, urlify, truncate, wrap_paragraphs
635
fd63782c4426 Fixed age, for new vcs implementation. Removed all obsolete date formatters
Marcin Kuzminski <marcin@python-works.com>
parents: 631
diff changeset
38 from webhelpers.date import time_ago_in_words
1098
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
39 from webhelpers.paginate import Page
698
4cd0709b6d4b fixes #65, Added reset buttons to edit forms
Marcin Kuzminski <marcin@python-works.com>
parents: 668
diff changeset
40 from webhelpers.html.tags import _set_input_attrs, _set_id_attr, \
1676
e86191684f4b fixed some anchor id problems for changeset ranges
Marcin Kuzminski <marcin@python-works.com>
parents: 1670
diff changeset
41 convert_boolean_attrs, NotGiven, _make_safe_id_component
698
4cd0709b6d4b fixes #65, Added reset buttons to edit forms
Marcin Kuzminski <marcin@python-works.com>
parents: 668
diff changeset
42
1753
1d1ccb873d00 moved soon-to-be-deleted code from vcs to rhodecode
Marcin Kuzminski <marcin@python-works.com>
parents: 1747
diff changeset
43 from rhodecode.lib.annotate import annotate_highlight
3375
7000fc4aa569 Add option to define custom lexers for custom extensions for code highlight in rcextension module
Marcin Kuzminski <marcin@python-works.com>
parents: 3367
diff changeset
44 from rhodecode.lib.utils import repo_name_slug, get_custom_lexer
2109
8ecfed1d8f8b utils/conf
Marcin Kuzminski <marcin@python-works.com>
parents: 2028
diff changeset
45 from rhodecode.lib.utils2 import str2bool, safe_unicode, safe_str, \
3557
58dcef7eef03 Implemented show_id function that is a configurable way to display sha hashes in the changelog.
Marcin Kuzminski <marcin@python-works.com>
parents: 3540
diff changeset
46 get_changeset_safe, datetime_to_time, time_to_datetime, AttributeDict,\
58dcef7eef03 Implemented show_id function that is a configurable way to display sha hashes in the changelog.
Marcin Kuzminski <marcin@python-works.com>
parents: 3540
diff changeset
47 safe_int
1670
d2de0c2f02cd #77 code review
Marcin Kuzminski <marcin@python-works.com>
parents: 1656
diff changeset
48 from rhodecode.lib.markup_renderer import MarkupRenderer
2323
6c0f76330d91 fix for issue #450. Rhodecode no longer will crash when bad revision is present in journal data.
Marcin Kuzminski <marcin@python-works.com>
parents: 2203
diff changeset
49 from rhodecode.lib.vcs.exceptions import ChangesetDoesNotExistError
3012
58f3bba0ddc1 extend helper for better breadcrumbs for repo groups
Marcin Kuzminski <marcin@python-works.com>
parents: 2998
diff changeset
50 from rhodecode.lib.vcs.backends.base import BaseChangeset, EmptyChangeset
2445
9b623dcddb02 Format datetime in notifications according to unified function
Marcin Kuzminski <marcin@python-works.com>
parents: 2427
diff changeset
51 from rhodecode.config.conf import DATE_FORMAT, DATETIME_FORMAT
2217
76947224bf27 Implemented initial code-review status of changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2203
diff changeset
52 from rhodecode.model.changeset_status import ChangesetStatusModel
2532
19de74e33fb0 Better descriptions of given permission overview in edit user view
Marcin Kuzminski <marcin@python-works.com>
parents: 2491
diff changeset
53 from rhodecode.model.db import URL_SEP, Permission
1670
d2de0c2f02cd #77 code review
Marcin Kuzminski <marcin@python-works.com>
parents: 1656
diff changeset
54
1837
a6a30c919513 #73 mapping of commited issues from commit message into issue tracker url.
Marcin Kuzminski <marcin@python-works.com>
parents: 1832
diff changeset
55 log = logging.getLogger(__name__)
a6a30c919513 #73 mapping of commited issues from commit message into issue tracker url.
Marcin Kuzminski <marcin@python-works.com>
parents: 1832
diff changeset
56
1789
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file
Marcin Kuzminski <marcin@python-works.com>
parents: 1781
diff changeset
57
2466
7010dc12f10c Added rewritten validators module + tests
Marcin Kuzminski <marcin@python-works.com>
parents: 2447
diff changeset
58 html_escape_table = {
7010dc12f10c Added rewritten validators module + tests
Marcin Kuzminski <marcin@python-works.com>
parents: 2447
diff changeset
59 "&": "&amp;",
7010dc12f10c Added rewritten validators module + tests
Marcin Kuzminski <marcin@python-works.com>
parents: 2447
diff changeset
60 '"': "&quot;",
7010dc12f10c Added rewritten validators module + tests
Marcin Kuzminski <marcin@python-works.com>
parents: 2447
diff changeset
61 "'": "&apos;",
7010dc12f10c Added rewritten validators module + tests
Marcin Kuzminski <marcin@python-works.com>
parents: 2447
diff changeset
62 ">": "&gt;",
7010dc12f10c Added rewritten validators module + tests
Marcin Kuzminski <marcin@python-works.com>
parents: 2447
diff changeset
63 "<": "&lt;",
7010dc12f10c Added rewritten validators module + tests
Marcin Kuzminski <marcin@python-works.com>
parents: 2447
diff changeset
64 }
7010dc12f10c Added rewritten validators module + tests
Marcin Kuzminski <marcin@python-works.com>
parents: 2447
diff changeset
65
7010dc12f10c Added rewritten validators module + tests
Marcin Kuzminski <marcin@python-works.com>
parents: 2447
diff changeset
66
7010dc12f10c Added rewritten validators module + tests
Marcin Kuzminski <marcin@python-works.com>
parents: 2447
diff changeset
67 def html_escape(text):
7010dc12f10c Added rewritten validators module + tests
Marcin Kuzminski <marcin@python-works.com>
parents: 2447
diff changeset
68 """Produce entities within text."""
2958
c0a6a2e6bb2e Use lightweight revisions in journal by default
Marcin Kuzminski <marcin@python-works.com>
parents: 2956
diff changeset
69 return "".join(html_escape_table.get(c, c) for c in text)
2466
7010dc12f10c Added rewritten validators module + tests
Marcin Kuzminski <marcin@python-works.com>
parents: 2447
diff changeset
70
7010dc12f10c Added rewritten validators module + tests
Marcin Kuzminski <marcin@python-works.com>
parents: 2447
diff changeset
71
2162
04d3fae0e4c0 imported patch 2260
Marcin Kuzminski <marcin@python-works.com>
parents: 2148
diff changeset
72 def shorter(text, size=20):
04d3fae0e4c0 imported patch 2260
Marcin Kuzminski <marcin@python-works.com>
parents: 2148
diff changeset
73 postfix = '...'
04d3fae0e4c0 imported patch 2260
Marcin Kuzminski <marcin@python-works.com>
parents: 2148
diff changeset
74 if len(text) > size:
04d3fae0e4c0 imported patch 2260
Marcin Kuzminski <marcin@python-works.com>
parents: 2148
diff changeset
75 return text[:size - len(postfix)] + postfix
04d3fae0e4c0 imported patch 2260
Marcin Kuzminski <marcin@python-works.com>
parents: 2148
diff changeset
76 return text
04d3fae0e4c0 imported patch 2260
Marcin Kuzminski <marcin@python-works.com>
parents: 2148
diff changeset
77
04d3fae0e4c0 imported patch 2260
Marcin Kuzminski <marcin@python-works.com>
parents: 2148
diff changeset
78
698
4cd0709b6d4b fixes #65, Added reset buttons to edit forms
Marcin Kuzminski <marcin@python-works.com>
parents: 668
diff changeset
79 def _reset(name, value=None, id=NotGiven, type="reset", **attrs):
1154
36fe593dfe4b simplified str2bool, and moved safe_unicode out of helpers since it was not html specific function
Marcin Kuzminski <marcin@python-works.com>
parents: 1115
diff changeset
80 """
36fe593dfe4b simplified str2bool, and moved safe_unicode out of helpers since it was not html specific function
Marcin Kuzminski <marcin@python-works.com>
parents: 1115
diff changeset
81 Reset button
899
d65843e07d3c Added message tooltip into journal revisions in push.
Marcin Kuzminski <marcin@python-works.com>
parents: 864
diff changeset
82 """
698
4cd0709b6d4b fixes #65, Added reset buttons to edit forms
Marcin Kuzminski <marcin@python-works.com>
parents: 668
diff changeset
83 _set_input_attrs(attrs, type, name, value)
4cd0709b6d4b fixes #65, Added reset buttons to edit forms
Marcin Kuzminski <marcin@python-works.com>
parents: 668
diff changeset
84 _set_id_attr(attrs, id, name)
4cd0709b6d4b fixes #65, Added reset buttons to edit forms
Marcin Kuzminski <marcin@python-works.com>
parents: 668
diff changeset
85 convert_boolean_attrs(attrs, ["disabled"])
4cd0709b6d4b fixes #65, Added reset buttons to edit forms
Marcin Kuzminski <marcin@python-works.com>
parents: 668
diff changeset
86 return HTML.input(**attrs)
4cd0709b6d4b fixes #65, Added reset buttons to edit forms
Marcin Kuzminski <marcin@python-works.com>
parents: 668
diff changeset
87
4cd0709b6d4b fixes #65, Added reset buttons to edit forms
Marcin Kuzminski <marcin@python-works.com>
parents: 668
diff changeset
88 reset = _reset
1676
e86191684f4b fixed some anchor id problems for changeset ranges
Marcin Kuzminski <marcin@python-works.com>
parents: 1670
diff changeset
89 safeid = _make_safe_id_component
734
49eb69d78988 implemented user dashboards, and following system.
Marcin Kuzminski <marcin@python-works.com>
parents: 718
diff changeset
90
1789
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file
Marcin Kuzminski <marcin@python-works.com>
parents: 1781
diff changeset
91
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file
Marcin Kuzminski <marcin@python-works.com>
parents: 1781
diff changeset
92 def FID(raw_id, path):
1776
22333ddd1a40 implements #307, configurable diffs
Marcin Kuzminski <marcin@python-works.com>
parents: 1769
diff changeset
93 """
1832
b9708d66277c fixed problem with anchor links that contains non ascii chars
Marcin Kuzminski <marcin@python-works.com>
parents: 1818
diff changeset
94 Creates a uniqe ID for filenode based on it's hash of path and revision
b9708d66277c fixed problem with anchor links that contains non ascii chars
Marcin Kuzminski <marcin@python-works.com>
parents: 1818
diff changeset
95 it's safe to use in urls
1789
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file
Marcin Kuzminski <marcin@python-works.com>
parents: 1781
diff changeset
96
1776
22333ddd1a40 implements #307, configurable diffs
Marcin Kuzminski <marcin@python-works.com>
parents: 1769
diff changeset
97 :param raw_id:
22333ddd1a40 implements #307, configurable diffs
Marcin Kuzminski <marcin@python-works.com>
parents: 1769
diff changeset
98 :param path:
22333ddd1a40 implements #307, configurable diffs
Marcin Kuzminski <marcin@python-works.com>
parents: 1769
diff changeset
99 """
1832
b9708d66277c fixed problem with anchor links that contains non ascii chars
Marcin Kuzminski <marcin@python-works.com>
parents: 1818
diff changeset
100
2148
ad127a5cef73 fixed comments issue on non-ascii file names
Marcin Kuzminski <marcin@python-works.com>
parents: 2125
diff changeset
101 return 'C-%s-%s' % (short_id(raw_id), md5(safe_str(path)).hexdigest()[:12])
1776
22333ddd1a40 implements #307, configurable diffs
Marcin Kuzminski <marcin@python-works.com>
parents: 1769
diff changeset
102
22333ddd1a40 implements #307, configurable diffs
Marcin Kuzminski <marcin@python-works.com>
parents: 1769
diff changeset
103
734
49eb69d78988 implemented user dashboards, and following system.
Marcin Kuzminski <marcin@python-works.com>
parents: 718
diff changeset
104 def get_token():
49eb69d78988 implemented user dashboards, and following system.
Marcin Kuzminski <marcin@python-works.com>
parents: 718
diff changeset
105 """Return the current authentication token, creating one if one doesn't
49eb69d78988 implemented user dashboards, and following system.
Marcin Kuzminski <marcin@python-works.com>
parents: 718
diff changeset
106 already exist.
49eb69d78988 implemented user dashboards, and following system.
Marcin Kuzminski <marcin@python-works.com>
parents: 718
diff changeset
107 """
49eb69d78988 implemented user dashboards, and following system.
Marcin Kuzminski <marcin@python-works.com>
parents: 718
diff changeset
108 token_key = "_authentication_token"
49eb69d78988 implemented user dashboards, and following system.
Marcin Kuzminski <marcin@python-works.com>
parents: 718
diff changeset
109 from pylons import session
49eb69d78988 implemented user dashboards, and following system.
Marcin Kuzminski <marcin@python-works.com>
parents: 718
diff changeset
110 if not token_key in session:
49eb69d78988 implemented user dashboards, and following system.
Marcin Kuzminski <marcin@python-works.com>
parents: 718
diff changeset
111 try:
49eb69d78988 implemented user dashboards, and following system.
Marcin Kuzminski <marcin@python-works.com>
parents: 718
diff changeset
112 token = hashlib.sha1(str(random.getrandbits(128))).hexdigest()
2203
d9972f76322e added emulation of pull hook for git-backend, and dummy git-push hook
Marcin Kuzminski <marcin@python-works.com>
parents: 2162
diff changeset
113 except AttributeError: # Python < 2.4
734
49eb69d78988 implemented user dashboards, and following system.
Marcin Kuzminski <marcin@python-works.com>
parents: 718
diff changeset
114 token = hashlib.sha1(str(random.randrange(2 ** 128))).hexdigest()
49eb69d78988 implemented user dashboards, and following system.
Marcin Kuzminski <marcin@python-works.com>
parents: 718
diff changeset
115 session[token_key] = token
49eb69d78988 implemented user dashboards, and following system.
Marcin Kuzminski <marcin@python-works.com>
parents: 718
diff changeset
116 if hasattr(session, 'save'):
49eb69d78988 implemented user dashboards, and following system.
Marcin Kuzminski <marcin@python-works.com>
parents: 718
diff changeset
117 session.save()
49eb69d78988 implemented user dashboards, and following system.
Marcin Kuzminski <marcin@python-works.com>
parents: 718
diff changeset
118 return session[token_key]
49eb69d78988 implemented user dashboards, and following system.
Marcin Kuzminski <marcin@python-works.com>
parents: 718
diff changeset
119
2162
04d3fae0e4c0 imported patch 2260
Marcin Kuzminski <marcin@python-works.com>
parents: 2148
diff changeset
120
0
564e40829f80 initial commit.
Marcin Kuzminski
parents:
diff changeset
121 class _GetError(object):
899
d65843e07d3c Added message tooltip into journal revisions in push.
Marcin Kuzminski <marcin@python-works.com>
parents: 864
diff changeset
122 """Get error from form_errors, and represent it as span wrapped error
d65843e07d3c Added message tooltip into journal revisions in push.
Marcin Kuzminski <marcin@python-works.com>
parents: 864
diff changeset
123 message
1203
6832ef664673 source code cleanup: remove trailing white space, normalize file endings
Marcin Kuzminski <marcin@python-works.com>
parents: 1187
diff changeset
124
899
d65843e07d3c Added message tooltip into journal revisions in push.
Marcin Kuzminski <marcin@python-works.com>
parents: 864
diff changeset
125 :param field_name: field to fetch errors for
d65843e07d3c Added message tooltip into journal revisions in push.
Marcin Kuzminski <marcin@python-works.com>
parents: 864
diff changeset
126 :param form_errors: form errors dict
d65843e07d3c Added message tooltip into journal revisions in push.
Marcin Kuzminski <marcin@python-works.com>
parents: 864
diff changeset
127 """
0
564e40829f80 initial commit.
Marcin Kuzminski
parents:
diff changeset
128
564e40829f80 initial commit.
Marcin Kuzminski
parents:
diff changeset
129 def __call__(self, field_name, form_errors):
564e40829f80 initial commit.
Marcin Kuzminski
parents:
diff changeset
130 tmpl = """<span class="error_msg">%s</span>"""
2427
f467c75544af Added h.tooltip to all places that tooltip_title is used.
Marcin Kuzminski <marcin@python-works.com>
parents: 2416
diff changeset
131 if form_errors and field_name in form_errors:
0
564e40829f80 initial commit.
Marcin Kuzminski
parents:
diff changeset
132 return literal(tmpl % form_errors.get(field_name))
564e40829f80 initial commit.
Marcin Kuzminski
parents:
diff changeset
133
281
cd2ee462fc2c implemented yui tooltip, and added it into annotation and main page.
Marcin Kuzminski <marcin@python-works.com>
parents: 278
diff changeset
134 get_error = _GetError()
cd2ee462fc2c implemented yui tooltip, and added it into annotation and main page.
Marcin Kuzminski <marcin@python-works.com>
parents: 278
diff changeset
135
2162
04d3fae0e4c0 imported patch 2260
Marcin Kuzminski <marcin@python-works.com>
parents: 2148
diff changeset
136
281
cd2ee462fc2c implemented yui tooltip, and added it into annotation and main page.
Marcin Kuzminski <marcin@python-works.com>
parents: 278
diff changeset
137 class _ToolTip(object):
631
05528ad948c4 Hacking for git support,and new faster repo scan
Marcin Kuzminski <marcin@python-works.com>
parents: 604
diff changeset
138
281
cd2ee462fc2c implemented yui tooltip, and added it into annotation and main page.
Marcin Kuzminski <marcin@python-works.com>
parents: 278
diff changeset
139 def __call__(self, tooltip_title, trim_at=50):
2427
f467c75544af Added h.tooltip to all places that tooltip_title is used.
Marcin Kuzminski <marcin@python-works.com>
parents: 2416
diff changeset
140 """
f467c75544af Added h.tooltip to all places that tooltip_title is used.
Marcin Kuzminski <marcin@python-works.com>
parents: 2416
diff changeset
141 Special function just to wrap our text into nice formatted
905
1294f2baf2bc added wrapping of long tooltips in index page
Marcin Kuzminski <marcin@python-works.com>
parents: 904
diff changeset
142 autowrapped text
1203
6832ef664673 source code cleanup: remove trailing white space, normalize file endings
Marcin Kuzminski <marcin@python-works.com>
parents: 1187
diff changeset
143
604
5cc96df705b9 fixed @repo into :repo for docs
Marcin Kuzminski <marcin@python-works.com>
parents: 547
diff changeset
144 :param tooltip_title:
281
cd2ee462fc2c implemented yui tooltip, and added it into annotation and main page.
Marcin Kuzminski <marcin@python-works.com>
parents: 278
diff changeset
145 """
2427
f467c75544af Added h.tooltip to all places that tooltip_title is used.
Marcin Kuzminski <marcin@python-works.com>
parents: 2416
diff changeset
146 tooltip_title = escape(tooltip_title)
f467c75544af Added h.tooltip to all places that tooltip_title is used.
Marcin Kuzminski <marcin@python-works.com>
parents: 2416
diff changeset
147 tooltip_title = tooltip_title.replace('<', '&lt;').replace('>', '&gt;')
f467c75544af Added h.tooltip to all places that tooltip_title is used.
Marcin Kuzminski <marcin@python-works.com>
parents: 2416
diff changeset
148 return tooltip_title
281
cd2ee462fc2c implemented yui tooltip, and added it into annotation and main page.
Marcin Kuzminski <marcin@python-works.com>
parents: 278
diff changeset
149 tooltip = _ToolTip()
cd2ee462fc2c implemented yui tooltip, and added it into annotation and main page.
Marcin Kuzminski <marcin@python-works.com>
parents: 278
diff changeset
150
2162
04d3fae0e4c0 imported patch 2260
Marcin Kuzminski <marcin@python-works.com>
parents: 2148
diff changeset
151
102
2dc0c8e4f384 Updated tempaltes, added file browser breadcrumbs, and feed icons
Marcin Kuzminski <marcin@python-works.com>
parents: 98
diff changeset
152 class _FilesBreadCrumbs(object):
631
05528ad948c4 Hacking for git support,and new faster repo scan
Marcin Kuzminski <marcin@python-works.com>
parents: 604
diff changeset
153
102
2dc0c8e4f384 Updated tempaltes, added file browser breadcrumbs, and feed icons
Marcin Kuzminski <marcin@python-works.com>
parents: 98
diff changeset
154 def __call__(self, repo_name, rev, paths):
955
129eb072b8a8 fixes for #99, added casting to unicode for int chars as utf-8 files
Marcin Kuzminski <marcin@python-works.com>
parents: 953
diff changeset
155 if isinstance(paths, str):
1176
014c9a58a0d9 fixes for issues #137 and #116 safe_unicode is now default for handling file names
Marcin Kuzminski <marcin@python-works.com>
parents: 1171
diff changeset
156 paths = safe_unicode(paths)
287
5827c739b0bd webhelpers breadcrumbs bugfix
Marcin Kuzminski <marcin@python-works.com>
parents: 286
diff changeset
157 url_l = [link_to(repo_name, url('files_home',
5827c739b0bd webhelpers breadcrumbs bugfix
Marcin Kuzminski <marcin@python-works.com>
parents: 286
diff changeset
158 repo_name=repo_name,
2686
269c6e0b54cc Reimplemented file-browser using partial-ajax
Marcin Kuzminski <marcin@python-works.com>
parents: 2674
diff changeset
159 revision=rev, f_path=''),
269c6e0b54cc Reimplemented file-browser using partial-ajax
Marcin Kuzminski <marcin@python-works.com>
parents: 2674
diff changeset
160 class_='ypjax-link')]
287
5827c739b0bd webhelpers breadcrumbs bugfix
Marcin Kuzminski <marcin@python-works.com>
parents: 286
diff changeset
161 paths_l = paths.split('/')
740
9279dfedcf93 fixed python2.5 incompatible enumerate calls
Marcin Kuzminski <marcin@python-works.com>
parents: 735
diff changeset
162 for cnt, p in enumerate(paths_l):
102
2dc0c8e4f384 Updated tempaltes, added file browser breadcrumbs, and feed icons
Marcin Kuzminski <marcin@python-works.com>
parents: 98
diff changeset
163 if p != '':
1789
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file
Marcin Kuzminski <marcin@python-works.com>
parents: 1781
diff changeset
164 url_l.append(link_to(p,
1766
Marcin Kuzminski <marcin@python-works.com>
parents: 1764
diff changeset
165 url('files_home',
Marcin Kuzminski <marcin@python-works.com>
parents: 1764
diff changeset
166 repo_name=repo_name,
Marcin Kuzminski <marcin@python-works.com>
parents: 1764
diff changeset
167 revision=rev,
Marcin Kuzminski <marcin@python-works.com>
parents: 1764
diff changeset
168 f_path='/'.join(paths_l[:cnt + 1])
2686
269c6e0b54cc Reimplemented file-browser using partial-ajax
Marcin Kuzminski <marcin@python-works.com>
parents: 2674
diff changeset
169 ),
269c6e0b54cc Reimplemented file-browser using partial-ajax
Marcin Kuzminski <marcin@python-works.com>
parents: 2674
diff changeset
170 class_='ypjax-link'
1766
Marcin Kuzminski <marcin@python-works.com>
parents: 1764
diff changeset
171 )
Marcin Kuzminski <marcin@python-works.com>
parents: 1764
diff changeset
172 )
97
be0096a02772 added helper for filesize
Marcin Kuzminski <marcin@python-works.com>
parents: 94
diff changeset
173
448
4679105ef03e more css html fixes (+cleanups), rewrote definition list for files
Marcin Kuzminski <marcin@python-works.com>
parents: 444
diff changeset
174 return literal('/'.join(url_l))
98
01d0f363f36d added pygments webhelper
Marcin Kuzminski <marcin@python-works.com>
parents: 97
diff changeset
175
281
cd2ee462fc2c implemented yui tooltip, and added it into annotation and main page.
Marcin Kuzminski <marcin@python-works.com>
parents: 278
diff changeset
176 files_breadcrumbs = _FilesBreadCrumbs()
899
d65843e07d3c Added message tooltip into journal revisions in push.
Marcin Kuzminski <marcin@python-works.com>
parents: 864
diff changeset
177
2162
04d3fae0e4c0 imported patch 2260
Marcin Kuzminski <marcin@python-works.com>
parents: 2148
diff changeset
178
505
5aba7adff196 little gui change for file source
Marcin Kuzminski <marcin@python-works.com>
parents: 494
diff changeset
179 class CodeHtmlFormatter(HtmlFormatter):
2162
04d3fae0e4c0 imported patch 2260
Marcin Kuzminski <marcin@python-works.com>
parents: 2148
diff changeset
180 """
04d3fae0e4c0 imported patch 2260
Marcin Kuzminski <marcin@python-works.com>
parents: 2148
diff changeset
181 My code Html Formatter for source codes
966
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
182 """
281
cd2ee462fc2c implemented yui tooltip, and added it into annotation and main page.
Marcin Kuzminski <marcin@python-works.com>
parents: 278
diff changeset
183
505
5aba7adff196 little gui change for file source
Marcin Kuzminski <marcin@python-works.com>
parents: 494
diff changeset
184 def wrap(self, source, outfile):
5aba7adff196 little gui change for file source
Marcin Kuzminski <marcin@python-works.com>
parents: 494
diff changeset
185 return self._wrap_div(self._wrap_pre(self._wrap_code(source)))
5aba7adff196 little gui change for file source
Marcin Kuzminski <marcin@python-works.com>
parents: 494
diff changeset
186
5aba7adff196 little gui change for file source
Marcin Kuzminski <marcin@python-works.com>
parents: 494
diff changeset
187 def _wrap_code(self, source):
740
9279dfedcf93 fixed python2.5 incompatible enumerate calls
Marcin Kuzminski <marcin@python-works.com>
parents: 735
diff changeset
188 for cnt, it in enumerate(source):
505
5aba7adff196 little gui change for file source
Marcin Kuzminski <marcin@python-works.com>
parents: 494
diff changeset
189 i, t = it
966
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
190 t = '<div id="L%s">%s</div>' % (cnt + 1, t)
505
5aba7adff196 little gui change for file source
Marcin Kuzminski <marcin@python-works.com>
parents: 494
diff changeset
191 yield i, t
966
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
192
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
193 def _wrap_tablelinenos(self, inner):
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
194 dummyoutfile = StringIO.StringIO()
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
195 lncount = 0
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
196 for t, line in inner:
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
197 if t:
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
198 lncount += 1
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
199 dummyoutfile.write(line)
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
200
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
201 fl = self.linenostart
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
202 mw = len(str(lncount + fl - 1))
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
203 sp = self.linenospecial
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
204 st = self.linenostep
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
205 la = self.lineanchors
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
206 aln = self.anchorlinenos
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
207 nocls = self.noclasses
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
208 if sp:
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
209 lines = []
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
210
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
211 for i in range(fl, fl + lncount):
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
212 if i % st == 0:
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
213 if i % sp == 0:
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
214 if aln:
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
215 lines.append('<a href="#%s%d" class="special">%*d</a>' %
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
216 (la, i, mw, i))
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
217 else:
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
218 lines.append('<span class="special">%*d</span>' % (mw, i))
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
219 else:
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
220 if aln:
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
221 lines.append('<a href="#%s%d">%*d</a>' % (la, i, mw, i))
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
222 else:
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
223 lines.append('%*d' % (mw, i))
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
224 else:
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
225 lines.append('')
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
226 ls = '\n'.join(lines)
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
227 else:
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
228 lines = []
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
229 for i in range(fl, fl + lncount):
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
230 if i % st == 0:
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
231 if aln:
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
232 lines.append('<a href="#%s%d">%*d</a>' % (la, i, mw, i))
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
233 else:
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
234 lines.append('%*d' % (mw, i))
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
235 else:
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
236 lines.append('')
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
237 ls = '\n'.join(lines)
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
238
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
239 # in case you wonder about the seemingly redundant <div> here: since the
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
240 # content in the other cell also is wrapped in a div, some browsers in
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
241 # some configurations seem to mess up the formatting...
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
242 if nocls:
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
243 yield 0, ('<table class="%stable">' % self.cssclass +
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
244 '<tr><td><div class="linenodiv" '
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
245 'style="background-color: #f0f0f0; padding-right: 10px">'
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
246 '<pre style="line-height: 125%">' +
1320
09c3fb460fcb Fixed problem with anchor link positioning when passed in ranges.
Marcin Kuzminski <marcin@python-works.com>
parents: 1312
diff changeset
247 ls + '</pre></div></td><td id="hlcode" class="code">')
966
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
248 else:
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
249 yield 0, ('<table class="%stable">' % self.cssclass +
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
250 '<tr><td class="linenos"><div class="linenodiv"><pre>' +
1320
09c3fb460fcb Fixed problem with anchor link positioning when passed in ranges.
Marcin Kuzminski <marcin@python-works.com>
parents: 1312
diff changeset
251 ls + '</pre></div></td><td id="hlcode" class="code">')
966
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
252 yield 0, dummyoutfile.getvalue()
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
253 yield 0, '</td></tr></table>'
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
254
63c91390853c fixed line number look
Marcin Kuzminski <marcin@python-works.com>
parents: 965
diff changeset
255
250
be4621c6de58 Pygments code coloring rewrite, annotation was moved to vcs whitch had much better lib for that. Fixed code recognition based on mimetypes of filenodes, for better coloring.
Marcin Kuzminski <marcin@python-works.com>
parents: 165
diff changeset
256 def pygmentize(filenode, **kwargs):
3375
7000fc4aa569 Add option to define custom lexers for custom extensions for code highlight in rcextension module
Marcin Kuzminski <marcin@python-works.com>
parents: 3367
diff changeset
257 """
7000fc4aa569 Add option to define custom lexers for custom extensions for code highlight in rcextension module
Marcin Kuzminski <marcin@python-works.com>
parents: 3367
diff changeset
258 pygmentize function using pygments
1203
6832ef664673 source code cleanup: remove trailing white space, normalize file endings
Marcin Kuzminski <marcin@python-works.com>
parents: 1187
diff changeset
259
604
5cc96df705b9 fixed @repo into :repo for docs
Marcin Kuzminski <marcin@python-works.com>
parents: 547
diff changeset
260 :param filenode:
165
ea893ffb7f00 implemented pygmentize codes into webhelpers. Together with color_dict caching into pylons globals
Marcin Kuzminski <marcin@python-works.com>
parents: 104
diff changeset
261 """
3375
7000fc4aa569 Add option to define custom lexers for custom extensions for code highlight in rcextension module
Marcin Kuzminski <marcin@python-works.com>
parents: 3367
diff changeset
262 lexer = get_custom_lexer(filenode.extension) or filenode.lexer
7000fc4aa569 Add option to define custom lexers for custom extensions for code highlight in rcextension module
Marcin Kuzminski <marcin@python-works.com>
parents: 3367
diff changeset
263 return literal(code_highlight(filenode.content, lexer,
7000fc4aa569 Add option to define custom lexers for custom extensions for code highlight in rcextension module
Marcin Kuzminski <marcin@python-works.com>
parents: 3367
diff changeset
264 CodeHtmlFormatter(**kwargs)))
165
ea893ffb7f00 implemented pygmentize codes into webhelpers. Together with color_dict caching into pylons globals
Marcin Kuzminski <marcin@python-works.com>
parents: 104
diff changeset
265
1781
089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1776
diff changeset
266
1171
2ab211e0aecd changes for #56
Marcin Kuzminski <marcin@python-works.com>
parents: 1159
diff changeset
267 def pygmentize_annotation(repo_name, filenode, **kwargs):
1781
089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1776
diff changeset
268 """
089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1776
diff changeset
269 pygmentize function for annotation
1203
6832ef664673 source code cleanup: remove trailing white space, normalize file endings
Marcin Kuzminski <marcin@python-works.com>
parents: 1187
diff changeset
270
604
5cc96df705b9 fixed @repo into :repo for docs
Marcin Kuzminski <marcin@python-works.com>
parents: 547
diff changeset
271 :param filenode:
165
ea893ffb7f00 implemented pygmentize codes into webhelpers. Together with color_dict caching into pylons globals
Marcin Kuzminski <marcin@python-works.com>
parents: 104
diff changeset
272 """
631
05528ad948c4 Hacking for git support,and new faster repo scan
Marcin Kuzminski <marcin@python-works.com>
parents: 604
diff changeset
273
438
0d4fceb91c9c fixes #24, added generator that generates equally distrybuted colors. Thus skipping creating one large coloring history.
Marcin Kuzminski <marcin@python-works.com>
parents: 428
diff changeset
274 color_dict = {}
1781
089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1776
diff changeset
275
947
99850ac883d1 Fixed whoosh daemon, for depracated walk method
Marcin Kuzminski <marcin@python-works.com>
parents: 946
diff changeset
276 def gen_color(n=10000):
1203
6832ef664673 source code cleanup: remove trailing white space, normalize file endings
Marcin Kuzminski <marcin@python-works.com>
parents: 1187
diff changeset
277 """generator for getting n of evenly distributed colors using
947
99850ac883d1 Fixed whoosh daemon, for depracated walk method
Marcin Kuzminski <marcin@python-works.com>
parents: 946
diff changeset
278 hsv color and golden ratio. It always return same order of colors
1203
6832ef664673 source code cleanup: remove trailing white space, normalize file endings
Marcin Kuzminski <marcin@python-works.com>
parents: 1187
diff changeset
279
947
99850ac883d1 Fixed whoosh daemon, for depracated walk method
Marcin Kuzminski <marcin@python-works.com>
parents: 946
diff changeset
280 :returns: RGB tuple
631
05528ad948c4 Hacking for git support,and new faster repo scan
Marcin Kuzminski <marcin@python-works.com>
parents: 604
diff changeset
281 """
1461
e7d9d543364d removed colorsys import
Marcin Kuzminski <marcin@python-works.com>
parents: 1438
diff changeset
282
e7d9d543364d removed colorsys import
Marcin Kuzminski <marcin@python-works.com>
parents: 1438
diff changeset
283 def hsv_to_rgb(h, s, v):
1781
089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1776
diff changeset
284 if s == 0.0:
089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1776
diff changeset
285 return v, v, v
089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1776
diff changeset
286 i = int(h * 6.0) # XXX assume int() truncates!
1461
e7d9d543364d removed colorsys import
Marcin Kuzminski <marcin@python-works.com>
parents: 1438
diff changeset
287 f = (h * 6.0) - i
e7d9d543364d removed colorsys import
Marcin Kuzminski <marcin@python-works.com>
parents: 1438
diff changeset
288 p = v * (1.0 - s)
e7d9d543364d removed colorsys import
Marcin Kuzminski <marcin@python-works.com>
parents: 1438
diff changeset
289 q = v * (1.0 - s * f)
e7d9d543364d removed colorsys import
Marcin Kuzminski <marcin@python-works.com>
parents: 1438
diff changeset
290 t = v * (1.0 - s * (1.0 - f))
e7d9d543364d removed colorsys import
Marcin Kuzminski <marcin@python-works.com>
parents: 1438
diff changeset
291 i = i % 6
1781
089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1776
diff changeset
292 if i == 0:
089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1776
diff changeset
293 return v, t, p
089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1776
diff changeset
294 if i == 1:
089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1776
diff changeset
295 return q, v, p
089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1776
diff changeset
296 if i == 2:
089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1776
diff changeset
297 return p, v, t
089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1776
diff changeset
298 if i == 3:
089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1776
diff changeset
299 return p, q, v
089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1776
diff changeset
300 if i == 4:
089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1776
diff changeset
301 return t, p, v
089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1776
diff changeset
302 if i == 5:
089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1776
diff changeset
303 return v, p, q
1461
e7d9d543364d removed colorsys import
Marcin Kuzminski <marcin@python-works.com>
parents: 1438
diff changeset
304
438
0d4fceb91c9c fixes #24, added generator that generates equally distrybuted colors. Thus skipping creating one large coloring history.
Marcin Kuzminski <marcin@python-works.com>
parents: 428
diff changeset
305 golden_ratio = 0.618033988749895
0d4fceb91c9c fixes #24, added generator that generates equally distrybuted colors. Thus skipping creating one large coloring history.
Marcin Kuzminski <marcin@python-works.com>
parents: 428
diff changeset
306 h = 0.22717784590367374
947
99850ac883d1 Fixed whoosh daemon, for depracated walk method
Marcin Kuzminski <marcin@python-works.com>
parents: 946
diff changeset
307
1320
09c3fb460fcb Fixed problem with anchor link positioning when passed in ranges.
Marcin Kuzminski <marcin@python-works.com>
parents: 1312
diff changeset
308 for _ in xrange(n):
450
c3236d7febad fixed, empty cs bug.
Marcin Kuzminski <marcin@python-works.com>
parents: 448
diff changeset
309 h += golden_ratio
438
0d4fceb91c9c fixes #24, added generator that generates equally distrybuted colors. Thus skipping creating one large coloring history.
Marcin Kuzminski <marcin@python-works.com>
parents: 428
diff changeset
310 h %= 1
0d4fceb91c9c fixes #24, added generator that generates equally distrybuted colors. Thus skipping creating one large coloring history.
Marcin Kuzminski <marcin@python-works.com>
parents: 428
diff changeset
311 HSV_tuple = [h, 0.95, 0.95]
1461
e7d9d543364d removed colorsys import
Marcin Kuzminski <marcin@python-works.com>
parents: 1438
diff changeset
312 RGB_tuple = hsv_to_rgb(*HSV_tuple)
1781
089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1776
diff changeset
313 yield map(lambda x: str(int(x * 256)), RGB_tuple)
438
0d4fceb91c9c fixes #24, added generator that generates equally distrybuted colors. Thus skipping creating one large coloring history.
Marcin Kuzminski <marcin@python-works.com>
parents: 428
diff changeset
314
0d4fceb91c9c fixes #24, added generator that generates equally distrybuted colors. Thus skipping creating one large coloring history.
Marcin Kuzminski <marcin@python-works.com>
parents: 428
diff changeset
315 cgenerator = gen_color()
631
05528ad948c4 Hacking for git support,and new faster repo scan
Marcin Kuzminski <marcin@python-works.com>
parents: 604
diff changeset
316
165
ea893ffb7f00 implemented pygmentize codes into webhelpers. Together with color_dict caching into pylons globals
Marcin Kuzminski <marcin@python-works.com>
parents: 104
diff changeset
317 def get_color_string(cs):
1781
089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1776
diff changeset
318 if cs in color_dict:
165
ea893ffb7f00 implemented pygmentize codes into webhelpers. Together with color_dict caching into pylons globals
Marcin Kuzminski <marcin@python-works.com>
parents: 104
diff changeset
319 col = color_dict[cs]
ea893ffb7f00 implemented pygmentize codes into webhelpers. Together with color_dict caching into pylons globals
Marcin Kuzminski <marcin@python-works.com>
parents: 104
diff changeset
320 else:
438
0d4fceb91c9c fixes #24, added generator that generates equally distrybuted colors. Thus skipping creating one large coloring history.
Marcin Kuzminski <marcin@python-works.com>
parents: 428
diff changeset
321 col = color_dict[cs] = cgenerator.next()
0d4fceb91c9c fixes #24, added generator that generates equally distrybuted colors. Thus skipping creating one large coloring history.
Marcin Kuzminski <marcin@python-works.com>
parents: 428
diff changeset
322 return "color: rgb(%s)! important;" % (', '.join(col))
631
05528ad948c4 Hacking for git support,and new faster repo scan
Marcin Kuzminski <marcin@python-works.com>
parents: 604
diff changeset
323
1171
2ab211e0aecd changes for #56
Marcin Kuzminski <marcin@python-works.com>
parents: 1159
diff changeset
324 def url_func(repo_name):
1352
79041f2d16f4 wrap_paragraph was to slow for toolip generation and was removed.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
325
1171
2ab211e0aecd changes for #56
Marcin Kuzminski <marcin@python-works.com>
parents: 1159
diff changeset
326 def _url_func(changeset):
1352
79041f2d16f4 wrap_paragraph was to slow for toolip generation and was removed.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
327 author = changeset.author
79041f2d16f4 wrap_paragraph was to slow for toolip generation and was removed.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
328 date = changeset.date
79041f2d16f4 wrap_paragraph was to slow for toolip generation and was removed.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
329 message = tooltip(changeset.message)
631
05528ad948c4 Hacking for git support,and new faster repo scan
Marcin Kuzminski <marcin@python-works.com>
parents: 604
diff changeset
330
1352
79041f2d16f4 wrap_paragraph was to slow for toolip generation and was removed.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
331 tooltip_html = ("<div style='font-size:0.8em'><b>Author:</b>"
79041f2d16f4 wrap_paragraph was to slow for toolip generation and was removed.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
332 " %s<br/><b>Date:</b> %s</b><br/><b>Message:"
79041f2d16f4 wrap_paragraph was to slow for toolip generation and was removed.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
333 "</b> %s<br/></div>")
79041f2d16f4 wrap_paragraph was to slow for toolip generation and was removed.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
334
79041f2d16f4 wrap_paragraph was to slow for toolip generation and was removed.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
335 tooltip_html = tooltip_html % (author, date, message)
1171
2ab211e0aecd changes for #56
Marcin Kuzminski <marcin@python-works.com>
parents: 1159
diff changeset
336 lnk_format = '%5s:%s' % ('r%s' % changeset.revision,
2ab211e0aecd changes for #56
Marcin Kuzminski <marcin@python-works.com>
parents: 1159
diff changeset
337 short_id(changeset.raw_id))
2ab211e0aecd changes for #56
Marcin Kuzminski <marcin@python-works.com>
parents: 1159
diff changeset
338 uri = link_to(
2ab211e0aecd changes for #56
Marcin Kuzminski <marcin@python-works.com>
parents: 1159
diff changeset
339 lnk_format,
2ab211e0aecd changes for #56
Marcin Kuzminski <marcin@python-works.com>
parents: 1159
diff changeset
340 url('changeset_home', repo_name=repo_name,
2ab211e0aecd changes for #56
Marcin Kuzminski <marcin@python-works.com>
parents: 1159
diff changeset
341 revision=changeset.raw_id),
2ab211e0aecd changes for #56
Marcin Kuzminski <marcin@python-works.com>
parents: 1159
diff changeset
342 style=get_color_string(changeset.raw_id),
2ab211e0aecd changes for #56
Marcin Kuzminski <marcin@python-works.com>
parents: 1159
diff changeset
343 class_='tooltip',
2ab211e0aecd changes for #56
Marcin Kuzminski <marcin@python-works.com>
parents: 1159
diff changeset
344 title=tooltip_html
2ab211e0aecd changes for #56
Marcin Kuzminski <marcin@python-works.com>
parents: 1159
diff changeset
345 )
631
05528ad948c4 Hacking for git support,and new faster repo scan
Marcin Kuzminski <marcin@python-works.com>
parents: 604
diff changeset
346
1171
2ab211e0aecd changes for #56
Marcin Kuzminski <marcin@python-works.com>
parents: 1159
diff changeset
347 uri += '\n'
2ab211e0aecd changes for #56
Marcin Kuzminski <marcin@python-works.com>
parents: 1159
diff changeset
348 return uri
2ab211e0aecd changes for #56
Marcin Kuzminski <marcin@python-works.com>
parents: 1159
diff changeset
349 return _url_func
2ab211e0aecd changes for #56
Marcin Kuzminski <marcin@python-works.com>
parents: 1159
diff changeset
350
2ab211e0aecd changes for #56
Marcin Kuzminski <marcin@python-works.com>
parents: 1159
diff changeset
351 return literal(annotate_highlight(filenode, url_func(repo_name), **kwargs))
631
05528ad948c4 Hacking for git support,and new faster repo scan
Marcin Kuzminski <marcin@python-works.com>
parents: 604
diff changeset
352
1781
089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1776
diff changeset
353
999
1951c35483ab fixed following js snipet. It' can be called multiple times now next to each repository
Marcin Kuzminski <marcin@python-works.com>
parents: 995
diff changeset
354 def is_following_repo(repo_name, user_id):
1951c35483ab fixed following js snipet. It' can be called multiple times now next to each repository
Marcin Kuzminski <marcin@python-works.com>
parents: 995
diff changeset
355 from rhodecode.model.scm import ScmModel
1951c35483ab fixed following js snipet. It' can be called multiple times now next to each repository
Marcin Kuzminski <marcin@python-works.com>
parents: 995
diff changeset
356 return ScmModel().is_following_repo(repo_name, user_id)
1951c35483ab fixed following js snipet. It' can be called multiple times now next to each repository
Marcin Kuzminski <marcin@python-works.com>
parents: 995
diff changeset
357
0
564e40829f80 initial commit.
Marcin Kuzminski
parents:
diff changeset
358 flash = _Flash()
282
237470e64bb8 switched filters into webhelpers for easy of usage.
Marcin Kuzminski <marcin@python-works.com>
parents: 281
diff changeset
359
635
fd63782c4426 Fixed age, for new vcs implementation. Removed all obsolete date formatters
Marcin Kuzminski <marcin@python-works.com>
parents: 631
diff changeset
360 #==============================================================================
1356
eec4defdf2b8 Make rhodecode use author/username filter from vcs instead of mercurial
Marcin Kuzminski <marcin@python-works.com>
parents: 1352
diff changeset
361 # SCM FILTERS available via h.
635
fd63782c4426 Fixed age, for new vcs implementation. Removed all obsolete date formatters
Marcin Kuzminski <marcin@python-works.com>
parents: 631
diff changeset
362 #==============================================================================
2007
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions
Marcin Kuzminski <marcin@python-works.com>
parents: 1979
diff changeset
363 from rhodecode.lib.vcs.utils import author_name, author_email
2109
8ecfed1d8f8b utils/conf
Marcin Kuzminski <marcin@python-works.com>
parents: 2028
diff changeset
364 from rhodecode.lib.utils2 import credentials_filter, age as _age
2239
493e03a4d268 added changeset status into changelog view
Marcin Kuzminski <marcin@python-works.com>
parents: 2217
diff changeset
365 from rhodecode.model.db import User, ChangesetStatus
282
237470e64bb8 switched filters into webhelpers for easy of usage.
Marcin Kuzminski <marcin@python-works.com>
parents: 281
diff changeset
366
3557
58dcef7eef03 Implemented show_id function that is a configurable way to display sha hashes in the changelog.
Marcin Kuzminski <marcin@python-works.com>
parents: 3540
diff changeset
367 age = lambda x, y=False: _age(x, y)
282
237470e64bb8 switched filters into webhelpers for easy of usage.
Marcin Kuzminski <marcin@python-works.com>
parents: 281
diff changeset
368 capitalize = lambda x: x.capitalize()
1356
eec4defdf2b8 Make rhodecode use author/username filter from vcs instead of mercurial
Marcin Kuzminski <marcin@python-works.com>
parents: 1352
diff changeset
369 email = author_email
636
ffd07396d315 Fixes for raw_id, needed for git
Marcin Kuzminski <marcin@python-works.com>
parents: 635
diff changeset
370 short_id = lambda x: x[:12]
1373
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1366
diff changeset
371 hide_credentials = lambda x: ''.join(credentials_filter(x))
660
df61378032f3 #48 rewrote action logger, translated action logger messages, added some extra messages. Linked and showed pushed revisions in logs
Marcin Kuzminski <marcin@python-works.com>
parents: 653
diff changeset
372
1764
39b49c999efb fixes issue #320.
Marcin Kuzminski <marcin@python-works.com>
parents: 1753
diff changeset
373
3557
58dcef7eef03 Implemented show_id function that is a configurable way to display sha hashes in the changelog.
Marcin Kuzminski <marcin@python-works.com>
parents: 3540
diff changeset
374 def show_id(cs):
58dcef7eef03 Implemented show_id function that is a configurable way to display sha hashes in the changelog.
Marcin Kuzminski <marcin@python-works.com>
parents: 3540
diff changeset
375 """
58dcef7eef03 Implemented show_id function that is a configurable way to display sha hashes in the changelog.
Marcin Kuzminski <marcin@python-works.com>
parents: 3540
diff changeset
376 Configurable function that shows ID
58dcef7eef03 Implemented show_id function that is a configurable way to display sha hashes in the changelog.
Marcin Kuzminski <marcin@python-works.com>
parents: 3540
diff changeset
377 by default it's r123:fffeeefffeee
58dcef7eef03 Implemented show_id function that is a configurable way to display sha hashes in the changelog.
Marcin Kuzminski <marcin@python-works.com>
parents: 3540
diff changeset
378
58dcef7eef03 Implemented show_id function that is a configurable way to display sha hashes in the changelog.
Marcin Kuzminski <marcin@python-works.com>
parents: 3540
diff changeset
379 :param cs: changeset instance
58dcef7eef03 Implemented show_id function that is a configurable way to display sha hashes in the changelog.
Marcin Kuzminski <marcin@python-works.com>
parents: 3540
diff changeset
380 """
58dcef7eef03 Implemented show_id function that is a configurable way to display sha hashes in the changelog.
Marcin Kuzminski <marcin@python-works.com>
parents: 3540
diff changeset
381 from rhodecode import CONFIG
3558
d91cdc111d2f backward compat: use safe .get on show_id function CONFIG calls
Marcin Kuzminski <marcin@python-works.com>
parents: 3557
diff changeset
382 def_len = safe_int(CONFIG.get('sha_len', 12))
3588
6750e8b5d234 rename sha_rev to something more understandable
Marcin Kuzminski <marcin@python-works.com>
parents: 3558
diff changeset
383 show_rev = str2bool(CONFIG.get('sha_show_numeric_rev', True))
3557
58dcef7eef03 Implemented show_id function that is a configurable way to display sha hashes in the changelog.
Marcin Kuzminski <marcin@python-works.com>
parents: 3540
diff changeset
384
58dcef7eef03 Implemented show_id function that is a configurable way to display sha hashes in the changelog.
Marcin Kuzminski <marcin@python-works.com>
parents: 3540
diff changeset
385 raw_id = cs.raw_id[:def_len]
58dcef7eef03 Implemented show_id function that is a configurable way to display sha hashes in the changelog.
Marcin Kuzminski <marcin@python-works.com>
parents: 3540
diff changeset
386 if show_rev:
58dcef7eef03 Implemented show_id function that is a configurable way to display sha hashes in the changelog.
Marcin Kuzminski <marcin@python-works.com>
parents: 3540
diff changeset
387 return 'r%s:%s' % (cs.revision, raw_id)
58dcef7eef03 Implemented show_id function that is a configurable way to display sha hashes in the changelog.
Marcin Kuzminski <marcin@python-works.com>
parents: 3540
diff changeset
388 else:
58dcef7eef03 Implemented show_id function that is a configurable way to display sha hashes in the changelog.
Marcin Kuzminski <marcin@python-works.com>
parents: 3540
diff changeset
389 return '%s' % (raw_id)
58dcef7eef03 Implemented show_id function that is a configurable way to display sha hashes in the changelog.
Marcin Kuzminski <marcin@python-works.com>
parents: 3540
diff changeset
390
58dcef7eef03 Implemented show_id function that is a configurable way to display sha hashes in the changelog.
Marcin Kuzminski <marcin@python-works.com>
parents: 3540
diff changeset
391
2416
44f328d6f209 Added a translatable date formatter for every date displayed.
Vincent Duvert <vincent@duvert.net>
parents: 2376
diff changeset
392 def fmt_date(date):
44f328d6f209 Added a translatable date formatter for every date displayed.
Vincent Duvert <vincent@duvert.net>
parents: 2376
diff changeset
393 if date:
2445
9b623dcddb02 Format datetime in notifications according to unified function
Marcin Kuzminski <marcin@python-works.com>
parents: 2427
diff changeset
394 _fmt = _(u"%a, %d %b %Y %H:%M:%S").encode('utf8')
9b623dcddb02 Format datetime in notifications according to unified function
Marcin Kuzminski <marcin@python-works.com>
parents: 2427
diff changeset
395 return date.strftime(_fmt).decode('utf8')
2427
f467c75544af Added h.tooltip to all places that tooltip_title is used.
Marcin Kuzminski <marcin@python-works.com>
parents: 2416
diff changeset
396
2416
44f328d6f209 Added a translatable date formatter for every date displayed.
Vincent Duvert <vincent@duvert.net>
parents: 2376
diff changeset
397 return ""
44f328d6f209 Added a translatable date formatter for every date displayed.
Vincent Duvert <vincent@duvert.net>
parents: 2376
diff changeset
398
44f328d6f209 Added a translatable date formatter for every date displayed.
Vincent Duvert <vincent@duvert.net>
parents: 2376
diff changeset
399
1959
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
400 def is_git(repository):
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
401 if hasattr(repository, 'alias'):
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
402 _type = repository.alias
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
403 elif hasattr(repository, 'repo_type'):
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
404 _type = repository.repo_type
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
405 else:
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
406 _type = repository
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
407 return _type == 'git'
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
408
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
409
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
410 def is_hg(repository):
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
411 if hasattr(repository, 'alias'):
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
412 _type = repository.alias
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
413 elif hasattr(repository, 'repo_type'):
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
414 _type = repository.repo_type
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
415 else:
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
416 _type = repository
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
417 return _type == 'hg'
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
418
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
419
1767
Marcin Kuzminski <marcin@python-works.com>
parents: 1766
diff changeset
420 def email_or_none(author):
2725
3853e37db97c fixes issue #531, when extracting user email, we check it against the database,
Marcin Kuzminski <marcin@python-works.com>
parents: 2686
diff changeset
421 # extract email from the commit string
1767
Marcin Kuzminski <marcin@python-works.com>
parents: 1766
diff changeset
422 _email = email(author)
Marcin Kuzminski <marcin@python-works.com>
parents: 1766
diff changeset
423 if _email != '':
2725
3853e37db97c fixes issue #531, when extracting user email, we check it against the database,
Marcin Kuzminski <marcin@python-works.com>
parents: 2686
diff changeset
424 # check it against RhodeCode database, and use the MAIN email for this
3853e37db97c fixes issue #531, when extracting user email, we check it against the database,
Marcin Kuzminski <marcin@python-works.com>
parents: 2686
diff changeset
425 # user
3853e37db97c fixes issue #531, when extracting user email, we check it against the database,
Marcin Kuzminski <marcin@python-works.com>
parents: 2686
diff changeset
426 user = User.get_by_email(_email, case_insensitive=True, cache=True)
3853e37db97c fixes issue #531, when extracting user email, we check it against the database,
Marcin Kuzminski <marcin@python-works.com>
parents: 2686
diff changeset
427 if user is not None:
3853e37db97c fixes issue #531, when extracting user email, we check it against the database,
Marcin Kuzminski <marcin@python-works.com>
parents: 2686
diff changeset
428 return user.email
1767
Marcin Kuzminski <marcin@python-works.com>
parents: 1766
diff changeset
429 return _email
1764
39b49c999efb fixes issue #320.
Marcin Kuzminski <marcin@python-works.com>
parents: 1753
diff changeset
430
39b49c999efb fixes issue #320.
Marcin Kuzminski <marcin@python-works.com>
parents: 1753
diff changeset
431 # See if it contains a username we can get an email from
1767
Marcin Kuzminski <marcin@python-works.com>
parents: 1766
diff changeset
432 user = User.get_by_username(author_name(author), case_insensitive=True,
1764
39b49c999efb fixes issue #320.
Marcin Kuzminski <marcin@python-works.com>
parents: 1753
diff changeset
433 cache=True)
39b49c999efb fixes issue #320.
Marcin Kuzminski <marcin@python-works.com>
parents: 1753
diff changeset
434 if user is not None:
39b49c999efb fixes issue #320.
Marcin Kuzminski <marcin@python-works.com>
parents: 1753
diff changeset
435 return user.email
39b49c999efb fixes issue #320.
Marcin Kuzminski <marcin@python-works.com>
parents: 1753
diff changeset
436
39b49c999efb fixes issue #320.
Marcin Kuzminski <marcin@python-works.com>
parents: 1753
diff changeset
437 # No valid email, not a valid user in the system, none!
39b49c999efb fixes issue #320.
Marcin Kuzminski <marcin@python-works.com>
parents: 1753
diff changeset
438 return None
39b49c999efb fixes issue #320.
Marcin Kuzminski <marcin@python-works.com>
parents: 1753
diff changeset
439
1781
089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1776
diff changeset
440
2731
09d8fec02954 Implemented #532.
Marcin Kuzminski <marcin@python-works.com>
parents: 2726
diff changeset
441 def person(author, show_attr="username_and_name"):
1764
39b49c999efb fixes issue #320.
Marcin Kuzminski <marcin@python-works.com>
parents: 1753
diff changeset
442 # attr to return from fetched user
2731
09d8fec02954 Implemented #532.
Marcin Kuzminski <marcin@python-works.com>
parents: 2726
diff changeset
443 person_getter = lambda usr: getattr(usr, show_attr)
1781
089c81cf04d9 fixes #326 some html special chars where not escaped in diffs + code garden in helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1776
diff changeset
444
1767
Marcin Kuzminski <marcin@python-works.com>
parents: 1766
diff changeset
445 # Valid email in the attribute passed, see if they're in the system
Marcin Kuzminski <marcin@python-works.com>
parents: 1766
diff changeset
446 _email = email(author)
Marcin Kuzminski <marcin@python-works.com>
parents: 1766
diff changeset
447 if _email != '':
Marcin Kuzminski <marcin@python-works.com>
parents: 1766
diff changeset
448 user = User.get_by_email(_email, case_insensitive=True, cache=True)
1764
39b49c999efb fixes issue #320.
Marcin Kuzminski <marcin@python-works.com>
parents: 1753
diff changeset
449 if user is not None:
39b49c999efb fixes issue #320.
Marcin Kuzminski <marcin@python-works.com>
parents: 1753
diff changeset
450 return person_getter(user)
1767
Marcin Kuzminski <marcin@python-works.com>
parents: 1766
diff changeset
451 return _email
1764
39b49c999efb fixes issue #320.
Marcin Kuzminski <marcin@python-works.com>
parents: 1753
diff changeset
452
39b49c999efb fixes issue #320.
Marcin Kuzminski <marcin@python-works.com>
parents: 1753
diff changeset
453 # Maybe it's a username?
1767
Marcin Kuzminski <marcin@python-works.com>
parents: 1766
diff changeset
454 _author = author_name(author)
Marcin Kuzminski <marcin@python-works.com>
parents: 1766
diff changeset
455 user = User.get_by_username(_author, case_insensitive=True,
1764
39b49c999efb fixes issue #320.
Marcin Kuzminski <marcin@python-works.com>
parents: 1753
diff changeset
456 cache=True)
39b49c999efb fixes issue #320.
Marcin Kuzminski <marcin@python-works.com>
parents: 1753
diff changeset
457 if user is not None:
39b49c999efb fixes issue #320.
Marcin Kuzminski <marcin@python-works.com>
parents: 1753
diff changeset
458 return person_getter(user)
39b49c999efb fixes issue #320.
Marcin Kuzminski <marcin@python-works.com>
parents: 1753
diff changeset
459
39b49c999efb fixes issue #320.
Marcin Kuzminski <marcin@python-works.com>
parents: 1753
diff changeset
460 # Still nothing? Just pass back the author name then
1767
Marcin Kuzminski <marcin@python-works.com>
parents: 1766
diff changeset
461 return _author
1764
39b49c999efb fixes issue #320.
Marcin Kuzminski <marcin@python-works.com>
parents: 1753
diff changeset
462
1959
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
463
2731
09d8fec02954 Implemented #532.
Marcin Kuzminski <marcin@python-works.com>
parents: 2726
diff changeset
464 def person_by_id(id_, show_attr="username_and_name"):
2726
aa17c7a1b8a5 Implemented basic locking functionality.
Marcin Kuzminski <marcin@python-works.com>
parents: 2725
diff changeset
465 # attr to return from fetched user
2731
09d8fec02954 Implemented #532.
Marcin Kuzminski <marcin@python-works.com>
parents: 2726
diff changeset
466 person_getter = lambda usr: getattr(usr, show_attr)
2726
aa17c7a1b8a5 Implemented basic locking functionality.
Marcin Kuzminski <marcin@python-works.com>
parents: 2725
diff changeset
467
aa17c7a1b8a5 Implemented basic locking functionality.
Marcin Kuzminski <marcin@python-works.com>
parents: 2725
diff changeset
468 #maybe it's an ID ?
aa17c7a1b8a5 Implemented basic locking functionality.
Marcin Kuzminski <marcin@python-works.com>
parents: 2725
diff changeset
469 if str(id_).isdigit() or isinstance(id_, int):
aa17c7a1b8a5 Implemented basic locking functionality.
Marcin Kuzminski <marcin@python-works.com>
parents: 2725
diff changeset
470 id_ = int(id_)
aa17c7a1b8a5 Implemented basic locking functionality.
Marcin Kuzminski <marcin@python-works.com>
parents: 2725
diff changeset
471 user = User.get(id_)
aa17c7a1b8a5 Implemented basic locking functionality.
Marcin Kuzminski <marcin@python-works.com>
parents: 2725
diff changeset
472 if user is not None:
aa17c7a1b8a5 Implemented basic locking functionality.
Marcin Kuzminski <marcin@python-works.com>
parents: 2725
diff changeset
473 return person_getter(user)
aa17c7a1b8a5 Implemented basic locking functionality.
Marcin Kuzminski <marcin@python-works.com>
parents: 2725
diff changeset
474 return id_
aa17c7a1b8a5 Implemented basic locking functionality.
Marcin Kuzminski <marcin@python-works.com>
parents: 2725
diff changeset
475
aa17c7a1b8a5 Implemented basic locking functionality.
Marcin Kuzminski <marcin@python-works.com>
parents: 2725
diff changeset
476
2674
a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options.
Marcin Kuzminski <marcin@python-works.com>
parents: 2609
diff changeset
477 def desc_stylize(value):
a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options.
Marcin Kuzminski <marcin@python-works.com>
parents: 2609
diff changeset
478 """
a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options.
Marcin Kuzminski <marcin@python-works.com>
parents: 2609
diff changeset
479 converts tags from value into html equivalent
a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options.
Marcin Kuzminski <marcin@python-works.com>
parents: 2609
diff changeset
480
a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options.
Marcin Kuzminski <marcin@python-works.com>
parents: 2609
diff changeset
481 :param value:
a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options.
Marcin Kuzminski <marcin@python-works.com>
parents: 2609
diff changeset
482 """
a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options.
Marcin Kuzminski <marcin@python-works.com>
parents: 2609
diff changeset
483 value = re.sub(r'\[see\ \=\>\ *([a-zA-Z0-9\/\=\?\&\ \:\/\.\-]*)\]',
a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options.
Marcin Kuzminski <marcin@python-works.com>
parents: 2609
diff changeset
484 '<div class="metatag" tag="see">see =&gt; \\1 </div>', value)
a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options.
Marcin Kuzminski <marcin@python-works.com>
parents: 2609
diff changeset
485 value = re.sub(r'\[license\ \=\>\ *([a-zA-Z0-9\/\=\?\&\ \:\/\.\-]*)\]',
a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options.
Marcin Kuzminski <marcin@python-works.com>
parents: 2609
diff changeset
486 '<div class="metatag" tag="license"><a href="http:\/\/www.opensource.org/licenses/\\1">\\1</a></div>', value)
3156
1ab01549f1f8 fixes issue #715 Meta-Tagging [requires => Repo-123] not working
Marcin Kuzminski <marcin@python-works.com>
parents: 3149
diff changeset
487 value = re.sub(r'\[(requires|recommends|conflicts|base)\ \=\>\ *([a-zA-Z0-9\-\/]*)\]',
2674
a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options.
Marcin Kuzminski <marcin@python-works.com>
parents: 2609
diff changeset
488 '<div class="metatag" tag="\\1">\\1 =&gt; <a href="/\\2">\\2</a></div>', value)
2965
d0553004e73d fixed #623: Lang meta-tag doesn't work with C#/C++
Marcin Kuzminski <marcin@python-works.com>
parents: 2958
diff changeset
489 value = re.sub(r'\[(lang|language)\ \=\>\ *([a-zA-Z\-\/\#\+]*)\]',
2674
a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options.
Marcin Kuzminski <marcin@python-works.com>
parents: 2609
diff changeset
490 '<div class="metatag" tag="lang">\\2</div>', value)
a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options.
Marcin Kuzminski <marcin@python-works.com>
parents: 2609
diff changeset
491 value = re.sub(r'\[([a-z]+)\]',
a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options.
Marcin Kuzminski <marcin@python-works.com>
parents: 2609
diff changeset
492 '<div class="metatag" tag="\\1">\\1</div>', value)
a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options.
Marcin Kuzminski <marcin@python-works.com>
parents: 2609
diff changeset
493
a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options.
Marcin Kuzminski <marcin@python-works.com>
parents: 2609
diff changeset
494 return value
a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options.
Marcin Kuzminski <marcin@python-works.com>
parents: 2609
diff changeset
495
a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options.
Marcin Kuzminski <marcin@python-works.com>
parents: 2609
diff changeset
496
3627
32cb8d45f330 helpers: show boolean value of value as icon, not just the True and False singletons
Mads Kiilerich <madski@unity3d.com>
parents: 3599
diff changeset
497 def boolicon(value):
32cb8d45f330 helpers: show boolean value of value as icon, not just the True and False singletons
Mads Kiilerich <madski@unity3d.com>
parents: 3599
diff changeset
498 """Returns boolean value of a value, represented as small html image of true/false
712
131c1e335fa7 Added ldap info on admin users, added bool2icon helper for nicer representation of
Marcin Kuzminski <marcin@python-works.com>
parents: 698
diff changeset
499 icons
1203
6832ef664673 source code cleanup: remove trailing white space, normalize file endings
Marcin Kuzminski <marcin@python-works.com>
parents: 1187
diff changeset
500
3627
32cb8d45f330 helpers: show boolean value of value as icon, not just the True and False singletons
Mads Kiilerich <madski@unity3d.com>
parents: 3599
diff changeset
501 :param value: value
712
131c1e335fa7 Added ldap info on admin users, added bool2icon helper for nicer representation of
Marcin Kuzminski <marcin@python-works.com>
parents: 698
diff changeset
502 """
131c1e335fa7 Added ldap info on admin users, added bool2icon helper for nicer representation of
Marcin Kuzminski <marcin@python-works.com>
parents: 698
diff changeset
503
3627
32cb8d45f330 helpers: show boolean value of value as icon, not just the True and False singletons
Mads Kiilerich <madski@unity3d.com>
parents: 3599
diff changeset
504 if value:
1050
cabe887a9829 removed obsolete _static flag from url, and fixed urls in webhelpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1045
diff changeset
505 return HTML.tag('img', src=url("/images/icons/accept.png"),
cabe887a9829 removed obsolete _static flag from url, and fixed urls in webhelpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1045
diff changeset
506 alt=_('True'))
3627
32cb8d45f330 helpers: show boolean value of value as icon, not just the True and False singletons
Mads Kiilerich <madski@unity3d.com>
parents: 3599
diff changeset
507 else:
1050
cabe887a9829 removed obsolete _static flag from url, and fixed urls in webhelpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1045
diff changeset
508 return HTML.tag('img', src=url("/images/icons/cancel.png"),
cabe887a9829 removed obsolete _static flag from url, and fixed urls in webhelpers
Marcin Kuzminski <marcin@python-works.com>
parents: 1045
diff changeset
509 alt=_('False'))
712
131c1e335fa7 Added ldap info on admin users, added bool2icon helper for nicer representation of
Marcin Kuzminski <marcin@python-works.com>
parents: 698
diff changeset
510
131c1e335fa7 Added ldap info on admin users, added bool2icon helper for nicer representation of
Marcin Kuzminski <marcin@python-works.com>
parents: 698
diff changeset
511
2958
c0a6a2e6bb2e Use lightweight revisions in journal by default
Marcin Kuzminski <marcin@python-works.com>
parents: 2956
diff changeset
512 def action_parser(user_log, feed=False, parse_cs=False):
2012
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
513 """
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
514 This helper will action_map the specified string action into translated
660
df61378032f3 #48 rewrote action logger, translated action logger messages, added some extra messages. Linked and showed pushed revisions in logs
Marcin Kuzminski <marcin@python-works.com>
parents: 653
diff changeset
515 fancy names with icons and links
1203
6832ef664673 source code cleanup: remove trailing white space, normalize file endings
Marcin Kuzminski <marcin@python-works.com>
parents: 1187
diff changeset
516
899
d65843e07d3c Added message tooltip into journal revisions in push.
Marcin Kuzminski <marcin@python-works.com>
parents: 864
diff changeset
517 :param user_log: user log instance
1087
51076a2a2b64 fixed unicode problems with file paths.
Marcin Kuzminski <marcin@python-works.com>
parents: 1055
diff changeset
518 :param feed: use output for feeds (no html and fancy icons)
2950
528c7f210b12 added experimental lightweight param to journal
Marcin Kuzminski <marcin@python-works.com>
parents: 2936
diff changeset
519 :param parse_cs: parse Changesets into VCS instances
660
df61378032f3 #48 rewrote action logger, translated action logger messages, added some extra messages. Linked and showed pushed revisions in logs
Marcin Kuzminski <marcin@python-works.com>
parents: 653
diff changeset
520 """
2958
c0a6a2e6bb2e Use lightweight revisions in journal by default
Marcin Kuzminski <marcin@python-works.com>
parents: 2956
diff changeset
521
660
df61378032f3 #48 rewrote action logger, translated action logger messages, added some extra messages. Linked and showed pushed revisions in logs
Marcin Kuzminski <marcin@python-works.com>
parents: 653
diff changeset
522 action = user_log.action
840
ee6f345736a6 action logger upgrade, for working with migrations
Marcin Kuzminski <marcin@python-works.com>
parents: 817
diff changeset
523 action_params = ' '
660
df61378032f3 #48 rewrote action logger, translated action logger messages, added some extra messages. Linked and showed pushed revisions in logs
Marcin Kuzminski <marcin@python-works.com>
parents: 653
diff changeset
524
df61378032f3 #48 rewrote action logger, translated action logger messages, added some extra messages. Linked and showed pushed revisions in logs
Marcin Kuzminski <marcin@python-works.com>
parents: 653
diff changeset
525 x = action.split(':')
df61378032f3 #48 rewrote action logger, translated action logger messages, added some extra messages. Linked and showed pushed revisions in logs
Marcin Kuzminski <marcin@python-works.com>
parents: 653
diff changeset
526
df61378032f3 #48 rewrote action logger, translated action logger messages, added some extra messages. Linked and showed pushed revisions in logs
Marcin Kuzminski <marcin@python-works.com>
parents: 653
diff changeset
527 if len(x) > 1:
df61378032f3 #48 rewrote action logger, translated action logger messages, added some extra messages. Linked and showed pushed revisions in logs
Marcin Kuzminski <marcin@python-works.com>
parents: 653
diff changeset
528 action, action_params = x
df61378032f3 #48 rewrote action logger, translated action logger messages, added some extra messages. Linked and showed pushed revisions in logs
Marcin Kuzminski <marcin@python-works.com>
parents: 653
diff changeset
529
718
7df3855bf6c7 Added fork name to journal
Marcin Kuzminski <marcin@python-works.com>
parents: 714
diff changeset
530 def get_cs_links():
2012
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
531 revs_limit = 3 # display this amount always
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
532 revs_top_limit = 50 # show upto this amount of changesets hidden
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
533 revs_ids = action_params.split(',')
2014
8ccac2b0fcf3 fixed cs_links for deleted repos
Marcin Kuzminski <marcin@python-works.com>
parents: 2012
diff changeset
534 deleted = user_log.repository is None
8ccac2b0fcf3 fixed cs_links for deleted repos
Marcin Kuzminski <marcin@python-works.com>
parents: 2012
diff changeset
535 if deleted:
8ccac2b0fcf3 fixed cs_links for deleted repos
Marcin Kuzminski <marcin@python-works.com>
parents: 2012
diff changeset
536 return ','.join(revs_ids)
8ccac2b0fcf3 fixed cs_links for deleted repos
Marcin Kuzminski <marcin@python-works.com>
parents: 2012
diff changeset
537
953
def3578dac8c fixed vcs import.
Marcin Kuzminski <marcin@python-works.com>
parents: 947
diff changeset
538 repo_name = user_log.repository.repo_name
1045
3fc9183e05dd another major codes rewrite:
Marcin Kuzminski <marcin@python-works.com>
parents: 1041
diff changeset
539
2323
6c0f76330d91 fix for issue #450. Rhodecode no longer will crash when bad revision is present in journal data.
Marcin Kuzminski <marcin@python-works.com>
parents: 2203
diff changeset
540 def lnk(rev, repo_name):
2950
528c7f210b12 added experimental lightweight param to journal
Marcin Kuzminski <marcin@python-works.com>
parents: 2936
diff changeset
541 if isinstance(rev, BaseChangeset) or isinstance(rev, AttributeDict):
2998
433428ffd13b fixes #645 Fix git handler when doing delete remote branch
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
542 lazy_cs = True
433428ffd13b fixes #645 Fix git handler when doing delete remote branch
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
543 if getattr(rev, 'op', None) and getattr(rev, 'ref_name', None):
433428ffd13b fixes #645 Fix git handler when doing delete remote branch
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
544 lazy_cs = False
433428ffd13b fixes #645 Fix git handler when doing delete remote branch
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
545 lbl = '?'
433428ffd13b fixes #645 Fix git handler when doing delete remote branch
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
546 if rev.op == 'delete_branch':
433428ffd13b fixes #645 Fix git handler when doing delete remote branch
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
547 lbl = '%s' % _('Deleted branch: %s') % rev.ref_name
433428ffd13b fixes #645 Fix git handler when doing delete remote branch
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
548 title = ''
433428ffd13b fixes #645 Fix git handler when doing delete remote branch
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
549 elif rev.op == 'tag':
433428ffd13b fixes #645 Fix git handler when doing delete remote branch
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
550 lbl = '%s' % _('Created tag: %s') % rev.ref_name
433428ffd13b fixes #645 Fix git handler when doing delete remote branch
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
551 title = ''
433428ffd13b fixes #645 Fix git handler when doing delete remote branch
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
552 _url = '#'
433428ffd13b fixes #645 Fix git handler when doing delete remote branch
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
553
433428ffd13b fixes #645 Fix git handler when doing delete remote branch
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
554 else:
433428ffd13b fixes #645 Fix git handler when doing delete remote branch
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
555 lbl = '%s' % (rev.short_id[:8])
433428ffd13b fixes #645 Fix git handler when doing delete remote branch
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
556 _url = url('changeset_home', repo_name=repo_name,
433428ffd13b fixes #645 Fix git handler when doing delete remote branch
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
557 revision=rev.raw_id)
433428ffd13b fixes #645 Fix git handler when doing delete remote branch
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
558 title = tooltip(rev.message)
2323
6c0f76330d91 fix for issue #450. Rhodecode no longer will crash when bad revision is present in journal data.
Marcin Kuzminski <marcin@python-works.com>
parents: 2203
diff changeset
559 else:
2958
c0a6a2e6bb2e Use lightweight revisions in journal by default
Marcin Kuzminski <marcin@python-works.com>
parents: 2956
diff changeset
560 ## changeset cannot be found/striped/removed etc.
2952
029a40c58df7 Added lightweight journal option for visual
Marcin Kuzminski <marcin@python-works.com>
parents: 2950
diff changeset
561 lbl = ('%s' % rev)[:12]
2323
6c0f76330d91 fix for issue #450. Rhodecode no longer will crash when bad revision is present in journal data.
Marcin Kuzminski <marcin@python-works.com>
parents: 2203
diff changeset
562 _url = '#'
6c0f76330d91 fix for issue #450. Rhodecode no longer will crash when bad revision is present in journal data.
Marcin Kuzminski <marcin@python-works.com>
parents: 2203
diff changeset
563 title = _('Changeset not found')
2958
c0a6a2e6bb2e Use lightweight revisions in journal by default
Marcin Kuzminski <marcin@python-works.com>
parents: 2956
diff changeset
564 if parse_cs:
c0a6a2e6bb2e Use lightweight revisions in journal by default
Marcin Kuzminski <marcin@python-works.com>
parents: 2956
diff changeset
565 return link_to(lbl, _url, title=title, class_='tooltip')
2971
2bfcec6a3985 new tooltip implementation
Marcin Kuzminski <marcin@python-works.com>
parents: 2966
diff changeset
566 return link_to(lbl, _url, raw_id=rev.raw_id, repo_name=repo_name,
2998
433428ffd13b fixes #645 Fix git handler when doing delete remote branch
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
567 class_='lazy-cs' if lazy_cs else '')
2203
d9972f76322e added emulation of pull hook for git-backend, and dummy git-push hook
Marcin Kuzminski <marcin@python-works.com>
parents: 2162
diff changeset
568
3507
71fa9a198ac3 show correct values for compare view when multiple git tags are pushed
Marcin Kuzminski <marcin@python-works.com>
parents: 3415
diff changeset
569 def _get_op(rev_txt):
71fa9a198ac3 show correct values for compare view when multiple git tags are pushed
Marcin Kuzminski <marcin@python-works.com>
parents: 3415
diff changeset
570 _op = None
71fa9a198ac3 show correct values for compare view when multiple git tags are pushed
Marcin Kuzminski <marcin@python-works.com>
parents: 3415
diff changeset
571 _name = rev_txt
71fa9a198ac3 show correct values for compare view when multiple git tags are pushed
Marcin Kuzminski <marcin@python-works.com>
parents: 3415
diff changeset
572 if len(rev_txt.split('=>')) == 2:
71fa9a198ac3 show correct values for compare view when multiple git tags are pushed
Marcin Kuzminski <marcin@python-works.com>
parents: 3415
diff changeset
573 _op, _name = rev_txt.split('=>')
71fa9a198ac3 show correct values for compare view when multiple git tags are pushed
Marcin Kuzminski <marcin@python-works.com>
parents: 3415
diff changeset
574 return _op, _name
71fa9a198ac3 show correct values for compare view when multiple git tags are pushed
Marcin Kuzminski <marcin@python-works.com>
parents: 3415
diff changeset
575
2203
d9972f76322e added emulation of pull hook for git-backend, and dummy git-push hook
Marcin Kuzminski <marcin@python-works.com>
parents: 2162
diff changeset
576 revs = []
d9972f76322e added emulation of pull hook for git-backend, and dummy git-push hook
Marcin Kuzminski <marcin@python-works.com>
parents: 2162
diff changeset
577 if len(filter(lambda v: v != '', revs_ids)) > 0:
2958
c0a6a2e6bb2e Use lightweight revisions in journal by default
Marcin Kuzminski <marcin@python-works.com>
parents: 2956
diff changeset
578 repo = None
2323
6c0f76330d91 fix for issue #450. Rhodecode no longer will crash when bad revision is present in journal data.
Marcin Kuzminski <marcin@python-works.com>
parents: 2203
diff changeset
579 for rev in revs_ids[:revs_top_limit]:
3507
71fa9a198ac3 show correct values for compare view when multiple git tags are pushed
Marcin Kuzminski <marcin@python-works.com>
parents: 3415
diff changeset
580 _op, _name = _get_op(rev)
2998
433428ffd13b fixes #645 Fix git handler when doing delete remote branch
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
581
2958
c0a6a2e6bb2e Use lightweight revisions in journal by default
Marcin Kuzminski <marcin@python-works.com>
parents: 2956
diff changeset
582 # we want parsed changesets, or new log store format is bad
2950
528c7f210b12 added experimental lightweight param to journal
Marcin Kuzminski <marcin@python-works.com>
parents: 2936
diff changeset
583 if parse_cs:
528c7f210b12 added experimental lightweight param to journal
Marcin Kuzminski <marcin@python-works.com>
parents: 2936
diff changeset
584 try:
2958
c0a6a2e6bb2e Use lightweight revisions in journal by default
Marcin Kuzminski <marcin@python-works.com>
parents: 2956
diff changeset
585 if repo is None:
c0a6a2e6bb2e Use lightweight revisions in journal by default
Marcin Kuzminski <marcin@python-works.com>
parents: 2956
diff changeset
586 repo = user_log.repository.scm_instance
c0a6a2e6bb2e Use lightweight revisions in journal by default
Marcin Kuzminski <marcin@python-works.com>
parents: 2956
diff changeset
587 _rev = repo.get_changeset(rev)
c0a6a2e6bb2e Use lightweight revisions in journal by default
Marcin Kuzminski <marcin@python-works.com>
parents: 2956
diff changeset
588 revs.append(_rev)
2950
528c7f210b12 added experimental lightweight param to journal
Marcin Kuzminski <marcin@python-works.com>
parents: 2936
diff changeset
589 except ChangesetDoesNotExistError:
528c7f210b12 added experimental lightweight param to journal
Marcin Kuzminski <marcin@python-works.com>
parents: 2936
diff changeset
590 log.error('cannot find revision %s in this repo' % rev)
528c7f210b12 added experimental lightweight param to journal
Marcin Kuzminski <marcin@python-works.com>
parents: 2936
diff changeset
591 revs.append(rev)
528c7f210b12 added experimental lightweight param to journal
Marcin Kuzminski <marcin@python-works.com>
parents: 2936
diff changeset
592 continue
528c7f210b12 added experimental lightweight param to journal
Marcin Kuzminski <marcin@python-works.com>
parents: 2936
diff changeset
593 else:
2958
c0a6a2e6bb2e Use lightweight revisions in journal by default
Marcin Kuzminski <marcin@python-works.com>
parents: 2956
diff changeset
594 _rev = AttributeDict({
2950
528c7f210b12 added experimental lightweight param to journal
Marcin Kuzminski <marcin@python-works.com>
parents: 2936
diff changeset
595 'short_id': rev[:12],
528c7f210b12 added experimental lightweight param to journal
Marcin Kuzminski <marcin@python-works.com>
parents: 2936
diff changeset
596 'raw_id': rev,
2958
c0a6a2e6bb2e Use lightweight revisions in journal by default
Marcin Kuzminski <marcin@python-works.com>
parents: 2956
diff changeset
597 'message': '',
2998
433428ffd13b fixes #645 Fix git handler when doing delete remote branch
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
598 'op': _op,
433428ffd13b fixes #645 Fix git handler when doing delete remote branch
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
599 'ref_name': _name
2950
528c7f210b12 added experimental lightweight param to journal
Marcin Kuzminski <marcin@python-works.com>
parents: 2936
diff changeset
600 })
2958
c0a6a2e6bb2e Use lightweight revisions in journal by default
Marcin Kuzminski <marcin@python-works.com>
parents: 2956
diff changeset
601 revs.append(_rev)
1359
54fc83f2192c Removed all string concat for exchange of ''.join()
Marcin Kuzminski <marcin@python-works.com>
parents: 1356
diff changeset
602 cs_links = []
2012
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
603 cs_links.append(" " + ', '.join(
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
604 [lnk(rev, repo_name) for rev in revs[:revs_limit]]
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
605 )
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
606 )
3507
71fa9a198ac3 show correct values for compare view when multiple git tags are pushed
Marcin Kuzminski <marcin@python-works.com>
parents: 3415
diff changeset
607 _op1, _name1 = _get_op(revs_ids[0])
71fa9a198ac3 show correct values for compare view when multiple git tags are pushed
Marcin Kuzminski <marcin@python-works.com>
parents: 3415
diff changeset
608 _op2, _name2 = _get_op(revs_ids[-1])
71fa9a198ac3 show correct values for compare view when multiple git tags are pushed
Marcin Kuzminski <marcin@python-works.com>
parents: 3415
diff changeset
609
71fa9a198ac3 show correct values for compare view when multiple git tags are pushed
Marcin Kuzminski <marcin@python-works.com>
parents: 3415
diff changeset
610 _rev = '%s...%s' % (_name1, _name2)
1009
eafe5ae429ea Added compare view into journal, fixed wrong function call to show compare view
Marcin Kuzminski <marcin@python-works.com>
parents: 999
diff changeset
611
2012
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
612 compare_view = (
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
613 ' <div class="compare_view tooltip" title="%s">'
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
614 '<a href="%s">%s</a> </div>' % (
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
615 _('Show all combined changesets %s->%s') % (
2954
9282b4f38277 shorten the journal compare tooltip
Marcin Kuzminski <marcin@python-works.com>
parents: 2952
diff changeset
616 revs_ids[0][:12], revs_ids[-1][:12]
2012
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
617 ),
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
618 url('changeset_home', repo_name=repo_name,
3507
71fa9a198ac3 show correct values for compare view when multiple git tags are pushed
Marcin Kuzminski <marcin@python-works.com>
parents: 3415
diff changeset
619 revision=_rev
2012
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
620 ),
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
621 _('compare view')
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
622 )
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
623 )
1009
eafe5ae429ea Added compare view into journal, fixed wrong function call to show compare view
Marcin Kuzminski <marcin@python-works.com>
parents: 999
diff changeset
624
2012
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
625 # if we have exactly one more than normally displayed
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
626 # just display it, takes less space than displaying
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
627 # "and 1 more revisions"
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
628 if len(revs_ids) == revs_limit + 1:
1979
3dc2cf954173 journal: polish
Aras Pranckevicius <aras@unity3d.com>
parents: 1959
diff changeset
629 rev = revs[revs_limit]
2012
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
630 cs_links.append(", " + lnk(rev, repo_name))
1979
3dc2cf954173 journal: polish
Aras Pranckevicius <aras@unity3d.com>
parents: 1959
diff changeset
631
3dc2cf954173 journal: polish
Aras Pranckevicius <aras@unity3d.com>
parents: 1959
diff changeset
632 # hidden-by-default ones
2012
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
633 if len(revs_ids) > revs_limit + 1:
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
634 uniq_id = revs_ids[0]
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
635 html_tmpl = (
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
636 '<span> %s <a class="show_more" id="_%s" '
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
637 'href="#more">%s</a> %s</span>'
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
638 )
1087
51076a2a2b64 fixed unicode problems with file paths.
Marcin Kuzminski <marcin@python-works.com>
parents: 1055
diff changeset
639 if not feed:
2012
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
640 cs_links.append(html_tmpl % (
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
641 _('and'),
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
642 uniq_id, _('%s more') % (len(revs_ids) - revs_limit),
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
643 _('revisions')
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
644 )
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
645 )
808
1af15d66838f added icons to journal, extend show more to actually show more pushed revisions,
Marcin Kuzminski <marcin@python-works.com>
parents: 790
diff changeset
646
1087
51076a2a2b64 fixed unicode problems with file paths.
Marcin Kuzminski <marcin@python-works.com>
parents: 1055
diff changeset
647 if not feed:
1979
3dc2cf954173 journal: polish
Aras Pranckevicius <aras@unity3d.com>
parents: 1959
diff changeset
648 html_tmpl = '<span id="%s" style="display:none">, %s </span>'
1087
51076a2a2b64 fixed unicode problems with file paths.
Marcin Kuzminski <marcin@python-works.com>
parents: 1055
diff changeset
649 else:
51076a2a2b64 fixed unicode problems with file paths.
Marcin Kuzminski <marcin@python-works.com>
parents: 1055
diff changeset
650 html_tmpl = '<span id="%s"> %s </span>'
51076a2a2b64 fixed unicode problems with file paths.
Marcin Kuzminski <marcin@python-works.com>
parents: 1055
diff changeset
651
2012
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
652 morelinks = ', '.join(
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
653 [lnk(rev, repo_name) for rev in revs[revs_limit:]]
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
654 )
1979
3dc2cf954173 journal: polish
Aras Pranckevicius <aras@unity3d.com>
parents: 1959
diff changeset
655
2012
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
656 if len(revs_ids) > revs_top_limit:
1979
3dc2cf954173 journal: polish
Aras Pranckevicius <aras@unity3d.com>
parents: 1959
diff changeset
657 morelinks += ', ...'
3dc2cf954173 journal: polish
Aras Pranckevicius <aras@unity3d.com>
parents: 1959
diff changeset
658
3dc2cf954173 journal: polish
Aras Pranckevicius <aras@unity3d.com>
parents: 1959
diff changeset
659 cs_links.append(html_tmpl % (uniq_id, morelinks))
1024
22c147726ea6 hidden compare view link for single revision push
Marcin Kuzminski <marcin@python-works.com>
parents: 1022
diff changeset
660 if len(revs) > 1:
1359
54fc83f2192c Removed all string concat for exchange of ''.join()
Marcin Kuzminski <marcin@python-works.com>
parents: 1356
diff changeset
661 cs_links.append(compare_view)
54fc83f2192c Removed all string concat for exchange of ''.join()
Marcin Kuzminski <marcin@python-works.com>
parents: 1356
diff changeset
662 return ''.join(cs_links)
734
49eb69d78988 implemented user dashboards, and following system.
Marcin Kuzminski <marcin@python-works.com>
parents: 718
diff changeset
663
718
7df3855bf6c7 Added fork name to journal
Marcin Kuzminski <marcin@python-works.com>
parents: 714
diff changeset
664 def get_fork_name():
953
def3578dac8c fixed vcs import.
Marcin Kuzminski <marcin@python-works.com>
parents: 947
diff changeset
665 repo_name = action_params
2914
1cd1cbe6cdcc formatting change on helper, remove str() call
Marcin Kuzminski <marcin@python-works.com>
parents: 2866
diff changeset
666 _url = url('summary_home', repo_name=repo_name)
1cd1cbe6cdcc formatting change on helper, remove str() call
Marcin Kuzminski <marcin@python-works.com>
parents: 2866
diff changeset
667 return _('fork name %s') % link_to(action_params, _url)
953
def3578dac8c fixed vcs import.
Marcin Kuzminski <marcin@python-works.com>
parents: 947
diff changeset
668
2375
bc2d8c03c050 Implemented #467 Journal logs comments on changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2367
diff changeset
669 def get_user_name():
bc2d8c03c050 Implemented #467 Journal logs comments on changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2367
diff changeset
670 user_name = action_params
bc2d8c03c050 Implemented #467 Journal logs comments on changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2367
diff changeset
671 return user_name
bc2d8c03c050 Implemented #467 Journal logs comments on changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2367
diff changeset
672
bc2d8c03c050 Implemented #467 Journal logs comments on changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2367
diff changeset
673 def get_users_group():
bc2d8c03c050 Implemented #467 Journal logs comments on changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2367
diff changeset
674 group_name = action_params
bc2d8c03c050 Implemented #467 Journal logs comments on changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2367
diff changeset
675 return group_name
bc2d8c03c050 Implemented #467 Journal logs comments on changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2367
diff changeset
676
2609
200a5b747e69 - added action when someone closes pull request in journal
Marcin Kuzminski <marcin@python-works.com>
parents: 2532
diff changeset
677 def get_pull_request():
200a5b747e69 - added action when someone closes pull request in journal
Marcin Kuzminski <marcin@python-works.com>
parents: 2532
diff changeset
678 pull_request_id = action_params
3063
ca2b21819dfd Implemented better support for Wildcard queries
Marcin Kuzminski <marcin@python-works.com>
parents: 3012
diff changeset
679 deleted = user_log.repository is None
ca2b21819dfd Implemented better support for Wildcard queries
Marcin Kuzminski <marcin@python-works.com>
parents: 3012
diff changeset
680 if deleted:
ca2b21819dfd Implemented better support for Wildcard queries
Marcin Kuzminski <marcin@python-works.com>
parents: 3012
diff changeset
681 repo_name = user_log.repository_name
ca2b21819dfd Implemented better support for Wildcard queries
Marcin Kuzminski <marcin@python-works.com>
parents: 3012
diff changeset
682 else:
ca2b21819dfd Implemented better support for Wildcard queries
Marcin Kuzminski <marcin@python-works.com>
parents: 3012
diff changeset
683 repo_name = user_log.repository.repo_name
2609
200a5b747e69 - added action when someone closes pull request in journal
Marcin Kuzminski <marcin@python-works.com>
parents: 2532
diff changeset
684 return link_to(_('Pull request #%s') % pull_request_id,
200a5b747e69 - added action when someone closes pull request in journal
Marcin Kuzminski <marcin@python-works.com>
parents: 2532
diff changeset
685 url('pullrequest_show', repo_name=repo_name,
200a5b747e69 - added action when someone closes pull request in journal
Marcin Kuzminski <marcin@python-works.com>
parents: 2532
diff changeset
686 pull_request_id=pull_request_id))
200a5b747e69 - added action when someone closes pull request in journal
Marcin Kuzminski <marcin@python-works.com>
parents: 2532
diff changeset
687
2375
bc2d8c03c050 Implemented #467 Journal logs comments on changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2367
diff changeset
688 # action : translated str, callback(extractor), icon
bc2d8c03c050 Implemented #467 Journal logs comments on changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2367
diff changeset
689 action_map = {
2491
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
690 'user_deleted_repo': (_('[deleted] repository'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
691 None, 'database_delete.png'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
692 'user_created_repo': (_('[created] repository'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
693 None, 'database_add.png'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
694 'user_created_fork': (_('[created] repository as fork'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
695 None, 'arrow_divide.png'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
696 'user_forked_repo': (_('[forked] repository'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
697 get_fork_name, 'arrow_divide.png'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
698 'user_updated_repo': (_('[updated] repository'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
699 None, 'database_edit.png'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
700 'admin_deleted_repo': (_('[delete] repository'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
701 None, 'database_delete.png'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
702 'admin_created_repo': (_('[created] repository'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
703 None, 'database_add.png'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
704 'admin_forked_repo': (_('[forked] repository'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
705 None, 'arrow_divide.png'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
706 'admin_updated_repo': (_('[updated] repository'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
707 None, 'database_edit.png'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
708 'admin_created_user': (_('[created] user'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
709 get_user_name, 'user_add.png'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
710 'admin_updated_user': (_('[updated] user'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
711 get_user_name, 'user_edit.png'),
3415
b8f929bff7e3 fixed tests and missing replacements from 5f1850e4712a
Marcin Kuzminski <marcin@python-works.com>
parents: 3405
diff changeset
712 'admin_created_users_group': (_('[created] user group'),
2491
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
713 get_users_group, 'group_add.png'),
3415
b8f929bff7e3 fixed tests and missing replacements from 5f1850e4712a
Marcin Kuzminski <marcin@python-works.com>
parents: 3405
diff changeset
714 'admin_updated_users_group': (_('[updated] user group'),
2491
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
715 get_users_group, 'group_edit.png'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
716 'user_commented_revision': (_('[commented] on revision in repository'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
717 get_cs_links, 'comment_add.png'),
2609
200a5b747e69 - added action when someone closes pull request in journal
Marcin Kuzminski <marcin@python-works.com>
parents: 2532
diff changeset
718 'user_commented_pull_request': (_('[commented] on pull request for'),
200a5b747e69 - added action when someone closes pull request in journal
Marcin Kuzminski <marcin@python-works.com>
parents: 2532
diff changeset
719 get_pull_request, 'comment_add.png'),
200a5b747e69 - added action when someone closes pull request in journal
Marcin Kuzminski <marcin@python-works.com>
parents: 2532
diff changeset
720 'user_closed_pull_request': (_('[closed] pull request for'),
200a5b747e69 - added action when someone closes pull request in journal
Marcin Kuzminski <marcin@python-works.com>
parents: 2532
diff changeset
721 get_pull_request, 'tick.png'),
2491
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
722 'push': (_('[pushed] into'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
723 get_cs_links, 'script_add.png'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
724 'push_local': (_('[committed via RhodeCode] into repository'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
725 get_cs_links, 'script_edit.png'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
726 'push_remote': (_('[pulled from remote] into repository'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
727 get_cs_links, 'connect.png'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
728 'pull': (_('[pulled] from'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
729 None, 'down_16.png'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
730 'started_following_repo': (_('[started following] repository'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
731 None, 'heart_add.png'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
732 'stopped_following_repo': (_('[stopped following] repository'),
9fad28af93bd fixed ico for pull request comment
Marcin Kuzminski <marcin@python-works.com>
parents: 2466
diff changeset
733 None, 'heart_delete.png'),
2375
bc2d8c03c050 Implemented #467 Journal logs comments on changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2367
diff changeset
734 }
660
df61378032f3 #48 rewrote action logger, translated action logger messages, added some extra messages. Linked and showed pushed revisions in logs
Marcin Kuzminski <marcin@python-works.com>
parents: 653
diff changeset
735
1087
51076a2a2b64 fixed unicode problems with file paths.
Marcin Kuzminski <marcin@python-works.com>
parents: 1055
diff changeset
736 action_str = action_map.get(action, action)
51076a2a2b64 fixed unicode problems with file paths.
Marcin Kuzminski <marcin@python-works.com>
parents: 1055
diff changeset
737 if feed:
51076a2a2b64 fixed unicode problems with file paths.
Marcin Kuzminski <marcin@python-works.com>
parents: 1055
diff changeset
738 action = action_str[0].replace('[', '').replace(']', '')
51076a2a2b64 fixed unicode problems with file paths.
Marcin Kuzminski <marcin@python-works.com>
parents: 1055
diff changeset
739 else:
2012
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
740 action = action_str[0]\
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
741 .replace('[', '<span class="journal_highlight">')\
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
742 .replace(']', '</span>')
1114
4de3fa6290a7 #109, added manual pull of changes for repositories that have remote location filled in.
Marcin Kuzminski <marcin@python-works.com>
parents: 1105
diff changeset
743
2012
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
744 action_params_func = lambda: ""
1052
c96651aebd8a fixed journal look & feel
Marcin Kuzminski <marcin@python-works.com>
parents: 1050
diff changeset
745
1114
4de3fa6290a7 #109, added manual pull of changes for repositories that have remote location filled in.
Marcin Kuzminski <marcin@python-works.com>
parents: 1105
diff changeset
746 if callable(action_str[1]):
1052
c96651aebd8a fixed journal look & feel
Marcin Kuzminski <marcin@python-works.com>
parents: 1050
diff changeset
747 action_params_func = action_str[1]
953
def3578dac8c fixed vcs import.
Marcin Kuzminski <marcin@python-works.com>
parents: 947
diff changeset
748
2375
bc2d8c03c050 Implemented #467 Journal logs comments on changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2367
diff changeset
749 def action_parser_icon():
bc2d8c03c050 Implemented #467 Journal logs comments on changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2367
diff changeset
750 action = user_log.action
bc2d8c03c050 Implemented #467 Journal logs comments on changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2367
diff changeset
751 action_params = None
bc2d8c03c050 Implemented #467 Journal logs comments on changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2367
diff changeset
752 x = action.split(':')
1959
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
753
2375
bc2d8c03c050 Implemented #467 Journal logs comments on changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2367
diff changeset
754 if len(x) > 1:
bc2d8c03c050 Implemented #467 Journal logs comments on changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2367
diff changeset
755 action, action_params = x
808
1af15d66838f added icons to journal, extend show more to actually show more pushed revisions,
Marcin Kuzminski <marcin@python-works.com>
parents: 790
diff changeset
756
2375
bc2d8c03c050 Implemented #467 Journal logs comments on changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2367
diff changeset
757 tmpl = """<img src="%s%s" alt="%s"/>"""
bc2d8c03c050 Implemented #467 Journal logs comments on changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2367
diff changeset
758 ico = action_map.get(action, ['', '', ''])[2]
bc2d8c03c050 Implemented #467 Journal logs comments on changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2367
diff changeset
759 return literal(tmpl % ((url('/images/icons/')), ico, action))
bc2d8c03c050 Implemented #467 Journal logs comments on changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2367
diff changeset
760
bc2d8c03c050 Implemented #467 Journal logs comments on changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2367
diff changeset
761 # returned callbacks we need to call to get
bc2d8c03c050 Implemented #467 Journal logs comments on changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2367
diff changeset
762 return [lambda: literal(action), action_params_func, action_parser_icon]
bc2d8c03c050 Implemented #467 Journal logs comments on changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2367
diff changeset
763
660
df61378032f3 #48 rewrote action logger, translated action logger messages, added some extra messages. Linked and showed pushed revisions in logs
Marcin Kuzminski <marcin@python-works.com>
parents: 653
diff changeset
764
df61378032f3 #48 rewrote action logger, translated action logger messages, added some extra messages. Linked and showed pushed revisions in logs
Marcin Kuzminski <marcin@python-works.com>
parents: 653
diff changeset
765
635
fd63782c4426 Fixed age, for new vcs implementation. Removed all obsolete date formatters
Marcin Kuzminski <marcin@python-works.com>
parents: 631
diff changeset
766 #==============================================================================
307
504feff57b49 added permission functions to webhelpers, updated dbmanage permissions
Marcin Kuzminski <marcin@python-works.com>
parents: 293
diff changeset
767 # PERMS
635
fd63782c4426 Fixed age, for new vcs implementation. Removed all obsolete date formatters
Marcin Kuzminski <marcin@python-works.com>
parents: 631
diff changeset
768 #==============================================================================
547
1e757ac98988 renamed project to rhodecode
Marcin Kuzminski <marcin@python-works.com>
parents: 512
diff changeset
769 from rhodecode.lib.auth import HasPermissionAny, HasPermissionAll, \
3222
b4daef4cc26d Group management delegation:
Marcin Kuzminski <marcin@python-works.com>
parents: 3156
diff changeset
770 HasRepoPermissionAny, HasRepoPermissionAll, HasReposGroupPermissionAll, \
b4daef4cc26d Group management delegation:
Marcin Kuzminski <marcin@python-works.com>
parents: 3156
diff changeset
771 HasReposGroupPermissionAny
282
237470e64bb8 switched filters into webhelpers for easy of usage.
Marcin Kuzminski <marcin@python-works.com>
parents: 281
diff changeset
772
1959
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
773
635
fd63782c4426 Fixed age, for new vcs implementation. Removed all obsolete date formatters
Marcin Kuzminski <marcin@python-works.com>
parents: 631
diff changeset
774 #==============================================================================
398
8c50b164fb58 Implemented basic gravatar support on admin pages only for now
Marcin Kuzminski <marcin@python-works.com>
parents: 307
diff changeset
775 # GRAVATAR URL
635
fd63782c4426 Fixed age, for new vcs implementation. Removed all obsolete date formatters
Marcin Kuzminski <marcin@python-works.com>
parents: 631
diff changeset
776 #==============================================================================
282
237470e64bb8 switched filters into webhelpers for easy of usage.
Marcin Kuzminski <marcin@python-works.com>
parents: 281
diff changeset
777
401
b1debb6c5a09 implemented gravatars to changesets, updated styling for changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 400
diff changeset
778 def gravatar_url(email_address, size=30):
3080
39bbe5d31a54 fixes issue #674, alternative gravatar url had an error when there was no valid email in commit data
Marcin Kuzminski <marcin@python-works.com>
parents: 3070
diff changeset
779 from pylons import url # doh, we need to re-import url to mock it later
3367
e6c551663a54 #763 gravatar helper function should fallback into default image if somehow email provided is empty.
Marcin Kuzminski <marcin@python-works.com>
parents: 3222
diff changeset
780 _def = 'anonymous@rhodecode.org'
e6c551663a54 #763 gravatar helper function should fallback into default image if somehow email provided is empty.
Marcin Kuzminski <marcin@python-works.com>
parents: 3222
diff changeset
781 use_gravatar = str2bool(config['app_conf'].get('use_gravatar'))
e6c551663a54 #763 gravatar helper function should fallback into default image if somehow email provided is empty.
Marcin Kuzminski <marcin@python-works.com>
parents: 3222
diff changeset
782 email_address = email_address or _def
e6c551663a54 #763 gravatar helper function should fallback into default image if somehow email provided is empty.
Marcin Kuzminski <marcin@python-works.com>
parents: 3222
diff changeset
783 if (not use_gravatar or not email_address or email_address == _def):
3080
39bbe5d31a54 fixes issue #674, alternative gravatar url had an error when there was no valid email in commit data
Marcin Kuzminski <marcin@python-works.com>
parents: 3070
diff changeset
784 f = lambda a, l: min(l, key=lambda x: abs(x - a))
39bbe5d31a54 fixes issue #674, alternative gravatar url had an error when there was no valid email in commit data
Marcin Kuzminski <marcin@python-works.com>
parents: 3070
diff changeset
785 return url("/images/user%s.png" % f(size, [14, 16, 20, 24, 30]))
39bbe5d31a54 fixes issue #674, alternative gravatar url had an error when there was no valid email in commit data
Marcin Kuzminski <marcin@python-works.com>
parents: 3070
diff changeset
786
3367
e6c551663a54 #763 gravatar helper function should fallback into default image if somehow email provided is empty.
Marcin Kuzminski <marcin@python-works.com>
parents: 3222
diff changeset
787 if use_gravatar and config['app_conf'].get('alternative_gravatar_url'):
2751
e291f25ea87f fixes issue #543, un-broken alternative gravatar option
Marcin Kuzminski <marcin@python-works.com>
parents: 2735
diff changeset
788 tmpl = config['app_conf'].get('alternative_gravatar_url', '')
2836
819eb7f8a555 Implemented patch from andrewsh ref #565 Add support for {netloc} and {scheme}
Marcin Kuzminski <marcin@python-works.com>
parents: 2751
diff changeset
789 parsed_url = urlparse.urlparse(url.current(qualified=True))
2751
e291f25ea87f fixes issue #543, un-broken alternative gravatar option
Marcin Kuzminski <marcin@python-works.com>
parents: 2735
diff changeset
790 tmpl = tmpl.replace('{email}', email_address)\
2836
819eb7f8a555 Implemented patch from andrewsh ref #565 Add support for {netloc} and {scheme}
Marcin Kuzminski <marcin@python-works.com>
parents: 2751
diff changeset
791 .replace('{md5email}', hashlib.md5(email_address.lower()).hexdigest()) \
819eb7f8a555 Implemented patch from andrewsh ref #565 Add support for {netloc} and {scheme}
Marcin Kuzminski <marcin@python-works.com>
parents: 2751
diff changeset
792 .replace('{netloc}', parsed_url.netloc)\
819eb7f8a555 Implemented patch from andrewsh ref #565 Add support for {netloc} and {scheme}
Marcin Kuzminski <marcin@python-works.com>
parents: 2751
diff changeset
793 .replace('{scheme}', parsed_url.scheme)\
2751
e291f25ea87f fixes issue #543, un-broken alternative gravatar option
Marcin Kuzminski <marcin@python-works.com>
parents: 2735
diff changeset
794 .replace('{size}', str(size))
e291f25ea87f fixes issue #543, un-broken alternative gravatar option
Marcin Kuzminski <marcin@python-works.com>
parents: 2735
diff changeset
795 return tmpl
e291f25ea87f fixes issue #543, un-broken alternative gravatar option
Marcin Kuzminski <marcin@python-works.com>
parents: 2735
diff changeset
796
946
f12cd4707301 patched gravatar url generation to properly support new https force flag from settings.
Marcin Kuzminski <marcin@python-works.com>
parents: 911
diff changeset
797 ssl_enabled = 'https' == request.environ.get('wsgi.url_scheme')
398
8c50b164fb58 Implemented basic gravatar support on admin pages only for now
Marcin Kuzminski <marcin@python-works.com>
parents: 307
diff changeset
798 default = 'identicon'
8c50b164fb58 Implemented basic gravatar support on admin pages only for now
Marcin Kuzminski <marcin@python-works.com>
parents: 307
diff changeset
799 baseurl_nossl = "http://www.gravatar.com/avatar/"
8c50b164fb58 Implemented basic gravatar support on admin pages only for now
Marcin Kuzminski <marcin@python-works.com>
parents: 307
diff changeset
800 baseurl_ssl = "https://secure.gravatar.com/avatar/"
8c50b164fb58 Implemented basic gravatar support on admin pages only for now
Marcin Kuzminski <marcin@python-works.com>
parents: 307
diff changeset
801 baseurl = baseurl_ssl if ssl_enabled else baseurl_nossl
631
05528ad948c4 Hacking for git support,and new faster repo scan
Marcin Kuzminski <marcin@python-works.com>
parents: 604
diff changeset
802
1101
c1080b42a7cb fixed problem with int. chars in gravatars
Marcin Kuzminski <marcin@python-works.com>
parents: 1100
diff changeset
803 if isinstance(email_address, unicode):
c1080b42a7cb fixed problem with int. chars in gravatars
Marcin Kuzminski <marcin@python-works.com>
parents: 1100
diff changeset
804 #hashlib crashes on unicode items
1401
b7563ad4e7ee Unicode fixes, added safe_str method for global str() operations +better test sandboxing
Marcin Kuzminski <marcin@python-works.com>
parents: 1373
diff changeset
805 email_address = safe_str(email_address)
398
8c50b164fb58 Implemented basic gravatar support on admin pages only for now
Marcin Kuzminski <marcin@python-works.com>
parents: 307
diff changeset
806 # construct the url
401
b1debb6c5a09 implemented gravatars to changesets, updated styling for changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 400
diff changeset
807 gravatar_url = baseurl + hashlib.md5(email_address.lower()).hexdigest() + "?"
2012
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
808 gravatar_url += urllib.urlencode({'d': default, 's': str(size)})
398
8c50b164fb58 Implemented basic gravatar support on admin pages only for now
Marcin Kuzminski <marcin@python-works.com>
parents: 307
diff changeset
809
8c50b164fb58 Implemented basic gravatar support on admin pages only for now
Marcin Kuzminski <marcin@python-works.com>
parents: 307
diff changeset
810 return gravatar_url
443
e5157e2a530e added safe unicode funtion, and implemented it in whoosh indexer
Marcin Kuzminski <marcin@python-works.com>
parents: 438
diff changeset
811
1098
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
812
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
813 #==============================================================================
1342
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1330
diff changeset
814 # REPO PAGER, PAGER FOR REPOSITORY
1098
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
815 #==============================================================================
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
816 class RepoPage(Page):
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
817
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
818 def __init__(self, collection, page=1, items_per_page=20,
1656
833f9dec0a06 implemented #44 - branch filtering in changelog, aka branch browser
Marcin Kuzminski <marcin@python-works.com>
parents: 1629
diff changeset
819 item_count=None, url=None, **kwargs):
1098
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
820
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
821 """Create a "RepoPage" instance. special pager for paging
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
822 repository
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
823 """
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
824 self._url_generator = url
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
825
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
826 # Safe the kwargs class-wide so they can be used in the pager() method
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
827 self.kwargs = kwargs
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
828
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
829 # Save a reference to the collection
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
830 self.original_collection = collection
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
831
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
832 self.collection = collection
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
833
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
834 # The self.page is the number of the current page.
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
835 # The first page has the number 1!
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
836 try:
2012
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
837 self.page = int(page) # make it int() if we get it as a string
1098
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
838 except (ValueError, TypeError):
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
839 self.page = 1
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
840
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
841 self.items_per_page = items_per_page
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
842
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
843 # Unless the user tells us how many items the collections has
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
844 # we calculate that ourselves.
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
845 if item_count is not None:
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
846 self.item_count = item_count
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
847 else:
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
848 self.item_count = len(self.collection)
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
849
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
850 # Compute the number of the first and last available page
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
851 if self.item_count > 0:
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
852 self.first_page = 1
1422
e69da281e235 fixed issues with repo pager
Marcin Kuzminski <marcin@python-works.com>
parents: 1421
diff changeset
853 self.page_count = int(math.ceil(float(self.item_count) /
e69da281e235 fixed issues with repo pager
Marcin Kuzminski <marcin@python-works.com>
parents: 1421
diff changeset
854 self.items_per_page))
1098
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
855 self.last_page = self.first_page + self.page_count - 1
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
856
1818
cf51bbfb120e auto white-space removal
Marcin Kuzminski <marcin@python-works.com>
parents: 1789
diff changeset
857 # Make sure that the requested page number is the range of
1766
Marcin Kuzminski <marcin@python-works.com>
parents: 1764
diff changeset
858 # valid pages
1098
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
859 if self.page > self.last_page:
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
860 self.page = self.last_page
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
861 elif self.page < self.first_page:
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
862 self.page = self.first_page
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
863
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
864 # Note: the number of items on this page can be less than
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
865 # items_per_page if the last page is not full
1422
e69da281e235 fixed issues with repo pager
Marcin Kuzminski <marcin@python-works.com>
parents: 1421
diff changeset
866 self.first_item = max(0, (self.item_count) - (self.page *
e69da281e235 fixed issues with repo pager
Marcin Kuzminski <marcin@python-works.com>
parents: 1421
diff changeset
867 items_per_page))
e69da281e235 fixed issues with repo pager
Marcin Kuzminski <marcin@python-works.com>
parents: 1421
diff changeset
868 self.last_item = ((self.item_count - 1) - items_per_page *
e69da281e235 fixed issues with repo pager
Marcin Kuzminski <marcin@python-works.com>
parents: 1421
diff changeset
869 (self.page - 1))
1098
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
870
1670
d2de0c2f02cd #77 code review
Marcin Kuzminski <marcin@python-works.com>
parents: 1656
diff changeset
871 self.items = list(self.collection[self.first_item:self.last_item + 1])
1656
833f9dec0a06 implemented #44 - branch filtering in changelog, aka branch browser
Marcin Kuzminski <marcin@python-works.com>
parents: 1629
diff changeset
872
1098
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
873 # Links to previous and next page
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
874 if self.page > self.first_page:
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
875 self.previous_page = self.page - 1
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
876 else:
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
877 self.previous_page = None
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
878
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
879 if self.page < self.last_page:
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
880 self.next_page = self.page + 1
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
881 else:
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
882 self.next_page = None
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
883
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
884 # No items available
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
885 else:
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
886 self.first_page = None
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
887 self.page_count = 0
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
888 self.last_page = None
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
889 self.first_item = None
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
890 self.last_item = None
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
891 self.previous_page = None
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
892 self.next_page = None
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
893 self.items = []
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
894
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
895 # This is a subclass of the 'list' type. Initialise the list now.
1656
833f9dec0a06 implemented #44 - branch filtering in changelog, aka branch browser
Marcin Kuzminski <marcin@python-works.com>
parents: 1629
diff changeset
896 list.__init__(self, reversed(self.items))
1098
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
897
91ddd4db4614 Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method
Marcin Kuzminski <marcin@python-works.com>
parents: 1087
diff changeset
898
990
7a1df0130533 moved tooltip function from the for loop and from templates to helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 966
diff changeset
899 def changed_tooltip(nodes):
1342
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1330
diff changeset
900 """
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1330
diff changeset
901 Generates a html string for changed nodes in changeset page.
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1330
diff changeset
902 It limits the output to 30 entries
1818
cf51bbfb120e auto white-space removal
Marcin Kuzminski <marcin@python-works.com>
parents: 1789
diff changeset
903
1342
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1330
diff changeset
904 :param nodes: LazyNodesGenerator
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1330
diff changeset
905 """
990
7a1df0130533 moved tooltip function from the for loop and from templates to helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 966
diff changeset
906 if nodes:
7a1df0130533 moved tooltip function from the for loop and from templates to helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 966
diff changeset
907 pref = ': <br/> '
7a1df0130533 moved tooltip function from the for loop and from templates to helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 966
diff changeset
908 suf = ''
7a1df0130533 moved tooltip function from the for loop and from templates to helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 966
diff changeset
909 if len(nodes) > 30:
7a1df0130533 moved tooltip function from the for loop and from templates to helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 966
diff changeset
910 suf = '<br/>' + _(' and %s more') % (len(nodes) - 30)
1257
0a2a10a1912f Implemented --stat for changelog
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
911 return literal(pref + '<br/> '.join([safe_unicode(x.path)
0a2a10a1912f Implemented --stat for changelog
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
912 for x in nodes[:30]]) + suf)
990
7a1df0130533 moved tooltip function from the for loop and from templates to helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 966
diff changeset
913 else:
7a1df0130533 moved tooltip function from the for loop and from templates to helpers
Marcin Kuzminski <marcin@python-works.com>
parents: 966
diff changeset
914 return ': ' + _('No Files')
1159
187a924ed653 Changes for repo groups
Marcin Kuzminski <marcin@python-works.com>
parents: 1154
diff changeset
915
187a924ed653 Changes for repo groups
Marcin Kuzminski <marcin@python-works.com>
parents: 1154
diff changeset
916
3599
8087731920d8 breadcrumbs: make repo names link to summary pages
Mads Kiilerich <madski@unity3d.com>
parents: 3588
diff changeset
917 def repo_link(groups_and_repos):
1342
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1330
diff changeset
918 """
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1330
diff changeset
919 Makes a breadcrumbs link to repo within a group
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1330
diff changeset
920 joins &raquo; on each group to create a fancy link
1818
cf51bbfb120e auto white-space removal
Marcin Kuzminski <marcin@python-works.com>
parents: 1789
diff changeset
921
1342
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1330
diff changeset
922 ex::
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1330
diff changeset
923 group >> subgroup >> repo
1818
cf51bbfb120e auto white-space removal
Marcin Kuzminski <marcin@python-works.com>
parents: 1789
diff changeset
924
1342
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1330
diff changeset
925 :param groups_and_repos:
3012
58f3bba0ddc1 extend helper for better breadcrumbs for repo groups
Marcin Kuzminski <marcin@python-works.com>
parents: 2998
diff changeset
926 :param last_url:
1342
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1330
diff changeset
927 """
3599
8087731920d8 breadcrumbs: make repo names link to summary pages
Mads Kiilerich <madski@unity3d.com>
parents: 3588
diff changeset
928 groups, just_name, repo_name = groups_and_repos
8087731920d8 breadcrumbs: make repo names link to summary pages
Mads Kiilerich <madski@unity3d.com>
parents: 3588
diff changeset
929 last_url = url('summary_home', repo_name=repo_name)
8087731920d8 breadcrumbs: make repo names link to summary pages
Mads Kiilerich <madski@unity3d.com>
parents: 3588
diff changeset
930 last_link = link_to(just_name, last_url)
1159
187a924ed653 Changes for repo groups
Marcin Kuzminski <marcin@python-works.com>
parents: 1154
diff changeset
931
3599
8087731920d8 breadcrumbs: make repo names link to summary pages
Mads Kiilerich <madski@unity3d.com>
parents: 3588
diff changeset
932 def make_link(group):
8087731920d8 breadcrumbs: make repo names link to summary pages
Mads Kiilerich <madski@unity3d.com>
parents: 3588
diff changeset
933 return link_to(group.name,
8087731920d8 breadcrumbs: make repo names link to summary pages
Mads Kiilerich <madski@unity3d.com>
parents: 3588
diff changeset
934 url('repos_group_home', group_name=group.group_name))
8087731920d8 breadcrumbs: make repo names link to summary pages
Mads Kiilerich <madski@unity3d.com>
parents: 3588
diff changeset
935 return literal(' &raquo; '.join(map(make_link, groups) + ['<span>%s</span>' % last_link]))
1257
0a2a10a1912f Implemented --stat for changelog
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
936
1959
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
937
1257
0a2a10a1912f Implemented --stat for changelog
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
938 def fancy_file_stats(stats):
1342
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1330
diff changeset
939 """
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1330
diff changeset
940 Displays a fancy two colored bar for number of added/deleted
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1330
diff changeset
941 lines of code on file
1818
cf51bbfb120e auto white-space removal
Marcin Kuzminski <marcin@python-works.com>
parents: 1789
diff changeset
942
1342
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1330
diff changeset
943 :param stats: two element list of added/deleted lines of code
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1330
diff changeset
944 """
2995
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
945 def cgen(l_type, a_v, d_v):
2118
Marcin Kuzminski <marcin@python-works.com>
parents: 2111
diff changeset
946 mapping = {'tr': 'top-right-rounded-corner-mid',
Marcin Kuzminski <marcin@python-works.com>
parents: 2111
diff changeset
947 'tl': 'top-left-rounded-corner-mid',
Marcin Kuzminski <marcin@python-works.com>
parents: 2111
diff changeset
948 'br': 'bottom-right-rounded-corner-mid',
Marcin Kuzminski <marcin@python-works.com>
parents: 2111
diff changeset
949 'bl': 'bottom-left-rounded-corner-mid'}
1959
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
950 map_getter = lambda x: mapping[x]
1257
0a2a10a1912f Implemented --stat for changelog
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
951
0a2a10a1912f Implemented --stat for changelog
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
952 if l_type == 'a' and d_v:
0a2a10a1912f Implemented --stat for changelog
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
953 #case when added and deleted are present
0a2a10a1912f Implemented --stat for changelog
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
954 return ' '.join(map(map_getter, ['tl', 'bl']))
0a2a10a1912f Implemented --stat for changelog
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
955
0a2a10a1912f Implemented --stat for changelog
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
956 if l_type == 'a' and not d_v:
0a2a10a1912f Implemented --stat for changelog
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
957 return ' '.join(map(map_getter, ['tr', 'br', 'tl', 'bl']))
0a2a10a1912f Implemented --stat for changelog
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
958
0a2a10a1912f Implemented --stat for changelog
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
959 if l_type == 'd' and a_v:
0a2a10a1912f Implemented --stat for changelog
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
960 return ' '.join(map(map_getter, ['tr', 'br']))
0a2a10a1912f Implemented --stat for changelog
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
961
0a2a10a1912f Implemented --stat for changelog
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
962 if l_type == 'd' and not a_v:
0a2a10a1912f Implemented --stat for changelog
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
963 return ' '.join(map(map_getter, ['tr', 'br', 'tl', 'bl']))
0a2a10a1912f Implemented --stat for changelog
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
964
2995
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
965 a, d = stats[0], stats[1]
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
966 width = 100
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
967
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
968 if a == 'b':
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
969 #binary mode
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
970 b_d = '<div class="bin%s %s" style="width:100%%">%s</div>' % (d, cgen('a', a_v='', d_v=0), 'bin')
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
971 b_a = '<div class="bin1" style="width:0%%">%s</div>' % ('bin')
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
972 return literal('<div style="width:%spx">%s%s</div>' % (width, b_a, b_d))
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
973
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
974 t = stats[0] + stats[1]
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
975 unit = float(width) / (t or 1)
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
976
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
977 # needs > 9% of width to be visible or 0 to be hidden
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
978 a_p = max(9, unit * a) if a > 0 else 0
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
979 d_p = max(9, unit * d) if d > 0 else 0
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
980 p_sum = a_p + d_p
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
981
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
982 if p_sum > width:
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
983 #adjust the percentage to be == 100% since we adjusted to 9
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
984 if a_p > d_p:
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
985 a_p = a_p - (p_sum - width)
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
986 else:
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
987 d_p = d_p - (p_sum - width)
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
988
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
989 a_v = a if a > 0 else ''
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
990 d_v = d if d > 0 else ''
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
991
1959
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
992 d_a = '<div class="added %s" style="width:%s%%">%s</div>' % (
2995
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
993 cgen('a', a_v, d_v), a_p, a_v
1959
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
994 )
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
995 d_d = '<div class="deleted %s" style="width:%s%%">%s</div>' % (
2995
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2971
diff changeset
996 cgen('d', a_v, d_v), d_p, d_v
1959
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
997 )
1257
0a2a10a1912f Implemented --stat for changelog
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
998 return literal('<div style="width:%spx">%s%s</div>' % (width, d_a, d_d))
1438
002f4f465b58 Links in summary page are now active
Marcin Kuzminski <marcin@python-works.com>
parents: 1422
diff changeset
999
002f4f465b58 Links in summary page are now active
Marcin Kuzminski <marcin@python-works.com>
parents: 1422
diff changeset
1000
3399
5ff79fad209c don't use double literal() calls on urlify functions
Marcin Kuzminski <marcin@python-works.com>
parents: 3398
diff changeset
1001 def urlify_text(text_, safe=True):
3398
1ca82b6a6349 urlify commit function also should extract normal links
Marcin Kuzminski <marcin@python-works.com>
parents: 3385
diff changeset
1002 """
1ca82b6a6349 urlify commit function also should extract normal links
Marcin Kuzminski <marcin@python-works.com>
parents: 3385
diff changeset
1003 Extrac urls from text and make html links out of them
1ca82b6a6349 urlify commit function also should extract normal links
Marcin Kuzminski <marcin@python-works.com>
parents: 3385
diff changeset
1004
1ca82b6a6349 urlify commit function also should extract normal links
Marcin Kuzminski <marcin@python-works.com>
parents: 3385
diff changeset
1005 :param text_:
1ca82b6a6349 urlify commit function also should extract normal links
Marcin Kuzminski <marcin@python-works.com>
parents: 3385
diff changeset
1006 """
1438
002f4f465b58 Links in summary page are now active
Marcin Kuzminski <marcin@python-works.com>
parents: 1422
diff changeset
1007
1766
Marcin Kuzminski <marcin@python-works.com>
parents: 1764
diff changeset
1008 url_pat = re.compile(r'''(http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]'''
Marcin Kuzminski <marcin@python-works.com>
parents: 1764
diff changeset
1009 '''|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+)''')
1438
002f4f465b58 Links in summary page are now active
Marcin Kuzminski <marcin@python-works.com>
parents: 1422
diff changeset
1010
002f4f465b58 Links in summary page are now active
Marcin Kuzminski <marcin@python-works.com>
parents: 1422
diff changeset
1011 def url_func(match_obj):
002f4f465b58 Links in summary page are now active
Marcin Kuzminski <marcin@python-works.com>
parents: 1422
diff changeset
1012 url_full = match_obj.groups()[0]
1868
f26acc1b27e2 added repository name into issue tracker link to support different projects issues tracker mapping
Marcin Kuzminski <marcin@python-works.com>
parents: 1865
diff changeset
1013 return '<a href="%(url)s">%(url)s</a>' % ({'url': url_full})
3399
5ff79fad209c don't use double literal() calls on urlify functions
Marcin Kuzminski <marcin@python-works.com>
parents: 3398
diff changeset
1014 _newtext = url_pat.sub(url_func, text_)
5ff79fad209c don't use double literal() calls on urlify functions
Marcin Kuzminski <marcin@python-works.com>
parents: 3398
diff changeset
1015 if safe:
5ff79fad209c don't use double literal() calls on urlify functions
Marcin Kuzminski <marcin@python-works.com>
parents: 3398
diff changeset
1016 return literal(_newtext)
5ff79fad209c don't use double literal() calls on urlify functions
Marcin Kuzminski <marcin@python-works.com>
parents: 3398
diff changeset
1017 return _newtext
1656
833f9dec0a06 implemented #44 - branch filtering in changelog, aka branch browser
Marcin Kuzminski <marcin@python-works.com>
parents: 1629
diff changeset
1018
1959
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
1019
1913
08344d037ba1 added links to revisions in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1912
diff changeset
1020 def urlify_changesets(text_, repository):
2111
122f15a8f6ec fixed issue with escaping < and > in changeset commits
Marcin Kuzminski <marcin@python-works.com>
parents: 2109
diff changeset
1021 """
122f15a8f6ec fixed issue with escaping < and > in changeset commits
Marcin Kuzminski <marcin@python-works.com>
parents: 2109
diff changeset
1022 Extract revision ids from changeset and make link from them
2125
097327aaf2ad more detailed logging on auth system
Marcin Kuzminski <marcin@python-works.com>
parents: 2118
diff changeset
1023
2111
122f15a8f6ec fixed issue with escaping < and > in changeset commits
Marcin Kuzminski <marcin@python-works.com>
parents: 2109
diff changeset
1024 :param text_:
3398
1ca82b6a6349 urlify commit function also should extract normal links
Marcin Kuzminski <marcin@python-works.com>
parents: 3385
diff changeset
1025 :param repository: repo name to build the URL with
2111
122f15a8f6ec fixed issue with escaping < and > in changeset commits
Marcin Kuzminski <marcin@python-works.com>
parents: 2109
diff changeset
1026 """
3385
d21c762f5c4b revision extraction function shouldn't be so eager, just extract commits that are
Marcin Kuzminski <marcin@python-works.com>
parents: 3382
diff changeset
1027 from pylons import url # doh, we need to re-import url to mock it later
3405
a9adca4ba3c9 fixed urlify changesets regex + tests
Marcin Kuzminski <marcin@python-works.com>
parents: 3399
diff changeset
1028 URL_PAT = re.compile(r'(^|\s)([0-9a-fA-F]{12,40})($|\s)')
1913
08344d037ba1 added links to revisions in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1912
diff changeset
1029
08344d037ba1 added links to revisions in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1912
diff changeset
1030 def url_func(match_obj):
3405
a9adca4ba3c9 fixed urlify changesets regex + tests
Marcin Kuzminski <marcin@python-works.com>
parents: 3399
diff changeset
1031 rev = match_obj.groups()[1]
a9adca4ba3c9 fixed urlify changesets regex + tests
Marcin Kuzminski <marcin@python-works.com>
parents: 3399
diff changeset
1032 pref = match_obj.groups()[0]
a9adca4ba3c9 fixed urlify changesets regex + tests
Marcin Kuzminski <marcin@python-works.com>
parents: 3399
diff changeset
1033 suf = match_obj.groups()[2]
a9adca4ba3c9 fixed urlify changesets regex + tests
Marcin Kuzminski <marcin@python-works.com>
parents: 3399
diff changeset
1034
1913
08344d037ba1 added links to revisions in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1912
diff changeset
1035 tmpl = (
08344d037ba1 added links to revisions in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1912
diff changeset
1036 '%(pref)s<a class="%(cls)s" href="%(url)s">'
3405
a9adca4ba3c9 fixed urlify changesets regex + tests
Marcin Kuzminski <marcin@python-works.com>
parents: 3399
diff changeset
1037 '%(rev)s</a>%(suf)s'
1913
08344d037ba1 added links to revisions in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1912
diff changeset
1038 )
08344d037ba1 added links to revisions in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1912
diff changeset
1039 return tmpl % {
08344d037ba1 added links to revisions in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1912
diff changeset
1040 'pref': pref,
08344d037ba1 added links to revisions in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1912
diff changeset
1041 'cls': 'revision-link',
08344d037ba1 added links to revisions in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1912
diff changeset
1042 'url': url('changeset_home', repo_name=repository, revision=rev),
08344d037ba1 added links to revisions in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1912
diff changeset
1043 'rev': rev,
3385
d21c762f5c4b revision extraction function shouldn't be so eager, just extract commits that are
Marcin Kuzminski <marcin@python-works.com>
parents: 3382
diff changeset
1044 'suf': suf
1913
08344d037ba1 added links to revisions in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1912
diff changeset
1045 }
08344d037ba1 added links to revisions in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1912
diff changeset
1046
08344d037ba1 added links to revisions in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1912
diff changeset
1047 newtext = URL_PAT.sub(url_func, text_)
08344d037ba1 added links to revisions in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1912
diff changeset
1048
08344d037ba1 added links to revisions in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1912
diff changeset
1049 return newtext
1868
f26acc1b27e2 added repository name into issue tracker link to support different projects issues tracker mapping
Marcin Kuzminski <marcin@python-works.com>
parents: 1865
diff changeset
1050
1959
7a7ffe24b82c optimized speed for browsing git changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 1944
diff changeset
1051
1878
287eff9614fa changelog: make messages be links again, and somewhat co-exist with issue tracker links (those are bold now)
Aras Pranckevicius <aras@unity3d.com>
parents: 1868
diff changeset
1052 def urlify_commit(text_, repository=None, link_=None):
2028
ef3114b01c7c fixed issues when urlify commit created empty links when link_ param was empty
Marcin Kuzminski <marcin@python-works.com>
parents: 2014
diff changeset
1053 """
ef3114b01c7c fixed issues when urlify commit created empty links when link_ param was empty
Marcin Kuzminski <marcin@python-works.com>
parents: 2014
diff changeset
1054 Parses given text message and makes proper links.
ef3114b01c7c fixed issues when urlify commit created empty links when link_ param was empty
Marcin Kuzminski <marcin@python-works.com>
parents: 2014
diff changeset
1055 issues are linked to given issue-server, and rest is a changeset link
ef3114b01c7c fixed issues when urlify commit created empty links when link_ param was empty
Marcin Kuzminski <marcin@python-works.com>
parents: 2014
diff changeset
1056 if link_ is given, in other case it's a plain text
ef3114b01c7c fixed issues when urlify commit created empty links when link_ param was empty
Marcin Kuzminski <marcin@python-works.com>
parents: 2014
diff changeset
1057
ef3114b01c7c fixed issues when urlify commit created empty links when link_ param was empty
Marcin Kuzminski <marcin@python-works.com>
parents: 2014
diff changeset
1058 :param text_:
ef3114b01c7c fixed issues when urlify commit created empty links when link_ param was empty
Marcin Kuzminski <marcin@python-works.com>
parents: 2014
diff changeset
1059 :param repository:
ef3114b01c7c fixed issues when urlify commit created empty links when link_ param was empty
Marcin Kuzminski <marcin@python-works.com>
parents: 2014
diff changeset
1060 :param link_: changeset link
ef3114b01c7c fixed issues when urlify commit created empty links when link_ param was empty
Marcin Kuzminski <marcin@python-works.com>
parents: 2014
diff changeset
1061 """
1837
a6a30c919513 #73 mapping of commited issues from commit message into issue tracker url.
Marcin Kuzminski <marcin@python-works.com>
parents: 1832
diff changeset
1062 import traceback
3398
1ca82b6a6349 urlify commit function also should extract normal links
Marcin Kuzminski <marcin@python-works.com>
parents: 3385
diff changeset
1063 from pylons import url # doh, we need to re-import url to mock it later
2125
097327aaf2ad more detailed logging on auth system
Marcin Kuzminski <marcin@python-works.com>
parents: 2118
diff changeset
1064
2111
122f15a8f6ec fixed issue with escaping < and > in changeset commits
Marcin Kuzminski <marcin@python-works.com>
parents: 2109
diff changeset
1065 def escaper(string):
122f15a8f6ec fixed issue with escaping < and > in changeset commits
Marcin Kuzminski <marcin@python-works.com>
parents: 2109
diff changeset
1066 return string.replace('<', '&lt;').replace('>', '&gt;')
2125
097327aaf2ad more detailed logging on auth system
Marcin Kuzminski <marcin@python-works.com>
parents: 2118
diff changeset
1067
2012
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
1068 def linkify_others(t, l):
1913
08344d037ba1 added links to revisions in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1912
diff changeset
1069 urls = re.compile(r'(\<a.*?\<\/a\>)',)
08344d037ba1 added links to revisions in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1912
diff changeset
1070 links = []
08344d037ba1 added links to revisions in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1912
diff changeset
1071 for e in urls.split(t):
08344d037ba1 added links to revisions in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1912
diff changeset
1072 if not urls.match(e):
2012
ca39c02c7c3e speed up generating changesets in journal log
Marcin Kuzminski <marcin@python-works.com>
parents: 2007
diff changeset
1073 links.append('<a class="message-link" href="%s">%s</a>' % (l, e))
1913
08344d037ba1 added links to revisions in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1912
diff changeset
1074 else:
1944
5fc9c92025c1 white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1933
diff changeset
1075 links.append(e)
5fc9c92025c1 white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1933
diff changeset
1076
1913
08344d037ba1 added links to revisions in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1912
diff changeset
1077 return ''.join(links)
2125
097327aaf2ad more detailed logging on auth system
Marcin Kuzminski <marcin@python-works.com>
parents: 2118
diff changeset
1078
2111
122f15a8f6ec fixed issue with escaping < and > in changeset commits
Marcin Kuzminski <marcin@python-works.com>
parents: 2109
diff changeset
1079 # urlify changesets - extrac revisions and make link out of them
2865
6d9b3ade3051 Allowing multiple issue servers to be autolinked in the changeset view;
Zachary Auclair <zach101@gmail.com>
parents: 2836
diff changeset
1080 newtext = urlify_changesets(escaper(text_), repository)
2111
122f15a8f6ec fixed issue with escaping < and > in changeset commits
Marcin Kuzminski <marcin@python-works.com>
parents: 2109
diff changeset
1081
3398
1ca82b6a6349 urlify commit function also should extract normal links
Marcin Kuzminski <marcin@python-works.com>
parents: 3385
diff changeset
1082 # extract http/https links and make them real urls
3399
5ff79fad209c don't use double literal() calls on urlify functions
Marcin Kuzminski <marcin@python-works.com>
parents: 3398
diff changeset
1083 newtext = urlify_text(newtext, safe=False)
3398
1ca82b6a6349 urlify commit function also should extract normal links
Marcin Kuzminski <marcin@python-works.com>
parents: 3385
diff changeset
1084
1837
a6a30c919513 #73 mapping of commited issues from commit message into issue tracker url.
Marcin Kuzminski <marcin@python-works.com>
parents: 1832
diff changeset
1085 try:
3382
b8cb1fe622e9 don't use global pylons config
Marcin Kuzminski <marcin@python-works.com>
parents: 3375
diff changeset
1086 from rhodecode import CONFIG
b8cb1fe622e9 don't use global pylons config
Marcin Kuzminski <marcin@python-works.com>
parents: 3375
diff changeset
1087 conf = CONFIG
1868
f26acc1b27e2 added repository name into issue tracker link to support different projects issues tracker mapping
Marcin Kuzminski <marcin@python-works.com>
parents: 1865
diff changeset
1088
2865
6d9b3ade3051 Allowing multiple issue servers to be autolinked in the changeset view;
Zachary Auclair <zach101@gmail.com>
parents: 2836
diff changeset
1089 # allow multiple issue servers to be used
6d9b3ade3051 Allowing multiple issue servers to be autolinked in the changeset view;
Zachary Auclair <zach101@gmail.com>
parents: 2836
diff changeset
1090 valid_indices = [
2866
736678a8c881 #518 multiple issues patterns
Marcin Kuzminski <marcin@python-works.com>
parents: 2865
diff changeset
1091 x.group(1)
736678a8c881 #518 multiple issues patterns
Marcin Kuzminski <marcin@python-works.com>
parents: 2865
diff changeset
1092 for x in map(lambda x: re.match(r'issue_pat(.*)', x), conf.keys())
736678a8c881 #518 multiple issues patterns
Marcin Kuzminski <marcin@python-works.com>
parents: 2865
diff changeset
1093 if x and 'issue_server_link%s' % x.group(1) in conf
736678a8c881 #518 multiple issues patterns
Marcin Kuzminski <marcin@python-works.com>
parents: 2865
diff changeset
1094 and 'issue_prefix%s' % x.group(1) in conf
736678a8c881 #518 multiple issues patterns
Marcin Kuzminski <marcin@python-works.com>
parents: 2865
diff changeset
1095 ]
2865
6d9b3ade3051 Allowing multiple issue servers to be autolinked in the changeset view;
Zachary Auclair <zach101@gmail.com>
parents: 2836
diff changeset
1096
2866
736678a8c881 #518 multiple issues patterns
Marcin Kuzminski <marcin@python-works.com>
parents: 2865
diff changeset
1097 log.debug('found issue server suffixes `%s` during valuation of: %s'
736678a8c881 #518 multiple issues patterns
Marcin Kuzminski <marcin@python-works.com>
parents: 2865
diff changeset
1098 % (','.join(valid_indices), newtext))
1868
f26acc1b27e2 added repository name into issue tracker link to support different projects issues tracker mapping
Marcin Kuzminski <marcin@python-works.com>
parents: 1865
diff changeset
1099
2865
6d9b3ade3051 Allowing multiple issue servers to be autolinked in the changeset view;
Zachary Auclair <zach101@gmail.com>
parents: 2836
diff changeset
1100 for pattern_index in valid_indices:
2866
736678a8c881 #518 multiple issues patterns
Marcin Kuzminski <marcin@python-works.com>
parents: 2865
diff changeset
1101 ISSUE_PATTERN = conf.get('issue_pat%s' % pattern_index)
736678a8c881 #518 multiple issues patterns
Marcin Kuzminski <marcin@python-works.com>
parents: 2865
diff changeset
1102 ISSUE_SERVER_LNK = conf.get('issue_server_link%s' % pattern_index)
736678a8c881 #518 multiple issues patterns
Marcin Kuzminski <marcin@python-works.com>
parents: 2865
diff changeset
1103 ISSUE_PREFIX = conf.get('issue_prefix%s' % pattern_index)
2865
6d9b3ade3051 Allowing multiple issue servers to be autolinked in the changeset view;
Zachary Auclair <zach101@gmail.com>
parents: 2836
diff changeset
1104
2866
736678a8c881 #518 multiple issues patterns
Marcin Kuzminski <marcin@python-works.com>
parents: 2865
diff changeset
1105 log.debug('pattern suffix `%s` PAT:%s SERVER_LINK:%s PREFIX:%s'
736678a8c881 #518 multiple issues patterns
Marcin Kuzminski <marcin@python-works.com>
parents: 2865
diff changeset
1106 % (pattern_index, ISSUE_PATTERN, ISSUE_SERVER_LNK,
736678a8c881 #518 multiple issues patterns
Marcin Kuzminski <marcin@python-works.com>
parents: 2865
diff changeset
1107 ISSUE_PREFIX))
2865
6d9b3ade3051 Allowing multiple issue servers to be autolinked in the changeset view;
Zachary Auclair <zach101@gmail.com>
parents: 2836
diff changeset
1108
6d9b3ade3051 Allowing multiple issue servers to be autolinked in the changeset view;
Zachary Auclair <zach101@gmail.com>
parents: 2836
diff changeset
1109 URL_PAT = re.compile(r'%s' % ISSUE_PATTERN)
1868
f26acc1b27e2 added repository name into issue tracker link to support different projects issues tracker mapping
Marcin Kuzminski <marcin@python-works.com>
parents: 1865
diff changeset
1110
1837
a6a30c919513 #73 mapping of commited issues from commit message into issue tracker url.
Marcin Kuzminski <marcin@python-works.com>
parents: 1832
diff changeset
1111 def url_func(match_obj):
1912
32e1e0745d3c fixes issue with whitespace for referenced tasks in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1884
diff changeset
1112 pref = ''
32e1e0745d3c fixes issue with whitespace for referenced tasks in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1884
diff changeset
1113 if match_obj.group().startswith(' '):
32e1e0745d3c fixes issue with whitespace for referenced tasks in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1884
diff changeset
1114 pref = ' '
32e1e0745d3c fixes issue with whitespace for referenced tasks in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1884
diff changeset
1115
1933
3da456a3a211 changed default issue tracker links pattern
Marcin Kuzminski <marcin@python-works.com>
parents: 1927
diff changeset
1116 issue_id = ''.join(match_obj.groups())
1840
87920d4f58c5 added class into issue tracker link
Marcin Kuzminski <marcin@python-works.com>
parents: 1837
diff changeset
1117 tmpl = (
1912
32e1e0745d3c fixes issue with whitespace for referenced tasks in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1884
diff changeset
1118 '%(pref)s<a class="%(cls)s" href="%(url)s">'
1865
37b3c3244bbc UI fixes
Marcin Kuzminski <marcin@python-works.com>
parents: 1840
diff changeset
1119 '%(issue-prefix)s%(id-repr)s'
1840
87920d4f58c5 added class into issue tracker link
Marcin Kuzminski <marcin@python-works.com>
parents: 1837
diff changeset
1120 '</a>'
87920d4f58c5 added class into issue tracker link
Marcin Kuzminski <marcin@python-works.com>
parents: 1837
diff changeset
1121 )
1868
f26acc1b27e2 added repository name into issue tracker link to support different projects issues tracker mapping
Marcin Kuzminski <marcin@python-works.com>
parents: 1865
diff changeset
1122 url = ISSUE_SERVER_LNK.replace('{id}', issue_id)
f26acc1b27e2 added repository name into issue tracker link to support different projects issues tracker mapping
Marcin Kuzminski <marcin@python-works.com>
parents: 1865
diff changeset
1123 if repository:
f26acc1b27e2 added repository name into issue tracker link to support different projects issues tracker mapping
Marcin Kuzminski <marcin@python-works.com>
parents: 1865
diff changeset
1124 url = url.replace('{repo}', repository)
2339
79b3c9c66c54 Added optional repo_name into issue tracker url to get just the name of repo without group prefix
Marcin Kuzminski <marcin@python-works.com>
parents: 2323
diff changeset
1125 repo_name = repository.split(URL_SEP)[-1]
79b3c9c66c54 Added optional repo_name into issue tracker url to get just the name of repo without group prefix
Marcin Kuzminski <marcin@python-works.com>
parents: 2323
diff changeset
1126 url = url.replace('{repo_name}', repo_name)
2865
6d9b3ade3051 Allowing multiple issue servers to be autolinked in the changeset view;
Zachary Auclair <zach101@gmail.com>
parents: 2836
diff changeset
1127
1913
08344d037ba1 added links to revisions in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1912
diff changeset
1128 return tmpl % {
1912
32e1e0745d3c fixes issue with whitespace for referenced tasks in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1884
diff changeset
1129 'pref': pref,
1868
f26acc1b27e2 added repository name into issue tracker link to support different projects issues tracker mapping
Marcin Kuzminski <marcin@python-works.com>
parents: 1865
diff changeset
1130 'cls': 'issue-tracker-link',
f26acc1b27e2 added repository name into issue tracker link to support different projects issues tracker mapping
Marcin Kuzminski <marcin@python-works.com>
parents: 1865
diff changeset
1131 'url': url,
f26acc1b27e2 added repository name into issue tracker link to support different projects issues tracker mapping
Marcin Kuzminski <marcin@python-works.com>
parents: 1865
diff changeset
1132 'id-repr': issue_id,
f26acc1b27e2 added repository name into issue tracker link to support different projects issues tracker mapping
Marcin Kuzminski <marcin@python-works.com>
parents: 1865
diff changeset
1133 'issue-prefix': ISSUE_PREFIX,
f26acc1b27e2 added repository name into issue tracker link to support different projects issues tracker mapping
Marcin Kuzminski <marcin@python-works.com>
parents: 1865
diff changeset
1134 'serv': ISSUE_SERVER_LNK,
1913
08344d037ba1 added links to revisions in commit messages
Marcin Kuzminski <marcin@python-works.com>
parents: 1912
diff changeset
1135 }
2865
6d9b3ade3051 Allowing multiple issue servers to be autolinked in the changeset view;
Zachary Auclair <zach101@gmail.com>
parents: 2836
diff changeset
1136 newtext = URL_PAT.sub(url_func, newtext)
2866
736678a8c881 #518 multiple issues patterns
Marcin Kuzminski <marcin@python-works.com>
parents: 2865
diff changeset
1137 log.debug('processed prefix:`%s` => %s' % (pattern_index, newtext))
1944
5fc9c92025c1 white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 1933
diff changeset
1138
2865
6d9b3ade3051 Allowing multiple issue servers to be autolinked in the changeset view;
Zachary Auclair <zach101@gmail.com>
parents: 2836
diff changeset
1139 # if we actually did something above
2956
a2ecf8a530b9 don't check for url issue links, since we always want to linkify changeset into a repo link, fixes issue
Marcin Kuzminski <marcin@python-works.com>
parents: 2954
diff changeset
1140 if link_:
a2ecf8a530b9 don't check for url issue links, since we always want to linkify changeset into a repo link, fixes issue
Marcin Kuzminski <marcin@python-works.com>
parents: 2954
diff changeset
1141 # wrap not links into final link => link_
a2ecf8a530b9 don't check for url issue links, since we always want to linkify changeset into a repo link, fixes issue
Marcin Kuzminski <marcin@python-works.com>
parents: 2954
diff changeset
1142 newtext = linkify_others(newtext, link_)
3631
10b4e34841a4 Don't catch all exceptions
Marcin Kuzminski <marcin@python-works.com>
parents: 3627
diff changeset
1143 except Exception:
1837
a6a30c919513 #73 mapping of commited issues from commit message into issue tracker url.
Marcin Kuzminski <marcin@python-works.com>
parents: 1832
diff changeset
1144 log.error(traceback.format_exc())
a6a30c919513 #73 mapping of commited issues from commit message into issue tracker url.
Marcin Kuzminski <marcin@python-works.com>
parents: 1832
diff changeset
1145 pass
a6a30c919513 #73 mapping of commited issues from commit message into issue tracker url.
Marcin Kuzminski <marcin@python-works.com>
parents: 1832
diff changeset
1146
2966
566f0166f21e yet another fix for commit linkifications
Marcin Kuzminski <marcin@python-works.com>
parents: 2965
diff changeset
1147 return literal(newtext)
1670
d2de0c2f02cd #77 code review
Marcin Kuzminski <marcin@python-works.com>
parents: 1656
diff changeset
1148
1868
f26acc1b27e2 added repository name into issue tracker link to support different projects issues tracker mapping
Marcin Kuzminski <marcin@python-works.com>
parents: 1865
diff changeset
1149
1670
d2de0c2f02cd #77 code review
Marcin Kuzminski <marcin@python-works.com>
parents: 1656
diff changeset
1150 def rst(source):
1789
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file
Marcin Kuzminski <marcin@python-works.com>
parents: 1781
diff changeset
1151 return literal('<div class="rst-block">%s</div>' %
1766
Marcin Kuzminski <marcin@python-works.com>
parents: 1764
diff changeset
1152 MarkupRenderer.rst(source))
1789
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file
Marcin Kuzminski <marcin@python-works.com>
parents: 1781
diff changeset
1153
1868
f26acc1b27e2 added repository name into issue tracker link to support different projects issues tracker mapping
Marcin Kuzminski <marcin@python-works.com>
parents: 1865
diff changeset
1154
1769
025f3333c769 @mention highlighting
Marcin Kuzminski <marcin@python-works.com>
parents: 1767
diff changeset
1155 def rst_w_mentions(source):
025f3333c769 @mention highlighting
Marcin Kuzminski <marcin@python-works.com>
parents: 1767
diff changeset
1156 """
025f3333c769 @mention highlighting
Marcin Kuzminski <marcin@python-works.com>
parents: 1767
diff changeset
1157 Wrapped rst renderer with @mention highlighting
1818
cf51bbfb120e auto white-space removal
Marcin Kuzminski <marcin@python-works.com>
parents: 1789
diff changeset
1158
1769
025f3333c769 @mention highlighting
Marcin Kuzminski <marcin@python-works.com>
parents: 1767
diff changeset
1159 :param source:
025f3333c769 @mention highlighting
Marcin Kuzminski <marcin@python-works.com>
parents: 1767
diff changeset
1160 """
1789
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file
Marcin Kuzminski <marcin@python-works.com>
parents: 1781
diff changeset
1161 return literal('<div class="rst-block">%s</div>' %
17caf4efe15c implements #308 rewrote diffs to enable displaying full diff on each file
Marcin Kuzminski <marcin@python-works.com>
parents: 1781
diff changeset
1162 MarkupRenderer.rst_with_mentions(source))
2217
76947224bf27 Implemented initial code-review status of changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2203
diff changeset
1163
76947224bf27 Implemented initial code-review status of changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2203
diff changeset
1164
76947224bf27 Implemented initial code-review status of changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2203
diff changeset
1165 def changeset_status(repo, revision):
76947224bf27 Implemented initial code-review status of changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2203
diff changeset
1166 return ChangesetStatusModel().get_status(repo, revision)
2239
493e03a4d268 added changeset status into changelog view
Marcin Kuzminski <marcin@python-works.com>
parents: 2217
diff changeset
1167
493e03a4d268 added changeset status into changelog view
Marcin Kuzminski <marcin@python-works.com>
parents: 2217
diff changeset
1168
493e03a4d268 added changeset status into changelog view
Marcin Kuzminski <marcin@python-works.com>
parents: 2217
diff changeset
1169 def changeset_status_lbl(changeset_status):
493e03a4d268 added changeset status into changelog view
Marcin Kuzminski <marcin@python-works.com>
parents: 2217
diff changeset
1170 return dict(ChangesetStatus.STATUSES).get(changeset_status)
2532
19de74e33fb0 Better descriptions of given permission overview in edit user view
Marcin Kuzminski <marcin@python-works.com>
parents: 2491
diff changeset
1171
19de74e33fb0 Better descriptions of given permission overview in edit user view
Marcin Kuzminski <marcin@python-works.com>
parents: 2491
diff changeset
1172
19de74e33fb0 Better descriptions of given permission overview in edit user view
Marcin Kuzminski <marcin@python-works.com>
parents: 2491
diff changeset
1173 def get_permission_name(key):
19de74e33fb0 Better descriptions of given permission overview in edit user view
Marcin Kuzminski <marcin@python-works.com>
parents: 2491
diff changeset
1174 return dict(Permission.PERMS).get(key)
3070
cc7eedb5323c final implementation of #210 journal filtering.
Marcin Kuzminski <marcin@python-works.com>
parents: 3063
diff changeset
1175
cc7eedb5323c final implementation of #210 journal filtering.
Marcin Kuzminski <marcin@python-works.com>
parents: 3063
diff changeset
1176
cc7eedb5323c final implementation of #210 journal filtering.
Marcin Kuzminski <marcin@python-works.com>
parents: 3063
diff changeset
1177 def journal_filter_help():
cc7eedb5323c final implementation of #210 journal filtering.
Marcin Kuzminski <marcin@python-works.com>
parents: 3063
diff changeset
1178 return _(textwrap.dedent('''
cc7eedb5323c final implementation of #210 journal filtering.
Marcin Kuzminski <marcin@python-works.com>
parents: 3063
diff changeset
1179 Example filter terms:
cc7eedb5323c final implementation of #210 journal filtering.
Marcin Kuzminski <marcin@python-works.com>
parents: 3063
diff changeset
1180 repository:vcs
cc7eedb5323c final implementation of #210 journal filtering.
Marcin Kuzminski <marcin@python-works.com>
parents: 3063
diff changeset
1181 username:marcin
cc7eedb5323c final implementation of #210 journal filtering.
Marcin Kuzminski <marcin@python-works.com>
parents: 3063
diff changeset
1182 action:*push*
cc7eedb5323c final implementation of #210 journal filtering.
Marcin Kuzminski <marcin@python-works.com>
parents: 3063
diff changeset
1183 ip:127.0.0.1
cc7eedb5323c final implementation of #210 journal filtering.
Marcin Kuzminski <marcin@python-works.com>
parents: 3063
diff changeset
1184 date:20120101
cc7eedb5323c final implementation of #210 journal filtering.
Marcin Kuzminski <marcin@python-works.com>
parents: 3063
diff changeset
1185 date:[20120101100000 TO 20120102]
cc7eedb5323c final implementation of #210 journal filtering.
Marcin Kuzminski <marcin@python-works.com>
parents: 3063
diff changeset
1186
cc7eedb5323c final implementation of #210 journal filtering.
Marcin Kuzminski <marcin@python-works.com>
parents: 3063
diff changeset
1187 Generate wildcards using '*' character:
cc7eedb5323c final implementation of #210 journal filtering.
Marcin Kuzminski <marcin@python-works.com>
parents: 3063
diff changeset
1188 "repositroy:vcs*" - search everything starting with 'vcs'
cc7eedb5323c final implementation of #210 journal filtering.
Marcin Kuzminski <marcin@python-works.com>
parents: 3063
diff changeset
1189 "repository:*vcs*" - search for repository containing 'vcs'
cc7eedb5323c final implementation of #210 journal filtering.
Marcin Kuzminski <marcin@python-works.com>
parents: 3063
diff changeset
1190
cc7eedb5323c final implementation of #210 journal filtering.
Marcin Kuzminski <marcin@python-works.com>
parents: 3063
diff changeset
1191 Optional AND / OR operators in queries
cc7eedb5323c final implementation of #210 journal filtering.
Marcin Kuzminski <marcin@python-works.com>
parents: 3063
diff changeset
1192 "repository:vcs OR repository:test"
cc7eedb5323c final implementation of #210 journal filtering.
Marcin Kuzminski <marcin@python-works.com>
parents: 3063
diff changeset
1193 "username:test AND repository:test*"
cc7eedb5323c final implementation of #210 journal filtering.
Marcin Kuzminski <marcin@python-works.com>
parents: 3063
diff changeset
1194 '''))
3110
144128efc6ab - #683 fixed difference between messages about not mapped repositories
Marcin Kuzminski <marcin@python-works.com>
parents: 3080
diff changeset
1195
144128efc6ab - #683 fixed difference between messages about not mapped repositories
Marcin Kuzminski <marcin@python-works.com>
parents: 3080
diff changeset
1196
144128efc6ab - #683 fixed difference between messages about not mapped repositories
Marcin Kuzminski <marcin@python-works.com>
parents: 3080
diff changeset
1197 def not_mapped_error(repo_name):
144128efc6ab - #683 fixed difference between messages about not mapped repositories
Marcin Kuzminski <marcin@python-works.com>
parents: 3080
diff changeset
1198 flash(_('%s repository is not mapped to db perhaps'
144128efc6ab - #683 fixed difference between messages about not mapped repositories
Marcin Kuzminski <marcin@python-works.com>
parents: 3080
diff changeset
1199 ' it was created or renamed from the filesystem'
144128efc6ab - #683 fixed difference between messages about not mapped repositories
Marcin Kuzminski <marcin@python-works.com>
parents: 3080
diff changeset
1200 ' please run the application again'
144128efc6ab - #683 fixed difference between messages about not mapped repositories
Marcin Kuzminski <marcin@python-works.com>
parents: 3080
diff changeset
1201 ' in order to rescan repositories') % repo_name, category='error')
3125
9b92cf5a0cca Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents: 3110
diff changeset
1202
9b92cf5a0cca Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents: 3110
diff changeset
1203
9b92cf5a0cca Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents: 3110
diff changeset
1204 def ip_range(ip_addr):
9b92cf5a0cca Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents: 3110
diff changeset
1205 from rhodecode.model.db import UserIpMap
9b92cf5a0cca Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents: 3110
diff changeset
1206 s, e = UserIpMap._get_ip_range(ip_addr)
9b92cf5a0cca Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents: 3110
diff changeset
1207 return '%s - %s' % (s, e)