X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=release.py;h=60977d502a7f4a11af6ac11ecc156c31eafcc06b;hp=66057fe643dd4a87d9259dbb4cbe72f06cad68b0;hb=4c140ad31a3b5a6b919f6acd8b6c79f9a8d3ab5f;hpb=8d500b07d75a39042806e90abe96655feeabc657 diff --git a/release.py b/release.py index 66057fe6..60977d50 100755 --- a/release.py +++ b/release.py @@ -6,6 +6,7 @@ import urllib import csv import datetime from string import Template +from optparse import OptionParser username = 'xclaesse' upload_server = 'master.gnome.org' @@ -28,40 +29,9 @@ $news $footer''' -class Commit: - ref = '' +class Bug: + number = '' author = '' - date = '' - message = '' - bug = '' - translation = False - - def parse(self): - p1 = self.message.rfind('(') - p2 = self.message.rfind (')') - if len(self.message) - p2 <= 2: - self.author = self.message[p1+1:p2] - self.message = self.message[:p1] - - p1 = self.message.find('#') - p2 = self.message.find(' ', p1) - if p1 != -1: - self.bug = self.message[p1+1:p2] - - message = self.message.lower() - if message.find('translation') != -1 and\ - message.find('updated') != -1: - self.translation = True - exp = '.*pdated(?P.*).ranslation.*' - lang_re = re.compile(exp, re.S | re.M) - match = lang_re.match(self.message) - if match: - lang = match.group('name').strip() - self.message = "Updated " + lang + " Translation" - - self.message += ' (' + self.author + ').' - - return self.bug class Project: def __init__(self): @@ -159,54 +129,43 @@ class Project: return t.substitute(locals()) def get_last_tag(self): - tags_str = self.exec_cmd('git-tag') + tags_str = self.exec_cmd('git tag') tags = tags_str.splitlines() return tags[len(tags)-1] - def get_commits(self): - bugs = '' - co = None - commits = [] - last_tag = self.get_last_tag() + def parse_commit(self, ref, author, date, message): + p1 = message.rfind('(') + p2 = message.rfind (')') + if len(message) - p2 <= 2 and \ + message[p1+1:].find('#') == -1: + author = message[p1+1:p2] + message = message[:p1] + + msg = message.lower() + if msg.find('translation') != -1 and \ + (msg.find('added') != -1 or \ + msg.find('updated') != -1): + self.translations += ' - ' + message + ' (' + author + ').\n' + elif message.find('#') != -1: + p1 = message.find('#') + while p1 != -1: + bug = Bug() + p2 = p1 + 1 + while p2 < len (message) and \ + message[p2].isdigit(): + p2 = p2 + 1 + bug.number = message[p1+1:p2] + bug.author = author + self.bug_commits.append(bug) + p1 = message.find('#', p2) + else: + self.commits += ' - ' + message + ' (' + author + ').\n' - changes = self.exec_cmd ("git-log " + last_tag + "..") - for line in changes.splitlines(1): - if line.startswith('commit'): - if co != None: - bug = co.parse() - if bug: - if bugs != '': - bugs += ',' - bugs += bug - - co = Commit() - commits.append(co) - p1 = line.find(' ') - co.ref = line[p1:].strip() - elif line.startswith('Author:'): - p1 = line.find(' ') - p2 = line.find('<') - co.author = line[p1:p2].strip() - elif line.startswith('Date:'): - p1 = line.find(' ') - co.date = line[p1:].strip() - elif line.startswith(' git-svn-id:'): - continue - elif line.startswith('Merge:'): - continue - else: - msg = line.strip() - if msg == '': - continue - if msg.startswith('*'): - p1 = msg.find(':') - msg = msg[p1 + 1:].strip() - elif msg.startswith('2007-') or msg.startswith('2008-'): - continue - if co.message != '': - co.message += '\n' - co.message += msg + def query_bug_commits(self): + bugs = '' + for bug in self.bug_commits: + bugs += bug.number + ',' # Bugzilla query to use query = 'http://bugzilla.gnome.org/buglist.cgi?ctype=csv' \ @@ -236,38 +195,78 @@ class Project: bug_number = row[col_bug_id] description = row[col_description] - for co in commits: - if co.bug == bug_number: - co.message = 'Fixed #%s, %s (%s)' % (co.bug, description, co.author) + for bug in self.bug_commits: + if bug.number == bug_number: + self.bugs += ' - Fixed #%s, %s (%s)\n' % (bug.number, description, bug.author) break - return commits + + def get_commits(self): + self.commits = '' + self.translations = '' + self.bugs = '' + self.bug_commits = [] + last_tag = self.get_last_tag() + ref = None + + changes = self.exec_cmd ("git log " + last_tag + "..") + for line in changes.splitlines(1): + if line.startswith('commit'): + if ref != None: + self.parse_commit (ref, author, date, message) + p1 = line.find(' ') + ref = line[p1:].strip() + author = '' + date = '' + message = '' + elif line.startswith('Author:'): + p1 = line.find(' ') + p2 = line.find('<') + author = line[p1:p2].strip() + elif line.startswith('Date:'): + p1 = line.find(' ') + date = line[p1:].strip() + elif line.startswith(' git-svn-id:'): + continue + elif line.startswith(' Signed-off-by:'): + continue + elif line.startswith(' From:'): + continue + elif line.startswith('Merge:'): + continue + else: + msg = line.strip() + if msg == '': + continue + if message != '': + message += '\n' + message += msg + + if len (self.bug_commits) > 0: + self.query_bug_commits () def make_tag(self): new_tag = self.package_name.upper() + '_' +\ self.package_version.replace('.', '_') - url1 = self.exec_cmd('git-config svn-remote.svn.url').strip() - url2 = url1[:url1.rfind('/')] + '/tags/' + new_tag - self.exec_cmd('svn copy %s %s -m "Tagged for release %s."' % (url1, url2, self.package_version)) + info = self.exec_cmd('git svn info | grep URL') + url1 = info[info.find(" "):].strip() + + end = url1.find("empathy") + end = url1.find("/", end) + url2 = url1[:end] + '/tags/' + new_tag - self.exec_cmd('git-tag -m "Tagged for release %s." %s' % ( self.package_version, new_tag)) + self.exec_cmd('svn copy %s %s -m "Tagged for release %s."' % (url1, url2, self.package_version)) + self.exec_cmd('git tag -m "Tagged for release %s." %s' % ( self.package_version, new_tag)) def generate_news(self): - bugs = '' - translations = '' - others = '' - commits = self.get_commits() - for co in commits: - - if co.translation == True: - translations += ' - ' + co.message + '\n' - elif co.bug != '': - bugs += ' - ' + co.message + '\n' - else: - others += ' - ' + co.message + '\n' - - news = 'NEW in '+ self.package_version + '\n==============\n' - news += others + '\nBugs fixed:\n' + bugs + '\nTranslations:\n' + translations + '\n' + self.get_commits() + news = 'NEW in '+ self.package_version + '\n==============\n' + if self.commits != '': + news += self.commits + '\n' + if self.bugs != '': + news += 'Bugs fixed:\n' + self.bugs + '\n' + if self.translations != '': + news += 'Translations:\n' + self.translations + '\n' return news @@ -290,12 +289,44 @@ class Project: cmd = 'ssh %s@%s install-module -u %s' % (username, upload_server, tarball) self.exec_cmd(cmd) + def send_email(self): + notes = self.get_release_notes() + cmd = 'xdg-email ' \ + ' --cc telepathy@lists.freedesktop.org' \ + ' --subject "ANNOUNCE: Empathy %s"' \ + ' --body "%s"' \ + ' gnome-announce-list@gnome.org' % (self.package_version, + notes.replace('"', '\\"')) + self.exec_cmd(cmd) + def release(self): self.make_tag() self.upload_tarball() - print self.get_release_notes() + self.send_email() + +if __name__ == '__main__': + p = Project() + parser = OptionParser() + parser.add_option("-n", "--print-news", action="store_true",\ + dest="print_news", help="Generate and print news") + parser.add_option("-p", "--print-notes", action="store_true",\ + dest="print_notes", help="Generate and print the release notes") + parser.add_option("-w", "--write-news", action="store_true",\ + dest="write_news", help="Generate and write news into the NEWS file") + parser.add_option("-r", "--release", action="store_true",\ + dest="release", help="Release the tarball") + parser.add_option("-e", "--email", action="store_true",\ + dest="email", help="Send the release announce email") + + (options, args) = parser.parse_args () + if (options.print_news): + print p.generate_news () + if (options.print_notes): + print p.get_release_notes () + if (options.write_news): + p.write_news () + if (options.release): + p.release () + if (options.email): + p.send_email () -p = Project() -#print p.generate_news() -#p.write_news() -#p.release()