almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

Fix changelog generator script

Browse Source 
* Correctly exclude merge commits (there's a git log option for it)
 * Stop mangling log lines with @ symbol. This should only be cut for
   author of a change.
 * Fix PEP8 issues
 * Remove unused code
 * Port to argparse (optparse is deprecated)

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2017-06-08 09:46:54 +02:00
parent 0cdf996e6e
commit 3a59e8f266
1 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
git-changelog
View File

@ -20,20 +20,15 @@
# Author: David Cantrell <dcantrell@redhat.com> # Author: David Cantrell <dcantrell@redhat.com>
# Author: Brian C. Lane <bcl@redhat.com> # Author: Brian C. Lane <bcl@redhat.com>
import os
import re
import subprocess import subprocess
import sys
import textwrap import textwrap
from optparse import OptionParser from argparse import ArgumentParser
class ChangeLog: class ChangeLog:
def __init__(self, name, version): def __init__(self, name, version):
self.name = name self.name = name
self.version = version self.version = version
self.ignore = None
def _getCommitDetail(self, commit, field): def _getCommitDetail(self, commit, field):
proc = subprocess.Popen(['git', 'log', '-1', proc = subprocess.Popen(['git', 'log', '-1',
@ -43,7 +38,7 @@ class ChangeLog:
ret = proc[0].strip('\n').split('\n') ret = proc[0].strip('\n').split('\n')
if len(ret) == 1 and ret[0].find('@') != -1: if field == '%aE' and len(ret) == 1 and ret[0].find('@') != -1:
ret = ret[0].split('@')[0] ret = ret[0].split('@')[0]
elif len(ret) == 1: elif len(ret) == 1:
ret = ret[0] ret = ret[0]
@ -57,25 +52,19 @@ class ChangeLog:
range = "%s.." % (self.version) range = "%s.." % (self.version)
else: else:
range = "%s-%s.." % (self.name, self.version) range = "%s-%s.." % (self.name, self.version)
proc = subprocess.Popen(['git', 'log', '--pretty=oneline', range], proc = subprocess.Popen(['git', 'log', '--pretty=oneline',
'--no-merges', range],
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE).communicate() stderr=subprocess.PIPE).communicate()
lines = filter(lambda x: x.find('l10n: ') != 41 and \ lines = filter(lambda x: x.find('l10n: ') != 41,
x.find('Merge commit') != 41 and \
x.find('Merge branch') != 41,
proc[0].strip('\n').split('\n')) proc[0].strip('\n').split('\n'))
if self.ignore and self.ignore != '':
for commit in self.ignore.split(','):
lines = filter(lambda x: not x.startswith(commit), lines)
log = [] log = []
for line in lines: for line in lines:
fields = line.split(' ') fields = line.split(' ')
commit = fields[0] commit = fields[0]
summary = self._getCommitDetail(commit, "%s") summary = self._getCommitDetail(commit, "%s")
long = self._getCommitDetail(commit, "%b")
author = self._getCommitDetail(commit, "%aE") author = self._getCommitDetail(commit, "%aE")
log.append(("%s (%s)" % (summary.strip(), author))) log.append(("%s (%s)" % (summary.strip(), author)))
@ -94,18 +83,17 @@ class ChangeLog:
return s return s
def main():
parser = OptionParser()
parser.add_option("-n", "--name", dest="name",
help="Name of package used in tags")
parser.add_option("-v", "--version", dest="version",
help="Last version, changelog is commits after this tag")
(options, args) = parser.parse_args()
cl = ChangeLog(options.name, options.version) def main():
parser = ArgumentParser()
parser.add_argument("-n", "--name",
help="Name of package used in tags")
parser.add_argument("-v", "--version",
help="Last version, changelog is commits after this tag")
args = parser.parse_args()
cl = ChangeLog(args.name, args.version)
print cl.formatLog() print cl.formatLog()
if __name__ == "__main__": if __name__ == "__main__":
main() main()