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

[noreply at github.com]

  Branch: refs/heads/buildbot-0.8.4
  Home:   https://github.com/buildbot/buildbot

  Commit: f44c2e9fc13cda9e0e15f6bb4daf72cc7906dafd
      https://github.com/buildbot/buildbot/commit/f44c2e9fc13cda9e0e15f6bb4daf72cc7906dafd
  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: 977eb41f40215a65215b6e74beac66a9f46b1801
      https://github.com/buildbot/buildbot/commit/977eb41f40215a65215b6e74beac66a9f46b1801
  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: 88931660eb8d30d9f4515d6ae7b23486d9f9c15b
      https://github.com/buildbot/buildbot/commit/88931660eb8d30d9f4515d6ae7b23486d9f9c15b
  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/7f4527f...8893166