diff --git a/create_log.py b/create_log.py index 1f35a5d..c179242 100755 --- a/create_log.py +++ b/create_log.py @@ -1,152 +1,152 @@ #!/usr/bin/env python2 import os import subprocess def getVersionFrom(repo): f = open(versionsDir + '/' + repo) return f.readlines()[1].strip() f = open('modules.git') #srcdir="/d/kde/src/5/" srcdir="/data/devel/kde/release/" repos=[] for line in f: line = line[:line.find(" ")] repos.append(line) repos.sort() versionsDir = os.getcwd() + "/versions" print "" for repo in repos: toVersion = getVersionFrom(repo) os.chdir(srcdir+repo) if repo == "kdelibs": - fromVersion = "v4.14.34" + fromVersion = "v4.14.35" else: - fromVersion = "v17.04.3" + fromVersion = "v17.08.0" p = subprocess.Popen('git fetch', shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) retval = p.wait() if retval != 0: raise NameError('git fetch failed') p = subprocess.Popen('git rev-parse '+fromVersion, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) retval = p.wait() if retval != 0: print "

" + repo + " [Show]

" print "" continue p = subprocess.Popen('git diff '+fromVersion+'..'+toVersion, shell=True, stdout=subprocess.PIPE) diffOutput = p.stdout.readlines() retval = p.wait() if retval != 0: raise NameError('git diff failed', repo, fromVersion, toVersion) if len(diffOutput): p = subprocess.Popen('git log '+fromVersion+'..'+toVersion, shell=True, stdout=subprocess.PIPE) commit = [] commits = [] for line in p.stdout.readlines(): if line.startswith("commit"): if len(commit) > 1 and not ignoreCommit: commits.append(commit) commitHash = line[7:].strip() ignoreCommit = False commit = [commitHash] elif line.startswith("Author"): pass elif line.startswith("Date"): pass elif line.startswith("Merge"): pass else: line = line.strip() if line.startswith("Merge remote-tracking branch"): ignoreCommit = True elif line.startswith("SVN_SILENT"): ignoreCommit = True elif line.startswith("GIT_SILENT"): ignoreCommit = True elif line.startswith("Merge branch"): ignoreCommit = True elif line: commit.append(line) # Add the last commit if len(commit) > 1 and not ignoreCommit: commits.append(commit) if len(commits): print "

" + repo + " [Show]

" print "" retval = p.wait() if retval != 0: raise NameError('git log failed', repo, fromVersion, toVersion) diff --git a/version b/version index 8eef3d1..6c27c45 100644 --- a/version +++ b/version @@ -1,5 +1,5 @@ if [ "$repo" = "kdelibs" ]; then - version=4.14.35 + version=4.14.36 else - version=17.08.0 + version=17.08.1 fi