Git.startVC overrides the default branch setting even if branch argument is None

[dionoea]

Can be fixed by using this code instead:

    def startVC(self, branch, revision, patch):
        if branch is not None:
                self.args['branch'] = branch
        if revision is not None:
                self.args['revision'] = revision
        if patch is not None:
                self.args['patch'] = patch

Other VCs are probably affected too. (Sorry for the irregular patch, I just modified the debian installed version and thus don't have anything to diff against)

[dustin]

340-conditional.patch

[dustin]

All tests pass.

 http://repo.or.cz/w/buildbot.git?a=shortlog;h=refs/remotes/dustin/bug340

[warner]

reformatted summary to avoid wikification

[warner]

hrm, I'm not sure this is right. There is always supposed to be a self.args['branch'] key. The per-step default branch is computed in Source.start here and passed in as an argument to startVC here, so the assignment that you're making optional is already incorporating the default branch information.

Am I misunderstanding something?

[warner]

Ping?

I'm going to let 0.7.9 go out the door with this change, but I think we may need to revert it. The Source subclass __init__ method is supposed to set self.branch instead of copying the default branch into self.args['branch']. Then Source.start picks up the default from self.branch and passes it into startVC.

[dustin]

oops, still needs review

[dustin]

No complaints about this in 0.7.9..