[Buildbot-commits] buildbot/buildbot scheduler.py, 1.25, 1.26 sourcestamp.py, 1.3, 1.4

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9373/buildbot

Modified Files:
	scheduler.py sourcestamp.py 
Log Message:
[project @ implement 'try --diff', might not work yet, still needs docs and tests]

Original author: warner at allmydata.com
Date: 2007-02-06 19:06:08

Index: scheduler.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/scheduler.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- scheduler.py	23 Jan 2007 21:04:32 -0000	1.25
+++ scheduler.py	6 Feb 2007 20:36:09 -0000	1.26
@@ -563,7 +563,7 @@
         #  "1", the version number of this format
         #  buildsetID, arbitrary string, used to find the buildSet later
         #  branch name, "" for default-branch
-        #  base revision
+        #  base revision, "" for HEAD
         #  patchlevel, usually "1"
         #  patch
         #  builderNames...
@@ -579,6 +579,8 @@
         builderNames = s[5:]
         if branch == "":
             branch = None
+        if baserev == "":
+            baserev = None
         patchlevel = int(patchlevel)
         patch = (patchlevel, diff)
         ss = SourceStamp(branch, baserev, patch)

Index: sourcestamp.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/sourcestamp.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sourcestamp.py	11 Dec 2006 09:06:34 -0000	1.3
+++ sourcestamp.py	6 Feb 2007 20:36:09 -0000	1.4
@@ -6,17 +6,17 @@
     """This is a tuple of (branch, revision, patchspec, changes).
 
     C{branch} is always valid, although it may be None to let the Source
-    step use its default branch. There are four possibilities for the
+    step use its default branch. There are three possibilities for the
     remaining elements:
-     - (revision=REV, patchspec=None, changes=None): build REV
+     - (revision=REV, patchspec=None, changes=None): build REV. If REV is
+       None, build the HEAD revision from the given branch.
      - (revision=REV, patchspec=(LEVEL, DIFF), changes=None): checkout REV,
        then apply a patch to the source, with C{patch -pPATCHLEVEL <DIFF}.
+       If REV is None, checkout HEAD and patch it.
      - (revision=None, patchspec=None, changes=[CHANGES]): let the Source
        step check out the latest revision indicated by the given Changes.
        CHANGES is a list of L{buildbot.changes.changes.Change} instances,
        and all must be on the same branch.
-     - (revision=None, patchspec=None, changes=None): build the latest code
-       from the given branch.
     """
 
     # all four of these are publically visible attributes