kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-10 01:10:11 +01:00
Code Activity

Only do the latest five tags when using UCM:Tags on git

Browse Source
This commit is contained in:
Daniel Martí 2014-04-17 21:05:18 +02:00
parent 3736da3761
commit 00fa44e916
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fdroidserver/checkupdates.py
View File

@ -123,6 +123,9 @@ def check_tags(app, pattern):
pat = re.compile(pattern) pat = re.compile(pattern)
tags = [tag for tag in tags if pat.match(tag)] tags = [tag for tag in tags if pat.match(tag)]
if repotype in ('git',):
tags = vcs.latesttags(tags, 5)
for tag in tags: for tag in tags:
logging.debug("Check tag: '{0}'".format(tag)) logging.debug("Check tag: '{0}'".format(tag))
vcs.gotorevision(tag) vcs.gotorevision(tag)

21
fdroidserver/common.py
View File

@ -320,6 +320,10 @@ class vcs:
def gettags(self): def gettags(self):
raise VCSException('gettags not supported for this vcs type') raise VCSException('gettags not supported for this vcs type')
# Get a list of latest number tags
def latesttags(self, number):
raise VCSException('latesttags not supported for this vcs type')
# Get current commit reference (hash, revision, etc) # Get current commit reference (hash, revision, etc)
def getref(self): def getref(self):
raise VCSException('getref not supported for this vcs type') raise VCSException('getref not supported for this vcs type')
@ -412,6 +416,14 @@ class vcs_git(vcs):
p = SilentPopen(['git', 'tag'], cwd=self.local) p = SilentPopen(['git', 'tag'], cwd=self.local)
return p.stdout.splitlines() return p.stdout.splitlines()
def latesttags(self, alltags, number):
self.checkrepo()
p = SilentPopen(['echo "'+'\n'.join(alltags)+'" | \
xargs -I@ git log --format=format:"%at @%n" -1 @ | \
sort -n | awk \'{print $2}\''],
cwd=self.local, shell=True)
return p.stdout.splitlines()[-number:]
class vcs_gitsvn(vcs): class vcs_gitsvn(vcs):
@ -1441,10 +1453,11 @@ def FDroidPopen(commands, cwd=None, shell=False, output=True):
:returns: A PopenResult. :returns: A PopenResult.
""" """
if cwd: if output:
cwd = os.path.normpath(cwd) if cwd:
logging.info("Directory: %s" % cwd) cwd = os.path.normpath(cwd)
logging.info("> %s" % ' '.join(commands)) logging.info("Directory: %s" % cwd)
logging.info("> %s" % ' '.join(commands))
result = PopenResult() result = PopenResult()
p = subprocess.Popen(commands, cwd=cwd, shell=shell, p = subprocess.Popen(commands, cwd=cwd, shell=shell,