If global and/or per builder mergeRequests is not set, the default mergeRequests handler expects only two arguments not the provided 3

[bdbaddog]

If global and/or per builder mergeRequests is not set, the default mergeRequests handler expects only two arguments not the provided 3

Stacktrace here:

2011-06-29 15:31:51-0700 [-] in maybeStartBuild for <Builder ''runtests'' at 4312472752>
        Traceback (most recent call last):
          File "/Users/bdbaddog/devel/buildbot/sandbox/lib/python2.6/site-packages/twisted/internet/defer.py", line 542, in _runCallbacks
            current.result = callback(current.result, *args, **kw)
          File "/Users/bdbaddog/devel/buildbot/sandbox/lib/python2.6/site-packages/twisted/internet/defer.py", line 891, in gotResult
            _deferGenerator(g, deferred)
          File "/Users/bdbaddog/devel/buildbot/sandbox/lib/python2.6/site-packages/twisted/internet/defer.py", line 866, in _deferGenerator
            result = g.next()
          File "/Users/bdbaddog/devel/buildbot/master/buildbot/process/builder.py", line 810, in _mergeRequests
            defer.maybeDeferred(lambda :
        --- <exception caught here> ---
          File "/Users/bdbaddog/devel/buildbot/sandbox/lib/python2.6/site-packages/twisted/internet/defer.py", line 133, in maybeDeferred
            result = f(*args, **kw)
          File "/Users/bdbaddog/devel/buildbot/master/buildbot/process/builder.py", line 811, in <lambda>
            mergeRequests_fn(self, breq_object, other_breq_object)))
        exceptions.TypeError: unbound method canBeMergedWith() must be called with BuildRequest instance as first argument (got Builder instance instead)

[Dustin J. Mitchell]

Use a properly-formed default mergeRequests function

This function takes the requisite three arguments (builder, req1, req2), and calls through to the BuildRequest?.canBeMergedWith method.

Fixes #2025.

Changeset: 0987c3b051463f4e982b0c0cc465cbb86916f485

[Dustin J. Mitchell]

Use a properly-formed default mergeRequests function

This function takes the requisite three arguments (builder, req1, req2), and calls through to the BuildRequest?.canBeMergedWith method.

Fixes #2025.

Changeset: 78bea192df2fa04472181e4de030785545d6ffbd