[Buildbot-commits] [buildbot/buildbot] 29c9de: remove unused BotMaster.shouldMergeRequests

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot

  Commit: 29c9de940d34a0de8268f83a3b7b4f4229d25657
      https://github.com/buildbot/buildbot/commit/29c9de940d34a0de8268f83a3b7b4f4229d25657
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2011-06-25 (Sat, 25 Jun 2011)

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

  Log Message:
  -----------
  remove unused BotMaster.shouldMergeRequests

Refs #2008


  Commit: 984c004a6b04d616e727f6d984e179126fdc9cde
      https://github.com/buildbot/buildbot/commit/984c004a6b04d616e727f6d984e179126fdc9cde
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2011-06-25 (Sat, 25 Jun 2011)

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

  Log Message:
  -----------
  Builder configuration should default mergeRequests to None, not True

Without this change, mergeRequests is True regardless of the global
setting, unless specifically set to something else in the BuilderConfig.

This also fixes an error in _getMergeRequestFn, which was looking at
self.master.mergeRequests, not self.botmaster.mergeRequests, and updates
the tests to match and to have somewhat more readable inputs.

Fixes #2008.


  Commit: 7928163ee56f657ea7bbd3791af5271ac04a87af
      https://github.com/buildbot/buildbot/commit/7928163ee56f657ea7bbd3791af5271ac04a87af
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2011-06-25 (Sat, 25 Jun 2011)

  Changed paths:
    M master/buildbot/master.py

  Log Message:
  -----------
  Allow c['mergeRequests'] = True

This is the default, and therefore unnecessary, but it shouldn't be
explicitly disallowed.  Refs #2008.


Compare: https://github.com/buildbot/buildbot/compare/714f5b2...7928163