jhbuild r2801 - in trunk: . jhbuild/buildbot jhbuild/buildbot/status/web

[fpeters svn gnome org]

Author: fpeters
Date: Thu Apr 16 10:09:17 2009
New Revision: 2801
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2801&view=rev

Log:
* jhbuild/buildbot/changes.py:
* jhbuild/buildbot/status/web/changes.py:
* jhbuild/buildbot/steps.py: fixed handling of git commit emails, and
display of such in the web interface.



Modified:
   trunk/ChangeLog
   trunk/jhbuild/buildbot/changes.py
   trunk/jhbuild/buildbot/status/web/changes.py
   trunk/jhbuild/buildbot/steps.py

Modified: trunk/jhbuild/buildbot/changes.py
==============================================================================
--- trunk/jhbuild/buildbot/changes.py	(original)
+++ trunk/jhbuild/buildbot/changes.py	Thu Apr 16 10:09:17 2009
@@ -37,12 +37,12 @@
 
         from_header = m['from']
         if '<' in from_header:
-            from_email = m['from'].split('<')[0].split('>')[0]
+            from_email = m['from'].split('<')[1][:-1]
         else:
             from_email = m['from']
 
         # From is svnuser svn gnome org
-        name, domain = m["from"].split("@")
+        name, domain = from_email.split("@")
 
         # If this e-mail is valid, it will come from an svn/src.gnome.org email
         if domain not in ('svn.gnome.org', 'src.gnome.org'):

Modified: trunk/jhbuild/buildbot/status/web/changes.py
==============================================================================
--- trunk/jhbuild/buildbot/status/web/changes.py	(original)
+++ trunk/jhbuild/buildbot/status/web/changes.py	Thu Apr 16 10:09:17 2009
@@ -66,10 +66,17 @@
             data += '</pre>\n'
 
         if self.change.revision:
-            link = 'http://svn.gnome.org/viewvc/%s?view=revision&revision=%s' % (
-                    self.change.project, self.change.revision)
-            data += '<p>View in GNOME ViewVC: <a href="%s">%s r%s</a></dd>\n' % (
-                    link, self.change.project, self.change.revision)
+            if len(self.change.revision) == 40:
+                # git commit
+                link = 'http://git.gnome.org/cgit/%s/commit/?id=%s' % (
+                        self.change.project, self.change.revision)
+                data += '<p>View in GNOME cgit: <a href="%s">%s commit %s</a></dd>\n' % (
+                        link, self.change.project, self.change.revision)
+            else:
+                link = 'http://svn.gnome.org/viewvc/%s?view=revision&revision=%s' % (
+                        self.change.project, self.change.revision)
+                data += '<p>View in GNOME ViewVC: <a href="%s">%s r%s</a></dd>\n' % (
+                        link, self.change.project, self.change.revision)
 
         data += '</div>'
         return data

Modified: trunk/jhbuild/buildbot/steps.py
==============================================================================
--- trunk/jhbuild/buildbot/steps.py	(original)
+++ trunk/jhbuild/buildbot/steps.py	Thu Apr 16 10:09:17 2009
@@ -38,7 +38,11 @@
     def computeSourceRevision(self, changes):
         if not changes:
             return None
-        return max([int(c.revision) for c in changes])
+        try:
+            return max([int(c.revision) for c in changes])
+        except ValueError:
+            # in git, revisions are not integers, return last.
+            return changes[-1].revision
 
     def startVC(self, branch, revision, patch):
         command = ['jhbuild']