SVN source incompatible with repo/branch/project scheme

[alge]

I'm trying to get buildbot to work with a repository with a  http://svnserver/repo/branch/project scheme. It works for trunk, but for branches the SVN source module seems to be impossible.

Example: repo = repo, branch = branches/foo, project=bar. An SVN source with svnurl=repo + "/" + branch + "/" + project fails, because SVN source has "assert not branch" if you set svnurl.

An SVN source with baseurl=repo, branch=branch will check out  http://repo/branches/foo, not  http://repo/branches/foo/project. This will checkout all the projects with that branch. There is no way to specify the project part with the baseurl scheme.

One solution could be to throw out the baseurl stuff and make svnurl truly configurable, i.e. svnurl="repo/%BRANCH%/project" - and let the SVN source do s/%BRANCH%/branch/. Or just removing the "assert not branch" for svnurl would let you work around the problem by using svnurls instead.

[alge]

For the record, I fixed it for myself by removing the assertion and re-starting buildbot. But I think it should be fixed - it's pretty annoying that the svn changesource supports repo/branches/project but that the vc-support svn source is incompatible with it.

[dustin]

patches welcome!

which assert did you remove?

[alge]

This one: http://buildbot.net/trac/browser/buildbot/steps/source.py#L455

.. but line 458 is the real problem. As you can see it sets svnurl = baseURL + branch, making it impossible to have anything after the branch in the url. svnurl = baseURL + branch + project would work for my case, but I'd rather have something like svnurl = svnurl.replace('%BRANCH%', branch). (=

[dustin]

That sounds good. A patch would be great :)

[dustin]

I need to look to see if this is still a problem in the most recent versions.

[Dustin J. Mitchell]

Merge branch 'ticket_338' of  git://github.com/gvalkov/buildbot

• 'ticket_338' of  git://github.com/gvalkov/buildbot: Fix typo Raise a RuntimeError? when the branch from the SourceStamp? and defaultBranch are both None. Add basic repo/branch/project support (Ticket 338). Move compatibility checking out of SVN.startVC

Fixes #338.

Changeset: 6ccd9a962a168d0032d2536648037dc4fafa9c93