epicknex/hererocks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor git_branch_accepts_tags

Browse Source
This commit is contained in:
mpeterv 2016-03-29 13:02:39 +03:00
parent b6e056a671
commit 3eb06b5a7b
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hererocks.py
View File

@ -122,12 +122,12 @@ clever_http_git_whitelist = [
"http://bitbucket.com/", "https://bitbucket.com/" "http://bitbucket.com/", "https://bitbucket.com/"
] ]
git_branch_accepts_tags = None git_branch_does_accept_tags = None
def set_git_branch_accepts_tags(): def git_branch_accepts_tags():
global git_branch_accepts_tags global git_branch_does_accept_tags
if git_branch_accepts_tags is None: if git_branch_does_accept_tags is None:
version_output = get_output("git", "--version") version_output = get_output("git", "--version")
match = re.search("(\d+)\.(\d+)\.?(\d*)", version_output) match = re.search("(\d+)\.(\d+)\.?(\d*)", version_output)
@ -135,8 +135,11 @@ def set_git_branch_accepts_tags():
major = int(match.group(1)) major = int(match.group(1))
minor = int(match.group(2)) minor = int(match.group(2))
tiny = int(match.group(3) or "0") tiny = int(match.group(3) or "0")
git_branch_accepts_tags = major > 1 or ( git_branch_does_accept_tags = (major, minor, tiny) >= (1, 7, 10)
major == 1 and (minor > 7 or (minor == 7 and tiny >= 10))) else:
git_branch_does_accept_tags = False
return git_branch_does_accept_tags
def git_clone_command(repo, ref, is_cache): def git_clone_command(repo, ref, is_cache):
if is_cache: if is_cache:
@ -152,9 +155,7 @@ def git_clone_command(repo, ref, is_cache):
if all(c in string.hexdigits for c in ref): if all(c in string.hexdigits for c in ref):
return ["git", "clone"], True return ["git", "clone"], True
set_git_branch_accepts_tags() if git_branch_accepts_tags():
if git_branch_accepts_tags:
return ["git", "clone", "--depth=1", "--branch=" + ref], False return ["git", "clone", "--depth=1", "--branch=" + ref], False
else: else:
return ["git", "clone", "--depth=1"], True return ["git", "clone", "--depth=1"], True