Changeset - 736678a8c881
Parent rev.
Child rev.
[Not reviewed]
beta
0 6 0
Marcin Kuzminski - 13 years ago 2012-09-23 17:33:53
marcin@python-works.com
#518 multiple issues patterns
- added logging
- some code cleanup
- added example of wiki pattern to .ini file
- updated contributors and changelog
6 files changed with 46 insertions and 11 deletions:
CONTRIBUTORS
1
development.ini
10
docs/changelog.rst
1
production.ini
10
rhodecode/config/deployment.ini_tmpl
10
rhodecode/lib/helpers.py
14
11
0 comments (0 inline, 0 general)
CONTRIBUTORS
➞
Show inline comments
 
@@ -23,6 +23,7 @@ List of contributors to RhodeCode projec
 
    Takumi IINO <trot.thunder@gmail.com>
 
    Indra Talip <indra.talip@gmail.com>
 
    James Rhodes <jrhodes@redpointsoftware.com.au>
 
    Dominik Ruf <dominikruf@gmail.com>
 
    xpol <xpolife@gmail.com>
 
    Vincent Caron <vcaron@bearstech.com>
 
    Zachary Auclair <zach101@gmail.com>
 
\ No newline at end of file
development.ini
➞
Show inline comments
 
@@ -105,12 +105,22 @@ issue_server_link = https://myissueserve
 

			




	
	
	
		
 
## prefix to add to link to indicate it's an url

			




	
	
	
		
 
## #314 will be replaced by <issue_prefix><id>

			




	
	
	
		
 

			




	
	
	
		
 
issue_prefix = #

			




	
	
	
		
 

			




	
	
	
		
 
## issue_pat, issue_server_link, issue_prefix can have suffixes to specify

			




	
	
	
		
 
## multiple patterns, to other issues server, wiki or others

			




	
	
	
		
 
## below an example how to create a wiki pattern 

			




	
	
	
		
 
#  #wiki-some-id -> https://mywiki.com/some-id

			




	
	
	
		
 

			




	
	
	
		
 
#issue_pat_wiki = (?:wiki-)(.+)

			




	
	
	
		
 
#issue_server_link_wiki = https://mywiki.com/{id}

			




	
	
	
		
 
#issue_prefix_wiki = WIKI-

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
## instance-id prefix

			




	
	
	
		
 
## a prefix key for this instance used for cache invalidation when running 

			




	
	
	
		
 
## multiple instances of rhodecode, make sure it's globally unique for 

			




	
	
	
		
 
## all running rhodecode instances. Leave empty if you don't use it

			




	
	
	
		
 
instance_id = 

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    docs/changelog.rst
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -13,12 +13,13 @@ Changelog

			




	
	
	
		
 

			




	
	
	
		
 
news

			




	
	
	
		
 
++++

			




	
	
	
		
 

			




	
	
	
		
 
- #558 Added config file to hooks extra data

			




	
	
	
		
 
- bumbped mercurial version to 2.3.1

			




	
	
	
		
 
- #518 added possibility of specifing multiple patterns for issues

			




	
	
	
		
 

			




	
	
	
		
 
fixes

			




	
	
	
		
 
+++++

			




	
	
	
		
 

			




	
	
	
		
 
- fixed #570 explicit users group permissions can overwrite owner permissions

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    production.ini
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -105,12 +105,22 @@ issue_server_link = https://myissueserve

			




	
	
	
		
 

			




	
	
	
		
 
## prefix to add to link to indicate it's an url

			




	
	
	
		
 
## #314 will be replaced by <issue_prefix><id>

			




	
	
	
		
 

			




	
	
	
		
 
issue_prefix = #

			




	
	
	
		
 

			




	
	
	
		
 
## issue_pat, issue_server_link, issue_prefix can have suffixes to specify

			




	
	
	
		
 
## multiple patterns, to other issues server, wiki or others

			




	
	
	
		
 
## below an example how to create a wiki pattern 

			




	
	
	
		
 
#  #wiki-some-id -> https://mywiki.com/some-id

			




	
	
	
		
 

			




	
	
	
		
 
#issue_pat_wiki = (?:wiki-)(.+)

			




	
	
	
		
 
#issue_server_link_wiki = https://mywiki.com/{id}

			




	
	
	
		
 
#issue_prefix_wiki = WIKI-

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
## instance-id prefix

			




	
	
	
		
 
## a prefix key for this instance used for cache invalidation when running 

			




	
	
	
		
 
## multiple instances of rhodecode, make sure it's globally unique for 

			




	
	
	
		
 
## all running rhodecode instances. Leave empty if you don't use it

			




	
	
	
		
 
instance_id = 

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    rhodecode/config/deployment.ini_tmpl
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -105,12 +105,22 @@ issue_server_link = https://myissueserve

			




	
	
	
		
 

			




	
	
	
		
 
## prefix to add to link to indicate it's an url

			




	
	
	
		
 
## #314 will be replaced by <issue_prefix><id>

			




	
	
	
		
 

			




	
	
	
		
 
issue_prefix = #

			




	
	
	
		
 

			




	
	
	
		
 
## issue_pat, issue_server_link, issue_prefix can have suffixes to specify

			




	
	
	
		
 
## multiple patterns, to other issues server, wiki or others

			




	
	
	
		
 
## below an example how to create a wiki pattern 

			




	
	
	
		
 
#  #wiki-some-id -> https://mywiki.com/some-id

			




	
	
	
		
 

			




	
	
	
		
 
#issue_pat_wiki = (?:wiki-)(.+)

			




	
	
	
		
 
#issue_server_link_wiki = https://mywiki.com/{id}

			




	
	
	
		
 
#issue_prefix_wiki = WIKI-

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
## instance-id prefix

			




	
	
	
		
 
## a prefix key for this instance used for cache invalidation when running 

			




	
	
	
		
 
## multiple instances of rhodecode, make sure it's globally unique for 

			




	
	
	
		
 
## all running rhodecode instances. Leave empty if you don't use it

			




	
	
	
		
 
instance_id = 

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    rhodecode/lib/helpers.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -1004,25 +1004,29 @@ def urlify_commit(text_, repository=None

			




	
	
	
		
 

			




	
	
	
		
 
    try:

			




	
	
	
		
 
        conf = config['app_conf']

			




	
	
	
		
 

			




	
	
	
		
 
        # allow multiple issue servers to be used

			




	
	
	
		
 
        valid_indices = [

			




	
	
	
		
 
            x.group(1) 

			




	
	
	
		
 
            for x in map(lambda x: re.match(r'issue_pat(.*)', x), conf.keys()) 

			




	
	
	
		
 
            if x and conf.has_key('issue_server_link'+x.group(1)) and conf.has_key('issue_prefix'+x.group(1))

			




	
	
	
		
 
            ]

			




	
	
	
		
 
            x.group(1)

			




	
	
	
		
 
            for x in map(lambda x: re.match(r'issue_pat(.*)', x), conf.keys())

			




	
	
	
		
 
            if x and 'issue_server_link%s' % x.group(1) in conf

			




	
	
	
		
 
            and 'issue_prefix%s' % x.group(1) in conf

			




	
	
	
		
 
        ]

			




	
	
	
		
 

			




	
	
	
		
 
        #log.debug('found issue server suffixes ' + ','.join(valid_indices) + ' during valuation of: \n' + newtext)

			




	
	
	
		
 
        log.debug('found issue server suffixes `%s` during valuation of: %s'

			




	
	
	
		
 
                  % (','.join(valid_indices), newtext))

			




	
	
	
		
 

			




	
	
	
		
 
        for pattern_index in valid_indices:

			




	
	
	
		
 
            ISSUE_PATTERN = conf.get('issue_pat'+pattern_index)

			




	
	
	
		
 
            ISSUE_SERVER_LNK = conf.get('issue_server_link'+pattern_index)

			




	
	
	
		
 
            ISSUE_PREFIX = conf.get('issue_prefix'+pattern_index)

			




	
	
	
		
 
            ISSUE_PATTERN = conf.get('issue_pat%s' % pattern_index)

			




	
	
	
		
 
            ISSUE_SERVER_LNK = conf.get('issue_server_link%s' % pattern_index)

			




	
	
	
		
 
            ISSUE_PREFIX = conf.get('issue_prefix%s' % pattern_index)

			




	
	
	
		
 

			




	
	
	
		
 
            #log.debug(ISSUE_PATTERN + ' ' + ISSUE_SERVER_LNK + ' ' + ISSUE_PREFIX)

			




	
	
	
		
 
            log.debug('pattern suffix `%s` PAT:%s SERVER_LINK:%s PREFIX:%s'

			




	
	
	
		
 
                      % (pattern_index, ISSUE_PATTERN, ISSUE_SERVER_LNK,

			




	
	
	
		
 
                         ISSUE_PREFIX))

			




	
	
	
		
 

			




	
	
	
		
 
            URL_PAT = re.compile(r'%s' % ISSUE_PATTERN)

			




	
	
	
		
 

			




	
	
	
		
 
            def url_func(match_obj):

			




	
	
	
		
 
                pref = ''

			




	
	
	
		
 
                if match_obj.group().startswith(' '):

			




	
	
		
 
@@ -1045,15 +1049,14 @@ def urlify_commit(text_, repository=None

			




	
	
	
		
 
                     'cls': 'issue-tracker-link',

			




	
	
	
		
 
                     'url': url,

			




	
	
	
		
 
                     'id-repr': issue_id,

			




	
	
	
		
 
                     'issue-prefix': ISSUE_PREFIX,

			




	
	
	
		
 
                     'serv': ISSUE_SERVER_LNK,

			




	
	
	
		
 
                }

			




	
	
	
		
 

			




	
	
	
		
 
            newtext = URL_PAT.sub(url_func, newtext)

			




	
	
	
		
 
            #log.debug('after '+pattern_index+':\n'+newtext)

			




	
	
	
		
 
            log.debug('processed prefix:`%s` => %s' % (pattern_index, newtext))

			




	
	
	
		
 

			




	
	
	
		
 
        # if we actually did something above

			




	
	
	
		
 
        if valid_indices:

			




	
	
	
		
 
            if link_:

			




	
	
	
		
 
                # wrap not links into final link => link_

			




	
	
	
		
 
                newtext = linkify_others(newtext, link_)

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.