Changeset - a6a30c919513
Parent rev.
Child rev.
[Not reviewed]
beta
0 9 0
Marcin Kuzminski - 14 years ago 2012-01-06 18:27:32
marcin@python-works.com
#73 mapping of commited issues from commit message into issue tracker url.
9 files changed with 122 insertions and 29 deletions:
development.ini
28
7
production.ini
28
7
rhodecode/config/deployment.ini_tmpl
27
6
rhodecode/lib/helpers.py
30
rhodecode/public/css/style.css
2
rhodecode/templates/changelog/changelog.html
2
2
rhodecode/templates/changeset/changeset.html
1
1
rhodecode/templates/changeset/changeset_range.html
1
1
rhodecode/templates/shortlog/shortlog_data.html
5
3
0 comments (0 inline, 0 general)
development.ini
➞
Show inline comments
 
@@ -55,19 +55,40 @@ force_https = false
 
commit_parse_limit = 25
 
use_gravatar = true
 
container_auth_enabled = false
 
proxypass_auth_enabled = false
 

			




	
	
	
		
 
## overwrite schema of clone url

			




	
	
	
		
 
# available vars:

			




	
	
	
		
 
# scheme - http/https

			




	
	
	
		
 
# user - current user

			




	
	
	
		
 
# pass - password 

			




	
	
	
		
 
# netloc - network location

			




	
	
	
		
 
# path - usually repo_name

			




	
	
	
		
 
# clone_uri = {scheme}://{user}{pass}{netloc}{path}

			




	
	
	
		
 
## available vars:

			




	
	
	
		
 
## scheme - http/https

			




	
	
	
		
 
## user - current user

			




	
	
	
		
 
## pass - password 

			




	
	
	
		
 
## netloc - network location

			




	
	
	
		
 
## path - usually repo_name

			




	
	
	
		
 

			




	
	
	
		
 
#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

			




	
	
	
		
 

			




	
	
	
		
 
#issue_server = https://myissueserver.com/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
                    
                

        

        

            



	
	
		
 
@@ -55,19 +55,40 @@ force_https = false

			




	
	
	
		
 
commit_parse_limit = 50

			




	
	
	
		
 
use_gravatar = true

			




	
	
	
		
 
container_auth_enabled = false

			




	
	
	
		
 
proxypass_auth_enabled = false

			




	
	
	
		
 

			




	
	
	
		
 
## overwrite schema of clone url

			




	
	
	
		
 
# available vars:

			




	
	
	
		
 
# scheme - http/https

			




	
	
	
		
 
# user - current user

			




	
	
	
		
 
# pass - password 

			




	
	
	
		
 
# netloc - network location

			




	
	
	
		
 
# path - usually repo_name

			




	
	
	
		
 
# clone_uri = {scheme}://{user}{pass}{netloc}{path}

			




	
	
	
		
 
## available vars:

			




	
	
	
		
 
## scheme - http/https

			




	
	
	
		
 
## user - current user

			




	
	
	
		
 
## pass - password 

			




	
	
	
		
 
## netloc - network location

			




	
	
	
		
 
## path - usually repo_name

			




	
	
	
		
 

			




	
	
	
		
 
#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

			




	
	
	
		
 

			




	
	
	
		
 
#issue_server = https://myissueserver.com/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
                    
                

        

        

            



	
	
		
 
@@ -55,20 +55,41 @@ force_https = false

			




	
	
	
		
 
commit_parse_limit = 50

			




	
	
	
		
 
use_gravatar = true

			




	
	
	
		
 
container_auth_enabled = false

			




	
	
	
		
 
proxypass_auth_enabled = false

			




	
	
	
		
 

			




	
	
	
		
 
## overwrite schema of clone url

			




	
	
	
		
 
# available vars:

			




	
	
	
		
 
# scheme - http/https

			




	
	
	
		
 
# user - current user

			




	
	
	
		
 
# pass - password 

			




	
	
	
		
 
# netloc - network location

			




	
	
	
		
 
# path - usually repo_name

			




	
	
	
		
 
## available vars:

			




	
	
	
		
 
## scheme - http/https

			




	
	
	
		
 
## user - current user

			




	
	
	
		
 
## pass - password 

			




	
	
	
		
 
## netloc - network location

			




	
	
	
		
 
## path - usually repo_name

			




	
	
	
		
 

			




	
	
	
		
 
# 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

			




	
	
	
		
 

			




	
	
	
		
 
#issue_server = https://myissueserver.com/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

			




	
	
	
		
 
broker.vhost = rabbitmqhost

			




        

    


    
    

    

        

                

                    rhodecode/lib/helpers.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -5,12 +5,13 @@ available to Controllers. This module is

			




	
	
	
		
 
"""

			




	
	
	
		
 
import random

			




	
	
	
		
 
import hashlib

			




	
	
	
		
 
import StringIO

			




	
	
	
		
 
import urllib

			




	
	
	
		
 
import math

			




	
	
	
		
 
import logging

			




	
	
	
		
 

			




	
	
	
		
 
from datetime import datetime

			




	
	
	
		
 
from pygments.formatters.html import HtmlFormatter

			




	
	
	
		
 
from pygments import highlight as code_highlight

			




	
	
	
		
 
from pylons import url, request, config

			




	
	
	
		
 
from pylons.i18n.translation import _, ungettext

			




	
	
		
 
@@ -38,12 +39,14 @@ from webhelpers.html.tags import _set_in

			




	
	
	
		
 

			




	
	
	
		
 
from rhodecode.lib.annotate import annotate_highlight

			




	
	
	
		
 
from rhodecode.lib.utils import repo_name_slug

			




	
	
	
		
 
from rhodecode.lib import str2bool, safe_unicode, safe_str, get_changeset_safe

			




	
	
	
		
 
from rhodecode.lib.markup_renderer import MarkupRenderer

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def _reset(name, value=None, id=NotGiven, type="reset", **attrs):

			




	
	
	
		
 
    """

			




	
	
	
		
 
    Reset button

			




	
	
	
		
 
    """

			




	
	
	
		
 
    _set_input_attrs(attrs, type, name, value)

			




	
	
		
 
@@ -737,12 +740,39 @@ def urlify_text(text):

			




	
	
	
		
 
    def url_func(match_obj):

			




	
	
	
		
 
        url_full = match_obj.groups()[0]

			




	
	
	
		
 
        return '<a href="%(url)s">%(url)s</a>' % ({'url':url_full})

			




	
	
	
		
 

			




	
	
	
		
 
    return literal(url_pat.sub(url_func, text))

			




	
	
	
		
 

			




	
	
	
		
 
def urlify_commit(text):

			




	
	
	
		
 
    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_PREFIX = conf.get('issue_prefix')

			




	
	
	
		
 
            def url_func(match_obj):

			




	
	
	
		
 
                issue_id = match_obj.groups()[0]

			




	
	
	
		
 
                return ' <a href="%(url)s">%(issue-prefix)s%(id-repr)s</a>' % (

			




	
	
	
		
 
                    {'url':ISSUE_SERVER.replace('{id}',issue_id),

			




	
	
	
		
 
                     'id-repr':issue_id,

			




	
	
	
		
 
                     'issue-prefix':ISSUE_PREFIX,

			




	
	
	
		
 
                     'serv':ISSUE_SERVER,

			




	
	
	
		
 
                    }

			




	
	
	
		
 
                )

			




	
	
	
		
 
            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):

			




        

    


    
    

    

        

                

                    rhodecode/public/css/style.css
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -2143,14 +2143,12 @@ h3.files_location {

			




	
	
	
		
 
	float: right;

			




	
	
	
		
 
	width: 25%;

			




	
	
	
		
 
	text-align: right;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#changeset_content .container .left .message {

			




	
	
	
		
 
	font-style: italic;

			




	
	
	
		
 
	color: #556CB5;

			




	
	
	
		
 
	white-space: pre-wrap;

			




	
	
	
		
 
}

			




	
	
	
		
 
#changeset_content .container .left .message a:hover {

			




	
	
	
		
 
	text-decoration: none;

			




	
	
	
		
 
}

			




	
	
	
		
 
.cs_files .cur_cs {

			




        

    


    
    

    

        

                

                    rhodecode/templates/changelog/changelog.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -45,21 +45,21 @@ ${c.repo_name} ${_('Changelog')} - ${c.r

			




	
	
	
		
 
					

			




	
	
	
		
 
				%for cnt,cs in enumerate(c.pagination):

			




	
	
	
		
 
					<div id="chg_${cnt+1}" class="container">

			




	
	
	
		
 
						<div class="left">

			




	
	
	
		
 
							<div class="date">

			




	
	
	
		
 
							${h.checkbox(cs.short_id,class_="changeset_range")}

			




	
	
	
		
 
							<span>${_('commit')} ${cs.revision}: ${h.short_id(cs.raw_id)}@${cs.date}</span>

			




	
	
	
		
 
							<span class="tooltip" title="${cs.date}"><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">${cs.revision}:${h.short_id(cs.raw_id)}</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="message">${h.link_to(h.wrap_paragraphs(cs.message),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>

			




	
	
	
		
 
							<div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message))}</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 len(cs.parents)>1:

			




        

    


    
    

    

        

                

                    rhodecode/templates/changeset/changeset.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -49,13 +49,13 @@

			




	
	
	
		
 
	                     <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.link_to(h.wrap_paragraphs(c.changeset.message),h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</div>

			




	
	
	
		
 
	                 <div class="message">${h.urlify_commit(h.wrap_paragraphs(c.changeset.message))}</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>

			




        

    


    
    

    

        

                

                    rhodecode/templates/changeset/changeset_range.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -38,13 +38,13 @@

			




	
	
	
		
 
            %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.link_to(h.wrap_paragraphs(cs.message),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div></td>

			




	
	
	
		
 
                <td><div class="message">${h.urlify_commit(h.wrap_paragraphs(c.changeset.message))}</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">

			




        

    


    
    

    

        

                

                    rhodecode/templates/shortlog/shortlog_data.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## -*- coding: utf-8 -*-

			




	
	
	
		
 
%if c.repo_changesets:

			




	
	
	
		
 
<table class="table_disp">

			




	
	
	
		
 
	<tr>

			




	
	
	
		
 
		<th class="left">${_('commit message')}</th>

			




	
	
	
		
 
	    <th class="left">${_('revision')}</th>	

			




	
	
	
		
 
        <th class="left">${_('commit message')}</th>

			




	
	
	
		
 
		<th class="left">${_('age')}</th>

			




	
	
	
		
 
		<th class="left">${_('author')}</th>

			




	
	
	
		
 
		<th class="left">${_('revision')}</th>

			




	
	
	
		
 
		<th class="left">${_('branch')}</th>

			




	
	
	
		
 
		<th class="left">${_('tags')}</th>

			




	
	
	
		
 
	</tr>

			




	
	
	
		
 
%for cnt,cs in enumerate(c.repo_changesets):

			




	
	
	
		
 
	<tr class="parity${cnt%2}">

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
            <div><pre><a href="${h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id)}">r${cs.revision}:${h.short_id(cs.raw_id)}</a></pre></div>

			




	
	
	
		
 
        </td>  

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
            ${h.link_to(h.truncate(cs.message,50),

			




	
	
	
		
 
            h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id),

			




	
	
	
		
 
            title=cs.message)}

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td><span class="tooltip" title="${cs.date}">

			




	
	
	
		
 
                      ${h.age(cs.date)}</span>

			




	
	
	
		
 
        </td>        	

			




	
	
	
		
 
		<td title="${cs.author}">${h.person(cs.author)}</td>

			




	
	
	
		
 
		<td><div><pre><a href="${h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id)}">r${cs.revision}:${h.short_id(cs.raw_id)}</a></pre></div></td>

			




	
	
	
		
 
		<td>

			




	
	
	
		
 
			<span class="logtags">

			




	
	
	
		
 
				<span class="branchtag">${cs.branch}</span>

			




	
	
	
		
 
			</span>

			




	
	
	
		
 
		</td>

			




	
	
	
		
 
		<td>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: clio-13329
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.
            – Support