Skip to content

Commit

Permalink
Remove support for Bazaar, Arch and Monotone
Browse files Browse the repository at this point in the history
Note that this is the "old" Bazaar (baz) that was a derivative of Arch,
not Canonical's "new" Bazaar (bzr).  Ugh, how confusing.

Fixes #869
  • Loading branch information
Dustin J. Mitchell committed Aug 15, 2010
1 parent 8362d18 commit a1db54c
Show file tree
Hide file tree
Showing 16 changed files with 22 additions and 1,315 deletions.
305 changes: 0 additions & 305 deletions master/buildbot/changes/monotone.py

This file was deleted.

47 changes: 2 additions & 45 deletions master/buildbot/clients/tryclient.py
Expand Up @@ -29,8 +29,8 @@ def dovc(self, cmd):
return d
def _didvc(self, res, cmd):
(stdout, stderr, code) = res
# 'bzr diff' sets rc=1 if there were any differences. tla, baz, and
# cvs do something similar, so don't bother requring rc=0.
# 'bzr diff' sets rc=1 if there were any differences.
# cvs does something similar, so don't bother requring rc=0.
return stdout

def get(self):
Expand Down Expand Up @@ -113,45 +113,6 @@ def getPatch(self, res):
d.addCallback(self.readPatch, self.patchlevel)
return d

class BazExtractor(SourceStampExtractor):
patchlevel = 1
vcexe = "baz"
def getBaseRevision(self):
d = self.dovc(["tree-id"])
d.addCallback(self.parseStatus)
return d
def parseStatus(self, res):
tid = res.strip()
slash = tid.index("/")
dd = tid.rindex("--")
self.branch = tid[slash+1:dd]
self.baserev = tid[dd+2:]
def getPatch(self, res):
d = self.dovc(["diff"])
d.addCallback(self.readPatch, self.patchlevel)
return d

class TlaExtractor(SourceStampExtractor):
patchlevel = 1
vcexe = "tla"
def getBaseRevision(self):
# 'tla logs --full' gives us ARCHIVE/BRANCH--REVISION
# 'tla logs' gives us REVISION
d = self.dovc(["logs", "--full", "--reverse"])
d.addCallback(self.parseStatus)
return d
def parseStatus(self, res):
tid = res.split("\n")[0].strip()
slash = tid.index("/")
dd = tid.rindex("--")
self.branch = tid[slash+1:dd]
self.baserev = tid[dd+2:]

def getPatch(self, res):
d = self.dovc(["changes", "--diffs"])
d.addCallback(self.readPatch, self.patchlevel)
return d

class BzrExtractor(SourceStampExtractor):
patchlevel = 0
vcexe = "bzr"
Expand Down Expand Up @@ -310,12 +271,8 @@ def getSourceStamp(vctype, treetop, branch=None):
e = CVSExtractor(treetop, branch)
elif vctype == "svn":
e = SVNExtractor(treetop, branch)
elif vctype == "baz":
e = BazExtractor(treetop, branch)
elif vctype == "bzr":
e = BzrExtractor(treetop, branch)
elif vctype == "tla":
e = TlaExtractor(treetop, branch)
elif vctype == "hg":
e = MercurialExtractor(treetop, branch)
elif vctype == "p4":
Expand Down
2 changes: 1 addition & 1 deletion master/buildbot/scripts/runner.py
Expand Up @@ -868,7 +868,7 @@ class TryOptions(OptionsWithOptionsFile):
"Base revision to use instead of scanning a local tree."],

["vc", None, None,
"The VC system in use, one of: cvs,svn,tla,baz,darcs,p4"],
"The VC system in use, one of: cvs,svn,bzr,darcs,p4"],
["branch", None, None,
"The branch in use, for VC systems that can't figure it out"
" themselves"],
Expand Down

0 comments on commit a1db54c

Please sign in to comment.