kallithea Changeset - 1ca82b6a6349

Changeset - 1ca82b6a6349

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 13 years ago 2013-02-25 17:55:18
marcin@python-works.com

urlify commit function also should extract normal links

1 file changed with 10 insertions and 1 deletions:

rhodecode/lib/helpers.py

0 comments (0 inline, 0 general)

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -975,12 +975,17 @@ def fancy_file_stats(stats): @@
         cgen('d', a_v, d_v), d_p, d_v
+    )
     return literal('<div style="width:%spx">%s%s</div>' % (width, d_a, d_d))
 def urlify_text(text_):
     """
     Extrac urls from text and make html links out of them
     :param text_:
     """
     url_pat = re.compile(r'''(http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]'''
                          '''|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+)''')
     def url_func(match_obj):
         url_full = match_obj.groups()[0]
@@ @@ -991,13 +996,13 @@ def urlify_text(text_): @@
 def urlify_changesets(text_, repository):
     """
     Extract revision ids from changeset and make link from them
     :param text_:
     :param repository:
+    :param repository: repo name to build the URL with
     """
     from pylons import url  # doh, we need to re-import url to mock it later
     URL_PAT = re.compile(r'(?:^|\s)([0-9a-fA-F]{12,40})(?:$|\s)')
     def url_func(match_obj):
         rev = match_obj.groups()[0]
@@ @@ -1034,12 +1039,13 @@ def urlify_commit(text_, repository=None @@
     :param text_:
     :param repository:
     :param link_: changeset link
     """
     import traceback
     from pylons import url  # doh, we need to re-import url to mock it later
     def escaper(string):
         return string.replace('<', '&lt;').replace('>', '&gt;')
     def linkify_others(t, l):
         urls = re.compile(r'(\<a.*?\<\/a\>)',)
@@ @@ -1052,12 +1058,15 @@ def urlify_commit(text_, repository=None @@
         return ''.join(links)
     # urlify changesets - extrac revisions and make link out of them
     newtext = urlify_changesets(escaper(text_), repository)
     # extract http/https links and make them real urls
     newtext = urlify_text(newtext)
     try:
         from rhodecode import CONFIG
         conf = CONFIG
         # allow multiple issue servers to be used
         valid_indices = [

0 comments (0 inline, 0 general)