[Buildbot-commits] [buildbot/buildbot] 480144: Merge remote-tracking branch 'hborkhuis/multirepo2...

Mon Feb 27 18:16:17 UTC 2012

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: 480144e3fb73f8cbdaaa236c54019094c5c7facf
      https://github.com/buildbot/buildbot/commit/480144e3fb73f8cbdaaa236c54019094c5c7facf
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-02-26 (Sun, 26 Feb 2012)

  Changed paths:
    M master/buildbot/changes/changes.py
  M master/buildbot/config.py
  M master/buildbot/db/changes.py
  A master/buildbot/db/migrate/versions/022_add_codebase.py
  M master/buildbot/db/model.py
  M master/buildbot/db/sourcestamps.py
  M master/buildbot/master.py
  M master/buildbot/process/build.py
  M master/buildbot/process/builder.py
  M master/buildbot/process/buildrequest.py
  M master/buildbot/process/properties.py
  M master/buildbot/schedulers/base.py
  M master/buildbot/schedulers/basic.py
  M master/buildbot/sourcestamp.py
  M master/buildbot/steps/source/oldsource.py
  M master/buildbot/test/fake/fakedb.py
  M master/buildbot/test/regressions/test_shell_command_properties.py
  M master/buildbot/test/unit/test_db_changes.py
  A master/buildbot/test/unit/test_db_migrate_versions_022_add_codebase.py
  M master/buildbot/test/unit/test_db_sourcestamps.py
  M master/buildbot/test/unit/test_master.py
  M master/buildbot/test/unit/test_process_build.py
  M master/buildbot/test/unit/test_process_builder.py
  M master/buildbot/test/unit/test_process_buildrequest.py
  M master/buildbot/test/unit/test_process_properties.py
  M master/buildbot/test/unit/test_schedulers_base.py
  M master/buildbot/test/unit/test_schedulers_dependent.py
  M master/buildbot/test/unit/test_schedulers_forcesched.py
  M master/buildbot/test/unit/test_schedulers_triggerable.py
  M master/buildbot/test/unit/test_schedulers_trysched.py
  M master/buildbot/test/unit/test_sourcestamp.py
  M master/docs/developer/config.rst
  M master/docs/manual/cfg-builders.rst
  M master/docs/manual/cfg-global.rst
  M master/docs/manual/cfg-properties.rst
  M master/docs/manual/concepts.rst
  M master/docs/release-notes.rst

  Log Message:
  -----------
  Merge remote-tracking branch 'hborkhuis/multirepo2a' into multirepo

Conflicts:
	master/docs/manual/concepts.rst
	master/docs/release-notes.rst
	master/buildbot/db/migrate/versions/022_add_codebase.py
	master/buildbot/test/unit/test_db_migrate_versions_022_add_codebase.py

  Commit: 27213414b20534e1f52e70df1908169b8c196d20
      https://github.com/buildbot/buildbot/commit/27213414b20534e1f52e70df1908169b8c196d20
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-02-26 (Sun, 26 Feb 2012)

  Changed paths:
    M master/buildbot/process/buildrequest.py

  Log Message:
  -----------
  Don't compare lengths of changes when merging.

  Commit: f2c29d2377be64b51fcd66a30daea1568c198529
      https://github.com/buildbot/buildbot/commit/f2c29d2377be64b51fcd66a30daea1568c198529
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-02-26 (Sun, 26 Feb 2012)

  Changed paths:
    M master/buildbot/process/builder.py
  M master/buildbot/process/buildrequest.py
  M master/buildbot/test/unit/test_process_buildrequest.py

  Log Message:
  -----------
  Don't prohibit merging incompatible source stamps.

We should check before trying to merge source stamp rather than
while merging them. This way, if users give us a different function,
merges will happen.

  Commit: 677b654ae9f03f1ca1e1a7f42c6893120a668eb7
      https://github.com/buildbot/buildbot/commit/677b654ae9f03f1ca1e1a7f42c6893120a668eb7
  Author: Harry Borkhuis <harry at aeteurope.nl>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M .mailmap
  M MAINTAINERS.txt
  M master/CREDITS
  M master/buildbot/__init__.py
  M master/buildbot/buildslave.py
  M master/buildbot/changes/changes.py
  M master/buildbot/changes/gerritchangesource.py
  M master/buildbot/changes/gitpoller.py
  M master/buildbot/changes/hgbuildbot.py
  M master/buildbot/changes/mail.py
  M master/buildbot/changes/svnpoller.py
  M master/buildbot/clients/tryclient.py
  M master/buildbot/config.py
  M master/buildbot/db/base.py
  M master/buildbot/db/buildsets.py
  M master/buildbot/db/changes.py
  M master/buildbot/db/migrate/versions/001_initial.py
  R master/buildbot/db/migrate/versions/021_add_codebase.py
  A master/buildbot/db/migrate/versions/021_fix_postgres_sequences.py
  A master/buildbot/db/migrate/versions/022_add_codebase.py
  R master/buildbot/db/migrate/versions/__init__.py
  A master/buildbot/db/migrate/versions/__init__.py
  M master/buildbot/db/pool.py
  M master/buildbot/db/sourcestamps.py
  M master/buildbot/db/state.py
  M master/buildbot/db/users.py
  M master/buildbot/ec2buildslave.py
  M master/buildbot/manhole.py
  M master/buildbot/master.py
  M master/buildbot/process/builder.py
  M master/buildbot/process/buildrequest.py
  M master/buildbot/process/buildstep.py
  M master/buildbot/process/factory.py
  M master/buildbot/process/metrics.py
  M master/buildbot/process/properties.py
  M master/buildbot/schedulers/base.py
  M master/buildbot/schedulers/basic.py
  M master/buildbot/schedulers/dependent.py
  M master/buildbot/schedulers/timed.py
  M master/buildbot/scripts/reconfig.py
  M master/buildbot/scripts/runner.py
  M master/buildbot/status/build.py
  M master/buildbot/status/builder.py
  M master/buildbot/status/mail.py
  M master/buildbot/status/master.py
  M master/buildbot/status/persistent_queue.py
  M master/buildbot/status/status_gerrit.py
  M master/buildbot/status/status_push.py
  M master/buildbot/status/web/baseweb.py
  M master/buildbot/status/web/change_hook.py
  M master/buildbot/status/web/hooks/base.py
  M master/buildbot/status/web/hooks/github.py
  M master/buildbot/status/web/hooks/googlecode.py
  M master/buildbot/steps/blocker.py
  M master/buildbot/steps/maxq.py
  M master/buildbot/steps/package/rpm/rpmbuild.py
  M master/buildbot/steps/python.py
  M master/buildbot/steps/shell.py
  M master/buildbot/steps/source/mercurial.py
  M master/buildbot/steps/source/svn.py
  M master/buildbot/steps/transfer.py
  M master/buildbot/steps/trigger.py
  M master/buildbot/test/fake/web.py
  M master/buildbot/test/integration/test_configs.py
  M master/buildbot/test/integration/test_upgrade.py
  M master/buildbot/test/unit/test_changes_gerritchangesource.py
  M master/buildbot/test/unit/test_changes_gitpoller.py
  M master/buildbot/test/unit/test_changes_mail.py
  M master/buildbot/test/unit/test_changes_mail_CVSMaildirSource.py
  M master/buildbot/test/unit/test_changes_svnpoller.py
  M master/buildbot/test/unit/test_config.py
  M master/buildbot/test/unit/test_db_base.py
  M master/buildbot/test/unit/test_db_migrate_versions_011_add_buildrequest_claims.py
  R master/buildbot/test/unit/test_db_migrate_versions_021_add_codebase.py
  A master/buildbot/test/unit/test_db_migrate_versions_021_fix_postgres_sequences.py
  A master/buildbot/test/unit/test_db_migrate_versions_022_add_codebase.py
  M master/buildbot/test/unit/test_master.py
  M master/buildbot/test/unit/test_process_buildrequest.py
  A master/buildbot/test/unit/test_process_factory.py
  M master/buildbot/test/unit/test_schedulers_trysched.py
  M master/buildbot/test/unit/test_scripts_checkconfig.py
  M master/buildbot/test/unit/test_scripts_runner.py
  M master/buildbot/test/unit/test_status_logfile.py
  M master/buildbot/test/unit/test_status_mail.py
  M master/buildbot/test/unit/test_status_web_base.py
  M master/buildbot/test/unit/test_status_web_change_hook.py
  M master/buildbot/test/unit/test_status_web_change_hooks_github.py
  M master/buildbot/test/unit/test_status_web_change_hooks_googlecode.py
  M master/buildbot/test/unit/test_steps_source_mercurial.py
  M master/buildbot/test/unit/test_steps_source_svn.py
  M master/buildbot/test/unit/test_steps_transfer.py
  M master/buildbot/test/unit/test_util_lru.py
  M master/buildbot/test/unit/test_util_maildir.py
  M master/buildbot/test/util/change_import.py
  M master/buildbot/test/util/querylog.py
  M master/contrib/bzr_buildbot.py
  M master/contrib/post_build_request.py
  A master/docs/_images/header-text-transparent.png
  R master/docs/_images/header-text-transparent.png
  A master/docs/_static/buildbot.ico
  R master/docs/_static/buildbot.ico
  M master/docs/conf.py
  M master/docs/developer/config.rst
  M master/docs/developer/database.rst
  M master/docs/developer/definitions.rst
  M master/docs/manual/cfg-buildsteps.rst
  M master/docs/manual/cfg-changesources.rst
  M master/docs/manual/cfg-statustargets.rst
  M master/docs/manual/concepts.rst
  M master/docs/manual/customization.rst
  M master/docs/release-notes.rst
  A master/docs/release-notes/0.8.6.rst
  R media/header-text-transparent.png
  A media/header-text-transparent.png
  M slave/buildslave/commands/darcs.py
  M slave/buildslave/runprocess.py
  M slave/buildslave/test/unit/test_commands_darcs.py
  M slave/buildslave/test/unit/test_runprocess.py

  Log Message:
  -----------
  Merge pull request #3 from tomprince/multirepo

  Commit: 0cf668ea02789d2567438da67fdfbd7ec8ae19e5
      https://github.com/buildbot/buildbot/commit/0cf668ea02789d2567438da67fdfbd7ec8ae19e5
  Author: Harry Borkhuis <harry at aeteurope.nl>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M master/buildbot/sourcestamp.py

  Log Message:
  -----------
  depickling of older sourcestamps including sourcestampsetid and codebase

  Commit: f8f7cad33ad4a408c45e2153d7ec15b1d3a4a50d
      https://github.com/buildbot/buildbot/commit/f8f7cad33ad4a408c45e2153d7ec15b1d3a4a50d
  Author: Harry Borkhuis <harry at aeteurope.nl>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M master/buildbot/test/integration/test_upgrade.py

  Log Message:
  -----------
  test for upgrade to sourcestamp version 3

Compare: https://github.com/buildbot/buildbot/compare/4c9b486...f8f7cad