3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git_deploy: refactor tag retrieval 

Use git for-each-ref to retreive tags and their associated commit
hashes.  This allows us to limit the amount of tags to 10 and
simplifies the code as the returned objects are already dereferenced.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2022-03-27 17:06:35 -04:00
parent e9e86c3042
commit f965ce8fd8
No known key found for this signature in database
GPG Key ID: 7027245FBBDDF59A
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
moonraker/components/update_manager/git_deploy.py
View File

@ -205,9 +205,14 @@ GIT_ENV_VARS = {
'GIT_HTTP_LOW_SPEED_TIME ': "20" 'GIT_HTTP_LOW_SPEED_TIME ': "20"
} }
GIT_MAX_LOG_CNT = 100 GIT_MAX_LOG_CNT = 100
GIT_LOG_FMT = \ GIT_LOG_FMT = (
"\"sha:%H%x1Dauthor:%an%x1Ddate:%ct%x1Dsubject:%s%x1Dmessage:%b%x1E\"" "\"sha:%H%x1Dauthor:%an%x1Ddate:%ct%x1Dsubject:%s%x1Dmessage:%b%x1E\""
)
GIT_OBJ_ERR = "fatal: loose object" GIT_OBJ_ERR = "fatal: loose object"
GIT_REF_FMT = (
"'%(if)%(*objecttype)%(then)%(*objecttype) (*objectname)"
"%(else)%(objecttype) %(objectname)%(end) %(refname)'"
)
class GitRepo: class GitRepo:
def __init__(self, def __init__(self,
@ -634,23 +639,19 @@ class GitRepo:
async def get_tagged_commits(self) -> Dict[str, Any]: async def get_tagged_commits(self) -> Dict[str, Any]:
self._verify_repo() self._verify_repo()
async with self.git_operation_lock: async with self.git_operation_lock:
resp = await self._run_git_cmd(f"show-ref --tags -d") resp = await self._run_git_cmd(
"for-each-ref --count=10 --sort='-creatordate' "
f"--format={GIT_REF_FMT} 'refs/tags'")
tagged_commits: Dict[str, Any] = {} tagged_commits: Dict[str, Any] = {}
tags = [tag.strip() for tag in resp.split('\n') if tag.strip()] for line in resp.split('\n'):
for tag in tags: parts = line.strip().split()
sha, ref = tag.split(' ', 1) if len(parts) != 3 or parts[0] != "commit":
ref = ref.split('/')[-1] continue
if ref[-3:] == "^{}": sha, ref = parts[1:]
# Dereference this commit and overwrite any existing tag tag = ref.split('/')[-1]
ref = ref[:-3] tagged_commits[sha] = tag
tagged_commits[ref] = sha
elif ref not in tagged_commits:
# This could be a lightweight tag pointing to a commit. If
# it is an annotated tag it will be overwritten by the
# dereferenced tag
tagged_commits[ref] = sha
# Return tagged commits as SHA keys mapped to tag values # Return tagged commits as SHA keys mapped to tag values
return {v: k for k, v in tagged_commits.items()} return tagged_commits
def get_repo_status(self) -> Dict[str, Any]: def get_repo_status(self) -> Dict[str, Any]:
return { return {