Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow git tags with / in the name and properly slugify #3545

Merged
merged 2 commits into from
Jan 30, 2018
Merged

Allow git tags with / in the name and properly slugify #3545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26fee81
Allow git tags with `/` in the name and properly slugify
humitos Jan 23, 2018
b72d416
Allow git branches with `/` in the name
humitos Jan 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions readthedocs/rtd_tests/tests/test_backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,17 @@ def test_parse_branches(self):
origin/HEAD -> origin/master
origin/master
origin/release/2.0.0
origin/release/foo/bar
"""

expected_ids = [
('develop', 'develop'),
('master', 'master'),
('release/2.0.0', 'release-2.0.0'),
('release/2.0.0', 'release/2.0.0'),
('origin/2.0.X', '2.0.X'),
('origin/master', 'master'),
('origin/release/2.0.0', 'release-2.0.0')
('origin/release/2.0.0', 'release/2.0.0'),
('origin/release/foo/bar', 'release/foo/bar'),
]
given_ids = [(x.identifier, x.verbose_name) for x in
self.project.vcs_repo().parse_branches(data)]
Expand All @@ -60,6 +62,7 @@ def test_parse_git_tags(self):
a63a2de628a3ce89034b7d1a5ca5e8159534eef0 refs/tags/2.1.0.beta2
c7fc3d16ed9dc0b19f0d27583ca661a64562d21e refs/tags/2.1.0.rc1
edc0a2d02a0cc8eae8b67a3a275f65cd126c05b1 refs/tags/2.1.0.rc2
274a5a8c988a804e40da098f59ec6c8f0378fe34 refs/tags/release/foobar
"""
expected_tags = [
('3b32886c8d3cb815df3793b3937b2e91d0fb00f1', '2.0.0'),
Expand All @@ -68,6 +71,7 @@ def test_parse_git_tags(self):
('a63a2de628a3ce89034b7d1a5ca5e8159534eef0', '2.1.0.beta2'),
('c7fc3d16ed9dc0b19f0d27583ca661a64562d21e', '2.1.0.rc1'),
('edc0a2d02a0cc8eae8b67a3a275f65cd126c05b1', '2.1.0.rc2'),
('274a5a8c988a804e40da098f59ec6c8f0378fe34', 'release/foobar'),
]

given_ids = [(x.identifier, x.verbose_name) for x in
Expand Down
13 changes: 5 additions & 8 deletions readthedocs/vcs_support/backends/git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def parse_tags(self, data):
if row == []:
continue
commit_hash, name = row
clean_name = name.split('/')[-1]
clean_name = name.replace('refs/tags/', '')
vcs_tags.append(VCSVersion(self, commit_hash, clean_name))
return vcs_tags

Expand Down Expand Up @@ -148,15 +148,12 @@ def parse_branches(self, data):
if branch:
branch = branch[0]
if branch.startswith('origin/'):
cut_len = len('origin/')
slug = branch[cut_len:].replace('/', '-')
if slug in ['HEAD']:
verbose_name = branch.replace('origin/', '')
if verbose_name in ['HEAD']:
continue
clean_branches.append(VCSVersion(self, branch, slug))
clean_branches.append(VCSVersion(self, branch, verbose_name))
else:
# Believe this is dead code.
slug = branch.replace('/', '-')
clean_branches.append(VCSVersion(self, branch, slug))
clean_branches.append(VCSVersion(self, branch, branch))
return clean_branches

@property
Expand Down