Mercurial > kallithea

changeset 1913:08344d037ba1 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added links to revisions in commit messages
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 19 Jan 2012 05:43:27 +0200
parents 32e1e0745d3c
children 6a9c38d39f2d
files rhodecode/lib/helpers.py rhodecode/public/css/style.css
diffstat 2 files changed, 55 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/lib/helpers.py	Thu Jan 19 03:47:48 2012 +0200
+++ b/rhodecode/lib/helpers.py	Thu Jan 19 05:43:27 2012 +0200
@@ -742,14 +742,48 @@
 
     return literal(url_pat.sub(url_func, text_))
 
+def urlify_changesets(text_, 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(' '):
+            pref = ' '
+        tmpl = (
+        '%(pref)s<a class="%(cls)s" href="%(url)s">'
+        '%(rev)s'
+        '</a>'
+        )
+        return tmpl % {
+         'pref': pref,
+         'cls': 'revision-link',
+         'url': url('changeset_home', repo_name=repository, revision=rev),
+         'rev': rev,
+        }
+
+    newtext = URL_PAT.sub(url_func, text_)
+
+    return newtext
 
 def urlify_commit(text_, repository=None, link_=None):
     import re
     import traceback
 
-    if link_:
-        link_ = '<a href="' + link_ + '">'
-
+    # urlify changesets
+    text_ = urlify_changesets(text_, repository)
+        
+    def linkify_others(t,l):
+        urls = re.compile(r'(\<a.*?\<\/a\>)',)
+        links = []
+        for e in urls.split(t):
+            if not urls.match(e):
+                links.append('<a class="message-link" href="%s">%s</a>' % (l,e))
+            else:
+                links.append(e)        
+        
+        return ''.join(links)
     try:
         conf = config['app_conf']
 
@@ -774,22 +808,20 @@
                 if repository:
                     url = url.replace('{repo}', repository)
 
-                if link_:
-                    tmpl = '</a>' + tmpl + link_
-
-                return tmpl % (
-                    {
+                return tmpl % {
                      'pref': pref,
                      'cls': 'issue-tracker-link',
                      'url': url,
                      'id-repr': issue_id,
                      'issue-prefix': ISSUE_PREFIX,
                      'serv': ISSUE_SERVER_LNK,
-                    }
-                )
+                }
+                
             newtext = URL_PAT.sub(url_func, text_)
-            if link_:
-                newtext = link_ + newtext + '</a>'
+            
+            # wrap not links into final link => link_
+            newtext = linkify_others(newtext, link_)
+            
             return literal(newtext)
     except:
         log.error(traceback.format_exc())
--- a/rhodecode/public/css/style.css	Thu Jan 19 03:47:48 2012 +0200
+++ b/rhodecode/public/css/style.css	Thu Jan 19 05:43:27 2012 +0200
@@ -2328,9 +2328,17 @@
 #graph_content .container .mid .message a:hover{
 	text-decoration: none;
 }
-
-#content #graph_content .message .issue-tracker-link {
-	font-weight: bold !important;
+#content #graph_content .message .revision-link,
+#changeset_content .container .message .revision-link
+ {
+	color:#3F6F9F;
+    font-weight: bold !important;
+}
+
+#content #graph_content .message .issue-tracker-link,
+#changeset_content .container .message .issue-tracker-link{
+    color:#3F6F9F;
+    font-weight: bold !important;
 }
 
 .right .comments-container{