[Buildbot-commits] buildbot/buildbot/process builder.py,1.29,1.30

[Brian Warner]

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

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

add pending/upcoming builds to the HTML "Current Activity" row

	* buildbot/status/html.py: add pending/upcoming builds to CurrentBox
	* buildbot/interfaces.py (IScheduler.getPendingBuildTimes): new method
	(IStatus.getSchedulers): new method
	* buildbot/status/builder.py (BuilderStatus): track pendingBuilds
	(Status.getSchedulers): implement
	* buildbot/process/builder.py (Builder): maintain
	BuilderStatus.pendingBuilds
	* buildbot/scheduler.py (Scheduler.getPendingBuildTimes): new method
	(TryBase.addChange): Try schedulers should ignore Changes

--This line, and those below, will be ignored--
Files to commit:
   <can't compute list>

This list might be incomplete or outdated if editing the log
message was not invoked from an up-to-date changes buffer!


Index: builder.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/builder.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- builder.py	17 Aug 2005 02:15:37 -0000	1.29
+++ builder.py	31 Aug 2005 01:51:43 -0000	1.30
@@ -259,11 +259,13 @@
         req.submittedAt = now()
         self.buildable.append(req)
         req.requestSubmitted(self)
+        self.builder_status.addBuildRequest(req.status)
         self.maybeStartBuild()
 
     def cancelBuildRequest(self, req):
         if req in self.buildable:
             self.buildable.remove(req)
+            self.builder_status.removeBuildRequest(req.status)
             return True
         return False
 
@@ -385,10 +387,12 @@
         # it. Grab the oldest request, see if we can merge it with anything
         # else.
         req = self.buildable.pop(0)
+        self.builder_status.removeBuildRequest(req.status)
         mergers = []
         for br in self.buildable[:]:
             if req.canBeMergedWith(br):
                 self.buildable.remove(br)
+                self.builder_status.removeBuildRequest(br.status)
                 mergers.append(br)
         requests = [req] + mergers
 
@@ -468,6 +472,7 @@
         self.building.remove(build)
         for req in build.requests:
             self.buildable.insert(0, req) # they get first priority
+            self.builder_status.addBuildRequest(req.status)
 
         # other notifyOnDisconnect calls will mark the slave as disconnected.
         # Re-try after they have fired, maybe there's another slave