kallithea Changeset - f26acc1b27e2

Changeset - f26acc1b27e2

Parent rev.

Child rev.

[Not reviewed]

beta

0 7 0

Marcin Kuzminski - 14 years ago 2012-01-09 03:00:12
marcin@python-works.com

added repository name into issue tracker link to support different projects issues tracker mapping

7 files changed with 28 insertions and 20 deletions:

development.ini

production.ini

rhodecode/config/deployment.ini_tmpl

rhodecode/lib/helpers.py

rhodecode/templates/changelog/changelog.html

rhodecode/templates/changeset/changeset.html

rhodecode/templates/changeset/changeset_range.html

0 comments (0 inline, 0 general)

development.ini

➞

Show inline comments

@@ @@ -68,27 +68,27 @@ proxypass_auth_enabled = false @@
 #clone_uri = {scheme}://{user}{pass}{netloc}{path}
 ## issue tracking mapping for commits messages
 ## uncomment url_pat, issue_server, issue_prefix to enable
 ## pattern to get the issues from commit messages
 ## default one used here is #1234
 url_pat = (?:^#|\s#)(\w+)
 ## server url to the issue, each {id} will be replaced with id
 ## fetched from the regex
+## fetched from the regex and {repo} is replaced with repository name
-issue_server = https://myissueserver.com/issue/{id}
+issue_server_link = https://myissueserver.com/{repo}/issue/{id}
 ## prefix to add to link to indicate it's an url
 ## #314 will be replaced by <issue_prefix><id>
 issue_prefix = #
 ####################################
 ###        CELERY CONFIG        ####
 ####################################
 use_celery = false
 broker.host = localhost

production.ini

➞

Show inline comments

@@ @@ -68,27 +68,27 @@ proxypass_auth_enabled = false @@
 #clone_uri = {scheme}://{user}{pass}{netloc}{path}
 ## issue tracking mapping for commits messages
 ## uncomment url_pat, issue_server, issue_prefix to enable
 ## pattern to get the issues from commit messages
 ## default one used here is #1234
 #url_pat = (?:^#|\s#)(\w+)
 ## server url to the issue, each {id} will be replaced with id
 ## fetched from the regex
+## fetched from the regex and {repo} is replaced with repository name
-#issue_server = https://myissueserver.com/issue/{id}
+#issue_server_link = https://myissueserver.com/{repo}/issue/{id}
 ## prefix to add to link to indicate it's an url
 ## #314 will be replaced by <issue_prefix><id>
 #issue_prefix = #
 ####################################
 ###        CELERY CONFIG        ####
 ####################################
 use_celery = false
 broker.host = localhost

rhodecode/config/deployment.ini_tmpl

➞

Show inline comments

@@ @@ -68,27 +68,27 @@ proxypass_auth_enabled = false @@
 # clone_uri = {scheme}://{user}{pass}{netloc}{path}
 ## issue tracking mapping for commits messages
 ## uncomment url_pat, issue_server, issue_prefix to enable
 ## pattern to get the issues from commit messages
 ## default one used here is #1234
 #url_pat = (?:^#|\s#)(\w+)
 ## server url to the issue, each {id} will be replaced with id
 ## fetched from the regex
+## fetched from the regex and {repo} is replaced with repository name
-#issue_server = https://myissueserver.com/issue/{id}
+#issue_server_link = https://myissueserver.com/{repo}/issue/{id}
 ## prefix to add to link to indicate it's an url
 ## #314 will be replaced by <issue_prefix><id>
 #issue_prefix = #
 ####################################
 ###        CELERY CONFIG        ####
 ####################################
 use_celery = false
 broker.host = localhost

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -730,63 +730,71 @@ def fancy_file_stats(stats): @@
                                                                    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]
         return '<a href="%(url)s">%(url)s</a>' % ({'url':url_full})
+        return '<a href="%(url)s">%(url)s</a>' % ({'url': url_full})
     return literal(url_pat.sub(url_func, text_))
 def urlify_commit(text_):
 def urlify_commit(text_, repository=None):
     import re
     import traceback
     try:
         conf = config['app_conf']
         URL_PAT = re.compile(r'%s' % conf.get('url_pat'))
         if URL_PAT:
-            ISSUE_SERVER = conf.get('issue_server')
+            ISSUE_SERVER_LNK = conf.get('issue_server_link')
             ISSUE_PREFIX = conf.get('issue_prefix')
             def url_func(match_obj):
                 issue_id = match_obj.groups()[0]
                 tmpl = (
                 ' <a class="%(cls)s" href="%(url)s">'
                 '%(issue-prefix)s%(id-repr)s'
                 '</a>'
+                )
                 url = ISSUE_SERVER_LNK.replace('{id}', issue_id)
                 if repository:
                     url = url.replace('{repo}', repository)
                 return tmpl % (
+                    {
                      'cls':'issue-tracker-link',
                      'url':ISSUE_SERVER.replace('{id}',issue_id),
                      'id-repr':issue_id,
                      'issue-prefix':ISSUE_PREFIX,
                      'serv':ISSUE_SERVER,
                      'cls': 'issue-tracker-link',
                      'url': url,
                      'id-repr': issue_id,
                      'issue-prefix': ISSUE_PREFIX,
                      'serv': ISSUE_SERVER_LNK,
+                    }
+                )
             return literal(URL_PAT.sub(url_func, text_))
     except:
         log.error(traceback.format_exc())
         pass
     return text_
 def rst(source):
     return literal('<div class="rst-block">%s</div>' %
                    MarkupRenderer.rst(source))
 def rst_w_mentions(source):
     """
     Wrapped rst renderer with @mention highlighting
     :param source:
     """
     return literal('<div class="rst-block">%s</div>' %
                    MarkupRenderer.rst_with_mentions(source))

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -50,25 +50,25 @@ ${c.repo_name} ${_('Changelog')} - ${c.r @@
 							${h.checkbox(cs.short_id,class_="changeset_range")}
 							<span class="tooltip" title="${h.age(cs.date)}"><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}"><span class="changeset_id">${cs.revision}:<span class="changeset_hash">${h.short_id(cs.raw_id)}</span></span></a></span>
 							</div>
 							<div class="author">
 								<div class="gravatar">
 									<img alt="gravatar" src="${h.gravatar_url(h.email(cs.author),16)}"/>
 								</div>
 								<div title="${cs.author}" class="user">${h.person(cs.author)}</div>
 							</div>
                             <div class="date">${cs.date}</div>
 						</div>
 						<div class="mid">
                             <div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message))}</div>
+                            <div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name)}</div>
                             <div class="expand ${'tablerow%s' % (cnt%2)}">&darr; ${_('show more')} &darr;</div>
 						</div>
 						<div class="right">
 									<div id="${cs.raw_id}_changes_info" class="changes">
                                         <span id="${cs.raw_id}" class="changed_total tooltip" title="${_('Affected number of files, click to show more details')}">${len(cs.affected_files)}</span>
 									</div>
 								   %if cs.parents:
 									%for p_cs in reversed(cs.parents):
 										<div class="parent">${_('Parent')}
 											<span class="changeset_id">${p_cs.revision}:<span class="changeset_hash">${h.link_to(h.short_id(p_cs.raw_id),
 											h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}</span></span>
 										</div>

rhodecode/templates/changeset/changeset.html

➞

Show inline comments

@@ @@ -40,25 +40,25 @@ @@
 			</div>
 		</div>
 	    <div id="changeset_content">
 			<div class="container">
 	             <div class="left">
 	                 <div class="author">
 	                     <div class="gravatar">
 	                         <img alt="gravatar" src="${h.gravatar_url(h.email(c.changeset.author),20)}"/>
 	                     </div>
 	                     <span>${h.person(c.changeset.author)}</span><br/>
 	                     <span><a href="mailto:${h.email_or_none(c.changeset.author)}">${h.email_or_none(c.changeset.author)}</a></span><br/>
 	                 </div>
 	                 <div class="message">${h.urlify_commit(h.wrap_paragraphs(c.changeset.message))}</div>
+	                 <div class="message">${h.urlify_commit(h.wrap_paragraphs(c.changeset.message),c.repo_name)}</div>
 	             </div>
 	             <div class="right">
 		             <div class="changes">
                         % if len(c.changeset.affected_files) <= c.affected_files_cut_off:
 		                 <span class="removed" title="${_('removed')}">${len(c.changeset.removed)}</span>
 		                 <span class="changed" title="${_('changed')}">${len(c.changeset.changed)}</span>
 		                 <span class="added" title="${_('added')}">${len(c.changeset.added)}</span>
 	                    % else:
                          <span class="removed" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>
                          <span class="changed" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>
                          <span class="added"   title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>
 	                    % endif

rhodecode/templates/changeset/changeset_range.html

➞

Show inline comments

@@ @@ -32,25 +32,25 @@ @@
 				</div>
 			</div>
 		</div>
 	    <div id="changeset_compare_view_content">
 			<div class="container">
 			<table class="compare_view_commits noborder">
             %for cs in c.cs_ranges:
                 <tr>
                 <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email(cs.author),14)}"/></div></td>
                 <td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</td>
                 <td><div class="author">${h.person(cs.author)}</div></td>
                 <td><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
                 <td><div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message))}</div></td>
+                <td><div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name)}</div></td>
                 </tr>
             %endfor
             </table>
 	        </div>
 	        <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div>
 	        <div class="cs_files">
 	               %for cs in c.cs_ranges:
 	                   <div class="cur_cs">r${cs}</div>
 	                %for change,filenode,diff,cs1,cs2,st in c.changes[cs.raw_id]:
 	                    <div class="cs_${change}">${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=h.FID(cs.raw_id,filenode.path)))}</div>
 	                %endfor
 	               %endfor

0 comments (0 inline, 0 general)