Ticket #71: update-sourcestamps.patch

buildbot/interfaces.py

@@ -98 +98 @@
         BuildRequests. This is called by a Build when it starts, to figure
         out what its sourceStamp should be."""
 
+    def getUpdatedSourceStamp(self, got_revision):
+        """Get a new SourceStamp object reflecting the actual revision found
+        by a Source step."""
+
     def getText(self):
         """Returns a list of strings to describe the stamp. These are
         intended to be displayed in a narrow column. If more space is
@@ -346 +350 @@
 
     def getSourceStamp():
         """Return a SourceStamp object which can be used to re-create
-        the source tree that this build used.
+        the source tree that this build used.  This method will
+        return the most specific information possible, and its results
+        may change as the build progresses.  Specifically, a "HEAD"
+        build may later be more accurately specified with the specific
+        revision information.
 
         This method will return None if the source information is no longer
         available."""

buildbot/sourcestamp.py

@@ -80 +80 @@
                                 changes=changes)
         return newsource
 
+    def getUpdatedSourceStamp(self, got_revision):
+        return SourceStamp(branch=self.branch, revision=got_revision, patch=self.patch)
+
     def getText(self):
         # XXX this won't work for VC's with huge 'revision' strings
         if self.revision is None: return [ "latest" ]

buildbot/status/builder.py

@@ -951 +951 @@
             return None
         return self.builder.getBuild(self.number-1)
 
-    def getSourceStamp(self):
-        return self.source
+    def getSourceStamp(self, specific=False):
+        if not specific or not self.properties.has_key('got_revision'):
+            return self.source
+        return self.source.getUpdatedSourceStamp(self.properties['got_revision'])
 
     def getReason(self):
         return self.reason

buildbot/process/builder.py

@@ -672 +672 @@
             return
 
         # get a source stamp, possibly more specific than the original
-        ss = bs.getSourceStamp()
-        changes = bs.getChanges()
-        ss = sourcestamp.SourceStamp(ss.branch, ss.revision, ss.patch, changes)
+        ss = bs.getSourceStamp(specific=True)
 
         req = base.BuildRequest(reason, ss, self.original.name)
         self.requestBuild(req)