Ticket #71: absolute-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 getAbsoluteSourceStamp(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
@@ -255 +259 @@
 
     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 an absolute SourceStamp if possible, and its results
+        may change as the build progresses.  Specifically, a "HEAD"
+        build may later be more accurately specified by an absolute
+        SourceStamp with the specific revision information.
 
         This method will return None if the source information is no longer
         available."""

buildbot/process/builder.py

@@ -692 +692 @@
         if not bs.isFinished():
             return
 
-        ss = bs.getSourceStamp()
+        ss = bs.getSourceStamp(absolute=True)
         req = base.BuildRequest(reason, ss, self.original.name)
         self.requestBuild(req)
 

buildbot/sourcestamp.py

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

buildbot/status/builder.py

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