kallithea Changeset - 4b7a790d9702

Changeset - 4b7a790d9702

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 11 years ago 2014-07-18 18:44:54
madski@unity3d.com

urlify: use look behind and ahead in hash regexp

This makes it match hashes only separated by a single whitespace - such as
space or newline.

1 file changed with 3 insertions and 16 deletions:

kallithea/lib/helpers.py

0 comments (0 inline, 0 general)

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -1235,46 +1235,33 @@ def urlify_text(text_, safe=True): @@
         return literal(_newtext)
     return _newtext
 def urlify_changesets(text_, repository):
     """
     Extract revision ids from changeset and make link from them
     :param text_:
     :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()[1]
         pref = match_obj.groups()[0]
         suf = match_obj.groups()[2]
         tmpl = (
         '%(pref)s<a class="%(cls)s" href="%(url)s">'
         '%(rev)s</a>%(suf)s'
+        )
         return tmpl % {
          'pref': pref,
          'cls': 'revision-link',
         rev = match_obj.group(0)
         return '<a class="revision-link" href="%(url)s">%(rev)s</a>' % {
          'url': url('changeset_home', repo_name=repository, revision=rev),
          'rev': rev,
          'suf': suf
+        }
     newtext = URL_PAT.sub(url_func, text_)
     return newtext
     return re.sub(r'(?:^|(?<=\s))([0-9a-fA-F]{12,40})(?=$|\s|[.,:])', url_func, text_)
 def urlify_commit(text_, repository, link_=None):
     """
     Parses given text message and makes proper links.
     issues are linked to given issue-server, and rest is a changeset link
     if link_ is given, in other case it's a plain text
     :param text_:
     :param repository:
     :param link_: changeset link
     """

0 comments (0 inline, 0 general)