[Buildbot-commits] buildbot/docs/examples twisted_master.cfg,1.35,1.36

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/docs/examples
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4679/docs/examples

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

s/base_url/baseURL/ and s/default_branch/defaultBranch/ for SVN+Darcs

	* buildbot/process/step.py (SVN.__init__): change 'base_url' and
	'default_branch' argument names to 'baseURL' and 'defaultBranch',
	for consistency with other BuildStep arguments that use camelCase.
	Well, at least more of them use camelCase (like flunkOnWarnings)
	than don't.. I wish I'd picked one style and stuck with it
	earlier. Annoying, but it's best done before the release, since
	these arguments didn't exist at all in 0.6.6 .
	(Darcs): same
	* buildbot/test/test_vc.py (SVN.testCheckout): same
	(Darcs.testPatch): same
	* docs/buildbot.texinfo (SVN): document the change
	(Darcs): same, add some build-on-branch docs
	* docs/examples/twisted_master.cfg: match change


Index: twisted_master.cfg
===================================================================
RCS file: /cvsroot/buildbot/buildbot/docs/examples/twisted_master.cfg,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- twisted_master.cfg	24 Oct 2005 03:48:31 -0000	1.35
+++ twisted_master.cfg	24 Oct 2005 22:42:03 -0000	1.36
@@ -56,19 +56,22 @@
 
 ## configure the builders
 
-svnurl = "svn://svn.twistedmatrix.com/svn/Twisted/trunk"
-# for build-on-branch, we use these instead
-base_url = "svn://svn.twistedmatrix.com/svn/Twisted/"
-default_branch = "trunk"
-#source_update = s(step.SVN, svnurl=svnurl, mode="update")
-#source_copy = s(step.SVN, svnurl=svnurl, mode="copy")
-#source_export = s(step.SVN, svnurl=svnurl, mode="export")
-source_update = s(step.SVN, base_url=base_url, default_branch=default_branch,
-                  mode="update")
-source_copy = s(step.SVN, base_url=base_url, default_branch=default_branch,
-                mode="copy")
-source_export = s(step.SVN, base_url=base_url, default_branch=default_branch,
-                  mode="export")
+if 0:
+    # always build on trunk
+    svnurl = "svn://svn.twistedmatrix.com/svn/Twisted/trunk"
+    source_update = s(step.SVN, svnurl=svnurl, mode="update")
+    source_copy = s(step.SVN, svnurl=svnurl, mode="copy")
+    source_export = s(step.SVN, svnurl=svnurl, mode="export")
+else:
+    # for build-on-branch, we use these instead
+    baseURL = "svn://svn.twistedmatrix.com/svn/Twisted/"
+    defaultBranch = "trunk"
+    source_update = s(step.SVN, baseURL=baseURL, defaultBranch=defaultBranch,
+                      mode="update")
+    source_copy = s(step.SVN, baseURL=baseURL, defaultBranch=defaultBranch,
+                    mode="copy")
+    source_export = s(step.SVN, baseURL=baseURL, defaultBranch=defaultBranch,
+                      mode="export")
 
 
 builders = []