Skip to content

Commit e2c13c5

Browse files
committed
Reduce regexes in Git.gettags()
1 parent c37b9ee commit e2c13c5

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

mbed/mbed.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -814,16 +814,14 @@ def gettags(rev=None):
814814
tags = []
815815
refs = Git.getrefs()
816816
for ref in refs:
817-
m = re.match(r'^(.+)\s+(.+)$', ref)
817+
m = re.match(r'^(.+)\s+refs\/tags\/(.+)$', ref)
818818
if m and (not rev or m.group(1).startswith(rev)):
819-
if re.match(r'refs\/tags\/', m.group(2)): # only tags
820-
t = re.sub(r'refs\/tags\/', '', m.group(2))
821-
if re.match(r'^(.+)\^\{\}$', t): # detect tag "symlink"
822-
t = re.sub(r'\^\{\}$', '', t) # remove "symlink" chars, e.g. some-tag^{}
823-
for tag in tags:
824-
if tag[1] == t:
825-
tags.remove(tag)
826-
tags.append(t if rev else [m.group(1), t])
819+
if re.match(r'^(.+)\^\{\}$', t): # detect tag "pointer"
820+
t = re.sub(r'\^\{\}$', '', t) # remove "pointer" chars, e.g. some-tag^{}
821+
for tag in tags:
822+
if tag[1] == t:
823+
tags.remove(tag)
824+
tags.append(t if rev else [m.group(1), t])
827825
return tags
828826

829827
# Finds branches a rev belongs to

0 commit comments

Comments
 (0)