Skip to content

Commit

Permalink
Merge pull request #184 from tomprince/source
Browse files Browse the repository at this point in the history
Get rid of _ComputeRepositoryURL from new source steps.

From Tom's description of the pull request:

The reason for this is that _ComputeRepositoryURL has a bunch of magic to be backwards compatible with a bunch of different ways of specifying the repository. With the new renderable support, one can write code to explicitly specify any of the behaviours exposed by _ComputeRepositoryURL, with out relying on the right backwards compatibility code. I thought since we are not making the new steps entirely compatible with the old ones, it would be a good chance to get rid of the backwards compatibility magic in _ComputeRepositoryURL.
  • Loading branch information
djmitche committed Jul 18, 2011
2 parents b3f7c7b + 0835def commit 24047db
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions master/buildbot/steps/source/git.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from twisted.internet import defer

from buildbot.process import buildstep
from buildbot.steps.source import Source, _ComputeRepositoryURL
from buildbot.steps.source import Source
from buildbot.interfaces import BuildSlaveTooOldError

class Git(Source):
Expand Down Expand Up @@ -86,7 +86,7 @@ def __init__(self, repourl=None, branch='master', mode='incremental',
assert self.repourl is not None
if self.mode == 'full':
assert self.method in ['clean', 'fresh', 'clobber', 'copy', None]
self.repourl = self.repourl and _ComputeRepositoryURL(self.repourl)
self.repourl = self.repourl

def startVC(self, branch, revision, patch):
self.branch = branch or 'master'
Expand Down
6 changes: 3 additions & 3 deletions master/buildbot/steps/source/mercurial.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from twisted.internet import defer

from buildbot.process import buildstep
from buildbot.steps.source import Source, _ComputeRepositoryURL
from buildbot.steps.source import Source
from buildbot.interfaces import BuildSlaveTooOldError

class Mercurial(Source):
Expand Down Expand Up @@ -94,8 +94,8 @@ def __init__(self, repourl=None, baseURL=None, mode='incremental',
raise ValueError("you must privide at least one of repourl and"
" baseURL")

self.repourl = self.repourl and _ComputeRepositoryURL(self.repourl)
self.baseURL = self.baseURL and _ComputeRepositoryURL(self.baseURL)
self.repourl = self.repourl
self.baseURL = self.baseURL

def startVC(self, branch, revision, patch):
self.revision = revision
Expand Down

0 comments on commit 24047db

Please sign in to comment.