[Buildbot-commits] buildbot/buildbot/status html.py,1.77,1.78

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/status
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13954/buildbot/status

Modified Files:
	html.py 
Log Message:
Revision: arch at buildbot.sf.net--2004/buildbot--dev--0--patch-426
Creator:  Brian Warner <warner at lothar.com>

add some HTML links, add NEWS items, assume revisions are strings

	* NEWS: start collecting items for next release

	* buildbot/process/step.py (SVN.computeSourceRevision): assume
	revisions are strings
	(P4Sync.computeSourceRevision): same

	* buildbot/status/html.py (StatusResourceBuild.body): add a link
	to the Buildbot's overall status page
	(StatusResourceBuilder.body): same


Index: html.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/html.py,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- html.py	15 Nov 2005 08:38:06 -0000	1.77
+++ html.py	23 Nov 2005 08:01:23 -0000	1.78
@@ -314,12 +314,15 @@
 
     def body(self, request):
         b = self.build
+        buildbotURL = self.status.getBuildbotURL()
+        projectName = self.status.getProjectName()
+        data = "<a href=\"%s\">%s</a>\n" % (buildbotURL, projectName)
         # the color in the following line gives python-mode trouble
-        data = ("<h1>Build <a href=\"%s\">%s</a>:#%d</h1>\n"
-                "<h2>Reason:</h2>\n%s\n"
-                % (self.status.getURLForThing(b.getBuilder()),
-                   urllib.quote(b.getBuilder().getName()), b.getNumber(),
-                   html.escape(b.getReason())))
+        data += ("<h1>Build <a href=\"%s\">%s</a>:#%d</h1>\n"
+                 "<h2>Reason:</h2>\n%s\n"
+                 % (self.status.getURLForThing(b.getBuilder()),
+                    urllib.quote(b.getBuilder().getName()), b.getNumber(),
+                    html.escape(b.getReason())))
 
         branch, revision, patch = b.getSourceStamp()
         data += "<h2>SourceStamp:</h2>\n"
@@ -488,7 +491,10 @@
         slaves = b.getSlaves()
         connected_slaves = [s for s in slaves if s.isConnected()]
 
-        data = make_row("Builder:", html.escape(b.getName()))
+        buildbotURL = self.status.getBuildbotURL()
+        projectName = self.status.getProjectName()
+        data = "<a href=\"%s\">%s</a>\n" % (buildbotURL, projectName)
+        data += make_row("Builder:", html.escape(b.getName()))
         b1 = b.getBuild(-1)
         if b1 is not None:
             data += make_row("Current/last build:", str(b1.getNumber()))