[Buildbot-commits] [buildbot/buildbot] 79f5c1: Merge remote-tracking branch 'upstream/master' int...

[noreply at github.com]

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

Commit: 79f5c11efc3a63b36c3715ee92065d0c73c2a759
    https://github.com/buildbot/buildbot/commit/79f5c11efc3a63b36c3715ee92065d0c73c2a759
Author: Richard Levitte <richard at levitte.org>
Date:   2011-04-03 (Sun, 03 Apr 2011)

Changed paths:
  M master/buildbot/buildslave.py
  M master/buildbot/status/web/files/default.css
  M master/buildbot/steps/subunit.py
  M master/docs/cfg-buildsteps.texinfo
  M master/docs/cfg-statustargets.texinfo
  M master/docs/installation.texinfo
  M slave/buildslave/commands/base.py
  M slave/buildslave/commands/git.py
  M slave/buildslave/commands/mtn.py
  M slave/buildslave/test/fake/runprocess.py
  M slave/buildslave/test/unit/test_commands_git.py
  M slave/buildslave/test/unit/test_commands_mtn.py
  M slave/buildslave/test/util/sourcecommand.py

Log Message:
-----------
Merge remote-tracking branch 'upstream/master' into monotone-integration


Commit: 759b309beca5627f1db2018c2dff51f430489d18
    https://github.com/buildbot/buildbot/commit/759b309beca5627f1db2018c2dff51f430489d18
Author: Richard Levitte <richard at levitte.org>
Date:   2011-04-04 (Mon, 04 Apr 2011)

Changed paths:
  M slave/buildslave/commands/mtn.py
  M slave/buildslave/test/unit/test_commands_mtn.py

Log Message:
-----------
* slave/buildslave/commands/mtn.py (_dovccmd): Take a function argument
  instead of using the callback, which frees up the callback argument for
  better use.  Also, make pulling a conditional.
  (parseGotRevision): Split it two, one part that sets up things for _dovccmd,
  and the other that performs the actual command to get the base revision.
  This makes testing much easier.
  * slave/buildslave/commands/mtn.py: Add a testof parseGotRevision.


Commit: 156db97dc8332838c64425443231a228f7e669e7
    https://github.com/buildbot/buildbot/commit/156db97dc8332838c64425443231a228f7e669e7
Author: Richard Levitte <richard at levitte.org>
Date:   2011-04-04 (Mon, 04 Apr 2011)

Changed paths:
  M slave/buildslave/test/unit/test_commands_mtn.py

Log Message:
-----------
* slave/buildslave/test/unit/test_commands_mtn.py: Add a few more tests,
  covering almost all of the mtn command.


Compare: https://github.com/buildbot/buildbot/compare/0113968...156db97