Ticket #470: source.py.patch

buildbot/steps/source.py

@@ -347 +347 @@
     name = 'svn'
 
     def __init__(self, svnurl=None, baseURL=None, defaultBranch=None,
-                 directory=None, **kwargs):
+                 directory=None, svndir=None, **kwargs):
         """
         @type  svnurl: string
         @param svnurl: the URL which points to the Subversion server,
@@ -368 +368 @@
                               explicitly. It will simply be appended
                               to C{baseURL} and the result handed to
                               the SVN command.
+
+        @param svndir: if branches are enabled, this is the directory
+                       to append to the URL after C{baseURL} and the branch
+                       have been appended.  You can use this to check out a
+                       subdirectory of the repository.  It should start with
+                       a slash.                              
         """
 
         if not kwargs.has_key('workdir') and directory is not None:
@@ -379 +385 @@
         self.svnurl = svnurl
         self.baseURL = baseURL
         self.branch = defaultBranch
+        self.svndir = svndir
 
         Source.__init__(self, **kwargs)
 
@@ -448 +455 @@
             self.args['svnurl'] = self.svnurl
         else:
             self.args['svnurl'] = self.baseURL + branch
+            if self.svndir is not None:
+                self.args['svnurl'] = self.args['svnurl'] + self.svndir
+
+        # add peg-revision to svnurl
+        if revision is not None and revision != "HEAD":
+            self.args['svnurl'] = self.args['svnurl'] + "@" + str(revision)
+            
         self.args['revision'] = revision
         self.args['patch'] = patch
 
         revstuff = []
         if branch is not None and branch != self.branch:
-            revstuff.append("[branch]")
+            revstuff.append("[%s]" % branch)
         if revision is not None:
             revstuff.append("r%s" % revision)
         self.description.extend(revstuff)