diff --git a/development.ini b/development.ini --- a/development.ini +++ b/development.ini @@ -68,15 +68,15 @@ 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 - +## comment out issue_pat, issue_server, issue_prefix to enable ## pattern to get the issues from commit messages -## default one used here is #1234 +## default one used here is # with a regex passive group for `#` +## {id} will be all groups matched from this pattern -url_pat = (?:^#|\s#)(\w+) +issue_pat = (?:\s*#)(\d+) -## server url to the issue, each {id} will be replaced with id +## server url to the issue, each {id} will be replaced with match ## fetched from the regex and {repo} is replaced with repository name issue_server_link = https://myissueserver.com/{repo}/issue/{id} diff --git a/production.ini b/production.ini --- a/production.ini +++ b/production.ini @@ -68,23 +68,23 @@ 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 - +## comment out issue_pat, issue_server, issue_prefix to enable ## pattern to get the issues from commit messages -## default one used here is #1234 +## default one used here is # with a regex passive group for `#` +## {id} will be all groups matched from this pattern -#url_pat = (?:^#|\s#)(\w+) +issue_pat = (?:\s*#)(\d+) -## server url to the issue, each {id} will be replaced with id +## server url to the issue, each {id} will be replaced with match ## fetched from the regex and {repo} is replaced with repository name -#issue_server_link = https://myissueserver.com/{repo}/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 = # +issue_prefix = # #################################### diff --git a/rhodecode/config/deployment.ini_tmpl b/rhodecode/config/deployment.ini_tmpl --- a/rhodecode/config/deployment.ini_tmpl +++ b/rhodecode/config/deployment.ini_tmpl @@ -68,23 +68,23 @@ 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 - +## comment out issue_pat, issue_server, issue_prefix to enable ## pattern to get the issues from commit messages -## default one used here is #1234 +## default one used here is # with a regex passive group for `#` +## {id} will be all groups matched from this pattern -#url_pat = (?:^#|\s#)(\w+) +issue_pat = (?:\s*#)(\d+) -## server url to the issue, each {id} will be replaced with id +## server url to the issue, each {id} will be replaced with match ## fetched from the regex and {repo} is replaced with repository name -#issue_server_link = https://myissueserver.com/{repo}/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 = # +issue_prefix = # #################################### diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py --- a/rhodecode/lib/helpers.py +++ b/rhodecode/lib/helpers.py @@ -788,7 +788,7 @@ def urlify_commit(text_, repository=None try: conf = config['app_conf'] - URL_PAT = re.compile(r'%s' % conf.get('url_pat')) + URL_PAT = re.compile(r'%s' % conf.get('issue_pat')) if URL_PAT: ISSUE_SERVER_LNK = conf.get('issue_server_link') @@ -799,7 +799,7 @@ def urlify_commit(text_, repository=None if match_obj.group().startswith(' '): pref = ' ' - issue_id = match_obj.groups()[0] + issue_id = ''.join(match_obj.groups()) tmpl = ( '%(pref)s' '%(issue-prefix)s%(id-repr)s'