Merge branch 'tube-bus-name'
[empathy.git] / release.py
index 9f9f677520fca11b0b8b40b14172b7a425f51603..60977d502a7f4a11af6ac11ecc156c31eafcc06b 100755 (executable)
@@ -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]
@@ -208,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:
@@ -227,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:
@@ -237,22 +241,32 @@ class Project:
                                        message += '\n'
                                message += msg
 
-               self.query_bug_commits ()
+               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):
                self.get_commits()
-               news = 'NEW in '+ self.package_version + '\n==============\n' 
-               news += self.commits + '\nBugs fixed:\n' + self.bugs + '\nTranslations:\n' + self.translations + '\n'
+               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