engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

shadow: Fix an error in the regex to detect shadow repository URLs.

Browse source
This commit is contained in:
Martin Bornhold 2016-09-26 14:54:21 +02:00
parent 69f6006e28
commit 5eeb75edac
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
rhodecode/lib/middleware/simplevcs.py
View file

@ -94,10 +94,10 @@ class SimpleVCS(object):
# we use this regex which will match only on URLs pointing to shadow
# repositories.
shadow_repo_re = re.compile(
'(?P<groups>(?:{slug_pat})(?:/{slug_pat})*)' # repo groups
'/(?P<target>{slug_pat})' # target repo
'/pull-request/(?P<pr_id>\d+)' # pull request
'/repository$' # shadow repo
'(?P<groups>(?:{slug_pat})(?:/{slug_pat})*/)?' # repo groups
'(?P<target>{slug_pat})/' # target repo
'pull-request/(?P<pr_id>\d+)/' # pull request
'repository$' # shadow repo
.format(slug_pat=SLUG_RE.pattern))
def __init__(self, application, config, registry):
@ -143,15 +143,17 @@ class SimpleVCS(object):
match_dict = match.groupdict()
# Build acl repo name from regex match.
acl_repo_name = safe_unicode(
'{groups}/{target}'.format(**match_dict))
acl_repo_name = safe_unicode('{groups}{target}'.format(
groups=match_dict['groups'] or '',
target=match_dict['target']))
# Retrieve pull request instance by ID from regex match.
pull_request = PullRequest.get(match_dict['pr_id'])
# Only proceed if we got a pull request and if acl repo name from
# URL equals the target repo name of the pull request.
if pull_request and acl_repo_name == pull_request.target_repo.repo_name:
if pull_request and (acl_repo_name ==
pull_request.target_repo.repo_name):
# Get file system path to shadow repository.
workspace_id = PullRequestModel()._workspace_id(pull_request)
target_vcs = pull_request.target_repo.scm_instance()