layla/auto-semver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update regex

Browse Source
This commit is contained in:
Layla 2020-02-27 21:56:15 +00:00
parent 76538e5516
commit f3c8944538
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
semver/__init__.py
View File

@ -20,7 +20,7 @@ NO_GIT_FLOW = Exception('No git flow branch found')
class SemVer(object): class SemVer(object):
GET_COMMIT_MESSAGE = re.compile(r"Merge (branch|pull request) '?(.+)'? (into|from) '?([\w\-]+)'?") GET_COMMIT_MESSAGE = re.compile(r"Merge (branch|pull request) '?(.+)'? (into|from) (?:'(.+)'|[^\/]+\/(.+))")
# Merge pull request #1 from RightBrain-Networks/feature/PLAT-185-versioning # Merge pull request #1 from RightBrain-Networks/feature/PLAT-185-versioning
def __init__(self,global_user=False): def __init__(self,global_user=False):
@ -57,7 +57,7 @@ class SemVer(object):
if str(matches.group(4)) == branch: if str(matches.group(4)) == branch:
self.merged_branch = matches.group(2) self.merged_branch = matches.group(2)
else: else:
self.merged_branch = matches.group(4) self.merged_branch = matches.group(5)
self.main_branch = branch self.main_branch = branch
return bool(matches) return bool(matches)