From 3739ffb33869c7006363e911fc8d223ee2499d1a Mon Sep 17 00:00:00 2001
From: warner <warner@lothar.com>
Date: Sun, 1 Oct 2006 02:11:24 +0100
Subject: [PATCH] try: update docs, remove some dead code

---
 ChangeLog                     |  5 +++++
 buildbot/scripts/tryclient.py |  2 --
 docs/buildbot.texinfo         | 40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8c340b0..8b88d48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-09-30  Brian Warner  <warner@lothar.com>
 
+	* docs/buildbot.texinfo (.buildbot config directory): add more
+	docs on the .buildbot/options keys used by "buildbot try"
+	* buildbot/scripts/tryclient.py (Try.createJob): remove dead code
+	(Try.deliverJob): same
+
 	* buildbot/changes/bonsaipoller.py (BonsaiParser): more updates
 	from Robert Helmer
 	(BonsaiPoller): same
diff --git a/buildbot/scripts/tryclient.py b/buildbot/scripts/tryclient.py
index 7966344..afc32e4 100644
--- a/buildbot/scripts/tryclient.py
+++ b/buildbot/scripts/tryclient.py
@@ -301,7 +301,6 @@ class Try(pb.Referenceable):
     def createJob(self):
         # returns a Deferred which fires when the job parameters have been
         # created
-        config = self.config
         opts = self.opts
         # generate a random (unique) string. It would make sense to add a
         # hostname and process ID here, but a) I suspect that would cause
@@ -336,7 +335,6 @@ class Try(pb.Referenceable):
 
     def deliverJob(self):
         # returns a Deferred that fires when the job has been delivered
-        config = self.config
         opts = self.opts
 
         if self.connect == "ssh":
diff --git a/docs/buildbot.texinfo b/docs/buildbot.texinfo
index fc9e094..6cf205d 100644
--- a/docs/buildbot.texinfo
+++ b/docs/buildbot.texinfo
@@ -5720,6 +5720,46 @@ Provides a default username for the @command{sendchange} command.
 @end table
 
 
+The following options are used by the @code{buildbot try} command
+(@pxref{try}):
+
+@table @code
+@item try_connect
+This specifies how the ``try'' command should deliver its request to
+the buildmaster. The currently accepted values are ``ssh'' and ``pb''.
+@item try_builders
+Which builders should be used for the ``try'' build.
+@item try_vc
+This specifies the version control system being used.
+@item try_branch
+This indicates that the current tree is on a non-trunk branch.
+@item try_topdir
+@item try_topfile
+Use @code{try_topdir} to explicitly indicate the top of your working
+tree, or @code{try_topfile} to name a file that will only be found in
+that top-most directory.
+
+@item try_host
+@item try_username
+@item try_dir
+When try_connect is ``ssh'', the command will pay attention to
+@code{try_host}, @code{try_username}, and @code{try_dir}.
+
+@item try_username
+@item try_password
+@item try_master
+Instead, when @code{try_connect} is ``pb'', the command will pay
+attention to @code{try_username}, @code{try_password}, and
+@code{try_master}.
+
+@item try_wait
+@item masterstatus
+@code{try_wait} and @code{masterstatus} are used to ask the ``try''
+command to wait for the requested build to complete.
+
+@end table
+
+
 
 @node Resources, Developer's Appendix, Command-line tool, Top
 @chapter Resources
-- 
2.11.4.GIT