merge with fix_sourcestampsetid

MAINTAINERS.txt

@@ -12,12 +12,9 @@ D: Component description (optional)
 U: URL for more information
 
 M: Component maintainer, in the form
-      FullName <address@domain.com>  - STATUS
-   where STATUS is optional, and can be one of
-      Hacker - knows the code and can write fixes
-      Tester - can test patches and advise committers to merge
-      User - can help to triage and explain bugs
-      Retired - former maintainer, now out of the business
+      FullName <address@domain.com> (irc:nick)
+   Maintainers have familiarity with the component and can help out with
+   development as well as patch review.
 
 S: Component status.  One of
     Supported: This will be a part of Buildbot forever
@@ -34,11 +31,13 @@ S: Component status.  One of
 == Version Control ==
 
 Perforce VC
-    S: Orphaned
+    S: Maintained
+    M: Bill Deegan <bill@baddogconsulting.com> (irc:bdbaddog)
     U: http://trac.buildbot.net/wiki/p4
 
 Subversion VC
-    S: Orphaned
+    S: Maintained
+    M: Bill Deegan <bill@baddogconsulting.com> (irc:bdbaddog)
     U: http://trac.buildbot.net/wiki/svn
 
 CVS VC
@@ -49,50 +48,49 @@ Bazaar VC
     S: Orphaned
     U: http://trac.buildbot.net/wiki/bzr
 
+BitKeeper VC:
+    S: Maintained
+    M: Harlan Stenn <harlan@pfcs.com> (irc:harlan)
+    U: http://trac.buildbot.net/wiki/bk
+
 Git VC
     S: Maintained
-    M: Amber Yust <ayust@yelp.com> - Hacker
+    M: Amber Yust <ayust@yelp.com> (irc:Aaeriele)
     U: http://trac.buildbot.net/wiki/git
 
-BitKeeper VC
-    S: Last-Rites
-    U: http://trac.buildbot.net/wiki/bk
-
 Darcs VC
     S: Orphaned
     U: http://trac.buildbot.net/wiki/darcs
 
 Mercurial VC
-    S: Orphaned
+    S: Maintained
+    M: Justin Wood <Callek@gmail.com> (irc:Callek)
     U: http://trac.buildbot.net/wiki/hg
 
 Repo VC
     S: Maintained
-    M: Chris Soyars <ctsoyars@gmail.com> - Tester
-    M: Piotr Sikora <piotr.sikora@frickle.com> - Hacker
-    M: Pierre Tardy <tardyp@gmail.com> - Hacker
+    M: Chris Soyars <ctsoyars@gmail.com>
+    M: Piotr Sikora <piotr.sikora@frickle.com> (irc:PiotrSikora)
+    M: Pierre Tardy <tardyp@gmail.com>
     U: http://trac.buildbot.net/wiki/repovc
 
 Monotone VC
     S: Maintained
-    M: Richard Levitte <richard@levitte.org> - Hacker
+    M: Richard Levitte <richard@levitte.org>
     U: http://trac.buildbot.net/wiki/mtn
 
 
 == Change Sources ==
 
 Gerrit
     S: Maintained
-    M: Piotr Sikora <piotr.sikora@frickle.com> - Hacker
-    M: Pierre Tardy <tardyp@gmail.com> - Hacker
+    M: Piotr Sikora <piotr.sikora@frickle.com> (irc:PiotrSikora)
+    M: Pierre Tardy <tardyp@gmail.com>
     U: http://trac.buildbot.net/wiki/gerrit
 
 
 == Buildbot Plugins ==
 
-Debug Client
-    S: Orphaned
-
 Status Client
     S: Patched
     M: Mark Wielaard <mark@klomp.org>
@@ -102,12 +100,12 @@ Debug Client
 
 Web Status
     S: Supported
-    M: Marcus Lindblom <macke@yar.nu> - Hacker
+    M: Marcus Lindblom <macke@yar.nu>
     U: http://trac.buildbot.net/wiki/web
 
 IRC Status
     S: Maintained
-    M: Amber Yust <ayust@yelp.com> - Hacker
+    M: Amber Yust <ayust@yelp.com> (irc:Aaeriele)
     U: http://trac.buildbot.net/wiki/irc
 
 MailNotifier
@@ -120,8 +118,8 @@ MailNotifier
 Virtualization
     D: Use of virtual, start-on-demand slaves
     S: Maintained
-    M: John Carr <john.carr@isotoma.com> - Hacker
-    M: Tom Wardill <tom@howrandom.net> - Hacker
+    M: John Carr <john.carr@isotoma.com>
+    M: Tom Wardill <tom@howrandom.net>
     U: http://trac.buildbot.net/wiki/virtualization
 
 Buildbot Try
@@ -161,6 +159,7 @@ OpenBSD
 Windows
     S: Patched
     M: Robert Stackhouse <robertstackhouse@gmail.com>
+    M: Justin Wood <Callek@gmail.com> (irc:Callek)
     U: http://trac.buildbot.net/wiki/windows
 
 RedHat / Fedora
@@ -171,45 +170,51 @@ RedHat / Fedora
     U: https://admin.fedoraproject.org/pkgdb/acls/name/buildbot
 
 Debian / Ubuntu
-    S: Orphaned
-    U: http://packages.ubuntu.com/maverick/buildbot
+    S: Maintained
+    M: Andriy Senkovych <jolly_roger@itblog.org.ua> (irc:jollyroger)
+    M: Adam Collard <adam.collard@gmail.com>
+    U: http://packages.ubuntu.com/oneiric/buildbot
+    U: http://packages.ubuntu.com/oneiric/buildbot-slave
+    U: http://packages.debian.org/sid/buildbot
+    U: http://packages.debian.org/sid/buildbot-slave
 
 OpenCSW
     S: Orphaned
     U: http://www.opencsw.org/packages/CSWbuildbot/
 
 Gentoo
     S: Maintained
-    M: Dustin J. Mitchell <dustin@v.igoro.us>
+    M: Dustin J. Mitchell <dustin@v.igoro.us> (irc:djmitche)
     U: http://packages.gentoo.org/package/dev-util/buildbot
 
 
 == Other Contact Information ==
 
 Security
     D: Contacts members of this team directly with any security concerns
-    M: Dustin J. Mitchell <dustin@v.igoro.us>
-    M: Amber Yust <ayust@yelp.com>
+    M: Dustin J. Mitchell <dustin@v.igoro.us> (irc:djmitche)
+    M: Amber Yust <ayust@yelp.com> (irc:Aaeriele)
     M: Steve Milner <smilner@redhat.com>
     U: http://trac.buildbot.net/wiki/SecurityPolicy
 
 Metabuildbot Slave Donors
     D: Maintainers of buildslaves for the Metabuildbot
     M: Steve Milner <smilner@redhat.com>
-    M: Dustin J. Mitchell <dustin@v.igoro.us>
-    M: Mozilla Release Engineering <release@mozilla.com>
+    M: Dustin J. Mitchell <dustin@v.igoro.us> (irc:djmitche)
+    M: Mozilla <dustin@mozilla.com>
     M: Marc-Antoine Ruel <maruel@chromium.org>
     M: Dustin Sallings <dustin@spy.net>
-    M: Tom Prince <tom.prince@ualberta.net>
+    M: Tom Prince <tom.prince@ualberta.net> (irc:tomprince)
     U: http://buildbot.buildbot.net
 
 Committers
     D: People who can commit changes to the main Buildbot repository
-    M: Dustin J. Mitchell <dustin@v.igoro.us>
-    M: Amber Yust <ayust@yelp.com>
+    M: Amar Takhar <verm@darkbeer.org>
+    M: Amber Yust <ayust@yelp.com> (irc:Aaeriele)
     M: Ben Hearsum <bhearsum@mozilla.com>
     M: Brian Warner <warner@lothar.com>
     M: Chris AtLee <catlee@mozilla.com>
+    M: Dustin J. Mitchell <dustin@v.igoro.us> (irc:djmitche)
     M: Marc-Antoine Ruel <maruel@chromium.org>
     M: Marcus Lindblom <macke@yar.nu>
-    M: Tom Prince <tom.prince@ualberta.net>
+    M: Tom Prince <tom.prince@ualberta.net> (irc:tomprince)

master/MANIFEST.in

@@ -27,6 +27,7 @@ include buildbot/buildbot.png
 
 include buildbot/db/migrate/README buildbot/db/migrate/migrate.cfg
 
-include contrib/* contrib/windows/* contrib/os-x/* contrib/css/*
+include contrib/* contrib/windows/* contrib/os-x/* contrib/css/* contrib/libvirt/*
+include contrib/blockertest/*
 include contrib/trac/* contrib/trac/bbwatcher/* contrib/trac/bbwatcher/templates/*
 include contrib/init-scripts/*

master/buildbot/db/connector.py

@@ -82,15 +82,15 @@ def __init__(self, master, basedir):
         self.cleanup_timer.setServiceParent(self)
 
 
-    def setup(self, check_version=True):
+    def setup(self, check_version=True, verbose=True):
         db_url = self.configured_url = self.master.config.db['db_url']
 
         log.msg("Setting up database with URL %r" % (db_url,))
 
         # set up the engine and pool
         self._engine = enginestrategy.create_engine(db_url,
                                 basedir=self.basedir)
-        self.pool = pool.DBThreadPool(self._engine)
+        self.pool = pool.DBThreadPool(self._engine, verbose=verbose)
 
         # make sure the db is up to date, unless specifically asked not to
         if check_version:

master/buildbot/db/pool.py

@@ -91,7 +91,14 @@ class DBThreadPool(threadpool.ThreadPool):
     # in bug #1810.
     __broken_sqlite = False
 
-    def __init__(self, engine):
+    def __init__(self, engine, verbose=False):
+        # verbose is used by upgrade scripts, and if it is set we should print
+        # messages about versions and other warnings
+        log_msg = log.msg
+        if verbose:
+            def log_msg(m):
+                print m
+
         pool_size = 5
 
         # If the engine has an C{optimal_thread_pool_size} attribute, then the
@@ -108,19 +115,18 @@ def __init__(self, engine):
         self.engine = engine
         if engine.dialect.name == 'sqlite':
             vers = self.get_sqlite_version()
-            log.msg("Using SQLite Version %s" % (vers,))
             if vers < (3,7):
-                log.msg("NOTE: this old version of SQLite does not support "
+                log_msg("Using SQLite Version %s" % (vers,))
+                log_msg("NOTE: this old version of SQLite does not support "
                         "WAL journal mode; a busy master may encounter "
                         "'Database is locked' errors.  Consider upgrading.")
-            if vers < (3,4):
-                log.msg("NOTE: this old version of SQLite is not supported. "
-                        "It fails for multiple simultaneous accesses to the "
-                        "database: try adding the 'pool_size=1' argument to "
-                        "your db url. ")
+                if vers < (3,4):
+                    log_msg("NOTE: this old version of SQLite is not "
+                            "supported.")
+                    raise RuntimeError("unsupported SQLite version")
             brkn = self.__broken_sqlite = self.detect_bug1810()
             if brkn:
-                log.msg("Applying SQLite workaround from Buildbot bug #1810")
+                log_msg("Applying SQLite workaround from Buildbot bug #1810")
         self._start_evt = reactor.callWhenRunning(self._start)
 
         # patch the do methods to do verbose logging if necessary

master/buildbot/process/build.py

@@ -91,7 +91,7 @@ def setLocks(self, locks):
     def setSlaveEnvironment(self, env):
         self.slaveEnvironment = env
 
-    def getSourceStamp(self, codebase):
+    def getSourceStamp(self, codebase=''):
         for source in self.sources:
             if source.codebase == codebase:
                 return source

master/buildbot/schedulers/triggerable.py

@@ -28,8 +28,8 @@ def __init__(self, name, builderNames, properties={}):
         self._bsc_subscription = None
         self.reason = "Triggerable(%s)" % name
 
-    def trigger(self, ssid, set_props=None):
-        """Trigger this scheduler with the given sourcestamp ID. Returns a
+    def trigger(self, ss_setid, set_props=None):
+        """Trigger this scheduler with the given sourcestampset ID. Returns a
         deferred that will fire when the buildset is finished."""
         # properties for this buildset are composed of our own properties,
         # potentially overridden by anything from the triggering build
@@ -41,8 +41,8 @@ def trigger(self, ssid, set_props=None):
         # note that this does not use the buildset subscriptions mechanism, as
         # the duration of interest to the caller is bounded by the lifetime of
         # this process.
-        if ssid:
-            d = self.addBuildsetForSourceStamp(reason=self.reason, ssid=ssid,
+        if ss_setid:
+            d = self.addBuildsetForSourceStamp(reason=self.reason, setid=ss_setid,
                     properties=props)
         else:
             d = self.addBuildsetForLatest(reason=self.reason, properties=props)

master/buildbot/scripts/runner.py

@@ -260,7 +260,7 @@ def create_db(self):
         master = BuildMaster(self.basedir)
         master.config = master_cfg
         db = connector.DBConnector(master, self.basedir)
-        d = db.setup(check_version=False)
+        d = db.setup(check_version=False, verbose=not self.config['quiet'])
         if not self.config['quiet']:
             print "creating database (%s)" % (master_cfg.db['db_url'],)
         d = db.model.upgrade()
@@ -432,7 +432,7 @@ def upgradeMaster(config):
     db = connector.DBConnector(master, basedir=config['basedir'])
 
     wfd = defer.waitForDeferred(
-            db.setup(check_version=False))
+            db.setup(check_version=False, verbose=not config['quiet']))
     yield wfd
     wfd.getResult()
 

master/buildbot/sourcestamp.py

@@ -278,18 +278,15 @@ def upgradeToVersion2(self):
 
     def upgradeToVersion3(self):
         #In version 2 sourcestamps where not part of a set
-        #The database has been upgraded where all existing sourcestamps got an
-        #setid equal to its ssid
-        self.sourcestampsetid = self.ssid
         #version 2 did not have codebase; set to ''
         self.codebase = ''
         self.wasUpgraded = True
 
     @util.deferredLocked('_getSourceStampSetId_lock')
     def getSourceStampSetId(self, master):
         "temporary; do not use widely!"
-        if self.ssid:
-            return defer.succeed(self.ssid)
+        if self.sourcestampsetid:
+            return defer.succeed(self.sourcestampsetid)
         # add it to the DB
         patch_body = None
         patch_level = None

master/buildbot/steps/source/__init__.py

@@ -13,8 +13,9 @@
 #
 # Copyright Buildbot Team Members
 
-from buildbot.steps.source.oldsource import _ComputeRepositoryURL, Source, CVS, \
-    SVN, Git, Darcs, Repo, Bzr, Mercurial, P4, P4Sync, Monotone, BK
+from buildbot.steps.source.base import Source
+from buildbot.steps.source.oldsource import CVS, \
+    SVN, Git, Darcs, Repo, Bzr, Mercurial, P4, P4Sync, Monotone
 
-_hush_pyflakes = [ _ComputeRepositoryURL, Source, CVS, SVN, \
-     Git, Darcs, Repo, Bzr, Mercurial, P4, P4Sync, Monotone, BK ]
+_hush_pyflakes = [ Source, CVS, SVN, \
+     Git, Darcs, Repo, Bzr, Mercurial, P4, P4Sync, Monotone ]