Merge commit 'c462bf85fc86c1710c23026231f56deb90b317f3' into jinja

buildbot/interfaces.py

@@ -882,6 +882,13 @@ def requestSubmitted(request):
         @type request: implementor of L{IBuildRequestStatus}
         """
 
+    def requestCancelled(builder, request):
+        """A BuildRequest has been cancelled on the given Builder.
+
+        @type builder: L{buildbot.status.builder.BuilderStatus}
+        @type request: implementor of L{IBuildRequestStatus}
+        """
+
     def builderAdded(builderName, builder):
         """
         A new Builder has just been added. This method may return an

buildbot/process/builder.py

@@ -456,7 +456,7 @@ def submitBuildRequest(self, req):
     def cancelBuildRequest(self, req):
         if req in self.buildable:
             self.buildable.remove(req)
-            self.builder_status.removeBuildRequest(req.status)
+            self.builder_status.removeBuildRequest(req.status, cancelled=True)
             return True
         return False
 

buildbot/status/base.py

@@ -11,6 +11,9 @@ class StatusReceiver:
     def requestSubmitted(self, request):
         pass
 
+    def requestCancelled(self, builder, request):
+        pass
+
     def buildsetSubmitted(self, buildset):
         pass
 

buildbot/status/builder.py

@@ -1800,8 +1800,11 @@ def addBuildRequest(self, brstatus):
         for w in self.watchers:
             w.requestSubmitted(brstatus)
 
-    def removeBuildRequest(self, brstatus):
+    def removeBuildRequest(self, brstatus, cancelled=False):
         self.pendingBuilds.remove(brstatus)
+        if cancelled:
+            for w in self.watchers:
+                w.requestCancelled(self, brstatus)
 
     # buildStarted is called by our child BuildStatus instances
     def buildStarted(self, s):