Update release script to correctly create SVN tag.

[empathy.git] / release.py

diff --git a/release.py b/release.py
index a31dc864a3bdc6cc60ec88c5a6ce32dc5b6c9a99..940072a89db9b1e6df57339f02b9c10a8d46926d 100755 (executable)
--- a/release.py
+++ b/release.py
@@ -129,7 +129,7 @@ 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]
@@ -142,23 +142,19 @@ class Project:
                        author = message[p1+1:p2]
                        message = message[:p1]
 
-               print message
-               print message.find('#')
-
                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:
-                       print message
                        p1 = message.find('#')
                        while p1 != -1:
                                bug = Bug()
                                p2 = p1 + 1
-                               while message[p2].isdigit():
+                               while p2 < len (message) and \
+                                     message[p2].isdigit():
                                        p2 = p2 + 1
-                               print message[p1+1:p2]
                                bug.number = message[p1+1:p2]
                                bug.author = author
                                self.bug_commits.append(bug)
@@ -212,7 +208,7 @@ class Project:
                last_tag = self.get_last_tag()
                ref = None
 
-               changes = self.exec_cmd ("git-log " + last_tag + "..")
+               changes = self.exec_cmd ("git log " + last_tag + "..")
                for line in changes.splitlines(1):
                        if line.startswith('commit'):
                                if ref != None:
@@ -231,6 +227,10 @@ class Project:
                                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:
@@ -247,11 +247,12 @@ class Project:
                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
+               svn_base = self.exec_cmd('git config svn-remote.svn.url').strip()
+               url1 = svn_base + '/trunk'
+               url2 = svn_base + '/tags/' + 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))
+               self.exec_cmd('git tag -m "Tagged for release %s." %s' % ( self.package_version, new_tag))
 
        def generate_news(self):
                self.get_commits()