kallithea Changeset - 566f0166f21e

Changeset - 566f0166f21e

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 13 years ago 2012-10-27 00:51:08
marcin@python-works.com

yet another fix for commit linkifications

1 file changed with 2 insertions and 6 deletions:

rhodecode/lib/helpers.py

0 comments (0 inline, 0 general)

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -937,13 +937,12 @@ def fancy_file_stats(stats): @@
         cgen('d'), d_p, d_v
+    )
     return literal('<div style="width:%spx">%s%s</div>' % (width, d_a, d_d))
 def urlify_text(text_):
     import re
     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]
@@ @@ -956,13 +955,13 @@ def urlify_changesets(text_, repository) @@
     """
     Extract revision ids from changeset and make link from them
     :param text_:
     :param repository:
     """
-    import re
     URL_PAT = re.compile(r'([0-9a-fA-F]{12,})')
     def url_func(match_obj):
         rev = match_obj.groups()[0]
         pref = ''
         if match_obj.group().startswith(' '):
@@ @@ -991,13 +990,12 @@ def urlify_commit(text_, repository=None @@
     if link_ is given, in other case it's a plain text
     :param text_:
     :param repository:
     :param link_: changeset link
     """
     import re
     import traceback
     def escaper(string):
         return string.replace('<', '&lt;').replace('>', '&gt;')
     def linkify_others(t, l):
@@ @@ -1068,19 +1066,17 @@ def urlify_commit(text_, repository=None @@
             log.debug('processed prefix:`%s` => %s' % (pattern_index, newtext))
         # if we actually did something above
         if link_:
             # wrap not links into final link => link_
             newtext = linkify_others(newtext, link_)
             return literal(newtext)
     except:
         log.error(traceback.format_exc())
         pass
     return newtext
+    return literal(newtext)
 def rst(source):
     return literal('<div class="rst-block">%s</div>' %
                    MarkupRenderer.rst(source))

0 comments (0 inline, 0 general)