[Buildbot-commits] buildbot/buildbot/changes changes.py,1.17,1.18 p4poller.py,1.2,1.3

[Brian Warner]

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

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

merge doc updates [org.apestaart at thomas/buildbot--doc--0--patch-6]

Merge epydoc changes from Thomas, add some hacks of my own. No code
changes to the buildbot itself, although I hacked docs/epyrun a bit.


Index: changes.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/changes/changes.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- changes.py	30 Sep 2004 23:03:52 -0000	1.17
+++ changes.py	18 Apr 2005 00:26:57 -0000	1.18
@@ -144,14 +144,16 @@
     They are expected to call self.changemaster.addChange() with Change
     objects.
 
-    There are several different variants of the second type of source.
+    There are several different variants of the second type of source:
     
-     MaildirSource watches a maildir for CVS commit mail. It uses DNotify if
-     available, or polls every 10 seconds if not. It parses incoming mail to
-     determine what files were changed.
+      - L{buildbot.changes.mail.MaildirSource} watches a maildir for CVS
+        commit mail. It uses DNotify if available, or polls every 10
+        seconds if not.  It parses incoming mail to determine what files
+        were changed.
 
-     FreshCVSSource makes a PB connection to the CVSToys 'freshcvs' daemon
-     and relays any changes it announces.
+       - L{buildbot.changes.freshcvs.FreshCVSSource} makes a PB
+         connection to the CVSToys 'freshcvs' daemon and relays any
+         changes it announces.
     
     """
 

Index: p4poller.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/changes/p4poller.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- p4poller.py	7 Sep 2004 01:19:09 -0000	1.2
+++ p4poller.py	18 Apr 2005 00:26:57 -0000	1.3
@@ -13,21 +13,7 @@
 
 class P4Source(service.Service, util.ComparableMixin):
     """This source will poll a perforce repository for changes and submit
-    them to the change master.
-
-    @param p4port: p4 port definition (host:portno)
-
-    @param p4user: p4 user
-
-    @param p4client: name of p4 client to poll
-
-    @param p4base: p4 file specification to limit a poll to (i.e., //...)
-
-
-    @param p4path: path to p4 binary, defaults to just 'p4'
-    @param pollinterval: interval in seconds between polls
-    @param histmax: maximum number of changes to look back through
-    """
+    them to the change master."""
 
     __implements__ = IChangeSource, service.Service.__implements__
     compare_attrs = ["p4port", "p4user", "p4client", "p4base",
@@ -40,6 +26,24 @@
 
     def __init__(self, p4port, p4user, p4client, p4base,
                  p4bin='p4', pollinterval=60 * 10, histmax=100):
+        """
+        @type  p4port:       string
+        @param p4port:       p4 port definition (host:portno)
+        @type  p4user:       string
+        @param p4user:       p4 user
+        @type  p4client:     string
+        @param p4client:     name of p4 client to poll
+        @type  p4base:       string
+        @param p4base:       p4 file specification to limit a poll to
+                             (i.e., //...)
+        @type  p4bin:        string
+        @param p4bin:        path to p4 binary, defaults to just 'p4'
+        @type  pollinterval: int
+        @param pollinterval: interval in seconds between polls
+        @type  histmax:      int
+        @param histmax:      maximum number of changes to look back through
+        """
+
         self.p4port = p4port
         self.p4user = p4user
         self.p4client = p4client