[Buildbot-commits] buildbot/buildbot/process step.py,1.76,1.77

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/process
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32175/buildbot/process

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

add "what we're checking out" note to the VC step description

	* buildbot/process/step.py (SVN): when building on a non-default
	branch, add the word "[branch]" to the VC step's description, so
	it is obvious that we're not building the usual stuff. Likewise,
	when we are building a specific revision, add the text "rNNN" to
	indicate what that revision number is. Thanks to Brad Hards and
	Nathaniel Smith for the suggestion.
	(Darcs.startVC): same
	(Arch.startVC): same
	(Bazaar.startVC): same


Index: step.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/step.py,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- step.py	5 Nov 2005 21:06:15 -0000	1.76
+++ step.py	5 Nov 2005 22:27:49 -0000	1.77
@@ -1348,6 +1348,14 @@
         self.args['revision'] = revision
         self.args['patch'] = patch
 
+        revstuff = []
+        if branch is not None and branch != self.branch:
+            revstuff.append("[branch]")
+        if revision is not None:
+            revstuff.append("r%s" % revision)
+        self.description.extend(revstuff)
+        self.descriptionDone.extend(revstuff)
+
         self.cmd = LoggedRemoteCommand("svn", self.args)
         ShellCommand.start(self, warnings)
 
@@ -1429,6 +1437,13 @@
             self.args['repourl'] = self.baseURL + branch
         self.args['revision'] = revision
         self.args['patch'] = patch
+
+        revstuff = []
+        if branch is not None and branch != self.branch:
+            revstuff.append("[branch]")
+        self.description.extend(revstuff)
+        self.descriptionDone.extend(revstuff)
+
         self.cmd = LoggedRemoteCommand("darcs", self.args)
         ShellCommand.start(self)
 
@@ -1559,6 +1574,15 @@
         self.args['revision'] = revision
         self.args['patch'] = patch
         warnings = self.checkSlaveVersion("arch", branch)
+
+        revstuff = []
+        if branch is not None and branch != self.branch:
+            revstuff.append("[branch]")
+        if revision is not None:
+            revstuff.append("patch%s" % revision)
+        self.description.extend(revstuff)
+        self.descriptionDone.extend(revstuff)
+
         self.cmd = LoggedRemoteCommand("arch", self.args)
         ShellCommand.start(self, warnings)
 
@@ -1596,6 +1620,15 @@
         self.args['revision'] = revision
         self.args['patch'] = patch
         warnings = self.checkSlaveVersion("bazaar", branch)
+
+        revstuff = []
+        if branch is not None and branch != self.branch:
+            revstuff.append("[branch]")
+        if revision is not None:
+            revstuff.append("patch%s" % revision)
+        self.description.extend(revstuff)
+        self.descriptionDone.extend(revstuff)
+
         self.cmd = LoggedRemoteCommand("bazaar", self.args)
         ShellCommand.start(self, warnings)